More include optimisations and fixes.

controls/menu.c

@@ -17,7 +17,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "bitmap.h"
 #include "win.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
@@ -25,8 +24,6 @@
 #include "task.h"
 #include "heap.h"
 #include "menu.h"
-#include "module.h"
-#include "neexe.h"
 #include "nonclient.h"
 #include "user.h"
 #include "message.h"

dlls/shell32/dataobject.c

@@ -7,15 +7,11 @@
  */
 #include <string.h>
 
-#include "debug.h"
-#include "wintypes.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_moniker.h"
 #include "wine/obj_dataobject.h"
 #include "pidl.h"
 #include "winerror.h"
 #include "shell32_main.h"
+#include "debug.h"
 
 UINT cfShellIDList=0;
 UINT cfFileGroupDesc=0;

dlls/shell32/shlfolder.c

@@ -12,13 +12,11 @@
 #include "debug.h"
 #include "winerror.h"
 
-#include "objbase.h"
 #include "wine/obj_base.h"
 #include "wine/obj_dragdrop.h"
 #include "shlguid.h"
 
 #include "pidl.h"
-#include "objbase.h"
 #include "shlobj.h"
 #include "shell32_main.h"
 

include/oleobj.h

@@ -1,8 +1,6 @@
 #ifndef _WINE_OLEOBJ_H
 #define _WINE_OLEOBJ_H
 
-#include "ole.h"
-#include "ole2.h"
 #include "wine/obj_base.h"
 #include "wine/obj_storage.h"
 #include "wine/obj_moniker.h"

include/shlobj.h

@@ -2,8 +2,10 @@
 #define __WINE_SHLOBJ_H
 
 #include "wintypes.h"
+#include "winbase.h"	/* WIN32_FIND_* */
 #include "wine/obj_base.h"
 #include "wine/obj_shelllink.h"
+#include "ole2.h"
 #include "shell.h"
 #include "oleobj.h"
 #include "commctrl.h"

include/wine/obj_channel.h

@@ -1,12 +1,11 @@
 /*
  * Defines undocumented Microsoft COM interfaces and APIs seemingly related to some 'channel' notion.
- *
- * Depends on 'obj_base.h'.
  */
 
 #ifndef __WINE_WINE_OBJ_CHANNEL_H
 #define __WINE_WINE_OBJ_CHANNEL_H
 
+#include "wine/obj_base.h"
 
 /*****************************************************************************
  * Predeclare the interfaces

include/wine/obj_clientserver.h

@@ -1,12 +1,11 @@
 /*
  * Defines the COM interfaces and APIs related to client/server aspects.
- *
- * Depends on 'obj_base.h'.
  */
 
 #ifndef __WINE_WINE_OBJ_CLIENTSERVER_H
 #define __WINE_WINE_OBJ_CLIENTSERVER_H
 
+#include "wine/obj_base.h"
 
 /*****************************************************************************
  * Predeclare the interfaces

include/wine/obj_control.h

@@ -9,6 +9,9 @@
 
 
 #include "winbase.h"
+#include "winuser.h"
+#include "wine/obj_inplace.h"
+#include "wine/obj_dragdrop.h"
 
 
 /*****************************************************************************

include/wine/obj_dataobject.h

@@ -7,6 +7,9 @@
 #ifndef __WINE_WINE_OBJ_DATAOBJECT_H
 #define __WINE_WINE_OBJ_DATAOBJECT_H
 
+#include "wine/obj_base.h"
+#include "wine/obj_storage.h"
+#include "wine/obj_moniker.h"
 
 /*****************************************************************************
  * Predeclare the structures

include/wine/obj_dragdrop.h

@@ -1,7 +1,5 @@
 /*
  * Defines the COM interfaces and APIs related to OLE Drag and Drop.
- *
- * Depends on 'obj_base.h'.
  */
 
 #ifndef __WINE_WINE_OBJ_DRAGDROP_H
@@ -9,6 +7,8 @@
 
 #include "winnt.h"
 #include "windef.h"
