diff --git a/tools/winapi_check/modules.dat b/tools/winapi_check/modules.dat
index 86282d65d22..7410a51af6d 100644
--- a/tools/winapi_check/modules.dat
+++ b/tools/winapi_check/modules.dat
@@ -4,6 +4,10 @@ dlls/advapi32
 memory
 misc
 
+% dlls/avicap32/avicap32.spec
+
+dlls/avicap32
+
 % dlls/avifil32/avifil32.spec
 
 dlls/avifil32
@@ -37,6 +41,10 @@ dlls/dciman32
 dlls/ddraw
 dlls/ddraw/dclipper
 
+% dlls/devenum/devenum.spec
+
+dlls/devenum
+
 % dlls/dinput/dinput.spec
 
 dlls/dinput
@@ -128,6 +136,10 @@ dlls/mapi32
 
 dlls/msimg32
 
+% dlls/msrle32/msrle32.spec
+
+dlls/msrle32
+
 % dlls/msvcrt/msvcrt.spec
 
 dlls/msvcrt
@@ -168,6 +180,10 @@ dlls/lzexpand
 
 dlls/lzexpand
 
+% dlls/msdmo/msdmo.spec
+
+dlls/msdmo
+
 % dlls/mpr/mpr.spec
 
 dlls/mpr
@@ -190,6 +206,10 @@ dlls/msvideo
 
 dlls/msvideo
 
+% dlls/netapi32/netapi32.spec
+
+dlls/netapi32
+
 % dlls/ntdll/ntdll.spec
 
 dlls/ntdll
@@ -234,6 +254,10 @@ dlls/oleaut32
 
 dlls/oleaut32
 
+% dlls/qcap/qcap.spec
+
+dlls/qcap
+
 % dlls/oleaut32/typelib.spec
 
 dlls/oleaut32
diff --git a/tools/winapi_check/win16/winsock.api b/tools/winapi_check/win16/winsock.api
index 3474e12b599..a0555cb02bc 100644
--- a/tools/winapi_check/win16/winsock.api
+++ b/tools/winapi_check/win16/winsock.api
@@ -14,9 +14,9 @@ INT16 *
 LPWSADATA16
 ULONG *
 char *
-struct timeval *
+struct WS_sockaddr *
+struct WS_timeval *
 ws_fd_set16 *
-ws_sockaddr *
 
 %segptr
 
diff --git a/tools/winapi_check/win32/avicap32.api b/tools/winapi_check/win32/avicap32.api
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/tools/winapi_check/win32/avicap32.api
@@ -0,0 +1 @@
+
diff --git a/tools/winapi_check/win32/mapi32.api b/tools/winapi_check/win32/mapi32.api
index e69de29bb2d..8b137891791 100644
--- a/tools/winapi_check/win32/mapi32.api
+++ b/tools/winapi_check/win32/mapi32.api
@@ -0,0 +1 @@
+
diff --git a/tools/winapi_check/win32/msimg32.api b/tools/winapi_check/win32/msimg32.api
index e69de29bb2d..8b137891791 100644
--- a/tools/winapi_check/win32/msimg32.api
+++ b/tools/winapi_check/win32/msimg32.api
@@ -0,0 +1 @@
+
diff --git a/tools/winapi_check/win32/msrle32.api b/tools/winapi_check/win32/msrle32.api
new file mode 100644
index 00000000000..ad54723eaab
--- /dev/null
+++ b/tools/winapi_check/win32/msrle32.api
@@ -0,0 +1,6 @@
+%long
+
+DWORD
+HDRVR
+LONG
+UINT
diff --git a/tools/winapi_check/win32/msvcrt.api b/tools/winapi_check/win32/msvcrt.api
index 354930357c8..32e6398ee18 100644
--- a/tools/winapi_check/win32/msvcrt.api
+++ b/tools/winapi_check/win32/msvcrt.api
@@ -63,6 +63,7 @@ struct _stat *
 struct _timeb *
 struct _utimbuf *
 struct _wfinddata_t *
+struct MSVCRT_tm *
 terminate_function
 type_info *
 unexpected_function
diff --git a/tools/winapi_check/win32/msvfw32.api b/tools/winapi_check/win32/msvfw32.api
index 9c129ab3f93..7203f4a6dc2 100644
--- a/tools/winapi_check/win32/msvfw32.api
+++ b/tools/winapi_check/win32/msvfw32.api
@@ -2,6 +2,7 @@
 
 BOOL
 DWORD
+HANDLE
 HDC
 HDRAWDIB
 HIC
@@ -18,6 +19,8 @@ WORD
 
 FARPROC
 ICINFO *
+LONG *
+LPBITMAPINFO
 LPBITMAPINFOHEADER
 LPDWORD
 LPVOID
diff --git a/tools/winapi_check/win32/netapi32.api b/tools/winapi_check/win32/netapi32.api
new file mode 100644
index 00000000000..cac5b27002a
--- /dev/null
+++ b/tools/winapi_check/win32/netapi32.api
@@ -0,0 +1,7 @@
+%long
+
+BOOL
+
+%ptr
+
+PNCB
diff --git a/tools/winapi_check/win32/shlwapi.api b/tools/winapi_check/win32/shlwapi.api
index c1a64b4e9e1..2dcd11bf49b 100644
--- a/tools/winapi_check/win32/shlwapi.api
+++ b/tools/winapi_check/win32/shlwapi.api
@@ -15,12 +15,15 @@ HMENU
 HMODULE
 HPALETTE
 HRESULT
+HUSKEY
 HWND
 LPARAM
 LRESULT
 UCHAR
 REGSAM
