diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c
index be4cc709332..a2d769750f0 100644
--- a/src/gallium/drivers/iris/iris_bufmgr.c
+++ b/src/gallium/drivers/iris/iris_bufmgr.c
@@ -52,7 +52,7 @@
 #include "common/intel_clflush.h"
 #include "dev/intel_debug.h"
 #include "common/intel_gem.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "main/macros.h"
 #include "os/os_mman.h"
 #include "util/debug.h"
diff --git a/src/gallium/drivers/iris/iris_screen.h b/src/gallium/drivers/iris/iris_screen.h
index ee2bc856db9..116fe7695fe 100644
--- a/src/gallium/drivers/iris/iris_screen.h
+++ b/src/gallium/drivers/iris/iris_screen.h
@@ -28,7 +28,7 @@
 #include "util/disk_cache.h"
 #include "util/slab.h"
 #include "util/u_screen.h"
-#include "intel/dev/gen_device_info.h"
+#include "intel/dev/intel_device_info.h"
 #include "intel/isl/isl.h"
 #include "iris_bufmgr.h"
 #include "iris_binder.h"
diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
index fb5ff90093f..9d414868172 100644
--- a/src/intel/Makefile.sources
+++ b/src/intel/Makefile.sources
@@ -150,8 +150,8 @@ COMPILER_GENERATED_FILES = \
 DEV_FILES = \
 	dev/intel_debug.c \
 	dev/intel_debug.h \
-	dev/gen_device_info.c \
-	dev/gen_device_info.h
+	dev/intel_device_info.c \
+	dev/intel_device_info.h
 
 GENXML_XML_FILES = \
 	genxml/gen4.xml \
diff --git a/src/intel/blorp/blorp_genX_exec.h b/src/intel/blorp/blorp_genX_exec.h
index e208ec8fc6b..accfaa48a28 100644
--- a/src/intel/blorp/blorp_genX_exec.h
+++ b/src/intel/blorp/blorp_genX_exec.h
@@ -25,7 +25,7 @@
 #define BLORP_GENX_EXEC_H
 
 #include "blorp_priv.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "common/intel_sample_positions.h"
 #include "common/intel_l3_config.h"
 #include "genxml/gen_macros.h"
diff --git a/src/intel/common/intel_aux_map.c b/src/intel/common/intel_aux_map.c
index 2576d5ee058..5777fc7ce42 100644
--- a/src/intel/common/intel_aux_map.c
+++ b/src/intel/common/intel_aux_map.c
@@ -77,7 +77,7 @@
 #include "intel_aux_map.h"
 #include "intel_gem.h"
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "isl/isl.h"
 
 #include "drm-uapi/i915_drm.h"
diff --git a/src/intel/common/intel_decoder.h b/src/intel/common/intel_decoder.h
index 3a069bb57bc..e3c185d21bd 100644
--- a/src/intel/common/intel_decoder.h
+++ b/src/intel/common/intel_decoder.h
@@ -28,7 +28,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "util/hash_table.h"
 #include "util/bitset.h"
 
diff --git a/src/intel/common/intel_disasm.h b/src/intel/common/intel_disasm.h
index b2bed3a9b9e..d3938f85c19 100644
--- a/src/intel/common/intel_disasm.h
+++ b/src/intel/common/intel_disasm.h
@@ -24,7 +24,7 @@
 #ifndef INTEL_DISASM_H
 #define INTEL_DISASM_H
 
