diff --git a/tools/winapi_check/modules.dat b/tools/winapi_check/modules.dat
index 9d3821374e6..d130c95d5ca 100644
--- a/tools/winapi_check/modules.dat
+++ b/tools/winapi_check/modules.dat
@@ -83,6 +83,10 @@ dlls/icmp
 
 dlls/imagehlp
 
+% dlls/imm32/imm.spec
+
+dlls/imm32
+
 % dlls/imm32/imm32.spec
 
 dlls/imm32
@@ -429,7 +433,14 @@ dlls/winmm
 % dlls/winmm/winmm.spec
 
 dlls/winmm
-windows
+
+% dlls/winnls/winnls.spec
+
+dlls/winnls
+
+% dlls/winnls/winnls32.spec
+
+dlls/winnls
 
 % dlls/winsock/winsock.spec
 
diff --git a/tools/winapi_check/win16/olecli.api b/tools/winapi_check/win16/olecli.api
index 34e0b648a6f..e41e92ef522 100644
--- a/tools/winapi_check/win16/olecli.api
+++ b/tools/winapi_check/win16/olecli.api
@@ -6,9 +6,7 @@ LONG
 %ptr
 
 LHCLIENTDOC *
-LPOLECLIENT
 LPOLEOBJECT
-LPOLEOBJECT *
 
 %segptr
 
diff --git a/tools/winapi_check/win16/setupx.api b/tools/winapi_check/win16/setupx.api
index 7549949efc3..5e5e4829a46 100644
--- a/tools/winapi_check/win16/setupx.api
+++ b/tools/winapi_check/win16/setupx.api
@@ -1,17 +1,17 @@
 %long
 
 DWORD
+LPARAM
 
 %ptr
 
+HINF16 *
 LPBYTE
 LPDWORD
-
-%ptr # --forbidden
-
-HINF16 *
 LPHKEY
-LPWORD
+LPLOGDISKDESC
+LPLPDEVICE_INFO16
+VIFPROC
 
 %str
 
@@ -22,7 +22,7 @@ LPSTR
 
 void
 
-%word # --forbidden
+%word
 
 INT16
 LOGDISKID16
diff --git a/tools/winapi_check/win32/crtdll.api b/tools/winapi_check/win32/crtdll.api
index 8a87159132f..67ab0c08a44 100644
--- a/tools/winapi_check/win32/crtdll.api
+++ b/tools/winapi_check/win32/crtdll.api
@@ -17,6 +17,7 @@ UCHAR
 clock_t
 size_t
 time_t
+unsigned char
 
 %long # --forbidden
 
@@ -32,6 +33,8 @@ LONGLONG
 
 CHAR *
 CRTDLL_FILE *
+CRTDLL_fpos_t *
+LPCSTR *
 LPCVOID
 LPDWORD
 LPDWORD *
@@ -44,6 +47,7 @@ PCONTEXT
 PEXCEPTION_FRAME
 PEXCEPTION_FRAME *
 PEXCEPTION_RECORD
+PINT
 VOID *
 WCHAR *
 _INITTERMFUN *
@@ -56,7 +60,6 @@ time_t *
 struct _heapinfo *
 struct _utimbuf *
 struct _exception *
-fpos_t *
 diskfree_t *
 unsigned char *
 va_list
diff --git a/tools/winapi_check/win32/imm32.api b/tools/winapi_check/win32/imm32.api
index dc329d758b1..63cd11099bc 100644
--- a/tools/winapi_check/win32/imm32.api
+++ b/tools/winapi_check/win32/imm32.api
@@ -3,6 +3,7 @@
 BOOL
 DWORD
 HIMC
+HIMCC
 HKL
 HWND
 LONG
@@ -11,6 +12,10 @@ LRESULT
 UINT
 WPARAM
 
+%long # --forbidden
+
+int
+
 %ptr
 
 LPCANDIDATEFORM
@@ -18,11 +23,14 @@ LPCANDIDATELIST
 LPCVOID
 LPCOMPOSITIONFORM
 LPDWORD
+LPHKL
+LPINPUTCONTEXT
 LPLOGFONTA
 LPLOGFONTW
 LPPOINT
 LPSTYLEBUFA
 LPSTYLEBUFW
+LPUINT
 LPVOID
 REGISTERWORDENUMPROCA
 REGISTERWORDENUMPROCW
diff --git a/tools/winapi_check/win32/ntdll.api b/tools/winapi_check/win32/ntdll.api
index f1150340f77..cd52f17b427 100644
--- a/tools/winapi_check/win32/ntdll.api
+++ b/tools/winapi_check/win32/ntdll.api
@@ -110,6 +110,7 @@ void *
 EXCEPTION_FRAME **
 GUID *
 WCHAR *
+WCHAR ***
 char *
 char ***
 enum __DEBUG_CLASS
diff --git a/tools/winapi_check/winapi_check b/tools/winapi_check/winapi_check
index c56531f669c..b359c281727 100755
--- a/tools/winapi_check/winapi_check
+++ b/tools/winapi_check/winapi_check
@@ -150,7 +150,7 @@ my %includes;
 		    $includes{$file}{includes}{"$file_dir/$header"}++;
 		} elsif(-e "$wine_dir/include/$header") {
 		    $includes{$file}{includes}{"include/$header"}++;
-		} else {		   
+		} else {
 		    $output->write("$file: #include \"$header\" is not a local include\n");
 		}
 	    }
@@ -618,6 +618,11 @@ foreach my $file ($options->c_files) {
 			foreach my $name (keys(%{$includes{"$file_dir/../$header"}{includes}})) { # FIXME: This is not correct
 			    $includes{$name}{used}++;
 			}
+		    } elsif($header eq "controls.h") { # FIXME: Kludge
+			$includes{"dlls/user/$header"}{used}++;
+			foreach my $name (keys(%{$includes{"dlls/user/$header"}{includes}})) {
+			    $includes{$name}{used}++;
+			}
 		    } elsif(-e "$wine_dir/include/$header") {
 			$includes{"include/$header"}{used}++;
 			foreach my $name (keys(%{$includes{"include/$header"}{includes}})) {
diff --git a/tools/winapi_check/winapi_options.pm b/tools/winapi_check/winapi_options.pm
index c7b899befb6..2af942bed4c 100644
--- a/tools/winapi_check/winapi_options.pm
+++ b/tools/winapi_check/winapi_options.pm
@@ -73,7 +73,7 @@ my %options = (
     "debug-messages" => { default => 0, parent => "statements", description => "check for debug messages inconsistances" },
     "documentation" => { default => 1, parent => "local", description => "check for documentation inconsistances\n" },
     "documentation-width" => { default => 0, parent => "documentation", description => "check for documentation width inconsistances\n" },
-    "documentation-arguments" => { default => 0, parent => "documentation", description => "check for arguments documentation inconsistances\n" },
+    "documentation-arguments" => { default => 1, parent => "documentation", description => "check for arguments documentation inconsistances\n" },
     "prototype" => { default => 0, parent => ["local", "headers"], description => "prototype checking" },
 
     "global" => { default => 1, description => "global checking" },