Cleanup of includes in VFS sources.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>

lib/vfs/mc-vfs/cpio.c

@@ -32,14 +32,12 @@
 #include "lib/global.h"
 #include "lib/unixcompat.h"
 
-#include "src/wtools.h"	/* message() */
-#include "src/main.h"	/* print_vfs_message */
-#include "vfs.h"
+#include "src/wtools.h"         /* message() */
 
-#include "utilvfs.h"
 #include "vfs-impl.h"
-#include "gc.h"			/* vfs_rmstamp */
+#include "utilvfs.h"
 #include "xdirentry.h"
+#include "gc.h"                 /* vfs_rmstamp */
 
 enum {
     STATUS_START,

lib/vfs/mc-vfs/direntry.c

@@ -42,12 +42,11 @@
 
 #include "src/wtools.h"         /* message() */
 #include "src/main.h"           /* print_vfs_message */
-#include "vfs.h"
 
-#include "utilvfs.h"
 #include "vfs-impl.h"
-#include "gc.h"                 /* vfs_rmstamp */
+#include "utilvfs.h"
 #include "xdirentry.h"
+#include "gc.h"                 /* vfs_rmstamp */
 
 #define CALL(x) if (MEDATA->x) MEDATA->x
 

lib/vfs/mc-vfs/extfs.c

@@ -50,12 +50,11 @@
 #include "lib/fileloc.h"
 
 #include "src/wtools.h"         /* message() */
-#include "src/main.h"           /* print_vfs_message */
+#include "src/main.h"           /* shell */
 #include "src/execute.h"        /* For shell_execute */
 
-#include "utilvfs.h"
-#include "vfs.h"
 #include "vfs-impl.h"
+#include "utilvfs.h"
 #include "gc.h"                 /* vfs_rmstamp */
 
 #undef ERRNOR

lib/vfs/mc-vfs/fish.c

@@ -63,12 +63,13 @@
 
 #include "src/wtools.h"         /* message() */
 #include "src/main.h"           /* print_vfs_message */
-#include "utilvfs.h"
-#include "xdirentry.h"
-#include "vfs.h"
+
 #include "vfs-impl.h"
-#include "gc.h"                 /* vfs_stamp_create */
+#include "utilvfs.h"
 #include "netutil.h"
+#include "xdirentry.h"
+#include "gc.h"                 /* vfs_stamp_create */
+
 #include "fish.h"
 #include "fishdef.h"
 

lib/vfs/mc-vfs/ftpfs.c

@@ -94,13 +94,14 @@ What to do with this?
 #include "src/history.h"
 #include "src/setup.h"          /* for load_anon_passwd */
 
-#include "utilvfs.h"
-#include "xdirentry.h"
-#include "vfs.h"
 #include "vfs-impl.h"
-#include "gc.h"                 /* vfs_stamp_create */
+#include "utilvfs.h"
 #include "netutil.h"
+#include "xdirentry.h"
+#include "gc.h"                 /* vfs_stamp_create */
+
 #include "ftpfs.h"
+
 #ifndef MAXHOSTNAMELEN
 #    define MAXHOSTNAMELEN 64
 #endif

lib/vfs/mc-vfs/gc.c

@@ -48,10 +48,10 @@
 #include "src/layout.h"		/* get_current_type(), get_other_type() */
 
 #include "vfs-impl.h"
-#include "gc.h"
-
 #include "utilvfs.h"
 
+#include "gc.h"
+
 int vfs_timeout = 60;		/* VFS timeout in seconds */
 
 static struct vfs_stamping *stamps;

lib/vfs/mc-vfs/local.c

@@ -14,11 +14,9 @@
 
 #include "lib/global.h"
 
-#include "src/wtools.h"	/* message() */
-#include "src/main.h"	/* print_vfs_message */
-
+#include "vfs-impl.h"
 #include "utilvfs.h"
-#include "vfs.h"
+
 #include "local.h"
 
 /**

lib/vfs/mc-vfs/netutil.c

@@ -28,6 +28,7 @@
 #include <signal.h>
 
 #include "lib/global.h"
+
 #include "netutil.h"
 
 volatile sig_atomic_t got_sigpipe = 0;

lib/vfs/mc-vfs/sfs.c

@@ -43,15 +43,14 @@
 
 #include "lib/global.h"
 
-#include "src/wtools.h"	/* message() */
-#include "src/main.h"	/* print_vfs_message */
+#include "src/wtools.h"		/* D_ERROR, D_NORMAL */
+#include "src/main.h"		/* mc_home */
 #include "src/execute.h"	/* EXECUTE_AS_SHELL */
 
-#include "utilvfs.h"
-#include "vfs.h"
 #include "vfs-impl.h"
-#include "gc.h"		/* vfs_stamp_create */
+#include "utilvfs.h"
 #include "local.h"
+#include "gc.h"		/* vfs_stamp_create */
 
 struct cachedfile {
     char *name, *cache;

lib/vfs/mc-vfs/smbfs.c

@@ -43,7 +43,6 @@
 #include "lib/global.h"
 
 #include "src/wtools.h"	/* message() */
-#include "src/main.h"	/* print_vfs_message */
 
 #undef	PACKAGE_BUGREPORT
 #undef	PACKAGE_NAME

lib/vfs/mc-vfs/tar.c

@@ -43,12 +43,11 @@
 #include "lib/global.h"
 
 #include "src/wtools.h"	/* message() */
-#include "src/main.h"	/* print_vfs_message */
-#include "vfs.h"
 
+#include "vfs-impl.h"
 #include "utilvfs.h"
-#include "gc.h"		/* vfs_rmstamp */
 #include "xdirentry.h"
+#include "gc.h"		/* vfs_rmstamp */
 
 static struct vfs_class vfs_tarfs_ops;
 

lib/vfs/mc-vfs/undelfs.c

@@ -57,10 +57,11 @@
 #include <ctype.h>
 
 #include "lib/global.h"
+
 #include "src/wtools.h"         /* message() */
 #include "src/main.h"           /* print_vfs_message */
+
 #include "utilvfs.h"
-#include "vfs.h"
 #include "vfs-impl.h"
 
 struct deleted_info

lib/vfs/mc-vfs/utilvfs.c

@@ -38,10 +38,10 @@
 #include "lib/global.h"
 #include "lib/unixcompat.h"
 
-#include "src/wtools.h"
+#include "src/wtools.h"        /* message() */
 #include "src/history.h"
 
-#include "vfs.h"
+#include "vfs-impl.h"
 #include "utilvfs.h"
 
 /** Get current username

lib/vfs/mc-vfs/vfs.c

@@ -52,16 +52,17 @@
 
 #include "lib/global.h"
 #include "lib/strutil.h"
+
 #ifdef HAVE_CHARSET
 #include "src/charsets.h"
 #endif
-
 #include "src/wtools.h"         /* message() */
-#include "src/main.h"           /* print_vfs_message */
+#include "src/main.h"           /* cd_symlinks */
 
+#include "vfs-impl.h"
 #include "utilvfs.h"
 #include "gc.h"
-#include "vfs.h"
+
 #ifdef ENABLE_VFS_NET
 #include "netutil.h"
 #endif
@@ -71,6 +72,7 @@
 #ifdef ENABLE_VFS_SMB
 #include "smbfs.h"
 #endif
+
 #include "local.h"
 
 #if defined(_AIX) && !defined(NAME_MAX)

lib/vfs/mc-vfs/xdirentry.h

@@ -9,7 +9,6 @@
 #define MC_VFS_XDIRENTRY_H
 
 #include <stdio.h>
-
 #include <sys/types.h>
 
 #define LINK_FOLLOW 15