-#include "intel/dev/gen_device_info.h"
+#include "intel/dev/intel_device_info.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/intel/common/intel_l3_config.h b/src/intel/common/intel_l3_config.h
index 0cf89501346..947e6b2c5ac 100644
--- a/src/intel/common/intel_l3_config.h
+++ b/src/intel/common/intel_l3_config.h
@@ -26,7 +26,7 @@
 
 #include <stdio.h>
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 
 /**
  * Chunk of L3 cache reserved for some specific purpose.
diff --git a/src/intel/common/intel_measure.c b/src/intel/common/intel_measure.c
index 2c46eb82bd8..326ae79d5e3 100644
--- a/src/intel/common/intel_measure.c
+++ b/src/intel/common/intel_measure.c
@@ -37,7 +37,7 @@
 #define __STDC_FORMAT_MACROS 1
 #include <inttypes.h>
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "util/debug.h"
 #include "util/macros.h"
 #include "util/u_debug.h"
diff --git a/src/intel/common/intel_uuid.h b/src/intel/common/intel_uuid.h
index 53336b34800..6eefd5912c5 100644
--- a/src/intel/common/intel_uuid.h
+++ b/src/intel/common/intel_uuid.h
@@ -25,7 +25,7 @@
 #ifndef INTEL_UUID_H
 #define INTEL_UUID_H
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "isl/isl.h"
 
 #ifdef __cplusplus
diff --git a/src/intel/common/mi_builder.h b/src/intel/common/mi_builder.h
index 6362f8fce6e..f3280fdcab1 100644
--- a/src/intel/common/mi_builder.h
+++ b/src/intel/common/mi_builder.h
@@ -24,7 +24,7 @@
 #ifndef MI_BUILDER_H
 #define MI_BUILDER_H
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "genxml/genX_bits.h"
 #include "util/bitscan.h"
 #include "util/fast_idiv_by_const.h"
diff --git a/src/intel/common/tests/mi_builder_test.cpp b/src/intel/common/tests/mi_builder_test.cpp
index bc5ed6b7e59..6a39c70b175 100644
--- a/src/intel/common/tests/mi_builder_test.cpp
+++ b/src/intel/common/tests/mi_builder_test.cpp
@@ -27,7 +27,7 @@
 
 #include <gtest/gtest.h>
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "drm-uapi/i915_drm.h"
 #include "genxml/gen_macros.h"
 #include "util/macros.h"
diff --git a/src/intel/compiler/brw_compiler.h b/src/intel/compiler/brw_compiler.h
index c1ad4500e80..7ce9924f6b2 100644
--- a/src/intel/compiler/brw_compiler.h
+++ b/src/intel/compiler/brw_compiler.h
@@ -25,7 +25,7 @@
 #define BRW_COMPILER_H
 
 #include <stdio.h>
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "main/macros.h"
 #include "main/mtypes.h"
 #include "util/ralloc.h"
diff --git a/src/intel/compiler/brw_eu_defines.h b/src/intel/compiler/brw_eu_defines.h
index 21c719fa136..dcce7511646 100644
--- a/src/intel/compiler/brw_eu_defines.h
+++ b/src/intel/compiler/brw_eu_defines.h
@@ -35,7 +35,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include "util/macros.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 
 /* The following hunk, up-to "Execution Unit" is used by both the
  * intel/compiler and i965 codebase. */
