diff --git a/controls/menu.c b/controls/menu.c index c0b59d4351a..bdae2a24f0f 100644 --- a/controls/menu.c +++ b/controls/menu.c @@ -35,8 +35,9 @@ #include #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" diff --git a/dlls/commdlg/filedlg.c b/dlls/commdlg/filedlg.c index 05a04bb27a3..13f4bad8ead 100644 --- a/dlls/commdlg/filedlg.c +++ b/dlls/commdlg/filedlg.c @@ -23,8 +23,8 @@ #include #include #include "windef.h" -#include "winnls.h" #include "winbase.h" +#include "winnls.h" #include "wingdi.h" #include "wine/winbase16.h" #include "wine/winuser16.h" diff --git a/dlls/commdlg/filedlg16.c b/dlls/commdlg/filedlg16.c index 7d4550f8905..dfeded9309e 100644 --- a/dlls/commdlg/filedlg16.c +++ b/dlls/commdlg/filedlg16.c @@ -23,9 +23,9 @@ #include #include #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" diff --git a/dlls/commdlg/fontdlg.c b/dlls/commdlg/fontdlg.c index 3024f7e989e..58868be5ca3 100644 --- a/dlls/commdlg/fontdlg.c +++ b/dlls/commdlg/fontdlg.c @@ -24,8 +24,8 @@ #include #include #include "windef.h" -#include "winnls.h" #include "winbase.h" +#include "winnls.h" #include "wingdi.h" #include "wine/winbase16.h" #include "wine/winuser16.h" diff --git a/dlls/commdlg/fontdlg16.c b/dlls/commdlg/fontdlg16.c index 527d1bb318c..49a1291641a 100644 --- a/dlls/commdlg/fontdlg16.c +++ b/dlls/commdlg/fontdlg16.c @@ -24,9 +24,9 @@ #include #include #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" diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 7966ffa4a7d..18c07c8fbee 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -30,6 +30,7 @@ #include #include +#include "winbase.h" #include "winnls.h" #include "winerror.h" diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index 6317bbb9474..ec90de4bd57 100644 --- a/dlls/devenum/devenum.rc +++ b/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 diff --git a/dlls/msacm/imaadp32/imaadp32.c b/dlls/msacm/imaadp32/imaadp32.c index a8117ffa52b..bcc4453f5ac 100644 --- a/dlls/msacm/imaadp32/imaadp32.c +++ b/dlls/msacm/imaadp32/imaadp32.c @@ -21,10 +21,10 @@ #include #include -#include "winnls.h" #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "winnls.h" #include "msacm.h" #include "mmreg.h" #include "../msacmdrv.h" diff --git a/dlls/msacm/msadp32/msadp32.c b/dlls/msacm/msadp32/msadp32.c index a7a8c632a44..66b6c07e5bc 100644 --- a/dlls/msacm/msadp32/msadp32.c +++ b/dlls/msacm/msadp32/msadp32.c @@ -21,10 +21,10 @@ #include #include -#include "winnls.h" #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "winnls.h" #include "msacm.h" #include "mmreg.h" #include "../msacmdrv.h" diff --git a/dlls/msacm/msg711/msg711.c b/dlls/msacm/msg711/msg711.c index 18023ad2ca8..e162d058d63 100644 --- a/dlls/msacm/msg711/msg711.c +++ b/dlls/msacm/msg711/msg711.c @@ -21,10 +21,10 @@ #include #include -#include "winnls.h" #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "winnls.h" #include "msacm.h" #include "mmreg.h" #include "../msacmdrv.h" diff --git a/dlls/msacm/winemp3/mpegl3.c b/dlls/msacm/winemp3/mpegl3.c index c0221f6073d..c0e6ab989b6 100644 --- a/dlls/msacm/winemp3/mpegl3.c +++ b/dlls/msacm/winemp3/mpegl3.c @@ -21,10 +21,10 @@ #include #include -#include "winnls.h" #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "winnls.h" #include "msacm.h" #include "mmreg.h" #include "../msacmdrv.h" diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 8c0abafbe06..047e217c58a 100644 --- a/dlls/ntdll/resource.c +++ b/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" diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 30c597a96fb..b18433defb5 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/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" diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ffe527c952f..e98113662ad 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -63,8 +63,9 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "winerror.h" -#include "winnls.h" /* for PRIMARYLANGID */ -#include "winreg.h" /* for HKEY_LOCAL_MACHINE */ +#include "winbase.h" +#include "winnls.h" +#include "winreg.h" #include "winuser.h" #include "wine/unicode.h" diff --git a/dlls/oleaut32/typelib16.c b/dlls/oleaut32/typelib16.c index 727acf46743..739d72598ac 100644 --- a/dlls/oleaut32/typelib16.c +++ b/dlls/oleaut32/typelib16.c @@ -30,8 +30,9 @@ #include #include "winerror.h" -#include "winnls.h" /* for PRIMARYLANGID */ -#include "winreg.h" /* for HKEY_LOCAL_MACHINE */ +#include "winbase.h" +#include "winnls.h" +#include "winreg.h" #include "winuser.h" #include "objbase.h" diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 844302c410f..f6976f377c8 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -30,6 +30,7 @@ #include #include "wine/debug.h" #include "windef.h" +#include "winbase.h" #include "winnls.h" #include "winreg.h" diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c index 43af25ede50..ad7b2f492c2 100644 --- a/dlls/shell32/shellstring.c +++ b/dlls/shell32/shellstring.c @@ -23,6 +23,7 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT +#include "winbase.h" #include "winnls.h" #include "winerror.h" #include "winreg.h" diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 275ba902939..37dc2695c59 100644 --- a/dlls/shell32/shlview.c +++ b/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" diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index 908eebae796..1b76ea5d37e 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -30,6 +30,7 @@ #include #include +#include "winbase.h" #include "winnls.h" #include "shlobj.h" #include "shellapi.h" diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index d8058a9822f..6991fb82119 100644 --- a/dlls/shlwapi/assoc.c +++ b/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" diff --git a/dlls/shlwapi/thread.c b/dlls/shlwapi/thread.c index fc0ddbbfe4b..98a3dfdad36 100644 --- a/dlls/shlwapi/thread.c +++ b/dlls/shlwapi/thread.c @@ -21,6 +21,7 @@ #include #include "windef.h" +#include "winbase.h" #include "winnls.h" #include "wine/debug.h" #define NO_SHLWAPI_REG diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index f66153482e4..c3e7a3d20e3 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -21,8 +21,8 @@ #include #include #include "windef.h" -#include "winnls.h" #include "winbase.h" +#include "winnls.h" #include "winerror.h" #include "wine/unicode.h" #include "wininet.h" diff --git a/dlls/ttydrv/graphics.c b/dlls/ttydrv/graphics.c index a211d9e496d..f94e6153c3a 100644 --- a/dlls/ttydrv/graphics.c +++ b/dlls/ttydrv/graphics.c @@ -20,6 +20,7 @@ #include "config.h" +#include "winbase.h" #include "winnls.h" #include "gdi.h" #include "wine/debug.h" diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index f05b1799889..3bedb45b13e 100644 --- a/dlls/winmm/joystick.c +++ b/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" diff --git a/graphics/x11drv/codepage.c b/graphics/x11drv/codepage.c index 656d83eff87..554bb4746e2 100644 --- a/graphics/x11drv/codepage.c +++ b/graphics/x11drv/codepage.c @@ -25,6 +25,7 @@ #include #include "windef.h" +#include "winbase.h" #include "winnls.h" #include "x11font.h" #include "wine/debug.h" diff --git a/graphics/x11drv/text.c b/graphics/x11drv/text.c index 34e78c491cc..490810a7062 100644 --- a/graphics/x11drv/text.c +++ b/graphics/x11drv/text.c @@ -28,6 +28,7 @@ #include #include "windef.h" +#include "winbase.h" #include "winnls.h" #include "wownt32.h" #include "gdi.h" diff --git a/graphics/x11drv/xfont.c b/graphics/x11drv/xfont.c index ecade9f24ff..6ad22049a47 100644 --- a/graphics/x11drv/xfont.c +++ b/graphics/x11drv/xfont.c @@ -40,6 +40,7 @@ #include #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winnls.h" #include "winreg.h" diff --git a/include/winnls.h b/include/winnls.h index 6b45a17dc9d..5c0f6d92623 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -20,8 +20,6 @@ #define __WINE_WINNLS_H #ifndef NONLS -#include "winbase.h" - #ifdef __cplusplus extern "C" { #endif diff --git a/memory/virtual.c b/memory/virtual.c index 6051035bdcf..5dcfb35cf81 100644 --- a/memory/virtual.c +++ b/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" diff --git a/msdos/ioports.c b/msdos/ioports.c index 21d72845474..a10474246d4 100644 --- a/msdos/ioports.c +++ b/msdos/ioports.c @@ -37,6 +37,7 @@ # include #endif #include "windef.h" +#include "winbase.h" #include "winnls.h" #include "winternl.h" #include "callback.h" diff --git a/objects/enhmetafile.c b/objects/enhmetafile.c index 942fef175cc..613ba1972e4 100644 --- a/objects/enhmetafile.c +++ b/objects/enhmetafile.c @@ -36,9 +36,9 @@ #include #include -#include "winnls.h" #include "winbase.h" #include "wingdi.h" +#include "winnls.h" #include "winerror.h" #include "gdi.h" #include "wine/debug.h" diff --git a/objects/font.c b/objects/font.c index bdc613a729f..db1950fa234 100644 --- a/objects/font.c +++ b/objects/font.c @@ -27,6 +27,7 @@ #include #include #include "winerror.h" +#include "winbase.h" #include "winnls.h" #include "wownt32.h" #include "gdi.h" diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index ec16e2b692e..15f131d94a7 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -42,6 +42,7 @@ #endif #undef KEY_EVENT /* avoid redefinition warning */ #include +#include #include #include "winecon_private.h" diff --git a/windows/dialog.c b/windows/dialog.c index f0465d6ea18..7dbe8397f7a 100644 --- a/windows/dialog.c +++ b/windows/dialog.c @@ -29,10 +29,10 @@ #include #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" diff --git a/windows/input.c b/windows/input.c index 2cca5876807..bfefcb4adda 100644 --- a/windows/input.c +++ b/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"