diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c
index d3f8295de97..be4cc709332 100644
--- a/src/gallium/drivers/iris/iris_bufmgr.c
+++ b/src/gallium/drivers/iris/iris_bufmgr.c
@@ -50,7 +50,7 @@
 #include "errno.h"
 #include "common/intel_aux_map.h"
 #include "common/intel_clflush.h"
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 #include "common/intel_gem.h"
 #include "dev/gen_device_info.h"
 #include "main/macros.h"
diff --git a/src/gallium/drivers/iris/iris_context.h b/src/gallium/drivers/iris/iris_context.h
index f5bf715531c..ccb1a9c043b 100644
--- a/src/gallium/drivers/iris/iris_context.h
+++ b/src/gallium/drivers/iris/iris_context.h
@@ -30,7 +30,7 @@
 #include "util/u_debug.h"
 #include "util/u_threaded_context.h"
 #include "intel/blorp/blorp.h"
-#include "intel/dev/gen_debug.h"
+#include "intel/dev/intel_debug.h"
 #include "intel/common/intel_l3_config.h"
 #include "intel/compiler/brw_compiler.h"
 #include "iris_batch.h"
diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c
index c1914b213b3..1cd96183228 100644
--- a/src/gallium/drivers/iris/iris_resource.c
+++ b/src/gallium/drivers/iris/iris_resource.c
@@ -49,7 +49,7 @@
 #include "iris_resource.h"
 #include "iris_screen.h"
 #include "intel/common/intel_aux_map.h"
-#include "intel/dev/gen_debug.h"
+#include "intel/dev/intel_debug.h"
 #include "isl/isl.h"
 #include "drm-uapi/drm_fourcc.h"
 #include "drm-uapi/i915_drm.h"
diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
index e709ba5a8c3..fb5ff90093f 100644
--- a/src/intel/Makefile.sources
+++ b/src/intel/Makefile.sources
@@ -148,8 +148,8 @@ COMPILER_GENERATED_FILES = \
 	compiler/brw_nir_trig_workarounds.c
 
 DEV_FILES = \
-	dev/gen_debug.c \
-	dev/gen_debug.h \
+	dev/intel_debug.c \
+	dev/intel_debug.h \
 	dev/gen_device_info.c \
 	dev/gen_device_info.h
 
diff --git a/src/intel/blorp/blorp.c b/src/intel/blorp/blorp.c
index cbba0867471..74aafe399e1 100644
--- a/src/intel/blorp/blorp.c
+++ b/src/intel/blorp/blorp.c
@@ -28,7 +28,7 @@
 #include "blorp_priv.h"
 #include "compiler/brw_compiler.h"
 #include "compiler/brw_nir.h"
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 
 const char *
 blorp_shader_type_to_name(enum blorp_shader_type type)
