diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 65ab33bee..c03ca3356 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,15 @@
+2001-06-25  Pavel Roskin  <proski@gnu.org>
+
+	* cpio.c: Include <config.h> before everything else.
+	* direntry.c: Likewise.
+	* fish.c: Likewise.
+	* ftpfs.c: Likewise.
+	* local.c: Likewise.
+	* tar.c: Likewise.
+	* utilvfs.h: Don't include <config.h> - it should be included
+	in all C files instead.
+	* xdirentry.h: Likewise.
+
 2001-06-19  Pavel Roskin  <proski@gnu.org>
 
 	* local.c (local_telldir): Warn and abort if telldir() is not
diff --git a/vfs/cpio.c b/vfs/cpio.c
index a8c631c0f..9e1ed7beb 100644
--- a/vfs/cpio.c
+++ b/vfs/cpio.c
@@ -19,6 +19,7 @@
    License along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+#include <config.h>
 #include "xdirentry.h"
 #include "utilvfs.h"
 #include <glib.h>
diff --git a/vfs/direntry.c b/vfs/direntry.c
index 0fca072c7..b0540b90a 100644
--- a/vfs/direntry.c
+++ b/vfs/direntry.c
@@ -26,7 +26,7 @@
  * Paths here do _not_ begin with '/', so root directory of
  * archive/site is simply "". Beware. */
 
-static volatile int total_inodes = 0, total_entries = 0;
+#include <config.h>
 
 #include "utilvfs.h"
 #include "xdirentry.h"
@@ -34,6 +34,8 @@ static volatile int total_inodes = 0, total_entries = 0;
 
 #define CALL(x) if (MEDATA->x) MEDATA->x
 
+static volatile int total_inodes = 0, total_entries = 0;
+
 vfs_s_inode *
 vfs_s_new_inode (vfs *me, vfs_s_super *super, struct stat *initstat)
 {
diff --git a/vfs/fish.c b/vfs/fish.c
index 085c5deac..f599e61ba 100644
--- a/vfs/fish.c
+++ b/vfs/fish.c
@@ -36,6 +36,8 @@
 
 /* Define this if your ssh can take -I option */
 
+#include <config.h>
+
 #undef HAVE_HACKED_SSH
 
 #include "utilvfs.h"
diff --git a/vfs/ftpfs.c b/vfs/ftpfs.c
index e1221be67..f1ed6619f 100644
--- a/vfs/ftpfs.c
+++ b/vfs/ftpfs.c
@@ -56,6 +56,7 @@ What to do with this?
 
 /* Namespace pollution: horrible */
 
+#include <config.h>
 #include <sys/types.h>          /* POSIX-required by sys/socket.h and netdb.h */
 #include <netdb.h>		/* struct hostent */
 #include <sys/socket.h>		/* AF_INET */
diff --git a/vfs/local.c b/vfs/local.c
index 32ef435f9..d23483752 100644
--- a/vfs/local.c
+++ b/vfs/local.c
@@ -1,3 +1,4 @@
+#include <config.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -9,7 +10,6 @@
 #include "utilvfs.h"
 
 #include "vfs.h"
-#include <config.h>
 #include "local.h"
 
 /* Note: Some of this functions are not static. This has rather good
diff --git a/vfs/tar.c b/vfs/tar.c
index ac4f1bb3a..4443c390e 100644
--- a/vfs/tar.c
+++ b/vfs/tar.c
@@ -20,9 +20,10 @@
 
 /* Namespace: vfs_tarfs_ops */
 
-#include "xdirentry.h"
+#include <config.h>
 #include <errno.h>
 
+#include "xdirentry.h"
 #include "utilvfs.h"
 
 #include "../src/dialog.h"	/* For MSG_ERROR */
diff --git a/vfs/utilvfs.h b/vfs/utilvfs.h
index ce3af816b..e2b285641 100644
--- a/vfs/utilvfs.h
+++ b/vfs/utilvfs.h
@@ -1,4 +1,3 @@
-#include <config.h>
 #include "../src/global.h"
 
 #include "../src/tty.h"		/* enable/disable interrupt key */
diff --git a/vfs/xdirentry.h b/vfs/xdirentry.h
index b5073046f..46cafbcb1 100644
--- a/vfs/xdirentry.h
+++ b/vfs/xdirentry.h
@@ -3,7 +3,6 @@
 
 /* $Id$ */
 
-#include <config.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>