+#include "wine/obj_base.h"
+#include "wine/obj_dataobject.h"
 
 /*****************************************************************************
  * Predeclare the interfaces

include/wine/obj_inplace.h

@@ -10,6 +10,7 @@
 
 #include "winbase.h"
 #include "winuser.h"
+#include "wine/obj_moniker.h"
 
 /*****************************************************************************
  * Predeclare the structures

include/wine/obj_marshal.h

@@ -1,13 +1,13 @@
 /*
  * Defines the COM interfaces and APIs that allow an interface to 
  * specify a custom marshaling for its objects.
- *
- * Depends on 'obj_storage.h' and 'obj_base.h'.
  */
 
 #ifndef __WINE_WINE_OBJ_MARSHAL_H
 #define __WINE_WINE_OBJ_MARSHAL_H
 
+#include "wine/obj_base.h"
+#include "wine/obj_storage.h"
 
 /*****************************************************************************
  * Predeclare the interfaces

include/wine/obj_misc.h

@@ -3,13 +3,12 @@
  * These did not really fit into the other categories, whould have 
  * required their own specific category or are too rarely used to be 
  * put in 'obj_base.h'.
- *
- * Depends on 'obj_base.h'.
  */
 
 #ifndef __WINE_WINE_OBJ_MISC_H
 #define __WINE_WINE_OBJ_MISC_H
 
+#include "wine/obj_base.h"
 
 /*****************************************************************************
  * Predeclare the interfaces

include/wine/obj_moniker.h

@@ -1,15 +1,13 @@
 /*
  * Defines the COM interfaces and APIs related to the moniker functionality.
- *
- * This file depends on 'obj_storage.h' and 'obj_base.h' and 'obj_misc.h' (IEnumString).
  */
-
-
-
 #ifndef __WINE_WINE_OBJ_MONIKER_H
 #define __WINE_WINE_OBJ_MONIKER_H
 
+#include "wine/obj_base.h"
+#include "wine/obj_storage.h"
 #include "wine/obj_misc.h"
+
 /*****************************************************************************
  * Predeclare the interfaces
  */

include/wine/obj_oleaut.h

@@ -1,14 +1,11 @@
 /*
  * Defines the COM interfaces and APIs related to OLE automation support.
- *
- * Depends on 'obj_base.h'.
  */
 
 #ifndef __WINE_WINE_OBJ_OLEAUT_H
 #define __WINE_WINE_OBJ_OLEAUT_H
 
-#include "windows.h"
-#include "wintypes.h"
+#include "wine/obj_base.h"
 
 /*****************************************************************************
  * Predeclare the interfaces

include/wine/obj_olefont.h

@@ -7,8 +7,8 @@
 #ifndef __WINE_WINE_OBJ_OLEFONT_H
 #define __WINE_WINE_OBJ_OLEFONT_H
 
-#include "windows.h"
-#include "wintypes.h"
+#include "wine/obj_base.h"
+#include "wingdi.h"	/* TEXTMETRIC*/
 
 /*****************************************************************************
  * Predeclare the interfaces

include/wine/obj_propertystorage.h

@@ -1,12 +1,12 @@
 /*
  * Defines the COM interfaces and APIs related to saving properties to file.
- *
- * Depends on 'obj_storage.h' and 'obj_base.h'.
  */
 
 #ifndef __WINE_WINE_OBJ_PROPERTYSTORAGE_H
 #define __WINE_WINE_OBJ_PROPERTYSTORAGE_H
 
+#include "wine/obj_base.h"
+#include "wine/obj_storage.h"
 
 /*****************************************************************************
  * Predeclare the interfaces

include/wine/obj_storage.h

@@ -1,15 +1,13 @@
 /*
  * Defines the COM interfaces and APIs related to structured data storage.
- *
- * Depends on 'obj_base.h'.
  */
 
 #ifndef __WINE_WINE_OBJ_STORAGE_H
 #define __WINE_WINE_OBJ_STORAGE_H
 
 
-#include "winbase.h"
-
+#include "winnt.h"
+#include "wine/obj_base.h"
 
 /*****************************************************************************
  * Predeclare the structures

include/wine/winuser16.h

@@ -1,6 +1,7 @@
 #ifndef __WINE_WINUSER16_H
 #define __WINE_WINUSER16_H
 
+#include "wintypes.h"
 #include "winbase.h"
 #include "winuser.h"
 

library/winestub.c

@@ -1,7 +1,7 @@
 /* Sample winestub.c file for compiling programs with libwine.so. */
 
 #include <string.h>
