diff --git a/src/imagination/vulkan/pvr_cmd_buffer.c b/src/imagination/vulkan/pvr_cmd_buffer.c
index c10f757804a..831bf4a7375 100644
--- a/src/imagination/vulkan/pvr_cmd_buffer.c
+++ b/src/imagination/vulkan/pvr_cmd_buffer.c
@@ -40,6 +40,7 @@
 #include "pvr_common.h"
 #include "pvr_csb.h"
 #include "pvr_csb_enum_helpers.h"
+#include "pvr_descriptor_set.h"
 #include "pvr_device.h"
 #include "pvr_device_info.h"
 #include "pvr_formats.h"
diff --git a/src/imagination/vulkan/pvr_common.h b/src/imagination/vulkan/pvr_common.h
index c7b1d49a8f9..1483a53e7df 100644
--- a/src/imagination/vulkan/pvr_common.h
+++ b/src/imagination/vulkan/pvr_common.h
@@ -234,87 +234,6 @@ struct pvr_sampler {
    uint32_t border_color_table_index;
 };
 
-struct pvr_descriptor_set_layout_binding {
-   VkDescriptorType type;
-   VkDescriptorBindingFlags flags;
-
-   uint32_t stage_flags; /** Which stages can use this binding. */
-
-   uint32_t descriptor_count;
-   uint32_t immutable_sampler_count;
-   struct pvr_sampler **immutable_samplers;
-
-   unsigned offset; /** Offset within the descriptor set. */
-   unsigned dynamic_buffer_idx;
-   unsigned stride; /** Stride of each descriptor in this binding. */
-};
-
-struct pvr_descriptor_set_layout {
-   struct vk_descriptor_set_layout vk;
-   VkDescriptorSetLayoutCreateFlagBits flags;
-
-   uint32_t descriptor_count;
-   uint32_t dynamic_buffer_count;
-
-   uint32_t binding_count;
-   struct pvr_descriptor_set_layout_binding *bindings;
-
-   uint32_t immutable_sampler_count;
-   struct pvr_sampler **immutable_samplers;
-
-   uint32_t stage_flags; /** Which stages can use this binding. */
-
-   unsigned size; /** Size in bytes. */
-};
-
-struct pvr_descriptor_pool {
-   struct vk_object_base base;
-
-   VkDescriptorType type;
-   VkAllocationCallbacks alloc;
-   VkDescriptorPoolCreateFlags flags;
-
-   /** List of the descriptor sets created using this pool. */
-   struct list_head desc_sets;
-
-   struct pvr_suballoc_bo *pvr_bo; /** Pool buffer object. */
-   void *mapping; /** Pool buffer CPU mapping. */
-   struct util_vma_heap heap; /** Pool (sub)allocation heap. */
-};
-
-struct pvr_descriptor {
-   VkDescriptorType type;
-
-   union {
-      struct {
-         struct pvr_buffer_view *bview;
-         pvr_dev_addr_t buffer_dev_addr;
-         VkDeviceSize buffer_desc_range;
-         VkDeviceSize buffer_whole_range;
-      };
-
-      struct {
-         VkImageLayout layout;
-         const struct pvr_image_view *iview;
-         const struct pvr_sampler *sampler;
-      };
-   };
-};
-
-struct pvr_descriptor_set {
-   struct vk_object_base base;
-   struct list_head link; /** Link in pvr_descriptor_pool::desc_sets. */
-
-   struct pvr_descriptor_set_layout *layout;
-   struct pvr_descriptor_pool *pool;
-
-   unsigned size; /** Descriptor set size. */
-   pvr_dev_addr_t dev_addr; /** Descriptor set device address. */
-   void *mapping; /** Descriptor set CPU mapping. */
-
-   struct pvr_buffer_descriptor dynamic_buffers[];
-};
-
 struct pvr_event {
    struct vk_object_base base;
 
diff --git a/src/imagination/vulkan/pvr_descriptor_set.c b/src/imagination/vulkan/pvr_descriptor_set.c
index 974c76c9f8f..a46aa93425d 100644
--- a/src/imagination/vulkan/pvr_descriptor_set.c
+++ b/src/imagination/vulkan/pvr_descriptor_set.c
@@ -21,6 +21,8 @@
  * SOFTWARE.
  */
 
+#include "pvr_descriptor_set.h"
+
 #include <assert.h>
 #include <limits.h>
 #include <stdint.h>
diff --git a/src/imagination/vulkan/pvr_descriptor_set.h b/src/imagination/vulkan/pvr_descriptor_set.h
new file mode 100644
index 00000000000..d4e8a5a58b7
--- /dev/null
+++ b/src/imagination/vulkan/pvr_descriptor_set.h
@@ -0,0 +1,127 @@
+/*
+ * Copyright © 2022 Imagination Technologies Ltd.
+ *
+ * based in part on anv driver which is:
+ * Copyright © 2015 Intel Corporation
+ *
+ * based in part on radv driver which is:
+ * Copyright © 2016 Red Hat.
+ * Copyright © 2016 Bas Nieuwenhuizen
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#ifndef PVR_DESCRIPTOR_SET_H
+#define PVR_DESCRIPTOR_SET_H
+
+#include "util/list.h"
+#include "util/vma.h"
+
+#include "vk_descriptor_set_layout.h"
+
+#include "pvr_common.h"
+#include "pvr_types.h"
+
+struct pvr_descriptor_set_layout_binding {
+   VkDescriptorType type;
+   VkDescriptorBindingFlags flags;
+
+   uint32_t stage_flags; /** Which stages can use this binding. */
+
+   uint32_t descriptor_count;
+   uint32_t immutable_sampler_count;
+   struct pvr_sampler **immutable_samplers;
+
+   unsigned offset; /** Offset within the descriptor set. */
+   unsigned dynamic_buffer_idx;
+   unsigned stride; /** Stride of each descriptor in this binding. */
+};
+
+struct pvr_descriptor_set_layout {
+   struct vk_descriptor_set_layout vk;
+   VkDescriptorSetLayoutCreateFlagBits flags;
+
+   uint32_t descriptor_count;
+   uint32_t dynamic_buffer_count;
+
+   uint32_t binding_count;
+   struct pvr_descriptor_set_layout_binding *bindings;
+
+   uint32_t immutable_sampler_count;
+   struct pvr_sampler **immutable_samplers;
+
+   uint32_t stage_flags; /** Which stages can use this binding. */
+
+   unsigned size; /** Size in bytes. */
+};
+
+struct pvr_descriptor_pool {
+   struct vk_object_base base;
+
+   VkDescriptorType type;
+   VkAllocationCallbacks alloc;
+   VkDescriptorPoolCreateFlags flags;
+
+   /** List of the descriptor sets created using this pool. */
+   struct list_head desc_sets;
+
+   struct pvr_suballoc_bo *pvr_bo; /** Pool buffer object. */
+   void *mapping; /** Pool buffer CPU mapping. */
+   struct util_vma_heap heap; /** Pool (sub)allocation heap. */
+};
+
+struct pvr_descriptor {
+   VkDescriptorType type;
+
+   union {
+      struct {
+         struct pvr_buffer_view *bview;
+         pvr_dev_addr_t buffer_dev_addr;
+         VkDeviceSize buffer_desc_range;
+         VkDeviceSize buffer_whole_range;
+      };
+
+      struct {
+         VkImageLayout layout;
+         const struct pvr_image_view *iview;
+         const struct pvr_sampler *sampler;
+      };
+   };
+};
+
+struct pvr_descriptor_set {
+   struct vk_object_base base;
+   struct list_head link; /** Link in pvr_descriptor_pool::desc_sets. */
+
+   struct pvr_descriptor_set_layout *layout;
+   struct pvr_descriptor_pool *pool;
+
+   unsigned size; /** Descriptor set size. */
+   pvr_dev_addr_t dev_addr; /** Descriptor set device address. */
+   void *mapping; /** Descriptor set CPU mapping. */
+
+   struct pvr_buffer_descriptor dynamic_buffers[];
+};
+
+VK_DEFINE_NONDISP_HANDLE_CASTS(pvr_descriptor_set_layout,
+                               vk.base,
+                               VkDescriptorSetLayout,
+                               VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT)
+
+VK_DEFINE_NONDISP_HANDLE_CASTS(pvr_descriptor_set,
+                               base,
+                               VkDescriptorSet,
+                               VK_OBJECT_TYPE_DESCRIPTOR_SET)
+
+VK_DEFINE_NONDISP_HANDLE_CASTS(pvr_descriptor_pool,
+                               base,
+                               VkDescriptorPool,
+                               VK_OBJECT_TYPE_DESCRIPTOR_POOL)
+
+static inline struct pvr_descriptor_set_layout *
+vk_to_pvr_descriptor_set_layout(struct vk_descriptor_set_layout *layout)
+{
+   return container_of(layout, struct pvr_descriptor_set_layout, vk);
+}
+
+#endif /* PVR_DESCRIPTOR_SET_H */
diff --git a/src/imagination/vulkan/pvr_pipeline.c b/src/imagination/vulkan/pvr_pipeline.c
index 33e30971004..ca1e49bb9ee 100644
--- a/src/imagination/vulkan/pvr_pipeline.c
+++ b/src/imagination/vulkan/pvr_pipeline.c
@@ -41,6 +41,7 @@
 #include "pvr_bo.h"
 #include "pvr_csb.h"
 #include "pvr_csb_enum_helpers.h"
