Include system headers before VLC headers

This fixes some problems when the system or VLC play evil tricks with
the preprocessor. (Only files including sys/stat.h are concerned with
this commit. I did not fix all files.)

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index fad5ed67607c680bbd1aace2d3549c0a1ea9b356..381da516450dfc1d712236ed8c45fa697c22808c 100644 (file)
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -30,18 +30,6 @@
 #endif
 
 #include <assert.h>
-#include <vlc_common.h>
-#include <vlc_plugin.h>
-#include <vlc_input.h>
-#include <vlc_access.h>
-#include <vlc_demux.h>
-#include <vlc_charset.h>
-#include <vlc_fs.h>
-#include <vlc_url.h>
-#include <vlc_vout.h>
-
-#include <vlc_dialog.h>
-
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif
@@ -54,6 +42,16 @@
 #endif
 #include <errno.h>
 
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_input.h>
+#include <vlc_access.h>
+#include <vlc_demux.h>
+#include <vlc_charset.h>
+#include <vlc_fs.h>
+#include <vlc_url.h>
+#include <vlc_vout.h>
+#include <vlc_dialog.h>
 #include <vlc_keys.h>
 #include <vlc_iso_lang.h>
 

diff --git a/modules/access/file.c b/modules/access/file.c
index b2ed9f1695ceed776b1825e05cb5feb5d50d0b9f..e51e616b16d9fccdbaf807118d33be53771cf542 100644 (file)
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -27,12 +27,6 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-#include "fs.h"
-#include <vlc_input.h>
-#include <vlc_access.h>
-#include <vlc_dialog.h>
-
 #include <assert.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -58,7 +52,6 @@
 #   include <io.h>
 #   include <ctype.h>
 #   include <shlwapi.h>
-#   include <vlc_charset.h>
 #else
 #   include <unistd.h>
 #endif
@@ -71,6 +64,14 @@
 #   define lseek _lseeki64
 #endif
 
+#include <vlc_common.h>
+#include "fs.h"
+#include <vlc_input.h>
+#include <vlc_access.h>
+#include <vlc_dialog.h>
+#ifdef WIN32
+# include <vlc_charset.h>
+#endif
 #include <vlc_fs.h>
 #include <vlc_url.h>
 

diff --git a/modules/access/mtp.c b/modules/access/mtp.c
index eb7e80a09bd4071e66211b2aaf58d6756a11e546..fe094ecac72d67780811a6ef014d3d1abf6c8e92 100644 (file)
--- a/modules/access/mtp.c
+++ b/modules/access/mtp.c
@@ -30,12 +30,6 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-#include <vlc_plugin.h>
-#include <vlc_input.h>
-#include <vlc_access.h>
-#include <vlc_dialog.h>
-
 #include <assert.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -45,10 +39,14 @@
 #ifdef HAVE_FCNTL_H
 #   include <fcntl.h>
 #endif
-
 #include <unistd.h>
 #include <poll.h>
 
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_input.h>
+#include <vlc_access.h>
+#include <vlc_dialog.h>
 #include <vlc_fs.h>
 
 #include "libmtp.h"

diff --git a/modules/access/smb.c b/modules/access/smb.c
index c9b931477a697a5b694e9036c56f73ab34ad87a1..2bc7ab52b70bcff51a2c3b88ca989eda15dc816e 100644 (file)
--- a/modules/access/smb.c
+++ b/modules/access/smb.c
@@ -28,11 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-#include <vlc_fs.h>
-#include <vlc_plugin.h>
-#include <vlc_access.h>
-
+#include <errno.h>
 #ifdef WIN32
 #   ifdef HAVE_FCNTL_H
 #       include <fcntl.h>
@@ -50,7 +46,10 @@
 #   include <libsmbclient.h>
 #endif
 