-#include "windows.h"
+#include "winuser.h"
 #include "xmalloc.h"
 
 extern int PASCAL WinMain(HINSTANCE,HINSTANCE,LPSTR,int);

memory/string.c

@@ -7,8 +7,9 @@
 
 #include <ctype.h>
 #include <string.h>
-#include "winbase.h"
-#include "winuser.h"
+#include "wine/winbase16.h"
+#include "wine/winuser16.h"
+#include "wine/keyboard16.h"
 #include "winerror.h"
 #include "ldt.h"
 #include "debug.h"

misc/sound.c

@@ -4,6 +4,7 @@
 
 #include <stdlib.h>
 #include "wintypes.h"
+#include "wine/winesound.h"
 #include "debug.h"
 
 INT16 WINAPI OpenSound16(void)

multimedia/mmsystem.c

@@ -24,12 +24,10 @@
 #include "winbase.h"
 #include "windef.h"
 #include "wine/winbase16.h"
-#include "wine/winuser16.h"
 #include "heap.h"
 #include "ldt.h"
 #include "user.h"
 #include "driver.h"
-#include "mmsystem.h"
 #include "multimedia.h"
 #include "callback.h"
 #include "module.h"

ole/bindctx.c

@@ -9,8 +9,6 @@
 #include <string.h>
 #include <assert.h>
 #include "winerror.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
 #include "wine/obj_moniker.h"
 #include "debug.h"
 #include "heap.h"

ole/filemoniker.c

@@ -8,10 +8,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include "winerror.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
 #include "wine/obj_moniker.h"
+#include "winerror.h"
 #include "debug.h"
 #include "heap.h"
 

ole/ifs.c

@@ -13,7 +13,6 @@
 #include "heap.h"
 #include "wine/winbase16.h"
 #include "wine/obj_base.h"
-#include "objbase.h"
 #include "local.h"
 #include "module.h"
 #include "debug.h"

ole/itemmoniker.c

@@ -9,8 +9,6 @@
 #include <string.h>
 #include <assert.h>
 #include "winerror.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
 #include "wine/obj_moniker.h"
 #include "debug.h"
 #include "heap.h"

ole/moniker.c

@@ -10,8 +10,6 @@
 #include <string.h>
 #include <assert.h>
 #include "winerror.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
 #include "wine/obj_moniker.h"
 #include "debug.h"
 

ole/ole2.c

@@ -7,17 +7,12 @@
 
 #include <assert.h>
 
-#include "windows.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "ole2.h"
 #include "process.h"
-#include "debug.h"
-#include "objbase.h"
-#include "objidl.h"
-#include "wine/obj_base.h"
 #include "wine/obj_clientserver.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_moniker.h"
+#include "debug.h"
 
 /******************************************************************************
  * These are static/global variables and internal data structures that the 

ole/ole2disp.c

@@ -5,14 +5,10 @@
  */
 
 #include <string.h>
-#include "windows.h"
 #include "winerror.h"
 #include "ole.h"
-#include "ole2.h"
 #include "oleauto.h"
-#include "wtypes.h"
 #include "wine/obj_base.h"
-#include "objbase.h"
 #include "heap.h"
 #include "ldt.h"
 #include "debug.h"

ole/ole2nls.c

@@ -10,7 +10,6 @@
 #include <stdlib.h>
 #include "winuser.h"
 #include "heap.h"
-#include "ole.h"
 #include "options.h"
 #include "winnls.h"
 #include "winreg.h"

ole/olecli.c

@@ -7,13 +7,11 @@
 /*	At the moment, these are only empty stubs.
  */
 
-#include "windows.h"
 #include "winerror.h"
 #include "ole.h"
 #include "gdi.h"
+#include "wine/obj_dataobject.h"
 #include "debug.h"
-#include "ole2.h"
-#include "objidl.h"
 
 
 extern LONG	OLE_current_handle;

ole/oledlg.c

@@ -4,8 +4,8 @@
  *	Copyright 1998	Patrik Stridvall
  */
 
