diff --git a/reactos/dll/opengl/mesa/drivers/common/CMakeLists.txt b/reactos/dll/opengl/mesa/drivers/common/CMakeLists.txt
index 2037330a389..c38b5a9655d 100644
--- a/reactos/dll/opengl/mesa/drivers/common/CMakeLists.txt
+++ b/reactos/dll/opengl/mesa/drivers/common/CMakeLists.txt
@@ -4,3 +4,4 @@ list(APPEND SOURCE
     meta.c)
 
 add_library(mesa_drv_common STATIC ${SOURCE})
+add_dependencies(mesa_drv_common xdk)
diff --git a/reactos/dll/opengl/mesa/main/CMakeLists.txt b/reactos/dll/opengl/mesa/main/CMakeLists.txt
index b4e4a965e8a..a0c6a4c3d05 100644
--- a/reactos/dll/opengl/mesa/main/CMakeLists.txt
+++ b/reactos/dll/opengl/mesa/main/CMakeLists.txt
@@ -70,6 +70,7 @@ list(APPEND SOURCE
     precomp.h)
 
 add_library(mesa_main STATIC ${SOURCE})
+add_dependencies(mesa_main xdk)
 add_pch(mesa_main precomp.h SOURCE)
 
 if(NOT MSVC)
diff --git a/reactos/dll/opengl/mesa/math/CMakeLists.txt b/reactos/dll/opengl/mesa/math/CMakeLists.txt
index 34543f3ea24..17460fdbd12 100644
--- a/reactos/dll/opengl/mesa/math/CMakeLists.txt
+++ b/reactos/dll/opengl/mesa/math/CMakeLists.txt
@@ -11,4 +11,5 @@ list(APPEND SOURCE
     precomp.h)
 
 add_library(mesa_math STATIC ${SOURCE})
+add_dependencies(mesa_math xdk)
 add_pch(mesa_math precomp.h SOURCE)
diff --git a/reactos/dll/opengl/mesa/swrast/CMakeLists.txt b/reactos/dll/opengl/mesa/swrast/CMakeLists.txt
index a0ac9d37eac..588c43df4ca 100644
--- a/reactos/dll/opengl/mesa/swrast/CMakeLists.txt
+++ b/reactos/dll/opengl/mesa/swrast/CMakeLists.txt
@@ -28,6 +28,7 @@ list(APPEND SOURCE
     precomp.h)
 
 add_library(mesa_swrast STATIC ${SOURCE})
+add_dependencies(mesa_swrast xdk)
 add_pch(mesa_swrast precomp.h SOURCE)
 
 if(MSVC)
diff --git a/reactos/dll/opengl/mesa/swrast_setup/CMakeLists.txt b/reactos/dll/opengl/mesa/swrast_setup/CMakeLists.txt
index b488022c6bc..0dcd413a537 100644
--- a/reactos/dll/opengl/mesa/swrast_setup/CMakeLists.txt
+++ b/reactos/dll/opengl/mesa/swrast_setup/CMakeLists.txt
@@ -4,3 +4,4 @@ list(APPEND SOURCE
     ss_triangle.c)
 
 add_library(mesa_swrast_setup STATIC ${SOURCE})
+add_dependencies(mesa_swrast_setup xdk)
diff --git a/reactos/dll/opengl/mesa/tnl/CMakeLists.txt b/reactos/dll/opengl/mesa/tnl/CMakeLists.txt
index 237c7775361..734d23425f6 100644
--- a/reactos/dll/opengl/mesa/tnl/CMakeLists.txt
+++ b/reactos/dll/opengl/mesa/tnl/CMakeLists.txt
@@ -18,4 +18,5 @@ list(APPEND SOURCE
     precomp.h)
 
 add_library(mesa_tnl STATIC ${SOURCE})
+add_dependencies(mesa_tnl xdk)
 add_pch(mesa_tnl precomp.h SOURCE)
diff --git a/reactos/dll/opengl/mesa/vbo/CMakeLists.txt b/reactos/dll/opengl/mesa/vbo/CMakeLists.txt
index 8433be42cf4..1383c671808 100644
--- a/reactos/dll/opengl/mesa/vbo/CMakeLists.txt
+++ b/reactos/dll/opengl/mesa/vbo/CMakeLists.txt
@@ -18,4 +18,5 @@ list(APPEND SOURCE
     precomp.h)
 
 add_library(mesa_vbo STATIC ${SOURCE})
+add_dependencies(mesa_vbo xdk)
 add_pch(mesa_vbo precomp.h SOURCE)
