diff --git a/include/QF/Vulkan/capture.h b/include/QF/Vulkan/capture.h
index 6cfd9d47e..c3043ae59 100644
--- a/include/QF/Vulkan/capture.h
+++ b/include/QF/Vulkan/capture.h
@@ -1,6 +1,11 @@
 #ifndef __QF_Vulkan_capture_h
 #define __QF_Vulkan_capture_h
 
+#ifndef VK_NO_PROTOTYPES
+#define VK_NO_PROTOTYPES
+#endif
+#include <vulkan/vulkan.h>
+
 #include "QF/darray.h"
 #include "QF/qtypes.h"
 
diff --git a/include/QF/Vulkan/command.h b/include/QF/Vulkan/command.h
index d568e03f2..452baa9ca 100644
--- a/include/QF/Vulkan/command.h
+++ b/include/QF/Vulkan/command.h
@@ -1,6 +1,11 @@
 #ifndef __QF_Vulkan_command_h
 #define __QF_Vulkan_command_h
 
+#ifndef VK_NO_PROTOTYPES
+#define VK_NO_PROTOTYPES
+#endif
+#include <vulkan/vulkan.h>
+
 #include "QF/darray.h"
 
 typedef struct qfv_cmdbufferset_s
diff --git a/include/QF/Vulkan/descriptor.h b/include/QF/Vulkan/descriptor.h
index 6dd09bff4..14d6be987 100644
--- a/include/QF/Vulkan/descriptor.h
+++ b/include/QF/Vulkan/descriptor.h
@@ -1,6 +1,11 @@
 #ifndef __QF_Vulkan_descriptor_h
 #define __QF_Vulkan_descriptor_h
 
+#ifndef VK_NO_PROTOTYPES
+#define VK_NO_PROTOTYPES
+#endif
+#include <vulkan/vulkan.h>
+
 #include "QF/darray.h"
 
 typedef struct qfv_bindingset_s
diff --git a/libs/video/renderer/vulkan/barrier.c b/libs/video/renderer/vulkan/barrier.c
index 7c4f6b788..2ef03860a 100644
--- a/libs/video/renderer/vulkan/barrier.c
+++ b/libs/video/renderer/vulkan/barrier.c
@@ -28,7 +28,6 @@
 # include "config.h"
 #endif
 
