Merged all API files into two files (Win16/Win32).

diff --git a/tools/winapi/config.pm b/tools/winapi/config.pm
index bda39c7..f148160 100644
--- a/tools/winapi/config.pm
+++ b/tools/winapi/config.pm
@@ -31,7 +31,7 @@
     &file_directory
     &file_type &files_filter
     &file_skip &files_skip
-    &get_api_files &get_c_files &get_h_files &get_spec_files
+    &get_c_files &get_h_files &get_spec_files
 );
 @EXPORT_OK = qw(
     $current_dir $wine_dir $winapi_dir $winapi_check_dir
@@ -174,10 +174,6 @@
     return @files;
 }
 
-sub get_api_files {
-    my $name = shift;
-    return _get_files("api", undef, "$winapi_check_dir/$name");
-}
 sub get_c_files { return _get_files("c", @_); }
 sub get_h_files { return _get_files("h", @_); }
 sub get_spec_files { return _get_files("spec", @_); }
diff --git a/tools/winapi/win16.api b/tools/winapi/win16.api
new file mode 100644
index 0000000..a010e7e
--- /dev/null
+++ b/tools/winapi/win16.api
@@ -0,0 +1,1348 @@
+%%avifile.dll
+
+%long
+
+DWORD
+HRESULT
+LONG
+UINT
+ULONG
+
+%ptr
+
+IAVIFile *
+LPCLSID
+PAVIFILE
+PAVIFILE *
+PAVISTREAM *
+
+%str
+
+LPCSTR
+
+%void
+
+void
+
+%%commdlg.dll
+
+%long
+
+BOOL
+DWORD
+LONG
+LPARAM
+LRESULT
+
+%ptr
+
+LPCHOOSECOLOR16
+LPCHOOSEFONT16
+LPPRINTDLG16
+
+%segptr
+
+SEGPTR
+
+%str
+
+LPCSTR
+LPSTR
+
+%word
+
+BOOL16
+HINSTANCE16
+HWND16
+INT16
+UINT16
+WORD
+WPARAM16
+short
+
+%%compobj.dll
+
+%long
+
+BOOL
+DWORD
+HRESULT
+INT
+ULONG
+
+%ptr
+
+CLSID *
+COSERVERINFO *
+FILETIME *
+GUID *
+HTASK16 *
+IMalloc16 *
+LPCLSID
+LPDWORD
+LPMALLOC16 *
+LPMESSAGEFILTER
+LPMESSAGEFILTER *
+LPOLESTR16 *
+LPUNKNOWN
+LPVOID
+LPVOID *
+LPWORD
+REFCLSID
+REFGUID
+REFIID
+
+%segptr
+
+SEGPTR
+
+%str
+
+LPCOLESTR16
+LPOLESTR
+
+%void
+
+VOID
+void
+
+%word
+
+BOOL16
+HINSTANCE16
+HTASK16
+INT16
+WORD
+
+%%ddeml.dll
+
+%long
+
+DWORD
+HCONV
+HCONVLIST
+HDDEDATA
+HSZ
+
+%long --forbidden
+
+int
+
+%ptr
+
+LPBYTE
+LPCONVCONTEXT16
+LPCONVINFO16
+LPDWORD
+LPVOID
+PFNCALLBACK16
+
+%str
+
+LPCSTR
+LPSTR
+
+%word
+
+BOOL16
+INT16
+UINT16
+
+%%dispdib.dll
+
+%ptr
+
+LPBITMAPINFO
+
+%str
+
+LPSTR
+
+%word
+
+WORD
+
+%%display.dll
+
+%long
+
+DWORD
+
+%ptr
+
+LPCURSORINFO
+struct tagCURSORICONINFO *
+
+%str
+
+LPSTR
+
+%void
+
+VOID
+
+%word
+
+BOOL16
+WORD
+
+%%gdi.exe
+
+%long
+
+COLORREF
+DWORD
+HANDLE
+LONG
+LPARAM
+UINT
+int
+
+%ptr
+
+ABORTPROC16
+BITMAP16 *
+BITMAPINFO *
+BITMAPINFOHEADER *
+DEVMODEA *
+DOCINFO16 *
+FARPROC16 *
+HANDLETABLE16 *
+INT16 *
+LOGBRUSH16 *
+LOGFONT16 *
+LOGPALETTE *
+LOGPEN16 *
+LPABC16
+LPBYTE
+LPCVOID
+LPDEVMODEA
+LPDWORD
+LPENUMLOGFONT16
+LPFONTINFO16
+LPGLYPHMETRICS16
+LPINT16
+LPKERNINGPAIR16
+LPLOGFONT16
+LPNEWTEXTMETRIC16
+LPOUTLINETEXTMETRIC16
+LPPALETTEENTRY
+LPPDEVICE
+LPPOINT16
+LPRASTERIZER_STATUS
+LPRECT16
+LPRGNDATA
+LPSIZE16
+LPTEXTXFORM16
+LPVOID
+MAT2 *
+METARECORD *
+PALETTEENTRY *
+POINT16 *
+RECT16 *
+RGBQUAD *
+SEGPTR *
+TEXTMETRIC16 *
+VOID *
+
+%segptr
+
+FARPROC16
+FONTENUMPROC16
+FONTENUMPROCEX16
+GOBJENUMPROC16
+LINEDDAPROC16
+MFENUMPROC16
+SEGPTR
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+VOID
+void
+
+%word
+
+BOOL16
+BYTE
+HANDLE16
+HBITMAP16
+HBRUSH16
+HDC16
+HFONT16
+HGDIOBJ16
+HGLOBAL16
+HMETAFILE16
+HMODULE16
+HPALETTE16
+HPEN16
+HPJOB16
+HPQ16
+HRGN16
+INT16
+UINT16
+WORD
+
+%%kernel.dll
+
+%long
+
+BOOL
+DWORD
+HANDLE
+HINSTANCE
+HMODULE
+INT
+LONG
+UINT
+
+%ptr
+
+BYTE *
+CONTEXT86 *
+FARPROC
+FARPROC *
+FARPROC16 *
+HANDLE *
+LPBYTE
+LPCATCHBUF
+LPCVOID
+LPDWORD
+LPHKEY
+LPVOID
+OFSTRUCT *
+OSVERSIONINFO16 *
+SECURITY_ATTRIBUTES *
+SEGINFO *
+SEGPTR *
+SYSLEVEL *
+THUNKLET *
+UINT16 *
+UTGLUEPROC
+WIN32_FIND_DATAA *
+WINDEBUGINFO16 *
+struct ThunkDataCommon *
+
+%segptr
+
+FARPROC16
+SEGPTR
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+VOID
+void
+
+%word
+
+ATOM
+BOOL16
+BYTE
+HANDLE16
+HFILE16
+HGLOBAL16
+HINSTANCE16
+HKEY
+HLOCAL16
+HMODULE16
+HQUEUE16
+HRSRC16
+HTASK16
+INT16
+UINT16
+WORD
+
+%wstr
+
+LPCWSTR
+
+%%keyboard.dll
+
+%long
+
+DWORD
+LONG
+
+%ptr
+
+LPBYTE
+LPKBINFO
+LPVOID
+
+%segptr
+
+FARPROC16
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+VOID
+void
+
+%word
+
+CHAR
+INT16
+UINT16
+WORD
+
+%%lzexpand.dll
+
+%long
+
+LONG
+
+%ptr
+
+LPOFSTRUCT
+LPVOID
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+void
+
+%word
+
+HFILE16
+INT16
+UINT16
+
+%%mmsystem.dll
+
+%long
+
+BOOL
+DWORD
+FOURCC
+HINSTANCE
+HWND
+LONG
+LPARAM
+LRESULT
+
+%ptr
+
+DWORD *
+HINSTANCE16 *
+HMIDIIN16 *
+HMIDIOUT16 *
+HMIDISTRM16 *
+HPCSTR
+HPSTR
+HWAVEIN16 *
+HWAVEOUT16 *
+LPAUXCAPS16
+LPBYTE
+LPDWORD
+LPHANDLE
+LPHMIXER16
+LPJOYCAPS16
+LPJOYINFO16
+LPJOYINFOEX
+LPMIDIHDR16
+LPMIDIINCAPS16
+LPMIDIOUTCAPS16
+LPMIXERCAPS16
+LPMIXERCONTROLDETAILS16
+LPMIXERLINE16
+LPMIXERLINECONTROLS16
+LPMMCKINFO
+LPMMIOPROC16
+LPMMTIME16
+LPTIMECAPS16
+LPUINT16
+LPWAVEFORMATEX
+LPWAVEHDR
+LPWAVEINCAPS16
+LPWAVEOUTCAPS16
+MIDIHDR16 *
+MMCKINFO *
+MMIOINFO16 *
+UINT16 *
+WAVEHDR *
+WORD *
+YIELDPROC16
+
+%segptr
+
+FARPROC16
+LPTIMECALLBACK16
+SEGPTR
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+void
+
+%word
+
+BOOL16
+HANDLE16
+HDRVR16
+HINSTANCE16
+HMIDIIN16
+HMIDIOUT16
+HMIDISTRM16
+HMIXER16
+HMIXEROBJ16
+HMMIO16
+HMODULE16
+HTASK16
+HWAVEIN16
+HWAVEOUT16
+HWND16
+INT16
+MMRESULT16
+UINT16
+WORD
+
+%%mouse.dll
+
+%ptr
+
+LPMOUSEINFO
+
+%segptr
+
+FARPROC16
+
+%void
+
+VOID
+
+%word
+
+WORD
+
+%%msacm.dll
+
+%long
+
+BOOL
+DWORD
+LPARAM
+LRESULT
+
+%ptr
+
+ACMDRIVERENUMCB16
+ACMFILTERENUMCB16
+ACMFILTERTAGENUMCB16
+ACMFORMATENUMCB16
+ACMFORMATTAGENUMCB16
+LPACMDRIVERDETAILS16
+LPACMFILTERCHOOSE16
+LPACMFILTERDETAILS16
+LPACMFILTERTAGDETAILS16
+LPACMFORMATCHOOSE16
+LPACMFORMATDETAILS16
+LPACMFORMATTAGDETAILS16
+LPACMSTREAMHEADER16
+LPDWORD
+LPHACMDRIVER16
+LPHACMDRIVERID16
+LPHACMSTREAM16
+LPVOID
+LPWAVEFILTER
+LPWAVEFORMATEX
+
+%word
+
+HACMDRIVER16
+HACMDRIVERID16
+HACMOBJ16
+HACMSTREAM16
+HINSTANCE16
+MMRESULT16
+UINT16
+WORD
+
+%%msvideo.dll
+
+%long
+
+DWORD
+LONG
+LRESULT
+
+%ptr
+
+LPBITMAPINFOHEADER
+LPDWORD
+LPVOID
+
+%segptr
+
+FARPROC16
+ICINFO16 *
+
+%str
+
+LPSTR
+
+%word
+
+BOOL16
+HDC16
+HDRAWDIB16
+HIC16
+HPALETTE16
+HWND16
+INT16
+UINT16
+WORD
+
+%%ole2.dll
+
+%long
+
+DWORD
+HRESULT
+
+%ptr
+
+LPDROPTARGET
+LPMONIKER *
+LPRUNNINGOBJECTTABLE *
+LPVOID
+
+%str
+
+LPCOLESTR16
+
+%void
+
+void
+
+%word
+
+HGLOBAL16
+HICON16
+HWND16
+UINT16
+
+%%ole2disp.dll
+
+%long
+
+DWORD
+HRESULT
+LCID
+int
+
+%ptr
+
+BSTR16 *
+INTERFACEDATA *
+ITypeInfo *
+ITypeInfo **
+IUnknown *
+IUnknown **
+LPBSTR16
+REFCLSID
+char *
+unsigned long *
+void *
+
+%segstr
+
+BSTR16
+
+%str
+
+LPCOLESTR16
+
+%void
+
+void
+
+%word
+
+INT16
+
+%%ole2nls.dll
+
+%long
+
+DWORD
+LCID
+LCTYPE
+
+%ptr
+
+LPVOID
+LPWORD
+
+%str
+
+LPCSTR
+LPSTR
+
+%word
+
+BOOL16
+INT16
+LANGID
+UINT16
+
+%%olecli.dll
+
+%long
+
+LHCLIENTDOC
+LONG
+
+%ptr
+
+LHCLIENTDOC *
+LPOLEOBJECT
+
+%segptr
+
+SEGPTR
+
+%str
+
+LPCSTR
+
+%word
+
+BOOL16
+HDC16
+OLESTATUS
+UINT16
+
+%%olesvr.dll
+
+%long
+
+LHSERVER
+LHSERVERDOC
+
+%ptr
+
+BOOL16 *
+LHSERVER *
+LHSERVERDOC *
+LPOLESERVER
+LPOLESERVERDOC
+
+%str
+
+LPCSTR
+
+%word
+
+HINSTANCE16
+OLESTATUS
+OLE_SERVER_USE
+
+%%setupx.dll
+
+%long
+
+BOOL
+DWORD
+LPARAM
+int
+
+%ptr
+
+HINF16 *
+LPBYTE
+LPDWORD
+LPEXPANDVTBL
+LPHKEY
+LPLOGDISKDESC
+LPLPDEVICE_INFO16
+LPVIRTNODE
+LPVOID
+VIFPROC
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+void
+
+%word
+
+HINF16
+HINSTANCE16
+HKEY
+HWND16
+INT16
+LOGDISKID16
+RETERR16
+UINT16
+VHSTR
+WORD
+WPARAM
+
+%%shell.dll
+
+%long
+
+BOOL
+DWORD
+LPARAM
+LRESULT
+
+%ptr
+
+HICON16 *
+LPDWORD
+LPHKEY
+LPWORD
+POINT16 *
+
+%segptr
+
+SEGPTR
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+void
+
+%word
+
+BOOL16
+HDROP16
+HGLOBAL16
+HICON16
+HINSTANCE16
+HKEY
+HWND16
+INT16
+UINT16
+WORD
+WPARAM16
+
+%%sound.dll
+
+%long
+
+DWORD
+
+%ptr
+
+LPINT16
+
+%void
+
+void
+
+%word
+
+INT16
+
+%%storage.dll
+
+%long
+
+DWORD
+HRESULT
+ULONG
+
+%longlong
+
+LARGE_INTEGER
+
+%ptr
+
+IID *
+IStorage16 *
+IStorage16 **
+IStream16 *
+IStream16 **
+LPSTORAGE16
+LPVOID *
+REFIID
+SNB16
+STATSTG16 *
+ULARGE_INTEGER *
+ULONG *
+void *
+
+%str
+
+LPCOLESTR16
+
+%%stress.dll
+
+%long
+
+DWORD
+LONG
+
+%void
+
+void
+
+%word
+
+BOOL16
+INT16
+UINT16
+
+%%system.dll
+
+%long
+
+DWORD
+
+%ptr
+
+char *
+
+%segptr
+
+FARPROC16
+
+%void
+
+void
+
+%word
+
+WORD
+
+%%toolhelp.dll
+
+%long
+
+DWORD
+
+%ptr
+
+CLASSENTRY *
+FARPROC
+GLOBALENTRY *
+GLOBALINFO *
+LOCAL32ENTRY *
+LOCAL32INFO *
+LOCALENTRY *
+LOCALINFO *
+MEMMANINFO *
+MODULEENTRY *
+STACKTRACEENTRY *
+SYSHEAPINFO *
+TASKENTRY *
+TIMERINFO *
+void *
+
+%segptr
+
+FARPROC16
+
+%str
+
+LPCSTR
+
+%void
+
+void
+
+%word
+
+BOOL16
+HGLOBAL16
+HMODULE16
+HTASK16
+WORD
+
+%%typelib.dll
+
+%long
+
+DWORD
+HRESULT
+LCID
+
+%ptr
+
+ITypeLib **
+LPBSTR16
+REFGUID
+
+%str
+
+LPOLESTR
+
+%word
+
+WORD
+
+%%user.exe
+
+%long
+
+BOOL
+COLORREF
+DWORD
+HHOOK
+INT
+LONG
+LPARAM
+LRESULT
+POINT16
+UINT
+
+%ptr
+
+BOOL16 *
+COLORREF *
+CONTEXT86 *
+CURSORICONINFO *
+DRAWSTATEPROC16
+DWORD *
+HANDLE *
+HHOOK *
+INT16 *
+LPBYTE
+LPCOMSTAT16
+LPCVOID
+LPDCB16
+LPDEVMODEA
+LPDRIVERINFOSTRUCT16
+LPDWORD
+LPICONINFO16
+LPINT16
+LPMSG16
+LPMSGBOXPARAMS16
+LPPAINTSTRUCT16
+LPPOINT16
+LPQUEUESTRUCT16 *
+LPRECT16
+LPSCROLLINFO
+LPVOID
+MENUITEMINFO16 *
+MSG16 *
+MSG32_16 *
+PAINTSTRUCT16 *
+POINT16 *
+RECT16 *
+SCROLLINFO *
+SEGPTR *
+UINT16 *
+WINDOWPLACEMENT16 *
+WNDCLASS16 *
+WNDCLASSEX16 *
+WNDPROC
+WORD *
+void *
+
+%segptr
+
+DLGPROC16
+FARPROC16
+GRAYSTRINGPROC16
+HOOKPROC16
+PROPENUMPROC16
+SEGPTR
+TIMERPROC16
+WNDENUMPROC16
+WNDPROC16
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+VOID
+void
+
+%word
+
+ATOM
+BOOL16
+BYTE
+CHAR
+HACCEL16
+HANDLE16
+HBITMAP16
+HBRUSH16
+HCURSOR16
+HDC16
+HDRVR16
+HDWP16
+HFONT16
+HGLOBAL16
+HICON16
+HINSTANCE16
+HMENU16
+HMODULE16
+HPALETTE16
+HQUEUE16
+HRGN16
+HRSRC16
+HTASK16
+HWND16
+INT16
+UINT16
+WORD
+WPARAM16
+
+%%ver.dll
+
+%long
+
+DWORD
+
+%ptr
+
+LPDWORD
+LPVOID
+SEGPTR *
+UINT16 *
+
+%segptr
+
+SEGPTR
+
+%str
+
+LPCSTR
+LPSTR
+
+%word
+
+UINT16
+
+%%w32sys.dll
+
+%long
+
+DWORD
+
+%ptr
+
+LPWIN32SINFO
+
+%segptr
+
+SEGPTR
+
+%word
+
+HFILE16
+WORD
+
+%%win32s16.dll
+
+%long
+
+BOOL
+DWORD
+HANDLE
+
+%ptr
+
+LPCVOID
+LPDWORD
+LPMEMORY_BASIC_INFORMATION
+LPVOID
+
+%segptr
+
+SEGPTR
+
+%void
+
+void
+
+%word
+
+WORD
+
+%%win87em.dll
+
+%long
+
+int
+
+%ptr
+
+CONTEXT86 *
+struct Win87EmInfoStruct *
+void *
+
+%void
+
+void
+
+%%winaspi.dll
+
+%long
+
+DWORD
+
+%segptr
+
+FARPROC16
+SEGPTR
+
+%word
+
+BOOL16
+WORD
+
+%%windebug.dll
+
+%ptr
+
+CONTEXT86 *
+
+%void
+
+void
+
+%%wineps16.dll
+
+%long
+
+DWORD
+
+%ptr
+
+LPDEVMODEA
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+void
+
+%word
+
+HANDLE16
+HWND16
+INT16
+WORD
+
+%%wing.dll
+
+%long
+
+COLORREF
+
+%ptr
+
+BITMAPINFO *
+RGBQUAD *
+SEGPTR *
+
+%segptr
+
+SEGPTR
+
+%word
+
+BOOL16
+HBITMAP16
+HBRUSH16
+HDC16
+HPALETTE16
+INT16
+UINT16
+WING_DITHER_TYPE
+
+%%winnls.dll
+
+%long
+
+BOOL
+
+%word
+
+HWND16
+
+%%winsock.dll
+
+%long
+
+BOOL
+INT
+LONG
+u_long
+
+%ptr
+
+INT16 *
+LPWSADATA16
+ULONG *
+char *
+struct WS_sockaddr *
+struct WS_timeval *
+ws_fd_set16 *
+
+%segptr
+
+FARPROC16
+SEGPTR
+
+%str
+
+LPCSTR
+
+%unknown
+
+struct in_addr
+
+%void
+
+void
+
+%word
+
+HANDLE16
+HWND16
+INT16
+SOCKET16
+UINT16
+u_short
+
+%%wprocs.dll
+
+%ptr
+
+CONTEXT86 *
+
+%void
+
+void
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
new file mode 100644
index 0000000..4822e9f
--- /dev/null
+++ b/tools/winapi/win32.api
@@ -0,0 +1,3111 @@
+%%advapi32.dll
+
+%long
+
+ACCESS_MASK
+ALG_ID
+BOOL
+BYTE
+DWORD
+HANDLE
+HCRYPTHASH
+HCRYPTKEY
+HCRYPTPROV
+HKEY
+LONG
+NTSTATUS
+POLICY_INFORMATION_CLASS
+REGSAM
+SC_HANDLE
+SECURITY_IMPERSONATION_LEVEL
+SECURITY_INFORMATION
+SERVICE_STATUS_HANDLE
+TOKEN_INFORMATION_CLASS
+ULONG
+WORD
+
+%long --extension
+
+LSA_HANDLE
+
+%ptr
+
+BYTE *
+DWORD *
+FILETIME *
+HANDLE *
+HCRYPTHASH *
+HCRYPTKEY *
+HCRYPTPROV *
+LPBOOL
+LPBYTE
+LPCSTR *
+LPCWSTR *
+LPDWORD
+LPENUM_SERVICE_STATUSA
+LPENUM_SERVICE_STATUSW
+LPHANDLER_FUNCTION
+LPHKEY
+LPHW_PROFILE_INFOA
+LPLONG
+LPSECURITY_ATTRIBUTES
+LPSERVICE_STATUS
+LPSERVICE_TABLE_ENTRYA
+LPSERVICE_TABLE_ENTRYW
+LPVOID
+LPVOID *
+PACL
+PACL *
+PBOOL
+PDWORD
+PGENERIC_MAPPING
+PHANDLE
+PHKEY
+PLSA_HANDLE
+PLSA_OBJECT_ATTRIBUTES
+PLSA_REFERENCED_DOMAIN_LIST *
+PLSA_TRANSLATED_NAME *
+PLSA_UNICODE_STRING
+PLUID
+PPRIVILEGE_SET
+PSECURITY_DESCRIPTOR
+PSECURITY_DESCRIPTOR_CONTROL
+PSID
+PSID *
+PSID_IDENTIFIER_AUTHORITY
+PSID_NAME_USE
+PUCHAR
+PVOID
+PVOID *
+SECURITY_ATTRIBUTES *
+SECURITY_DESCRIPTOR *
+
+%str
+
+LPCSTR
+LPSTR
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
+%%avicap32.dll
+
+%long
+
+BOOL
+INT
+WORD
+
+%str
+
+LPSTR
+
+%wstr
+
+LPWSTR
+
+%%avifil32.dll
+
+%long
+
+DWORD
+HRESULT
+LONG
+UINT
+ULONG
+
+%ptr
+
+AVICOMPRESSOPTIONS *
+AVISTREAMINFOA *
+AVISTREAMINFOW *
+CLSID *
+IAVIFile *
+LONG *
+LPAVIFILEINFOA
+LPAVIFILEINFOW
+LPBITMAPINFOHEADER
+LPCLSID
+LPVOID
+PAVIFILE
+PAVIFILE *
+PAVISTREAM
+PAVISTREAM *
+PGETFRAME
+
+%str
+
+LPCSTR
+
+%void
+
+void
+
+%%comcat.dll
+
+%long
+
+HRESULT
+
+%ptr
+
+LPVOID *
+REFCLSID
+REFIID
+
+%%comctl32.dll
+
+%long
+
+BOOL
+CHAR
+COLORREF
+DWORD
+HANDLE
+HBITMAP
+HDC
+HDPA
+HDSA
+HICON
+HIMAGELIST
+HINSTANCE
+HMENU
+HPROPSHEETPAGE
+HRESULT
+HWND
+INT
+LANGID
+LPARAM
+LRESULT
+UINT
+WORD
+WPARAM
+int
+
+%longlong
+
+POINT
+
+%ptr
+
+DLLVERSIONINFO *
+DPAENUMPROC
+DPALOADPROC
+DSAENUMPROC
+HDPA *
+IMAGEINFO *
+IMAGELISTDRAWPARAMS *
+INT *
+IStream *
+LPCOLDTBBUTTON
+LPCOLORMAP
+LPCPROPSHEETHEADERA
+LPCPROPSHEETHEADERW
+LPCPROPSHEETPAGEA
+LPCPROPSHEETPAGEW
+LPCREATEMRULISTA
+LPCREATEMRULISTW
+LPCTBBUTTON
+LPCVOID
+LPINITCOMMONCONTROLSEX
+LPINT
+LPNMHDR
+LPRECT
+LPSCROLLINFO
+LPSTR *
+LPSTREAM
+LPUINT
+LPVOID
+LPWSTR *
+PFNDPACOMPARE
+PFNDPAMERGE
+POINT *
+SMOOTHSCROLLSTRUCT *
+TRACKMOUSEEVENT *
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+VOID
+void
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
+%%comdlg32.dll
+
+%long
+
+BOOL
+DWORD
+HRESULT
+HWND
+UINT
+short
+
+%ptr
+
+LPCHOOSECOLORA
+LPCHOOSECOLORW
+LPCHOOSEFONTA
+LPCHOOSEFONTW
+LPFINDREPLACEA
+LPFINDREPLACEW
+LPOPENFILENAMEA
+LPOPENFILENAMEW
+LPPAGESETUPDLGA
+LPPAGESETUPDLGW
+LPPRINTDLGA
+LPPRINTDLGW
+LPVOID
+
+%str
+
+LPCSTR
+LPSTR
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
+%%crtdll.dll
+
+%long
+
+int
+
+%ptr
+
+char *
+char ***
+int *
+struct crtdll_stat *
+
+%void
+
+void
+
+%%crypt32.dll
+
+%long
+
+BOOL
+DWORD
+
+%ptr
+
+GUID *
+SIP_ADD_NEWPROVIDER *
+SIP_DISPATCH_INFO *
+
+%wstr
+
+LPCWSTR
+
+%%d3d8.dll
+
+%long
+
+HRESULT
+UINT
+
+%ptr
+
+LPVOID
+
+%%dciman32.dll
+
+%long
+
+HDC
+
+%void
+
+void
+
+%%ddraw.dll
+
+%long
+
+DWORD
+HRESULT
+
+%ptr
+
+LPDDENUMCALLBACKA
+LPDDENUMCALLBACKEXA
+LPDDENUMCALLBACKEXW
+LPDDENUMCALLBACKW
+LPDIRECTDRAW *
+LPDIRECTDRAWCLIPPER *
+LPGUID
+LPUNKNOWN
+LPVOID
+LPVOID *
+REFCLSID
+REFIID
+
+%%dinput.dll
+
+%long
+
+DWORD
+HINSTANCE
+HRESULT
+
+%ptr
+
+LPDIRECTINPUTA *
+LPUNKNOWN
+LPVOID *
+REFCLSID
+REFIID
+
+%%dinput8.dll
+
+%long
+
+DWORD
+HINSTANCE
+HRESULT
+
+%ptr
+
+LPUNKNOWN
+LPVOID *
+REFCLSID
+REFIID
+
+%%dplayx.dll
+
+%long
+
+DWORD
+HRESULT
+
+%ptr
+
+IUnknown *
+LPDIRECTPLAY2 *
+LPDIRECTPLAYLOBBY *
+LPDIRECTPLAYLOBBYA *
+LPDPENUMDPCALLBACKA
+LPDPENUMDPCALLBACKW
+LPGUID
+LPVOID
+LPVOID *
+REFCLSID
+REFIID
+
+%%dsound.dll
+
+%long
+
+DWORD
+HRESULT
+
+%ptr
+
+IUnknown *
+LPCGUID
+LPDIRECTSOUND8 *
+LPDIRECTSOUNDCAPTURE *
+LPDSENUMCALLBACKA
+LPDSENUMCALLBACKW
+LPUNKNOWN
+LPVOID
+LPVOID *
+REFCLSID
+REFGUID
+REFIID
+
+%%gdi32.dll
+
+%long
+
+BOOL
+COLORREF
+DWORD
+FLOAT
+HANDLE
+HBITMAP
+HBRUSH
+HCOLORSPACE
+HDC
+HENHMETAFILE
+HFONT
+HGDIOBJ
+HGLOBAL
+HMETAFILE
+HPALETTE
+HPEN
+HRGN
+HWND
+INT
+LONG
+LPARAM
+UINT
+WORD
+
+%long --extension
+
+HDC16
+HMETAFILE16
+HPJOB16
+INT16
+int
+
+%ptr
+
+ABORTPROC
+BITMAP *
+BITMAPINFO *
+BITMAPINFOHEADER *
+BYTE *
+COLORADJUSTMENT *
+DCHOOKPROC
+DEVMODEA *
+DEVMODEW *
+DOCINFOA *
+DOCINFOW *
+DWORD *
+ENHMETARECORD *
+ENHMFENUMPROC
+FONTENUMPROCA
+FONTENUMPROCEXA
+FONTENUMPROCEXW
+FONTENUMPROCW
+GCP_RESULTSA *
+GCP_RESULTSW *
+GOBJENUMPROC
+HANDLETABLE *
+INT *
+LINEDDAPROC
+LOGBRUSH *
+LOGFONTA *
+LOGFONTW *
+LOGPALETTE *
+LOGPEN *
+LPABC
+LPABCFLOAT
+LPBYTE
+LPCHARSETINFO
+LPCOLORADJUSTMENT
+LPCVOID
+LPDEVMODEA
+LPDWORD
+LPENHMETAHEADER
+LPFONTSIGNATURE
+LPGLYPHMETRICS
+LPHANDLETABLE
+LPINT
+LPKERNINGPAIR
+LPLOGCOLORSPACEA
+LPLOGCOLORSPACEW
+LPLOGFONTA
+LPLOGFONTW
+LPOUTLINETEXTMETRICA
+LPOUTLINETEXTMETRICW
+LPPALETTEENTRY
+LPPIXELFORMATDESCRIPTOR
+LPPOINT
+LPRASTERIZER_STATUS
+LPRECT
+LPRGNDATA
+LPSIZE
+LPVOID
+LPVOID *
+LPWORD
+LPXFORM
+MAT2 *
+METAFILEPICT *
+METARECORD *
+MFENUMPROC
+PALETTEENTRY *
+PFLOAT
+PIXELFORMATDESCRIPTOR *
+POINT *
+PPOLYTEXTA
+PPOLYTEXTW
+PVOID
+RECT *
+RGBQUAD *
+RGNDATA *
+TEXTMETRICA *
+TEXTMETRICW *
+WORD *
+XFORM *
+void *
+
+%ptr --extension
+
+FARPROC16
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+void
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
+%%glu32.dll
+
+%double
+
+double
+
+%long
+
+int
+
+%ptr
+
+char *
+void *
+
+%%icmp.dll
+
+%long
+
+BOOL
+DWORD
+HANDLE
+IPAddr
+WORD
+
+%ptr
+
+LPVOID
+PIP_OPTION_INFORMATION
+
+%%imaadp32.acm
+
+%long
+
+DWORD
+HDRVR
+LPARAM
+LRESULT
+UINT
+
+%%imagehlp.dll
+
+%long
+
+BOOL
+BOOLEAN
+DWORD
+HANDLE
+HMODULE
+ULONG
+USHORT
+WORD
+
+%ptr
+
+DIGEST_FUNCTION
+DIGEST_HANDLE
+LPDWORD
+LPSYSTEMTIME
+LPVOID
+PAPI_VERSION
+PCHAR
+PCHAR *
+PDWORD
+PENUMLOADED_MODULES_CALLBACK
+PFUNCTION_TABLE_ACCESS_ROUTINE
+PGET_MODULE_BASE_ROUTINE
+PIMAGEHLP_MODULE
+PIMAGEHLP_STATUS_ROUTINE
+PIMAGEHLP_SYMBOL
+PIMAGE_DEBUG_INFORMATION
+PIMAGE_LOAD_CONFIG_DIRECTORY
+PIMAGE_NT_HEADERS
+PIMAGE_SECTION_HEADER
+PIMAGE_SECTION_HEADER *
+PLOADED_IMAGE
+PREAD_PROCESS_MEMORY_ROUTINE
+PSTACKFRAME
+PSYMBOL_REGISTERED_CALLBACK
+PSYM_ENUMMODULES_CALLBACK
+PSYM_ENUMSYMBOLS_CALLBACK
+PTRANSLATE_ADDRESS_ROUTINE
+PULONG
+PVOID
+PWIN_CERTIFICATE
+ULONG *
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+VOID
+
+%wstr
+
+LPWSTR
+
+%%imm32.dll
+
+%long
+
+BOOL
+DWORD
+HIMC
+HKL
+HWND
+LONG
+LPARAM
+LRESULT
+UINT
+WPARAM
+
+%ptr
+
+LPCANDIDATEFORM
+LPCANDIDATELIST
+LPCOMPOSITIONFORM
+LPCVOID
+LPDWORD
+LPLOGFONTA
+LPLOGFONTW
+LPPOINT
+LPSTYLEBUFA
+LPSTYLEBUFW
+LPVOID
+REGISTERWORDENUMPROCA
+REGISTERWORDENUMPROCW
+
+%str
+
+LPCSTR
+LPSTR
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
+%%joystick.drv
+
+%long
+
+DWORD
+HDRVR
+LONG
+
+%%kernel32.dll
+
+%long
+
+ATOM
+BOOL
+BYTE
+CALID
+CALTYPE
+CHAR
+COORD
+DWORD
+EXECUTION_STATE
+HANDLE
+HFILE
+HGLOBAL
+HINSTANCE
+HLOCAL
+HMODULE
+HRSRC
+INT
+LANGID
+LCID
+LCTYPE
+LONG
+UINT
+WCHAR
+WORD
+WOW_HANDLE_TYPE
+int
+
+%long --extension
+
+BOOL16
+HGLOBAL16
+HINSTANCE16
+HMODULE16
+HRSRC16
+HTASK16
+INT16
+UINT16
+
+%long --pointer
+
+ULONG_PTR
+
+%longlong
+
+DWORDLONG
+
+%ptr
+
+BOOL *
+BY_HANDLE_FILE_INFORMATION *
+CALINFO_ENUMPROCA
+CHAR_INFO *
+CODEPAGE_ENUMPROCA
+CODEPAGE_ENUMPROCW
+COMPUTER_NAME_FORMAT
+CONTEXT *
+CONTEXT86 *
+CRITICAL_SECTION *
+CURRENCYFMTA *
+CURRENCYFMTW *
+DATEFMT_ENUMPROCA
+DATEFMT_ENUMPROCW
+DWORD *
+ENUMRESLANGPROCA
+ENUMRESLANGPROCW
+ENUMRESNAMEPROCA
+ENUMRESNAMEPROCW
+ENUMRESTYPEPROCA
+ENUMRESTYPEPROCW
+FARPROC
+FARPROC *
+FILETIME *
+FINDEX_INFO_LEVELS
+FINDEX_SEARCH_OPS
+GET_FILEEX_INFO_LEVELS
+HANDLE *
+INPUT_RECORD *
+LARGE_INTEGER *
+LOCALE_ENUMPROCA
+LOCALE_ENUMPROCW
+LONG *
+LPBOOL
+LPBYTE
+LPCHAR_INFO
+LPCOMMCONFIG
+LPCOMMPROP
+LPCOMMTIMEOUTS
+LPCOMSTAT
+LPCONSOLE_CURSOR_INFO
+LPCONSOLE_SCREEN_BUFFER_INFO
+LPCPINFO
+LPCVOID
+LPDCB
+LPDEBUG_EVENT
+LPDWORD
+LPFILETIME
+LPINPUT_RECORD
+LPLDT_ENTRY
+LPMEMORYSTATUS
+LPMEMORY_BASIC_INFORMATION
+LPMODULEENTRY32
+LPOSVERSIONINFOEXA
+LPOSVERSIONINFOEXW
+LPOVERLAPPED
+LPOVERLAPPED *
+LPOVERLAPPED_COMPLETION_ROUTINE
+LPPROCESSENTRY32
+LPPROCESS_HEAP_ENTRY
+LPPROCESS_INFORMATION
+LPPROGRESS_ROUTINE
+LPSECURITY_ATTRIBUTES
+LPSMALL_RECT
+LPSTARTUPINFOA
+LPSTARTUPINFOW
+LPSTR *
+LPSYSTEMTIME
+LPSYSTEM_INFO
+LPSYSTEM_POWER_STATUS
+LPTHREADENTRY32
+LPTHREAD_START_ROUTINE
+LPTIME_ZONE_INFORMATION
+LPTOP_LEVEL_EXCEPTION_FILTER
+LPVOID
+LPVOID *
+LPWORD
+LPWSTR *
+NUMBERFMTA *
+NUMBERFMTW *
+OFSTRUCT *
+OSVERSIONINFOA *
+OSVERSIONINFOW *
+PAPCFUNC
+PBOOL
+PDWORD
+PEXCEPTION_POINTERS
+PHANDLE
+PHANDLER_ROUTINE
+PLARGE_INTEGER
+PLONG
+PTIMERAPCROUTINE
+PULARGE_INTEGER
+SECURITY_ATTRIBUTES *
+SYSLEVEL *
+SYSLEVEL **
+SYSTEMTIME *
+TIMEFMT_ENUMPROCA
+TIMEFMT_ENUMPROCW
+WIN32_FIND_DATAA *
+WIN32_FIND_DATAW *
+WORD *
+struct ThunkDataCommon *
+va_list
+va_list *
+
+%ptr --extension
+
+BUILTIN16_DESCRIPTOR *
+FARPROC16
+SEGPTR
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+VOID
+void
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
+%%lz32.dll
+
+%long
+
+HFILE
+INT
+LONG
+UINT
+
+%ptr
+
+LPOFSTRUCT
+LPVOID
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+void
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
+%%mapi32.dll
+
+%long
+
+FLAGS
+HRESULT
+ULONG
+
+%ptr
+
+LPLHANDLE
+LPVOID
+LPVOID *
+VOID *
+
+%str
+
+LPSTR
+
+%void
+
+VOID
+
+%%mcianim.drv
+
+%long
+
+DWORD
+HDRVR
+LONG
+
+%%mciavi.drv
+
+%long
+
+DWORD
+HDRVR
+LONG
+
+%%mcicda.drv
+
+%long
+
+DWORD
+HDRVR
+LONG
+
+%%mciseq.drv
+
+%long
+
+DWORD
+HDRVR
+LONG
+
+%%mciwave.drv
+
+%long
+
+DWORD
+HDRVR
+LONG
+
+%%midimap.drv
+
+%long
+
+DWORD
+HDRVR
+LONG
+UINT
+
+%%mpr.dll
+
+%long
+
+BOOL
+BYTE
+DWORD
+HANDLE
+HPROVIDER
+HWND
+INT
+UINT
+WORD
+enum NOTIFYTYPE
+
+%ptr
+
+BOOL *
+ENUMPASSWORDPROC
+LPAUTHDLGSTRUCTA
+LPBYTE
+LPCONNECTDLGSTRUCTA
+LPCONNECTDLGSTRUCTW
+LPCSTR *
+LPDISCDLGSTRUCTA
+LPDISCDLGSTRUCTW
+LPDWORD
+LPHANDLE
+LPNETCONNECTINFOSTRUCT
+LPNETINFOSTRUCT
+LPNETRESOURCEA
+LPNETRESOURCEW
+LPSTR *
+LPVOID
+LPWORD
+LPWSTR *
+NOTIFYCALLBACK
+PHPROVIDER
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+VOID
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
+%%msacm.drv
+
+%long
+
+DWORD
+HDRVR
+LONG
+UINT
+WORD
+
+%%msacm32.dll
+
+%long
+
+DWORD
+HACMDRIVER
+HACMDRIVERID
+HACMOBJ
+HACMSTREAM
+HDRVR
+HINSTANCE
+LPARAM
+LRESULT
+MMRESULT
+UINT
+
+%ptr
+
+ACMDRIVERENUMCB
+ACMFILTERENUMCBA
+ACMFILTERENUMCBW
+ACMFILTERTAGENUMCBA
+ACMFILTERTAGENUMCBW
+ACMFORMATENUMCBA
+ACMFORMATENUMCBW
+ACMFORMATTAGENUMCBA
+ACMFORMATTAGENUMCBW
+LPDWORD
+LPVOID
+PACMDRIVERDETAILSA
+PACMDRIVERDETAILSW
+PACMFILTERCHOOSEA
+PACMFILTERCHOOSEW
+PACMFILTERDETAILSA
+PACMFILTERDETAILSW
+PACMFILTERTAGDETAILSA
+PACMFILTERTAGDETAILSW
+PACMFORMATCHOOSEA
+PACMFORMATCHOOSEW
+PACMFORMATDETAILSA
+PACMFORMATDETAILSW
+PACMFORMATTAGDETAILSA
+PACMFORMATTAGDETAILSW
+PACMSTREAMHEADER
+PHACMDRIVER
+PHACMDRIVERID
+PHACMSTREAM
+PWAVEFILTER
+PWAVEFORMATEX
+
+%%msacmmap.dll
+
+%long
+
+DWORD
+HDRVR
+LONG
+UINT
+WORD
+
+%%msg711.acm
+
+%long
+
+DWORD
+HDRVR
+LPARAM
+LRESULT
+UINT
+
+%%msimg32.dll
+
+%long
+
+BOOL
+HDC
+UINT
+ULONG
+int
+
+%ptr
+
+BLENDFUNCTION
+TRIVERTEX *
+void *
+
+%void
+
+void
+
+%%msisys.ocx
+
+%long
+
+HRESULT
+
+%ptr
+
+CLSID *
+IID *
+void **
+
+%%msvcrt.dll
+
+%double
+
+double
+
+%long
+
+DWORD
+INT
+LONG
+MSVCRT_clock_t
+MSVCRT_complex
+MSVCRT_size_t
+MSVCRT_time_t
+WCHAR
+int
+long
+unsigned int
+unsigned long
+
+%longlong
+
+LONGLONG
+ULONGLONG
+
+%ptr
+
+MSVCRT_EXCEPTION_FRAME *
+MSVCRT_FILE *
+MSVCRT_compar_fn_t
+MSVCRT_exception *
+MSVCRT_fpos_t *
+MSVCRT_free_func
+MSVCRT_malloc_func
+MSVCRT_matherr_func
+MSVCRT_new_handler_func
+MSVCRT_sig_handler_func
+MSVCRT_time_t *
+MSVCRT_wint_t
+PCONTEXT
+PEXCEPTION_FRAME
+PEXCEPTION_FRAME *
+PEXCEPTION_POINTERS
+PEXCEPTION_RECORD
+WCHAR *
+WCHAR **
+WCHAR ***
+WORD **
+_HEAPINFO *
+_INITTERMFUN *
+_JUMP_BUFFER *
+__non_rtti_object *
+_onexit_t
+_onexit_t **
+bad_cast *
+bad_typeid *
+char *
+char **
+char ***
+exception *
+int *
+struct MSVCRT_tm *
+struct __EXCEPTION_FRAME *
+struct __EXCEPTION_FRAME **
+struct _diskfree_t *
+struct _finddata_t *
+struct _stat *
+struct _timeb *
+struct _utimbuf *
+struct _wfinddata_t *
+terminate_function
+type_info *
+unexpected_function
+unsigned char *
+unsigned int *
+unsigned long *
+va_list
+void *
+
+%ptr --extension
+
+_beginthread_start_routine_t
+_beginthreadex_start_routine_t
+
+%unknown
+
+MSVCRT_div_t
+MSVCRT_ldiv_t
+
+%void
+
+VOID
+void
+
+%%msvcrt20.dll
+
+%long
+
+int
+
+%ptr
+
+WCHAR **
+char **
+int *
+
+%void
+
+void
+
+%%msvfw32.dll
+
+%long
+
+BOOL
+DWORD
+HANDLE
+HDC
+HDRAWDIB
+HIC
+HINSTANCE
+HPALETTE
+HWND
+INT
+LONG
+LRESULT
+UINT
+WORD
+
+%ptr
+
+FARPROC
+ICINFO *
+LONG *
+LPBITMAPINFO
+LPBITMAPINFOHEADER
+LPDWORD
+LPVOID
+
+%str
+
+LPCSTR
+
+%wstr
+
+LPCWSTR
+
+%%netapi32.dll
+
+%long
+
+BOOL
+
+%ptr
+
+PNCB
+
+%%ntdll.dll
+
+%double
+
+double
+
+%long
+
+ACCESS_MASK
+BOOL
+BOOLEAN
+BYTE
+DWORD
+FILE_INFORMATION_CLASS
+FS_INFORMATION_CLASS
+HANDLE
+HMODULE
+INT
+KEY_INFORMATION_CLASS
+KEY_VALUE_INFORMATION_CLASS
+LONG
+NTSTATUS
+OBJECT_INFORMATION_CLASS
+PROCESSINFOCLASS
+SECTION_INHERIT
+SECURITY_IMPERSONATION_LEVEL
+SECURITY_INFORMATION
+SIZE_T
+SYSTEM_INFORMATION_CLASS
+THREADINFOCLASS
+TIMER_TYPE
+TOKEN_TYPE
+UINT
+ULONG
+WCHAR
+int
+long
+unsigned int
+unsigned long
+
+%long --extension
+
+obj_handle_t
+
+%longlong
+
+LONGLONG
+ULONGLONG
+
+%ptr
+
+CONTEXT *
+CONTEXT86 *
+DWORD *
+EXCEPTION_FRAME *
+EXCEPTION_RECORD *
+FILETIME *
+HANDLE *
+INT *
+LARGE_INTEGER *
+LPBYTE
+LPDWORD
+LPDWORD *
+LPRTL_RWLOCK
+LPVOID
+LPVOID *
+LPWSTR *
+OBJECT_ATTRIBUTES *
+PACE_HEADER
+PACE_HEADER *
+PACL
+PACL *
+PANSI_STRING
+PBOOLEAN
+PCVOID
+PDWORD
+PEXCEPTION_FRAME
+PEXCEPTION_RECORD
+PGENERIC_MAPPING
+PHANDLE
+PIMAGE_NT_HEADERS
+PIO_APC_ROUTINE
+PIO_STATUS_BLOCK
+PLARGE_INTEGER
+PLUID
+POBJDIR_INFORMATION
+POBJECT_ATTRIBUTES
+PPRIVILEGE_SET
+PRTL_HEAP_DEFINITION
+PSECURITY_DESCRIPTOR
+PSECURITY_DESCRIPTOR_CONTROL
+PSID
+PSID *
+PSID_IDENTIFIER_AUTHORITY
+PSTRING
+PTIMERAPCROUTINE
+PTIME_FIELDS
+PTOKEN_PRIVILEGES
+PULONG
+PUNICODE_STRING
+PVOID
+PVOID *
+RTL_CRITICAL_SECTION *
+STRING *
+UINT *
+ULONGLONG *
+UNICODE_STRING *
+VOID *
+struct _TEB *
+union cptable *
+void *
+
+%ptr --extension
+
+WCHAR *
+char *
+enum fd_type *
+int *
+obj_handle_t *
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+VOID
+void
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
+%%odbc32.dll
+
+%long
+
+SQLHANDLE
+SQLHDBC
+SQLHDESC
+SQLHENV
+SQLHSTMT
+SQLHWND
+SQLINTEGER
+SQLRETURN
+SQLSMALLINT
+SQLUINTEGER
+SQLUSMALLINT
+
+%ptr
+
+SQLCHAR *
+SQLHANDLE *
+SQLHDBC *
+SQLHENV *
+SQLHSTMT *
+SQLINTEGER *
+SQLPOINTER
+SQLPOINTER *
+SQLSMALLINT *
+SQLUINTEGER *
+SQLUSMALLINT *
+
+%%ole32.dll
+
+%long
+
+BOOL
+CLIPFORMAT
+DWORD
+HACCEL
+HANDLE
+HGLOBAL
+HINSTANCE
+HMENU
+HOLEMENU
+HRESULT
+HWND
+INT
+UINT
+ULONG
+int
+
+%ptr
+
+CLIPFORMAT *
+CLSID *
+COSERVERINFO *
+DVTARGETDEVICE *
+DWORD *
+FILETIME *
+GUID *
+HGLOBAL *
+ICreateErrorInfo **
+IDataObject *
+IDataObject **
+IDropSource *
+IErrorInfo *
+IErrorInfo **
+ILockBytes *
+IMoniker *
+IMoniker **
+IPersistStream *
+IStorage *
+IStorage **
+IStream *
+IUnknown *
+LPBC
+LPBC *
+LPCLSID
+LPDATAADVISEHOLDER *
+LPDATAOBJECT
+LPDROPTARGET
+LPDWORD
+LPENUMFORMATETC *
+LPENUMOLEVERB *
+LPFORMATETC
+LPGUID
+LPLOCKBYTES *
+LPMALLOC *
+LPMARSHAL *
+LPMESSAGEFILTER
+LPMESSAGEFILTER *
+LPMONIKER
+LPMONIKER *
+LPMSG
+LPOLEADVISEHOLDER *
+LPOLECLIENTSITE
+LPOLEINPLACEACTIVEOBJECT
+LPOLEINPLACEFRAME
+LPOLEINPLACEFRAMEINFO
+LPOLEMENUGROUPWIDTHS
+LPOLEOBJECT
+LPOLESTR *
+LPOLESTREAM
+LPPERSISTSTORAGE
+LPRUNNINGOBJECTTABLE *
+LPSTORAGE
+LPSTREAM
+LPSTREAM *
+LPUNKNOWN
+LPUNKNOWN *
+LPVOID
+LPVOID *
+MULTI_QI *
+OLECHAR *
+REFCLSID
+REFGUID
+REFIID
+SNB
+STGMEDIUM *
+ULONG *
+WORD *
+void *
+void **
+
+%str
+
+LPCOLESTR
+LPOLESTR
+
+%void
+
+VOID
+void
+
+%%oleaut32.dll
+
+%double
+
+CY
+DATE
+double
+
+%long
+
+BOOL
+BYTE
+CHAR
+DISPID
+DWORD
+FLOAT
+HCURSOR
+HICON
+HINSTANCE
+HPALETTE
+HRESULT
+HWND
+INT
+LCID
+LONG
+OLE_COLOR
+REGKIND
+SYSKIND
+UINT
+ULONG
+USHORT
+VARIANT_BOOL
+VARTYPE
+WORD
+int
+short
+signed char
+unsigned int
+
+%ptr
+
+BSTR *
+BYTE *
+CHAR *
+COLORREF *
+CY *
+DATE *
+DISPID *
+DISPPARAMS *
+EXCEPINFO *
+FLOAT *
+ICreateTypeLib **
+INTERFACEDATA *
+ITypeInfo *
+ITypeInfo **
+ITypeLib *
+ITypeLib **
+IUnknown *
+IUnknown **
+LONG *
+LPBSTR
+LPBYTE
+LPCLSID
+LPDWORD
+LPFONTDESC
+LPOCPFIPARAMS
+LPPICTDESC
+LPSTREAM
+LPSYSTEMTIME
+LPUNKNOWN
+LPUNKNOWN *
+LPVARIANT
+LPVOID
+LPVOID *
+NUMPARSE *
+OLECHAR *
+OLECHAR **
+REFCLSID
+REFGUID
+REFIID
+SAFEARRAY *
+SAFEARRAY **
+SAFEARRAYBOUND *
+UDATE *
+UINT *
+ULONG *
+USHORT *
+VARIANT *
+VARIANTARG *
+VARIANT_BOOL *
+VARTYPE *
+VOID *
+double *
+int *
+short *
+void *
+void **
+
+%str
+
+LPCOLESTR
+LPCSTR
+LPOLESTR
+
+%void
+
+void
+
+%wstr
+
+BSTR
+
+%%olecli32.dll
+
+%long
+
+BOOL
+HDC
+LHCLIENTDOC
+LONG
+OLECLIPFORMAT
+OLEOPT_RENDER
+OLESTATUS
+
+%ptr
+
+LHCLIENTDOC *
+LONG *
+LPOLECLIENT
+LPOLEOBJECT
+LPOLEOBJECT *
+
+%str
+
+LPCSTR
+
+%%oledlg.dll
+
+%long
+
+BOOL
+HMENU
+HWND
+INT
+UINT
+WORD
+
+%ptr
+
+HMENU *
+LPOLEOBJECT
+LPOLEUIBUSYA
+LPOLEUIBUSYW
+LPOLEUICHANGEICONA
+LPOLEUICHANGEICONW
+LPOLEUICHANGESOURCEA
+LPOLEUICHANGESOURCEW
+LPOLEUICONVERTA
+LPOLEUICONVERTW
+LPOLEUIEDITLINKSA
+LPOLEUIEDITLINKSW
+LPOLEUIINSERTOBJECTA
+LPOLEUIINSERTOBJECTW
+LPOLEUILINKCONTAINERA
+LPOLEUILINKCONTAINERW
+LPOLEUIOBJECTPROPSA
+LPOLEUIOBJECTPROPSW
+LPOLEUIPASTESPECIALA
+LPOLEUIPASTESPECIALW
+REFCLSID
+
+%str
+
+LPCSTR
+LPSTR
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
+%%olepro32.dll
+
+%long
+
+HRESULT
+
+%ptr
+
+LPVOID *
+REFCLSID
+REFIID
+
+%%olesvr32.dll
+
+%long
+
+HINSTANCE
+LHSERVER
+LHSERVERDOC
+OLESTATUS
+OLE_SERVER_USE
+
+%ptr
+
+BOOL *
+LHSERVER *
+LHSERVERDOC *
+LPOLESERVER
+LPOLESERVERDOC
+
+%str
+
+LPCSTR
+
+%%opengl32.dll
+
+%double
+
+GLclampd
+GLdouble
+
+%long
+
+BOOL
+DWORD
+FLOAT
+GLbitfield
+GLboolean
+GLbyte
+GLclampf
+GLenum
+GLfloat
+GLint
+GLshort
+GLsizei
+GLubyte
+GLuint
+GLushort
+HDC
+HGLRC
+UINT
+int
+
+%ptr
+
+COLORREF *
+GLboolean *
+GLbyte *
+GLclampf *
+GLdouble *
+GLfloat *
+GLint *
+GLshort *
+GLstring
+GLubyte *
+GLuint *
+GLushort *
+GLvoid *
+GLvoid **
+LPGLYPHMETRICSFLOAT
+LPLAYERPLANEDESCRIPTOR
+void *
+
+%str
+
+LPCSTR
+
+%void
+
+void
+
+%%psapi.dll
+
+%long
+
+BOOL
+DWORD
+HANDLE
+HMODULE
+
+%ptr
+
+DWORD *
+HMODULE *
+LPDWORD
+LPMODULEINFO
+LPVOID
+LPVOID *
+PPROCESS_MEMORY_COUNTERS
+PPSAPI_WS_WATCH_INFORMATION
+
+%str
+
+LPSTR
+
+%wstr
+
+LPWSTR
+
+%%rasapi32.dll
+
+%long
+
+BOOL
+DWORD
+HRASCONN
+
+%ptr
+
+LPBOOL
+LPCSTR *
+LPCWSTR *
+LPDWORD
+LPRASAUTODIALENTRYA
+LPRASAUTODIALENTRYW
+LPRASCONNA
+LPRASDEVINFOA
+LPRASDEVINFOW
+LPRASDIALPARAMSA
+LPRASENTRYNAMEA
+LPVOID
+
+%str
+
+LPCSTR
+
+%wstr
+
+LPCWSTR
+
+%%riched32.dll
+
+%long
+
+HRESULT
+
+%ptr
+
+DLLVERSIONINFO *
+
+%%rpcrt4.dll
+
+%long
+
+HMODULE
+HRESULT
+RPC_IF_HANDLE
+RPC_STATUS
+UINT
+ULONG
+
+%ptr
+
+CLSID *
+CStdPSFactoryBuffer *
+LPSTR *
+LPVOID
+LPVOID *
+LPWSTR *
+PRPC_POLICY
+ProxyFileInfo **
+REFCLSID
+REFIID
+RPC_AUTH_KEY_RETRIEVAL_FN
+RPC_BINDING_HANDLE *
+RPC_IF_CALLBACK_FN *
+RPC_MGR_EPV *
+RPC_STATUS *
+UUID *
+unsigned char *
+unsigned char **
+unsigned short
+unsigned short *
+
+%str
+
+LPSTR
+
+%wstr
+
+LPWSTR
+
+%%serialui.dll
+
+%long
+
+BOOL
+DWORD
+HWND
+LPARAM
+
+%ptr
+
+LPCOMMCONFIG
+LPDEVICE_INFO
+LPDWORD
+LPFNADDPROPSHEETPAGE
+
+%str
+
+LPCSTR
+
+%%setupapi.dll
+
+%long
+
+BOOL
+DWORD
+HDEVINFO
+HINF
+HKEY
+HSPFILEQ
+HWND
+LONG
+UINT
+
+%long --ptr
+
+UINT_PTR
+
+%ptr
+
+BYTE *
+DWORD *
+GUID *
+INFCONTEXT *
+INT *
+PBYTE
+PDWORD
+PSP_DEVICE_INTERFACE_DATA
+PSP_DEVICE_INTERFACE_DETAIL_DATAA
+PSP_DEVICE_INTERFACE_DETAIL_DATAW
+PSP_DEVINFO_DATA
+PSP_FILE_CALLBACK_A
+PSP_FILE_CALLBACK_W
+PSP_FILE_COPY_PARAMS_A
+PSP_FILE_COPY_PARAMS_W
+PSTR
+PUINT
+PVOID
+UINT *
+
+%str
+
+LPCSTR
+PCSTR
+PCWSTR
+PWSTR
+
+%void
+
+void
+
+%%shdocvw.dll
+
+%long
+
+BOOL
+HRESULT
+
+%ptr
+
+DLLVERSIONINFO *
+LPVOID *
+REFCLSID
+REFIID
+
+%wstr
+
+LPCWSTR
+
+%%shell32.dll
+
+%long
+
+BOOL
+COLORREF
+DWORD
+HANDLE
+HBITMAP
+HDROP
+HGLOBAL
+HICON
+HIMAGELIST
+HINSTANCE
+HKEY
+HMENU
+HMODULE
+HRESULT
+HWND
+INT
+LONG
+LRESULT
+UINT
+ULONG
+WORD
+WPARAM
+int
+
+%ptr
+
+CLSID *
+DLLVERSIONINFO *
+DWORD *
+FARPROC
+HICON *
+HIMAGELIST *
+HWND *
+IShellFolder **
+IStream *
+ITEMIDLIST *
+LPBROWSEINFOA
+LPBYTE
+LPCITEMIDLIST
+LPCITEMIDLIST *
+LPCNOTIFYREGISTER
+LPCRECT
+LPCSHELLFOLDERVIEWINFO
+LPCVOID
+LPCVOID *
+LPDATAOBJECT
+LPDATAOBJECT *
+LPDRAWITEMSTRUCT
+LPDROPSOURCE
+LPDROPTARGET
+LPDWORD
+LPFNCREATEINSTANCE
+LPFNFMCALLBACK
+LPHKEY
+LPITEMIDLIST
+LPITEMIDLIST *
+LPMALLOC *
+LPMEASUREITEMSTRUCT
+LPNOTIFYREGISTER
+LPPOINT
+LPSECURITY_ATTRIBUTES
+LPSHELLEXECUTEINFOA
+LPSHELLEXECUTEINFOW
+LPSHELLFLAGSTATE
+LPSHELLFOLDER
+LPSHELLVIEW *
+LPSHFILEOPSTRUCTA
+LPSHFILEOPSTRUCTW
+LPSTRRET
+LPTPMPARAMS
+LPUNKNOWN
+LPUNKNOWN *
+LPVOID
+LPVOID *
+LPWORD
+LPWSTR *
+PAPPBARDATA
+PNOTIFYICONDATAA
+PNOTIFYICONDATAW
+POINT *
+REFCLSID
+REFIID
+SHFILEINFOA *
+SHFILEINFOW *
+UINT *
+int *
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+VOID
+void
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
+%%shlwapi.dll
+
+%long
+
+BOOL
+COLORREF
+DWORD
+HANDLE
+HDC
+HDROP
+HICON
+HINSTANCE
+HKEY
+HMENU
+HMODULE
+HPALETTE
+HRESULT
+HSHARED
+HUSKEY
+HWND
+INT
+LANGID
+LONG
+LPARAM
+LRESULT
+REGSAM
+SHREGENUM_FLAGS
+UCHAR
+UINT
+ULONG
+URLIS
+WCHAR
+WORD
+WPARAM
+int
+
+%ptr
+
+BOOL *
+CLSID *
+DLLVERSIONINFO *
+HICON *
+IFACE_INDEX_TBL *
+IID *
+IStream *
+IStream **
+ITEMIDLIST *
+IUnknown *
+IUnknown **
+LPBROWSEINFOW
+LPCITEMIDLIST
+LPCLSID
+LPCSHLWAPI_CLIST
+LPCSTR *
+LPCVOID
+LPCWSTR *
+LPDWORD
+LPDWORD *
+LPHWND
+LPINT
+LPITEMIDLIST
+LPOPENFILENAMEW
+LPPAGESETUPDLGW
+LPPRINTDLGW
+LPSHELLEXECUTEINFOW
+LPSHFILEOPSTRUCTW
+LPSHLWAPI_CLIST
+LPSHLWAPI_CLIST *
+LPSTRRET
+LPUNKNOWN *
+LPVOID
+LPVOID *
+LPWORD
+PACL
+PHUSKEY
+PLONG
+PSECURITY_DESCRIPTOR
+PVOID
+REFGUID
+REFIID
+SHFILEINFOW *
+UINT *
+ULARGE_INTEGER *
+WNDCLASSA *
+unsigned char *
+va_list
+
+%ptr --extension
+
+UNKNOWN_SHLWAPI_1 *
+UNKNOWN_SHLWAPI_2 *
+WNDCLASSW *
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+VOID
+void
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
+%%sti.dll
+
+%long
+
+DWORD
+HINSTANCE
+HRESULT
+
+%ptr
+
+LPVOID
+
+%%tapi32.dll
+
+%long
+
+DWORD
+HCALL
+HINSTANCE
+HLINE
+HLINEAPP
+HPHONE
+HPHONEAPP
+HWND
+
+%ptr
+
+HICON *
+LINECALLBACK
+LPDWORD
+LPHCALL
+LPHLINE
+LPHLINEAPP
+LPHPHONE
+LPHPHONEAPP
+LPLINEADDRESSCAPS
+LPLINEADDRESSSTATUS
+LPLINECALLINFO
+LPLINECALLLIST
+LPLINECALLPARAMS
+LPLINECALLSTATUS
+LPLINECOUNTRYLIST
+LPLINEDEVCAPS
+LPLINEDEVSTATUS
+LPLINEDIALPARAMS
+LPLINEEXTENSIONID
+LPLINEFORWARDLIST
+LPLINEGENERATETONE
+LPLINEMEDIACONTROLCALLSTATE
+LPLINEMEDIACONTROLDIGIT
+LPLINEMEDIACONTROLMEDIA
+LPLINEMEDIACONTROLTONE
+LPLINEMONITORTONE
+LPLINEPROVIDERLIST
+LPLINETRANSLATECAPS
+LPLINETRANSLATEOUTPUT
+LPPHONEBUTTONINFO
+LPPHONECAPS
+LPPHONEEXTENSIONID
+LPPHONESTATUS
+LPVARSTRING
+LPVOID
+PHONECALLBACK
+
+%str
+
+LPCSTR
+LPSTR
+
+%%ttydrv.dll
+
+%long
+
+BOOL
+CHAR
+COLORREF
+DWORD
+HBITMAP
+HDC
+HFONT
+HRGN
+HWND
+INT
+INT16
+LONG
+UINT
+UINT16
+WORD
+int
+
+%ptr
+
+BITMAPINFO *
+CREATESTRUCTA *
+DC *
+DEVMODEA *
+DWORD *
+INT *
+LPBYTE
+LPCVOID
+LPINT
+LPPALETTEENTRY
+LPPOINT
+LPSIZE
+LPTEXTMETRICW
+POINT *
+RECT *
+TTYDRV_PDEVICE *
+TTYDRV_PDEVICE **
+WINDOWPOS *
+struct tagCURSORICONINFO *
+void *
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+void
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
+%%twain_32.dll
+
+%long
+
+TW_UINT16
+TW_UINT32
+
+%ptr
+
+TW_MEMREF
+pTW_IDENTITY
+
+%%urlmon.dll
+
+%long
+
+BOOL
+DWORD
+HRESULT
+long
+
+%ptr
+
+DWORD *
+IBindCtx *
+IBindCtx **
+IBindStatusCallback *
+IBindStatusCallback **
+IEnumFORMATETC *
+IMoniker *
+IMoniker **
+LPVOID
+LPVOID *
+REFCLSID
+REFIID
+
+%str
+
+LPCSTR
+
+%wstr
+
+LPCWSTR
+
+%%user32.dll
+
+%long
+
+ATOM
+BOOL
+BYTE
+CHAR
+COLORREF
+DWORD
+HACCEL
+HANDLE
+HBITMAP
+HBRUSH
+HCONV
+HCONVLIST
+HCURSOR
+HDC
+HDDEDATA
+HDESK
+HDEVNOTIFY
+HDWP
+HFONT
+HHOOK
+HICON
+HINSTANCE
+HKL
+HMENU
+HMODULE
+HMONITOR
+HRESULT
+HRGN
+HSZ
+HTASK
+HWINEVENTHOOK
+HWINSTA
+HWND
+INT
+LONG
+LPARAM
+LRESULT
+SHORT
+UINT
+ULONG_PTR
+WCHAR
+WORD
+WPARAM
+int
+
+%long --extension
+
+BOOL16
+HANDLE16
+HDRVR16
+HGLOBAL16
+HINSTANCE16
+HMODULE16
+HTASK16
+HWND16
+INT16
+UINT16
+WPARAM16
+
+%longlong
+
+POINT
+
+%ptr
+
+BOOL *
+COLORREF *
+DLGPROC
+DRAWSTATEPROC
+DWORD *
+GRAYSTRINGPROC
+HANDLE *
+HBRUSH *
+HICON *
+HKL *
+HOOKPROC
+HWND *
+INT *
+LPACCEL
+LPBYTE
+LPCHARSETINFO
+LPCMENUINFO
+LPCONVCONTEXT
+LPCONVINFO
+LPCVOID
+LPDEVMODEA
+LPDEVMODEW
+LPDISPLAY_DEVICEA
+LPDISPLAY_DEVICEW
+LPDRAWTEXTPARAMS
+LPDWORD
+LPINPUT
+LPINT
+LPMENUINFO
+LPMENUITEMINFOA
+LPMENUITEMINFOW
+LPMONITORINFO
+LPMSG
+LPMSGBOXPARAMSA
+LPMSGBOXPARAMSW
+LPPOINT
+LPRECT
+LPSCROLLINFO
+LPSECURITY_ATTRIBUTES
+LPTPMPARAMS
+LPVOID
+LPWORD
+MENUITEMINFOA *
+MENUITEMINFOW *
+MONITORENUMPROC
+MSG *
+PAINTSTRUCT *
+PFNCALLBACK
+PICONINFO
+POINT *
+PROPENUMPROCA
+PROPENUMPROCEXA
+PROPENUMPROCEXW
+PROPENUMPROCW
+PSECURITY_DESCRIPTOR
+PSECURITY_INFORMATION
+PSECURITY_QUALITY_OF_SERVICE
+PUINT
+PVOID
+PWINDOWINFO
+RECT *
+SCROLLINFO *
+SECURITY_QUALITY_OF_SERVICE *
+SENDASYNCPROC
+TIMERPROC
+TRACKMOUSEEVENT *
+UINT *
+WINDOWPLACEMENT *
+WINEVENTPROC
+WNDCLASSA *
+WNDCLASSEXA *
+WNDCLASSEXW *
+WNDCLASSW *
+WNDENUMPROC
+WNDPROC
+va_list
+
+%ptr --extension
+
+DLGPROC16
+HOOKPROC16
+WNDPROC16
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+VOID
+void
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
+%%version.dll
+
+%long
+
+BOOL
+DWORD
+UINT
+
+%ptr
+
+LPDWORD
+LPVOID
+LPVOID *
+UINT *
+
+%str
+
+LPCSTR
+LPSTR
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
+%%w32skrnl.dll
+
+%long
+
+HTASK16
+
+%str
+
+LPSTR
+
+%%winealsa.drv
+
+%long
+
+DWORD
+HDRVR
+LONG
+UINT
+WORD
+
+%%winearts.drv
+
+%long
+
+DWORD
+HDRVR
+LONG
+UINT
+WORD
+
+%%winedos.dll
+
+%long
+
+BOOL
+DWORD
+HANDLE
+UINT
+int
+
+%ptr
+
+DWORD *
+
+%str
+
+LPCSTR
+
+%void
+
+void
+
+%%winemp3.acm
+
+%long
+
+DWORD
+HDRVR
+LPARAM
+LRESULT
+UINT
+
+%%wineoss.drv
+
+%long
+
+DWORD
+HDRVR
+LONG
+UINT
+WORD
+
+%%wineps.dll
+
+%long
+
+BOOL
+COLORREF
+DWORD
+HBITMAP
+HBRUSH
+HDC
+HFONT
+HPEN
+HRGN
+HWND
+INT
+LPARAM
+UINT
+WORD
+
+%ptr
+
+BITMAPINFO *
+DC *
+DEVICEFONTENUMPROC
+DEVMODEA *
+DOCINFOA *
+DWORD *
+INT *
+LPCVOID
+LPDEVMODEA
+LPINT
+LPLOGFONTW
+LPSIZE
+LPVOID
+POINT *
+PSDRV_PDEVICE *
+PSDRV_PDEVICE **
+RECT *
+TEXTMETRICW *
+void *
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+VOID
+
+%wstr
+
+LPCWSTR
+
+%%wininet.dll
+
+%long
+
+BOOL
+DWORD
+FILETIME
+HANDLE
+HINTERNET
+HRESULT
+INTERNET_PORT
+
+%ptr
+
+HANDLE *
+INTERNET_STATUS_CALLBACK
+LPBYTE
+LPCSTR *
+LPCVOID
+LPDWORD
+LPINTERNET_BUFFERSA
+LPINTERNET_CACHE_ENTRY_INFOA
+LPINTERNET_CACHE_ENTRY_INFOW
+LPURL_COMPONENTSA
+LPVOID
+LPWIN32_FIND_DATAA
+
+%str
+
+LPCSTR
+LPSTR
+
+%wstr
+
+LPCWSTR
+
+%%winmm.dll
+
+%long
+
+BOOL
+DWORD
+FOURCC
+HDRVR
+HINSTANCE
+HMIDIIN
+HMIDIOUT
+HMIDISTRM
+HMIXER
+HMIXEROBJ
+HMMIO
+HMODULE
+HTASK
+HWAVEIN
+HWAVEOUT
+HWND
+INT
+LONG
+LPARAM
+LRESULT
+MMRESULT
+UINT
+
+%long --forbidden
+
+HMMIO16
+UINT16
+
+%ptr
+
+DWORD *
+HMIDIIN *
+HMIDIOUT *
+HMIDISTRM *
+HPCSTR
+HPSTR
+HWAVEIN *
+HWAVEOUT *
+LPAUXCAPSA
+LPAUXCAPSW
+LPBYTE
+LPDWORD
+LPHMIXER
+LPJOYCAPSA
+LPJOYCAPSW
+LPJOYINFO
+LPJOYINFOEX
+LPMIDIHDR
+LPMIDIINCAPSA
+LPMIDIINCAPSW
+LPMIDIOUTCAPSA
+LPMIDIOUTCAPSW
+LPMIXERCAPSA
+LPMIXERCAPSW
+LPMIXERCONTROLDETAILS
+LPMIXERLINEA
+LPMIXERLINECONTROLSA
+LPMIXERLINECONTROLSW
+LPMIXERLINEW
+LPMMCKINFO
+LPMMIOPROC
+LPMMIOPROC16
+LPMMTIME
+LPTIMECALLBACK
+LPTIMECAPS
+LPUINT
+LPWAVEFORMATEX
+LPWAVEHDR
+LPWAVEINCAPSA
+LPWAVEINCAPSW
+LPWAVEOUTCAPSA
+LPWAVEOUTCAPSW
+MIDIHDR *
+MMCKINFO *
+MMIOINFO *
+UINT *
+WAVEHDR *
+WORD *
+YIELDPROC
+
+%str
+
+LPCSTR
+LPSTR
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
+%%winspool.drv
+
+%long
+
+BOOL
+DWORD
+HANDLE
+HWND
+INT
+LONG
+WORD
+
+%ptr
+
+DEVMODEW *
+HANDLE *
+LPBYTE
+LPDEVMODEA
+LPDEVMODEW
+LPDWORD
+LPPRINTER_DEFAULTSA
+LPPRINTER_DEFAULTSW
+LPVOID
+
+%str
+
+LPCSTR
+LPSTR
+
+%wstr
+
+LPCWSTR
+LPWSTR
+
+%%wintrust.dll
+
+%long
+
+HWND
+LONG
+
+%ptr
+
+GUID *
+LPVOID
+
+%%wnaspi32.dll
+
+%long
+
+BOOL
+DWORD
+
+%ptr
+
+LPDWORD
+LPSRB
+PASPI32BUFF
+
+%%ws2_32.dll
+
+%long
+
+BOOL
+DWORD
+GROUP
+HANDLE
+HWND
+INT
+LONG
+SOCKET
+UINT
+WORD
+WSAEVENT
+int
+long
+u_long
+u_short
+
+%ptr
+
+FARPROC
+INT *
+LPCONDITIONPROC
+LPDWORD
+LPGUID
+LPINT
+LPQOS
+LPVOID
+LPWPUPOSTMESSAGE
+LPWSABUF
+LPWSADATA
+LPWSANETWORKEVENTS
+LPWSAOVERLAPPED
+LPWSAOVERLAPPED_COMPLETION_ROUTINE
+LPWSAPROTOCOL_INFOA
+LPWSAPROTOCOL_INFOW
+WS_fd_set *
+char *
+int *
+struct WS_hostent *
+struct WS_protoent *
+struct WS_servent *
+struct WS_sockaddr *
+struct WS_timeval *
+u_long *
+
+%str
+
+LPCSTR
+LPSTR
+
+%unknown
+
+struct WS_in_addr
+
+%void
+
+void
+
+%wstr
+
+LPCWSTR
+
+%%wsock32.dll
+
+%long
+
+DWORD
+INT
+SOCKET
+UINT
+
+%ptr
+
+INT *
+LPDWORD
+LPINT
+LPVOID
+char *
+struct netent *
+
+%str
+
+LPCSTR
+
+%void
+
+void
+
+%%x11drv.dll
+
+%long
+
+BOOL
+CHAR
+COLORREF
+DWORD
+HANDLE
+HBITMAP
+HBRUSH
+HDC
+HFONT
+HICON
+HPALETTE
+HPEN
+HRGN
+HWND
+INT
+LONG
+LPARAM
+UINT
+WORD
+WPARAM
+int
+
+%ptr
+
+BITMAPINFO *
+BYTE *
+CREATESTRUCTA *
+CURSORICONINFO *
+DC *
+DEVICEFONTENUMPROC
+DEVMODEA *
+DWORD *
+HANDLE *
+INT *
+LPBYTE
+LPCVOID
+LPINT
+LPLOGFONTW
+LPPALETTEENTRY
+LPPOINT
+LPRECT
+LPSIZE
+LPVOID
+LPVOID *
+PIXELFORMATDESCRIPTOR *
+POINT *
+RECT *
+RGBQUAD *
+TEXTMETRICW *
+WINDOWPOS *
+X11DRV_PDEVICE *
+X11DRV_PDEVICE **
+void *
+
+%str
+
+LPCSTR
+LPSTR
+
+%void
+
+void
+
+%wstr
+
+LPCWSTR
+LPWSTR
diff --git a/tools/winapi_check/winapi.pm b/tools/winapi/winapi.pm
similarity index 96%
rename from tools/winapi_check/winapi.pm
rename to tools/winapi/winapi.pm
index 3209344..4e93286 100644
--- a/tools/winapi_check/winapi.pm
+++ b/tools/winapi/winapi.pm
@@ -29,11 +29,7 @@
 
 use vars qw($win16api $win32api @winapis);
 