diff --git a/reactos/dll/win32/shell32/shelldesktop/CMakeLists.txt b/reactos/dll/win32/shell32/shelldesktop/CMakeLists.txt
index 7625c31aef4..3ea3fca01b4 100644
--- a/reactos/dll/win32/shell32/shelldesktop/CMakeLists.txt
+++ b/reactos/dll/win32/shell32/shelldesktop/CMakeLists.txt
@@ -1,9 +1,7 @@
-PROJECT(SHELL)
 
+project(SHELL)
 set_cpp(WITH_RUNTIME)
-
 add_definitions(-DUNICODE -D_UNICODE)
-
 include_directories(${REACTOS_SOURCE_DIR}/lib/atl)
 
 list(APPEND SOURCE
@@ -11,3 +9,4 @@ list(APPEND SOURCE
     dde.cpp)
 
 add_library(shelldesktop ${SOURCE})
+add_dependencies(shelldesktop xdk)
diff --git a/reactos/dll/win32/shell32/shellmenu/CMakeLists.txt b/reactos/dll/win32/shell32/shellmenu/CMakeLists.txt
index 65754c616c5..7136e60e74f 100644
--- a/reactos/dll/win32/shell32/shellmenu/CMakeLists.txt
+++ b/reactos/dll/win32/shell32/shellmenu/CMakeLists.txt
@@ -17,3 +17,4 @@ list(APPEND SOURCE
     CStartMenu.cpp)
 
 add_library(shellmenu ${SOURCE})
+add_dependencies(shellmenu xdk)
diff --git a/reactos/lib/3rdparty/libwine/CMakeLists.txt b/reactos/lib/3rdparty/libwine/CMakeLists.txt
index a57e9851b47..aaf50c33137 100644
--- a/reactos/lib/3rdparty/libwine/CMakeLists.txt
+++ b/reactos/lib/3rdparty/libwine/CMakeLists.txt
@@ -18,3 +18,4 @@ add_library(wine ${SOURCE})
 add_dependencies(wine psdk)
 
 add_library(wineldr loader.c)
+add_dependencies(wineldr xdk)
diff --git a/reactos/lib/3rdparty/stlport/CMakeLists.txt b/reactos/lib/3rdparty/stlport/CMakeLists.txt
index 9a57cdd411a..5210770d021 100644
--- a/reactos/lib/3rdparty/stlport/CMakeLists.txt
+++ b/reactos/lib/3rdparty/stlport/CMakeLists.txt
@@ -47,4 +47,5 @@ add_library(stlport
     src/cxa.c
     src/c_locale.c)
 
+add_dependencies(stlport xdk)
 add_pch(stlport src/stlport_prefix.h SOURCE)
diff --git a/reactos/lib/cmlib/CMakeLists.txt b/reactos/lib/cmlib/CMakeLists.txt
index fc17e3cf08f..fa1b8ad1f00 100644
--- a/reactos/lib/cmlib/CMakeLists.txt
+++ b/reactos/lib/cmlib/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND SOURCE
 
 if(CMAKE_CROSSCOMPILING)
     add_library(cmlib ${SOURCE})
-    add_dependencies(cmlib bugcodes)
+    add_dependencies(cmlib bugcodes xdk)
     add_pch(cmlib cmlib.h SOURCE)
 else()
     add_definitions(
diff --git a/reactos/lib/cportlib/CMakeLists.txt b/reactos/lib/cportlib/CMakeLists.txt
index 6e10d6bd5cb..c0154d27fc0 100644
--- a/reactos/lib/cportlib/CMakeLists.txt
+++ b/reactos/lib/cportlib/CMakeLists.txt
@@ -1,2 +1,3 @@
 
 add_library(cportlib cport.c)
+add_dependencies(cportlib xdk)
diff --git a/reactos/lib/cryptlib/CMakeLists.txt b/reactos/lib/cryptlib/CMakeLists.txt
index 71a65627485..e86a93aabcc 100644
--- a/reactos/lib/cryptlib/CMakeLists.txt
+++ b/reactos/lib/cryptlib/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_library(cryptlib
+list(APPEND SOURCE
     aes.c
     des.c
     md4.c
@@ -8,3 +8,6 @@ add_library(cryptlib
     rc4.c
     sha1.c
     util.c)
+
+add_library(cryptlib ${SOURCE})
+add_dependencies(cryptlib xdk)
diff --git a/reactos/lib/drivers/sound/stdunk/CMakeLists.txt b/reactos/lib/drivers/sound/stdunk/CMakeLists.txt
index e2d54dd5f30..b7f8fac0999 100644
--- a/reactos/lib/drivers/sound/stdunk/CMakeLists.txt
+++ b/reactos/lib/drivers/sound/stdunk/CMakeLists.txt
@@ -1,3 +1,4 @@
 
 set_cpp()
 add_library(stdunk cunknown.cpp)
+add_dependencies(stdunk xdk)
diff --git a/reactos/lib/fast486/CMakeLists.txt b/reactos/lib/fast486/CMakeLists.txt
index 1c995fb9f5a..0185120c322 100644
--- a/reactos/lib/fast486/CMakeLists.txt
+++ b/reactos/lib/fast486/CMakeLists.txt
@@ -11,3 +11,4 @@ list(APPEND SOURCE
     fpu.c)
 
 add_library(fast486 ${SOURCE})
+add_dependencies(fast486 xdk)
diff --git a/reactos/lib/fslib/vfatlib/CMakeLists.txt b/reactos/lib/fslib/vfatlib/CMakeLists.txt
index 7df11959eb2..3c4b764ab0a 100644
--- a/reactos/lib/fslib/vfatlib/CMakeLists.txt
+++ b/reactos/lib/fslib/vfatlib/CMakeLists.txt
@@ -14,4 +14,5 @@ list(APPEND SOURCE
     vfatlib.h)
 
 add_library(vfatlib ${SOURCE})
+add_dependencies(vfatlib xdk)
 add_pch(vfatlib vfatlib.h SOURCE)
diff --git a/reactos/lib/lsalib/CMakeLists.txt b/reactos/lib/lsalib/CMakeLists.txt
index fad7b70a634..2e338c8d95b 100644
--- a/reactos/lib/lsalib/CMakeLists.txt
+++ b/reactos/lib/lsalib/CMakeLists.txt
@@ -1,3 +1,4 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
 add_library(lsalib lsa.c)
+add_dependencies(lsalib xdk)
diff --git a/reactos/lib/sdk/cpprt/CMakeLists.txt b/reactos/lib/sdk/cpprt/CMakeLists.txt
index 8c2f10e5511..87490c88501 100644
--- a/reactos/lib/sdk/cpprt/CMakeLists.txt
+++ b/reactos/lib/sdk/cpprt/CMakeLists.txt
@@ -20,3 +20,4 @@ elseif(ARCH STREQUAL "arm")
 endif()
 
 add_library(cpprt ${SOURCE} ${cpprt_asm})
+add_dependencies(cpprt xdk)
diff --git a/reactos/lib/sdk/ioevent/CMakeLists.txt b/reactos/lib/sdk/ioevent/CMakeLists.txt
index 2f7d583bc0b..39fce7ef81d 100644
--- a/reactos/lib/sdk/ioevent/CMakeLists.txt
+++ b/reactos/lib/sdk/ioevent/CMakeLists.txt
@@ -1,2 +1,3 @@
 
 add_library(ioevent ioevent.c)
+add_dependencies(ioevent xdk)
diff --git a/reactos/win32ss/gdi/gdi32/wine/CMakeLists.txt b/reactos/win32ss/gdi/gdi32/wine/CMakeLists.txt
index 040e6a4607a..c29da5cd8b8 100644
--- a/reactos/win32ss/gdi/gdi32/wine/CMakeLists.txt
+++ b/reactos/win32ss/gdi/gdi32/wine/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND SOURCE
     mfdrv/init.c
     mfdrv/objects.c
     mfdrv/text.c
-    rosglue.c
-)
+    rosglue.c)
 
 add_library(winegdi ${SOURCE})
+add_dependencies(winegdi xdk)
diff --git a/reactos/win32ss/user/winsrv/concfg/CMakeLists.txt b/reactos/win32ss/user/winsrv/concfg/CMakeLists.txt
index 98a01ea3347..98d8fdfddff 100644
--- a/reactos/win32ss/user/winsrv/concfg/CMakeLists.txt
+++ b/reactos/win32ss/user/winsrv/concfg/CMakeLists.txt
@@ -1,5 +1,3 @@
 
-list(APPEND SOURCE
-    settings.c)
-
-add_library(concfg ${SOURCE})
+add_library(concfg settings.c)
+add_dependencies(concfg xdk)
diff --git a/reactos/win32ss/user/winsrv/usersrv.cmake b/reactos/win32ss/user/winsrv/usersrv.cmake
index ced12dde0c9..de92a80143c 100644
--- a/reactos/win32ss/user/winsrv/usersrv.cmake
+++ b/reactos/win32ss/user/winsrv/usersrv.cmake
@@ -10,6 +10,7 @@ list(APPEND USERSRV_SOURCE
     usersrv/usersrv.h)
 
 add_library(usersrv ${USERSRV_SOURCE})
+add_dependencies(usersrv xdk)
 add_pch(usersrv usersrv/usersrv.h USERSRV_SOURCE)
 #add_object_library(usersrv ${USERSRV_SOURCE})
 list(APPEND USERSRV_IMPORT_LIBS basesrv)