+SHREGENUM_FLAGS
 UINT
+URLIS
 WCHAR
 WORD
 WPARAM
@@ -53,15 +56,18 @@ LPSHFILEOPSTRUCTW
 LPSTRRET
 LPUNKNOWN *
 LPVOID
+LPVOID *
+PHUSKEY
 REFIID
 REFGUID
 SHFILEINFOW *
 unsigned char *
-void *
 WNDCLASSA *
 
 %ptr --extension
 
+UNKNOWN_SHLWAPI_1 *
+UNKNOWN_SHLWAPI_2 *
 WNDCLASSW *
 
 %str
diff --git a/tools/winapi_check/win32/sti.api b/tools/winapi_check/win32/sti.api
index e69de29bb2d..8b137891791 100644
--- a/tools/winapi_check/win32/sti.api
+++ b/tools/winapi_check/win32/sti.api
@@ -0,0 +1 @@
+
diff --git a/tools/winapi_check/win32/ttydrv.api b/tools/winapi_check/win32/ttydrv.api
index 39439a3a173..6193ca51655 100644
--- a/tools/winapi_check/win32/ttydrv.api
+++ b/tools/winapi_check/win32/ttydrv.api
@@ -24,20 +24,15 @@ int
 %ptr
 
 BITMAPINFO *
-BYTE *
 DC *
 DEVMODEA *
 DWORD *
 CREATESTRUCTA *
 LPBYTE
 LPCVOID
-LPDIDEVICEOBJECTDATA
-LPDWORD
 LPINT
-LPMOUSE_EVENT_PROC
 LPSIZE
 LPTEXTMETRICW
-LPVOID
 INT *
 POINT *
 RECT *
diff --git a/tools/winapi_check/win32/url.api b/tools/winapi_check/win32/url.api
index e69de29bb2d..8b137891791 100644
--- a/tools/winapi_check/win32/url.api
+++ b/tools/winapi_check/win32/url.api
@@ -0,0 +1 @@
+
diff --git a/tools/winapi_check/win32/urlmon.api b/tools/winapi_check/win32/urlmon.api
index cfbd512960d..e38c1cf961a 100644
--- a/tools/winapi_check/win32/urlmon.api
+++ b/tools/winapi_check/win32/urlmon.api
@@ -19,4 +19,3 @@ REFIID
 %wstr
 
 LPCWSTR
-LPWSTR
diff --git a/tools/winapi_check/win32/winedos.api b/tools/winapi_check/win32/winedos.api
index ac266a32a7c..b03645089ef 100644
--- a/tools/winapi_check/win32/winedos.api
+++ b/tools/winapi_check/win32/winedos.api
@@ -5,13 +5,16 @@ BYTE
 HANDLE
 INT
 UINT
+ULONG_PTR
 WORD
 
 
 %ptr
 
 CONTEXT86 *
+BYTE *
 DOSRELAY
+PAPCFUNC
 LPDOSTASK
 LPVOID
 
diff --git a/tools/winapi_check/win32/ws2_32.api b/tools/winapi_check/win32/ws2_32.api
index f473bfddda5..a1bdfccfad4 100644
--- a/tools/winapi_check/win32/ws2_32.api
+++ b/tools/winapi_check/win32/ws2_32.api
@@ -12,13 +12,10 @@ UINT
 WORD
 WSAEVENT
 int
+long
 u_long
 u_short
 
-%long # --forbidden
-
-SOCKET16
-
 %ptr
 
 FARPROC
@@ -35,16 +32,15 @@ LPWSAOVERLAPPED_COMPLETION_ROUTINE
 LPWSANETWORKEVENTS
 LPWSAPROTOCOL_INFOA
 LPWSAPROTOCOL_INFOW
-ULONG *
-WIN_hostent *
-WIN_protoent *
-WIN_servent *
+WS_fd_set *
 char *
 int *
-struct sockaddr *
-struct timeval *
-ws_fd_set32 *
-ws_sockaddr *
+u_long *
+struct WS_hostent *
+struct WS_protoent *
+struct WS_servent *
+struct WS_sockaddr *
+struct WS_timeval *
 
 %str
 
@@ -53,7 +49,7 @@ LPSTR
 
 %unknown
 
-struct in_addr
+struct WS_in_addr
 
 %void
 
diff --git a/tools/winapi_check/win32/x11drv.api b/tools/winapi_check/win32/x11drv.api
index f81114539b4..3048fece732 100644
--- a/tools/winapi_check/win32/x11drv.api
+++ b/tools/winapi_check/win32/x11drv.api
@@ -20,8 +20,6 @@ WORD
 
 %long # --forbidden
 
-INT16
-UINT16
 int
 
 %ptr
@@ -38,11 +36,8 @@ HANDLE *
 INT *
 LPBYTE
 LPCVOID
-LPDIDEVICEOBJECTDATA
-LPDWORD
 LPINT
 LPLOGFONTW
-LPMOUSE_EVENT_PROC
 LPPOINT
 LPRECT
 LPSIZE
diff --git a/tools/winapi_check/winapi_check b/tools/winapi_check/winapi_check
index 24ce8392045..f14b698b335 100755
--- a/tools/winapi_check/winapi_check
+++ b/tools/winapi_check/winapi_check
@@ -393,7 +393,7 @@ foreach my $file (@c_files) {
     my $conditional = 0;
     my $found_include = sub {
 	local $_ = shift;
-	if(/^\"config\.h\"/) {
+	if(/^\"(?:config\.h|wine\/port\.h)\"/) {
 	    $config++;
 	}
     };