Don't use wine/unicode.h in the header files, include it directly

dlls/advapi32/security.c

@@ -26,7 +26,9 @@
 #include "heap.h"
 #include "winternl.h"
 #include "ntsecapi.h"
+
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(advapi);
 

dlls/comctl32/listview.c

@@ -133,7 +133,9 @@
 #include "heap.h"
 #include "commctrl.h"
 #include "comctl32.h"
+
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(listview);
 

dlls/shell32/shell32_main.c

@@ -42,6 +42,7 @@
 #include "shell32_main.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 

files/directory.c

@@ -57,6 +57,15 @@ static DOS_FULL_NAME DIR_System;
 static const WCHAR wineW[] = {'w','i','n','e',0};
 
 /***********************************************************************
+ *           FILE_contains_pathW
+ */
+inline static int FILE_contains_pathW (LPCWSTR name)
+{
+    return ((*name && (name[1] == ':')) ||
+            strchrW (name, '/') || strchrW (name, '\\'));
+}
+
+/***********************************************************************
  *           DIR_GetPath
  *
  * Get a path name from the wine.ini file and make sure it is valid.

include/file.h

@@ -28,7 +28,6 @@
 #include <sys/types.h>
 #include "winbase.h"
 #include "wine/windef16.h"  /* HFILE16 */
-#include "wine/unicode.h"
 
 #define MAX_PATHNAME_LEN   1024
 
@@ -68,12 +67,6 @@ inline static int FILE_contains_path (LPCSTR name)
             strchr (name, '/') || strchr (name, '\\'));
 }
 
-inline static int FILE_contains_pathW (LPCWSTR name)
-{
-    return ((*name && (name[1] == ':')) ||
-            strchrW (name, '/') || strchrW (name, '\\'));
-}
-
 /* files/file.c */
 extern mode_t FILE_umask;
 extern int FILE_strcasecmp( const char *str1, const char *str2 );

include/heap.h

@@ -25,7 +25,6 @@
 
 #include "winbase.h"
 #include "winnls.h"
-#include "wine/unicode.h"
 
 /* strdup macros */
 /* DO NOT USE THEM!!  they will go away soon */

loader/loadorder.c

@@ -30,7 +30,9 @@
 #include "winternl.h"
 #include "file.h"
 #include "module.h"
+
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(module);
 

loader/module.c

@@ -36,7 +36,9 @@
 #include "heap.h"
 #include "file.h"
 #include "module.h"
+
 #include "wine/debug.h"
+#include "wine/unicode.h"
 #include "wine/server.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(module);

msdos/dosconf.c

@@ -36,6 +36,7 @@
 #include "msdos.h"
 
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(profile);
 

windows/clipboard.c

@@ -49,7 +49,9 @@
 #include "user.h"
 #include "win.h"
 #include "clipboard.h"
+
 #include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(clipboard);