diff --git a/include/QF/Makemodule.am b/include/QF/Makemodule.am
index 875262cf6..fff9fd24c 100644
--- a/include/QF/Makemodule.am
+++ b/include/QF/Makemodule.am
@@ -197,11 +197,11 @@ include_qf_vulkan = \
 	include/QF/Vulkan/qf_matrices.h \
 	include/QF/Vulkan/qf_model.h \
 	include/QF/Vulkan/qf_particles.h \
+	include/QF/Vulkan/qf_renderpass.h \
 	include/QF/Vulkan/qf_scene.h \
 	include/QF/Vulkan/qf_sprite.h \
 	include/QF/Vulkan/qf_texture.h \
 	include/QF/Vulkan/qf_vid.h \
-	include/QF/Vulkan/renderpass.h \
 	include/QF/Vulkan/scrap.h \
 	include/QF/Vulkan/shader.h \
 	include/QF/Vulkan/staging.h \
diff --git a/include/QF/Vulkan/renderpass.h b/include/QF/Vulkan/qf_renderpass.h
similarity index 100%
rename from include/QF/Vulkan/renderpass.h
rename to include/QF/Vulkan/qf_renderpass.h
diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am
index 41a940649..102d4a393 100644
--- a/libs/video/renderer/Makemodule.am
+++ b/libs/video/renderer/Makemodule.am
@@ -211,7 +211,6 @@ libs_video_renderer_librender_vulkan_la_SOURCES = \
 	libs/video/renderer/vulkan/memory.c \
 	libs/video/renderer/vulkan/pipeline.c \
 	libs/video/renderer/vulkan/projection.c \
-	libs/video/renderer/vulkan/renderpass.c \
 	libs/video/renderer/vulkan/resource.c \
 	libs/video/renderer/vulkan/scrap.c \
 	libs/video/renderer/vulkan/shader.c \
@@ -229,6 +228,7 @@ libs_video_renderer_librender_vulkan_la_SOURCES = \
 	libs/video/renderer/vulkan/vulkan_main.c \
 	libs/video/renderer/vulkan/vulkan_matrices.c \
 	libs/video/renderer/vulkan/vulkan_particles.c \
+	libs/video/renderer/vulkan/vulkan_renderpass.c \
 	libs/video/renderer/vulkan/vulkan_scene.c \
 	libs/video/renderer/vulkan/vulkan_sprite.c \
 	libs/video/renderer/vulkan/vulkan_texture.c \
diff --git a/libs/video/renderer/vid_render_vulkan.c b/libs/video/renderer/vid_render_vulkan.c
index cce63d511..cae6db2ea 100644
--- a/libs/video/renderer/vid_render_vulkan.c
+++ b/libs/video/renderer/vid_render_vulkan.c
@@ -50,6 +50,7 @@
 #include "QF/Vulkan/qf_main.h"
 #include "QF/Vulkan/qf_matrices.h"
 #include "QF/Vulkan/qf_particles.h"
+#include "QF/Vulkan/qf_renderpass.h"
 #include "QF/Vulkan/qf_scene.h"
 #include "QF/Vulkan/qf_sprite.h"
 #include "QF/Vulkan/qf_texture.h"
@@ -62,7 +63,6 @@
 #include "QF/Vulkan/instance.h"
 #include "QF/Vulkan/projection.h"
 #include "QF/Vulkan/staging.h"
-#include "QF/Vulkan/renderpass.h"
 #include "QF/Vulkan/swapchain.h"
 #include "QF/ui/view.h"
 
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index a403dc7c1..344820e54 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -41,9 +41,10 @@
 #include "QF/Vulkan/instance.h"
 #include "QF/Vulkan/image.h"
 #include "QF/Vulkan/pipeline.h"
-#include "QF/Vulkan/renderpass.h"
 #include "QF/Vulkan/shader.h"
 
+#include "QF/Vulkan/qf_renderpass.h"
+
 #include "vid_vulkan.h"
 
 #define vkparse_internal
diff --git a/libs/video/renderer/vulkan/vulkan_alias.c b/libs/video/renderer/vulkan/vulkan_alias.c
index b9a683fc6..26e5b404e 100644
--- a/libs/video/renderer/vulkan/vulkan_alias.c
+++ b/libs/video/renderer/vulkan/vulkan_alias.c
@@ -42,11 +42,11 @@
 
 #include "QF/Vulkan/qf_alias.h"
 #include "QF/Vulkan/qf_matrices.h"
