diff --git a/src/intel/compiler/brw_fs_builder.h b/src/intel/compiler/brw_builder.h
similarity index 100%
rename from src/intel/compiler/brw_fs_builder.h
rename to src/intel/compiler/brw_builder.h
diff --git a/src/intel/compiler/brw_compile_cs.cpp b/src/intel/compiler/brw_compile_cs.cpp
index 7a6b6a39594..db898524629 100644
--- a/src/intel/compiler/brw_compile_cs.cpp
+++ b/src/intel/compiler/brw_compile_cs.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 #include "brw_fs_live_variables.h"
 #include "brw_generator.h"
 #include "brw_nir.h"
diff --git a/src/intel/compiler/brw_compile_fs.cpp b/src/intel/compiler/brw_compile_fs.cpp
index efeb9b4a34a..3b7c965f878 100644
--- a/src/intel/compiler/brw_compile_fs.cpp
+++ b/src/intel/compiler/brw_compile_fs.cpp
@@ -5,7 +5,7 @@
 
 #include "brw_eu.h"
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 #include "brw_fs_live_variables.h"
 #include "brw_generator.h"
 #include "brw_nir.h"
diff --git a/src/intel/compiler/brw_compile_gs.cpp b/src/intel/compiler/brw_compile_gs.cpp
index a3666df86df..a312f9d0e3c 100644
--- a/src/intel/compiler/brw_compile_gs.cpp
+++ b/src/intel/compiler/brw_compile_gs.cpp
@@ -5,7 +5,7 @@
 
 #include "brw_eu.h"
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 #include "brw_generator.h"
 #include "brw_prim.h"
 #include "brw_nir.h"
diff --git a/src/intel/compiler/brw_compile_mesh.cpp b/src/intel/compiler/brw_compile_mesh.cpp
index 33e0aa0e739..e9030159dc8 100644
--- a/src/intel/compiler/brw_compile_mesh.cpp
+++ b/src/intel/compiler/brw_compile_mesh.cpp
@@ -25,7 +25,7 @@
 #include <vector>
 #include "brw_compiler.h"
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 #include "brw_generator.h"
 #include "brw_nir.h"
 #include "brw_private.h"
diff --git a/src/intel/compiler/brw_compile_tcs.cpp b/src/intel/compiler/brw_compile_tcs.cpp
index df7595e7970..7ff8576e111 100644
--- a/src/intel/compiler/brw_compile_tcs.cpp
+++ b/src/intel/compiler/brw_compile_tcs.cpp
@@ -7,7 +7,7 @@
 #include "intel_nir.h"
 #include "brw_nir.h"
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 #include "brw_generator.h"
 #include "brw_private.h"
 #include "dev/intel_debug.h"
diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp
index 8812309b723..2fb6ec8428d 100644
--- a/src/intel/compiler/brw_fs.cpp
+++ b/src/intel/compiler/brw_fs.cpp
@@ -30,7 +30,7 @@
 
 #include "brw_eu.h"
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 #include "brw_fs_live_variables.h"
 #include "brw_nir.h"
 #include "brw_cfg.h"
diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp
index 2eaa4e95a1e..650c4baa849 100644
--- a/src/intel/compiler/brw_fs_nir.cpp
+++ b/src/intel/compiler/brw_fs_nir.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 #include "brw_nir.h"
 #include "brw_eu.h"
 #include "nir.h"
diff --git a/src/intel/compiler/brw_fs_reg_allocate.cpp b/src/intel/compiler/brw_fs_reg_allocate.cpp
index 6c48cdf6aa9..50077f8a71a 100644
--- a/src/intel/compiler/brw_fs_reg_allocate.cpp
+++ b/src/intel/compiler/brw_fs_reg_allocate.cpp
@@ -27,7 +27,7 @@
 
 #include "brw_eu.h"
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 #include "brw_cfg.h"
 #include "util/set.h"
 #include "util/register_allocate.h"
