diff --git a/reactos/dll/win32/acledit/CMakeLists.txt b/reactos/dll/win32/acledit/CMakeLists.txt
index cf3f752ed3c..99382a542b7 100644
--- a/reactos/dll/win32/acledit/CMakeLists.txt
+++ b/reactos/dll/win32/acledit/CMakeLists.txt
@@ -4,11 +4,11 @@ spec2def(acledit.dll acledit.spec)
 list(APPEND SOURCE
     acledit.c
     stubs.c
-    acledit.rc
+    acleditint.h
     ${CMAKE_CURRENT_BINARY_DIR}/acledit.def)
 
-add_library(acledit SHARED ${SOURCE})
+add_library(acledit SHARED ${SOURCE} acledit.rc)
 set_module_type(acledit win32dll UNICODE)
 add_importlibs(acledit msvcrt kernel32 ntdll)
-add_pch(acledit acleditint.h)
+add_pch(acledit acleditint.h SOURCE)
 add_cd_file(TARGET acledit DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/aclui/CMakeLists.txt b/reactos/dll/win32/aclui/CMakeLists.txt
index 1b914a26d65..58f63709afc 100644
--- a/reactos/dll/win32/aclui/CMakeLists.txt
+++ b/reactos/dll/win32/aclui/CMakeLists.txt
@@ -6,14 +6,17 @@ add_definitions(-DSUPPORT_UXTHEME)
 list(APPEND SOURCE
     aclui.c
     checklist.c
-    guid.c
     misc.c
     sidcache.c
-    ${CMAKE_CURRENT_BINARY_DIR}/aclui.def)
+    precomp.h)
 
-add_library(aclui SHARED ${SOURCE} aclui.rc)
+add_library(aclui SHARED
+    ${SOURCE}
+    guid.c
+    aclui.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/aclui.def)
 
 set_module_type(aclui win32dll UNICODE)
 add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme msvcrt kernel32 ntdll)
