diff --git a/tools/winapi/make_parser.pm b/tools/winapi/make_parser.pm
index 3b389c590d1..00c1ed95c1d 100644
--- a/tools/winapi/make_parser.pm
+++ b/tools/winapi/make_parser.pm
@@ -153,6 +153,8 @@ sub line {
 	ld_output("collect2", $_);
     } elsif($tool eq "gcc" && s/^(.+?\.[chly]):\s*//) {
 	gcc_output($1, $_);
+    } elsif($tool eq "ld" && s/^(.+?\.c):(?:\d+:)?\s*//) {
+	ld_output($1, $_);
     } elsif($tool eq "winebuild" && s/^(.+?\.spec):\s*//) {
 	winebuild_output($1, $_);
     } elsif($tool eq "wmc" && s/^(.+?\.mc):\s*//) {
@@ -166,7 +168,7 @@ sub line {
     } else {
 	error("line");
     }
-    
+
     $file =~ s/^\.\///;
 
     return 1;
diff --git a/tools/winapi_check/modules.dat b/tools/winapi_check/modules.dat
index 0d40938fbb0..002cf558bed 100644
--- a/tools/winapi_check/modules.dat
+++ b/tools/winapi_check/modules.dat
@@ -146,6 +146,10 @@ dlls/msrle32
 
 dlls/msvcrt
 
+% dlls/msvcrt20/msvcrt20.spec
+
+dlls/msvcrt20
+
 % dlls/kernel/stress.spec
 
 dlls/kernel
diff --git a/tools/winapi_check/win32/kernel32.api b/tools/winapi_check/win32/kernel32.api
index 66b0b7213a4..d026b32db1f 100644
--- a/tools/winapi_check/win32/kernel32.api
+++ b/tools/winapi_check/win32/kernel32.api
@@ -52,10 +52,11 @@ BY_HANDLE_FILE_INFORMATION *
 CHAR_INFO *
 DWORD *
 CALINFO_ENUMPROCA
-CONTEXT *
-CONTEXT86 *
 CODEPAGE_ENUMPROCA
 CODEPAGE_ENUMPROCW
+CONTEXT *
+CONTEXT86 *
+COMPUTER_NAME_FORMAT
 CRITICAL_SECTION *
 CURRENCYFMTA *
 CURRENCYFMTW *
diff --git a/tools/winapi_check/win32/mapi32.api b/tools/winapi_check/win32/mapi32.api
index 8b137891791..d96bb1f1616 100644
--- a/tools/winapi_check/win32/mapi32.api
+++ b/tools/winapi_check/win32/mapi32.api
@@ -1 +1,20 @@
+%long
 
+FLAGS
+HRESULT
+ULONG
+
+%ptr
+
+LPLHANDLE
+LPVOID
+LPVOID *
+VOID *
+
+%str
+
+LPSTR
+
+%void
+
+VOID
diff --git a/tools/winapi_check/win32/msimg32.api b/tools/winapi_check/win32/msimg32.api
index 8b137891791..a06e3e36064 100644
--- a/tools/winapi_check/win32/msimg32.api
+++ b/tools/winapi_check/win32/msimg32.api
@@ -1 +1,10 @@
+%long
+
+BOOL
+HDC
+ULONG
+
+%ptr
+
+void *
 
diff --git a/tools/winapi_check/win32/ntdll.api b/tools/winapi_check/win32/ntdll.api
index 032a8514b0d..ee8685305f1 100644
--- a/tools/winapi_check/win32/ntdll.api
+++ b/tools/winapi_check/win32/ntdll.api
@@ -113,7 +113,7 @@ WCHAR *
 WCHAR ***
 char *
 char ***
-enum __DEBUG_CLASS
+enum __WINE_DEBUG_CLASS
 va_list
 
 %str
diff --git a/tools/winapi_check/win32/oleaut32.api b/tools/winapi_check/win32/oleaut32.api
index 616df9dc564..3638c26a285 100644
--- a/tools/winapi_check/win32/oleaut32.api
+++ b/tools/winapi_check/win32/oleaut32.api
@@ -69,6 +69,7 @@ LPSTREAM
 LPSYSTEMTIME
 LPUNKNOWN
 LPUNKNOWN *
+LPVARIANT
 LPVOID
 LPVOID *
 NUMPARSE *
diff --git a/tools/winapi_check/win32/rpcrt4.api b/tools/winapi_check/win32/rpcrt4.api
index 0acc8bc308c..3726cd2a533 100644
--- a/tools/winapi_check/win32/rpcrt4.api
+++ b/tools/winapi_check/win32/rpcrt4.api
@@ -10,10 +10,15 @@ ULONG
 %ptr
 
 CLSID *
+CStdPSFactoryBuffer *
 LPSTR *
 LPVOID
+LPVOID *
 LPWSTR *
 PRPC_POLICY
+ProxyFileInfo **
+REFCLSID
+REFIID
 RPC_AUTH_KEY_RETRIEVAL_FN
 RPC_BINDING_HANDLE *
 RPC_IF_CALLBACK_FN *
@@ -22,7 +27,7 @@ RPC_STATUS *
 UUID *
 unsigned char **
 unsigned short
-void **
+void *
 
 %str
 
diff --git a/tools/winapi_check/win32/wininet.api b/tools/winapi_check/win32/wininet.api
index 6069eb53661..5e70b0a3494 100644
--- a/tools/winapi_check/win32/wininet.api
+++ b/tools/winapi_check/win32/wininet.api
@@ -3,6 +3,7 @@
 BOOL
 DWORD
 FILETIME
+HANDLE
 HINTERNET
 HRESULT
 INTERNET_PORT
@@ -15,6 +16,7 @@ LPCVOID
 LPDWORD
 LPINTERNET_BUFFERSA
 LPINTERNET_CACHE_ENTRY_INFOA
+LPINTERNET_CACHE_ENTRY_INFOW
 LPURL_COMPONENTSA
 LPVOID
 LPWIN32_FIND_DATAA