[cleanup] Fix inl header includes

We have many inl headers which either do not include their non-inl header, or are including other headers first. Both can lead to compile errors because definitions of inline functions might not be visible in inl headers. This CL adds a script to fix those includes, and runs it over the whole code base. R=leszeks@chromium.org Change-Id: I1b7b04c59e5a5b89308512bfc40729f7ec4afc38 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6387805 Reviewed-by: Leszek Swirski <leszeks@chromium.org> Commit-Queue: Clemens Backes <clemensb@chromium.org> Cr-Commit-Position: refs/heads/main@{#99453}
2026-10-28 09:47:03 +08:00 · 2025-03-25 10:21:48 -07:00
1 parent a2993d008d
commit 8cd6e52452
@@ -6,6 +6,8 @@
 #define V8_API_API_ARGUMENTS_INL_H_

 #include "src/api/api-arguments.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/api/api-inl.h"
 #include "src/debug/debug.h"
 #include "src/execution/vm-state-inl.h"
@@ -5,8 +5,10 @@
 #ifndef V8_API_API_INL_H_
 #define V8_API_API_INL_H_

-#include "include/v8-fast-api-calls.h"
 #include "src/api/api.h"
+// Include the non-inl header before the rest of the headers.
+
+#include "include/v8-fast-api-calls.h"
 #include "src/common/assert-scope.h"
 #include "src/execution/microtask-queue.h"
 #include "src/flags/flags.h"
@@ -6,6 +6,7 @@
 #define V8_BASELINE_BASELINE_ASSEMBLER_INL_H_

 #include "src/baseline/baseline-assembler.h"
+// Include the non-inl header before the rest of the headers.

 #include <type_traits>
 #include <unordered_map>
@@ -6,6 +6,8 @@
 #define V8_BUILTINS_BUILTINS_INL_H_

 #include "src/builtins/builtins.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/execution/isolate.h"

 namespace v8 {
@@ -6,6 +6,7 @@
 #define V8_BUILTINS_BUILTINS_UTILS_INL_H_

 #include "src/builtins/builtins-utils.h"
+// Include the non-inl header before the rest of the headers.

 #include "src/execution/arguments-inl.h"

@@ -38,6 +38,8 @@
 #define V8_CODEGEN_ARM_ASSEMBLER_ARM_INL_H_

 #include "src/codegen/arm/assembler-arm.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/codegen/assembler.h"
 #include "src/codegen/flush-instruction-cache.h"
 #include "src/debug/debug.h"
@@ -5,10 +5,12 @@
 #ifndef V8_CODEGEN_ARM64_ASSEMBLER_ARM64_INL_H_
 #define V8_CODEGEN_ARM64_ASSEMBLER_ARM64_INL_H_

+#include "src/codegen/arm64/assembler-arm64.h"
+// Include the non-inl header before the rest of the headers.
+
 #include <type_traits>

 #include "src/base/memory.h"
-#include "src/codegen/arm64/assembler-arm64.h"
 #include "src/codegen/assembler.h"
 #include "src/codegen/flush-instruction-cache.h"
 #include "src/debug/debug.h"
@@ -6,6 +6,7 @@
 #define V8_CODEGEN_ARM64_DECODER_ARM64_INL_H_

 #include "src/codegen/arm64/decoder-arm64.h"
+// Include the non-inl header before the rest of the headers.

 namespace v8 {
 namespace internal {
@@ -6,6 +6,7 @@
 #define V8_CODEGEN_ASSEMBLER_INL_H_

 #include "src/codegen/assembler.h"
+// Include the non-inl header before the rest of the headers.

 #if V8_TARGET_ARCH_IA32
 #include "src/codegen/ia32/assembler-ia32-inl.h"
@@ -5,11 +5,13 @@
 #ifndef V8_CODEGEN_CODE_STUB_ASSEMBLER_INL_H_
 #define V8_CODEGEN_CODE_STUB_ASSEMBLER_INL_H_

+#include "src/codegen/code-stub-assembler.h"
+// Include the non-inl header before the rest of the headers.
+
 #include <functional>

 #include "src/builtins/builtins-constructor-gen.h"
 #include "src/builtins/builtins-inl.h"
-#include "src/codegen/code-stub-assembler.h"
 #include "src/common/globals.h"

 namespace v8 {
@@ -37,10 +37,12 @@
 #ifndef V8_CODEGEN_IA32_ASSEMBLER_IA32_INL_H_
 #define V8_CODEGEN_IA32_ASSEMBLER_IA32_INL_H_

+#include "src/codegen/ia32/assembler-ia32.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/base/memory.h"
 #include "src/codegen/assembler.h"
 #include "src/codegen/flush-instruction-cache.h"
-#include "src/codegen/ia32/assembler-ia32.h"
 #include "src/debug/debug.h"
 #include "src/objects/objects-inl.h"

@@ -5,10 +5,12 @@
 #ifndef V8_CODEGEN_INTERFACE_DESCRIPTORS_INL_H_
 #define V8_CODEGEN_INTERFACE_DESCRIPTORS_INL_H_

+#include "src/codegen/interface-descriptors.h"
+// Include the non-inl header before the rest of the headers.
+
 #include <utility>

 #include "src/base/logging.h"
-#include "src/codegen/interface-descriptors.h"
 #include "src/codegen/register.h"
 #if V8_ENABLE_WEBASSEMBLY
 #include "src/wasm/wasm-linkage.h"
@@ -5,9 +5,11 @@
 #ifndef V8_CODEGEN_LOONG64_ASSEMBLER_LOONG64_INL_H_
 #define V8_CODEGEN_LOONG64_ASSEMBLER_LOONG64_INL_H_

+#include "src/codegen/loong64/assembler-loong64.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/codegen/assembler.h"
 #include "src/codegen/flush-instruction-cache.h"
-#include "src/codegen/loong64/assembler-loong64.h"
 #include "src/debug/debug.h"
 #include "src/heap/heap-layout-inl.h"
 #include "src/heap/heap-layout.h"
@@ -5,8 +5,10 @@
 #ifndef V8_CODEGEN_MACRO_ASSEMBLER_INL_H_
 #define V8_CODEGEN_MACRO_ASSEMBLER_INL_H_

-#include "src/codegen/assembler-inl.h"
 #include "src/codegen/macro-assembler.h"
+// Include the non-inl header before the rest of the headers.
+
+#include "src/codegen/assembler-inl.h"

 #if V8_TARGET_ARCH_ARM64
 #include "src/codegen/arm64/macro-assembler-arm64-inl.h"
@@ -35,9 +35,11 @@
 #ifndef V8_CODEGEN_MIPS64_ASSEMBLER_MIPS64_INL_H_
 #define V8_CODEGEN_MIPS64_ASSEMBLER_MIPS64_INL_H_

+#include "src/codegen/mips64/assembler-mips64.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/codegen/assembler.h"
 #include "src/codegen/flush-instruction-cache.h"
-#include "src/codegen/mips64/assembler-mips64.h"
 #include "src/debug/debug.h"
 #include "src/objects/objects-inl.h"

@@ -37,9 +37,11 @@
 #ifndef V8_CODEGEN_PPC_ASSEMBLER_PPC_INL_H_
 #define V8_CODEGEN_PPC_ASSEMBLER_PPC_INL_H_

+#include "src/codegen/ppc/assembler-ppc.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/codegen/assembler.h"
 #include "src/codegen/flush-instruction-cache.h"
-#include "src/codegen/ppc/assembler-ppc.h"
 #include "src/debug/debug.h"
 #include "src/heap/heap-layout-inl.h"
 #include "src/objects/objects-inl.h"
@@ -5,8 +5,10 @@
 #ifndef V8_CODEGEN_RELOC_INFO_INL_H_
 #define V8_CODEGEN_RELOC_INFO_INL_H_

-#include "src/codegen/assembler-inl.h"
 #include "src/codegen/reloc-info.h"
+// Include the non-inl header before the rest of the headers.
+
+#include "src/codegen/assembler-inl.h"
 #include "src/heap/heap-write-barrier-inl.h"

 namespace v8 {
@@ -35,6 +35,9 @@
 #ifndef V8_CODEGEN_RISCV_ASSEMBLER_RISCV_INL_H_
 #define V8_CODEGEN_RISCV_ASSEMBLER_RISCV_INL_H_

+#include "src/codegen/riscv/assembler-riscv.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/codegen/assembler-arch.h"
 #include "src/codegen/assembler.h"
 #include "src/debug/debug.h"
@@ -37,9 +37,11 @@
 #ifndef V8_CODEGEN_S390_ASSEMBLER_S390_INL_H_
 #define V8_CODEGEN_S390_ASSEMBLER_S390_INL_H_

+#include "src/codegen/s390/assembler-s390.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/codegen/assembler.h"
 #include "src/codegen/flush-instruction-cache.h"
-#include "src/codegen/s390/assembler-s390.h"
 #include "src/debug/debug.h"
 #include "src/objects/objects-inl.h"

@@ -5,10 +5,12 @@
 #ifndef V8_CODEGEN_X64_ASSEMBLER_X64_INL_H_
 #define V8_CODEGEN_X64_ASSEMBLER_X64_INL_H_

+#include "src/codegen/x64/assembler-x64.h"
+// Include the non-inl header before the rest of the headers.
+
 #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/heap/heap-layout-inl.h"
 #include "src/objects/objects-inl.h"
@@ -6,6 +6,8 @@
 #define V8_COMMON_CODE_MEMORY_ACCESS_INL_H_

 #include "src/common/code-memory-access.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/flags/flags.h"
 #include "src/objects/instruction-stream.h"
 #include "src/objects/slots-inl.h"
@@ -5,9 +5,11 @@
 #ifndef V8_COMMON_SEGMENTED_TABLE_INL_H_
 #define V8_COMMON_SEGMENTED_TABLE_INL_H_

+#include "src/common/segmented-table.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/base/emulated-virtual-address-subspace.h"
 #include "src/common/assert-scope.h"
-#include "src/common/segmented-table.h"
 #include "src/utils/allocation.h"

 namespace v8 {
@@ -5,8 +5,10 @@
 #ifndef V8_COMPILER_ALLOCATION_BUILDER_INL_H_
 #define V8_COMPILER_ALLOCATION_BUILDER_INL_H_

-#include "src/compiler/access-builder.h"
 #include "src/compiler/allocation-builder.h"
+// Include the non-inl header before the rest of the headers.
+
+#include "src/compiler/access-builder.h"
 #include "src/heap/heap-inl.h"
 #include "src/objects/arguments-inl.h"

@@ -6,6 +6,8 @@
 #define V8_COMPILER_JS_HEAP_BROKER_INL_H_

 #include "src/compiler/js-heap-broker.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/heap/parked-scope-inl.h"

 namespace v8::internal::compiler {
@@ -6,6 +6,8 @@
 #define V8_DATE_DATEPARSER_INL_H_

 #include "src/date/dateparser.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/execution/isolate.h"
 #include "src/strings/char-predicates-inl.h"

@@ -6,6 +6,8 @@
 #define V8_DEBUG_DEBUG_WASM_OBJECTS_INL_H_

 #include "src/debug/debug-wasm-objects.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/objects/js-objects-inl.h"

 // Has to be the last include (doesn't have include guards):
@@ -6,6 +6,7 @@
 #define V8_EXECUTION_ARGUMENTS_INL_H_

 #include "src/execution/arguments.h"
+// Include the non-inl header before the rest of the headers.

 #include "src/handles/handles-inl.h"
 #include "src/objects/objects-inl.h"  // TODO(jkummerow): Just smi-inl.h.
@@ -5,11 +5,13 @@
 #ifndef V8_EXECUTION_FRAMES_INL_H_
 #define V8_EXECUTION_FRAMES_INL_H_

+#include "src/execution/frames.h"
+// Include the non-inl header before the rest of the headers.
+
 #include <optional>

 #include "src/base/memory.h"
 #include "src/execution/frame-constants.h"
-#include "src/execution/frames.h"
 #include "src/execution/isolate.h"
 #include "src/execution/pointer-authentication.h"
 #include "src/objects/objects-inl.h"
@@ -5,8 +5,10 @@
 #ifndef V8_EXECUTION_LOCAL_ISOLATE_INL_H_
 #define V8_EXECUTION_LOCAL_ISOLATE_INL_H_

-#include "src/execution/isolate.h"
 #include "src/execution/local-isolate.h"
+// Include the non-inl header before the rest of the headers.
+
+#include "src/execution/isolate.h"
 #include "src/roots/roots-inl.h"

 namespace v8 {
@@ -6,6 +6,8 @@
 #define V8_EXECUTION_PROTECTORS_INL_H_

 #include "src/execution/protectors.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/objects/property-cell-inl.h"
 #include "src/objects/smi.h"

@@ -5,9 +5,11 @@
 #ifndef V8_EXECUTION_VM_STATE_INL_H_
 #define V8_EXECUTION_VM_STATE_INL_H_

+#include "src/execution/vm-state.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/execution/isolate-inl.h"
 #include "src/execution/simulator.h"
-#include "src/execution/vm-state.h"
 #include "src/logging/log.h"
 #include "src/tracing/trace-event.h"

@@ -6,6 +6,8 @@
 #define V8_HANDLES_GLOBAL_HANDLES_INL_H_

 #include "src/handles/global-handles.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/handles/handles-inl.h"
 #include "src/objects/heap-object-inl.h"
 #include "src/objects/tagged.h"
@@ -5,10 +5,12 @@
 #ifndef V8_HANDLES_HANDLES_INL_H_
 #define V8_HANDLES_HANDLES_INL_H_

+#include "src/handles/handles.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/base/sanitizer/msan.h"
 #include "src/execution/isolate.h"
 #include "src/execution/local-isolate.h"
-#include "src/handles/handles.h"
 #include "src/handles/local-handles-inl.h"
 #include "src/objects/casting.h"
 #include "src/objects/objects.h"
@@ -5,10 +5,12 @@
 #ifndef V8_HANDLES_LOCAL_HANDLES_INL_H_
 #define V8_HANDLES_LOCAL_HANDLES_INL_H_

+#include "src/handles/local-handles.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/base/sanitizer/msan.h"
 #include "src/execution/isolate.h"
 #include "src/execution/local-isolate.h"
-#include "src/handles/local-handles.h"

 namespace v8 {
 namespace internal {
@@ -5,9 +5,11 @@
 #ifndef V8_HANDLES_MAYBE_HANDLES_INL_H_
 #define V8_HANDLES_MAYBE_HANDLES_INL_H_

+#include "src/handles/maybe-handles.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/base/macros.h"
 #include "src/handles/handles-inl.h"
-#include "src/handles/maybe-handles.h"
 #include "src/objects/casting.h"
 #include "src/objects/maybe-object-inl.h"

@@ -6,6 +6,8 @@
 #define V8_HANDLES_TRACED_HANDLES_INL_H_

 #include "src/handles/traced-handles.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/heap/heap-layout-inl.h"
 #include "src/heap/heap-write-barrier-inl.h"
 #include "src/objects/slots-inl.h"
@@ -6,6 +6,7 @@
 #define V8_HEAP_CONSERVATIVE_STACK_VISITOR_INL_H_

 #include "src/heap/conservative-stack-visitor.h"
+// Include the non-inl header before the rest of the headers.

 #include "src/common/globals.h"
 #include "src/execution/isolate-inl.h"
@@ -6,6 +6,7 @@
 #define V8_HEAP_CPPGC_JS_CPP_MARKING_STATE_INL_H_

 #include "src/heap/cppgc-js/cpp-marking-state.h"
+// Include the non-inl header before the rest of the headers.

 namespace v8 {
 namespace internal {
@@ -5,12 +5,14 @@
 #ifndef V8_HEAP_CPPGC_JS_UNIFIED_HEAP_MARKING_STATE_INL_H_
 #define V8_HEAP_CPPGC_JS_UNIFIED_HEAP_MARKING_STATE_INL_H_

+#include "src/heap/cppgc-js/unified-heap-marking-state.h"
+// Include the non-inl header before the rest of the headers.
+
 #include <atomic>

 #include "include/v8-traced-handle.h"
 #include "src/base/logging.h"
 #include "src/handles/traced-handles.h"
-#include "src/heap/cppgc-js/unified-heap-marking-state.h"
 #include "src/heap/heap.h"
 #include "src/heap/mark-compact.h"
 #include "src/heap/marking-inl.h"
@@ -5,8 +5,10 @@
 #ifndef V8_HEAP_EVACUATION_ALLOCATOR_INL_H_
 #define V8_HEAP_EVACUATION_ALLOCATOR_INL_H_

-#include "src/common/globals.h"
 #include "src/heap/evacuation-allocator.h"
+// Include the non-inl header before the rest of the headers.
+
+#include "src/common/globals.h"
 #include "src/heap/spaces-inl.h"

 namespace v8 {
@@ -6,6 +6,8 @@
 #define V8_HEAP_EVACUATION_VERIFIER_INL_H_

 #include "src/heap/evacuation-verifier.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/heap/heap-inl.h"
 #include "src/heap/heap-layout-inl.h"
 #include "src/heap/mark-compact.h"
@@ -6,6 +6,8 @@
 #define V8_HEAP_FACTORY_BASE_INL_H_

 #include "src/heap/factory-base.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/heap/local-heap-inl.h"
 #include "src/numbers/conversions.h"
 #include "src/objects/heap-number.h"
@@ -6,6 +6,8 @@
 #define V8_HEAP_FREE_LIST_INL_H_

 #include "src/heap/free-list.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/heap/page-metadata-inl.h"
 #include "src/heap/spaces.h"

@@ -5,10 +5,12 @@
 #ifndef V8_HEAP_GC_TRACER_INL_H_
 #define V8_HEAP_GC_TRACER_INL_H_

+#include "src/heap/gc-tracer.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/base/logging.h"
 #include "src/base/platform/platform.h"
 #include "src/execution/isolate.h"
-#include "src/heap/gc-tracer.h"
 #include "src/heap/heap-inl.h"

 namespace v8 {
@@ -5,10 +5,12 @@
 #ifndef V8_HEAP_HEAP_ALLOCATOR_INL_H_
 #define V8_HEAP_HEAP_ALLOCATOR_INL_H_

+#include "src/heap/heap-allocator.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/base/logging.h"
 #include "src/common/assert-scope.h"
 #include "src/common/globals.h"
-#include "src/heap/heap-allocator.h"
 #include "src/heap/large-spaces.h"
 #include "src/heap/local-heap.h"
 #include "src/heap/main-allocator-inl.h"
@@ -5,6 +5,9 @@
 #ifndef V8_HEAP_HEAP_INL_H_
 #define V8_HEAP_HEAP_INL_H_

+#include "src/heap/heap.h"
+// Include the non-inl header before the rest of the headers.
+
 #include <atomic>
 #include <optional>

@@ -19,7 +22,6 @@
 #include "src/heap/heap-allocator-inl.h"
 #include "src/heap/heap-layout-inl.h"
 #include "src/heap/heap-write-barrier.h"
-#include "src/heap/heap.h"
 #include "src/heap/large-spaces.h"
 #include "src/heap/memory-allocator.h"
 #include "src/heap/memory-chunk-inl.h"
@@ -5,8 +5,10 @@
 #ifndef V8_HEAP_HEAP_LAYOUT_INL_H_
 #define V8_HEAP_HEAP_LAYOUT_INL_H_

-#include "src/flags/flags.h"
 #include "src/heap/heap-layout.h"
+// Include the non-inl header before the rest of the headers.
+
+#include "src/flags/flags.h"
 #include "src/heap/memory-chunk-inl.h"
 #include "src/objects/casting.h"
 #include "src/objects/objects.h"
@@ -6,6 +6,8 @@
 #define V8_HEAP_HEAP_UTILS_INL_H_

 #include "src/heap/heap-utils.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/heap/memory-chunk-inl.h"

 namespace v8::internal {
@@ -5,12 +5,14 @@
 #ifndef V8_HEAP_HEAP_VISITOR_INL_H_
 #define V8_HEAP_HEAP_VISITOR_INL_H_

+#include "src/heap/heap-visitor.h"
+// Include the non-inl header before the rest of the headers.
+
 #include <optional>

 #include "src/base/logging.h"
 #include "src/execution/local-isolate.h"
 #include "src/heap/heap-layout-inl.h"
-#include "src/heap/heap-visitor.h"
 #include "src/heap/mark-compact.h"
 #include "src/heap/object-lock-inl.h"
 #include "src/objects/arguments.h"
@@ -5,14 +5,13 @@
 #ifndef V8_HEAP_HEAP_WRITE_BARRIER_INL_H_
 #define V8_HEAP_HEAP_WRITE_BARRIER_INL_H_

-// Include the non-inl header before the rest of the headers.
 #include "src/heap/heap-write-barrier.h"
+// Include the non-inl header before the rest of the headers.

 // Clients of this interface shouldn't depend on lots of heap internals.
 // Do not include anything from src/heap here!

 #include "src/heap/heap-layout-inl.h"
-#include "src/heap/heap-write-barrier.h"
 #include "src/heap/marking-barrier.h"
 #include "src/heap/memory-chunk.h"
 #include "src/objects/compressed-slots-inl.h"
@@ -5,10 +5,12 @@
 #ifndef V8_HEAP_INCREMENTAL_MARKING_INL_H_
 #define V8_HEAP_INCREMENTAL_MARKING_INL_H_

+#include "src/heap/incremental-marking.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/common/globals.h"
 #include "src/execution/isolate.h"
 #include "src/heap/heap-inl.h"
-#include "src/heap/incremental-marking.h"
 #include "src/heap/marking-state-inl.h"
 #include "src/objects/descriptor-array.h"

@@ -6,6 +6,8 @@
 #define V8_HEAP_LARGE_PAGE_METADATA_INL_H_

 #include "src/heap/large-page-metadata.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/heap/mutable-page-metadata-inl.h"

 namespace v8 {
@@ -5,8 +5,10 @@
 #ifndef V8_HEAP_LIVE_OBJECT_RANGE_INL_H_
 #define V8_HEAP_LIVE_OBJECT_RANGE_INL_H_

-#include "src/heap/heap-inl.h"
 #include "src/heap/live-object-range.h"
+// Include the non-inl header before the rest of the headers.
+
+#include "src/heap/heap-inl.h"
 #include "src/heap/page-metadata-inl.h"
 #include "src/objects/instance-type-inl.h"

@@ -5,8 +5,10 @@
 #ifndef V8_HEAP_LOCAL_FACTORY_INL_H_
 #define V8_HEAP_LOCAL_FACTORY_INL_H_

-#include "src/heap/factory-base-inl.h"
 #include "src/heap/local-factory.h"
+// Include the non-inl header before the rest of the headers.
+
+#include "src/heap/factory-base-inl.h"
 #include "src/roots/roots-inl.h"

 namespace v8 {
@@ -5,13 +5,15 @@
 #ifndef V8_HEAP_LOCAL_HEAP_INL_H_
 #define V8_HEAP_LOCAL_HEAP_INL_H_

+#include "src/heap/local-heap.h"
+// Include the non-inl header before the rest of the headers.
+
 #include <atomic>

 #include "src/common/assert-scope.h"
 #include "src/handles/persistent-handles.h"
 #include "src/heap/heap.h"
 #include "src/heap/large-spaces.h"
-#include "src/heap/local-heap.h"
 #include "src/heap/main-allocator-inl.h"
 #include "src/heap/parked-scope.h"
 #include "src/heap/zapping.h"
@@ -5,9 +5,11 @@
 #ifndef V8_HEAP_MAIN_ALLOCATOR_INL_H_
 #define V8_HEAP_MAIN_ALLOCATOR_INL_H_

+#include "src/heap/main-allocator.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/flags/flags.h"
 #include "src/heap/heap-inl.h"
-#include "src/heap/main-allocator.h"
 #include "src/heap/marking-state-inl.h"

 namespace v8 {
@@ -5,9 +5,11 @@
 #ifndef V8_HEAP_MARK_COMPACT_INL_H_
 #define V8_HEAP_MARK_COMPACT_INL_H_

+#include "src/heap/mark-compact.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/common/globals.h"
 #include "src/heap/heap-visitor-inl.h"
-#include "src/heap/mark-compact.h"
 #include "src/heap/marking-state-inl.h"
 #include "src/heap/marking-visitor-inl.h"
 #include "src/heap/marking-worklist-inl.h"
@@ -5,12 +5,14 @@
 #ifndef V8_HEAP_MARKING_BARRIER_INL_H_
 #define V8_HEAP_MARKING_BARRIER_INL_H_

+#include "src/heap/marking-barrier.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/base/logging.h"
 #include "src/heap/heap-layout-inl.h"
 #include "src/heap/incremental-marking-inl.h"
 #include "src/heap/incremental-marking.h"
 #include "src/heap/mark-compact-inl.h"
-#include "src/heap/marking-barrier.h"
 #include "src/heap/marking.h"

 namespace v8 {
@@ -5,10 +5,12 @@
 #ifndef V8_HEAP_MARKING_INL_H_
 #define V8_HEAP_MARKING_INL_H_

+#include "src/heap/marking.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/base/build_config.h"
 #include "src/base/macros.h"
 #include "src/heap/heap-inl.h"
-#include "src/heap/marking.h"
 #include "src/heap/memory-chunk-layout.h"
 #include "src/heap/memory-chunk-metadata.h"
 #include "src/heap/spaces.h"
@@ -5,8 +5,10 @@
 #ifndef V8_HEAP_MARKING_STATE_INL_H_
 #define V8_HEAP_MARKING_STATE_INL_H_

-#include "src/heap/marking-inl.h"
 #include "src/heap/marking-state.h"
+// Include the non-inl header before the rest of the headers.
+
+#include "src/heap/marking-inl.h"
 #include "src/heap/mutable-page-metadata.h"

 namespace v8 {
@@ -5,6 +5,9 @@
 #ifndef V8_HEAP_MARKING_VISITOR_INL_H_
 #define V8_HEAP_MARKING_VISITOR_INL_H_

+#include "src/heap/marking-visitor.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/common/globals.h"
 #include "src/heap/ephemeron-remembered-set.h"
 #include "src/heap/heap-layout-inl.h"
@@ -12,7 +15,6 @@
 #include "src/heap/heap-visitor.h"
 #include "src/heap/marking-progress-tracker.h"
 #include "src/heap/marking-state-inl.h"
-#include "src/heap/marking-visitor.h"
 #include "src/heap/marking-worklist-inl.h"
 #include "src/heap/marking.h"
 #include "src/heap/pretenuring-handler-inl.h"
@@ -5,10 +5,12 @@
 #ifndef V8_HEAP_MARKING_WORKLIST_INL_H_
 #define V8_HEAP_MARKING_WORKLIST_INL_H_

+#include "src/heap/marking-worklist.h"
+// Include the non-inl header before the rest of the headers.
+
 #include <unordered_map>

 #include "src/heap/cppgc-js/cpp-marking-state-inl.h"
-#include "src/heap/marking-worklist.h"
 #include "src/objects/embedder-data-slot.h"
 #include "src/objects/js-objects-inl.h"

@@ -5,8 +5,10 @@
 #ifndef V8_HEAP_MEMORY_CHUNK_INL_H_
 #define V8_HEAP_MEMORY_CHUNK_INL_H_

-#include "src/heap/memory-chunk-metadata.h"
 #include "src/heap/memory-chunk.h"
+// Include the non-inl header before the rest of the headers.
+
+#include "src/heap/memory-chunk-metadata.h"
 #include "src/sandbox/check.h"

 namespace v8 {
@@ -5,8 +5,10 @@
 #ifndef V8_HEAP_MEMORY_CHUNK_METADATA_INL_H_
 #define V8_HEAP_MEMORY_CHUNK_METADATA_INL_H_

-#include "src/heap/memory-chunk-inl.h"
 #include "src/heap/memory-chunk-metadata.h"
+// Include the non-inl header before the rest of the headers.
+
+#include "src/heap/memory-chunk-inl.h"

 namespace v8 {
 namespace internal {
@@ -6,6 +6,8 @@
 #define V8_HEAP_MEMORY_MEASUREMENT_INL_H_

 #include "src/heap/memory-measurement.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/objects/contexts-inl.h"
 #include "src/objects/contexts.h"
 #include "src/objects/instance-type-inl.h"
@@ -5,12 +5,14 @@
 #ifndef V8_HEAP_MINOR_MARK_SWEEP_INL_H_
 #define V8_HEAP_MINOR_MARK_SWEEP_INL_H_

+#include "src/heap/minor-mark-sweep.h"
+// Include the non-inl header before the rest of the headers.
+
 #include <atomic>
 #include <optional>

 #include "src/base/build_config.h"
 #include "src/common/globals.h"
-#include "src/heap/minor-mark-sweep.h"
 #include "src/heap/mutable-page-metadata.h"
 #include "src/heap/remembered-set-inl.h"
 #include "src/heap/young-generation-marking-visitor-inl.h"
@@ -5,8 +5,10 @@
 #ifndef V8_HEAP_MUTABLE_PAGE_METADATA_INL_H_
 #define V8_HEAP_MUTABLE_PAGE_METADATA_INL_H_

-#include "src/heap/memory-chunk-metadata-inl.h"
 #include "src/heap/mutable-page-metadata.h"
+// Include the non-inl header before the rest of the headers.
+
+#include "src/heap/memory-chunk-metadata-inl.h"
 #include "src/heap/spaces-inl.h"

 namespace v8 {
@@ -5,10 +5,12 @@
 #ifndef V8_HEAP_NEW_SPACES_INL_H_
 #define V8_HEAP_NEW_SPACES_INL_H_

+#include "src/heap/new-spaces.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/base/sanitizer/msan.h"
 #include "src/common/globals.h"
 #include "src/heap/heap.h"
-#include "src/heap/new-spaces.h"
 #include "src/heap/paged-spaces-inl.h"
 #include "src/heap/spaces-inl.h"
 #include "src/objects/objects-inl.h"
@@ -5,8 +5,10 @@
 #ifndef V8_HEAP_OBJECT_LOCK_INL_H_
 #define V8_HEAP_OBJECT_LOCK_INL_H_

-#include "src/heap/mutable-page-metadata-inl.h"
 #include "src/heap/object-lock.h"
+// Include the non-inl header before the rest of the headers.
+
+#include "src/heap/mutable-page-metadata-inl.h"

 namespace v8 {
 namespace internal {
@@ -5,8 +5,10 @@
 #ifndef V8_HEAP_PAGE_METADATA_INL_H_
 #define V8_HEAP_PAGE_METADATA_INL_H_

-#include "src/heap/memory-chunk-inl.h"
 #include "src/heap/page-metadata.h"
+// Include the non-inl header before the rest of the headers.
+
+#include "src/heap/memory-chunk-inl.h"
 #include "src/heap/paged-spaces.h"
 #include "src/heap/spaces.h"

@@ -5,10 +5,12 @@
 #ifndef V8_HEAP_PAGED_SPACES_INL_H_
 #define V8_HEAP_PAGED_SPACES_INL_H_

+#include "src/heap/paged-spaces.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/common/globals.h"
 #include "src/heap/heap-inl.h"
 #include "src/heap/incremental-marking.h"
-#include "src/heap/paged-spaces.h"
 #include "src/objects/heap-object.h"
 #include "src/objects/objects-inl.h"

@@ -5,12 +5,14 @@
 #ifndef V8_HEAP_PARKED_SCOPE_INL_H_
 #define V8_HEAP_PARKED_SCOPE_INL_H_

+#include "src/heap/parked-scope.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/base/platform/condition-variable.h"
 #include "src/base/platform/mutex.h"
 #include "src/base/platform/semaphore.h"
 #include "src/execution/local-isolate.h"
 #include "src/heap/local-heap-inl.h"
-#include "src/heap/parked-scope.h"

 namespace v8 {
 namespace internal {
@@ -5,11 +5,13 @@
 #ifndef V8_HEAP_PRETENURING_HANDLER_INL_H_
 #define V8_HEAP_PRETENURING_HANDLER_INL_H_

+#include "src/heap/pretenuring-handler.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/base/sanitizer/msan.h"
 #include "src/heap/heap-layout-inl.h"
 #include "src/heap/new-spaces.h"
 #include "src/heap/page-metadata.h"
-#include "src/heap/pretenuring-handler.h"
 #include "src/heap/spaces.h"
 #include "src/objects/allocation-site-inl.h"
 #include "src/objects/allocation-site.h"
@@ -5,8 +5,10 @@
 #ifndef V8_HEAP_READ_ONLY_HEAP_INL_H_
 #define V8_HEAP_READ_ONLY_HEAP_INL_H_

-#include "src/execution/isolate-utils-inl.h"
 #include "src/heap/read-only-heap.h"
+// Include the non-inl header before the rest of the headers.
+
+#include "src/execution/isolate-utils-inl.h"
 #include "src/roots/roots-inl.h"

 namespace v8 {
@@ -5,9 +5,11 @@
 #ifndef V8_HEAP_REMEMBERED_SET_INL_H_
 #define V8_HEAP_REMEMBERED_SET_INL_H_

+#include "src/heap/remembered-set.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/codegen/assembler-inl.h"
 #include "src/common/ptr-compr-inl.h"
-#include "src/heap/remembered-set.h"
 #include "src/objects/heap-object.h"

 namespace v8 {
@@ -5,6 +5,9 @@
 #ifndef V8_HEAP_SCAVENGER_INL_H_
 #define V8_HEAP_SCAVENGER_INL_H_

+#include "src/heap/scavenger.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/codegen/assembler-inl.h"
 #include "src/heap/evacuation-allocator-inl.h"
 #include "src/heap/heap-layout-inl.h"
@@ -14,7 +17,6 @@
 #include "src/heap/mutable-page-metadata.h"
 #include "src/heap/new-spaces.h"
 #include "src/heap/pretenuring-handler-inl.h"
-#include "src/heap/scavenger.h"
 #include "src/objects/casting-inl.h"
 #include "src/objects/js-objects.h"
 #include "src/objects/map.h"
@@ -5,6 +5,9 @@
 #ifndef V8_HEAP_SPACES_INL_H_
 #define V8_HEAP_SPACES_INL_H_

+#include "src/heap/spaces.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/base/atomic-utils.h"
 #include "src/common/globals.h"
 #include "src/heap/heap.h"
@@ -13,7 +16,6 @@
 #include "src/heap/mutable-page-metadata-inl.h"
 #include "src/heap/new-spaces.h"
 #include "src/heap/paged-spaces.h"
-#include "src/heap/spaces.h"

 namespace v8 {
 namespace internal {
@@ -5,6 +5,9 @@
 #ifndef V8_HEAP_YOUNG_GENERATION_MARKING_VISITOR_INL_H_
 #define V8_HEAP_YOUNG_GENERATION_MARKING_VISITOR_INL_H_

+#include "src/heap/young-generation-marking-visitor.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/common/globals.h"
 #include "src/heap/heap-layout-inl.h"
 #include "src/heap/heap-visitor-inl.h"
@@ -14,7 +17,6 @@
 #include "src/heap/mutable-page-metadata.h"
 #include "src/heap/pretenuring-handler-inl.h"
 #include "src/heap/remembered-set-inl.h"
-#include "src/heap/young-generation-marking-visitor.h"

 namespace v8 {
 namespace internal {
@@ -5,10 +5,12 @@
 #ifndef V8_IC_HANDLER_CONFIGURATION_INL_H_
 #define V8_IC_HANDLER_CONFIGURATION_INL_H_

+#include "src/ic/handler-configuration.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/builtins/builtins.h"
 #include "src/execution/isolate.h"
 #include "src/handles/handles-inl.h"
-#include "src/ic/handler-configuration.h"
 #include "src/objects/data-handler-inl.h"
 #include "src/objects/field-index-inl.h"
 #include "src/objects/objects-inl.h"
@@ -6,6 +6,7 @@
 #define V8_IC_IC_INL_H_

 #include "src/ic/ic.h"
+// Include the non-inl header before the rest of the headers.

 #include "src/codegen/assembler-inl.h"
 #include "src/debug/debug.h"
@@ -5,8 +5,10 @@
 #ifndef V8_LOGGING_LOG_INL_H_
 #define V8_LOGGING_LOG_INL_H_

-#include "src/execution/isolate.h"
 #include "src/logging/log.h"
+// Include the non-inl header before the rest of the headers.
+
+#include "src/execution/isolate.h"
 #include "src/objects/objects-inl.h"
 #include "src/tracing/trace-event.h"

@@ -5,13 +5,15 @@
 #ifndef V8_MAGLEV_MAGLEV_ASSEMBLER_INL_H_
 #define V8_MAGLEV_MAGLEV_ASSEMBLER_INL_H_

+#include "src/maglev/maglev-assembler.h"
+// Include the non-inl header before the rest of the headers.
+
 #include <algorithm>
 #include <type_traits>

 #include "src/base/iterator.h"
 #include "src/base/template-utils.h"
 #include "src/codegen/machine-type.h"
-#include "src/maglev/maglev-assembler.h"

 #ifdef V8_TARGET_ARCH_ARM
 #include "src/maglev/arm/maglev-assembler-arm-inl.h"
@@ -5,9 +5,11 @@
 #ifndef V8_MAGLEV_MAGLEV_IR_INL_H_
 #define V8_MAGLEV_MAGLEV_IR_INL_H_

+#include "src/maglev/maglev-ir.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/interpreter/bytecode-register.h"
 #include "src/maglev/maglev-deopt-frame-visitor.h"
-#include "src/maglev/maglev-ir.h"
 #include "src/sandbox/js-dispatch-table-inl.h"

 namespace v8 {
@@ -5,6 +5,9 @@
 #ifndef V8_NUMBERS_CONVERSIONS_INL_H_
 #define V8_NUMBERS_CONVERSIONS_INL_H_

+#include "src/numbers/conversions.h"
+// Include the non-inl header before the rest of the headers.
+
 #include <float.h>   // Required for DBL_MAX and on Win32 for finite()
 #include <limits.h>  // Required for INT_MAX etc.
 #include <stdarg.h>
@@ -17,7 +20,6 @@
 #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"
 #include "src/objects/smi-inl.h"
@@ -6,6 +6,7 @@
 #define V8_NUMBERS_INTEGER_LITERAL_INL_H_

 #include "src/numbers/integer-literal.h"
+// Include the non-inl header before the rest of the headers.

 namespace v8 {
 namespace internal {
@@ -6,6 +6,8 @@
 #define V8_OBJECTS_ABSTRACT_CODE_INL_H_

 #include "src/objects/abstract-code.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/objects/bytecode-array-inl.h"
 #include "src/objects/code-inl.h"
 #include "src/objects/instance-type-inl.h"
@@ -5,9 +5,11 @@
 #ifndef V8_OBJECTS_ALLOCATION_SITE_INL_H_
 #define V8_OBJECTS_ALLOCATION_SITE_INL_H_

+#include "src/objects/allocation-site.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/common/globals.h"
 #include "src/heap/heap-write-barrier-inl.h"
-#include "src/objects/allocation-site.h"
 #include "src/objects/dependent-code-inl.h"
 #include "src/objects/js-objects-inl.h"

@@ -6,6 +6,7 @@
 #define V8_OBJECTS_ALLOCATION_SITE_SCOPES_INL_H_

 #include "src/objects/allocation-site-scopes.h"
+// Include the non-inl header before the rest of the headers.

 #include "src/objects/allocation-site-inl.h"

@@ -5,8 +5,10 @@
 #ifndef V8_OBJECTS_ARGUMENTS_INL_H_
 #define V8_OBJECTS_ARGUMENTS_INL_H_

-#include "src/execution/isolate-inl.h"
 #include "src/objects/arguments.h"
+// Include the non-inl header before the rest of the headers.
+
+#include "src/execution/isolate-inl.h"
 #include "src/objects/contexts-inl.h"
 #include "src/objects/fixed-array-inl.h"
 #include "src/objects/objects-inl.h"
@@ -5,10 +5,12 @@
 #ifndef V8_OBJECTS_BYTECODE_ARRAY_INL_H_
 #define V8_OBJECTS_BYTECODE_ARRAY_INL_H_

+#include "src/objects/bytecode-array.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/common/ptr-compr-inl.h"
 #include "src/heap/heap-write-barrier-inl.h"
 #include "src/interpreter/bytecode-register.h"
-#include "src/objects/bytecode-array.h"
 #include "src/objects/fixed-array-inl.h"

 // Has to be the last include (doesn't have include guards):
@@ -5,8 +5,10 @@
 #ifndef V8_OBJECTS_CALL_SITE_INFO_INL_H_
 #define V8_OBJECTS_CALL_SITE_INFO_INL_H_

-#include "src/heap/heap-write-barrier-inl.h"
 #include "src/objects/call-site-info.h"
+// Include the non-inl header before the rest of the headers.
+
+#include "src/heap/heap-write-barrier-inl.h"
 #include "src/objects/objects-inl.h"
 #include "src/objects/struct-inl.h"

@@ -5,11 +5,13 @@
 #ifndef V8_OBJECTS_CASTING_INL_H_
 #define V8_OBJECTS_CASTING_INL_H_

+#include "src/objects/casting.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/common/globals.h"
 #include "src/execution/isolate.h"
 #include "src/heap/heap-layout.h"
 #include "src/heap/heap.h"
-#include "src/objects/casting.h"
 #include "src/objects/heap-object.h"

 namespace v8::internal {
@@ -6,6 +6,7 @@
 #define V8_OBJECTS_CELL_INL_H_

 #include "src/objects/cell.h"
+// Include the non-inl header before the rest of the headers.

 #include "src/heap/heap-write-barrier-inl.h"
 #include "src/objects/objects-inl.h"
@@ -5,12 +5,14 @@
 #ifndef V8_OBJECTS_CODE_INL_H_
 #define V8_OBJECTS_CODE_INL_H_

+#include "src/objects/code.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/baseline/bytecode-offset-iterator.h"
 #include "src/codegen/code-desc.h"
 #include "src/deoptimizer/deoptimize-reason.h"
 #include "src/heap/heap-layout-inl.h"
 #include "src/heap/heap-write-barrier-inl.h"
-#include "src/objects/code.h"
 #include "src/objects/deoptimization-data-inl.h"
 #include "src/objects/instance-type-inl.h"
 #include "src/objects/instruction-stream-inl.h"
@@ -5,9 +5,11 @@
 #ifndef V8_OBJECTS_COMPILATION_CACHE_TABLE_INL_H_
 #define V8_OBJECTS_COMPILATION_CACHE_TABLE_INL_H_

+#include "src/objects/compilation-cache-table.h"
+// Include the non-inl header before the rest of the headers.
+
 #include <optional>

-#include "src/objects/compilation-cache-table.h"
 #include "src/objects/name-inl.h"
 #include "src/objects/script-inl.h"
 #include "src/objects/shared-function-info.h"
@@ -7,9 +7,11 @@

 #ifdef V8_COMPRESS_POINTERS

+#include "src/objects/compressed-slots.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/common/ptr-compr-inl.h"
 #include "src/objects/casting.h"
-#include "src/objects/compressed-slots.h"
 #include "src/objects/maybe-object-inl.h"

 namespace v8::internal {
@@ -5,10 +5,12 @@
 #ifndef V8_OBJECTS_CONTEXTS_INL_H_
 #define V8_OBJECTS_CONTEXTS_INL_H_

+#include "src/objects/contexts.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/common/globals.h"
 #include "src/heap/heap-write-barrier.h"
 #include "src/objects/casting.h"
-#include "src/objects/contexts.h"
 #include "src/objects/dictionary-inl.h"
 #include "src/objects/fixed-array-inl.h"
 #include "src/objects/js-function-inl.h"
@@ -6,6 +6,8 @@
 #define V8_OBJECTS_DATA_HANDLER_INL_H_

 #include "src/objects/data-handler.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/objects/objects-inl.h"  // Needed for write barriers

 // Has to be the last include (doesn't have include guards):
@@ -5,11 +5,13 @@
 #ifndef V8_OBJECTS_DEBUG_OBJECTS_INL_H_
 #define V8_OBJECTS_DEBUG_OBJECTS_INL_H_

+#include "src/objects/debug-objects.h"
+// Include the non-inl header before the rest of the headers.
+
 #include "src/codegen/optimized-compilation-info.h"
 #include "src/heap/heap-write-barrier-inl.h"
 #include "src/objects/bytecode-array-inl.h"
 #include "src/objects/code-inl.h"
-#include "src/objects/debug-objects.h"
 #include "src/objects/objects-inl.h"
 #include "src/objects/shared-function-info.h"
 #include "src/objects/string.h"
@@ -5,8 +5,10 @@
 #ifndef V8_OBJECTS_DEOPTIMIZATION_DATA_INL_H_
 #define V8_OBJECTS_DEOPTIMIZATION_DATA_INL_H_

-#include "src/common/ptr-compr-inl.h"
 #include "src/objects/deoptimization-data.h"
+// Include the non-inl header before the rest of the headers.
+
+#include "src/common/ptr-compr-inl.h"
 #include "src/objects/fixed-array-inl.h"
 #include "src/objects/js-regexp-inl.h"