diff --git a/src/imagination/vulkan/pvr_framebuffer.h b/src/imagination/vulkan/pvr_framebuffer.h
index ef14e6ca8a9..cf0df6f643d 100644
--- a/src/imagination/vulkan/pvr_framebuffer.h
+++ b/src/imagination/vulkan/pvr_framebuffer.h
@@ -14,6 +14,12 @@
 #ifndef PVR_FRAMEBUFFER_H
 #define PVR_FRAMEBUFFER_H
 
+#include <pthread.h>
+
+#include "vk_object.h"
+
+#include "pvr_limits.h"
+
 struct pvr_render_target {
    struct pvr_rt_dataset *rt_dataset[PVR_MAX_MULTIVIEW];
 
diff --git a/src/imagination/vulkan/pvr_sampler.c b/src/imagination/vulkan/pvr_sampler.c
index 42252285d9e..cb6ee1a5bfa 100644
--- a/src/imagination/vulkan/pvr_sampler.c
+++ b/src/imagination/vulkan/pvr_sampler.c
@@ -16,6 +16,7 @@
 #include "vk_log.h"
 
 #include "pvr_border.h"
+#include "pvr_csb.h"
 #include "pvr_device.h"
 #include "pvr_entrypoints.h"
 #include "pvr_physical_device.h"
diff --git a/src/imagination/vulkan/pvr_sampler.h b/src/imagination/vulkan/pvr_sampler.h
index 4a797a3fc29..17cdb5e3e48 100644
--- a/src/imagination/vulkan/pvr_sampler.h
+++ b/src/imagination/vulkan/pvr_sampler.h
@@ -18,10 +18,6 @@
 
 #include "vk_sampler.h"
 
-#include "hwdef/rogue_hw_defs.h"
-
-#include "pco/pco_data.h"
-
 #include "pvr_common.h"
 
 struct pvr_sampler {