diff --git a/reactos/dll/cpl/console/CMakeLists.txt b/reactos/dll/cpl/console/CMakeLists.txt
index c65229af0f8..809a6baf6a2 100644
--- a/reactos/dll/cpl/console/CMakeLists.txt
+++ b/reactos/dll/cpl/console/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 include_directories(
-    ${REACTOS_SOURCE_DIR}/win32ss/user/winsrv/consrv
-    ${REACTOS_SOURCE_DIR}/win32ss/user/winsrv/consrv/frontends/gui)
+    ${REACTOS_SOURCE_DIR}/win32ss/core/user/winsrv/consrv
+    ${REACTOS_SOURCE_DIR}/win32ss/core/user/winsrv/consrv/frontends/gui)
 
 spec2def(console.dll console.spec)
 
diff --git a/reactos/dll/ntdll/CMakeLists.txt b/reactos/dll/ntdll/CMakeLists.txt
index 982e260f57e..038d786ba08 100644
--- a/reactos/dll/ntdll/CMakeLists.txt
+++ b/reactos/dll/ntdll/CMakeLists.txt
@@ -8,8 +8,7 @@ add_definitions(
 
 include_directories(
     BEFORE include
-    ${REACTOS_SOURCE_DIR}/include/reactos/subsys
-    ${REACTOS_SOURCE_DIR}/win32ss/include)
+    ${REACTOS_SOURCE_DIR}/include/reactos/subsys)
 
 list(APPEND SOURCE
     csr/api.c
diff --git a/reactos/win32ss/base/CMakeLists.txt b/reactos/win32ss/base/CMakeLists.txt
index 70efe77cfd7..170794f3001 100644
--- a/reactos/win32ss/base/CMakeLists.txt
+++ b/reactos/win32ss/base/CMakeLists.txt
@@ -3,3 +3,4 @@ add_subdirectory(advapi32)
 add_subdirectory(basesrv)
 add_subdirectory(kernel32)
 add_subdirectory(kernel32_vista)
+add_subdirectory(scm)
diff --git a/reactos/win32ss/core/gdi/gdi32/CMakeLists.txt b/reactos/win32ss/core/gdi/gdi32/CMakeLists.txt
index 796b50d658c..d10f7c5af4e 100644
--- a/reactos/win32ss/core/gdi/gdi32/CMakeLists.txt
+++ b/reactos/win32ss/core/gdi/gdi32/CMakeLists.txt
@@ -5,7 +5,7 @@ add_definitions(-DLANGPACK)
 
 include_directories(
     include
-    ${REACTOS_SOURCE_DIR}/win32ss/include)
+    ${REACTOS_SOURCE_DIR}/win32ss/core/include)
 
 add_definitions(-DLANGPACK)
 spec2def(gdi32.dll gdi32.spec ADD_IMPORTLIB)
diff --git a/reactos/win32ss/core/gdi/gdi32/wine/CMakeLists.txt b/reactos/win32ss/core/gdi/gdi32/wine/CMakeLists.txt
index 040e6a4607a..892555c992e 100644
--- a/reactos/win32ss/core/gdi/gdi32/wine/CMakeLists.txt
+++ b/reactos/win32ss/core/gdi/gdi32/wine/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 include_directories(
     ${REACTOS_SOURCE_DIR}/include/reactos/wine
-    ${REACTOS_SOURCE_DIR}/win32ss/include
+    ${REACTOS_SOURCE_DIR}/win32ss/core/include
     ../include
     .)
 
diff --git a/reactos/win32ss/core/user/user32/CMakeLists.txt b/reactos/win32ss/core/user/user32/CMakeLists.txt
index 409d325255a..c74e0db3a1f 100644
--- a/reactos/win32ss/core/user/user32/CMakeLists.txt
+++ b/reactos/win32ss/core/user/user32/CMakeLists.txt
@@ -4,7 +4,7 @@ spec2def(user32.dll user32.spec ADD_IMPORTLIB)
 include_directories(
     ${REACTOS_SOURCE_DIR}/include/reactos/subsys
     include
-    ${REACTOS_SOURCE_DIR}/win32ss/include)
+    ${REACTOS_SOURCE_DIR}/win32ss/core/include)
 
 list(APPEND SOURCE
     controls/appswitch.c
diff --git a/reactos/win32ss/core/user/winsrv/CMakeLists.txt b/reactos/win32ss/core/user/winsrv/CMakeLists.txt
index 1444c839737..67af25e8104 100644
--- a/reactos/win32ss/core/user/winsrv/CMakeLists.txt
+++ b/reactos/win32ss/core/user/winsrv/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 include_directories(
     ${REACTOS_SOURCE_DIR}/include/reactos/subsys
-    ${REACTOS_SOURCE_DIR}/win32ss/include)
+    ${REACTOS_SOURCE_DIR}/win32ss/core/include)
 
 spec2def(winsrv.dll winsrv.spec)