diff --git a/tools/winapi/win16.api b/tools/winapi/win16.api
index df92d77e8ea..e9f1f5567d6 100644
--- a/tools/winapi/win16.api
+++ b/tools/winapi/win16.api
@@ -1188,6 +1188,7 @@ LPARAM
 LRESULT
 POINT16
 UINT
+int
 
 %ptr
 
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index 313b261c9aa..3f6fedd6e05 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -48,6 +48,7 @@ HCRYPTKEY *
 HCRYPTPROV *
 LPBOOL
 LPBYTE
+LPCGUID
 LPCSTR *
 LPCWSTR *
 LPDWORD
@@ -112,6 +113,8 @@ PSID *
 PSID_IDENTIFIER_AUTHORITY
 PSID_NAME_USE
 PTOKEN_GROUPS
+PTRACE_GUID_REGISTRATION
+PTRACEHANDLE
 PTRUSTEEA
 PTRUSTEEW
 PUCHAR
@@ -123,6 +126,7 @@ PVALENTW
 SC_LOCK
 SECURITY_ATTRIBUTES *
 WCHAR *
+WMIDPREQUEST
 unsigned char *
 
 %str
@@ -623,12 +627,14 @@ void
 
 %long
 
+BOOL
 HRESULT
 UINT
 
 %ptr
 
 IDirect3D9 *
+LPVOID
 
 %%d3dxof.dll
 
@@ -1428,6 +1434,7 @@ DWORD
 EXECUTION_STATE
 GEOCLASS
 GEOID
+GEOTYPE
 HANDLE
 HFILE
 HGLOBAL
@@ -1489,7 +1496,6 @@ CODEPAGE_ENUMPROCA
 CODEPAGE_ENUMPROCW
 COMPUTER_NAME_FORMAT
 CONTEXT *
-CONTEXT86 *
 CRITICAL_SECTION *
 CURRENCYFMTA *
 CURRENCYFMTW *
@@ -1621,7 +1627,6 @@ void *
 
 BUILTIN16_DESCRIPTOR *
 FARPROC16
-UINT16 *
 SEGPTR
 
 %str
@@ -2208,7 +2213,6 @@ MSVCRT_FILE *
 MSVCRT_fpos_t *
 MSVCRT_matherr_func
 MSVCRT_new_handler_func
-MSVCRT_sig_handler_func
 MSVCRT_terminate_function
 MSVCRT_unexpected_function
 MSVCRT_time_t *
@@ -2231,6 +2235,7 @@ exception *
 free_func_t
 int (*)(void *, void *)
 int *
+long *
 malloc_func_t
 struct MSVCRT___JUMP_BUFFER *
 struct MSVCRT__exception *
@@ -2253,6 +2258,7 @@ unsigned long *
 va_list
 void (*)(void)
 void *
+__sighandler_t
 
 %unknown
 
@@ -2434,6 +2440,7 @@ double
 
 ACCESS_MASK
 ACL_INFORMATION_CLASS
+ATOM_INFORMATION_CLASS
 BOOL
 BOOLEAN
 BYTE
@@ -2458,6 +2465,7 @@ OBJECT_INFORMATION_CLASS
 POWER_ACTION
 POWER_INFORMATION_LEVEL
 PROCESSINFOCLASS
+RTL_ATOM
 SECTION_INHERIT
 SECURITY_IMPERSONATION_LEVEL
 SECURITY_INFORMATION
@@ -2596,6 +2604,9 @@ PVECTORED_EXCEPTION_HANDLER
 PVOID
 PVOID *
 PWSTR *
+RTL_ATOM *
+RTL_ATOM_TABLE
+RTL_ATOM_TABLE *
 RTL_CRITICAL_SECTION *
 RTL_HANDLE *
 RTL_HANDLE **
@@ -3483,15 +3494,20 @@ GUID *
 INFCONTEXT *
 LONGLONG *
 LPBYTE *
-LPDWORD
 LPCVOID
+LPDWORD
 LPGUID
+LPHANDLE
 LPVOID
+LPVOID *
 LPWIN32_FIND_DATAW
+LPWSTR *
 PBYTE
 PDWORD
 PINFCONTEXT
 PINT
+PSECURITY_DESCRIPTOR
+PSECURITY_DESCRIPTOR *
 PSP_CLASSINSTALL_HEADER
 PSP_DEVICE_INTERFACE_DATA
 PSP_DEVICE_INTERFACE_DETAIL_DATA_A
@@ -3907,63 +3923,6 @@ PHONECALLBACK
 LPCSTR
 LPSTR
 
