diff --git a/src/intel/compiler/brw/brw_compile_bs.cpp b/src/intel/compiler/brw/brw_compile_bs.cpp
index 0ff1216bbf0..7ae4cd56759 100644
--- a/src/intel/compiler/brw/brw_compile_bs.cpp
+++ b/src/intel/compiler/brw/brw_compile_bs.cpp
@@ -5,7 +5,7 @@
 
 #include "brw_analysis.h"
 #include "brw_shader.h"
-#include "brw_generator.h"
+#include "brw_to_binary.h"
 #include "brw_nir.h"
 #include "brw_cfg.h"
 #include "brw_private.h"
diff --git a/src/intel/compiler/brw/brw_compile_cs.cpp b/src/intel/compiler/brw/brw_compile_cs.cpp
index a9c75a1f950..3fead229b62 100644
--- a/src/intel/compiler/brw/brw_compile_cs.cpp
+++ b/src/intel/compiler/brw/brw_compile_cs.cpp
@@ -6,7 +6,7 @@
 #include "brw_shader.h"
 #include "brw_analysis.h"
 #include "brw_builder.h"
-#include "brw_generator.h"
+#include "brw_to_binary.h"
 #include "brw_nir.h"
 #include "brw_cfg.h"
 #include "brw_private.h"
diff --git a/src/intel/compiler/brw/brw_compile_fs.cpp b/src/intel/compiler/brw/brw_compile_fs.cpp
index 859544b1f8c..4bedc4734ca 100644
--- a/src/intel/compiler/brw/brw_compile_fs.cpp
+++ b/src/intel/compiler/brw/brw_compile_fs.cpp
@@ -7,7 +7,7 @@
 #include "brw_shader.h"
 #include "brw_analysis.h"
 #include "brw_builder.h"
-#include "brw_generator.h"
+#include "brw_to_binary.h"
 #include "brw_nir.h"
 #include "brw_cfg.h"
 #include "brw_private.h"
diff --git a/src/intel/compiler/brw/brw_compile_gs.cpp b/src/intel/compiler/brw/brw_compile_gs.cpp
index 00da268d963..fd06a26934b 100644
--- a/src/intel/compiler/brw/brw_compile_gs.cpp
+++ b/src/intel/compiler/brw/brw_compile_gs.cpp
@@ -6,7 +6,7 @@
 #include "brw_eu.h"
 #include "brw_shader.h"
 #include "brw_builder.h"
-#include "brw_generator.h"
+#include "brw_to_binary.h"
 #include "intel_prim.h"
 #include "brw_nir.h"
 #include "brw_private.h"
diff --git a/src/intel/compiler/brw/brw_compile_mesh.cpp b/src/intel/compiler/brw/brw_compile_mesh.cpp
index 4839648bf4a..648f04dcecf 100644
--- a/src/intel/compiler/brw/brw_compile_mesh.cpp
+++ b/src/intel/compiler/brw/brw_compile_mesh.cpp
@@ -7,7 +7,7 @@
 #include "brw_compiler.h"
 #include "brw_shader.h"
 #include "brw_builder.h"
-#include "brw_generator.h"
+#include "brw_to_binary.h"
 #include "brw_nir.h"
 #include "brw_private.h"
 #include "compiler/nir/nir_builder.h"
diff --git a/src/intel/compiler/brw/brw_compile_tcs.cpp b/src/intel/compiler/brw/brw_compile_tcs.cpp
index 48b7875d2e8..f538b9843dd 100644
--- a/src/intel/compiler/brw/brw_compile_tcs.cpp
+++ b/src/intel/compiler/brw/brw_compile_tcs.cpp
@@ -8,7 +8,7 @@
 #include "brw_nir.h"
 #include "brw_shader.h"
 #include "brw_builder.h"
-#include "brw_generator.h"
+#include "brw_to_binary.h"
 #include "brw_private.h"
 #include "dev/intel_debug.h"
 
