diff --git a/dll/cpl/joy/CMakeLists.txt b/dll/cpl/joy/CMakeLists.txt
index bd99d4c83b2..27c98ed4f4e 100644
--- a/dll/cpl/joy/CMakeLists.txt
+++ b/dll/cpl/joy/CMakeLists.txt
@@ -13,6 +13,9 @@ add_importlibs(joy
     user32
     comctl32
     ole32
-    shell32)
+    shell32
+    msvcrt
+    kernel32
+    ntdll)
 
 add_cab_target(joy 1)
diff --git a/dll/shellext/deskadp/CMakeLists.txt b/dll/shellext/deskadp/CMakeLists.txt
index 6b4b4bfe898..0ed62d85628 100644
--- a/dll/shellext/deskadp/CMakeLists.txt
+++ b/dll/shellext/deskadp/CMakeLists.txt
@@ -20,6 +20,7 @@ add_importlibs(deskadp
     gdi32
     comctl32
     ole32
+    msvcrt
     kernel32
     ntdll)
 
diff --git a/dll/shellext/deskmon/CMakeLists.txt b/dll/shellext/deskmon/CMakeLists.txt
index 31acba5e931..098c33dbb73 100644
--- a/dll/shellext/deskmon/CMakeLists.txt
+++ b/dll/shellext/deskmon/CMakeLists.txt
@@ -20,6 +20,7 @@ add_importlibs(deskmon
     gdi32
     comctl32
     ole32
+    msvcrt
     kernel32
     ntdll)
 
diff --git a/dll/shellext/devcpux/CMakeLists.txt b/dll/shellext/devcpux/CMakeLists.txt
index 4eaaea544f3..aa178eece85 100644
--- a/dll/shellext/devcpux/CMakeLists.txt
+++ b/dll/shellext/devcpux/CMakeLists.txt
@@ -11,6 +11,7 @@ add_importlibs(devcpux
     user32
     powrprof
     comctl32
+    msvcrt
     kernel32
     ntdll)
 
diff --git a/dll/shellext/fontext/CMakeLists.txt b/dll/shellext/fontext/CMakeLists.txt
index 0b61fe86010..c3f3d5a1f95 100644
--- a/dll/shellext/fontext/CMakeLists.txt
+++ b/dll/shellext/fontext/CMakeLists.txt
@@ -21,6 +21,7 @@ add_importlibs(fontext
     lz32
     advapi32
     setupapi
+    msvcrt
     kernel32
     ntdll)
 
diff --git a/dll/shellext/slayer/CMakeLists.txt b/dll/shellext/slayer/CMakeLists.txt
index b0fb986db83..dc24cb0e875 100644
--- a/dll/shellext/slayer/CMakeLists.txt
+++ b/dll/shellext/slayer/CMakeLists.txt
@@ -20,6 +20,7 @@ add_importlibs(slayer
     advapi32
     ole32
     shell32
+    msvcrt
     kernel32
     ntdll)
 
diff --git a/dll/win32/acledit/acledit.pdef b/dll/win32/acledit/acledit.pdef
deleted file mode 100644
index 7871db8bde9..00000000000
--- a/dll/win32/acledit/acledit.pdef
+++ /dev/null
@@ -1,24 +0,0 @@
-; File generated automatically, do not edit!
-
-LIBRARY acledit.dll
-
-EXPORTS
-#define FOOL(x) x
-#ifdef _MSC_VER
-#define _NAME_STDCALL(name, stackbytes) name
-#define _NAME_FASTCALL(name, stackbytes) name
-#define _NAME_CDECL(name, stackbytes) name
-#else
-#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes
-#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes
-#define _NAME_CDECL(name, stackbytes) FOOL(name)
-#endif
-#define _NAME_EXTERN(name, stackbytes) name
-#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes)
-_NAME(EditAuditInfo,STDCALL,4)
-_NAME(EditOwnerInfo,STDCALL,4)
-_NAME(EditPermissionInfo,STDCALL,4)
-_NAME(FMExtensionProcW,STDCALL,12)
-_NAME(SedDiscretionaryAclEditor,STDCALL,52)
-_NAME(SedSystemAclEditor,STDCALL,48)
-_NAME(SedTakeOwnership,STDCALL,56)
diff --git a/dll/win32/aclui/CMakeLists.txt b/dll/win32/aclui/CMakeLists.txt
index ff0d6084c14..9ad2e011c12 100644
--- a/dll/win32/aclui/CMakeLists.txt
+++ b/dll/win32/aclui/CMakeLists.txt
@@ -22,7 +22,7 @@ set_export_spec(aclui aclui.spec aclui.dll)
 
 add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/aclui.def)
 
