- Fix headers to include less or smaller header files.

- Fix header and source files to include missing header files to avoid
  warnings and errors.

controls/menu.c

@@ -20,6 +20,7 @@
 #include "bitmap.h"
 #include "win.h"
 #include "wine/winbase16.h"
+#include "wine/winuser16.h"
 #include "sysmetrics.h"
 #include "task.h"
 #include "heap.h"

include/cursoricon.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_CURSORICON_H
 #define __WINE_CURSORICON_H
 
-#include "wingdi.h"
+#include "wintypes.h"
 
 #pragma pack(1)
 

include/dde_atom.h

@@ -12,7 +12,7 @@
 
 #ifdef CONFIG_IPC
 
-#include "windows.h"
+#include "wintypes.h"
 
 #define DDE_ATOMS 157		   /* a prime number for hashing */
 

include/ddraw.h

@@ -6,7 +6,7 @@
 #include <X11/extensions/XShm.h>
 #endif /* defined(HAVE_LIBXXSHM) */
 
-#include "winbase.h" /* LARGE_INTEGER ... */
+#include "winnt.h" /* LARGE_INTEGER ... */
 #include "wingdi.h" /* PALETTE stuff ... */
 #include "wine/obj_base.h"
 

include/dispdib.h

@@ -8,7 +8,7 @@
 #ifndef __WINE_DISPDIB_H
 #define __WINE_DISPDIB_H
 
-#include "wingdi.h"
+#include "wingdi.h" /* for LPBITMAPINFO */
 
 /* error codes */
 #define DISPLAYDIB_NOERROR        0x0000

include/dosexe.h

@@ -8,7 +8,7 @@
 #define __WINE_DOSEXE_H
 
 #include <sys/types.h> /* pid_t */
-#include "winbase.h"
+#include "winbase.h"   /* for LPSTARTUPINFO32A */
 #include "sig_context.h"
 
 typedef struct _DOSTASK {

include/dsound.h

@@ -1,7 +1,7 @@
 #ifndef __WINE_DSOUND_H
 #define __WINE_DSOUND_H
 
-#include "wintypes.h"
+#include "winbase.h"     /* for CRITICAL_SECTION */
 #include "mmsystem.h"
 #include "d3d.h"			/*FIXME: Need to break out d3dtypes.h */
 

include/mmsystem.h

@@ -8,6 +8,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif 
+#include "wintypes.h"
 
 typedef LPSTR		    HPSTR;          /* a huge version of LPSTR */
 typedef LPCSTR			HPCSTR;         /* a huge version of LPCSTR */

include/path.h

@@ -7,6 +7,8 @@
 #ifndef __WINE_PATH_H
 #define __WINE_PATH_H
 
+#include "wintypes.h"
+
 /* It should not be necessary to access the contents of the GdiPath
  * structure directly; if you find that the exported functions don't
  * allow you to do what you want, then please place a new exported

include/progress.h

@@ -7,6 +7,8 @@
 #ifndef __WINE_PROGRESS_H
 #define __WINE_PROGRESS_H
 
+#include "wintypes.h"
+
 typedef struct
 {
   INT32       CurVal;       /* Current progress value */

include/queue.h

@@ -8,7 +8,7 @@
 #define __WINE_QUEUE_H
 
 #include "wintypes.h"
-#include "wine/winuser16.h"
+#include "winuser.h"
 #include "thread.h"
 
 

include/resource.h

@@ -7,6 +7,8 @@
 #ifndef __WINE_RESOURCE_H
 #define __WINE_RESOURCE_H
 
+#include "wintypes.h"
+
 #ifndef __WRC_RSC_H
 #include "wrc_rsc.h"
 #endif

include/struct32.h

@@ -3,6 +3,7 @@
 #define __WINE__STRUCT32_H
 
 #include "winbase.h"
+#include "wine/winuser16.h"
 #include "queue.h"
 
 extern void STRUCT32_MINMAXINFO32to16( const MINMAXINFO32*, MINMAXINFO16* );

include/updown.h

@@ -7,6 +7,9 @@
 #ifndef __WINE_UPDOWN_H
 #define __WINE_UPDOWN_H
 
+#include "wintypes.h"
+#include "commctrl.h"
+
 typedef struct
 {
   UINT32      AccelCount;   /* Number of elements in AccelVect */

include/windows.h

@@ -13,11 +13,11 @@ extern "C" {
 #include "winreg.h"
 #include "winnetwk.h"
 #include "winver.h"
-#include "winreg.h"
 #include "lzexpand.h"
 #include "shellapi.h"
 #include "ole2.h"
 #include "winnls.h"
+#include "objbase.h"
 
 /* FIXME: remove the following includes which are not in SDK */
 #include "ntdll.h"

include/winpos.h

@@ -8,6 +8,7 @@
 #define __WINE_WINPOS_H
 
 #include "win.h"
+#include "wine/winuser16.h" /* for WINDOWPOS16 */
 
 #define DWP_MAGIC  ((INT32)('W' | ('P' << 8) | ('O' << 16) | ('S' << 24)))
 

loader/main.c

@@ -10,6 +10,7 @@
 #include <string.h>
 #include <errno.h>
 #include "wine/winbase16.h"
+#include "wine/winuser16.h"
 #include "bitmap.h"
 #include "comm.h"
 #include "neexe.h"
@@ -140,7 +141,6 @@ BOOL32 WINAPI MAIN_KernelInit(HINSTANCE32 hinstDLL, DWORD fdwReason, LPVOID lpvR
         NE_SetEntryPoint( hModule, 194, DOSMEM_BiosSysSeg );  /* KERNEL.194: __F000H */
 #undef SET_ENTRY_POINT
     }
-
     return TRUE;
 }
 

misc/commdlg.c

@@ -8,7 +8,9 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
+#include "winbase.h"
 #include "wine/winbase16.h"
+#include "wine/winuser16.h"
 #include "win.h"
 #include "heap.h"
 #include "message.h"

misc/winsock_dns.c

@@ -41,6 +41,7 @@
 # include <resolv.h>
 #endif
 
+#include "wine/winuser16.h"
 #include "winsock.h"
 #include "heap.h"
 #include "ldt.h"

multimedia/mmsystem.c

@@ -15,13 +15,13 @@
  *        and long term pointers to 16 bit space in here
  */
 
-#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/ioctl.h>
 
+#include "winbase.h"
 #include "windef.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
@@ -30,10 +30,8 @@
 #include "ldt.h"
 #include "user.h"
 #include "driver.h"
-#include "file.h"
 #include "mmsystem.h"
 #include "multimedia.h"
-#include "xmalloc.h"
 #include "callback.h"
 #include "module.h"
 #include "selectors.h"

windows/win.c

@@ -17,7 +17,6 @@
 #include "dce.h"
 #include "sysmetrics.h"
 #include "cursoricon.h"
-#include "heap.h"
 #include "hook.h"
 #include "menu.h"
 #include "message.h"