-%%ttydrv.dll
-
-%long
-
-BOOL
-COLORREF
-DWORD
-HANDLE
-HBITMAP
-HDC
-HFONT
-HKL
-HRGN
-HWND
-INT
-LONG
-SHORT
-UINT
-WCHAR
-int
-
-%ptr
-
-BITMAPINFO *
-CREATESTRUCTA *
-DEVMODEW *
-DWORD *
-INT *
-LPBYTE
-LPCVOID
-LPINT
-LPPALETTEENTRY
-LPPOINT
-LPSIZE
-LPTEXTMETRICW
-LPVOID
-POINT *
-RECT *
-TTYDRV_PDEVICE *
-TTYDRV_PDEVICE **
-WINDOWPOS *
-struct tagCURSORICONINFO *
-void *
-
-%str
-
-LPCSTR
-
-%void
-
-void
-
-%wstr
-
-LPCWSTR
-LPWSTR
-
 %%twain_32.dll
 
 %long
@@ -4418,10 +4377,19 @@ IWineD3D *
 
 %long
 
+BOOL
 BYTE
 DWORD
+UINT
+WORD
 int
 
+%ptr
+
+LPVOID
+UINT16 *
+void *
+
 %str
 
 LPCSTR
@@ -4470,7 +4438,7 @@ LONG
 UINT
 WORD
 
-%%wineps.dll
+%%wineps.drv
 
 %long
 
@@ -4524,6 +4492,136 @@ void
 
 LPCWSTR
 
+%%winetty.drv
+
+%long
+
+BOOL
+COLORREF
+DWORD
+HANDLE
+HBITMAP
+HDC
+HFONT
+HKL
+HRGN
+HWND
+INT
+LONG
+SHORT
+UINT
+WCHAR
+int
+
+%ptr
+
+BITMAPINFO *
+CREATESTRUCTA *
+DEVMODEW *
+DWORD *
+INT *
+LPBYTE
+LPCVOID
+LPINT
+LPPALETTEENTRY
+LPPOINT
+LPSIZE
+LPTEXTMETRICW
+LPVOID
+POINT *
+RECT *
+TTYDRV_PDEVICE *
+TTYDRV_PDEVICE **
+WINDOWPOS *
+struct tagCURSORICONINFO *
+void *
+
+%str
+
+LPCSTR
+
+%void
+
+void
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
+%%winex11.drv
+
+%long
+
+BOOL
+COLORREF
+DWORD
+HANDLE
+HANDLE16
+HBITMAP
+HBRUSH
+HDC
+HFONT
+HICON
+HKL
+HPALETTE
+HPEN
+HRGN
+HWND
+INT
+LONG
+LPARAM
+LRESULT
+SHORT
+UINT
+WCHAR
+WPARAM
+int
+
+%ptr
+
+BITMAPINFO *
+BLENDFUNCTION
+CREATESTRUCTA *
+CURSORICONINFO *
+DEVMODEW *
+DWORD *
+FONTENUMPROCW
+HANDLE *
+HANDLE16 *
+HKL *
+INT *
+LPBYTE
+LPCVOID
+LPDEVMODEW
+LPINPUT
+LPINT
+LPLOGFONTW
+LPPALETTEENTRY
+LPPOINT
+LPRECT
+LPSIZE
+LPVOID
+LPWTPACKET *
+PIXELFORMATDESCRIPTOR *
+POINT *
+RECT *
+RGBQUAD *
+TEXTMETRICW *
+WINDOWPOS *
+X11DRV_PDEVICE *
+X11DRV_PDEVICE **
+void *
+
+%void
+
+void
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
 %%wininet.dll
 
 %double
@@ -4948,76 +5046,3 @@ PWTS_SESSION_INFOW *
 %void
 
 void
-
-%%x11drv.dll
-
-%long
-
-BOOL
-COLORREF
-DWORD
-HANDLE
-HANDLE16
-HBITMAP
-HBRUSH
-HDC
-HFONT
-HICON
-HKL
-HPALETTE
-HPEN
-HRGN
-HWND
-INT
-LONG
-LPARAM
-LRESULT
-SHORT
-UINT
-WCHAR
-WPARAM
-int
-
-%ptr
-
-BITMAPINFO *
-BLENDFUNCTION
-CREATESTRUCTA *
-CURSORICONINFO *
-DEVMODEW *
-DWORD *
-FONTENUMPROCW
-HANDLE *
-HANDLE16 *
-HKL *
-INT *
-LPBYTE
-LPCVOID
-LPDEVMODEW
-LPINPUT
-LPINT
-LPLOGFONTW
-LPPALETTEENTRY
-LPPOINT
-LPRECT
-LPSIZE
-LPVOID
-LPWTPACKET *
-PIXELFORMATDESCRIPTOR *
-POINT *
-RECT *
-RGBQUAD *
-TEXTMETRICW *
-WINDOWPOS *
-X11DRV_PDEVICE *
-X11DRV_PDEVICE **
-void *
-
-%void
-
-void
-
-%wstr
-
-LPCWSTR
-LPWSTR