diff --git a/src/gallium/drivers/iris/iris_blorp.c b/src/gallium/drivers/iris/iris_blorp.c
index 257b87eb7e6..7b2adfd910a 100644
--- a/src/gallium/drivers/iris/iris_blorp.c
+++ b/src/gallium/drivers/iris/iris_blorp.c
@@ -47,7 +47,7 @@
 #include "genxml/gen_macros.h"
 
 #if GFX_VER >= 9
-#include "blorp/blorp_genX_exec.h"
+#include "blorp/blorp_genX_exec_brw.h"
 #else
 #include "blorp/blorp_genX_exec_elk.h"
 #endif
diff --git a/src/gallium/drivers/iris/iris_indirect_gen.c b/src/gallium/drivers/iris/iris_indirect_gen.c
index 085ac052473..894949f8a44 100644
--- a/src/gallium/drivers/iris/iris_indirect_gen.c
+++ b/src/gallium/drivers/iris/iris_indirect_gen.c
@@ -35,7 +35,7 @@
 
 #if GFX_VER >= 9
 #include "intel/compiler/brw_compiler.h"
-#include "intel/common/intel_genX_state.h"
+#include "intel/common/intel_genX_state_brw.h"
 #else
 #include "intel/compiler/elk/elk_compiler.h"
 #include "intel/common/intel_genX_state_elk.h"
diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 1f5a037f995..3ab54c0b298 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -110,7 +110,7 @@
 
 #if GFX_VER >= 9
 #include "intel/compiler/brw_compiler.h"
-#include "intel/common/intel_genX_state.h"
+#include "intel/common/intel_genX_state_brw.h"
 #else
 #include "intel/compiler/elk/elk_compiler.h"
 #include "intel/common/intel_genX_state_elk.h"
diff --git a/src/intel/blorp/blorp_genX_exec.h b/src/intel/blorp/blorp_genX_exec_brw.h
similarity index 99%
rename from src/intel/blorp/blorp_genX_exec.h
rename to src/intel/blorp/blorp_genX_exec_brw.h
index 7c278be0e60..c65efff26f5 100644
--- a/src/intel/blorp/blorp_genX_exec.h
+++ b/src/intel/blorp/blorp_genX_exec_brw.h
@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef BLORP_GENX_EXEC_H
-#define BLORP_GENX_EXEC_H
+#ifndef BLORP_GENX_EXEC_BRW_H
+#define BLORP_GENX_EXEC_BRW_H
 
 #include "blorp_priv.h"
 #include "dev/intel_device_info.h"
@@ -166,7 +166,7 @@ _blorp_combine_address(struct blorp_batch *batch, void *location,
 #define __gen_combine_address _blorp_combine_address
 
 #include "genxml/genX_pack.h"
-#include "common/intel_genX_state.h"
+#include "common/intel_genX_state_brw.h"
 
 #define _blorp_cmd_length(cmd) cmd ## _length
 #define _blorp_cmd_length_bias(cmd) cmd ## _length_bias
@@ -2706,4 +2706,4 @@ blorp_exec(struct blorp_batch *batch, const struct blorp_params *params)
    }
 }
 
-#endif /* BLORP_GENX_EXEC_H */
+#endif /* BLORP_GENX_EXEC_BRW_H */
diff --git a/src/intel/blorp/meson.build b/src/intel/blorp/meson.build
index e349d0e65cb..ef07f498cc6 100644
--- a/src/intel/blorp/meson.build
+++ b/src/intel/blorp/meson.build
@@ -28,7 +28,7 @@ files_libblorp = files(
 )
 
 files_blorp_brw = files(
-  'blorp_genX_exec.h',
+  'blorp_genX_exec_brw.h',
   'blorp_brw.c',
 )
 
diff --git a/src/intel/common/intel_genX_state.h b/src/intel/common/intel_genX_state_brw.h
similarity index 98%
rename from src/intel/common/intel_genX_state.h
rename to src/intel/common/intel_genX_state_brw.h
index 7c964b1d284..6534b9328b9 100644
--- a/src/intel/common/intel_genX_state.h
+++ b/src/intel/common/intel_genX_state_brw.h
@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef INTEL_GENX_STATE_H
-#define INTEL_GENX_STATE_H
+#ifndef INTEL_GENX_STATE_BRW_H
+#define INTEL_GENX_STATE_BRW_H
 
 #ifndef GFX_VERx10
 #error This file should only be included by genX files.
@@ -182,4 +182,4 @@ preferred_slm_allocation_size(const struct intel_device_info *devinfo)
 }
 #endif
 
