diff --git a/BUILD.gn b/BUILD.gn
index e850ba4734..3cfbc8fac1 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1626,6 +1626,7 @@ v8_source_set("torque_generated_definitions") {
     ":generate_bytecode_builtins_list",
     ":run_torque",
     ":v8_internal_headers",
+    ":v8_libbase",
     ":v8_tracing",
   ]
 
diff --git a/src/torque/implementation-visitor.cc b/src/torque/implementation-visitor.cc
index 91b2da982d..11210e7c5a 100644
--- a/src/torque/implementation-visitor.cc
+++ b/src/torque/implementation-visitor.cc
@@ -154,6 +154,8 @@ void ImplementationVisitor::BeginDebugMacrosFile() {
   std::ostream& header = debug_macros_h_;
 
   source << "#include \"torque-generated/debug-macros.h\"\n\n";
+  source << "#include \"src/objects/swiss-name-dictionary.h\"\n";
+  source << "#include \"src/objects/ordered-hash-table.h\"\n";
   source << "#include \"tools/debug_helper/debug-macro-shims.h\"\n";
   source << "#include \"include/v8-internal.h\"\n";
   source << "\n";
@@ -166,13 +168,12 @@ void ImplementationVisitor::BeginDebugMacrosFile() {
   const char* kHeaderDefine = "V8_GEN_TORQUE_GENERATED_DEBUG_MACROS_H_";
   header << "#ifndef " << kHeaderDefine << "\n";
   header << "#define " << kHeaderDefine << "\n\n";
-  header << "#include \"src/builtins/torque-csa-header-includes.h\"\n";
   header << "#include \"tools/debug_helper/debug-helper-internal.h\"\n";
   header << "\n";
 
   header << "namespace v8 {\n"
          << "namespace internal {\n"
-         << "namespace debug_helper_internal{\n"
+         << "namespace debug_helper_internal {\n"
          << "\n";
 }