radv: remove radv_private.h

This file was a giant mess and I'm very happy to remove it entirely.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28568>

86 files changed, 145 insertions, 193 deletions

diff --git a/src/amd/vulkan/layers/radv_annotate_layer_gen.py b/src/amd/vulkan/layers/radv_annotate_layer_gen.py
index 3fd75a0e1a6..aac2992be58 100644
--- a/src/amd/vulkan/layers/radv_annotate_layer_gen.py
+++ b/src/amd/vulkan/layers/radv_annotate_layer_gen.py
@@ -44,7 +44,8 @@ EXCLUDED_COMMANDS = [
 TEMPLATE = Template(COPYRIGHT + """
 /* This file generated from ${filename}, don't edit directly. */
 
-#include "radv_private.h"
+#include "radv_cmd_buffer.h"
+#include "radv_entrypoints.h"
 
 #define ANNOTATE(command, ...) \
    struct radv_cmd_buffer *cmd_buffer = radv_cmd_buffer_from_handle(commandBuffer); \
diff --git a/src/amd/vulkan/layers/radv_ctx_roll_layer.c b/src/amd/vulkan/layers/radv_ctx_roll_layer.c
index 31872468b34..4cadedd0d16 100644
--- a/src/amd/vulkan/layers/radv_ctx_roll_layer.c
+++ b/src/amd/vulkan/layers/radv_ctx_roll_layer.c
@@ -21,8 +21,9 @@
  * IN THE SOFTWARE.
  */
 
+#include "radv_cmd_buffer.h"
 #include "radv_device.h"
-#include "radv_private.h"
+#include "radv_entrypoints.h"
 
 VKAPI_ATTR VkResult VKAPI_CALL
 ctx_roll_QueuePresentKHR(VkQueue _queue, const VkPresentInfoKHR *pPresentInfo)
diff --git a/src/amd/vulkan/layers/radv_metro_exodus.c b/src/amd/vulkan/layers/radv_metro_exodus.c
index 0b1920b3728..8aef519adc2 100644
--- a/src/amd/vulkan/layers/radv_metro_exodus.c
+++ b/src/amd/vulkan/layers/radv_metro_exodus.c
@@ -21,7 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "radv_private.h"
+#include "radv_device.h"
+#include "radv_entrypoints.h"
 #include "vk_common_entrypoints.h"
 
 VKAPI_ATTR VkResult VKAPI_CALL
diff --git a/src/amd/vulkan/layers/radv_quantic_dream.c b/src/amd/vulkan/layers/radv_quantic_dream.c
index f00a57742b5..c9ee32088db 100644
--- a/src/amd/vulkan/layers/radv_quantic_dream.c
+++ b/src/amd/vulkan/layers/radv_quantic_dream.c
@@ -21,7 +21,7 @@
  * IN THE SOFTWARE.
  */
 
-#include "radv_private.h"
+#include "radv_entrypoints.h"
 
 VKAPI_ATTR VkResult VKAPI_CALL
 quantic_dream_UnmapMemory2KHR(VkDevice _device, const VkMemoryUnmapInfoKHR *pMemoryUnmapInfo)
diff --git a/src/amd/vulkan/layers/radv_rage2.c b/src/amd/vulkan/layers/radv_rage2.c
index a9575e9d32f..95a08f935a4 100644
--- a/src/amd/vulkan/layers/radv_rage2.c
+++ b/src/amd/vulkan/layers/radv_rage2.c
@@ -21,8 +21,9 @@
  * IN THE SOFTWARE.
  */
 
+#include "radv_cmd_buffer.h"
 #include "radv_device.h"
-#include "radv_private.h"
+#include "radv_entrypoints.h"
 #include "vk_common_entrypoints.h"
 #include "vk_framebuffer.h"
 
diff --git a/src/amd/vulkan/layers/radv_rmv_layer.c b/src/amd/vulkan/layers/radv_rmv_layer.c
index a507580923b..ddb7b180449 100644
--- a/src/amd/vulkan/layers/radv_rmv_layer.c
+++ b/src/amd/vulkan/layers/radv_rmv_layer.c
@@ -23,7 +23,9 @@
 
 #include "rmv/vk_rmv_common.h"
 #include "rmv/vk_rmv_tokens.h"
-#include "radv_private.h"
+#include "radv_device.h"
+#include "radv_entrypoints.h"
+#include "radv_queue.h"
 #include "vk_common_entrypoints.h"
 
 VKAPI_ATTR VkResult VKAPI_CALL
diff --git a/src/amd/vulkan/layers/radv_rra_layer.c b/src/amd/vulkan/layers/radv_rra_layer.c
index 08f11377fd0..1df3fbfebe1 100644
--- a/src/amd/vulkan/layers/radv_rra_layer.c
+++ b/src/amd/vulkan/layers/radv_rra_layer.c
@@ -24,7 +24,6 @@
 #include "meta/radv_meta.h"
 #include "util/u_process.h"
 #include "radv_event.h"
-#include "radv_private.h"
 #include "radv_rra.h"
 #include "vk_acceleration_structure.h"
 #include "vk_common_entrypoints.h"
diff --git a/src/amd/vulkan/layers/radv_sqtt_layer.c b/src/amd/vulkan/layers/radv_sqtt_layer.c
index 5eae9c6c9f3..c2928d29b52 100644
--- a/src/amd/vulkan/layers/radv_sqtt_layer.c
+++ b/src/amd/vulkan/layers/radv_sqtt_layer.c
@@ -23,8 +23,8 @@
 
 #include "radv_cmd_buffer.h"
 #include "radv_cs.h"
+#include "radv_entrypoints.h"
 #include "radv_pipeline_rt.h"
-#include "radv_private.h"
 #include "radv_queue.h"
 #include "radv_shader.h"
 #include "radv_sqtt.h"
diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
index 36aec490ab9..75456fc3e69 100644
--- a/src/amd/vulkan/meson.build
+++ b/src/amd/vulkan/meson.build
@@ -151,7 +151,6 @@ libradv_files = files(
   'radv_pipeline_rt.h',
   'radv_printf.c',
   'radv_printf.h',
-  'radv_private.h',
   'radv_queue.c',
   'radv_queue.h',
   'radv_radeon_winsys.h',
diff --git a/src/amd/vulkan/meta/radv_meta.h b/src/amd/vulkan/meta/radv_meta.h
index df205eed687..f09516aa540 100644
--- a/src/amd/vulkan/meta/radv_meta.h
+++ b/src/amd/vulkan/meta/radv_meta.h
@@ -31,18 +31,20 @@
 #include "radv_cmd_buffer.h"
 #include "radv_device.h"
 #include "radv_device_memory.h"
+#include "radv_entrypoints.h"
 #include "radv_image.h"
 #include "radv_image_view.h"
 #include "radv_physical_device.h"
 #include "radv_pipeline.h"
 #include "radv_pipeline_compute.h"
 #include "radv_pipeline_graphics.h"
-#include "radv_private.h"
 #include "radv_queue.h"
 #include "radv_shader.h"
 #include "radv_shader_object.h"
 #include "radv_sqtt.h"
 
+#include "vk_shader_module.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/amd/vulkan/meta/radv_meta_astc_decode.c b/src/amd/vulkan/meta/radv_meta_astc_decode.c
index 055f4a50687..1b2aca262c1 100644
--- a/src/amd/vulkan/meta/radv_meta_astc_decode.c
+++ b/src/amd/vulkan/meta/radv_meta_astc_decode.c
@@ -24,7 +24,6 @@
 #include <stdbool.h>
 
 #include "radv_meta.h"
-#include "radv_private.h"
 #include "sid.h"
 #include "vk_common_entrypoints.h"
 #include "vk_format.h"
diff --git a/src/amd/vulkan/meta/radv_meta_blit.c b/src/amd/vulkan/meta/radv_meta_blit.c
index c6f19163013..03b96ac7aef 100644
--- a/src/amd/vulkan/meta/radv_meta_blit.c
+++ b/src/amd/vulkan/meta/radv_meta_blit.c
@@ -23,6 +23,7 @@
 
 #include "nir/nir_builder.h"
 #include "radv_meta.h"
+#include "vk_command_pool.h"
 #include "vk_common_entrypoints.h"
 
 struct blit_region {
diff --git a/src/amd/vulkan/meta/radv_meta_blit2d.c b/src/amd/vulkan/meta/radv_meta_blit2d.c
index 5dcdb9d74d8..5ef6c592e3f 100644
--- a/src/amd/vulkan/meta/radv_meta_blit2d.c
+++ b/src/amd/vulkan/meta/radv_meta_blit2d.c
@@ -25,9 +25,11 @@
  */
 
 #include "nir/nir_builder.h"
+#include "radv_entrypoints.h"
 #include "radv_meta.h"
 #include "vk_common_entrypoints.h"
 #include "vk_format.h"
+#include "vk_shader_module.h"
 
 enum blit2d_src_type {
    BLIT2D_SRC_TYPE_IMAGE,
diff --git a/src/amd/vulkan/meta/radv_meta_bufimage.c b/src/amd/vulkan/meta/radv_meta_bufimage.c
index b54f433d55c..2709bdd85cb 100644
--- a/src/amd/vulkan/meta/radv_meta_bufimage.c
+++ b/src/amd/vulkan/meta/radv_meta_bufimage.c
@@ -22,8 +22,10 @@
  * IN THE SOFTWARE.
  */
 #include "nir/nir_builder.h"
+#include "radv_entrypoints.h"
 #include "radv_meta.h"
 #include "vk_common_entrypoints.h"
+#include "vk_shader_module.h"
 
 /*
  * GFX queue: Compute shader implementation of image->buffer copy
diff --git a/src/amd/vulkan/meta/radv_meta_clear.c b/src/amd/vulkan/meta/radv_meta_clear.c
index 0d8f9360394..a9c510c1d9a 100644
--- a/src/amd/vulkan/meta/radv_meta_clear.c
+++ b/src/amd/vulkan/meta/radv_meta_clear.c
@@ -23,13 +23,14 @@
 
 #include "nir/nir_builder.h"
 #include "radv_debug.h"
+#include "radv_entrypoints.h"
 #include "radv_formats.h"
 #include "radv_meta.h"
-#include "radv_private.h"
 
 #include "util/format_rgb9e5.h"
 #include "vk_common_entrypoints.h"
 #include "vk_format.h"
+#include "vk_shader_module.h"
 
 enum { DEPTH_CLEAR_SLOW, DEPTH_CLEAR_FAST };
 
diff --git a/src/amd/vulkan/meta/radv_meta_copy.c b/src/amd/vulkan/meta/radv_meta_copy.c
index 4c6cdb2c93f..50689ee226a 100644
--- a/src/amd/vulkan/meta/radv_meta_copy.c
+++ b/src/amd/vulkan/meta/radv_meta_copy.c
@@ -23,7 +23,6 @@
 
 #include "radv_formats.h"
 #include "radv_meta.h"
-#include "radv_private.h"
 #include "radv_sdma.h"
 #include "vk_format.h"
 
diff --git a/src/amd/vulkan/meta/radv_meta_copy_vrs_htile.c b/src/amd/vulkan/meta/radv_meta_copy_vrs_htile.c
index b6f80d71357..fb6182dfa57 100644
--- a/src/amd/vulkan/meta/radv_meta_copy_vrs_htile.c
+++ b/src/amd/vulkan/meta/radv_meta_copy_vrs_htile.c
@@ -25,7 +25,6 @@
 #include "ac_surface.h"
 
 #include "radv_meta.h"
-#include "radv_private.h"
 #include "vk_common_entrypoints.h"
 #include "vk_format.h"
 
diff --git a/src/amd/vulkan/meta/radv_meta_dcc_retile.c b/src/amd/vulkan/meta/radv_meta_dcc_retile.c
index 938a2663768..aaf65c01fda 100644
--- a/src/amd/vulkan/meta/radv_meta_dcc_retile.c
+++ b/src/amd/vulkan/meta/radv_meta_dcc_retile.c
@@ -25,7 +25,6 @@
 #include "ac_surface.h"
 
 #include "radv_meta.h"
-#include "radv_private.h"
 #include "vk_common_entrypoints.h"
 
 static nir_shader *
diff --git a/src/amd/vulkan/meta/radv_meta_decompress.c b/src/amd/vulkan/meta/radv_meta_decompress.c
index 553778a3b8e..89ee31cf6f1 100644
--- a/src/amd/vulkan/meta/radv_meta_decompress.c
+++ b/src/amd/vulkan/meta/radv_meta_decompress.c
@@ -25,7 +25,6 @@
 #include <stdbool.h>
 
 #include "radv_meta.h"
-#include "radv_private.h"
 #include "sid.h"
 
 enum radv_depth_op {
diff --git a/src/amd/vulkan/meta/radv_meta_etc_decode.c b/src/amd/vulkan/meta/radv_meta_etc_decode.c
index 2b2eaf0a079..bd3c51852f1 100644
--- a/src/amd/vulkan/meta/radv_meta_etc_decode.c
+++ b/src/amd/vulkan/meta/radv_meta_etc_decode.c
@@ -26,7 +26,6 @@
 
 #include "nir/nir_builder.h"
 #include "radv_meta.h"
-#include "radv_private.h"
 #include "sid.h"
 #include "vk_common_entrypoints.h"
 #include "vk_format.h"
diff --git a/src/amd/vulkan/meta/radv_meta_fast_clear.c b/src/amd/vulkan/meta/radv_meta_fast_clear.c
index abc6d4d2096..5d098602b4d 100644
--- a/src/amd/vulkan/meta/radv_meta_fast_clear.c
+++ b/src/amd/vulkan/meta/radv_meta_fast_clear.c
@@ -25,7 +25,6 @@
 #include <stdbool.h>
 
 #include "radv_meta.h"
-#include "radv_private.h"
 #include "sid.h"
 
 enum radv_color_op {
diff --git a/src/amd/vulkan/meta/radv_meta_fmask_expand.c b/src/amd/vulkan/meta/radv_meta_fmask_expand.c
index 3c289f82623..867daa8ea43 100644
--- a/src/amd/vulkan/meta/radv_meta_fmask_expand.c
+++ b/src/amd/vulkan/meta/radv_meta_fmask_expand.c
@@ -24,7 +24,6 @@
 
 #include "radv_formats.h"
 #include "radv_meta.h"
-#include "radv_private.h"
 #include "vk_format.h"
 
 static VkResult radv_device_init_meta_fmask_expand_state_internal(struct radv_device *device, uint32_t samples_log2);
diff --git a/src/amd/vulkan/meta/radv_meta_resolve.c b/src/amd/vulkan/meta/radv_meta_resolve.c
index 841a7951b61..f0e20d487e2 100644
--- a/src/amd/vulkan/meta/radv_meta_resolve.c
+++ b/src/amd/vulkan/meta/radv_meta_resolve.c
@@ -25,8 +25,8 @@
 #include <stdbool.h>
 
 #include "nir/nir_builder.h"
+#include "radv_entrypoints.h"
 #include "radv_meta.h"
-#include "radv_private.h"
 #include "sid.h"
 #include "vk_format.h"
 
diff --git a/src/amd/vulkan/meta/radv_meta_resolve_cs.c b/src/amd/vulkan/meta/radv_meta_resolve_cs.c
index 855d1e66f35..794db702e9c 100644
--- a/src/amd/vulkan/meta/radv_meta_resolve_cs.c
+++ b/src/amd/vulkan/meta/radv_meta_resolve_cs.c
@@ -27,12 +27,13 @@
 #include "nir/nir_builder.h"
 #include "nir/nir_format_convert.h"
 
+#include "radv_entrypoints.h"
 #include "radv_formats.h"
 #include "radv_meta.h"
-#include "radv_private.h"
 #include "sid.h"
 #include "vk_common_entrypoints.h"
 #include "vk_format.h"
+#include "vk_shader_module.h"
 
 static nir_def *
 radv_meta_build_resolve_srgb_conversion(nir_builder *b, nir_def *input)
diff --git a/src/amd/vulkan/meta/radv_meta_resolve_fs.c b/src/amd/vulkan/meta/radv_meta_resolve_fs.c
index dcc7a1def7c..a87a29437a8 100644
--- a/src/amd/vulkan/meta/radv_meta_resolve_fs.c
+++ b/src/amd/vulkan/meta/radv_meta_resolve_fs.c
@@ -25,8 +25,8 @@
 #include <stdbool.h>
 
 #include "nir/nir_builder.h"
+#include "radv_entrypoints.h"
 #include "radv_meta.h"
-#include "radv_private.h"
 #include "sid.h"
 #include "vk_common_entrypoints.h"
 #include "vk_format.h"
diff --git a/src/amd/vulkan/nir/radv_nir_apply_pipeline_layout.c b/src/amd/vulkan/nir/radv_nir_apply_pipeline_layout.c
index 25aa70fac1a..5e97e94e0a9 100644
--- a/src/amd/vulkan/nir/radv_nir_apply_pipeline_layout.c
+++ b/src/amd/vulkan/nir/radv_nir_apply_pipeline_layout.c
@@ -24,10 +24,13 @@
 #include "ac_shader_util.h"
 #include "nir.h"
 #include "nir_builder.h"
+#include "radv_descriptor_set.h"
+#include "radv_device.h"
 #include "radv_nir.h"
-#include "radv_private.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;
diff --git a/src/amd/vulkan/nir/radv_nir_lower_abi.c b/src/amd/vulkan/nir/radv_nir_lower_abi.c
index a4cb1784bf3..d02d0132b6f 100644
--- a/src/amd/vulkan/nir/radv_nir_lower_abi.c
+++ b/src/amd/vulkan/nir/radv_nir_lower_abi.c
@@ -26,9 +26,10 @@
 #include "nir_builder.h"
 #include "radv_constants.h"
 #include "radv_nir.h"
-#include "radv_private.h"
+#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))
diff --git a/src/amd/vulkan/nir/radv_nir_lower_fs_barycentric.c b/src/amd/vulkan/nir/radv_nir_lower_fs_barycentric.c
index 50aa5aed32f..5ecb15e0d63 100644
--- a/src/amd/vulkan/nir/radv_nir_lower_fs_barycentric.c
+++ b/src/amd/vulkan/nir/radv_nir_lower_fs_barycentric.c
@@ -24,7 +24,8 @@
 #include "nir/nir.h"
 #include "nir/nir_builder.h"
 #include "radv_nir.h"
-#include "radv_private.h"
+#include "radv_pipeline_graphics.h"
+#include "sid.h"
 
 typedef struct {
    bool dynamic_rasterization_samples;
diff --git a/src/amd/vulkan/nir/radv_nir_lower_fs_intrinsics.c b/src/amd/vulkan/nir/radv_nir_lower_fs_intrinsics.c
index 8eb1f98d9ff..cb9fd29113e 100644
--- a/src/amd/vulkan/nir/radv_nir_lower_fs_intrinsics.c
+++ b/src/amd/vulkan/nir/radv_nir_lower_fs_intrinsics.c
@@ -26,8 +26,9 @@
 #include "nir.h"
 #include "nir_builder.h"
 #include "radv_nir.h"
-#include "radv_private.h"
-
+#include "radv_shader.h"
+#include "radv_shader_args.h"
+#include "radv_shader_info.h"
 bool
 radv_nir_lower_fs_intrinsics(nir_shader *nir, const struct radv_shader_stage *fs_stage,
                              const struct radv_graphics_state_key *gfx_state)
diff --git a/src/amd/vulkan/nir/radv_nir_lower_intrinsics_early.c b/src/amd/vulkan/nir/radv_nir_lower_intrinsics_early.c
index 0a32c684d80..82f7e4f8a15 100644
--- a/src/amd/vulkan/nir/radv_nir_lower_intrinsics_early.c
+++ b/src/amd/vulkan/nir/radv_nir_lower_intrinsics_early.c
@@ -26,7 +26,6 @@
 #include "nir.h"
 #include "nir_builder.h"
 #include "radv_nir.h"
-#include "radv_private.h"
 
 bool
 radv_nir_lower_intrinsics_early(nir_shader *nir, bool lower_view_index_to_zero)
diff --git a/src/amd/vulkan/nir/radv_nir_lower_io.c b/src/amd/vulkan/nir/radv_nir_lower_io.c
index a96dd615a25..0ea6e913855 100644
--- a/src/amd/vulkan/nir/radv_nir_lower_io.c
+++ b/src/amd/vulkan/nir/radv_nir_lower_io.c
@@ -26,9 +26,9 @@
 #include "ac_nir.h"
 #include "nir.h"
 #include "nir_builder.h"
+#include "radv_device.h"
 #include "radv_nir.h"
 #include "radv_physical_device.h"
-#include "radv_private.h"
 #include "radv_shader.h"
 
 static int
diff --git a/src/amd/vulkan/nir/radv_nir_lower_poly_line_smooth.c b/src/amd/vulkan/nir/radv_nir_lower_poly_line_smooth.c
index a1cc6a4e17d..6198c110086 100644
--- a/src/amd/vulkan/nir/radv_nir_lower_poly_line_smooth.c
+++ b/src/amd/vulkan/nir/radv_nir_lower_poly_line_smooth.c
@@ -24,7 +24,7 @@
 #include "nir.h"
 #include "nir_builder.h"
 #include "radv_nir.h"
-#include "radv_private.h"
+#include "radv_pipeline_graphics.h"
 
 static bool
 radv_should_lower_poly_line_smooth(nir_shader *nir, const struct radv_graphics_state_key *gfx_state)
diff --git a/src/amd/vulkan/nir/radv_nir_lower_ray_queries.c b/src/amd/vulkan/nir/radv_nir_lower_ray_queries.c
index 9ce59549260..9dbe0bb8e0c 100644
--- a/src/amd/vulkan/nir/radv_nir_lower_ray_queries.c
+++ b/src/amd/vulkan/nir/radv_nir_lower_ray_queries.c
@@ -30,7 +30,6 @@
 #include "nir/radv_nir_rt_common.h"
 #include "radv_debug.h"
 #include "radv_nir.h"
-#include "radv_private.h"
 #include "radv_shader.h"
 
 /* Traversal stack size. Traversal supports backtracking so we can go deeper than this size if
diff --git a/src/amd/vulkan/nir/radv_nir_lower_vs_inputs.c b/src/amd/vulkan/nir/radv_nir_lower_vs_inputs.c
index 3551b53b5f2..562addbe359 100644
--- a/src/amd/vulkan/nir/radv_nir_lower_vs_inputs.c
+++ b/src/amd/vulkan/nir/radv_nir_lower_vs_inputs.c
@@ -21,12 +21,12 @@
  * IN THE SOFTWARE.
  */
 
+#include "ac_gpu_info.h"
 #include "ac_nir.h"
 #include "nir.h"
 #include "nir_builder.h"
 #include "radv_constants.h"
 #include "radv_nir.h"
-#include "radv_private.h"
 #include "radv_shader.h"
 #include "radv_shader_args.h"
 
diff --git a/src/amd/vulkan/nir/radv_nir_rt_common.h b/src/amd/vulkan/nir/radv_nir_rt_common.h
index 1718ca8d1fa..cad1aa3ef05 100644
--- a/src/amd/vulkan/nir/radv_nir_rt_common.h
+++ b/src/amd/vulkan/nir/radv_nir_rt_common.h
@@ -30,7 +30,7 @@
 
 #include "compiler/spirv/spirv.h"
 
-#include "radv_private.h"
+struct radv_device;
 
 nir_def *build_addr_to_node(nir_builder *b, nir_def *addr);
 
diff --git a/src/amd/vulkan/nir/radv_nir_rt_shader.c b/src/amd/vulkan/nir/radv_nir_rt_shader.c
index 009ae786af2..497bd658775 100644
--- a/src/amd/vulkan/nir/radv_nir_rt_shader.c
+++ b/src/amd/vulkan/nir/radv_nir_rt_shader.c
@@ -31,7 +31,6 @@
 #include "ac_nir.h"
 #include "radv_pipeline_cache.h"
 #include "radv_pipeline_rt.h"
-#include "radv_private.h"
 #include "radv_shader.h"
 
 #include "vk_pipeline.h"
diff --git a/src/amd/vulkan/radix_sort/radv_radix_sort.c b/src/amd/vulkan/radix_sort/radv_radix_sort.c
index 3e3d07af779..14086036989 100644
--- a/src/amd/vulkan/radix_sort/radv_radix_sort.c
+++ b/src/amd/vulkan/radix_sort/radv_radix_sort.c
@@ -23,7 +23,7 @@
 
 #include "radv_radix_sort.h"
 #include "targets/u64/config.h"
-#include "radv_private.h"
+#include "radv_cmd_buffer.h"
 #include "target.h"
 
 static const uint32_t init_spv[] = {
diff --git a/src/amd/vulkan/radv_acceleration_structure.c b/src/amd/vulkan/radv_acceleration_structure.c
index b051a612490..3f709583c4b 100644
--- a/src/amd/vulkan/radv_acceleration_structure.c
+++ b/src/amd/vulkan/radv_acceleration_structure.c
@@ -21,12 +21,12 @@
  * IN THE SOFTWARE.
  */
 
-#include "radv_private.h"
 #include "radv_sqtt.h"
 
 #include "meta/radv_meta.h"
 #include "nir_builder.h"
 #include "radv_cs.h"
+#include "radv_entrypoints.h"
 
 #include "radix_sort/common/vk/barrier.h"
 #include "radix_sort/radv_radix_sort.h"
diff --git a/src/amd/vulkan/radv_android.c b/src/amd/vulkan/radv_android.c
index 6ae39bfca0d..470a9bf7fc9 100644
--- a/src/amd/vulkan/radv_android.c
+++ b/src/amd/vulkan/radv_android.c
@@ -21,13 +21,13 @@
  * IN THE SOFTWARE.
  */
 
-#include "radv_buffer.h"
 #include "radv_android.h"
+#include "radv_buffer.h"
 #include "radv_device.h"
 #include "radv_device_memory.h"
+#include "radv_entrypoints.h"
 #include "radv_image.h"
 #include "radv_physical_device.h"
-#include "radv_private.h"
 
 #if DETECT_OS_ANDROID
 #include <libsync.h>
@@ -45,6 +45,7 @@
 #include "util/os_file.h"
 
 #include "vk_android.h"
+#include "vk_log.h"
 #include "vk_util.h"
 
 #if DETECT_OS_ANDROID
diff --git a/src/amd/vulkan/radv_buffer.c b/src/amd/vulkan/radv_buffer.c
index b18f0192ace..bdb0e4b6f7d 100644
--- a/src/amd/vulkan/radv_buffer.c
+++ b/src/amd/vulkan/radv_buffer.c
@@ -26,12 +26,16 @@
  */
 
 #include "radv_buffer.h"
+#include "radv_device.h"
 #include "radv_device_memory.h"
-#include "radv_private.h"
+#include "radv_entrypoints.h"
+#include "radv_instance.h"
+#include "radv_physical_device.h"
 #include "radv_rmv.h"
 
 #include "vk_common_entrypoints.h"
 #include "vk_debug_utils.h"
+#include "vk_log.h"
 
 void
 radv_buffer_init(struct radv_buffer *buffer, struct radv_device *device, struct radeon_winsys_bo *bo, uint64_t size,
diff --git a/src/amd/vulkan/radv_buffer_view.c b/src/amd/vulkan/radv_buffer_view.c
index f5d780d30df..0c03d566e14 100644
--- a/src/amd/vulkan/radv_buffer_view.c
+++ b/src/amd/vulkan/radv_buffer_view.c
@@ -29,9 +29,11 @@
 
 #include "radv_buffer.h"
 #include "radv_buffer_view.h"
+#include "radv_entrypoints.h"
 #include "radv_formats.h"
 #include "radv_image.h"
-#include "radv_private.h"
+
+#include "vk_log.h"
 
 void
 radv_make_texel_buffer_descriptor(struct radv_device *device, uint64_t va, VkFormat vk_format, unsigned offset,
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 8ea4ca49c8b..75b0a92df84 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -33,13 +33,13 @@
 #include "radv_device_generated_commands.h"
 #include "radv_event.h"
 #include "radv_pipeline_rt.h"
-#include "radv_private.h"
 #include "radv_radeon_winsys.h"
 #include "radv_rmv.h"
 #include "radv_shader.h"
 #include "radv_shader_object.h"
 #include "radv_sqtt.h"
 #include "sid.h"
+#include "vk_command_pool.h"
 #include "vk_common_entrypoints.h"
 #include "vk_enum_defines.h"
 #include "vk_format.h"
diff --git a/src/amd/vulkan/radv_cp_dma.c b/src/amd/vulkan/radv_cp_dma.c
index 1db29263626..7e94874ea8c 100644
--- a/src/amd/vulkan/radv_cp_dma.c
+++ b/src/amd/vulkan/radv_cp_dma.c
@@ -29,7 +29,6 @@
 #include "radv_buffer.h"
 #include "radv_cs.h"
 #include "radv_debug.h"
-#include "radv_private.h"
 #include "radv_shader.h"
 #include "radv_sqtt.h"
 #include "sid.h"
diff --git a/src/amd/vulkan/radv_cp_reg_shadowing.c b/src/amd/vulkan/radv_cp_reg_shadowing.c
index b35913a8787..a9dbe93cdac 100644
--- a/src/amd/vulkan/radv_cp_reg_shadowing.c
+++ b/src/amd/vulkan/radv_cp_reg_shadowing.c
@@ -27,7 +27,6 @@
 #include "radv_buffer.h"
 #include "radv_cs.h"
 #include "radv_debug.h"
-#include "radv_private.h"
 #include "sid.h"
 
 static void
diff --git a/src/amd/vulkan/radv_cs.c b/src/amd/vulkan/radv_cs.c
index fa241d443ee..6fa3beb4d63 100644
--- a/src/amd/vulkan/radv_cs.c
+++ b/src/amd/vulkan/radv_cs.c
@@ -30,7 +30,6 @@
 #include "radv_buffer.h"
 #include "radv_cs.h"
 #include "radv_debug.h"
-#include "radv_private.h"
 #include "radv_shader.h"
 #include "radv_sqtt.h"
 #include "sid.h"
diff --git a/src/amd/vulkan/radv_cs.h b/src/amd/vulkan/radv_cs.h
index bacc9895a33..9b4fb1a488c 100644
--- a/src/amd/vulkan/radv_cs.h
+++ b/src/amd/vulkan/radv_cs.h
@@ -28,7 +28,10 @@
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>
-#include "radv_private.h"
+
+#include "radv_cmd_buffer.h"
+#include "radv_physical_device.h"
+#include "radv_radeon_winsys.h"
 #include "sid.h"
 
 static inline unsigned
diff --git a/src/amd/vulkan/radv_debug.c b/src/amd/vulkan/radv_debug.c
index 667cedc70bc..db17dfb17f6 100644
--- a/src/amd/vulkan/radv_debug.c
+++ b/src/amd/vulkan/radv_debug.c
@@ -37,6 +37,9 @@
 #include "ac_debug.h"
 #include "radv_buffer.h"
 #include "radv_debug.h"
+#include "radv_descriptor_set.h"
+#include "radv_entrypoints.h"
+#include "radv_pipeline_graphics.h"
 #include "radv_pipeline_rt.h"
 #include "radv_shader.h"
 #include "sid.h"
diff --git a/src/amd/vulkan/radv_debug.h b/src/amd/vulkan/radv_debug.h
index 9fdf51ef260..99b822e0979 100644
--- a/src/amd/vulkan/radv_debug.h
+++ b/src/amd/vulkan/radv_debug.h
@@ -24,7 +24,9 @@
 #ifndef RADV_DEBUG_H
 #define RADV_DEBUG_H
 
-#include "radv_private.h"
+#include "radv_device.h"
+#include "radv_instance.h"
+#include "radv_physical_device.h"
 
 /* Please keep docs/envvars.rst up-to-date when you add/remove options. */
 enum {
diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c
index da8cbc8fa7f..a9d1ec50173 100644
--- a/src/amd/vulkan/radv_descriptor_set.c
+++ b/src/amd/vulkan/radv_descriptor_set.c
@@ -29,16 +29,20 @@
 #include "util/mesa-sha1.h"
 #include "radv_buffer.h"
 #include "radv_buffer_view.h"
+#include "radv_cmd_buffer.h"
+#include "radv_descriptor_set.h"
+#include "radv_entrypoints.h"
 #include "radv_image.h"
 #include "radv_image_view.h"
-#include "radv_private.h"
 #include "radv_rmv.h"
 #include "radv_sampler.h"
 #include "sid.h"
 #include "vk_acceleration_structure.h"
 #include "vk_descriptors.h"
 #include "vk_format.h"
+#include "vk_log.h"
 #include "vk_util.h"
+#include "vk_ycbcr_conversion.h"
 
 static unsigned
 radv_descriptor_type_buffer_count(VkDescriptorType type)
diff --git a/src/amd/vulkan/radv_descriptor_set.h b/src/amd/vulkan/radv_descriptor_set.h
index 1385784e30a..7bbea32f5cd 100644
--- a/src/amd/vulkan/radv_descriptor_set.h
+++ b/src/amd/vulkan/radv_descriptor_set.h
@@ -24,6 +24,8 @@
 #ifndef RADV_DESCRIPTOR_SET_H
 #define RADV_DESCRIPTOR_SET_H
 
+#include "util/mesa-sha1.h"
+
 #include "radv_constants.h"
 
 #include "vk_descriptor_set_layout.h"
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index a1f2885ddbc..18745f56350 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -48,10 +48,10 @@
 #include "util/u_debug.h"
 #include "radv_cs.h"
 #include "radv_debug.h"
+#include "radv_entrypoints.h"
 #include "radv_formats.h"
 #include "radv_physical_device.h"
 #include "radv_printf.h"
-#include "radv_private.h"
 #include "radv_rmv.h"
 #include "radv_shader.h"
 #include "radv_spm.h"
diff --git a/src/amd/vulkan/radv_device_generated_commands.c b/src/amd/vulkan/radv_device_generated_commands.c
index 511993e0020..21c9f837aef 100644
--- a/src/amd/vulkan/radv_device_generated_commands.c
+++ b/src/amd/vulkan/radv_device_generated_commands.c
@@ -23,13 +23,14 @@
 
 #include "radv_device_generated_commands.h"
 #include "meta/radv_meta.h"
-#include "radv_private.h"
+#include "radv_entrypoints.h"
 
 #include "ac_rgp.h"
 
 #include "nir_builder.h"
 
 #include "vk_common_entrypoints.h"
+#include "vk_shader_module.h"
 
 static void
 radv_get_sequence_size_compute(const struct radv_indirect_command_layout *layout,
diff --git a/src/amd/vulkan/radv_device_memory.c b/src/amd/vulkan/radv_device_memory.c
index 94330e8ca34..6da8154dc1f 100644
--- a/src/amd/vulkan/radv_device_memory.c
+++ b/src/amd/vulkan/radv_device_memory.c
@@ -28,10 +28,12 @@
 #include "radv_device_memory.h"
 #include "radv_android.h"
 #include "radv_buffer.h"
+#include "radv_entrypoints.h"
 #include "radv_image.h"
-#include "radv_private.h"
 #include "radv_rmv.h"
 
+#include "vk_log.h"
+
 void
 radv_device_memory_init(struct radv_device_memory *mem, struct radv_device *device, struct radeon_winsys_bo *bo)
 {
diff --git a/src/amd/vulkan/radv_device_memory.h b/src/amd/vulkan/radv_device_memory.h
index d901a21eb0b..4a12c7540a7 100644
--- a/src/amd/vulkan/radv_device_memory.h
+++ b/src/amd/vulkan/radv_device_memory.h
@@ -31,7 +31,6 @@
 #include "vk_object.h"
 
 #include "radv_android.h"
-#include "radv_private.h"
 
 struct radv_device;
 
diff --git a/src/amd/vulkan/radv_event.c b/src/amd/vulkan/radv_event.c
index 1f1d652836e..c799eb38e95 100644
--- a/src/amd/vulkan/radv_event.c
+++ b/src/amd/vulkan/radv_event.c
@@ -25,9 +25,13 @@
  * IN THE SOFTWARE.
  */
 
-#include "radv_event.h"
+#include "vk_alloc.h"
+#include "vk_log.h"
+
 #include "radv_buffer.h"
-#include "radv_private.h"
+#include "radv_device.h"
+#include "radv_entrypoints.h"
+#include "radv_event.h"
 #include "radv_rmv.h"
 
 static void
diff --git a/src/amd/vulkan/radv_formats.c b/src/amd/vulkan/radv_formats.c
index f1bb808fb7c..805d9b4178e 100644
--- a/src/amd/vulkan/radv_formats.c
+++ b/src/amd/vulkan/radv_formats.c
@@ -25,14 +25,15 @@
 #include "radv_formats.h"
 #include "radv_android.h"
 #include "radv_debug.h"
+#include "radv_entrypoints.h"
 #include "radv_image.h"
-#include "radv_private.h"
 
 #include "sid.h"
 
 #include "vk_android.h"
 #include "vk_enum_defines.h"
 #include "vk_format.h"
+#include "vk_log.h"
 #include "vk_util.h"
 
 #include "util/format_r11g11b10f.h"
diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index a8a5343c151..b2a29cb5f86 100644
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -34,9 +34,9 @@
 #include "radv_buffer_view.h"
 #include "radv_debug.h"
 #include "radv_device_memory.h"
+#include "radv_entrypoints.h"
 #include "radv_formats.h"
 #include "radv_image_view.h"
-#include "radv_private.h"
 #include "radv_radeon_winsys.h"
 #include "radv_rmv.h"
 #include "radv_video.h"
@@ -44,6 +44,7 @@
 #include "sid.h"
 #include "vk_debug_utils.h"
 #include "vk_format.h"
+#include "vk_log.h"
 #include "vk_render_pass.h"
 #include "vk_util.h"
 
diff --git a/src/amd/vulkan/radv_image.h b/src/amd/vulkan/radv_image.h
index 4b31790a3b7..78c8bfc21fc 100644
--- a/src/amd/vulkan/radv_image.h
+++ b/src/amd/vulkan/radv_image.h
@@ -32,7 +32,6 @@
 
 #include "radv_device.h"
 #include "radv_physical_device.h"
-#include "radv_private.h"
 #include "radv_radeon_winsys.h"
 
 #include "vk_format.h"
diff --git a/src/amd/vulkan/radv_image_view.c b/src/amd/vulkan/radv_image_view.c
index dd88807da06..bfff195ac9d 100644
--- a/src/amd/vulkan/radv_image_view.c
+++ b/src/amd/vulkan/radv_image_view.c
@@ -25,11 +25,13 @@
  * IN THE SOFTWARE.
  */
 
+#include "vk_log.h"
+
 #include "radv_image_view.h"
 #include "radv_buffer_view.h"
+#include "radv_entrypoints.h"
 #include "radv_formats.h"
 #include "radv_image.h"
-#include "radv_private.h"
 
 #include "gfx10_format_table.h"
 
diff --git a/src/amd/vulkan/radv_instance.c b/src/amd/vulkan/radv_instance.c
index 5a09e1260e9..b5d386264e4 100644
--- a/src/amd/vulkan/radv_instance.c
+++ b/src/amd/vulkan/radv_instance.c
@@ -25,14 +25,23 @@
  * IN THE SOFTWARE.
  */
 
+#ifdef HAVE_VALGRIND
+#include <memcheck.h>
+#include <valgrind.h>
+#define VG(x) x
+#else
+#define VG(x) ((void)0)
+#endif
+
 #include "radv_instance.h"
 #include "radv_debug.h"
-#include "radv_private.h"
+#include "radv_entrypoints.h"
 #include "radv_wsi.h"
 
 #include "util/driconf.h"
 
 #include "vk_instance.h"
+#include "vk_log.h"
 #include "vk_util.h"
 
 static const struct debug_control radv_debug_options[] = {{"nofastclears", RADV_DEBUG_NO_FAST_CLEARS},
diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c
index d1263346a68..74ebb9c8755 100644
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -29,7 +29,6 @@
 #include "nir/nir.h"
 #include "radv_debug.h"
 #include "radv_llvm_helper.h"
-#include "radv_private.h"
 #include "radv_shader.h"
 #include "radv_shader_args.h"
 
diff --git a/src/amd/vulkan/radv_perfcounter.c b/src/amd/vulkan/radv_perfcounter.c
index c8d7ad45fb8..7d90fa62ea3 100644
--- a/src/amd/vulkan/radv_perfcounter.c
+++ b/src/amd/vulkan/radv_perfcounter.c
@@ -26,8 +26,8 @@
 #include "ac_perfcounter.h"
 #include "amdgfxregs.h"
 #include "radv_cs.h"
+#include "radv_entrypoints.h"
 #include "radv_perfcounter.h"
-#include "radv_private.h"
 #include "radv_sqtt.h"
 #include "sid.h"
 
diff --git a/src/amd/vulkan/radv_physical_device.c b/src/amd/vulkan/radv_physical_device.c
index f129a78998e..8bfad67e81e 100644
--- a/src/amd/vulkan/radv_physical_device.c
+++ b/src/amd/vulkan/radv_physical_device.c
@@ -31,15 +31,18 @@
 #include <sys/sysmacros.h>
 #endif
 
+#include "vk_log.h"
+#include "vk_shader_module.h"
+
 #include "util/disk_cache.h"
 #include "util/hex.h"
 #include "util/u_debug.h"
 #include "radv_android.h"
 #include "radv_debug.h"
+#include "radv_entrypoints.h"
 #include "radv_instance.h"
 #include "radv_physical_device.h"
 #include "radv_pipeline_rt.h"
-#include "radv_private.h"
 #include "radv_video.h"
 #include "radv_wsi.h"
 
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index ba7f06510de..855f67ce0f6 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -38,7 +38,6 @@
 #include "radv_cs.h"
 #include "radv_debug.h"
 #include "radv_pipeline_rt.h"
-#include "radv_private.h"
 #include "radv_rmv.h"
 #include "radv_shader.h"
 #include "radv_shader_args.h"
@@ -54,6 +53,7 @@
 #include "sid.h"
 #include "vk_format.h"
 #include "vk_nir_convert_ycbcr.h"
+#include "vk_ycbcr_conversion.h"
 
 bool
 radv_shader_need_indirect_descriptor_sets(const struct radv_shader *shader)
diff --git a/src/amd/vulkan/radv_pipeline_cache.c b/src/amd/vulkan/radv_pipeline_cache.c
index 50c92d6cb8e..eb4e50b3d38 100644
--- a/src/amd/vulkan/radv_pipeline_cache.c
+++ b/src/amd/vulkan/radv_pipeline_cache.c
@@ -31,8 +31,8 @@
 #include "aco_interface.h"
 #include "nir_serialize.h"
 #include "radv_debug.h"
+#include "radv_descriptor_set.h"
 #include "radv_pipeline_rt.h"
-#include "radv_private.h"
 #include "radv_shader.h"
 #include "vk_pipeline.h"
 #include "vk_util.h"
diff --git a/src/amd/vulkan/radv_pipeline_compute.c b/src/amd/vulkan/radv_pipeline_compute.c
index 010c6f39506..2779518b3bc 100644
--- a/src/amd/vulkan/radv_pipeline_compute.c
+++ b/src/amd/vulkan/radv_pipeline_compute.c
@@ -38,7 +38,6 @@
 #include "radv_cs.h"
 #include "radv_debug.h"
 #include "radv_pipeline_cache.h"
-#include "radv_private.h"
 #include "radv_rmv.h"
 #include "radv_shader.h"
 #include "radv_shader_args.h"
diff --git a/src/amd/vulkan/radv_pipeline_graphics.c b/src/amd/vulkan/radv_pipeline_graphics.c
index 35ed1061e69..cb9c81aff8b 100644
--- a/src/amd/vulkan/radv_pipeline_graphics.c
+++ b/src/amd/vulkan/radv_pipeline_graphics.c
@@ -37,9 +37,9 @@
 #include "util/u_atomic.h"
 #include "radv_cs.h"
 #include "radv_debug.h"
+#include "radv_entrypoints.h"
 #include "radv_formats.h"
 #include "radv_pipeline_cache.h"
-#include "radv_private.h"
 #include "radv_rmv.h"
 #include "radv_shader.h"
 #include "radv_shader_args.h"
diff --git a/src/amd/vulkan/radv_pipeline_rt.c b/src/amd/vulkan/radv_pipeline_rt.c
index 47e23147e2e..d0a33040f09 100644
--- a/src/amd/vulkan/radv_pipeline_rt.c
+++ b/src/amd/vulkan/radv_pipeline_rt.c
@@ -24,11 +24,14 @@
 #include "nir/nir.h"
 #include "nir/nir_builder.h"
 
+#include "vk_shader_module.h"
+
 #include "nir/radv_nir.h"
 #include "radv_debug.h"
+#include "radv_descriptor_set.h"
+#include "radv_entrypoints.h"
 #include "radv_pipeline_cache.h"
 #include "radv_pipeline_rt.h"
-#include "radv_private.h"
 #include "radv_rmv.h"
 #include "radv_shader.h"
 
diff --git a/src/amd/vulkan/radv_printf.c b/src/amd/vulkan/radv_printf.c
index 84468affbe3..8267ee0c995 100644
--- a/src/amd/vulkan/radv_printf.c
+++ b/src/amd/vulkan/radv_printf.c
@@ -5,7 +5,7 @@
  */
 
 #include "radv_printf.h"
-#include "radv_private.h"
+#include "radv_physical_device.h"
 
 #include "util/hash_table.h"
 #include "util/strndup.h"
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
deleted file mode 100644
index c0d472407c9..00000000000
--- a/src/amd/vulkan/radv_private.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright © 2016 Red Hat.
- * Copyright © 2016 Bas Nieuwenhuizen
- *
- * based in part on anv driver which is:
- * Copyright © 2015 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-#ifndef RADV_PRIVATE_H
-#define RADV_PRIVATE_H
-
-#include <assert.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef HAVE_VALGRIND
-#include <memcheck.h>
-#include <valgrind.h>
-#define VG(x) x
-#else
-#define VG(x) ((void)0)
-#endif
-
-#include "c11/threads.h"
-#ifndef _WIN32
-#include <amdgpu.h>
-#include <xf86drm.h>
-#endif
-#include "compiler/shader_enums.h"
-#include "util/bitscan.h"
-#include "util/detect_os.h"
-#include "util/list.h"
-#include "util/macros.h"
-#include "util/rwlock.h"
-#include "util/xmlconfig.h"
-#include "vk_alloc.h"
-#include "vk_command_pool.h"
-#include "vk_debug_report.h"
-#include "vk_device.h"
-#include "vk_format.h"
-#include "vk_log.h"
-#include "vk_physical_device.h"
-#include "vk_shader_module.h"
-#include "vk_util.h"
-#include "vk_ycbcr_conversion.h"
-
-#include "ac_binary.h"
-#include "ac_gpu_info.h"
-#include "ac_shader_util.h"
-#include "ac_spm.h"
-#include "ac_sqtt.h"
-#include "ac_surface.h"
-#include "ac_vcn.h"
-#include "radv_cmd_buffer.h"
-#include "radv_constants.h"
-#include "radv_descriptor_set.h"
-#include "radv_device.h"
-#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_radeon_winsys.h"
-#include "radv_rra.h"
-#include "radv_shader.h"
-#include "radv_shader_args.h"
-#include "sid.h"
-
-#include "radix_sort/radix_sort_vk_devaddr.h"
-
-#include <vulkan/vk_android_native_buffer.h>
-#include <vulkan/vk_icd.h>
-#include <vulkan/vulkan.h>
-#include <vulkan/vulkan_android.h>
-
-#include "radv_entrypoints.h"
-
-#include "wsi_common.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* RADV_PRIVATE_H */
diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c
index 76e20be2141..1fd3163cba8 100644
--- a/src/amd/vulkan/radv_query.c
+++ b/src/amd/vulkan/radv_query.c
@@ -34,13 +34,14 @@
 #include "util/u_atomic.h"
 #include "vulkan/vulkan_core.h"
 #include "radv_cs.h"
+#include "radv_entrypoints.h"
 #include "radv_perfcounter.h"
-#include "radv_private.h"
 #include "radv_query.h"
 #include "radv_rmv.h"
 #include "sid.h"
 #include "vk_acceleration_structure.h"
 #include "vk_common_entrypoints.h"
+#include "vk_shader_module.h"
 
 #define TIMESTAMP_NOT_READY UINT64_MAX
 
diff --git a/src/amd/vulkan/radv_queue.c b/src/amd/vulkan/radv_queue.c
index 28412c1d78c..e405f64fd63 100644
--- a/src/amd/vulkan/radv_queue.c
+++ b/src/amd/vulkan/radv_queue.c
@@ -33,7 +33,6 @@
 #include "radv_device_memory.h"
 #include "radv_image.h"
 #include "radv_printf.h"
-#include "radv_private.h"
 #include "radv_rmv.h"
 #include "vk_semaphore.h"
 #include "vk_sync.h"
diff --git a/src/amd/vulkan/radv_rmv.c b/src/amd/vulkan/radv_rmv.c
index 26411929f3e..556f80f33ea 100644
--- a/src/amd/vulkan/radv_rmv.c
+++ b/src/amd/vulkan/radv_rmv.c
@@ -31,11 +31,12 @@
 #include <stdlib.h>
 #include "ac_gpu_info.h"
 #include "radv_buffer.h"
+#include "radv_descriptor_set.h"
 #include "radv_device_memory.h"
 #include "radv_event.h"
 #include "radv_image.h"
+#include "radv_pipeline_graphics.h"
 #include "radv_pipeline_rt.h"
-#include "radv_private.h"
 #include "radv_query.h"
 #include "radv_rmv.h"
 
diff --git a/src/amd/vulkan/radv_rra.c b/src/amd/vulkan/radv_rra.c
index 86b5f3f63ef..a57c5e9af27 100644
--- a/src/amd/vulkan/radv_rra.c
+++ b/src/amd/vulkan/radv_rra.c
@@ -25,7 +25,9 @@
 #include "bvh/bvh.h"
 #include "util/half_float.h"
 #include "amd_family.h"
-#include "radv_private.h"
+#include "radv_device.h"
+#include "radv_entrypoints.h"
+#include "radv_physical_device.h"
 #include "vk_acceleration_structure.h"
 #include "vk_common_entrypoints.h"
 
diff --git a/src/amd/vulkan/radv_sampler.c b/src/amd/vulkan/radv_sampler.c
index 1f97dc0db3a..0af0328b0db 100644
--- a/src/amd/vulkan/radv_sampler.c
+++ b/src/amd/vulkan/radv_sampler.c
@@ -25,9 +25,12 @@
  * IN THE SOFTWARE.
  */
 
-#include "radv_private.h"
+#include "vk_log.h"
 
 #include "radv_sampler.h"
+#include "radv_device.h"
+#include "radv_entrypoints.h"
+#include "radv_physical_device.h"
 
 static unsigned
 radv_tex_wrap(VkSamplerAddressMode address_mode)
diff --git a/src/amd/vulkan/radv_sdma.c b/src/amd/vulkan/radv_sdma.c
index 0b6e07eb8c7..618378b7d15 100644
--- a/src/amd/vulkan/radv_sdma.c
+++ b/src/amd/vulkan/radv_sdma.c
@@ -30,7 +30,6 @@
 #include "radv_buffer.h"
 #include "radv_cs.h"
 #include "radv_formats.h"
-#include "radv_private.h"
 
 struct radv_sdma_chunked_copy_info {
    unsigned extent_horizontal_blocks;
diff --git a/src/amd/vulkan/radv_sdma.h b/src/amd/vulkan/radv_sdma.h
index 0956e216687..a9b8edcc997 100644
--- a/src/amd/vulkan/radv_sdma.h
+++ b/src/amd/vulkan/radv_sdma.h
@@ -25,7 +25,6 @@
 #define RADV_SDMA_H
 
 #include "radv_image.h"
-#include "radv_private.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index 0a153d2b55b..82602bccc97 100644
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -38,9 +38,9 @@
 #include "util/u_atomic.h"
 #include "radv_cs.h"
 #include "radv_debug.h"
+#include "radv_entrypoints.h"
 #include "radv_nir_to_llvm.h"
 #include "radv_printf.h"
-#include "radv_private.h"
 #include "radv_sdma.h"
 #include "radv_shader_args.h"
 
@@ -52,6 +52,7 @@
 #endif
 #include "aco_interface.h"
 #include "sid.h"
+#include "vk_debug_report.h"
 #include "vk_format.h"
 #include "vk_nir.h"
 #include "vk_semaphore.h"
diff --git a/src/amd/vulkan/radv_shader_args.c b/src/amd/vulkan/radv_shader_args.c
index 4e9385a8fef..e94b84bde84 100644
--- a/src/amd/vulkan/radv_shader_args.c
+++ b/src/amd/vulkan/radv_shader_args.c
@@ -27,7 +27,8 @@
  */
 
 #include "radv_shader_args.h"
-#include "radv_private.h"
+#include "radv_device.h"
+#include "radv_physical_device.h"
 #include "radv_shader.h"
 
 struct user_sgpr_info {
diff --git a/src/amd/vulkan/radv_shader_info.c b/src/amd/vulkan/radv_shader_info.c
index 2bf56530969..a970ab14220 100644
--- a/src/amd/vulkan/radv_shader_info.c
+++ b/src/amd/vulkan/radv_shader_info.c
@@ -24,7 +24,9 @@
 #include "nir/nir.h"
 #include "nir/nir_xfb_info.h"
 #include "nir/radv_nir.h"
-#include "radv_private.h"
+#include "radv_device.h"
+#include "radv_physical_device.h"
+#include "radv_pipeline_graphics.h"
 #include "radv_shader.h"
 
 #include "ac_nir.h"
diff --git a/src/amd/vulkan/radv_shader_object.c b/src/amd/vulkan/radv_shader_object.c
index d035d64a161..b21a6838832 100644
--- a/src/amd/vulkan/radv_shader_object.c
+++ b/src/amd/vulkan/radv_shader_object.c
@@ -21,9 +21,15 @@
  * IN THE SOFTWARE.
  */
 
-#include "radv_shader_object.h"
+#include "vk_log.h"
+
+#include "radv_device.h"
+#include "radv_entrypoints.h"
+#include "radv_physical_device.h"
 #include "radv_pipeline_cache.h"
-#include "radv_private.h"
+#include "radv_pipeline_compute.h"
+#include "radv_pipeline_graphics.h"
+#include "radv_shader_object.h"
 
 static void
 radv_shader_object_destroy_variant(struct radv_device *device, VkShaderCodeTypeEXT code_type,
diff --git a/src/amd/vulkan/radv_spm.c b/src/amd/vulkan/radv_spm.c
index 5c79e226977..9fffd024aaa 100644
--- a/src/amd/vulkan/radv_spm.c
+++ b/src/amd/vulkan/radv_spm.c
@@ -25,7 +25,6 @@
 
 #include "radv_buffer.h"
 #include "radv_cs.h"
-#include "radv_private.h"
 #include "radv_spm.h"
 #include "sid.h"
 
diff --git a/src/amd/vulkan/radv_sqtt.c b/src/amd/vulkan/radv_sqtt.c
index 9f89e16643e..c7fbf42365c 100644
--- a/src/amd/vulkan/radv_sqtt.c
+++ b/src/amd/vulkan/radv_sqtt.c
@@ -26,12 +26,13 @@
 #include "radv_buffer.h"
 #include "radv_cs.h"
 #include "radv_debug.h"
+#include "radv_entrypoints.h"
 #include "radv_perfcounter.h"
-#include "radv_private.h"
 #include "radv_spm.h"
 #include "radv_sqtt.h"
 #include "sid.h"
 
+#include "vk_command_pool.h"
 #include "vk_common_entrypoints.h"
 
 #define SQTT_BUFFER_ALIGN_SHIFT 12
diff --git a/src/amd/vulkan/radv_video.c b/src/amd/vulkan/radv_video.c
index ad13fd6eee0..9252750b095 100644
--- a/src/amd/vulkan/radv_video.c
+++ b/src/amd/vulkan/radv_video.c
@@ -25,7 +25,6 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  **************************************************************************/
-#include "radv_private.h"
 
 #ifndef _WIN32
 #include "drm-uapi/amdgpu_drm.h"
@@ -41,6 +40,7 @@
 #include "radv_cs.h"
 #include "radv_debug.h"
 #include "radv_device_memory.h"
+#include "radv_entrypoints.h"
 #include "radv_image.h"
 #include "radv_image_view.h"
 #include "radv_video.h"
diff --git a/src/amd/vulkan/radv_wsi.c b/src/amd/vulkan/radv_wsi.c
index 078553724b4..0b3a8fdd26f 100644
--- a/src/amd/vulkan/radv_wsi.c
+++ b/src/amd/vulkan/radv_wsi.c
@@ -27,7 +27,6 @@
 #include "meta/radv_meta.h"
 #include "util/macros.h"
 #include "radv_debug.h"
-#include "radv_private.h"
 #include "vk_fence.h"
 #include "vk_semaphore.h"
 #include "vk_util.h"
diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_surface.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_surface.c
index 6a08fa3b952..53043281521 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_surface.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_surface.c
@@ -28,8 +28,8 @@
 
 #include "radv_amdgpu_surface.h"
 #include "util/bitset.h"
+#include "util/compiler.h"
 #include "radv_amdgpu_winsys.h"
-#include "radv_private.h"
 #include "sid.h"
 
 #include "ac_surface.h"