-#include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/barrier.h"
 
 const qfv_imagebarrier_t imageBarriers[] = {
diff --git a/libs/video/renderer/vulkan/buffer.c b/libs/video/renderer/vulkan/buffer.c
index 30030adee..95f5fea74 100644
--- a/libs/video/renderer/vulkan/buffer.c
+++ b/libs/video/renderer/vulkan/buffer.c
@@ -29,7 +29,6 @@
 #endif
 
 #include "QF/mathlib.h"
-#include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/buffer.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/instance.h"
diff --git a/libs/video/renderer/vulkan/capture.c b/libs/video/renderer/vulkan/capture.c
index 974957aa7..53da1560f 100644
--- a/libs/video/renderer/vulkan/capture.c
+++ b/libs/video/renderer/vulkan/capture.c
@@ -28,7 +28,6 @@
 # include "config.h"
 #endif
 
-#include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/capture.h"
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/device.h"
diff --git a/libs/video/renderer/vulkan/command.c b/libs/video/renderer/vulkan/command.c
index c35fede96..5c64f851c 100644
--- a/libs/video/renderer/vulkan/command.c
+++ b/libs/video/renderer/vulkan/command.c
@@ -28,7 +28,6 @@
 # include "config.h"
 #endif
 
-#include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/device.h"
 
diff --git a/libs/video/renderer/vulkan/descriptor.c b/libs/video/renderer/vulkan/descriptor.c
index 026d5ae9c..ca7791ea8 100644
--- a/libs/video/renderer/vulkan/descriptor.c
+++ b/libs/video/renderer/vulkan/descriptor.c
@@ -30,7 +30,6 @@
 
 #include "QF/hash.h"
 
-#include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
 
diff --git a/libs/video/renderer/vulkan/device.c b/libs/video/renderer/vulkan/device.c
index 0ff989511..5dc2e331a 100644
--- a/libs/video/renderer/vulkan/device.c
+++ b/libs/video/renderer/vulkan/device.c
@@ -32,7 +32,6 @@
 
 #include "QF/sys.h"
 
-#include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/instance.h"
 
diff --git a/libs/video/renderer/vulkan/image.c b/libs/video/renderer/vulkan/image.c
index f60082c7f..9d9bfbb21 100644
--- a/libs/video/renderer/vulkan/image.c
+++ b/libs/video/renderer/vulkan/image.c
@@ -30,7 +30,6 @@
 
 #include "QF/mathlib.h"
 
-#include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/barrier.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
diff --git a/libs/video/renderer/vulkan/memory.c b/libs/video/renderer/vulkan/memory.c
index ee2d6ec01..12f6d4ab3 100644
--- a/libs/video/renderer/vulkan/memory.c
+++ b/libs/video/renderer/vulkan/memory.c
@@ -28,7 +28,6 @@
 # include "config.h"
 #endif
 
-#include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/memory.h"
 
diff --git a/libs/video/renderer/vulkan/pipeline.c b/libs/video/renderer/vulkan/pipeline.c
index b602287f6..c83ef4a3b 100644
--- a/libs/video/renderer/vulkan/pipeline.c
+++ b/libs/video/renderer/vulkan/pipeline.c
@@ -30,7 +30,6 @@
 
 #include "QF/dstring.h"
 
-#include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/pipeline.h"
diff --git a/libs/video/renderer/vulkan/renderpass.c b/libs/video/renderer/vulkan/renderpass.c
index e0a95db8d..f69c1bd96 100644
--- a/libs/video/renderer/vulkan/renderpass.c
+++ b/libs/video/renderer/vulkan/renderpass.c
@@ -30,7 +30,6 @@
 
 #include "QF/cvar.h"
 
-#include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
 #include "QF/Vulkan/renderpass.h"
diff --git a/libs/video/renderer/vulkan/scrap.c b/libs/video/renderer/vulkan/scrap.c
index 6517d2b17..9e89fb050 100644
--- a/libs/video/renderer/vulkan/scrap.c
+++ b/libs/video/renderer/vulkan/scrap.c
@@ -34,7 +34,6 @@
 #include "QF/render.h"
 #include "QF/ui/vrect.h"
 
-#include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/barrier.h"
 #include "QF/Vulkan/buffer.h"
 #include "QF/Vulkan/command.h"
diff --git a/libs/video/renderer/vulkan/staging.c b/libs/video/renderer/vulkan/staging.c
index e16aa49df..22f96f40b 100644
--- a/libs/video/renderer/vulkan/staging.c
+++ b/libs/video/renderer/vulkan/staging.c
@@ -30,7 +30,6 @@
 
 #include "QF/dstring.h"
 
-#include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/buffer.h"
 #include "QF/Vulkan/command.h"
 #include "QF/Vulkan/debug.h"
diff --git a/libs/video/renderer/vulkan/swapchain.c b/libs/video/renderer/vulkan/swapchain.c
index 9f48594b2..278b27f70 100644
--- a/libs/video/renderer/vulkan/swapchain.c
+++ b/libs/video/renderer/vulkan/swapchain.c
@@ -9,13 +9,11 @@
 #include "QF/cvar.h"
 #include "QF/mathlib.h"
 
-#include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/image.h"
 #include "QF/Vulkan/instance.h"
 #include "QF/Vulkan/swapchain.h"
 
-#include "r_internal.h"
 #include "vid_vulkan.h"
 
 qfv_swapchain_t *
diff --git a/libs/video/renderer/vulkan/vkparse.c b/libs/video/renderer/vulkan/vkparse.c
index 98effde21..4e7c95a9a 100644
--- a/libs/video/renderer/vulkan/vkparse.c
+++ b/libs/video/renderer/vulkan/vkparse.c
@@ -36,7 +36,6 @@
 #include "QF/mathlib.h"
 #include "QF/va.h"
 
-#include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/debug.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/instance.h"
diff --git a/libs/video/renderer/vulkan/vulkan_main.c b/libs/video/renderer/vulkan/vulkan_main.c
index a68022c32..9af4c5b73 100644
--- a/libs/video/renderer/vulkan/vulkan_main.c
+++ b/libs/video/renderer/vulkan/vulkan_main.c
@@ -150,28 +150,3 @@ Vulkan_NewScene (scene_t *scene, vulkan_ctx_t *ctx)
 	Vulkan_BuildDisplayLists (scene->models, scene->num_models, ctx);
 	Vulkan_LoadLights (scene, ctx);
 }
-
-/*void
-glsl_R_LineGraph (int x, int y, int *h_vals, int count)
-{
-}*/
-
-/*void
-glsl_R_TimeRefresh_f (void)
-{
-	double      start, stop, time;
-	int         i;
-
-	glsl_ctx->end_rendering ();
-
-	start = Sys_DoubleTime ();
-	for (i = 0; i < 128; i++) {
-		r_refdef.viewangles[1] = i * (360.0 / 128.0);
-		Vulkan_RenderView (ctx);
-		glsl_ctx->end_rendering ();
-	}
-
-	stop = Sys_DoubleTime ();
-	time = stop - start;
-	Sys_Printf ("%g seconds (%g fps)\n", time, 128 / time);
-}*/
diff --git a/libs/video/renderer/vulkan/vulkan_matrices.c b/libs/video/renderer/vulkan/vulkan_matrices.c
index 363ca70be..67765734f 100644
--- a/libs/video/renderer/vulkan/vulkan_matrices.c
+++ b/libs/video/renderer/vulkan/vulkan_matrices.c
@@ -49,16 +49,12 @@
 #include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
 #include "QF/Vulkan/instance.h"
