diff --git a/src/imagination/vulkan/pvr_blit.c b/src/imagination/vulkan/pvr_blit.c
index 142f98b4388..363769f3573 100644
--- a/src/imagination/vulkan/pvr_blit.c
+++ b/src/imagination/vulkan/pvr_blit.c
@@ -37,20 +37,20 @@
 #define PVR_MAX_TRANSFER_SIZE_IN_TEXELS 2048U
 
 void pvr_CmdBlitImage2KHR(VkCommandBuffer commandBuffer,
-                          const VkBlitImageInfo2KHR *pBlitImageInfo)
+                          const VkBlitImageInfo2 *pBlitImageInfo)
 {
    assert(!"Unimplemented");
 }
 
 void pvr_CmdCopyImageToBuffer2KHR(
    VkCommandBuffer commandBuffer,
-   const VkCopyImageToBufferInfo2KHR *pCopyImageToBufferInfo)
+   const VkCopyImageToBufferInfo2 *pCopyImageToBufferInfo)
 {
    assert(!"Unimplemented");
 }
 
 void pvr_CmdCopyImage2KHR(VkCommandBuffer commandBuffer,
-                          const VkCopyImageInfo2KHR *pCopyImageInfo)
+                          const VkCopyImageInfo2 *pCopyImageInfo)
 {
    assert(!"Unimplemented");
 }
@@ -75,7 +75,7 @@ void pvr_CmdFillBuffer(VkCommandBuffer commandBuffer,
 
 void pvr_CmdCopyBufferToImage2KHR(
    VkCommandBuffer commandBuffer,
-   const VkCopyBufferToImageInfo2KHR *pCopyBufferToImageInfo)
+   const VkCopyBufferToImageInfo2 *pCopyBufferToImageInfo)
 {
    assert(!"Unimplemented");
 }
@@ -101,7 +101,7 @@ void pvr_CmdClearDepthStencilImage(VkCommandBuffer commandBuffer,
 }
 
 void pvr_CmdCopyBuffer2KHR(VkCommandBuffer commandBuffer,
-                           const VkCopyBufferInfo2KHR *pCopyBufferInfo)
+                           const VkCopyBufferInfo2 *pCopyBufferInfo)
 {
    PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer);
    PVR_FROM_HANDLE(pvr_buffer, src, pCopyBufferInfo->srcBuffer);
@@ -141,7 +141,7 @@ void pvr_CmdClearAttachments(VkCommandBuffer commandBuffer,
 }
 
 void pvr_CmdResolveImage2KHR(VkCommandBuffer commandBuffer,
-                             const VkResolveImageInfo2KHR *pResolveImageInfo)
+                             const VkResolveImageInfo2 *pResolveImageInfo)
 {
    assert(!"Unimplemented");
 }