-use config qw(
-    &file_type
-    &get_api_files
-    $current_dir $wine_dir
-);
+use config qw($current_dir $wine_dir $winapi_dir);
 use modules qw($modules);
 use options qw($options);
 use output qw($output);
@@ -76,14 +72,7 @@
 	$self->parse_spec_file("$wine_dir/$file");
     }
 
-    foreach my $file (get_api_files($$name)) {
-	my $module = $file;
-	$module =~ s/.*?\/([^\/]*?)\.api$/$1/;
-
-	if($modules->is_allowed_module($module)) {
-	    $self->parse_api_file($file,$module);
-	}
-    }
+    $self->parse_api_file("$$name.api");
 
     foreach my $forward_name (sort(keys(%$function_forward))) {
 	$$function_forward{$forward_name} =~ /^(\S*):(\S*)\.(\S*)$/;
@@ -116,8 +105,8 @@
     my $type_format = \%{$self->{TYPE_FORMAT}};
 
     my $file = shift;
-    my $module = shift;
 
+    my $module;
     my $kind;
     my $format;
     my $extension = 0;
@@ -125,14 +114,19 @@
 
     $output->lazy_progress("$file");
 
-    open(IN, "< $wine_dir/$file") || die "$wine_dir/$file: $!\n";
+    open(IN, "< $winapi_dir/$file") || die "$winapi_dir/$file: $!\n";
     $/ = "\n";
     while(<IN>) {
 	s/^\s*?(.*?)\s*$/$1/; # remove whitespace at begin and end of line
 	s/^(.*?)\s*#.*$/$1/;  # remove comments
 	/^$/ && next;         # skip empty lines
 
-	if(s/^%(\S+)\s*//) {
+	if(/^%%(\S+)$/) {
+	    $module = $1;
+	    $module =~ s/\.dll$//; # FIXME: Kludge
+	} elsif(!$modules->is_allowed_module($module)) {
+	    # Nothing
+	} elsif(s/^%(\S+)\s*//) {
 	    $kind = $1;
 	    $format = undef;
 	    $forbidden = 0;
@@ -229,12 +223,14 @@
     $file =~ s%^\./%%;
 
     my %ordinals;
-    my $type;
     my $module;
     my $module_file;
 
     $output->lazy_progress("$file");
 
+    $module = $file;
+    $module =~ s/^.*?([^\/]*)\.spec$/$1/;
+
     open(IN, "< $file") || die "$file: $!\n";
     $/ = "\n";
     my $header = 1;
@@ -248,7 +244,6 @@
 	if($header)  {
 	    if(/^name\s*(\S*)/) { $module = $1; }
 	    if(/^file\s*(\S*)/) { $module_file = $1; }
-	    if(/^type\s*(\w+)/) { $type = $1; }
 	    if(/^\d+|@/) { $header = 0; $lookahead = 1; }
 	    next;
 	}
@@ -344,16 +339,7 @@
 
 	    $ordinal = $1;
 
-	    my $internal_name;
-	    if(0 && $type eq "win16") {
-		if($external_name =~ /\d$/) {
-		    $internal_name = $external_name . "_16";
-		} else {
-		    $internal_name = $external_name . "16";
-		}
-	    } else {
-		$internal_name = $external_name;
-	    }
+	    my $internal_name = $external_name;
 
 	    $$function_stub{$module}{$external_name} = 1;
 	    if(!$$function_internal_name{$external_name}) {
diff --git a/tools/winapi_check/modules.dat b/tools/winapi_check/modules.dat
index 6d8e205..68b0153 100644
--- a/tools/winapi_check/modules.dat
+++ b/tools/winapi_check/modules.dat
@@ -40,6 +40,10 @@
 
 dlls/crypt32
 
+% dlls/d3d8/d3d8.spec
+
+dlls/d3d8
+
 % dlls/dciman32/dciman32.spec
 
 dlls/dciman32
@@ -57,6 +61,10 @@
 
 dlls/dinput
 
+% dlls/dinput8/dinput8.spec
+
+dlls/dinput8
+
 % dlls/dplay/dplay.spec
 
 % dlls/dplayx/dplayx.spec
@@ -523,6 +531,10 @@
 
 dlls/winmm/winearts
 
+% dlls/winmm/winealsa/winealsa.drv.spec
+
+dlls/winmm/winealsa
+
 % dlls/winmm/wineoss/wineoss.drv.spec
 
 dlls/winmm/wineoss
diff --git a/tools/winapi_check/modules.pm b/tools/winapi_check/modules.pm
index 42c02cf..051aabf 100644
--- a/tools/winapi_check/modules.pm
+++ b/tools/winapi_check/modules.pm
@@ -49,15 +49,24 @@
 
     open(IN, "< $file") || die "$file: $!\n";
     local $/ = "\n";
-    while(<IN>) {
+    my $header = 1;
+    my $lookahead = 0;
+    while($lookahead || defined($_ = <IN>)) {
+	$lookahead = 0;
 	s/^\s*(.*?)\s*$/$1/;
 	s/^(.*?)\s*#.*$/$1/;
 	/^$/ && next;
 
-	if(/^name\s*(\S*)/) { $module = $1; }
-	if(/^type\s*(\w+)/) { $type = $1; }
+	if($header)  {
+	    if(/^name\s*(\S*)/) { $module = $1; }
+	    if(/^\d+|@/) { $header = 0; $lookahead = 1; }
+	    next;
+	}
 
-	if(defined($module) && defined($type)) { last; }
+	if(/^(\d+|@)\s+pascal(?:16)?/) {
+	    $type = "win16";
+	    last;
+	}
     }
     close(IN);
 
@@ -67,7 +76,7 @@
     }
 
     if(!defined($type)) {
-	$type = "";
+	$type = "win32";
     }
 
     return ($type, $module);
@@ -143,8 +152,6 @@
     foreach my $spec_file (@spec_files) {
 	(my $type, my $module) = get_spec_file_type("$wine_dir/$spec_file");
 
-	if(!$type) { $type = "win32"; }
-
 	$$spec_file2module{$spec_file} = $module;
 	$$module2spec_file{$module} = $spec_file;
 
diff --git a/tools/winapi_check/win16/avifile.api b/tools/winapi_check/win16/avifile.api
deleted file mode 100644
index 68526fa..0000000
--- a/tools/winapi_check/win16/avifile.api
+++ /dev/null
@@ -1,23 +0,0 @@
-%long
-
-DWORD
-LONG
-HRESULT
-UINT
-ULONG
-
-%ptr
-
-IAVIFile *
-LPCLSID
-PAVIFILE
-PAVIFILE *
-PAVISTREAM *
-
-%str
-
-LPCSTR
-
-%void
-
-void
diff --git a/tools/winapi_check/win16/commdlg.api b/tools/winapi_check/win16/commdlg.api
deleted file mode 100644
index 760e511..0000000
--- a/tools/winapi_check/win16/commdlg.api
+++ /dev/null
@@ -1,36 +0,0 @@
-%long
-
-DWORD
-LONG
-LPARAM
-LRESULT
-
-%long # --forbidden
-
-BOOL
-
-%ptr
-
-LPCHOOSECOLOR16
-LPCHOOSEFONT16
-LPPRINTDLG16
-
-%segptr
-
-SEGPTR
-
-%str
-
-LPCSTR
-LPSTR
-
-%word
-
-BOOL16
-HINSTANCE16
-HWND16
-INT16
-UINT16
-WORD
-WPARAM16
-short
diff --git a/tools/winapi_check/win16/compobj.api b/tools/winapi_check/win16/compobj.api
deleted file mode 100644
index 63e5a08..0000000
--- a/tools/winapi_check/win16/compobj.api
+++ /dev/null
@@ -1,57 +0,0 @@
-%long
-
-DWORD
-HRESULT
-ULONG
-
-%long # --forbidden
-
-BOOL
-INT
-
-%ptr
-
-CLSID *
-COSERVERINFO *
-FILETIME *
-GUID *
-HTASK16 *
-IMalloc16 *
-LPCLSID
-LPDWORD
-LPMALLOC16 *
-LPMESSAGEFILTER
-LPMESSAGEFILTER *
-LPOLESTR16 *
-LPUNKNOWN
-LPVOID
-LPVOID *
-LPWORD
-REFCLSID
-REFGUID
-REFIID
-
-%segptr
-
-SEGPTR
-
-%str
-
-LPCOLESTR16
-
-%str # --forbidden
-
-LPOLESTR
-
-%void
-
-void
-VOID
-
-%word
-
-BOOL16
-HINSTANCE16
-HTASK16
-INT16
-WORD
diff --git a/tools/winapi_check/win16/ddeml.api b/tools/winapi_check/win16/ddeml.api
deleted file mode 100644
index dcd325d..0000000
--- a/tools/winapi_check/win16/ddeml.api
+++ /dev/null
@@ -1,32 +0,0 @@
-%long
-
-DWORD
-HCONV
-HCONVLIST
-HDDEDATA
-HSZ
-
-%long --forbidden
-
-int
-
-%ptr
-
-LPBYTE
-LPCONVCONTEXT16
-LPCONVINFO16
-LPDWORD
-LPVOID
-PFNCALLBACK16
-
-%str
-
-LPCSTR
-LPSTR
-
-%word
-
-BOOL16
-INT16
-UINT16
-
diff --git a/tools/winapi_check/win16/dispdib.api b/tools/winapi_check/win16/dispdib.api
deleted file mode 100644
index 7912d1e..0000000
--- a/tools/winapi_check/win16/dispdib.api
+++ /dev/null
@@ -1,11 +0,0 @@
-%ptr
-
-LPBITMAPINFO
-
-%str
-
-LPSTR
-
-%word
-
-WORD
\ No newline at end of file
diff --git a/tools/winapi_check/win16/display.api b/tools/winapi_check/win16/display.api
deleted file mode 100644
index ea64981..0000000
--- a/tools/winapi_check/win16/display.api
+++ /dev/null
@@ -1,24 +0,0 @@
-%long
-
-DWORD
-
-%ptr
-
-LPCURSORINFO
-
-%ptr # --forbidden
-
-struct tagCURSORICONINFO *
-
-%str
-
-LPSTR
-
-%void
-
-VOID
-
-%word
-
-BOOL16
-WORD
diff --git a/tools/winapi_check/win16/gdi.api b/tools/winapi_check/win16/gdi.api
deleted file mode 100644
index 8870e6c..0000000
--- a/tools/winapi_check/win16/gdi.api
+++ /dev/null
@@ -1,104 +0,0 @@
-%long
-
-COLORREF
-DWORD
-LONG
-LPARAM
-
-%long # --forbidden
-
-HANDLE
-UINT
-int
-
-%ptr
-
-ABORTPROC16
-BITMAP16 *
-BITMAPINFO *
-BITMAPINFOHEADER *
-DEVMODEA *
-DOCINFO16 *
-FARPROC16 *
-HANDLETABLE16 *
-INT16 *
-LOGBRUSH16 *
-LOGFONT16 *
-LOGPALETTE *
-LOGPEN16 *
-LPABC16
-LPBYTE
-LPCVOID
-LPDWORD
-LPENUMLOGFONT16
-LPFONTINFO16
-LPGLYPHMETRICS16
-LPINT16
-LPKERNINGPAIR16
-LPLOGFONT16
-LPNEWTEXTMETRIC16
-LPOUTLINETEXTMETRIC16
-LPPALETTEENTRY
-LPPDEVICE
-LPPOINT16
-LPRASTERIZER_STATUS
-LPRECT16
-LPRGNDATA
-LPSIZE16
-LPTEXTXFORM16
-LPVOID
-MAT2 *
-METARECORD *
-PALETTEENTRY *
-POINT16 *
-RECT16 *
-RGBQUAD *
-SEGPTR *
-TEXTMETRIC16 *
-VOID *
-
-%ptr # --forbidden
-
-LPDEVMODEA
-
-%segptr
-
-FARPROC16
-FONTENUMPROC16
-FONTENUMPROCEX16
-GOBJENUMPROC16
-LINEDDAPROC16
-MFENUMPROC16
-SEGPTR
-
-%str
-
-LPCSTR
-LPSTR
-
-%void
-
-VOID
-void
-
-%word
-
-BOOL16
-BYTE
-HANDLE16
-HBITMAP16
-HBRUSH16
-HDC16
-HFONT16
-HGDIOBJ16
-HGLOBAL16
-HMETAFILE16
-HMODULE16
-HPALETTE16
-HPEN16
-HPJOB16
-HPQ16
-HRGN16
-INT16
-UINT16
-WORD
diff --git a/tools/winapi_check/win16/kernel.api b/tools/winapi_check/win16/kernel.api
deleted file mode 100644
index 48d48ff..0000000
--- a/tools/winapi_check/win16/kernel.api
+++ /dev/null
@@ -1,84 +0,0 @@
-%long
-
-DWORD
-LONG
-
-%long # --forbidden
-
-BOOL
-HANDLE
-HINSTANCE
-HMODULE
-INT
-UINT
-
-%ptr
-
-BYTE *
-CONTEXT86 *
-FARPROC16 *
-HANDLE *
-LPBYTE
-LPCATCHBUF
-LPCVOID
-LPDWORD
-LPVOID
-OFSTRUCT *
-OSVERSIONINFO16 *
-SECURITY_ATTRIBUTES *
-SEGINFO *
-SEGPTR *
-SYSLEVEL *
-THUNKLET *
-WIN32_FIND_DATAA *
-WINDEBUGINFO16 *
-UINT16 *
-UTGLUEPROC
-struct ThunkDataCommon *
-
-%ptr # --forbidden
-
-FARPROC
-FARPROC *
-LPHKEY
-
-%segptr
-
-FARPROC16
-SEGPTR
-
-%str
-
-LPCSTR
-LPSTR
-
-%void
-
-VOID
-void
-
-%word
-
-ATOM
-BOOL16
-BYTE
-HANDLE16
-HFILE16
-HGLOBAL16
-HINSTANCE16
-HLOCAL16
-HMODULE16
-HQUEUE16
-HRSRC16
-HTASK16
-INT16
-UINT16
-WORD
-
-%word # --forbidden
-
-HKEY
-
-%wstr # --forbidden
-
-LPCWSTR
diff --git a/tools/winapi_check/win16/keyboard.api b/tools/winapi_check/win16/keyboard.api
deleted file mode 100644
index 79c4dba..0000000
--- a/tools/winapi_check/win16/keyboard.api
+++ /dev/null
@@ -1,32 +0,0 @@
-%long
-
-DWORD
-LONG
-
-%ptr
-
-LPBYTE
-LPKBINFO
-LPVOID
-
-%segptr
-
-FARPROC16
-
-%str
-
-LPCSTR
-LPSTR
-
-%void
-
-void
-VOID
-
-%word
-
-CHAR
-INT16
-UINT16
-WORD
-
diff --git a/tools/winapi_check/win16/lzexpand.api b/tools/winapi_check/win16/lzexpand.api
deleted file mode 100644
index 20ea694..0000000
--- a/tools/winapi_check/win16/lzexpand.api
+++ /dev/null
@@ -1,24 +0,0 @@
-%long
-
-LONG
-
-%ptr
-
-LPOFSTRUCT
-LPVOID
-
-%str
-
-LPCSTR
-LPSTR
-
-%void
-
-void
-
-%word
-
-HFILE16
-INT16
-UINT16
-
diff --git a/tools/winapi_check/win16/mmsystem.api b/tools/winapi_check/win16/mmsystem.api
deleted file mode 100644
index fd80f8b..0000000
--- a/tools/winapi_check/win16/mmsystem.api
+++ /dev/null
@@ -1,96 +0,0 @@
-%long
-
-DWORD
-FOURCC
-LONG
-LPARAM
-LRESULT
-
-%long # --forbidden
-
-BOOL
-HINSTANCE
-HWND
-
-%ptr
-
-DWORD *
-HINSTANCE16 *
-HMIDIIN16 *
-HMIDIOUT16 *
-HMIDISTRM16 *
-HPCSTR
-HPSTR
-HWAVEIN16 *
-HWAVEOUT16 *
-LPAUXCAPS16
-LPBYTE
-LPDWORD
-LPHANDLE
-LPHMIXER16
-LPJOYCAPS16
-LPJOYINFO16
-LPJOYINFOEX
-LPMIDIHDR16
-LPMIDIINCAPS16
-LPMIDIOUTCAPS16
-LPMIXERCAPS16
-LPMIXERCONTROLDETAILS16
-LPMIXERLINE16
-LPMIXERLINECONTROLS16
-LPMMCKINFO
-LPMMIOPROC16
-LPMMTIME16
-LPTIMECAPS16
-LPUINT16
-LPWAVEINCAPS16
-LPWAVEOUTCAPS16
-MIDIHDR16 *
-MMCKINFO *
-MMIOINFO16 *
-UINT16 *
-WAVEHDR *
-WORD *
-YIELDPROC16
-
-%ptr # --forbidden
-
-LPWAVEFORMATEX
-LPWAVEHDR
-
-%segptr
-
-FARPROC16
-LPTIMECALLBACK16
-SEGPTR
-
-%str
-
-LPCSTR
-LPSTR
-
-%void
-
-void
-
-%word
-
-BOOL16
-HANDLE16
-HDRVR16
-HINSTANCE16
-HMIDIIN16
-HMIDIOUT16
-HMIDISTRM16
-HMIXER16
-HMIXEROBJ16
-HMMIO16
-HMODULE16
-HTASK16
-HWAVEIN16
-HWAVEOUT16
-HWND16
-INT16
-MMRESULT16
-UINT16
-WORD
diff --git a/tools/winapi_check/win16/mouse.api b/tools/winapi_check/win16/mouse.api
deleted file mode 100644
index c09494e..0000000
--- a/tools/winapi_check/win16/mouse.api
+++ /dev/null
@@ -1,15 +0,0 @@
-%ptr
-
-LPMOUSEINFO
-
-%segptr
-
-FARPROC16
-
-%void
-
-VOID
-
-%word
-
-WORD
\ No newline at end of file
diff --git a/tools/winapi_check/win16/msacm.api b/tools/winapi_check/win16/msacm.api
deleted file mode 100644
index 921c5ae..0000000
--- a/tools/winapi_check/win16/msacm.api
+++ /dev/null
@@ -1,43 +0,0 @@
-%long
-
-BOOL
-DWORD
-LPARAM
-LRESULT
-
-%ptr
-
-ACMDRIVERENUMCB16
-ACMFILTERENUMCB16
-ACMFILTERTAGENUMCB16
-ACMFORMATENUMCB16
-ACMFORMATTAGENUMCB16
-LPACMDRIVERDETAILS16
-LPACMFILTERCHOOSE16
-LPACMFILTERDETAILS16
-LPACMFILTERTAGDETAILS16
-LPACMFORMATCHOOSE16
-LPACMFORMATDETAILS16
-LPACMFORMATTAGDETAILS16
-LPACMSTREAMHEADER16
-LPDWORD
-LPHACMDRIVER16
-LPHACMDRIVERID16
-LPHACMSTREAM16
-LPVOID
-
-%ptr # --forbidden
-
-LPWAVEFILTER
-LPWAVEFORMATEX
-
-%word
-
-HACMDRIVER16
-HACMDRIVERID16
-HACMOBJ16
-HACMSTREAM16
-HINSTANCE16
-MMRESULT16
-UINT16
-WORD
diff --git a/tools/winapi_check/win16/msvideo.api b/tools/winapi_check/win16/msvideo.api
deleted file mode 100644
index 9aa96e2..0000000
--- a/tools/winapi_check/win16/msvideo.api
+++ /dev/null
@@ -1,32 +0,0 @@
-%long
-
-DWORD
-LONG
-LRESULT
-
-%ptr
-
-LPBITMAPINFOHEADER
-LPDWORD
-LPVOID
-
-%str
-
-LPSTR
-
-%word
-
-BOOL16
-INT16
-HDC16
-HDRAWDIB16
-HIC16
-HPALETTE16
-HWND16
-UINT16
-WORD
-
-%segptr
-
-ICINFO16 *
-FARPROC16
diff --git a/tools/winapi_check/win16/ole2.api b/tools/winapi_check/win16/ole2.api
deleted file mode 100644
index 4f13546..0000000
--- a/tools/winapi_check/win16/ole2.api
+++ /dev/null
@@ -1,27 +0,0 @@
-%long
-
-DWORD
-HRESULT
-
-%ptr
-
-LPDROPTARGET
-LPMONIKER *
-LPRUNNINGOBJECTTABLE *
-LPVOID
-
-%str
-
-LPCOLESTR16
-
-%void
-
-void
-
-%word
-
-HGLOBAL16
-HICON16
-HWND16
-UINT16
-
diff --git a/tools/winapi_check/win16/ole2disp.api b/tools/winapi_check/win16/ole2disp.api
deleted file mode 100644
index 4d9914b..0000000
--- a/tools/winapi_check/win16/ole2disp.api
+++ /dev/null
@@ -1,42 +0,0 @@
-%long
-
-DWORD
-HRESULT
-LCID
-
-%long # --forbidden
-
-int
-
-%ptr
-
-BSTR16 *
-LPBSTR16
-INTERFACEDATA *
-ITypeInfo *
-ITypeInfo **
-IUnknown *
-IUnknown **
-void *
-REFCLSID
-char *
-
-%ptr # --forbidden
-
-unsigned long *
-
-%segstr
-
-BSTR16
-
-%str
-
-LPCOLESTR16
-
-%void
-
-void
-
-%word
-
-INT16
\ No newline at end of file
diff --git a/tools/winapi_check/win16/ole2nls.api b/tools/winapi_check/win16/ole2nls.api
deleted file mode 100644
index 9ffa54e..0000000
--- a/tools/winapi_check/win16/ole2nls.api
+++ /dev/null
@@ -1,24 +0,0 @@
-%long
-
-DWORD
-LCID
-LCTYPE
-
-%ptr
-
-LPVOID
-LPWORD
-
-%str
-
-LPCSTR
-LPSTR
-
-%word
-
-LANGID
-BOOL16
-INT16
-UINT16
-
-
diff --git a/tools/winapi_check/win16/olecli.api b/tools/winapi_check/win16/olecli.api
deleted file mode 100644
index e41e92e..0000000
--- a/tools/winapi_check/win16/olecli.api
+++ /dev/null
@@ -1,27 +0,0 @@
-%long
-
-LHCLIENTDOC
-LONG
-
-%ptr
-
-LHCLIENTDOC *
-LPOLEOBJECT
-
-%segptr
-
-SEGPTR
-
-%str
-
-LPCSTR
-
-%word
-
-BOOL16
-HDC16
-OLESTATUS
-UINT16
-
-
-
diff --git a/tools/winapi_check/win16/olesvr.api b/tools/winapi_check/win16/olesvr.api
deleted file mode 100644
index 9416820..0000000
--- a/tools/winapi_check/win16/olesvr.api
+++ /dev/null
@@ -1,22 +0,0 @@
-%long
-
-LHSERVER
-LHSERVERDOC
-
-%ptr
-
-BOOL16 *
-LHSERVER *
-LHSERVERDOC *
-LPOLESERVER
-LPOLESERVERDOC
-
-%str
-
-LPCSTR
-
-%word
-
-HINSTANCE16
-OLE_SERVER_USE
-OLESTATUS
diff --git a/tools/winapi_check/win16/setupx.api b/tools/winapi_check/win16/setupx.api
deleted file mode 100644
index 8d3d3f7..0000000
--- a/tools/winapi_check/win16/setupx.api
+++ /dev/null
@@ -1,42 +0,0 @@
-%long
-
-BOOL
-DWORD
-LPARAM
-int
-
-%ptr
-
-HINF16 *
-LPBYTE
-LPDWORD
-LPEXPANDVTBL
-LPHKEY
-LPLOGDISKDESC
-LPLPDEVICE_INFO16
-LPVIRTNODE
-LPVOID
-VIFPROC
-
-%str
-
-LPCSTR
-LPSTR
-
-%void
-
-void
-
-%word
-
-INT16
-LOGDISKID16
-HINF16
-HINSTANCE16
-HKEY
-HWND16
-RETERR16
-UINT16
-VHSTR
-WORD
-WPARAM
diff --git a/tools/winapi_check/win16/shell.api b/tools/winapi_check/win16/shell.api
deleted file mode 100644
index 61c83c8..0000000
--- a/tools/winapi_check/win16/shell.api
+++ /dev/null
@@ -1,50 +0,0 @@
-%long
-
-DWORD
-LPARAM
-LRESULT
-
-%long # --forbidden
-
-BOOL
-
-%ptr
-
-HICON16 *
-LPDWORD
-LPWORD
-POINT16 *
-
-%ptr # --forbidden
-
-LPHKEY
-
-%segptr
-
-SEGPTR
-
-%str
-
-LPCSTR
-LPSTR
-
-%void
-
-void
-
-%word
-
-BOOL16
-HDROP16
-HGLOBAL16
-HICON16
-HINSTANCE16
-HWND16
-INT16
-UINT16
-WORD
-WPARAM16
-
-%word # --forbidden
-
-HKEY
\ No newline at end of file
diff --git a/tools/winapi_check/win16/sound.api b/tools/winapi_check/win16/sound.api
deleted file mode 100644
index cb05f75..0000000
--- a/tools/winapi_check/win16/sound.api
+++ /dev/null
@@ -1,15 +0,0 @@
-%long
-
-DWORD
-
-%ptr
-
-LPINT16
-
-%void
-
-void
-
-%word
-
-INT16
diff --git a/tools/winapi_check/win16/storage.api b/tools/winapi_check/win16/storage.api
deleted file mode 100644
index dda522e..0000000
--- a/tools/winapi_check/win16/storage.api
+++ /dev/null
@@ -1,31 +0,0 @@
-%long
-
-DWORD
-HRESULT
-ULONG
-
-%longlong
-
-LARGE_INTEGER
-
-%ptr
-
-LPSTORAGE16
-LPVOID *
-IID *
-IStorage16 *
-IStorage16 **
-IStream16 *
-IStream16 **
-REFIID
-SNB16
-STATSTG16 *
-ULARGE_INTEGER *
-ULONG *
-void *
-
-%str
-
-LPCOLESTR16
-
-
diff --git a/tools/winapi_check/win16/stress.api b/tools/winapi_check/win16/stress.api
deleted file mode 100644
index 247e34c..0000000
--- a/tools/winapi_check/win16/stress.api
+++ /dev/null
@@ -1,14 +0,0 @@
-%long
-
-DWORD
-LONG
-
-%void
-
-void
-
-%word
-
-BOOL16
-INT16
-UINT16
diff --git a/tools/winapi_check/win16/system.api b/tools/winapi_check/win16/system.api
deleted file mode 100644
index d80c8e9..0000000
--- a/tools/winapi_check/win16/system.api
+++ /dev/null
@@ -1,19 +0,0 @@
-%long
-
-DWORD
-
-%ptr
-
-char *
-
-%segptr
-
-FARPROC16
-
-%void
-
-void
-
-%word
-
-WORD
diff --git a/tools/winapi_check/win16/toolhelp.api b/tools/winapi_check/win16/toolhelp.api
deleted file mode 100644
index b2d5cbf..0000000
--- a/tools/winapi_check/win16/toolhelp.api
+++ /dev/null
@@ -1,44 +0,0 @@
-%long
-
-DWORD
-
-%ptr
-
-CLASSENTRY *
-GLOBALENTRY *
-GLOBALINFO *
-LOCALENTRY *
-LOCALINFO *
-MEMMANINFO *
-MODULEENTRY *
-STACKTRACEENTRY *
-TASKENTRY *
-SYSHEAPINFO *
-TIMERINFO *
-void *
-
-%ptr # --forbidden
-
-FARPROC
-LOCAL32ENTRY *
-LOCAL32INFO *
-
-%segptr
-
-FARPROC16
-
-%str
-
-LPCSTR
-
-%void
-
-void
-
-%word
-
-BOOL16
-HGLOBAL16
-HMODULE16
-HTASK16
-WORD
diff --git a/tools/winapi_check/win16/typelib.api b/tools/winapi_check/win16/typelib.api
deleted file mode 100644
index e81d3d2..0000000
--- a/tools/winapi_check/win16/typelib.api
+++ /dev/null
@@ -1,19 +0,0 @@
-%long
-
-DWORD
-HRESULT
-LCID
-
-%ptr
-
-ITypeLib **
-LPBSTR16
-REFGUID
-
-%str # --forbidden
-
-LPOLESTR
-
-%word
-
-WORD
diff --git a/tools/winapi_check/win16/user.api b/tools/winapi_check/win16/user.api
deleted file mode 100644
index 224b358..0000000
--- a/tools/winapi_check/win16/user.api
+++ /dev/null
@@ -1,112 +0,0 @@
-%long
-
-COLORREF
-DWORD
-HHOOK
-LONG
-LPARAM
-LRESULT
-POINT16
-
-%long # --forbidden
-
-BOOL
-INT
-UINT
-
-%ptr
-
-BOOL16 *
-COLORREF *
-CONTEXT86 *
-CURSORICONINFO *
-DRAWSTATEPROC16
-DWORD *
-HANDLE *
-HHOOK *
-INT16 *
-LPBYTE
-LPCOMSTAT16
-LPCVOID
-LPDCB16
-LPDEVMODEA
-LPDRIVERINFOSTRUCT16
-LPDWORD
-LPICONINFO16
-LPINT16
-LPMSG16
-LPMSGBOXPARAMS16
-LPPAINTSTRUCT16
-LPPOINT16
-LPQUEUESTRUCT16 *
-LPRECT16
-LPSCROLLINFO
-LPVOID
-MENUITEMINFO16 *
-MSG16 *
-MSG32_16 *
-PAINTSTRUCT16 *
-POINT16 *
-RECT16 *
-SCROLLINFO *
-SEGPTR *
-UINT16 *
-WINDOWPLACEMENT16 *
-WNDCLASS16 *
-WNDCLASSEX16 *
-WNDPROC
-WORD *
-void *
-
-%segptr
-
-FARPROC16
-DLGPROC16
-GRAYSTRINGPROC16
-HOOKPROC16
-PROPENUMPROC16
-TIMERPROC16
-WNDENUMPROC16
-WNDPROC16
-SEGPTR
-
-%str
-
-LPCSTR
-LPSTR
-
-%void
-
-VOID
-void
-
-%word
-
-ATOM
-BOOL16
-BYTE
-CHAR
-HANDLE16
-HACCEL16
-HBITMAP16
-HBRUSH16
-HCURSOR16
-HDC16
-HDRVR16
-HDWP16
-HFONT16
-HGLOBAL16
-HICON16
-HINSTANCE16
-HMENU16
-HMODULE16
-HPALETTE16
-HQUEUE16
-HRGN16
-HRSRC16
-HTASK16
-HWND16
-INT16
-UINT16
-WORD
-WPARAM16
diff --git a/tools/winapi_check/win16/ver.api b/tools/winapi_check/win16/ver.api
deleted file mode 100644
index 25cc038..0000000
--- a/tools/winapi_check/win16/ver.api
+++ /dev/null
@@ -1,23 +0,0 @@
-%long
-
-DWORD
-
-%ptr
-
-LPDWORD
-LPVOID
-SEGPTR *
-UINT16 *
-
-%segptr
-
-SEGPTR
-
-%str
-
-LPCSTR
-LPSTR
-
-%word
-
-UINT16
diff --git a/tools/winapi_check/win16/w32sys.api b/tools/winapi_check/win16/w32sys.api
deleted file mode 100644
index 6920bd7..0000000
--- a/tools/winapi_check/win16/w32sys.api
+++ /dev/null
@@ -1,16 +0,0 @@
-%long
-
-DWORD
-
-%ptr
-
-LPWIN32SINFO
-
-%segptr
-
-SEGPTR
-
-%word
-
-HFILE16
-WORD
diff --git a/tools/winapi_check/win16/win32s16.api b/tools/winapi_check/win16/win32s16.api
deleted file mode 100644
index 666e868..0000000
--- a/tools/winapi_check/win16/win32s16.api
+++ /dev/null
@@ -1,27 +0,0 @@
-%long
-
-DWORD
-
-%long # --forbidden
-
-BOOL
-HANDLE
-
-%ptr
-
-LPCVOID
-LPDWORD
-LPMEMORY_BASIC_INFORMATION
-LPVOID
-
-%segptr
-
-SEGPTR
-
-%void
-
-void
-
-%word
-
-WORD
diff --git a/tools/winapi_check/win16/win87em.api b/tools/winapi_check/win16/win87em.api
deleted file mode 100644
index c2f248a..0000000
--- a/tools/winapi_check/win16/win87em.api
+++ /dev/null
@@ -1,13 +0,0 @@
-%long # --forbidden
-
-int
-
-%ptr
-
-CONTEXT86 *
-struct Win87EmInfoStruct *
-void *
-
-%void
-
-void
diff --git a/tools/winapi_check/win16/winaspi.api b/tools/winapi_check/win16/winaspi.api
deleted file mode 100644
index fa7e078..0000000
--- a/tools/winapi_check/win16/winaspi.api
+++ /dev/null
@@ -1,13 +0,0 @@
-%long
-
-DWORD
-
-%segptr
-
-FARPROC16
-SEGPTR
-
-%word
-
-BOOL16
-WORD
diff --git a/tools/winapi_check/win16/windebug.api b/tools/winapi_check/win16/windebug.api
deleted file mode 100644
index 052488b..0000000
--- a/tools/winapi_check/win16/windebug.api
+++ /dev/null
@@ -1,7 +0,0 @@
-%ptr
-
-CONTEXT86 *
-
-%void
-
-void
\ No newline at end of file
diff --git a/tools/winapi_check/win16/wineps16.api b/tools/winapi_check/win16/wineps16.api
deleted file mode 100644
index 918583b..0000000
--- a/tools/winapi_check/win16/wineps16.api
+++ /dev/null
@@ -1,23 +0,0 @@
-%long
-
-DWORD
-
-%ptr # --forbidden
-
-LPDEVMODEA
-
-%str
-
-LPCSTR
-LPSTR
-
-%void
-
-void
-
-%word
-
-HANDLE16
-HWND16
-INT16
-WORD
diff --git a/tools/winapi_check/win16/wing.api b/tools/winapi_check/win16/wing.api
deleted file mode 100644
index 3ecb38b..0000000
--- a/tools/winapi_check/win16/wing.api
+++ /dev/null
@@ -1,26 +0,0 @@
-%long
-
-COLORREF
-
-%ptr
-
-BITMAPINFO *
-RGBQUAD *
-SEGPTR *
-
-%segptr
-
-SEGPTR
-
-%word
-
-BOOL16
-HBITMAP16
-HBRUSH16
-HDC16
-HPALETTE16
-INT16
-UINT16
-WING_DITHER_TYPE
-
-
diff --git a/tools/winapi_check/win16/winnls.api b/tools/winapi_check/win16/winnls.api
deleted file mode 100644
index fef242f..0000000
--- a/tools/winapi_check/win16/winnls.api
+++ /dev/null
@@ -1,7 +0,0 @@
-%long
-
-BOOL
-
-%word
-
-HWND16
\ No newline at end of file
diff --git a/tools/winapi_check/win16/winsock.api b/tools/winapi_check/win16/winsock.api
deleted file mode 100644
index a0555cb..0000000
--- a/tools/winapi_check/win16/winsock.api
+++ /dev/null
@@ -1,48 +0,0 @@
-%long
-
-LONG
-
-%long # --forbidden
-
-BOOL
-INT
-u_long
-
-%ptr
-
-INT16 *
-LPWSADATA16
-ULONG *
-char *
-struct WS_sockaddr *
-struct WS_timeval *
-ws_fd_set16 *
-
-%segptr
-
-FARPROC16
-SEGPTR
-
-%str
-
-LPCSTR
-
-%void
-
-void
-
-%word
-
-HANDLE16
-HWND16
-INT16
-SOCKET16
-UINT16
-
-%word # --forbidden
-
-u_short
-
-%unknown
-
-struct in_addr
diff --git a/tools/winapi_check/win16/wprocs.api b/tools/winapi_check/win16/wprocs.api
deleted file mode 100644
index 1bca6ea..0000000
--- a/tools/winapi_check/win16/wprocs.api
+++ /dev/null
@@ -1,7 +0,0 @@
-%ptr
-
-CONTEXT86 *
-
-%void
-
-void
diff --git a/tools/winapi_check/win32/advapi32.api b/tools/winapi_check/win32/advapi32.api
deleted file mode 100644
index e215853..0000000
--- a/tools/winapi_check/win32/advapi32.api
+++ /dev/null
@@ -1,88 +0,0 @@
-%long
-
-ALG_ID
-ACCESS_MASK
-BOOL
-BYTE
-DWORD
-HANDLE
-HCRYPTHASH
-HCRYPTKEY
-HCRYPTPROV
-HKEY
-LONG
-NTSTATUS
-POLICY_INFORMATION_CLASS
-REGSAM
-SC_HANDLE
-SECURITY_IMPERSONATION_LEVEL
-SECURITY_INFORMATION
-SERVICE_STATUS_HANDLE
-TOKEN_INFORMATION_CLASS
-ULONG
-WORD
-
-%long --extension
-
-LSA_HANDLE
-
-%ptr
-
-BYTE *
-DWORD *
-FILETIME *
-HANDLE *
-HCRYPTHASH *
-HCRYPTKEY *
-HCRYPTPROV *
-LPBOOL
-LPBYTE
-LPCSTR *
-LPCWSTR *
-LPDWORD
-LPENUM_SERVICE_STATUSA
-LPENUM_SERVICE_STATUSW
-LPHANDLER_FUNCTION
-LPHKEY
-LPLONG
-LPSECURITY_ATTRIBUTES
-LPSERVICE_STATUS
-LPSERVICE_TABLE_ENTRYA
-LPSERVICE_TABLE_ENTRYW
-LPVOID
-LPVOID *
-PACL
-PACL *
-PBOOL
-PDWORD
-PGENERIC_MAPPING
-PHANDLE
-PHKEY
-PLSA_HANDLE
-PLSA_OBJECT_ATTRIBUTES
-PLSA_REFERENCED_DOMAIN_LIST *
-PLSA_TRANSLATED_NAME *
-PLSA_UNICODE_STRING
-PLUID
-PPRIVILEGE_SET
-PSECURITY_DESCRIPTOR
-PSECURITY_DESCRIPTOR_CONTROL
-PSID
-PSID *
-PSID_IDENTIFIER_AUTHORITY
-PSID_NAME_USE
-PUCHAR
-PVOID
-PVOID *
-SECURITY_ATTRIBUTES *
-SECURITY_DESCRIPTOR *
-
-%str
-
-LPCSTR
-LPSTR
-
-%wstr
-
-LPCWSTR
-LPWSTR
diff --git a/tools/winapi_check/win32/avicap32.api b/tools/winapi_check/win32/avicap32.api
deleted file mode 100644
index 8b13789..0000000
--- a/tools/winapi_check/win32/avicap32.api
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tools/winapi_check/win32/avifil32.api b/tools/winapi_check/win32/avifil32.api
deleted file mode 100644
index dafecf6..0000000
--- a/tools/winapi_check/win32/avifil32.api
+++ /dev/null
@@ -1,34 +0,0 @@
-%long
-
-DWORD
-HRESULT
-LONG
-UINT
-ULONG
-
-%ptr
-
-AVICOMPRESSOPTIONS *
-AVISTREAMINFOA *
-AVISTREAMINFOW *
-CLSID *
-IAVIFile *
-LONG *
-LPAVIFILEINFOA
-LPAVIFILEINFOW
-LPBITMAPINFOHEADER
-LPCLSID
-LPVOID
-PAVIFILE
-PAVIFILE *
-PAVISTREAM
-PAVISTREAM *
-PGETFRAME
-
-%str
-
-LPCSTR
-
-%void
-
-void
diff --git a/tools/winapi_check/win32/comcat.api b/tools/winapi_check/win32/comcat.api
deleted file mode 100644
index b5108d9..0000000
--- a/tools/winapi_check/win32/comcat.api
+++ /dev/null
@@ -1,9 +0,0 @@
-%long
-
-HRESULT
-
-%ptr
-
-REFCLSID
-REFIID
-LPVOID *
\ No newline at end of file
diff --git a/tools/winapi_check/win32/comctl32.api b/tools/winapi_check/win32/comctl32.api
deleted file mode 100644
index 3be6220..0000000
--- a/tools/winapi_check/win32/comctl32.api
+++ /dev/null
@@ -1,88 +0,0 @@
-%long
-
-BOOL
-CHAR
-COLORREF
-DWORD
-HANDLE
-HBITMAP
-HDC
-HDPA
-HDSA
-HICON
-HIMAGELIST
-HINSTANCE
-HMENU
-HPROPSHEETPAGE
-HRESULT
-HWND
-INT
-LANGID
-LPARAM
-LRESULT
-UINT
-WORD
-WPARAM
-
-%long # --forbidden
-
-int
-
-%longlong
-
-POINT 
-
-%ptr
-
-INT *
-IStream *
-LPCVOID
-LPINT
-LPRECT
-LPSTR *
-LPUINT
-LPVOID
-LPWSTR *
-POINT *
-SMOOTHSCROLLSTRUCT *
-
-%ptr
-
-DLLVERSIONINFO *
-DPAENUMPROC
-DPALOADPROC
-DSAENUMPROC
-HDPA *
-IMAGEINFO *
-IMAGELISTDRAWPARAMS *
-LPCOLDTBBUTTON
-LPCOLORMAP
-LPCPROPSHEETHEADERA
-LPCPROPSHEETHEADERW
-LPCPROPSHEETPAGEA
-LPCPROPSHEETPAGEW
-LPCREATEMRULISTA
-LPCREATEMRULISTW
-LPCTBBUTTON
-LPINITCOMMONCONTROLSEX
-LPNMHDR
-LPSCROLLINFO
-LPSTREAM
-PFNDPACOMPARE
-PFNDPAMERGE
-TRACKMOUSEEVENT *
-
-%str
-
-LPCSTR
-LPSTR
-
-%wstr
-
-LPCWSTR
-LPWSTR
-
-%void
-
-VOID
-void
diff --git a/tools/winapi_check/win32/comdlg32.api b/tools/winapi_check/win32/comdlg32.api
deleted file mode 100644
index 981b3a7..0000000
--- a/tools/winapi_check/win32/comdlg32.api
+++ /dev/null
@@ -1,37 +0,0 @@
-%long
-
-BOOL
-DWORD
-HRESULT
-HWND
-UINT
-
-%long # --forbidden
-
-short
-
-%ptr
-
-LPCHOOSECOLORA
-LPCHOOSECOLORW
-LPCHOOSEFONTA
-LPCHOOSEFONTW
-LPFINDREPLACEA
-LPFINDREPLACEW
-LPOPENFILENAMEA
-LPOPENFILENAMEW
-LPPAGESETUPDLGA
-LPPAGESETUPDLGW
-LPPRINTDLGA
-LPPRINTDLGW
-LPVOID
-
-%str
-
-LPCSTR
-LPSTR
-
-%wstr
-
-LPCWSTR
-LPWSTR
diff --git a/tools/winapi_check/win32/crtdll.api b/tools/winapi_check/win32/crtdll.api
deleted file mode 100644
index d53e20e..0000000
--- a/tools/winapi_check/win32/crtdll.api
+++ /dev/null
@@ -1,12 +0,0 @@
-%long
-
-int
-
-%ptr
-
-char ***
-int *
-
-%void
-
-void
diff --git a/tools/winapi_check/win32/crypt32.api b/tools/winapi_check/win32/crypt32.api
deleted file mode 100644
index 704b5cd..0000000
--- a/tools/winapi_check/win32/crypt32.api
+++ /dev/null
@@ -1,4 +0,0 @@
-%long
-
-BOOL
-DWORD
diff --git a/tools/winapi_check/win32/dciman32.api b/tools/winapi_check/win32/dciman32.api
deleted file mode 100644
index ae1e15d..0000000
--- a/tools/winapi_check/win32/dciman32.api
+++ /dev/null
@@ -1,7 +0,0 @@
-%long
-
-HDC
-
-%void
-
-void
\ No newline at end of file
diff --git a/tools/winapi_check/win32/ddraw.api b/tools/winapi_check/win32/ddraw.api
deleted file mode 100644
index 699adf2..0000000
--- a/tools/winapi_check/win32/ddraw.api
+++ /dev/null
@@ -1,19 +0,0 @@
-%long
-
-DWORD
-HRESULT
-
-%ptr
-
-LPDDENUMCALLBACKA
-LPDDENUMCALLBACKEXA
-LPDDENUMCALLBACKEXW
-LPDDENUMCALLBACKW
-LPDIRECTDRAW *
-LPDIRECTDRAWCLIPPER *
-LPGUID
-LPUNKNOWN
-LPVOID
-LPVOID *
-REFCLSID
-REFIID
\ No newline at end of file
diff --git a/tools/winapi_check/win32/dinput.api b/tools/winapi_check/win32/dinput.api
deleted file mode 100644
index f71e165..0000000
--- a/tools/winapi_check/win32/dinput.api
+++ /dev/null
@@ -1,13 +0,0 @@
-%long
-
-DWORD
-HINSTANCE
-HRESULT
-
-%ptr
-
-LPDIRECTINPUTA *
-LPVOID *
-LPUNKNOWN
-REFCLSID
-REFIID
\ No newline at end of file
diff --git a/tools/winapi_check/win32/dplayx.api b/tools/winapi_check/win32/dplayx.api
deleted file mode 100644
index c08ba56..0000000
--- a/tools/winapi_check/win32/dplayx.api
+++ /dev/null
@@ -1,18 +0,0 @@
-%long
-
-DWORD
-HRESULT
-
-%ptr
-
-IUnknown *
-LPDIRECTPLAY2 *
-LPDIRECTPLAYLOBBY *
-LPDIRECTPLAYLOBBYA *
-LPDPENUMDPCALLBACKA
-LPDPENUMDPCALLBACKW
-LPGUID
-LPVOID
-LPVOID *
-REFCLSID
-REFIID
diff --git a/tools/winapi_check/win32/dsound.api b/tools/winapi_check/win32/dsound.api
deleted file mode 100644
index 85b0800..0000000
--- a/tools/winapi_check/win32/dsound.api
+++ /dev/null
@@ -1,20 +0,0 @@
-%long
-
-DWORD
-HRESULT
-
-%ptr
-
-IUnknown *
-LPCGUID
-LPDIRECTSOUND *
-LPDIRECTSOUNDCAPTURE *
-LPDSENUMCALLBACKA
-LPDSENUMCALLBACKW
-LPUNKNOWN
-LPVOID
-LPVOID *
-REFCLSID
-REFGUID
-REFIID
-
diff --git a/tools/winapi_check/win32/gdi32.api b/tools/winapi_check/win32/gdi32.api
deleted file mode 100644
index 4b1bd85..0000000
--- a/tools/winapi_check/win32/gdi32.api
+++ /dev/null
@@ -1,132 +0,0 @@
-%long
-
-BOOL
-COLORREF
-DWORD
-FLOAT
-HANDLE
-HBITMAP
-HBRUSH
-HCOLORSPACE
-HDC
-HENHMETAFILE
-HFONT
-HGDIOBJ
-HGLOBAL
-HMETAFILE
-HPALETTE
-HPEN
-HRGN
-HWND
-INT
-LONG
-LPARAM
-UINT
-WORD
-
-%long --extension
-
-HDC16
-HMETAFILE16
-HPJOB16
-INT16
-int
-
-%ptr
-
-ABORTPROC
-BYTE *
-BITMAP *
-BITMAPINFO *
-BITMAPINFOHEADER *
-COLORADJUSTMENT *
-DCHOOKPROC
-DEVMODEA *
-DEVMODEW *
-DOCINFOA *
-DOCINFOW *
-DWORD *
-ENHMETARECORD *
-ENHMFENUMPROC
-FONTENUMPROCA
-FONTENUMPROCEXA
-FONTENUMPROCEXW
-FONTENUMPROCW
-GCP_RESULTSA *
-GCP_RESULTSW *
-GOBJENUMPROC
-HANDLETABLE *
-INT *
-LINEDDAPROC
-LOGBRUSH *
-LOGFONTA *
-LOGFONTW *
-LOGPALETTE *
-LOGPEN *
-LPABC
-LPABCFLOAT
-LPBYTE
-LPCOLORADJUSTMENT
-LPCHARSETINFO
-LPCVOID
-LPDEVMODEA
-LPDWORD
-LPENHMETAHEADER
-LPFONTSIGNATURE
-LPGLYPHMETRICS
-LPHANDLETABLE
-LPINT
-LPKERNINGPAIR
-LPLOGFONTA
-LPLOGFONTW
-LPLOGCOLORSPACEA
-LPLOGCOLORSPACEW
-LPOUTLINETEXTMETRICA
-LPOUTLINETEXTMETRICW
-LPPALETTEENTRY
-LPPIXELFORMATDESCRIPTOR
-LPPOINT
-LPRASTERIZER_STATUS
-LPRECT
-LPRGNDATA
-LPSIZE
-LPVOID
-LPVOID *
-LPWORD
-LPXFORM
-MAT2 *
-METAFILEPICT *
-METARECORD *
-MFENUMPROC
-PALETTEENTRY *
-PFLOAT
-PIXELFORMATDESCRIPTOR *
-POINT *
-PPOLYTEXTA
-PPOLYTEXTW
-RECT *
-RGBQUAD *
-RGNDATA *
-TEXTMETRICA *
-TEXTMETRICW *
-WORD *
-XFORM *
-void *
-
-%ptr --extension
-
-FARPROC16
-
-%str
-
-LPCSTR
-LPSTR
-
-%void
-
-void
-
-%wstr
-
-LPCWSTR
-LPWSTR
diff --git a/tools/winapi_check/win32/glu32.api b/tools/winapi_check/win32/glu32.api
deleted file mode 100644
index 27af5e8..0000000
--- a/tools/winapi_check/win32/glu32.api
+++ /dev/null
@@ -1,13 +0,0 @@
-%double
-
-double
-
-%long
-
-int
-
-%ptr
-
-char *
-void *
-
diff --git a/tools/winapi_check/win32/icmp.api b/tools/winapi_check/win32/icmp.api
deleted file mode 100644
index 88ba26b..0000000
--- a/tools/winapi_check/win32/icmp.api
+++ /dev/null
@@ -1,12 +0,0 @@
-%long
-
-BOOL
-DWORD
-HANDLE
-IPAddr
-WORD
-
-%ptr
-
-LPVOID
-PIP_OPTION_INFORMATION
diff --git a/tools/winapi_check/win32/imaadp32.api b/tools/winapi_check/win32/imaadp32.api
deleted file mode 100644
index 3afe2d9..0000000
--- a/tools/winapi_check/win32/imaadp32.api
+++ /dev/null
@@ -1,8 +0,0 @@
-%long
-
-DWORD
-LPARAM
-LRESULT
-HDRVR
-UINT
-
diff --git a/tools/winapi_check/win32/imagehlp.api b/tools/winapi_check/win32/imagehlp.api
deleted file mode 100644
index 304990d..0000000
--- a/tools/winapi_check/win32/imagehlp.api
+++ /dev/null
@@ -1,57 +0,0 @@
-%long
-
-BOOL
-BOOLEAN
-DWORD
-HANDLE
-HMODULE
-ULONG
-USHORT
-WORD
-
-%ptr
-
-DIGEST_FUNCTION
-DIGEST_HANDLE
-LPDWORD
-LPSYSTEMTIME
-LPVOID
-PAPI_VERSION
-PCHAR
-PCHAR *
-PDWORD
-PENUMLOADED_MODULES_CALLBACK
-PFUNCTION_TABLE_ACCESS_ROUTINE
-PGET_MODULE_BASE_ROUTINE
-PIMAGEHLP_MODULE
-PIMAGEHLP_STATUS_ROUTINE
-PIMAGEHLP_SYMBOL
-PIMAGE_DEBUG_INFORMATION
-PIMAGE_LOAD_CONFIG_DIRECTORY
-PIMAGE_NT_HEADERS
-PIMAGE_SECTION_HEADER
-PIMAGE_SECTION_HEADER *
-PLOADED_IMAGE
-PREAD_PROCESS_MEMORY_ROUTINE
-PSTACKFRAME
-PSYMBOL_REGISTERED_CALLBACK
-PSYM_ENUMMODULES_CALLBACK
-PSYM_ENUMSYMBOLS_CALLBACK
-PULONG
-PTRANSLATE_ADDRESS_ROUTINE
-PVOID
-PWIN_CERTIFICATE
-ULONG *
-
-%str
-
-LPSTR
-LPCSTR
-
-%void
-
-VOID
-
-%wstr
-
-LPWSTR
diff --git a/tools/winapi_check/win32/imm32.api b/tools/winapi_check/win32/imm32.api
deleted file mode 100644
index dc329d7..0000000
--- a/tools/winapi_check/win32/imm32.api
+++ /dev/null
@@ -1,38 +0,0 @@
-%long
-
-BOOL
-DWORD
-HIMC
-HKL
-HWND
-LONG
-LPARAM
-LRESULT
-UINT
-WPARAM
-
-%ptr
-
-LPCANDIDATEFORM
-LPCANDIDATELIST
-LPCVOID
-LPCOMPOSITIONFORM
-LPDWORD
-LPLOGFONTA
-LPLOGFONTW
-LPPOINT
-LPSTYLEBUFA
-LPSTYLEBUFW
-LPVOID
-REGISTERWORDENUMPROCA
-REGISTERWORDENUMPROCW
-
-%str
-
-LPSTR
-LPCSTR
-
-%wstr
-
-LPWSTR
-LPCWSTR
diff --git a/tools/winapi_check/win32/joystick.api b/tools/winapi_check/win32/joystick.api
deleted file mode 100644
index ec10fec..0000000
--- a/tools/winapi_check/win32/joystick.api
+++ /dev/null
@@ -1,5 +0,0 @@
-%long
-
-DWORD
-HDRVR
-LONG
diff --git a/tools/winapi_check/win32/kernel32.api b/tools/winapi_check/win32/kernel32.api
deleted file mode 100644
index d11117a..0000000
--- a/tools/winapi_check/win32/kernel32.api
+++ /dev/null
@@ -1,179 +0,0 @@
-%long
-
-ATOM
-BOOL
-BYTE
-CHAR
-CALID
-CALTYPE
-COORD
-DWORD
-EXECUTION_STATE
-LCTYPE
-HANDLE
-HFILE
-HGLOBAL
-HINSTANCE
-HLOCAL
-HMODULE
-HRSRC
-INT
-LANGID
-LCID
-LONG
-UINT
-WCHAR
-WORD
-WOW_HANDLE_TYPE
-
-%long --pointer
-
-ULONG_PTR
-
-%long # --forbidden
-
-int
-
-%long --extension
-
-BOOL16
-INT16
-HGLOBAL16
-HINSTANCE16
-HMODULE16
-HRSRC16
-HTASK16
-UINT16
-
-%longlong
-
-DWORDLONG
-
-%ptr
-
-BOOL *
-BY_HANDLE_FILE_INFORMATION *
-CHAR_INFO *
-DWORD *
-CALINFO_ENUMPROCA
-CODEPAGE_ENUMPROCA
-CODEPAGE_ENUMPROCW
-CONTEXT *
-CONTEXT86 *
-COMPUTER_NAME_FORMAT
-CRITICAL_SECTION *
-CURRENCYFMTA *
-CURRENCYFMTW *
-DATEFMT_ENUMPROCA
-DATEFMT_ENUMPROCW
-ENUMRESLANGPROCA
-ENUMRESLANGPROCW
-ENUMRESNAMEPROCA
-ENUMRESNAMEPROCW
-ENUMRESTYPEPROCA
-ENUMRESTYPEPROCW
-FARPROC
-FARPROC *
-FILETIME *
-FINDEX_INFO_LEVELS
-FINDEX_SEARCH_OPS
-GET_FILEEX_INFO_LEVELS
-HANDLE *
-INPUT_RECORD *
-LARGE_INTEGER *
-LOCALE_ENUMPROCA
-LOCALE_ENUMPROCW
-LONG *
-LPBOOL
-LPBYTE
-LPCHAR_INFO
-LPCOMMCONFIG
-LPCOMMPROP
-LPCOMMTIMEOUTS
-LPCOMSTAT
-LPCONSOLE_CURSOR_INFO
-LPCONSOLE_SCREEN_BUFFER_INFO
-LPCPINFO
-LPCVOID
-LPDCB
-LPDEBUG_EVENT
-LPDWORD
-LPFILETIME
-LPINPUT_RECORD
-LPLDT_ENTRY
-LPMEMORYSTATUS
-LPMEMORY_BASIC_INFORMATION
-LPMODULEENTRY32
-LPOVERLAPPED
-LPOVERLAPPED *
-LPOVERLAPPED_COMPLETION_ROUTINE
-LPOSVERSIONINFOEXA
-LPOSVERSIONINFOEXW
-LPPROCESSENTRY32
-LPPROCESS_HEAP_ENTRY
-LPPROCESS_INFORMATION
-LPPROGRESS_ROUTINE
-LPSECURITY_ATTRIBUTES
-LPSMALL_RECT
-LPSTARTUPINFOA
-LPSTARTUPINFOW
-LPSTR *
-LPSYSTEM_INFO
-LPSYSTEM_POWER_STATUS
-LPSYSTEMTIME
-LPTHREAD_START_ROUTINE
-LPTHREADENTRY32
-LPTIME_ZONE_INFORMATION
-LPTOP_LEVEL_EXCEPTION_FILTER
-LPVOID
-LPVOID *
-LPWORD
-LPWSTR *
-NUMBERFMTA *
-NUMBERFMTW *
-OFSTRUCT *
-OSVERSIONINFOA *
-OSVERSIONINFOW *
-PAPCFUNC
-PBOOL
-PDWORD
-PEXCEPTION_POINTERS
-PHANDLE
-PHANDLER_ROUTINE
-PLARGE_INTEGER
-PLONG
-PTIMERAPCROUTINE
-PULARGE_INTEGER
-SECURITY_ATTRIBUTES *
-SYSLEVEL *
-SYSLEVEL **
-SYSTEMTIME *
-TIMEFMT_ENUMPROCA
-TIMEFMT_ENUMPROCW
-WIN32_FIND_DATAA *
-WIN32_FIND_DATAW *
-WORD *
-struct ThunkDataCommon *
-va_list
-va_list *
-
-%ptr --extension
-
-FARPROC16
-BUILTIN16_DESCRIPTOR *
-SEGPTR
-
-%str
-
-LPSTR
-LPCSTR
-
-%void
-
-void
-VOID
-
-%wstr
-
-LPCWSTR
-LPWSTR
diff --git a/tools/winapi_check/win32/lz32.api b/tools/winapi_check/win32/lz32.api
deleted file mode 100644
index 9e7c9f4..0000000
--- a/tools/winapi_check/win32/lz32.api
+++ /dev/null
@@ -1,25 +0,0 @@
-%long
-
-HFILE
-INT
-LONG
-UINT
-
-%ptr
-
-LPOFSTRUCT
-LPVOID
-
-%str
-
-LPSTR
-LPCSTR
-
-%void
-
-void
-
-%wstr
-
-LPWSTR
-LPCWSTR
diff --git a/tools/winapi_check/win32/mapi32.api b/tools/winapi_check/win32/mapi32.api
deleted file mode 100644
index d96bb1f..0000000
--- a/tools/winapi_check/win32/mapi32.api
+++ /dev/null
@@ -1,20 +0,0 @@
-%long
-
-FLAGS
-HRESULT
-ULONG
-
-%ptr
-
-LPLHANDLE
-LPVOID
-LPVOID *
-VOID *
-
-%str
-
-LPSTR
-
-%void
-
-VOID
diff --git a/tools/winapi_check/win32/mcianim.api b/tools/winapi_check/win32/mcianim.api
deleted file mode 100644
index cac3a61..0000000
--- a/tools/winapi_check/win32/mcianim.api
+++ /dev/null
@@ -1,6 +0,0 @@
-%long
-
-DWORD
-HDRVR
-LONG
-
diff --git a/tools/winapi_check/win32/mciavi.api b/tools/winapi_check/win32/mciavi.api
deleted file mode 100644
index ec10fec..0000000
--- a/tools/winapi_check/win32/mciavi.api
+++ /dev/null
@@ -1,5 +0,0 @@
-%long
-
-DWORD
-HDRVR
-LONG
diff --git a/tools/winapi_check/win32/mcicda.api b/tools/winapi_check/win32/mcicda.api
deleted file mode 100644
index cac3a61..0000000
--- a/tools/winapi_check/win32/mcicda.api
+++ /dev/null
@@ -1,6 +0,0 @@
-%long
-
-DWORD
-HDRVR
-LONG
-
diff --git a/tools/winapi_check/win32/mciseq.api b/tools/winapi_check/win32/mciseq.api
deleted file mode 100644
index cac3a61..0000000
--- a/tools/winapi_check/win32/mciseq.api
+++ /dev/null
@@ -1,6 +0,0 @@
-%long
-
-DWORD
-HDRVR
-LONG
-
diff --git a/tools/winapi_check/win32/mciwave.api b/tools/winapi_check/win32/mciwave.api
deleted file mode 100644
index ec10fec..0000000
--- a/tools/winapi_check/win32/mciwave.api
+++ /dev/null
@@ -1,5 +0,0 @@
-%long
-
-DWORD
-HDRVR
-LONG
diff --git a/tools/winapi_check/win32/midimap.api b/tools/winapi_check/win32/midimap.api
deleted file mode 100644
index 4d001ad..0000000
--- a/tools/winapi_check/win32/midimap.api
+++ /dev/null
@@ -1,7 +0,0 @@
-%long
-
-DWORD
-HDRVR
-LONG
-UINT
-
diff --git a/tools/winapi_check/win32/mpr.api b/tools/winapi_check/win32/mpr.api
deleted file mode 100644
index 2d6f733..0000000
--- a/tools/winapi_check/win32/mpr.api
+++ /dev/null
@@ -1,50 +0,0 @@
-%long
-
-BOOL
-BYTE
-DWORD
-HANDLE
-HPROVIDER
-HWND
-INT
-UINT
-WORD
-enum NOTIFYTYPE
-
-%ptr
-
-ENUMPASSWORDPROC
-BOOL *
-LPAUTHDLGSTRUCTA
-LPBYTE
-LPCSTR *
-LPCONNECTDLGSTRUCTA
-LPCONNECTDLGSTRUCTW
-LPDISCDLGSTRUCTA
-LPDISCDLGSTRUCTW
-LPDWORD
-LPHANDLE
-LPNETCONNECTINFOSTRUCT
-LPNETINFOSTRUCT
-LPNETRESOURCEA
-LPNETRESOURCEW
-LPSTR *
-LPVOID
-LPWORD
-LPWSTR *
-NOTIFYCALLBACK
-PHPROVIDER
-
-%str
-
-LPSTR
-LPCSTR
-
-%void
-
-VOID
-
-%wstr
-
-LPCWSTR
-LPWSTR
diff --git a/tools/winapi_check/win32/msacm32.api b/tools/winapi_check/win32/msacm32.api
deleted file mode 100644
index 7817a41..0000000
--- a/tools/winapi_check/win32/msacm32.api
+++ /dev/null
@@ -1,47 +0,0 @@
-%long
-
-DWORD
-HACMDRIVER
-HACMDRIVERID
-HACMOBJ
-HACMSTREAM
-HDRVR
-HINSTANCE
-LPARAM
-LRESULT
-MMRESULT
-UINT
-
-%ptr
-
-ACMDRIVERENUMCB
-ACMFILTERENUMCBA
-ACMFILTERENUMCBW
-ACMFILTERTAGENUMCBA
-ACMFILTERTAGENUMCBW
-ACMFORMATENUMCBA
-ACMFORMATENUMCBW
-ACMFORMATTAGENUMCBA
-ACMFORMATTAGENUMCBW
-LPDWORD
-LPVOID
-PACMDRIVERDETAILSA
-PACMDRIVERDETAILSW
-PACMFILTERCHOOSEA
-PACMFILTERCHOOSEW
-PACMFILTERDETAILSA
-PACMFILTERDETAILSW
-PACMFILTERTAGDETAILSA
-PACMFILTERTAGDETAILSW
-PACMFORMATCHOOSEA
-PACMFORMATCHOOSEW
-PACMFORMATDETAILSA
-PACMFORMATDETAILSW
-PACMFORMATTAGDETAILSA
-PACMFORMATTAGDETAILSW
-PACMSTREAMHEADER
-PHACMDRIVER
-PHACMDRIVERID
-PHACMSTREAM
-PWAVEFILTER
-PWAVEFORMATEX
diff --git a/tools/winapi_check/win32/msacmmap.api b/tools/winapi_check/win32/msacmmap.api
deleted file mode 100644
index b264f54..0000000
--- a/tools/winapi_check/win32/msacmmap.api
+++ /dev/null
@@ -1,7 +0,0 @@
-%long
-
-DWORD
-HDRVR
-LONG
-UINT
-WORD
diff --git a/tools/winapi_check/win32/msg711.api b/tools/winapi_check/win32/msg711.api
deleted file mode 100644
index 1debd44..0000000
--- a/tools/winapi_check/win32/msg711.api
+++ /dev/null
@@ -1,7 +0,0 @@
-%long
-
-DWORD
-HDRVR
-LPARAM
-LRESULT
-UINT
diff --git a/tools/winapi_check/win32/msimg32.api b/tools/winapi_check/win32/msimg32.api
deleted file mode 100644
index d8de6de..0000000
--- a/tools/winapi_check/win32/msimg32.api
+++ /dev/null
@@ -1,17 +0,0 @@
-%long
-
-BOOL
-HDC
-UINT
-ULONG
-int
-
-%ptr
-
-BLENDFUNCTION
-TRIVERTEX *
-void *
-
-%void
-
-void
diff --git a/tools/winapi_check/win32/msisys.api b/tools/winapi_check/win32/msisys.api
deleted file mode 100644
index c9b8791..0000000
--- a/tools/winapi_check/win32/msisys.api
+++ /dev/null
@@ -1,9 +0,0 @@
-%long
-
-HRESULT
-
-%ptr
-
-CLSID *
-IID *
-void **
diff --git a/tools/winapi_check/win32/msrle32.api b/tools/winapi_check/win32/msrle32.api
deleted file mode 100644
index 8b13789..0000000
--- a/tools/winapi_check/win32/msrle32.api
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tools/winapi_check/win32/msvcrt.api b/tools/winapi_check/win32/msvcrt.api
deleted file mode 100644
index db4e2dc..0000000
--- a/tools/winapi_check/win32/msvcrt.api
+++ /dev/null
@@ -1,92 +0,0 @@
-%double
-
-double
-
-%long
-
-DWORD
-INT
-LONG
-MSVCRT_clock_t
-MSVCRT_complex
-MSVCRT_size_t
-MSVCRT_time_t
-WCHAR
-int
-long
-unsigned int
-unsigned long
-
-%longlong
-
-LONGLONG
-ULONGLONG
-
-%ptr
-
-__non_rtti_object *
-_HEAPINFO *
-_INITTERMFUN *
-_JUMP_BUFFER *
-_onexit_t
-_onexit_t **
-MSVCRT_EXCEPTION_FRAME *
-MSVCRT_FILE *
-MSVCRT_compar_fn_t
-MSVCRT_exception *
-MSVCRT_fpos_t *
-MSVCRT_free_func
-MSVCRT_malloc_func
-MSVCRT_matherr_func
-MSVCRT_new_handler_func
-MSVCRT_sig_handler_func
-MSVCRT_time_t *
-MSVCRT_wint_t
-PCONTEXT
-PEXCEPTION_FRAME
-PEXCEPTION_FRAME *
-PEXCEPTION_POINTERS
-PEXCEPTION_RECORD
-WCHAR *
-WCHAR **
-WCHAR ***
-WORD **
-bad_cast *
-bad_typeid *
-char *
-char **
-char ***
-exception *
-int *
-struct __EXCEPTION_FRAME *
-struct __EXCEPTION_FRAME **
-struct _finddata_t *
-struct _diskfree_t *
-struct _stat *
-struct _timeb *
-struct _utimbuf *
-struct _wfinddata_t *
-struct MSVCRT_tm *
-terminate_function
-type_info *
-unexpected_function
-unsigned char *
-unsigned int *
-unsigned long *
-va_list
-void *
-
-%ptr --extension
-
-_beginthread_start_routine_t
-_beginthreadex_start_routine_t
-
-%unknown
-
-MSVCRT_div_t
-MSVCRT_ldiv_t
-
-%void
-
-void
-VOID
diff --git a/tools/winapi_check/win32/msvfw32.api b/tools/winapi_check/win32/msvfw32.api
deleted file mode 100644
index 7203f4a..0000000
--- a/tools/winapi_check/win32/msvfw32.api
+++ /dev/null
@@ -1,34 +0,0 @@
-%long
-
-BOOL
-DWORD
-HANDLE
-HDC
-HDRAWDIB
-HIC
-HINSTANCE
-HPALETTE
-HWND
-INT
-LONG
-LRESULT
-UINT
-WORD
-
-%ptr
-
-FARPROC
-ICINFO *
-LONG *
-LPBITMAPINFO
-LPBITMAPINFOHEADER
-LPDWORD
-LPVOID
-
-%str
-
-LPCSTR
-
-%wstr
-
-LPCWSTR
diff --git a/tools/winapi_check/win32/netapi32.api b/tools/winapi_check/win32/netapi32.api
deleted file mode 100644
index cac5b27..0000000
--- a/tools/winapi_check/win32/netapi32.api
+++ /dev/null
@@ -1,7 +0,0 @@
-%long
-
-BOOL
-
-%ptr
-
-PNCB
diff --git a/tools/winapi_check/win32/ntdll.api b/tools/winapi_check/win32/ntdll.api
deleted file mode 100644
index e2155c9..0000000
--- a/tools/winapi_check/win32/ntdll.api
+++ /dev/null
@@ -1,134 +0,0 @@
-%double
-
-double
-
-%long
-
-ACCESS_MASK
-BOOL
-BOOLEAN
-BYTE
-DWORD
-FILE_INFORMATION_CLASS
-FS_INFORMATION_CLASS
-HANDLE
-HMODULE
-INT
-KEY_INFORMATION_CLASS
-KEY_VALUE_INFORMATION_CLASS
-LONG
-NTSTATUS
-OBJECT_INFORMATION_CLASS
-PROCESSINFOCLASS
-SECTION_INHERIT
-SECURITY_IMPERSONATION_LEVEL
-SECURITY_INFORMATION
-SIZE_T
-SYSTEM_INFORMATION_CLASS
-THREADINFOCLASS
-TIMER_TYPE
-TOKEN_TYPE
-UINT
-ULONG
-WCHAR
-
-%long --extension
-
-obj_handle_t
-
-%long # --forbidden
-
-int
-long
-unsigned int
-unsigned long
-
-%longlong
-
-LONGLONG
-ULONGLONG
-
-%ptr
-
-CONTEXT *
-CONTEXT86 *
-DWORD *
-EXCEPTION_FRAME *
-EXCEPTION_RECORD *
-FILETIME *
-HANDLE *
-INT *
-LARGE_INTEGER *
-LPBYTE
-LPDWORD
-LPDWORD *
-LPRTL_RWLOCK
-LPVOID
-LPVOID *
-LPWSTR *
-OBJECT_ATTRIBUTES *
-PACE_HEADER
-PACE_HEADER *
-PACL
-PACL *
-PBOOLEAN
-PCVOID
-PDWORD
-PEXCEPTION_FRAME
-PEXCEPTION_RECORD
-PGENERIC_MAPPING
-PHANDLE
-PIMAGE_NT_HEADERS
-PIO_APC_ROUTINE
-PIO_STATUS_BLOCK
-PLARGE_INTEGER
-PLUID
-POBJDIR_INFORMATION
-POBJECT_ATTRIBUTES
-PPRIVILEGE_SET
-PRTL_HEAP_DEFINITION
-PSECURITY_DESCRIPTOR
-PSECURITY_DESCRIPTOR_CONTROL
-PSID
-PSID *
-PSID_IDENTIFIER_AUTHORITY
-PSTRING
-PTIME_FIELDS
-PTIMERAPCROUTINE
-PTOKEN_PRIVILEGES
-PULONG
-PUNICODE_STRING
-PVOID
-PVOID *
-RTL_CRITICAL_SECTION *
-STRING *
-UINT *
-ULONGLONG *
-UNICODE_STRING *
-VOID *
-struct _TEB *
-union cptable *
-void *
-
-%ptr --extension
-
-WCHAR *
-char *
-enum fd_type *
-obj_handle_t *
-int *
-
-%str
-
-LPSTR
-LPCSTR
-
-%void
-
-void
-VOID
-
-%wstr
-
-LPCWSTR
-LPWSTR
diff --git a/tools/winapi_check/win32/odbc32.api b/tools/winapi_check/win32/odbc32.api
deleted file mode 100644
index a532242..0000000
--- a/tools/winapi_check/win32/odbc32.api
+++ /dev/null
@@ -1,29 +0,0 @@
-%long
-
-SQLHANDLE
-SQLHDBC
-SQLHDESC
-SQLHENV
-SQLHSTMT
-SQLHWND
-SQLINTEGER
-SQLRETURN
-SQLSMALLINT
-SQLUINTEGER
-SQLUSMALLINT
-
-%ptr
-
-SQLCHAR *
-SQLHANDLE *
-SQLHDBC *
-SQLHENV *
-SQLHSTMT *
-SQLINTEGER *
-SQLPOINTER
-SQLPOINTER *
-SQLSMALLINT *
-SQLUINTEGER *
-SQLUSMALLINT *
-
-
diff --git a/tools/winapi_check/win32/ole32.api b/tools/winapi_check/win32/ole32.api
deleted file mode 100644
index 934b9fd..0000000
--- a/tools/winapi_check/win32/ole32.api
+++ /dev/null
@@ -1,104 +0,0 @@
-%long
-
-BOOL
-CLIPFORMAT
-DWORD
-HACCEL
-HANDLE
-HGLOBAL
-HINSTANCE
-HMENU
-HRESULT
-HOLEMENU
-HWND
-INT
-UINT
-ULONG
-
-%long # --forbidden
-
-int
-
-%ptr
-
-CLIPFORMAT *
-CLSID *
-COSERVERINFO *
-DVTARGETDEVICE *
-DWORD *
-FILETIME *
-GUID *
-HGLOBAL *
-ICreateErrorInfo **
-IDataObject *
-IDataObject **
-IDropSource *
-IErrorInfo *
-IErrorInfo **
-ILockBytes *
-IMoniker *
-IMoniker **
-IPersistStream *
-IStorage *
-IStorage **
-IStream *
-IUnknown *
-LPBC
-LPBC *
-LPCLSID
-LPDATAADVISEHOLDER *
-LPDATAOBJECT
-LPDROPTARGET
-LPDWORD
-LPENUMFORMATETC *
-LPENUMOLEVERB *
-LPFORMATETC
-LPGUID
-LPLOCKBYTES *
-LPMALLOC *
-LPMARSHAL *
-LPMESSAGEFILTER
-LPMESSAGEFILTER *
-LPMONIKER
-LPMONIKER *
-LPMSG
-LPOLEADVISEHOLDER *
-LPOLECLIENTSITE
-LPOLEINPLACEACTIVEOBJECT
-LPOLEINPLACEFRAME
-LPOLEINPLACEFRAMEINFO
-LPOLEMENUGROUPWIDTHS
-LPOLEOBJECT
-LPOLESTREAM
-LPOLESTR *
-LPPERSISTSTORAGE
-LPSTREAM
-LPRUNNINGOBJECTTABLE *
-LPUNKNOWN
-LPUNKNOWN *
-LPVOID
-LPVOID *
-LPSTORAGE
-LPSTREAM *
-MULTI_QI *
-OLECHAR *
-REFCLSID
-REFGUID
-REFIID
-SNB
-STGMEDIUM *
-ULONG *
-WORD *
-void *
-void **
-
-%str # ???
-
-LPCOLESTR
-LPOLESTR
-
-%void
-
-VOID
-void
-
diff --git a/tools/winapi_check/win32/oleaut32.api b/tools/winapi_check/win32/oleaut32.api
deleted file mode 100644
index 3638c26..0000000
--- a/tools/winapi_check/win32/oleaut32.api
+++ /dev/null
@@ -1,110 +0,0 @@
-%double
-
-CY
-DATE
-double
-
-%long
-
-BOOL
-BYTE
-CHAR
-DISPID
-DWORD
-FLOAT
-HCURSOR
-HICON
-HINSTANCE
-HPALETTE
-HRESULT
-HWND
-INT
-LCID
-LONG
-OLE_COLOR
-REGKIND
-SYSKIND
-UINT
-ULONG
-USHORT
-VARIANT_BOOL
-VARTYPE
-WORD
-
-%long # --forbidden
-
-int
-short
-signed char
-unsigned int
-
-%ptr
-
-BSTR *
-BYTE *
-CHAR *
-COLORREF *
-CY *
-DATE *
-DISPID *
-DISPPARAMS *
-EXCEPINFO *
-FLOAT *
-ICreateTypeLib **
-INTERFACEDATA *
-ITypeInfo *
-ITypeInfo **
-ITypeLib *
-ITypeLib **
-IUnknown *
-IUnknown **
-LONG *
-LPBSTR
-LPCLSID
-LPDWORD
-LPFONTDESC
-LPOCPFIPARAMS
-LPPICTDESC
-LPSTREAM
-LPSYSTEMTIME
-LPUNKNOWN
-LPUNKNOWN *
-LPVARIANT
-LPVOID
-LPVOID *
-NUMPARSE *
-OLECHAR *
-OLECHAR **
-REFCLSID
-REFGUID
-REFIID
-SAFEARRAY *
-SAFEARRAY **
-SAFEARRAYBOUND *
-UDATE *
-UINT *
-ULONG *
-USHORT *
-VARIANT *
-VARIANTARG *
-VARIANT_BOOL *
-VARTYPE *
-VOID *
-double *
-short *
-void *
-void **
-
-%str # ???
-
-LPCOLESTR
-LPCSTR
-
-%void
-
-void
-
-%wstr # ???
-
-BSTR
-
diff --git a/tools/winapi_check/win32/olecli32.api b/tools/winapi_check/win32/olecli32.api
deleted file mode 100644
index 38e0d5d..0000000
--- a/tools/winapi_check/win32/olecli32.api
+++ /dev/null
@@ -1,22 +0,0 @@
-%long
-
-BOOL
-HDC
-LHCLIENTDOC
-LONG
-OLECLIPFORMAT
-OLESTATUS
-OLEOPT_RENDER
-
-%ptr
-
-LHCLIENTDOC *
-LONG *
-LPOLECLIENT
-LPOLEOBJECT
-LPOLEOBJECT *
-
-%str
-
-LPCSTR
-
diff --git a/tools/winapi_check/win32/oledlg.api b/tools/winapi_check/win32/oledlg.api
deleted file mode 100644
index 894222e..0000000
--- a/tools/winapi_check/win32/oledlg.api
+++ /dev/null
@@ -1,42 +0,0 @@
-%long
-
-BOOL
-HMENU
-HWND
-INT
-UINT
-WORD
-
-%ptr
-
-HMENU *
-LPOLEOBJECT
-LPOLEUIBUSYA
-LPOLEUIBUSYW
-LPOLEUICHANGEICONA
-LPOLEUICHANGEICONW
-LPOLEUICHANGESOURCEA
-LPOLEUICHANGESOURCEW
-LPOLEUICONVERTA
-LPOLEUICONVERTW
-LPOLEUIEDITLINKSA
-LPOLEUIEDITLINKSW
-LPOLEUIINSERTOBJECTA
-LPOLEUIINSERTOBJECTW
-LPOLEUILINKCONTAINERA
-LPOLEUILINKCONTAINERW
-LPOLEUIOBJECTPROPSA
-LPOLEUIOBJECTPROPSW
-LPOLEUIPASTESPECIALA
-LPOLEUIPASTESPECIALW
-REFCLSID
-
-%str
-
-LPCSTR
-LPSTR
-
-%wstr
-
-LPCWSTR
-LPWSTR
\ No newline at end of file
diff --git a/tools/winapi_check/win32/olepro32.api b/tools/winapi_check/win32/olepro32.api
deleted file mode 100644
index 201c979..0000000
--- a/tools/winapi_check/win32/olepro32.api
+++ /dev/null
@@ -1,9 +0,0 @@
-%long
-
-HRESULT
-
-%ptr
-
-LPVOID *
-REFCLSID
-REFIID
diff --git a/tools/winapi_check/win32/olesvr32.api b/tools/winapi_check/win32/olesvr32.api
deleted file mode 100644
index b318a82..0000000
--- a/tools/winapi_check/win32/olesvr32.api
+++ /dev/null
@@ -1,19 +0,0 @@
-%long
-
-HINSTANCE
-LHSERVER
-LHSERVERDOC
-OLE_SERVER_USE
-OLESTATUS
-
-%ptr
-
-BOOL *
-LHSERVER *
-LHSERVERDOC *
-LPOLESERVER
-LPOLESERVERDOC
-
-%str
-
-LPCSTR
\ No newline at end of file
diff --git a/tools/winapi_check/win32/opengl32.api b/tools/winapi_check/win32/opengl32.api
deleted file mode 100644
index b0f0902..0000000
--- a/tools/winapi_check/win32/opengl32.api
+++ /dev/null
@@ -1,54 +0,0 @@
-%double
-
-GLclampd
-GLdouble
-
-%long
-
-BOOL
-DWORD
-FLOAT
-GLbitfield
-GLboolean
-GLbyte
-GLclampf
-GLenum
-GLfloat
-GLint
-GLshort
-GLsizei
-GLubyte
-GLuint
-GLushort
-HDC
-HGLRC
-UINT
-int
-
-%ptr
-
-COLORREF *
-GLbyte *
-GLboolean *
-GLclampf *
-GLdouble *
-GLfloat *
-GLint *
-GLshort *
-GLstring
-GLuint *
-GLubyte *
-GLushort *
-GLvoid *
-GLvoid **
-LPGLYPHMETRICSFLOAT
-LPLAYERPLANEDESCRIPTOR
-void *
-
-%str
-
-LPCSTR
-
-%void
-
-void
diff --git a/tools/winapi_check/win32/psapi.api b/tools/winapi_check/win32/psapi.api
deleted file mode 100644
index 84cc4f5..0000000
--- a/tools/winapi_check/win32/psapi.api
+++ /dev/null
@@ -1,25 +0,0 @@
-%long
-
-BOOL
-DWORD
-HANDLE
-HMODULE
-
-%ptr
-
-DWORD *
-HMODULE *
-LPDWORD
-LPMODULEINFO
-LPVOID
-LPVOID *
-PPROCESS_MEMORY_COUNTERS
-PPSAPI_WS_WATCH_INFORMATION
-
-%str
-
-LPSTR
-
-%wstr
-
-LPWSTR
diff --git a/tools/winapi_check/win32/quartz.api b/tools/winapi_check/win32/quartz.api
deleted file mode 100644
index 8b13789..0000000
--- a/tools/winapi_check/win32/quartz.api
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tools/winapi_check/win32/rasapi32.api b/tools/winapi_check/win32/rasapi32.api
deleted file mode 100644
index 75cec6d..0000000
--- a/tools/winapi_check/win32/rasapi32.api
+++ /dev/null
@@ -1,29 +0,0 @@
-%long
-
-BOOL
-DWORD
-HRASCONN
-
-%ptr
-
-LPBOOL
-LPCSTR *
-LPCWSTR *
-LPDWORD
-LPRASAUTODIALENTRYA
-LPRASAUTODIALENTRYW
-LPRASCONNA
-LPRASDEVINFOA
-LPRASDEVINFOW
-LPRASDIALPARAMSA
-LPRASENTRYNAMEA
-LPVOID
-
-%str
-
-LPCSTR
-
-%wstr
-
-LPCWSTR
-
diff --git a/tools/winapi_check/win32/riched32.api b/tools/winapi_check/win32/riched32.api
deleted file mode 100644
index 96f3629..0000000
--- a/tools/winapi_check/win32/riched32.api
+++ /dev/null
@@ -1,7 +0,0 @@
-%long
-
-HRESULT
-
-%ptr
-
-DLLVERSIONINFO *
diff --git a/tools/winapi_check/win32/rpcrt4.api b/tools/winapi_check/win32/rpcrt4.api
deleted file mode 100644
index 70c6f68..0000000
--- a/tools/winapi_check/win32/rpcrt4.api
+++ /dev/null
@@ -1,37 +0,0 @@
-%long
-
-HMODULE
-HRESULT
-RPC_IF_HANDLE
-RPC_STATUS
-UINT
-ULONG
-
-%ptr
-
-CLSID *
-CStdPSFactoryBuffer *
-LPSTR *
-LPVOID
-LPVOID *
-LPWSTR *
-PRPC_POLICY
-ProxyFileInfo **
-REFCLSID
-REFIID
-RPC_AUTH_KEY_RETRIEVAL_FN
-RPC_BINDING_HANDLE *
-RPC_IF_CALLBACK_FN *
-RPC_MGR_EPV *
-RPC_STATUS *
-UUID *
-unsigned char **
-unsigned short
-
-%str
-
-LPSTR
-
-%wstr
-
-LPWSTR
diff --git a/tools/winapi_check/win32/serialui.api b/tools/winapi_check/win32/serialui.api
deleted file mode 100644
index ea5bf09..0000000
--- a/tools/winapi_check/win32/serialui.api
+++ /dev/null
@@ -1,17 +0,0 @@
-%long
-
-BOOL
-DWORD
-HWND
-LPARAM
-
-%ptr
-
-LPCOMMCONFIG
-LPDWORD
-LPDEVICE_INFO
-LPFNADDPROPSHEETPAGE
-
-%str
-
-LPCSTR
diff --git a/tools/winapi_check/win32/setupapi.api b/tools/winapi_check/win32/setupapi.api
deleted file mode 100644
index 6debfe7..0000000
--- a/tools/winapi_check/win32/setupapi.api
+++ /dev/null
@@ -1,48 +0,0 @@
-%long
-
-BOOL
-LONG
-DWORD
-HDEVINFO
-HINF
-HKEY
-HSPFILEQ
-HWND
-UINT
-
-%long --ptr
-
-UINT_PTR
-
-%ptr
-
-BYTE *
-DWORD *
-GUID *
-INFCONTEXT *
-INT *
-PBYTE
-PDWORD
-PSP_DEVICE_INTERFACE_DATA
-PSP_DEVICE_INTERFACE_DETAIL_DATAA
-PSP_DEVICE_INTERFACE_DETAIL_DATAW
-PSP_DEVINFO_DATA
-PSP_FILE_CALLBACK_A
-PSP_FILE_CALLBACK_W
-PSP_FILE_COPY_PARAMS_A
-PSP_FILE_COPY_PARAMS_W
-PSTR
-PUINT
-PVOID
-UINT *
-
-%str
-
-LPCSTR
-PCSTR
-PCWSTR
-PWSTR
-
-%void
-
-void
diff --git a/tools/winapi_check/win32/shdocvw.api b/tools/winapi_check/win32/shdocvw.api
deleted file mode 100644
index c5480c6..0000000
--- a/tools/winapi_check/win32/shdocvw.api
+++ /dev/null
@@ -1,15 +0,0 @@
-%long
-
-BOOL
-HRESULT
-
-%ptr
-
-DLLVERSIONINFO *
-LPVOID *
-REFCLSID
-REFIID
-
-%wstr
-
-LPCWSTR
diff --git a/tools/winapi_check/win32/shell32.api b/tools/winapi_check/win32/shell32.api
deleted file mode 100644
index ca8d175..0000000
--- a/tools/winapi_check/win32/shell32.api
+++ /dev/null
@@ -1,109 +0,0 @@
-%long
-
-BOOL
-COLORREF
-DWORD
-HANDLE
-HBITMAP
-HDROP
-HGLOBAL
-HMENU
-HMODULE
-HICON
-HINSTANCE
-HIMAGELIST
-HKEY
-HRESULT
-HWND
-INT
-LONG
-LRESULT
-UINT
-ULONG
-WORD
-WPARAM
-
-%long # --forbidden
-
-int
-
-%ptr
-
-CLSID *
-DLLVERSIONINFO *
-DWORD *
-FARPROC
-HICON *
-HIMAGELIST *
-HWND *
-IShellFolder **
-IStream *
-ITEMIDLIST *
-LPBROWSEINFOA
-LPBYTE
-LPCITEMIDLIST
-LPCITEMIDLIST *
-LPCNOTIFYREGISTER
-LPCRECT
-LPCSHELLFOLDERVIEWINFO
-LPCVOID
-LPCVOID *
-LPDATAOBJECT
-LPDATAOBJECT *
-LPDRAWITEMSTRUCT
-LPDROPSOURCE
-LPDROPTARGET
-LPDWORD
-LPFNCREATEINSTANCE
-LPFNFMCALLBACK
-LPHKEY
-LPITEMIDLIST
-LPITEMIDLIST *
-LPMALLOC *
-LPMEASUREITEMSTRUCT
-LPNOTIFYREGISTER
-LPPOINT
-LPSECURITY_ATTRIBUTES
-LPSHELLEXECUTEINFOA
-LPSHELLEXECUTEINFOW
-LPSHELLFLAGSTATE
-LPSHELLFOLDER
-LPSHELLVIEW *
-LPSHFILEOPSTRUCTA
-LPSHFILEOPSTRUCTW
-LPSTRRET
-LPTPMPARAMS
-LPUNKNOWN
-LPUNKNOWN *
-LPVOID
-LPVOID *
-LPWORD
-LPWSTR *
-PAPPBARDATA
-PNOTIFYICONDATAA
-PNOTIFYICONDATAW
-POINT *
-SHFILEINFOA *
-SHFILEINFOW *
-REFCLSID
-REFIID
-UINT *
-
-%ptr # --forbidden
-
-int *
-
-%str
-
-LPCSTR
-LPSTR
-
-%void
-
-void
-VOID
-
-%wstr
-
-LPCWSTR
-LPWSTR
diff --git a/tools/winapi_check/win32/shlwapi.api b/tools/winapi_check/win32/shlwapi.api
deleted file mode 100644
index 0be8255..0000000
--- a/tools/winapi_check/win32/shlwapi.api
+++ /dev/null
@@ -1,101 +0,0 @@
-%long
-
-BOOL
-COLORREF
-DWORD
-INT
-LONG
-HANDLE
-HDC
-HDROP
-HICON
-HINSTANCE
-HKEY
-HMENU
-HMODULE
-HPALETTE
-HRESULT
-HSHARED
-HUSKEY
-HWND
-LANGID
-LPARAM
-LRESULT
-UCHAR
-REGSAM
-SHREGENUM_FLAGS
-UINT
-URLIS
-WCHAR
-WORD
-WPARAM
-
-%long # --forbidden
-
-int
-
-%ptr
-
-BOOL *
-CLSID *
-DLLVERSIONINFO *
-HICON *
-IFACE_INDEX_TBL *
-IStream *
-ITEMIDLIST *
-IUnknown *
-IUnknown **
-LPBROWSEINFOW
-LPCITEMIDLIST
-LPCLSID
-LPCSTR *
-LPCVOID
-LPCWSTR *
-LPDWORD
-LPDWORD *
-LPHWND
-LPINT
-LPITEMIDLIST
-LPOPENFILENAMEW
-LPPAGESETUPDLGW
-LPPRINTDLGW
-LPSHELLEXECUTEINFOW
-LPSHFILEOPSTRUCTW
-LPSTRRET
-LPUNKNOWN *
-LPVOID
-LPVOID *
-LPWORD
-PACL
-PHUSKEY
-PLONG
-PSECURITY_DESCRIPTOR
-PVOID
-REFIID
-REFGUID
-SHFILEINFOW *
-UINT *
-WNDCLASSA *
-unsigned char *
-
-%ptr --extension
-
-UNKNOWN_SHLWAPI_1 *
-UNKNOWN_SHLWAPI_2 *
-WNDCLASSW *
-
-%str
-
-LPCSTR
-LPSTR
-
-%void
-
-VOID
-void
-
-%wstr
-
-LPCWSTR
-LPWSTR
-
diff --git a/tools/winapi_check/win32/sti.api b/tools/winapi_check/win32/sti.api
deleted file mode 100644
index 8b13789..0000000
--- a/tools/winapi_check/win32/sti.api
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tools/winapi_check/win32/tapi32.api b/tools/winapi_check/win32/tapi32.api
deleted file mode 100644
index 0a655a0..0000000
--- a/tools/winapi_check/win32/tapi32.api
+++ /dev/null
@@ -1,56 +0,0 @@
-%long
-
-DWORD
-HCALL
-HINSTANCE
-HLINE
-HLINEAPP
-HPHONE
-HPHONEAPP
-HWND
-
-%ptr
-
-HICON *
-LINECALLBACK
-LPDWORD
-LPHCALL
-LPHLINE
-LPHLINEAPP
-LPHPHONE
-LPHPHONEAPP
-LPLINEADDRESSCAPS
-LPLINEADDRESSSTATUS
-LPLINECALLINFO
-LPLINECALLLIST
-LPLINECALLPARAMS
-LPLINECALLSTATUS
-LPLINECOUNTRYLIST
-LPLINEDEVCAPS
-LPLINEDEVSTATUS
-LPLINEDIALPARAMS
-LPLINEEXTENSIONID
-LPLINEFORWARDLIST
-LPLINEGENERATETONE
-LPLINEMEDIACONTROLCALLSTATE
-LPLINEMEDIACONTROLDIGIT
-LPLINEMEDIACONTROLMEDIA
-LPLINEMEDIACONTROLTONE
-LPLINEMONITORTONE
-LPLINEPROVIDERLIST
-LPLINETRANSLATECAPS
-LPLINETRANSLATEOUTPUT
-LPPHONEBUTTONINFO
-LPPHONECAPS
-LPPHONEEXTENSIONID
-LPPHONESTATUS
-LPVARSTRING
-LPVOID
-PHONECALLBACK
-
-%str
-
-LPSTR
-LPCSTR
-
-
diff --git a/tools/winapi_check/win32/ttydrv.api b/tools/winapi_check/win32/ttydrv.api
deleted file mode 100644
index d7977ed..0000000
--- a/tools/winapi_check/win32/ttydrv.api
+++ /dev/null
@@ -1,57 +0,0 @@
-%long
-
-BOOL
-CHAR
-COLORREF
-DWORD
-INT
-HDC
-HBITMAP
-HFONT
-HRGN
-HWND
-LONG
-UINT
-WORD
-
-%long # --forbidden
-
-INT16
-UINT16
-int
-
-%ptr
-
-BITMAPINFO *
-DC *
-DEVMODEA *
-DWORD *
-CREATESTRUCTA *
-LPBYTE
-LPCVOID
-LPINT
-LPPALETTEENTRY
-LPSIZE
-LPTEXTMETRICW
-INT *
-POINT *
-RECT *
-TTYDRV_PDEVICE *
-WINDOWPOS *
-struct tagCURSORICONINFO *
-
-void *
-
-%str
-
-LPCSTR
-LPSTR
-
-%wstr
-
-LPCWSTR
-LPWSTR
-
-%void
-
-void
diff --git a/tools/winapi_check/win32/twain_32.api b/tools/winapi_check/win32/twain_32.api
deleted file mode 100644
index 8bc7d97..0000000
--- a/tools/winapi_check/win32/twain_32.api
+++ /dev/null
@@ -1,10 +0,0 @@
-%long
-
-TW_UINT16
-TW_UINT32
-
-%ptr
-
-TW_MEMREF
-pTW_IDENTITY
-
diff --git a/tools/winapi_check/win32/url.api b/tools/winapi_check/win32/url.api
deleted file mode 100644
index 8b13789..0000000
--- a/tools/winapi_check/win32/url.api
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tools/winapi_check/win32/urlmon.api b/tools/winapi_check/win32/urlmon.api
deleted file mode 100644
index ec2c2bb..0000000
--- a/tools/winapi_check/win32/urlmon.api
+++ /dev/null
@@ -1,29 +0,0 @@
-%long
-
-BOOL
-DWORD
-HRESULT
-long
-
-%ptr
-
-DWORD *
-IBindCtx *
-IBindCtx **
-IBindStatusCallback *
-IBindStatusCallback **
-IEnumFORMATETC *
-IMoniker *
-IMoniker **
-LPVOID
-LPVOID *
-REFCLSID
-REFIID
-
-%str
-
-LPCSTR
-
-%wstr
-
-LPCWSTR
diff --git a/tools/winapi_check/win32/user32.api b/tools/winapi_check/win32/user32.api
deleted file mode 100644
index 0ed0a67..0000000
--- a/tools/winapi_check/win32/user32.api
+++ /dev/null
@@ -1,164 +0,0 @@
-%long
-
-ATOM
-BOOL
-BYTE
-CHAR
-COLORREF
-DWORD
-HANDLE
-HACCEL
-HBITMAP
-HBRUSH
-HCONV
-HCONVLIST
-HCURSOR
-HDC
-HDDEDATA
-HDESK
-HDEVNOTIFY
-HDWP
-HFONT
-HHOOK
-HICON
-HINSTANCE
-HKL
-HMENU
-HMONITOR
-HRESULT
-HRGN
-HSZ
-HTASK
-HWINSTA
-HWND
-INT
-LONG
-LPARAM
-LRESULT
-SHORT
-UINT
-ULONG_PTR
-WCHAR
-WORD
-WPARAM
-
-%long # --forbidden
-
-int
-
-%long --extension
-
-BOOL16
-INT16
-HANDLE16
-HDRVR16
-HGLOBAL16
-HMODULE16
-HINSTANCE16
-HTASK16
-HWND16
-UINT16
-WPARAM16
-
-%longlong
-
-POINT 
-
-%ptr
-
-BOOL *
-COLORREF *
-DWORD *
-DLGPROC
-DRAWSTATEPROC
-GRAYSTRINGPROC
-HANDLE *
-HBRUSH *
-HICON *
-HKL *
-HWND *
-HOOKPROC
-INT *
-LPACCEL
-LPCHARSETINFO
-LPCMENUINFO
-LPCONVCONTEXT
-LPCONVINFO
-LPBYTE
-LPCVOID
-LPDEVMODEA
-LPDEVMODEW
-LPDISPLAY_DEVICEA
-LPDISPLAY_DEVICEW
-LPDRAWTEXTPARAMS
-LPDWORD
-LPINT
-LPINPUT
-LPMENUINFO
-LPMENUITEMINFOA
-LPMENUITEMINFOW
-LPMONITORINFO
-LPMSG
-LPMSGBOXPARAMSA
-LPMSGBOXPARAMSW
-LPPOINT
-LPRECT
-LPSCROLLINFO
-LPSECURITY_ATTRIBUTES
-LPTPMPARAMS
-LPVOID
-LPWORD
-MENUITEMINFOA *
-MENUITEMINFOW *
-MONITORENUMPROC
-MSG *
-PAINTSTRUCT *
-PFNCALLBACK
-PICONINFO
-POINT *
-PROPENUMPROCA
-PROPENUMPROCEXA
-PROPENUMPROCEXW
-PROPENUMPROCW
-PSECURITY_DESCRIPTOR
-PSECURITY_INFORMATION
-PSECURITY_QUALITY_OF_SERVICE
-PUINT
-PVOID
-PWINDOWINFO
-RECT *
-SCROLLINFO *
-SECURITY_QUALITY_OF_SERVICE *
-SENDASYNCPROC
-TIMERPROC
-TRACKMOUSEEVENT *
-UINT *
-WINDOWPLACEMENT *
-WNDCLASSA *
-WNDCLASSEXA *
-WNDCLASSEXW *
-WNDCLASSW *
-WNDENUMPROC
-WNDPROC
-va_list
-
-%ptr --extension
-
-DLGPROC16
-HOOKPROC16
-WNDPROC16
-
-%str
-
-LPSTR
-LPCSTR
-
-%void
-
-void
-VOID
-
-%wstr
-
-LPWSTR
-LPCWSTR
diff --git a/tools/winapi_check/win32/version.api b/tools/winapi_check/win32/version.api
deleted file mode 100644
index 201b262..0000000
--- a/tools/winapi_check/win32/version.api
+++ /dev/null
@@ -1,22 +0,0 @@
-%long
-
-BOOL
-DWORD
-UINT
-
-%ptr
-
-LPDWORD
-LPVOID
-LPVOID *
-UINT *
-
-%str
-
-LPSTR
-LPCSTR
-
-%wstr
-
-LPCWSTR
-LPWSTR
diff --git a/tools/winapi_check/win32/w32skrnl.api b/tools/winapi_check/win32/w32skrnl.api
deleted file mode 100644
index 67696a2..0000000
--- a/tools/winapi_check/win32/w32skrnl.api
+++ /dev/null
@@ -1,8 +0,0 @@
-%long # --forbidden
-
-HTASK16
-
-%str
-
-LPSTR
-
diff --git a/tools/winapi_check/win32/winearts.api b/tools/winapi_check/win32/winearts.api
deleted file mode 100644
index 5f70cbc..0000000
--- a/tools/winapi_check/win32/winearts.api
+++ /dev/null
@@ -1,7 +0,0 @@
-%long
-
-WORD
-DWORD
-LONG
-HDRVR
-UINT
diff --git a/tools/winapi_check/win32/winedos.api b/tools/winapi_check/win32/winedos.api
deleted file mode 100644
index 5af6fbc..0000000
--- a/tools/winapi_check/win32/winedos.api
+++ /dev/null
@@ -1,19 +0,0 @@
-%long
-
-BOOL
-DWORD
-HANDLE
-UINT
-int
-
-%ptr
-
-DWORD *
-
-%str
-
-LPCSTR
-
-%void
-
-void
diff --git a/tools/winapi_check/win32/winemp3.api b/tools/winapi_check/win32/winemp3.api
deleted file mode 100644
index 1debd44..0000000
--- a/tools/winapi_check/win32/winemp3.api
+++ /dev/null
@@ -1,7 +0,0 @@
-%long
-
-DWORD
-HDRVR
-LPARAM
-LRESULT
-UINT
diff --git a/tools/winapi_check/win32/wineoss.api b/tools/winapi_check/win32/wineoss.api
deleted file mode 100644
index b264f54..0000000
--- a/tools/winapi_check/win32/wineoss.api
+++ /dev/null
@@ -1,7 +0,0 @@
-%long
-
-DWORD
-HDRVR
-LONG
-UINT
-WORD
diff --git a/tools/winapi_check/win32/wineps.api b/tools/winapi_check/win32/wineps.api
deleted file mode 100644
index c6e7863..0000000
--- a/tools/winapi_check/win32/wineps.api
+++ /dev/null
@@ -1,50 +0,0 @@
-%long
-
-BOOL
-COLORREF
-DWORD
-HBITMAP
-HBRUSH
-HDC
-HFONT
-HPEN
-HRGN
-HWND
-INT
-LPARAM
-UINT
-WORD
-
-%ptr
-
-BITMAPINFO *
-DC *
-DEVICEFONTENUMPROC
-DEVMODEA *
-DOCINFOA *
-DWORD *
-INT *
-LPCVOID
-LPDEVMODEA
-LPINT
-LPLOGFONTW
-LPSIZE
-LPVOID
-POINT *
-PSDRV_PDEVICE *
-RECT *
-TEXTMETRICW *
-void *
-
-%str 
-
-LPCSTR
-LPSTR
-
-%wstr
-
-LPCWSTR
-
-%void
-
-VOID
diff --git a/tools/winapi_check/win32/wininet.api b/tools/winapi_check/win32/wininet.api
deleted file mode 100644
index 5e70b0a..0000000
--- a/tools/winapi_check/win32/wininet.api
+++ /dev/null
@@ -1,32 +0,0 @@
-%long
-
-BOOL
-DWORD
-FILETIME
-HANDLE
-HINTERNET
-HRESULT
-INTERNET_PORT
-
-%ptr
-
-LPBYTE
-LPCSTR *
-LPCVOID
-LPDWORD
-LPINTERNET_BUFFERSA
-LPINTERNET_CACHE_ENTRY_INFOA
-LPINTERNET_CACHE_ENTRY_INFOW
-LPURL_COMPONENTSA
-LPVOID
-LPWIN32_FIND_DATAA
-INTERNET_STATUS_CALLBACK
-
-%str
-
-LPCSTR
-LPSTR
-
-%wstr
-
-LPCWSTR
diff --git a/tools/winapi_check/win32/winmm.api b/tools/winapi_check/win32/winmm.api
deleted file mode 100644
index eab7f98..0000000
--- a/tools/winapi_check/win32/winmm.api
+++ /dev/null
@@ -1,94 +0,0 @@
-%long
-
-BOOL
-DWORD
-FOURCC
-HDRVR
-HINSTANCE
-HMIDIIN
-HMIDIOUT
-HMIDISTRM
-HMIXER
-HMIXEROBJ
-HMMIO
-HMODULE
-HTASK
-HWAVEIN
-HWAVEOUT
-HWND
-MMRESULT
-INT
-LONG
-LPARAM
-LRESULT
-UINT
-
-%long --forbidden
-
-HMMIO16
-UINT16
-
-%ptr
-
-DWORD *
-HMIDIIN *
-HMIDIOUT *
-HMIDISTRM *
-HPCSTR
-HPSTR
-HWAVEIN *
-HWAVEOUT *
-LPAUXCAPSA
-LPAUXCAPSW
-LPBYTE
-LPDWORD
-LPHMIXER
-LPJOYCAPSA
-LPJOYCAPSW
-LPJOYINFO
-LPJOYINFOEX
-LPMIDIHDR
-LPMIDIINCAPSA
-LPMIDIINCAPSW
-LPMIDIOUTCAPSA
-LPMIDIOUTCAPSW
-LPMIXERCAPSA
-LPMIXERCAPSW
-LPMIXERCONTROLDETAILS
-LPMIXERLINEA
-LPMIXERLINECONTROLSA
-LPMIXERLINECONTROLSW
-LPMIXERLINEW
-LPMMCKINFO
-LPMMIOPROC
-LPMMTIME
-LPTIMECALLBACK
-LPTIMECAPS
-LPUINT
-LPWAVEFORMATEX
-LPWAVEHDR
-LPWAVEINCAPSA
-LPWAVEINCAPSW
-LPWAVEOUTCAPSA
-LPWAVEOUTCAPSW
-MIDIHDR *
-MMCKINFO *
-MMIOINFO *
-WAVEHDR *
-UINT *
-WORD *
-YIELDPROC
-
-%ptr # --forbidden
-
-LPMMIOPROC16
-
-%str
-
-LPCSTR
-LPSTR
-
-%wstr
-
-LPCWSTR
-LPWSTR
diff --git a/tools/winapi_check/win32/winspool.api b/tools/winapi_check/win32/winspool.api
deleted file mode 100644
index 3d27190..0000000
--- a/tools/winapi_check/win32/winspool.api
+++ /dev/null
@@ -1,31 +0,0 @@
-%long
-
-BOOL
-DWORD
-HANDLE
-HWND
-INT
-LONG
-WORD
-
-%ptr
-
-DEVMODEW *
-HANDLE *
-LPBYTE
-LPDEVMODEA
-LPDEVMODEW
-LPDWORD
-LPPRINTER_DEFAULTSA
-LPPRINTER_DEFAULTSW
-LPVOID
-
-%str
-
-LPCSTR
-LPSTR
-
-%wstr
-
-LPCWSTR
-LPWSTR
diff --git a/tools/winapi_check/win32/wintrust.api b/tools/winapi_check/win32/wintrust.api
deleted file mode 100644
index 6c49e59..0000000
--- a/tools/winapi_check/win32/wintrust.api
+++ /dev/null
@@ -1,9 +0,0 @@
-%long
-
-HWND
-LONG
-
-%ptr
-
-GUID *
-LPVOID
diff --git a/tools/winapi_check/win32/wnaspi32.api b/tools/winapi_check/win32/wnaspi32.api
deleted file mode 100644
index 7b32c2c..0000000
--- a/tools/winapi_check/win32/wnaspi32.api
+++ /dev/null
@@ -1,10 +0,0 @@
-%long
-
-BOOL
-DWORD
-
-%ptr
-
-LPDWORD
-LPSRB
-PASPI32BUFF
diff --git a/tools/winapi_check/win32/wow32.api b/tools/winapi_check/win32/wow32.api
deleted file mode 100644
index 8b13789..0000000
--- a/tools/winapi_check/win32/wow32.api
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/tools/winapi_check/win32/ws2_32.api b/tools/winapi_check/win32/ws2_32.api
deleted file mode 100644
index a262d67..0000000
--- a/tools/winapi_check/win32/ws2_32.api
+++ /dev/null
@@ -1,62 +0,0 @@
-%long
-
-BOOL
-DWORD
-GROUP
-HANDLE
-HWND
-INT
-LONG
-SOCKET
-UINT
-WORD
-WSAEVENT
-int
-long
-u_long
-u_short
-
-%ptr
-
-FARPROC
-INT *
-LPCONDITIONPROC
-LPDWORD
-LPGUID
-LPINT
-LPQOS
-LPVOID
-LPWPUPOSTMESSAGE
-LPWSABUF
-LPWSADATA
-LPWSAOVERLAPPED
-LPWSAOVERLAPPED_COMPLETION_ROUTINE
-LPWSANETWORKEVENTS
-LPWSAPROTOCOL_INFOA
-LPWSAPROTOCOL_INFOW
-WS_fd_set *
-char *
-int *
-u_long *
-struct WS_hostent *
-struct WS_protoent *
-struct WS_servent *
-struct WS_sockaddr *
-struct WS_timeval *
-
-%str
-
-LPCSTR
-LPSTR
-
-%unknown
-
-struct WS_in_addr
-
-%void
-
-void
-
-%wstr
-
-LPCWSTR
diff --git a/tools/winapi_check/win32/wsock32.api b/tools/winapi_check/win32/wsock32.api
deleted file mode 100644
index 2b83839..0000000
--- a/tools/winapi_check/win32/wsock32.api
+++ /dev/null
@@ -1,23 +0,0 @@
-%long
-
-DWORD
-INT
-SOCKET
-UINT
-
-%ptr
-
-INT *
-LPDWORD
-LPINT
-LPVOID
-char *
-struct netent *
-
-%str
-
-LPCSTR
-
-%void
-
-void
diff --git a/tools/winapi_check/win32/x11drv.api b/tools/winapi_check/win32/x11drv.api
deleted file mode 100644
index f24ed1c..0000000
--- a/tools/winapi_check/win32/x11drv.api
+++ /dev/null
@@ -1,71 +0,0 @@
-%long
-
-BOOL
-CHAR
-COLORREF
-DWORD
-HANDLE
-HBITMAP
-HBRUSH
-HDC
-HFONT
-HICON
-HPALETTE
-HPEN
-HRGN
-HWND
-INT
-LONG
-LPARAM
-UINT
-WPARAM
-WORD
-
-%long # --forbidden
-
-int
-
-%ptr
-
-BITMAPINFO *
-BYTE *
-DC *
-CURSORICONINFO *
-CREATESTRUCTA *
-DEVICEFONTENUMPROC
-DEVMODEA *
-DWORD *
-HANDLE *
-INT *
-LPBYTE
-LPCVOID
-LPINT
-LPLOGFONTW
-LPPALETTEENTRY
-LPPOINT
-LPRECT
-LPSIZE
-LPVOID
-LPVOID *
-PIXELFORMATDESCRIPTOR *
-POINT *
-RECT *
-RGBQUAD *
-TEXTMETRICW *
-WINDOWPOS *
-X11DRV_PDEVICE *
-void *
-
-%str
-
-LPCSTR
-LPSTR
-
-%wstr
-
-LPCWSTR
-LPWSTR
-
-%void
-
-void
diff --git a/tools/winapi_check/winapi_check b/tools/winapi_check/winapi_check
index 3ec273d..3b73fdd 100755
--- a/tools/winapi_check/winapi_check
+++ b/tools/winapi_check/winapi_check
@@ -592,7 +592,7 @@
 				$include2info{$name}{used}++;
 			    }
 			}
-		    } elsif(-e "$wine_dir/$file_dir/../$header") {
+		    } elsif(-e "$file_dir/../$header") {
 			if($file_dir =~ m%^(.*?)/[^/]+$%) {
 			    $include2info{"$1/$header"}{used}++;
 			    foreach my $name (keys(%{$include2info{"$1/$header"}{includes}})) {
diff --git a/tools/winapi_check/winapi_documentation.pm b/tools/winapi_check/winapi_documentation.pm
index 837ff9f..cc6d868 100644
--- a/tools/winapi_check/winapi_documentation.pm
+++ b/tools/winapi_check/winapi_documentation.pm
@@ -76,6 +76,8 @@
 	    {
 		my $found_name = 0;
 		my $found_ordinal = 0;
+
+		$module =~ s/\.(acm|dll|drv|exe|ocx)$//; # FIXME: Kludge
 		foreach (split(/\n/, $documentation)) {
 		    if(/^(\s*)\*(\s*)(\@|\S+)(\s*)([\(\[])(\w+)\.(\@|\d+)([\)\]])/) {
 			my $external_name2 = $3;
@@ -120,12 +122,19 @@
 		my $module = $2;
 		my $ordinal = $3;
 
+		if(!$options->documentation_pedantic && $ordinal ne "@") {
+		    $ordinal = int($ordinal);
+		}
+
 		my $found = 0;
 		foreach my $entry2 (winapi::get_all_module_internal_ordinal($internal_name)) {
 		    (my $external_name2, my $module2, my $ordinal2) = @$entry2;
 
+		    my $_module2 = $module2;
+		    $_module2 =~ s/\.(acm|dll|drv|exe|ocx)$//; # FIXME: Kludge
+
 		    if($external_name eq $external_name2 &&
-		       lc($module) eq $module2 &&
+		       lc($module) eq $_module2 &&
 		       $ordinal eq $ordinal2 &&
 		       ($external_name2 eq "@" ||
 			($win16api->is_module($module2) && !$win16api->is_function_stub_in_module($module2, $external_name2)) ||
@@ -133,6 +142,7 @@
 			$modules->is_allowed_module_in_file($module2, "$current_dir/$file"))
 		    {
 			$found = 1;
+			last;
 		    }
 		}
 		if(!$found) {