diff --git a/tools/winapi/win16.api b/tools/winapi/win16.api
index e620f7cd4ba..8ebd3c693bb 100644
--- a/tools/winapi/win16.api
+++ b/tools/winapi/win16.api
@@ -864,8 +864,8 @@ LONG
 
 %ptr
 
+_LPOLEOBJECT
 LHCLIENTDOC *
-LPOLEOBJECT
 
 %segptr
 
@@ -1137,6 +1137,21 @@ HMODULE16
 HTASK16
 WORD
 
+%%twain.dll
+
+%long
+
+TW_UINT32
+
+%ptr
+
+TW_MEMREF
+pTW_IDENTITY
+
+%word
+
+TW_UINT16
+
 %%typelib.dll
 
 %long
@@ -1210,7 +1225,6 @@ RECT16 *
 SCROLLINFO *
 SEGPTR *
 UINT16 *
-VA_LIST16
 WINDOWPLACEMENT16 *
 WNDCLASS16 *
 WNDCLASSEX16 *
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index d24d90fa4c7..30fdb6f6447 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -24,8 +24,10 @@ SECURITY_IMPERSONATION_LEVEL
 SECURITY_INFORMATION
 SERVICE_STATUS_HANDLE
 TOKEN_INFORMATION_CLASS
+UINT
 ULONG
 WORD
+unsigned int
 
 %long --extension
 
@@ -56,14 +58,18 @@ LPSECURITY_ATTRIBUTES
 LPSERVICE_STATUS
 LPSERVICE_TABLE_ENTRYA
 LPSERVICE_TABLE_ENTRYW
+LPSTR *
 LPVOID
 LPVOID *
 LPWSTR *
+MD4_CTX *
+MD5_CTX *
 PACL
 PACL *
 PACTRL_ACCESSW *
 PACTRL_AUDITW *
 PBOOL
+PCHAR
 PDWORD
 PEXPLICIT_ACCESSA
 PEXPLICIT_ACCESSA *
@@ -83,6 +89,7 @@ PPRIVILEGE_SET
 PSECURITY_DESCRIPTOR
 PSECURITY_DESCRIPTOR *
 PSECURITY_DESCRIPTOR_CONTROL
+PSHA_CTX
 PSID
 PSID *
 PSID_IDENTIFIER_AUTHORITY
@@ -96,8 +103,8 @@ PVOID *
 PVALENTA
 PVALENTW
 SECURITY_ATTRIBUTES *
-SECURITY_DESCRIPTOR *
 WCHAR *
+unsigned char *
 
 %str
 
@@ -113,6 +120,21 @@ VOID
 LPCWSTR
 LPWSTR
 
+%%advpack.dll
+
+%long
+
+HMODULE
+HRESULT
+
+%ptr
+
+LPCSTRTABLE
+
+%str
+
+LPCSTR
+
 %%amstream.dll
 
 %long
@@ -126,6 +148,31 @@ LPVOID *
 REFCLSID
 REFIID
 
+%%atl
+
+%long
+
+BOOL
+DWORD
+HINSTANCE
+HRESULT
+
+%ptr
+
+_ATL_INTMAP_ENTRY *
+_ATL_MODULEA *
+_ATL_MODULEW *
+_ATL_OBJMAP_ENTRYA *
+CLSID *
+LPVOID
+LPVOID *
+REFIID
+void *
+
+%str
+
+LPCOLESTR
+
 %%avicap32.dll
 
 %long
@@ -529,6 +576,20 @@ UINT
 
 IDirect3D9 *
 
+%%d3dxof
+
+%long
+
+DWORD
+HRESULT
+
+%ptr
+
+REFCLSID
+REFIID
+LPDIRECTXFILE *
+LPVOID *
+
 %%dbghelp.dll
 
 %long
@@ -548,8 +609,10 @@ LPAPI_VERSION
 LPSTACKFRAME
 LPVOID
 PDWORD
+PENUMDIRTREE_CALLBACK
 PENUMLOADED_MODULES_CALLBACK
 PFIND_DEBUG_FILE_CALLBACK
+PFINDFILEINPATHCALLBACK
 PFUNCTION_TABLE_ACCESS_ROUTINE
 PGET_MODULE_BASE_ROUTINE
 PIMAGE_DEBUG_INFORMATION
