diff --git a/dll/win32/atl/CMakeLists.txt b/dll/win32/atl/CMakeLists.txt
index b47f966d9bc..dc965abfe82 100644
--- a/dll/win32/atl/CMakeLists.txt
+++ b/dll/win32/atl/CMakeLists.txt
@@ -22,9 +22,7 @@ add_library(atl SHARED ${SOURCE})
 
 set_module_type(atl win32dll)
 
-target_link_libraries(atl
-    uuid
-    wine)
+target_link_libraries(atl uuid wine)
 
 add_importlibs(atl
     msvcrt
@@ -36,5 +34,7 @@ add_importlibs(atl
     kernel32
     ntdll)
 
+add_importlib_target(atl.spec)
+
 add_dependencies(atl atl_atliface_header)
 add_cab_target(atl 1)
diff --git a/dll/win32/avifil32/CMakeLists.txt b/dll/win32/avifil32/CMakeLists.txt
index 41810293b9b..c5c72a54391 100644
--- a/dll/win32/avifil32/CMakeLists.txt
+++ b/dll/win32/avifil32/CMakeLists.txt
@@ -7,6 +7,8 @@ add_definitions(-D_WIN32_WINNT=0x600)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+spec2def(avifil32.dll avifil32.spec)
+
 add_library(avifil32 SHARED
     acmstream.c
     api.c
@@ -20,17 +22,11 @@ add_library(avifil32 SHARED
     tmpfile.c
     wavfile.c
     rsrc.rc
-    avifil32.def)
-
-if(NOT MSVC)
-    set_source_files_properties(avifil32.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+    ${CMAKE_CURRENT_BINARY_DIR}/avifil32.def)
 
 set_module_type(avifil32 win32dll)
 
-target_link_libraries(avifil32
-    uuid
-    wine)
+target_link_libraries(avifil32 uuid wine)
 
 add_importlibs(avifil32
     msvcrt
@@ -43,4 +39,5 @@ add_importlibs(avifil32
     kernel32
     ntdll)
 
+add_importlib_target(avifil32.spec)
 add_cab_target(avifil32 1)
diff --git a/dll/win32/credui/CMakeLists.txt b/dll/win32/credui/CMakeLists.txt
index 9117a16724a..338c213277e 100644
--- a/dll/win32/credui/CMakeLists.txt
+++ b/dll/win32/credui/CMakeLists.txt
@@ -18,5 +18,6 @@ set_module_type(credui win32dll)
 target_link_libraries(credui wine)
 
 add_importlibs(credui advapi32 user32 comctl32 msvcrt kernel32 ntdll)
+add_importlib_target(credui.spec)
 
 add_cab_target(credui 1)
diff --git a/dll/win32/cryptnet/CMakeLists.txt b/dll/win32/cryptnet/CMakeLists.txt
index f3ad22e37c4..a0e44232f23 100644
--- a/dll/win32/cryptnet/CMakeLists.txt
+++ b/dll/win32/cryptnet/CMakeLists.txt
@@ -21,5 +21,5 @@ add_importlibs(cryptnet
     kernel32
     ntdll)
 
-
+add_importlib_target(cryptnet.spec)
 add_cab_target(cryptnet 1)
diff --git a/dll/win32/hlink/CMakeLists.txt b/dll/win32/hlink/CMakeLists.txt
index 00cc9e31759..c9f328b29a5 100644
--- a/dll/win32/hlink/CMakeLists.txt
+++ b/dll/win32/hlink/CMakeLists.txt
@@ -28,5 +28,5 @@ add_importlibs(hlink
     kernel32
     ntdll)
 
-
+add_importlib_target(hlink.spec)
 add_cab_target(hlink 1)
diff --git a/dll/win32/icmp/CMakeLists.txt b/dll/win32/icmp/CMakeLists.txt
index 1ab64e7fd0a..aed1b622644 100644
--- a/dll/win32/icmp/CMakeLists.txt
+++ b/dll/win32/icmp/CMakeLists.txt
@@ -16,5 +16,5 @@ set_module_type(icmp win32dll)
 target_link_libraries(icmp wine)
 
 add_importlibs(icmp ws2_32 msvcrt kernel32 ntdll)
-add_dependencies(icmp psdk)
+add_importlib_target(icmp.spec)
 add_cab_target(icmp 1)
diff --git a/dll/win32/inetcomm/CMakeLists.txt b/dll/win32/inetcomm/CMakeLists.txt
index e914418940c..c0924d634e9 100644
--- a/dll/win32/inetcomm/CMakeLists.txt
+++ b/dll/win32/inetcomm/CMakeLists.txt
@@ -21,9 +21,7 @@ add_library(inetcomm SHARED ${SOURCE})
 
 set_module_type(inetcomm win32dll)
 
-target_link_libraries(inetcomm
-    uuid
-    wine)
+target_link_libraries(inetcomm uuid wine)
 
 add_importlibs(inetcomm
     ole32
@@ -35,4 +33,5 @@ add_importlibs(inetcomm
     kernel32
     ntdll)
 
+add_importlib_target(inetcomm.spec)
 add_cab_target(inetcomm 1)
diff --git a/dll/win32/ntdsapi/CMakeLists.txt b/dll/win32/ntdsapi/CMakeLists.txt
index 6413da1e814..2c9171da4d4 100644
--- a/dll/win32/ntdsapi/CMakeLists.txt
+++ b/dll/win32/ntdsapi/CMakeLists.txt
@@ -14,5 +14,6 @@ set_entrypoint(ntdsapi 0)
 target_link_libraries(ntdsapi wine)
 
 add_importlibs(ntdsapi user32 kernel32 ntdll)
+add_importlib_target(ntdsapi.spec)
 add_dependencies(ntdsapi psdk buildno_header)
 add_cab_target(ntdsapi 1)
diff --git a/dll/win32/odbccp32/CMakeLists.txt b/dll/win32/odbccp32/CMakeLists.txt
index df80d3d9db3..77982c0d7a2 100644
--- a/dll/win32/odbccp32/CMakeLists.txt
+++ b/dll/win32/odbccp32/CMakeLists.txt
@@ -1,6 +1,7 @@
 
-add_definitions(-D__WINESRC__)
-add_definitions(-D_DLL -D__USE_CRTIMP)
+add_definitions(
+    -D__WINESRC__
+    -D_DLL -D__USE_CRTIMP)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
@@ -13,9 +14,7 @@ list(APPEND SOURCE
 add_library(odbccp32 SHARED ${SOURCE})
 set_entrypoint(odbccp32 0)
 
-target_link_libraries(odbccp32
-    uuid
-    wine)
+target_link_libraries(odbccp32 uuid wine)
 
 add_importlibs(odbccp32
     msvcrt
@@ -23,5 +22,5 @@ add_importlibs(odbccp32
     kernel32
     ntdll)
 
-
+add_importlib_target(odbccp32.spec)
 add_cab_target(odbccp32 1)
diff --git a/dll/win32/oleacc/CMakeLists.txt b/dll/win32/oleacc/CMakeLists.txt
index 59dad21d5c5..79f02e80c5c 100644
--- a/dll/win32/oleacc/CMakeLists.txt
+++ b/dll/win32/oleacc/CMakeLists.txt
@@ -6,7 +6,8 @@ set_rc_compiler()
 spec2def(oleacc.dll oleacc.spec)
 
 list(APPEND SOURCE
-    main.c oleacc.rc
+    main.c
+    oleacc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/oleacc.def)
 
 add_library(oleacc SHARED ${SOURCE})
@@ -20,5 +21,5 @@ add_importlibs(oleacc
     kernel32
     ntdll)
 
-
-add_cab_target(oleacc 1)
\ No newline at end of file
+add_importlib_target(oleacc.spec)
+add_cab_target(oleacc 1)
diff --git a/dll/win32/pdh/CMakeLists.txt b/dll/win32/pdh/CMakeLists.txt
index e09c32c6a5c..8e69d4953c5 100644
--- a/dll/win32/pdh/CMakeLists.txt
+++ b/dll/win32/pdh/CMakeLists.txt
@@ -18,5 +18,6 @@ set_entrypoint(pdh 0)
 target_link_libraries(pdh wine)
 
 add_importlibs(pdh kernel32 ntdll)
+add_importlib_target(pdh.spec)
 
 add_cab_target(pdh 1)
\ No newline at end of file
diff --git a/dll/win32/powrprof/CMakeLists.txt b/dll/win32/powrprof/CMakeLists.txt
index 024099adfce..69d3c5f1b22 100644
--- a/dll/win32/powrprof/CMakeLists.txt
+++ b/dll/win32/powrprof/CMakeLists.txt
@@ -13,6 +13,5 @@ set_module_type(powrprof win32dll)
 target_link_libraries(powrprof wine)
 
 add_importlibs(powrprof advapi32 user32 comctl32 msvcrt kernel32 ntdll)
-
-add_cab_target(powrprof 1)
 add_importlib_target(powrprof.spec)
+add_cab_target(powrprof 1)
diff --git a/dll/win32/winhttp/CMakeLists.txt b/dll/win32/winhttp/CMakeLists.txt
index ce9cec3dbc3..af19e7e3855 100644
--- a/dll/win32/winhttp/CMakeLists.txt
+++ b/dll/win32/winhttp/CMakeLists.txt
@@ -2,6 +2,8 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+spec2def(winhttp.dll winhttp.spec)
+
 add_library(winhttp SHARED
     cookie.c
     handle.c
@@ -10,16 +12,10 @@ add_library(winhttp SHARED
     request.c
     session.c
     url.c
-    winhttp.def)
-
-if(NOT MSVC)
-    set_source_files_properties(winhttp.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+    ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def)
 
 set_module_type(winhttp win32dll)
-
 target_link_libraries(winhttp wine)
-
 add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt crypt32 advapi32 kernel32 ntdll)
-
+add_importlib_target(winhttp.spec)
 add_cab_target(winhttp 1)
diff --git a/dll/win32/wlanapi/CMakeLists.txt b/dll/win32/wlanapi/CMakeLists.txt
index 43133f94f86..93fd1c338cf 100644
--- a/dll/win32/wlanapi/CMakeLists.txt
+++ b/dll/win32/wlanapi/CMakeLists.txt
@@ -17,6 +17,7 @@ target_link_libraries(wlanapi
     ${PSEH_LIB})
 
 add_importlibs(wlanapi rpcrt4 kernel32 ntdll)
-add_dependencies(wlanapi psdk buildno_header)
+add_importlib_target(wlanapi.spec)
 
-add_cab_target(wlanapi 1)
\ No newline at end of file
+add_dependencies(wlanapi psdk buildno_header)
+add_cab_target(wlanapi 1)
diff --git a/dll/win32/wldap32/CMakeLists.txt b/dll/win32/wldap32/CMakeLists.txt
index 73eeb255224..2f1f712e1f8 100644
--- a/dll/win32/wldap32/CMakeLists.txt
+++ b/dll/win32/wldap32/CMakeLists.txt
@@ -36,5 +36,5 @@ set_module_type(wldap32 win32dll)
 target_link_libraries(wldap32 wine)
 
 add_importlibs(wldap32 user32 msvcrt kernel32 ntdll)
-
+add_importlib_target(wldap32.spec)
 add_cab_target(wldap32 1)
diff --git a/dll/win32/xmllite/CMakeLists.txt b/dll/win32/xmllite/CMakeLists.txt
index d28ff833e29..8dfc706881a 100644
--- a/dll/win32/xmllite/CMakeLists.txt
+++ b/dll/win32/xmllite/CMakeLists.txt
@@ -13,9 +13,8 @@ add_library(xmllite SHARED ${SOURCE})
 
 set_module_type(xmllite win32dll)
 
-target_link_libraries(xmllite
-    wine)
+target_link_libraries(xmllite wine)
 
 add_importlibs(xmllite msvcrt kernel32 ntdll)
-
+add_importlib_target(xmllite.spec)
 add_cab_target(xmllite 1)