From: mstarzinger <mstarzinger@chromium.org>
Date: Thu, 20 Aug 2015 07:44:00 +0000 (-0700)
Subject: Remove grab-bag includes of v8.h from everywhere.
X-Git-Tag: upstream/4.7.83~777
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=98a0fe0f329b4e00de826a91e192942fd0d5c0f9;p=platform%2Fupstream%2Fv8.git

Remove grab-bag includes of v8.h from everywhere.

R=bmeurer@chromium.org

Review URL: https://codereview.chromium.org/1285183010

Cr-Commit-Position: refs/heads/master@{#30263}
---

diff --git a/src/allocation-tracker.cc b/src/allocation-tracker.cc
index 128d25c8d..0822c1f4d 100644
--- a/src/allocation-tracker.cc
+++ b/src/allocation-tracker.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
-
 #include "src/allocation-tracker.h"
+
 #include "src/frames-inl.h"
 #include "src/heap-snapshot-generator-inl.h"
+#include "src/objects-inl.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/base/smart-pointers.h b/src/base/smart-pointers.h
index 6528fca92..df3fcac66 100644
--- a/src/base/smart-pointers.h
+++ b/src/base/smart-pointers.h
@@ -5,6 +5,8 @@
 #ifndef V8_BASE_SMART_POINTERS_H_
 #define V8_BASE_SMART_POINTERS_H_
 
+#include "src/base/logging.h"
+
 namespace v8 {
 namespace base {
 
diff --git a/src/builtins.cc b/src/builtins.cc
index aa7268f6b..4bc61b8f6 100644
--- a/src/builtins.cc
+++ b/src/builtins.cc
@@ -2,14 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
+#include "src/builtins.h"
 
 #include "src/api.h"
 #include "src/api-natives.h"
 #include "src/arguments.h"
 #include "src/base/once.h"
 #include "src/bootstrapper.h"
-#include "src/builtins.h"
 #include "src/cpu-profiler.h"
 #include "src/elements.h"
 #include "src/frames-inl.h"
diff --git a/src/builtins.h b/src/builtins.h
index cf90aacf8..8f1aaa5bb 100644
--- a/src/builtins.h
+++ b/src/builtins.h
@@ -5,6 +5,8 @@
 #ifndef V8_BUILTINS_H_
 #define V8_BUILTINS_H_
 
+#include "src/handles.h"
+
 namespace v8 {
 namespace internal {
 
diff --git a/src/cancelable-task.cc b/src/cancelable-task.cc
index 32d5057c4..969b34210 100644
--- a/src/cancelable-task.cc
+++ b/src/cancelable-task.cc
@@ -5,7 +5,8 @@
 #include "src/cancelable-task.h"
 
 #include "src/base/platform/platform.h"
-#include "src/v8.h"
+#include "src/isolate.h"
+#include "src/objects-inl.h"  // TODO(mstarzinger): Temporary cycle breaker!
 
 namespace v8 {
 namespace internal {
diff --git a/src/code-stubs-hydrogen.cc b/src/code-stubs-hydrogen.cc
index 81304e500..69a49232c 100644
--- a/src/code-stubs-hydrogen.cc
+++ b/src/code-stubs-hydrogen.cc
@@ -2,10 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
+#include "src/code-stubs.h"
 
 #include "src/bailout-reason.h"
-#include "src/code-stubs.h"
 #include "src/field-index.h"
 #include "src/hydrogen.h"
 #include "src/ic/ic.h"
diff --git a/src/compilation-cache.cc b/src/compilation-cache.cc
index 46d783866..d8b17a029 100644
--- a/src/compilation-cache.cc
+++ b/src/compilation-cache.cc
@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
+#include "src/compilation-cache.h"
 
 #include "src/assembler.h"
-#include "src/compilation-cache.h"
+#include "src/counters.h"
+#include "src/factory.h"
+#include "src/objects-inl.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/compilation-cache.h b/src/compilation-cache.h
index 136bb97ea..2d7609ec1 100644
--- a/src/compilation-cache.h
+++ b/src/compilation-cache.h
@@ -5,6 +5,10 @@
 #ifndef V8_COMPILATION_CACHE_H_
 #define V8_COMPILATION_CACHE_H_
 
+#include "src/allocation.h"
+#include "src/handles.h"
+#include "src/objects.h"
+
 namespace v8 {
 namespace internal {
 
diff --git a/src/context-measure.cc b/src/context-measure.cc
index 42a08be0a..da4aae498 100644
--- a/src/context-measure.cc
+++ b/src/context-measure.cc
@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
-
 #include "src/context-measure.h"
 
+#include "src/base/logging.h"
+#include "src/contexts.h"
+#include "src/objects-inl.h"
+
 namespace v8 {
 namespace internal {
 
diff --git a/src/conversions.cc b/src/conversions.cc
index 587747385..2ce1d70fe 100644
--- a/src/conversions.cc
+++ b/src/conversions.cc
@@ -2,16 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "src/conversions.h"
+
 #include <limits.h>
 #include <stdarg.h>
 #include <cmath>
 
-#include "src/v8.h"
-
 #include "src/assert-scope.h"
 #include "src/char-predicates-inl.h"
 #include "src/conversions-inl.h"
-#include "src/conversions.h"
 #include "src/dtoa.h"
 #include "src/factory.h"
 #include "src/list-inl.h"
diff --git a/src/counters.cc b/src/counters.cc
index 2788ff7f9..e8dea2e07 100644
--- a/src/counters.cc
+++ b/src/counters.cc
@@ -2,10 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
+#include "src/counters.h"
 
 #include "src/base/platform/platform.h"
-#include "src/counters.h"
 #include "src/isolate.h"
 #include "src/log-inl.h"
 
diff --git a/src/cpu-profiler.cc b/src/cpu-profiler.cc
index 638f91513..ecef2e346 100644
--- a/src/cpu-profiler.cc
+++ b/src/cpu-profiler.cc
@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
-
-#include "src/cpu-profiler-inl.h"
+#include "src/cpu-profiler.h"
 
 #include "src/compiler.h"
+#include "src/cpu-profiler-inl.h"
 #include "src/deoptimizer.h"
 #include "src/frames-inl.h"
 #include "src/hashmap.h"
diff --git a/src/date.cc b/src/date.cc
index 68c7507d0..3106b1622 100644
--- a/src/date.cc
+++ b/src/date.cc
@@ -4,8 +4,6 @@
 
 #include "src/date.h"
 
-#include "src/v8.h"
-
 #include "src/objects.h"
 #include "src/objects-inl.h"
 
diff --git a/src/deoptimizer.cc b/src/deoptimizer.cc
index 0efc4de36..077f109b5 100644
--- a/src/deoptimizer.cc
+++ b/src/deoptimizer.cc
@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
+#include "src/deoptimizer.h"
 
 #include "src/accessors.h"
 #include "src/codegen.h"
 #include "src/cpu-profiler.h"
-#include "src/deoptimizer.h"
 #include "src/disasm.h"
 #include "src/frames-inl.h"
 #include "src/full-codegen/full-codegen.h"
 #include "src/global-handles.h"
 #include "src/macro-assembler.h"
 #include "src/prettyprinter.h"
+#include "src/v8.h"
 
 
 namespace v8 {
diff --git a/src/dtoa.h b/src/dtoa.h
index dd88688d0..ca6277ee5 100644
--- a/src/dtoa.h
+++ b/src/dtoa.h
@@ -5,6 +5,8 @@
 #ifndef V8_DTOA_H_
 #define V8_DTOA_H_
 
+#include "src/vector.h"
+
 namespace v8 {
 namespace internal {
 
diff --git a/src/elements.cc b/src/elements.cc
index 3e80d5570..e0fb6fba0 100644
--- a/src/elements.cc
+++ b/src/elements.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
+#include "src/elements.h"
 
 #include "src/arguments.h"
 #include "src/conversions.h"
-#include "src/elements.h"
+#include "src/factory.h"
 #include "src/messages.h"
-#include "src/objects.h"
+#include "src/objects-inl.h"
 #include "src/utils.h"
 
 // Each concrete ElementsAccessor can handle exactly one ElementsKind,
diff --git a/src/extensions/free-buffer-extension.cc b/src/extensions/free-buffer-extension.cc
index b642b3df3..946d4d77d 100644
--- a/src/extensions/free-buffer-extension.cc
+++ b/src/extensions/free-buffer-extension.cc
@@ -5,7 +5,8 @@
 #include "src/extensions/free-buffer-extension.h"
 
 #include "src/base/platform/platform.h"
-#include "src/v8.h"
+#include "src/isolate.h"
+#include "src/objects-inl.h"  // TODO(mstarzinger): Temporary cycle breaker!
 
 namespace v8 {
 namespace internal {
diff --git a/src/extensions/statistics-extension.cc b/src/extensions/statistics-extension.cc
index 495167695..5612259fc 100644
--- a/src/extensions/statistics-extension.cc
+++ b/src/extensions/statistics-extension.cc
@@ -4,7 +4,10 @@
 
 #include "src/extensions/statistics-extension.h"
 
-#include "src/v8.h"
+#include "src/counters.h"
+#include "src/heap/heap-inl.h"
+#include "src/isolate.h"
+#include "src/objects-inl.h"  // TODO(mstarzinger): Temporary cycle breaker!
 
 namespace v8 {
 namespace internal {
diff --git a/src/extensions/trigger-failure-extension.cc b/src/extensions/trigger-failure-extension.cc
index 672c1a706..9aa8c2dcf 100644
--- a/src/extensions/trigger-failure-extension.cc
+++ b/src/extensions/trigger-failure-extension.cc
@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 #include "src/extensions/trigger-failure-extension.h"
-#include "src/v8.h"
+
+#include "src/base/logging.h"
+#include "src/checks.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/fast-dtoa.h b/src/fast-dtoa.h
index d96c296f1..38e8a8249 100644
--- a/src/fast-dtoa.h
+++ b/src/fast-dtoa.h
@@ -5,6 +5,8 @@
 #ifndef V8_FAST_DTOA_H_
 #define V8_FAST_DTOA_H_
 
+#include "src/vector.h"
+
 namespace v8 {
 namespace internal {
 
diff --git a/src/fixed-dtoa.h b/src/fixed-dtoa.h
index b6495c11e..0a6cb5081 100644
--- a/src/fixed-dtoa.h
+++ b/src/fixed-dtoa.h
@@ -5,6 +5,8 @@
 #ifndef V8_FIXED_DTOA_H_
 #define V8_FIXED_DTOA_H_
 
+#include "src/vector.h"
+
 namespace v8 {
 namespace internal {
 
diff --git a/src/flags.cc b/src/flags.cc
index 6f28ebb03..1899d7ebe 100644
--- a/src/flags.cc
+++ b/src/flags.cc
@@ -2,16 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "src/flags.h"
+
 #include <cctype>
 #include <cstdlib>
 #include <sstream>
 
-#include "src/v8.h"
-
+#include "src/allocation.h"
 #include "src/assembler.h"
 #include "src/base/functional.h"
 #include "src/base/platform/platform.h"
+#include "src/objects-inl.h"  // TODO(mstarzinger): Temporary cycle breaker!
 #include "src/ostreams.h"
+#include "src/utils.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/global-handles.cc b/src/global-handles.cc
index befa17376..650999f39 100644
--- a/src/global-handles.cc
+++ b/src/global-handles.cc
@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
-
-#include "src/api.h"
 #include "src/global-handles.h"
 
+#include "src/api.h"
+#include "src/v8.h"
 #include "src/vm-state-inl.h"
 
 namespace v8 {
diff --git a/src/handles.cc b/src/handles.cc
index ca23a6f75..ae6fac89d 100644
--- a/src/handles.cc
+++ b/src/handles.cc
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
-
 #include "src/handles.h"
 
+#include "src/base/logging.h"
+#include "src/objects-inl.h"
+
 namespace v8 {
 namespace internal {
 
diff --git a/src/heap-profiler.cc b/src/heap-profiler.cc
index 68d94ccbd..6dc18f318 100644
--- a/src/heap-profiler.cc
+++ b/src/heap-profiler.cc
@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
-
 #include "src/heap-profiler.h"
 
 #include "src/allocation-tracker.h"
+#include "src/api.h"
 #include "src/heap-snapshot-generator-inl.h"
 
 namespace v8 {
diff --git a/src/heap-profiler.h b/src/heap-profiler.h
index 16dd08a26..80516be0f 100644
--- a/src/heap-profiler.h
+++ b/src/heap-profiler.h
@@ -7,6 +7,7 @@
 
 #include "src/base/smart-pointers.h"
 #include "src/isolate.h"
+#include "src/list.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/heap-snapshot-generator.cc b/src/heap-snapshot-generator.cc
index f9c235ed9..dab9785ec 100644
--- a/src/heap-snapshot-generator.cc
+++ b/src/heap-snapshot-generator.cc
@@ -2,15 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
-
-#include "src/heap-snapshot-generator-inl.h"
+#include "src/heap-snapshot-generator.h"
 
 #include "src/allocation-tracker.h"
 #include "src/code-stubs.h"
 #include "src/conversions.h"
 #include "src/debug/debug.h"
 #include "src/heap-profiler.h"
+#include "src/heap-snapshot-generator-inl.h"
 #include "src/types.h"
 
 namespace v8 {
diff --git a/src/heap-snapshot-generator.h b/src/heap-snapshot-generator.h
index 5693cc16c..9a984eef9 100644
--- a/src/heap-snapshot-generator.h
+++ b/src/heap-snapshot-generator.h
@@ -5,7 +5,9 @@
 #ifndef V8_HEAP_SNAPSHOT_GENERATOR_H_
 #define V8_HEAP_SNAPSHOT_GENERATOR_H_
 
+#include "include/v8-profiler.h"
 #include "src/base/platform/time.h"
+#include "src/objects.h"
 #include "src/strings-storage.h"
 
 namespace v8 {
@@ -14,6 +16,8 @@ namespace internal {
 class AllocationTracker;
 class AllocationTraceNode;
 class HeapEntry;
+class HeapIterator;
+class HeapProfiler;
 class HeapSnapshot;
 class SnapshotFiller;
 
diff --git a/src/heap/memory-reducer.cc b/src/heap/memory-reducer.cc
index c297c4dde..3f2862df3 100644
--- a/src/heap/memory-reducer.cc
+++ b/src/heap/memory-reducer.cc
@@ -6,6 +6,7 @@
 
 #include "src/flags.h"
 #include "src/heap/heap.h"
+#include "src/objects-inl.h"  // TODO(mstarzinger): Temporary cycle breaker!
 #include "src/utils.h"
 #include "src/v8.h"
 
diff --git a/src/heap/store-buffer-inl.h b/src/heap/store-buffer-inl.h
index f168fe0a5..90f54766d 100644
--- a/src/heap/store-buffer-inl.h
+++ b/src/heap/store-buffer-inl.h
@@ -6,6 +6,7 @@
 #define V8_STORE_BUFFER_INL_H_
 
 #include "src/heap/heap.h"
+#include "src/heap/spaces-inl.h"
 #include "src/heap/store-buffer.h"
 
 namespace v8 {
diff --git a/src/heap/store-buffer.cc b/src/heap/store-buffer.cc
index 95fb83c3c..090d996c8 100644
--- a/src/heap/store-buffer.cc
+++ b/src/heap/store-buffer.cc
@@ -8,6 +8,8 @@
 
 #include "src/counters.h"
 #include "src/heap/store-buffer-inl.h"
+#include "src/isolate.h"
+#include "src/objects-inl.h"
 #include "src/v8.h"
 
 namespace v8 {
diff --git a/src/hydrogen-dce.cc b/src/hydrogen-dce.cc
index 1d5bb7841..50a300bd9 100644
--- a/src/hydrogen-dce.cc
+++ b/src/hydrogen-dce.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "src/hydrogen-dce.h"
-#include "src/v8.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/hydrogen-instructions.cc b/src/hydrogen-instructions.cc
index 770d710a3..0e45e3507 100644
--- a/src/hydrogen-instructions.cc
+++ b/src/hydrogen-instructions.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
+#include "src/hydrogen-instructions.h"
 
 #include "src/base/bits.h"
 #include "src/double.h"
diff --git a/src/hydrogen-sce.cc b/src/hydrogen-sce.cc
index 6944f7090..235a94142 100644
--- a/src/hydrogen-sce.cc
+++ b/src/hydrogen-sce.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "src/hydrogen-sce.h"
-#include "src/v8.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index 8984a6e9f..8c59ce86c 100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -6,8 +6,6 @@
 
 #include <sstream>
 
-#include "src/v8.h"
-
 #include "src/allocation-site-scopes.h"
 #include "src/ast-numbering.h"
 #include "src/full-codegen/full-codegen.h"
diff --git a/src/interface-descriptors.cc b/src/interface-descriptors.cc
index da9eb2991..80f1431ec 100644
--- a/src/interface-descriptors.cc
+++ b/src/interface-descriptors.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
-
 #include "src/interface-descriptors.h"
 
 namespace v8 {
diff --git a/src/isolate.cc b/src/isolate.cc
index 155e9ead0..b6c5da02a 100644
--- a/src/isolate.cc
+++ b/src/isolate.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "src/isolate.h"
+
 #include <stdlib.h>
 
 #include <fstream>  // NOLINT(readability/streams)
 #include <sstream>
 
-#include "src/v8.h"
-
 #include "src/ast.h"
 #include "src/base/platform/platform.h"
 #include "src/base/sys-info.h"
@@ -36,6 +36,7 @@
 #include "src/scopeinfo.h"
 #include "src/simulator.h"
 #include "src/snapshot/serialize.h"
+#include "src/v8.h"
 #include "src/version.h"
 #include "src/vm-state-inl.h"
 
diff --git a/src/layout-descriptor.cc b/src/layout-descriptor.cc
index b961a7de9..11a72e732 100644
--- a/src/layout-descriptor.cc
+++ b/src/layout-descriptor.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <sstream>
+#include "src/layout-descriptor.h"
 
-#include "src/v8.h"
+#include <sstream>
 
 #include "src/base/bits.h"
-#include "src/layout-descriptor.h"
+#include "src/handles-inl.h"
 
 using v8::base::bits::CountTrailingZeros32;
 
diff --git a/src/lithium-allocator.cc b/src/lithium-allocator.cc
index afa28bbb4..21103922f 100644
--- a/src/lithium-allocator.cc
+++ b/src/lithium-allocator.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
+#include "src/lithium-allocator.h"
 
 #include "src/hydrogen.h"
 #include "src/lithium-inl.h"
diff --git a/src/lithium-codegen.cc b/src/lithium-codegen.cc
index 24c1301dc..267df58cc 100644
--- a/src/lithium-codegen.cc
+++ b/src/lithium-codegen.cc
@@ -6,8 +6,6 @@
 
 #include <sstream>
 
-#include "src/v8.h"
-
 #if V8_TARGET_ARCH_IA32
 #include "src/ia32/lithium-ia32.h"  // NOLINT
 #include "src/ia32/lithium-codegen-ia32.h"  // NOLINT
diff --git a/src/lithium.cc b/src/lithium.cc
index a9d7748ef..728ed67fb 100644
--- a/src/lithium.cc
+++ b/src/lithium.cc
@@ -4,8 +4,6 @@
 
 #include "src/lithium.h"
 
-#include "src/v8.h"
-
 #include "src/scopes.h"
 
 #if V8_TARGET_ARCH_IA32
diff --git a/src/log-inl.h b/src/log-inl.h
index a96631d05..82f5e7d7d 100644
--- a/src/log-inl.h
+++ b/src/log-inl.h
@@ -7,6 +7,7 @@
 
 #include "src/log.h"
 #include "src/isolate.h"
+#include "src/objects-inl.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/log.cc b/src/log.cc
index 044250f11..0bc93fb38 100644
--- a/src/log.cc
+++ b/src/log.cc
@@ -7,8 +7,6 @@
 #include <cstdarg>
 #include <sstream>
 
-#include "src/v8.h"
-
 #include "src/bailout-reason.h"
 #include "src/base/platform/platform.h"
 #include "src/bootstrapper.h"
diff --git a/src/lookup.cc b/src/lookup.cc
index 4d3214324..71be9a876 100644
--- a/src/lookup.cc
+++ b/src/lookup.cc
@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
+#include "src/lookup.h"
 
 #include "src/bootstrapper.h"
 #include "src/deoptimizer.h"
-#include "src/lookup.h"
 #include "src/lookup-inl.h"
 
 namespace v8 {
diff --git a/src/messages.cc b/src/messages.cc
index 4e0c45f0f..6683443e5 100644
--- a/src/messages.cc
+++ b/src/messages.cc
@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
+#include "src/messages.h"
 
 #include "src/api.h"
 #include "src/execution.h"
-#include "src/messages.h"
 #include "src/string-builder.h"
 
 namespace v8 {
diff --git a/src/messages.h b/src/messages.h
index d92e5f7a7..5d56ceb1c 100644
--- a/src/messages.h
+++ b/src/messages.h
@@ -11,6 +11,7 @@
 #define V8_MESSAGES_H_
 
 #include "src/base/smart-pointers.h"
+#include "src/handles.h"
 #include "src/list.h"
 
 namespace v8 {
diff --git a/src/objects-debug.cc b/src/objects-debug.cc
index 815a5b53f..6d87bd7ae 100644
--- a/src/objects-debug.cc
+++ b/src/objects-debug.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
+#include "src/objects.h"
 
 #include "src/bootstrapper.h"
 #include "src/disasm.h"
diff --git a/src/objects-printer.cc b/src/objects-printer.cc
index 799561eb8..b3a0e4711 100644
--- a/src/objects-printer.cc
+++ b/src/objects-printer.cc
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
+#include "src/objects.h"
 
 #include "src/disasm.h"
 #include "src/disassembler.h"
 #include "src/interpreter/bytecodes.h"
+#include "src/objects-inl.h"
 #include "src/ostreams.h"
 #include "src/regexp/jsregexp.h"
 
diff --git a/src/objects.cc b/src/objects.cc
index ed394ad0c..4a18728d3 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "src/objects.h"
+
 #include <iomanip>
 #include <sstream>
 
-#include "src/v8.h"
-
 #include "src/accessors.h"
 #include "src/allocation-site-scopes.h"
 #include "src/api.h"
diff --git a/src/optimizing-compile-dispatcher.cc b/src/optimizing-compile-dispatcher.cc
index 1f98e7bc9..8e3e96ad0 100644
--- a/src/optimizing-compile-dispatcher.cc
+++ b/src/optimizing-compile-dispatcher.cc
@@ -4,12 +4,11 @@
 
 #include "src/optimizing-compile-dispatcher.h"
 
-#include "src/v8.h"
-
 #include "src/base/atomicops.h"
 #include "src/full-codegen/full-codegen.h"
 #include "src/hydrogen.h"
 #include "src/isolate.h"
+#include "src/v8.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/prettyprinter.cc b/src/prettyprinter.cc
index 9bc4e6a56..e71489fa7 100644
--- a/src/prettyprinter.cc
+++ b/src/prettyprinter.cc
@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <stdarg.h>
+#include "src/prettyprinter.h"
 
-#include "src/v8.h"
+#include <stdarg.h>
 
 #include "src/ast-value-factory.h"
 #include "src/base/platform/platform.h"
-#include "src/prettyprinter.h"
 #include "src/scopes.h"
 
 namespace v8 {
diff --git a/src/profile-generator.cc b/src/profile-generator.cc
index d2e94b475..09468cad7 100644
--- a/src/profile-generator.cc
+++ b/src/profile-generator.cc
@@ -2,14 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
-
-#include "src/profile-generator-inl.h"
+#include "src/profile-generator.h"
 
 #include "src/compiler.h"
 #include "src/debug/debug.h"
 #include "src/deoptimizer.h"
 #include "src/global-handles.h"
+#include "src/profile-generator-inl.h"
 #include "src/sampler.h"
 #include "src/scopeinfo.h"
 #include "src/splay-tree-inl.h"
diff --git a/src/runtime-profiler.cc b/src/runtime-profiler.cc
index 4a45baf52..6b942d44a 100644
--- a/src/runtime-profiler.cc
+++ b/src/runtime-profiler.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
-
 #include "src/runtime-profiler.h"
 
 #include "src/assembler.h"
diff --git a/src/sampler.cc b/src/sampler.cc
index 79b5bff85..4e669ca6d 100644
--- a/src/sampler.cc
+++ b/src/sampler.cc
@@ -42,8 +42,6 @@
 
 #endif
 
-#include "src/v8.h"
-
 #include "src/base/platform/platform.h"
 #include "src/cpu-profiler-inl.h"
 #include "src/flags.h"
diff --git a/src/scanner-character-streams.cc b/src/scanner-character-streams.cc
index 442bc75d6..7db807d7a 100644
--- a/src/scanner-character-streams.cc
+++ b/src/scanner-character-streams.cc
@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
-
 #include "src/scanner-character-streams.h"
 
 #include "include/v8.h"
+#include "src/globals.h"
 #include "src/handles.h"
+#include "src/list-inl.h"  // TODO(mstarzinger): Temporary cycle breaker!
+#include "src/objects.h"
 #include "src/unicode-inl.h"
 
 namespace v8 {
diff --git a/src/scanner-character-streams.h b/src/scanner-character-streams.h
index 582165710..352e17612 100644
--- a/src/scanner-character-streams.h
+++ b/src/scanner-character-streams.h
@@ -5,11 +5,16 @@
 #ifndef V8_SCANNER_CHARACTER_STREAMS_H_
 #define V8_SCANNER_CHARACTER_STREAMS_H_
 
+#include "src/handles.h"
 #include "src/scanner.h"
+#include "src/vector.h"
 
 namespace v8 {
 namespace internal {
 
+// Forward declarations.
+class ExternalTwoByteString;
+
 // A buffered character stream based on a random access character
 // source (ReadBlock can be called with pos_ pointing to any position,
 // even positions before the current).
diff --git a/src/scanner.cc b/src/scanner.cc
index c6c0a8d6a..cebb5870f 100644
--- a/src/scanner.cc
+++ b/src/scanner.cc
@@ -4,18 +4,17 @@
 
 // Features shared by parsing and pre-parsing scanners.
 
+#include "src/scanner.h"
+
 #include <stdint.h>
 
 #include <cmath>
 
-#include "src/v8.h"
-
 #include "src/ast-value-factory.h"
 #include "src/char-predicates-inl.h"
 #include "src/conversions-inl.h"
 #include "src/list-inl.h"
 #include "src/parser.h"
-#include "src/scanner.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/scopeinfo.cc b/src/scopeinfo.cc
index e53f36d27..da146c3d1 100644
--- a/src/scopeinfo.cc
+++ b/src/scopeinfo.cc
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <stdlib.h>
+#include "src/scopeinfo.h"
 
-#include "src/v8.h"
+#include <stdlib.h>
 
 #include "src/bootstrapper.h"
-#include "src/scopeinfo.h"
 #include "src/scopes.h"
 
 namespace v8 {
diff --git a/src/snapshot/mksnapshot.cc b/src/snapshot/mksnapshot.cc
index f44eca523..99d93aade 100644
--- a/src/snapshot/mksnapshot.cc
+++ b/src/snapshot/mksnapshot.cc
@@ -6,14 +6,13 @@
 #include <signal.h>
 #include <stdio.h>
 
-#include "src/v8.h"
-
 #include "include/libplatform/libplatform.h"
 #include "src/assembler.h"
 #include "src/base/platform/platform.h"
 #include "src/bootstrapper.h"
 #include "src/flags.h"
 #include "src/list.h"
+#include "src/objects-inl.h"  // TODO(mstarzinger): Temporary cycle breaker!
 #include "src/snapshot/natives.h"
 #include "src/snapshot/serialize.h"
 
diff --git a/src/snapshot/serialize.cc b/src/snapshot/serialize.cc
index 3f261203e..a3a22336d 100644
--- a/src/snapshot/serialize.cc
+++ b/src/snapshot/serialize.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
+#include "src/snapshot/serialize.h"
 
 #include "src/accessors.h"
 #include "src/api.h"
@@ -19,9 +19,9 @@
 #include "src/parser.h"
 #include "src/runtime/runtime.h"
 #include "src/snapshot/natives.h"
-#include "src/snapshot/serialize.h"
 #include "src/snapshot/snapshot.h"
 #include "src/snapshot/snapshot-source-sink.h"
+#include "src/v8.h"
 #include "src/v8threads.h"
 #include "src/version.h"
 
diff --git a/src/snapshot/snapshot-common.cc b/src/snapshot/snapshot-common.cc
index 743178b51..5a849f63b 100644
--- a/src/snapshot/snapshot-common.cc
+++ b/src/snapshot/snapshot-common.cc
@@ -4,12 +4,11 @@
 
 // The common functionality when building with or without snapshots.
 
-#include "src/v8.h"
+#include "src/snapshot/snapshot.h"
 
 #include "src/api.h"
 #include "src/base/platform/platform.h"
 #include "src/full-codegen/full-codegen.h"
-#include "src/snapshot/snapshot.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/snapshot/snapshot-empty.cc b/src/snapshot/snapshot-empty.cc
index 464d3a800..af2c9af8a 100644
--- a/src/snapshot/snapshot-empty.cc
+++ b/src/snapshot/snapshot-empty.cc
@@ -4,10 +4,10 @@
 
 // Used for building without snapshots.
 
-#include "src/v8.h"
-
 #include "src/snapshot/snapshot.h"
 
+#include "src/objects-inl.h"  // TODO(mstarzinger): Temporary cycle breaker!
+
 namespace v8 {
 namespace internal {
 
diff --git a/src/snapshot/snapshot-external.cc b/src/snapshot/snapshot-external.cc
index 1d5476cb5..256f72aae 100644
--- a/src/snapshot/snapshot-external.cc
+++ b/src/snapshot/snapshot-external.cc
@@ -7,6 +7,7 @@
 #include "src/snapshot/snapshot.h"
 
 #include "src/base/platform/mutex.h"
+#include "src/objects-inl.h"  // TODO(mstarzinger): Temporary cycle breaker!
 #include "src/snapshot/serialize.h"
 #include "src/snapshot/snapshot-source-sink.h"
 #include "src/v8.h"  // for V8::Initialize
diff --git a/src/snapshot/snapshot.h b/src/snapshot/snapshot.h
index 7f89213f1..dabc694d5 100644
--- a/src/snapshot/snapshot.h
+++ b/src/snapshot/snapshot.h
@@ -2,15 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/isolate.h"
-#include "src/snapshot/serialize.h"
-
 #ifndef V8_SNAPSHOT_SNAPSHOT_H_
 #define V8_SNAPSHOT_SNAPSHOT_H_
 
+#include "src/isolate.h"
+#include "src/snapshot/serialize.h"
+
 namespace v8 {
 namespace internal {
 
+// Forward declarations.
+class Isolate;
+class PartialSerializer;
+class StartupSerializer;
+
 class Snapshot : public AllStatic {
  public:
   class Metadata {
diff --git a/src/string-search.h b/src/string-search.h
index bf5ffe6b2..349d4fd2d 100644
--- a/src/string-search.h
+++ b/src/string-search.h
@@ -5,6 +5,9 @@
 #ifndef V8_STRING_SEARCH_H_
 #define V8_STRING_SEARCH_H_
 
+#include "src/isolate.h"
+#include "src/vector.h"
+
 namespace v8 {
 namespace internal {
 
diff --git a/src/strings-storage.cc b/src/strings-storage.cc
index 8ddf291fc..52cc00f85 100644
--- a/src/strings-storage.cc
+++ b/src/strings-storage.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
-
 #include "src/strings-storage.h"
 
+#include "src/base/smart-pointers.h"
+#include "src/objects-inl.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/transitions.cc b/src/transitions.cc
index 9870e17d8..64b813352 100644
--- a/src/transitions.cc
+++ b/src/transitions.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
+#include "src/transitions.h"
 
-#include "src/objects.h"
+#include "src/objects-inl.h"
 #include "src/transitions-inl.h"
 #include "src/utils.h"
 
diff --git a/src/type-feedback-vector.cc b/src/type-feedback-vector.cc
index 999eaab23..6aa471268 100644
--- a/src/type-feedback-vector.cc
+++ b/src/type-feedback-vector.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
+#include "src/type-feedback-vector.h"
 
 #include "src/code-stubs.h"
 #include "src/ic/ic.h"
diff --git a/src/type-info.cc b/src/type-info.cc
index 1dbe21c9f..bffeccfbc 100644
--- a/src/type-info.cc
+++ b/src/type-info.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
+#include "src/type-info.h"
 
 #include "src/ast.h"
 #include "src/code-stubs.h"
 #include "src/compiler.h"
 #include "src/ic/ic.h"
 #include "src/ic/stub-cache.h"
-#include "src/type-info.h"
+#include "src/objects-inl.h"
 
 namespace v8 {
 namespace internal {
diff --git a/src/type-info.h b/src/type-info.h
index 965fca301..7143458a3 100644
--- a/src/type-info.h
+++ b/src/type-info.h
@@ -6,7 +6,9 @@
 #define V8_TYPE_INFO_H_
 
 #include "src/allocation.h"
+#include "src/contexts.h"
 #include "src/globals.h"
+#include "src/token.h"
 #include "src/types.h"
 #include "src/zone.h"
 
diff --git a/src/v8threads.cc b/src/v8threads.cc
index 45c1c8a25..b533a906b 100644
--- a/src/v8threads.cc
+++ b/src/v8threads.cc
@@ -2,14 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "src/v8.h"
+#include "src/v8threads.h"
 
 #include "src/api.h"
 #include "src/bootstrapper.h"
 #include "src/debug/debug.h"
 #include "src/execution.h"
 #include "src/regexp/regexp-stack.h"
-#include "src/v8threads.h"
 
 namespace v8 {
 
diff --git a/src/v8threads.h b/src/v8threads.h
index c3ba51737..3e189d5cb 100644
--- a/src/v8threads.h
+++ b/src/v8threads.h
@@ -5,6 +5,8 @@
 #ifndef V8_V8THREADS_H_
 #define V8_V8THREADS_H_
 
+#include "src/isolate.h"
+
 namespace v8 {
 namespace internal {
 
diff --git a/src/version.cc b/src/version.cc
index eae80c85c..7305bf257 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "include/v8-version.h"
-#include "src/v8.h"
 #include "src/version.h"
 
+#include "include/v8-version.h"
+#include "src/utils.h"
+
 // Define SONAME to have the build system put a specific SONAME into the
 // shared library instead the generic SONAME generated from the V8 version
 // number. This define is mainly used by the build system script.
diff --git a/src/version.h b/src/version.h
index dbcec1b27..2596beeb8 100644
--- a/src/version.h
+++ b/src/version.h
@@ -6,6 +6,7 @@
 #define V8_VERSION_H_
 
 #include "src/base/functional.h"
+#include "src/vector.h"
 
 namespace v8 {
 namespace internal {
diff --git a/test/cctest/cctest.h b/test/cctest/cctest.h
index 5c1919520..0136db60f 100644
--- a/test/cctest/cctest.h
+++ b/test/cctest/cctest.h
@@ -29,6 +29,7 @@
 #define CCTEST_H_
 
 #include "include/libplatform/libplatform.h"
+#include "src/objects-inl.h"  // TODO(everyone): Make cctest IWYU.
 #include "src/v8.h"
 
 #ifndef TEST
diff --git a/test/cctest/gay-fixed.h b/test/cctest/gay-fixed.h
index f5c31edf6..c14c11f05 100644
--- a/test/cctest/gay-fixed.h
+++ b/test/cctest/gay-fixed.h
@@ -28,6 +28,8 @@
 #ifndef GAY_FIXED_H_
 #define GAY_FIXED_H_
 
+#include "src/vector.h"
+
 namespace v8 {
 namespace internal {
 
diff --git a/test/cctest/gay-precision.h b/test/cctest/gay-precision.h
index 10dd58b3c..08aaa1d3d 100644
--- a/test/cctest/gay-precision.h
+++ b/test/cctest/gay-precision.h
@@ -28,6 +28,8 @@
 #ifndef GAY_PRECISION_H_
 #define GAY_PRECISION_H_
 
+#include "src/vector.h"
+
 namespace v8 {
 namespace internal {
 
diff --git a/test/cctest/gay-shortest.h b/test/cctest/gay-shortest.h
index 9b512148e..4efe76ba0 100644
--- a/test/cctest/gay-shortest.h
+++ b/test/cctest/gay-shortest.h
@@ -28,6 +28,8 @@
 #ifndef GAY_SHORTEST_H_
 #define GAY_SHORTEST_H_
 
+#include "src/vector.h"
+
 namespace v8 {
 namespace internal {
 
diff --git a/test/cctest/trace-extension.h b/test/cctest/trace-extension.h
index 919eda5bb..186cc6e74 100644
--- a/test/cctest/trace-extension.h
+++ b/test/cctest/trace-extension.h
@@ -33,6 +33,8 @@
 namespace v8 {
 namespace internal {
 
+struct TickSample;
+
 class TraceExtension : public v8::Extension {
  public:
   TraceExtension() : v8::Extension("v8/trace", kSource) { }