Removed #include of wingdi.h and windef.h from winuser.h (and resolved

the resulting compilation failures).

controls/button.c

@@ -8,6 +8,8 @@
 #include <string.h>
 #include "win.h"
 #include "button.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "tweak.h"
 

controls/combo.c

@@ -9,8 +9,9 @@
 #include <string.h>
 
 #include "winbase.h"
-#include "winuser.h"
+#include "windef.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "wine/winuser16.h"
 #include "win.h"
 #include "spy.h"

controls/desktop.c

@@ -10,6 +10,7 @@
 
 #include "desktop.h"
 #include "windef.h"
+#include "wingdi.h"
 #include "heap.h"
 #include "monitor.h"
 #include "win.h"

controls/icontitle.c

@@ -7,6 +7,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "wine/winuser16.h"
 #include "win.h"

controls/listbox.c

@@ -6,6 +6,9 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "wine/winbase16.h"
 #include "winuser.h"
@@ -18,8 +21,8 @@
 #include "debugtools.h"
 #include "tweak.h"
 
-DEFAULT_DEBUG_CHANNEL(listbox)
-DECLARE_DEBUG_CHANNEL(combo)
+DEFAULT_DEBUG_CHANNEL(listbox);
+DECLARE_DEBUG_CHANNEL(combo);
 
 /* Unimplemented yet:
  * - LBS_NOSEL

controls/menu.c

@@ -17,9 +17,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "win.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
+#include "win.h"
 #include "task.h"
 #include "heap.h"
 #include "menu.h"

controls/scroll.c

@@ -5,6 +5,8 @@
  * Copyright 1994, 1996 Alexandre Julliard
  */
 
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "scroll.h"
 #include "heap.h"

controls/static.c

@@ -5,6 +5,8 @@
  *
  */
 
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "win.h"
 #include "cursoricon.h"

controls/uitools.c

@@ -5,6 +5,8 @@
  * Copyright 1997 Bertho A. Stultiens
  */
 
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "winuser.h"
 #include "debugtools.h"

dlls/comctl32/monthcal.c

@@ -17,8 +17,11 @@
  */
 
 #include <math.h>
+#include <stdio.h>
 
 #include "winbase.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "wingdi.h"
 #include "win.h"
@@ -28,7 +31,7 @@
 #include "monthcal.h"
 #include "debugtools.h"
 
-DEFAULT_DEBUG_CHANNEL(monthcal)
+DEFAULT_DEBUG_CHANNEL(monthcal);
 
 /* take #days/month from ole/parsedt.c;
  * we want full month-names, and abbreviated weekdays, so these are

dlls/comctl32/toolbar.c

@@ -27,6 +27,8 @@
 #include <string.h>
 
 #include "winbase.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "wingdi.h"
 #include "commctrl.h"

dlls/comctl32/updown.c

@@ -29,15 +29,18 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 
+#include "windef.h"
 #include "winbase.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "commctrl.h"
 #include "winnls.h"
 #include "updown.h"
 #include "debugtools.h"
 
-DEFAULT_DEBUG_CHANNEL(updown)
+DEFAULT_DEBUG_CHANNEL(updown);
 
 /* Control configuration constants */
 

dlls/commdlg/colordlg.c

@@ -7,8 +7,11 @@
 
 #include <ctype.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
+#include "windef.h"
 #include "winbase.h"
+#include "wingdi.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "ldt.h"
@@ -21,7 +24,7 @@
 #include "winproc.h"
 #include "cderr.h"
 
-DEFAULT_DEBUG_CHANNEL(commdlg)
+DEFAULT_DEBUG_CHANNEL(commdlg);
 
 #include "cdlg.h"
 

dlls/commdlg/filedlg.c

@@ -6,8 +6,11 @@
  */
 #include <ctype.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
+#include "windef.h"
 #include "winbase.h"
+#include "wingdi.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "ldt.h"
@@ -22,7 +25,7 @@
 #include "cderr.h"
 #include "tweak.h"
 
