Remove some unused includes

Bug: v8:13006 Change-Id: Iee530e965786583330ff5e00ccfe58358a813f76 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3879500 Reviewed-by: Toon Verwaest <verwaest@chromium.org> Commit-Queue: Manos Koukoutos <manoskouk@chromium.org> Cr-Commit-Position: refs/heads/main@{#83332}
2022-09-20 14:17:53 +02:00 · 2022-09-20 14:17:53 +02:00 · 0cb7542904
commit 0cb7542904
parent f938b792ab
53 changed files with 30 additions and 138 deletions
--- a/src/baseline/baseline-batch-compiler.cc
+++ b/src/baseline/baseline-batch-compiler.cc
@ -12,12 +12,11 @@
 #include <algorithm>

 #include "src/baseline/baseline-compiler.h"
+#include "src/baseline/baseline.h"
 #include "src/codegen/compiler.h"
 #include "src/execution/isolate.h"
 #include "src/handles/global-handles-inl.h"
-#include "src/heap/factory-inl.h"
 #include "src/heap/heap-inl.h"
-#include "src/heap/local-heap-inl.h"
 #include "src/heap/parked-scope.h"
 #include "src/objects/fixed-array-inl.h"
 #include "src/objects/js-function-inl.h"
--- a/src/codegen/x64/assembler-x64-inl.h
+++ b/src/codegen/x64/assembler-x64-inl.h
@ -5,11 +5,9 @@
 #ifndef V8_CODEGEN_X64_ASSEMBLER_X64_INL_H_
 #define V8_CODEGEN_X64_ASSEMBLER_X64_INL_H_

-#include "src/base/cpu.h"
 #include "src/base/memory.h"
 #include "src/codegen/flush-instruction-cache.h"
 #include "src/codegen/x64/assembler-x64.h"
-#include "src/debug/debug.h"
 #include "src/objects/objects-inl.h"

 namespace v8 {
--- a/src/codegen/x64/assembler-x64.cc
+++ b/src/codegen/x64/assembler-x64.cc
@ -18,8 +18,6 @@
 #include "src/base/bits.h"
 #include "src/base/cpu.h"
 #include "src/codegen/assembler-inl.h"
-#include "src/codegen/macro-assembler.h"
-#include "src/deoptimizer/deoptimizer.h"
 #include "src/flags/flags.h"
 #include "src/init/v8.h"

--- a/src/codegen/x64/assembler-x64.h
+++ b/src/codegen/x64/assembler-x64.h
@ -46,7 +46,6 @@
 #include "src/codegen/assembler.h"
 #include "src/codegen/cpu-features.h"
 #include "src/codegen/label.h"
-#include "src/codegen/x64/constants-x64.h"
 #include "src/codegen/x64/fma-instr.h"
 #include "src/codegen/x64/register-x64.h"
 #include "src/codegen/x64/sse-instr.h"
--- a/src/codegen/x64/macro-assembler-x64.cc
+++ b/src/codegen/x64/macro-assembler-x64.cc
@ -7,28 +7,20 @@
 #if V8_TARGET_ARCH_X64

 #include "src/base/bits.h"
-#include "src/base/division-by-constant.h"
-#include "src/base/utils/random-number-generator.h"
-#include "src/codegen/callable.h"
 #include "src/codegen/code-factory.h"
 #include "src/codegen/cpu-features.h"
-#include "src/codegen/external-reference-table.h"
 #include "src/codegen/interface-descriptors-inl.h"
 #include "src/codegen/macro-assembler.h"
 #include "src/codegen/register-configuration.h"
 #include "src/codegen/x64/assembler-x64.h"
 #include "src/codegen/x64/register-x64.h"
 #include "src/common/globals.h"
-#include "src/debug/debug.h"
 #include "src/deoptimizer/deoptimizer.h"
 #include "src/execution/frames-inl.h"
 #include "src/heap/memory-chunk.h"
-#include "src/init/bootstrapper.h"
 #include "src/logging/counters.h"
 #include "src/objects/objects-inl.h"
 #include "src/objects/smi.h"
-#include "src/sandbox/external-pointer.h"
-#include "src/snapshot/snapshot.h"

 // Satisfy cpplint check, but don't include platform-specific header. It is
 // included recursively via macro-assembler.h.
--- a/src/codegen/x64/macro-assembler-x64.h
+++ b/src/codegen/x64/macro-assembler-x64.h
@ -9,7 +9,6 @@
 #ifndef V8_CODEGEN_X64_MACRO_ASSEMBLER_X64_H_
 #define V8_CODEGEN_X64_MACRO_ASSEMBLER_X64_H_

-#include "src/base/flags.h"
 #include "src/codegen/bailout-reason.h"
 #include "src/codegen/shared-ia32-x64/macro-assembler-shared-ia32-x64.h"
 #include "src/codegen/x64/assembler-x64.h"
--- a/src/heap/allocation-result.h
+++ b/src/heap/allocation-result.h
@ -8,7 +8,6 @@
 #include "src/common/globals.h"
 #include "src/objects/heap-object.h"
 #include "src/objects/objects.h"
-#include "src/objects/smi.h"

 namespace v8 {
 namespace internal {
--- a/src/heap/array-buffer-sweeper.h
+++ b/src/heap/array-buffer-sweeper.h
@ -7,10 +7,9 @@

 #include <memory>

-#include "src/base/logging.h"
+#include "src/base/platform/condition-variable.h"
 #include "src/base/platform/mutex.h"
 #include "src/objects/js-array-buffer.h"
-#include "src/tasks/cancelable-task.h"

 namespace v8 {
 namespace internal {
--- a/src/heap/base-space.h
+++ b/src/heap/base-space.h
@ -9,7 +9,6 @@

 #include "src/base/macros.h"
 #include "src/common/globals.h"
-#include "src/logging/log.h"
 #include "src/utils/allocation.h"

 namespace v8 {
--- a/src/heap/basic-memory-chunk.cc
+++ b/src/heap/basic-memory-chunk.cc
@ -8,7 +8,6 @@

 #include "src/heap/heap-write-barrier-inl.h"
 #include "src/heap/incremental-marking.h"
-#include "src/objects/heap-object.h"
 #include "src/utils/allocation.h"

 namespace v8 {
--- a/src/heap/basic-memory-chunk.h
+++ b/src/heap/basic-memory-chunk.h
@ -8,7 +8,6 @@
 #include <type_traits>
 #include <unordered_map>

-#include "src/base/atomic-utils.h"
 #include "src/base/flags.h"
 #include "src/common/globals.h"
 #include "src/flags/flags.h"
--- a/src/heap/code-stats.cc
+++ b/src/heap/code-stats.cc
@ -5,8 +5,6 @@
 #include "src/heap/code-stats.h"

 #include "src/codegen/code-comments.h"
-#include "src/codegen/reloc-info.h"
-#include "src/heap/heap-inl.h"
 #include "src/heap/large-spaces.h"
 #include "src/heap/paged-spaces-inl.h"  // For PagedSpaceObjectIterator.
 #include "src/objects/objects-inl.h"
--- a/src/heap/collection-barrier.cc
+++ b/src/heap/collection-barrier.cc
@ -6,11 +6,8 @@

 #include "src/base/platform/mutex.h"
 #include "src/base/platform/time.h"
-#include "src/common/globals.h"
 #include "src/execution/isolate.h"
-#include "src/handles/handles.h"
 #include "src/heap/heap-inl.h"
-#include "src/heap/heap.h"
 #include "src/heap/local-heap.h"
 #include "src/heap/parked-scope.h"

--- a/src/heap/collection-barrier.h
+++ b/src/heap/collection-barrier.h
@ -7,12 +7,10 @@

 #include <atomic>

-#include "src/base/optional.h"
 #include "src/base/platform/condition-variable.h"
 #include "src/base/platform/elapsed-timer.h"
 #include "src/base/platform/mutex.h"
 #include "src/heap/local-heap.h"
-#include "src/logging/counters.h"

 namespace v8 {
 namespace internal {
--- a/src/heap/combined-heap.h
+++ b/src/heap/combined-heap.h
@ -9,7 +9,6 @@
 #include "src/heap/read-only-heap.h"
 #include "src/heap/safepoint.h"
 #include "src/heap/third-party/heap-api.h"
-#include "src/objects/objects.h"

 namespace v8 {
 namespace internal {
--- a/src/heap/concurrent-allocator-inl.h
+++ b/src/heap/concurrent-allocator-inl.h
@ -5,16 +5,12 @@
 #ifndef V8_HEAP_CONCURRENT_ALLOCATOR_INL_H_
 #define V8_HEAP_CONCURRENT_ALLOCATOR_INL_H_

-#include "include/v8-internal.h"
 #include "src/common/globals.h"
 #include "src/heap/allocation-result.h"
 #include "src/heap/concurrent-allocator.h"
-#include "src/heap/heap.h"
-#include "src/heap/incremental-marking.h"
 #include "src/heap/local-heap.h"
 #include "src/heap/spaces-inl.h"
 #include "src/heap/spaces.h"
-#include "src/objects/heap-object.h"

 namespace v8 {
 namespace internal {
--- a/src/heap/concurrent-allocator.cc
+++ b/src/heap/concurrent-allocator.cc
@ -11,7 +11,6 @@
 #include "src/heap/heap.h"
 #include "src/heap/local-heap-inl.h"
 #include "src/heap/local-heap.h"
-#include "src/heap/marking.h"
 #include "src/heap/memory-chunk.h"
 #include "src/heap/parked-scope.h"

--- a/src/heap/concurrent-marking.cc
+++ b/src/heap/concurrent-marking.cc
@ -15,26 +15,16 @@
 #include "src/heap/heap-inl.h"
 #include "src/heap/heap.h"
 #include "src/heap/mark-compact-inl.h"
-#include "src/heap/mark-compact.h"
 #include "src/heap/marking-visitor-inl.h"
-#include "src/heap/marking-visitor.h"
 #include "src/heap/marking.h"
 #include "src/heap/memory-chunk.h"
 #include "src/heap/memory-measurement-inl.h"
-#include "src/heap/memory-measurement.h"
-#include "src/heap/objects-visiting-inl.h"
 #include "src/heap/objects-visiting.h"
 #include "src/heap/weak-object-worklists.h"
 #include "src/init/v8.h"
-#include "src/objects/data-handler-inl.h"
-#include "src/objects/embedder-data-array-inl.h"
-#include "src/objects/hash-table-inl.h"
 #include "src/objects/js-array-buffer-inl.h"
-#include "src/objects/slots-inl.h"
-#include "src/objects/transitions-inl.h"
 #include "src/objects/visitors.h"
 #include "src/utils/utils-inl.h"
-#include "src/utils/utils.h"

 namespace v8 {
 namespace internal {
--- a/src/heap/concurrent-marking.h
+++ b/src/heap/concurrent-marking.h
@ -8,19 +8,11 @@
 #include <memory>

 #include "include/v8-platform.h"
-#include "src/base/atomic-utils.h"
 #include "src/base/optional.h"
-#include "src/base/platform/condition-variable.h"
-#include "src/base/platform/mutex.h"
-#include "src/heap/marking-visitor.h"
 #include "src/heap/marking-worklist.h"
+#include "src/heap/memory-chunk.h"
 #include "src/heap/memory-measurement.h"
 #include "src/heap/slot-set.h"
-#include "src/heap/spaces.h"
-#include "src/init/v8.h"
-#include "src/tasks/cancelable-task.h"
-#include "src/utils/allocation.h"
-#include "src/utils/utils.h"

 namespace v8 {
 namespace internal {
--- a/src/heap/embedder-tracing.h
+++ b/src/heap/embedder-tracing.h
@ -10,7 +10,6 @@
 #include "include/v8-cppgc.h"
 #include "include/v8-embedder-heap.h"
 #include "include/v8-traced-handle.h"
-#include "src/common/globals.h"
 #include "src/execution/isolate.h"
 #include "src/flags/flags.h"
 #include "src/heap/cppgc-js/cpp-heap.h"
--- a/src/heap/factory-base-inl.h
+++ b/src/heap/factory-base-inl.h
@ -11,6 +11,7 @@
 #include "src/objects/map.h"
 #include "src/objects/slots-inl.h"
 #include "src/objects/smi.h"
+#include "src/objects/template-objects-inl.h"
 #include "src/roots/roots.h"

 namespace v8 {
--- a/src/heap/factory-base.cc
+++ b/src/heap/factory-base.cc
@ -7,7 +7,6 @@
 #include "src/ast/ast-source-ranges.h"
 #include "src/ast/ast.h"
 #include "src/common/assert-scope.h"
-#include "src/execution/local-isolate.h"
 #include "src/handles/handles-inl.h"
 #include "src/heap/factory.h"
 #include "src/heap/heap-inl.h"
@ -18,7 +17,6 @@
 #include "src/logging/log.h"
 #include "src/objects/instance-type.h"
 #include "src/objects/literal-objects-inl.h"
-#include "src/objects/module-inl.h"
 #include "src/objects/oddball.h"
 #include "src/objects/shared-function-info-inl.h"
 #include "src/objects/shared-function-info.h"
--- a/src/heap/factory-inl.h
+++ b/src/heap/factory-inl.h
@ -10,15 +10,11 @@
 // Clients of this interface shouldn't depend on lots of heap internals.
 // Do not include anything from src/heap here!
 #include "src/execution/isolate-inl.h"
-#include "src/handles/handles-inl.h"
 #include "src/heap/factory-base-inl.h"
 #include "src/objects/feedback-cell.h"
-#include "src/objects/heap-number-inl.h"
 #include "src/objects/objects-inl.h"
 #include "src/objects/oddball.h"
-#include "src/objects/string-inl.h"
-#include "src/objects/string-table-inl.h"
-#include "src/strings/string-hasher.h"
+#include "src/objects/string-table.h"

 namespace v8 {
 namespace internal {
--- a/src/heap/factory.cc
+++ b/src/heap/factory.cc
@ -9,7 +9,6 @@
 #include <string>
 #include <utility>  // For move

-#include "src/ast/ast-source-ranges.h"
 #include "src/base/bits.h"
 #include "src/builtins/accessors.h"
 #include "src/builtins/constants-table-builder.h"
@ -24,33 +23,26 @@
 #include "src/heap/heap-allocator-inl.h"
 #include "src/heap/heap-inl.h"
 #include "src/heap/incremental-marking.h"
+#include "src/heap/local-heap-inl.h"
 #include "src/heap/mark-compact-inl.h"
 #include "src/heap/memory-chunk.h"
 #include "src/heap/read-only-heap.h"
 #include "src/ic/handler-configuration-inl.h"
-#include "src/init/bootstrapper.h"
 #include "src/interpreter/interpreter.h"
-#include "src/logging/counters.h"
 #include "src/logging/log.h"
 #include "src/numbers/conversions.h"
-#include "src/numbers/hash-seed-inl.h"
 #include "src/objects/allocation-site-inl.h"
 #include "src/objects/allocation-site-scopes.h"
 #include "src/objects/api-callbacks.h"
-#include "src/objects/arguments-inl.h"
 #include "src/objects/bigint.h"
 #include "src/objects/call-site-info-inl.h"
-#include "src/objects/cell-inl.h"
 #include "src/objects/debug-objects-inl.h"
-#include "src/objects/embedder-data-array-inl.h"
 #include "src/objects/feedback-cell-inl.h"
 #include "src/objects/fixed-array-inl.h"
 #include "src/objects/foreign-inl.h"
 #include "src/objects/instance-type-inl.h"
 #include "src/objects/js-array-buffer-inl.h"
 #include "src/objects/js-array-inl.h"
-#include "src/objects/js-atomics-synchronization-inl.h"
-#include "src/objects/js-collection-inl.h"
 #include "src/objects/js-generator-inl.h"
 #include "src/objects/js-objects.h"
 #include "src/objects/js-regexp-inl.h"
@ -64,22 +56,16 @@
 #include "src/objects/promise-inl.h"
 #include "src/objects/property-descriptor-object-inl.h"
 #include "src/objects/scope-info.h"
-#include "src/objects/string-set-inl.h"
-#include "src/objects/struct-inl.h"
-#include "src/objects/synthetic-module-inl.h"
-#include "src/objects/template-objects-inl.h"
-#include "src/objects/transitions-inl.h"
+#include "src/objects/string-table.h"
 #include "src/roots/roots.h"
-#include "src/strings/unicode-inl.h"
+
 #if V8_ENABLE_WEBASSEMBLY
 #include "src/wasm/module-instantiate.h"
+#include "src/wasm/wasm-objects.h"
 #include "src/wasm/wasm-result.h"
 #include "src/wasm/wasm-value.h"
 #endif

-#include "src/heap/local-factory-inl.h"
-#include "src/heap/local-heap-inl.h"
-
 namespace v8 {
 namespace internal {

@ -622,7 +608,7 @@ Handle<NameDictionary> Factory::NewNameDictionary(int at_least_space_for) {
 }

 Handle<PropertyDescriptorObject> Factory::NewPropertyDescriptorObject() {
-  auto object = NewStructInternal<PropertyDescriptorObject>(
+  PropertyDescriptorObject object = NewStructInternal<PropertyDescriptorObject>(
      PROPERTY_DESCRIPTOR_OBJECT_TYPE, AllocationType::kYoung);
  DisallowGarbageCollection no_gc;
  object.set_flags(0);
--- a/src/heap/factory.h
+++ b/src/heap/factory.h
@ -9,7 +9,6 @@
 // Do not include anything from src/heap here!
 #include "src/base/strings.h"
 #include "src/base/vector.h"
-#include "src/baseline/baseline.h"
 #include "src/builtins/builtins.h"
 #include "src/common/globals.h"
 #include "src/execution/messages.h"
--- a/src/heap/finalization-registry-cleanup-task.cc
+++ b/src/heap/finalization-registry-cleanup-task.cc
@ -5,7 +5,6 @@
 #include "src/heap/finalization-registry-cleanup-task.h"

 #include "src/execution/frames.h"
-#include "src/execution/interrupts-scope.h"
 #include "src/execution/stack-guard.h"
 #include "src/execution/v8threads.h"
 #include "src/heap/heap-inl.h"
--- a/src/heap/finalization-registry-cleanup-task.h
+++ b/src/heap/finalization-registry-cleanup-task.h
@ -5,7 +5,7 @@
 #ifndef V8_HEAP_FINALIZATION_REGISTRY_CLEANUP_TASK_H_
 #define V8_HEAP_FINALIZATION_REGISTRY_CLEANUP_TASK_H_

-#include "src/objects/js-weak-refs.h"
+#include "src/heap/heap.h"
 #include "src/tasks/cancelable-task.h"

 namespace v8 {
--- a/src/heap/free-list.h
+++ b/src/heap/free-list.h
@ -9,8 +9,6 @@
 #include "src/common/globals.h"
 #include "src/heap/memory-chunk.h"
 #include "src/objects/free-space.h"
-#include "src/objects/map.h"
-#include "src/utils/utils.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"  // nogncheck

 namespace v8 {
--- a/src/heap/gc-tracer-inl.h
+++ b/src/heap/gc-tracer-inl.h
@ -5,7 +5,6 @@
 #ifndef V8_HEAP_GC_TRACER_INL_H_
 #define V8_HEAP_GC_TRACER_INL_H_

-#include "src/base/platform/platform.h"
 #include "src/execution/isolate.h"
 #include "src/heap/gc-tracer.h"
 #include "src/heap/heap-inl.h"
--- a/src/heap/gc-tracer.cc
+++ b/src/heap/gc-tracer.cc
@ -7,10 +7,8 @@
 #include <cstdarg>

 #include "include/v8-metrics.h"
-#include "src/base/atomic-utils.h"
 #include "src/base/strings.h"
 #include "src/common/globals.h"
-#include "src/execution/thread-id.h"
 #include "src/heap/cppgc-js/cpp-heap.h"
 #include "src/heap/cppgc/metric-recorder.h"
 #include "src/heap/gc-tracer-inl.h"
--- a/src/heap/heap-controller.h
+++ b/src/heap/heap-controller.h
@ -6,8 +6,8 @@
 #define V8_HEAP_HEAP_CONTROLLER_H_

 #include <cstddef>
+
 #include "src/heap/heap.h"
-#include "src/utils/allocation.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"  // nogncheck

 namespace v8 {
--- a/src/heap/heap-write-barrier-inl.h
+++ b/src/heap/heap-write-barrier-inl.h
@ -8,16 +8,16 @@
 // Clients of this interface shouldn't depend on lots of heap internals.
 // Do not include anything from src/heap here!

-#include "src/common/code-memory-access-inl.h"
 #include "src/common/globals.h"
 #include "src/heap/heap-write-barrier.h"
 #include "src/heap/marking-barrier.h"
+#include "src/heap/read-only-heap.h"
 #include "src/objects/code.h"
-#include "src/objects/compressed-slots-inl.h"
-#include "src/objects/fixed-array.h"
+#include "src/objects/descriptor-array.h"
 #include "src/objects/heap-object.h"
-#include "src/objects/maybe-object-inl.h"
-#include "src/objects/slots-inl.h"
+#include "src/objects/js-array-buffer.h"
+#include "src/objects/maybe-object.h"
+#include "src/objects/tagged-impl-inl.h"

 namespace v8 {
 namespace internal {
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@ -30,7 +30,6 @@
 #include "src/debug/debug.h"
 #include "src/deoptimizer/deoptimizer.h"
 #include "src/execution/embedder-state.h"
-#include "src/execution/isolate-utils-inl.h"
 #include "src/execution/microtask-queue.h"
 #include "src/execution/v8threads.h"
 #include "src/execution/vm-state-inl.h"
@ -55,7 +54,6 @@
 #include "src/heap/heap-controller.h"
 #include "src/heap/heap-layout-tracer.h"
 #include "src/heap/heap-write-barrier-inl.h"
-#include "src/heap/incremental-marking-inl.h"
 #include "src/heap/incremental-marking.h"
 #include "src/heap/large-spaces.h"
 #include "src/heap/local-heap.h"
@ -69,45 +67,34 @@
 #include "src/heap/memory-reducer.h"
 #include "src/heap/new-spaces.h"
 #include "src/heap/object-stats.h"
-#include "src/heap/objects-visiting-inl.h"
 #include "src/heap/objects-visiting.h"
 #include "src/heap/paged-spaces-inl.h"
-#include "src/heap/parked-scope.h"
 #include "src/heap/read-only-heap.h"
 #include "src/heap/remembered-set.h"
 #include "src/heap/safepoint.h"
 #include "src/heap/scavenge-job.h"
-#include "src/heap/scavenger-inl.h"
+#include "src/heap/scavenger.h"
 #include "src/heap/stress-marking-observer.h"
 #include "src/heap/stress-scavenge-observer.h"
-#include "src/heap/sweeper.h"
 #include "src/init/bootstrapper.h"
 #include "src/init/v8.h"
-#include "src/interpreter/interpreter.h"
+#include "src/logging/counters-scopes.h"
 #include "src/logging/log.h"
 #include "src/logging/runtime-call-stats-scope.h"
 #include "src/numbers/conversions.h"
-#include "src/objects/data-handler.h"
-#include "src/objects/feedback-vector.h"
 #include "src/objects/free-space-inl.h"
 #include "src/objects/hash-table-inl.h"
 #include "src/objects/hash-table.h"
 #include "src/objects/instance-type.h"
 #include "src/objects/maybe-object.h"
 #include "src/objects/objects.h"
-#include "src/objects/shared-function-info.h"
 #include "src/objects/slots-atomic-inl.h"
 #include "src/objects/slots-inl.h"
 #include "src/objects/visitors.h"
 #include "src/regexp/regexp.h"
 #include "src/snapshot/embedded/embedded-data.h"
 #include "src/snapshot/serializer-deserializer.h"
-#include "src/snapshot/snapshot.h"
-#include "src/strings/string-stream.h"
-#include "src/strings/unicode-decoder.h"
-#include "src/strings/unicode-inl.h"
 #include "src/tracing/trace-event.h"
-#include "src/utils/utils-inl.h"
 #include "src/utils/utils.h"
 // Has to be the last include (doesn't have include guards):
 #include "src/objects/object-macros.h"
--- a/src/heap/heap.h
+++ b/src/heap/heap.h
@ -18,9 +18,7 @@
 #include "include/v8-embedder-heap.h"
 #include "include/v8-internal.h"
 #include "include/v8-isolate.h"
-#include "src/base/atomic-utils.h"
 #include "src/base/enum-set.h"
-#include "src/base/platform/condition-variable.h"
 #include "src/base/platform/mutex.h"
 #include "src/builtins/accessors.h"
 #include "src/common/assert-scope.h"
@ -31,7 +29,6 @@
 #include "src/heap/base/stack.h"
 #include "src/heap/gc-callbacks.h"
 #include "src/heap/heap-allocator.h"
-#include "src/init/heap-symbols.h"
 #include "src/objects/allocation-site.h"
 #include "src/objects/fixed-array.h"
 #include "src/objects/hash-table.h"
--- a/src/heap/incremental-marking-job.h
+++ b/src/heap/incremental-marking-job.h
@ -5,7 +5,8 @@
 #ifndef V8_HEAP_INCREMENTAL_MARKING_JOB_H_
 #define V8_HEAP_INCREMENTAL_MARKING_JOB_H_

-#include "src/tasks/cancelable-task.h"
+#include "src/base/compiler-specific.h"
+#include "src/base/platform/mutex.h"

 namespace v8 {
 namespace internal {
--- a/src/heap/incremental-marking.cc
+++ b/src/heap/incremental-marking.cc
@ -33,10 +33,8 @@
 #include "src/objects/embedder-data-array-inl.h"
 #include "src/objects/hash-table-inl.h"
 #include "src/objects/slots-inl.h"
-#include "src/objects/transitions-inl.h"
 #include "src/objects/visitors.h"
 #include "src/tracing/trace-event.h"
-#include "src/utils/utils.h"

 namespace v8 {
 namespace internal {
--- a/src/heap/incremental-marking.h
+++ b/src/heap/incremental-marking.h
@ -11,7 +11,6 @@
 #include "src/heap/heap.h"
 #include "src/heap/incremental-marking-job.h"
 #include "src/heap/mark-compact.h"
-#include "src/tasks/cancelable-task.h"

 namespace v8 {
 namespace internal {
--- a/src/heap/invalidated-slots-inl.h
+++ b/src/heap/invalidated-slots-inl.h
@ -7,10 +7,8 @@

 #include "src/base/logging.h"
 #include "src/heap/invalidated-slots.h"
-#include "src/heap/spaces.h"
 #include "src/objects/heap-object.h"
 #include "src/objects/objects-inl.h"
-#include "src/utils/allocation.h"

 namespace v8 {
 namespace internal {
--- a/src/heap/invalidated-slots.cc
+++ b/src/heap/invalidated-slots.cc
@ -7,8 +7,6 @@
 #include "src/base/logging.h"
 #include "src/heap/invalidated-slots-inl.h"
 #include "src/heap/memory-chunk.h"
-#include "src/heap/spaces.h"
-#include "src/objects/objects-inl.h"

 namespace v8 {
 namespace internal {
--- a/src/heap/invalidated-slots.h
+++ b/src/heap/invalidated-slots.h
@ -8,11 +8,8 @@
 #include <set>
 #include <stack>

-#include "src/base/atomic-utils.h"
 #include "src/heap/memory-chunk-layout.h"
 #include "src/objects/heap-object.h"
-#include "src/utils/allocation.h"
-#include "src/utils/utils.h"

 namespace v8 {
 namespace internal {
--- a/src/heap/large-spaces.cc
+++ b/src/heap/large-spaces.cc
@ -11,7 +11,6 @@
 #include "src/heap/combined-heap.h"
 #include "src/heap/incremental-marking.h"
 #include "src/heap/list.h"
-#include "src/heap/marking.h"
 #include "src/heap/memory-allocator.h"
 #include "src/heap/memory-chunk-inl.h"
 #include "src/heap/remembered-set.h"
--- a/src/heap/marking-visitor.h
+++ b/src/heap/marking-visitor.h
@ -6,11 +6,11 @@
 #define V8_HEAP_MARKING_VISITOR_H_

 #include "src/common/globals.h"
+#include "src/execution/isolate.h"
 #include "src/heap/marking-worklist.h"
 #include "src/heap/marking.h"
 #include "src/heap/memory-chunk.h"
 #include "src/heap/objects-visiting.h"
-#include "src/heap/spaces.h"
 #include "src/heap/weak-object-worklists.h"

 namespace v8 {
--- a/src/heap/paged-spaces.h
+++ b/src/heap/paged-spaces.h
@ -21,6 +21,7 @@
 #include "src/heap/memory-chunk-layout.h"
 #include "src/heap/memory-chunk.h"
 #include "src/heap/spaces.h"
+#include "src/objects/map.h"

 namespace v8 {
 namespace internal {
--- a/src/logging/log-file.cc
+++ b/src/logging/log-file.cc
@ -14,6 +14,7 @@
 #include "src/common/assert-scope.h"
 #include "src/common/globals.h"
 #include "src/execution/isolate-utils.h"
+#include "src/logging/log.h"
 #include "src/objects/objects-inl.h"
 #include "src/objects/string-inl.h"
 #include "src/strings/string-stream.h"
--- a/src/numbers/conversions-inl.h
+++ b/src/numbers/conversions-inl.h
@ -14,12 +14,9 @@
 // ----------------------------------------------------------------------------
 // Extra POSIX/ANSI functions for Win32/MSVC.

-#include "src/base/bits.h"
 #include "src/base/numbers/double.h"
-#include "src/base/platform/platform.h"
 #include "src/numbers/conversions.h"
 #include "src/objects/heap-number-inl.h"
-#include "src/objects/objects-inl.h"

 namespace v8 {
 namespace internal {
--- a/src/numbers/conversions.cc
+++ b/src/numbers/conversions.cc
@ -15,9 +15,7 @@
 #include "src/bigint/bigint.h"
 #include "src/common/assert-scope.h"
 #include "src/handles/handles.h"
-#include "src/heap/factory.h"
 #include "src/objects/bigint.h"
-#include "src/objects/objects-inl.h"
 #include "src/objects/string-inl.h"
 #include "src/strings/char-predicates-inl.h"
 #include "src/utils/allocation.h"
--- a/src/objects/embedder-data-slot-inl.h
+++ b/src/objects/embedder-data-slot-inl.h
@ -8,6 +8,7 @@
 #include "src/base/memory.h"
 #include "src/common/globals.h"
 #include "src/heap/heap-write-barrier-inl.h"
+#include "src/objects/compressed-slots-inl.h"
 #include "src/objects/embedder-data-array.h"
 #include "src/objects/embedder-data-slot.h"
 #include "src/objects/js-objects-inl.h"
--- a/src/objects/js-function.cc
+++ b/src/objects/js-function.cc
@ -5,6 +5,7 @@
 #include "src/objects/js-function.h"

 #include "src/baseline/baseline-batch-compiler.h"
+#include "src/baseline/baseline.h"
 #include "src/codegen/compiler.h"
 #include "src/diagnostics/code-tracer.h"
 #include "src/execution/isolate.h"
--- a/src/objects/swiss-name-dictionary-inl.h
+++ b/src/objects/swiss-name-dictionary-inl.h
@ -15,6 +15,7 @@
 #include "src/objects/instance-type-inl.h"
 #include "src/objects/js-collection-iterator.h"
 #include "src/objects/objects-inl.h"
+#include "src/objects/slots-inl.h"
 #include "src/objects/smi.h"
 #include "src/objects/swiss-name-dictionary.h"

--- a/src/snapshot/code-serializer.cc
+++ b/src/snapshot/code-serializer.cc
@ -10,6 +10,7 @@
 #include "src/base/platform/elapsed-timer.h"
 #include "src/base/platform/platform.h"
 #include "src/baseline/baseline-batch-compiler.h"
+#include "src/baseline/baseline.h"
 #include "src/codegen/background-merge-task.h"
 #include "src/common/globals.h"
 #include "src/handles/maybe-handles.h"
--- a/src/snapshot/startup-deserializer.cc
+++ b/src/snapshot/startup-deserializer.cc
@ -9,6 +9,7 @@
 #include "src/execution/v8threads.h"
 #include "src/handles/handles-inl.h"
 #include "src/heap/paged-spaces-inl.h"
+#include "src/logging/log.h"
 #include "src/objects/oddball.h"
 #include "src/roots/roots-inl.h"

--- a/src/wasm/baseline/liftoff-compiler.cc
+++ b/src/wasm/baseline/liftoff-compiler.cc
@ -5,8 +5,6 @@
 #include "src/wasm/baseline/liftoff-compiler.h"

 #include "src/base/enum-set.h"
-#include "src/base/optional.h"
-#include "src/codegen/assembler-inl.h"
 // TODO(clemensb): Remove dependences on compiler stuff.
 #include "src/codegen/external-reference.h"
 #include "src/codegen/interface-descriptors-inl.h"
@ -15,7 +13,6 @@
 #include "src/compiler/linkage.h"
 #include "src/compiler/wasm-compiler.h"
 #include "src/logging/counters.h"
-#include "src/logging/log.h"
 #include "src/objects/smi.h"
 #include "src/tracing/trace-event.h"
 #include "src/utils/ostreams.h"
--- a/test/cctest/wasm/test-wasm-breakpoints.cc
+++ b/test/cctest/wasm/test-wasm-breakpoints.cc
@ -4,15 +4,12 @@

 #include "src/codegen/assembler-inl.h"
 #include "src/debug/debug-interface.h"
+#include "src/debug/debug.h"
 #include "src/execution/frames-inl.h"
-#include "src/objects/property-descriptor.h"
-#include "src/utils/utils.h"
 #include "src/wasm/wasm-debug.h"
 #include "src/wasm/wasm-objects-inl.h"
 #include "test/cctest/cctest.h"
 #include "test/cctest/wasm/wasm-run-utils.h"
-#include "test/common/value-helper.h"
-#include "test/common/wasm/test-signatures.h"
 #include "test/common/wasm/wasm-macro-gen.h"

 namespace v8 {