diff --git a/src/intel/compiler/brw_gen_enum.h b/src/intel/compiler/brw_gen_enum.h
index 9af169b93c3..6cbcbab1b54 100644
--- a/src/intel/compiler/brw_gen_enum.h
+++ b/src/intel/compiler/brw_gen_enum.h
@@ -22,7 +22,7 @@
  */
 
 #include "util/macros.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 
 enum gen {
    GFX4    = (1 << 0),
diff --git a/src/intel/compiler/brw_inst.h b/src/intel/compiler/brw_inst.h
index d76e112bdd4..81657845aa6 100644
--- a/src/intel/compiler/brw_inst.h
+++ b/src/intel/compiler/brw_inst.h
@@ -36,7 +36,7 @@
 
 #include "brw_eu_defines.h"
 #include "brw_reg_type.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/intel/compiler/brw_reg_type.c b/src/intel/compiler/brw_reg_type.c
index fb1124e2530..e389937cde8 100644
--- a/src/intel/compiler/brw_reg_type.c
+++ b/src/intel/compiler/brw_reg_type.c
@@ -23,7 +23,7 @@
 
 #include "brw_reg.h"
 #include "brw_eu_defines.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 
 #define INVALID (-1)
 
diff --git a/src/intel/dev/intel_dev_info.c b/src/intel/dev/intel_dev_info.c
index 32ac3caeeb2..a3730310d9c 100644
--- a/src/intel/dev/intel_dev_info.c
+++ b/src/intel/dev/intel_dev_info.c
@@ -33,7 +33,7 @@
 
 #include <xf86drm.h>
 
-#include "gen_device_info.h"
+#include "intel_device_info.h"
 
 static int
 error(char *fmt, ...)
diff --git a/src/intel/dev/gen_device_info.c b/src/intel/dev/intel_device_info.c
similarity index 99%
rename from src/intel/dev/gen_device_info.c
rename to src/intel/dev/intel_device_info.c
index 082790ce029..1550b0f0c3d 100644
--- a/src/intel/dev/gen_device_info.c
+++ b/src/intel/dev/intel_device_info.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include "gen_device_info.h"
+#include "intel_device_info.h"
 #include "compiler/shader_enums.h"
 #include "intel/common/intel_gem.h"
 #include "util/bitscan.h"
diff --git a/src/intel/dev/gen_device_info.h b/src/intel/dev/intel_device_info.h
similarity index 99%
rename from src/intel/dev/gen_device_info.h
rename to src/intel/dev/intel_device_info.h
index fe5ac11a388..d42d1c1c2ba 100644
--- a/src/intel/dev/gen_device_info.h
+++ b/src/intel/dev/intel_device_info.h
@@ -22,8 +22,8 @@
   *
   */
 
-#ifndef GEN_DEVICE_INFO_H
-#define GEN_DEVICE_INFO_H
+#ifndef INTEL_DEVICE_INFO_H
+#define INTEL_DEVICE_INFO_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -360,4 +360,4 @@ int gen_get_aperture_size(int fd, uint64_t *size);
 }
 #endif
 
-#endif /* GEN_DEVICE_INFO_H */
+#endif /* INTEL_DEVICE_INFO_H */
diff --git a/src/intel/dev/gen_device_info_test.c b/src/intel/dev/intel_device_info_test.c
similarity index 96%
rename from src/intel/dev/gen_device_info_test.c
rename to src/intel/dev/intel_device_info_test.c
index 815213938d8..3b9e833d0a3 100644
--- a/src/intel/dev/gen_device_info_test.c
+++ b/src/intel/dev/intel_device_info_test.c
@@ -3,7 +3,7 @@
 #include <stdint.h>
 #include <assert.h>
 
-#include "gen_device_info.h"
+#include "intel_device_info.h"
 
 int
 main(int argc, char *argv[])
