diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
index 8c4f9ba5646..284c5303b29 100644
--- a/src/amd/vulkan/meson.build
+++ b/src/amd/vulkan/meson.build
@@ -154,6 +154,7 @@ libradv_files = files(
   'radv_spm.c',
   'radv_sqtt.c',
   'radv_query.c',
+  'radv_query.h',
   'radv_video.c',
   'radv_video.h',
   'radv_wsi.c',
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 481167568ab..dbb16169dfe 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -63,7 +63,6 @@
 #include "vk_instance.h"
 #include "vk_log.h"
 #include "vk_physical_device.h"
-#include "vk_query_pool.h"
 #include "vk_queue.h"
 #include "vk_shader_module.h"
 #include "vk_texcompress_astc.h"
@@ -83,6 +82,7 @@
 #include "ac_vcn.h"
 #include "radv_constants.h"
 #include "radv_descriptor_set.h"
+#include "radv_query.h"
 #include "radv_radeon_winsys.h"
 #include "radv_shader.h"
 #include "radv_shader_args.h"
@@ -2104,8 +2104,6 @@ enum radv_cmd_flush_bits radv_src_access_flush(struct radv_cmd_buffer *cmd_buffe
 enum radv_cmd_flush_bits radv_dst_access_flush(struct radv_cmd_buffer *cmd_buffer, VkAccessFlags2 dst_flags,
                                                const struct radv_image *image);
 
-void radv_write_timestamp(struct radv_cmd_buffer *cmd_buffer, uint64_t va, VkPipelineStageFlags2 stage);
-
 void radv_cmd_buffer_trace_emit(struct radv_cmd_buffer *cmd_buffer);
 
 void radv_cmd_buffer_annotate(struct radv_cmd_buffer *cmd_buffer, const char *annotation);
@@ -2628,17 +2626,6 @@ struct radv_resolve_barrier {
 
 void radv_emit_resolve_barrier(struct radv_cmd_buffer *cmd_buffer, const struct radv_resolve_barrier *barrier);
 
-struct radv_query_pool {
-   struct vk_query_pool vk;
-   struct radeon_winsys_bo *bo;
-   uint32_t stride;
-   uint32_t availability_offset;
-   uint64_t size;
-   char *ptr;
-   bool uses_gds; /* For NGG GS on GFX10+ */
-   bool uses_ace; /* For task shader invocations on GFX10.3+ */
-};
-
 struct radv_perfcounter_impl;
 
 struct radv_pc_query_pool {
@@ -3353,7 +3340,6 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(radv_device_memory, base, VkDeviceMemory, VK_OBJE
 VK_DEFINE_NONDISP_HANDLE_CASTS(radv_indirect_command_layout, base, VkIndirectCommandsLayoutNV,
                                VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NV)
 VK_DEFINE_NONDISP_HANDLE_CASTS(radv_pipeline, base, VkPipeline, VK_OBJECT_TYPE_PIPELINE)
-VK_DEFINE_NONDISP_HANDLE_CASTS(radv_query_pool, vk.base, VkQueryPool, VK_OBJECT_TYPE_QUERY_POOL)
 VK_DEFINE_NONDISP_HANDLE_CASTS(radv_shader_object, base, VkShaderEXT, VK_OBJECT_TYPE_SHADER_EXT);
 
 static inline uint64_t
diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c
index d705b7122c9..9bd1bad5f73 100644
--- a/src/amd/vulkan/radv_query.c
+++ b/src/amd/vulkan/radv_query.c
@@ -35,6 +35,7 @@
 #include "vulkan/vulkan_core.h"
 #include "radv_cs.h"
 #include "radv_private.h"
+#include "radv_query.h"
 #include "sid.h"
 #include "vk_acceleration_structure.h"
 #include "vk_common_entrypoints.h"
diff --git a/src/amd/vulkan/radv_query.h b/src/amd/vulkan/radv_query.h
new file mode 100644
index 00000000000..48e6f9a80a8
--- /dev/null
+++ b/src/amd/vulkan/radv_query.h
@@ -0,0 +1,50 @@
+/*
+ * 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_QUERY_H
+#define RADV_QUERY_H
+
+#include "vk_query_pool.h"
+
+struct radv_cmd_buffer;
+
+struct radv_query_pool {
+   struct vk_query_pool vk;
+   struct radeon_winsys_bo *bo;
+   uint32_t stride;
+   uint32_t availability_offset;
+   uint64_t size;
+   char *ptr;
+   bool uses_gds; /* For NGG GS on GFX10+ */
+   bool uses_ace; /* For task shader invocations on GFX10.3+ */
+};
+
+VK_DEFINE_NONDISP_HANDLE_CASTS(radv_query_pool, vk.base, VkQueryPool, VK_OBJECT_TYPE_QUERY_POOL)
+
+void radv_write_timestamp(struct radv_cmd_buffer *cmd_buffer, uint64_t va, VkPipelineStageFlags2 stage);
+
+#endif /* RADV_QUERY_H */
diff --git a/src/amd/vulkan/radv_rmv.c b/src/amd/vulkan/radv_rmv.c
index 373f30ee637..5b7719c236a 100644
--- a/src/amd/vulkan/radv_rmv.c
+++ b/src/amd/vulkan/radv_rmv.c
@@ -34,6 +34,7 @@
 #include "radv_event.h"
 #include "radv_image.h"
 #include "radv_private.h"
+#include "radv_query.h"
 
 #define RADV_FTRACE_INSTANCE_PATH "/sys/kernel/tracing/instances/amd_rmv"