Moved inclusion of winestring.h to winebase.h.

include/winbase.h

@@ -2,6 +2,7 @@
 #define __WINE_WINBASE_H
 
 #include "winnt.h"
+#include "wine/winestring.h"
 
 #include "pshpack1.h"
 

include/wine/winestring.h

@@ -4,13 +4,15 @@
 #include "windef.h"
 
 INT16       WINAPI WideCharToLocal16(LPSTR,LPWSTR,INT16);
-INT       WINAPI WideCharToLocal(LPSTR,LPWSTR,INT);
+INT         WINAPI WideCharToLocal(LPSTR,LPWSTR,INT);
 INT16       WINAPI LocalToWideChar16(LPWSTR,LPSTR,INT16);
-INT       WINAPI LocalToWideChar(LPWSTR,LPSTR,INT);
-INT       WINAPI lstrncmpA(LPCSTR,LPCSTR,INT);
-INT       WINAPI lstrncmpW(LPCWSTR,LPCWSTR,INT);
-INT       WINAPI lstrncmpiA(LPCSTR,LPCSTR,INT);
-INT       WINAPI lstrncmpiW(LPCWSTR,LPCWSTR,INT);
+INT         WINAPI LocalToWideChar(LPWSTR,LPSTR,INT);
+INT         WINAPI lstrncmpA(LPCSTR,LPCSTR,INT);
+INT         WINAPI lstrncmpW(LPCWSTR,LPCWSTR,INT);
+#define     lstrncmp WINELIB_NAME_AW(lstrncmp)
+INT         WINAPI lstrncmpiA(LPCSTR,LPCSTR,INT);
+INT         WINAPI lstrncmpiW(LPCWSTR,LPCWSTR,INT);
+#define     lstrncmpi WINELIB_NAME_AW(lstrncmpi)
 LPWSTR      WINAPI lstrcpyAtoW(LPWSTR,LPCSTR);
 LPSTR       WINAPI lstrcpyWtoA(LPSTR,LPCWSTR);
 LPWSTR      WINAPI lstrcpynAtoW(LPWSTR,LPCSTR,INT);

include/winuser.h

@@ -6,7 +6,6 @@
 #endif
 #include "windef.h"
 #include "wingdi.h"
-#include "wine/winestring.h"
 
 #ifdef __cplusplus
 extern "C" {

multimedia/joystick.c

@@ -20,6 +20,7 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include "winuser.h"
+#include "winbase.h"
 #include "mmsystem.h"
 #include "debug.h"