diff --git a/src/imagination/vulkan/pvr_job_common.h b/src/imagination/vulkan/pvr_job_common.h
index bdcf29abbf7..9aa0832f252 100644
--- a/src/imagination/vulkan/pvr_job_common.h
+++ b/src/imagination/vulkan/pvr_job_common.h
@@ -30,7 +30,6 @@
 
 #include "hwdef/rogue_hw_defs.h"
 #include "pvr_csb_enum_helpers.h"
-#include "pvr_private.h"
 #include "pvr_types.h"
 
 enum pvr_pbe_gamma {
diff --git a/src/imagination/vulkan/pvr_job_context.h b/src/imagination/vulkan/pvr_job_context.h
index 206c879c171..3b73c452411 100644
--- a/src/imagination/vulkan/pvr_job_context.h
+++ b/src/imagination/vulkan/pvr_job_context.h
@@ -25,7 +25,6 @@
 #define PVR_JOB_CONTEXT_H
 
 #include "pvr_common.h"
-#include "pvr_private.h"
 #include "pvr_transfer_frag_store.h"
 #include "pvr_types.h"
 #include "pvr_usc.h"
diff --git a/src/imagination/vulkan/pvr_pipeline.h b/src/imagination/vulkan/pvr_pipeline.h
index 934d15f780a..e821059372f 100644
--- a/src/imagination/vulkan/pvr_pipeline.h
+++ b/src/imagination/vulkan/pvr_pipeline.h
@@ -15,9 +15,11 @@
 #define PVR_PIPELINE_H
 
 #include "vk_object.h"
+#include "vk_graphics_state.h"
 
+#include "pvr_common.h"
+#include "pvr_csb.h"
 #include "pvr_pds.h"
-#include "pvr_private.h"
 
 struct pvr_suballoc_bo;
 
diff --git a/src/imagination/vulkan/pvr_tex_state.h b/src/imagination/vulkan/pvr_tex_state.h
index f807d168bbf..9710dfdac02 100644
--- a/src/imagination/vulkan/pvr_tex_state.h
+++ b/src/imagination/vulkan/pvr_tex_state.h
@@ -28,7 +28,6 @@
 #include <vulkan/vulkan.h>
 
 #include "hwdef/rogue_hw_defs.h"
-#include "pvr_private.h"
 #include "pvr_types.h"
 #include "util/macros.h"
 
diff --git a/src/imagination/vulkan/pvr_usc.c b/src/imagination/vulkan/pvr_usc.c
index 8102bada955..7cf060f8e4b 100644
--- a/src/imagination/vulkan/pvr_usc.c
+++ b/src/imagination/vulkan/pvr_usc.c
@@ -22,7 +22,7 @@
 #include "pco/usclib/pco_usclib.h"
 #include "pvr_common.h"
 #include "pvr_formats.h"
-#include "pvr_private.h"
+#include "pvr_hw_pass.h"
 #include "pvr_pass.h"
 #include "pvr_usc.h"
 #include "util/macros.h"
diff --git a/src/imagination/vulkan/pvr_usc.h b/src/imagination/vulkan/pvr_usc.h
index de672da9fe3..d6c8a1236ea 100644
--- a/src/imagination/vulkan/pvr_usc.h
+++ b/src/imagination/vulkan/pvr_usc.h
@@ -18,7 +18,6 @@
 #include "pco/pco.h"
 #include "pvr_common.h"
 #include "pvr_formats.h"
-#include "pvr_private.h"
 
 struct pvr_load_op;
 
diff --git a/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_bo.h b/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_bo.h
index 519b55aac44..86bc257c521 100644
--- a/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_bo.h
+++ b/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_bo.h
@@ -26,7 +26,6 @@
 
 #include <stdint.h>
 
-#include "pvr_private.h"
 #include "pvr_srv.h"
 #include "pvr_types.h"
 #include "pvr_winsys.h"
diff --git a/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_bridge.h b/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_bridge.h
index 3d8e7643590..0f2b4c1f618 100644
--- a/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_bridge.h
+++ b/src/imagination/vulkan/winsys/pvrsrvkm/pvr_srv_bridge.h
@@ -28,7 +28,6 @@
 #include <stdint.h>
 
 #include "drm-uapi/drm.h"
-#include "pvr_private.h"
 #include "pvr_srv.h"
 #include "pvr_types.h"
 #include "util/macros.h"