diff --git a/src/imagination/vulkan/pvr_cmd_buffer.c b/src/imagination/vulkan/pvr_cmd_buffer.c
index 470c141fbff..834ccb3bd45 100644
--- a/src/imagination/vulkan/pvr_cmd_buffer.c
+++ b/src/imagination/vulkan/pvr_cmd_buffer.c
@@ -2330,7 +2330,7 @@ pvr_cmd_buffer_set_clear_values(struct pvr_cmd_buffer *cmd_buffer,
 
 void pvr_CmdBeginRenderPass2(VkCommandBuffer commandBuffer,
                              const VkRenderPassBeginInfo *pRenderPassBeginInfo,
-                             const VkSubpassBeginInfoKHR *pSubpassBeginInfo)
+                             const VkSubpassBeginInfo *pSubpassBeginInfo)
 {
    PVR_FROM_HANDLE(pvr_framebuffer,
                    framebuffer,
@@ -4640,7 +4640,7 @@ pvr_resolve_unemitted_resolve_attachments(struct pvr_cmd_buffer *cmd_buffer)
 }
 
 void pvr_CmdEndRenderPass2(VkCommandBuffer commandBuffer,
-                           const VkSubpassEndInfoKHR *pSubpassEndInfo)
+                           const VkSubpassEndInfo *pSubpassEndInfo)
 {
    PVR_FROM_HANDLE(pvr_cmd_buffer, cmd_buffer, commandBuffer);
    struct pvr_cmd_buffer_state *state = &cmd_buffer->state;
@@ -4690,21 +4690,21 @@ void pvr_CmdNextSubpass2(VkCommandBuffer commandBuffer,
 }
 
 void pvr_CmdPipelineBarrier2KHR(VkCommandBuffer commandBuffer,
-                                const VkDependencyInfoKHR *pDependencyInfo)
+                                const VkDependencyInfo *pDependencyInfo)
 {
    assert(!"Unimplemented");
 }
 
 void pvr_CmdResetEvent2KHR(VkCommandBuffer commandBuffer,
                            VkEvent _event,
-                           VkPipelineStageFlags2KHR stageMask)
+                           VkPipelineStageFlags2 stageMask)
 {
    assert(!"Unimplemented");
 }
 
 void pvr_CmdSetEvent2KHR(VkCommandBuffer commandBuffer,
                          VkEvent _event,
-                         const VkDependencyInfoKHR *pDependencyInfo)
+                         const VkDependencyInfo *pDependencyInfo)
 {
    assert(!"Unimplemented");
 }
@@ -4712,13 +4712,13 @@ void pvr_CmdSetEvent2KHR(VkCommandBuffer commandBuffer,
 void pvr_CmdWaitEvents2KHR(VkCommandBuffer commandBuffer,
                            uint32_t eventCount,
                            const VkEvent *pEvents,
-                           const VkDependencyInfoKHR *pDependencyInfos)
+                           const VkDependencyInfo *pDependencyInfos)
 {
    assert(!"Unimplemented");
 }
 
 void pvr_CmdWriteTimestamp2KHR(VkCommandBuffer commandBuffer,
-                               VkPipelineStageFlags2KHR stage,
+                               VkPipelineStageFlags2 stage,
                                VkQueryPool queryPool,
                                uint32_t query)
 {
diff --git a/src/imagination/vulkan/pvr_pass.c b/src/imagination/vulkan/pvr_pass.c
index 96e53b7df23..186ef05ed2c 100644
--- a/src/imagination/vulkan/pvr_pass.c
+++ b/src/imagination/vulkan/pvr_pass.c
@@ -59,7 +59,7 @@ static const struct {
 
 static inline bool pvr_subpass_has_msaa_input_attachment(
    struct pvr_render_subpass *subpass,
-   const VkRenderPassCreateInfo2KHR *pCreateInfo)
+   const VkRenderPassCreateInfo2 *pCreateInfo)
 {
    for (uint32_t i = 0; i < subpass->input_count; i++) {
       const uint32_t attachment = subpass->input_attachments[i];
@@ -304,7 +304,7 @@ static void pvr_load_op_destroy(struct pvr_device *device,
    })
 
 VkResult pvr_CreateRenderPass2(VkDevice _device,
-                               const VkRenderPassCreateInfo2KHR *pCreateInfo,
+                               const VkRenderPassCreateInfo2 *pCreateInfo,
                                const VkAllocationCallbacks *pAllocator,
                                VkRenderPass *pRenderPass)
 {
diff --git a/src/imagination/vulkan/pvr_queue.c b/src/imagination/vulkan/pvr_queue.c
index 11e01fae47e..7576c423e6a 100644
--- a/src/imagination/vulkan/pvr_queue.c
+++ b/src/imagination/vulkan/pvr_queue.c
@@ -190,7 +190,7 @@ VkResult pvr_QueueWaitIdle(VkQueue _queue)
 }
 
 static enum pvr_pipeline_stage_bits
-pvr_convert_stage_mask(VkPipelineStageFlags2KHR stage_mask)
+pvr_convert_stage_mask(VkPipelineStageFlags2 stage_mask)
 {
    enum pvr_pipeline_stage_bits stages = 0;