+#include "QF/Vulkan/qf_renderpass.h"
 #include "QF/Vulkan/qf_texture.h"
 #include "QF/Vulkan/debug.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/instance.h"
-#include "QF/Vulkan/renderpass.h"
 
 #include "r_internal.h"
 #include "vid_vulkan.h"
diff --git a/libs/video/renderer/vulkan/vulkan_bsp.c b/libs/video/renderer/vulkan/vulkan_bsp.c
index a3f7582bf..e73f920a0 100644
--- a/libs/video/renderer/vulkan/vulkan_bsp.c
+++ b/libs/video/renderer/vulkan/vulkan_bsp.c
@@ -57,6 +57,7 @@
 #include "QF/Vulkan/qf_bsp.h"
 #include "QF/Vulkan/qf_lightmap.h"
 #include "QF/Vulkan/qf_matrices.h"
+#include "QF/Vulkan/qf_renderpass.h"
 #include "QF/Vulkan/qf_scene.h"
 #include "QF/Vulkan/qf_texture.h"
 #include "QF/Vulkan/buffer.h"
@@ -67,7 +68,6 @@
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
 #include "QF/Vulkan/instance.h"
-#include "QF/Vulkan/renderpass.h"
 #include "QF/Vulkan/scrap.h"
 #include "QF/Vulkan/staging.h"
 
diff --git a/libs/video/renderer/vulkan/vulkan_compose.c b/libs/video/renderer/vulkan/vulkan_compose.c
index 6d8ad105e..52ff735e8 100644
--- a/libs/video/renderer/vulkan/vulkan_compose.c
+++ b/libs/video/renderer/vulkan/vulkan_compose.c
@@ -45,12 +45,12 @@
 #include "QF/sys.h"
 
 #include "QF/Vulkan/qf_compose.h"
+#include "QF/Vulkan/qf_renderpass.h"
 #include "QF/Vulkan/debug.h"
 #include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
 #include "QF/Vulkan/instance.h"
-#include "QF/Vulkan/renderpass.h"
 
 #include "r_internal.h"
 #include "vid_vulkan.h"
diff --git a/libs/video/renderer/vulkan/vulkan_draw.c b/libs/video/renderer/vulkan/vulkan_draw.c
index c042d814f..0712a50ca 100644
--- a/libs/video/renderer/vulkan/vulkan_draw.c
+++ b/libs/video/renderer/vulkan/vulkan_draw.c
@@ -52,6 +52,7 @@
 #include "compat.h"
 #include "QF/Vulkan/qf_draw.h"
 #include "QF/Vulkan/qf_matrices.h"
+#include "QF/Vulkan/qf_renderpass.h"
 #include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/barrier.h"
 #include "QF/Vulkan/buffer.h"
@@ -61,7 +62,6 @@
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
 #include "QF/Vulkan/instance.h"
-#include "QF/Vulkan/renderpass.h"
 #include "QF/Vulkan/scrap.h"
 #include "QF/Vulkan/staging.h"
 #include "QF/ui/view.h"
diff --git a/libs/video/renderer/vulkan/vulkan_iqm.c b/libs/video/renderer/vulkan/vulkan_iqm.c
index 3dd3261ff..f2491aca5 100644
--- a/libs/video/renderer/vulkan/vulkan_iqm.c
+++ b/libs/video/renderer/vulkan/vulkan_iqm.c
@@ -41,12 +41,12 @@
 
 #include "QF/Vulkan/qf_iqm.h"
 #include "QF/Vulkan/qf_matrices.h"
+#include "QF/Vulkan/qf_renderpass.h"
 #include "QF/Vulkan/qf_texture.h"
 #include "QF/Vulkan/debug.h"
 #include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/instance.h"
-#include "QF/Vulkan/renderpass.h"
 #include "QF/Vulkan/resource.h"
 
 #include "r_internal.h"
diff --git a/libs/video/renderer/vulkan/vulkan_lighting.c b/libs/video/renderer/vulkan/vulkan_lighting.c
index 414031f8f..8da92aa58 100644
--- a/libs/video/renderer/vulkan/vulkan_lighting.c
+++ b/libs/video/renderer/vulkan/vulkan_lighting.c
@@ -56,6 +56,7 @@
 
 #include "QF/Vulkan/qf_draw.h"
 #include "QF/Vulkan/qf_lighting.h"
