diff --git a/renderdoc/driver/vulkan/Makefile b/renderdoc/driver/vulkan/Makefile
index 1594042d1..1e2c5d5af 100644
--- a/renderdoc/driver/vulkan/Makefile
+++ b/renderdoc/driver/vulkan/Makefile
@@ -5,7 +5,7 @@ MACROS=-DLINUX \
 			 -DRENDERDOC_PLATFORM=linux \
 			 -DRENDERDOC_EXPORTS \
 			 -DGIT_COMMIT_HASH="\"$(COMMIT)\""
-CFLAGS=-c -Wall -Werror -Wno-unused -Wno-unknown-pragmas -fPIC $(MACROS) -I../../ -I../../3rdparty/ -I$(VULKAN_SDK)/include/vulkan
+CFLAGS=-c -Wall -Werror -Wno-unused -Wno-unknown-pragmas -fPIC $(MACROS) -I../../ -I../../3rdparty/ -I$(VK_SDK_PATH)/include
 CPPFLAGS=-std=c++11 -g -Wno-reorder -fvisibility=hidden -fvisibility-inlines-hidden
 OBJDIR=.obj
 OBJECTS=vk_dispatchtables.o \
diff --git a/renderdoc/driver/vulkan/vk_common.h b/renderdoc/driver/vulkan/vk_common.h
index cc6a3c2cd..f83542ce3 100644
--- a/renderdoc/driver/vulkan/vk_common.h
+++ b/renderdoc/driver/vulkan/vk_common.h
@@ -54,11 +54,11 @@
 #include <xcb/xcb.h>
 #endif
 
-#include <vulkan.h>
-#include <vk_debug_marker_lunarg.h>
-#include <vk_debug_report_lunarg.h>
-#include <vk_wsi_swapchain.h>
-#include <vk_wsi_device_swapchain.h>
+#include <vulkan/vulkan.h>
+#include <vulkan/vk_debug_marker_lunarg.h>
+#include <vulkan/vk_debug_report_lunarg.h>
+#include <vulkan/vk_ext_khr_swapchain.h>
+#include <vulkan/vk_ext_khr_device_swapchain.h>
 
 #include "api/replay/renderdoc_replay.h"
 
diff --git a/renderdoc/driver/vulkan/vk_dispatchtables.h b/renderdoc/driver/vulkan/vk_dispatchtables.h
index 098862fac..c01db0fbb 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 InitDeviceReplayTables(VkDevice device);
diff --git a/renderdoc/driver/vulkan/vk_replay.h b/renderdoc/driver/vulkan/vk_replay.h
index 1a1019f58..d6501a0ff 100644
--- a/renderdoc/driver/vulkan/vk_replay.h
+++ b/renderdoc/driver/vulkan/vk_replay.h
@@ -35,7 +35,7 @@
 #undef CreateSemaphore
 #endif
 
-#include "vk_layer.h"
+#include <vulkan/vk_layer.h>
 
 #if defined(WIN32)
 
diff --git a/renderdoc/driver/vulkan/vk_tracelayer.cpp b/renderdoc/driver/vulkan/vk_tracelayer.cpp
index 9b778fc4f..2d72ef386 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