diff --git a/src/imagination/vulkan/meson.build b/src/imagination/vulkan/meson.build
index dbf06afd5ce..b6e5c495105 100644
--- a/src/imagination/vulkan/meson.build
+++ b/src/imagination/vulkan/meson.build
@@ -24,12 +24,12 @@ pvr_files = files(
   'winsys/powervr/pvr_drm_job_transfer.c',
   'winsys/pvr_winsys.c',
   'winsys/pvr_winsys_helper.c',
+  'pvr_arch_border.c',
   'pvr_arch_csb.c',
   'pvr_arch_descriptor_set.c',
   'pvr_arch_device.c',
   'pvr_blit.c',
   'pvr_bo.c',
-  'pvr_border.c',
   'pvr_clear.c',
   'pvr_cmd_buffer.c',
   'pvr_cmd_query.c',
diff --git a/src/imagination/vulkan/pvr_border.c b/src/imagination/vulkan/pvr_arch_border.c
similarity index 100%
rename from src/imagination/vulkan/pvr_border.c
rename to src/imagination/vulkan/pvr_arch_border.c
diff --git a/src/imagination/vulkan/pvr_border.h b/src/imagination/vulkan/pvr_border.h
index 20c0c210901..3afcf79ed03 100644
--- a/src/imagination/vulkan/pvr_border.h
+++ b/src/imagination/vulkan/pvr_border.h
@@ -28,9 +28,10 @@
 #include <stdint.h>
 #include <vulkan/vulkan_core.h>
 
-#include "pvr_csb.h"
 #include "util/bitset.h"
 
+#include "pvr_csb.h"
+
 #define PVR_BORDER_COLOR_TABLE_NR_ENTRIES \
    (ROGUE_TEXSTATE_SAMPLER_WORD0_BORDERCOLOR_INDEX_MAX_SIZE + 1)