-#include <errno.h>
+#include <vlc_common.h>
+#include <vlc_fs.h>
+#include <vlc_plugin.h>
+#include <vlc_access.h>
 
 /*****************************************************************************
  * Module descriptor

diff --git a/modules/access/vcd/cdrom.c b/modules/access/vcd/cdrom.c
index c17428904c6ce883102c70929c71a86f0af6eb5e..d417b28a753dd2b9123a561c7b89fe2684da8570 100644 (file)
--- a/modules/access/vcd/cdrom.c
+++ b/modules/access/vcd/cdrom.c
@@ -34,16 +34,9 @@
 #   define INCL_DOSDEVIOCTL
 #endif
 
-#include <vlc_common.h>
-#include <vlc_access.h>
-#include <vlc_charset.h>
-#include <vlc_fs.h>
-#include <limits.h>
-
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif
-
 #include <sys/types.h>
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
@@ -55,6 +48,12 @@
 #   include <arpa/inet.h>
 #endif
 
+#include <vlc_common.h>
+#include <vlc_access.h>
+#include <vlc_charset.h>
+#include <vlc_fs.h>
+#include <limits.h>
+
 #if defined( SYS_BSDI )
 #   include <dvd.h>
 #elif defined ( __APPLE__ )

diff --git a/modules/demux/mp4/drms.c b/modules/demux/mp4/drms.c
index 39f4225f30f66088e37b8c17ae2029154c79f5c5..eb312b0617cb7390067825e7a668aeeb4ad089e8 100644 (file)
--- a/modules/demux/mp4/drms.c
+++ b/modules/demux/mp4/drms.c
@@ -26,36 +26,29 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-#include <vlc_md5.h>
-#include "libmp4.h"
-#include <vlc_fs.h>
-
+/* In Solaris (and perhaps others) PATH_MAX is in limits.h. */
+#include <limits.h>
 #ifdef WIN32
 #   include <io.h>
-#else
-#   include <stdio.h>
-#endif
-
-#include <errno.h>
-
-#ifdef WIN32
 #   if !defined( UNDER_CE )
 #       include <direct.h>
 #   endif
 #   include <tchar.h>
 #   include <shlobj.h>
 #   include <windows.h>
+#else
+#   include <stdio.h>
 #endif
-
+#include <errno.h>
+#include <sys/types.h>
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
 #endif
-#include <sys/types.h>
-
-/* In Solaris (and perhaps others) PATH_MAX is in limits.h. */
-#include <limits.h>
 
+#include <vlc_common.h>
+#include <vlc_md5.h>
+#include "libmp4.h"
+#include <vlc_fs.h>
 #ifdef __APPLE__
 #include "TargetConditionals.h"
 #ifndef TARGET_OS_IPHONE

diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index 2ebacc67a700a34ba1c5df3371e9adc1fb264da1..2c0ceb2022af6682c98899edc194aa915d19592a 100644 (file)
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -34,11 +34,16 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-#include <vlc_plugin.h>
-
 #define _XOPEN_SOURCE_EXTENDED 1
+
+#include <assert.h>
 #include <wchar.h>
+#ifdef HAVE_SYS_STAT_H
+#   include <sys/stat.h>
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 
 #include <ncurses.h>
 
@@ -53,12 +58,6 @@
 #include <vlc_fs.h>
 #include <vlc_url.h>
 
-#include <assert.h>
-
-#ifdef HAVE_SYS_STAT_H
-#   include <sys/stat.h>
-#endif
-
 /*****************************************************************************
  * Local prototypes.
  *****************************************************************************/

diff --git a/modules/gui/skins2/src/theme_loader.cpp b/modules/gui/skins2/src/theme_loader.cpp
index 9e78572a28983ef7ee7e95015f78152c739e8e48..06ffe3672fb599fa58472fe4bb2ab43a8dc97f8b 100644 (file)
--- a/modules/gui/skins2/src/theme_loader.cpp
+++ b/modules/gui/skins2/src/theme_loader.cpp
@@ -26,6 +26,16 @@
 # include "config.h"
 #endif
 
+#ifdef HAVE_FCNTL_H
+#   include <fcntl.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#   include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#   include <unistd.h>
+#endif
+
 #include <vlc_common.h>
 #include <vlc_fs.h>
 
@@ -37,16 +47,6 @@
 #include "../src/vlcproc.hpp"
 #include "../src/window_manager.hpp"
 
-#ifdef HAVE_FCNTL_H
-#   include <fcntl.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#   include <sys/stat.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
-
 #if defined( HAVE_ZLIB_H )
 #   include <zlib.h>
 #   include <errno.h>