+#include "QF/Vulkan/qf_renderpass.h"
 #include "QF/Vulkan/qf_texture.h"
 #include "QF/Vulkan/barrier.h"
 #include "QF/Vulkan/buffer.h"
@@ -65,7 +66,6 @@
 #include "QF/Vulkan/image.h"
 #include "QF/Vulkan/instance.h"
 #include "QF/Vulkan/projection.h"
-#include "QF/Vulkan/renderpass.h"
 #include "QF/Vulkan/staging.h"
 
 #include "compat.h"
diff --git a/libs/video/renderer/vulkan/vulkan_main.c b/libs/video/renderer/vulkan/vulkan_main.c
index 698881205..8fa6a91e3 100644
--- a/libs/video/renderer/vulkan/vulkan_main.c
+++ b/libs/video/renderer/vulkan/vulkan_main.c
@@ -56,10 +56,9 @@
 #include "QF/Vulkan/qf_lightmap.h"
 #include "QF/Vulkan/qf_main.h"
 #include "QF/Vulkan/qf_particles.h"
+#include "QF/Vulkan/qf_renderpass.h"
 #include "QF/Vulkan/qf_scene.h"
 #include "QF/Vulkan/qf_sprite.h"
-//#include "QF/Vulkan/qf_textures.h"
-#include "QF/Vulkan/renderpass.h"
 
 #include "mod_internal.h"
 #include "r_internal.h"
diff --git a/libs/video/renderer/vulkan/vulkan_matrices.c b/libs/video/renderer/vulkan/vulkan_matrices.c
index 67765734f..e22f1ff3b 100644
--- a/libs/video/renderer/vulkan/vulkan_matrices.c
+++ b/libs/video/renderer/vulkan/vulkan_matrices.c
@@ -43,13 +43,13 @@
 #include "QF/sys.h"
 #include "QF/va.h"
 #include "QF/Vulkan/qf_matrices.h"
+#include "QF/Vulkan/qf_renderpass.h"
 #include "QF/Vulkan/barrier.h"
 #include "QF/Vulkan/buffer.h"
 #include "QF/Vulkan/debug.h"
 #include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/instance.h"
-#include "QF/Vulkan/renderpass.h"
 #include "QF/Vulkan/staging.h"
 
 #include "r_internal.h"
diff --git a/libs/video/renderer/vulkan/renderpass.c b/libs/video/renderer/vulkan/vulkan_renderpass.c
similarity index 96%
rename from libs/video/renderer/vulkan/renderpass.c
rename to libs/video/renderer/vulkan/vulkan_renderpass.c
index e2f7ff2e9..a3068d42a 100644
--- a/libs/video/renderer/vulkan/renderpass.c
+++ b/libs/video/renderer/vulkan/vulkan_renderpass.c
@@ -32,4 +32,4 @@
 
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
-#include "QF/Vulkan/renderpass.h"
+#include "QF/Vulkan/qf_renderpass.h"
diff --git a/libs/video/renderer/vulkan/vulkan_sprite.c b/libs/video/renderer/vulkan/vulkan_sprite.c
index c8ed837b0..d5fa35454 100644
--- a/libs/video/renderer/vulkan/vulkan_sprite.c
+++ b/libs/video/renderer/vulkan/vulkan_sprite.c
@@ -54,6 +54,7 @@
 #include "QF/scene/entity.h"
 
 #include "QF/Vulkan/qf_matrices.h"
+#include "QF/Vulkan/qf_renderpass.h"
 #include "QF/Vulkan/qf_sprite.h"
 #include "QF/Vulkan/qf_texture.h"
 #include "QF/Vulkan/buffer.h"
@@ -62,7 +63,6 @@
 #include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/instance.h"
-#include "QF/Vulkan/renderpass.h"
 
 #include "r_internal.h"
 #include "vid_vulkan.h"
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 2cd5fa1fe..fcd9919fc 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -46,7 +46,6 @@
 #include "QF/Vulkan/debug.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/instance.h"
-#include "QF/Vulkan/renderpass.h"
 #include "QF/Vulkan/staging.h"
 #include "QF/Vulkan/swapchain.h"
 
@@ -57,6 +56,7 @@
 #include "QF/Vulkan/qf_lighting.h"
 #include "QF/Vulkan/qf_main.h"
 #include "QF/Vulkan/qf_matrices.h"
+#include "QF/Vulkan/qf_renderpass.h"
 #include "QF/Vulkan/qf_vid.h"
 
 #include "r_internal.h"