Splittet the vfs.h header into a user's part (vfs.h) and an implementor's part (vfs-impl.h).

vfs/cpio.c

@@ -20,6 +20,7 @@
 #include <config.h>
 #include <errno.h>
 #include "utilvfs.h"
+#include "vfs-impl.h"
 #include "gc.h"		/* vfs_rmstamp */
 #include "xdirentry.h"
 

vfs/direntry.c

@@ -28,6 +28,7 @@
 #include <errno.h>
 
 #include "utilvfs.h"
+#include "vfs-impl.h"
 #include "gc.h"		/* vfs_rmstamp */
 #include "xdirentry.h"
 

vfs/extfs.c

@@ -37,6 +37,7 @@
 #include "utilvfs.h"
 #include "../src/execute.h"	/* For shell_execute */
 #include "vfs.h"
+#include "vfs-impl.h"
 #include "gc.h"		/* vfs_rmstamp */
 
 #undef ERRNOR

vfs/fish.c

@@ -43,6 +43,7 @@
 
 #include "xdirentry.h"
 #include "vfs.h"
+#include "vfs-impl.h"
 #include "gc.h"		/* vfs_stamp_create */
 #include "tcputil.h"
 

vfs/ftpfs.c

@@ -72,6 +72,7 @@ What to do with this?
 
 #include "xdirentry.h"
 #include "vfs.h"
+#include "vfs-impl.h"
 #include "gc.h"		/* vfs_stamp_create */
 #include "tcputil.h"
 #include "../src/setup.h"	/* for load_anon_passwd */

vfs/gc.c

@@ -32,6 +32,7 @@
 #include <ctype.h>		/* is_digit() */
 
 #include "utilvfs.h"
+#include "vfs-impl.h"
 #include "gc.h"
 #include "vfs.h"
 

vfs/gc.h

@@ -1,6 +1,8 @@
 #ifndef __GC_H
 #define __GC_H
 
+#include "vfs-impl.h"
+
 struct vfs_stamping {
     struct vfs_class *v;
     vfsid id;

vfs/local.h

@@ -1,6 +1,8 @@
 #ifndef _VFS_LOCAL_H_
 #define _VFS_LOCAL_H_
 
+#include "vfs-impl.h"
+
 extern int local_close (void *data);
 extern int local_read (void *data, char *buffer, int count);
 extern int local_fstat (void *data, struct stat *buf);

vfs/mcfs.c

@@ -51,6 +51,7 @@
 #include "utilvfs.h"
 
 #include "vfs.h"
+#include "vfs-impl.h"
 #include "mcfs.h"
 #include "mcfsutil.h"
 #include "tcputil.h"

vfs/sfs.c

@@ -22,6 +22,7 @@
 #include "utilvfs.h"
 
 #include "vfs.h"
+#include "vfs-impl.h"
 #include "gc.h"		/* vfs_stamp_create */
 #include "local.h"
 #include "../src/execute.h"	/* EXECUTE_AS_SHELL */