diff --git a/src/dxgi/dxgi_device.h b/src/dxgi/dxgi_device.h
index afecd6476..0fbd54cc1 100644
--- a/src/dxgi/dxgi_device.h
+++ b/src/dxgi/dxgi_device.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <dxvk_device.h>
-
 #include "dxgi_adapter.h"
 #include "dxgi_interfaces.h"
 #include "dxgi_options.h"
 
+#include "../dxvk/dxvk_device.h"
+
 namespace dxvk {
   
   class DxgiFactory;
diff --git a/src/dxgi/dxgi_factory.h b/src/dxgi/dxgi_factory.h
index de2420b7d..2a81ebdb2 100644
--- a/src/dxgi/dxgi_factory.h
+++ b/src/dxgi/dxgi_factory.h
@@ -2,11 +2,11 @@
 
 #include <vector>
 
-#include <dxvk_instance.h>
-
 #include "dxgi_adapter.h"
 #include "dxgi_options.h"
 
+#include "../dxvk/dxvk_instance.h"
+
 namespace dxvk {
     
   class DxgiFactory : public DxgiObject<IDXGIFactory2> {
diff --git a/src/dxgi/dxgi_swapchain.h b/src/dxgi/dxgi_swapchain.h
index e0cd2b58b..0bbd19ea3 100644
--- a/src/dxgi/dxgi_swapchain.h
+++ b/src/dxgi/dxgi_swapchain.h
@@ -3,14 +3,14 @@
 #include <memory>
 #include <mutex>
 
-#include <dxvk_surface.h>
-#include <dxvk_swapchain.h>
-
 #include "dxgi_interfaces.h"
 #include "dxgi_object.h"
 
 #include "../d3d11/d3d11_interfaces.h"
 
+#include "../dxvk/dxvk_surface.h"
+#include "../dxvk/dxvk_swapchain.h"
+
 #include "../spirv/spirv_module.h"
 
 namespace dxvk {
diff --git a/tests/dxbc/test_dxbc_compiler.cpp b/tests/dxbc/test_dxbc_compiler.cpp
index 1920819ff..26b5d77ef 100644
--- a/tests/dxbc/test_dxbc_compiler.cpp
+++ b/tests/dxbc/test_dxbc_compiler.cpp
@@ -1,8 +1,8 @@
 #include <iterator>
 #include <fstream>
 
-#include <dxbc_module.h>
-#include <dxvk_shader.h>
+#include "../../src/dxbc/dxbc_module.h"
+#include "../../src/dxvk/dxvk_shader.h"
 
 #include <shellapi.h>
 #include <windows.h>