-DEFAULT_DEBUG_CHANNEL(commdlg)
+DEFAULT_DEBUG_CHANNEL(commdlg);
 
 #include "cdlg.h"
 

dlls/commdlg/filedlgbrowser.c

@@ -7,6 +7,8 @@
 #include <stdio.h>
 #include "unknwn.h"
 #include "filedlgbrowser.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "heap.h"
 #include "wine/obj_dataobject.h"

dlls/commdlg/finddlg32.c

@@ -6,6 +6,8 @@
  */
 
 #include "winbase.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "commdlg.h"
 #include "cderr.h"

dlls/commdlg/fontdlg.c

@@ -7,8 +7,11 @@
 
 #include <ctype.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
+#include "windef.h"
 #include "winbase.h"
+#include "wingdi.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "ldt.h"
@@ -22,7 +25,7 @@
 #include "winproc.h"
 #include "cderr.h"
 
-DEFAULT_DEBUG_CHANNEL(commdlg)
+DEFAULT_DEBUG_CHANNEL(commdlg);
 
 #include "cdlg.h"
 

dlls/commdlg/printdlg.c

@@ -8,8 +8,11 @@
 
 #include <ctype.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
+#include "windef.h"
 #include "winbase.h"
+#include "wingdi.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "ldt.h"
@@ -23,7 +26,7 @@
 #include "winspool.h"
 #include "winerror.h"
 
-DEFAULT_DEBUG_CHANNEL(commdlg)
+DEFAULT_DEBUG_CHANNEL(commdlg);
 
 #include "cdlg.h"
 

dlls/crtdll/crtdll_main.c

@@ -32,6 +32,7 @@ AJ 990101:
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
+#include <stdio.h>
 #include <sys/stat.h>
 #include <sys/times.h>
 #include <unistd.h>
@@ -41,6 +42,8 @@ AJ 990101:
 #include <fcntl.h>
 #include <setjmp.h>
 #include "winbase.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "winerror.h"
 #include "ntddk.h"
@@ -53,7 +56,7 @@ AJ 990101:
 #include "options.h"
 #include "winnls.h"
 
-DEFAULT_DEBUG_CHANNEL(crtdll)
+DEFAULT_DEBUG_CHANNEL(crtdll);
 
 /* windows.h RAND_MAX is smaller than normal RAND_MAX */
 #define CRTDLL_RAND_MAX         0x7fff 

dlls/dsound/dsound_main.c

@@ -62,6 +62,8 @@
 #include <string.h>
 #include <math.h>	/* Insomnia - pow() function */
 #include "dsound.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
@@ -236,7 +238,7 @@ static void _dump_DSBCAPS(DWORD xmask) {
 
 	for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++)
 		if (flags[i].mask & xmask)
-			fprintf(stderr,"%s ",flags[i].name);
+			DPRINTF("%s ",flags[i].name);
 }
 
 /*******************************************************************************

dlls/imm32/imm.c

@@ -5,6 +5,8 @@
  */
 
 #include "winbase.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "winerror.h"
 #include "windef.h"

dlls/mouse/mouse_main.c

@@ -13,6 +13,8 @@
 #include "module.h"
 #include "mouse.h"
 #include "monitor.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "win.h"
 #include "wine/winbase16.h"

dlls/msacm32/driver.c

@@ -10,6 +10,8 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "windef.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "debugtools.h"
 #include "driver.h"

dlls/msacm32/internal.c

@@ -10,6 +10,8 @@
 #include <string.h>
 
 #include "winbase.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "winerror.h"
 #include "driver.h"

dlls/msvideo/msvideo_main.c

@@ -5,6 +5,8 @@
 #include <string.h>
 
 #include "winbase.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "wingdi.h"
 #include "vfw.h"

dlls/ntdll/rtl.c

@@ -11,6 +11,8 @@
 #include <string.h>
 #include "heap.h"
 #include "debugtools.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "winerror.h"
 #include "stackframe.h"

dlls/ntdll/sec.c

@@ -11,6 +11,7 @@
 #include <math.h>
 #include "windef.h"
 #include "winbase.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "wine/winestring.h"
 #include "file.h"

