Moved LCTYPE, GetLocaleInfo, NUMBERFMT, CURRENCYFMT and the related

include/winbase.h

@@ -1726,9 +1726,6 @@ DWORD       WINAPI GetFileAttributesW(LPCWSTR);
 UINT      WINAPI GetLogicalDriveStringsA(UINT,LPSTR);
 UINT      WINAPI GetLogicalDriveStringsW(UINT,LPWSTR);
 #define     GetLogicalDriveStrings WINELIB_NAME_AW(GetLogicalDriveStrings)
-INT       WINAPI GetLocaleInfoA(LCID,LCTYPE,LPSTR,INT);
-INT       WINAPI GetLocaleInfoW(LCID,LCTYPE,LPWSTR,INT);
-#define     GetLocaleInfo WINELIB_NAME_AW(GetLocaleInfo)
 DWORD       WINAPI GetModuleFileNameA(HMODULE,LPSTR,DWORD);
 DWORD       WINAPI GetModuleFileNameW(HMODULE,LPWSTR,DWORD);
 #define     GetModuleFileName WINELIB_NAME_AW(GetModuleFileName)

include/windef.h

@@ -195,7 +195,6 @@ typedef HANDLE          HHOOK;
 typedef HANDLE          HMONITOR;
 typedef DWORD           LCID;
 typedef WORD            LANGID;
-typedef DWORD           LCTYPE;
 typedef float           FLOAT;
 
 /* Pointers types. These are the same for emulator and library. */
@@ -352,6 +351,8 @@ typedef LRESULT CALLBACK (*WNDPROC)(HWND,UINT,WPARAM,LPARAM);
 #define OPTIONAL
 #endif  /* __WINE__ */
 
+#include "winnt.h"
+
 /* Macro for structure packing. */
 
 #ifdef __GNUC__

include/wine/winbase16.h

@@ -3,6 +3,7 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "winnls.h"
 #include "wine/windef16.h"
 
 #include "pshpack1.h"