diff --git a/dll/win32/activeds/CMakeLists.txt b/dll/win32/activeds/CMakeLists.txt
index b72c4c31f71..07f7520eae1 100644
--- a/dll/win32/activeds/CMakeLists.txt
+++ b/dll/win32/activeds/CMakeLists.txt
@@ -5,7 +5,11 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(activeds.dll activeds.spec)
 
-add_library(activeds SHARED activeds_main.c ${CMAKE_CURRENT_BINARY_DIR}/activeds.def)
+list(APPEND SOURCE
+    activeds_main.c
+    ${CMAKE_CURRENT_BINARY_DIR}/activeds.def)
+
+add_library(activeds SHARED ${SOURCE})
 
 set_module_type(activeds win32dll)
 
diff --git a/dll/win32/bcrypt/CMakeLists.txt b/dll/win32/bcrypt/CMakeLists.txt
index fe8f4b4b518..c6e8501f387 100644
--- a/dll/win32/bcrypt/CMakeLists.txt
+++ b/dll/win32/bcrypt/CMakeLists.txt
@@ -2,18 +2,19 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(bcrypt.dll bcrypt.spec)
 
-add_library(bcrypt SHARED
+list(APPEND SOURCE
     bcrypt_main.c
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/bcrypt.def)
 
+add_library(bcrypt SHARED ${SOURCE})
 set_module_type(bcrypt win32dll)
 
 target_link_libraries(bcrypt wine)
 
 add_importlibs(bcrypt msvcrt kernel32 ntdll)
 
-
 add_cab_target(bcrypt 1)
diff --git a/dll/win32/browseui/CMakeLists.txt b/dll/win32/browseui/CMakeLists.txt
index 2aaea9138c3..1e19d5b9530 100644
--- a/dll/win32/browseui/CMakeLists.txt
+++ b/dll/win32/browseui/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 set_unicode()
 set_cpp()
 
@@ -13,9 +12,10 @@ include_directories(
     ${REACTOS_SOURCE_DIR}/include/reactos/wine
     ${REACTOS_SOURCE_DIR}/lib/atl)
 
+set_rc_compiler()
 spec2def(browseui.dll browseui.spec)
 
-add_library(browseui SHARED
+list(APPEND SOURCE
     aclmulti.cpp
     addressband.cpp
     addresseditbox.cpp
@@ -38,6 +38,7 @@ add_library(browseui SHARED
     browseui.rc
     ${CMAKE_CURRENT_BINARY_DIR}/browseui.def)
 
+add_library(browseui SHARED ${SOURCE})
 set_module_type(browseui win32dll)
 
 target_link_libraries(browseui
diff --git a/dll/win32/cfgmgr32/CMakeLists.txt b/dll/win32/cfgmgr32/CMakeLists.txt
index df7a9270824..7b445d4aa0d 100644
--- a/dll/win32/cfgmgr32/CMakeLists.txt
+++ b/dll/win32/cfgmgr32/CMakeLists.txt
@@ -1,9 +1,12 @@
 
 spec2def(cfgmgr32.dll cfgmgr32.spec)
 
-add_library(cfgmgr32 SHARED cfgmgr32.rc ${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32.def)
+list(APPEND SOURCE 
+    cfgmgr32.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32.def)
+add_library(cfgmgr32 SHARED ${SOURCE})
 
 set_entrypoint(cfgmgr32 0)
-
+add_importlibs(cfgmgr32 kernel32 ntdll)
 add_dependencies(cfgmgr32 psdk buildno_header)
 add_cab_target(cfgmgr32 1)
diff --git a/dll/win32/clusapi/CMakeLists.txt b/dll/win32/clusapi/CMakeLists.txt
index 880c1e7cc27..40597b7faaf 100644
--- a/dll/win32/clusapi/CMakeLists.txt
+++ b/dll/win32/clusapi/CMakeLists.txt
@@ -3,9 +3,14 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(clusapi.dll clusapi.spec)
 
-add_library(clusapi SHARED clusapi.c ${CMAKE_CURRENT_BINARY_DIR}/clusapi.def)
+list(APPEND SOURCE
+    clusapi.c
+    ${CMAKE_CURRENT_BINARY_DIR}/clusapi.def)
+
+add_library(clusapi SHARED ${SOURCE})
 
 set_module_type(clusapi win32dll)
 
diff --git a/dll/win32/comdlg32/CMakeLists.txt b/dll/win32/comdlg32/CMakeLists.txt
index 249347e65a9..a614093b43c 100644
--- a/dll/win32/comdlg32/CMakeLists.txt
+++ b/dll/win32/comdlg32/CMakeLists.txt
@@ -4,9 +4,10 @@ add_definitions(-D_WINE)
 add_definitions(-D_DLL -D__USE_CRTIMP)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(comdlg32.dll comdlg32.spec)
 
-add_library(comdlg32 SHARED
+list(APPEND SOURCE
     cdlg32.c
     colordlg.c
     filedlg.c
@@ -18,6 +19,8 @@ add_library(comdlg32 SHARED
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/comdlg32.def)
 
+add_library(comdlg32 SHARED ${SOURCE})
+
 set_module_type(comdlg32 win32dll)
 
 target_link_libraries(comdlg32
diff --git a/dll/win32/credui/CMakeLists.txt b/dll/win32/credui/CMakeLists.txt
index e69e1afe547..9117a16724a 100644
--- a/dll/win32/credui/CMakeLists.txt
+++ b/dll/win32/credui/CMakeLists.txt
@@ -3,9 +3,15 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(credui.dll credui.spec)
 
-add_library(credui SHARED credui_main.c credui.rc ${CMAKE_CURRENT_BINARY_DIR}/credui.def)
+list(APPEND SOURCE
+    credui_main.c
+    credui.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/credui.def)
+
+add_library(credui SHARED ${SOURCE})
 
 set_module_type(credui win32dll)
 
diff --git a/dll/win32/crypt32/CMakeLists.txt b/dll/win32/crypt32/CMakeLists.txt
index 225c7865622..93f78b61f10 100644
--- a/dll/win32/crypt32/CMakeLists.txt
+++ b/dll/win32/crypt32/CMakeLists.txt
@@ -10,9 +10,10 @@ add_definitions(-D_WIN32_WINNT=0x600)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(crypt32.dll crypt32.spec)
 
-add_library(crypt32 SHARED
+list(APPEND SOURCE
     base64.c
     cert.c
     chain.c
@@ -41,6 +42,8 @@ add_library(crypt32 SHARED
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/crypt32.def)
 
+add_library(crypt32 SHARED ${SOURCE})
+
 set_module_type(crypt32 win32dll)
 
 target_link_libraries(crypt32
diff --git a/dll/win32/cryptdlg/CMakeLists.txt b/dll/win32/cryptdlg/CMakeLists.txt
index 83e4f0115ab..18911636178 100644
--- a/dll/win32/cryptdlg/CMakeLists.txt
+++ b/dll/win32/cryptdlg/CMakeLists.txt
@@ -2,9 +2,15 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(cryptdlg.dll cryptdlg.spec)
 
-add_library(cryptdlg SHARED main.c cryptdlg.rc ${CMAKE_CURRENT_BINARY_DIR}/cryptdlg.def)
+list(APPEND SOURCE
+    main.c
+    cryptdlg.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/cryptdlg.def)
+
+add_library(cryptdlg SHARED ${SOURCE})
 
 set_module_type(cryptdlg win32dll)
 
diff --git a/dll/win32/cryptnet/CMakeLists.txt b/dll/win32/cryptnet/CMakeLists.txt
index c71b4f01351..f3ad22e37c4 100644
--- a/dll/win32/cryptnet/CMakeLists.txt
+++ b/dll/win32/cryptnet/CMakeLists.txt
@@ -4,7 +4,11 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(cryptnet.dll cryptnet.spec)
 
-add_library(cryptnet SHARED cryptnet_main.c ${CMAKE_CURRENT_BINARY_DIR}/cryptnet.def)
+list(APPEND SOURCE
+    cryptnet_main.c
+    ${CMAKE_CURRENT_BINARY_DIR}/cryptnet.def)
+
+add_library(cryptnet SHARED ${SOURCE})
 
 set_module_type(cryptnet win32dll)
 
diff --git a/dll/win32/cryptui/CMakeLists.txt b/dll/win32/cryptui/CMakeLists.txt
index 9f5f84eb07a..0b82ed87782 100644
--- a/dll/win32/cryptui/CMakeLists.txt
+++ b/dll/win32/cryptui/CMakeLists.txt
@@ -3,9 +3,15 @@ add_definitions(-D__WINESRC__)
 add_definitions(-D_WINE)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(cryptui.dll cryptui.spec)
 
-add_library(cryptui SHARED main.c cryptui.rc ${CMAKE_CURRENT_BINARY_DIR}/cryptui.def)
+list(APPEND SOURCE
+    main.c
+    cryptui.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/cryptui.def)
+
+add_library(cryptui SHARED ${SOURCE})
 
 set_module_type(cryptui win32dll)
 
diff --git a/dll/win32/dciman32/CMakeLists.txt b/dll/win32/dciman32/CMakeLists.txt
index 156a79a7052..53fa92786b0 100644
--- a/dll/win32/dciman32/CMakeLists.txt
+++ b/dll/win32/dciman32/CMakeLists.txt
@@ -3,9 +3,14 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(dciman32.dll dciman32.spec)
 
-add_library(dciman32 SHARED dciman_main.c ${CMAKE_CURRENT_BINARY_DIR}/dciman32.def)
+list(APPEND SOURCE
+    dciman_main.c
+    ${CMAKE_CURRENT_BINARY_DIR}/dciman32.def)
+
+add_library(dciman32 SHARED ${SOURCE})
 
 set_module_type(dciman32 win32dll)
 
diff --git a/dll/win32/faultrep/CMakeLists.txt b/dll/win32/faultrep/CMakeLists.txt
index e70b61068a1..456684f84ff 100644
--- a/dll/win32/faultrep/CMakeLists.txt
+++ b/dll/win32/faultrep/CMakeLists.txt
@@ -3,9 +3,14 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(faultrep.dll faultrep.spec)
 
-add_library(faultrep SHARED faultrep.c ${CMAKE_CURRENT_BINARY_DIR}/faultrep.def)
+list(APPEND SOURCE
+    faultrep.c
+    ${CMAKE_CURRENT_BINARY_DIR}/faultrep.def)
+    
+add_library(faultrep SHARED ${SOURCE})
 
 set_module_type(faultrep win32dll)
 
diff --git a/dll/win32/fusion/CMakeLists.txt b/dll/win32/fusion/CMakeLists.txt
index af9af89f293..914e4b40a4b 100644
--- a/dll/win32/fusion/CMakeLists.txt
+++ b/dll/win32/fusion/CMakeLists.txt
@@ -3,9 +3,10 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(fusion.dll fusion.spec)
 
-add_library(fusion SHARED
+list(APPEND SOURCE
     asmcache.c
     asmenum.c
     asmname.c
@@ -14,6 +15,8 @@ add_library(fusion SHARED
     fusion_main.c
     ${CMAKE_CURRENT_BINARY_DIR}/fusion.def)
 
+add_library(fusion SHARED ${SOURCE})
+
 set_module_type(fusion win32dll)
 
 target_link_libraries(fusion wine)
diff --git a/dll/win32/gdiplus/CMakeLists.txt b/dll/win32/gdiplus/CMakeLists.txt
index 416dd0cfc5d..ec6e9f953d6 100644
--- a/dll/win32/gdiplus/CMakeLists.txt
+++ b/dll/win32/gdiplus/CMakeLists.txt
@@ -3,9 +3,10 @@ add_definitions(-D__WINESRC__)
 add_definitions(-D_DLL -D__USE_CRTIMP)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(gdiplus.dll gdiplus.spec)
 
-add_library(gdiplus SHARED
+list(APPEND SOURCE
     brush.c
     customlinecap.c
     font.c
@@ -21,6 +22,8 @@ add_library(gdiplus SHARED
     stringformat.c
     ${CMAKE_CURRENT_BINARY_DIR}/gdiplus.def)
 
+add_library(gdiplus SHARED ${SOURCE})
+
 set_module_type(gdiplus win32dll)
 
 target_link_libraries(gdiplus
diff --git a/dll/win32/hlink/CMakeLists.txt b/dll/win32/hlink/CMakeLists.txt
index 060a428235e..00cc9e31759 100644
--- a/dll/win32/hlink/CMakeLists.txt
+++ b/dll/win32/hlink/CMakeLists.txt
@@ -4,13 +4,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(hlink.dll hlink.spec)
 
-add_library(hlink SHARED
+list(APPEND SOURCE
     browse_ctx.c
     extserv.c
     hlink_main.c
     link.c
     ${CMAKE_CURRENT_BINARY_DIR}/hlink.def)
 
+add_library(hlink SHARED ${SOURCE})
+
 set_module_type(hlink win32dll)
 
 target_link_libraries(hlink
diff --git a/dll/win32/httpapi/CMakeLists.txt b/dll/win32/httpapi/CMakeLists.txt
index ae932c016f2..ff7a68991cb 100644
--- a/dll/win32/httpapi/CMakeLists.txt
+++ b/dll/win32/httpapi/CMakeLists.txt
@@ -5,7 +5,11 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(httpapi.dll httpapi.spec)
 
-add_library(httpapi SHARED httpapi_main.c ${CMAKE_CURRENT_BINARY_DIR}/httpapi.def)
+list(APPEND SOURCE
+    httpapi_main.c
+    ${CMAKE_CURRENT_BINARY_DIR}/httpapi.def)
+
+add_library(httpapi SHARED ${SOURCE})
 
 set_module_type(httpapi win32dll)
 
diff --git a/dll/win32/icmp/CMakeLists.txt b/dll/win32/icmp/CMakeLists.txt
index c0133a22bb4..1ab64e7fd0a 100644
--- a/dll/win32/icmp/CMakeLists.txt
+++ b/dll/win32/icmp/CMakeLists.txt
@@ -1,9 +1,15 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(icmp.dll icmp.spec)
 
-add_library(icmp SHARED icmp_main.c icmp.rc ${CMAKE_CURRENT_BINARY_DIR}/icmp.def)
+list(APPEND SOURCE
+    icmp_main.c
+    icmp.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/icmp.def)
+
+add_library(icmp SHARED ${SOURCE})
 
 set_module_type(icmp win32dll)
 
diff --git a/dll/win32/imm32/CMakeLists.txt b/dll/win32/imm32/CMakeLists.txt
index 1bee229ba4f..be8c957427f 100644
--- a/dll/win32/imm32/CMakeLists.txt
+++ b/dll/win32/imm32/CMakeLists.txt
@@ -6,9 +6,15 @@ add_definitions(-D_WIN32_WINNT=0x600)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(imm32.dll imm32.spec)
 
-add_library(imm32 SHARED imm.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/imm32.def)
+list(APPEND SOURCE
+    imm.c
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/imm32.def)
+
+add_library(imm32 SHARED ${SOURCE})
 
 set_module_type(imm32 win32dll)
 
diff --git a/dll/win32/inetcomm/CMakeLists.txt b/dll/win32/inetcomm/CMakeLists.txt
index 34a573e3dff..e914418940c 100644
--- a/dll/win32/inetcomm/CMakeLists.txt
+++ b/dll/win32/inetcomm/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(inetcomm.dll inetcomm.spec)
 
-add_library(inetcomm SHARED
+list(APPEND SOURCE
     imaptransport.c
     inetcomm_main.c
     internettransport.c
@@ -17,6 +17,8 @@ add_library(inetcomm SHARED
     smtptransport.c
     ${CMAKE_CURRENT_BINARY_DIR}/inetcomm.def)
 
+add_library(inetcomm SHARED ${SOURCE})
+
 set_module_type(inetcomm win32dll)
 
 target_link_libraries(inetcomm
@@ -33,5 +35,4 @@ add_importlibs(inetcomm
     kernel32
     ntdll)
 
-
 add_cab_target(inetcomm 1)
diff --git a/dll/win32/inetmib1/CMakeLists.txt b/dll/win32/inetmib1/CMakeLists.txt
index 0c51697428f..602fd27afe6 100644
--- a/dll/win32/inetmib1/CMakeLists.txt
+++ b/dll/win32/inetmib1/CMakeLists.txt
@@ -5,7 +5,11 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(inetmib1.dll inetmib1.spec)
 
-add_library(inetmib1 SHARED main.c ${CMAKE_CURRENT_BINARY_DIR}/inetmib1.def)
+list(APPEND SOURCE
+    main.c 
+    ${CMAKE_CURRENT_BINARY_DIR}/inetmib1.def)
+
+add_library(inetmib1 SHARED ${SOURCE})
 
 set_module_type(inetmib1 win32dll)
 
@@ -18,5 +22,4 @@ add_importlibs(inetmib1
     kernel32
     ntdll)
 
-
 add_cab_target(inetmib1 1)
diff --git a/dll/win32/initpki/CMakeLists.txt b/dll/win32/initpki/CMakeLists.txt
index 2a67b92c085..4d5e42d6fe7 100644
--- a/dll/win32/initpki/CMakeLists.txt
+++ b/dll/win32/initpki/CMakeLists.txt
@@ -4,7 +4,11 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(initpki.dll initpki.spec)
 
-add_library(initpki SHARED main.c ${CMAKE_CURRENT_BINARY_DIR}/initpki.def)
+list(APPEND SOURCE
+    main.c
+    ${CMAKE_CURRENT_BINARY_DIR}/initpki.def)
+
+add_library(initpki SHARED ${SOURCE})
 
 set_module_type(initpki win32dll)
 
diff --git a/dll/win32/inseng/CMakeLists.txt b/dll/win32/inseng/CMakeLists.txt
index 3d9ad986e6b..9cf108305a7 100644
--- a/dll/win32/inseng/CMakeLists.txt
+++ b/dll/win32/inseng/CMakeLists.txt
@@ -6,7 +6,12 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(inseng.dll inseng.spec)
 
-add_library(inseng SHARED inseng_main.c regsvr.c ${CMAKE_CURRENT_BINARY_DIR}/inseng.def)
+list(APPEND SOURCE
+    inseng_main.c
+    regsvr.c
+    ${CMAKE_CURRENT_BINARY_DIR}/inseng.def)
+
+add_library(inseng SHARED ${SOURCE})
 
 set_module_type(inseng win32dll)
 
diff --git a/dll/win32/itircl/CMakeLists.txt b/dll/win32/itircl/CMakeLists.txt
index 2511d2bd731..8f65fb81571 100644
--- a/dll/win32/itircl/CMakeLists.txt
+++ b/dll/win32/itircl/CMakeLists.txt
@@ -4,7 +4,11 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(itircl.dll itircl.spec)
 
-add_library(itircl SHARED itircl_main.c ${CMAKE_CURRENT_BINARY_DIR}/itircl.def)
+list(APPEND SOURCE
+    itircl_main.c
+    ${CMAKE_CURRENT_BINARY_DIR}/itircl.def)
+
+add_library(itircl SHARED ${SOURCE})
 
 set_module_type(itircl win32dll)
 
diff --git a/dll/win32/itss/CMakeLists.txt b/dll/win32/itss/CMakeLists.txt
index ea68a80efec..43548e56bc8 100644
--- a/dll/win32/itss/CMakeLists.txt
+++ b/dll/win32/itss/CMakeLists.txt
@@ -2,9 +2,10 @@
 add_definitions(-D__WINESRC__ -D_DLL -D__USE_CRTIMP)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(itss.dll itss.spec)
 
-add_library(itss SHARED
+list(APPEND SOURCE
     chm_lib.c
     lzx.c
     itss.c
@@ -14,6 +15,8 @@ add_library(itss SHARED
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/itss.def)
 
+add_library(itss SHARED ${SOURCE})
+
 set_module_type(itss win32dll)
 
 target_link_libraries(itss
diff --git a/dll/win32/localspl/CMakeLists.txt b/dll/win32/localspl/CMakeLists.txt
index 2a883d9400e..f1e5ec47e34 100644
--- a/dll/win32/localspl/CMakeLists.txt
+++ b/dll/win32/localspl/CMakeLists.txt
@@ -4,15 +4,18 @@ remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(localspl.dll localspl.spec)
 
-add_library(localspl SHARED
+list(APPEND SOURCE
     localmon.c
     localspl_main.c
     provider.c
     localspl.rc
     ${CMAKE_CURRENT_BINARY_DIR}/localspl.def)
 
+add_library(localspl SHARED ${SOURCE})
+
 set_module_type(localspl win32dll)
 
 target_link_libraries(localspl
diff --git a/dll/win32/lsasrv/CMakeLists.txt b/dll/win32/lsasrv/CMakeLists.txt
index b4eb7c5c079..3ce484d330d 100644
--- a/dll/win32/lsasrv/CMakeLists.txt
+++ b/dll/win32/lsasrv/CMakeLists.txt
@@ -1,12 +1,12 @@
-
 set_unicode()
 
 include_directories(${REACTOS_BINARY_DIR}/include/reactos/idl)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys/lsass)
 
+set_rc_compiler()
 spec2def(lsasrv.dll lsasrv.spec)
 
-add_library(lsasrv SHARED
+list(APPEND SOURCE
     authport.c
     lsarpc.c
     lsasrv.c
@@ -15,6 +15,8 @@ add_library(lsasrv SHARED
     lsasrv.rc
     ${CMAKE_CURRENT_BINARY_DIR}/lsasrv.def)
 
+add_library(lsasrv SHARED ${SOURCE})
+
 set_entrypoint(lsasrv 0)
 
 target_link_libraries(lsasrv
diff --git a/dll/win32/mapi32/CMakeLists.txt b/dll/win32/mapi32/CMakeLists.txt
index d96f690e272..acada9c7ebf 100644
--- a/dll/win32/mapi32/CMakeLists.txt
+++ b/dll/win32/mapi32/CMakeLists.txt
@@ -1,10 +1,10 @@
-
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(mapi32.dll mapi32.spec)
 
-add_library(mapi32 SHARED
+list(APPEND SOURCE
     imalloc.c
     mapi32_main.c
     prop.c
@@ -13,6 +13,8 @@ add_library(mapi32 SHARED
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mapi32.def)
 
+add_library(mapi32 SHARED ${SOURCE})
+
 set_module_type(mapi32 win32dll)
 
 target_link_libraries(mapi32
diff --git a/dll/win32/mlang/CMakeLists.txt b/dll/win32/mlang/CMakeLists.txt
index 6939e442026..b2ac57a5993 100644
--- a/dll/win32/mlang/CMakeLists.txt
+++ b/dll/win32/mlang/CMakeLists.txt
@@ -6,9 +6,13 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(mlang.dll mlang.spec)
 
-add_library(mlang SHARED mlang.c regsvr.c
+list(APPEND SOURCE
+    mlang.c
+    regsvr.c
     ${CMAKE_CURRENT_BINARY_DIR}/mlang.def)
 
+add_library(mlang SHARED ${SOURCE})
+
 set_entrypoint(mlang 0)
 
 target_link_libraries(mlang
diff --git a/dll/win32/modemui/CMakeLists.txt b/dll/win32/modemui/CMakeLists.txt
index e39a88ad706..1ba002b5261 100644
--- a/dll/win32/modemui/CMakeLists.txt
+++ b/dll/win32/modemui/CMakeLists.txt
@@ -3,10 +3,15 @@ set_unicode()
 
 spec2def(modemui.dll modemui.spec)
 
-add_library(modemui SHARED modemui.c modemui.rc ${CMAKE_CURRENT_BINARY_DIR}/modemui.def)
+list(APPEND SOURCE
+    modemui.c
+    modemui.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/modemui.def)
+
+add_library(modemui SHARED ${SOURCE})
 
 set_module_type(modemui win32dll)
 
-add_importlibs(modemui msvcrt kernel32)
+add_importlibs(modemui msvcrt kernel32 ntdll)
 
 add_cab_target(modemui 1)
diff --git a/dll/win32/mprapi/CMakeLists.txt b/dll/win32/mprapi/CMakeLists.txt
index f54f3c01898..c08eb449ace 100644
--- a/dll/win32/mprapi/CMakeLists.txt
+++ b/dll/win32/mprapi/CMakeLists.txt
@@ -4,7 +4,11 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(mprapi.dll mprapi.spec)
 
-add_library(mprapi SHARED mprapi.c ${CMAKE_CURRENT_BINARY_DIR}/mprapi.def)
+list(APPEND SOURCE
+    mprapi.c
+    ${CMAKE_CURRENT_BINARY_DIR}/mprapi.def)
+
+add_library(mprapi SHARED ${SOURCE})
 
 set_module_type(mprapi win32dll)
 
diff --git a/dll/win32/msacm32/CMakeLists.txt b/dll/win32/msacm32/CMakeLists.txt
index 0e332dba2c1..6a92c28d46a 100644
--- a/dll/win32/msacm32/CMakeLists.txt
+++ b/dll/win32/msacm32/CMakeLists.txt
@@ -4,9 +4,10 @@ set_unicode()
 add_definitions(-D_DLL -D__USE_CRTIMP)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(msacm32.dll msacm32.spec)
 
-add_library(msacm32 SHARED
+list(APPEND SOURCE
     driver.c
     filter.c
     format.c
@@ -16,13 +17,14 @@ add_library(msacm32 SHARED
     stream.c
     ${CMAKE_CURRENT_BINARY_DIR}/msacm32.def)
 
+add_library(msacm32 SHARED ${SOURCE})
+
 set_module_type(msacm32 win32dll)
 
 target_link_libraries(msacm32 wine)
 
 add_importlibs(msacm32 msvcrt advapi32 user32 winmm kernel32 ntdll)
 
-
 add_subdirectory(msacm32.drv)
 add_cab_target(msacm32 1)
 add_importlib_target(msacm32.spec)
diff --git a/dll/win32/mscms/CMakeLists.txt b/dll/win32/mscms/CMakeLists.txt
index dc966110238..ed364ea6cec 100644
--- a/dll/win32/mscms/CMakeLists.txt
+++ b/dll/win32/mscms/CMakeLists.txt
@@ -1,10 +1,10 @@
-
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(mscms.dll mscms.spec)
 
-add_library(mscms SHARED
+list(APPEND SOURCE
     handle.c
     icc.c
     mscms_main.c
@@ -14,6 +14,8 @@ add_library(mscms SHARED
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mscms.def)
 
+add_library(mscms SHARED ${SOURCE})
+
 set_module_type(mscms win32dll)
 
 target_link_libraries(mscms wine)
diff --git a/dll/win32/msctf/CMakeLists.txt b/dll/win32/msctf/CMakeLists.txt
index c8131004867..df203827df5 100644
--- a/dll/win32/msctf/CMakeLists.txt
+++ b/dll/win32/msctf/CMakeLists.txt
@@ -1,13 +1,13 @@
-
 add_definitions(-D__WINESRC__)
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 add_definitions(-D_DLL -D__USE_CRTIMP)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(msctf.dll msctf.spec)
 
-add_library(msctf SHARED
+list(APPEND SOURCE
     categorymgr.c
     compartmentmgr.c
     context.c
@@ -22,6 +22,8 @@ add_library(msctf SHARED
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msctf.def)
 
+add_library(msctf SHARED ${SOURCE})
+
 set_module_type(msctf win32dll)
 
 target_link_libraries(msctf
diff --git a/dll/win32/msftedit/CMakeLists.txt b/dll/win32/msftedit/CMakeLists.txt
index 6929d3f0e48..dab96ca2dd4 100644
--- a/dll/win32/msftedit/CMakeLists.txt
+++ b/dll/win32/msftedit/CMakeLists.txt
@@ -1,14 +1,16 @@
-
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(msftedit.dll msftedit.spec)
 
-add_library(msftedit SHARED
+list(APPEND SOURCE
     msftedit_main.c
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msftedit.def)
 
+add_library(msftedit SHARED ${SOURCE})
+
 set_module_type(msftedit win32dll)
 
 target_link_libraries(msftedit
diff --git a/dll/win32/msgina/CMakeLists.txt b/dll/win32/msgina/CMakeLists.txt
index 45718063aa1..d9ced083dc6 100644
--- a/dll/win32/msgina/CMakeLists.txt
+++ b/dll/win32/msgina/CMakeLists.txt
@@ -1,10 +1,10 @@
-
 include_directories(include)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(msgina.dll msgina.spec)
 
-add_library(msgina SHARED
+list(APPEND SOURCE
     gui.c
     msgina.c
     stubs.c
@@ -12,6 +12,8 @@ add_library(msgina SHARED
     msgina.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msgina.def)
 
+add_library(msgina SHARED ${SOURCE})
+
 set_module_type(msgina win32dll)
 
 target_link_libraries(msgina wine)
diff --git a/dll/win32/mshtml/CMakeLists.txt b/dll/win32/mshtml/CMakeLists.txt
index 279abb281ad..150a37b558b 100644
--- a/dll/win32/mshtml/CMakeLists.txt
+++ b/dll/win32/mshtml/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-ADD_INTERFACE_DEFINITIONS(mshtml_nsiface_header nsiface.idl)
-
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
@@ -11,9 +9,12 @@ add_definitions(
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+ADD_INTERFACE_DEFINITIONS(mshtml_nsiface_header nsiface.idl)
+
+set_rc_compiler()
 spec2def(mshtml.dll mshtml.spec)
 
-add_library(mshtml SHARED
+list(APPEND SOURCE
     conpoint.c
     dispex.c
     editor.c
@@ -78,6 +79,8 @@ add_library(mshtml SHARED
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def)
 
+add_library(mshtml SHARED ${SOURCE})
+
 set_module_type(mshtml win32dll)
 
 target_link_libraries(mshtml
diff --git a/dll/win32/msimtf/CMakeLists.txt b/dll/win32/msimtf/CMakeLists.txt
index d4a5b3a180d..5b161294a8f 100644
--- a/dll/win32/msimtf/CMakeLists.txt
+++ b/dll/win32/msimtf/CMakeLists.txt
@@ -1,15 +1,17 @@
-
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(msimtf.dll msimtf.spec)
 
-add_library(msimtf SHARED
+list(APPEND SOURCE
     activeimmapp.c
     main.c
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/msimtf.def)
 
+add_library(msimtf SHARED ${SOURCE})
+
 set_module_type(msimtf win32dll)
 
 target_link_libraries(msimtf
diff --git a/dll/win32/msisip/CMakeLists.txt b/dll/win32/msisip/CMakeLists.txt
index f61e7ed9b90..b65348edc88 100644
--- a/dll/win32/msisip/CMakeLists.txt
+++ b/dll/win32/msisip/CMakeLists.txt
@@ -4,7 +4,11 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(msisip.dll msisip.spec)
 
-add_library(msisip SHARED main.c ${CMAKE_CURRENT_BINARY_DIR}/msisip.def)
+list(APPEND SOURCE
+    main.c
+    ${CMAKE_CURRENT_BINARY_DIR}/msisip.def)
+
+add_library(msisip SHARED ${SOURCE})
 
 set_module_type(msisip win32dll)
 
diff --git a/dll/win32/msvcrt20/CMakeLists.txt b/dll/win32/msvcrt20/CMakeLists.txt
index f8d0c532d86..517f0e6c042 100644
--- a/dll/win32/msvcrt20/CMakeLists.txt
+++ b/dll/win32/msvcrt20/CMakeLists.txt
@@ -6,9 +6,11 @@ add_definitions(-DCRTDLL)
 
 spec2def(msvcrt20.dll msvcrt20.spec)
 
-add_library(msvcrt20 SHARED msvcrt20.c
+list(APPEND SOURCE
+    msvcrt20.c
     ${CMAKE_CURRENT_BINARY_DIR}/msvcrt20.def)
 
+add_library(msvcrt20 SHARED ${SOURCE})
 set_entrypoint(msvcrt20 0)
 
 target_link_libraries(msvcrt20 wine)
diff --git a/dll/win32/nddeapi/CMakeLists.txt b/dll/win32/nddeapi/CMakeLists.txt
index 2b321fba94d..4c01573b731 100644
--- a/dll/win32/nddeapi/CMakeLists.txt
+++ b/dll/win32/nddeapi/CMakeLists.txt
@@ -4,9 +4,11 @@ add_definitions(-D__WINESRC__)
 
 spec2def(nddeapi.dll nddeapi.spec)
 
-add_library(nddeapi SHARED nddeapi.c
+list(APPEND SOURCE
+    nddeapi.c
     ${CMAKE_CURRENT_BINARY_DIR}/nddeapi.def)
 
+add_library(nddeapi SHARED ${SOURCE})
 set_entrypoint(nddeapi 0)
 
 target_link_libraries(nddeapi wine)
diff --git a/dll/win32/ntdsapi/CMakeLists.txt b/dll/win32/ntdsapi/CMakeLists.txt
index a2b53d31578..6413da1e814 100644
--- a/dll/win32/ntdsapi/CMakeLists.txt
+++ b/dll/win32/ntdsapi/CMakeLists.txt
@@ -4,9 +4,11 @@ add_definitions(-D__WINESRC__)
 
 spec2def(ntdsapi.dll ntdsapi.spec)
 
-add_library(ntdsapi SHARED ntdsapi.c
+list(APPEND SOURCE
+    ntdsapi.c
     ${CMAKE_CURRENT_BINARY_DIR}/ntdsapi.def)
 
+add_library(ntdsapi SHARED ${SOURCE})
 set_entrypoint(ntdsapi 0)
 
 target_link_libraries(ntdsapi wine)
diff --git a/dll/win32/odbccp32/CMakeLists.txt b/dll/win32/odbccp32/CMakeLists.txt
index a290305e814..df80d3d9db3 100644
--- a/dll/win32/odbccp32/CMakeLists.txt
+++ b/dll/win32/odbccp32/CMakeLists.txt
@@ -6,9 +6,11 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(odbccp32.dll odbccp32.spec)
 
-add_library(odbccp32 SHARED odbccp32.c
+list(APPEND SOURCE
+    odbccp32.c
     ${CMAKE_CURRENT_BINARY_DIR}/odbccp32.def)
 
+add_library(odbccp32 SHARED ${SOURCE})
 set_entrypoint(odbccp32 0)
 
 target_link_libraries(odbccp32
diff --git a/dll/win32/oleacc/CMakeLists.txt b/dll/win32/oleacc/CMakeLists.txt
index e166528f919..59dad21d5c5 100644
--- a/dll/win32/oleacc/CMakeLists.txt
+++ b/dll/win32/oleacc/CMakeLists.txt
@@ -1,13 +1,16 @@
 
 add_definitions(-D__WINESRC__)
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(oleacc.dll oleacc.spec)
 
-add_library(oleacc SHARED main.c oleacc.rc
+list(APPEND SOURCE
+    main.c oleacc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/oleacc.def)
 
+add_library(oleacc SHARED ${SOURCE})
+
 set_entrypoint(oleacc 0)
 
 target_link_libraries(oleacc wine)
diff --git a/dll/win32/olecli32/CMakeLists.txt b/dll/win32/olecli32/CMakeLists.txt
index a9ff73f018b..02f1376cd5e 100644
--- a/dll/win32/olecli32/CMakeLists.txt
+++ b/dll/win32/olecli32/CMakeLists.txt
@@ -2,11 +2,14 @@
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
 
+set_rc_compiler()
 spec2def(olecli32.dll olecli32.spec)
 
-add_library(olecli32 SHARED olecli_main.c
+list(APPEND SOURCE
+    olecli_main.c
     ${CMAKE_CURRENT_BINARY_DIR}/olecli32.def)
 
+add_library(olecli32 SHARED ${SOURCE})
 set_entrypoint(olecli32 0)
 
 target_link_libraries(olecli32 wine)
diff --git a/dll/win32/pdh/CMakeLists.txt b/dll/win32/pdh/CMakeLists.txt
index 877f5de11d1..e09c32c6a5c 100644
--- a/dll/win32/pdh/CMakeLists.txt
+++ b/dll/win32/pdh/CMakeLists.txt
@@ -8,9 +8,11 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(pdh.dll pdh.spec)
 
-add_library(pdh SHARED pdh_main.c
+list(APPEND SOURCE
+    pdh_main.c
     ${CMAKE_CURRENT_BINARY_DIR}/pdh.def)
 
+add_library(pdh SHARED ${SOURCE})
 set_entrypoint(pdh 0)
 
 target_link_libraries(pdh wine)
diff --git a/dll/win32/rasapi32/CMakeLists.txt b/dll/win32/rasapi32/CMakeLists.txt
index 1617ae5ad2a..f3aef5629aa 100644
--- a/dll/win32/rasapi32/CMakeLists.txt
+++ b/dll/win32/rasapi32/CMakeLists.txt
@@ -2,11 +2,14 @@
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 add_definitions(-D__WINESRC__)
 
+set_rc_compiler()
 spec2def(rasapi32.dll rasapi32.spec)
 
-add_library(rasapi32 SHARED rasapi.c
+list(APPEND SOURCE
+    rasapi.c
     ${CMAKE_CURRENT_BINARY_DIR}/rasapi32.def)
 
+add_library(rasapi32 SHARED ${SOURCE})
 set_entrypoint(rasapi32 0)
 
 target_link_libraries(rasapi32 wine)
diff --git a/dll/win32/security/CMakeLists.txt b/dll/win32/security/CMakeLists.txt
index bf0f923aa31..1583c4c72af 100644
--- a/dll/win32/security/CMakeLists.txt
+++ b/dll/win32/security/CMakeLists.txt
@@ -1,15 +1,16 @@
-
 set_unicode()
-
 add_definitions(-D__SECURITY__)
 
+set_rc_compiler()
 spec2def(security.dll security.spec)
 
-add_library(security SHARED security.rc
+list(APPEND SOURCE
+    security.rc
     ${CMAKE_CURRENT_BINARY_DIR}/security.def)
 
+add_library(security SHARED ${SOURCE})
 set_entrypoint(security 0)
 
-add_importlibs(security advapi32 ntdll)
+add_importlibs(security advapi32 ntdll kernel32)
 
 add_cab_target(security 1)
\ No newline at end of file
diff --git a/dll/win32/snmpapi/CMakeLists.txt b/dll/win32/snmpapi/CMakeLists.txt
index 1889adb9c9d..b12f56cc05e 100644
--- a/dll/win32/snmpapi/CMakeLists.txt
+++ b/dll/win32/snmpapi/CMakeLists.txt
@@ -4,10 +4,16 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
+set_rc_compiler()
 
 spec2def(snmpapi.dll snmpapi.spec)
 
-add_library(snmpapi SHARED main.c snmpapi.rc ${CMAKE_CURRENT_BINARY_DIR}/snmpapi.def)
+list(APPEND SOURCE
+    main.c
+    snmpapi.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/snmpapi.def)
+    
+add_library(snmpapi SHARED ${SOURCE})
 
 set_module_type(snmpapi win32dll)
 
diff --git a/dll/win32/spoolss/CMakeLists.txt b/dll/win32/spoolss/CMakeLists.txt
index dc6a066c2b0..021cf6bfcf4 100644
--- a/dll/win32/spoolss/CMakeLists.txt
+++ b/dll/win32/spoolss/CMakeLists.txt
@@ -4,7 +4,12 @@ add_definitions(-D__WINESRC__)
 
 spec2def(spoolss.dll spoolss.spec)
 
-add_library(spoolss SHARED spoolss_main.c router.c ${CMAKE_CURRENT_BINARY_DIR}/spoolss.def)
+list(APPEND SOURCE
+    spoolss_main.c
+    router.c
+    ${CMAKE_CURRENT_BINARY_DIR}/spoolss.def)
+
+add_library(spoolss SHARED ${SOURCE})
 
 set_module_type(spoolss win32dll)
 
diff --git a/dll/win32/srclient/CMakeLists.txt b/dll/win32/srclient/CMakeLists.txt
index 3b8ca34c7d0..ccc647f2a79 100644
--- a/dll/win32/srclient/CMakeLists.txt
+++ b/dll/win32/srclient/CMakeLists.txt
@@ -1,9 +1,11 @@
 
 spec2def(srclient.dll srclient.spec)
 
-add_library(srclient SHARED srclient_main.c
+list(APPEND SOURCE
+    srclient_main.c
     ${CMAKE_CURRENT_BINARY_DIR}/srclient.def)
 
+add_library(srclient SHARED ${SOURCE})
 set_entrypoint(srclient 0)
 
 add_importlibs(srclient kernel32 ntdll)
diff --git a/dll/win32/sxs/CMakeLists.txt b/dll/win32/sxs/CMakeLists.txt
index fa919363fe9..34fb7580497 100644
--- a/dll/win32/sxs/CMakeLists.txt
+++ b/dll/win32/sxs/CMakeLists.txt
@@ -4,9 +4,11 @@ add_definitions(-D__WINESRC__)
 
 spec2def(sxs.dll sxs.spec)
 
-add_library(sxs SHARED sxs.c
+list(APPEND SOURCE
+    sxs.c
     ${CMAKE_CURRENT_BINARY_DIR}/sxs.def)
 
+add_library(sxs SHARED ${SOURCE})
 set_entrypoint(sxs 0)
 
 target_link_libraries(sxs wine)
diff --git a/dll/win32/tapi32/CMakeLists.txt b/dll/win32/tapi32/CMakeLists.txt
index abb19d50783..4545c196985 100644
--- a/dll/win32/tapi32/CMakeLists.txt
+++ b/dll/win32/tapi32/CMakeLists.txt
@@ -4,12 +4,13 @@ add_definitions(-D__WINESRC__)
 
 spec2def(tapi32.dll tapi32.spec)
 
-add_library(tapi32 SHARED
+list(APPEND SOURCE
     assisted.c
     internal.c
     line.c
     phone.c
     ${CMAKE_CURRENT_BINARY_DIR}/tapi32.def)
+add_library(tapi32 SHARED ${SOURCE})
 
 set_entrypoint(tapi32 0)
 
diff --git a/dll/win32/traffic/CMakeLists.txt b/dll/win32/traffic/CMakeLists.txt
index 6ba2de1e6b5..92a2f04116f 100644
--- a/dll/win32/traffic/CMakeLists.txt
+++ b/dll/win32/traffic/CMakeLists.txt
@@ -4,10 +4,12 @@ add_definitions(-D__WINESRC__)
 
 spec2def(traffic.dll traffic.spec)
 
-add_library(traffic SHARED
+list(APPEND SOURCE
     traffic_main.c
     ${CMAKE_CURRENT_BINARY_DIR}/traffic.def)
 
+add_library(traffic SHARED ${SOURCE})
+
 set_module_type(traffic win32dll)
 
 target_link_libraries(traffic wine)
diff --git a/dll/win32/updspapi/CMakeLists.txt b/dll/win32/updspapi/CMakeLists.txt
index f0f25630027..3b6783ddb95 100644
--- a/dll/win32/updspapi/CMakeLists.txt
+++ b/dll/win32/updspapi/CMakeLists.txt
@@ -4,9 +4,11 @@ add_definitions(-D__WINESRC__)
 
 spec2def(updspapi.dll updspapi.spec)
 
-add_library(updspapi SHARED main.c
+list(APPEND SOURCE
+    main.c
     ${CMAKE_CURRENT_BINARY_DIR}/updspapi.def)
 
+add_library(updspapi SHARED ${SOURCE})
 set_entrypoint(updspapi 0)
 
 target_link_libraries(updspapi wine)