diff --git a/dll/directx/dinput8/CMakeLists.txt b/dll/directx/dinput8/CMakeLists.txt
index c8b54e922be..4a4c11054e6 100644
--- a/dll/directx/dinput8/CMakeLists.txt
+++ b/dll/directx/dinput8/CMakeLists.txt
@@ -31,4 +31,5 @@ add_importlibs(dinput8
 
 add_dependencies(dinput8 psdk buildno_header)
 
-add_cab_target(dinput8 1)
\ No newline at end of file
+add_cab_target(dinput8 1)
+add_importlib_target(dinput8.spec)
\ No newline at end of file
diff --git a/dll/directx/dsound/CMakeLists.txt b/dll/directx/dsound/CMakeLists.txt
index c677d837cee..dfb8c365971 100644
--- a/dll/directx/dsound/CMakeLists.txt
+++ b/dll/directx/dsound/CMakeLists.txt
@@ -38,3 +38,4 @@ add_importlibs(dsound
 
 
 add_cab_target(dsound 1)
+add_importlib_target(dsound.spec)
diff --git a/dll/directx/wine/d3d9/CMakeLists.txt b/dll/directx/wine/d3d9/CMakeLists.txt
index e05850be76a..931e4f9fadc 100644
--- a/dll/directx/wine/d3d9/CMakeLists.txt
+++ b/dll/directx/wine/d3d9/CMakeLists.txt
@@ -44,3 +44,4 @@ add_importlibs(d3d9
 
 add_dependencies(d3d9 wineheaders)
 add_cab_target(d3d9 1)
+add_importlib_target(d3d9.spec)
diff --git a/dll/directx/wine/ddraw/CMakeLists.txt b/dll/directx/wine/ddraw/CMakeLists.txt
index 42cb720d3e2..4d6ab9c0872 100644
--- a/dll/directx/wine/ddraw/CMakeLists.txt
+++ b/dll/directx/wine/ddraw/CMakeLists.txt
@@ -50,4 +50,5 @@ add_importlibs(ddraw
     ntdll)
 
 add_dependencies(ddraw wineheaders)
-add_cab_target(ddraw 1)
\ No newline at end of file
+add_cab_target(ddraw 1)
+add_importlib_target(ddraw.spec)
\ No newline at end of file
diff --git a/dll/win32/comctl32/CMakeLists.txt b/dll/win32/comctl32/CMakeLists.txt
index 2f64e85faaf..5aa3c044278 100644
--- a/dll/win32/comctl32/CMakeLists.txt
+++ b/dll/win32/comctl32/CMakeLists.txt
@@ -67,3 +67,4 @@ add_importlibs(comctl32
     ntdll)
 
 add_cab_target(comctl32 1)
+add_importlib_target(comctl32.spec)
diff --git a/dll/win32/comdlg32/CMakeLists.txt b/dll/win32/comdlg32/CMakeLists.txt
index 62b823ebf08..249347e65a9 100644
--- a/dll/win32/comdlg32/CMakeLists.txt
+++ b/dll/win32/comdlg32/CMakeLists.txt
@@ -39,3 +39,4 @@ add_importlibs(comdlg32
 
 
 add_cab_target(comdlg32 1)
+add_importlib_target(comdlg32.spec)
diff --git a/dll/win32/devmgr/CMakeLists.txt b/dll/win32/devmgr/CMakeLists.txt
index 46766ef8630..bd4cc8800c3 100644
--- a/dll/win32/devmgr/CMakeLists.txt
+++ b/dll/win32/devmgr/CMakeLists.txt
@@ -31,3 +31,4 @@ add_importlibs(devmgr
 add_pch(devmgr ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 add_cab_target(devmgr 1)
+add_importlib_target(devmgr.spec)
diff --git a/dll/win32/iphlpapi/CMakeLists.txt b/dll/win32/iphlpapi/CMakeLists.txt
index 44b3013cb20..1cc323ea776 100644
--- a/dll/win32/iphlpapi/CMakeLists.txt
+++ b/dll/win32/iphlpapi/CMakeLists.txt
@@ -31,3 +31,4 @@ target_link_libraries(iphlpapi
 add_importlibs(iphlpapi dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll)
 
 add_cab_target(iphlpapi 1)
+add_importlib_target(iphlpapi.spec)
diff --git a/dll/win32/loadperf/CMakeLists.txt b/dll/win32/loadperf/CMakeLists.txt
index 8796150ed9c..5555a275641 100644
--- a/dll/win32/loadperf/CMakeLists.txt
+++ b/dll/win32/loadperf/CMakeLists.txt
@@ -18,3 +18,4 @@ target_link_libraries(loadperf
 add_importlibs(loadperf kernel32 ntdll)
 
 add_cab_target(loadperf 1)
+add_importlib_target(loadperf.spec)
diff --git a/dll/win32/ole32/CMakeLists.txt b/dll/win32/ole32/CMakeLists.txt
index 6078ddc29f9..90e919fe121 100644
--- a/dll/win32/ole32/CMakeLists.txt
+++ b/dll/win32/ole32/CMakeLists.txt
@@ -73,4 +73,5 @@ target_link_libraries(ole32
 add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 ntdll)
     
 add_dependencies(ole32 ole32idl)
-add_cab_target(ole32 1)
\ No newline at end of file
+add_cab_target(ole32 1)
+add_importlib_target(ole32.spec)
\ No newline at end of file
diff --git a/dll/win32/setupapi/CMakeLists.txt b/dll/win32/setupapi/CMakeLists.txt
index a5b90b8c4cb..78ed2db0d56 100644
--- a/dll/win32/setupapi/CMakeLists.txt
+++ b/dll/win32/setupapi/CMakeLists.txt
@@ -56,3 +56,4 @@ add_importlibs(setupapi
 
 
 add_cab_target(setupapi 1)
+add_importlib_target(setupapi.spec)
diff --git a/dll/win32/shdocvw/CMakeLists.txt b/dll/win32/shdocvw/CMakeLists.txt
index 7a06b133422..b33c211e67c 100644
--- a/dll/win32/shdocvw/CMakeLists.txt
+++ b/dll/win32/shdocvw/CMakeLists.txt
@@ -52,3 +52,4 @@ add_importlibs(shdocvw
 
 add_dependencies(shdocvw shdocvw_v1 shdocvw_def)
 add_cab_target(shdocvw 1)
+add_importlib_target(shdocvw.spec)
diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt
index 0a09372d883..7b7efd12d71 100644
--- a/dll/win32/shell32/CMakeLists.txt
+++ b/dll/win32/shell32/CMakeLists.txt
@@ -1,3 +1,6 @@
+
+spec2def(shell32.dll shell32.spec)
+
 list(APPEND SOURCE
     authors.c
     autocomplete.c
@@ -61,8 +64,6 @@ add_definitions(-D_SHELL32_)
 add_definitions(-DCOM_NO_WINDOWS_H)
 add_definitions(-D_WINE)
 
-spec2def(shell32.dll shell32.spec)
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 include_directories(${REACTOS_SOURCE_DIR}/lib/recyclebin)
 include_directories(${REACTOS_SOURCE_DIR})
@@ -95,5 +96,5 @@ add_importlibs(shell32
 
 
 add_cab_target(shell32 1)
-add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/shell32.def)
+add_importlib_target(shell32.spec)
 
diff --git a/dll/win32/shlwapi/CMakeLists.txt b/dll/win32/shlwapi/CMakeLists.txt
index ffdbe034676..b6070544c77 100644
--- a/dll/win32/shlwapi/CMakeLists.txt
+++ b/dll/win32/shlwapi/CMakeLists.txt
@@ -51,3 +51,4 @@ add_importlibs(shlwapi
 
 
 add_cab_target(shlwapi 1)
+add_importlib_target(shlwapi.spec)
diff --git a/dll/win32/snmpapi/CMakeLists.txt b/dll/win32/snmpapi/CMakeLists.txt
index 6315b0b21e9..105992a8192 100644
--- a/dll/win32/snmpapi/CMakeLists.txt
+++ b/dll/win32/snmpapi/CMakeLists.txt
@@ -16,3 +16,4 @@ target_link_libraries(snmpapi wine)
 add_importlibs(snmpapi kernel32 ntdll)
 
 add_cab_target(snmpapi 1)
+add_importlib_target(snmpapi.spec)
diff --git a/dll/win32/urlmon/CMakeLists.txt b/dll/win32/urlmon/CMakeLists.txt
index b78c402f0aa..3f1a541db89 100644
--- a/dll/win32/urlmon/CMakeLists.txt
+++ b/dll/win32/urlmon/CMakeLists.txt
@@ -66,3 +66,4 @@ add_definitions(-DPROXY_CLSID_IS={0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,
 
 rpcproxy(urlmon urlmon_urlmon.idl)
 add_cab_target(urlmon 1)
+add_importlib_target(urlmon.spec)
diff --git a/dll/win32/version/CMakeLists.txt b/dll/win32/version/CMakeLists.txt
index 104e463f358..c662998a8a4 100644
--- a/dll/win32/version/CMakeLists.txt
+++ b/dll/win32/version/CMakeLists.txt
@@ -1,4 +1,6 @@
 
+spec2def(version.dll version.spec)
+
 add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@@ -8,11 +10,7 @@ add_library(version SHARED
     install.c
     resource.c
     version.rc
-    version.def)
-
-if(NOT MSVC)
-    set_source_files_properties(version.def PROPERTIES EXTERNAL_OBJECT TRUE)
-endif()
+    ${CMAKE_CURRENT_BINARY_DIR}/version.def)
 
 set_entrypoint(version 0)
 
@@ -20,4 +18,5 @@ target_link_libraries(version wine)
 
 add_importlibs(version lz32 kernel32 ntdll)
 add_dependencies(version psdk buildno_header)
-add_cab_target(version 1)
\ No newline at end of file
+add_cab_target(version 1)
+add_importlib_target(version.spec)
\ No newline at end of file
diff --git a/dll/win32/wininet/CMakeLists.txt b/dll/win32/wininet/CMakeLists.txt
index 0fe8f96f218..9644be2c727 100644
--- a/dll/win32/wininet/CMakeLists.txt
+++ b/dll/win32/wininet/CMakeLists.txt
@@ -35,3 +35,4 @@ target_link_libraries(wininet
 add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 secur32 crypt32 ws2_32 msvcrt kernel32 ntdll)
 
 add_cab_target(wininet 1)
+add_importlib_target(wininet.spec)
diff --git a/dll/win32/winmm/CMakeLists.txt b/dll/win32/winmm/CMakeLists.txt
index 8a8ac42f16f..2c2151f4d08 100644
--- a/dll/win32/winmm/CMakeLists.txt
+++ b/dll/win32/winmm/CMakeLists.txt
@@ -30,3 +30,4 @@ add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll)
 
 add_subdirectory(midimap)
 add_cab_target(winmm 1)
+add_importlib_target(winmm.spec)
diff --git a/dll/win32/ws2_32/CMakeLists.txt b/dll/win32/ws2_32/CMakeLists.txt
index 4f7024025e5..1f074426a9b 100644
--- a/dll/win32/ws2_32/CMakeLists.txt
+++ b/dll/win32/ws2_32/CMakeLists.txt
@@ -33,3 +33,4 @@ add_importlibs(ws2_32 user32 advapi32 dnsapi ws2help kernel32 ntdll)
 add_pch(ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/include/ws2_32.h ${SOURCE})
 
 add_cab_target(ws2_32 1)
+add_importlib_target(ws2_32.spec)