diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index d2778cf45..74b8e391e 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,5 +1,9 @@
 2003-10-29  Pavel Roskin  <proski@gnu.org>
 
+	* extfs.h: Merge ...
+	* extfs.c: ... here.
+	* Makefile.am: Remove extfs.h.
+
 	* ftpfs.c: Use HAVE_STRUCT_LINGER_L_LINGER instead of
 	HAVE_STRUCT_LINGER.
 
diff --git a/vfs/Makefile.am b/vfs/Makefile.am
index a6eb6e519..16fc87413 100644
--- a/vfs/Makefile.am
+++ b/vfs/Makefile.am
@@ -23,7 +23,6 @@ BASICFILES = 			\
 	vfs.c
 
 VFSHDRS = 			\
-	extfs.h 		\
 	ftpfs.h 		\
 	local.h			\
 	mcfs.h 			\
diff --git a/vfs/extfs.c b/vfs/extfs.c
index fb91bd21c..6a8944b60 100644
--- a/vfs/extfs.c
+++ b/vfs/extfs.c
@@ -19,7 +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.  */
 
-/* Namespace: exports only vfs_extfs_ops */
+/* Namespace: init_extfs */
 
 #include <config.h>
 #include <stdio.h>
@@ -37,7 +37,6 @@
 #include "utilvfs.h"
 #include "../src/execute.h"	/* For shell_execute */
 #include "vfs.h"
-#include "extfs.h"
 
 #undef ERRNOR
 #define ERRNOR(x,y) do { my_errno = x; return y; } while(0)
@@ -76,6 +75,19 @@ struct pseudofile {
     struct entry *entry;
 };
 
+struct archive {
+    int fstype;
+    char *name;
+    char *local_name;
+    struct stat local_stat;
+    dev_t rdev;
+    int fd_usage;
+    ino_t __inode_counter;
+    struct entry *root_entry;
+    struct entry *current_dir;
+    struct archive *next;
+};
+
 static struct entry *extfs_find_entry (struct entry *dir, char *name,
 				       int make_dirs, int make_file);
 static int extfs_which (struct vfs_class *me, char *path);
diff --git a/vfs/extfs.h b/vfs/extfs.h
deleted file mode 100644
index a1eeae0ee..000000000
--- a/vfs/extfs.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Declarations for the extfs.
-
-   Copyright (C) 1995 The Free Software Foundation
-   
-   Written by: 1995 Jakub Jelinek
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-struct archive {
-    int fstype;
-    char *name;
-    char *local_name;
-    struct stat local_stat;
-    dev_t rdev;
-    int fd_usage;
-    ino_t __inode_counter;
-    struct entry *root_entry;
-    struct entry *current_dir;
-    struct archive *next;
-};
-
-typedef struct archive extfs_archive; 	/* Do _not_ use this inside extfs.c */
diff --git a/vfs/vfs.c b/vfs/vfs.c
index 638ff1365..d05e448e8 100644
--- a/vfs/vfs.c
+++ b/vfs/vfs.c
@@ -48,7 +48,6 @@
 #include "../src/wtools.h"	/* input_dialog() */
 
 #include "vfs.h"
-#include "extfs.h"		/* FIXME: we should not know anything about our modules */
 #ifdef USE_NETCODE
 #   include "tcputil.h"
 #endif