diff --git a/src/intel/compiler/brw_compile_clip.c b/src/intel/compiler/brw_compile_clip.c
index 259c6104021..ff5e84d2e58 100644
--- a/src/intel/compiler/brw_compile_clip.c
+++ b/src/intel/compiler/brw_compile_clip.c
@@ -23,7 +23,7 @@
 
 #include "brw_clip.h"
 
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 
 const unsigned *
 brw_compile_clip(const struct brw_compiler *compiler,
diff --git a/src/intel/compiler/brw_compile_sf.c b/src/intel/compiler/brw_compile_sf.c
index 70c4dbf5a18..4b32d955822 100644
--- a/src/intel/compiler/brw_compile_sf.c
+++ b/src/intel/compiler/brw_compile_sf.c
@@ -24,7 +24,7 @@
 #include "brw_compiler.h"
 #include "brw_eu.h"
 
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 
 struct brw_sf_compile {
    struct brw_codegen func;
diff --git a/src/intel/compiler/brw_compiler.c b/src/intel/compiler/brw_compiler.c
index 480c81cff7c..73a2b07c398 100644
--- a/src/intel/compiler/brw_compiler.c
+++ b/src/intel/compiler/brw_compiler.c
@@ -24,7 +24,7 @@
 #include "brw_compiler.h"
 #include "brw_shader.h"
 #include "brw_eu.h"
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 #include "compiler/nir/nir.h"
 #include "main/errors.h"
 #include "util/debug.h"
diff --git a/src/intel/compiler/brw_disasm_info.c b/src/intel/compiler/brw_disasm_info.c
index 082ff8f3340..b7776dfff20 100644
--- a/src/intel/compiler/brw_disasm_info.c
+++ b/src/intel/compiler/brw_disasm_info.c
@@ -24,7 +24,7 @@
 #include "brw_cfg.h"
 #include "brw_eu.h"
 #include "brw_disasm_info.h"
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 #include "compiler/nir/nir.h"
 
 __attribute__((weak)) void nir_print_instr(UNUSED const nir_instr *instr,
diff --git a/src/intel/compiler/brw_eu.cpp b/src/intel/compiler/brw_eu.cpp
index 4fe6b8d4fb8..802fe8ce8bb 100644
--- a/src/intel/compiler/brw_eu.cpp
+++ b/src/intel/compiler/brw_eu.cpp
@@ -36,7 +36,7 @@
 #include "brw_eu.h"
 #include "brw_shader.h"
 #include "brw_gen_enum.h"
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 
 #include "util/ralloc.h"
 
diff --git a/src/intel/compiler/brw_eu_compact.c b/src/intel/compiler/brw_eu_compact.c
index 1841c95bfc1..d20f7f9cc45 100644
--- a/src/intel/compiler/brw_eu_compact.c
+++ b/src/intel/compiler/brw_eu_compact.c
@@ -81,7 +81,7 @@
 #include "brw_eu.h"
 #include "brw_shader.h"
 #include "brw_disasm_info.h"
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 
 static const uint32_t g45_control_index_table[32] = {
    0b00000000000000000,
diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp
index 9100b8d0a5e..55c0667fdda 100644
--- a/src/intel/compiler/brw_fs.cpp
+++ b/src/intel/compiler/brw_fs.cpp
@@ -36,7 +36,7 @@
 #include "brw_vec4_gs_visitor.h"
 #include "brw_cfg.h"
 #include "brw_dead_control_flow.h"
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 #include "compiler/glsl_types.h"
 #include "compiler/nir/nir_builder.h"
 #include "program/prog_parameter.h"
diff --git a/src/intel/compiler/brw_nir.c b/src/intel/compiler/brw_nir.c
index dae10a0c499..f6321901bc6 100644
--- a/src/intel/compiler/brw_nir.c
+++ b/src/intel/compiler/brw_nir.c
@@ -23,7 +23,7 @@
 
 #include "brw_nir.h"
 #include "brw_shader.h"
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 #include "compiler/glsl_types.h"
 #include "compiler/nir/nir_builder.h"
 #include "util/u_math.h"
diff --git a/src/intel/compiler/brw_shader.cpp b/src/intel/compiler/brw_shader.cpp
index 5382f259b88..128c1685937 100644
--- a/src/intel/compiler/brw_shader.cpp
+++ b/src/intel/compiler/brw_shader.cpp
@@ -26,7 +26,7 @@
 #include "brw_fs.h"
 #include "brw_nir.h"
 #include "brw_vec4_tes.h"
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 #include "main/uniforms.h"
 #include "util/macros.h"
 
diff --git a/src/intel/compiler/brw_vec4.cpp b/src/intel/compiler/brw_vec4.cpp
index 08945d6c437..8fb1c5e3283 100644
--- a/src/intel/compiler/brw_vec4.cpp
+++ b/src/intel/compiler/brw_vec4.cpp
@@ -28,7 +28,7 @@
 #include "brw_vec4_builder.h"
 #include "brw_vec4_vs.h"
 #include "brw_dead_control_flow.h"
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 #include "program/prog_parameter.h"
 #include "util/u_math.h"
 
diff --git a/src/intel/compiler/brw_vec4_generator.cpp b/src/intel/compiler/brw_vec4_generator.cpp
index 1266095eb8b..ac582e8d2a4 100644
--- a/src/intel/compiler/brw_vec4_generator.cpp
+++ b/src/intel/compiler/brw_vec4_generator.cpp
@@ -23,7 +23,7 @@
 #include "brw_vec4.h"
 #include "brw_cfg.h"
 #include "brw_eu.h"
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 #include "util/mesa-sha1.h"
 
 using namespace brw;
diff --git a/src/intel/compiler/brw_vec4_gs_visitor.cpp b/src/intel/compiler/brw_vec4_gs_visitor.cpp
index bdf59aceda3..135ad0000ab 100644
--- a/src/intel/compiler/brw_vec4_gs_visitor.cpp
+++ b/src/intel/compiler/brw_vec4_gs_visitor.cpp
@@ -32,7 +32,7 @@
 #include "brw_cfg.h"
 #include "brw_fs.h"
 #include "brw_nir.h"
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 
 namespace brw {
 
diff --git a/src/intel/compiler/brw_vec4_tcs.cpp b/src/intel/compiler/brw_vec4_tcs.cpp
index b06a03b5b3f..33646904577 100644
--- a/src/intel/compiler/brw_vec4_tcs.cpp
+++ b/src/intel/compiler/brw_vec4_tcs.cpp
@@ -30,7 +30,7 @@
 #include "brw_nir.h"
 #include "brw_vec4_tcs.h"
 #include "brw_fs.h"
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 
 namespace brw {
 
diff --git a/src/intel/compiler/brw_vec4_tes.cpp b/src/intel/compiler/brw_vec4_tes.cpp
index 94856c88cb8..2155f257ea3 100644
--- a/src/intel/compiler/brw_vec4_tes.cpp
+++ b/src/intel/compiler/brw_vec4_tes.cpp
@@ -29,7 +29,7 @@
 
 #include "brw_vec4_tes.h"
 #include "brw_cfg.h"
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 
 namespace brw {
 
diff --git a/src/intel/compiler/brw_vec4_vs_visitor.cpp b/src/intel/compiler/brw_vec4_vs_visitor.cpp
index 07f7a065309..870554a5dbc 100644
--- a/src/intel/compiler/brw_vec4_vs_visitor.cpp
+++ b/src/intel/compiler/brw_vec4_vs_visitor.cpp
@@ -23,7 +23,7 @@
 
 
 #include "brw_vec4_vs.h"
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 
 namespace brw {
 
diff --git a/src/intel/compiler/brw_vue_map.c b/src/intel/compiler/brw_vue_map.c
index bb3146118a9..3bf4e712338 100644
--- a/src/intel/compiler/brw_vue_map.c
+++ b/src/intel/compiler/brw_vue_map.c
@@ -41,7 +41,7 @@
 
 
 #include "brw_compiler.h"
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 
 static inline void
 assign_vue_slot(struct brw_vue_map *vue_map, int varying, int slot)
diff --git a/src/intel/dev/gen_debug.c b/src/intel/dev/intel_debug.c
similarity index 99%
rename from src/intel/dev/gen_debug.c
rename to src/intel/dev/intel_debug.c
index a99abe48e69..3b97cc29b4b 100644
--- a/src/intel/dev/gen_debug.c
+++ b/src/intel/dev/intel_debug.c
@@ -23,7 +23,7 @@
  */
 
 /**
- * \file gen_debug.c
+ * \file intel_debug.c
  *
  * Support for the INTEL_DEBUG environment variable, along with other
  * miscellaneous debugging code.
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 #include "git_sha1.h"
 #include "util/macros.h"
 #include "util/debug.h"
diff --git a/src/intel/dev/gen_debug.h b/src/intel/dev/intel_debug.h
similarity index 98%
rename from src/intel/dev/gen_debug.h
rename to src/intel/dev/intel_debug.h
index efaea6f3418..3222e856f77 100644
--- a/src/intel/dev/gen_debug.h
+++ b/src/intel/dev/intel_debug.h
@@ -23,8 +23,8 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef GEN_DEBUG_H
-#define GEN_DEBUG_H
+#ifndef INTEL_DEBUG_H
+#define INTEL_DEBUG_H
 
 #include <stdint.h>
 #include "compiler/shader_enums.h"
@@ -34,7 +34,7 @@
 extern "C" {
 #endif
 /**
- * \file gen_debug.h
+ * \file intel_debug.h
  *
  * Basic INTEL_DEBUG environment variable handling.  This file defines the
  * list of debugging flags, as well as some macros for handling them.
@@ -175,4 +175,4 @@ extern void *intel_debug_get_identifier_block(void *buffer,
 }
 #endif
 
-#endif /* GEN_DEBUG_H */
+#endif /* INTEL_DEBUG_H */
diff --git a/src/intel/dev/meson.build b/src/intel/dev/meson.build
index 5b6630ef816..df1f994e5e9 100644
--- a/src/intel/dev/meson.build
+++ b/src/intel/dev/meson.build
@@ -21,8 +21,8 @@
 # TODO: android?
 
 files_libintel_dev = files(
-  'gen_debug.c',
-  'gen_debug.h',
+  'intel_debug.c',
+  'intel_debug.h',
   'gen_device_info.c',
   'gen_device_info.h',
 )
diff --git a/src/intel/isl/isl_drm.c b/src/intel/isl/isl_drm.c
index 23e452783fc..1d23d2590b9 100644
--- a/src/intel/isl/isl_drm.c
+++ b/src/intel/isl/isl_drm.c
@@ -29,7 +29,7 @@
 
 #include "isl.h"
 #include "dev/gen_device_info.h"
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 
 uint32_t
 isl_tiling_to_i915_tiling(enum isl_tiling tiling)
diff --git a/src/intel/perf/gen_perf.c b/src/intel/perf/gen_perf.c
index eb94c385c48..34ff97fef9c 100644
--- a/src/intel/perf/gen_perf.c
+++ b/src/intel/perf/gen_perf.c
@@ -37,7 +37,7 @@
 
 #include "common/intel_gem.h"
 
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 #include "dev/gen_device_info.h"
 
 #include "perf/gen_perf.h"
diff --git a/src/intel/perf/gen_perf_query.c b/src/intel/perf/gen_perf_query.c
index 10f9b970926..3e8dec6c617 100644
--- a/src/intel/perf/gen_perf_query.c
+++ b/src/intel/perf/gen_perf_query.c
@@ -25,7 +25,7 @@
 
 #include "common/intel_gem.h"
 
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 #include "dev/gen_device_info.h"
 
 #include "perf/gen_perf.h"
diff --git a/src/intel/tools/aubinator_error_decode.c b/src/intel/tools/aubinator_error_decode.c
index 4158c7d6459..eaa4e417859 100644
--- a/src/intel/tools/aubinator_error_decode.c
+++ b/src/intel/tools/aubinator_error_decode.c
@@ -39,7 +39,7 @@
 #include <zlib.h>
 
 #include "common/intel_decoder.h"
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 #include "util/macros.h"
 
 #define CSI "\e["
diff --git a/src/intel/tools/intel_dump_gpu.c b/src/intel/tools/intel_dump_gpu.c
index 53cc29788a8..e067aeaf5bc 100644
--- a/src/intel/tools/intel_dump_gpu.c
+++ b/src/intel/tools/intel_dump_gpu.c
@@ -43,7 +43,7 @@
 #include "intel_aub.h"
 #include "aub_write.h"
 
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 #include "dev/gen_device_info.h"
 #include "util/macros.h"
 
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index 3af9a80db6c..48783687b2d 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -95,7 +95,7 @@ struct gen_perf_query_result;
 #include "anv_entrypoints.h"
 #include "isl/isl.h"
 
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 #define MESA_LOG_TAG "MESA-INTEL"
 #include "util/log.h"
 #include "wsi_common.h"
diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c b/src/mesa/drivers/dri/i965/brw_blorp.c
index fc239753c71..e839cfda1ae 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp.c
+++ b/src/mesa/drivers/dri/i965/brw_blorp.c
@@ -38,7 +38,7 @@
 #include "brw_state.h"
 #include "brw_buffer_objects.h"
 #include "brw_fbo.h"
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 
 #define FILE_DEBUG_FLAG DEBUG_BLORP
 
diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.c b/src/mesa/drivers/dri/i965/brw_bufmgr.c
index 13c4fa08ef0..7b0643f161c 100644
--- a/src/mesa/drivers/dri/i965/brw_bufmgr.c
+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.c
@@ -46,7 +46,7 @@
 
 #include "errno.h"
 #include "common/intel_clflush.h"
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 #include "common/intel_gem.h"
 #include "dev/gen_device_info.h"
 #include "libdrm_macros.h"
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index 468fb37dbf6..6a26ecc0f4d 100644
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -46,7 +46,7 @@
 
 #include <brw_bufmgr.h>
 
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 #include "common/intel_decoder.h"
 #include "brw_screen.h"
 #include "brw_tex_obj.h"
diff --git a/src/mesa/drivers/dri/i965/brw_disk_cache.c b/src/mesa/drivers/dri/i965/brw_disk_cache.c
index 4b2ea12ebc4..2caf59ec081 100644
--- a/src/mesa/drivers/dri/i965/brw_disk_cache.c
+++ b/src/mesa/drivers/dri/i965/brw_disk_cache.c
@@ -32,7 +32,7 @@
 #include "util/mesa-sha1.h"
 
 #include "compiler/brw_eu.h"
-#include "dev/gen_debug.h"
+#include "dev/intel_debug.h"
 
 #include "brw_context.h"
 #include "brw_program.h"