diff --git a/src/freedreno/common/fd6_hw.h b/src/freedreno/common/fd6_hw.h
new file mode 100644
index 00000000000..bdbc63220a5
--- /dev/null
+++ b/src/freedreno/common/fd6_hw.h
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its susidiaries.
+ * SPDX-License-Identifier: MIT
+ */
+
+#ifndef FD6_HW_H
+#define FD6_HW_H
+
+#include "adreno_pm4.xml.h"
+#include "adreno_common.xml.h"
+
+#include "a6xx.xml.h"
+
+#endif /* FD6_HW_H */
diff --git a/src/freedreno/common/fd6_pack.h b/src/freedreno/common/fd6_pack.h
index 64265da28ea..5b98d62fbb8 100644
--- a/src/freedreno/common/fd6_pack.h
+++ b/src/freedreno/common/fd6_pack.h
@@ -6,7 +6,7 @@
 #ifndef FD6_PACK_H
 #define FD6_PACK_H
 
-#include "a6xx.xml.h"
+#include "fd6_hw.h"
 
 struct fd_reg_pair {
    uint32_t reg;
diff --git a/src/freedreno/common/freedreno_stompable_regs.h b/src/freedreno/common/freedreno_stompable_regs.h
index 2ffab79ce23..c572416420d 100644
--- a/src/freedreno/common/freedreno_stompable_regs.h
+++ b/src/freedreno/common/freedreno_stompable_regs.h
@@ -8,7 +8,7 @@
 
 #include <stdint.h>
 
-#include "a6xx.xml.h"
+#include "fd6_hw.h"
 
 /* In order to debug issues with usage of stale reg data we need to have
  * a list of regs which we allowed to stomp.
diff --git a/src/freedreno/computerator/a6xx.cc b/src/freedreno/computerator/a6xx.cc
index 7eb46ce6fc6..d36bc9d2334 100644
--- a/src/freedreno/computerator/a6xx.cc
+++ b/src/freedreno/computerator/a6xx.cc
@@ -25,9 +25,7 @@
 
 #include "util/u_math.h"
 
-#include "adreno_pm4.xml.h"
-#include "adreno_common.xml.h"
-#include "a6xx.xml.h"
+#include "fd6_hw.h"
 
 #include "common/freedreno_dev_info.h"
 
diff --git a/src/freedreno/decode/rdcompiler-utils.h b/src/freedreno/decode/rdcompiler-utils.h
index f896ff51306..575758f29e0 100644
--- a/src/freedreno/decode/rdcompiler-utils.h
+++ b/src/freedreno/decode/rdcompiler-utils.h
@@ -16,11 +16,7 @@
 
 #include "util/u_math.h"
 
-#include "adreno_common.xml.h"
-#include "adreno_pm4.xml.h"
-#include "freedreno_pm4.h"
-
-#include "a6xx.xml.h"
+#include "fd6_hw.h"
 
 #include "ir3/ir3_assembler.h"
 #include "ir3/ir3_compiler.h"
diff --git a/src/freedreno/decode/rddecompiler.c b/src/freedreno/decode/rddecompiler.c
index 259b3cb7c39..afefe49bb47 100644
--- a/src/freedreno/decode/rddecompiler.c
+++ b/src/freedreno/decode/rddecompiler.c
@@ -24,11 +24,7 @@
 
 #include "util/u_math.h"
 
-#include "adreno_common.xml.h"
-#include "adreno_pm4.xml.h"
-#include "freedreno_pm4.h"
-
-#include "a6xx.xml.h"
+#include "fd6_hw.h"
 #include "common/freedreno_dev_info.h"
 
 #include "util/hash_table.h"
diff --git a/src/freedreno/fdl/fd6_format_table.h b/src/freedreno/fdl/fd6_format_table.h
index 56fb259b010..ee772cf8939 100644
--- a/src/freedreno/fdl/fd6_format_table.h
+++ b/src/freedreno/fdl/fd6_format_table.h
@@ -15,9 +15,7 @@
 
 #include "common/freedreno_common.h"
 
-#include "adreno_pm4.xml.h"
-#include "adreno_common.xml.h"
-#include "a6xx.xml.h"
+#include "fd6_hw.h"
 
 BEGINC;
 
diff --git a/src/freedreno/fdl/fd6_layout.c b/src/freedreno/fdl/fd6_layout.c
index f4d6adfcb46..18ab293c6b9 100644
--- a/src/freedreno/fdl/fd6_layout.c
+++ b/src/freedreno/fdl/fd6_layout.c
@@ -11,9 +11,7 @@
 
 #include "freedreno_layout.h"
 
-#include "adreno_pm4.xml.h"
-#include "adreno_common.xml.h"
-#include "a6xx.xml.h"
+#include "fd6_hw.h"
 
 static bool
 is_r8g8(const struct fdl_layout *layout)
diff --git a/src/freedreno/fdl/fd6_layout_test.c b/src/freedreno/fdl/fd6_layout_test.c
index fe9cb6157aa..ad6cbc1d10b 100644
--- a/src/freedreno/fdl/fd6_layout_test.c
+++ b/src/freedreno/fdl/fd6_layout_test.c
@@ -5,11 +5,7 @@
 
 #include "freedreno_layout.h"
 #include "fd_layout_test.h"
-#include "adreno_common.xml.h"
-#include "adreno_pm4.xml.h"
-#include "a6xx.xml.h"
-
-#include <stdio.h>
+#include "fd6_hw.h"
 
 static const struct testcase
    testcases_a630[] =
diff --git a/src/freedreno/fdl/fd_layout_test.c b/src/freedreno/fdl/fd_layout_test.c
index 4f2dca061af..f913d6fdb06 100644
--- a/src/freedreno/fdl/fd_layout_test.c
+++ b/src/freedreno/fdl/fd_layout_test.c
@@ -5,9 +5,7 @@
 
 #include "freedreno_layout.h"
 #include "fd_layout_test.h"
-#include "adreno_common.xml.h"
-#include "adreno_pm4.xml.h"
-#include "a6xx.xml.h"
+#include "fd6_hw.h"
 
 #include <stdio.h>
 
diff --git a/src/freedreno/perfcntrs/fd6_perfcntr.c b/src/freedreno/perfcntrs/fd6_perfcntr.c
index a983acc35fb..60dc498022f 100644
--- a/src/freedreno/perfcntrs/fd6_perfcntr.c
+++ b/src/freedreno/perfcntrs/fd6_perfcntr.c
@@ -11,9 +11,8 @@
 
 #include "util/half_float.h"
 #include "util/u_math.h"
-#include "adreno_common.xml.h"
-#include "adreno_pm4.xml.h"
-#include "a6xx.xml.h"
+
+#include "fd6_hw.h"
 
 #define REG(_x) REG_A6XX_ ## _x
 #include "freedreno_perfcntr.h"
diff --git a/src/freedreno/perfcntrs/fd7_perfcntr.c b/src/freedreno/perfcntrs/fd7_perfcntr.c
index 63d974b38d3..16ad507227d 100644
--- a/src/freedreno/perfcntrs/fd7_perfcntr.c
+++ b/src/freedreno/perfcntrs/fd7_perfcntr.c
@@ -4,9 +4,8 @@
  */
 
 #include "util/u_math.h"
-#include "adreno_common.xml.h"
-#include "adreno_pm4.xml.h"
-#include "a6xx.xml.h"
+
+#include "fd6_hw.h"
 
 #include "freedreno_perfcntr.h"
 
diff --git a/src/freedreno/vulkan/tu_common.h b/src/freedreno/vulkan/tu_common.h
index a8700e276c3..283dbf8e2e6 100644
--- a/src/freedreno/vulkan/tu_common.h
+++ b/src/freedreno/vulkan/tu_common.h
@@ -55,9 +55,7 @@
 #include "ir3/ir3_compiler.h"
 #include "ir3/ir3_shader.h"
 
-#include "adreno_common.xml.h"
-#include "adreno_pm4.xml.h"
-#include "a6xx.xml.h"
+#include "fd6_hw.h"
 #include "fdl/freedreno_layout.h"
 #include "common/freedreno_dev_info.h"
 #include "common/freedreno_common.h"
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_context.h b/src/gallium/drivers/freedreno/a6xx/fd6_context.h
index b3d342a3772..a85cde8fa16 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_context.h
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_context.h
@@ -18,7 +18,7 @@
 #include "ir3/ir3_shader.h"
 #include "ir3/ir3_descriptor.h"
 
-#include "a6xx.xml.h"
+#include "fd6_hw.h"
 
 struct fd6_lrz_state {
    union {
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_resource.cc b/src/gallium/drivers/freedreno/a6xx/fd6_resource.cc
index 463905cbee7..e0e94b8ecf8 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_resource.cc
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_resource.cc
@@ -17,7 +17,7 @@
 #include "common/freedreno_lrz.h"
 #include "common/freedreno_ubwc.h"
 
-#include "a6xx.xml.h"
+#include "fd6_hw.h"
 
 /* A subset of the valid tiled formats can be compressed.  We do
  * already require tiled in order to be compressed, but just because