@@ -842,6 +905,7 @@ IUnknown *
 LPCDSBUFFERDESC
 LPCDSCBUFFERDESC
 LPCGUID
+LPDIRECTSOUND *
 LPDIRECTSOUND8 *
 LPDIRECTSOUNDBUFFER8 *
 LPDIRECTSOUNDCAPTURE *
@@ -1065,6 +1129,7 @@ void
 %long
 
 DWORD
+HRESULT
 HWND
 UINT
 
@@ -1256,6 +1321,19 @@ PULONG
 
 LPWSTR
 
+%%itss
+
+%long
+
+BOOL
+HRESULT
+
+%ptr
+
+LPVOID *
+REFCLSID
+REFIID
+
 %%joystick.drv
 
 %long
@@ -1324,6 +1402,7 @@ ULONG_PTR
 %longlong
 
 DWORDLONG
+LARGE_INTEGER
 
 %ptr
 
@@ -1534,14 +1613,19 @@ LONGLONG
 ALLOCATEMORE *
 CMC_buffer
 CMC_extension *
+LPADRLIST
 LPALLOCATEBUFFER
+LPBYTE
 LPFREEBUFFER
 LPLHANDLE
 LPMAPIADVISESINK
 LPMAPIADVISESINK *
+LPMAPINAMEID
+LPMAPIPROP
 LPMAPISESSION *
 LPSPropTagArray
 LPSPropValue
+LPSPropValue *
 LPSRowSet
 LPSRow
 LPSTR *
@@ -1561,6 +1645,7 @@ LPSTR
 %void
 
 VOID
+void
 
 %wstr
 
@@ -1616,6 +1701,33 @@ HDRVR
 LONG
 UINT
 
+%%mlang
+
+%long
+
+DWORD
+HRESULT
+INT
+LCID
+
+%ptr
+
+LPDWORD
+LPINT
+LPVOID *
+REFCLSID
+REFIID
+
+%str
+
+LPCSTR
+LPSTR
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
 %%mmdevldr.vxd
 
 %long
@@ -1765,6 +1877,29 @@ LONG
 UINT
 WORD
 
+%%mscms
+
+%long
+
+BOOL
+DWORD
+HPROFILE
+
+%ptr
+
+PDWORD
+PPROFILE
+
+%str
+
+PCSTR
+PSTR
+
+%wstr
+
+PCWSTR
+PWSTR
+
 %%msdmo.dll
 
 %long
@@ -1817,6 +1952,10 @@ REFIID
 
 LPCSTR
 
+%wstr
+
+LPCWSTR
+
 %%msi.dll
 
 %long
@@ -1826,12 +1965,16 @@ DWORD
 HINSTANCE
 HRESULT
 HWND
+INSTALLMESSAGE
 INSTALLSTATE
+INSTALLTYPE
 INSTALLUILEVEL
+INT
 LANGID
 MSICOLINFO
 MSICONDITION
 MSIHANDLE
+MSIMODIFY
 UINT
 WORD
 int
@@ -1844,8 +1987,10 @@ DLLVERSIONINFO *
 DWORD *
 FILETIME *
 HWND *
+INSTALLUI_HANDLERA
 INSTALLSTATE *
 INT *
+LPVOID
 LPVOID *
 MSIHANDLE *
 PCCERT_CONTEXT *
@@ -1932,53 +2077,55 @@ unsigned __int64
 
 %ptr
 
+EXCEPTION_REGISTRATION_RECORD *
+EXCEPTION_REGISTRATION_RECORD **
+MSVCRT__beginthread_start_routine_t
+MSVCRT__beginthreadex_start_routine_t
 MSVCRT__onexit_t
 MSVCRT__onexit_t **
+MSVCRT__se_translator_function
 MSVCRT_EXCEPTION_FRAME *
 MSVCRT_FILE *
 MSVCRT_fpos_t *
-MSVCRT_free_func
-MSVCRT_malloc_func
 MSVCRT_matherr_func
 MSVCRT_new_handler_func
 MSVCRT_sig_handler_func
+MSVCRT_terminate_function
+MSVCRT_unexpected_function
 MSVCRT_time_t *
 MSVCRT_wchar_t *
 MSVCRT_wchar_t **
 MSVCRT_wchar_t ***
 MSVCRT_wint_t
 PCONTEXT