diff --git a/src/intel/compiler/brw_fs_thread_payload.cpp b/src/intel/compiler/brw_fs_thread_payload.cpp
index d83f298cb6e..05a37caaab3 100644
--- a/src/intel/compiler/brw_fs_thread_payload.cpp
+++ b/src/intel/compiler/brw_fs_thread_payload.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 
 using namespace brw;
 
diff --git a/src/intel/compiler/brw_fs_visitor.cpp b/src/intel/compiler/brw_fs_visitor.cpp
index b055c9fc031..d1ddb8bea8b 100644
--- a/src/intel/compiler/brw_fs_visitor.cpp
+++ b/src/intel/compiler/brw_fs_visitor.cpp
@@ -29,7 +29,7 @@
  */
 #include "brw_eu.h"
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 #include "brw_nir.h"
 #include "compiler/glsl_types.h"
 #include "dev/intel_device_info.h"
diff --git a/src/intel/compiler/brw_lower.cpp b/src/intel/compiler/brw_lower.cpp
index 67ba76b67b4..bb6dc735887 100644
--- a/src/intel/compiler/brw_lower.cpp
+++ b/src/intel/compiler/brw_lower.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 
 using namespace brw;
 
diff --git a/src/intel/compiler/brw_lower_dpas.cpp b/src/intel/compiler/brw_lower_dpas.cpp
index 0f30e50253f..77d08721049 100644
--- a/src/intel/compiler/brw_lower_dpas.cpp
+++ b/src/intel/compiler/brw_lower_dpas.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 
 using namespace brw;
 
diff --git a/src/intel/compiler/brw_lower_integer_multiplication.cpp b/src/intel/compiler/brw_lower_integer_multiplication.cpp
index 3f3a51766d3..0597c05579e 100644
--- a/src/intel/compiler/brw_lower_integer_multiplication.cpp
+++ b/src/intel/compiler/brw_lower_integer_multiplication.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 
 using namespace brw;
 
diff --git a/src/intel/compiler/brw_lower_logical_sends.cpp b/src/intel/compiler/brw_lower_logical_sends.cpp
index abd5c223466..821c5ea2cc2 100644
--- a/src/intel/compiler/brw_lower_logical_sends.cpp
+++ b/src/intel/compiler/brw_lower_logical_sends.cpp
@@ -27,7 +27,7 @@
 
 #include "brw_eu.h"
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 
 using namespace brw;
 
diff --git a/src/intel/compiler/brw_lower_pack.cpp b/src/intel/compiler/brw_lower_pack.cpp
index 4523771b56f..8b9fa3f6539 100644
--- a/src/intel/compiler/brw_lower_pack.cpp
+++ b/src/intel/compiler/brw_lower_pack.cpp
@@ -24,7 +24,7 @@
 #include "util/half_float.h"
 #include "brw_fs.h"
 #include "brw_cfg.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 
 using namespace brw;
 
diff --git a/src/intel/compiler/brw_lower_regioning.cpp b/src/intel/compiler/brw_lower_regioning.cpp
index 2b9010d0141..229d57c9197 100644
--- a/src/intel/compiler/brw_lower_regioning.cpp
+++ b/src/intel/compiler/brw_lower_regioning.cpp
@@ -23,7 +23,7 @@
 
 #include "brw_fs.h"
 #include "brw_cfg.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 
 using namespace brw;
 
diff --git a/src/intel/compiler/brw_lower_scoreboard.cpp b/src/intel/compiler/brw_lower_scoreboard.cpp
index ceea789d06a..1a751fc9b1a 100644
--- a/src/intel/compiler/brw_lower_scoreboard.cpp
+++ b/src/intel/compiler/brw_lower_scoreboard.cpp
@@ -55,7 +55,7 @@
  */
 
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 #include "brw_cfg.h"
 
 using namespace brw;
