winnls.h must not include winbase.h.

controls/menu.c

@@ -35,8 +35,9 @@
 #include <string.h>
 
 #include "windef.h"
-#include "winnls.h"
+#include "winbase.h"
 #include "wingdi.h"
+#include "winnls.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "wownt32.h"

dlls/commdlg/filedlg.c

@@ -23,8 +23,8 @@
 #include <stdio.h>
 #include <string.h>
 #include "windef.h"
-#include "winnls.h"
 #include "winbase.h"
+#include "winnls.h"
 #include "wingdi.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"

dlls/commdlg/filedlg16.c

@@ -23,9 +23,9 @@
 #include <stdio.h>
 #include <string.h>
 #include "windef.h"
-#include "winnls.h"
 #include "winbase.h"
 #include "wingdi.h"
+#include "winnls.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "wine/unicode.h"

dlls/commdlg/fontdlg.c

@@ -24,8 +24,8 @@
 #include <stdio.h>
 #include <string.h>
 #include "windef.h"
-#include "winnls.h"
 #include "winbase.h"
+#include "winnls.h"
 #include "wingdi.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"

dlls/commdlg/fontdlg16.c

@@ -24,9 +24,9 @@
 #include <stdio.h>
 #include <string.h>
 #include "windef.h"
-#include "winnls.h"
 #include "winbase.h"
 #include "wingdi.h"
+#include "winnls.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "heap.h"

dlls/ddraw/main.c

@@ -30,6 +30,7 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "winbase.h"
 #include "winnls.h"
 #include "winerror.h"
 

dlls/devenum/devenum.rc

@@ -18,6 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "winbase.h"
 #include "winnls.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT

dlls/msacm/imaadp32/imaadp32.c

@@ -21,10 +21,10 @@
 
 #include <assert.h>
 #include <string.h>
-#include "winnls.h"
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "winnls.h"
 #include "msacm.h"
 #include "mmreg.h"
 #include "../msacmdrv.h"

dlls/msacm/msadp32/msadp32.c

@@ -21,10 +21,10 @@
 
 #include <assert.h>
 #include <string.h>
-#include "winnls.h"
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "winnls.h"
 #include "msacm.h"
 #include "mmreg.h"
 #include "../msacmdrv.h"

dlls/msacm/msg711/msg711.c

@@ -21,10 +21,10 @@
 
 #include <assert.h>
 #include <string.h>
-#include "winnls.h"
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "winnls.h"
 #include "msacm.h"
 #include "mmreg.h"
 #include "../msacmdrv.h"

dlls/msacm/winemp3/mpegl3.c

@@ -21,10 +21,10 @@
 
 #include <assert.h>
 #include <string.h>
-#include "winnls.h"
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "winnls.h"
 #include "msacm.h"
 #include "mmreg.h"
 #include "../msacmdrv.h"

dlls/ntdll/resource.c

@@ -33,6 +33,7 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #include "windef.h"
+#include "winbase.h"
 #include "winnls.h"
 #include "winnt.h"
 #include "winternl.h"

dlls/oleaut32/tmarshal.c

@@ -29,6 +29,7 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #include "winerror.h"
+#include "winbase.h"
 #include "winnls.h"
 #include "winreg.h"
 #include "winuser.h"

dlls/oleaut32/typelib.c

@@ -63,8 +63,9 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #include "winerror.h"
-#include "winnls.h"         /* for PRIMARYLANGID */
+#include "winbase.h"
-#include "winreg.h"         /* for HKEY_LOCAL_MACHINE */
+#include "winnls.h"
+#include "winreg.h"
 #include "winuser.h"
 
 #include "wine/unicode.h"

dlls/oleaut32/typelib16.c

@@ -30,8 +30,9 @@
 #include <ctype.h>
 
 #include "winerror.h"
-#include "winnls.h"         /* for PRIMARYLANGID */
+#include "winbase.h"
-#include "winreg.h"         /* for HKEY_LOCAL_MACHINE */
+#include "winnls.h"
+#include "winreg.h"
 #include "winuser.h"
 
 #include "objbase.h"

dlls/shell32/shellpath.c

@@ -30,6 +30,7 @@
 #include <ctype.h>
 #include "wine/debug.h"
 #include "windef.h"
+#include "winbase.h"
 #include "winnls.h"
 #include "winreg.h"
 

