Index: base/services/nfsd/CMakeLists.txt
===================================================================
--- base/services/nfsd/CMakeLists.txt	(revision 75427)
+++ base/services/nfsd/CMakeLists.txt	(working copy)
@@ -54,7 +54,8 @@
 endif()
 
 set_module_type(nfsd win32cui)
-add_importlibs(nfsd advapi32 iphlpapi kernel32_vista libtirpc msvcrt shell32 ws2_32 wldap32 kernel32 ntdll)
+add_importlibs(nfsd advapi32 iphlpapi libtirpc msvcrt shell32 ws2_32 wldap32 kernel32 ntdll)
+add_delay_importlibs(nfsd kernel32_vista)
 add_cd_file(TARGET nfsd DESTINATION reactos/system32 FOR all)
 add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/netconfig" DESTINATION reactos/system32/drivers/etc FOR all)
 add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/ms-nfs41-idmap.conf" DESTINATION reactos/system32/drivers/etc FOR all)
Index: dll/win32/inseng/CMakeLists.txt
===================================================================
--- dll/win32/inseng/CMakeLists.txt	(revision 75427)
+++ dll/win32/inseng/CMakeLists.txt	(working copy)
@@ -17,6 +17,7 @@
 add_library(inseng SHARED ${SOURCE} guid.c inseng.rc)
 set_module_type(inseng win32dll)
 target_link_libraries(inseng uuid wine)
-add_importlibs(inseng ole32 urlmon kernel32_vista msvcrt kernel32 ntdll)
+add_importlibs(inseng ole32 urlmon msvcrt kernel32 ntdll)
+add_delay_importlibs(inseng kernel32_vista)
 add_pch(inseng inseng_private.h SOURCE)
 add_cd_file(TARGET inseng DESTINATION reactos/system32 FOR all)
Index: dll/win32/msi/CMakeLists.txt
===================================================================
--- dll/win32/msi/CMakeLists.txt	(revision 75427)
+++ dll/win32/msi/CMakeLists.txt	(working copy)
@@ -64,12 +64,11 @@
 set_module_type(msi win32dll)
 target_link_libraries(msi uuid ${PSEH_LIB} wine)
 add_dependencies(msi msi_idlheader)
-add_delay_importlibs(msi odbccp32 crypt32 wintrust)
+add_delay_importlibs(msi odbccp32 crypt32 wintrust kernel32_vista)
 add_importlibs(msi advapi32 advapi32_vista cabinet comctl32 gdi32 ole32 oleaut32 shell32 shlwapi urlmon user32 version wininet mspatcha
     #FIXME : should be in delayed imports
     imagehlp
     msvcrt
-    kernel32_vista
     kernel32
     ntdll)
 
Index: dll/win32/ole32/CMakeLists.txt
===================================================================
--- dll/win32/ole32/CMakeLists.txt	(revision 75427)
+++ dll/win32/ole32/CMakeLists.txt	(working copy)
@@ -80,8 +80,8 @@
 
 set_module_type(ole32 win32dll)
 target_link_libraries(ole32 wine uuid ${PSEH_LIB})
-add_delay_importlibs(ole32 oleaut32)
-add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 kernel32_vista ntdll)
+add_delay_importlibs(ole32 oleaut32 kernel32_vista)
+add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 ntdll)
 add_dependencies(ole32 ole32idl)
 add_pch(ole32 precomp.h SOURCE)
 add_cd_file(TARGET ole32 DESTINATION reactos/system32 FOR all)
Index: dll/win32/oleaut32/CMakeLists.txt
===================================================================
--- dll/win32/oleaut32/CMakeLists.txt	(revision 75427)
+++ dll/win32/oleaut32/CMakeLists.txt	(working copy)
@@ -51,7 +51,7 @@
 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 kernel32_vista msvcrt kernel32 ntdll)