-#include "windows.h"
 #include "wintypes.h"
+#include "winbase.h"
 #include "winerror.h"
 #include "ole.h"
 #include "oledlg.h"

ole/olefont.c

@@ -8,7 +8,6 @@
  */
 #include <assert.h>
 #include <string.h>
-#include "windows.h"
 #include "winerror.h"
 #include "oleauto.h"
 #include "ocidl.h"

ole/oleobj.c

@@ -6,14 +6,13 @@
 
 
 #include <string.h>
-#include "ole.h"
-#include "ole2.h"
+#include "oleobj.h"
+#include "winbase.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
 #include "wine/obj_storage.h"
 #include "wine/obj_moniker.h"
 #include "wine/obj_dataobject.h"
-#include "oleobj.h"
 #include "debug.h"
 
 

ole/olesvr.c

@@ -7,7 +7,6 @@
 /*	At the moment, these are only empty stubs.
  */
 
-#include "windows.h"
 #include "ole.h"
 #include "debug.h"
 

ole/safearray.c

@@ -7,15 +7,14 @@
  * Copyright 1999 Sylvain St-Germain
  */
 
-#include <wintypes.h>
-#include <winerror.h>
-#include <winbase.h>
-#include <oleauto.h>
-#include <ole.h>
-#include <strings.h>
 #include <stdio.h>
-#include <debug.h>
+#include <strings.h>
+#include "wintypes.h"
+#include "winerror.h"
+#include "winbase.h"
+#include "oleauto.h"
 #include "wine/obj_base.h"
+#include "debug.h"
 
 /* Localy used methods */
 static INT  

ole/stg_bigblockfile.c

@@ -23,11 +23,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "windows.h"
+#include "winbase.h"
 #include "winerror.h"
-#include "ole.h"
-#include "ole2.h"
-#include "wine/obj_base.h"
 #include "wine/obj_storage.h"
 
 #include "storage32.h"

ole/stg_stream.c

@@ -13,11 +13,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "windows.h"
+#include "winbase.h"
 #include "winerror.h"
-#include "ole.h"
-#include "ole2.h"
-#include "wine/obj_base.h"
 #include "wine/obj_storage.h"
 
 #include "storage32.h"

ole/storage.c

@@ -18,7 +18,6 @@
 #include "ole.h"
 #include "wine/obj_base.h"
 #include "wine/obj_storage.h"
-#include "objbase.h"
 #include "heap.h"
 #include "module.h"
 #include "ldt.h"

ole/storage32.c

@@ -15,18 +15,12 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "windows.h"
+#include "winbase.h"
 #include "winerror.h"
-#include "file.h"
-#include "ole.h"
-#include "ole2.h"
-#include "objbase.h"
+#include "wine/obj_storage.h"
+#include "wine/winestring.h"
 #include "crtdll.h"
 #include "tchar.h"
-#include "heap.h"
-
-#include "winnt.h"
-#include "winbase.h"
 #include "debug.h"
 
 #include "storage32.h"

ole/typelib.c

@@ -8,13 +8,12 @@
 #include <string.h>
 #include <assert.h>
 #include "wintypes.h"
+#include "winerror.h"
+#include "winreg.h"
+#include "oleauto.h"
 #include "wine/winbase16.h"
 #include "heap.h"
-#include "winreg.h"
-#include "winerror.h"
-#include "oleauto.h"
 #include "wine/obj_base.h"
-#include "objbase.h"
 #include "debug.h"
 #include "winversion.h"
 

ole/variant.c

@@ -25,7 +25,6 @@
 #include "heap.h"
 #include "debug.h"
 #include "winerror.h"
-#include "mapidefs.h"
 #include "parsedt.h"
 
 #include <string.h>

tools/fnt2bdf.c

@@ -15,7 +15,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "windows.h"
+#include "winuser.h"
 #include "fnt2bdf.h"
 #include "neexe.h"
 #include "module.h"

windows/display.c

@@ -7,8 +7,8 @@
 
 #include "config.h"
 
-#include "debug.h"
 #include "display.h"
+#include "debug.h"
 #include "wintypes.h"
 
 #ifndef X_DISPLAY_MISSING