diff --git a/src/intel/compiler/brw_lower_simd_width.cpp b/src/intel/compiler/brw_lower_simd_width.cpp
index a120bb3ac9a..c97d1c77be6 100644
--- a/src/intel/compiler/brw_lower_simd_width.cpp
+++ b/src/intel/compiler/brw_lower_simd_width.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 
 using namespace brw;
 
diff --git a/src/intel/compiler/brw_lower_subgroup_ops.cpp b/src/intel/compiler/brw_lower_subgroup_ops.cpp
index 80e4ac564ac..20bc3218c19 100644
--- a/src/intel/compiler/brw_lower_subgroup_ops.cpp
+++ b/src/intel/compiler/brw_lower_subgroup_ops.cpp
@@ -7,7 +7,7 @@
 #include "util/half_float.h"
 
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 
 using namespace brw;
 
diff --git a/src/intel/compiler/brw_opt.cpp b/src/intel/compiler/brw_opt.cpp
index 3d883700bda..48b54d6e0d5 100644
--- a/src/intel/compiler/brw_opt.cpp
+++ b/src/intel/compiler/brw_opt.cpp
@@ -5,7 +5,7 @@
 
 #include "brw_eu.h"
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 
 using namespace brw;
 
diff --git a/src/intel/compiler/brw_opt_address_reg_load.cpp b/src/intel/compiler/brw_opt_address_reg_load.cpp
index 3eeaadfdeb1..75465a02b90 100644
--- a/src/intel/compiler/brw_opt_address_reg_load.cpp
+++ b/src/intel/compiler/brw_opt_address_reg_load.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 #include "brw_cfg.h"
 #include "brw_eu.h"
 
diff --git a/src/intel/compiler/brw_opt_algebraic.cpp b/src/intel/compiler/brw_opt_algebraic.cpp
index 2e774feae2d..b9038455944 100644
--- a/src/intel/compiler/brw_opt_algebraic.cpp
+++ b/src/intel/compiler/brw_opt_algebraic.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 #include "util/half_float.h"
 
 using namespace brw;
diff --git a/src/intel/compiler/brw_opt_combine_constants.cpp b/src/intel/compiler/brw_opt_combine_constants.cpp
index 17d0e6d9564..d082fa0c75a 100644
--- a/src/intel/compiler/brw_opt_combine_constants.cpp
+++ b/src/intel/compiler/brw_opt_combine_constants.cpp
@@ -29,7 +29,7 @@
  */
 
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 #include "brw_cfg.h"
 #include "util/half_float.h"
 
diff --git a/src/intel/compiler/brw_opt_cse.cpp b/src/intel/compiler/brw_opt_cse.cpp
index 4508da2b023..6f6fb8a870a 100644
--- a/src/intel/compiler/brw_opt_cse.cpp
+++ b/src/intel/compiler/brw_opt_cse.cpp
@@ -25,7 +25,7 @@
 #include "util/xxhash.h"
 
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 #include "brw_cfg.h"
 
 /** @file
diff --git a/src/intel/compiler/brw_opt_txf_combiner.cpp b/src/intel/compiler/brw_opt_txf_combiner.cpp
index 17f65fe89ef..714020cbd08 100644
--- a/src/intel/compiler/brw_opt_txf_combiner.cpp
+++ b/src/intel/compiler/brw_opt_txf_combiner.cpp
@@ -5,7 +5,7 @@
 
 #include "brw_eu.h"
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 
 using namespace brw;
 
diff --git a/src/intel/compiler/brw_opt_virtual_grfs.cpp b/src/intel/compiler/brw_opt_virtual_grfs.cpp
index 14b6b98fe1a..6129a6916bc 100644
--- a/src/intel/compiler/brw_opt_virtual_grfs.cpp
+++ b/src/intel/compiler/brw_opt_virtual_grfs.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 
 using namespace brw;
 
diff --git a/src/intel/compiler/brw_workaround.cpp b/src/intel/compiler/brw_workaround.cpp
index 895605d23ba..fdb004d0ce6 100644
--- a/src/intel/compiler/brw_workaround.cpp
+++ b/src/intel/compiler/brw_workaround.cpp
@@ -4,7 +4,7 @@
  */
 
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 
 using namespace brw;
 
diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build
index 50179f7a646..a42f881341e 100644
--- a/src/intel/compiler/meson.build
+++ b/src/intel/compiler/meson.build
@@ -21,6 +21,7 @@ intel_nir_files = files(
 )
 
 libintel_compiler_brw_files = files(
+  'brw_builder.h',
   'brw_cfg.cpp',
   'brw_cfg.h',
   'brw_compile_bs.cpp',
@@ -45,7 +46,6 @@ libintel_compiler_brw_files = files(
   'brw_eu_inst.h',
   'brw_eu.h',
   'brw_eu_validate.c',
-  'brw_fs_builder.h',
   'brw_fs.cpp',
   'brw_fs.h',
   'brw_fs_live_variables.cpp',
diff --git a/src/intel/compiler/test_lower_scoreboard.cpp b/src/intel/compiler/test_lower_scoreboard.cpp
index b367e089476..f2b4944de69 100644
--- a/src/intel/compiler/test_lower_scoreboard.cpp
+++ b/src/intel/compiler/test_lower_scoreboard.cpp
@@ -23,7 +23,7 @@
 
 #include <gtest/gtest.h>
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 #include "brw_cfg.h"
 
 using namespace brw;
diff --git a/src/intel/compiler/test_opt_cmod_propagation.cpp b/src/intel/compiler/test_opt_cmod_propagation.cpp
index 7c6f08f39ac..2ecb7e484ba 100644
--- a/src/intel/compiler/test_opt_cmod_propagation.cpp
+++ b/src/intel/compiler/test_opt_cmod_propagation.cpp
@@ -23,7 +23,7 @@
 
 #include <gtest/gtest.h>
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 #include "brw_cfg.h"
 
 using namespace brw;
diff --git a/src/intel/compiler/test_opt_combine_constants.cpp b/src/intel/compiler/test_opt_combine_constants.cpp
index 3f398df9c36..fa6947775a7 100644
--- a/src/intel/compiler/test_opt_combine_constants.cpp
+++ b/src/intel/compiler/test_opt_combine_constants.cpp
@@ -5,7 +5,7 @@
 
 #include <gtest/gtest.h>
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 #include "brw_cfg.h"
 
 using namespace brw;
diff --git a/src/intel/compiler/test_opt_copy_propagation.cpp b/src/intel/compiler/test_opt_copy_propagation.cpp
index cbbf8b48a2d..efa2182f8c4 100644
--- a/src/intel/compiler/test_opt_copy_propagation.cpp
+++ b/src/intel/compiler/test_opt_copy_propagation.cpp
@@ -23,7 +23,7 @@
 
 #include <gtest/gtest.h>
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 #include "brw_cfg.h"
 
 using namespace brw;
diff --git a/src/intel/compiler/test_opt_cse.cpp b/src/intel/compiler/test_opt_cse.cpp
index e826f5cf487..1cac79909ae 100644
--- a/src/intel/compiler/test_opt_cse.cpp
+++ b/src/intel/compiler/test_opt_cse.cpp
@@ -5,7 +5,7 @@
 
 #include <gtest/gtest.h>
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 #include "brw_cfg.h"
 
 using namespace brw;
diff --git a/src/intel/compiler/test_opt_saturate_propagation.cpp b/src/intel/compiler/test_opt_saturate_propagation.cpp
index eb7ec734946..7031dd8e591 100644
--- a/src/intel/compiler/test_opt_saturate_propagation.cpp
+++ b/src/intel/compiler/test_opt_saturate_propagation.cpp
@@ -23,7 +23,7 @@
 
 #include <gtest/gtest.h>
 #include "brw_fs.h"
-#include "brw_fs_builder.h"
+#include "brw_builder.h"
 #include "brw_cfg.h"
 
 using namespace brw;