diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index 027c0f9ac53..68f7839e01b 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -224,6 +224,7 @@ LPWSTR *
 PFNDPACOMPARE
 PFNDPAMERGE
 POINT *
+RECT *
 SMOOTHSCROLLSTRUCT *
 TRACKMOUSEEVENT *
 
@@ -307,10 +308,15 @@ DWORD
 
 %ptr
 
+BYTE *
+DWORD *
 GUID *
 SIP_ADD_NEWPROVIDER *
 SIP_DISPATCH_INFO *
 
+%str
+LPCSTR
+
 %wstr
 
 LPCWSTR
@@ -1333,6 +1339,7 @@ ACCESS_MASK
 BOOL
 BOOLEAN
 BYTE
+CCHAR
 DWORD
 FILE_INFORMATION_CLASS
 FS_INFORMATION_CLASS
@@ -1356,6 +1363,7 @@ TOKEN_TYPE
 UINT
 ULONG
 WCHAR
+WORD
 int
 long
 unsigned int
@@ -1379,6 +1387,8 @@ EXCEPTION_FRAME *
 EXCEPTION_RECORD *
 FILETIME *
 HANDLE *
+IMAGE_NT_HEADERS *
+IMAGE_SECTION_HEADER **
 INT *
 LARGE_INTEGER *
 LPBYTE
@@ -1395,6 +1405,7 @@ PACL
 PACL *
 PANSI_STRING
 PBOOLEAN
+PCRTL_BITMAP
 PCVOID
 PDWORD
 PEXCEPTION_FRAME
@@ -1402,6 +1413,7 @@ PEXCEPTION_RECORD
 PGENERIC_MAPPING
 PHANDLE
 PIMAGE_NT_HEADERS
+PIMAGE_SECTION_HEADER
 PIO_APC_ROUTINE
 PIO_STATUS_BLOCK
 PLARGE_INTEGER
@@ -1409,6 +1421,8 @@ PLUID
 POBJDIR_INFORMATION
 POBJECT_ATTRIBUTES
 PPRIVILEGE_SET
+PRTL_BITMAP
+PRTL_BITMAP_RUN
 PRTL_HEAP_DEFINITION
 PSECURITY_DESCRIPTOR
 PSECURITY_DESCRIPTOR_CONTROL
@@ -1426,6 +1440,7 @@ PVOID *
 RTL_CRITICAL_SECTION *
 STRING *
 UINT *
+ULONG *
 ULONGLONG *
 UNICODE_STRING *
 VOID *
@@ -1532,6 +1547,7 @@ IStorage *
 IStorage **
 IStream *
 IUnknown *
+IUnknown **
 LPBC
 LPBC *
 LPCLSID
@@ -1945,6 +1961,7 @@ RPC_IF_HANDLE
 RPC_STATUS
 UINT
 ULONG
+unsigned short
 
 %ptr
 
@@ -1964,10 +1981,6 @@ RPC_IF_CALLBACK_FN *
 RPC_MGR_EPV *
 RPC_STATUS *
 UUID *
-unsigned char *
-unsigned char **
-unsigned short
-unsigned short *
 
 %str
 
@@ -2094,6 +2107,10 @@ WORD
 WPARAM
 int
 
+%longlong
+
+POINT
+
 %ptr
 
 CLSID *
@@ -2131,6 +2148,7 @@ LPMALLOC *
 LPMEASUREITEMSTRUCT
 LPNOTIFYREGISTER
 LPPOINT
+LPSCROLLSAMPLES
 LPSECURITY_ATTRIBUTES
 LPSHELLEXECUTEINFOA
 LPSHELLEXECUTEINFOW
@@ -2217,6 +2235,7 @@ DLLVERSIONINFO *
 HICON *
 IFACE_INDEX_TBL *
 IID *
+INT *
 IStream *
 IStream **
 ITEMIDLIST *
@@ -2242,6 +2261,7 @@ LPSHELLEXECUTEINFOW
 LPSHFILEOPSTRUCTW
 LPSHLWAPI_CLIST
 LPSHLWAPI_CLIST *
+LPSTR *
 LPSTRRET
 LPTHREAD_START_ROUTINE
 LPVOID
@@ -2252,6 +2272,7 @@ PHUSKEY
 PLONG
 PSECURITY_DESCRIPTOR
 PVOID
+RECT *
 REFGUID
 REFIID
 SHFILEINFOW *
@@ -2441,10 +2462,10 @@ IBindStatusCallback **
 IEnumFORMATETC *
 IMoniker *
 IMoniker **
-LPVOID
 LPVOID *
 REFCLSID
 REFIID
+void **
 
 %str
 
diff --git a/tools/winapi_check/winapi_check b/tools/winapi_check/winapi_check
index 0eb8885017b..6ee665fa29a 100755
--- a/tools/winapi_check/winapi_check
+++ b/tools/winapi_check/winapi_check
@@ -578,7 +578,7 @@ foreach my $file (@c_files) {
 				# Do nothing X Windows is handled differently
 			    } elsif($macro =~ /^HAVE_(.*?)_H$/) {
 				my $name = $1;
-				if($header !~ /^alloca\.h|sys\/time\.h|unistd\.h$/ &&
+				if($header !~ /^alloca\.h$/ &&
 				   $file_dir !~ /tests$/ &&
 				   !$preprocessor->is_def("STATFS_DEFINED_BY_$name"))
 				{