diff --git a/reactos/dll/directx/devenum/CMakeLists.txt b/reactos/dll/directx/devenum/CMakeLists.txt
index 06adbcac179..73373558419 100644
--- a/reactos/dll/directx/devenum/CMakeLists.txt
+++ b/reactos/dll/directx/devenum/CMakeLists.txt
@@ -1,5 +1,4 @@
 
-
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
@@ -17,22 +16,8 @@ add_library(devenum SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/devenum.def)
 
 set_module_type(devenum win32dll UNICODE)
-
-target_link_libraries(devenum
-    strmiids
-    uuid
-    wine)
-
-add_importlibs(devenum
-    advapi32
-    ole32
-    oleaut32
-    winmm
-    user32
-    avicap32
-    msvcrt
-    kernel32
-    ntdll)
-
+target_link_libraries(devenum strmiids uuid wine)
+add_importlibs(devenum advapi32 ole32 oleaut32 winmm user32 avicap32 msvcrt kernel32 ntdll)
 add_pch(devenum devenum_private.h)
+add_dependencies(devenum dxsdk)
 add_cd_file(TARGET devenum DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/directx/ksproxy/CMakeLists.txt b/reactos/dll/directx/ksproxy/CMakeLists.txt
index 65d5ca90163..b8fdd3d1563 100644
--- a/reactos/dll/directx/ksproxy/CMakeLists.txt
+++ b/reactos/dll/directx/ksproxy/CMakeLists.txt
@@ -23,10 +23,7 @@ list(APPEND SOURCE
     qualityforward.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/ksproxy.def)
 
-add_library(ksproxy SHARED
-    ${SOURCE}
-    ksproxy.rc)
-
+add_library(ksproxy SHARED ${SOURCE} ksproxy.rc)
 set_module_type(ksproxy win32dll)
 set_target_properties(ksproxy PROPERTIES SUFFIX ".ax")
 
@@ -39,15 +36,6 @@ else()
 endif()
 
 target_link_libraries(ksproxy strmiids)
-
-add_importlibs(ksproxy
-    advapi32
-    ole32
-    setupapi
-    ksuser
-    msvcrt
-    kernel32
-    ntdll)
-
+add_importlibs(ksproxy advapi32 ole32 setupapi ksuser msvcrt kernel32 ntdll)
+add_dependencies(ksproxy dxsdk)
 add_cd_file(TARGET ksproxy DESTINATION reactos/system32 FOR all)
-
diff --git a/reactos/dll/directx/quartz/CMakeLists.txt b/reactos/dll/directx/quartz/CMakeLists.txt
index 889d26f28c2..f0f6a57e050 100644
--- a/reactos/dll/directx/quartz/CMakeLists.txt
+++ b/reactos/dll/directx/quartz/CMakeLists.txt
@@ -43,34 +43,11 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/quartz_strmif_p.c
     ${CMAKE_CURRENT_BINARY_DIR}/quartz.def)
 
-add_library(quartz SHARED
-    ${SOURCE}
-    version.rc)
-
+add_library(quartz SHARED ${SOURCE} version.rc)
 set_module_type(quartz win32dll)
-
-target_link_libraries(quartz
-    strmiids
-    uuid
-    wine
-    ${PSEH_LIB})
-
-add_importlibs(quartz
-    msvcrt
-    advapi32
-    dsound
-    ole32
-    oleaut32
-    shlwapi
-    user32
-    gdi32
-    advapi32
-    msvfw32
-    msacm32
-    rpcrt4
-    kernel32
-    ntdll)
-
+target_link_libraries(quartz strmiids uuid wine ${PSEH_LIB})
+add_importlibs(quartz dsound ole32 oleaut32 shlwapi user32 gdi32 advapi32 msvfw32 msacm32 rpcrt4 msvcrt kernel32 ntdll)
+add_dependencies(quartz dxsdk)
 add_pch(quartz quartz_private.h)
 add_cd_file(TARGET quartz DESTINATION reactos/system32 FOR all)
 
diff --git a/reactos/dll/win32/mciqtz32/CMakeLists.txt b/reactos/dll/win32/mciqtz32/CMakeLists.txt
index 1a176ed0ae4..d5257fb3405 100644
--- a/reactos/dll/win32/mciqtz32/CMakeLists.txt
+++ b/reactos/dll/win32/mciqtz32/CMakeLists.txt
@@ -14,4 +14,5 @@ add_library(mciqtz32 SHARED ${SOURCE})
 set_module_type(mciqtz32 win32dll)
 target_link_libraries(mciqtz32 wine strmiids)
 add_importlibs(mciqtz32 winmm oleaut32 ole32 user32 gdi32 msvcrt kernel32 ntdll)
+add_dependencies(mciqtz32 dxsdk)
 add_cd_file(TARGET mciqtz32 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/hal/halx86/acpi.cmake b/reactos/hal/halx86/acpi.cmake
index 1c710f4cf89..91553b2d064 100644
--- a/reactos/hal/halx86/acpi.cmake
+++ b/reactos/hal/halx86/acpi.cmake
@@ -6,7 +6,7 @@ list(APPEND HAL_ACPI_SOURCE
     legacy/bus/pcibus.c)
 
 add_object_library(lib_hal_acpi ${HAL_ACPI_SOURCE})
-
+add_dependencies(lib_hal_acpi bugcodes)
 #add_pch(lib_hal_acpi include/hal.h)
 
 if(MSVC OR (NOT CMAKE_VERSION VERSION_GREATER 2.8.7))
diff --git a/reactos/hal/halx86/legacy.cmake b/reactos/hal/halx86/legacy.cmake
index 1fb59012bcb..3a36d5b6c58 100644
--- a/reactos/hal/halx86/legacy.cmake
+++ b/reactos/hal/halx86/legacy.cmake
@@ -12,7 +12,7 @@ list(APPEND HAL_LEGACY_SOURCE
     legacy/halpcat.c)
 
 add_object_library(lib_hal_legacy ${HAL_LEGACY_SOURCE})
-
+add_dependencies(lib_hal_legacy bugcodes)
 #add_pch(lib_hal_legacy include/hal.h)
 
 if(MSVC OR (NOT CMAKE_VERSION VERSION_GREATER 2.8.7))
diff --git a/reactos/hal/halx86/up.cmake b/reactos/hal/halx86/up.cmake
index 08c04316a45..8102f1721e1 100644
--- a/reactos/hal/halx86/up.cmake
+++ b/reactos/hal/halx86/up.cmake
@@ -4,3 +4,4 @@ list(APPEND HAL_UP_SOURCE
     up/processor.c)
 
 add_object_library(lib_hal_up ${HAL_UP_SOURCE})
+add_dependencies(lib_hal_up bugcodes)