diff --git a/src/intel/dev/meson.build b/src/intel/dev/meson.build
index edb3e6f5957..a776843d291 100644
--- a/src/intel/dev/meson.build
+++ b/src/intel/dev/meson.build
@@ -23,8 +23,8 @@
 files_libintel_dev = files(
   'intel_debug.c',
   'intel_debug.h',
-  'gen_device_info.c',
-  'gen_device_info.h',
+  'intel_device_info.c',
+  'intel_device_info.h',
 )
 
 libintel_dev = static_library(
@@ -40,7 +40,7 @@ if with_tests
   test('gen_device_info_test',
        executable(
          'gen_device_info_test',
-         'gen_device_info_test.c',
+         'intel_device_info_test.c',
          include_directories : [inc_include, inc_src],
          link_with : libintel_dev,
        ),
diff --git a/src/intel/genxml/gen_bits_header.py b/src/intel/genxml/gen_bits_header.py
index 8b567297343..7cfdcacd0a3 100644
--- a/src/intel/genxml/gen_bits_header.py
+++ b/src/intel/genxml/gen_bits_header.py
@@ -67,7 +67,7 @@ from operator import itemgetter
 
 #include <stdint.h>
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "util/macros.h"
 
 <%def name="emit_per_gen_prop_func(item, prop)">
diff --git a/src/intel/isl/isl_drm.c b/src/intel/isl/isl_drm.c
index 1d23d2590b9..2b82cfcba0a 100644
--- a/src/intel/isl/isl_drm.c
+++ b/src/intel/isl/isl_drm.c
@@ -28,7 +28,7 @@
 #include "drm-uapi/i915_drm.h"
 
 #include "isl.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "dev/intel_debug.h"
 
 uint32_t
diff --git a/src/intel/isl/isl_format.c b/src/intel/isl/isl_format.c
index 5443f6ea0c7..a43ac1e65bf 100644
--- a/src/intel/isl/isl_format.c
+++ b/src/intel/isl/isl_format.c
@@ -25,7 +25,7 @@
 
 #include "isl.h"
 #include "isl_priv.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 
 #include "main/macros.h" /* Needed for MAX3 and MAX2 for format_rgb9e5 */
 #include "util/format_srgb.h"
diff --git a/src/intel/isl/isl_priv.h b/src/intel/isl/isl_priv.h
index fc9d8c591e5..3b807d74b89 100644
--- a/src/intel/isl/isl_priv.h
+++ b/src/intel/isl/isl_priv.h
@@ -28,7 +28,7 @@
 #include <stddef.h>
 #include <strings.h>
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "util/macros.h"
 
 #include "isl.h"
diff --git a/src/intel/isl/tests/isl_surf_get_image_offset_test.c b/src/intel/isl/tests/isl_surf_get_image_offset_test.c
index ead3d802237..d775621a2d0 100644
--- a/src/intel/isl/tests/isl_surf_get_image_offset_test.c
+++ b/src/intel/isl/tests/isl_surf_get_image_offset_test.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "isl/isl.h"
 #include "isl/isl_priv.h"
 
diff --git a/src/intel/perf/gen_perf.c b/src/intel/perf/gen_perf.c
index 34ff97fef9c..e815ab0f73f 100644
--- a/src/intel/perf/gen_perf.c
+++ b/src/intel/perf/gen_perf.c
@@ -38,7 +38,7 @@
 #include "common/intel_gem.h"
 
 #include "dev/intel_debug.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 
 #include "perf/gen_perf.h"
 #include "perf/gen_perf_regs.h"
diff --git a/src/intel/perf/gen_perf_mdapi.c b/src/intel/perf/gen_perf_mdapi.c
index 5508baba589..6c8b9c69209 100644
--- a/src/intel/perf/gen_perf_mdapi.c
+++ b/src/intel/perf/gen_perf_mdapi.c
@@ -26,7 +26,7 @@
 #include "gen_perf_private.h"
 #include "gen_perf_regs.h"
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 
 #include <drm-uapi/i915_drm.h>
 
diff --git a/src/intel/perf/gen_perf_mdapi.h b/src/intel/perf/gen_perf_mdapi.h
index 4e77e2bebcc..37ddb4d7fb7 100644
--- a/src/intel/perf/gen_perf_mdapi.h
+++ b/src/intel/perf/gen_perf_mdapi.h
@@ -26,7 +26,7 @@
 
 #include <stdint.h>
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 
 struct gen_perf_query_result;
 
diff --git a/src/intel/perf/gen_perf_query.c b/src/intel/perf/gen_perf_query.c
index 3e8dec6c617..da685d755e4 100644
--- a/src/intel/perf/gen_perf_query.c
+++ b/src/intel/perf/gen_perf_query.c
@@ -26,7 +26,7 @@
 #include "common/intel_gem.h"
 
 #include "dev/intel_debug.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 
 #include "perf/gen_perf.h"
 #include "perf/gen_perf_mdapi.h"
diff --git a/src/intel/tools/aub_mem.h b/src/intel/tools/aub_mem.h
index 60eacaa9270..8d61c923fa1 100644
--- a/src/intel/tools/aub_mem.h
+++ b/src/intel/tools/aub_mem.h
@@ -30,7 +30,7 @@
 #include "util/list.h"
 #include "util/rb_tree.h"
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "common/intel_decoder.h"
 
 #ifdef __cplusplus
diff --git a/src/intel/tools/aub_read.h b/src/intel/tools/aub_read.h
index 1e788332dcb..7ca17e46075 100644
--- a/src/intel/tools/aub_read.h
+++ b/src/intel/tools/aub_read.h
@@ -27,7 +27,7 @@
 
 #include <stdint.h>
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "drm-uapi/i915_drm.h"
 
 #ifdef __cplusplus
diff --git a/src/intel/tools/aub_write.h b/src/intel/tools/aub_write.h
index d99d3b71b80..e20e6a22b43 100644
--- a/src/intel/tools/aub_write.h
+++ b/src/intel/tools/aub_write.h
@@ -32,7 +32,7 @@
 
 #include "drm-uapi/i915_drm.h"
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "common/intel_gem.h"
 
 #ifdef __cplusplus
diff --git a/src/intel/tools/i965_asm.h b/src/intel/tools/i965_asm.h
index 200b2248fc5..b9d8df414a6 100644
--- a/src/intel/tools/i965_asm.h
+++ b/src/intel/tools/i965_asm.h
@@ -34,7 +34,7 @@
 #include "compiler/brw_eu_defines.h"
 #include "compiler/brw_inst.h"
 #include "compiler/brw_eu.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "util/list.h"
 
 /* glibc < 2.27 defines OVERFLOW in /usr/include/math.h. */
diff --git a/src/intel/tools/i965_disasm.c b/src/intel/tools/i965_disasm.c
index 3c8eaff33ea..1f0e3fba566 100644
--- a/src/intel/tools/i965_disasm.c
+++ b/src/intel/tools/i965_disasm.c
@@ -27,7 +27,7 @@
 #include <getopt.h>
 
 #include "compiler/brw_eu.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "util/u_dynarray.h"
 
 enum opt_input_type {
diff --git a/src/intel/tools/intel_dump_gpu.c b/src/intel/tools/intel_dump_gpu.c
index ef063ec6e4a..eaa3ba757d8 100644
--- a/src/intel/tools/intel_dump_gpu.c
+++ b/src/intel/tools/intel_dump_gpu.c
@@ -44,7 +44,7 @@
 #include "aub_write.h"
 
 #include "dev/intel_debug.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "util/macros.h"
 
 static int close_init_helper(int fd);
diff --git a/src/intel/tools/intel_noop_drm_shim.c b/src/intel/tools/intel_noop_drm_shim.c
index 0486303962e..f45ec1bffbd 100644
--- a/src/intel/tools/intel_noop_drm_shim.c
+++ b/src/intel/tools/intel_noop_drm_shim.c
@@ -33,7 +33,7 @@
 #include <sys/un.h>
 
 #include "common/intel_gem.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "drm-uapi/i915_drm.h"
 #include "drm-shim/drm_shim.h"
 #include "util/macros.h"
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index a0dd982df16..1a6dff4fe83 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -48,7 +48,7 @@
 #include "common/intel_gem.h"
 #include "common/intel_l3_config.h"
 #include "common/intel_measure.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "blorp/blorp.h"
 #include "compiler/brw_compiler.h"
 #include "util/bitset.h"
diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.c b/src/mesa/drivers/dri/i965/brw_bufmgr.c
index 7b0643f161c..1c72872835b 100644
--- a/src/mesa/drivers/dri/i965/brw_bufmgr.c
+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.c
@@ -48,7 +48,7 @@
 #include "common/intel_clflush.h"
 #include "dev/intel_debug.h"
 #include "common/intel_gem.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "libdrm_macros.h"
 #include "main/macros.h"
 #include "util/macros.h"
diff --git a/src/mesa/drivers/dri/i965/brw_screen.h b/src/mesa/drivers/dri/i965/brw_screen.h
index 226cd3387b4..626d11f8986 100644
--- a/src/mesa/drivers/dri/i965/brw_screen.h
+++ b/src/mesa/drivers/dri/i965/brw_screen.h
@@ -34,7 +34,7 @@
 #include "isl/isl.h"
 #include "dri_util.h"
 #include "brw_bufmgr.h"
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "drm-uapi/i915_drm.h"
 #include "util/xmlconfig.h"
 
diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c b/src/mesa/drivers/dri/i965/genX_state_upload.c
index 34b14ed70b2..f6d75d5f766 100644
--- a/src/mesa/drivers/dri/i965/genX_state_upload.c
+++ b/src/mesa/drivers/dri/i965/genX_state_upload.c
@@ -25,7 +25,7 @@
 
 #include "main/samplerobj.h"
 
-#include "dev/gen_device_info.h"
+#include "dev/intel_device_info.h"
 #include "common/intel_sample_positions.h"
 #include "genxml/gen_macros.h"
 #include "common/intel_guardband.h"