diff --git a/tools/winapi/win16.api b/tools/winapi/win16.api
index e9f1f5567d6..a10bdf5f7c6 100644
--- a/tools/winapi/win16.api
+++ b/tools/winapi/win16.api
@@ -38,7 +38,6 @@ void
 
 %long
 
-BOOL
 DWORD
 LONG
 LPARAM
@@ -61,11 +60,9 @@ LPSTR
 %word
 
 BOOL16
-HINSTANCE16
 HWND16
 INT16
 UINT16
-WORD
 WPARAM16
 short
 
@@ -566,6 +563,7 @@ HWND
 LONG
 LPARAM
 LRESULT
+int
 
 %ptr
 
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index 67f05e7d839..4f299371c34 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -35,6 +35,7 @@ HCRYPTHASH
 HCRYPTKEY
 HCRYPTPROV
 HKEY
+INT
 LONG
 NTSTATUS
 POLICY_INFORMATION_CLASS
@@ -71,6 +72,7 @@ LPBOOL
 LPBYTE
 LPCGUID
 LPCSTR *
+LPCVOID
 LPCWSTR *
 LPDWORD
 LPENUM_SERVICE_STATUSA
@@ -78,6 +80,7 @@ LPENUM_SERVICE_STATUSW
 LPHANDLER_FUNCTION
 LPHW_PROFILE_INFOA
 LPHW_PROFILE_INFOW
+LPINT
 LPLONG
 LPPROCESS_INFORMATION
 LPQUERY_SERVICE_CONFIGA
@@ -589,9 +592,12 @@ CRYPTPROTECT_PROMPTSTRUCT *
 DATA_BLOB *
 DWORD *
 GUID *
+LPWSTR *
 PCCERT_CONTEXT
 PCCRL_CONTEXT
 PCCRL_CONTEXT *
+PCRYPT_DECODE_PARA
+PCRYPT_ENCODE_PARA
 PVOID
 SIP_ADD_NEWPROVIDER *
 SIP_DISPATCH_INFO *
@@ -1007,6 +1013,7 @@ LPDIRECTSOUND *
 LPDIRECTSOUND8 *
 LPDIRECTSOUNDBUFFER8 *
 LPDIRECTSOUNDCAPTURE *
+LPDIRECTSOUNDCAPTURE8 *
 LPDIRECTSOUNDCAPTUREBUFFER8 *
 LPDIRECTSOUNDFULLDUPLEX *
 LPDSENUMCALLBACKA
@@ -1540,6 +1547,7 @@ GEO_ENUMPROC
 GET_FILEEX_INFO_LEVELS
 GUID *
 HANDLE *
+IMAGE_DOS_HEADER *
 INPUT_RECORD *
 LANGGROUPLOCALE_ENUMPROCA
 LANGGROUPLOCALE_ENUMPROCW
@@ -1573,6 +1581,7 @@ LPLDT_ENTRY
 LPMEMORYSTATUS
 LPMEMORYSTATUSEX
 LPMODULEENTRY32
+LPMODULEENTRY32W
 LPOSVERSIONINFOEXA
 LPOSVERSIONINFOEXW
 LPOVERLAPPED
@@ -1646,7 +1655,6 @@ void *
 
 %ptr --extension
 
-BUILTIN16_DESCRIPTOR *
 FARPROC16
 SEGPTR
 
@@ -2208,6 +2216,7 @@ MSVCRT_clock_t
 MSVCRT_size_t
 MSVCRT_time_t
 MSVCRT_wchar_t
+NTSTATUS
 int
 long
 short
@@ -2471,11 +2480,11 @@ DWORD
 FILE_INFORMATION_CLASS
 FS_INFORMATION_CLASS
 HANDLE
-HKEY
 HMODULE
 INT
 KEY_INFORMATION_CLASS
 KEY_VALUE_INFORMATION_CLASS
+KPROFILE_SOURCE
 LANGID
 LCID
 LONG