dlls/ole32/clipboard.c

@@ -44,6 +44,8 @@
  */
 
 #include <assert.h>
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/ole32/ole2.c

@@ -8,8 +8,11 @@
 
 #include <assert.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "winerror.h"
 #include "ole2.h"

dlls/ole32/ole2stubs.c

@@ -5,6 +5,8 @@
  */
 
 #include "ole2.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "debugtools.h"
 

dlls/oleaut32/ole2disp.c

@@ -4,6 +4,8 @@
  *	Copyright 1995	Martin von Loewis
  */
 #include <string.h>
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "winerror.h"
 #include "oleauto.h"

dlls/oleaut32/oleaut.c

@@ -3,6 +3,8 @@
  *
  */
 #include <string.h>
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "winerror.h"
 #include "winversion.h"

dlls/shell32/iconcache.c

@@ -3,7 +3,11 @@
  *
  */
 #include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
 #include "winbase.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "wingdi.h"
 #include "wine/winuser16.h"

dlls/shell32/shell.c

@@ -8,6 +8,8 @@
 #include <string.h>
 #include <unistd.h>
 #include <ctype.h>
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "wine/winbase16.h"
 #include "wine/shell16.h"

dlls/shell32/shell32_main.c

@@ -6,7 +6,10 @@
  */
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "winerror.h"
 #include "heap.h"
@@ -27,8 +30,7 @@
 #include "wine/undocshell.h"
 #include "shpolicy.h"
 
-DEFAULT_DEBUG_CHANNEL(shell)
-DECLARE_DEBUG_CHANNEL(exec)
+DEFAULT_DEBUG_CHANNEL(shell);
 
 #define MORE_DEBUG 1
 /*************************************************************************
@@ -422,7 +424,7 @@ UINT WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data)
  *
  */
 DWORD WINAPI SHHelpShortcuts_RunDLL (DWORD dwArg1, DWORD dwArg2, DWORD dwArg3, DWORD dwArg4)