-#include "QF/Vulkan/projection.h"
 #include "QF/Vulkan/renderpass.h"
 #include "QF/Vulkan/staging.h"
-#include "QF/ui/view.h"
 
 #include "r_internal.h"
 #include "vid_vulkan.h"
 
-#include "util.h"
-
 static void
 setup_view (vulkan_ctx_t *ctx)
 {
diff --git a/libs/video/renderer/vulkan/vulkan_particles.c b/libs/video/renderer/vulkan/vulkan_particles.c
index 461c01c91..e2fe68ac7 100644
--- a/libs/video/renderer/vulkan/vulkan_particles.c
+++ b/libs/video/renderer/vulkan/vulkan_particles.c
@@ -42,9 +42,6 @@
 #include "QF/render.h"
 #include "QF/va.h"
 
-#include "QF/plugin/vid_render.h"
-
-#include "QF/Vulkan/qf_vid.h" //FIXME header issues
 #include "QF/Vulkan/buffer.h"
 #include "QF/Vulkan/debug.h"
 #include "QF/Vulkan/device.h"
@@ -52,7 +49,6 @@
 #include "QF/Vulkan/staging.h"
 #include "QF/Vulkan/qf_particles.h"
 
-#include "r_internal.h"
 #include "vid_vulkan.h"
 
 //FIXME make dynamic
diff --git a/libs/video/renderer/vulkan/vulkan_texture.c b/libs/video/renderer/vulkan/vulkan_texture.c
index f30d3407e..2033b9182 100644
--- a/libs/video/renderer/vulkan/vulkan_texture.c
+++ b/libs/video/renderer/vulkan/vulkan_texture.c
@@ -38,30 +38,16 @@
 # include <strings.h>
 #endif
 
-#include "QF/alloc.h"
-#include "QF/cvar.h"
-#include "QF/dstring.h"
-#include "QF/hash.h"
-#include "QF/image.h"
-#include "QF/mathlib.h"
-#include "QF/quakefs.h"
-#include "QF/render.h"
-#include "QF/sys.h"
 #include "QF/va.h"
-#include "QF/Vulkan/qf_vid.h"
 #include "QF/Vulkan/qf_texture.h"
 #include "QF/Vulkan/barrier.h"
-#include "QF/Vulkan/buffer.h"
-#include "QF/Vulkan/command.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/scrap.h"
 #include "QF/Vulkan/staging.h"
 
-#include "r_scrap.h"
 #include "vid_vulkan.h"
 
 void
diff --git a/libs/video/renderer/vulkan/vulkan_vid_common.c b/libs/video/renderer/vulkan/vulkan_vid_common.c
index 36d8de490..07a236a0c 100644
--- a/libs/video/renderer/vulkan/vulkan_vid_common.c
+++ b/libs/video/renderer/vulkan/vulkan_vid_common.c
@@ -31,40 +31,22 @@
 #ifdef HAVE_MATH_H
 # include <math.h>
 #endif
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
+
+#include <string.h>
 
 #include "QF/cexpr.h"
 #include "QF/cmem.h"
 #include "QF/cvar.h"
 #include "QF/dstring.h"
 #include "QF/hash.h"
-#include "QF/mathlib.h"
 #include "QF/plist.h"
-#include "QF/qargs.h"
-#include "QF/quakefs.h"
-#include "QF/sys.h"
 #include "QF/va.h"
-#include "QF/simd/vec4f.h"
 #include "QF/scene/entity.h"
-#include "QF/Vulkan/qf_matrices.h"
-#include "QF/Vulkan/qf_vid.h"
-#include "QF/Vulkan/barrier.h"
-#include "QF/Vulkan/buffer.h"
 #include "QF/Vulkan/capture.h"
 #include "QF/Vulkan/debug.h"
-#include "QF/Vulkan/descriptor.h"
 #include "QF/Vulkan/device.h"
-#include "QF/Vulkan/command.h"
 #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/staging.h"
 #include "QF/Vulkan/swapchain.h"
 
@@ -74,13 +56,12 @@
 #include "QF/Vulkan/qf_draw.h"
 #include "QF/Vulkan/qf_lighting.h"
 #include "QF/Vulkan/qf_main.h"
+#include "QF/Vulkan/qf_matrices.h"
+#include "QF/Vulkan/qf_vid.h"
 
-#include "compat.h"
-#include "d_iface.h"
 #include "r_internal.h"
 #include "vid_vulkan.h"
 
-#include "util.h"
 #include "vkparse.h"
 
 #include "libs/video/renderer/vulkan/vkparse.hinc"