diff --git a/src/imagination/vulkan/pvr_csb.h b/src/imagination/vulkan/pvr_csb.h
index 6e5a3f34416..6066c3c5a89 100644
--- a/src/imagination/vulkan/pvr_csb.h
+++ b/src/imagination/vulkan/pvr_csb.h
@@ -50,16 +50,18 @@
 #define __pvr_make_address(addr_u64) PVR_DEV_ADDR(addr_u64)
 /* clang-format on */
 
-#include "csbgen/rogue/cdm.h"
-#include "csbgen/rogue/cr.h"
-#include "csbgen/rogue/ipf.h"
-#include "csbgen/rogue/kmd_stream.h"
-#include "csbgen/rogue/lls.h"
-#include "csbgen/rogue/pbestate.h"
-#include "csbgen/rogue/pds.h"
-#include "csbgen/rogue/ppp.h"
-#include "csbgen/rogue/texstate.h"
-#include "csbgen/rogue/vdm.h"
+#if defined(PVR_BUILD_ARCH_ROGUE)
+#   include "csbgen/rogue/cdm.h"
+#   include "csbgen/rogue/cr.h"
+#   include "csbgen/rogue/ipf.h"
+#   include "csbgen/rogue/kmd_stream.h"
+#   include "csbgen/rogue/lls.h"
+#   include "csbgen/rogue/pbestate.h"
+#   include "csbgen/rogue/pds.h"
+#   include "csbgen/rogue/ppp.h"
+#   include "csbgen/rogue/texstate.h"
+#   include "csbgen/rogue/vdm.h"
+#endif
 
 /**
  * \brief Size of the individual csb buffer object.
diff --git a/src/imagination/vulkan/pvr_image.c b/src/imagination/vulkan/pvr_image.c
index 935bbeaaa51..09458aad3f6 100644
--- a/src/imagination/vulkan/pvr_image.c
+++ b/src/imagination/vulkan/pvr_image.c
@@ -317,6 +317,7 @@ void pvr_GetImageSubresourceLayout(VkDevice device,
 }
 
 /* Leave this at the very end, to avoid leakage of HW-defs here */
+#define PVR_BUILD_ARCH_ROGUE
 #include "pvr_csb.h"
 
 static unsigned get_pbe_stride_align(const struct pvr_device_info *dev_info)
diff --git a/src/imagination/vulkan/pvr_physical_device.c b/src/imagination/vulkan/pvr_physical_device.c
index 3fc034a5eb8..5e2286707b8 100644
--- a/src/imagination/vulkan/pvr_physical_device.c
+++ b/src/imagination/vulkan/pvr_physical_device.c
@@ -1238,6 +1238,7 @@ pvr_physical_device_setup_formats(struct pvr_physical_device *const pdevice)
 }
 
 /* Leave this at the very end, to avoid leakage of HW-defs here */
+#define PVR_BUILD_ARCH_ROGUE
 #include "pvr_border.h"
 
 static unsigned
diff --git a/src/imagination/vulkan/pvr_transfer_frag_store.c b/src/imagination/vulkan/pvr_transfer_frag_store.c
index 04ca926d8b1..89dc066d3f3 100644
--- a/src/imagination/vulkan/pvr_transfer_frag_store.c
+++ b/src/imagination/vulkan/pvr_transfer_frag_store.c
@@ -399,6 +399,7 @@ void pvr_transfer_frag_store_fini(struct pvr_device *device,
 }
 
 /* Leave this at the very end, to avoid leakage of HW-defs here */
+#define PVR_BUILD_ARCH_ROGUE
 #include "pvr_csb.h"
 
 static uint32_t get_doutu_sample_rate(const struct pvr_device_info *dev_info,