diff --git a/modules/lua/intf.c b/modules/lua/intf.c
index 61fe36253cec0ee9b35354340bdb1ed62ccdec09..f80dc39da3f6fde9f813c99bbb09d78628859b89 100644 (file)
--- a/modules/lua/intf.c
+++ b/modules/lua/intf.c
@@ -24,19 +24,16 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#ifndef  _GNU_SOURCE
-#   define  _GNU_SOURCE
-#endif
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-#include <vlc_interface.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include <vlc_common.h>
+#include <vlc_interface.h>
+
 #include "vlc.h"
 #include "libs.h"
 

diff --git a/modules/lua/libs/net.c b/modules/lua/libs/net.c
index 0e832cc27e40c856523684f5df13e3354e41c0e8..33e3750c7d06d3d39593d0d524275d443d6b2b0c 100644 (file)
--- a/modules/lua/libs/net.c
+++ b/modules/lua/libs/net.c
@@ -24,30 +24,24 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#ifndef  _GNU_SOURCE
-#   define  _GNU_SOURCE
-#endif
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <errno.h>
 #ifdef WIN32
 #include <io.h>
 #endif
+#ifdef HAVE_POLL
+#include <poll.h>       /* poll structures and defines */
+#endif
+#include <sys/stat.h>
 
 #include <vlc_common.h>
 #include <vlc_network.h>
 #include <vlc_url.h>
 #include <vlc_fs.h>
 
-#ifdef HAVE_POLL
-#include <poll.h>       /* poll structures and defines */
-#endif
-
-#include <sys/stat.h>
-
-#include<errno.h>
 #include "../vlc.h"
 #include "../libs.h"
 

diff --git a/modules/lua/vlc.c b/modules/lua/vlc.c
index a14f24abaefef8e8b447da21fea71cbc4b9f8bb9..7c4ba5da02c38a9f18f9bbfd2cc793e41e2b7742 100644 (file)
--- a/modules/lua/vlc.c
+++ b/modules/lua/vlc.c
@@ -25,15 +25,12 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#ifndef  _GNU_SOURCE
-#   define  _GNU_SOURCE
-#endif
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
 #include <assert.h>
+#include <sys/stat.h>
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
@@ -43,7 +40,6 @@
 #include <vlc_aout.h>
 #include <vlc_services_discovery.h>
 #include <vlc_stream.h>
-#include <sys/stat.h>
 
 #include "vlc.h"
 

diff --git a/modules/media_library/sql_media_library.h b/modules/media_library/sql_media_library.h
index 287737ce9683c7d0e9ae2da1f6201a384cf4f2a5..572394e2202bd6aa41230860288a95f0103dc838 100644 (file)
--- a/modules/media_library/sql_media_library.h
+++ b/modules/media_library/sql_media_library.h
@@ -28,17 +28,16 @@
 #ifndef SQL_MEDIA_LIBRARY_H
 #define SQL_MEDIA_LIBRARY_H
 
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include <stdarg.h>
+#include <assert.h>
+#include <errno.h>
+#ifdef HAVE_SYS_STAT_H
+#   include <sys/stat.h>
 #endif
 
 #include <vlc_common.h>
-#include <vlc/vlc.h>
-
 #include <vlc_sql.h>
 #include <vlc_media_library.h>
-
 #include <vlc_playlist.h>
 #include <vlc_input.h>
 #include <vlc_arrays.h>
@@ -47,17 +46,8 @@
 #include <vlc_interface.h>
 #include <vlc_modules.h>
 
-#include <stdarg.h>
-#include <assert.h>
-#include <errno.h>
-
 #include "item_list.h"
 
-#ifdef HAVE_SYS_STAT_H
-#   include <sys/stat.h>
-#endif
-
-
 /*****************************************************************************
  * Static parameters
  *****************************************************************************/

diff --git a/modules/meta_engine/folder.c b/modules/meta_engine/folder.c
index 46337908c49728e8d524b96397a3de288edac661..724bae6b004d80dbae93752843bd8f577f93b78c 100644 (file)
--- a/modules/meta_engine/folder.c
+++ b/modules/meta_engine/folder.c
@@ -29,6 +29,10 @@
 # include "config.h"
 #endif
 
+#ifdef HAVE_SYS_STAT_H
+#   include <sys/stat.h>
+#endif
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_art_finder.h>
@@ -36,10 +40,6 @@
 #include <vlc_url.h>
 #include <vlc_input_item.h>
 