@@ -2487,9 +2496,12 @@ POWER_ACTION
 POWER_INFORMATION_LEVEL
 PROCESSINFOCLASS
 RTL_ATOM
+SECTION_INFORMATION_CLASS
 SECTION_INHERIT
 SECURITY_IMPERSONATION_LEVEL
 SECURITY_INFORMATION
+SEMAPHORE_INFORMATION_CLASS
+SHUTDOWN_ACTION
 SIZE_T
 SYSTEM_INFORMATION_CLASS
 SYSTEM_POWER_STATE
@@ -2556,8 +2568,8 @@ LPBYTE
 LPCVOID
 LPCVOID *
 LPDWORD
-LPDWORD *
 LPRTL_RWLOCK
+LPSTR *
 LPTIME_ZONE_INFORMATION
 LPVOID
 LPVOID *
@@ -2585,7 +2597,6 @@ PDWORD
 PEXCEPTION_RECORD
 PGENERIC_MAPPING
 PHANDLE
-PHKEY
 PIMAGE_NT_HEADERS
 PIMAGE_SECTION_HEADER
 PIO_APC_ROUTINE
@@ -2593,9 +2604,9 @@ PIO_STATUS_BLOCK
 PLARGE_INTEGER
 PLDR_MODULE *
 PLONG
-PLPCMESSAGE
-PLPCSECTIONINFO
-PLPCSECTIONMAPINFO
+PLPC_MESSAGE
+PLPC_SECTION_READ
+PLPC_SECTION_WRITE
 PLUID
 PLUID_AND_ATTRIBUTES
 PNTAPCFUNC
@@ -2608,6 +2619,7 @@ PRTL_HEAP_DEFINITION
 PRTL_USER_PROCESS_PARAMETERS
 PSECURITY_DESCRIPTOR
 PSECURITY_DESCRIPTOR_CONTROL
+PSECURITY_QUALITY_OF_SERVICE
 PSID
 PSID *
 PSID_IDENTIFIER_AUTHORITY
@@ -2615,10 +2627,11 @@ PSTRING
 PSYSTEM_MODULE_INFORMATION
 PRTL_QUERY_REGISTRY_TABLE
 PRTL_THREAD_START_ROUTINE
-PTIMERAPCROUTINE
 PTIME_FIELDS
+PTIMER_APC_ROUTINE
 PTOKEN_GROUPS
 PTOKEN_PRIVILEGES
+PULARGE_INTEGER
 PULONG
 PUNICODE_STRING
 PVECTORED_EXCEPTION_HANDLER
@@ -3183,6 +3196,7 @@ ULONG
 
 %ptr
 
+PADMINISTRATOR_POWER_POLICY
 PGLOBAL_POWER_POLICY
 PMACHINE_PROCESSOR_POWER_POLICY
 PPOWER_POLICY
@@ -3242,7 +3256,6 @@ LPVOID *
 
 %long
 
-DWORD
 HRESULT
 LONG
 
@@ -3521,6 +3534,7 @@ LPCWSTR
 %long
 
 BOOL
+DI_FUNCTION
 DWORD
 HANDLE
 HDEVINFO
@@ -4016,6 +4030,7 @@ IUnknown *
 LPBC
 LPBINDCTX
 LPBINDSTATUSCALLBACK
+LPSOFTDISTINFO
 LPWSTR *
 LPUNKNOWN
 LPVOID
@@ -4028,6 +4043,7 @@ uCLSSPEC *
 %str
 
 LPCSTR
+LPSTR
 
 %void
 
@@ -4943,16 +4959,24 @@ LPWSTR
 
 BOOL
 DWORD
+HANDLE
 HCATADMIN
 HWND
 LONG
 
 %ptr
 
+BYTE *
+CRYPT_REGISTER_ACTIONID *
+DWORD *
 GUID *
 HCATADMIN *
 WINTRUST_DATA *
 
+%void
+
+void
+
 %%wnaspi32.dll
 
 %long