amd: remove unnecessary and transitive #includes

Reported by clang tools.
See: https://clangd.llvm.org/guides/include-cleaner

struct ac_cmdbuf had to be moved to ac_cmdbuf_base.h because we can't
include ac_cmdbuf.h->sid.h->amdgfxregs.h in radeon_winsys.h for r300.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41091>

src/amd/common/ac_binary.c

@@ -8,7 +8,6 @@
 
 #include "ac_gpu_info.h"
 #include "util/u_math.h"
-#include "util/u_memory.h"
 
 #include <sid.h>
 #include <stdio.h>

src/amd/common/ac_binary.h

@@ -9,7 +9,6 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {

src/amd/common/ac_cmdbuf.h

@@ -9,7 +9,9 @@
 
 #include <inttypes.h>
 
+#include "ac_cmdbuf_base.h"
 #include "ac_pm4.h"
+#include "sid.h"
 
 #include "util/bitset.h"
 
@@ -17,15 +19,6 @@
 extern "C" {
 #endif
 
-struct ac_cmdbuf {
-   uint32_t cdw;         /* Number of used dwords. */
-   uint32_t max_dw;      /* Maximum number of dwords. */
-   uint32_t reserved_dw; /* Number of dwords reserved. */
-   uint32_t *buf;        /* The base pointer of the chunk. */
-
-   bool context_roll;
-};
-
 /* The structure layout is identical to a pair of registers in SET_*_REG_PAIRS_PACKED. */
 struct ac_gfx11_reg_pair {
    union {

src/amd/common/ac_cmdbuf_base.h

@@ -0,0 +1,20 @@
+/* Copyright 2026 Valve Corporation
+ * SPDX-License-Identifier: MIT
+ */
+
+#ifndef AC_CMDBUF_BASE_H
+#define AC_CMDBUF_BASE_H
+
+#include <stdint.h>
+#include <stdbool.h>
+
+struct ac_cmdbuf {
+   uint32_t cdw;         /* Number of used dwords. */
+   uint32_t max_dw;      /* Maximum number of dwords. */
+   uint32_t reserved_dw; /* Number of dwords reserved. */
+   uint32_t *buf;        /* The base pointer of the chunk. */
+
+   bool context_roll;
+};
+
+#endif

src/amd/common/ac_cmdbuf_sdma.h

@@ -8,7 +8,8 @@
 #ifndef AC_CMDBUF_SDMA_H
 #define AC_CMDBUF_SDMA_H
 
-#include "util/format/u_format.h"
+#include <stdbool.h>
+#include "util/format/u_formats.h"
 
 enum sdma_version;
 struct radeon_info;

src/amd/common/ac_descriptors.c

@@ -11,7 +11,7 @@
 #include "ac_surface.h"
 
 #include "gfx10_format_table.h"
-#include "sid.h"
+#include "amdgfxregs.h"
 
 #include "util/u_math.h"
 #include "util/format/u_format.h"

src/amd/common/ac_descriptors.h

@@ -11,8 +11,6 @@
 #include "ac_gpu_info.h"
 #include "ac_surface.h"
 
-#include "util/format/u_format.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif

src/amd/common/ac_formats.c

@@ -9,7 +9,7 @@
 #include "ac_formats.h"
 #include "ac_gpu_info.h"
 
-#include "sid.h"
+#include "amdgfxregs.h"
 
 uint32_t
 ac_translate_buffer_numformat(const struct util_format_description *desc,

src/amd/common/ac_gpu_info.c

@@ -13,12 +13,10 @@
 
 #include "addrlib/src/amdgpu_asic_addr.h"
 #include "amd_family.h"
-#include "sid.h"
+#include "amdgfxregs.h"
 #include "util/macros.h"
-#include "util/u_cpu_detect.h"
 #include "util/u_math.h"
 #include "util/os_misc.h"
-#include "util/bitset.h"
 
 #include <stdio.h>
 #include <ctype.h>

src/amd/common/ac_gpu_info.h

@@ -8,7 +8,8 @@
 #define AC_GPU_INFO_H
 
 #include <stdbool.h>
-#include "util/macros.h"
+#include <stdint.h>
+#include <stdio.h>
 #include "amd_family.h"
 
 #ifdef __cplusplus

src/amd/common/ac_guardband.c

@@ -9,6 +9,7 @@
 
 #include "ac_gpu_info.h"
 #include "ac_guardband.h"
+#include "util/macros.h"
 
 void
 ac_compute_guardband(const struct radeon_info *info, int minx, int miny,

src/amd/common/ac_msgpack.c

@@ -13,7 +13,6 @@
  */
 
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>

src/amd/common/ac_perfcounter.h

@@ -9,7 +9,7 @@
 
 #include <stdbool.h>
 
-#include "sid.h"
+#include "amdgfxregs.h"
 
 #include "ac_gpu_info.h"
 

src/amd/common/ac_perfcounter_gfx10.c

@@ -4,11 +4,9 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ac_gpu_info.h"
 #include "ac_perfcounter.h"
 #include "ac_spm.h"
 
-#include "util/u_memory.h"
 #include "util/macros.h"
 
 /* gfx10_CB */

src/amd/common/ac_perfcounter_gfx103.c

@@ -4,11 +4,9 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ac_gpu_info.h"
 #include "ac_perfcounter.h"
 #include "ac_spm.h"
 
-#include "util/u_memory.h"
 #include "util/macros.h"
 
 /* gfx103_CB */

src/amd/common/ac_rtld.c

@@ -9,7 +9,6 @@
 #include "ac_binary.h"
 #include "ac_gpu_info.h"
 #include "util/compiler.h"
-#include "util/u_dynarray.h"
 #include "util/u_math.h"
 
 #include <gelf.h>

src/amd/common/ac_rtld.h

@@ -8,7 +8,6 @@
 #define AC_RTLD_H
 
 #include "compiler/shader_enums.h"
-#include "util/u_dynarray.h"
 #include "amd_family.h"
 
 #include <stdbool.h>

src/amd/common/ac_shader_util.c

@@ -7,12 +7,10 @@
 #include "ac_shader_util.h"
 #include "ac_gpu_info.h"
 
-#include "sid.h"
+#include "amdgfxregs.h"
 #include "util/u_math.h"
 
 #include <assert.h>
-#include <stdlib.h>
-#include <string.h>
 
 unsigned ac_get_spi_shader_z_format(bool writes_z, bool writes_stencil, bool writes_samplemask,
                                     bool writes_mrt0_alpha)

src/amd/common/ac_shader_util.h

@@ -10,7 +10,7 @@
 #include "ac_binary.h"
 #include "amd_family.h"
 #include "compiler/shader_enums.h"
-#include "util/format/u_format.h"
+#include "util/format/u_formats.h"
 #include "util/u_math.h"
 
 #include <stdbool.h>

src/amd/common/ac_surface.c

@@ -12,16 +12,14 @@
 #include "addrlib/inc/addrinterface.h"
 #include "addrlib/src/amdgpu_asic_addr.h"
 #include "amd_family.h"
-#include "sid.h"
-#include "util/hash_table.h"
+#include "amdgfxregs.h"
 #include "util/macros.h"
 #include "util/simple_mtx.h"
 #include "util/u_atomic.h"
 #include "util/format/u_format.h"
 #include "util/u_math.h"
-#include "util/u_memory.h"
 
-#include <errno.h>
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 

src/amd/common/ac_surface.h

@@ -8,7 +8,7 @@
 #define AC_SURFACE_H
 
 #include "amd_family.h"
-#include "util/format/u_format.h"
+#include "util/format/u_formats.h"
 
 #include <stdbool.h>
 #include <stdint.h>

src/amd/common/ac_surface_meta_address_test.c

@@ -13,15 +13,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "drm-uapi/amdgpu_drm.h"
-#include "drm-uapi/drm_fourcc.h"
-
 #include "ac_surface.h"
 #include "util/macros.h"
 #include "util/u_atomic.h"
 #include "util/u_math.h"
-#include "util/u_vector.h"
-#include "util/mesa-blake3.h"
 #include "addrlib/inc/addrinterface.h"
 
 #include "ac_surface_test.h"

src/amd/common/ac_surface_modifier_test.c

@@ -6,10 +6,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "drm-uapi/amdgpu_drm.h"
 #include "drm-uapi/drm_fourcc.h"
 
 #include "ac_surface.h"
+#include "util/format/u_format.h"
 #include "util/macros.h"
 #include "util/u_math.h"
 #include "util/u_vector.h"

src/amd/common/ac_surface_test.h

@@ -10,7 +10,6 @@
 
 #include "ac_gpu_info.h"
 #include "amdgfxregs.h"
-#include "addrlib/src/amdgpu_asic_addr.h"
 
 #include "amdgpu_devices.h"
 #include "ac_linux_drm.h"

src/amd/common/ac_uvd_dec.c

@@ -12,7 +12,7 @@
 #include "ac_cmdbuf.h"
 #include "util/os_time.h"
 #include "util/detect_os.h"
-#include "util/bitpack_helpers.h"
+#include "util/u_math.h"
 #include "util/u_memory.h"
 
 #if DETECT_OS_POSIX

src/amd/common/ac_vcn_enc.c

@@ -6,7 +6,6 @@
  *
  **************************************************************************/
 
-#include <stdint.h>
 #include <stdbool.h>
 
 #include "ac_vcn_enc.h"

src/amd/common/ac_vcn_enc.h

@@ -28,6 +28,7 @@
 #ifndef AC_VCN_ENC_H
 #define AC_VCN_ENC_H
 
+#include <stdint.h>
 #include "amd_family.h"
 
 #define RENCODE_IB_OP_INITIALIZE                                                    0x01000001

src/amd/common/ac_video_dec.h

@@ -9,7 +9,6 @@
 
 #include "ac_video.h"
 #include "ac_gpu_info.h"
-#include "util/format/u_format.h"
 
 #define AC_VIDEO_DEC_MAX_REFS 17
 

src/amd/common/amd_family.c

@@ -5,7 +5,6 @@
  */
 
 #include "amd_family.h"
-#include "addrlib/src/amdgpu_asic_addr.h"
 #include "util/macros.h"
 #include "ac_gpu_info.h"
 

src/amd/common/gfx10_format_table.h

@@ -8,7 +8,7 @@
 #define GFX10_FORMAT_TABLE_H
 
 #include "util/format/u_formats.h"
-#include "ac_gpu_info.h"
+#include "amd_family.h"
 
 #include <stdbool.h>
 

src/amd/common/meson.build

@@ -98,6 +98,7 @@ amd_common_files = files(
   'ac_binary.h',
   'ac_cmdbuf.c',
   'ac_cmdbuf.h',
+  'ac_cmdbuf_base.h',
   'ac_cmdbuf_cp.c',
   'ac_cmdbuf_cp.h',
   'ac_cmdbuf_sdma.c',

src/amd/common/nir/ac_nir_helpers.h

@@ -8,9 +8,6 @@
 #ifndef AC_NIR_HELPERS_H
 #define AC_NIR_HELPERS_H
 
-#include "ac_hw_stage.h"
-#include "ac_shader_args.h"
-#include "ac_shader_util.h"
 #include "ac_nir.h"
 #include "nir_defines.h"
 

src/amd/common/nir/ac_nir_lower_image_opcodes_cdna.c

@@ -21,7 +21,6 @@
 
 #include "ac_nir.h"
 #include "nir_builder.h"
-#include "amdgfxregs.h"
 
 static nir_def *get_field(nir_builder *b, nir_def *desc, unsigned index, unsigned mask)
 {

src/amd/common/nir/ac_nir_lower_ngg.c

@@ -7,7 +7,6 @@
 #include "ac_nir.h"
 #include "ac_nir_helpers.h"
 #include "ac_gpu_info.h"
-#include "amdgfxregs.h"
 #include "nir_builder.h"
 #include "nir_xfb_info.h"
 #include "util/u_math.h"

src/amd/common/nir/ac_nir_lower_ngg_gs.c

@@ -7,11 +7,9 @@
 #include "ac_nir.h"
 #include "ac_nir_helpers.h"
 #include "ac_gpu_info.h"
-#include "amdgfxregs.h"
 #include "nir_builder.h"
 #include "nir_xfb_info.h"
 #include "util/u_math.h"
-#include "util/u_vector.h"
 
 typedef struct
 {

src/amd/common/nir/ac_nir_lower_ps_early.c

@@ -13,9 +13,7 @@
  */
 
 #include "ac_nir.h"
-#include "sid.h"
 #include "nir_builder.h"
-#include "nir_builtin_builder.h"
 
 typedef struct {
    const ac_nir_lower_ps_early_options *options;

src/amd/common/nir/ac_nir_lower_ps_late.c

@@ -11,7 +11,7 @@
  */
 
 #include "ac_nir.h"
-#include "sid.h"
+#include "amdgfxregs.h"
 #include "nir_builder.h"
 #include "nir_builtin_builder.h"
 

src/amd/common/nir/ac_nir_lower_taskmesh_io_to_mem.c

@@ -7,8 +7,6 @@
 #include "ac_gpu_info.h"
 #include "ac_nir.h"
 #include "nir_builder.h"
-#include "amdgfxregs.h"
-#include "util/u_math.h"
 
 /*
  * These NIR passes are used to lower NIR cross-stage I/O intrinsics

src/amd/common/nir/ac_nir_lower_tess_io_to_mem.c

@@ -10,7 +10,6 @@
 #include "ac_shader_util.h"
 #include "nir_builder.h"
 #include "nir_tcs_info.h"
-#include "util/u_math.h"
 
 /*
  * These NIR passes are used to lower NIR cross-stage I/O intrinsics into the

src/amd/common/nir/ac_nir_prerast_utils.c

@@ -6,7 +6,7 @@
 
 #include "ac_nir.h"
 #include "ac_nir_helpers.h"
-#include "sid.h"
+#include "amdgfxregs.h"
 
 #include "nir_builder.h"
 #include "nir_xfb_info.h"

src/amd/common/nir/ac_nir_surface.c

@@ -5,9 +5,8 @@
  */
 
 #include "ac_nir_surface.h"
-#include "ac_gpu_info.h"
 #include "nir_builder.h"
-#include "sid.h"
+#include "amdgfxregs.h"
 
 static nir_def *gfx10_nir_meta_addr_from_coord(nir_builder *b, uint32_t gb_addr_config,
                                                const struct gfx9_meta_equation *equation,

src/amd/common/nir/ac_nir_surface.h

@@ -10,7 +10,6 @@
 #include "ac_surface.h"
 #include "amd_family.h"
 #include "nir_defines.h"
-#include "util/format/u_format.h"
 
 #ifdef __cplusplus
 extern "C" {

src/amd/common/virtio/amdgpu_virtio_bo.c

@@ -7,12 +7,8 @@
 #include "drm-uapi/amdgpu_drm.h"
 
 #include "amdgpu_virtio_private.h"
-#include "ac_linux_drm.h"
-#include "util/list.h"
 #include "util/log.h"
 #include "util/os_mman.h"
-#include "util/os_time.h"
-#include "util/u_math.h"
 #include "sid.h"
 
 #include <xf86drm.h>

src/amd/compiler/aco_assembler.cpp

@@ -7,7 +7,7 @@
 #include "aco_builder.h"
 #include "aco_ir.h"
 
-#include "common/sid.h"
+#include "common/amdgfxregs.h"
 
 #include "util/memstream.h"
 

src/amd/compiler/aco_dead_code_analysis.cpp

@@ -6,7 +6,6 @@
 
 #include "aco_ir.h"
 
-#include <algorithm>
 #include <vector>
 
 /*

src/amd/compiler/aco_insert_delay_alu.cpp

@@ -8,7 +8,6 @@
 #include "aco_ir.h"
 
 #include <map>
-#include <stack>
 #include <vector>
 
 namespace aco {

src/amd/compiler/aco_insert_waitcnt.cpp

@@ -7,7 +7,7 @@
 #include "aco_builder.h"
 #include "aco_ir.h"
 
-#include "common/sid.h"
+#include "common/amdgfxregs.h"
 
 #include <map>
 #include <stack>

src/amd/compiler/aco_interface.cpp

@@ -12,8 +12,6 @@
 
 #include "ac_gpu_info.h"
 #include "nir.h"
-#include <array>
-#include <iostream>
 #include <vector>
 
 using namespace aco;

src/amd/compiler/aco_lower_phis.cpp

@@ -10,7 +10,6 @@
 #include "util/enum_operators.h"
 
 #include <algorithm>
-#include <map>
 #include <vector>
 
 namespace aco {

src/amd/compiler/aco_lower_to_hw_instr.cpp

@@ -7,7 +7,7 @@
 #include "aco_builder.h"
 #include "aco_ir.h"
 
-#include "common/sid.h"
+#include "common/amdgfxregs.h"
 
 #include <map>
 #include <vector>

src/amd/compiler/aco_optimizer.cpp

@@ -11,7 +11,6 @@
 #include "util/memstream.h"
 
 #include <algorithm>
-#include <array>
 #include <vector>
 
 namespace aco {

src/amd/compiler/aco_optimizer_postRA.cpp

@@ -4,12 +4,10 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "aco_builder.h"
 #include "aco_ir.h"
 
 #include <algorithm>
 #include <array>
-#include <bitset>
 #include <vector>
 
 namespace aco {

src/amd/compiler/aco_print_asm.cpp

@@ -6,8 +6,6 @@
 
 #include "aco_ir.h"
 
-#include "util/u_debug.h"
-
 #include "amd_family.h"
 
 #if AMD_LLVM_AVAILABLE
@@ -22,7 +20,6 @@
 #endif
 
 #include <array>
-#include <iomanip>
 #include <vector>
 
 namespace aco {

src/amd/compiler/aco_print_ir.cpp

@@ -8,7 +8,7 @@
 #include "aco_ir.h"
 
 #include "common/ac_shader_util.h"
-#include "common/sid.h"
+#include "common/amdgfxregs.h"
 
 #include <array>
 

src/amd/compiler/aco_reduce_assign.cpp

@@ -5,7 +5,6 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "aco_builder.h"
 #include "aco_ir.h"
 
 #include <vector>

src/amd/compiler/aco_repair_ssa.cpp

@@ -6,8 +6,6 @@
 
 #include "aco_ir.h"
 
-#include <functional>
-
 namespace aco {
 
 namespace {

src/amd/compiler/aco_spill.cpp

@@ -9,9 +9,6 @@
 #include "aco_ir.h"
 #include "aco_util.h"
 
-#include "common/ac_descriptors.h"
-#include "common/sid.h"
-
 #include <algorithm>
 #include <cstring>
 #include <map>

src/amd/compiler/aco_util.h

@@ -22,7 +22,6 @@
 #include <type_traits>
 #include <unordered_map>
 #include <unordered_set>
-#include <vector>
 
 namespace aco {
 

src/amd/compiler/aco_validate.cpp

@@ -11,7 +11,6 @@
 
 #include <array>
 #include <map>
-#include <set>
 #include <vector>
 
 namespace aco {

src/amd/compiler/instruction_selection/aco_isel_setup.cpp

@@ -6,7 +6,6 @@
 
 #include "aco_instruction_selection.h"
 #include "aco_interface.h"
-#include "aco_nir_call_attribs.h"
 
 #include "nir_builder.h"
 #include "nir_control_flow.h"

src/amd/compiler/tests/framework.h

@@ -5,12 +5,10 @@
  */
 #ifndef ACO_TEST_COMMON_H
 #define ACO_TEST_COMMON_H
-#include "aco_builder.h"
-#include "aco_ir.h"
 
+#include "aco_builder.h"
 #include "util/macros.h"
 
-#include "ac_shader_util.h"
 #include "amd_family.h"
 #include <map>
 #include <stdio.h>

src/amd/compiler/tests/helpers.h

@@ -9,7 +9,6 @@
 #include "vulkan/vulkan.h"
 
 #include "framework.h"
-#include "ac_gpu_info.h"
 #include "nir_builder.h"
 #include <functional>
 

src/amd/compiler/tests/test_assembler.cpp

@@ -6,7 +6,7 @@
 #include <llvm/Config/llvm-config.h>
 
 #include "helpers.h"
-#include "sid.h"
+#include "amdgfxregs.h"
 
 using namespace aco;
 

src/amd/compiler/tests/test_hard_clause.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 #include "helpers.h"
-#include "sid.h"
+#include "amdgfxregs.h"
 
 using namespace aco;
 

src/amd/drm-shim/amdgpu_noop_drm_shim.c

@@ -5,9 +5,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <string.h>
 #include "common/amdgpu_devices.h"
-#include "common/amd_family.h"
 #include "drm-shim/amdgpu_noop_drm_shim.h"
 #include "drm-shim/drm_shim.h"
 #include "drm-uapi/amdgpu_drm.h"

src/amd/llvm/ac_llvm_build.c

@@ -9,13 +9,12 @@
 #include "ac_nir.h"
 #include "ac_llvm_util.h"
 #include "ac_shader_util.h"
-#include "c11/threads.h"
 #include "shader_enums.h"
 #include "sid.h"
 #include "util/bitscan.h"
+#include "util/format/u_format.h"
 #include "util/macros.h"
 #include "util/u_atomic.h"
-#include "util/u_math.h"
 #include <llvm-c/Core.h>
 #include <llvm/Config/llvm-config.h>
 

src/amd/llvm/ac_llvm_build.h

@@ -7,7 +7,6 @@
 #define AC_LLVM_BUILD_H
 
 #include "ac_llvm_util.h"
-#include "ac_shader_abi.h"
 #include "ac_shader_args.h"
 #include "ac_shader_util.h"
 #include "amd_family.h"

src/amd/llvm/ac_llvm_helper.cpp

@@ -35,7 +35,6 @@
  * with our #define in include/c99_compat.h
  */
 
-#include "ac_binary.h"
 #include "ac_llvm_util.h"
 #include "ac_llvm_build.h"
 #include "util/macros.h"

src/amd/llvm/ac_llvm_util.c

@@ -3,20 +3,18 @@
  *
  * SPDX-License-Identifier: MIT
  */
-/* based on pieces from si_pipe.c and radeon_llvm_emit.c */
-#include "ac_llvm_util.h"
-
-#include "ac_llvm_build.h"
-#include "c11/threads.h"
-#include "util/bitscan.h"
-#include "util/u_math.h"
-#include <llvm-c/Core.h>
-#include <llvm-c/Support.h>
 
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 
+#include <llvm-c/Core.h>
+#include <llvm-c/Support.h>
+
+#include "c11/threads.h"
+#include "ac_llvm_util.h"
+#include "ac_llvm_build.h"
+
 static void ac_init_llvm_target(void)
 {
    LLVMInitializeAMDGPUTargetInfo();

src/amd/llvm/ac_nir_to_llvm.c

@@ -13,7 +13,6 @@
 #include "ac_shader_util.h"
 #include "ac_nir.h"
 #include "nir/nir.h"
-#include "nir/nir_deref.h"
 #include "sid.h"
 #include "util/bitscan.h"
 #include "util/u_math.h"

src/amd/llvm/ac_nir_to_llvm.h

@@ -7,10 +7,7 @@
 #ifndef AC_NIR_TO_LLVM_H
 #define AC_NIR_TO_LLVM_H
 
-#include "amd_family.h"
-#include "compiler/shader_enums.h"
 #include <llvm-c/Core.h>
-#include "llvm-c/TargetMachine.h"
 
 #include <stdbool.h>
 

src/amd/llvm/ac_shader_abi.h

@@ -7,10 +7,8 @@
 #ifndef AC_SHADER_ABI_H
 #define AC_SHADER_ABI_H
 
-#include "ac_shader_args.h"
 #include "ac_shader_util.h"
 #include "compiler/shader_enums.h"
-#include "nir_defines.h"
 #include <llvm-c/Core.h>
 
 #include <assert.h>

src/amd/packets/parse_cp_pm4_table_data_json.py

@@ -690,6 +690,7 @@ def print_packet_parser(is_header):
         print('#include "amd_cp_print_packet_%s.h"' % gfx_version)
         print('#include "amd_cp_packets_%s.h"' % gfx_version)
         print('#include "amdgfxregs.h"')
+        print('#include "util/macros.h"')
 
     # Generate enum-to-string tables.
     if not is_header:

src/amd/vulkan/bvh/build_interface.h

@@ -13,7 +13,6 @@
 #include "build_helpers.h"
 #else
 #include <stdint.h>
-#include "bvh.h"
 #define REF(type) uint64_t
 #define VOID_REF  uint64_t
 #endif

src/amd/vulkan/layers/radv_sqtt_layer.c

@@ -11,12 +11,12 @@
 #include "radv_pipeline_rt.h"
 #include "radv_queue.h"
 #include "radv_shader.h"
-#include "radv_spm.h"
 #include "radv_sqtt.h"
 #include "vk_semaphore.h"
 
 #include "ac_rgp.h"
 #include "ac_sqtt.h"
+#include "util/u_memory.h"
 
 void
 radv_sqtt_emit_relocated_shaders(struct radv_cmd_buffer *cmd_buffer, struct radv_graphics_pipeline *pipeline)

src/amd/vulkan/meta/radv_meta.c

@@ -8,6 +8,7 @@
 
 #include "radv_meta.h"
 #include "radv_debug_nir.h"
+#include "radv_shader_object.h"
 
 #include "vk_common_entrypoints.h"
 #include "vk_pipeline_cache.h"

src/amd/vulkan/meta/radv_meta.h

@@ -20,15 +20,10 @@
 #include "radv_physical_device.h"
 #include "radv_pipeline.h"
 #include "radv_pipeline_compute.h"
-#include "radv_pipeline_graphics.h"
 #include "radv_queue.h"
 #include "radv_shader.h"
-#include "radv_shader_object.h"
 #include "radv_sqtt.h"
 
-#include "vk_render_pass.h"
-#include "vk_shader_module.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif

src/amd/vulkan/meta/radv_meta_astc_decode.c

@@ -7,7 +7,6 @@
 #include <stdbool.h>
 
 #include "radv_meta.h"
-#include "sid.h"
 #include "vk_format.h"
 
 static void

src/amd/vulkan/meta/radv_meta_blit.c

@@ -7,7 +7,7 @@
 #include "nir/radv_meta_nir.h"
 #include "radv_meta.h"
 #include "radv_sampler.h"
-#include "vk_command_pool.h"
+#include "vk_shader_module.h"
 
 static enum glsl_sampler_dim
 translate_sampler_dim(VkImageType type)

src/amd/vulkan/meta/radv_meta_buffer.c

@@ -12,6 +12,7 @@
 #include "radv_debug.h"
 #include "radv_meta.h"
 #include "radv_sdma.h"
+#include "vk_shader_module.h"
 
 #include "radv_cs.h"
 

src/amd/vulkan/meta/radv_meta_clear.c

@@ -5,7 +5,6 @@
  */
 
 #include "nir/radv_meta_nir.h"
-#include "radv_debug.h"
 #include "radv_entrypoints.h"
 #include "radv_formats.h"
 #include "radv_meta.h"

src/amd/vulkan/meta/radv_meta_clear_hiz.c

@@ -7,6 +7,7 @@
 #include "nir/radv_meta_nir.h"
 #include "radv_entrypoints.h"
 #include "radv_meta.h"
+#include "vk_shader_module.h"
 
 static VkResult
 get_clear_hiz_pipeline_layout(struct radv_device *device, VkPipelineLayout *layout_out)

src/amd/vulkan/meta/radv_meta_copy.c

@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "nir/radv_meta_nir.h"
 #include "radv_formats.h"
 #include "radv_meta.h"
 #include "radv_sdma.h"

src/amd/vulkan/meta/radv_meta_copy_indirect_cs.c

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: MIT
  */
 #include "nir/radv_meta_nir.h"
-#include "radv_cs.h"
 #include "radv_formats.h"
 #include "radv_meta.h"
+#include "vk_shader_module.h"
 
 /* Copy memory->memory. */
 static VkResult

src/amd/vulkan/meta/radv_meta_copy_indirect_fs.c

@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: MIT
  */
 #include "nir/radv_meta_nir.h"
-#include "radv_cs.h"
 #include "radv_formats.h"
 #include "radv_meta.h"
+#include "vk_shader_module.h"
 
 static VkResult
 get_gfx_copy_memory_to_image_indirect_pipeline_layout(struct radv_device *device, VkPipelineLayout *layout_out)

src/amd/vulkan/meta/radv_meta_copy_vrs_htile.c

@@ -7,7 +7,7 @@
 #include "nir/radv_meta_nir.h"
 #include "ac_surface.h"
 #include "radv_meta.h"
-#include "vk_format.h"
+#include "vk_shader_module.h"
 
 static VkResult
 get_pipeline(struct radv_device *device, struct radv_image *image, VkPipeline *pipeline_out,

src/amd/vulkan/meta/radv_meta_dcc_retile.c

@@ -8,6 +8,7 @@
 #include "ac_surface.h"
 
 #include "radv_meta.h"
+#include "vk_shader_module.h"
 
 static VkResult
 get_pipeline_layout(struct radv_device *device, VkPipelineLayout *layout_out)

src/amd/vulkan/meta/radv_meta_decompress.c

@@ -9,7 +9,8 @@
 
 #include "nir/radv_meta_nir.h"
 #include "radv_meta.h"
-#include "sid.h"
+
+#include "vk_shader_module.h"
 
 struct radv_htile_expand_key {
    enum radv_meta_object_key_type type;

src/amd/vulkan/meta/radv_meta_etc_decode.c

@@ -7,11 +7,7 @@
 #include <assert.h>
 #include <stdbool.h>
 
-#include "nir/nir_builder.h"
-#include "radv_cs.h"
 #include "radv_meta.h"
-#include "sid.h"
-#include "vk_format.h"
 
 static VkPipeline
 radv_get_etc_decode_pipeline(struct radv_cmd_buffer *cmd_buffer, bool indirect)

src/amd/vulkan/meta/radv_meta_fast_clear.c

@@ -10,6 +10,7 @@
 #include "nir/radv_meta_nir.h"
 #include "radv_cs.h"
 #include "radv_meta.h"
+#include "vk_shader_module.h"
 
 enum radv_color_op {
    FAST_CLEAR_ELIMINATE,

src/amd/vulkan/meta/radv_meta_fmask_copy.c

@@ -7,6 +7,7 @@
 #include "nir/radv_meta_nir.h"
 #include "radv_formats.h"
 #include "radv_meta.h"
+#include "vk_shader_module.h"
 
 static VkResult
 get_pipeline_layout(struct radv_device *device, VkPipelineLayout *layout_out)

src/amd/vulkan/meta/radv_meta_fmask_expand.c

@@ -8,7 +8,7 @@
 #include "nir/radv_meta_nir.h"
 #include "radv_formats.h"
 #include "radv_meta.h"
-#include "vk_format.h"
+#include "vk_shader_module.h"
 
 static VkResult
 get_pipeline_layout(struct radv_device *device, VkPipelineLayout *layout_out)

src/amd/vulkan/meta/radv_meta_resolve_fs.c

@@ -11,6 +11,7 @@
 #include "radv_entrypoints.h"
 #include "radv_meta.h"
 #include "vk_format.h"
+#include "vk_shader_module.h"
 
 static VkResult
 get_gfx_resolve_pipeline_layout(struct radv_device *device, VkPipelineLayout *layout_out)

src/amd/vulkan/nir/radv_nir_lower_abi.c

@@ -12,7 +12,6 @@
 #include "radv_pipeline_graphics.h"
 #include "radv_shader.h"
 #include "radv_shader_args.h"
-#include "sid.h"
 
 #define GET_SGPR_FIELD_NIR(arg, field)                                                                                 \
    ac_nir_unpack_arg(b, &s->args->ac, arg, field##__SHIFT, util_bitcount(field##__MASK))

src/amd/vulkan/nir/radv_nir_lower_descriptors.c

@@ -9,11 +9,10 @@
 #include "nir.h"
 #include "nir_builder.h"
 #include "radv_descriptor_set.h"
-#include "radv_descriptors.h"
 #include "radv_nir.h"
+#include "radv_physical_device.h"
 #include "radv_shader.h"
 #include "radv_shader_args.h"
-#include "sid.h"
 
 typedef struct {
    enum amd_gfx_level gfx_level;

src/amd/vulkan/nir/radv_nir_lower_fs_barycentric.c

@@ -7,8 +7,10 @@
 #include "nir/nir.h"
 #include "nir/nir_builder.h"
 #include "radv_nir.h"
-#include "radv_pipeline_graphics.h"
-#include "sid.h"
+#include "radv_pipeline.h"
+#include "radv_shader.h"
+
+#include "amdgfxregs.h"
 
 typedef struct {
    bool dynamic_rasterization_samples;

src/amd/vulkan/nir/radv_nir_lower_hit_attrib_derefs.c

@@ -7,7 +7,6 @@
 #include "nir.h"
 #include "nir_builder.h"
 #include "nir_deref.h"
-#include "radv_constants.h"
 #include "radv_nir.h"
 
 typedef nir_def *(*load_intrin_cb)(nir_builder *b, unsigned base);

src/amd/vulkan/nir/radv_nir_lower_ray_queries.c

@@ -11,8 +11,9 @@
 
 #include "bvh/bvh.h"
 #include "nir/radv_nir_rt_common.h"
-#include "radv_debug.h"
+#include "radv_device.h"
 #include "radv_nir.h"
+#include "radv_physical_device.h"
 #include "radv_shader.h"
 
 /* Traversal stack size. Traversal supports backtracking so we can go deeper than this size if

src/amd/vulkan/nir/radv_nir_lower_vs_inputs.c

@@ -8,7 +8,6 @@
 #include "nir.h"
 #include "nir_builder.h"
 #include "nir_deref.h"
-#include "radv_constants.h"
 #include "radv_nir.h"
 #include "radv_shader.h"
 #include "radv_shader_args.h"

src/amd/vulkan/nir/radv_nir_opt_fs_builtins.c

@@ -6,8 +6,11 @@
 
 #include "nir/nir.h"
 #include "nir/nir_builder.h"
+
+#include "amdgfxregs.h"
 #include "radv_nir.h"
-#include "radv_pipeline_graphics.h"
+#include "radv_pipeline.h"
+#include "radv_shader.h"
 
 typedef struct {
    const struct radv_graphics_state_key *gfx;