-PEXCEPTION_REGISTRATION_RECORD
-PEXCEPTION_REGISTRATION_RECORD *
 PEXCEPTION_POINTERS
 PEXCEPTION_RECORD
 WCHAR **
 WORD **
-_HEAPINFO *
 _INITTERMFUN *
-_JUMP_BUFFER *
-_se_translator_function
 char *
 char **
 char ***
 cxx_exception_type *
+free_func_t
 int (*)(void *, void *)
 int *
+malloc_func_t
+struct MSVCRT___JUMP_BUFFER *
 struct MSVCRT__exception *
 struct MSVCRT__diskfree_t *
 struct MSVCRT__finddata_t *
 struct MSVCRT__finddatai64_t *
+struct MSVCRT__heapinfo *
 struct MSVCRT__stat *
 struct MSVCRT__stati64 *
+struct MSVCRT__timeb *
+struct MSVCRT__utimbuf *
 struct MSVCRT__wfinddata_t *
 struct MSVCRT__wfinddatai64_t *
 struct MSVCRT_lconv *
 struct MSVCRT_tm *
-struct _timeb *
-struct _utimbuf *
-terminate_function
 type_info *
-unexpected_function
 unsigned char *
 unsigned int *
 unsigned long *
@@ -1986,11 +2133,6 @@ va_list
 void (*)(void)
 void *
 
-%ptr --extension
-
-_beginthread_start_routine_t
-_beginthreadex_start_routine_t
-
 %unknown
 
 MSVCRT_div_t
@@ -2180,6 +2322,7 @@ HMODULE
 INT
 KEY_INFORMATION_CLASS
 KEY_VALUE_INFORMATION_CLASS
+LANGID
 LCID
 LONG
 MEMORY_INFORMATION_CLASS
@@ -2193,6 +2336,7 @@ SIZE_T
 SYSTEM_INFORMATION_CLASS
 THREADINFOCLASS
 TIMER_TYPE
+TOKEN_INFORMATION_CLASS
 TOKEN_TYPE
 UCHAR
 UINT
@@ -2245,6 +2389,7 @@ IMAGE_RESOURCE_DATA_ENTRY *
 IMAGE_RESOURCE_DATA_ENTRY **
 IMAGE_SECTION_HEADER **
 INT *
+LANGID *
 LARGE_INTEGER *
 LCID *
 LDR_RESOURCE_INFO *
@@ -2310,6 +2455,7 @@ PSYSTEM_MODULE_INFORMATION
 PRTL_THREAD_START_ROUTINE
 PTIMERAPCROUTINE
 PTIME_FIELDS
+PTOKEN_GROUPS
 PTOKEN_PRIVILEGES
 PULONG
 PUNICODE_STRING
@@ -2343,7 +2489,6 @@ wine_signal_handler
 
 WCHAR *
 char *
-enum fd_type *
 int *
 obj_handle_t *
 
@@ -2672,11 +2817,11 @@ OLESTATUS
 
 %ptr
 
+_LPOLEOBJECT
+_LPOLEOBJECT *
 LHCLIENTDOC *
 LONG *
 LPOLECLIENT
-LPOLEOBJECT
-LPOLEOBJECT *
 
 %str
 
@@ -2863,6 +3008,7 @@ LPVOID *
 
 DWORD
 HRESULT
+LONG
 
 %ptr
 
@@ -2923,6 +3069,7 @@ DLLVERSIONINFO *
 DWORD
 HMODULE
 HRESULT
+HWND
 RPC_BINDING_HANDLE
 RPC_IF_HANDLE
 RPC_STATUS
@@ -3018,6 +3165,8 @@ LPCWSTR
 
 %long
 
+BOOLEAN
+EXTENDED_NAME_FORMAT
 SECURITY_STATUS
 ULONG
 unsigned long
@@ -3044,6 +3193,14 @@ unsigned long *
 void *
 void **
 
+%str
+
+LPSTR
+
+%wstr
+
+LPWSTR
+
 %%serialui.dll
 
 %long
@@ -3164,7 +3321,6 @@ DWORD
 HANDLE
 HBITMAP
 HDROP
-HGLOBAL
 HICON
 HIMAGELIST
 HINSTANCE
@@ -3175,6 +3331,7 @@ HRESULT
 HWND
 INT
 LONG
+LPARAM
 LRESULT
 RESTRICTIONS
 UINT
