diff --git a/renderdoc/driver/vulkan/vk_common.h b/renderdoc/driver/vulkan/vk_common.h
index 38e7cd0f3..b7a2f17eb 100644
--- a/renderdoc/driver/vulkan/vk_common.h
+++ b/renderdoc/driver/vulkan/vk_common.h
@@ -43,11 +43,9 @@
 #include <xcb/xcb.h>
 #endif
 
-#include <vulkan.h>
-#include <vk_debug_marker_lunarg.h>
-#include <vk_debug_report_lunarg.h>
-#include <vk_ext_khr_swapchain.h>
-#include <vk_ext_khr_device_swapchain.h>
+#include <vulkan/vulkan.h>
+#include <vulkan/vk_lunarg_debug_marker.h>
+#include <vulkan/vk_lunarg_debug_report.h>
 
 #include "api/replay/renderdoc_replay.h"
 
diff --git a/renderdoc/driver/vulkan/vk_dispatchtables.h b/renderdoc/driver/vulkan/vk_dispatchtables.h
index a11822390..f7dcb56cb 100644
--- a/renderdoc/driver/vulkan/vk_dispatchtables.h
+++ b/renderdoc/driver/vulkan/vk_dispatchtables.h
@@ -32,7 +32,7 @@
 #undef CreateSemaphore
 #endif
 
-#include <vk_layer.h>
+#include <vulkan/vk_layer.h>
 
 void InitReplayTables(void *vulkanModule);
 void InitInstanceReplayTables(VkInstance instance);
diff --git a/renderdoc/driver/vulkan/vk_tracelayer.cpp b/renderdoc/driver/vulkan/vk_tracelayer.cpp
index eb3ec8542..11abb3f3a 100644
--- a/renderdoc/driver/vulkan/vk_tracelayer.cpp
+++ b/renderdoc/driver/vulkan/vk_tracelayer.cpp
@@ -24,7 +24,7 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <vk_layer.h>
+#include <vulkan/vk_layer.h>
 
 // RenderDoc Includes