-#endif /* INTEL_GENX_STATE_H */
+#endif /* INTEL_GENX_STATE_BRW_H */
diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build
index 5823d01497f..0628e6cae4f 100644
--- a/src/intel/common/meson.build
+++ b/src/intel/common/meson.build
@@ -40,7 +40,7 @@ files_libintel_common = files(
   'intel_engine.h',
   'intel_gem.c',
   'intel_gem.h',
-  'intel_genX_state.h',
+  'intel_genX_state_brw.h',
   'intel_genX_state_elk.h',
   'intel_guardband.h',
   'intel_l3_config.c',
diff --git a/src/intel/vulkan/genX_blorp_exec.c b/src/intel/vulkan/genX_blorp_exec.c
index 11a0e3c7d92..e0d20448e4c 100644
--- a/src/intel/vulkan/genX_blorp_exec.c
+++ b/src/intel/vulkan/genX_blorp_exec.c
@@ -26,13 +26,13 @@
 #include "anv_private.h"
 #include "anv_measure.h"
 
-/* These are defined in anv_private.h and blorp_genX_exec.h */
+/* These are defined in anv_private.h and blorp_genX_exec_brw.h */
 #undef __gen_address_type
 #undef __gen_user_data
 #undef __gen_combine_address
 
 #include "common/intel_l3_config.h"
-#include "blorp/blorp_genX_exec.h"
+#include "blorp/blorp_genX_exec_brw.h"
 
 #include "ds/intel_tracepoints.h"
 
diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index 3b293cfab90..b2f633525a7 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -33,7 +33,7 @@
 #include "genxml/gen_macros.h"
 #include "genxml/genX_pack.h"
 #include "genxml/genX_rt_pack.h"
-#include "common/intel_genX_state.h"
+#include "common/intel_genX_state_brw.h"
 
 #include "ds/intel_tracepoints.h"
 
diff --git a/src/intel/vulkan/genX_cmd_compute.c b/src/intel/vulkan/genX_cmd_compute.c
index ca89dd9905c..22d9e7ecdc5 100644
--- a/src/intel/vulkan/genX_cmd_compute.c
+++ b/src/intel/vulkan/genX_cmd_compute.c
@@ -33,7 +33,7 @@
 #include "genxml/gen_macros.h"
 #include "genxml/genX_pack.h"
 #include "genxml/genX_rt_pack.h"
-#include "common/intel_genX_state.h"
+#include "common/intel_genX_state_brw.h"
 
 #include "ds/intel_tracepoints.h"
 
diff --git a/src/intel/vulkan/genX_cmd_draw.c b/src/intel/vulkan/genX_cmd_draw.c
index 37796f35626..b2181bb7ac7 100644
--- a/src/intel/vulkan/genX_cmd_draw.c
+++ b/src/intel/vulkan/genX_cmd_draw.c
@@ -33,7 +33,7 @@
 #include "genxml/gen_macros.h"
 #include "genxml/genX_pack.h"
 #include "genxml/genX_rt_pack.h"
-#include "common/intel_genX_state.h"
+#include "common/intel_genX_state_brw.h"
 
 #include "ds/intel_tracepoints.h"
 
diff --git a/src/intel/vulkan/genX_cmd_draw_generated_flush.h b/src/intel/vulkan/genX_cmd_draw_generated_flush.h
index d810bee746c..2240d1e1918 100644
--- a/src/intel/vulkan/genX_cmd_draw_generated_flush.h
+++ b/src/intel/vulkan/genX_cmd_draw_generated_flush.h
@@ -29,7 +29,7 @@
 
 #include "util/macros.h"
 
-#include "common/intel_genX_state.h"
+#include "common/intel_genX_state_brw.h"
 
 #include "anv_private.h"
 
diff --git a/src/intel/vulkan/genX_cmd_draw_generated_indirect.h b/src/intel/vulkan/genX_cmd_draw_generated_indirect.h
index 2b48a72f1e4..789dc7a88ad 100644
--- a/src/intel/vulkan/genX_cmd_draw_generated_indirect.h
+++ b/src/intel/vulkan/genX_cmd_draw_generated_indirect.h
@@ -29,7 +29,7 @@
 
 #include "util/macros.h"
 
-#include "common/intel_genX_state.h"
+#include "common/intel_genX_state_brw.h"
 
 #include "anv_private.h"
 #include "anv_internal_kernels.h"
diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c
index 2f692643547..7824960c78d 100644
--- a/src/intel/vulkan/genX_pipeline.c
+++ b/src/intel/vulkan/genX_pipeline.c
@@ -27,7 +27,7 @@
 #include "genxml/genX_pack.h"
 #include "genxml/genX_rt_pack.h"
 
-#include "common/intel_genX_state.h"
+#include "common/intel_genX_state_brw.h"
 #include "common/intel_l3_config.h"
 #include "common/intel_sample_positions.h"
 #include "nir/nir_xfb_info.h"
diff --git a/src/intel/vulkan/genX_simple_shader.c b/src/intel/vulkan/genX_simple_shader.c
index ca6f9f0b143..e34f1cd59d3 100644
--- a/src/intel/vulkan/genX_simple_shader.c
+++ b/src/intel/vulkan/genX_simple_shader.c
@@ -30,7 +30,7 @@
 
 #include "genxml/gen_macros.h"
 #include "genxml/genX_pack.h"
-#include "common/intel_genX_state.h"
+#include "common/intel_genX_state_brw.h"
 
 static void
 genX(emit_simpler_shader_init_fragment)(struct anv_simple_shader *state)
@@ -52,7 +52,7 @@ genX(emit_simpler_shader_init_fragment)(struct anv_simple_shader *state)
     *
     * Find more about how to set up a 3D pipeline with a fragment shader but
     * without a vertex shader in blorp_emit_vertex_elements() in
-    * blorp_genX_exec.h.
+    * blorp_genX_exec_brw.h.
     */
    GENX(VERTEX_ELEMENT_STATE_pack)(
       batch, dw + 1, &(struct GENX(VERTEX_ELEMENT_STATE)) {
diff --git a/src/intel/vulkan_hasvk/genX_blorp_exec.c b/src/intel/vulkan_hasvk/genX_blorp_exec.c
index 1ddb6030384..33f16ad6974 100644
--- a/src/intel/vulkan_hasvk/genX_blorp_exec.c
+++ b/src/intel/vulkan_hasvk/genX_blorp_exec.c
@@ -26,7 +26,7 @@
 #include "anv_private.h"
 #include "anv_measure.h"
 
-/* These are defined in anv_private.h and blorp_genX_exec.h */
+/* These are defined in anv_private.h and blorp_genX_exec_elk.h */
 #undef __gen_address_type
 #undef __gen_user_data
 #undef __gen_combine_address