winuser.h now requires that we include winbase.h first.

controls/icontitle.c

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

dlls/commdlg/filedlgbrowser.c

@@ -7,6 +7,7 @@
 #include <stdio.h>
 
 #include "windef.h"
+#include "winbase.h"
 #include "winnls.h"
 #include "wingdi.h"
 #include "winuser.h"

dlls/dsound/dsound_main.c

@@ -34,6 +34,7 @@
 #include <math.h>	/* Insomnia - pow() function */
 
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "winerror.h"

dlls/msvideo/drawdib.c

@@ -7,9 +7,9 @@
  */
 
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "winbase.h"
 #include "wine/winbase16.h"
 #include "debugtools.h"
 #include "vfw.h"

dlls/ole32/clipboard.c

@@ -47,9 +47,9 @@
 #include <assert.h>
 
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "winbase.h"
 #include "winerror.h"
 #include "winnls.h"
 #include "ole2.h"

dlls/ole32/ole2nls.c

@@ -10,7 +10,9 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <locale.h>
+
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "wine/windef16.h"

dlls/oleaut32/ole2disp.c

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

dlls/oleaut32/oleaut.c

@@ -3,7 +3,9 @@
  *
  */
 #include <string.h>
+
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "winerror.h"

dlls/oleaut32/stubs.c

@@ -7,6 +7,7 @@
  */
 
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "debugtools.h"

dlls/richedit/rtf.h

@@ -4,6 +4,7 @@
 #include <stdio.h>
 
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "richedit.h"

dlls/user/user_main.c

@@ -3,6 +3,7 @@
  */
 
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "winreg.h"

dlls/winmm/joystick/joystick.c

@@ -36,7 +36,9 @@
 #ifdef HAVE_SYS_ERRNO_H
 #include <sys/errno.h>
 #endif
+
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "mmddk.h"

dlls/winmm/mcianim/mcianim.c

@@ -6,6 +6,7 @@
  */
 
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "mmddk.h"

dlls/winmm/mciavi/mciavi.c

@@ -7,7 +7,9 @@
  */
 
 #include <string.h>
+
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "mmddk.h"

dlls/winmm/mcicda/mcicda.c

@@ -9,7 +9,9 @@
 
 #include "config.h"
 #include <stdio.h>
+
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "mmddk.h"

dlls/winmm/mciseq/mcimidi.c

@@ -17,7 +17,9 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "mmddk.h"

dlls/winmm/mciwave/mciwave.c

@@ -9,6 +9,7 @@
 
 #include "winerror.h"
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "mmddk.h"

dlls/winmm/midimap/midimap.c

@@ -6,6 +6,7 @@
  */
 
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "mmddk.h"

dlls/winmm/time.c

@@ -8,7 +8,9 @@
 
 #include <time.h>
 #include <sys/time.h>
+
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "winemm.h"

dlls/winmm/wavemap/wavemap.c

@@ -12,6 +12,7 @@
  */
 
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "mmddk.h"

dlls/winmm/wineoss/midi.c

@@ -18,7 +18,9 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
+
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "mmddk.h"

dlls/winmm/wineoss/oss.c

@@ -6,6 +6,7 @@
  */
 
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "mmddk.h"

include/win.h

@@ -8,6 +8,7 @@
 #define __WINE_WIN_H
 
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winproc.h"
 #include "winuser.h"

include/winpos.h

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

misc/tweak.c

@@ -29,7 +29,9 @@
  *****************************************************************************/
 
 #include <string.h>
+
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "tweak.h"

msdos/int09.c

@@ -4,7 +4,9 @@
 
 #include <stdlib.h>
 #include <string.h>
+
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "miscemu.h"

msdos/int33.c

@@ -3,7 +3,9 @@
  */
 
 #include <stdlib.h>
+
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "miscemu.h"

ole/ole2nls.c

@@ -11,7 +11,9 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <locale.h>
+
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "wine/unicode.h"

tools/bin2res.c

@@ -26,7 +26,9 @@
 #ifdef HAVE_SYS_MMAN_H
 # include <sys/mman.h>
 #endif
+
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 

tools/wrc/genres.c

@@ -22,6 +22,7 @@
 #include "genres.h"
 #include "utils.h"
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 

tools/wrc/parser.y

@@ -124,6 +124,7 @@
 #include "preproc.h"
 #include "parser.h"
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 

windows/clipboard.c

@@ -23,7 +23,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
+
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "wine/winuser16.h"

windows/dialog.c

@@ -10,8 +10,10 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+
 #include "windef.h"
 #include "winnls.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "windowsx.h"

windows/hook.c

@@ -15,6 +15,7 @@
  */
 
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "wine/winuser16.h"

windows/input.c

@@ -17,6 +17,7 @@
 
 #include "windef.h"
 #include "winnls.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "wine/winbase16.h"

windows/keyboard.c

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

windows/mdi.c

@@ -70,7 +70,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
+
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "wine/unicode.h"