@@ -3201,6 +3358,7 @@ HIMAGELIST *
 HWND *
 IShellFolder *
 IShellFolder **
+IShellView **
 IStream *
 ITEMIDLIST *
 LPBROWSEINFOA
@@ -3209,7 +3367,7 @@ LPBYTE
 LPCITEMIDLIST
 LPCITEMIDLIST *
 LPCRECT
-LPCSHELLFOLDERVIEWINFO
+LPCSFV
 LPCVOID
 LPCVOID *
 LPDATAOBJECT
@@ -3234,7 +3392,6 @@ LPSHELLEXECUTEINFOW
 LPSHELLFLAGSTATE
 LPSHELLFOLDER
 LPSHELLSTATE
-LPSHELLVIEW *
 LPSHFILEOPSTRUCTA
 LPSHFILEOPSTRUCTW
 LPSTRRET
@@ -3293,7 +3450,6 @@ HMENU
 HMODULE
 HPALETTE
 HRESULT
-HSHARED
 HUSKEY
 HWND
 INT
@@ -3335,7 +3491,9 @@ HWND *
 IBindCtx *
 IConnectionPoint *
 IConnectionPoint **
+IDataObject *
 IDispatch **
+IDropTarget *
 IFACE_INDEX_TBL *
 IID *
 INT *
@@ -3377,9 +3535,12 @@ LPWORD
 LPWSTR *
 OLECMD *
 OLECMDTEXT *
+PARSEDURLA *
+PARSEDURLW *
 PHKEY
 PHUSKEY
 PLONG
+PPOINTL
 PSECURITY_DESCRIPTOR
 PVOID
 RECT *
@@ -3400,8 +3561,6 @@ void **
 
 %ptr --extension
 
-UNKNOWN_SHLWAPI_1 *
-UNKNOWN_SHLWAPI_2 *
 WNDCLASSW *
 
 %str
@@ -3579,9 +3738,12 @@ IBindCtx **
 IBindStatusCallback *
 IBindStatusCallback **
 IEnumFORMATETC *
+IInternetSecurityManager **
 IInternetSession **
 IMoniker *
 IMoniker **
+IServiceProvider *
+IUnknown *
 LPBC
 LPBINDSTATUSCALLBACK
 LPWSTR *
@@ -3983,7 +4145,7 @@ UINT
 
 %ptr
 
-IDirect3DImpl *
+IWineD3D *
 
 %%winedos.dll
 
@@ -4106,11 +4268,13 @@ GROUPID
 BOOL
 DWORD
 HANDLE
+HINSTANCE
 HINTERNET
 HRESULT
 HWND
 INTERNET_PORT
 LONG
+int
 
 %longlong
 
@@ -4151,6 +4315,10 @@ LPSTR
 LPCWSTR
 LPWSTR
 
+%void
+
+void
+
 %%winmm.dll
 
 %long
@@ -4158,6 +4326,7 @@ LPWSTR
 BOOL
 DWORD
 FOURCC
+HANDLE
 HDRVR
 HINSTANCE
 HMIDIIN
@@ -4193,6 +4362,7 @@ UINT16
 %ptr
 
 DWORD *
+HANDLE *
 HMIDIIN *
 HMIDISTRM *
 HPCSTR
@@ -4226,6 +4396,7 @@ LPMMTIME
 LPTIMECALLBACK
 LPTIMECAPS
 LPUINT
+LPTASKCALLBACK
 LPWAVEFORMATEX
 LPWAVEHDR
 LPWAVEINCAPSA
@@ -4251,6 +4422,10 @@ LPSTR
 LPCWSTR
 LPWSTR
 
+%void
+
+void
+
 %%winnls32.dll
 
 %long
@@ -4413,6 +4588,10 @@ u_short *
 LPCSTR
 LPSTR
 
+%wstr
+
+LPWSTR
+
 %unknown
 
 struct WS_in_addr
@@ -4439,7 +4618,6 @@ UINT
 INT *
 LPDWORD
 LPGUID
-LPINT
 LPSERVICE_ASYNC_INFO
 LPSERVICE_INFOA
 LPSERVICE_INFOW
@@ -4491,6 +4669,7 @@ int
 %ptr
 
 BITMAPINFO *
+BLENDFUNCTION
 BYTE *
 CREATESTRUCTA *
 CURSORICONINFO *