diff --git a/reactos/dll/ntdll/CMakeLists.txt b/reactos/dll/ntdll/CMakeLists.txt
index 13d9541f59a..fb5a3ea5e58 100644
--- a/reactos/dll/ntdll/CMakeLists.txt
+++ b/reactos/dll/ntdll/CMakeLists.txt
@@ -8,7 +8,8 @@ add_definitions(
 
 include_directories(
     BEFORE include
-    ${REACTOS_SOURCE_DIR}/include/reactos/subsys)
+    ${REACTOS_SOURCE_DIR}/include/reactos/subsys
+    ${REACTOS_SOURCE_DIR}/win32ss/include)
 
 list(APPEND SOURCE
     csr/api.c
diff --git a/reactos/dll/ntdll/ldr/ldrinit.c b/reactos/dll/ntdll/ldr/ldrinit.c
index b451f122540..d751e3ec376 100644
--- a/reactos/dll/ntdll/ldr/ldrinit.c
+++ b/reactos/dll/ntdll/ldr/ldrinit.c
@@ -10,7 +10,7 @@
 /* INCLUDES *****************************************************************/
 
 #include <ntdll.h>
-#include <win32k/callback.h>
+#include <callback.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/win32ss/gdi/gdi32/CMakeLists.txt b/reactos/win32ss/gdi/gdi32/CMakeLists.txt
index 73268aba47b..1061717d5df 100644
--- a/reactos/win32ss/gdi/gdi32/CMakeLists.txt
+++ b/reactos/win32ss/gdi/gdi32/CMakeLists.txt
@@ -2,7 +2,9 @@
 
 add_definitions(-DLANGPACK)
 
-include_directories(include)
+include_directories(
+    include
+    ${REACTOS_SOURCE_DIR}/win32ss/include)
 
 spec2def(gdi32.dll gdi32.spec ADD_IMPORTLIB)
 
diff --git a/reactos/win32ss/gdi/gdi32/include/precomp.h b/reactos/win32ss/gdi/gdi32/include/precomp.h
index 9f1b62770f0..db8cf5a81e8 100644
--- a/reactos/win32ss/gdi/gdi32/include/precomp.h
+++ b/reactos/win32ss/gdi/gdi32/include/precomp.h
@@ -33,14 +33,14 @@
 #include <d3dhal.h>
 
 /* Public Win32K Headers */
-#include <win32k/ntgdityp.h>
+#include <ntgdityp.h>
 #include <ntgdi.h>
-#include <win32k/ntgdihdl.h>
+#include <ntgdihdl.h>
 
 /* Private GDI32 Header */
 #include "gdi32p.h"
 
 /* Deprecated NTGDI calls which shouldn't exist */
-#include <win32k/ntgdibad.h>
+#include <ntgdibad.h>
 
 /* EOF */
diff --git a/reactos/include/reactos/win32k/callback.h b/reactos/win32ss/include/callback.h
similarity index 100%
rename from reactos/include/reactos/win32k/callback.h
rename to reactos/win32ss/include/callback.h
diff --git a/reactos/include/reactos/win32k/ntgdibad.h b/reactos/win32ss/include/ntgdibad.h
similarity index 100%
rename from reactos/include/reactos/win32k/ntgdibad.h
rename to reactos/win32ss/include/ntgdibad.h
diff --git a/reactos/include/reactos/win32k/ntgdihdl.h b/reactos/win32ss/include/ntgdihdl.h
similarity index 100%
rename from reactos/include/reactos/win32k/ntgdihdl.h
rename to reactos/win32ss/include/ntgdihdl.h
diff --git a/reactos/include/reactos/win32k/ntgdityp.h b/reactos/win32ss/include/ntgdityp.h
similarity index 100%
rename from reactos/include/reactos/win32k/ntgdityp.h
rename to reactos/win32ss/include/ntgdityp.h
diff --git a/reactos/include/reactos/win32k/ntuser.h b/reactos/win32ss/include/ntuser.h
similarity index 100%
rename from reactos/include/reactos/win32k/ntuser.h
rename to reactos/win32ss/include/ntuser.h
diff --git a/reactos/include/reactos/win32k/ntusrtyp.h b/reactos/win32ss/include/ntusrtyp.h
similarity index 100%
rename from reactos/include/reactos/win32k/ntusrtyp.h
rename to reactos/win32ss/include/ntusrtyp.h
diff --git a/reactos/win32ss/pch.h b/reactos/win32ss/pch.h
index 90bc9992909..8abe0049db2 100644
--- a/reactos/win32ss/pch.h
+++ b/reactos/win32ss/pch.h
@@ -72,12 +72,12 @@ typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
 #include <csrss/csrss.h>
 
 /* Public Win32K headers */
-#include <win32k/callback.h>
-#include <win32k/ntusrtyp.h>
-#include <win32k/ntuser.h>
-#include <win32k/ntgdityp.h>
-#include <win32k/ntgdibad.h>
-#include <win32k/ntgdihdl.h>
+#include <include/callback.h>
+#include <include/ntusrtyp.h>
+#include <include/ntuser.h>
+#include <include/ntgdityp.h>
+#include <include/ntgdibad.h>
+#include <include/ntgdihdl.h>
 #include <ntgdi.h>
 
 /* Undocumented user definitions */
diff --git a/reactos/win32ss/user/user32/CMakeLists.txt b/reactos/win32ss/user/user32/CMakeLists.txt
index cdbe4fe4e43..b67b30d33e7 100644
--- a/reactos/win32ss/user/user32/CMakeLists.txt
+++ b/reactos/win32ss/user/user32/CMakeLists.txt
@@ -4,7 +4,8 @@ spec2def(user32.dll user32.spec ADD_IMPORTLIB)
 include_directories(
     BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine
     ${REACTOS_SOURCE_DIR}/include/reactos/subsys
-    include)
+    include
+    ${REACTOS_SOURCE_DIR}/win32ss/include)
 
 set_rc_compiler()
 
