diff --git a/tools/winapi_check/modules.dat b/tools/winapi_check/modules.dat
index fc5678178f926241cdd13bfc5266221d6415124d..388828aa821ae0497f298444f9a9dd50c06e193a 100644
--- a/tools/winapi_check/modules.dat
+++ b/tools/winapi_check/modules.dat
@@ -444,6 +444,8 @@ dlls/winmm
 
 % dlls/winnls/winnls.spec
 
+dlls/winnls
+
 % dlls/winnls/winnls32.spec
 
 % dlls/winsock/winsock.spec
diff --git a/tools/winapi_check/win16/winnls.api b/tools/winapi_check/win16/winnls.api
new file mode 100644
index 0000000000000000000000000000000000000000..fef242f7a6819b9c77b73e1383aad3227576e9a2
--- /dev/null
+++ b/tools/winapi_check/win16/winnls.api
@@ -0,0 +1,7 @@
+%long
+
+BOOL
+
+%word
+
+HWND16
\ No newline at end of file
diff --git a/tools/winapi_check/win32/dciman32.api b/tools/winapi_check/win32/dciman32.api
index 46afe7dcd03395940db4050be940a2854b7510e9..ae1e15df761fca4d48606689137c7c27b2d76d90 100644
--- a/tools/winapi_check/win32/dciman32.api
+++ b/tools/winapi_check/win32/dciman32.api
@@ -1,3 +1,7 @@
 %long
 
 HDC
+
+%void
+
+void
\ No newline at end of file
diff --git a/tools/winapi_check/winapi_documentation.pm b/tools/winapi_check/winapi_documentation.pm
index 435f756de631f6c6b33f308fad907776f0453666..2b73e63492e427e4406fc591e139261ce03625dd 100644
--- a/tools/winapi_check/winapi_documentation.pm
+++ b/tools/winapi_check/winapi_documentation.pm
@@ -106,7 +106,7 @@ sub check_documentation {
 		foreach my $uc_module16 (@uc_modules16) {
 		    if($documentation !~ /\b$uc_module16\.\Q$ordinal16\E/) {
 			$output->write("documentation: wrong or missing ordinal " .
-				       "expected (\U$module16\E.$ordinal16)\\\n$documentation\n");
+				       "expected ($uc_module16.$ordinal16) \\\n$documentation\n");
 		    }
 		}
 	    }
@@ -121,7 +121,7 @@ sub check_documentation {
 		foreach my $uc_module32 (@uc_modules32) {
 		    if($documentation !~ /\b$uc_module32\.\Q$ordinal32\E/) {
 			$output->write("documentation: wrong or missing ordinal " .
-						   "expected (\U$module32\E.$ordinal32) \\\n$documentation\n");
+						   "expected ($uc_module32.$ordinal32) \\\n$documentation\n");
 		    }
 		}
 	    }