diff --git a/include/accctrl.h b/include/accctrl.h index 2710d0c21a4..80041e76d93 100644 --- a/include/accctrl.h +++ b/include/accctrl.h @@ -19,7 +19,7 @@ #ifndef __WINE_ACCCTRL_H #define __WINE_ACCCTRL_H -#include "wtypes.h" +#include #ifdef __cplusplus extern "C" { diff --git a/include/async.h b/include/async.h index 8422e41ab94..cb1e67c1348 100644 --- a/include/async.h +++ b/include/async.h @@ -26,9 +26,9 @@ #ifndef __WINE_ASYNC_H #define __WINE_ASYNC_H -#include "thread.h" -#include "wine/server.h" -#include "winternl.h" +#include +#include +#include struct async_private; diff --git a/include/bitmap.h b/include/bitmap.h index 28280afe73d..11e0fd94c65 100644 --- a/include/bitmap.h +++ b/include/bitmap.h @@ -21,7 +21,7 @@ #ifndef __WINE_BITMAP_H #define __WINE_BITMAP_H -#include "gdi.h" +#include /* DIB Section sync state */ enum { DIB_Status_None, DIB_Status_InSync, DIB_Status_GdiMod, DIB_Status_AppMod, DIB_Status_AuxMod }; diff --git a/include/builtin16.h b/include/builtin16.h index a1ce7b86fa6..fba99059b79 100644 --- a/include/builtin16.h +++ b/include/builtin16.h @@ -21,13 +21,13 @@ #ifndef __WINE_BUILTIN16_H #define __WINE_BUILTIN16_H -#include "windef.h" -#include "wine/windef16.h" +#include +#include struct _CONTEXT86; struct _STACK16FRAME; -#include "pshpack1.h" +#include #ifdef __i386__ @@ -70,7 +70,7 @@ typedef struct #endif -#include "poppack.h" +#include /* argument type flags for relay debugging */ enum arg_types diff --git a/include/callback.h b/include/callback.h index 0d1168c5919..9d57be53e8e 100644 --- a/include/callback.h +++ b/include/callback.h @@ -21,8 +21,8 @@ #ifndef __WINE_CALLBACK_H #define __WINE_CALLBACK_H -#include "windef.h" -#include "winnt.h" +#include +#include typedef struct { void (WINAPI *EmulateInterruptPM)( CONTEXT86 *context, BYTE intnum ); diff --git a/include/clipboard.h b/include/clipboard.h index 9279b13bca4..b82a8c7e623 100644 --- a/include/clipboard.h +++ b/include/clipboard.h @@ -22,7 +22,7 @@ #ifndef __WINE_CLIPBOARD_H #define __WINE_CLIPBOARD_H -#include "windef.h" +#include typedef struct tagCLIPBOARDINFO { diff --git a/include/comcat.h b/include/comcat.h index b82b11ec54a..f7d16278c35 100644 --- a/include/comcat.h +++ b/include/comcat.h @@ -16,18 +16,18 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rpc.h" -#include "rpcndr.h" +#include +#include #ifndef COM_NO_WINDOWS_H -#include "windows.h" -#include "ole2.h" +#include +#include #endif #ifndef __WINE_COMCAT_H #define __WINE_COMCAT_H -#include "unknwn.h" -#include "wine/obj_enumguid.h" -#include "wine/obj_comcat.h" +#include +#include +#include #endif /*__WINE_COMCAT_H */ diff --git a/include/commctrl.h b/include/commctrl.h index a3abf4b8e38..023eaa78b03 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -21,12 +21,12 @@ #ifndef __WINE_COMMCTRL_H #define __WINE_COMMCTRL_H -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "prsht.h" +#include +#include +#include +#include +#include +#include #ifdef __cplusplus extern "C" { @@ -1986,7 +1986,7 @@ static const WCHAR WC_PAGESCROLLERW[] = { 'S','y','s','P','a','g','e','r',0 }; #define PGN_SCROLL (PGN_FIRST-1) #define PGN_CALCSIZE (PGN_FIRST-2) -#include "pshpack1.h" +#include typedef struct { @@ -1999,7 +1999,7 @@ typedef struct INT iScroll; } NMPGSCROLL, *LPNMPGSCROLL; -#include "poppack.h" +#include typedef struct { @@ -2428,14 +2428,14 @@ typedef struct tagNMTVGETINFOTIPW #define NMTVGETINFOTIP WINELIB_NAME_AW(NMTVGETINFOTIP) #define LPNMTVGETINFOTIP WINELIB_NAME_AW(LPNMTVGETINFOTIP) -#include "pshpack1.h" +#include typedef struct tagTVKEYDOWN { NMHDR hdr; WORD wVKey; UINT flags; } NMTVKEYDOWN, *LPNMTVKEYDOWN; -#include "poppack.h" +#include #define TV_KEYDOWN NMTVKEYDOWN @@ -3092,14 +3092,14 @@ typedef struct tagLVDISPINFOW #define LV_DISPINFOA NMLVDISPINFOA #define LV_DISPINFOW NMLVDISPINFOW -#include "pshpack1.h" +#include typedef struct tagLVKEYDOWN { NMHDR hdr; WORD wVKey; UINT flags; } NMLVKEYDOWN, *LPNMLVKEYDOWN; -#include "poppack.h" +#include #define LV_KEYDOWN NMLVKEYDOWN @@ -3692,14 +3692,14 @@ typedef struct tagTCITEMW #define TCN_SELCHANGING (TCN_FIRST - 2) #define TCN_GETOBJECT (TCN_FIRST - 3) -#include "pshpack1.h" +#include typedef struct tagTCKEYDOWN { NMHDR hdr; WORD wVKey; UINT flags; } NMTCKEYDOWN; -#include "poppack.h" +#include #define TC_KEYDOWN NMTCKEYDOWN diff --git a/include/commdlg.h b/include/commdlg.h index 3ef3a27733c..045a55c7784 100644 --- a/include/commdlg.h +++ b/include/commdlg.h @@ -25,8 +25,8 @@ extern "C" { #endif -#include "prsht.h" -#include "pshpack1.h" +#include +#include #ifndef SNDMSG #ifdef __cplusplus @@ -686,7 +686,7 @@ BOOL WINAPI ChooseFontW(LPCHOOSEFONTW); void COMDLG32_SetCommDlgExtendedError(DWORD err); -#include "poppack.h" +#include #ifdef __cplusplus } diff --git a/include/compobj.h b/include/compobj.h index ffc2f7927d0..8ccbbaca236 100644 --- a/include/compobj.h +++ b/include/compobj.h @@ -20,6 +20,6 @@ #define __WINE_COMPOBJ_H /* compobj.h is just a synonym for objbase.h */ -#include "objbase.h" +#include #endif /* __WINE_COMPOBJ_H */ diff --git a/include/control.h b/include/control.h index 09d8722e3e3..96b940411e2 100644 --- a/include/control.h +++ b/include/control.h @@ -19,10 +19,10 @@ #ifndef __CONTROL_INCLUDED__ #define __CONTROL_INCLUDED__ -#include "windef.h" -#include "wingdi.h" -#include "objbase.h" -#include "oleauto.h" +#include +#include +#include +#include typedef struct IMediaControl IMediaControl; typedef struct IBasicAudio IBasicAudio; diff --git a/include/cpl.h b/include/cpl.h index c9e3461cf01..a330e984837 100644 --- a/include/cpl.h +++ b/include/cpl.h @@ -21,7 +21,7 @@ #ifndef _INC_CPL #define _INC_CPL -#include "pshpack1.h" +#include #ifdef __cplusplus extern "C" { @@ -84,6 +84,6 @@ DECL_WINELIB_TYPE_AW(LPNEWCPLINFO) } #endif -#include "poppack.h" +#include #endif /* _INC_CPL */ diff --git a/include/cursoricon.h b/include/cursoricon.h index db720839901..fd22967e023 100644 --- a/include/cursoricon.h +++ b/include/cursoricon.h @@ -21,9 +21,9 @@ #ifndef __WINE_CURSORICON_H #define __WINE_CURSORICON_H -#include "windef.h" +#include -#include "pshpack1.h" +#include typedef struct { @@ -78,7 +78,7 @@ typedef struct } CURSORICONFILEDIR; -#include "poppack.h" +#include #define CID_RESOURCE 0x0001 #define CID_WIN32 0x0004 diff --git a/include/d3d.h b/include/d3d.h index dfa9ae83332..b7443fbccb4 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -19,9 +19,9 @@ #ifndef __WINE_D3D_H #define __WINE_D3D_H -#include "ddraw.h" -#include "d3dtypes.h" /* must precede d3dcaps.h */ -#include "d3dcaps.h" +#include +#include /* must precede d3dcaps.h */ +#include /***************************************************************************** * Predeclare the interfaces diff --git a/include/d3d8.h b/include/d3d8.h index d9cf66b40aa..30c70d5f00a 100644 --- a/include/d3d8.h +++ b/include/d3d8.h @@ -23,10 +23,10 @@ #define DIRECT3D_VERSION 0x0800 #endif -#include "objbase.h" +#include -#include "d3d8types.h" -#include "d3d8caps.h" +#include +#include /***************************************************************************** * Behavior Flags for IDirect3D8::CreateDevice diff --git a/include/d3d9.h b/include/d3d9.h index 3c3c9a45c8f..1ac4c512239 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -24,10 +24,10 @@ #define DIRECT3D_VERSION 0x0900 #endif -#include "objbase.h" +#include -#include "d3d9types.h" -#include "d3d9caps.h" +#include +#include /***************************************************************************** * Behavior Flags for IDirect3D8::CreateDevice diff --git a/include/d3dcaps.h b/include/d3dcaps.h index 4b9ab4718d2..51dff252cd1 100644 --- a/include/d3dcaps.h +++ b/include/d3dcaps.h @@ -19,7 +19,7 @@ #ifndef __WINE_D3DCAPS_H #define __WINE_D3DCAPS_H -#include "ddraw.h" +#include typedef struct _D3DTRANSFORMCAPS { DWORD dwSize; diff --git a/include/d3dhal.h b/include/d3dhal.h index b8908e47da4..2c0a4393ba7 100644 --- a/include/d3dhal.h +++ b/include/d3dhal.h @@ -26,7 +26,7 @@ extern "C" { #endif -#include "d3d.h" +#include /***************************************************************************** * device info structures diff --git a/include/d3dtypes.h b/include/d3dtypes.h index 163cde0eb28..509b5df16e1 100644 --- a/include/d3dtypes.h +++ b/include/d3dtypes.h @@ -28,7 +28,7 @@ /* #include FIXME: Need to include for compatibility. Inclusion caused compile fail */ #include -#include "ddraw.h" +#include #define D3DVALP(val, prec) ((float)(val)) #define D3DVAL(val) ((float)(val)) @@ -332,7 +332,7 @@ typedef struct _D3DMATRIX { } D3DMATRIX, *LPD3DMATRIX; #if defined(__cplusplus) && defined(D3D_OVERLOADS) -#include "d3dvec.inl" +#include #endif typedef struct _D3DVIEWPORT { diff --git a/include/d3dx8core.h b/include/d3dx8core.h index 610b7d92486..a5eb5b06626 100644 --- a/include/d3dx8core.h +++ b/include/d3dx8core.h @@ -19,11 +19,11 @@ #ifndef __WINE_D3DX8CORE_H #define __WINE_D3DX8CORE_H -#include "objbase.h" +#include -#include "d3d8.h" -#include "d3d8types.h" -#include "d3d8caps.h" +#include +#include +#include /***************************************************************************** * #defines and error codes diff --git a/include/dbghelp.h b/include/dbghelp.h index 352adb99d09..4967f2660f9 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -21,9 +21,9 @@ #ifndef __WINE_DBGHELP_H #define __WINE_DBGHELP_H -#include "windef.h" -#include "winbase.h" -#include "ver.h" +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/dce.h b/include/dce.h index f77d7f47dde..3e6555b7835 100644 --- a/include/dce.h +++ b/include/dce.h @@ -21,7 +21,7 @@ #ifndef __WINE_DCE_H #define __WINE_DCE_H -#include "windef.h" +#include /* internal DCX flags */ #define DCX_DCEEMPTY 0x00000800 diff --git a/include/dde.h b/include/dde.h index b38b96cf8b3..77996fe53b6 100644 --- a/include/dde.h +++ b/include/dde.h @@ -22,7 +22,7 @@ #ifndef __WINE_DDE_H #define __WINE_DDE_H -#include "windef.h" +#include #ifdef __cplusplus extern "C" { diff --git a/include/ddeml.h b/include/ddeml.h index 5f4c82af13a..ab463dcb5f1 100644 --- a/include/ddeml.h +++ b/include/ddeml.h @@ -22,7 +22,7 @@ #ifndef __WINE_DDEML_H #define __WINE_DDEML_H -#include "windef.h" +#include #ifdef __cplusplus extern "C" { diff --git a/include/ddraw.h b/include/ddraw.h index e7922b395a7..4bee9e0eb1e 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -19,9 +19,9 @@ #ifndef __WINE_DDRAW_H #define __WINE_DDRAW_H -#include "windef.h" /* LARGE_INTEGER ... */ -#include "wingdi.h" /* PALETTE stuff ... */ -#include "objbase.h" +#include /* LARGE_INTEGER ... */ +#include /* PALETTE stuff ... */ +#include #ifdef __cplusplus extern "C" { diff --git a/include/ddrawi.h b/include/ddrawi.h index 17cdda448b5..d7b2ad2d774 100644 --- a/include/ddrawi.h +++ b/include/ddrawi.h @@ -26,8 +26,8 @@ extern "C" { #endif -#include "ddraw.h" -#include "dciddi.h" /* the DD HAL is layered onto DCI escapes */ +#include +#include /* the DD HAL is layered onto DCI escapes */ typedef struct _DDVIDEOPORTCAPS *LPDDVIDEOPORTCAPS; /* should be in dvp.h */ typedef struct _DDKERNELCAPS *LPDDKERNELCAPS; /* should be in ddkernel.h */ diff --git a/include/digitalv.h b/include/digitalv.h index 6c36995e43b..c0f59e800c9 100644 --- a/include/digitalv.h +++ b/include/digitalv.h @@ -23,8 +23,8 @@ * Wine Digital Video extensions */ -#include "mmsystem.h" -#include "windef.h" +#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/dinput.h b/include/dinput.h index c62329a79f8..e056b4f7c38 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -19,8 +19,8 @@ #ifndef __WINE_DINPUT_H #define __WINE_DINPUT_H -#include "windef.h" /* for MAX_PATH */ -#include "objbase.h" +#include /* for MAX_PATH */ +#include #ifndef DIRECTINPUT_VERSION #define DIRECTINPUT_VERSION 0x0800 diff --git a/include/dmdls.h b/include/dmdls.h index 6bb0b582094..dfe73c5ec17 100644 --- a/include/dmdls.h +++ b/include/dmdls.h @@ -20,7 +20,7 @@ #ifndef __WINE_DMUSIC_DLS_H #define __WINE_DMUSIC_DLS_H -#include "dls1.h" +#include typedef long PCENT, GCENT, TCENT, PERCENT; typedef LONGLONG REFERENCE_TIME, *LPREFERENCE_TIME; diff --git a/include/dmo.h b/include/dmo.h index 65d627dbb58..c70291580ef 100644 --- a/include/dmo.h +++ b/include/dmo.h @@ -19,16 +19,16 @@ #ifndef __DMO_H__ #define __DMO_H__ -#include "mediaerr.h" +#include #ifdef FIX_LOCK_NAME #define Lock DMOLock #endif -#include "mediaobj.h" +#include #ifdef FIX_LOCK_NAME #undef Lock #endif -#include "dmoreg.h" -#include "dmort.h" +#include +#include #endif /* __DMO_H__ */ diff --git a/include/dmplugin.h b/include/dmplugin.h index a0c38c6b9b7..e4472468447 100644 --- a/include/dmplugin.h +++ b/include/dmplugin.h @@ -21,8 +21,8 @@ #ifndef __WINE_DMUSIC_PLUGIN_H #define __WINE_DMUSIC_PLUGIN_H -#include "objbase.h" -#include "mmsystem.h" +#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/dmusbuff.h b/include/dmusbuff.h index 1298cfee8a1..6008fdcaf2f 100644 --- a/include/dmusbuff.h +++ b/include/dmusbuff.h @@ -20,7 +20,7 @@ #ifndef __WINE_DMUSIC_BUFFER_H #define __WINE_DMUSIC_BUFFER_H -#include "pshpack4.h" +#include /***************************************************************************** * Definitions @@ -40,6 +40,6 @@ typedef struct _DMUS_EVENTHEADER DWORD dwFlags; } DMUS_EVENTHEADER, *LPDMUS_EVENTHEADER; -#include "poppack.h" +#include #endif /* __WINE_DMUSIC_BUFFER_H */ diff --git a/include/dmusicc.h b/include/dmusicc.h index 28088b5be65..bc5b5a6e672 100644 --- a/include/dmusicc.h +++ b/include/dmusicc.h @@ -20,17 +20,17 @@ #ifndef __WINE_DMUSIC_CORE_H #define __WINE_DMUSIC_CORE_H -#include "objbase.h" +#include -#include "mmsystem.h" -#include "dsound.h" +#include +#include -#include "dls1.h" -#include "dmerror.h" -#include "dmdls.h" -#include "dmusbuff.h" +#include +#include +#include +#include -/*#include "pshpack8.h" */ +/*#include */ #ifdef __cplusplus extern "C" { @@ -675,6 +675,6 @@ ICOM_DEFINE(IReferenceClock,IUnknown) } /* extern "C" */ #endif /* __cplusplus */ -/*#include "poppack.h" */ +/*#include */ #endif /* __WINE_DMUSIC_CORE_H */ diff --git a/include/dmusicf.h b/include/dmusicf.h index ed1d22d4d87..9a496b54c81 100644 --- a/include/dmusicf.h +++ b/include/dmusicf.h @@ -21,8 +21,8 @@ #ifndef __WINE_DMUSIC_FILEFORMATS_H #define __WINE_DMUSIC_FILEFORMATS_H -#include "objbase.h" -#include "mmsystem.h" +#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/dmusici.h b/include/dmusici.h index 30c5da13597..12a22b18538 100644 --- a/include/dmusici.h +++ b/include/dmusici.h @@ -21,10 +21,10 @@ #ifndef __WINE_DMUSIC_PERFORMANCE_H #define __WINE_DMUSIC_PERFORMANCE_H -#include "objbase.h" -#include "mmsystem.h" +#include +#include -#include "oleauto.h" +#include #ifdef __cplusplus extern "C" { diff --git a/include/dmusics.h b/include/dmusics.h index 112434f21f3..c4010295136 100644 --- a/include/dmusics.h +++ b/include/dmusics.h @@ -21,7 +21,7 @@ #ifndef __WINE_DMUSIC_SOFTWARESYNTH_H #define __WINE_DMUSIC_SOFTWARESYNTH_H -#include "dmusicc.h" +#include /***************************************************************************** diff --git a/include/docobj.h b/include/docobj.h index ac856b38c3c..1e082c677e6 100644 --- a/include/docobj.h +++ b/include/docobj.h @@ -16,23 +16,23 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rpc.h" -#include "rpcndr.h" +#include +#include #ifndef COM_NO_WINDOWS_H -#include "windows.h" -#include "ole2.h" +#include +#include #endif #ifndef __WINE_DOCOBJ_H #define __WINE_DOCOBJ_H -#include "winbase.h" -#include "windef.h" -#include "wingdi.h" -#include "winuser.h" -#include "ole2.h" +#include +#include +#include +#include +#include #define __WINE_INCLUDE_OAIDL -#include "oaidl.h" +#include #undef __WINE_INCLUDE_OAIDL /***************************************************************************** diff --git a/include/dpaddr.h b/include/dpaddr.h index 18652afea22..84706b145ea 100644 --- a/include/dpaddr.h +++ b/include/dpaddr.h @@ -20,7 +20,7 @@ #define __WINE_DPLAY8_DPADDR_H #include -#include "dplay8.h" +#include #ifdef __cplusplus extern "C" { diff --git a/include/dplay.h b/include/dplay.h index e8932629748..3956e05b2a9 100644 --- a/include/dplay.h +++ b/include/dplay.h @@ -19,7 +19,7 @@ #ifndef __WINE_DPLAY_H #define __WINE_DPLAY_H -#include "ole2.h" +#include #ifdef __cplusplus extern "C" { diff --git a/include/dplay8.h b/include/dplay8.h index 547836065bd..64d3ddce9b0 100644 --- a/include/dplay8.h +++ b/include/dplay8.h @@ -20,7 +20,7 @@ #define __WINE_DPLAY8_H #include -#include "dpaddr.h" +#include #ifdef __cplusplus extern "C" { diff --git a/include/dplobby.h b/include/dplobby.h index 792d3f090d4..103f5b66d30 100644 --- a/include/dplobby.h +++ b/include/dplobby.h @@ -20,7 +20,7 @@ #ifndef __WINE_DPLOBBY_H #define __WINE_DPLOBBY_H -#include "dplay.h" +#include #ifdef __cplusplus extern "C" { diff --git a/include/drive.h b/include/drive.h index ec9fba165b1..e0fa8f9f900 100644 --- a/include/drive.h +++ b/include/drive.h @@ -21,7 +21,7 @@ #ifndef __WINE_DRIVE_H #define __WINE_DRIVE_H -#include "windef.h" +#include #define MAX_DOS_DRIVES 26 diff --git a/include/dsconf.h b/include/dsconf.h index 2df46d685bb..5467f2ff310 100644 --- a/include/dsconf.h +++ b/include/dsconf.h @@ -19,7 +19,7 @@ #ifndef __WINE_DSCONF_H #define __WINE_DSCONF_H -#include "dsound.h" +#include #ifdef __cplusplus extern "C" { diff --git a/include/dshow.h b/include/dshow.h index fcbd823693b..9c6238b8453 100644 --- a/include/dshow.h +++ b/include/dshow.h @@ -21,24 +21,24 @@ #define AM_NOVTABLE -#include "windef.h" -#include "wingdi.h" -#include "objbase.h" -#include "ddraw.h" -#include "mmsystem.h" +#include +#include +#include +#include +#include #ifndef NUMELMS #define NUMELMS(array) (sizeof(array)/sizeof((array)[0])) #endif -#include "strmif.h" -/*#include "amvideo.h"*/ -/*#include "amaudio.h"*/ -#include "control.h" -/*#include "evcode.h"*/ -#include "uuids.h" -/*#include "errors.h"*/ -#include "audevcod.h" +#include +/*#include */ +/*#include */ +#include +/*#include */ +#include +/*#include */ +#include #ifndef OATRUE #define OATRUE (-1) diff --git a/include/dsound.h b/include/dsound.h index 893088b9764..8a4036c69eb 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -23,8 +23,8 @@ #define DIRECTSOUND_VERSION 0x0800 #endif -#include "mmsystem.h" -#include "d3dtypes.h" +#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/fci.h b/include/fci.h index 257baccba30..7cd0ffe1ce5 100644 --- a/include/fci.h +++ b/include/fci.h @@ -23,7 +23,7 @@ extern "C" { #endif /* defined(__cplusplus) */ -#include "pshpack4.h" +#include #ifndef INCLUDED_TYPES_FCI_FDI #define INCLUDED_TYPES_FCI_FDI 1 @@ -248,7 +248,7 @@ BOOL __cdecl FCIDestroy(HFCI hfci); /**********************************************************************/ -#include "poppack.h" +#include #ifdef __cplusplus } /* extern "C" */ diff --git a/include/fdi.h b/include/fdi.h index b414bd5d915..fa9fc3b58a0 100644 --- a/include/fdi.h +++ b/include/fdi.h @@ -23,7 +23,7 @@ extern "C" { #endif /* defined(__cplusplus) */ -#include "pshpack4.h" +#include #ifndef INCLUDED_TYPES_FCI_FDI #define INCLUDED_TYPES_FCI_FDI 1 @@ -257,14 +257,14 @@ typedef INT_PTR (__cdecl *PFNFDINOTIFY)(FDINOTIFICATIONTYPE fdint, #define FNFDINOTIFY(fn) INT_PTR __cdecl fn(FDINOTIFICATIONTYPE fdint, \ PFDINOTIFICATION pfdin) -#include "pshpack1.h" +#include typedef struct { char ach[2]; /* Set to { '*', '\0' } */ long cbFile; /* Required spill file size */ } FDISPILLFILE, *PFDISPILLFILE; -#include "poppack.h" +#include #define cpuUNKNOWN (-1) /* FDI does detection */ #define cpu80286 (0) /* '286 opcodes only */ @@ -282,7 +282,7 @@ BOOL __cdecl FDITruncateCabinet(HFDI, char *, USHORT); /**********************************************************************/ -#include "poppack.h" +#include #ifdef __cplusplus } /* extern "C" */ diff --git a/include/file.h b/include/file.h index a6fa9ce5de7..ea6302351a9 100644 --- a/include/file.h +++ b/include/file.h @@ -26,9 +26,9 @@ # include #endif #include -#include "winbase.h" -#include "wine/windef16.h" /* HFILE16 */ -#include "winternl.h" +#include +#include /* HFILE16 */ +#include #define MAX_PATHNAME_LEN 1024 diff --git a/include/gdi.h b/include/gdi.h index 906688acb01..850b4a53009 100644 --- a/include/gdi.h +++ b/include/gdi.h @@ -21,9 +21,9 @@ #ifndef __WINE_GDI_H #define __WINE_GDI_H -#include "windef.h" -#include "wingdi.h" -#include "wine/wingdi16.h" +#include +#include +#include #include /* GDI objects magic numbers */ diff --git a/include/global.h b/include/global.h index f7d49ab67ef..947051a2cc2 100644 --- a/include/global.h +++ b/include/global.h @@ -21,9 +21,9 @@ #ifndef __WINE_GLOBAL_H #define __WINE_GLOBAL_H -#include "windef.h" -#include "wine/windef16.h" -#include "wine/library.h" +#include +#include +#include /* memory/global.c */ extern HGLOBAL16 GLOBAL_CreateBlock( UINT16 flags, const void *ptr, DWORD size, diff --git a/include/heap.h b/include/heap.h index e42491c4582..16d0fd1dfc9 100644 --- a/include/heap.h +++ b/include/heap.h @@ -23,8 +23,8 @@ #include -#include "winbase.h" -#include "winnls.h" +#include +#include /* strdup macros */ /* DO NOT USE IT!! it will go away soon */ diff --git a/include/icmpapi.h b/include/icmpapi.h index 7020ad98ce2..ad375eb4fa6 100644 --- a/include/icmpapi.h +++ b/include/icmpapi.h @@ -21,7 +21,7 @@ #ifndef __WINE_ICMPAPI_H #define __WINE_ICMPAPI_H -#include "windef.h" +#include HANDLE WINAPI IcmpCreateFile( VOID diff --git a/include/imagehlp.h b/include/imagehlp.h index feba051f458..84e80781164 100644 --- a/include/imagehlp.h +++ b/include/imagehlp.h @@ -21,8 +21,8 @@ #ifndef __WINE_IMAGEHLP_H #define __WINE_IMAGEHLP_H -#include "windef.h" -#include "winbase.h" +#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/imm.h b/include/imm.h index 2269258a639..52097d6f5f2 100644 --- a/include/imm.h +++ b/include/imm.h @@ -21,7 +21,7 @@ #ifndef __WINE_IMM_H #define __WINE_IMM_H -#include "windef.h" +#include #ifdef __cplusplus extern "C" { diff --git a/include/initguid.h b/include/initguid.h index 976dd786869..b69c925c11f 100644 --- a/include/initguid.h +++ b/include/initguid.h @@ -23,4 +23,4 @@ */ #define INITGUID -#include "guiddef.h" +#include diff --git a/include/instance.h b/include/instance.h index 5afe987c460..78f35c34a28 100644 --- a/include/instance.h +++ b/include/instance.h @@ -21,7 +21,7 @@ #ifndef __WINE_INSTANCE_H #define __WINE_INSTANCE_H -#include "windef.h" +#include /* This structure is always located at offset 0 of the DGROUP segment */ diff --git a/include/local.h b/include/local.h index 964ba4bf861..bf17b6da782 100644 --- a/include/local.h +++ b/include/local.h @@ -21,8 +21,8 @@ #ifndef __WINE_LOCAL_H #define __WINE_LOCAL_H -#include "windef.h" -#include "wine/windef16.h" +#include +#include /* These function are equivalent to the Local* API functions, */ /* excepted that they need DS as the first parameter. This */ diff --git a/include/lzexpand.h b/include/lzexpand.h index 450f92db437..cb73eedbfb1 100644 --- a/include/lzexpand.h +++ b/include/lzexpand.h @@ -20,7 +20,7 @@ #ifndef __WINE_LZEXPAND_H #define __WINE_LZEXPAND_H -#include "windef.h" +#include #ifdef __cplusplus extern "C" { diff --git a/include/mapicode.h b/include/mapicode.h index 57346d62822..c6b7a9dee0c 100644 --- a/include/mapicode.h +++ b/include/mapicode.h @@ -21,7 +21,7 @@ #ifndef MAPICODE_H #define MAPICODE_H -#include "winerror.h" +#include #define MAKE_MAPI_SCODE(sev,fac,code) \ ( (((ULONG)(sev)<<31) | ((ULONG)(fac)<<16) | ((ULONG)(code))) ) diff --git a/include/mapidefs.h b/include/mapidefs.h index 92d1c0fd103..6d02393295b 100644 --- a/include/mapidefs.h +++ b/include/mapidefs.h @@ -19,11 +19,11 @@ #ifndef __WINE_MAPIDEFS_H #define __WINE_MAPIDEFS_H -#include "windef.h" -#include "windows.h" -#include "winerror.h" +#include +#include +#include #ifndef _OBJBASE_H_ -#include "objbase.h" +#include #endif /* Some types */ diff --git a/include/mediaobj.h b/include/mediaobj.h index 1be544873aa..f6af55ee8e0 100644 --- a/include/mediaobj.h +++ b/include/mediaobj.h @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rpc.h" -#include "rpcndr.h" +#include +#include #ifndef COM_NO_WINDOWS_H -#include "windows.h" -#include "ole2.h" +#include +#include #endif #ifndef __mediaobj_h__ @@ -33,8 +33,8 @@ typedef struct IMediaBuffer IMediaBuffer; typedef struct IMediaObject IMediaObject; typedef struct IMediaObjectInPlace IMediaObjectInPlace; -#include "unknwn.h" -#include "objidl.h" +#include +#include typedef struct _DMOMediaType { diff --git a/include/miscemu.h b/include/miscemu.h index b26c130849e..153462f1d94 100644 --- a/include/miscemu.h +++ b/include/miscemu.h @@ -21,12 +21,12 @@ #ifndef __WINE_MISCEMU_H #define __WINE_MISCEMU_H -#include "windef.h" -#include "selectors.h" -#include "wine/windef16.h" +#include +#include +#include /* msdos/dosmem.c */ -#include "pshpack1.h" +#include typedef struct { @@ -86,7 +86,7 @@ typedef struct BYTE DiskDataRate; /* 8B: Last disk data rate selected */ } BIOSDATA; -#include "poppack.h" +#include extern WORD DOSMEM_0000H; extern WORD DOSMEM_BiosDataSeg; diff --git a/include/mmddk.h b/include/mmddk.h index de88056416c..345bb6f4ef0 100644 --- a/include/mmddk.h +++ b/include/mmddk.h @@ -26,8 +26,8 @@ #ifndef __MMDDK_H #define __MMDDK_H -#include "mmsystem.h" -#include "winbase.h" +#include +#include #define MAX_MIDIINDRV (16) /* For now I'm making 16 the maximum number of midi devices one can @@ -41,7 +41,7 @@ * Multimedia DDK compatible part * ================================== */ -#include "pshpack1.h" +#include #define DRVM_INIT 100 #define DRVM_EXIT 101 @@ -439,6 +439,6 @@ BOOL WINAPI mciFreeCommandResource(UINT uTable); BOOL WINAPI DriverCallback(DWORD dwCallBack, UINT uFlags, HDRVR hDev, UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2); -#include "poppack.h" +#include #endif /* __MMDDK_H */ diff --git a/include/mmreg.h b/include/mmreg.h index 7c5c7a5a2b9..265f52a6dbd 100644 --- a/include/mmreg.h +++ b/include/mmreg.h @@ -28,7 +28,7 @@ #ifndef _ACM_WAVEFILTER #define _ACM_WAVEFILTER -#include "windef.h" +#include #define WAVE_FILTER_UNKNOWN 0x0000 #define WAVE_FILTER_DEVELOPMENT 0xFFFF diff --git a/include/mmsystem.h b/include/mmsystem.h index 05798e6f802..cd0c6d6521d 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -21,7 +21,7 @@ #ifndef __WINE_MMSYSTEM_H #define __WINE_MMSYSTEM_H -#include "windef.h" +#include #ifdef __cplusplus extern "C" { @@ -52,7 +52,7 @@ typedef HMIXEROBJ *LPHMIXEROBJ; typedef HWAVEIN *LPHWAVEIN; typedef HWAVEOUT *LPHWAVEOUT; -#include "pshpack1.h" +#include typedef LRESULT (CALLBACK *DRIVERPROC)(DWORD,HDRVR,UINT,LPARAM,LPARAM); @@ -2225,7 +2225,7 @@ typedef struct { DECL_WINELIB_TYPE_AW(MCI_OVLY_LOAD_PARMS) DECL_WINELIB_TYPE_AW(LPMCI_OVLY_LOAD_PARMS) -#include "poppack.h" +#include #ifdef __cplusplus } diff --git a/include/module.h b/include/module.h index 954ad0fa464..6ee79bb5490 100644 --- a/include/module.h +++ b/include/module.h @@ -21,11 +21,11 @@ #ifndef __WINE_MODULE_H #define __WINE_MODULE_H -#include "windef.h" -#include "winbase.h" -#include "wine/windef16.h" -#include "wine/winbase16.h" -#include "winternl.h" +#include +#include +#include +#include +#include /* In-memory module structure. See 'Windows Internals' p. 219 */ typedef struct _NE_MODULE @@ -98,7 +98,7 @@ typedef struct /* Self-loading modules contain this structure in their first segment */ -#include "pshpack1.h" +#include typedef struct { @@ -123,7 +123,7 @@ typedef struct DWORD dwReserved; } LOADPARAMS; -#include "poppack.h" +#include /* internal representation of 32bit modules. per process. */ typedef struct _wine_modref diff --git a/include/msacm.h b/include/msacm.h index a688a024211..0412f9c2598 100644 --- a/include/msacm.h +++ b/include/msacm.h @@ -21,9 +21,9 @@ #ifndef __WINE_MSACM_H #define __WINE_MSACM_H -#include "windef.h" -#include "mmsystem.h" -#include "mmreg.h" +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/msdos.h b/include/msdos.h index c44426bba51..d2fe189b38f 100644 --- a/include/msdos.h +++ b/include/msdos.h @@ -20,9 +20,9 @@ #ifndef __WINE_MSDOS_H #define __WINE_MSDOS_H -#include "wine/windef16.h" +#include -#include "pshpack1.h" +#include struct fcb { BYTE drive; @@ -121,7 +121,7 @@ typedef struct _DOS_LISTOFLISTS SEGPTR wine_pm_lol; /* -- wine: Protected mode pointer to LOL */ } DOS_LISTOFLISTS; -#include "poppack.h" +#include #define MAX_DOS_DRIVES 26 diff --git a/include/msiquery.h b/include/msiquery.h index 994f5b7f059..fb61a7436c4 100644 --- a/include/msiquery.h +++ b/include/msiquery.h @@ -19,7 +19,7 @@ #ifndef __WINE_MSIQUERY_H #define __WINE_MSIQUERY_H -#include "msi.h" +#include typedef enum tagMSICONDITION { diff --git a/include/mssip.h b/include/mssip.h index 92fbe11e1cb..6d9aea8dc5c 100644 --- a/include/mssip.h +++ b/include/mssip.h @@ -46,7 +46,7 @@ typedef CRYPT_HASH_BLOB CRYPT_DIGEST_DATA; /**********************************************************************/ -#include "pshpack8.h" +#include typedef struct SIP_SUBJECTINFO_ { DWORD cbSize; GUID *pgSubjectType; @@ -75,26 +75,26 @@ typedef struct SIP_SUBJECTINFO_ { LPVOID pClientData; } SIP_SUBJECTINFO, *LPSIP_SUBJECTINFO; -#include "poppack.h" +#include -#include "pshpack8.h" +#include typedef struct MS_ADDINFO_FLAT_ { DWORD cbStruct; struct SIP_INDIRECT_DATA_ *pIndirectData; } MS_ADDINFO_FLAT, *PMS_ADDINFO_FLAT; -#include "poppack.h" +#include -#include "pshpack8.h" +#include typedef struct MS_ADDINFO_CATALOGMEMBER_ { DWORD cbStruct; struct CRYPTCATSTORE_ *pStore; struct CRYPTCATMEMBER_ *pMember; } MS_ADDINFO_CATALOGMEMBER, *PMS_ADDINFO_CATALOGMEMBER; -#include "poppack.h" +#include -#include "pshpack8.h" +#include typedef struct MS_ADDINFO_BLOB_ { DWORD cbStruct; @@ -104,15 +104,15 @@ typedef struct MS_ADDINFO_BLOB_ { DWORD cbMemSignedMsg; BYTE *pbMemSignedMsg; } MS_ADDINFO_BLOB, *PMS_ADDINFO_BLOB; -#include "poppack.h" +#include -#include "pshpack8.h" +#include typedef struct SIP_INDIRECT_DATA_ { CRYPT_ATTRIBUTE_TYPE_VALUE Data; CRYPT_ALGORITHM_IDENTIFIER DigestAlgorithm; CRYPT_HASH_BLOB Digest; } SIP_INDIRECT_DATA, *PSIP_INDIRECT_DATA; -#include "poppack.h" +#include typedef BOOL (WINAPI * pCryptSIPGetSignedDataMsg)(SIP_SUBJECTINFO *,DWORD *,DWORD,DWORD *,BYTE *); typedef BOOL (WINAPI * pCryptSIPPutSignedDataMsg)(SIP_SUBJECTINFO *,DWORD,DWORD,DWORD,BYTE); @@ -120,7 +120,7 @@ typedef BOOL (WINAPI * pCryptSIPCreateIndirectData)(SIP_SUBJECTINFO *,DWORD *,SI typedef BOOL (WINAPI * pCryptSIPVerifyIndirectData)(SIP_SUBJECTINFO *,SIP_INDIRECT_DATA *); typedef BOOL (WINAPI * pCryptSIPRemoveSignedDataMsg)(SIP_SUBJECTINFO *,DWORD); -#include "pshpack8.h" +#include typedef struct SIP_DISPATCH_INFO_ { DWORD cbSize; @@ -132,12 +132,12 @@ typedef struct SIP_DISPATCH_INFO_ { pCryptSIPVerifyIndirectData pfVerify; pCryptSIPRemoveSignedDataMsg pfRemove; } SIP_DISPATCH_INFO, *LPSIP_DISPATCH_INFO; -#include "poppack.h" +#include typedef BOOL (WINAPI *pfnIsFileSupported)(HANDLE,GUID *); typedef BOOL (WINAPI *pfnIsFileSupportedName)(WCHAR *,GUID *); -#include "pshpack8.h" +#include typedef struct SIP_ADD_NEWPROVIDER_ { DWORD cbStruct; @@ -157,7 +157,7 @@ typedef struct SIP_ADD_NEWPROVIDER_ WCHAR *pwszIsFunctionNameFmt2; } SIP_ADD_NEWPROVIDER, *PSIP_ADD_NEWPROVIDER; -#include "poppack.h" +#include /**********************************************************************/ diff --git a/include/msvcrt/sys/stat.h b/include/msvcrt/sys/stat.h index 5bea0fe01ec..a64e57bbaba 100644 --- a/include/msvcrt/sys/stat.h +++ b/include/msvcrt/sys/stat.h @@ -11,7 +11,7 @@ #define __WINE_USE_MSVCRT #endif -#include "sys/types.h" +#include #ifndef MSVCRT # ifdef USE_MSVCRT_PREFIX diff --git a/include/netspi.h b/include/netspi.h index acecf465a94..ff1e996798f 100644 --- a/include/netspi.h +++ b/include/netspi.h @@ -21,8 +21,8 @@ #ifndef _NETSPI_H_ #define _NETSPI_H_ -#include "windef.h" -#include "winnetwk.h" +#include +#include /* * Note: The Unicode variants of all these routines/structures diff --git a/include/nonclient.h b/include/nonclient.h index 7935a4cd86d..b984a42513a 100644 --- a/include/nonclient.h +++ b/include/nonclient.h @@ -21,7 +21,7 @@ #ifndef __WINE_NONCLIENT_H #define __WINE_NONCLIENT_H -#include "windef.h" +#include extern LONG NC_HandleNCPaint( HWND hwnd , HRGN clip); extern LONG NC_HandleNCActivate( HWND hwnd, WPARAM wParam ); diff --git a/include/ntddcdrm.h b/include/ntddcdrm.h index e0902dd31b8..1260814d1e8 100644 --- a/include/ntddcdrm.h +++ b/include/ntddcdrm.h @@ -46,7 +46,7 @@ #define IOCTL_CDROM_RELEASE CTL_CODE(IOCTL_CDROM_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CDROM_FIND_NEW_DEVICES CTL_CODE(IOCTL_CDROM_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) -#include "ntddstor.h" +#include #define MAXIMUM_NUMBER_TRACKS 100 #define MAXIMUM_CDROM_SIZE 804 diff --git a/include/ntsecapi.h b/include/ntsecapi.h index b5e2b5c6866..2bb7a398815 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -19,7 +19,7 @@ #ifndef __WINE_NTSECAPI_H #define __WINE_NTSECAPI_H -#include "winnt.h" +#include #ifdef __cplusplus extern "C" { diff --git a/include/oaidl.h b/include/oaidl.h index 71bc79b76f2..8881eab3285 100644 --- a/include/oaidl.h +++ b/include/oaidl.h @@ -1,13 +1,13 @@ /*** Autogenerated by WIDL 0.1 from oaidl.idl - Do not edit ***/ -#include "rpc.h" -#include "rpcndr.h" +#include +#include #ifndef __WIDL_OAIDL_H #define __WIDL_OAIDL_H #ifdef __cplusplus extern "C" { #endif -#include "objidl.h" +#include #ifndef __IDispatch_FWD_DEFINED__ #define __IDispatch_FWD_DEFINED__ typedef struct IDispatch IDispatch; diff --git a/include/objbase.h b/include/objbase.h index 248b46fcba3..783952fe944 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rpc.h" -#include "rpcndr.h" +#include +#include #ifndef _OBJBASE_H_ #define _OBJBASE_H_ @@ -303,7 +303,7 @@ #define ICOM_THIS(impl,iface) impl* const This=(impl*)(iface) #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) -#include "objidl.h" +#include #ifndef RC_INVOKED /* For compatibility only, at least for now */ @@ -311,7 +311,7 @@ #endif #ifndef INITGUID -#include "cguid.h" +#include #endif #ifdef __cplusplus diff --git a/include/objidl.h b/include/objidl.h index 285f0d8fba0..2732e440dd1 100644 --- a/include/objidl.h +++ b/include/objidl.h @@ -1,13 +1,13 @@ /*** Autogenerated by WIDL 0.1 from objidl.idl - Do not edit ***/ -#include "rpc.h" -#include "rpcndr.h" +#include +#include #ifndef __WIDL_OBJIDL_H #define __WIDL_OBJIDL_H #ifdef __cplusplus extern "C" { #endif -#include "unknwn.h" +#include #ifndef __IStream_FWD_DEFINED__ #define __IStream_FWD_DEFINED__ typedef struct IStream IStream; diff --git a/include/ocidl.h b/include/ocidl.h index 61c112b246b..b65e242fccd 100644 --- a/include/ocidl.h +++ b/include/ocidl.h @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rpc.h" -#include "rpcndr.h" +#include +#include #ifndef COM_NO_WINDOWS_H -#include "windows.h" -#include "ole2.h" +#include +#include #endif #ifndef __WINE_OCIDL_H @@ -31,19 +31,19 @@ #endif #define __WINE_INCLUDE_OLEIDL -#include "oleidl.h" +#include #undef __WINE_INCLUDE_OLEIDL #define __WINE_INCLUDE_OAIDL -#include "oaidl.h" +#include #undef __WINE_INCLUDE_OAIDL -#include "wine/obj_olefont.h" -#include "wine/obj_picture.h" +#include +#include -#include "wine/obj_control.h" -#include "wine/obj_connection.h" -#include "wine/obj_property.h" -#include "wine/obj_oleundo.h" +#include +#include +#include +#include #endif /* __WINE_OCIDL_H */ diff --git a/include/ole2.h b/include/ole2.h index f72f5e0e7de..c616462df71 100644 --- a/include/ole2.h +++ b/include/ole2.h @@ -21,12 +21,12 @@ #ifndef __WINE_OLE2_H #define __WINE_OLE2_H -#include "windef.h" -#include "winerror.h" -#include "objbase.h" -#include "oleauto.h" +#include +#include +#include +#include #define __WINE_INCLUDE_OLEIDL -#include "oleidl.h" +#include #undef __WINE_INCLUDE_OLEIDL struct tagMSG; diff --git a/include/oleauto.h b/include/oleauto.h index bc9ae0e393b..adeee1aab7a 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -19,9 +19,9 @@ #ifndef __WINE_OLEAUTO_H #define __WINE_OLEAUTO_H -#include "winbase.h" +#include #define __WINE_INCLUDE_OAIDL -#include "oaidl.h" +#include #undef __WINE_INCLUDE_OAIDL #ifdef __cplusplus diff --git a/include/olectl.h b/include/olectl.h index 6e03f7187ad..05fd8d2408d 100644 --- a/include/olectl.h +++ b/include/olectl.h @@ -19,9 +19,9 @@ #ifndef __WINE_OLECTL_H #define __WINE_OLECTL_H -#include "windef.h" +#include #define __WINE_INCLUDE_OCIDL -#include "ocidl.h" +#include #undef __WINE_INCLUDE_OCIDL #ifdef __cplusplus diff --git a/include/oledlg.h b/include/oledlg.h index 5ee3af5472f..62cf4b80ec8 100644 --- a/include/oledlg.h +++ b/include/oledlg.h @@ -21,10 +21,10 @@ #ifndef __WINE_OLEDLG_H #define __WINE_OLEDLG_H -#include "commdlg.h" -#include "prsht.h" -#include "windef.h" -#include "ole2.h" +#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/oleidl.h b/include/oleidl.h index 41165b50ae9..3c33e7170ce 100644 --- a/include/oleidl.h +++ b/include/oleidl.h @@ -16,11 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rpc.h" -#include "rpcndr.h" +#include +#include #ifndef COM_NO_WINDOWS_H -#include "windows.h" -#include "ole2.h" +#include +#include #endif #ifndef __WINE_OLEIDL_H @@ -30,11 +30,11 @@ #error DO NOT INCLUDE DIRECTLY #endif -#include "objbase.h" -#include "wine/obj_inplace.h" -#include "wine/obj_cache.h" -#include "wine/obj_oleobj.h" -#include "wine/obj_oleview.h" -#include "wine/obj_dragdrop.h" +#include +#include +#include +#include +#include +#include #endif /* __WINE_OLEIDL_H */ diff --git a/include/options.h b/include/options.h index 8e45c2dad3d..36b541b641c 100644 --- a/include/options.h +++ b/include/options.h @@ -21,7 +21,7 @@ #ifndef __WINE_OPTIONS_H #define __WINE_OPTIONS_H -#include "windef.h" +#include extern const char *argv0; extern const char *full_argv0; diff --git a/include/palette.h b/include/palette.h index a10bf56d51e..04f59080aa3 100644 --- a/include/palette.h +++ b/include/palette.h @@ -21,7 +21,7 @@ #ifndef __WINE_PALETTE_H #define __WINE_PALETTE_H -#include "gdi.h" +#include #define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */ diff --git a/include/prsht.h b/include/prsht.h index f96471176f6..942b09d2c47 100644 --- a/include/prsht.h +++ b/include/prsht.h @@ -19,9 +19,9 @@ #ifndef __WINE_PRSHT_H #define __WINE_PRSHT_H -#include "windef.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/psapi.h b/include/psapi.h index b125a4688a7..4df75e695bc 100644 --- a/include/psapi.h +++ b/include/psapi.h @@ -21,7 +21,7 @@ #ifndef __WINE_PSAPI_H #define __WINE_PSAPI_H -#include "windef.h" +#include typedef struct _MODULEINFO { LPVOID lpBaseOfDll; diff --git a/include/pshpack1.h b/include/pshpack1.h index 54a1ababd65..961dab51c5a 100644 --- a/include/pshpack1.h +++ b/include/pshpack1.h @@ -30,12 +30,12 @@ # define __WINE_PSHPACK_H2 1 /* Depth == 2 */ # define __WINE_INTERNAL_POPPACK -# include "poppack.h" +# include # elif !defined(__WINE_PSHPACK_H3) # define __WINE_PSHPACK_H3 1 /* Depth == 3 */ # define __WINE_INTERNAL_POPPACK -# include "poppack.h" +# include # endif # if _MSC_VER >= 800 diff --git a/include/pshpack2.h b/include/pshpack2.h index 060642ec8da..8ef24858e00 100644 --- a/include/pshpack2.h +++ b/include/pshpack2.h @@ -30,12 +30,12 @@ # define __WINE_PSHPACK_H2 2 /* Depth == 2 */ # define __WINE_INTERNAL_POPPACK -# include "poppack.h" +# include # elif !defined(__WINE_PSHPACK_H3) # define __WINE_PSHPACK_H3 2 /* Depth == 3 */ # define __WINE_INTERNAL_POPPACK -# include "poppack.h" +# include # endif # if _MSC_VER >= 800 diff --git a/include/pshpack4.h b/include/pshpack4.h index 7f19dfc42a4..1042129e25a 100644 --- a/include/pshpack4.h +++ b/include/pshpack4.h @@ -30,12 +30,12 @@ # define __WINE_PSHPACK_H2 4 /* Depth == 2 */ # define __WINE_INTERNAL_POPPACK -# include "poppack.h" +# include # elif !defined(__WINE_PSHPACK_H3) # define __WINE_PSHPACK_H3 4 /* Depth == 3 */ # define __WINE_INTERNAL_POPPACK -# include "poppack.h" +# include # endif # if _MSC_VER >= 800 diff --git a/include/pshpack8.h b/include/pshpack8.h index 59d7a9284ad..b1b212bfe05 100644 --- a/include/pshpack8.h +++ b/include/pshpack8.h @@ -30,12 +30,12 @@ # define __WINE_PSHPACK_H2 8 /* Depth == 2 */ # define __WINE_INTERNAL_POPPACK -# include "poppack.h" +# include # elif !defined(__WINE_PSHPACK_H3) # define __WINE_PSHPACK_H3 8 /* Depth == 3 */ # define __WINE_INTERNAL_POPPACK -# include "poppack.h" +# include # endif # if _MSC_VER >= 800 diff --git a/include/ras.h b/include/ras.h index dde22fec76a..789acc0909e 100644 --- a/include/ras.h +++ b/include/ras.h @@ -19,13 +19,13 @@ #ifndef __WINE_RAS_H #define __WINE_RAS_H -#include "windef.h" -#include "lmcons.h" +#include +#include #ifdef __cplusplus extern "C" { #endif -#include "pshpack4.h" +#include #define RAS_MaxCallbackNumber RAS_MaxPhoneNumber #define RAS_MaxDeviceName 128 @@ -334,7 +334,7 @@ DWORD WINAPI RasSetAutodialEnableA(DWORD dwDialingLocation, BOOL fEnabled); DWORD WINAPI RasSetAutodialEnableW(DWORD dwDialingLocation, BOOL fEnabled); #define RasSetAutodialEnable WINELIB_NAME_AW(RasSetAutodialEnable) -#include "poppack.h" +#include #ifdef __cplusplus } #endif diff --git a/include/richedit.h b/include/richedit.h index 834a666de64..3ca67e247f3 100644 --- a/include/richedit.h +++ b/include/richedit.h @@ -20,7 +20,7 @@ #ifndef __WINE_RICHEDIT_H #define __WINE_RICHEDIT_H -#include "pshpack4.h" +#include #ifdef __cplusplus extern "C" { @@ -619,6 +619,6 @@ typedef struct _gettextlengthex { } #endif -#include "poppack.h" +#include #endif /* __WINE_RICHEDIT_H */ diff --git a/include/rpc.h b/include/rpc.h index aa7b0b760ec..db2efa7f5cb 100644 --- a/include/rpc.h +++ b/include/rpc.h @@ -19,7 +19,7 @@ */ #if !defined(RPC_NO_WINDOWS_H) && !defined(__WINESRC__) -#include "windows.h" +#include #endif #ifndef __WINE_RPC_H @@ -45,11 +45,11 @@ typedef long RPC_STATUS; typedef void* I_RPC_HANDLE; -#include "rpcdce.h" -/* #include "rpcnsi.h" */ -#include "rpcnterr.h" -#include "excpt.h" -#include "winerror.h" +#include +/* #include */ +#include +#include +#include /* ignore exception handling for now */ #define RpcTryExcept if (1) { diff --git a/include/rpcdce.h b/include/rpcdce.h index cd752705561..c550d835dbe 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -19,7 +19,7 @@ #ifndef __WINE_RPCDCE_H #define __WINE_RPCDCE_H -#include "windef.h" +#include /* avoid delving into windows.h ifndef __WINESRC__; this would pull in rpcndr.h, which needs rpcdcep.h, which @@ -29,7 +29,7 @@ #define RPC_NO_WINDOWS_H #endif -#include "rpc.h" +#include #ifdef __NO_HAD_RPC_NO_WINDOWS_H #undef RPC_NO_WINDOWS_H @@ -37,7 +37,7 @@ #endif #ifndef GUID_DEFINED -#include "guiddef.h" +#include #endif #ifndef UUID_DEFINED @@ -285,6 +285,6 @@ RPCRTAPI unsigned short RPC_ENTRY RPCRTAPI int RPC_ENTRY UuidIsNil( UUID* Uuid, RPC_STATUS* Status_ ); -#include "rpcdcep.h" +#include #endif /*__WINE_RPCDCE_H */ diff --git a/include/rpcdcep.h b/include/rpcdcep.h index c184ee2eb3e..b9c5f583a14 100644 --- a/include/rpcdcep.h +++ b/include/rpcdcep.h @@ -19,7 +19,7 @@ #ifndef __WINE_RPCDCEP_H #define __WINE_RPCDCEP_H -#include "rpcdce.h" +#include typedef struct _RPC_VERSION { unsigned short MajorVersion; diff --git a/include/rpcndr.h b/include/rpcndr.h index 56a104389fe..f55c365de1e 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -24,8 +24,8 @@ #ifndef __WINE_RPCNDR_H #define __WINE_RPCNDR_H -#include "basetsd.h" -#include "rpcdcep.h" +#include +#include /* stupid #if can't handle casts... this __stupidity is just a workaround for that limitation */ @@ -141,7 +141,7 @@ typedef struct _NDR_PIPE_MESSAGE *PNDR_PIPE_MESSAGE; typedef struct _NDR_ASYNC_MESSAGE *PNDR_ASYNC_MESSAGE; typedef struct _NDR_CORRELATION_INFO *PNDR_CORRELATION_INFO; -#include "pshpack4.h" +#include typedef struct _MIDL_STUB_MESSAGE { PRPC_MESSAGE RpcMsg; @@ -198,7 +198,7 @@ typedef struct _MIDL_STUB_MESSAGE void *pMemoryList; ULONG_PTR w2kReserved[5]; } MIDL_STUB_MESSAGE, *PMIDL_STUB_MESSAGE; -#include "poppack.h" +#include typedef struct _GENERIC_BINDING_ROUTINE_PAIR GENERIC_BINDING_ROUTINE_PAIR, *PGENERIC_BINDING_ROUTINE_PAIR; diff --git a/include/rpcproxy.h b/include/rpcproxy.h index f4e2059a523..18aff4b17d7 100644 --- a/include/rpcproxy.h +++ b/include/rpcproxy.h @@ -24,11 +24,11 @@ #ifndef __WINE_RPCPROXY_H #define __WINE_RPCPROXY_H -#include "basetsd.h" -#include "guiddef.h" -#include "winnt.h" -#include "rpc.h" -#include "rpcndr.h" +#include +#include +#include +#include +#include typedef struct tagCInterfaceStubVtbl *PCInterfaceStubVtblList; typedef struct tagCInterfaceProxyVtbl *PCInterfaceProxyVtblList; diff --git a/include/selectors.h b/include/selectors.h index 235db7bb57d..5a1d5ffb27c 100644 --- a/include/selectors.h +++ b/include/selectors.h @@ -21,8 +21,8 @@ #ifndef __WINE_SELECTORS_H #define __WINE_SELECTORS_H -#include "windef.h" -#include "wine/library.h" +#include +#include extern WORD SELECTOR_AllocBlock( const void *base, DWORD size, unsigned char flags ); extern WORD SELECTOR_ReallocBlock( WORD sel, const void *base, DWORD size ); diff --git a/include/servprov.h b/include/servprov.h index daeb6e04bf5..2ccfe35e01e 100644 --- a/include/servprov.h +++ b/include/servprov.h @@ -16,18 +16,18 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rpc.h" -#include "rpcndr.h" +#include +#include #ifndef COM_NO_WINDOWS_H -#include "windows.h" -#include "ole2.h" +#include +#include #endif #ifndef __WINE_SERVPROV_H #define __WINE_SERVPROV_H -#include "objbase.h" +#include /***************************************************************************** diff --git a/include/setupapi.h b/include/setupapi.h index e0fd1a3eec1..bccee22a381 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -19,7 +19,7 @@ #ifndef _INC_SETUPAPI #define _INC_SETUPAPI -#include "commctrl.h" +#include /* Define type for handle to a loaded inf file */ typedef PVOID HINF; diff --git a/include/shellapi.h b/include/shellapi.h index 1644a6b6f64..86afc6aa01a 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -19,13 +19,13 @@ #ifndef __WINE_SHELLAPI_H #define __WINE_SHELLAPI_H -#include "windef.h" +#include #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */ -#include "pshpack1.h" +#include DECLARE_HANDLE(HDROP); @@ -289,6 +289,6 @@ BOOL WINAPI ShellAboutW(HWND,LPCWSTR,LPCWSTR,HICON); } /* extern "C" */ #endif /* defined(__cplusplus) */ -#include "poppack.h" +#include #endif /* __WINE_SHELLAPI_H */ diff --git a/include/shlguid.h b/include/shlguid.h index 005aa819d04..490a1d5d046 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -19,7 +19,7 @@ #ifndef __WINE_SHLGUID_H #define __WINE_SHLGUID_H -#include "objbase.h" +#include #define DEFINE_SHLGUID(name, l, w1, w2) DEFINE_OLEGUID(name,l,w1,w2) diff --git a/include/shlobj.h b/include/shlobj.h index d7bc5a06ec5..4493ebe3eb3 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -19,24 +19,24 @@ #ifndef __WINE_SHLOBJ_H #define __WINE_SHLOBJ_H -#include "windef.h" -#include "winbase.h" /* WIN32_FIND_* */ -#include "ole2.h" -#include "oleauto.h" -#include "commctrl.h" -#include "prsht.h" -#include "shlguid.h" +#include +#include /* WIN32_FIND_* */ +#include +#include +#include +#include +#include #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */ -#include "pshpack1.h" +#include /**************************************************************************** * SHITEMID, ITEMIDLIST, PIDL API */ -#include "pshpack1.h" +#include typedef struct { WORD cb; /* nr of bytes in this item */ @@ -48,23 +48,23 @@ typedef struct _ITEMIDLIST { SHITEMID mkid; /* first itemid in list */ } ITEMIDLIST,*LPITEMIDLIST,*LPCITEMIDLIST; -#include "poppack.h" +#include BOOL WINAPI SHGetPathFromIDListA (LPCITEMIDLIST pidl,LPSTR pszPath); BOOL WINAPI SHGetPathFromIDListW (LPCITEMIDLIST pidl,LPWSTR pszPath); #define SHGetPathFromIDList WINELIB_NAME_AW(SHGetPathFromIDList) -#include "wine/obj_enumidlist.h" -#include "wine/obj_shellfolder.h" -#include "wine/obj_shellview.h" -#include "wine/obj_shelllink.h" -#include "wine/obj_shellbrowser.h" -#include "wine/obj_contextmenu.h" -#include "wine/obj_shellextinit.h" -#include "wine/obj_extracticon.h" -#include "wine/obj_commdlgbrowser.h" -#include "wine/obj_dockingwindowframe.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /***************************************************************************** * Predeclare interfaces @@ -605,7 +605,7 @@ typedef struct _DROPFILES BOOL fWide; } DROPFILES, *LPDROPFILES; -#include "poppack.h" +#include #ifdef __cplusplus } /* extern "C" */ diff --git a/include/shlwapi.h b/include/shlwapi.h index fb0f3f0c0f3..9bd10eac0f5 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -21,13 +21,13 @@ #ifndef __WINE_SHLWAPI_H #define __WINE_SHLWAPI_H -#include "objbase.h" +#include #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */ -#include "pshpack1.h" +#include #ifndef NO_SHLWAPI_REG @@ -930,7 +930,7 @@ typedef struct _DLLVERSIONINFO2 { HRESULT WINAPI DllInstall(BOOL,LPCWSTR); -#include "poppack.h" +#include #ifdef __cplusplus } /* extern "C" */ diff --git a/include/sipbase.h b/include/sipbase.h index a575b68f2b6..c49fa4f1cab 100644 --- a/include/sipbase.h +++ b/include/sipbase.h @@ -19,6 +19,6 @@ #ifndef __WINE_SIPBASE_H #define __WINE_SIPBASE_H -#include "mssip.h" +#include #endif /* __WINE_SIPBASE_H */ diff --git a/include/snoop.h b/include/snoop.h index 115125a6fb3..86d46104bee 100644 --- a/include/snoop.h +++ b/include/snoop.h @@ -21,7 +21,7 @@ #ifndef __WINE_SNOOP_H #define __WINE_SNOOP_H -#include "module.h" +#include extern void SNOOP_RegisterDLL(HMODULE,LPCSTR,DWORD,DWORD); extern void SNOOP16_RegisterDLL(NE_MODULE*,LPCSTR); diff --git a/include/sql.h b/include/sql.h index 82a7979a722..c95266c708d 100644 --- a/include/sql.h +++ b/include/sql.h @@ -25,7 +25,7 @@ #define ODBCVER 0x0351 #endif -#include "sqltypes.h" +#include #ifdef __cplusplus extern "C" { diff --git a/include/sqlext.h b/include/sqlext.h index 906997b68ee..2eaa1e107d0 100644 --- a/include/sqlext.h +++ b/include/sqlext.h @@ -21,7 +21,7 @@ #ifndef __SQLEXT_H #define __SQLEXT_H -#include "sql.h" +#include #ifdef __cplusplus extern "C" { diff --git a/include/stackframe.h b/include/stackframe.h index 80e3f39e8f5..94428b5f9d5 100644 --- a/include/stackframe.h +++ b/include/stackframe.h @@ -23,11 +23,11 @@ #include -#include "thread.h" -#include "winnt.h" -#include "wine/winbase16.h" +#include +#include +#include -#include "pshpack1.h" +#include /* 32-bit stack layout after CallTo16() */ typedef struct _STACK32FRAME @@ -66,7 +66,7 @@ typedef struct _STACK16FRAME WORD cs; /* 2e */ } STACK16FRAME; -#include "poppack.h" +#include #define CURRENT_STACK16 ((STACK16FRAME*)MapSL(NtCurrentTeb()->cur_stack)) #define CURRENT_DS (CURRENT_STACK16->ds) diff --git a/include/storage.h b/include/storage.h index ade3fd124f9..175fc076d11 100644 --- a/include/storage.h +++ b/include/storage.h @@ -21,6 +21,6 @@ /* "storage.h" is obsolete, you should include "objbase.h" instead */ -#include "objbase.h" +#include #endif diff --git a/include/strmif.h b/include/strmif.h index 4e4a44114a6..8cb686b55eb 100644 --- a/include/strmif.h +++ b/include/strmif.h @@ -1,15 +1,15 @@ /*** Autogenerated by WIDL 0.1 from strmif.idl - Do not edit ***/ -#include "rpc.h" -#include "rpcndr.h" +#include +#include #ifndef __WIDL_STRMIF_H #define __WIDL_STRMIF_H #ifdef __cplusplus extern "C" { #endif -#include "objidl.h" -#include "guiddef.h" -#include "oaidl.h" +#include +#include +#include #define CDEF_CLASS_DEFAULT 0x0001 #define CDEF_BYPASS_CLASS_MANAGER 0x0002 #define CDEF_CLASS_LEGACY 0x0004 diff --git a/include/syslevel.h b/include/syslevel.h index 03415950bfc..0e540d43dc4 100644 --- a/include/syslevel.h +++ b/include/syslevel.h @@ -21,8 +21,8 @@ #ifndef __WINE_SYSLEVEL_H #define __WINE_SYSLEVEL_H -#include "windef.h" -#include "winbase.h" +#include +#include extern WORD SYSLEVEL_Win16CurrentTeb; extern WORD SYSLEVEL_EmergencyTeb; diff --git a/include/tapi.h b/include/tapi.h index f64a911c534..6ee134c1b29 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -21,7 +21,7 @@ #ifndef __WINE_TAPI_H #define __WINE_TAPI_H -#include "windef.h" +#include #ifdef __cplusplus extern "C" { diff --git a/include/task.h b/include/task.h index b4cdf2d8552..67b80d31f68 100644 --- a/include/task.h +++ b/include/task.h @@ -21,10 +21,10 @@ #ifndef __WINE_TASK_H #define __WINE_TASK_H -#include "windef.h" -#include "wine/windef16.h" +#include +#include -#include "pshpack1.h" +#include /* Process database (i.e. a normal DOS PSP) */ @@ -155,7 +155,7 @@ typedef struct _THHOOK HTASK16 LockTDB; /* 14 hLockedTask */ } THHOOK; -#include "poppack.h" +#include extern THHOOK *pThhook; diff --git a/include/tchar.h b/include/tchar.h index e550a413133..1e5cdb4dcb4 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -23,7 +23,7 @@ #error Wine should not include tchar.h internally #endif -#include "windef.h" +#include #ifdef __cplusplus extern "C" { diff --git a/include/thread.h b/include/thread.h index 876d121f8d9..f163977bc57 100644 --- a/include/thread.h +++ b/include/thread.h @@ -22,8 +22,8 @@ #define __WINE_THREAD_H #define WINE_NO_TEB -#include "winternl.h" -#include "wine/windef16.h" +#include +#include struct _SECURITY_ATTRIBUTES; struct tagSYSLEVEL; diff --git a/include/toolhelp.h b/include/toolhelp.h index 663d3e121c5..b241d29c4dd 100644 --- a/include/toolhelp.h +++ b/include/toolhelp.h @@ -19,15 +19,15 @@ #ifndef __WINE_TOOLHELP_H #define __WINE_TOOLHELP_H -#include "windef.h" -#include "wine/windef16.h" +#include +#include #define MAX_DATA 11 #define MAX_MODULE_NAME 9 #define MAX_PATH16 255 #define MAX_CLASSNAME 255 -#include "pshpack1.h" +#include /* Global heap */ @@ -416,6 +416,6 @@ typedef struct { WORD wFlags; } STACKTRACEENTRY; -#include "poppack.h" +#include #endif /* __WINE_TOOLHELP_H */ diff --git a/include/unknwn.h b/include/unknwn.h index 8c3081c8fa7..643d4940819 100644 --- a/include/unknwn.h +++ b/include/unknwn.h @@ -1,13 +1,13 @@ /*** Autogenerated by WIDL 0.1 from unknwn.idl - Do not edit ***/ -#include "rpc.h" -#include "rpcndr.h" +#include +#include #ifndef __WIDL_UNKNWN_H #define __WIDL_UNKNWN_H #ifdef __cplusplus extern "C" { #endif -#include "wtypes.h" +#include #if defined(ICOM_MSVTABLE_COMPAT) && (!defined(__cplusplus) || defined(CINTERFACE)) # define ICOM_MSVTABLE_COMPAT_FIELDS long dummyRTTI1,dummyRTTI2; # define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE 0,0, diff --git a/include/urlmon.h b/include/urlmon.h index 5ae4db30cab..8113db619b2 100644 --- a/include/urlmon.h +++ b/include/urlmon.h @@ -16,18 +16,18 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "rpc.h" -#include "rpcndr.h" +#include +#include #ifndef COM_NO_WINDOWS_H -#include "windows.h" -#include "ole2.h" +#include +#include #endif #ifndef __WINE_URLMON_H #define __WINE_URLMON_H -#include "winbase.h" -#include "objbase.h" +#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/user.h b/include/user.h index 0c26c0be56e..927c7dcb2ca 100644 --- a/include/user.h +++ b/include/user.h @@ -21,11 +21,11 @@ #ifndef __WINE_USER_H #define __WINE_USER_H -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include -#include "local.h" +#include extern WORD USER_HeapSel; diff --git a/include/ver.h b/include/ver.h index b22460888df..277f95deebf 100644 --- a/include/ver.h +++ b/include/ver.h @@ -22,6 +22,6 @@ #ifndef __WINE_VER_H #define __WINE_VER_H -#include "winver.h" +#include #endif /* __WINE_VER_H */ diff --git a/include/vfw.h b/include/vfw.h index 90ee7e4d03e..9b514719430 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -19,9 +19,9 @@ #ifndef __WINE_VFW_H #define __WINE_VFW_H -#include "windef.h" -#include "mmsystem.h" -#include "wingdi.h" +#include +#include +#include #define VFWAPI WINAPI #define VFWAPIV WINAPIV @@ -974,7 +974,7 @@ typedef struct { #define FIND_SIZE 0x00003000L /* return physical size */ #define FIND_INDEX 0x00004000L /* return physical index position */ -#include "ole2.h" +#include #define DEFINE_AVIGUID(name, l, w1, w2) \ DEFINE_GUID(name, l, w1, w2, 0xC0,0,0,0,0,0,0,0x46) diff --git a/include/win.h b/include/win.h index 07340d59b8e..e078ff61dee 100644 --- a/include/win.h +++ b/include/win.h @@ -21,13 +21,13 @@ #ifndef __WINE_WIN_H #define __WINE_WIN_H -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "wine/windef16.h" +#include +#include +#include +#include +#include -#include "user.h" +#include #define WND_MAGIC 0x444e4957 /* 'WIND' */ diff --git a/include/winbase.h b/include/winbase.h index f0dacd3032d..268e1a3fded 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -23,9 +23,9 @@ #include #endif -#include "basetsd.h" -#include "windef.h" -#include "winerror.h" +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wincrypt.h b/include/wincrypt.h index b64b7ef0c88..32b124430b3 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -19,7 +19,7 @@ #ifndef __WINE_WINCRYPT_H #define __WINE_WINCRYPT_H -#include "windef.h" +#include /* some typedefs for function parameters */ typedef unsigned int ALG_ID; diff --git a/include/windef.h b/include/windef.h index 422c5d8ac17..974761f2c56 100644 --- a/include/windef.h +++ b/include/windef.h @@ -179,7 +179,7 @@ typedef float FLOAT, *PFLOAT; typedef double DOUBLE; typedef double DATE; -#include "winnt.h" +#include /* Macros to map Winelib names to the correct implementation name */ /* Note that Winelib is purely Win32. */ diff --git a/include/windows.h b/include/windows.h index b1a87589043..db9a09f5816 100644 --- a/include/windows.h +++ b/include/windows.h @@ -29,73 +29,73 @@ #endif #if defined(RC_INVOKED) && !defined(NOWINRES) -#include "winresrc.h" +#include #else /* RC_INVOKED && !NOWINRES */ /* All the basic includes */ -#include "excpt.h" -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "wincon.h" -#include "winver.h" -#include "winreg.h" -#include "winnetwk.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* Not so essential ones */ #ifndef WIN32_LEAN_AND_MEAN -#include "cderr.h" -#include "dde.h" -#include "ddeml.h" -#include "dlgs.h" -#include "lzexpand.h" -#include "mmsystem.h" -#include "nb30.h" -#include "rpc.h" -#include "shellapi.h" -/* #include "winperf.h" */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +/* #include */ #ifndef WINE_NOWINSOCK -#include "winsock2.h" +#include #endif /* WINE_NOWINSOCK */ #ifndef NOCRYPT -#include "wincrypt.h" -/* #include "winefs.h" */ -/* #include "winscard.h" */ +#include +/* #include */ +/* #include */ #endif /* !NOCRYPT */ #ifndef NOGDI -#include "winspool.h" +#include #ifdef INC_OLE1 -/* #include "ole.h" */ +/* #include */ #else -#include "ole2.h" +#include #endif -#include "commdlg.h" +#include #endif /* !NOGDI */ #endif /* !WIN32_LEAN_AND_MEAN */ -/* #include "stralign.h" */ +/* #include */ #ifdef INC_OLE2 -#include "ole2.h" +#include #endif /* INC_OLE2 */ #ifndef NOSERVICE -#include "winsvc.h" +#include #endif /* !NOSERVICE */ #ifndef NOMCX -#include "mcx.h" +#include #endif /* !NOMCX */ #ifndef NOIMM -#include "imm.h" +#include #endif /* !NOIMM */ #endif /* RC_INVOKED && !NOWINRES */ diff --git a/include/wine/debug.h b/include/wine/debug.h index 2c116ad031f..c96fc7bcf01 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -22,9 +22,9 @@ #define __WINE_WINE_DEBUG_H #include -#include "windef.h" +#include #ifndef GUID_DEFINED -#include "guiddef.h" +#include #endif #ifdef __cplusplus diff --git a/include/wine/exception.h b/include/wine/exception.h index c5b58ec085d..2b383a146af 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -22,7 +22,7 @@ #define __WINE_WINE_EXCEPTION_H #include -#include "windef.h" +#include /* The following definitions allow using exceptions in Wine and Winelib code * diff --git a/include/wine/library.h b/include/wine/library.h index 676c75b2140..2cd1aca58cf 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -22,7 +22,7 @@ #define __WINE_WINE_LIBRARY_H #include -#include "winbase.h" +#include /* configuration */ diff --git a/include/wine/mmsystem16.h b/include/wine/mmsystem16.h index 0a79ea9d15a..69ac462faad 100644 --- a/include/wine/mmsystem16.h +++ b/include/wine/mmsystem16.h @@ -21,11 +21,11 @@ #ifndef __WINE_WINE_MMSYSTEM16_H #define __WINE_WINE_MMSYSTEM16_H -#include "windef.h" -#include "wine/windef16.h" -#include "mmddk.h" +#include +#include +#include -#include "pshpack1.h" +#include typedef UINT16 MMVERSION16; typedef UINT16 MCIDEVICEID16; @@ -803,6 +803,6 @@ typedef struct { LPSTR lpstrText; } MCI_DGV_WINDOW_PARMS16, *LPMCI_DGV_WINDOW_PARMS16; -#include "poppack.h" +#include #endif /* __WINE_WINE_MMSYSTEM16_H */ diff --git a/include/wine/obj_serviceprovider.h b/include/wine/obj_serviceprovider.h index d518aed47bc..35583da4097 100644 --- a/include/wine/obj_serviceprovider.h +++ b/include/wine/obj_serviceprovider.h @@ -23,8 +23,8 @@ #ifndef __WINE_WINE_OBJ_SERVICEPROVIDER_H #define __WINE_WINE_OBJ_SERVICEPROVIDER_H -#include "objbase.h" -#include "winbase.h" +#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wine/rpcss_shared.h b/include/wine/rpcss_shared.h index 2bbb0e8b27b..5d1760b34c5 100644 --- a/include/wine/rpcss_shared.h +++ b/include/wine/rpcss_shared.h @@ -21,10 +21,10 @@ #ifndef __WINE_RPCSS_SHARED_H #define __WINE_RPCSS_SHARED_H -#include "basetsd.h" -#include "windef.h" +#include +#include -#include "rpcdcep.h" +#include #define RPCSS_NP_PROTOCOL_VERSION 0x0000 diff --git a/include/wine/server.h b/include/wine/server.h index 5b47c14151b..2e0d808757f 100644 --- a/include/wine/server.h +++ b/include/wine/server.h @@ -21,9 +21,9 @@ #ifndef __WINE_WINE_SERVER_H #define __WINE_WINE_SERVER_H -#include "winternl.h" -#include "wine/exception.h" -#include "wine/server_protocol.h" +#include +#include +#include /* client communication functions */ diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 7882662d7a0..049718a5751 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -10,7 +10,7 @@ #include #include -#include "winbase.h" +#include struct request_header { diff --git a/include/wine/test.h b/include/wine/test.h index b982e2d8bf3..09dde12649f 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -22,7 +22,7 @@ #define __WINE_TEST_H #include -#include "windef.h" +#include /* debug level */ extern int winetest_debug; diff --git a/include/wine/unicode.h b/include/wine/unicode.h index ac4252b7c08..98ad0fb919d 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -23,9 +23,9 @@ #include -#include "windef.h" -#include "winbase.h" -#include "winnls.h" +#include +#include +#include /* code page info common to SBCS and DBCS */ struct cp_info diff --git a/include/wine/winaspi.h b/include/wine/winaspi.h index 71e07541207..e0d9f8aa874 100644 --- a/include/wine/winaspi.h +++ b/include/wine/winaspi.h @@ -23,7 +23,7 @@ #define __WINASPI_H__ /* Include base aspi defs */ -#include "wnaspi32.h" +#include #ifdef __cplusplus extern "C" { @@ -33,7 +33,7 @@ extern "C" { #define ASPI_DOS 1 #define ASPI_WIN16 2 -#include "pshpack1.h" +#include /* SRB HA_INQUIRY */ @@ -131,7 +131,7 @@ typedef union tagSRB16 { SRB_GDEVBlock16 devtype; } SRB16, *LPSRB16; -#include "poppack.h" +#include extern WORD WINAPI SendASPICommand16(SEGPTR); extern WORD WINAPI GetASPISupportInfo16(void); diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index 059cfa8857a..787c62ae608 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -19,13 +19,13 @@ #ifndef __WINE_WINE_WINBASE16_H #define __WINE_WINE_WINBASE16_H -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "wine/windef16.h" -#include "wine/library.h" +#include +#include +#include +#include +#include -#include "pshpack1.h" +#include typedef struct _SEGINFO { UINT16 offSegment; UINT16 cbSegment; @@ -76,7 +76,7 @@ typedef struct DWORD dwAllocCount WINE_PACKED; } WINDEBUGINFO16, *LPWINDEBUGINFO16; -#include "poppack.h" +#include #define INVALID_HANDLE_VALUE16 ((HANDLE16) -1) #define INFINITE16 0xFFFF diff --git a/include/wine/windef16.h b/include/wine/windef16.h index 4c7cf5c6e79..126aa51ba76 100644 --- a/include/wine/windef16.h +++ b/include/wine/windef16.h @@ -23,7 +23,7 @@ #ifndef __WINE_WINDEF16_H #define __WINE_WINDEF16_H -#include "windef.h" +#include /* Standard data types */ @@ -107,7 +107,7 @@ typedef HANDLE16 HGDIOBJ16; typedef HANDLE16 HGLOBAL16; typedef HANDLE16 HLOCAL16; -#include "pshpack1.h" +#include /* The SIZE structure */ @@ -135,7 +135,7 @@ typedef struct INT16 bottom; } RECT16, *LPRECT16; -#include "poppack.h" +#include /* Callback function pointers types */ diff --git a/include/wine/wingdi16.h b/include/wine/wingdi16.h index 237cb6a2c6a..af61dd9f146 100644 --- a/include/wine/wingdi16.h +++ b/include/wine/wingdi16.h @@ -19,11 +19,11 @@ #ifndef __WINE_WINE_WINGDI16_H #define __WINE_WINE_WINGDI16_H -#include "windef.h" -#include "wingdi.h" -#include "wine/winbase16.h" +#include +#include +#include -#include "pshpack1.h" +#include typedef HANDLE16 HPQ16; typedef HANDLE16 HPJOB16; @@ -375,7 +375,7 @@ struct PATH_INFO { #define RENDERMODE_OPEN 1 #define RENDERMODE_CLOSED 2 -#include "poppack.h" +#include INT16 WINAPI AbortDoc16(HDC16); diff --git a/include/wine/winnet16.h b/include/wine/winnet16.h index 63d08cebb91..a096e4f227d 100644 --- a/include/wine/winnet16.h +++ b/include/wine/winnet16.h @@ -22,10 +22,10 @@ #ifndef __WINE_WINNET16_H #define __WINE_WINNET16_H -#include "windef.h" -#include "wine/windef16.h" +#include +#include -#include "pshpack1.h" +#include /* * Remote printing @@ -61,7 +61,7 @@ typedef struct } JOBSTRUCT16, *LPJOBSTRUCT16; -#include "poppack.h" +#include #define WNPRJ_QSTATUS 0x0007 #define WNPRJ_DEVSTATUS 0x0FF8 diff --git a/include/wine/winsock16.h b/include/wine/winsock16.h index 216a819df88..a841740bd3d 100644 --- a/include/wine/winsock16.h +++ b/include/wine/winsock16.h @@ -19,8 +19,8 @@ #ifndef __WINE_WINE_WINSOCK16_H #define __WINE_WINE_WINSOCK16_H -#include "windef.h" -#include "pshpack1.h" +#include +#include typedef UINT16 SOCKET16; @@ -75,7 +75,7 @@ typedef struct WSAData16 SEGPTR lpVendorInfo; } WSADATA16, *LPWSADATA16; -#include "poppack.h" +#include #define WS_FD_CLR16(fd, set) __WS_FD_CLR((fd),(set), ws_fd_set16) #define WS_FD_SET16(fd, set) __WS_FD_SET1((fd),(set), ws_fd_set16) diff --git a/include/wine/winuser16.h b/include/wine/winuser16.h index f0499f846bd..02f337a6dbf 100644 --- a/include/wine/winuser16.h +++ b/include/wine/winuser16.h @@ -19,10 +19,10 @@ #ifndef __WINE_WINE_WINUSER16_H #define __WINE_WINE_WINUSER16_H -#include "wine/wingdi16.h" /* wingdi.h needed for COLORREF */ -#include "winuser.h" /* winuser.h needed for MSGBOXCALLBACK */ +#include /* wingdi.h needed for COLORREF */ +#include /* winuser.h needed for MSGBOXCALLBACK */ -#include "pshpack1.h" +#include typedef struct tagCOMSTAT16 { @@ -559,7 +559,7 @@ typedef struct DWORD itemData2 WINE_PACKED; } COMPAREITEMSTRUCT16, *LPCOMPAREITEMSTRUCT16; -#include "poppack.h" +#include /* WM_COMMNOTIFY flags */ #define CN_RECEIVE 0x0001 diff --git a/include/wingdi.h b/include/wingdi.h index e60203a73a6..db191edb3b3 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -1688,7 +1688,7 @@ typedef struct { BYTE rgbtRed; } RGBTRIPLE; -#include "pshpack2.h" +#include typedef struct { WORD bfType; @@ -1697,7 +1697,7 @@ typedef struct WORD bfReserved2; DWORD bfOffBits; } BITMAPFILEHEADER, *PBITMAPFILEHEADER, *LPBITMAPFILEHEADER; -#include "poppack.h" +#include #define MAKEPOINTS(l) (*((POINTS *)&(l))) @@ -1835,7 +1835,7 @@ typedef struct #define CLR_INVALID 0xffffffff /* Metafile header structure */ -#include "pshpack2.h" +#include typedef struct { WORD mtType; @@ -1846,7 +1846,7 @@ typedef struct DWORD mtMaxRecord; WORD mtNoParameters; } METAHEADER, *PMETAHEADER, *LPMETAHEADER; -#include "poppack.h" +#include /* Metafile typical record structure */ typedef struct diff --git a/include/winioctl.h b/include/winioctl.h index d73cc3054aa..bca97d46a34 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -19,7 +19,7 @@ #ifndef __WINE_WINIOCTL_H #define __WINE_WINIOCTL_H -#include "winnt.h" +#include #define CTL_CODE( DeviceType, Function, Method, Access ) ( \ (DWORD)((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method) \ @@ -337,14 +337,14 @@ typedef struct tagDIOCRegs { /* Important: All MS_DOS data structures must be packed on a one-byte boundary - good old 16 bit. */ -#include "pshpack1.h" +#include typedef struct tagMID { WORD midInfoLevel; DWORD midSerialNum; BYTE midVolLabel[11]; BYTE midFileSysType[8]; } MID, *PMID; -#include "poppack.h" +#include /* End VWIN32 information */ diff --git a/include/winnetwk.h b/include/winnetwk.h index 28ddf6ccef8..b9b406b83d3 100644 --- a/include/winnetwk.h +++ b/include/winnetwk.h @@ -20,8 +20,8 @@ #ifndef _WINNETWK_H_ #define _WINNETWK_H_ -#include "windef.h" -#include "winerror.h" +#include +#include /* * Network types diff --git a/include/winnt.h b/include/winnt.h index ac7e9f2e55e..83fe440afa7 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -21,7 +21,7 @@ #ifndef __WINE_WINNT_H #define __WINE_WINNT_H -#include "basetsd.h" +#include #ifndef RC_INVOKED #include @@ -1514,7 +1514,7 @@ static DWORD __builtin_return_address(int p_iDepth) #define IS_TEXT_UNICODE_NULL_BYTES 0x1000 #define IS_TEXT_UNICODE_NOT_ASCII_MASK 0xF000 -#include "ntstatus.h" +#include #define MAXIMUM_WAIT_OBJECTS 64 #define MAXIMUM_SUSPEND_COUNT 127 @@ -1659,7 +1659,7 @@ extern struct _TEB * WINAPI NtCurrentTeb(void); * File formats definitions */ -#include "pshpack2.h" +#include typedef struct _IMAGE_DOS_HEADER { WORD e_magic; /* 00: MZ Header signature */ WORD e_cblp; /* 02: Bytes on last page of file */ @@ -1681,7 +1681,7 @@ typedef struct _IMAGE_DOS_HEADER { WORD e_res2[10]; /* 28: Reserved words */ DWORD e_lfanew; /* 3c: Offset to extended header */ } IMAGE_DOS_HEADER, *PIMAGE_DOS_HEADER; -#include "poppack.h" +#include #define IMAGE_DOS_SIGNATURE 0x5A4D /* MZ */ #define IMAGE_OS2_SIGNATURE 0x454E /* NE */ @@ -1694,7 +1694,7 @@ typedef struct _IMAGE_DOS_HEADER { * This is the Windows executable (NE) header. * the name IMAGE_OS2_HEADER is misleading, but in the SDK this way. */ -#include "pshpack2.h" +#include typedef struct { WORD ne_magic; /* 00 NE signature 'NE' */ @@ -1728,9 +1728,9 @@ typedef struct WORD ne_swaparea; /* 3c Reserved by Microsoft */ WORD ne_expver; /* 3e Expected Windows version number */ } IMAGE_OS2_HEADER, *PIMAGE_OS2_HEADER; -#include "poppack.h" +#include -#include "pshpack2.h" +#include typedef struct _IMAGE_VXD_HEADER { WORD e32_magic; BYTE e32_border; @@ -1784,7 +1784,7 @@ typedef struct _IMAGE_VXD_HEADER { WORD e32_devid; WORD e32_ddkver; } IMAGE_VXD_HEADER, *PIMAGE_VXD_HEADER; -#include "poppack.h" +#include /* These defines describe the meanings of the bits in the Characteristics field */ @@ -2046,7 +2046,7 @@ typedef struct _IMAGE_SECTION_HEADER { #define IMAGE_SCN_MEM_READ 0x40000000 #define IMAGE_SCN_MEM_WRITE 0x80000000 -#include "pshpack2.h" +#include typedef struct _IMAGE_SYMBOL { union { @@ -2115,7 +2115,7 @@ typedef IMAGE_AUX_SYMBOL *PIMAGE_AUX_SYMBOL; #define IMAGE_SIZEOF_AUX_SYMBOL 18 -#include "poppack.h" +#include #define IMAGE_SYM_UNDEFINED (SHORT)0 #define IMAGE_SYM_ABSOLUTE (SHORT)-1 @@ -2295,7 +2295,7 @@ typedef struct _IMAGE_BASE_RELOCATION /* WORD TypeOffset[1]; */ } IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION; -#include "pshpack2.h" +#include typedef struct _IMAGE_RELOCATION { @@ -2307,7 +2307,7 @@ typedef struct _IMAGE_RELOCATION WORD Type; } IMAGE_RELOCATION, *PIMAGE_RELOCATION; -#include "poppack.h" +#include #define IMAGE_SIZEOF_RELOCATION 10 @@ -3026,12 +3026,12 @@ typedef struct _LUID { LONG HighPart; } LUID, *PLUID; -#include "pshpack4.h" +#include typedef struct _LUID_AND_ATTRIBUTES { LUID Luid; DWORD Attributes; } LUID_AND_ATTRIBUTES, *PLUID_AND_ATTRIBUTES; -#include "poppack.h" +#include /* * PRIVILEGE_SET @@ -3533,7 +3533,7 @@ typedef enum _CM_ERROR_CONTROL_TYPE #define RtlFillMemory(Destination, Length, Fill) memset((Destination),(Fill),(Length)) #define RtlZeroMemory(Destination, Length) memset((Destination),0,(Length)) -#include "guiddef.h" +#include typedef struct _RTL_CRITICAL_SECTION_DEBUG { diff --git a/include/winpos.h b/include/winpos.h index f972b55412d..299af65b3dd 100644 --- a/include/winpos.h +++ b/include/winpos.h @@ -21,10 +21,10 @@ #ifndef __WINE_WINPOS_H #define __WINE_WINPOS_H -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include +#include +#include +#include /* undocumented SWP flags - from SDK 3.1 */ #define SWP_NOCLIENTSIZE 0x0800 diff --git a/include/winreg.h b/include/winreg.h index 269e593ceb5..63ef69b69e1 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -21,8 +21,8 @@ #ifndef __WINE_WINREG_H #define __WINE_WINREG_H -#include "winbase.h" -#include "winnt.h" +#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/winres.h b/include/winres.h index 4ee7982d851..e6f9c26a14b 100644 --- a/include/winres.h +++ b/include/winres.h @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "winresrc.h" +#include #ifdef IDC_STATIC #undef IDC_STATIC diff --git a/include/winresrc.h b/include/winresrc.h index f5e06a717cb..940172dd3a0 100644 --- a/include/winresrc.h +++ b/include/winresrc.h @@ -35,11 +35,11 @@ #define _WIN32_WINNT 0x0500 #endif -#include "winuser.h" -#include "commctrl.h" -#include "dde.h" -#include "winnt.h" -#include "dlgs.h" -#include "winver.h" +#include +#include +#include +#include +#include +#include #endif /* _WINRESRC_ */ diff --git a/include/winsock.h b/include/winsock.h index ddc8473a963..77d6cd4d817 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -88,9 +88,9 @@ #endif /* __WINE_WINSOCKAPI_STDLIB_H */ #ifndef __WINESRC__ -# include "windows.h" +# include #else -# include "windef.h" +# include #endif #ifndef _WINSOCKAPI_ @@ -115,7 +115,7 @@ extern "C" { #endif /* defined(__cplusplus) */ /* proper 4-byte packing */ -#include "pshpack4.h" +#include /* * Address families @@ -993,13 +993,13 @@ SOCKET WINAPI WS(socket)(int,int,int); #if defined(__WINESRC__) || !defined(__WINE_WINSOCK2__) /* Stuff specific to winsock.h */ -#include "mswsock.h" +#include #endif /* __WINE_WINSOCK2__ */ #endif /* !defined(__WINE_WINSOCK2__) || WS_API_PROTOTYPES */ -#include "poppack.h" +#include #ifdef __cplusplus } diff --git a/include/winsock2.h b/include/winsock2.h index 4bb29d396c2..f2488d2e0a9 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -44,7 +44,7 @@ #endif #define __WINE_WINSOCK2__ -#include "winsock.h" +#include #undef __WINE_WINSOCK2__ @@ -53,7 +53,7 @@ extern "C" { #endif /* defined(__cplusplus) */ /* proper 4-byte packing */ -#include "pshpack4.h" +#include #ifndef USE_WS_PREFIX @@ -139,7 +139,7 @@ extern "C" { #ifndef GUID_DEFINED -#include "guiddef.h" +#include #endif #define MAX_PROTOCOL_CHAIN 7 @@ -526,7 +526,7 @@ typedef DWORD (WINAPI *LPFN_WSAWAITFORMULTIPLEEVENTS)(DWORD,const WSAEVENT*,BOOL #define CF_REJECT 0x0001 #define CF_DEFER 0x0002 -#include "poppack.h" +#include #ifdef __cplusplus } diff --git a/include/winsvc.h b/include/winsvc.h index 2cb3060691e..f9e7efa38f4 100644 --- a/include/winsvc.h +++ b/include/winsvc.h @@ -23,7 +23,7 @@ extern "C" { #endif /* defined(__cplusplus) */ -#include "windef.h" +#include /* Controls */ #define SERVICE_CONTROL_STOP 0x00000001 diff --git a/include/winternl.h b/include/winternl.h index 94c64fe1bb7..74551ceca08 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -21,9 +21,9 @@ #ifndef __WINE_WINTERNAL_H #define __WINE_WINTERNAL_H -#include "windef.h" -#include "winnt.h" -#include "winreg.h" +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/winuser.h b/include/winuser.h index 9d449ec21d7..df82e0aebc8 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2412,7 +2412,7 @@ DECL_WINELIB_TYPE_AW(LPMONITORINFOEX) typedef BOOL (CALLBACK *MONITORENUMPROC)(HMONITOR,HDC,LPRECT,LPARAM); -#include "pshpack2.h" +#include typedef struct tagDLGTEMPLATE { @@ -2450,7 +2450,7 @@ typedef DLGITEMTEMPLATE *LPDLGITEMTEMPLATEA; typedef DLGITEMTEMPLATE *LPDLGITEMTEMPLATEW; DECL_WINELIB_TYPE_AW(LPDLGITEMTEMPLATE) -#include "poppack.h" +#include /* CBT hook values */ #define HCBT_MOVESIZE 0 diff --git a/include/winver.h b/include/winver.h index 7b8f907dd40..47048ee9b0a 100644 --- a/include/winver.h +++ b/include/winver.h @@ -20,7 +20,7 @@ #ifndef __WINE_WINVER_H #define __WINE_WINVER_H -#include "windef.h" +#include #ifdef __cplusplus extern "C" { diff --git a/include/wnaspi32.h b/include/wnaspi32.h index 81cff58a56a..0d87fcf1437 100644 --- a/include/wnaspi32.h +++ b/include/wnaspi32.h @@ -104,7 +104,7 @@ extern "C" { #define SS_SECURITY_VIOLATION 0xE2 /* Replaces SS_INVALID_MODE */ /*** END DEFS */ -#include "pshpack1.h" +#include /* SRB - HOST ADAPTER INQUIRY - SC_HA_INQUIRY */ typedef struct tagSRB32_HaInquiry { @@ -226,7 +226,7 @@ typedef struct tagASPI32BUFF { DWORD AB_Reserved; /* 0 */ } ASPI32BUFF, *PASPI32BUFF; -#include "poppack.h" +#include /* Prototypes */ extern DWORD __cdecl SendASPI32Command (PSRB); diff --git a/include/ws2spi.h b/include/ws2spi.h index 50aa723cfee..b0a3b909791 100644 --- a/include/ws2spi.h +++ b/include/ws2spi.h @@ -22,10 +22,10 @@ #define _WINSOCK2SPI_ #ifndef _WINSOCK2API_ -#include "winsock2.h" +#include #endif /* !defined(_WINSOCK2API_) */ -#include "pshpack4.h" +#include #ifdef __cplusplus extern "C" { @@ -37,6 +37,6 @@ typedef BOOL (WINAPI *LPWPUPOSTMESSAGE)(HWND,UINT,WPARAM,LPARAM); } /* extern "C" */ #endif /* defined(__cplusplus) */ -#include "poppack.h" +#include #endif /* !defined(_WINSOCK2SPI_) */ diff --git a/include/wtypes.h b/include/wtypes.h index e61194fa5a9..3d79234967a 100644 --- a/include/wtypes.h +++ b/include/wtypes.h @@ -1,14 +1,14 @@ /*** Autogenerated by WIDL 0.1 from wtypes.idl - Do not edit ***/ -#include "rpc.h" -#include "rpcndr.h" +#include +#include #ifndef __WIDL_WTYPES_H #define __WIDL_WTYPES_H #ifdef __cplusplus extern "C" { #endif -#include "basetsd.h" -#include "guiddef.h" +#include +#include #if 0 /* winnt.h */ typedef unsigned char BYTE;