diff --git a/reactos/win32ss/user/user32/include/user32.h b/reactos/win32ss/user/user32/include/user32.h
index 4dd40c7ba73..be2e6cd8e50 100644
--- a/reactos/win32ss/user/user32/include/user32.h
+++ b/reactos/win32ss/user/user32/include/user32.h
@@ -33,9 +33,9 @@
 #include <csrss/csrss.h>
 
 /* Public Win32K Headers */
-#include <win32k/ntusrtyp.h>
-#include <win32k/ntuser.h>
-#include <win32k/callback.h>
+#include <ntusrtyp.h>
+#include <ntuser.h>
+#include <callback.h>
 
 /* Undocumented user definitions*/
 #include <undocuser.h>
diff --git a/reactos/win32ss/user/win32csr/CMakeLists.txt b/reactos/win32ss/user/win32csr/CMakeLists.txt
index 85acbb2f6c0..dddeec587c3 100644
--- a/reactos/win32ss/user/win32csr/CMakeLists.txt
+++ b/reactos/win32ss/user/win32csr/CMakeLists.txt
@@ -4,7 +4,8 @@ include_directories(
     ${REACTOS_SOURCE_DIR}/subsystems/win32/csrss/include
     ${REACTOS_SOURCE_DIR}/include/reactos/subsys
     ${REACTOS_SOURCE_DIR}/include/reactos/drivers
-    ${REACTOS_SOURCE_DIR}/dll/cpl/console)
+    ${REACTOS_SOURCE_DIR}/dll/cpl/console
+    ${REACTOS_SOURCE_DIR}/win32ss/include)
 
 spec2def(win32csr.dll win32csr.spec)
 
diff --git a/reactos/win32ss/user/win32csr/w32csr.h b/reactos/win32ss/user/win32csr/w32csr.h
index bf1b2a412f6..357a2c9e6cb 100644
--- a/reactos/win32ss/user/win32csr/w32csr.h
+++ b/reactos/win32ss/user/win32csr/w32csr.h
@@ -16,7 +16,7 @@
 #include "tuiconsole.h"
 
 /* Public Win32K Headers */
-#include <win32k/ntuser.h>
+#include <ntuser.h>
 
 #include "resource.h"