-add_pch(aclui precomp.h)
+add_pch(aclui precomp.h SOURCE)
 add_cd_file(TARGET aclui DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/activeds/CMakeLists.txt b/reactos/dll/win32/activeds/CMakeLists.txt
index 399e654bbc5..37ae0ab9eb1 100644
--- a/reactos/dll/win32/activeds/CMakeLists.txt
+++ b/reactos/dll/win32/activeds/CMakeLists.txt
@@ -6,10 +6,14 @@ spec2def(activeds.dll activeds.spec)
 list(APPEND SOURCE
     activeds_main.c
     stubs.c
+    precomp.h)
+
+add_library(activeds SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/activeds.def)
 
-add_library(activeds SHARED ${SOURCE})
 set_module_type(activeds win32dll)
 target_link_libraries(activeds wine)
 add_importlibs(activeds msvcrt kernel32 ntdll)
+add_pch(activeds precomp.h SOURCE)
 add_cd_file(TARGET activeds DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/advapi32/CMakeLists.txt b/reactos/dll/win32/advapi32/CMakeLists.txt
index db953400474..3c1df063134 100644
--- a/reactos/dll/win32/advapi32/CMakeLists.txt
+++ b/reactos/dll/win32/advapi32/CMakeLists.txt
@@ -44,6 +44,10 @@ list(APPEND SOURCE
     service/sctrl.c
     token/privilege.c
     token/token.c
+    advapi32.h)
+
+add_library(advapi32 SHARED
+    ${SOURCE}
     advapi32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/advapi32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/advapi32.def
@@ -51,15 +55,12 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/lsa_c.c
     ${CMAKE_CURRENT_BINARY_DIR}/svcctl_c.c)
 
-add_library(advapi32 SHARED ${SOURCE})
 set_module_type(advapi32 win32dll UNICODE)
 target_link_libraries(advapi32 cryptlib wine ${PSEH_LIB})
 add_delay_importlibs(advapi32 rpcrt4)
 add_importlibs(advapi32 secur32 msvcrt kernel32 ntdll)
 
-add_pch(advapi32 advapi32.h
-    ${CMAKE_CURRENT_BINARY_DIR}/lsa_c.h
-    ${CMAKE_CURRENT_BINARY_DIR}/eventlogrpc_c.h)
+add_pch(advapi32 advapi32.h SOURCE)
 
 add_cd_file(TARGET advapi32 DESTINATION reactos/system32 FOR all)
 
diff --git a/reactos/dll/win32/advpack/CMakeLists.txt b/reactos/dll/win32/advpack/CMakeLists.txt
index ec8cfb1e8d0..c33a9dd7086 100644
--- a/reactos/dll/win32/advpack/CMakeLists.txt
+++ b/reactos/dll/win32/advpack/CMakeLists.txt
@@ -10,10 +10,14 @@ list(APPEND SOURCE
     files.c
     install.c
     reg.c
+    advpack_private.h)
+
+add_library(advpack SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/advpack.def)
 
-add_library(advpack SHARED ${SOURCE})
 set_module_type(advpack win32dll)
 target_link_libraries(advpack wine)
 add_importlibs(advpack ole32 setupapi version advapi32 msvcrt kernel32 ntdll)
+add_pch(advpack advpack_private.h SOURCE)
 add_cd_file(TARGET advpack DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/atl100/CMakeLists.txt b/reactos/dll/win32/atl100/CMakeLists.txt
index c8b212265ca..7efa34415d2 100644
--- a/reactos/dll/win32/atl100/CMakeLists.txt
+++ b/reactos/dll/win32/atl100/CMakeLists.txt
@@ -14,11 +14,15 @@ list(APPEND SOURCE
     atl.c
     atl_ax.c
     registrar.c
-    ${CMAKE_CURRENT_BINARY_DIR}/atl100_stubs.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/atl100_stubs.c)
+
+add_library(atl100 SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/atl100.def)
 
-add_library(atl100 SHARED ${SOURCE})
 set_module_type(atl100 win32dll)
 target_link_libraries(atl100 uuid wine)
 add_importlibs(atl100 ole32 oleaut32 user32 gdi32 advapi32 msvcrt kernel32 ntdll)
+add_pch(atl100 precomp.h SOURCE)
 add_cd_file(TARGET atl100 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/authz/CMakeLists.txt b/reactos/dll/win32/authz/CMakeLists.txt
index c4968887cb4..53bc1977118 100644
--- a/reactos/dll/win32/authz/CMakeLists.txt
+++ b/reactos/dll/win32/authz/CMakeLists.txt
@@ -6,15 +6,17 @@ list(APPEND SOURCE
     authz.c
     clictx.c
     resman.c
-    authz.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/authz_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/authz.def)
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/authz_stubs.c)
 
-add_library(authz SHARED ${SOURCE})
+add_library(authz SHARED
+    ${SOURCE}
+    authz.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/authz.def)
 
 set_module_type(authz win32dll UNICODE)
 
 add_importlibs(authz advapi32 msvcrt kernel32 ntdll)
-add_pch(authz precomp.h)
+add_pch(authz precomp.h SOURCE)
 
 add_cd_file(TARGET authz DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/avifil32/CMakeLists.txt b/reactos/dll/win32/avifil32/CMakeLists.txt
index e209684e040..1b73ab76da8 100644
--- a/reactos/dll/win32/avifil32/CMakeLists.txt
+++ b/reactos/dll/win32/avifil32/CMakeLists.txt
@@ -6,7 +6,7 @@ add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(avifil32.dll avifil32.spec ADD_IMPORTLIB)
 
-add_library(avifil32 SHARED
+list(APPEND SOURCE
     acmstream.c
     api.c
     avifile.c
@@ -17,6 +17,10 @@ add_library(avifil32 SHARED
     icmstream.c
     tmpfile.c
     wavfile.c
+    avifile_private.h)
+
+add_library(avifil32 SHARED
+    ${SOURCE}
     guid.c
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/avifil32.def)
@@ -24,4 +28,5 @@ add_library(avifil32 SHARED
 set_module_type(avifil32 win32dll)
 target_link_libraries(avifil32 wine)
 add_importlibs(avifil32 msacm32 msvfw32 winmm ole32 user32 advapi32 msvcrt kernel32 ntdll)
+add_pch(avifil32 avifile_private.h SOURCE)
 add_cd_file(TARGET avifil32 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/browseui/CMakeLists.txt b/reactos/dll/win32/browseui/CMakeLists.txt
index 35a065ca00f..b9966066e02 100644
--- a/reactos/dll/win32/browseui/CMakeLists.txt
+++ b/reactos/dll/win32/browseui/CMakeLists.txt
@@ -28,12 +28,13 @@ list(APPEND SOURCE
     toolsband.cpp
     travellog.cpp
     utility.cpp
-    dllinstall.c
-    ${CMAKE_CURRENT_BINARY_DIR}/browseui.def)
+    precomp.h)
 
 add_library(browseui SHARED
     ${SOURCE}
-    browseui.rc)
+    dllinstall.c
+    browseui.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/browseui.def)
 
 set_module_type(browseui win32dll UNICODE)
 
@@ -55,5 +56,5 @@ add_importlibs(browseui
     kernel32
     ntdll)
 
-add_pch(browseui precomp.h)
+add_pch(browseui precomp.h SOURCE)
 add_cd_file(TARGET browseui DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/cabinet/CMakeLists.txt b/reactos/dll/win32/cabinet/CMakeLists.txt
index 4d76fc886ef..3d27e919da8 100644
--- a/reactos/dll/win32/cabinet/CMakeLists.txt
+++ b/reactos/dll/win32/cabinet/CMakeLists.txt
@@ -13,16 +13,18 @@ list(APPEND SOURCE
     cabinet_main.c
     fci.c
     fdi.c
+    cabinet.h)
+
+add_library(cabinet SHARED
+    ${SOURCE}
     stubs.c
     cabinet.rc
     ${CMAKE_CURRENT_BINARY_DIR}/cabinet.def)
 
-add_library(cabinet SHARED ${SOURCE})
-
 set_module_type(cabinet win32dll)
 target_link_libraries(cabinet wine zlib)
 add_importlibs(cabinet msvcrt kernel32 ntdll)
 
-add_pch(cabinet cabinet.h)
+add_pch(cabinet cabinet.h SOURCE)
 add_dependencies(cabinet psdk)
 add_cd_file(TARGET cabinet DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/comctl32/CMakeLists.txt b/reactos/dll/win32/comctl32/CMakeLists.txt
index eb7e9526e90..22d9f72492b 100644
--- a/reactos/dll/win32/comctl32/CMakeLists.txt
+++ b/reactos/dll/win32/comctl32/CMakeLists.txt
@@ -47,13 +47,17 @@ list(APPEND SOURCE
     trackbar.c
     treeview.c
     updown.c
+    comctl32.h)
+
+add_library(comctl32 SHARED
+    ${SOURCE}
     stubs.c
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/comctl32.def)
 
-add_library(comctl32 SHARED ${SOURCE} rsrc.rc)
 set_module_type(comctl32 win32dll UNICODE)
 target_link_libraries(comctl32 uuid wine ${PSEH_LIB})
 add_delay_importlibs(comctl32 winmm uxtheme)
 add_importlibs(comctl32 user32 gdi32 advapi32 msvcrt kernel32 ntdll)
-add_pch(comctl32 comctl32.h)
+add_pch(comctl32 comctl32.h SOURCE)
 add_cd_file(TARGET comctl32 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/comdlg32/CMakeLists.txt b/reactos/dll/win32/comdlg32/CMakeLists.txt
index a801e59738e..91dd62032dc 100644
--- a/reactos/dll/win32/comdlg32/CMakeLists.txt
+++ b/reactos/dll/win32/comdlg32/CMakeLists.txt
@@ -16,12 +16,17 @@ list(APPEND SOURCE
     fontdlg.c
     #itemdlg.c /* Win 7 */
     printdlg.c
-    ${CMAKE_CURRENT_BINARY_DIR}/comdlg32_stubs.c
+    cdlg.h
+    ${CMAKE_CURRENT_BINARY_DIR}/comdlg32_stubs.c)
+
+add_library(comdlg32 SHARED
+    ${SOURCE}
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/comdlg32.def)
 
-add_library(comdlg32 SHARED ${SOURCE} rsrc.rc)
 set_module_type(comdlg32 win32dll)
 target_link_libraries(comdlg32 uuid wine)
 add_delay_importlibs(comdlg32 ole32)
 add_importlibs(comdlg32 shell32 shlwapi comctl32 winspool user32 gdi32 advapi32 msvcrt kernel32 ntdll)
+add_pch(comdlg32 cdlg.h SOURCE)
 add_cd_file(TARGET comdlg32 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/crypt32/CMakeLists.txt b/reactos/dll/win32/crypt32/CMakeLists.txt
index 14f52da2a27..aef59eb235f 100644
--- a/reactos/dll/win32/crypt32/CMakeLists.txt
+++ b/reactos/dll/win32/crypt32/CMakeLists.txt
@@ -35,11 +35,16 @@ list(APPEND SOURCE
     sip.c
     store.c
     str.c
+    crypt32_private.h)
+
+add_library(crypt32 SHARED
+    ${SOURCE}
+    crypt32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/crypt32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/crypt32.def)
 
-add_library(crypt32 SHARED ${SOURCE} crypt32.rc)
 set_module_type(crypt32 win32dll)
 target_link_libraries(crypt32 wine ${PSEH_LIB} oldnames)
 add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll)
+add_pch(crypt32 crypt32_private.h SOURCE)
 add_cd_file(TARGET crypt32 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/dbghelp/CMakeLists.txt b/reactos/dll/win32/dbghelp/CMakeLists.txt
index c107cb70039..d3f948e2191 100644
--- a/reactos/dll/win32/dbghelp/CMakeLists.txt
+++ b/reactos/dll/win32/dbghelp/CMakeLists.txt
@@ -69,16 +69,19 @@ else()
         storage.c
         symbol.c
         type.c
-        ${CMAKE_CURRENT_BINARY_DIR}/dbghelp_stubs.c
-        ${CMAKE_CURRENT_BINARY_DIR}/dbghelp.def)
+        dbghelp_private.h
+        ${CMAKE_CURRENT_BINARY_DIR}/dbghelp_stubs.c)
 
-    add_library(dbghelp SHARED ${SOURCE} version.rc)
+    add_library(dbghelp SHARED
+        ${SOURCE}
+        version.rc
+        ${CMAKE_CURRENT_BINARY_DIR}/dbghelp.def)
 
     set_module_type(dbghelp win32dll)
     target_link_libraries(dbghelp wine ${PSEH_LIB} oldnames zlib)
     add_delay_importlibs(dbghelp version)
     add_importlibs(dbghelp psapi msvcrt kernel32 ntdll)
-    add_pch(dbghelp dbghelp_private.h)
+    add_pch(dbghelp dbghelp_private.h SOURCE)
     add_cd_file(TARGET dbghelp DESTINATION reactos/system32 FOR all)
 
 endif()
diff --git a/reactos/dll/win32/devmgr/CMakeLists.txt b/reactos/dll/win32/devmgr/CMakeLists.txt
index bf31655583a..d2c78a1207e 100644
--- a/reactos/dll/win32/devmgr/CMakeLists.txt
+++ b/reactos/dll/win32/devmgr/CMakeLists.txt
@@ -2,17 +2,20 @@
 spec2def(devmgr.dll devmgr.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
-    devmgr.rc
     advprop.c
     devprblm.c
     hwpage.c
     hwresource.c
     misc.c
     stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/devmgr_stubs.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/devmgr_stubs.c)
+
+add_library(devmgr SHARED
+    ${SOURCE}
+    devmgr.rc
     ${CMAKE_CURRENT_BINARY_DIR}/devmgr.def)
 
-add_library(devmgr SHARED ${SOURCE})
 set_module_type(devmgr win32dll UNICODE)
 target_link_libraries(devmgr uuid wine)
 
@@ -26,5 +29,5 @@ add_importlibs(devmgr
     kernel32
     ntdll)
 
-add_pch(devmgr precomp.h)
+add_pch(devmgr precomp.h SOURCE)
 add_cd_file(TARGET devmgr DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/dhcpcsvc/CMakeLists.txt b/reactos/dll/win32/dhcpcsvc/CMakeLists.txt
index 6aead39e448..227f789c212 100644
--- a/reactos/dll/win32/dhcpcsvc/CMakeLists.txt
+++ b/reactos/dll/win32/dhcpcsvc/CMakeLists.txt
@@ -19,17 +19,19 @@ list(APPEND SOURCE
     dhcp/tables.c
     dhcp/util.c
     dhcpcsvc.c
+    include/rosdhcp.h)
+
+add_library(dhcpcsvc SHARED
+    ${SOURCE}
     dhcpcsvc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc.def)
 
-add_library(dhcpcsvc SHARED ${SOURCE})
-
 set_module_type(dhcpcsvc win32dll)
 
 add_importlibs(dhcpcsvc ws2_32 iphlpapi advapi32 msvcrt kernel32 ntdll)
 
 
-add_pch(dhcpcsvc include/rosdhcp.h)
+add_pch(dhcpcsvc include/rosdhcp.h SOURCE)
 
 add_cd_file(TARGET dhcpcsvc DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/dnsapi/CMakeLists.txt b/reactos/dll/win32/dnsapi/CMakeLists.txt
index d3c8873a902..0755c23a5f6 100644
--- a/reactos/dll/win32/dnsapi/CMakeLists.txt
+++ b/reactos/dll/win32/dnsapi/CMakeLists.txt
@@ -16,15 +16,17 @@ list(APPEND SOURCE
     dnsapi/query.c
     dnsapi/record.c
     dnsapi/stubs.c
+    dnsapi/precomp.h)
+
+add_library(dnsapi SHARED
+    ${SOURCE}
     dnsapi.rc
     ${CMAKE_CURRENT_BINARY_DIR}/dnsapi.def)
 
-add_library(dnsapi SHARED ${SOURCE})
-
 set_module_type(dnsapi win32dll)
 target_link_libraries(dnsapi adns)
 add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll)
-add_pch(dnsapi dnsapi/precomp.h)
+add_pch(dnsapi dnsapi/precomp.h SOURCE)
 add_dependencies(dnsapi psdk)
 add_cd_file(TARGET dnsapi DESTINATION reactos/system32 FOR all)
 
diff --git a/reactos/dll/win32/fmifs/CMakeLists.txt b/reactos/dll/win32/fmifs/CMakeLists.txt
index a81ce84d4db..ffc3d847466 100644
--- a/reactos/dll/win32/fmifs/CMakeLists.txt
+++ b/reactos/dll/win32/fmifs/CMakeLists.txt
@@ -10,14 +10,17 @@ list(APPEND SOURCE
     init.c
     media.c
     query.c
+    precomp.h)
+
+add_library(fmifs SHARED
+    ${SOURCE}
     fmifs.rc
     ${CMAKE_CURRENT_BINARY_DIR}/fmifs_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def)
 
-add_library(fmifs SHARED ${SOURCE})
 set_module_type(fmifs win32dll ENTRYPOINT InitializeFmIfs 12)
 add_importlibs(fmifs kernel32 ntdll)
-add_pch(fmifs precomp.h)
+add_pch(fmifs precomp.h SOURCE)
 add_dependencies(fmifs psdk)
 add_cd_file(TARGET fmifs DESTINATION reactos/system32 FOR all)
 
diff --git a/reactos/dll/win32/fusion/CMakeLists.txt b/reactos/dll/win32/fusion/CMakeLists.txt
index 545c18717ec..6704f9597f6 100644
--- a/reactos/dll/win32/fusion/CMakeLists.txt
+++ b/reactos/dll/win32/fusion/CMakeLists.txt
@@ -10,13 +10,18 @@ list(APPEND SOURCE
     asmname.c
     assembly.c
     fusion.c
-    ${CMAKE_CURRENT_BINARY_DIR}/fusion_stubs.c
+    fusionpriv.h
+    ${CMAKE_CURRENT_BINARY_DIR}/fusion_stubs.c)
+
+add_library(fusion SHARED
+    ${SOURCE}
+    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
 
-add_library(fusion SHARED ${SOURCE} version.rc)
 set_module_type(fusion win32dll)
 target_link_libraries(fusion uuid wine)
 add_importlibs(fusion advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll)
+add_pch(fusion fusionpriv.h SOURCE)
 add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.0.3705 FOR all)
 add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all)
 add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v2.0.50727 FOR all)
diff --git a/reactos/dll/win32/gdiplus/CMakeLists.txt b/reactos/dll/win32/gdiplus/CMakeLists.txt
index aa61ec36d25..8a75a7507f2 100644
--- a/reactos/dll/win32/gdiplus/CMakeLists.txt
+++ b/reactos/dll/win32/gdiplus/CMakeLists.txt
@@ -22,13 +22,18 @@ list(APPEND SOURCE
     pen.c
     region.c
     stringformat.c
+    gdiplus_private.h)
+
+add_library(gdiplus SHARED
+    ${SOURCE}
     guid.c
+    gdiplus.rc
     ${CMAKE_CURRENT_BINARY_DIR}/gdiplus_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/gdiplus.def)
 
-add_library(gdiplus SHARED ${SOURCE} gdiplus.rc)
 set_module_type(gdiplus win32dll)
 target_link_libraries(gdiplus wine)
 add_delay_importlibs(gdiplus windowscodecs)
 add_importlibs(gdiplus msvcrt shlwapi oleaut32 ole32 user32 gdi32 kernel32 ntdll)
+add_pch(gdiplus gdiplus_private.h SOURCE)
 add_cd_file(TARGET gdiplus DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt b/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt
index e48f0a6d00d..2e967c9721f 100644
--- a/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt
+++ b/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt
@@ -6,7 +6,7 @@ add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(hhctrl.ocx hhctrl.ocx.spec)
 
-add_library(hhctrl SHARED
+list(APPEND SOURCE
     chm.c
     content.c
     help.c
@@ -15,6 +15,10 @@ add_library(hhctrl SHARED
     search.c
     stream.c
     webbrowser.c
+    hhctrl.h)
+
+add_library(hhctrl SHARED
+    ${SOURCE}
     guid.c
     hhctrl.rc
     ${CMAKE_CURRENT_BINARY_DIR}/hhctrl.def)
@@ -34,5 +38,5 @@ set_module_type(hhctrl win32ocx)
 target_link_libraries(hhctrl uuid wine)
 add_importlibs(hhctrl advapi32 comctl32 shlwapi ole32 oleaut32 user32 gdi32 msvcrt kernel32 ntdll)
 add_dependencies(hhctrl wineheaders)
-add_pch(hhctrl hhctrl.h)
+add_pch(hhctrl hhctrl.h SOURCE)
 add_cd_file(TARGET hhctrl DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/hid/CMakeLists.txt b/reactos/dll/win32/hid/CMakeLists.txt
index a892ca13d12..42147d368e1 100644
--- a/reactos/dll/win32/hid/CMakeLists.txt
+++ b/reactos/dll/win32/hid/CMakeLists.txt
@@ -3,15 +3,17 @@
 list(APPEND SOURCE
     hid.c
     stubs.c
-    hid.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/hid.def)
+    precomp.h)
 
 spec2def(hid.dll hid.spec)
 
-add_library(hid SHARED ${SOURCE})
+add_library(hid SHARED
+    ${SOURCE}
+    hid.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/hid.def)
 
 set_module_type(hid win32dll UNICODE)
 
 add_importlibs(hid msvcrt kernel32 ntdll)
-add_pch(hid precomp.h)
+add_pch(hid precomp.h SOURCE)
 add_cd_file(TARGET hid DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/hlink/CMakeLists.txt b/reactos/dll/win32/hlink/CMakeLists.txt
index 12860b9f374..8e6b85d7151 100644
--- a/reactos/dll/win32/hlink/CMakeLists.txt
+++ b/reactos/dll/win32/hlink/CMakeLists.txt
@@ -9,13 +9,17 @@ list(APPEND SOURCE
     extserv.c
     hlink_main.c
     link.c
+    hlink_private.h)
+
+add_library(hlink SHARED
+    ${SOURCE}
+    hlink.rc
     ${CMAKE_CURRENT_BINARY_DIR}/hlink_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/hlink.def)
 
-add_library(hlink SHARED ${SOURCE} hlink.rc)
 set_module_type(hlink win32dll)
 target_link_libraries(hlink uuid wine)
 add_delay_importlibs(hlink urlmon)
 add_importlibs(hlink shell32 ole32 advapi32 msvcrt kernel32 ntdll)
-add_pch(hlink hlink_private.h)
+add_pch(hlink hlink_private.h SOURCE)
 add_cd_file(TARGET hlink DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/hnetcfg/CMakeLists.txt b/reactos/dll/win32/hnetcfg/CMakeLists.txt
index 84aa3787ca1..b42abf08d44 100644
--- a/reactos/dll/win32/hnetcfg/CMakeLists.txt
+++ b/reactos/dll/win32/hnetcfg/CMakeLists.txt
@@ -11,9 +11,13 @@ list(APPEND SOURCE
     port.c
     profile.c
     service.c
+    hnetcfg_private.h)
+
+add_library(hnetcfg SHARED
+    ${SOURCE}
+    hnetcfg.rc
     ${CMAKE_CURRENT_BINARY_DIR}/hnetcfg.def)
 
-add_library(hnetcfg SHARED ${SOURCE} hnetcfg.rc)
 add_typelib(hnetcfg_tlb.idl)
 
 list(APPEND hnetcfg_rc_deps
@@ -25,4 +29,5 @@ set_source_files_properties(hnetcfg.rc PROPERTIES OBJECT_DEPENDS "${hnetcfg_rc_d
 set_module_type(hnetcfg win32dll)
 target_link_libraries(hnetcfg wine uuid)
 add_importlibs(hnetcfg ole32 oleaut32 advapi32 msvcrt kernel32 ntdll)
+add_pch(hnetcfg hnetcfg_private.h SOURCE)
 add_cd_file(TARGET hnetcfg DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/ieframe/CMakeLists.txt b/reactos/dll/win32/ieframe/CMakeLists.txt
index 8101a0a7ede..562c38dba64 100644
--- a/reactos/dll/win32/ieframe/CMakeLists.txt
+++ b/reactos/dll/win32/ieframe/CMakeLists.txt
@@ -23,10 +23,13 @@ list(APPEND SOURCE
     urlhist.c
     view.c
     webbrowser.c
-    ${CMAKE_CURRENT_BINARY_DIR}/ieframe_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/ieframe.def)
+    ieframe.h
+    ${CMAKE_CURRENT_BINARY_DIR}/ieframe_stubs.c)
 
-add_library(ieframe SHARED ${SOURCE} ieframe.rc)
+add_library(ieframe SHARED
+    ${SOURCE}
+    ieframe.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/ieframe.def)
 
 add_typelib(ieframe_v1.idl)
 
@@ -43,4 +46,5 @@ add_dependencies(ieframe stdole2)
 set_module_type(ieframe win32dll)
 target_link_libraries(ieframe uuid wine)
 add_importlibs(ieframe urlmon shell32 comctl32 shlwapi oleaut32 ole32 user32 gdi32 advapi32 msvcrt kernel32 ntdll)
+add_pch(ieframe ieframe.h SOURCE)
 add_cd_file(TARGET ieframe DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/imagehlp/CMakeLists.txt b/reactos/dll/win32/imagehlp/CMakeLists.txt
index 3b8ab83f413..4195057c091 100644
--- a/reactos/dll/win32/imagehlp/CMakeLists.txt
+++ b/reactos/dll/win32/imagehlp/CMakeLists.txt
@@ -9,13 +9,16 @@ list(APPEND SOURCE
     imagehlp_main.c
     integrity.c
     modify.c
+    precomp.h)
+
+add_library(imagehlp SHARED
+    ${SOURCE}
     imagehlp.rc
     ${CMAKE_CURRENT_BINARY_DIR}/imagehlp_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/imagehlp.def)
 
-add_library(imagehlp SHARED ${SOURCE})
 set_module_type(imagehlp win32dll)
 target_link_libraries(imagehlp wine)
 add_importlibs(imagehlp dbghelp msvcrt kernel32 ntdll)
-add_pch(imagehlp precomp.h)
+add_pch(imagehlp precomp.h SOURCE)
 add_cd_file(TARGET imagehlp DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/inetcomm/CMakeLists.txt b/reactos/dll/win32/inetcomm/CMakeLists.txt
index f5545499835..a13ee56cbe2 100644
--- a/reactos/dll/win32/inetcomm/CMakeLists.txt
+++ b/reactos/dll/win32/inetcomm/CMakeLists.txt
@@ -11,12 +11,17 @@ list(APPEND SOURCE
     mimeole.c
     pop3transport.c
     smtptransport.c
+    inetcomm_private.h)
+
+add_library(inetcomm SHARED
+    ${SOURCE}
     guid.c
+    inetcomm.rc
     ${CMAKE_CURRENT_BINARY_DIR}/inetcomm_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/inetcomm.def)
 
-add_library(inetcomm SHARED ${SOURCE} inetcomm.rc)
 set_module_type(inetcomm win32dll)
 target_link_libraries(inetcomm uuid wine)
 add_importlibs(inetcomm ole32 oleaut32 ws2_32 user32 msvcrt kernel32 ntdll)
+add_pch(inetcomm inetcomm_private.h SOURCE)
 add_cd_file(TARGET inetcomm DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/iphlpapi/CMakeLists.txt b/reactos/dll/win32/iphlpapi/CMakeLists.txt
index 589e8502b64..ce365f72ce2 100644
--- a/reactos/dll/win32/iphlpapi/CMakeLists.txt
+++ b/reactos/dll/win32/iphlpapi/CMakeLists.txt
@@ -16,15 +16,17 @@ list(APPEND SOURCE
     registry.c
     resinfo_reactos.c
     route_reactos.c
-    iphlpapi.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi.def)
+    iphlpapi_private.h
+    ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi_stubs.c)
 
-add_library(iphlpapi SHARED ${SOURCE})
+add_library(iphlpapi SHARED
+    ${SOURCE}
+    iphlpapi.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi.def)
 
 set_module_type(iphlpapi win32dll UNICODE)
 target_link_libraries(iphlpapi wine tdilib)
 add_importlibs(iphlpapi icmp dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll)
-add_pch(iphlpapi iphlpapi_private.h)
+add_pch(iphlpapi iphlpapi_private.h SOURCE)
 add_cd_file(TARGET iphlpapi DESTINATION reactos/system32 FOR all)
 
diff --git a/reactos/dll/win32/itss/CMakeLists.txt b/reactos/dll/win32/itss/CMakeLists.txt
index 620d3d49c1a..48616208612 100644
--- a/reactos/dll/win32/itss/CMakeLists.txt
+++ b/reactos/dll/win32/itss/CMakeLists.txt
@@ -11,12 +11,17 @@ list(APPEND SOURCE
     moniker.c
     protocol.c
     storage.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/itss_stubs.c)
+
+add_library(itss SHARED
+    ${SOURCE}
     guid.c
-    ${CMAKE_CURRENT_BINARY_DIR}/itss_stubs.c
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/itss.def)
 
-add_library(itss SHARED ${SOURCE} rsrc.rc)
 set_module_type(itss win32dll)
 target_link_libraries(itss uuid wine)
 add_importlibs(itss urlmon shlwapi ole32 msvcrt kernel32 ntdll)
+add_pch(itss precomp.h SOURCE)
 add_cd_file(TARGET itss DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/jscript/CMakeLists.txt b/reactos/dll/win32/jscript/CMakeLists.txt
index 65b22cc1fed..f49a2ece614 100644
--- a/reactos/dll/win32/jscript/CMakeLists.txt
+++ b/reactos/dll/win32/jscript/CMakeLists.txt
@@ -31,7 +31,7 @@ list(APPEND SOURCE
     regexp.c
     string.c
     vbarray.c
-    ${CMAKE_CURRENT_BINARY_DIR}/jscript.def)
+    jscript.h)
 
 list(APPEND jscript_rc_deps
     ${CMAKE_CURRENT_SOURCE_DIR}/jscript.rgs
@@ -40,12 +40,16 @@ list(APPEND jscript_rc_deps
 
 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${jscript_rc_deps}")
 
-add_library(jscript SHARED ${SOURCE} rsrc.rc)
+add_library(jscript SHARED
+    ${SOURCE}
+    rsrc.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/jscript.def)
+
 add_idl_headers(jscript_idlheader jscript_classes.idl)
 add_typelib(jsglobal.idl)
 add_dependencies(jscript jscript_idlheader stdole2) # jsglobal.tlb needs stdole2.tlb
 set_module_type(jscript win32dll)
 target_link_libraries(jscript uuid wine)
 add_importlibs(jscript user32 ole32 oleaut32 advapi32 msvcrt kernel32 ntdll)
-add_pch(jscript jscript.h)
+add_pch(jscript jscript.h SOURCE)
 add_cd_file(TARGET jscript DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/kernel32/CMakeLists.txt b/reactos/dll/win32/kernel32/CMakeLists.txt
index 7b6ff8732e9..35a3707dcb2 100644
--- a/reactos/dll/win32/kernel32/CMakeLists.txt
+++ b/reactos/dll/win32/kernel32/CMakeLists.txt
@@ -80,8 +80,7 @@ list(APPEND SOURCE
     winnls/string/lstring.c
     winnls/string/nls.c
     winnls/string/sortkey.c
-    kernel32.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/kernel32.def)
+    k32.h)
 
 if(ARCH STREQUAL "i386")
     list(APPEND ASM_SOURCE
@@ -94,7 +93,11 @@ elseif(ARCH STREQUAL "amd64")
 endif()
 
 add_asm_files(kernel32_asm ${ASM_SOURCE})
-add_library(kernel32 SHARED ${SOURCE} ${kernel32_asm})
+add_library(kernel32 SHARED
+    ${SOURCE}
+    ${kernel32_asm}
+    kernel32.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/kernel32.def)
 
 set_module_type(kernel32 win32dll ENTRYPOINT DllMain 12)
 #############################################
@@ -105,6 +108,6 @@ set_subsystem(kernel32 console)
 target_link_libraries(kernel32 wine chkstk ${PSEH_LIB})
 
 add_importlibs(kernel32 ntdll)
-add_pch(kernel32 k32.h)
+add_pch(kernel32 k32.h SOURCE)
 add_dependencies(kernel32 psdk errcodes asm)
 add_cd_file(TARGET kernel32 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/localspl/CMakeLists.txt b/reactos/dll/win32/localspl/CMakeLists.txt
index 7765fa50e62..17d814e6a53 100644
--- a/reactos/dll/win32/localspl/CMakeLists.txt
+++ b/reactos/dll/win32/localspl/CMakeLists.txt
@@ -10,11 +10,16 @@ list(APPEND SOURCE
     localmon.c
     localspl_main.c
     provider.c
+    localspl_private.h)
+
+add_library(localspl SHARED
+    ${SOURCE}
+    localspl.rc
     ${CMAKE_CURRENT_BINARY_DIR}/localspl_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/localspl.def)
 
-add_library(localspl SHARED ${SOURCE} localspl.rc)
 set_module_type(localspl win32dll)
 target_link_libraries(localspl wine)
 add_importlibs(localspl spoolss user32 advapi32 msvcrt kernel32 ntdll)
+add_pch(localspl localspl_private.h SOURCE)
 add_cd_file(TARGET localspl DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/lpk/CMakeLists.txt b/reactos/dll/win32/lpk/CMakeLists.txt
index fbea9599c1e..1374941f3c6 100644
--- a/reactos/dll/win32/lpk/CMakeLists.txt
+++ b/reactos/dll/win32/lpk/CMakeLists.txt
@@ -8,14 +8,16 @@ spec2def(lpk.dll lpk.spec)
 list(APPEND SOURCE
     dllmain.c
     stub.c
+    ros_lpk.h)
+
+add_library(lpk SHARED
+    ${SOURCE}
     lpk.rc
     ${CMAKE_CURRENT_BINARY_DIR}/lpk.def)
 
-add_library(lpk SHARED ${SOURCE})
-
 set_module_type(lpk win32dll UNICODE)
 
 
 add_importlibs(lpk user32 usp10 msvcrt kernel32 ntdll)
-add_pch(lpk ros_lpk.h)
+add_pch(lpk ros_lpk.h SOURCE)
 add_cd_file(TARGET lpk DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/lsasrv/CMakeLists.txt b/reactos/dll/win32/lsasrv/CMakeLists.txt
index 73d53c36a2b..523841c7253 100644
--- a/reactos/dll/win32/lsasrv/CMakeLists.txt
+++ b/reactos/dll/win32/lsasrv/CMakeLists.txt
@@ -20,15 +20,18 @@ list(APPEND SOURCE
     security.c
     session.c
     utils.c
-    lsasrv.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/lsasrv_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/lsasrv.def
-    ${CMAKE_CURRENT_BINARY_DIR}/lsa_s.c)
+    lsasrv.h
+    ${CMAKE_CURRENT_BINARY_DIR}/lsa_s.c
+    ${CMAKE_CURRENT_BINARY_DIR}/lsasrv_stubs.c)
+
+add_library(lsasrv SHARED
+    ${SOURCE}
+    lsasrv.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/lsasrv.def)
 
-add_library(lsasrv SHARED ${SOURCE})
 set_module_type(lsasrv win32dll UNICODE)
 target_link_libraries(lsasrv wine ${PSEH_LIB})
 add_importlibs(lsasrv samsrv rpcrt4 msvcrt kernel32 advapi32 ntdll)
-add_pch(lsasrv lsasrv.h)
+add_pch(lsasrv lsasrv.h SOURCE)
 add_dependencies(lsasrv psdk)
 add_cd_file(TARGET lsasrv DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/mapi32/CMakeLists.txt b/reactos/dll/win32/mapi32/CMakeLists.txt
index 6d54afbb2d8..46dcb53dfcb 100644
--- a/reactos/dll/win32/mapi32/CMakeLists.txt
+++ b/reactos/dll/win32/mapi32/CMakeLists.txt
@@ -8,14 +8,19 @@ list(APPEND SOURCE
     mapi32_main.c
     prop.c
     sendmail.c
-    util.c
     stubs.c
+    util.c
+    precomp.h)
+
+add_library(mapi32 SHARED
+    ${SOURCE}
     guid.c
+    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mapi32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/mapi32.def)
 
-add_library(mapi32 SHARED ${SOURCE} version.rc)
 set_module_type(mapi32 win32dll)
 target_link_libraries(mapi32 uuid wine)
 add_importlibs(mapi32 shlwapi user32 advapi32 msvcrt kernel32 ntdll)
+add_pch(mapi32 precomp.h SOURCE)
 add_cd_file(TARGET mapi32 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/mciavi32/CMakeLists.txt b/reactos/dll/win32/mciavi32/CMakeLists.txt
index 78f9cabfa99..434f56c2677 100644
--- a/reactos/dll/win32/mciavi32/CMakeLists.txt
+++ b/reactos/dll/win32/mciavi32/CMakeLists.txt
@@ -9,11 +9,15 @@ list(APPEND SOURCE
     mciavi.c
     mmoutput.c
     wnd.c
+    private_mciavi.h)
+
+add_library(mciavi32 SHARED
+    ${SOURCE}
+    mciavi_res.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mciavi32.def)
 
-add_library(mciavi32 SHARED ${SOURCE} mciavi_res.rc)
 set_module_type(mciavi32 win32dll)
 target_link_libraries(mciavi32 wine)
 add_importlibs(mciavi32 msvfw32 winmm user32 gdi32 msvcrt kernel32 ntdll)
-add_pch(mciavi32 private_mciavi.h)
+add_pch(mciavi32 private_mciavi.h SOURCE)
 add_cd_file(TARGET mciavi32 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/mmdevapi/CMakeLists.txt b/reactos/dll/win32/mmdevapi/CMakeLists.txt
index ebb3ef3400f..1172f54f012 100644
--- a/reactos/dll/win32/mmdevapi/CMakeLists.txt
+++ b/reactos/dll/win32/mmdevapi/CMakeLists.txt
@@ -10,12 +10,17 @@ list(APPEND SOURCE
     audiovolume.c
     devenum.c
     main.c
+    mmdevapi.h
+    ${CMAKE_CURRENT_BINARY_DIR}/mmdevapi_stubs.c)
+
+add_library(mmdevapi SHARED
+    ${SOURCE}
     guid.c
-    ${CMAKE_CURRENT_BINARY_DIR}/mmdevapi_stubs.c
+    mmdevapi.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mmdevapi.def)
 
-add_library(mmdevapi SHARED ${SOURCE} mmdevapi.rc)
 set_module_type(mmdevapi win32dll)
 target_link_libraries(mmdevapi uuid wine)
 add_importlibs(mmdevapi ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll)
+add_pch(mmdevapi mmdevapi.h SOURCE)
 add_cd_file(TARGET mmdevapi DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/mmdrv/CMakeLists.txt b/reactos/dll/win32/mmdrv/CMakeLists.txt
index 89b2d6b2fa6..8a4a500a306 100644
--- a/reactos/dll/win32/mmdrv/CMakeLists.txt
+++ b/reactos/dll/win32/mmdrv/CMakeLists.txt
@@ -11,11 +11,15 @@ list(APPEND SOURCE
     common.c
     wave.c
     wave_io.c
+    mmdrv.h)
+
+add_library(mmdrv SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def)
 
-add_library(mmdrv SHARED ${SOURCE})
 set_module_type(mmdrv win32dll UNICODE)
 
 add_importlibs(mmdrv msvcrt winmm user32 kernel32 ntdll)
 add_dependencies(mmdrv psdk)
+add_pch(mmdrv mmdrv.h SOURCE)
 add_cd_file(TARGET mmdrv DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/mpr/CMakeLists.txt b/reactos/dll/win32/mpr/CMakeLists.txt
index 05c6a98b4dd..7770a0cd3c5 100644
--- a/reactos/dll/win32/mpr/CMakeLists.txt
+++ b/reactos/dll/win32/mpr/CMakeLists.txt
@@ -13,11 +13,16 @@ list(APPEND SOURCE
     nps.c
     pwcache.c
     wnet.c
-    ${CMAKE_CURRENT_BINARY_DIR}/mpr_stubs.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/mpr_stubs.c)
+
+add_library(mpr SHARED
+    ${SOURCE}
+    mpr.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mpr.def)
 
-add_library(mpr SHARED ${SOURCE} mpr.rc)
 set_module_type(mpr win32dll)
 target_link_libraries(mpr wine)
 add_importlibs(mpr advapi32 user32 msvcrt kernel32 ntdll)
+add_pch(mpr precomp.h SOURCE)
 add_cd_file(TARGET mpr DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/msacm32/CMakeLists.txt b/reactos/dll/win32/msacm32/CMakeLists.txt
index 152f98068a5..4a3e8ab466d 100644
--- a/reactos/dll/win32/msacm32/CMakeLists.txt
+++ b/reactos/dll/win32/msacm32/CMakeLists.txt
@@ -10,13 +10,17 @@ list(APPEND SOURCE
     msacm32_main.c
     pcmconverter.c
     stream.c
-    ${CMAKE_CURRENT_BINARY_DIR}/msacm32_stubs.c
+    wineacm.h
+    ${CMAKE_CURRENT_BINARY_DIR}/msacm32_stubs.c)
+
+add_library(msacm32 SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/msacm32.def)
 
-add_library(msacm32 SHARED ${SOURCE})
 set_module_type(msacm32 win32dll ENTRYPOINT DllMain 12 UNICODE)
 target_link_libraries(msacm32 wine)
 add_importlibs(msacm32 advapi32 user32 winmm msvcrt kernel32 ntdll)
+add_pch(msacm32 wineacm.h SOURCE)
 add_cd_file(TARGET msacm32 DESTINATION reactos/system32 FOR all)
 
 add_subdirectory(msacm32.drv)
diff --git a/reactos/dll/win32/msafd/CMakeLists.txt b/reactos/dll/win32/msafd/CMakeLists.txt
index b73ee765704..1be60b0851e 100644
--- a/reactos/dll/win32/msafd/CMakeLists.txt
+++ b/reactos/dll/win32/msafd/CMakeLists.txt
@@ -7,18 +7,20 @@ include_directories(
 spec2def(msafd.dll msafd.spec)
 
 list(APPEND SOURCE
-    msafd.rc
     misc/dllmain.c
     misc/event.c
     misc/helpers.c
     misc/sndrcv.c
     misc/stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/msafd.def)
+    msafd.h)
 
-add_library(msafd SHARED ${SOURCE})
+add_library(msafd SHARED
+    ${SOURCE}
+    msafd.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/msafd.def)
 
 set_module_type(msafd win32dll UNICODE)
 
 add_importlibs(msafd advapi32 msvcrt kernel32 ntdll)
-add_pch(msafd msafd.h)
+add_pch(msafd msafd.h SOURCE)
 add_cd_file(TARGET msafd DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/mscoree/CMakeLists.txt b/reactos/dll/win32/mscoree/CMakeLists.txt
index 21b183df8a3..e2ec45bffae 100644
--- a/reactos/dll/win32/mscoree/CMakeLists.txt
+++ b/reactos/dll/win32/mscoree/CMakeLists.txt
@@ -15,13 +15,17 @@ list(APPEND SOURCE
     metadata.c
     metahost.c
     mscoree_main.c
+    mscoree_private.h)
+
+add_library(mscoree SHARED
+    ${SOURCE}
     guid.c
     mscoree.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mscoree_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/mscoree.def)
 
-add_library(mscoree SHARED ${SOURCE})
 set_module_type(mscoree win32dll)
 target_link_libraries(mscoree uuid wine)
 add_importlibs(mscoree dbghelp advapi32 shell32 ole32 shlwapi msvcrt kernel32 ntdll)
+add_pch(mscoree mscoree_private.h SOURCE)
 add_cd_file(TARGET mscoree DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/msctf/CMakeLists.txt b/reactos/dll/win32/msctf/CMakeLists.txt
index e934bf6ddf0..63be882bff0 100644
--- a/reactos/dll/win32/msctf/CMakeLists.txt
+++ b/reactos/dll/win32/msctf/CMakeLists.txt
@@ -17,11 +17,16 @@ list(APPEND SOURCE
     msctf.c
     range.c
     threadmgr.c
-    ${CMAKE_CURRENT_BINARY_DIR}/msctf_stubs.c
+    msctf_internal.h
+    ${CMAKE_CURRENT_BINARY_DIR}/msctf_stubs.c)
+
+add_library(msctf SHARED
+    ${SOURCE}
+    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msctf.def)
 
-add_library(msctf SHARED ${SOURCE} version.rc)
 set_module_type(msctf win32dll)
 target_link_libraries(msctf uuid wine)
 add_importlibs(msctf ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll)
+add_pch(msctf msctf_internal.h SOURCE)
 add_cd_file(TARGET msctf DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/msgina/CMakeLists.txt b/reactos/dll/win32/msgina/CMakeLists.txt
index 9ac77fad89c..8c33c0c4cf1 100644
--- a/reactos/dll/win32/msgina/CMakeLists.txt
+++ b/reactos/dll/win32/msgina/CMakeLists.txt
@@ -11,14 +11,17 @@ list(APPEND SOURCE
     msgina.c
     stubs.c
     tui.c
+    msgina.h)
+
+add_library(msgina SHARED
+    ${SOURCE}
     msgina.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msgina_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/msgina.def)
 
-add_library(msgina SHARED ${SOURCE})
 set_module_type(msgina win32dll)
 target_link_libraries(msgina wine)
 add_importlibs(msgina advapi32 user32 gdi32 userenv msvcrt kernel32 ntdll)
 add_delay_importlibs(msgina secur32)
-add_pch(msgina msgina.h)
+add_pch(msgina msgina.h SOURCE)
 add_cd_file(TARGET msgina DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/mshtml/CMakeLists.txt b/reactos/dll/win32/mshtml/CMakeLists.txt
index 9921f275e73..f2866888cec 100644
--- a/reactos/dll/win32/mshtml/CMakeLists.txt
+++ b/reactos/dll/win32/mshtml/CMakeLists.txt
@@ -85,16 +85,19 @@ list(APPEND SOURCE
     task.c
     txtrange.c
     view.c
-    guid.c
-    rsrc.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/mshtml_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def)
+    mshtml_private.h)
 
 if(MSVC)
     add_asm_files(mshtml_asm msvc.S)
 endif()
 
-add_library(mshtml SHARED ${SOURCE} ${mshtml_asm})
+add_library(mshtml SHARED
+    ${SOURCE}
+    ${mshtml_asm}
+    guid.c
+    rsrc.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/mshtml_stubs.c
+    ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def)
 
 list(APPEND mshtml_rc_deps
     ${CMAKE_CURRENT_SOURCE_DIR}/blank.htm
@@ -108,4 +111,5 @@ target_link_libraries(mshtml uuid wine strmiids oldnames)
 add_delay_importlibs(mshtml wininet)
 add_importlibs(mshtml urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32 msvcrt kernel32 ntdll)
 add_dependencies(mshtml mshtml_nsiface_header)
+add_pch(mshtml mshtml_private.h SOURCE)
 add_cd_file(TARGET mshtml DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/msi/CMakeLists.txt b/reactos/dll/win32/msi/CMakeLists.txt
index 1fec59c17f8..c075bfd6ff7 100644
--- a/reactos/dll/win32/msi/CMakeLists.txt
+++ b/reactos/dll/win32/msi/CMakeLists.txt
@@ -51,12 +51,15 @@ list(APPEND SOURCE
     update.c
     upgrade.c
     where.c
-    msi.rc
+    msipriv.h
     ${CMAKE_CURRENT_BINARY_DIR}/msiserver_i.c
-    ${CMAKE_CURRENT_BINARY_DIR}/msi_stubs.c
+    ${CMAKE_CURRENT_BINARY_DIR}/msi_stubs.c)
+
+add_library(msi SHARED
+    ${SOURCE}
+    msi.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msi.def)
 
-add_library(msi SHARED ${SOURCE})
 add_idl_headers(msi_idlheader msiserver.idl)
 add_typelib(msiserver.idl)
 set_source_files_properties(msi.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msiserver.tlb)
@@ -83,5 +86,5 @@ add_importlibs(msi
     kernel32
     ntdll)
 
-add_pch(msi msipriv.h)
+add_pch(msi msipriv.h SOURCE)
 add_cd_file(TARGET msi DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/msimtf/CMakeLists.txt b/reactos/dll/win32/msimtf/CMakeLists.txt
index ea0e82adaa5..1c68982c050 100644
--- a/reactos/dll/win32/msimtf/CMakeLists.txt
+++ b/reactos/dll/win32/msimtf/CMakeLists.txt
@@ -6,11 +6,16 @@ spec2def(msimtf.dll msimtf.spec)
 list(APPEND SOURCE
     activeimmapp.c
     main.c
-    ${CMAKE_CURRENT_BINARY_DIR}/msimtf_stubs.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/msimtf_stubs.c)
+
+add_library(msimtf SHARED
+    ${SOURCE}
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msimtf.def)
 
-add_library(msimtf SHARED ${SOURCE} rsrc.rc)
 set_module_type(msimtf win32dll)
 target_link_libraries(msimtf uuid wine)
 add_importlibs(msimtf imm32 msvcrt kernel32 ntdll)
+add_pch(msimtf precomp.h SOURCE)
 add_cd_file(TARGET msimtf DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/msports/CMakeLists.txt b/reactos/dll/win32/msports/CMakeLists.txt
index e94d107cdfe..53a40962bce 100644
--- a/reactos/dll/win32/msports/CMakeLists.txt
+++ b/reactos/dll/win32/msports/CMakeLists.txt
@@ -8,14 +8,17 @@ list(APPEND SOURCE
     msports.c
     parallel.c
     serial.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/msports_stubs.c)
+
+add_library(msports SHARED
+    ${SOURCE}
     msports.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/msports_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/msports.def)
 
-add_library(msports SHARED ${SOURCE})
 set_module_type(msports win32dll UNICODE)
 target_link_libraries(msports wine)
 add_importlibs(msports setupapi comctl32 user32 advapi32 msvcrt kernel32 ntdll)
-add_pch(msports precomp.h)
+add_pch(msports precomp.h SOURCE)
 add_cd_file(TARGET msports DESTINATION reactos/system32 FOR all)
 
diff --git a/reactos/dll/win32/mstask/CMakeLists.txt b/reactos/dll/win32/mstask/CMakeLists.txt
index 88864d15add..dadf11b837e 100644
--- a/reactos/dll/win32/mstask/CMakeLists.txt
+++ b/reactos/dll/win32/mstask/CMakeLists.txt
@@ -10,13 +10,17 @@ list(APPEND SOURCE
     task.c
     task_scheduler.c
     task_trigger.c
+    mstask_private.h
     ${CMAKE_CURRENT_BINARY_DIR}/mstask_local_i.c
-    ${CMAKE_CURRENT_BINARY_DIR}/mstask_stubs.c
+    ${CMAKE_CURRENT_BINARY_DIR}/mstask_stubs.c)
+
+add_library(mstask SHARED
+    ${SOURCE}
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mstask.def)
 
-add_library(mstask SHARED ${SOURCE} rsrc.rc)
 set_module_type(mstask win32dll)
 target_link_libraries(mstask uuid wine)
 add_importlibs(mstask ole32 msvcrt kernel32 ntdll)
-add_pch(mstask mstask_private.h)
+add_pch(mstask mstask_private.h SOURCE)
 add_cd_file(TARGET mstask DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/msv1_0/CMakeLists.txt b/reactos/dll/win32/msv1_0/CMakeLists.txt
index 0b521351cc1..e24124707d7 100644
--- a/reactos/dll/win32/msv1_0/CMakeLists.txt
+++ b/reactos/dll/win32/msv1_0/CMakeLists.txt
@@ -1,7 +1,4 @@
 
-#include_directories(
-#    ${CMAKE_CURRENT_BINARY_DIR})
-
 spec2def(msv1_0.dll msv1_0.spec)
 
 list(APPEND SOURCE
diff --git a/reactos/dll/win32/msvfw32/CMakeLists.txt b/reactos/dll/win32/msvfw32/CMakeLists.txt
index 443bc9ae5d9..c5cbcc0a7fb 100644
--- a/reactos/dll/win32/msvfw32/CMakeLists.txt
+++ b/reactos/dll/win32/msvfw32/CMakeLists.txt
@@ -8,11 +8,16 @@ list(APPEND SOURCE
     mciwnd.c
     msvideo_main.c
     drawdib.c
-    ${CMAKE_CURRENT_BINARY_DIR}/msvfw32_stubs.c
+    msvideo_private.h
+    ${CMAKE_CURRENT_BINARY_DIR}/msvfw32_stubs.c)
+
+add_library(msvfw32 SHARED
+    ${SOURCE}
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msvfw32.def)
 
-add_library(msvfw32 SHARED ${SOURCE} rsrc.rc)
 set_module_type(msvfw32 win32dll)
 target_link_libraries(msvfw32 wine)
 add_importlibs(msvfw32 winmm comctl32 user32 gdi32 advapi32 msvcrt kernel32 ntdll)
+add_pch(msvfw32 msvideo_private.h SOURCE)
 add_cd_file(TARGET msvfw32 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/mswsock/CMakeLists.txt b/reactos/dll/win32/mswsock/CMakeLists.txt
index 72ab98b6a65..ac10be5db76 100644
--- a/reactos/dll/win32/mswsock/CMakeLists.txt
+++ b/reactos/dll/win32/mswsock/CMakeLists.txt
@@ -8,13 +8,15 @@ spec2def(mswsock.dll mswsock.spec ADD_IMPORTLIB)
 list(APPEND SOURCE
     extensions.c
     stubs.c
+    precomp.h)
+
+add_library(mswsock SHARED
+    ${SOURCE}
     mswsock.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def)
 
-add_library(mswsock SHARED ${SOURCE})
-
 set_module_type(mswsock win32dll UNICODE)
 add_importlibs(mswsock ws2_32 msvcrt kernel32)
-add_pch(mswsock precomp.h)
+add_pch(mswsock precomp.h SOURCE)
 add_cd_file(TARGET mswsock DESTINATION reactos/system32 FOR all)
 
diff --git a/reactos/dll/win32/msxml3/CMakeLists.txt b/reactos/dll/win32/msxml3/CMakeLists.txt
index b4e72a50705..ce3e78b31f2 100644
--- a/reactos/dll/win32/msxml3/CMakeLists.txt
+++ b/reactos/dll/win32/msxml3/CMakeLists.txt
@@ -25,7 +25,6 @@ list(APPEND SOURCE
     domimpl.c
     element.c
     entityref.c
-    factory.c
     httprequest.c
     main.c
     mxnamespace.c
@@ -40,7 +39,6 @@ list(APPEND SOURCE
     selection.c
     stylesheet.c
     text.c
-    uuid.c
     xdr.c
     xmldoc.c
     xmlelem.c
@@ -48,8 +46,8 @@ list(APPEND SOURCE
     xmlview.c
     xslpattern.tab.c
     xslpattern.yy.c
-    ${CMAKE_CURRENT_BINARY_DIR}/msxml3_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/msxml3.def)
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/msxml3_stubs.c)
 
 list(APPEND msxml3_rc_deps
     ${CMAKE_CURRENT_SOURCE_DIR}/msxml3.manifest
@@ -58,10 +56,18 @@ list(APPEND msxml3_rc_deps
     ${CMAKE_CURRENT_BINARY_DIR}/msxml3_v1.tlb)
 
 set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS "${msxml3_rc_deps}")
-add_library(msxml3 SHARED ${SOURCE} version.rc)
+
+add_library(msxml3 SHARED
+    ${SOURCE}
+    factory.c
+    uuid.c
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/msxml3.def)
+
 add_idl_headers(xmlparser_idlheader xmlparser.idl)
 set_module_type(msxml3 win32dll)
 target_link_libraries(msxml3 libxml2 uuid wine)
 add_importlibs(msxml3 urlmon ws2_32 shlwapi oleaut32 ole32 user32 msvcrt kernel32 ntdll)
 add_dependencies(msxml3 xmlparser_idlheader stdole2) # msxml3_v1.tlb needs stdole2.tlb
+add_pch(msxml3 precomp.h SOURCE)
 add_cd_file(TARGET msxml3 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/netapi32/CMakeLists.txt b/reactos/dll/win32/netapi32/CMakeLists.txt
index d5d48222812..334f617656a 100644
--- a/reactos/dll/win32/netapi32/CMakeLists.txt
+++ b/reactos/dll/win32/netapi32/CMakeLists.txt
@@ -20,11 +20,13 @@ list(APPEND SOURCE
     share.c
     user.c
     wksta.c
+    netapi32.h)
+
+add_library(netapi32 SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/netapi32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/netapi32.def)
 
-add_library(netapi32 SHARED ${SOURCE})
-
 set_module_type(netapi32 win32dll)
 
 target_link_libraries(netapi32 wine)
@@ -32,6 +34,6 @@ target_link_libraries(netapi32 wine)
 add_importlibs(netapi32 iphlpapi ws2_32 advapi32 msvcrt kernel32 ntdll)
 
 add_delay_importlibs(netapi32 samlib secur32)
-
+add_pch(netapi32 netapi32.h SOURCE)
 add_cd_file(TARGET netapi32 DESTINATION reactos/system32 FOR all)
 
diff --git a/reactos/dll/win32/netcfgx/CMakeLists.txt b/reactos/dll/win32/netcfgx/CMakeLists.txt
index 8f182b0efed..207238666cd 100644
--- a/reactos/dll/win32/netcfgx/CMakeLists.txt
+++ b/reactos/dll/win32/netcfgx/CMakeLists.txt
@@ -9,13 +9,16 @@ list(APPEND SOURCE
     netcfg_iface.c
     inetcfgcomp_iface.c
     tcpipconf_notify.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/netcfgx_stubs.c)
+
+add_library(netcfgx SHARED
+    ${SOURCE}
     netcfgx.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/netcfgx_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/netcfgx.def)
 
-add_library(netcfgx SHARED ${SOURCE})
 set_module_type(netcfgx win32dll)
 target_link_libraries(netcfgx uuid wine)
 add_importlibs(netcfgx rpcrt4 setupapi advapi32 iphlpapi dhcpcsvc ole32 user32 comctl32 ws2_32 msvcrt kernel32 ntdll)
-add_pch(netcfgx precomp.h)
+add_pch(netcfgx precomp.h SOURCE)
 add_cd_file(TARGET netcfgx DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/netshell/CMakeLists.txt b/reactos/dll/win32/netshell/CMakeLists.txt
index 08019a1ec65..4a0f4c7de07 100644
--- a/reactos/dll/win32/netshell/CMakeLists.txt
+++ b/reactos/dll/win32/netshell/CMakeLists.txt
@@ -17,15 +17,18 @@ list(APPEND SOURCE
     netshell.cpp
     shfldr_netconnect.cpp
     enumlist.cpp
-    netshell.rc
     classfactory.cpp
     connectmanager.cpp
     lanconnectui.cpp
     lanstatusui.cpp
+    precomp.h)
+
+add_library(netshell SHARED
+    ${SOURCE}
+    netshell.rc
     ${CMAKE_CURRENT_BINARY_DIR}/netshell_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/netshell.def)
 
-add_library(netshell SHARED ${SOURCE})
 set_module_type(netshell win32dll)
 target_link_libraries(netshell uuid wine)
 
@@ -44,5 +47,5 @@ add_importlibs(netshell
     kernel32
     ntdll)
 
-add_pch(netshell precomp.h)
+add_pch(netshell precomp.h SOURCE)
 add_cd_file(TARGET netshell DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/newdev/CMakeLists.txt b/reactos/dll/win32/newdev/CMakeLists.txt
index 3cea067fb84..996995034a9 100644
--- a/reactos/dll/win32/newdev/CMakeLists.txt
+++ b/reactos/dll/win32/newdev/CMakeLists.txt
@@ -6,14 +6,17 @@ list(APPEND SOURCE
     newdev.c
     stubs.c
     wizard.c
+    newdev_private.h
+    ${CMAKE_CURRENT_BINARY_DIR}/newdev_stubs.c)
+
+add_library(newdev SHARED
+    ${SOURCE}
     newdev.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/newdev_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/newdev.def)
 
-add_library(newdev SHARED ${SOURCE})
 set_module_type(newdev win32dll UNICODE)
 target_link_libraries(newdev wine)
 add_importlibs(newdev gdi32 comctl32 setupapi advapi32 user32 shell32 msvcrt kernel32 ntdll)
-add_pch(newdev newdev_private.h)
+add_pch(newdev newdev_private.h SOURCE)
 add_cd_file(TARGET newdev DESTINATION reactos/system32 FOR all)
 
diff --git a/reactos/dll/win32/objsel/CMakeLists.txt b/reactos/dll/win32/objsel/CMakeLists.txt
index 00787e22d1f..e7fc09f8fdd 100644
--- a/reactos/dll/win32/objsel/CMakeLists.txt
+++ b/reactos/dll/win32/objsel/CMakeLists.txt
@@ -11,11 +11,13 @@ spec2def(objsel.dll objsel.spec)
 list(APPEND SOURCE
     factory.c
     objsel.c
+    objsel_private.h)
+
+add_library(objsel SHARED
+    ${SOURCE}
     objsel.rc
     ${CMAKE_CURRENT_BINARY_DIR}/objsel.def)
 
-add_library(objsel SHARED ${SOURCE})
-
 set_module_type(objsel win32dll)
 
 target_link_libraries(objsel uuid wine)
@@ -27,5 +29,5 @@ add_importlibs(objsel
     kernel32
     ntdll)
 
-add_pch(objsel objsel_private.h)
+add_pch(objsel objsel_private.h SOURCE)
 add_cd_file(TARGET objsel DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/ole32/CMakeLists.txt b/reactos/dll/win32/ole32/CMakeLists.txt
index 0f2d49c8e78..807f8029815 100644
--- a/reactos/dll/win32/ole32/CMakeLists.txt
+++ b/reactos/dll/win32/ole32/CMakeLists.txt
@@ -59,10 +59,19 @@ list(APPEND SOURCE
     storage32.c
     stubmanager.c
     usrmarshal.c
-    guid.c
+    precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/dcom_i.c
+    ${CMAKE_CURRENT_BINARY_DIR}/irot_c.c)
+
+if(MSVC AND (ARCH STREQUAL "i386"))
+    list(APPEND SOURCE msvc-thiscall.c)
+endif()
+
+add_library(ole32 SHARED
+    ${SOURCE}
+    guid.c
+    ole32res.rc
     ${CMAKE_CURRENT_BINARY_DIR}/dcom_p.c
-    ${CMAKE_CURRENT_BINARY_DIR}/irot_c.c
     ${CMAKE_CURRENT_BINARY_DIR}/ole32_objidl_p.c
     ${CMAKE_CURRENT_BINARY_DIR}/ole32_oleidl_p.c
     ${CMAKE_CURRENT_BINARY_DIR}/ole32_unknwn_p.c
@@ -70,14 +79,10 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
     ${CMAKE_CURRENT_BINARY_DIR}/ole32.def)
 
-if(MSVC AND (ARCH STREQUAL "i386"))
-    list(APPEND SOURCE msvc-thiscall.c)
-endif()
-
-add_library(ole32 SHARED ${SOURCE} ole32res.rc)
 set_module_type(ole32 win32dll)
 target_link_libraries(ole32 wine uuid ${PSEH_LIB})
 add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 ntdll)
 add_delay_importlibs(ole32 oleaut32)
 add_dependencies(ole32 ole32idl)
+add_pch(ole32 precomp.h SOURCE)
 add_cd_file(TARGET ole32 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/oleaut32/CMakeLists.txt b/reactos/dll/win32/oleaut32/CMakeLists.txt
index 06cb3aaca97..1673fb07aa4 100644
--- a/reactos/dll/win32/oleaut32/CMakeLists.txt
+++ b/reactos/dll/win32/oleaut32/CMakeLists.txt
@@ -33,6 +33,15 @@ list(APPEND SOURCE
     varformat.c
     variant.c
     vartype.c
+    precomp.h)
+
+if(MSVC)
+    add_asm_files(oleaut32_asm msvc.S)
+endif()
+
+add_library(oleaut32 SHARED
+    ${SOURCE}
+    ${oleaut32_asm}
     oleaut32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/oleaut32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
@@ -40,15 +49,11 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/oleaut32_ocidl_p.c
     ${CMAKE_CURRENT_BINARY_DIR}/oleaut32.def)
 
-if(MSVC)
-    add_asm_files(oleaut32_asm msvc.S)
-endif()
-
-add_library(oleaut32 SHARED ${SOURCE} ${oleaut32_asm})
 add_idl_headers(oleaut32_idlheader oleaut32_oaidl.idl)
 add_dependencies(oleaut32 oleaut32_idlheader)
 set_module_type(oleaut32 win32dll)
 target_link_libraries(oleaut32 wine wineldr uuid ${PSEH_LIB})
 add_delay_importlibs(oleaut32 comctl32 urlmon windowscodecs)
 add_importlibs(oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 msvcrt kernel32 ntdll)
+add_pch(oleaut32 precomp.h SOURCE)
 add_cd_file(TARGET oleaut32 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/oledlg/CMakeLists.txt b/reactos/dll/win32/oledlg/CMakeLists.txt
index 38cbd228931..fe9b6c41e27 100644
--- a/reactos/dll/win32/oledlg/CMakeLists.txt
+++ b/reactos/dll/win32/oledlg/CMakeLists.txt
@@ -7,10 +7,15 @@ list(APPEND SOURCE
     insobjdlg.c
     oledlg_main.c
     pastespl.c
+    oledlg_private.h)
+
+add_library(oledlg SHARED
+    ${SOURCE}
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/oledlg.def)
 
-add_library(oledlg SHARED ${SOURCE} rsrc.rc)
 set_module_type(oledlg win32dll)
 target_link_libraries(oledlg wine)
 add_importlibs(oledlg ole32 comdlg32 user32 advapi32 msvcrt kernel32 ntdll)
+add_pch(oledlg oledlg_private.h SOURCE)
 add_cd_file(TARGET oledlg DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/propsys/CMakeLists.txt b/reactos/dll/win32/propsys/CMakeLists.txt
index ea600c2caab..3e5d50f11b2 100644
--- a/reactos/dll/win32/propsys/CMakeLists.txt
+++ b/reactos/dll/win32/propsys/CMakeLists.txt
@@ -7,11 +7,16 @@ list(APPEND SOURCE
     propstore.c
     propsys_main.c
     propvar.c
-    ${CMAKE_CURRENT_BINARY_DIR}/propsys_stubs.c
+    propsys_private.h
+    ${CMAKE_CURRENT_BINARY_DIR}/propsys_stubs.c)
+
+add_library(propsys SHARED
+    ${SOURCE}
+    propsys.rc
     ${CMAKE_CURRENT_BINARY_DIR}/propsys.def)
 
-add_library(propsys SHARED ${SOURCE} propsys.rc)
 set_module_type(propsys win32dll)
 target_link_libraries(propsys uuid wine)
 add_importlibs(propsys ole32 oleaut32 msvcrt kernel32 ntdll)
+add_pch(propsys propsys_private.h SOURCE)
 add_cd_file(TARGET propsys DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/qmgr/CMakeLists.txt b/reactos/dll/win32/qmgr/CMakeLists.txt
index 08598e0a9aa..e3cdc684526 100644
--- a/reactos/dll/win32/qmgr/CMakeLists.txt
+++ b/reactos/dll/win32/qmgr/CMakeLists.txt
@@ -13,15 +13,19 @@ list(APPEND SOURCE
     qmgr.c
     qmgr_main.c
     service.c
-    ${CMAKE_CURRENT_BINARY_DIR}/qmgr_local_i.c
+    qmgr.h
+    ${CMAKE_CURRENT_BINARY_DIR}/qmgr_local_i.c)
+
+add_library(qmgr SHARED
+    ${SOURCE}
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/qmgr.def)
 
-add_library(qmgr SHARED ${SOURCE} rsrc.rc)
 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qmgr.inf)
 add_idl_headers(qmgr_idlheader qmgr_local.idl)
 set_module_type(qmgr win32dll)
 target_link_libraries(qmgr uuid wine)
 add_importlibs(qmgr ole32 wininet urlmon advapi32 msvcrt kernel32 ntdll)
-add_pch(qmgr qmgr.h)
+add_pch(qmgr qmgr.h SOURCE)
 add_cd_file(TARGET qmgr DESTINATION reactos/system32 FOR all)
 add_dependencies(qmgr qmgr_idlheader)
diff --git a/reactos/dll/win32/rasadhlp/CMakeLists.txt b/reactos/dll/win32/rasadhlp/CMakeLists.txt
index 33786a1a408..ef17487612f 100644
--- a/reactos/dll/win32/rasadhlp/CMakeLists.txt
+++ b/reactos/dll/win32/rasadhlp/CMakeLists.txt
@@ -7,11 +7,14 @@ list(APPEND SOURCE
     autodial.c
     init.c
     winsock.c
-    ${CMAKE_CURRENT_BINARY_DIR}/rasadhlp_stubs.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/rasadhlp_stubs.c)
+
+add_library(rasadhlp SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/rasadhlp.def)
 
-add_library(rasadhlp SHARED ${SOURCE})
 set_module_type(rasadhlp win32dll)
 add_importlibs(rasadhlp ws2_32 msvcrt kernel32 ntdll)
-add_pch(rasadhlp precomp.h)
+add_pch(rasadhlp precomp.h SOURCE)
 add_cd_file(TARGET rasadhlp DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/riched20/CMakeLists.txt b/reactos/dll/win32/riched20/CMakeLists.txt
index 06af6874560..339445459ec 100644
--- a/reactos/dll/win32/riched20/CMakeLists.txt
+++ b/reactos/dll/win32/riched20/CMakeLists.txt
@@ -18,23 +18,28 @@ list(APPEND SOURCE
     string.c
     style.c
     table.c
-    txthost.c
-    txtsrv.c
     undo.c
     wrap.c
     writer.c
-    ${CMAKE_CURRENT_BINARY_DIR}/riched20.def)
+    editor.h)
 
 if(MSVC)
     if(ARCH STREQUAL "i386")
         list(APPEND SOURCE msvc-thiscall.c)
     endif()
     set_source_files_properties(txthost.c txtsrv.c PROPERTIES COMPILE_FLAGS "/FImsvc.h")
+    list(APPEND ADDITIONAL_SOURCE txthost.c txtsrv.c)
+else()
+    list(APPEND SOURCE txthost.c txtsrv.c)
 endif()
 
-add_library(riched20 SHARED ${SOURCE} version.rc)
+list(APPEND ADDITIONAL_SOURCE
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/riched20.def)
+
+add_library(riched20 SHARED ${SOURCE} ${ADDITIONAL_SOURCE})
 set_module_type(riched20 win32dll)
 target_link_libraries(riched20 wine uuid)
 add_importlibs(riched20 ole32 oleaut32 imm32 user32 gdi32 msvcrt kernel32 ntdll)
-add_pch(riched20 editor.h)
+add_pch(riched20 editor.h SOURCE)
 add_cd_file(TARGET riched20 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/rpcrt4/CMakeLists.txt b/reactos/dll/win32/rpcrt4/CMakeLists.txt
index beab1fddb60..fa024a5ee24 100644
--- a/reactos/dll/win32/rpcrt4/CMakeLists.txt
+++ b/reactos/dll/win32/rpcrt4/CMakeLists.txt
@@ -23,9 +23,8 @@ list(APPEND SOURCE
     rpc_server.c
     rpc_transport.c
     unix_func.c
-    ${CMAKE_CURRENT_BINARY_DIR}/epm_c.c
-    ${CMAKE_CURRENT_BINARY_DIR}/rpcrt4_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/rpcrt4.def)
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/epm_c.c)
 
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
@@ -45,11 +44,14 @@ endif()
 add_library(rpcrt4 SHARED
     ${SOURCE}
     ${rpcrt4_asm}
-    rpcrt4.rc)
+    rpcrt4.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/rpcrt4_stubs.c
+    ${CMAKE_CURRENT_BINARY_DIR}/rpcrt4.def)
 
 set_module_type(rpcrt4 win32dll)
 target_link_libraries(rpcrt4 wine uuid ${PSEH_LIB})
 
 add_delay_importlibs(rpcrt4 iphlpapi wininet secur32 user32)
 add_importlibs(rpcrt4 msvcrt advapi32 ws2_32 kernel32 ntdll)
+add_pch(rpcrt4 precomp.h SOURCE)
 add_cd_file(TARGET rpcrt4 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/rsaenh/CMakeLists.txt b/reactos/dll/win32/rsaenh/CMakeLists.txt
index ac8985bfcf8..7e73f526ca5 100644
--- a/reactos/dll/win32/rsaenh/CMakeLists.txt
+++ b/reactos/dll/win32/rsaenh/CMakeLists.txt
@@ -15,11 +15,15 @@ list(APPEND SOURCE
     rsa.c
     rsaenh.c
     sha2.c
+    tomcrypt.h)
+
+add_library(rsaenh SHARED
+    ${SOURCE}
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/rsaenh.def)
 
-add_library(rsaenh SHARED ${SOURCE} rsrc.rc)
 set_module_type(rsaenh win32dll)
 target_link_libraries(rsaenh wine)
 add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll)
-add_pch(rsaenh tomcrypt.h)
+add_pch(rsaenh tomcrypt.h SOURCE)
 add_cd_file(TARGET rsaenh DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/samlib/CMakeLists.txt b/reactos/dll/win32/samlib/CMakeLists.txt
index ea6c9c02845..3a9ff384e03 100644
--- a/reactos/dll/win32/samlib/CMakeLists.txt
+++ b/reactos/dll/win32/samlib/CMakeLists.txt
@@ -10,14 +10,17 @@ add_rpc_files(client ${REACTOS_SOURCE_DIR}/include/reactos/idl/sam.idl)
 list(APPEND SOURCE
     dllmain.c
     samlib.c
-    samlib.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/samlib_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/samlib.def
-    ${CMAKE_CURRENT_BINARY_DIR}/sam_c.c)
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/sam_c.c
+    ${CMAKE_CURRENT_BINARY_DIR}/samlib_stubs.c)
+
+add_library(samlib SHARED
+    ${SOURCE}
+    samlib.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/samlib.def)
 
-add_library(samlib SHARED ${SOURCE})
 set_module_type(samlib win32dll UNICODE)
 target_link_libraries(samlib wine ${PSEH_LIB})
 add_importlibs(samlib rpcrt4 advapi32 msvcrt kernel32 ntdll)
-add_pch(samlib precomp.h)
+add_pch(samlib precomp.h SOURCE)
 add_cd_file(TARGET samlib DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/samsrv/CMakeLists.txt b/reactos/dll/win32/samsrv/CMakeLists.txt
index 83cacc1a542..bb9d34fddff 100644
--- a/reactos/dll/win32/samsrv/CMakeLists.txt
+++ b/reactos/dll/win32/samsrv/CMakeLists.txt
@@ -19,15 +19,19 @@ list(APPEND SOURCE
     setup.c
     user.c
     utils.c
-    samsrv.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/samsrv_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def
-    ${CMAKE_CURRENT_BINARY_DIR}/sam_s.c)
+    samsrv.h
+    ${CMAKE_CURRENT_BINARY_DIR}/sam_s.c
+    ${CMAKE_CURRENT_BINARY_DIR}/samsrv_stubs.c)
+
+add_library(samsrv SHARED
+    ${SOURCE}
+    samsrv.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def)
 
-add_library(samsrv SHARED ${SOURCE})
 set_module_type(samsrv win32dll UNICODE)
 
 target_link_libraries(samsrv wine ${PSEH_LIB})
 add_importlibs(samsrv msvcrt rpcrt4 advapi32 kernel32 ntdll)
 add_dependencies(samsrv psdk)
+add_pch(samsrv samsrv.h SOURCE)
 add_cd_file(TARGET samsrv DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/schannel/CMakeLists.txt b/reactos/dll/win32/schannel/CMakeLists.txt
index e7917004cb5..2fcfa26f6ed 100644
--- a/reactos/dll/win32/schannel/CMakeLists.txt
+++ b/reactos/dll/win32/schannel/CMakeLists.txt
@@ -7,12 +7,16 @@ list(APPEND SOURCE
     lsamode.c
     schannel_main.c
     usermode.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/schannel_stubs.c)
+
+add_library(schannel SHARED
+    ${SOURCE}
     version.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/schannel_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/schannel.def)
 
-add_library(schannel SHARED ${SOURCE})
 set_module_type(schannel win32dll)
 target_link_libraries(schannel wine)
 add_importlibs(schannel secur32 msvcrt kernel32 ntdll)
+add_pch(schannel precomp.h SOURCE)
 add_cd_file(TARGET schannel DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/scrrun/CMakeLists.txt b/reactos/dll/win32/scrrun/CMakeLists.txt
index b5cdc6771fe..696a3bdba38 100644
--- a/reactos/dll/win32/scrrun/CMakeLists.txt
+++ b/reactos/dll/win32/scrrun/CMakeLists.txt
@@ -10,9 +10,8 @@ list(APPEND SOURCE
     dictionary.c
     filesystem.c
     scrrun.c
-    guid.c
-    ${CMAKE_CURRENT_BINARY_DIR}/scrrun_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/scrrun.def)
+    scrrun_private.h
+    ${CMAKE_CURRENT_BINARY_DIR}/scrrun_stubs.c)
 
 list(APPEND scrrun_rc_deps
     ${CMAKE_CURRENT_SOURCE_DIR}/scrrun.rgs
@@ -20,9 +19,16 @@ list(APPEND scrrun_rc_deps
     ${CMAKE_CURRENT_BINARY_DIR}/scrrun.tlb)
 
 set_source_files_properties(scrrun.rc PROPERTIES OBJECT_DEPENDS "${scrrun_rc_deps}")
-add_library(scrrun SHARED ${SOURCE} scrrun.rc)
+
+add_library(scrrun SHARED
+    ${SOURCE}
+    guid.c
+    scrrun.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/scrrun.def)
+
 add_dependencies(scrrun scrrun_idlheader stdole2)
 set_module_type(scrrun win32dll)
 target_link_libraries(scrrun uuid wine)
 add_importlibs(scrrun oleaut32 version advapi32 msvcrt kernel32 ntdll)
+add_pch(scrrun scrrun_private.h SOURCE)
 add_cd_file(TARGET scrrun DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/secur32/CMakeLists.txt b/reactos/dll/win32/secur32/CMakeLists.txt
index a3ffb431a45..95bece1bccd 100644
--- a/reactos/dll/win32/secur32/CMakeLists.txt
+++ b/reactos/dll/win32/secur32/CMakeLists.txt
@@ -8,20 +8,21 @@ list(APPEND SOURCE
     dllmain.c
     secext.c
     sspi.c
-    secur32.rc
     stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/secur32_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/secur32.def
-)
+    precomp.h)
 
-add_library(secur32 SHARED ${SOURCE})
+add_library(secur32 SHARED
+    ${SOURCE}
+    secur32.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/secur32_stubs.c
+    ${CMAKE_CURRENT_BINARY_DIR}/secur32.def)
 
 set_module_type(secur32 win32dll)
 
 target_link_libraries(secur32 lsalib)
 
 add_importlibs(secur32 advapi32 msvcrt kernel32 ntdll)
-add_pch(secur32 precomp.h)
+add_pch(secur32 precomp.h SOURCE)
 
 add_cd_file(TARGET secur32 DESTINATION reactos/system32 FOR all)
 
diff --git a/reactos/dll/win32/setupapi/CMakeLists.txt b/reactos/dll/win32/setupapi/CMakeLists.txt
index 1ca7dd12fc0..3d1af9fe4ca 100644
--- a/reactos/dll/win32/setupapi/CMakeLists.txt
+++ b/reactos/dll/win32/setupapi/CMakeLists.txt
@@ -29,12 +29,15 @@ list(APPEND SOURCE
     stringtable.c
     stubs.c
     rpc.c
-    setupapi.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/setupapi_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/setupapi.def
+    setupapi_private.h
     ${CMAKE_CURRENT_BINARY_DIR}/pnp_c.c)
 
-add_library(setupapi SHARED ${SOURCE})
+add_library(setupapi SHARED
+    ${SOURCE}
+    setupapi.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/setupapi_stubs.c
+    ${CMAKE_CURRENT_BINARY_DIR}/setupapi.def)
+
 set_module_type(setupapi win32dll UNICODE)
 target_link_libraries(setupapi uuid wine ${PSEH_LIB})
 add_delay_importlibs(setupapi shell32)
@@ -50,5 +53,5 @@ add_importlibs(setupapi
     kernel32
     ntdll)
 
-add_pch(setupapi setupapi_private.h)
+add_pch(setupapi setupapi_private.h SOURCE)
 add_cd_file(TARGET setupapi DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/shdocvw/CMakeLists.txt b/reactos/dll/win32/shdocvw/CMakeLists.txt
index 25f8371efe2..ea8a53d97bb 100644
--- a/reactos/dll/win32/shdocvw/CMakeLists.txt
+++ b/reactos/dll/win32/shdocvw/CMakeLists.txt
@@ -9,17 +9,22 @@ spec2def(shdocvw.dll shdocvw.spec ADD_IMPORTLIB)
 list(APPEND SOURCE
     shdocvw_main.c
     shlinstobj.c
-    ${CMAKE_CURRENT_BINARY_DIR}/shdocvw_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def)
+    shdocvw.h
+    ${CMAKE_CURRENT_BINARY_DIR}/shdocvw_stubs.c)
 
 add_typelib(shdocvw_v1.idl)
 set_source_files_properties(shdocvw.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/shdocvw_v1.tlb)
-add_library(shdocvw SHARED ${SOURCE} shdocvw.rc)
+
+add_library(shdocvw SHARED
+    ${SOURCE}
+    shdocvw.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def)
+
 set_module_type(shdocvw win32dll)
 target_link_libraries(shdocvw uuid wine)
 add_delay_importlibs(shdocvw ole32 oleaut32 ieframe)
 add_importlibs(shdocvw shlwapi advapi32 msvcrt kernel32 ntdll)
 # shdocvw_v1.tlb needs stdole2.tlb
 add_dependencies(shdocvw stdole2)
-add_pch(shdocvw shdocvw.h)
+add_pch(shdocvw shdocvw.h SOURCE)
 add_cd_file(TARGET shdocvw DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/shell32/CMakeLists.txt b/reactos/dll/win32/shell32/CMakeLists.txt
index d542de5a22b..f84298872e7 100644
--- a/reactos/dll/win32/shell32/CMakeLists.txt
+++ b/reactos/dll/win32/shell32/CMakeLists.txt
@@ -72,12 +72,13 @@ list(APPEND SOURCE
     folder_options.cpp
     filedefext.cpp
     drvdefext.cpp
-    ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/shell32.def)
+    precomp.h)
 
 add_library(shell32 SHARED
     ${SOURCE}
-    shell32.rc)
+    shell32.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c
+    ${CMAKE_CURRENT_BINARY_DIR}/shell32.def)
 
 set_module_type(shell32 win32dll UNICODE)
 
@@ -106,5 +107,5 @@ add_importlibs(shell32
     ntdll)
 
 add_dependencies(shell32 shdocvw_v1)
-add_pch(shell32 precomp.h)
+add_pch(shell32 precomp.h SOURCE)
 add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/shlwapi/CMakeLists.txt b/reactos/dll/win32/shlwapi/CMakeLists.txt
index f760833bdc4..8cb79d8bf90 100644
--- a/reactos/dll/win32/shlwapi/CMakeLists.txt
+++ b/reactos/dll/win32/shlwapi/CMakeLists.txt
@@ -20,13 +20,18 @@ list(APPEND SOURCE
     string.c
     thread.c
     url.c
+    precomp.h)
+
+add_library(shlwapi SHARED
+    ${SOURCE}
+    shlwapi.rc
     wsprintf.c
     ${CMAKE_CURRENT_BINARY_DIR}/shlwapi_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/shlwapi.def)
 
-add_library(shlwapi SHARED ${SOURCE} shlwapi.rc)
 set_module_type(shlwapi win32dll)
 target_link_libraries(shlwapi uuid wine)
 add_delay_importlibs(shlwapi userenv oleaut32 ole32 comdlg32 mpr mlang urlmon shell32 winmm version)
 add_importlibs(shlwapi user32 gdi32 advapi32 wininet msvcrt kernel32 ntdll)
+add_pch(shlwapi precomp.h SOURCE)
 add_cd_file(TARGET shlwapi DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/smdll/CMakeLists.txt b/reactos/dll/win32/smdll/CMakeLists.txt
index 88e87e35b28..1b4648bf13d 100644
--- a/reactos/dll/win32/smdll/CMakeLists.txt
+++ b/reactos/dll/win32/smdll/CMakeLists.txt
@@ -6,15 +6,17 @@ spec2def(smdll.dll smdll.spec ADD_IMPORTLIB)
 list(APPEND SOURCE
     dllmain.c
     query.c
+    precomp.h)
+
+add_library(smdll SHARED
+    ${SOURCE}
     smdll.rc
     ${CMAKE_CURRENT_BINARY_DIR}/smdll.def)
 
-add_library(smdll SHARED ${SOURCE})
-
 target_link_libraries(smdll smlib)
 set_module_type(smdll nativedll ENTRYPOINT DllMainCRTStartup 12)
 add_importlibs(smdll ntdll)
-add_pch(smdll precomp.h)
+add_pch(smdll precomp.h SOURCE)
 add_dependencies(smdll psdk)
 add_cd_file(TARGET smdll DESTINATION reactos/system32 FOR all)
 
diff --git a/reactos/dll/win32/spoolss/CMakeLists.txt b/reactos/dll/win32/spoolss/CMakeLists.txt
index 67c269a1805..41785c5e7a6 100644
--- a/reactos/dll/win32/spoolss/CMakeLists.txt
+++ b/reactos/dll/win32/spoolss/CMakeLists.txt
@@ -6,11 +6,15 @@ spec2def(spoolss.dll spoolss.spec ADD_IMPORTLIB)
 list(APPEND SOURCE
     spoolss_main.c
     router.c
-    ${CMAKE_CURRENT_BINARY_DIR}/spoolss_stubs.c
+    spoolss.h
+    ${CMAKE_CURRENT_BINARY_DIR}/spoolss_stubs.c)
+
+add_library(spoolss SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/spoolss.def)
 
-add_library(spoolss SHARED ${SOURCE})
 set_module_type(spoolss win32dll)
 target_link_libraries(spoolss wine)
 add_importlibs(spoolss msvcrt kernel32 ntdll)
+add_pch(spoolss spoolss.h SOURCE)
 add_cd_file(TARGET spoolss DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/sti/CMakeLists.txt b/reactos/dll/win32/sti/CMakeLists.txt
index fab24cc291f..6d7375c1dce 100644
--- a/reactos/dll/win32/sti/CMakeLists.txt
+++ b/reactos/dll/win32/sti/CMakeLists.txt
@@ -7,18 +7,23 @@ add_definitions(
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(sti.dll sti.spec)
+add_rpcproxy_files(sti_wia.idl)
 
 list(APPEND SOURCE
     sti.c
     sti_main.c
-    guid.c
+    precomp.h
     ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
-    ${CMAKE_CURRENT_BINARY_DIR}/sti_wia_p.c
+    ${CMAKE_CURRENT_BINARY_DIR}/sti_wia_p.c)
+
+add_library(sti SHARED
+    ${SOURCE}
+    guid.c
+    sti.rc
     ${CMAKE_CURRENT_BINARY_DIR}/sti.def)
 
-add_rpcproxy_files(sti_wia.idl)
-add_library(sti SHARED ${SOURCE} sti.rc)
 set_module_type(sti win32dll)
 target_link_libraries(sti wine uuid ${PSEH_LIB})
 add_importlibs(sti ole32 oleaut32 rpcrt4 advapi32 msvcrt kernel32 ntdll)
+add_pch(sti precomp.h SOURCE)
 add_cd_file(TARGET sti DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/sxs/CMakeLists.txt b/reactos/dll/win32/sxs/CMakeLists.txt
index b21b2dd3ad3..97f80b33dbd 100644
--- a/reactos/dll/win32/sxs/CMakeLists.txt
+++ b/reactos/dll/win32/sxs/CMakeLists.txt
@@ -7,12 +7,16 @@ list(APPEND SOURCE
     cache.c
     name.c
     sxs.c
+    sxs_private.h
+    ${CMAKE_CURRENT_BINARY_DIR}/sxs_stubs.c)
+
+add_library(sxs SHARED
+    ${SOURCE}
     guid.c
-    ${CMAKE_CURRENT_BINARY_DIR}/sxs_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/sxs.def)
 
-add_library(sxs SHARED ${SOURCE})
 set_module_type(sxs win32dll)
 target_link_libraries(sxs wine)
 add_importlibs(sxs oleaut32 ole32 msvcrt kernel32 ntdll)
+add_pch(sxs sxs_private.h SOURCE)
 add_cd_file(TARGET sxs DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/syssetup/CMakeLists.txt b/reactos/dll/win32/syssetup/CMakeLists.txt
index 77c86e86203..6c0b48147cc 100644
--- a/reactos/dll/win32/syssetup/CMakeLists.txt
+++ b/reactos/dll/win32/syssetup/CMakeLists.txt
@@ -8,12 +8,15 @@ list(APPEND SOURCE
     logfile.c
     security.c
     wizard.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/syssetup_stubs.c)
+
+add_library(syssetup SHARED
+    ${SOURCE}
     syssetup.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/syssetup_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/syssetup.def)
 
-add_library(syssetup SHARED ${SOURCE})
-add_pch(syssetup precomp.h)
+add_pch(syssetup precomp.h SOURCE)
 set_module_type(syssetup win32dll UNICODE)
 target_link_libraries(syssetup uuid wine ${PSEH_LIB})
 
diff --git a/reactos/dll/win32/tapi32/CMakeLists.txt b/reactos/dll/win32/tapi32/CMakeLists.txt
index 5fc9beeb833..f474b3b7185 100644
--- a/reactos/dll/win32/tapi32/CMakeLists.txt
+++ b/reactos/dll/win32/tapi32/CMakeLists.txt
@@ -8,11 +8,15 @@ list(APPEND SOURCE
     internal.c
     line.c
     phone.c
-    ${CMAKE_CURRENT_BINARY_DIR}/tapi32_stubs.c
+    precomp.h
+    ${CMAKE_CURRENT_BINARY_DIR}/tapi32_stubs.c)
+
+add_library(tapi32 SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/tapi32.def)
 
-add_library(tapi32 SHARED ${SOURCE})
 set_module_type(tapi32 win32dll)
 target_link_libraries(tapi32 wine)
 add_importlibs(tapi32 advapi32 msvcrt kernel32 ntdll)
+add_pch(tapi32 precomp.h SOURCE)
 add_cd_file(TARGET tapi32 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/twain_32/CMakeLists.txt b/reactos/dll/win32/twain_32/CMakeLists.txt
index ab718e9b0e1..c13a4619c9b 100644
--- a/reactos/dll/win32/twain_32/CMakeLists.txt
+++ b/reactos/dll/win32/twain_32/CMakeLists.txt
@@ -6,10 +6,15 @@ spec2def(twain_32.dll twain_32.spec)
 list(APPEND SOURCE
     dsm_ctrl.c
     twain32_main.c
+    twain_i.h)
+
+add_library(twain_32 SHARED
+    ${SOURCE}
+    twain_32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/twain_32.def)
 
-add_library(twain_32 SHARED ${SOURCE} twain_32.rc)
 set_module_type(twain_32 win32dll)
 target_link_libraries(twain_32 wine)
 add_importlibs(twain_32 msvcrt kernel32 ntdll)
+add_pch(twain_32 twain_i.h SOURCE)
 add_cd_file(TARGET twain_32 DESTINATION reactos FOR all)
diff --git a/reactos/dll/win32/urlmon/CMakeLists.txt b/reactos/dll/win32/urlmon/CMakeLists.txt
index 81404deda38..b3389e20657 100644
--- a/reactos/dll/win32/urlmon/CMakeLists.txt
+++ b/reactos/dll/win32/urlmon/CMakeLists.txt
@@ -36,14 +36,18 @@ list(APPEND SOURCE
     uri.c
     urlmon_main.c
     usrmarshal.c
+    urlmon_main.h)
+
+add_library(urlmon SHARED
+    ${SOURCE}
+    urlmon.rc
     ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
     ${CMAKE_CURRENT_BINARY_DIR}/urlmon_urlmon_p.c
     ${CMAKE_CURRENT_BINARY_DIR}/urlmon_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/urlmon.def)
 
-add_library(urlmon SHARED ${SOURCE} urlmon.rc)
 set_module_type(urlmon win32dll)
 target_link_libraries(urlmon uuid wine ${PSEH_LIB})
 add_importlibs(urlmon rpcrt4 propsys ole32 oleaut32 shlwapi shell32 wininet user32 advapi32 advpack msvcrt kernel32 ntdll)
-add_pch(urlmon urlmon_main.h)
+add_pch(urlmon urlmon_main.h SOURCE)
 add_cd_file(TARGET urlmon DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/userenv/CMakeLists.txt b/reactos/dll/win32/userenv/CMakeLists.txt
index dbf2c9a2aa2..4ed171080c0 100644
--- a/reactos/dll/win32/userenv/CMakeLists.txt
+++ b/reactos/dll/win32/userenv/CMakeLists.txt
@@ -11,13 +11,16 @@ list(APPEND SOURCE
     registry.c
     setup.c
     userenv.c
+    precomp.h)
+
+add_library(userenv SHARED
+    ${SOURCE}
     userenv.rc
     ${CMAKE_CURRENT_BINARY_DIR}/userenv_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/userenv.def)
 
-add_library(userenv SHARED ${SOURCE})
 set_module_type(userenv win32dll)
 target_link_libraries(userenv uuid)
 add_importlibs(userenv advapi32 user32 msvcrt kernel32 ntdll)
-add_pch(userenv precomp.h)
+add_pch(userenv precomp.h SOURCE)
 add_cd_file(TARGET userenv DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/usp10/CMakeLists.txt b/reactos/dll/win32/usp10/CMakeLists.txt
index b9af55569fb..2cf15aadecd 100644
--- a/reactos/dll/win32/usp10/CMakeLists.txt
+++ b/reactos/dll/win32/usp10/CMakeLists.txt
@@ -14,11 +14,15 @@ list(APPEND SOURCE
     shape.c
     shaping.c
     usp10.c
-    ${CMAKE_CURRENT_BINARY_DIR}/usp10_stubs.c
+    usp10_internal.h
+    ${CMAKE_CURRENT_BINARY_DIR}/usp10_stubs.c)
+
+add_library(usp10 SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/usp10.def)
 
-add_library(usp10 SHARED ${SOURCE})
 set_module_type(usp10 win32dll)
 target_link_libraries(usp10 wine)
 add_importlibs(usp10 advapi32 user32 gdi32 msvcrt kernel32 ntdll)
+add_pch(usp10 usp10_internal.h SOURCE)
 add_cd_file(TARGET usp10 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/uxtheme/CMakeLists.txt b/reactos/dll/win32/uxtheme/CMakeLists.txt
index 176431ba0fb..7c666275481 100644
--- a/reactos/dll/win32/uxtheme/CMakeLists.txt
+++ b/reactos/dll/win32/uxtheme/CMakeLists.txt
@@ -16,14 +16,17 @@ list(APPEND SOURCE
     system.c
     themehooks.c
     uxini.c
+    uxthemep.h
+    ${CMAKE_CURRENT_BINARY_DIR}/uxtheme_stubs.c)
+
+add_library(uxtheme SHARED
+    ${SOURCE}
     version.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/uxtheme_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/uxtheme.def)
 
-add_library(uxtheme SHARED ${SOURCE})
 set_module_type(uxtheme win32dll)
 target_link_libraries(uxtheme wine)
 add_delay_importlibs(uxtheme msimg32)
 add_importlibs(uxtheme user32 advapi32 gdi32 msvcrt kernel32 ntdll)
-add_pch(uxtheme uxthemep.h)
+add_pch(uxtheme uxthemep.h SOURCE)
 add_cd_file(TARGET uxtheme DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/vbscript/CMakeLists.txt b/reactos/dll/win32/vbscript/CMakeLists.txt
index 1a9fa7c3ac3..83d355760fc 100644
--- a/reactos/dll/win32/vbscript/CMakeLists.txt
+++ b/reactos/dll/win32/vbscript/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
     vbregexp.c
     vbscript.c
     vbscript_main.c
-    ${CMAKE_CURRENT_BINARY_DIR}/vbscript.def)
+    vbscript.h)
 
 list(APPEND vbscript_rc_deps
     ${CMAKE_CURRENT_SOURCE_DIR}/vbscript_classes.rgs
@@ -29,9 +29,15 @@ list(APPEND vbscript_rc_deps
 set_source_files_properties(vbscript.rc PROPERTIES OBJECT_DEPENDS "${vbscript_rc_deps}")
 add_idl_headers(vbscript_idlheader vbscript_classes.idl vbsglobal.idl vbsregexp55.idl)
 add_typelib(vbsglobal.idl vbsregexp10.idl vbsregexp55.idl)
-add_library(vbscript SHARED ${SOURCE} vbscript.rc)
+
+add_library(vbscript SHARED
+    ${SOURCE}
+    vbscript.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/vbscript.def)
+
 set_module_type(vbscript win32dll)
 target_link_libraries(vbscript uuid wine)
 add_importlibs(vbscript oleaut32 ole32 user32 msvcrt kernel32 ntdll)
 add_dependencies(vbscript vbscript_idlheader stdole2)
+add_pch(vbscript vbscript.h SOURCE)
 add_cd_file(TARGET vbscript DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/wbemdisp/CMakeLists.txt b/reactos/dll/win32/wbemdisp/CMakeLists.txt
index c1ea827cc45..c750c91329c 100644
--- a/reactos/dll/win32/wbemdisp/CMakeLists.txt
+++ b/reactos/dll/win32/wbemdisp/CMakeLists.txt
@@ -6,8 +6,7 @@ spec2def(wbemdisp.dll wbemdisp.spec)
 list(APPEND SOURCE
     locator.c
     main.c
-    guid.c
-    ${CMAKE_CURRENT_BINARY_DIR}/wbemdisp.def)
+    wbemdisp_private.h)
 
 add_idl_headers(wbemdisp_idlheader wbemdisp_classes.idl)
 add_typelib(wbemdisp_tlb.idl)
@@ -19,9 +18,15 @@ list(APPEND wbemdisp_rc_deps
 
 set_source_files_properties(wbemdisp.rc PROPERTIES OBJECT_DEPENDS "${wbemdisp_rc_deps}")
 
-add_library(wbemdisp SHARED ${SOURCE} wbemdisp.rc)
+add_library(wbemdisp SHARED
+    ${SOURCE}
+    guid.c
+    wbemdisp.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/wbemdisp.def)
+
 set_module_type(wbemdisp win32dll)
 target_link_libraries(wbemdisp uuid wine)
 add_dependencies(wbemdisp wbemdisp_idlheader)
 add_importlibs(wbemdisp oleaut32 msvcrt kernel32 ntdll)
+add_pch(wbemdisp wbemdisp_private.h SOURCE)
 add_cd_file(TARGET wbemdisp DESTINATION reactos/system32/wbem FOR all)
diff --git a/reactos/dll/win32/wbemprox/CMakeLists.txt b/reactos/dll/win32/wbemprox/CMakeLists.txt
index a9ec2bb8515..ede7f423349 100644
--- a/reactos/dll/win32/wbemprox/CMakeLists.txt
+++ b/reactos/dll/win32/wbemprox/CMakeLists.txt
@@ -19,13 +19,18 @@ list(APPEND SOURCE
     table.c
     wbemlocator.c
     wql.tab.c
+    wbemprox_private.h)
+
+add_library(wbemprox SHARED
+    ${SOURCE}
     guid.c
+    wbemprox.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wbemprox.def)
 
-add_library(wbemprox SHARED ${SOURCE} wbemprox.rc)
 set_source_files_properties(wbemprox.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/wbemprox.rgs)
 set_module_type(wbemprox win32dll)
 target_link_libraries(wbemprox uuid wine)
 add_importlibs(wbemprox iphlpapi dxgi oleaut32 advapi32 user32 gdi32 version msvcrt kernel32 ntdll)
 add_dependencies(wbemprox d3d_idl_headers)
+add_pch(wbemprox wbemprox_private.h SOURCE)
 add_cd_file(TARGET wbemprox DESTINATION reactos/system32/wbem FOR all)
diff --git a/reactos/dll/win32/wdmaud.drv/CMakeLists.txt b/reactos/dll/win32/wdmaud.drv/CMakeLists.txt
index 03189df359a..38bd5e059c2 100644
--- a/reactos/dll/win32/wdmaud.drv/CMakeLists.txt
+++ b/reactos/dll/win32/wdmaud.drv/CMakeLists.txt
@@ -14,11 +14,13 @@ list(APPEND SOURCE
     mixer.c
     mmixer.c
     legacy.c
+    wdmaud.h)
+
+add_library(wdmaud.drv SHARED
+    ${SOURCE}
     wdmaud.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.def)
 
-add_library(wdmaud.drv SHARED ${SOURCE})
-
 set_module_type(wdmaud.drv win32dll UNICODE)
 
 set_target_properties(wdmaud.drv PROPERTIES SUFFIX "")
@@ -29,5 +31,5 @@ target_link_libraries(wdmaud.drv
     mmixer)
 
 add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll)
-add_pch(wdmaud.drv wdmaud.h)
+add_pch(wdmaud.drv wdmaud.h SOURCE)
 add_cd_file(TARGET wdmaud.drv DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/windowscodecs/CMakeLists.txt b/reactos/dll/win32/windowscodecs/CMakeLists.txt
index 8f69c0f0bb1..bb583b87d3b 100644
--- a/reactos/dll/win32/windowscodecs/CMakeLists.txt
+++ b/reactos/dll/win32/windowscodecs/CMakeLists.txt
@@ -51,14 +51,19 @@ list(APPEND SOURCE
     tgaformat.c
     tiffformat.c
     ungif.c
+    wincodecs_private.h)
+
+add_library(windowscodecs SHARED
+    ${SOURCE}
     guid.c
+    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
     ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def
     ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs_wincodec_p.c)
 
-add_library(windowscodecs SHARED ${SOURCE} version.rc)
 set_module_type(windowscodecs win32dll)
 target_link_libraries(windowscodecs wine uuid ${PSEH_LIB})
 add_importlibs(windowscodecs ole32 oleaut32 rpcrt4 shlwapi user32 gdi32 advapi32 msvcrt kernel32 ntdll)
+add_pch(windowscodecs wincodecs_private.h SOURCE)
 add_cd_file(TARGET windowscodecs DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/winhttp/CMakeLists.txt b/reactos/dll/win32/winhttp/CMakeLists.txt
index 224d54e2b8d..a03e0fb9cc2 100644
--- a/reactos/dll/win32/winhttp/CMakeLists.txt
+++ b/reactos/dll/win32/winhttp/CMakeLists.txt
@@ -2,6 +2,7 @@
 add_definitions(
     -D__WINESRC__
     -D_WINE)
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 spec2def(winhttp.dll winhttp.spec ADD_IMPORTLIB)
 
@@ -13,14 +14,20 @@ list(APPEND SOURCE
     request.c
     session.c
     url.c
-    ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def)
+    winhttp_private.h)
 
 set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/winhttp_tlb.tlb)
 add_typelib(winhttp_tlb.idl)
-add_library(winhttp SHARED ${SOURCE} rsrc.rc)
+
+add_library(winhttp SHARED
+    ${SOURCE}
+    rsrc.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def)
+
 set_module_type(winhttp win32dll)
 target_link_libraries(winhttp uuid wine)
 add_delay_importlibs(winhttp oleaut32 ole32 crypt32 secur32)
 add_importlibs(winhttp user32 advapi32 ws2_32 msvcrt kernel32 ntdll)
 add_dependencies(winhttp stdole2) # wininet_tlb.tlb needs stdole2.tlb
+add_pch(winhttp winhttp_private.h SOURCE)
 add_cd_file(TARGET winhttp DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/wininet/CMakeLists.txt b/reactos/dll/win32/wininet/CMakeLists.txt
index f7e449c3e02..dfdc55f481c 100644
--- a/reactos/dll/win32/wininet/CMakeLists.txt
+++ b/reactos/dll/win32/wininet/CMakeLists.txt
@@ -20,12 +20,17 @@ list(APPEND SOURCE
     urlcache.c
     utility.c
     wininet_main.c
+    internet.h)
+
+add_library(wininet SHARED
+    ${SOURCE}
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wininet_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/wininet.def)
 
-add_library(wininet SHARED ${SOURCE} rsrc.rc)
 set_module_type(wininet win32dll)
 target_link_libraries(wininet wine ${PSEH_LIB} zlib)
 add_delay_importlibs(wininet secur32 crypt32 cryptui)
 add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 ws2_32 msvcrt kernel32 ntdll)
+add_pch(wininet internet.h SOURCE)
 add_cd_file(TARGET wininet DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/winmm/CMakeLists.txt b/reactos/dll/win32/winmm/CMakeLists.txt
index 78cd2d589f4..2394e2c9eac 100644
--- a/reactos/dll/win32/winmm/CMakeLists.txt
+++ b/reactos/dll/win32/winmm/CMakeLists.txt
@@ -14,15 +14,17 @@ list(APPEND SOURCE
     registry.c
     time.c
     winmm.c
-    ${CMAKE_CURRENT_BINARY_DIR}/winmm_stubs.c
-    ${CMAKE_CURRENT_BINARY_DIR}/winmm.def)
+    winemm.h
+    ${CMAKE_CURRENT_BINARY_DIR}/winmm_stubs.c)
 
 add_library(winmm SHARED
     ${SOURCE}
-    winmm_res.rc)
+    winmm_res.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/winmm.def)
 
 set_module_type(winmm win32dll)
 target_link_libraries(winmm wine ${PSEH_LIB})
 add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll)
+add_pch(winmm winemm.h SOURCE)
 add_subdirectory(midimap)
 add_cd_file(TARGET winmm DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/winspool/CMakeLists.txt b/reactos/dll/win32/winspool/CMakeLists.txt
index 2f7d2ac0873..c63d8bb3565 100644
--- a/reactos/dll/win32/winspool/CMakeLists.txt
+++ b/reactos/dll/win32/winspool/CMakeLists.txt
@@ -5,13 +5,17 @@ spec2def(winspool.drv winspool.spec ADD_IMPORTLIB)
 list(APPEND SOURCE
     info.c
     stubs.c
+    precomp.h)
+
+add_library(winspool.drv SHARED
+    ${SOURCE}
     winspool.rc
     ${CMAKE_CURRENT_BINARY_DIR}/winspool_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/winspool.def)
 
-add_library(winspool.drv SHARED ${SOURCE})
 set_target_properties(winspool.drv PROPERTIES SUFFIX "")
 set_module_type(winspool.drv win32dll UNICODE)
 target_link_libraries(winspool.drv wine)
 add_importlibs(winspool.drv advapi32 shlwapi msvcrt kernel32 ntdll)
+add_pch(winspool.drv precomp.h SOURCE)
 add_cd_file(TARGET winspool.drv DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/winsta/CMakeLists.txt b/reactos/dll/win32/winsta/CMakeLists.txt
index 1b6ecef8477..18d65dc3b7b 100644
--- a/reactos/dll/win32/winsta/CMakeLists.txt
+++ b/reactos/dll/win32/winsta/CMakeLists.txt
@@ -9,13 +9,15 @@ list(APPEND SOURCE
     security.c
     server.c
     ws.c
+    winsta.h)
+
+add_library(winsta SHARED
+    ${SOURCE}
     winsta.rc
     ${CMAKE_CURRENT_BINARY_DIR}/winsta.def)
 
-add_library(winsta SHARED ${SOURCE})
-    
 set_module_type(winsta win32dll)
 target_link_libraries(winsta wine)
 add_importlibs(winsta msvcrt kernel32 ntdll)
-add_pch(winsta winsta.h)
+add_pch(winsta winsta.h SOURCE)
 add_cd_file(TARGET winsta DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/wintrust/CMakeLists.txt b/reactos/dll/win32/wintrust/CMakeLists.txt
index 08dd731f0dd..edd0426926b 100644
--- a/reactos/dll/win32/wintrust/CMakeLists.txt
+++ b/reactos/dll/win32/wintrust/CMakeLists.txt
@@ -9,14 +9,19 @@ list(APPEND SOURCE
     register.c
     softpub.c
     wintrust_main.c
-    ${CMAKE_CURRENT_BINARY_DIR}/wintrust_stubs.c
+    wintrust_priv.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wintrust_stubs.c)
+
+add_library(wintrust SHARED
+    ${SOURCE}
+    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wintrust.def)
 
-add_library(wintrust SHARED ${SOURCE} version.rc)
 set_module_type(wintrust win32dll)
 target_link_libraries(wintrust wine ${PSEH_LIB})
 # FIXME: imagehlp should be delay-imported. See CORE-6504
 #add_delay_importlibs(wintrust cryptui imagehlp)
 add_delay_importlibs(wintrust cryptui)
 add_importlibs(wintrust imagehlp crypt32 user32 advapi32 msvcrt kernel32 ntdll)
+add_pch(wintrust wintrust_priv.h SOURCE)
 add_cd_file(TARGET wintrust DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/wldap32/CMakeLists.txt b/reactos/dll/win32/wldap32/CMakeLists.txt
index 6f987c2b0a3..6ef3ca931ac 100644
--- a/reactos/dll/win32/wldap32/CMakeLists.txt
+++ b/reactos/dll/win32/wldap32/CMakeLists.txt
@@ -5,7 +5,6 @@ spec2def(wldap32.dll wldap32.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
     add.c
-    ber.c
     bind.c
     compare.c
     control.c
@@ -24,11 +23,17 @@ list(APPEND SOURCE
     rename.c
     search.c
     value.c
-    ${CMAKE_CURRENT_BINARY_DIR}/wldap32_stubs.c
+    winldap_private.h
+    ${CMAKE_CURRENT_BINARY_DIR}/wldap32_stubs.c)
+
+add_library(wldap32 SHARED
+    ${SOURCE}
+    ber.c
+    wldap32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wldap32.def)
 
-add_library(wldap32 SHARED ${SOURCE} wldap32.rc)
 set_module_type(wldap32 win32dll)
 target_link_libraries(wldap32 wine)
 add_importlibs(wldap32 user32 msvcrt kernel32 ntdll)
+add_pch(wldap32 winldap_private.h SOURCE)
 add_cd_file(TARGET wldap32 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/ws2_32/CMakeLists.txt b/reactos/dll/win32/ws2_32/CMakeLists.txt
index 348973f3b62..0cded311199 100644
--- a/reactos/dll/win32/ws2_32/CMakeLists.txt
+++ b/reactos/dll/win32/ws2_32/CMakeLists.txt
@@ -17,15 +17,18 @@ list(APPEND SOURCE
     misc/sndrcv.c
     misc/stubs.c
     misc/upcall.c
+    include/ws2_32.h)
+
+add_library(ws2_32 SHARED
+    ${SOURCE}
     misc/async.c
     ws2_32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def)
 
-add_library(ws2_32 SHARED ${SOURCE})
 set_module_type(ws2_32 win32dll UNICODE)
 target_link_libraries(ws2_32 wine)
 add_delay_importlibs(ws2_32 user32)
 add_importlibs(ws2_32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll)
-add_pch(ws2_32 include/ws2_32.h)
+add_pch(ws2_32 include/ws2_32.h SOURCE)
 add_cd_file(TARGET ws2_32 DESTINATION reactos/system32 FOR all)
 
diff --git a/reactos/dll/win32/ws2_32_new/CMakeLists.txt b/reactos/dll/win32/ws2_32_new/CMakeLists.txt
index 3689850e758..250439a108b 100644
--- a/reactos/dll/win32/ws2_32_new/CMakeLists.txt
+++ b/reactos/dll/win32/ws2_32_new/CMakeLists.txt
@@ -44,12 +44,15 @@ list(APPEND SOURCE
     src/sputil.c
     src/startup.c
     src/wsautil.c
+    inc/ws2_32.h)
+
+add_library(ws2_32_new SHARED
+    ${SOURCE}
     ws2_32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/ws2_32_new.def)
 
-add_library(ws2_32_new SHARED ${SOURCE})
 set_module_type(ws2_32_new win32dll)
 add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll)
-add_pch(ws2_32_new inc/ws2_32.h)
+add_pch(ws2_32_new inc/ws2_32.h SOURCE)
 target_link_libraries(ws2_32_new wine)
 add_cd_file(TARGET ws2_32_new DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/ws2help/CMakeLists.txt b/reactos/dll/win32/ws2help/CMakeLists.txt
index 7aaf6508623..277270a2349 100644
--- a/reactos/dll/win32/ws2help/CMakeLists.txt
+++ b/reactos/dll/win32/ws2help/CMakeLists.txt
@@ -9,11 +9,13 @@ list(APPEND SOURCE
     dllmain.c
     handle.c
     notify.c
+    precomp.h)
+
+add_library(ws2help SHARED
+    ${SOURCE}
     ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def)
 
-add_library(ws2help SHARED ${SOURCE})
 set_module_type(ws2help win32dll)
 add_importlibs(ws2help advapi32 ws2_32 msvcrt kernel32 ntdll)
-add_pch(ws2help precomp.h)
+add_pch(ws2help precomp.h SOURCE)
 add_cd_file(TARGET ws2help DESTINATION reactos/system32 FOR all)
-
diff --git a/reactos/dll/win32/wuapi/CMakeLists.txt b/reactos/dll/win32/wuapi/CMakeLists.txt
index 7e1b29df9d2..bef091a5e5f 100644
--- a/reactos/dll/win32/wuapi/CMakeLists.txt
+++ b/reactos/dll/win32/wuapi/CMakeLists.txt
@@ -14,13 +14,19 @@ list(APPEND SOURCE
     session.c
     systeminfo.c
     updates.c
-    ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def)
+    wuapi_private.h)
 
 add_typelib(wuapi_tlb.idl)
 set_source_files_properties(wuapi.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/wuapi_tlb.tlb)
-add_library(wuapi SHARED ${SOURCE} wuapi.rc)
+
+add_library(wuapi SHARED
+    ${SOURCE}
+    wuapi.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def)
+
 set_module_type(wuapi win32dll)
 target_link_libraries(wuapi uuid wine wuguid)
 add_importlibs(wuapi msvcrt kernel32 ntdll)
 add_dependencies(wuapi stdole2) # wuapi_tlb.tlb needs stdole2.tlb
+add_pch(wuapi wuapi_private.h SOURCE)
 add_cd_file(TARGET wuapi DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/xmllite/CMakeLists.txt b/reactos/dll/win32/xmllite/CMakeLists.txt
index 4694dce61ab..5c208736af4 100644
--- a/reactos/dll/win32/xmllite/CMakeLists.txt
+++ b/reactos/dll/win32/xmllite/CMakeLists.txt
@@ -7,12 +7,16 @@ list(APPEND SOURCE
     reader.c
     writer.c
     xmllite_main.c
+    xmllite_private.h
+    ${CMAKE_CURRENT_BINARY_DIR}/xmllite_stubs.c)
+
+add_library(xmllite SHARED
+    ${SOURCE}
     guid.c
-    ${CMAKE_CURRENT_BINARY_DIR}/xmllite_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/xmllite.def)
 
-add_library(xmllite SHARED ${SOURCE})
 set_module_type(xmllite win32dll)
 target_link_libraries(xmllite uuid wine)
 add_importlibs(xmllite msvcrt kernel32 ntdll)
+add_pch(xmllite xmllite_private.h SOURCE)
 add_cd_file(TARGET xmllite DESTINATION reactos/system32 FOR all)