+add_delay_importlibs(oleaut32 comctl32 urlmon windowscodecs kernel32_vista)
+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)
Index: dll/win32/pdh/CMakeLists.txt
===================================================================
--- dll/win32/pdh/CMakeLists.txt	(revision 75427)
+++ dll/win32/pdh/CMakeLists.txt	(working copy)
@@ -14,5 +14,6 @@
 add_library(pdh SHARED ${SOURCE})
 set_module_type(pdh win32dll)
 target_link_libraries(pdh wine)
-add_importlibs(pdh msvcrt kernel32_vista kernel32 ntdll)
+add_delay_importlibs(pdh kernel32_vista)
+add_importlibs(pdh msvcrt kernel32 ntdll)
 add_cd_file(TARGET pdh DESTINATION reactos/system32 FOR all)
Index: dll/win32/rpcrt4/CMakeLists.txt
===================================================================
--- dll/win32/rpcrt4/CMakeLists.txt	(revision 75427)
+++ dll/win32/rpcrt4/CMakeLists.txt	(working copy)
@@ -51,7 +51,7 @@
 
 set_module_type(rpcrt4 win32dll)
 target_link_libraries(rpcrt4 wine uuid ${PSEH_LIB})
-add_delay_importlibs(rpcrt4 iphlpapi wininet secur32 user32)
-add_importlibs(rpcrt4 advapi32 advapi32_vista kernel32_vista ws2_32 msvcrt kernel32 ntdll)
+add_delay_importlibs(rpcrt4 iphlpapi wininet secur32 user32 kernel32_vista)
+add_importlibs(rpcrt4 advapi32 advapi32_vista ws2_32 msvcrt kernel32 ntdll)
 add_pch(rpcrt4 precomp.h SOURCE)
 add_cd_file(TARGET rpcrt4 DESTINATION reactos/system32 FOR all)
Index: dll/win32/snmpapi/CMakeLists.txt
===================================================================
--- dll/win32/snmpapi/CMakeLists.txt	(revision 75427)
+++ dll/win32/snmpapi/CMakeLists.txt	(working copy)
@@ -14,5 +14,6 @@
 add_library(snmpapi SHARED ${SOURCE} snmpapi.rc)
 set_module_type(snmpapi win32dll)
 target_link_libraries(snmpapi wine)
-add_importlibs(snmpapi msvcrt kernel32_vista kernel32 ntdll)
+add_delay_importlibs(snmpapi kernel32_vista)
+add_importlibs(snmpapi msvcrt kernel32 ntdll)
 add_cd_file(TARGET snmpapi DESTINATION reactos/system32 FOR all)
Index: dll/win32/urlmon/CMakeLists.txt
===================================================================
--- dll/win32/urlmon/CMakeLists.txt	(revision 75427)
+++ dll/win32/urlmon/CMakeLists.txt	(working copy)
@@ -45,6 +45,7 @@
 
 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 kernel32_vista msvcrt kernel32 ntdll)
+add_delay_importlibs(urlmon kernel32_vista)
+add_importlibs(urlmon rpcrt4 propsys ole32 oleaut32 shlwapi shell32 wininet user32 advapi32 advpack msvcrt kernel32 ntdll)
 add_pch(urlmon urlmon_main.h SOURCE)
 add_cd_file(TARGET urlmon DESTINATION reactos/system32 FOR all)
Index: dll/win32/wininet/CMakeLists.txt
===================================================================
--- dll/win32/wininet/CMakeLists.txt	(revision 75427)
+++ dll/win32/wininet/CMakeLists.txt	(working copy)
@@ -32,7 +32,7 @@
 
 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 normaliz kernel32_vista msvcrt kernel32 ntdll)
+add_delay_importlibs(wininet secur32 crypt32 cryptui kernel32_vista)
+add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 ws2_32 normaliz msvcrt kernel32 ntdll)
 add_pch(wininet internet.h SOURCE)
 add_cd_file(TARGET wininet DESTINATION reactos/system32 FOR all)