+#include "pvr_descriptor_set.h"
 #include "pvr_device.h"
 #include "pvr_pass.h"
 #include "pvr_pds.h"
diff --git a/src/imagination/vulkan/pvr_private.h b/src/imagination/vulkan/pvr_private.h
index 865e59c6938..569ac73fbe8 100644
--- a/src/imagination/vulkan/pvr_private.h
+++ b/src/imagination/vulkan/pvr_private.h
@@ -81,25 +81,6 @@ struct pvr_physical_device;
 VkResult pvr_wsi_init(struct pvr_physical_device *pdevice);
 void pvr_wsi_finish(struct pvr_physical_device *pdevice);
 
-static inline struct pvr_descriptor_set_layout *
-vk_to_pvr_descriptor_set_layout(struct vk_descriptor_set_layout *layout)
-{
-   return container_of(layout, struct pvr_descriptor_set_layout, vk);
-}
-
-VK_DEFINE_NONDISP_HANDLE_CASTS(pvr_descriptor_set_layout,
-                               vk.base,
-                               VkDescriptorSetLayout,
-                               VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT)
-VK_DEFINE_NONDISP_HANDLE_CASTS(pvr_descriptor_set,
-                               base,
-                               VkDescriptorSet,
-                               VK_OBJECT_TYPE_DESCRIPTOR_SET)
-VK_DEFINE_NONDISP_HANDLE_CASTS(pvr_descriptor_pool,
-                               base,
-                               VkDescriptorPool,
-                               VK_OBJECT_TYPE_DESCRIPTOR_POOL)
-
 /**
  * Print a FINISHME message, including its source location.
  */