[test] Remove some unused includes (2)

Mostly test/fuzzer, test/inspector, test/unittests. Bug: v8:13006 Change-Id: I825efa5d72a224bb3cb9f86a9fac8763e9dbd1cf Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3769696 Reviewed-by: Jakob Kummerow <jkummerow@chromium.org> Commit-Queue: Manos Koukoutos <manoskouk@chromium.org> Cr-Commit-Position: refs/heads/main@{#81799}
2022-07-18 13:30:02 +00:00 · 2022-07-18 13:30:02 +00:00 · 2a0584bfe8
commit 2a0584bfe8
parent 5f1b06e366
68 changed files with 48 additions and 159 deletions
--- a/test/fuzzer/inspector-fuzzer.cc
+++ b/test/fuzzer/inspector-fuzzer.cc
@ -11,7 +11,6 @@
 #include <string>
 #include <vector>

-#include "include/libplatform/libplatform.h"
 #include "include/v8-isolate.h"
 #include "include/v8-local-handle.h"
 #include "include/v8-object.h"
@ -21,10 +20,6 @@
 #include "src/base/platform/time.h"
 #include "src/base/small-vector.h"
 #include "src/base/vector.h"
-#include "src/flags/flags.h"
-#include "src/heap/read-only-heap.h"
-#include "src/libplatform/default-platform.h"
-#include "src/utils/utils.h"
 #include "test/inspector/frontend-channel.h"
 #include "test/inspector/isolate-data.h"
 #include "test/inspector/task-runner.h"
--- a/test/fuzzer/multi-return.cc
+++ b/test/fuzzer/multi-return.cc
@ -16,8 +16,6 @@
 #include "src/compiler/raw-machine-assembler.h"
 #include "src/compiler/wasm-compiler.h"
 #include "src/execution/simulator.h"
-#include "src/objects/objects-inl.h"
-#include "src/objects/objects.h"
 #include "src/wasm/wasm-engine.h"
 #include "src/wasm/wasm-features.h"
 #include "src/wasm/wasm-limits.h"
--- a/test/fuzzer/parser.cc
+++ b/test/fuzzer/parser.cc
@ -13,11 +13,9 @@
 #include "include/v8-exception.h"
 #include "include/v8-isolate.h"
 #include "include/v8-local-handle.h"
-#include "src/objects/objects-inl.h"
-#include "src/objects/objects.h"
+#include "src/execution/isolate.h"
 #include "src/parsing/parse-info.h"
 #include "src/parsing/parsing.h"
-#include "src/parsing/preparser.h"
 #include "test/fuzzer/fuzzer-support.h"

 bool IsValidInput(const uint8_t* data, size_t size) {
--- a/test/fuzzer/regexp-builtins.cc
+++ b/test/fuzzer/regexp-builtins.cc
@ -14,9 +14,7 @@
 #include "include/v8-local-handle.h"
 #include "include/v8-primitive.h"
 #include "include/v8-script.h"
-#include "src/heap/factory.h"
 #include "src/objects/objects-inl.h"
-#include "src/regexp/regexp.h"
 #include "test/fuzzer/fuzzer-support.h"

 // This is a hexdump of test/fuzzer/regexp_builtins/mjsunit.js generated using
--- a/test/fuzzer/regexp.cc
+++ b/test/fuzzer/regexp.cc
@ -13,8 +13,8 @@
 #include "include/v8-isolate.h"
 #include "include/v8-local-handle.h"
 #include "src/base/strings.h"
+#include "src/execution/isolate-inl.h"
 #include "src/heap/factory.h"
-#include "src/objects/objects-inl.h"
 #include "test/fuzzer/fuzzer-support.h"

 namespace i = v8::internal;
--- a/test/fuzzer/wasm-async.cc
+++ b/test/fuzzer/wasm-async.cc
@ -10,13 +10,9 @@
 #include "include/v8-exception.h"
 #include "include/v8-isolate.h"
 #include "include/v8-local-handle.h"
-#include "src/api/api.h"
 #include "src/execution/isolate-inl.h"
-#include "src/heap/factory.h"
-#include "src/objects/objects-inl.h"
 #include "src/wasm/wasm-engine.h"
 #include "src/wasm/wasm-module.h"
-#include "test/common/wasm/flag-utils.h"
 #include "test/common/wasm/wasm-module-runner.h"
 #include "test/fuzzer/fuzzer-support.h"
 #include "test/fuzzer/wasm-fuzzer-common.h"
--- a/test/fuzzer/wasm-code.cc
+++ b/test/fuzzer/wasm-code.cc
@ -6,8 +6,6 @@
 #include <stdint.h>

 #include "src/execution/isolate.h"
-#include "src/objects/objects-inl.h"
-#include "src/objects/objects.h"
 #include "src/wasm/wasm-module-builder.h"
 #include "test/common/wasm/test-signatures.h"
 #include "test/fuzzer/wasm-fuzzer-common.h"
--- a/test/fuzzer/wasm-compile.cc
+++ b/test/fuzzer/wasm-compile.cc
@ -9,18 +9,14 @@
 #include <algorithm>

 #include "src/base/macros.h"
+#include "src/base/v8-fallthrough.h"
 #include "src/execution/isolate.h"
-#include "src/objects/objects-inl.h"
-#include "src/objects/objects.h"
-#include "src/utils/ostreams.h"
 #include "src/wasm/function-body-decoder.h"
 #include "src/wasm/wasm-module-builder.h"
 #include "src/wasm/wasm-module.h"
 #include "src/wasm/wasm-opcodes-inl.h"
 #include "test/common/wasm/flag-utils.h"
 #include "test/common/wasm/test-signatures.h"
-#include "test/common/wasm/wasm-module-runner.h"
-#include "test/fuzzer/fuzzer-support.h"
 #include "test/fuzzer/wasm-fuzzer-common.h"

 namespace v8 {
--- a/test/fuzzer/wasm-fuzzer-common.h
+++ b/test/fuzzer/wasm-fuzzer-common.h
@ -12,7 +12,6 @@

 #include "src/wasm/module-decoder.h"
 #include "src/wasm/wasm-module-builder.h"
-#include "test/common/wasm/wasm-interpreter.h"

 namespace v8 {
 namespace internal {
--- a/test/fuzzer/wasm-streaming.cc
+++ b/test/fuzzer/wasm-streaming.cc
@ -8,7 +8,6 @@
 #include "include/v8-isolate.h"
 #include "src/api/api-inl.h"
 #include "src/flags/flags.h"
-#include "src/libplatform/default-platform.h"
 #include "src/wasm/streaming-decoder.h"
 #include "src/wasm/wasm-engine.h"
 #include "src/wasm/wasm-objects-inl.h"
--- a/test/fuzzer/wasm.cc
+++ b/test/fuzzer/wasm.cc
@ -12,12 +12,9 @@
 #include "include/v8-isolate.h"
 #include "include/v8-local-handle.h"
 #include "src/execution/isolate-inl.h"
-#include "src/heap/factory.h"
-#include "src/objects/objects-inl.h"
 #include "src/wasm/wasm-engine.h"
 #include "src/wasm/wasm-feature-flags.h"
 #include "src/wasm/wasm-module.h"
-#include "test/common/wasm/flag-utils.h"
 #include "test/common/wasm/wasm-module-runner.h"
 #include "test/fuzzer/fuzzer-support.h"
 #include "test/fuzzer/wasm-fuzzer-common.h"
--- a/test/inspector/DEPS
+++ b/test/inspector/DEPS
@ -4,5 +4,7 @@ include_rules = [
  "+src/flags/flags.h",
  "+src/heap/read-only-heap.h",
  "+src/inspector/test-interface.h",
+  "+src/init/v8.h",
+  "+src/libplatform/default-platform.h",
  "+src/utils",
 ]
--- a/test/inspector/frontend-channel.h
+++ b/test/inspector/frontend-channel.h
@ -8,7 +8,6 @@
 #include <vector>

 #include "include/v8-context.h"
-#include "include/v8-exception.h"
 #include "include/v8-function.h"
 #include "include/v8-inspector.h"
 #include "include/v8-microtask-queue.h"
--- a/test/inspector/inspector-test.cc
+++ b/test/inspector/inspector-test.cc
@ -12,14 +12,13 @@
 #include <vector>

 #include "include/libplatform/libplatform.h"
+#include "include/v8-exception.h"
 #include "include/v8-initialization.h"
 #include "include/v8-local-handle.h"
 #include "include/v8-snapshot.h"
 #include "src/base/platform/platform.h"
 #include "src/base/small-vector.h"
-#include "src/base/vector.h"
 #include "src/flags/flags.h"
-#include "src/heap/read-only-heap.h"
 #include "src/utils/utils.h"
 #include "test/inspector/frontend-channel.h"
 #include "test/inspector/isolate-data.h"
--- a/test/inspector/isolate-data.cc
+++ b/test/inspector/isolate-data.cc
@ -8,7 +8,7 @@
 #include "include/v8-exception.h"
 #include "include/v8-microtask-queue.h"
 #include "include/v8-template.h"
-#include "src/base/vector.h"
+#include "src/init/v8.h"
 #include "src/inspector/test-interface.h"
 #include "test/inspector/task-runner.h"
 #include "test/inspector/utils.h"
--- a/test/inspector/isolate-data.h
+++ b/test/inspector/isolate-data.h
@ -11,11 +11,7 @@
 #include "include/v8-array-buffer.h"
 #include "include/v8-inspector.h"
 #include "include/v8-local-handle.h"
-#include "include/v8-platform.h"
 #include "include/v8-script.h"
-#include "src/base/macros.h"
-#include "src/base/platform/platform.h"
-#include "src/base/vector.h"

 namespace v8 {

--- a/test/inspector/task-runner.cc
+++ b/test/inspector/task-runner.cc
@ -4,11 +4,13 @@

 #include "test/inspector/task-runner.h"

-#include "include/libplatform/libplatform.h"
 #include "include/v8-exception.h"
 #include "include/v8-local-handle.h"
 #include "include/v8-primitive.h"
 #include "src/flags/flags.h"
+#include "src/init/v8.h"
+#include "src/libplatform/default-platform.h"
+#include "src/utils/locked-queue-inl.h"

 #if !defined(_WIN32) && !defined(_WIN64)
 #include <unistd.h>
--- a/test/inspector/task-runner.h
+++ b/test/inspector/task-runner.h
@ -8,12 +8,8 @@
 #include <map>
 #include <memory>

-#include "include/v8-inspector.h"
-#include "include/v8-platform.h"
-#include "src/base/macros.h"
 #include "src/base/platform/platform.h"
-#include "src/base/vector.h"
-#include "src/utils/locked-queue-inl.h"
+#include "src/utils/locked-queue.h"
 #include "test/inspector/isolate-data.h"

 namespace v8 {
--- a/test/inspector/utils.h
+++ b/test/inspector/utils.h
@ -9,7 +9,6 @@

 #include "include/v8-inspector.h"
 #include "include/v8-local-handle.h"
-#include "src/base/macros.h"

 namespace v8 {

--- a/test/unittests/api/deserialize-unittest.cc
+++ b/test/unittests/api/deserialize-unittest.cc
@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.

-#include "include/libplatform/libplatform.h"
 #include "include/v8-context.h"
 #include "include/v8-function.h"
 #include "include/v8-isolate.h"
--- a/test/unittests/api/isolate-unittest.cc
+++ b/test/unittests/api/isolate-unittest.cc
@ -7,9 +7,7 @@
 #include "include/libplatform/libplatform.h"
 #include "include/v8-platform.h"
 #include "include/v8-template.h"
-#include "src/base/macros.h"
 #include "src/base/platform/semaphore.h"
-#include "src/execution/execution.h"
 #include "src/init/v8.h"
 #include "test/unittests/test-utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
--- a/test/unittests/api/remote-object-unittest.cc
+++ b/test/unittests/api/remote-object-unittest.cc
@ -7,7 +7,6 @@
 #include "include/v8-primitive.h"
 #include "include/v8-template.h"
 #include "src/api/api-inl.h"
-#include "src/handles/handles.h"
 #include "src/objects/objects-inl.h"
 #include "test/unittests/test-utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
--- a/test/unittests/api/v8-object-unittest.cc
+++ b/test/unittests/api/v8-object-unittest.cc
@ -8,7 +8,6 @@
 #include "include/v8-local-handle.h"
 #include "include/v8-primitive.h"
 #include "include/v8-template.h"
-#include "src/api/api.h"
 #include "src/objects/objects-inl.h"
 #include "test/unittests/test-utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
--- a/test/unittests/api/v8-script-unittest.cc
+++ b/test/unittests/api/v8-script-unittest.cc
@ -3,12 +3,10 @@
 // found in the LICENSE file.

 #include "include/v8-context.h"
-#include "include/v8-function.h"
 #include "include/v8-isolate.h"
 #include "include/v8-local-handle.h"
 #include "include/v8-primitive.h"
 #include "include/v8-template.h"
-#include "src/api/api.h"
 #include "src/objects/objects-inl.h"
 #include "test/unittests/test-utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
--- a/test/unittests/asmjs/asm-scanner-unittest.cc
+++ b/test/unittests/asmjs/asm-scanner-unittest.cc
@ -3,7 +3,7 @@
 // found in the LICENSE file.

 #include "src/asmjs/asm-scanner.h"
-#include "src/objects/objects.h"
+
 #include "src/parsing/scanner-character-streams.h"
 #include "src/parsing/scanner.h"
 #include "testing/gtest/include/gtest/gtest.h"
--- a/test/unittests/base/atomicops-unittest.cc
+++ b/test/unittests/base/atomicops-unittest.cc
@ -27,8 +27,6 @@

 #include "src/base/atomicops.h"

-#include "src/init/v8.h"
-#include "test/unittests/test-utils.h"
 #include "testing/gtest/include/gtest/gtest.h"

 namespace v8 {
--- a/test/unittests/base/bignum-dtoa-unittest.cc
+++ b/test/unittests/base/bignum-dtoa-unittest.cc
@ -30,8 +30,6 @@
 #include <stdlib.h>

 #include "src/base/numbers/double.h"
-#include "src/base/platform/platform.h"
-#include "src/init/v8.h"
 #include "test/unittests/gay-fixed.h"
 #include "test/unittests/gay-precision.h"
 #include "test/unittests/gay-shortest.h"
--- a/test/unittests/base/bignum-unittest.cc
+++ b/test/unittests/base/bignum-unittest.cc
@ -6,9 +6,6 @@

 #include <stdlib.h>

-#include "src/base/platform/platform.h"
-#include "src/init/v8.h"
-#include "test/unittests/test-utils.h"
 #include "testing/gtest/include/gtest/gtest.h"

 namespace v8 {
--- a/test/unittests/base/bits-unittest.cc
+++ b/test/unittests/base/bits-unittest.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/base/bits.h"
+
 #include <limits>

-#include "src/base/bits.h"
-#include "src/base/macros.h"
 #include "testing/gtest-support.h"

 #ifdef DEBUG
--- a/test/unittests/base/double-unittest.cc
+++ b/test/unittests/base/double-unittest.cc
@ -30,8 +30,7 @@
 #include <stdlib.h>

 #include "src/base/numbers/diy-fp.h"
-#include "src/base/platform/platform.h"
-#include "src/init/v8.h"
+#include "src/common/globals.h"
 #include "testing/gtest/include/gtest/gtest.h"

 namespace v8 {
--- a/test/unittests/base/dtoa-unittest.cc
+++ b/test/unittests/base/dtoa-unittest.cc
@ -30,8 +30,6 @@
 #include <stdlib.h>

 #include "src/base/numbers/double.h"
-#include "src/base/platform/platform.h"
-#include "src/init/v8.h"
 #include "test/unittests/gay-fixed.h"
 #include "test/unittests/gay-precision.h"
 #include "test/unittests/gay-shortest.h"
--- a/test/unittests/base/fast-dtoa-unittest.cc
+++ b/test/unittests/base/fast-dtoa-unittest.cc
@ -29,10 +29,7 @@

 #include <stdlib.h>

-#include "src/base/numbers/diy-fp.h"
 #include "src/base/numbers/double.h"
-#include "src/base/platform/platform.h"
-#include "src/init/v8.h"
 #include "test/unittests/gay-precision.h"
 #include "test/unittests/gay-shortest.h"
 #include "testing/gtest/include/gtest/gtest.h"
--- a/test/unittests/base/fixed-dtoa-unittest.cc
+++ b/test/unittests/base/fixed-dtoa-unittest.cc
@ -29,9 +29,6 @@

 #include <stdlib.h>

-#include "src/base/numbers/double.h"
-#include "src/base/platform/platform.h"
-#include "src/init/v8.h"
 #include "test/unittests/gay-fixed.h"
 #include "testing/gtest/include/gtest/gtest.h"

--- a/test/unittests/base/hashmap-unittest.cc
+++ b/test/unittests/base/hashmap-unittest.cc
@ -30,8 +30,6 @@
 #include <stdlib.h>

 #include "src/base/overflowing-math.h"
-#include "src/init/v8.h"
-#include "test/unittests/test-utils.h"
 #include "testing/gtest/include/gtest/gtest.h"

 namespace v8 {
--- a/test/unittests/base/ieee754-unittest.cc
+++ b/test/unittests/base/ieee754-unittest.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 "src/base/ieee754.h"
+
 #include <limits>

-#include "src/base/ieee754.h"
-#include "src/base/macros.h"
 #include "src/base/overflowing-math.h"
 #include "testing/gmock-support.h"
-#include "testing/gtest-support.h"

 using testing::BitEq;
 using testing::IsNaN;
--- a/test/unittests/base/logging-unittest.cc
+++ b/test/unittests/base/logging-unittest.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/base/logging.h"
+
 #include <cstdint>

-#include "src/base/logging.h"
-#include "src/objects/objects.h"
 #include "src/objects/smi.h"
 #include "testing/gtest-support.h"

--- a/test/unittests/base/vector-unittest.cc
+++ b/test/unittests/base/vector-unittest.cc
@ -7,7 +7,6 @@
 #include <algorithm>

 #include "testing/gmock-support.h"
-#include "testing/gtest-support.h"

 namespace v8 {
 namespace base {
--- a/test/unittests/codegen/code-pages-unittest.cc
+++ b/test/unittests/codegen/code-pages-unittest.cc
@ -9,7 +9,6 @@
 #include "src/execution/isolate.h"
 #include "src/handles/handles-inl.h"
 #include "src/heap/factory.h"
-#include "src/heap/memory-allocator.h"
 #include "src/heap/spaces.h"
 #include "src/libsampler/sampler.h"
 #include "test/unittests/test-utils.h"
--- a/test/unittests/codegen/code-stub-assembler-unittest.cc
+++ b/test/unittests/codegen/code-stub-assembler-unittest.cc
@ -4,11 +4,8 @@

 #include "test/unittests/codegen/code-stub-assembler-unittest.h"

-#include "src/codegen/code-factory.h"
-#include "src/codegen/interface-descriptors-inl.h"
 #include "src/compiler/node.h"
 #include "src/execution/isolate.h"
-#include "src/objects/objects-inl.h"
 #include "test/unittests/compiler/compiler-test-utils.h"
 #include "test/unittests/compiler/node-test-utils.h"

--- a/test/unittests/codegen/code-stub-assembler-unittest.h
+++ b/test/unittests/codegen/code-stub-assembler-unittest.h
@ -7,7 +7,6 @@

 #include "src/codegen/code-stub-assembler.h"
 #include "test/unittests/test-utils.h"
-#include "testing/gmock-support.h"

 namespace v8 {
 namespace internal {
--- a/test/unittests/codegen/source-position-table-unittest.cc
+++ b/test/unittests/codegen/source-position-table-unittest.cc
@ -2,10 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.

-#include "src/init/v8.h"
-
 #include "src/codegen/source-position-table.h"
-#include "src/objects/objects.h"
+
 #include "test/unittests/test-utils.h"

 namespace v8 {
--- a/test/unittests/compiler/branch-elimination-unittest.cc
+++ b/test/unittests/compiler/branch-elimination-unittest.cc
@ -3,14 +3,12 @@
 // found in the LICENSE file.

 #include "src/compiler/branch-elimination.h"
+
 #include "src/codegen/tick-counter.h"
 #include "src/compiler/js-graph.h"
-#include "src/compiler/linkage.h"
 #include "src/compiler/node-properties.h"
-#include "test/unittests/compiler/compiler-test-utils.h"
 #include "test/unittests/compiler/graph-unittest.h"
 #include "test/unittests/compiler/node-test-utils.h"
-#include "testing/gmock-support.h"

 namespace v8 {
 namespace internal {
--- a/test/unittests/compiler/bytecode-analysis-unittest.cc
+++ b/test/unittests/compiler/bytecode-analysis-unittest.cc
@ -5,10 +5,8 @@
 #include "src/compiler/bytecode-analysis.h"

 #include "src/compiler/bytecode-liveness-map.h"
-#include "src/init/v8.h"
 #include "src/interpreter/bytecode-array-builder.h"
 #include "src/interpreter/bytecode-array-iterator.h"
-#include "src/interpreter/bytecode-decoder.h"
 #include "src/interpreter/bytecode-label.h"
 #include "src/interpreter/control-flow-builders.h"
 #include "src/objects/objects-inl.h"
--- a/test/unittests/compiler/checkpoint-elimination-unittest.cc
+++ b/test/unittests/compiler/checkpoint-elimination-unittest.cc
@ -3,11 +3,11 @@
 // found in the LICENSE file.

 #include "src/compiler/checkpoint-elimination.h"
+
 #include "src/compiler/common-operator.h"
 #include "src/compiler/operator.h"
 #include "test/unittests/compiler/graph-reducer-unittest.h"
 #include "test/unittests/compiler/graph-unittest.h"
-#include "test/unittests/compiler/node-test-utils.h"

 using testing::StrictMock;

--- a/test/unittests/compiler/compiler-unittest.cc
+++ b/test/unittests/compiler/compiler-unittest.cc
@ -16,11 +16,7 @@
 #include "src/api/api-inl.h"
 #include "src/codegen/compilation-cache.h"
 #include "src/codegen/script-details.h"
-#include "src/diagnostics/disasm.h"
 #include "src/heap/factory.h"
-#include "src/heap/spaces.h"
-#include "src/init/v8.h"
-#include "src/interpreter/interpreter.h"
 #include "src/objects/allocation-site-inl.h"
 #include "src/objects/objects-inl.h"
 #include "src/objects/shared-function-info.h"
--- a/test/unittests/compiler/constant-folding-reducer-unittest.cc
+++ b/test/unittests/compiler/constant-folding-reducer-unittest.cc
@ -3,16 +3,12 @@
 // found in the LICENSE file.

 #include "src/compiler/constant-folding-reducer.h"
-#include "src/codegen/code-factory.h"
-#include "src/compiler/access-builder.h"
+
 #include "src/compiler/compilation-dependencies.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/js-operator.h"
 #include "src/compiler/machine-operator.h"
-#include "src/compiler/node-properties.h"
-#include "src/compiler/operator-properties.h"
 #include "src/execution/isolate-inl.h"
-#include "test/unittests/compiler/compiler-test-utils.h"
 #include "test/unittests/compiler/graph-unittest.h"
 #include "test/unittests/compiler/node-test-utils.h"
 #include "testing/gmock-support.h"
--- a/test/unittests/compiler/control-equivalence-unittest.cc
+++ b/test/unittests/compiler/control-equivalence-unittest.cc
@ -3,10 +3,10 @@
 // found in the LICENSE file.

 #include "src/compiler/control-equivalence.h"
+
 #include "src/compiler/compiler-source-position-table.h"
 #include "src/compiler/graph-visualizer.h"
 #include "src/compiler/node-origin-table.h"
-#include "src/compiler/node-properties.h"
 #include "src/utils/bit-vector.h"
 #include "src/zone/zone-containers.h"
 #include "test/unittests/compiler/graph-unittest.h"
--- a/test/unittests/compiler/csa-load-elimination-unittest.cc
+++ b/test/unittests/compiler/csa-load-elimination-unittest.cc
@ -10,10 +10,7 @@
 #include "src/compiler/node-matchers.h"
 #include "src/compiler/node.h"
 #include "src/compiler/simplified-operator.h"
-#include "test/unittests/compiler/graph-reducer-unittest.h"
 #include "test/unittests/compiler/graph-unittest.h"
-#include "test/unittests/compiler/node-test-utils.h"
-#include "testing/gmock-support.h"

 using testing::_;
 using testing::StrictMock;
--- a/test/unittests/compiler/dead-code-elimination-unittest.cc
+++ b/test/unittests/compiler/dead-code-elimination-unittest.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 "src/compiler/common-operator.h"
 #include "src/compiler/dead-code-elimination.h"
+
+#include "src/compiler/common-operator.h"
 #include "test/unittests/compiler/graph-reducer-unittest.h"
 #include "test/unittests/compiler/graph-unittest.h"
 #include "test/unittests/compiler/node-test-utils.h"
-#include "testing/gmock-support.h"

 using testing::StrictMock;

--- a/test/unittests/compiler/effect-control-linearizer-unittest.cc
+++ b/test/unittests/compiler/effect-control-linearizer-unittest.cc
@ -3,10 +3,10 @@
 // found in the LICENSE file.

 #include "src/compiler/effect-control-linearizer.h"
+
 #include "src/compiler/access-builder.h"
 #include "src/compiler/compiler-source-position-table.h"
 #include "src/compiler/js-graph.h"
-#include "src/compiler/linkage.h"
 #include "src/compiler/node-origin-table.h"
 #include "src/compiler/node-properties.h"
 #include "src/compiler/schedule.h"
--- a/test/unittests/compiler/frame-unittest.cc
+++ b/test/unittests/compiler/frame-unittest.cc
@ -5,7 +5,7 @@
 #include "src/compiler/frame.h"

 #include "src/codegen/aligned-slot-allocator.h"
-#include "testing/gtest-support.h"
+#include "testing/gmock/include/gmock/gmock.h"

 namespace v8 {
 namespace internal {
--- a/test/unittests/compiler/js-create-lowering-unittest.cc
+++ b/test/unittests/compiler/js-create-lowering-unittest.cc
@ -3,19 +3,14 @@
 // found in the LICENSE file.

 #include "src/compiler/js-create-lowering.h"
-#include "src/codegen/code-factory.h"
+
 #include "src/codegen/tick-counter.h"
-#include "src/compiler/access-builder.h"
 #include "src/compiler/compilation-dependencies.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/js-operator.h"
 #include "src/compiler/machine-operator.h"
-#include "src/compiler/node-properties.h"
-#include "src/compiler/operator-properties.h"
 #include "src/execution/isolate-inl.h"
 #include "src/objects/arguments.h"
-#include "src/objects/feedback-vector.h"
-#include "test/unittests/compiler/compiler-test-utils.h"
 #include "test/unittests/compiler/graph-unittest.h"
 #include "test/unittests/compiler/node-test-utils.h"
 #include "testing/gmock-support.h"
--- a/test/unittests/compiler/js-intrinsic-lowering-unittest.cc
+++ b/test/unittests/compiler/js-intrinsic-lowering-unittest.cc
@ -2,15 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.

-#include "src/compiler/access-builder.h"
-#include "src/compiler/diamond.h"
-#include "src/compiler/js-graph.h"
 #include "src/compiler/js-intrinsic-lowering.h"
-#include "src/compiler/js-operator.h"
-#include "test/unittests/compiler/graph-unittest.h"
-#include "test/unittests/compiler/node-test-utils.h"
-#include "testing/gmock-support.h"

+#include "src/compiler/js-graph.h"
+#include "src/compiler/js-operator.h"
+#include "src/compiler/simplified-operator.h"
+#include "test/unittests/compiler/graph-unittest.h"
+#include "testing/gmock-support.h"

 using testing::_;
 using testing::AllOf;
--- a/test/unittests/compiler/js-native-context-specialization-unittest.cc
+++ b/test/unittests/compiler/js-native-context-specialization-unittest.cc
@ -2,12 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.

-#include "test/unittests/compiler/graph-unittest.h"
-
 #include "src/compiler/js-native-context-specialization.h"
+
 #include "src/compiler/js-operator.h"
-#include "src/compiler/machine-operator.h"
-#include "src/compiler/simplified-operator.h"
+#include "test/unittests/compiler/graph-unittest.h"

 namespace v8 {
 namespace internal {
--- a/test/unittests/compiler/js-typed-lowering-unittest.cc
+++ b/test/unittests/compiler/js-typed-lowering-unittest.cc
@ -4,16 +4,12 @@

 #include "src/compiler/js-typed-lowering.h"

-#include "src/codegen/code-factory.h"
 #include "src/compiler/access-builder.h"
 #include "src/compiler/compilation-dependencies.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/js-operator.h"
 #include "src/compiler/machine-operator.h"
-#include "src/compiler/node-properties.h"
-#include "src/compiler/operator-properties.h"
 #include "src/execution/isolate-inl.h"
-#include "test/unittests/compiler/compiler-test-utils.h"
 #include "test/unittests/compiler/graph-unittest.h"
 #include "test/unittests/compiler/node-test-utils.h"
 #include "testing/gmock-support.h"
--- a/test/unittests/compiler/load-elimination-unittest.cc
+++ b/test/unittests/compiler/load-elimination-unittest.cc
@ -3,6 +3,7 @@
 // found in the LICENSE file.

 #include "src/compiler/load-elimination.h"
+
 #include "src/compiler/access-builder.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/node.h"
@ -10,7 +11,6 @@
 #include "test/unittests/compiler/graph-reducer-unittest.h"
 #include "test/unittests/compiler/graph-unittest.h"
 #include "test/unittests/compiler/node-test-utils.h"
-#include "testing/gmock-support.h"

 using testing::_;
 using testing::StrictMock;
--- a/test/unittests/compiler/loop-peeling-unittest.cc
+++ b/test/unittests/compiler/loop-peeling-unittest.cc
@ -2,15 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.

-#include "src/compiler/access-builder.h"
-#include "src/compiler/graph.h"
-#include "src/compiler/graph-visualizer.h"
-#include "src/compiler/js-graph.h"
 #include "src/compiler/loop-peeling.h"
+
+#include "src/compiler/graph-visualizer.h"
+#include "src/compiler/graph.h"
 #include "src/compiler/machine-operator.h"
 #include "src/compiler/node.h"
-#include "src/compiler/node-properties.h"
-#include "test/unittests/compiler/compiler-test-utils.h"
 #include "test/unittests/compiler/graph-unittest.h"
 #include "test/unittests/compiler/node-test-utils.h"
 #include "testing/gmock-support.h"
--- a/test/unittests/compiler/machine-operator-reducer-unittest.cc
+++ b/test/unittests/compiler/machine-operator-reducer-unittest.cc
@ -12,7 +12,6 @@
 #include "src/base/overflowing-math.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/machine-operator.h"
-#include "src/compiler/typer.h"
 #include "src/numbers/conversions-inl.h"
 #include "test/unittests/compiler/graph-unittest.h"
 #include "test/unittests/compiler/node-test-utils.h"
--- a/test/unittests/compiler/node-cache-unittest.cc
+++ b/test/unittests/compiler/node-cache-unittest.cc
@ -3,9 +3,9 @@
 // found in the LICENSE file.

 #include "src/compiler/node-cache.h"
+
 #include "test/unittests/compiler/graph-unittest.h"
 #include "test/unittests/test-utils.h"
-#include "testing/gmock-support.h"

 using testing::Contains;

--- a/test/unittests/compiler/node-matchers-unittest.cc
+++ b/test/unittests/compiler/node-matchers-unittest.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 "src/compiler/node-matchers.h"
+
 #include "src/compiler/common-operator.h"
 #include "src/compiler/graph.h"
 #include "src/compiler/machine-operator.h"
 #include "src/compiler/node.h"
-#include "src/compiler/node-matchers.h"
-#include "src/compiler/opcodes.h"
-
 #include "test/unittests/compiler/graph-unittest.h"
 #include "test/unittests/test-utils.h"

--- a/test/unittests/compiler/node-test-utils.cc
+++ b/test/unittests/compiler/node-test-utils.cc
@ -11,8 +11,6 @@
 #include "src/compiler/node-properties.h"
 #include "src/compiler/simplified-operator.h"
 #include "src/handles/handles-inl.h"
-#include "src/objects/objects-inl.h"
-#include "src/objects/objects.h"

 using testing::_;
 using testing::MakeMatcher;
--- a/test/unittests/compiler/node-unittest.cc
+++ b/test/unittests/compiler/node-unittest.cc
@ -3,9 +3,10 @@
 // found in the LICENSE file.

 #include "src/compiler/node.h"
+
 #include "src/compiler/operator.h"
 #include "test/unittests/test-utils.h"
-#include "testing/gmock-support.h"
+#include "testing/gmock/include/gmock/gmock.h"

 using testing::Contains;
 using testing::ElementsAre;
--- a/test/unittests/compiler/redundancy-elimination-unittest.cc
+++ b/test/unittests/compiler/redundancy-elimination-unittest.cc
@ -3,13 +3,12 @@
 // found in the LICENSE file.

 #include "src/compiler/redundancy-elimination.h"
+
 #include "src/codegen/tick-counter.h"
-#include "src/compiler/common-operator.h"
 #include "src/compiler/feedback-source.h"
 #include "test/unittests/compiler/graph-reducer-unittest.h"
 #include "test/unittests/compiler/graph-unittest.h"
 #include "test/unittests/compiler/node-test-utils.h"
-#include "testing/gmock-support.h"

 using testing::_;
 using testing::NiceMock;
--- a/test/unittests/compiler/scheduler-rpo-unittest.cc
+++ b/test/unittests/compiler/scheduler-rpo-unittest.cc
@ -6,7 +6,6 @@

 #include "src/compiler/schedule.h"
 #include "src/compiler/scheduler.h"
-#include "test/unittests/compiler/compiler-test-utils.h"
 #include "test/unittests/test-utils.h"
 #include "testing/gmock/include/gmock/gmock.h"

--- a/test/unittests/compiler/simplified-operator-reducer-unittest.cc
+++ b/test/unittests/compiler/simplified-operator-reducer-unittest.cc
@ -3,12 +3,10 @@
 // found in the LICENSE file.

 #include "src/compiler/simplified-operator-reducer.h"
+
 #include "src/codegen/tick-counter.h"
-#include "src/compiler/access-builder.h"
 #include "src/compiler/js-graph.h"
-#include "src/compiler/node-properties.h"
 #include "src/compiler/simplified-operator.h"
-#include "src/compiler/types.h"
 #include "src/numbers/conversions-inl.h"
 #include "test/unittests/compiler/graph-unittest.h"
 #include "test/unittests/compiler/node-test-utils.h"
--- a/test/unittests/compiler/state-values-utils-unittest.cc
+++ b/test/unittests/compiler/state-values-utils-unittest.cc
@ -5,7 +5,6 @@
 #include "src/compiler/state-values-utils.h"

 #include "src/compiler/bytecode-liveness-map.h"
-#include "src/utils/bit-vector.h"
 #include "test/unittests/compiler/graph-unittest.h"
 #include "test/unittests/compiler/node-test-utils.h"
 #include "test/unittests/test-utils.h"
--- a/test/unittests/compiler/typed-optimization-unittest.cc
+++ b/test/unittests/compiler/typed-optimization-unittest.cc
@ -3,16 +3,12 @@
 // found in the LICENSE file.

 #include "src/compiler/typed-optimization.h"
-#include "src/codegen/code-factory.h"
-#include "src/compiler/access-builder.h"
+
 #include "src/compiler/compilation-dependencies.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/js-operator.h"
 #include "src/compiler/machine-operator.h"
-#include "src/compiler/node-properties.h"
-#include "src/compiler/operator-properties.h"
 #include "src/execution/isolate-inl.h"
-#include "test/unittests/compiler/compiler-test-utils.h"
 #include "test/unittests/compiler/graph-unittest.h"
 #include "test/unittests/compiler/node-test-utils.h"
 #include "testing/gmock-support.h"
--- a/test/unittests/compiler/types-unittest.cc
+++ b/test/unittests/compiler/types-unittest.cc
@ -9,7 +9,6 @@
 #include "src/base/strings.h"
 #include "src/execution/isolate.h"
 #include "src/heap/factory-inl.h"
-#include "src/heap/heap.h"
 #include "src/objects/objects.h"
 #include "test/common/types-fuzz.h"
 #include "test/unittests/test-utils.h"