dlls/shell32/shellstring.c

@@ -23,6 +23,7 @@
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+#include "winbase.h"
 #include "winnls.h"
 #include "winerror.h"
 #include "winreg.h"

dlls/shell32/shlview.c

@@ -44,6 +44,7 @@
 
 #include "windef.h"
 #include "winerror.h"
+#include "winbase.h"
 #include "winnls.h"
 #include "servprov.h"
 #include "shlguid.h"

dlls/shell32/systray.c

@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "winbase.h"
 #include "winnls.h"
 #include "shlobj.h"
 #include "shellapi.h"

dlls/shlwapi/assoc.c

@@ -18,6 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "windef.h"
+#include "winbase.h"
 #include "winnls.h"
 #include "winreg.h"
 #include "shlguid.h"

dlls/shlwapi/thread.c

@@ -21,6 +21,7 @@
 #include <string.h>
 
 #include "windef.h"
+#include "winbase.h"
 #include "winnls.h"
 #include "wine/debug.h"
 #define NO_SHLWAPI_REG

dlls/shlwapi/url.c

@@ -21,8 +21,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include "windef.h"
-#include "winnls.h"
 #include "winbase.h"
+#include "winnls.h"
 #include "winerror.h"
 #include "wine/unicode.h"
 #include "wininet.h"

dlls/ttydrv/graphics.c

@@ -20,6 +20,7 @@
 
 #include "config.h"
 
+#include "winbase.h"
 #include "winnls.h"
 #include "gdi.h"
 #include "wine/debug.h"

dlls/winmm/joystick.c

@@ -35,9 +35,10 @@
 #endif
 
 #include "mmsystem.h"
-#include "winnls.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "winnls.h"
 
 #include "winemm.h"
 

graphics/x11drv/codepage.c

@@ -25,6 +25,7 @@
 #include <math.h>
 
 #include "windef.h"
+#include "winbase.h"
 #include "winnls.h"
 #include "x11font.h"
 #include "wine/debug.h"

graphics/x11drv/text.c

@@ -28,6 +28,7 @@
 #include <math.h>
 
 #include "windef.h"
+#include "winbase.h"
 #include "winnls.h"
 #include "wownt32.h"
 #include "gdi.h"

graphics/x11drv/xfont.c

@@ -40,6 +40,7 @@
 #include <math.h>
 
 #include "windef.h"
+#include "winbase.h"
 #include "wingdi.h"
 #include "winnls.h"
 #include "winreg.h"

include/winnls.h

@@ -20,8 +20,6 @@
 #define __WINE_WINNLS_H
 #ifndef NONLS
 
-#include "winbase.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif

memory/virtual.c

@@ -31,8 +31,8 @@
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
-#include "winnls.h"
 #include "winbase.h"
+#include "winnls.h"
 #include "winternl.h"
 #include "winerror.h"
 #include "wine/exception.h"

msdos/ioports.c

@@ -37,6 +37,7 @@
 # include <unistd.h>
 #endif
 #include "windef.h"
+#include "winbase.h"
 #include "winnls.h"
 #include "winternl.h"
 #include "callback.h"

objects/enhmetafile.c

@@ -36,9 +36,9 @@
 
 #include <string.h>
 #include <assert.h>
-#include "winnls.h"
 #include "winbase.h"
 #include "wingdi.h"
+#include "winnls.h"
 #include "winerror.h"
 #include "gdi.h"
 #include "wine/debug.h"

objects/font.c

@@ -27,6 +27,7 @@
 #include <string.h>
 #include <assert.h>
 #include "winerror.h"
+#include "winbase.h"
 #include "winnls.h"
 #include "wownt32.h"
 #include "gdi.h"

programs/wineconsole/curses.c

@@ -42,6 +42,7 @@
 #endif
 #undef KEY_EVENT  /* avoid redefinition warning */
 #include <unistd.h>
+#include <winbase.h>
 #include <winnls.h>
 #include "winecon_private.h"
 

windows/dialog.c

@@ -29,10 +29,10 @@
 #include <string.h>
 
 #include "windef.h"
-#include "winnls.h"
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "winnls.h"
 #include "wine/winuser16.h"
 #include "wine/unicode.h"
 #include "controls.h"

windows/input.c

@@ -31,10 +31,10 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #include "windef.h"
-#include "winnls.h"
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "winnls.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "wine/server.h"