diff --git a/src/intel/compiler/brw/brw_compile_tes.cpp b/src/intel/compiler/brw/brw_compile_tes.cpp
index a3d5fcba29b..8ef4e6c6b13 100644
--- a/src/intel/compiler/brw/brw_compile_tes.cpp
+++ b/src/intel/compiler/brw/brw_compile_tes.cpp
@@ -6,7 +6,7 @@
 #include "brw_cfg.h"
 #include "brw_eu.h"
 #include "brw_shader.h"
-#include "brw_generator.h"
+#include "brw_to_binary.h"
 #include "brw_nir.h"
 #include "brw_private.h"
 #include "intel_nir.h"
diff --git a/src/intel/compiler/brw/brw_compile_vs.cpp b/src/intel/compiler/brw/brw_compile_vs.cpp
index 8953b49cbe9..6a49570c372 100644
--- a/src/intel/compiler/brw/brw_compile_vs.cpp
+++ b/src/intel/compiler/brw/brw_compile_vs.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "brw_shader.h"
-#include "brw_generator.h"
+#include "brw_to_binary.h"
 #include "brw_eu.h"
 #include "brw_nir.h"
 #include "brw_private.h"
diff --git a/src/intel/compiler/brw/brw_generator.cpp b/src/intel/compiler/brw/brw_generator.cpp
index 9db5a9d05a5..3d4a29903ce 100644
--- a/src/intel/compiler/brw/brw_generator.cpp
+++ b/src/intel/compiler/brw/brw_generator.cpp
@@ -21,6 +21,8 @@
 #include "util/mesa-blake3.h"
 #include "util/half_float.h"
 
+namespace old {
+
 static gen_opcode
 brw_opcode_to_gen(enum opcode op)
 {
@@ -1645,6 +1647,8 @@ brw_generator::get_assembly()
    return brw_get_program(p, &prog_data->program_size);
 }
 
+} /* namespace old */
+
 /* After program generation, go back and update the UIP and JIP of
  * BREAK, CONT, ENDIF and HALT instructions to their correct locations.
  */
diff --git a/src/intel/compiler/brw/brw_generator.h b/src/intel/compiler/brw/brw_generator.h
index a3285ea9b5b..ebd9280b330 100644
--- a/src/intel/compiler/brw/brw_generator.h
+++ b/src/intel/compiler/brw/brw_generator.h
@@ -7,6 +7,8 @@
 
 #include "brw_shader.h"
 
+namespace old {
+
 /* Translates BRW IR to actual EU assembly code. */
 class brw_generator
 {
@@ -74,3 +76,5 @@ private:
    mesa_shader_stage stage;
    void *mem_ctx;
 };
+
+} /* namespace old */
diff --git a/src/intel/compiler/brw/brw_to_binary.cpp b/src/intel/compiler/brw/brw_to_binary.cpp
index 851b799095e..23fb80f0620 100644
--- a/src/intel/compiler/brw/brw_to_binary.cpp
+++ b/src/intel/compiler/brw/brw_to_binary.cpp
@@ -21,8 +21,6 @@
 #include "util/half_float.h"
 #include "util/os_file.h"
 
-namespace gen {
-
 static gen_opcode
 brw_opcode_to_gen(enum opcode op)
 {
@@ -2383,5 +2381,3 @@ brw_generator::append_reloc(const intel_shader_reloc &r)
    relocs = reralloc(mem_ctx, relocs, intel_shader_reloc, num_relocs + 1);
    relocs[num_relocs++] = r;
 }
-
-} /* namespace gen */
diff --git a/src/intel/compiler/brw/brw_to_binary.h b/src/intel/compiler/brw/brw_to_binary.h
index 1b4ce2fd17c..7af5d94583a 100644
--- a/src/intel/compiler/brw/brw_to_binary.h
+++ b/src/intel/compiler/brw/brw_to_binary.h
@@ -10,8 +10,6 @@
 #include "brw_shader.h"
 #include "gen/gen.h"
 
-namespace gen {
-
 class brw_generator
 {
 public:
@@ -140,5 +138,3 @@ private:
 
    void append_reloc(const intel_shader_reloc &r);
 };
-
-} /* namespace gen */