-#ifdef HAVE_SYS_STAT_H
-#   include <sys/stat.h>
-#endif
-
 static const char* cover_files[] = {
     "Folder.jpg",           /* Windows */
     "AlbumArtSmall.jpg",    /* Windows */

diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index fdfd37b22ecceab1cd457eeeff92f0ca860c1124..78771eb44d4e16e84815f7f9cb20a800232303e8 100644 (file)
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -26,13 +26,11 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-#include <vlc_plugin.h>
 #include <errno.h>
 #include <time.h>
-
 #include <sys/types.h>
 #include <errno.h>
+
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
@@ -42,9 +40,10 @@
 #else
 # include <unistd.h>
 #endif
-# include <fcntl.h>
-
+#include <fcntl.h>
 
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_tls.h>
 #include <vlc_charset.h>
 #include <vlc_fs.h>

diff --git a/modules/services_discovery/mediadirs.c b/modules/services_discovery/mediadirs.c
index 11885a8e0a89f0bae3e1f298ff0983f932d3a27c..dd841a58fa07e1f0d7e93c80c4b40d7c0177f599 100644 (file)
--- a/modules/services_discovery/mediadirs.c
+++ b/modules/services_discovery/mediadirs.c
@@ -29,15 +29,14 @@
 # include "config.h"
 #endif
 
+#include <sys/stat.h>
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_url.h>
 #include <vlc_fs.h>
 #include <vlc_services_discovery.h>
 
-#include <sys/stat.h>
-
-
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/

diff --git a/src/input/input.c b/src/input/input.c
index 9a8f9ae4fb34d624710e21c254a7f53f651939d3..445dc142e77c0adbf55722f6caabbf05b1ac57f4 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -34,6 +34,9 @@
 #include <limits.h>
 #include <assert.h>
 #include <errno.h>
+#ifdef HAVE_SYS_STAT_H
+#   include <sys/stat.h>
+#endif
 
 #include "input_internal.h"
 #include "event.h"
@@ -55,10 +58,6 @@
 #include <vlc_strings.h>
 #include <vlc_modules.h>
 
-#ifdef HAVE_SYS_STAT_H
-#   include <sys/stat.h>
-#endif
-
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/

diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index 4108a9bc2cbd80a816db9b5c7d78609e30d55e83..b8f4e729fd9cec9b7d10dbe2d89a73c7307a5be0 100644 (file)
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -31,17 +31,15 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-#include <vlc_fs.h>
-#include <vlc_url.h>
-
+#include <ctype.h> /* isalnum() */
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif
-
 #include <sys/stat.h>
 
-#include <ctype.h> /* isalnum */
+#include <vlc_common.h>
+#include <vlc_fs.h>
+#include <vlc_url.h>
 
 #include "input_internal.h"
 

diff --git a/src/misc/block.c b/src/misc/block.c
index 9cf832bef95fcb8f39c09ec220d56742a23283bc..ebdda1dcf1e3fd2aedee9273a0ff781aaa8e4561 100644 (file)
--- a/src/misc/block.c
+++ b/src/misc/block.c
@@ -28,7 +28,6 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
 #include <sys/stat.h>
 #include <assert.h>
 #include <errno.h>
@@ -36,7 +35,8 @@
 # include <unistd.h>
 #endif
 
-#include "vlc_block.h"
+#include <vlc_common.h>
+#include <vlc_block.h>
 
 /**
  * @section Block handling functions.

diff --git a/src/modules/cache.c b/src/modules/cache.c
index 779656a07ffebf147e0036b0934bc00d71d71c47..c71dde2da430c039bebc587e5185471532771c2e 100644 (file)
--- a/src/modules/cache.c
+++ b/src/modules/cache.c
@@ -28,15 +28,9 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-#include "libvlc.h"
-
-#include <stdlib.h>                                      /* free(), strtol() */
-#include <stdio.h>                                              /* sprintf() */
-#include <string.h>                                              /* strdup() */
-#include <vlc_plugin.h>
-#include <errno.h>
-
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifdef HAVE_UNISTD_H
@@ -44,6 +38,12 @@
 #endif
 #include <assert.h>
 
+#include <vlc_common.h>
+#include "libvlc.h"
+
+#include <vlc_plugin.h>
+#include <errno.h>
+
 #include "config/configuration.h"
 
 #include <vlc_fs.h>

diff --git a/src/playlist/art.c b/src/playlist/art.c
index 31ba188cdc298186cb21caf7d02d1ba0b1846b27..08c794ebf654754b2d72bd1775e79e1afaf98349 100644 (file)
--- a/src/playlist/art.c
+++ b/src/playlist/art.c
@@ -27,6 +27,10 @@
 #endif
 
 #include <assert.h>
+#ifdef HAVE_SYS_STAT_H
+#   include <sys/stat.h>
+#endif
+
 #include <vlc_common.h>
 #include <vlc_playlist.h>
 #include <vlc_fs.h>
@@ -35,10 +39,6 @@
 #include <vlc_url.h>
 #include <vlc_md5.h>
 
-#ifdef HAVE_SYS_STAT_H
-#   include <sys/stat.h>
-#endif
-
 #include "../libvlc.h"
 #include "playlist_internal.h"
 

diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c
index dc19963be41c24ad20ad07517ef8c8080f82efa2..5470d4838f979b8d463509c1588e665d1f10fdee 100644 (file)
--- a/src/playlist/loadsave.c
+++ b/src/playlist/loadsave.c
@@ -24,6 +24,10 @@
 # include "config.h"
 #endif
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
 #include <vlc_common.h>
 #include <vlc_playlist.h>
 #include <vlc_events.h>
@@ -33,10 +37,6 @@
 #include <vlc_url.h>
 #include <vlc_modules.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
 int playlist_Export( playlist_t * p_playlist, const char *psz_filename,
                      playlist_item_t *p_export_root, const char *psz_type )
 {

diff --git a/src/posix/filesystem.c b/src/posix/filesystem.c
index 7d9e7234f879efe28c16a35df0e3ad2a72f33d2d..06b7e146f699f70159c3c48daacc001f7f1b39e6 100644 (file)
--- a/src/posix/filesystem.c
+++ b/src/posix/filesystem.c
@@ -25,26 +25,26 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-#include <vlc_charset.h>
-#include <vlc_fs.h>
-#include "libvlc.h" /* vlc_mkdir */
-
 #include <assert.h>
 
 #include <stdio.h>
 #include <limits.h> /* NAME_MAX */
 #include <errno.h>
+
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
+#ifndef HAVE_LSTAT
+# define lstat(a, b) stat(a, b)
+#endif
 #include <dirent.h>
 #include <sys/socket.h>
 
-#ifndef HAVE_LSTAT
-# define lstat( a, b ) stat(a, b)
-#endif
+#include <vlc_common.h>
+#include <vlc_charset.h>
+#include <vlc_fs.h>
+#include "libvlc.h" /* vlc_mkdir */
 
 /**
  * Opens a system file handle.

diff --git a/src/video_output/snapshot.c b/src/video_output/snapshot.c
index dfde5bd5401eda19ca3f589e8b8ddb4a9e6fc22d..8ecac34b8e6a7fad007439aeba0aca5731a841cf 100644 (file)
--- a/src/video_output/snapshot.c
+++ b/src/video_output/snapshot.c
@@ -26,6 +26,11 @@
 # include "config.h"
 #endif
 
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <time.h>
+
 #include <vlc_common.h>
 #include <vlc_fs.h>
 #include <vlc_strings.h>
@@ -33,11 +38,6 @@
 
 #include "snapshot.h"
 
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <time.h>
-
 /* */
 void vout_snapshot_Init(vout_snapshot_t *snap)
 {

diff --git a/src/win32/filesystem.c b/src/win32/filesystem.c
index 381943750b6bc2aa1db63d0633bb0ad64049783d..ea86b507405509d8ace052e57f82821031cacf07 100644 (file)
--- a/src/win32/filesystem.c
+++ b/src/win32/filesystem.c
@@ -28,11 +28,6 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-#include <vlc_charset.h>
-#include <vlc_fs.h>
-#include "libvlc.h" /* vlc_mkdir */
-
 #include <assert.h>
 
 #include <stdio.h>
@@ -48,6 +43,11 @@
 # include <tchar.h>
 #endif
 
+#include <vlc_common.h>
+#include <vlc_charset.h>
+#include <vlc_fs.h>
+#include "libvlc.h" /* vlc_mkdir */
+
 static wchar_t *widen_path (const char *path)
 {
     wchar_t *wpath;