-{ FIXME_(exec)("(%lx, %lx, %lx, %lx) empty stub!\n",
+{ FIXME("(%lx, %lx, %lx, %lx) empty stub!\n",
 	dwArg1, dwArg2, dwArg3, dwArg4);
 
   return 0;

dlls/shell32/shpolicy.c

@@ -16,6 +16,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "shpolicy.h"
 

dlls/winmm/joystick.c

@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include <unistd.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
@@ -34,12 +35,14 @@
 #ifdef HAVE_SYS_ERRNO_H
 #include <sys/errno.h>
 #endif
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "winbase.h"
 #include "mmsystem.h"
 #include "debugtools.h"
 
-DEFAULT_DEBUG_CHANNEL(mmsys)
+DEFAULT_DEBUG_CHANNEL(mmsys);
 
 #define MAXJOYSTICK	(JOYSTICKID2 + 1)
 #define JOY_PERIOD_MIN	(10)	/* min Capture time period */

dlls/winmm/mci.c

@@ -7,9 +7,12 @@
  */
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 
 #include "winbase.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "heap.h"
 #include "driver.h"
@@ -20,7 +23,7 @@
 #include "wine/winbase16.h"
 #include "debugtools.h"
 
-DEFAULT_DEBUG_CHANNEL(mci)
+DEFAULT_DEBUG_CHANNEL(mci);
 
 static	int			MCI_InstalledCount;
 static	LPSTR			MCI_lpInstallNames = NULL;

dlls/winmm/mcianim/mcianim.c

@@ -5,6 +5,8 @@
  * Copyright 1994 Martin Ayotte
  */
 
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "driver.h"
 #include "mmddk.h"

dlls/winmm/mciavi/mciavi.c

@@ -7,6 +7,8 @@
  */
 
 #include <string.h>
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "mmddk.h"
 #include "user.h"

dlls/winmm/mcicda/mcicda.c

@@ -7,6 +7,9 @@
  * Copyright 2000    Andreas Mohr
  */
 
+#include "config.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "driver.h"
 #include "mmddk.h"

dlls/winmm/mciseq/mcimidi.c

@@ -16,6 +16,8 @@
  */
 
 #include <stdlib.h>
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "mmddk.h"
 #include "driver.h"

dlls/winmm/mciwave/mciwave.c

@@ -10,6 +10,8 @@
  *	- record/play should and must be done asynchronous
  */
 
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "driver.h"
 #include "mmddk.h"

dlls/winmm/midimap/midimap.c

@@ -5,6 +5,8 @@
  * Copyright 	1999 Eric Pouech
  */
 
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "driver.h"
 #include "mmddk.h"

dlls/winmm/time.c

@@ -8,6 +8,8 @@
 
 #include <time.h>
 #include <sys/time.h>
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "winemm.h"
 #include "services.h"

dlls/winmm/wavemap/wavemap.c

@@ -11,6 +11,8 @@
  *	+ use asynchronous ACM conversion
  */
 
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "driver.h"
 #include "mmddk.h"

dlls/winmm/wineoss/audio.c

@@ -16,11 +16,14 @@
 #include "config.h"
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "driver.h"
 #include "mmddk.h"
@@ -29,7 +32,7 @@
 #include "ldt.h"
 #include "debugtools.h"
 
-DEFAULT_DEBUG_CHANNEL(wave)
+DEFAULT_DEBUG_CHANNEL(wave);
 
 /* Allow 1% deviation for sample rates (some ES137x cards) */
 #define NEAR_MATCH(rate1,rate2) (((100*((int)(rate1)-(int)(rate2)))/(rate1))==0)

dlls/winmm/wineoss/midi.c

@@ -18,6 +18,8 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "mmddk.h"
 #include "oss.h"

dlls/winmm/wineoss/oss.c

@@ -5,6 +5,8 @@
  * Copyright 	1999 Eric Pouech
  */
 
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "driver.h"
 #include "mmddk.h"

files/directory.c

@@ -8,6 +8,7 @@
 
 #include <ctype.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -20,6 +21,8 @@
 #include "winbase.h"
 #include "wine/winbase16.h"
 #include "wine/winestring.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "winerror.h"
 #include "process.h"
@@ -30,8 +33,8 @@
 #include "options.h"
 #include "debugtools.h"
 
-DEFAULT_DEBUG_CHANNEL(dosfs)
-DECLARE_DEBUG_CHANNEL(file)
+DEFAULT_DEBUG_CHANNEL(dosfs);
+DECLARE_DEBUG_CHANNEL(file);
 
 static DOS_FULL_NAME DIR_Windows;
 static DOS_FULL_NAME DIR_System;

files/dos_fs.c

@@ -22,6 +22,7 @@
 #include <unistd.h>
 
 #include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "wine/winbase16.h"
 #include "winerror.h"

files/profile.c

@@ -8,6 +8,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <pwd.h>
@@ -16,6 +17,8 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "wine/winbase16.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "winnls.h"
 #include "file.h"
@@ -24,7 +27,7 @@
 #include "xmalloc.h"
 #include "options.h"
 
-DEFAULT_DEBUG_CHANNEL(profile)
+DEFAULT_DEBUG_CHANNEL(profile);
 
 typedef struct tagPROFILEKEY
 {

graphics/painting.c

@@ -16,6 +16,8 @@
 #include "path.h"
 #include "debugtools.h"
 #include "winerror.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "wine/winuser16.h"
 

graphics/psdrv/escape.c

@@ -3,6 +3,8 @@
  *
  *	Copyright 1998  Huw D M Davies
  */
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "psdrv.h"
 #include "debugtools.h"

graphics/x11drv/bitmap.c

@@ -24,6 +24,8 @@
 #include "xmalloc.h"
 #include "local.h"
 #include "x11drv.h"
+#include "wingdi.h"
+#include "windef.h"
 #include "wine/winuser16.h"
 
 DEFAULT_DEBUG_CHANNEL(x11drv)

graphics/x11drv/xfont.c

@@ -25,6 +25,8 @@
 #include <fcntl.h>
 #include <math.h>
 #include <assert.h>
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "heap.h"
 #include "options.h"

if1632/snoop.c

@@ -6,7 +6,10 @@
 
 #include <assert.h>
 #include <string.h>
+#include <stdio.h>
 #include "winbase.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "winnt.h"
 #include "heap.h"

include/callback.h

@@ -9,6 +9,7 @@
 
 #include "windef.h"
 #include "winnt.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 
 extern int (*IF1632_CallLargeStack)( int (*func)(void), void *arg );

include/commctrl.h

@@ -7,6 +7,7 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "imagelist.h"
 #include "prsht.h"

include/commdlg.h

@@ -10,6 +10,7 @@ extern "C" {
 #endif
 
 #include "windef.h"		/* needed for CHOOSEFONT structure */
+#include "wingdi.h"
 #include "winuser.h"
 #include "pshpack1.h"
 

include/docobj.h

@@ -2,6 +2,8 @@
 #define __WINE_DOCOBJ_H
 
 #include "winbase.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "ole2.h"
 #include "wine/obj_oleaut.h"

include/prsht.h

@@ -1,6 +1,8 @@
 #ifndef __WINE_PRSHT_H
 #define __WINE_PRSHT_H
 
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 
 #ifdef __cplusplus

include/queue.h

@@ -8,6 +8,7 @@
 #define __WINE_QUEUE_H
 
 #include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "thread.h"
 

include/struct32.h

@@ -3,6 +3,8 @@
 #define __WINE_STRUCT32_H
 
 #include "winbase.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "queue.h"
 

include/win.h

@@ -7,6 +7,8 @@
 #ifndef __WINE_WIN_H
 #define __WINE_WIN_H
 
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "queue.h"
 #include "class.h"

include/windows.h

@@ -5,10 +5,10 @@
 extern "C" {
 #endif
 
+#include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "windef.h"
 #include "shell.h"
 #include "winreg.h"
 #include "winnetwk.h"

include/wine/obj_extracticon.h

@@ -6,6 +6,8 @@
 #define __WINE_WINE_OBJ_EXTRACTICON_H
 
 #include "winbase.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "wine/obj_base.h"
 

include/wine/obj_shellbrowser.h

@@ -6,6 +6,8 @@
 #define __WINE_WINE_OBJ_SHELLBROWSER_H
 
 #include "winbase.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "wine/obj_base.h"
 #include "wine/obj_inplace.h"	/* IOleWindow */

include/wine/obj_shellview.h

@@ -6,6 +6,8 @@
 #define __WINE_WINE_OBJ_SHELLVIEW_H
 
 #include "winbase.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "wine/obj_base.h"
 #include "wine/obj_inplace.h"

include/winuser.h

@@ -4,8 +4,6 @@
 #ifndef RC_INVOKED
 #include <stdarg.h>
 #endif
-#include "windef.h"
-#include "wingdi.h"
 
 #ifdef __cplusplus
 extern "C" {

libtest/hello4.c

@@ -2,6 +2,8 @@
 #include <windows.h>
 /* Win32 counterpart for CalcChildScroll16 is not implemented */
 /* even in MS Visual C++ */
+#include "windef.h"
+#include "wingdi.h"
 #include <wine/winuser16.h>
 
 void Write (HDC dc, int x, int y, char *s)

loader/dos/dosvm.c

@@ -21,6 +21,8 @@
 
 #include "wine/winbase16.h"
 #include "wine/exception.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "winnt.h"
 #include "msdos.h"

loader/main.c

@@ -2,6 +2,7 @@
  * Main initialization code
  */
 
+#include <assert.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -9,7 +10,8 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <assert.h>
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "bitmap.h"

loader/module.c

@@ -7,12 +7,14 @@
 #include <assert.h>
 #include <fcntl.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include "wine/winuser16.h"
-#include "wine/winbase16.h"
 #include "windef.h"
+#include "wingdi.h"
+#include "wine/winbase16.h"
+#include "wine/winuser16.h"
 #include "winerror.h"
 #include "file.h"
 #include "global.h"

loader/ne/convert.c

@@ -5,11 +5,13 @@
  */
 
 #include <string.h>
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "module.h"
 #include "debugtools.h"
 
-DEFAULT_DEBUG_CHANNEL(resource)
+DEFAULT_DEBUG_CHANNEL(resource);
 
 /**********************************************************************
  *	    ConvertDialog32To16   (KERNEL.615)

loader/resource.c

@@ -14,6 +14,7 @@
 #include <unistd.h>
 #include "winbase.h"
 #include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"

memory/atom.c

@@ -16,9 +16,11 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "windef.h"
+#include "wingdi.h"
+#include "winuser.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
-#include "winuser.h"
 #include "global.h"
 #include "instance.h"
 #include "ldt.h"

memory/environ.c

@@ -6,6 +6,8 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "wine/winestring.h"
 #include "process.h"

memory/instr.c

@@ -4,6 +4,8 @@
  * Copyright 1995 Alexandre Julliard
  */
 
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "ldt.h"
 #include "global.h"
@@ -13,8 +15,8 @@
 #include "selectors.h"
 #include "debugtools.h"
 
-DEFAULT_DEBUG_CHANNEL(int)
-DECLARE_DEBUG_CHANNEL(io)
+DEFAULT_DEBUG_CHANNEL(int);
+DECLARE_DEBUG_CHANNEL(io);
 
 #ifdef __i386__
 
@@ -472,9 +474,8 @@ BOOL INSTR_EmulateInstruction( CONTEXT86 *context )
 	    case 0x22: /* mov eax, crX */
 	    	switch (instr[2]) {
 		case 0xc0:
-			fprintf(stderr,"mov eax,cr0 at 0x%08lx, EAX=0x%08lx\n",
-				EIP_reg(context),EAX_reg(context)
-			);
+			ERR("mov eax,cr0 at 0x%08lx, EAX=0x%08lx\n",
+                            EIP_reg(context),EAX_reg(context) );
 			EIP_reg(context) += prefixlen+3;
 			return TRUE;
 		default:
@@ -495,12 +496,12 @@ BOOL INSTR_EmulateInstruction( CONTEXT86 *context )
 		     * bit 7: PGE   Enable global pages
 		     * bit 8: PCE	Enable performance counters at IPL3
 		     */
-		    fprintf(stderr,"mov cr4,eax at 0x%08lx\n",EIP_reg(context));
+		    ERR("mov cr4,eax at 0x%08lx\n",EIP_reg(context));
 		    EAX_reg(context) = 0;
 		    EIP_reg(context) += prefixlen+3;
 		    return TRUE;
 		case 0xc0: /* mov cr0, eax */
-		    fprintf(stderr,"mov cr0,eax at 0x%08lx\n",EIP_reg(context));
+		    ERR("mov cr0,eax at 0x%08lx\n",EIP_reg(context));
 		    EAX_reg(context) = 0x10; /* FIXME: set more bits ? */
 		    EIP_reg(context) += prefixlen+3;
 		    return TRUE;

memory/string.c

@@ -8,10 +8,12 @@
 #include <ctype.h>
 #include <string.h>
 
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
-#include "winbase.h"
-#include "winuser.h"
 #include "wine/keyboard16.h"
 #include "wine/exception.h"
 #include "winerror.h"

misc/comm.c

@@ -35,6 +35,7 @@
 #include "config.h"
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <termios.h>
 #include <fcntl.h>
 #include <string.h>
@@ -50,6 +51,8 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "comm.h"
 #ifdef HAVE_SYS_MODEM_H
@@ -69,7 +72,7 @@
 
 #include "debugtools.h"
 
-DEFAULT_DEBUG_CHANNEL(comm)
+DEFAULT_DEBUG_CHANNEL(comm);
 
 #ifndef TIOCINQ
 #define	TIOCINQ FIONREAD

misc/ddeml.c

@@ -11,6 +11,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "winbase.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "ddeml.h"
 #include "winerror.h"

misc/lstr.c

@@ -9,6 +9,7 @@
 
 #include <stdarg.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 
@@ -21,10 +22,12 @@
 # define iswlower(c) islower(c)
 #endif  /* HAVE_WCTYPE_H */
 
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
-#include "winbase.h"
-#include "winuser.h"
 #include "winnls.h"
 #include "task.h"
 #include "heap.h"
@@ -33,7 +36,7 @@
 #include "module.h"
 #include "debugtools.h"
 
-DEFAULT_DEBUG_CHANNEL(resource)
+DEFAULT_DEBUG_CHANNEL(resource);
 
 extern const WORD OLE2NLS_CT_CType3_LUT[]; /* FIXME: does not belong here */
 

misc/main.c

@@ -41,6 +41,8 @@
 #include "keyboard.h"
 #include "gdi.h"
 #include "user.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "tweak.h"
 

misc/spy.c

@@ -7,6 +7,9 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "wine/winbase16.h"
 #include "win.h"

misc/system.c

@@ -4,6 +4,8 @@
  * Copyright 1996 Alexandre Julliard
  */
 
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "services.h"

misc/tweak.c

@@ -29,6 +29,8 @@
  *****************************************************************************/
 
 #include <string.h>
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "tweak.h"
 #include "options.h"

misc/version.c

@@ -9,7 +9,10 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
+#include "windef.h"
 #include "winbase.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "wine/winbase16.h"
 #include "process.h"

misc/wsprintf.c

@@ -6,7 +6,10 @@
 
 #include <stdarg.h>
 #include <string.h>
+#include <stdio.h>
 #include "wine/winbase16.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "ldt.h"
 #include "stackframe.h"

msdos/int09.c

@@ -4,6 +4,8 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "miscemu.h"
 #include "input.h"

msdos/int16.c

@@ -11,6 +11,8 @@
 #include "console.h"
 #include "wincon.h"
 #include "debugtools.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "miscemu.h"
 

msdos/int21.c

@@ -20,6 +20,8 @@
 #include <ctype.h>
 #include "windef.h"
 #include "winbase.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h" /* SW_NORMAL */
 #include "wine/winbase16.h"
 #include "winerror.h"

msdos/int33.c

@@ -3,6 +3,8 @@
  */
 
 #include <stdlib.h>
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "miscemu.h"
 #include "dosexe.h"

msdos/vxd.c

@@ -6,7 +6,11 @@
 
 #include <fcntl.h>
 #include <memory.h>
+#include <sys/types.h>
+#include <unistd.h>
 #include "winbase.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"

objects/clipping.c

@@ -8,6 +8,8 @@
 #include "dc.h"
 #include "region.h"
 #include "debugtools.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 
 DEFAULT_DEBUG_CHANNEL(clipping)

objects/cursoricon.c

@@ -32,6 +32,8 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "heap.h"

objects/dc.c

@@ -21,6 +21,8 @@
 #include "font.h"
 #include "callback.h"
 #include "winerror.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 
 DEFAULT_DEBUG_CHANNEL(dc)

objects/gdiobj.c

@@ -13,6 +13,7 @@
 #endif /* !defined(X_DISPLAY_MISSING */
 
 #include <stdlib.h>
+#include <stdio.h>
 
 #include "bitmap.h"
 #include "brush.h"
@@ -26,6 +27,8 @@
 #include "debugtools.h"
 #include "gdi.h"
 #include "tweak.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 
 DEFAULT_DEBUG_CHANNEL(gdi)

objects/palette.c

@@ -12,6 +12,8 @@
 #include <string.h>
 
 #include "winbase.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "gdi.h"
 #include "color.h"

objects/region.c

@@ -83,13 +83,15 @@ SOFTWARE.
 
 #include <stdlib.h>
 #include <string.h>
-#include "region.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "debugtools.h"
+#include "region.h"
 #include "heap.h"
 #include "dc.h"
 
-DEFAULT_DEBUG_CHANNEL(region) 
+DEFAULT_DEBUG_CHANNEL(region);
 
 typedef void (*voidProcp)();