-add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme kernel32 ntdll)
+add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme msvcrt kernel32 ntdll)
 
 add_pch(aclui ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
diff --git a/dll/win32/aclui/aclui.pdef b/dll/win32/aclui/aclui.pdef
deleted file mode 100644
index 9ffc762bc59..00000000000
--- a/dll/win32/aclui/aclui.pdef
+++ /dev/null
@@ -1,20 +0,0 @@
-; File generated automatically, do not edit!
-
-LIBRARY aclui.dll
-
-EXPORTS
-#define FOOL(x) x
-#if defined(__GNUC__) && defined(_X86_)
-#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes
-#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes
-#define _NAME_CDECL(name, stackbytes) FOOL(name)
-#else
-#define _NAME_STDCALL(name, stackbytes) name
-#define _NAME_FASTCALL(name, stackbytes) name
-#define _NAME_CDECL(name, stackbytes) name
-#endif
-#define _NAME_EXTERN(name, stackbytes) name
-#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes)
-_NAME(CreateSecurityPage,STDCALL,4)
-_NAME(EditSecurity,STDCALL,8)
-_NAME(IID_ISecurityInformation,EXTERN,0) DATA
diff --git a/dll/win32/activeds/CMakeLists.txt b/dll/win32/activeds/CMakeLists.txt
index 24c9b9a9bca..b72c4c31f71 100644
--- a/dll/win32/activeds/CMakeLists.txt
+++ b/dll/win32/activeds/CMakeLists.txt
@@ -11,7 +11,7 @@ set_module_type(activeds win32dll)
 
 target_link_libraries(activeds wine)
 
-add_importlibs(activeds kernel32 ntdll)
+add_importlibs(activeds msvcrt kernel32 ntdll)
 
 
 add_cab_target(activeds 1)
diff --git a/dll/win32/advpack/CMakeLists.txt b/dll/win32/advpack/CMakeLists.txt
index 08da12b3c54..392dd5345d9 100644
--- a/dll/win32/advpack/CMakeLists.txt
+++ b/dll/win32/advpack/CMakeLists.txt
@@ -20,6 +20,6 @@ set_module_type(advpack win32dll)
 
 target_link_libraries(advpack wine)
 
-add_importlibs(advpack ole32 setupapi version advapi32 kernel32 ntdll)
+add_importlibs(advpack ole32 setupapi version advapi32 msvcrt kernel32 ntdll)
 
 add_cab_target(advpack 1)
diff --git a/dll/win32/authz/CMakeLists.txt b/dll/win32/authz/CMakeLists.txt
index 18ecd0d9032..1638288098b 100644
--- a/dll/win32/authz/CMakeLists.txt
+++ b/dll/win32/authz/CMakeLists.txt
@@ -16,9 +16,7 @@ add_library(authz SHARED
 
 set_module_type(authz win32dll)
 
-
-
 add_pch(authz ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
-add_importlibs(authz advapi32 kernel32 ntdll)
+add_importlibs(authz advapi32 msvcrt kernel32 ntdll)
 
 add_cab_target(authz 1)
diff --git a/dll/win32/avicap32/CMakeLists.txt b/dll/win32/avicap32/CMakeLists.txt
index b0511ebbb92..c3fc804c4cf 100644
--- a/dll/win32/avicap32/CMakeLists.txt
+++ b/dll/win32/avicap32/CMakeLists.txt
@@ -12,7 +12,7 @@ set_module_type(avicap32 win32dll)
 
 target_link_libraries(avicap32 wine)
 
-add_importlibs(avicap32 advapi32 user32 version kernel32 ntdll)
+add_importlibs(avicap32 advapi32 user32 version msvcrt kernel32 ntdll)
 
 add_cab_target(avicap32 1)
 add_importlib_target(avicap32.spec)
diff --git a/dll/win32/avicap32/avicap32.pdef b/dll/win32/avicap32/avicap32.pdef
deleted file mode 100644
index 8e812eb8eb2..00000000000
--- a/dll/win32/avicap32/avicap32.pdef
+++ /dev/null
@@ -1,23 +0,0 @@
-; File generated automatically, do not edit!
-
-LIBRARY avicap32.dll
-
-EXPORTS
-#define FOOL(x) x
-#if defined(__GNUC__) && defined(_X86_)
-#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes
-#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes
-#define _NAME_CDECL(name, stackbytes) FOOL(name)
-#else
-#define _NAME_STDCALL(name, stackbytes) name
-#define _NAME_FASTCALL(name, stackbytes) name
-#define _NAME_CDECL(name, stackbytes) name
-#endif
-#define _NAME_EXTERN(name, stackbytes) name
-#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes)
-_NAME(AppCleanup,STDCALL,4)
-_NAME(capCreateCaptureWindowA,STDCALL,32)
-_NAME(capCreateCaptureWindowW,STDCALL,32)
-_NAME(capGetDriverDescriptionA,STDCALL,20)
-_NAME(capGetDriverDescriptionW,STDCALL,20)
-_NAME(videoThunk32,STDCALL,20)
diff --git a/dll/win32/batt/CMakeLists.txt b/dll/win32/batt/CMakeLists.txt
index a98fe0ff10f..b3018db767b 100644
--- a/dll/win32/batt/CMakeLists.txt
+++ b/dll/win32/batt/CMakeLists.txt
@@ -12,6 +12,6 @@ set_export_spec(batt batt.spec)
 
 add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/batt.def)
 
-add_importlibs(batt kernel32)
+add_importlibs(batt msvcrt kernel32)
 
 add_cab_target(batt 1)
diff --git a/dll/win32/batt/batt.pdef b/dll/win32/batt/batt.pdef
deleted file mode 100644
index 78775e6599e..00000000000
--- a/dll/win32/batt/batt.pdef
+++ /dev/null
@@ -1,19 +0,0 @@
-; File generated automatically, do not edit!
-
-LIBRARY batt.dll
-
-EXPORTS
-#define FOOL(x) x
-#if defined(__GNUC__) && defined(_X86_)
-#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes
-#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes
-#define _NAME_CDECL(name, stackbytes) FOOL(name)
-#else
-#define _NAME_STDCALL(name, stackbytes) name
-#define _NAME_FASTCALL(name, stackbytes) name
-#define _NAME_CDECL(name, stackbytes) name
-#endif
-#define _NAME_EXTERN(name, stackbytes) name
-#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes)
-_NAME(BatteryClassCoInstaller,STDCALL,16)
-_NAME(BatteryClassInstall,STDCALL,12)
diff --git a/dll/win32/bcrypt/CMakeLists.txt b/dll/win32/bcrypt/CMakeLists.txt
index 43666ff3866..fe8f4b4b518 100644
--- a/dll/win32/bcrypt/CMakeLists.txt
+++ b/dll/win32/bcrypt/CMakeLists.txt
@@ -13,7 +13,7 @@ set_module_type(bcrypt win32dll)
 
 target_link_libraries(bcrypt wine)
 
-add_importlibs(bcrypt kernel32 ntdll)
+add_importlibs(bcrypt msvcrt kernel32 ntdll)
 
 
 add_cab_target(bcrypt 1)
diff --git a/dll/win32/cards/CMakeLists.txt b/dll/win32/cards/CMakeLists.txt
index d70f55507ca..3e5e8f938c1 100644
--- a/dll/win32/cards/CMakeLists.txt
+++ b/dll/win32/cards/CMakeLists.txt
@@ -15,6 +15,6 @@ add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/cards.def)
 
 set_module_type(cards win32dll)
 
-add_importlibs(cards user32 gdi32)
+add_importlibs(cards user32 gdi32 msvcrt kernel32)
 
 add_cab_target(cards 1)
diff --git a/dll/win32/cards/cards.pdef b/dll/win32/cards/cards.pdef
deleted file mode 100644
index e6c19e97217..00000000000
--- a/dll/win32/cards/cards.pdef
+++ /dev/null
@@ -1,23 +0,0 @@
-; File generated automatically, do not edit!
-
-LIBRARY cards.dll
-
-EXPORTS
-#define FOOL(x) x
-#if defined(__GNUC__) && defined(_X86_)
-#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes
-#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes
-#define _NAME_CDECL(name, stackbytes) FOOL(name)
-#else
-#define _NAME_STDCALL(name, stackbytes) name
-#define _NAME_FASTCALL(name, stackbytes) name
-#define _NAME_CDECL(name, stackbytes) name
-#endif
-#define _NAME_EXTERN(name, stackbytes) name
-#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes)
-_NAME(WEP,STDCALL,4)
-_NAME(cdtAnimate,STDCALL,20)
-_NAME(cdtDraw,STDCALL,24)
-_NAME(cdtDrawExt,STDCALL,32)
-_NAME(cdtInit,STDCALL,8)
-_NAME(cdtTerm,STDCALL,0)
diff --git a/dll/win32/clusapi/CMakeLists.txt b/dll/win32/clusapi/CMakeLists.txt
index e0535da6895..880c1e7cc27 100644
--- a/dll/win32/clusapi/CMakeLists.txt
+++ b/dll/win32/clusapi/CMakeLists.txt
@@ -11,6 +11,6 @@ set_module_type(clusapi win32dll)
 
 target_link_libraries(clusapi wine)
 
-add_importlibs(clusapi kernel32 ntdll)
+add_importlibs(clusapi msvcrt kernel32 ntdll)
 
 add_cab_target(clusapi 1)
diff --git a/dll/win32/compstui/CMakeLists.txt b/dll/win32/compstui/CMakeLists.txt
index dc28ea6ef1d..f42488ad740 100644
--- a/dll/win32/compstui/CMakeLists.txt
+++ b/dll/win32/compstui/CMakeLists.txt
@@ -10,7 +10,7 @@ set_export_spec(compstui compstui.spec)
 
 target_link_libraries(compstui wine)
 
-add_importlibs(compstui kernel32 ntdll)
+add_importlibs(compstui msvcrt kernel32 ntdll)
 
 add_cab_target(compstui 1)
 add_importlib_target(compstui.spec)
diff --git a/dll/win32/compstui/compstui.pdef b/dll/win32/compstui/compstui.pdef
deleted file mode 100644
index cac0069b55f..00000000000
--- a/dll/win32/compstui/compstui.pdef
+++ /dev/null
@@ -1,21 +0,0 @@
-; File generated automatically, do not edit!
-
-LIBRARY compstui.dll
-
-EXPORTS
-#define FOOL(x) x
-#if defined(__GNUC__) && defined(_X86_)
-#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes
-#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes
-#define _NAME_CDECL(name, stackbytes) FOOL(name)
-#else
-#define _NAME_STDCALL(name, stackbytes) name
-#define _NAME_FASTCALL(name, stackbytes) name
-#define _NAME_CDECL(name, stackbytes) name
-#endif
-#define _NAME_EXTERN(name, stackbytes) name
-#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes)
-_NAME(CommonPropertySheetUIA,STDCALL,16)
-_NAME(CommonPropertySheetUIW,STDCALL,16)
-_NAME(GetCPSUIUserData,STDCALL,4)
-_NAME(SetCPSUIUserData,STDCALL,8)
diff --git a/dll/win32/credui/CMakeLists.txt b/dll/win32/credui/CMakeLists.txt
index 57a5b5bc3dd..e69e1afe547 100644
--- a/dll/win32/credui/CMakeLists.txt
+++ b/dll/win32/credui/CMakeLists.txt
@@ -11,6 +11,6 @@ set_module_type(credui win32dll)
 
 target_link_libraries(credui wine)
 
-add_importlibs(credui advapi32 user32 comctl32 kernel32 ntdll)
+add_importlibs(credui advapi32 user32 comctl32 msvcrt kernel32 ntdll)
 
 add_cab_target(credui 1)
diff --git a/dll/win32/crtdll/CMakeLists.txt b/dll/win32/crtdll/CMakeLists.txt
index 386413ef9ca..8658ece4d84 100644
--- a/dll/win32/crtdll/CMakeLists.txt
+++ b/dll/win32/crtdll/CMakeLists.txt
@@ -29,7 +29,7 @@ target_link_libraries(crtdll
     wine
     crt)
 
-add_importlibs(crtdll kernel32 ntdll)
+add_importlibs(crtdll msvcrt kernel32 ntdll)
 add_pch(crtdll ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 add_cab_target(crtdll 1)
diff --git a/dll/win32/cryptdlg/CMakeLists.txt b/dll/win32/cryptdlg/CMakeLists.txt
index 8193f33b1ee..83e4f0115ab 100644
--- a/dll/win32/cryptdlg/CMakeLists.txt
+++ b/dll/win32/cryptdlg/CMakeLists.txt
@@ -16,6 +16,7 @@ add_importlibs(cryptdlg
     crypt32
     cryptui
     wintrust
+    msvcrt
     kernel32
     ntdll)
 
diff --git a/dll/win32/cryptnet/CMakeLists.txt b/dll/win32/cryptnet/CMakeLists.txt
index db8fe3387b5..c71b4f01351 100644
--- a/dll/win32/cryptnet/CMakeLists.txt
+++ b/dll/win32/cryptnet/CMakeLists.txt
@@ -13,6 +13,7 @@ target_link_libraries(cryptnet wine)
 add_importlibs(cryptnet
     crypt32
     wininet
+    msvcrt
     kernel32
     ntdll)
 
diff --git a/dll/win32/cryptui/CMakeLists.txt b/dll/win32/cryptui/CMakeLists.txt
index 5f644d06ee0..9f5f84eb07a 100644
--- a/dll/win32/cryptui/CMakeLists.txt
+++ b/dll/win32/cryptui/CMakeLists.txt
@@ -23,6 +23,7 @@ add_importlibs(cryptui
     wintrust
     comctl32
     comdlg32
+    msvcrt
     kernel32
     ntdll)
 
diff --git a/dll/win32/dciman32/CMakeLists.txt b/dll/win32/dciman32/CMakeLists.txt
index d3aeb9e10de..156a79a7052 100644
--- a/dll/win32/dciman32/CMakeLists.txt
+++ b/dll/win32/dciman32/CMakeLists.txt
@@ -11,6 +11,6 @@ set_module_type(dciman32 win32dll)
 
 target_link_libraries(dciman32 wine)
 
-add_importlibs(dciman32 kernel32 ntdll)
+add_importlibs(dciman32 msvcrt kernel32 ntdll)
 
 add_cab_target(dciman32 1)
diff --git a/dll/win32/devmgr/CMakeLists.txt b/dll/win32/devmgr/CMakeLists.txt
index bd4cc8800c3..e684ec4bccd 100644
--- a/dll/win32/devmgr/CMakeLists.txt
+++ b/dll/win32/devmgr/CMakeLists.txt
@@ -25,6 +25,7 @@ add_importlibs(devmgr
     advapi32
     user32
     version
+    msvcrt
     kernel32
     ntdll)
 
diff --git a/dll/win32/dwmapi/CMakeLists.txt b/dll/win32/dwmapi/CMakeLists.txt
index 520fb559bcc..89e9e6dc9e6 100644
--- a/dll/win32/dwmapi/CMakeLists.txt
+++ b/dll/win32/dwmapi/CMakeLists.txt
@@ -11,6 +11,6 @@ set_module_type(dwmapi win32dll)
 
 target_link_libraries(dwmapi wine)
 
-add_importlibs(dwmapi kernel32 ntdll)
+add_importlibs(dwmapi msvcrt kernel32 ntdll)
 
 add_cab_target(dwmapi 1)
diff --git a/dll/win32/faultrep/CMakeLists.txt b/dll/win32/faultrep/CMakeLists.txt
index 58ffce7f3b5..e70b61068a1 100644
--- a/dll/win32/faultrep/CMakeLists.txt
+++ b/dll/win32/faultrep/CMakeLists.txt
@@ -11,6 +11,6 @@ set_module_type(faultrep win32dll)
 
 target_link_libraries(faultrep wine)
 
-add_importlibs(faultrep advapi32 kernel32 ntdll)
+add_importlibs(faultrep advapi32 msvcrt kernel32 ntdll)
 
 add_cab_target(faultrep 1)
diff --git a/dll/win32/fusion/CMakeLists.txt b/dll/win32/fusion/CMakeLists.txt
index 4833dbd78b8..af9af89f293 100644
--- a/dll/win32/fusion/CMakeLists.txt
+++ b/dll/win32/fusion/CMakeLists.txt
@@ -18,6 +18,6 @@ set_module_type(fusion win32dll)
 
 target_link_libraries(fusion wine)
 
-add_importlibs(fusion shlwapi advapi32 dbghelp user32 kernel32 ntdll)
+add_importlibs(fusion shlwapi advapi32 dbghelp user32 msvcrt kernel32 ntdll)
 
 add_cab_target(fusion 1)
diff --git a/dll/win32/gdi32/CMakeLists.txt b/dll/win32/gdi32/CMakeLists.txt
index 9ac4bf019d6..2017a7c6bb8 100644
--- a/dll/win32/gdi32/CMakeLists.txt
+++ b/dll/win32/gdi32/CMakeLists.txt
@@ -52,7 +52,7 @@ target_link_libraries(gdi32
 
 set_export_spec(gdi32 gdi32.spec)
 
-add_importlibs(gdi32 user32 advapi32 kernel32 ntdll)
+add_importlibs(gdi32 user32 advapi32 msvcrt kernel32 ntdll)
 add_pch(gdi32 ${CMAKE_CURRENT_SOURCE_DIR}/include/precomp.h ${SOURCE})
 add_cab_target(gdi32 1)
 add_importlib_target(gdi32.spec)
diff --git a/dll/win32/getuname/CMakeLists.txt b/dll/win32/getuname/CMakeLists.txt
index 04fce339972..56b70e7b402 100644
--- a/dll/win32/getuname/CMakeLists.txt
+++ b/dll/win32/getuname/CMakeLists.txt
@@ -14,6 +14,6 @@ add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/getuname.def)
 
 set_module_type(getuname win32dll)
 
-add_importlibs(getuname kernel32 ntdll)
+add_importlibs(getuname msvcrt kernel32 ntdll)
 
 add_cab_target(getuname 1)
diff --git a/dll/win32/getuname/getuname.pdef b/dll/win32/getuname/getuname.pdef
deleted file mode 100644
index d483b4e8c12..00000000000
--- a/dll/win32/getuname/getuname.pdef
+++ /dev/null
@@ -1,18 +0,0 @@
-; File generated automatically, do not edit!
-
-LIBRARY getuname.dll
-
-EXPORTS
-#define FOOL(x) x
-#if defined(__GNUC__) && defined(_X86_)
-#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes
-#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes
-#define _NAME_CDECL(name, stackbytes) FOOL(name)
-#else
-#define _NAME_STDCALL(name, stackbytes) name
-#define _NAME_FASTCALL(name, stackbytes) name
-#define _NAME_CDECL(name, stackbytes) name
-#endif
-#define _NAME_EXTERN(name, stackbytes) name
-#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes)
-_NAME(GetUName,STDCALL,8)
diff --git a/dll/win32/hhctrl.ocx/CMakeLists.txt b/dll/win32/hhctrl.ocx/CMakeLists.txt
index a4858d67030..88f4b14d265 100644
--- a/dll/win32/hhctrl.ocx/CMakeLists.txt
+++ b/dll/win32/hhctrl.ocx/CMakeLists.txt
@@ -34,6 +34,7 @@ add_importlibs(hhctrl
     oleaut32
     user32
     gdi32
+    msvcrt
     kernel32
     ntdll)
 
diff --git a/dll/win32/hid/CMakeLists.txt b/dll/win32/hid/CMakeLists.txt
index 343bcc1607a..0a288951ce1 100644
--- a/dll/win32/hid/CMakeLists.txt
+++ b/dll/win32/hid/CMakeLists.txt
@@ -15,9 +15,7 @@ add_library(hid SHARED
 
 set_module_type(hid win32dll)
 
-
-
-add_importlibs(hid kernel32 ntdll)
+add_importlibs(hid msvcrt kernel32 ntdll)
 add_pch(hid ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 add_cab_target(hid 1)
diff --git a/dll/win32/hlink/CMakeLists.txt b/dll/win32/hlink/CMakeLists.txt
index d3d0d539ad5..060a428235e 100644
--- a/dll/win32/hlink/CMakeLists.txt
+++ b/dll/win32/hlink/CMakeLists.txt
@@ -22,6 +22,7 @@ add_importlibs(hlink
     ole32
     advapi32
     urlmon
+    msvcrt
     kernel32
     ntdll)
 
diff --git a/dll/win32/hnetcfg/CMakeLists.txt b/dll/win32/hnetcfg/CMakeLists.txt
index 2c37454bb54..f67ab0266d7 100644
--- a/dll/win32/hnetcfg/CMakeLists.txt
+++ b/dll/win32/hnetcfg/CMakeLists.txt
@@ -28,6 +28,7 @@ target_link_libraries(hnetcfg wine)
 add_importlibs(hnetcfg
     ole32
     advapi32
+    msvcrt
     kernel32
     ntdll)
 
diff --git a/dll/win32/httpapi/CMakeLists.txt b/dll/win32/httpapi/CMakeLists.txt
index 0c905073ef7..ae932c016f2 100644
--- a/dll/win32/httpapi/CMakeLists.txt
+++ b/dll/win32/httpapi/CMakeLists.txt
@@ -11,6 +11,6 @@ set_module_type(httpapi win32dll)
 
 target_link_libraries(httpapi wine)
 
-add_importlibs(httpapi kernel32 ntdll)
+add_importlibs(httpapi msvcrt kernel32 ntdll)
 
 add_cab_target(httpapi 1)
diff --git a/dll/win32/iccvid/CMakeLists.txt b/dll/win32/iccvid/CMakeLists.txt
index a9106da90a2..32aec00d350 100644
--- a/dll/win32/iccvid/CMakeLists.txt
+++ b/dll/win32/iccvid/CMakeLists.txt
@@ -12,6 +12,6 @@ set_module_type(iccvid win32dll)
 
 target_link_libraries(iccvid wine)
 
-add_importlibs(iccvid user32 kernel32 ntdll)
+add_importlibs(iccvid user32 msvcrt kernel32 ntdll)
 
 add_cab_target(iccvid 1)
diff --git a/dll/win32/icmp/CMakeLists.txt b/dll/win32/icmp/CMakeLists.txt
index ec441913e08..c0133a22bb4 100644
--- a/dll/win32/icmp/CMakeLists.txt
+++ b/dll/win32/icmp/CMakeLists.txt
@@ -9,6 +9,6 @@ set_module_type(icmp win32dll)
 
 target_link_libraries(icmp wine)
 
-add_importlibs(icmp ws2_32 kernel32 ntdll)
+add_importlibs(icmp ws2_32 msvcrt kernel32 ntdll)
 add_dependencies(icmp psdk)
 add_cab_target(icmp 1)
diff --git a/dll/win32/imagehlp/CMakeLists.txt b/dll/win32/imagehlp/CMakeLists.txt
index 37677f11a55..5ed8b9613aa 100644
--- a/dll/win32/imagehlp/CMakeLists.txt
+++ b/dll/win32/imagehlp/CMakeLists.txt
@@ -22,7 +22,7 @@ set_module_type(imagehlp win32dll)
 
 target_link_libraries(imagehlp wine)
 
-add_importlibs(imagehlp dbghelp kernel32 ntdll)
+add_importlibs(imagehlp dbghelp msvcrt kernel32 ntdll)
 add_pch(imagehlp ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 
 add_cab_target(imagehlp 1)
diff --git a/dll/win32/imm32/CMakeLists.txt b/dll/win32/imm32/CMakeLists.txt
index a9ae2eb9181..1bee229ba4f 100644
--- a/dll/win32/imm32/CMakeLists.txt
+++ b/dll/win32/imm32/CMakeLists.txt
@@ -14,7 +14,7 @@ set_module_type(imm32 win32dll)
 
 target_link_libraries(imm32 wine)
 
-add_importlibs(imm32 advapi32 user32 kernel32 ntdll)
+add_importlibs(imm32 advapi32 user32 msvcrt kernel32 ntdll)
 
 add_cab_target(imm32 1)
 add_importlib_target(imm32.spec)
diff --git a/dll/win32/inetcomm/CMakeLists.txt b/dll/win32/inetcomm/CMakeLists.txt
index 59e58e2a95b..34a573e3dff 100644
--- a/dll/win32/inetcomm/CMakeLists.txt
+++ b/dll/win32/inetcomm/CMakeLists.txt
@@ -29,6 +29,7 @@ add_importlibs(inetcomm
     ws2_32
     user32
     advapi32
+    msvcrt
     kernel32
     ntdll)
 
diff --git a/dll/win32/initpki/CMakeLists.txt b/dll/win32/initpki/CMakeLists.txt
index 2c926e520c5..2a67b92c085 100644
--- a/dll/win32/initpki/CMakeLists.txt
+++ b/dll/win32/initpki/CMakeLists.txt
@@ -10,6 +10,6 @@ set_module_type(initpki win32dll)
 
 target_link_libraries(initpki wine)
 
-add_importlibs(initpki kernel32 ntdll)
+add_importlibs(initpki msvcrt kernel32 ntdll)
 
 add_cab_target(initpki 1)
diff --git a/dll/win32/inseng/CMakeLists.txt b/dll/win32/inseng/CMakeLists.txt
index 970a2219427..3d9ad986e6b 100644
--- a/dll/win32/inseng/CMakeLists.txt
+++ b/dll/win32/inseng/CMakeLists.txt
@@ -17,6 +17,7 @@ target_link_libraries(inseng
 add_importlibs(inseng
     ole32
     advapi32
+    msvcrt
     kernel32
     ntdll)
 
diff --git a/dll/win32/itss/CMakeLists.txt b/dll/win32/itss/CMakeLists.txt
index 791937e9c05..ea68a80efec 100644
--- a/dll/win32/itss/CMakeLists.txt
+++ b/dll/win32/itss/CMakeLists.txt
@@ -24,6 +24,7 @@ add_importlibs(itss
     urlmon
     shlwapi
     ole32
+    msvcrt
     kernel32
     ntdll)
 
diff --git a/dll/win32/loadperf/CMakeLists.txt b/dll/win32/loadperf/CMakeLists.txt
index 5555a275641..eb5cce57c5c 100644
--- a/dll/win32/loadperf/CMakeLists.txt
+++ b/dll/win32/loadperf/CMakeLists.txt
@@ -15,7 +15,7 @@ target_link_libraries(loadperf
     ${CMAKE_CURRENT_BINARY_DIR}/loadperf.def
     wine)
 
-add_importlibs(loadperf kernel32 ntdll)
+add_importlibs(loadperf msvcrt kernel32 ntdll)
 
 add_cab_target(loadperf 1)
 add_importlib_target(loadperf.spec)