Remove lots of gnome vfs includes

2007-11-02  Alexander Larsson  <alexl@redhat.com>

        * libnautilus-private/nautilus-customization-data.[ch]:
        * libnautilus-private/nautilus-desktop-directory.c:
        * libnautilus-private/nautilus-directory-async.c:
        * libnautilus-private/nautilus-directory-private.h:
        * libnautilus-private/nautilus-directory.[ch]:
        * libnautilus-private/nautilus-file-operations-progress.[ch]:
        * libnautilus-private/nautilus-file-private.h:
        * libnautilus-private/nautilus-file-utilities.c:
        * libnautilus-private/nautilus-file.[ch]:
        * libnautilus-private/nautilus-global-preferences.c:
        * libnautilus-private/nautilus-icon-dnd.c:
        * libnautilus-private/nautilus-metafile.c:
        * libnautilus-private/nautilus-monitor.c:
        * libnautilus-private/nautilus-program-choosing.c:
        * libnautilus-private/nautilus-query.h:
        * libnautilus-private/nautilus-search-directory.c:
        * libnautilus-private/nautilus-search-engine-tracker.c:
        * libnautilus-private/nautilus-search-engine.h:
        * libnautilus-private/nautilus-thumbnails.c:
        * libnautilus-private/nautilus-tree-view-drag-dest.c:
        * libnautilus-private/nautilus-vfs-utils.h:
        * src/file-manager/fm-desktop-icon-view.c:
        * src/file-manager/fm-ditem-page.c:
        * src/file-manager/fm-icon-container.c:
        * src/file-manager/fm-icon-view.c:
        * src/file-manager/fm-list-view.c:
        * src/file-manager/fm-properties-window.c:
        * src/file-manager/fm-tree-view.c:
        * src/nautilus-desktop-window.c:
        * src/nautilus-emblem-sidebar.c:
        * src/nautilus-location-bar.c:
        * src/nautilus-location-dialog.c:
        * src/nautilus-location-entry.c:
        * src/nautilus-main.c:
        * src/nautilus-navigation-window-menus.c:
        * src/nautilus-places-sidebar.c:
        * src/nautilus-query-editor.c:
        * src/nautilus-shell.c:
        * src/nautilus-sidebar-title.c:
        * src/nautilus-window-manage-views.c:
        * src/nautilus-window.c:
        * test/test-nautilus-mime-actions-set.c:
        * test/test-nautilus-mime-actions.c:
        * test/test.h:
	Remove lots of gnome vfs includes
	
        * src/Makefile.am:
	Disable building of connect to server app


svn path=/branches/gio-branch/; revision=13400

50 files changed, 130 insertions, 158 deletions

diff --git a/ChangeLog b/ChangeLog
index 0a0325560..0a3db5586 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,56 @@
 2007-11-02  Alexander Larsson  <alexl@redhat.com>
 
+        * libnautilus-private/nautilus-customization-data.[ch]:
+        * libnautilus-private/nautilus-desktop-directory.c:
+        * libnautilus-private/nautilus-directory-async.c:
+        * libnautilus-private/nautilus-directory-private.h:
+        * libnautilus-private/nautilus-directory.[ch]:
+        * libnautilus-private/nautilus-file-operations-progress.[ch]:
+        * libnautilus-private/nautilus-file-private.h:
+        * libnautilus-private/nautilus-file-utilities.c:
+        * libnautilus-private/nautilus-file.[ch]:
+        * libnautilus-private/nautilus-global-preferences.c:
+        * libnautilus-private/nautilus-icon-dnd.c:
+        * libnautilus-private/nautilus-metafile.c:
+        * libnautilus-private/nautilus-monitor.c:
+        * libnautilus-private/nautilus-program-choosing.c:
+        * libnautilus-private/nautilus-query.h:
+        * libnautilus-private/nautilus-search-directory.c:
+        * libnautilus-private/nautilus-search-engine-tracker.c:
+        * libnautilus-private/nautilus-search-engine.h:
+        * libnautilus-private/nautilus-thumbnails.c:
+        * libnautilus-private/nautilus-tree-view-drag-dest.c:
+        * libnautilus-private/nautilus-vfs-utils.h:
+        * src/file-manager/fm-desktop-icon-view.c:
+        * src/file-manager/fm-ditem-page.c:
+        * src/file-manager/fm-icon-container.c:
+        * src/file-manager/fm-icon-view.c:
+        * src/file-manager/fm-list-view.c:
+        * src/file-manager/fm-properties-window.c:
+        * src/file-manager/fm-tree-view.c:
+        * src/nautilus-desktop-window.c:
+        * src/nautilus-emblem-sidebar.c:
+        * src/nautilus-location-bar.c:
+        * src/nautilus-location-dialog.c:
+        * src/nautilus-location-entry.c:
+        * src/nautilus-main.c:
+        * src/nautilus-navigation-window-menus.c:
+        * src/nautilus-places-sidebar.c:
+        * src/nautilus-query-editor.c:
+        * src/nautilus-shell.c:
+        * src/nautilus-sidebar-title.c:
+        * src/nautilus-window-manage-views.c:
+        * src/nautilus-window.c:
+        * test/test-nautilus-mime-actions-set.c:
+        * test/test-nautilus-mime-actions.c:
+        * test/test.h:
+	Remove lots of gnome vfs includes
+	
+        * src/Makefile.am:
+	Disable building of connect to server app
+
+2007-11-02  Alexander Larsson  <alexl@redhat.com>
+
         * libnautilus-private/nautilus-file.[ch]:
         Add nautilus_file_is_launchable
 
diff --git a/libnautilus-private/nautilus-customization-data.c b/libnautilus-private/nautilus-customization-data.c
index a552b04a9..29d4d96a5 100644
--- a/libnautilus-private/nautilus-customization-data.c
+++ b/libnautilus-private/nautilus-customization-data.c
@@ -43,8 +43,6 @@
 #include <librsvg/rsvg.h>
 #include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
-#include <libgnomevfs/gnome-vfs-directory.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <libxml/parser.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libnautilus-private/nautilus-customization-data.h b/libnautilus-private/nautilus-customization-data.h
index f9be62691..b68dffe78 100644
--- a/libnautilus-private/nautilus-customization-data.h
+++ b/libnautilus-private/nautilus-customization-data.h
@@ -32,7 +32,6 @@
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtklabel.h>
-#include <libgnomevfs/gnome-vfs-types.h>
 
 #define RESET_IMAGE_NAME "reset.png"
 
diff --git a/libnautilus-private/nautilus-desktop-directory.c b/libnautilus-private/nautilus-desktop-directory.c
index 98645bf25..3d5d50dd6 100644
--- a/libnautilus-private/nautilus-desktop-directory.c
+++ b/libnautilus-private/nautilus-desktop-directory.c
@@ -33,7 +33,6 @@
 #include "nautilus-file-utilities.h"
 #include "nautilus-global-preferences.h"
 #include <eel/eel-glib-extensions.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-macros.h>
diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
index 8bec12a08..18b45ff8d 100644
--- a/libnautilus-private/nautilus-directory-async.c
+++ b/libnautilus-private/nautilus-directory-async.c
@@ -38,10 +38,6 @@
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-string.h>
 #include <gtk/gtkmain.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnomevfs/gnome-vfs-mime-monitor.h>
-#include <libgnomevfs/gnome-vfs-volume-monitor.h>
 #include <libxml/parser.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libnautilus-private/nautilus-directory-private.h b/libnautilus-private/nautilus-directory-private.h
index b513d4c95..e5bb36052 100644
--- a/libnautilus-private/nautilus-directory-private.h
+++ b/libnautilus-private/nautilus-directory-private.h
@@ -24,9 +24,6 @@
 
 #include <gio/gfile.h>
 #include <eel/eel-vfs-extensions.h>
-#include <libgnomevfs/gnome-vfs-file-info.h>
-#include <libgnomevfs/gnome-vfs-types.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
 #include <libnautilus-private/nautilus-directory-metafile-monitor.h>
 #include <libnautilus-private/nautilus-directory.h>
 #include <libnautilus-private/nautilus-file-queue.h>
@@ -103,9 +100,6 @@ struct NautilusDirectoryDetails
 	NautilusFile *get_info_file;
 	GetInfoState *get_info_in_progress;
 
-	NautilusFile *slow_mime_type_file;
-	GnomeVFSAsyncHandle *slow_mime_type_in_progress;
-
 	NautilusFile *extension_info_file;
 	NautilusInfoProvider *extension_info_provider;
 	NautilusOperationHandle *extension_info_in_progress;
diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c
index 5ad887401..beef7fc54 100644
--- a/libnautilus-private/nautilus-directory.c
+++ b/libnautilus-private/nautilus-directory.c
@@ -43,7 +43,6 @@
 #include <eel/eel-string.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 
 enum {
 	FILES_ADDED,
@@ -58,10 +57,10 @@ static guint signals[LAST_SIGNAL];
 /* Specifications for parallel-directory metafile. */
 #define METAFILES_DIRECTORY_NAME "metafiles"
 #define METAFILE_SUFFIX ".xml"
-#define METAFILES_DIRECTORY_PERMISSIONS \
-	(GNOME_VFS_PERM_USER_ALL \
-         | GNOME_VFS_PERM_GROUP_ALL \
-	 | GNOME_VFS_PERM_OTHER_ALL)
+#define METAFILES_DIRECTORY_PERMISSIONS  \
+	(S_IRUSR | S_IWUSR | S_IXUSR |   \
+	 S_IRGRP | S_IWGRP | S_IXGRP |   \
+	 S_IROTH | S_IWOTH | S_IXOTH)
 
 static GHashTable *directories;
 
diff --git a/libnautilus-private/nautilus-directory.h b/libnautilus-private/nautilus-directory.h
index deaf2ff3e..40397b863 100644
--- a/libnautilus-private/nautilus-directory.h
+++ b/libnautilus-private/nautilus-directory.h
@@ -27,7 +27,6 @@
 
 #include <gtk/gtkobject.h>
 #include <gio/gfile.h>
-#include <libgnomevfs/gnome-vfs-types.h>
 #include <libnautilus-private/nautilus-file-attributes.h>
 
 /* NautilusDirectory is a class that manages the model for a directory,
diff --git a/libnautilus-private/nautilus-file-operations-progress.c b/libnautilus-private/nautilus-file-operations-progress.c
index 2add9c0e6..e7c13550e 100644
--- a/libnautilus-private/nautilus-file-operations-progress.c
+++ b/libnautilus-private/nautilus-file-operations-progress.c
@@ -41,7 +41,6 @@
 #include <gtk/gtkvbox.h>
 #include <glib/gi18n.h>
 #include <gio/gurifuncs.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include "nautilus-file-operations-progress-icons.h"
 
 /* The default width of the progress dialog. It will be wider
diff --git a/libnautilus-private/nautilus-file-operations-progress.h b/libnautilus-private/nautilus-file-operations-progress.h
index 48bdb7e5d..f7a0adafa 100644
--- a/libnautilus-private/nautilus-file-operations-progress.h
+++ b/libnautilus-private/nautilus-file-operations-progress.h
@@ -30,7 +30,6 @@
 #define NAUTILUS_FILE_OPERATIONS_PROGRESS_H
 
 #include <gtk/gtkdialog.h>
-#include <libgnomevfs/gnome-vfs-file-size.h>
 
 typedef struct NautilusFileOperationsProgressDetails NautilusFileOperationsProgressDetails;
 
diff --git a/libnautilus-private/nautilus-file-private.h b/libnautilus-private/nautilus-file-private.h
index 35ac4ceba..7509d1410 100644
--- a/libnautilus-private/nautilus-file-private.h
+++ b/libnautilus-private/nautilus-file-private.h
@@ -78,7 +78,7 @@ struct NautilusFileDetails
 	
 	int sort_order;
 	
-	guint permissions;
+	guint32 permissions;
 	int uid; /* -1 is none */
 	int gid; /* -1 is none */
 	
diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c
index d714e32fd..20d3eb63b 100644
--- a/libnautilus-private/nautilus-file-utilities.c
+++ b/libnautilus-private/nautilus-file-utilities.c
@@ -34,14 +34,10 @@
 #include "nautilus-signaller.h"
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-string.h>
-#include <eel/eel-vfs-extensions.h>
 #include <eel/eel-debug.h>
 #include <libgnome/gnome-util.h>
 #include <glib/gi18n.h>
 #include <gio/gfilemonitor.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <unistd.h>
 #include <stdlib.h>
 
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index e81d0b937..78defb5aa 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -58,12 +58,6 @@
 #include <gio/gcontenttype.h>
 #include <gio/gurifuncs.h>
 #include <libgnome/gnome-macros.h>
-#include <libgnomevfs/gnome-vfs-file-info.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnomevfs/gnome-vfs-volume.h>
-#include <libgnomevfs/gnome-vfs-volume-monitor.h>
-#include <libgnomevfs/gnome-vfs-drive.h>
 #include <glib/gfileutils.h>
 #include <gio/gthemedicon.h>
 #include <gio/gfileicon.h>
@@ -1518,7 +1512,7 @@ update_info_internal (NautilusFile *file,
 	gboolean changed;
 	gboolean is_symlink, is_hidden, is_backup, is_mountpoint;
 	gboolean has_permissions;
-	GnomeVFSFilePermissions permissions;
+	guint32 permissions;
 	gboolean can_read, can_write, can_execute, can_delete, can_trash, can_rename, can_mount, can_unmount, can_eject;
 	gboolean thumbnailing_failed;
 	int uid, gid;
@@ -4035,7 +4029,7 @@ nautilus_file_get_permissions (NautilusFile *file)
  **/
 void
 nautilus_file_set_permissions (NautilusFile *file, 
-			       GnomeVFSFilePermissions new_permissions,
+			       guint32 new_permissions,
 			       NautilusFileOperationCallback callback,
 			       gpointer callback_data)
 {
@@ -4689,7 +4683,7 @@ nautilus_file_set_group (NautilusFile *file,
 static char *
 nautilus_file_get_octal_permissions_as_string (NautilusFile *file)
 {
-	GnomeVFSFilePermissions permissions;
+	guint32 permissions;
 
 	g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL);
 
@@ -4714,7 +4708,7 @@ nautilus_file_get_octal_permissions_as_string (NautilusFile *file)
 static char *
 nautilus_file_get_permissions_as_string (NautilusFile *file)
 {
-	GnomeVFSFilePermissions permissions;
+	guint32 permissions;
 	gboolean is_directory;
 	gboolean is_link;
 	gboolean suid, sgid, sticky;
diff --git a/libnautilus-private/nautilus-file.h b/libnautilus-private/nautilus-file.h
index 77ad336c3..e0895f6ac 100644
--- a/libnautilus-private/nautilus-file.h
+++ b/libnautilus-private/nautilus-file.h
@@ -26,7 +26,6 @@
 #define NAUTILUS_FILE_H
 
 #include <gtk/gtkobject.h>
-#include <libgnomevfs/gnome-vfs-types.h>
 #include <gio/gfileinfo.h>
 #include <gio/gfile.h>
 #include <gio/gioerror.h>
@@ -270,7 +269,7 @@ void                    nautilus_file_set_group                         (Nautilu
 									 NautilusFileOperationCallback   callback,
 									 gpointer                        callback_data);
 void                    nautilus_file_set_permissions                   (NautilusFile                   *file,
-									 GnomeVFSFilePermissions         permissions,
+									 guint32                         permissions,
 									 NautilusFileOperationCallback   callback,
 									 gpointer                        callback_data);
 void                    nautilus_file_rename                            (NautilusFile                   *file,
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index 394f7712c..8817c2b84 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -35,8 +35,6 @@
 #include <eel/eel-string.h>
 #include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 
 /* Constants */
 #define STRING_LIST_DEFAULT_TOKENS_DELIMETER ","
diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c
index 51f3ef4e6..cf396d137 100644
--- a/libnautilus-private/nautilus-icon-dnd.c
+++ b/libnautilus-private/nautilus-icon-dnd.c
@@ -59,9 +59,6 @@
 #include <eel/eel-canvas-rect-ellipse.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <libgnomeui/gnome-uidefs.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnomevfs/gnome-vfs-mime-utils.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-file-changes-queue.h>
 #include <stdio.h>
diff --git a/libnautilus-private/nautilus-metafile.c b/libnautilus-private/nautilus-metafile.c
index a03200a3c..f313b2d80 100644
--- a/libnautilus-private/nautilus-metafile.c
+++ b/libnautilus-private/nautilus-metafile.c
@@ -39,10 +39,6 @@
 #include <gio/gurifuncs.h>
 #include <libxml/parser.h>
 #include <gtk/gtkmain.h>
-#include <libgnomevfs/gnome-vfs-file-info.h>
-#include <libgnomevfs/gnome-vfs-types.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs.h>
 #include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
@@ -116,7 +112,6 @@ typedef struct MetafileReadState {
 } MetafileReadState;
 
 typedef struct MetafileWriteState {
-	GnomeVFSAsyncHandle *handle;
 	xmlChar *buffer;
 	goffset size;
 	gboolean write_again;
diff --git a/libnautilus-private/nautilus-monitor.c b/libnautilus-private/nautilus-monitor.c
index 5cb18d48d..2e3cae869 100644
--- a/libnautilus-private/nautilus-monitor.c
+++ b/libnautilus-private/nautilus-monitor.c
@@ -31,9 +31,6 @@
 
 #include <gio/gdirectorymonitor.h>
 #include <libgnome/gnome-util.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
-#include <libgnomevfs/gnome-vfs-volume-monitor.h>
 
 struct NautilusMonitor {
 	GDirectoryMonitor *monitor;
diff --git a/libnautilus-private/nautilus-program-choosing.c b/libnautilus-private/nautilus-program-choosing.c
index 7f878f85e..0f15ea9e4 100644
--- a/libnautilus-private/nautilus-program-choosing.c
+++ b/libnautilus-private/nautilus-program-choosing.c
@@ -29,11 +29,9 @@
 #include "nautilus-mime-actions.h"
 #include "nautilus-global-preferences.h"
 #include "nautilus-icon-info.h"
-#include "nautilus-vfs-utils.h"
 #include "nautilus-recent.h"
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-gnome-extensions.h>
-#include <eel/eel-vfs-extensions.h>
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-preferences.h>
 #include <eel/eel-string.h>
@@ -46,8 +44,6 @@
 #include <libgnome/gnome-desktop-item.h>
 #include <libgnome/gnome-url.h>
 #include <libgnomeui/gnome-uidefs.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <stdlib.h>
 
 #ifdef HAVE_STARTUP_NOTIFICATION
diff --git a/libnautilus-private/nautilus-query.h b/libnautilus-private/nautilus-query.h
index fae278042..8d92c3ddf 100644
--- a/libnautilus-private/nautilus-query.h
+++ b/libnautilus-private/nautilus-query.h
@@ -25,7 +25,6 @@
 #define NAUTILUS_QUERY_H
 
 #include <glib-object.h>
-#include <libgnomevfs/gnome-vfs-result.h>
 
 #define NAUTILUS_TYPE_QUERY		(nautilus_query_get_type ())
 #define NAUTILUS_QUERY(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_QUERY, NautilusQuery))
diff --git a/libnautilus-private/nautilus-search-directory.c b/libnautilus-private/nautilus-search-directory.c
index 485ea3170..3341cfb1f 100644
--- a/libnautilus-private/nautilus-search-directory.c
+++ b/libnautilus-private/nautilus-search-directory.c
@@ -30,7 +30,6 @@
 #include "nautilus-file-utilities.h"
 #include "nautilus-search-engine.h"
 #include <eel/eel-glib-extensions.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <gtk/gtksignal.h>
 #include <gio/gioerror.h>
 #include <libgnome/gnome-macros.h>
diff --git a/libnautilus-private/nautilus-search-engine-tracker.c b/libnautilus-private/nautilus-search-engine-tracker.c
index 17a8a562f..80c2f6664 100644
--- a/libnautilus-private/nautilus-search-engine-tracker.c
+++ b/libnautilus-private/nautilus-search-engine-tracker.c
@@ -24,7 +24,6 @@
 #include <config.h>
 #include "nautilus-search-engine-tracker.h"
 #include <tracker.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-glib-extensions.h>
 
diff --git a/libnautilus-private/nautilus-search-engine.h b/libnautilus-private/nautilus-search-engine.h
index 79e68aeb3..2be4c1e13 100644
--- a/libnautilus-private/nautilus-search-engine.h
+++ b/libnautilus-private/nautilus-search-engine.h
@@ -25,7 +25,6 @@
 #define NAUTILUS_SEARCH_ENGINE_H
 
 #include <glib-object.h>
-#include <libgnomevfs/gnome-vfs-result.h>
 #include <libnautilus-private/nautilus-query.h>
 
 #define NAUTILUS_TYPE_SEARCH_ENGINE		(nautilus_search_engine_get_type ())
diff --git a/libnautilus-private/nautilus-thumbnails.c b/libnautilus-private/nautilus-thumbnails.c
index a574e083c..1b6cc9014 100644
--- a/libnautilus-private/nautilus-thumbnails.c
+++ b/libnautilus-private/nautilus-thumbnails.c
@@ -35,7 +35,6 @@
 #include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
 #include <gtk/gtkmain.h>
-#include <libgnomevfs/gnome-vfs.h>
 #include <librsvg/rsvg.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/libnautilus-private/nautilus-tree-view-drag-dest.c b/libnautilus-private/nautilus-tree-view-drag-dest.c
index 3a501c131..0394dd3ff 100644
--- a/libnautilus-private/nautilus-tree-view-drag-dest.c
+++ b/libnautilus-private/nautilus-tree-view-drag-dest.c
@@ -34,7 +34,6 @@
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-macros.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include "nautilus-file-dnd.h"
 #include "nautilus-icon-dnd.h"
 #include "nautilus-link.h"
diff --git a/libnautilus-private/nautilus-vfs-utils.h b/libnautilus-private/nautilus-vfs-utils.h
index 29ee721c1..88d32f9d0 100644
--- a/libnautilus-private/nautilus-vfs-utils.h
+++ b/libnautilus-private/nautilus-vfs-utils.h
@@ -3,7 +3,7 @@
 
 #include <glib/gerror.h>
 #include <gio/gfileinfo.h>
-#include <libgnomevfs/gnome-vfs-file-info.h>
+#include <libgnomevfs/gnome-vfs-result.h>
 
 /* This file has helper tools in the conversion from gnome-vfs to gio */
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 20fed8b01..7ac77c2d6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,9 +5,10 @@ SUBDIRS=file-manager
 bin_PROGRAMS=					\
 	nautilus				\
 	nautilus-file-management-properties	\
-	nautilus-connect-server			\
 	$(NULL)
 
+#	nautilus-connect-server			
+
 INCLUDES =							\
 	-I$(top_srcdir) 					\
 	-I$(top_srcdir)/cut-n-paste-code			\
@@ -139,13 +140,14 @@ nautilus_file_management_properties_SOURCES= \
 	nautilus-file-management-properties-main.c	\
 	$(NULL)
 
-nautilus_connect_server_SOURCES= \
-	nautilus-connect-server-dialog.c	\
-	nautilus-connect-server-dialog.h	\
-	nautilus-connect-server-dialog-main.c	\
-	nautilus-location-entry.c		\
-	nautilus-location-entry.h		\
-	$(NULL)
+# Disabled for now in the gio world
+#nautilus_connect_server_SOURCES= \
+#	nautilus-connect-server-dialog.c	\
+#	nautilus-connect-server-dialog.h	\
+#	nautilus-connect-server-dialog-main.c	\
+#	nautilus-location-entry.c		\
+#	nautilus-location-entry.h		\
+#	$(NULL)
 
 $(nautilus_shell_interface_idl_sources): nautilus_shell_interface_idl_stamp
 nautilus_shell_interface_idl_stamp: nautilus-shell-interface.idl $(ORBIT_IDL)
diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
index 99c0046c7..b984f2d7b 100644
--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@@ -44,7 +44,6 @@
 #include <gtk/gtkcheckmenuitem.h>
 #include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
-#include <libgnomevfs/gnome-vfs.h>
 #include <libnautilus-private/nautilus-desktop-icon-file.h>
 #include <libnautilus-private/nautilus-directory-background.h>
 #include <libnautilus-private/nautilus-directory-notify.h>
diff --git a/src/file-manager/fm-ditem-page.c b/src/file-manager/fm-ditem-page.c
index 6c91cb2fd..fdb2e04f8 100644
--- a/src/file-manager/fm-ditem-page.c
+++ b/src/file-manager/fm-ditem-page.c
@@ -44,8 +44,6 @@
 #include <libnautilus-private/nautilus-file.h>
 #include <libnautilus-private/nautilus-file-attributes.h>
 #include <libgnome/gnome-desktop-item.h>
-#include <eel/eel-vfs-extensions.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 
 static void fm_ditem_page_instance_init            (FMDitemPage               *provider);
 static void fm_ditem_page_class_init               (FMDitemPageClass          *class);
diff --git a/src/file-manager/fm-icon-container.c b/src/file-manager/fm-icon-container.c
index c15dae868..d4ebad8e7 100644
--- a/src/file-manager/fm-icon-container.c
+++ b/src/file-manager/fm-icon-container.c
@@ -25,10 +25,6 @@
 
 #include <libgnome/gnome-macros.h>
 #include <glib/gi18n.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <eel/eel-string.h>
 #include <gio/gcontenttype.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index 69cd2b712..ed89d96af 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -50,11 +50,6 @@
 #include <glib/gi18n.h>
 #include <gio/gcontenttype.h>
 #include <gio/gsocketoutputstream.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
-#include <libgnomevfs/gnome-vfs-async-ops.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnomevfs/gnome-vfs-xfer.h>
 #include <libnautilus-private/nautilus-directory-background.h>
 #include <libnautilus-private/nautilus-directory.h>
 #include <libnautilus-private/nautilus-dnd.h>
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index 7356e9d0c..1664c58a4 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -50,7 +50,6 @@
 #include <libegg/eggtreemultidnd.h>
 #include <glib/gi18n.h>
 #include <libgnome/gnome-macros.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-extension/nautilus-column-provider.h>
 #include <libnautilus-private/nautilus-column-chooser.h>
 #include <libnautilus-private/nautilus-column-utilities.h>
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 61093b101..f81d005fe 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -64,7 +64,6 @@
 #include <libgnomeui/gnome-help.h>
 #include <libgnomeui/gnome-thumbnail.h>
 #include <libgnomeui/gnome-uidefs.h>
-#include <libgnomevfs/gnome-vfs.h>
 #include <libnautilus-extension/nautilus-property-page-provider.h>
 #include <libnautilus-private/nautilus-customization-data.h>
 #include <libnautilus-private/nautilus-entry.h>
@@ -3211,8 +3210,8 @@ permission_change_callback (NautilusFile *file,
 
 static void
 update_permissions (FMPropertiesWindow *window,
-		    GnomeVFSFilePermissions vfs_new_perm,
-		    GnomeVFSFilePermissions vfs_mask,
+		    guint32 vfs_new_perm,
+		    guint32 vfs_mask,
 		    gboolean is_folder,
 		    gboolean apply_to_both_folder_and_dir,
 		    gboolean use_original)
@@ -3221,7 +3220,7 @@ update_permissions (FMPropertiesWindow *window,
 	
 	for (l = window->details->target_files; l != NULL; l = l->next) {
 		NautilusFile *file;
-		GnomeVFSFilePermissions permissions;
+		guint32 permissions;
 
 		file = NAUTILUS_FILE (l->data);
 
@@ -3257,19 +3256,19 @@ update_permissions (FMPropertiesWindow *window,
 
 static gboolean
 initial_permission_state_consistent (FMPropertiesWindow *window,
-				     GnomeVFSFilePermissions mask,
+				     guint32 mask,
 				     gboolean is_folder,
 				     gboolean both_folder_and_dir)
 {
 	GList *l;
 	gboolean first;
-	GnomeVFSFilePermissions first_permissions;
+	guint32 first_permissions;
 
 	first = TRUE;
 	first_permissions = 0;
 	for (l = window->details->target_files; l != NULL; l = l->next) {
 		NautilusFile *file;
-		GnomeVFSFilePermissions permissions;
+		guint32 permissions;
 
 		file = l->data;
 		
@@ -3305,7 +3304,7 @@ permission_button_toggled (GtkToggleButton *button,
 			   FMPropertiesWindow *window)
 {
 	gboolean is_folder, is_special;
-	GnomeVFSFilePermissions permission_mask;
+	guint32 permission_mask;
 	gboolean inconsistent;
 	gboolean on;
 	
@@ -3367,7 +3366,7 @@ permission_button_update (FMPropertiesWindow *window,
 	gboolean is_folder, is_special;
 	gboolean no_match;
 	gboolean sensitive;
-	GnomeVFSFilePermissions button_permission;
+	guint32 button_permission;
 
 	if (gtk_toggle_button_get_inconsistent (button) &&
 	    window->details->has_recursive_apply) {
@@ -3391,7 +3390,7 @@ permission_button_update (FMPropertiesWindow *window,
 	no_match = TRUE;
 	for (l = window->details->target_files; l != NULL; l = l->next) {
 		NautilusFile *file;
-		GnomeVFSFilePermissions file_permissions;
+		guint32 file_permissions;
 
 		file = NAUTILUS_FILE (l->data);
 
@@ -3450,7 +3449,7 @@ permission_button_update (FMPropertiesWindow *window,
 static void
 set_up_permissions_checkbox (FMPropertiesWindow *window,
 			     GtkWidget *check_button, 
-			     GnomeVFSFilePermissions permission,
+			     guint32 permission,
 			     gboolean is_folder)
 {
 	/* Load up the check_button with data we'll need when updating its state. */
@@ -3476,7 +3475,7 @@ add_permissions_checkbox_with_label (FMPropertiesWindow *window,
 				     GtkTable *table, 
 				     int row, int column,
 				     const char *label,
-				     GnomeVFSFilePermissions permission_to_check,
+				     guint32 permission_to_check,
 				     GtkLabel *label_for,
 				     gboolean is_folder)
 {
@@ -3507,7 +3506,7 @@ static void
 add_permissions_checkbox (FMPropertiesWindow *window,
 			  GtkTable *table, 
 			  int row, int column, 
-			  GnomeVFSFilePermissions permission_to_check,
+			  guint32 permission_to_check,
 			  GtkLabel *label_for,
 			  gboolean is_folder)
 {
@@ -3529,6 +3528,24 @@ add_permissions_checkbox (FMPropertiesWindow *window,
 					     is_folder);
 }
 
+enum {
+	UNIX_PERM_SUID = S_ISUID,
+	UNIX_PERM_SGID = S_ISGID,	
+	UNIX_PERM_STICKY = 01000,	/* S_ISVTX not defined on all systems */
+	UNIX_PERM_USER_READ = S_IRUSR,
+	UNIX_PERM_USER_WRITE = S_IWUSR,
+	UNIX_PERM_USER_EXEC = S_IXUSR,
+	UNIX_PERM_USER_ALL = S_IRUSR | S_IWUSR | S_IXUSR,
+	UNIX_PERM_GROUP_READ = S_IRGRP,
+	UNIX_PERM_GROUP_WRITE = S_IWGRP,
+	UNIX_PERM_GROUP_EXEC = S_IXGRP,
+	UNIX_PERM_GROUP_ALL = S_IRGRP | S_IWGRP | S_IXGRP,
+	UNIX_PERM_OTHER_READ = S_IROTH,
+	UNIX_PERM_OTHER_WRITE = S_IWOTH,
+	UNIX_PERM_OTHER_EXEC = S_IXOTH,
+	UNIX_PERM_OTHER_ALL = S_IROTH | S_IWOTH | S_IXOTH
+};
+
 typedef enum {
 	PERMISSION_READ  = (1<<0),
 	PERMISSION_WRITE = (1<<1),
@@ -3541,16 +3558,16 @@ typedef enum {
 	PERMISSION_OTHER
 } PermissionType;
 
-static GnomeVFSFilePermissions vfs_perms[3][3] = {
-	{GNOME_VFS_PERM_USER_READ, GNOME_VFS_PERM_USER_WRITE, GNOME_VFS_PERM_USER_EXEC},
-	{GNOME_VFS_PERM_GROUP_READ, GNOME_VFS_PERM_GROUP_WRITE, GNOME_VFS_PERM_GROUP_EXEC},
-	{GNOME_VFS_PERM_OTHER_READ, GNOME_VFS_PERM_OTHER_WRITE, GNOME_VFS_PERM_OTHER_EXEC},
+static guint32 vfs_perms[3][3] = {
+	{UNIX_PERM_USER_READ, UNIX_PERM_USER_WRITE, UNIX_PERM_USER_EXEC},
+	{UNIX_PERM_GROUP_READ, UNIX_PERM_GROUP_WRITE, UNIX_PERM_GROUP_EXEC},
+	{UNIX_PERM_OTHER_READ, UNIX_PERM_OTHER_WRITE, UNIX_PERM_OTHER_EXEC},
 };
 
-static GnomeVFSFilePermissions 
+static guint32 
 permission_to_vfs (PermissionType type, PermissionValue perm)
 {
-	GnomeVFSFilePermissions vfs_perm;
+	guint32 vfs_perm;
 	g_assert (type >= 0 && type < 3);
 
 	vfs_perm = 0;
@@ -3569,7 +3586,7 @@ permission_to_vfs (PermissionType type, PermissionValue perm)
 
 
 static PermissionValue
-permission_from_vfs (PermissionType type, GnomeVFSFilePermissions vfs_perm)
+permission_from_vfs (PermissionType type, guint32 vfs_perm)
 {
 	PermissionValue perm;
 	g_assert (type >= 0 && type < 3);
@@ -3596,7 +3613,7 @@ permission_combo_changed (GtkWidget *combo, FMPropertiesWindow *window)
 	gboolean is_folder, use_original;
 	PermissionType type;
 	int new_perm, mask;
-	GnomeVFSFilePermissions vfs_new_perm, vfs_mask;
+	guint32 vfs_new_perm, vfs_mask;
 
 	is_folder = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (combo), "is-folder"));
 	type = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (combo), "permission-type"));
@@ -3693,7 +3710,7 @@ permission_combo_update (FMPropertiesWindow *window,
 	
 	for (l = window->details->target_files; l != NULL; l = l->next) {
 		NautilusFile *file;
-		GnomeVFSFilePermissions file_permissions;
+		guint32 file_permissions;
 
 		file = NAUTILUS_FILE (l->data);
 
@@ -3909,7 +3926,7 @@ static GtkWidget *
 append_special_execution_checkbox (FMPropertiesWindow *window,
 				   GtkTable *table,
 				   const char *label_text,
-				   GnomeVFSFilePermissions permission_to_check)
+				   guint32 permission_to_check)
 {
 	GtkWidget *check_button;
 	guint last_row;
@@ -3939,12 +3956,12 @@ static void
 append_special_execution_flags (FMPropertiesWindow *window, GtkTable *table)
 {
 	append_special_execution_checkbox 
-		(window, table, _("Set _user ID"), GNOME_VFS_PERM_SUID);
+		(window, table, _("Set _user ID"), UNIX_PERM_SUID);
 
 	attach_title_field (table, table->nrows - 1, _("Special flags:"));
 
-	append_special_execution_checkbox (window, table, _("Set gro_up ID"), GNOME_VFS_PERM_SGID);
-	append_special_execution_checkbox (window, table, _("_Sticky"), GNOME_VFS_PERM_STICKY);
+	append_special_execution_checkbox (window, table, _("Set gro_up ID"), UNIX_PERM_SGID);
+	append_special_execution_checkbox (window, table, _("_Sticky"), UNIX_PERM_STICKY);
 
 	gtk_table_set_row_spacing (table, table->nrows - 1, 18);
 }
@@ -3993,7 +4010,7 @@ get_initial_permissions (GList *file_list)
 				g_direct_equal);
 	
 	for (l = file_list; l != NULL; l = l->next) {
-		GnomeVFSFilePermissions permissions;
+		guint32 permissions;
 		NautilusFile *file;
 		
 		file = NAUTILUS_FILE (l->data);
@@ -4109,7 +4126,7 @@ create_simple_permissions (FMPropertiesWindow *window, GtkTable *page_table)
 	add_permissions_checkbox_with_label (window, page_table,
 					     last_row, 1,
 					     _("Allow _executing file as program"),
-					     GNOME_VFS_PERM_USER_EXEC|GNOME_VFS_PERM_GROUP_EXEC|GNOME_VFS_PERM_OTHER_EXEC,
+					     UNIX_PERM_USER_EXEC|UNIX_PERM_GROUP_EXEC|UNIX_PERM_OTHER_EXEC,
 					     execute_label, FALSE);
 	
 }
@@ -4145,7 +4162,7 @@ create_permission_checkboxes (FMPropertiesWindow *window,
 				  check_button_table, 
 				  PERMISSIONS_CHECKBOXES_OWNER_ROW,
 				  PERMISSIONS_CHECKBOXES_READ_COLUMN,
-				  GNOME_VFS_PERM_USER_READ,
+				  UNIX_PERM_USER_READ,
 				  owner_perm_label,
 				  is_folder);
 	
@@ -4153,7 +4170,7 @@ create_permission_checkboxes (FMPropertiesWindow *window,
 				  check_button_table, 
 				  PERMISSIONS_CHECKBOXES_OWNER_ROW,
 				  PERMISSIONS_CHECKBOXES_WRITE_COLUMN,
-				  GNOME_VFS_PERM_USER_WRITE,
+				  UNIX_PERM_USER_WRITE,
 				  owner_perm_label,
 				  is_folder);
 	
@@ -4161,7 +4178,7 @@ create_permission_checkboxes (FMPropertiesWindow *window,
 				  check_button_table, 
 				  PERMISSIONS_CHECKBOXES_OWNER_ROW,
 				  PERMISSIONS_CHECKBOXES_EXECUTE_COLUMN,
-				  GNOME_VFS_PERM_USER_EXEC,
+				  UNIX_PERM_USER_EXEC,
 				  owner_perm_label,
 				  is_folder);
 	
@@ -4169,7 +4186,7 @@ create_permission_checkboxes (FMPropertiesWindow *window,
 				  check_button_table, 
 				  PERMISSIONS_CHECKBOXES_GROUP_ROW,
 				  PERMISSIONS_CHECKBOXES_READ_COLUMN,
-				  GNOME_VFS_PERM_GROUP_READ,
+				  UNIX_PERM_GROUP_READ,
 				  group_perm_label,
 				  is_folder);
 	
@@ -4177,7 +4194,7 @@ create_permission_checkboxes (FMPropertiesWindow *window,
 				  check_button_table, 
 				  PERMISSIONS_CHECKBOXES_GROUP_ROW,
 				  PERMISSIONS_CHECKBOXES_WRITE_COLUMN,
-				  GNOME_VFS_PERM_GROUP_WRITE,
+				  UNIX_PERM_GROUP_WRITE,
 				  group_perm_label,
 				  is_folder);
 	
@@ -4185,7 +4202,7 @@ create_permission_checkboxes (FMPropertiesWindow *window,
 				  check_button_table, 
 				  PERMISSIONS_CHECKBOXES_GROUP_ROW,
 				  PERMISSIONS_CHECKBOXES_EXECUTE_COLUMN,
-				  GNOME_VFS_PERM_GROUP_EXEC,
+				  UNIX_PERM_GROUP_EXEC,
 				  group_perm_label,
 				  is_folder);
 	
@@ -4193,7 +4210,7 @@ create_permission_checkboxes (FMPropertiesWindow *window,
 				  check_button_table, 
 				  PERMISSIONS_CHECKBOXES_OTHERS_ROW,
 				  PERMISSIONS_CHECKBOXES_READ_COLUMN,
-				  GNOME_VFS_PERM_OTHER_READ,
+				  UNIX_PERM_OTHER_READ,
 				  other_perm_label,
 				  is_folder);
 	
@@ -4201,7 +4218,7 @@ create_permission_checkboxes (FMPropertiesWindow *window,
 				  check_button_table, 
 				  PERMISSIONS_CHECKBOXES_OTHERS_ROW,
 				  PERMISSIONS_CHECKBOXES_WRITE_COLUMN,
-				  GNOME_VFS_PERM_OTHER_WRITE,
+				  UNIX_PERM_OTHER_WRITE,
 				  other_perm_label,
 				  is_folder);
 	
@@ -4209,7 +4226,7 @@ create_permission_checkboxes (FMPropertiesWindow *window,
 				  check_button_table, 
 				  PERMISSIONS_CHECKBOXES_OTHERS_ROW,
 				  PERMISSIONS_CHECKBOXES_EXECUTE_COLUMN,
-				  GNOME_VFS_PERM_OTHER_EXEC,
+				  UNIX_PERM_OTHER_EXEC,
 				  other_perm_label,
 				  is_folder);
 }
@@ -4318,9 +4335,9 @@ static void
 apply_recursive_clicked (GtkWidget *recursive_button,
 			 FMPropertiesWindow *window)
 {
-	GnomeVFSFilePermissions file_permission, file_permission_mask;
-	GnomeVFSFilePermissions dir_permission, dir_permission_mask;
-	GnomeVFSFilePermissions vfs_mask, vfs_new_perm, p;
+	guint32 file_permission, file_permission_mask;
+	guint32 dir_permission, dir_permission_mask;
+	guint32 vfs_mask, vfs_new_perm, p;
 	GtkWidget *button, *combo;
 	gboolean active, is_folder, is_special, use_original;
 	GList *l;
diff --git a/src/file-manager/fm-tree-view.c b/src/file-manager/fm-tree-view.c
index 1d445a5fb..d88937e44 100644
--- a/src/file-manager/fm-tree-view.c
+++ b/src/file-manager/fm-tree-view.c
@@ -40,7 +40,6 @@
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-preferences.h>
 #include <eel/eel-stock-dialogs.h>
-#include <eel/eel-vfs-extensions.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkcellrendererpixbuf.h>
 #include <gtk/gtkcellrenderertext.h>
@@ -61,8 +60,6 @@
 #include <gio/gthemedicon.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <libgnomeui/gnome-popup-menu.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnomevfs/gnome-vfs-volume-monitor.h>
 #include <libnautilus-private/nautilus-clipboard-monitor.h>
 #include <libnautilus-private/nautilus-desktop-icon-file.h>
 #include <libnautilus-private/nautilus-debug-log.h>
diff --git a/src/nautilus-desktop-window.c b/src/nautilus-desktop-window.c
index e6217815d..aa939b90b 100644
--- a/src/nautilus-desktop-window.c
+++ b/src/nautilus-desktop-window.c
@@ -33,7 +33,6 @@
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-vfs-extensions.h>
 #include <libgnome/gnome-macros.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <gio/gthemedicon.h>
 
diff --git a/src/nautilus-emblem-sidebar.c b/src/nautilus-emblem-sidebar.c
index 2535b5ba4..2b3ee6dc5 100644
--- a/src/nautilus-emblem-sidebar.c
+++ b/src/nautilus-emblem-sidebar.c
@@ -39,7 +39,6 @@
 #include <eel/eel-labeled-image.h>
 #include <eel/eel-graphic-effects.h>
 #include <eel/eel-gdk-pixbuf-extensions.h>
-#include <eel/eel-vfs-extensions.h>
 #include <eel/eel-stock-dialogs.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtkdnd.h>
@@ -59,7 +58,6 @@
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <libgnomeui/gnome-popup-menu.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <gconf/gconf-client.h>
 #include <libnautilus-private/nautilus-icon-dnd.h>
 #include <libnautilus-private/nautilus-emblem-utils.h>
diff --git a/src/nautilus-location-bar.c b/src/nautilus-location-bar.c
index 5861697ff..cee33bd81 100644
--- a/src/nautilus-location-bar.c
+++ b/src/nautilus-location-bar.c
@@ -47,7 +47,6 @@
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <libgnomeui/gnome-uidefs.h>
-#include <libgnomevfs/gnome-vfs.h>
 #include <libnautilus-private/nautilus-icon-dnd.h>
 #include <libnautilus-private/nautilus-clipboard.h>
 #include <stdio.h>
diff --git a/src/nautilus-location-dialog.c b/src/nautilus-location-dialog.c
index bafc889ce..464057b0f 100644
--- a/src/nautilus-location-dialog.c
+++ b/src/nautilus-location-dialog.c
@@ -25,13 +25,11 @@
 #include "nautilus-location-dialog.h"
 
 #include <eel/eel-gtk-macros.h>
-#include <eel/eel-vfs-extensions.h>
 #include <eel/eel-stock-dialogs.h>
 #include <gtk/gtkhbox.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkstock.h>
 #include <libgnomeui/gnome-help.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include "nautilus-location-entry.h"
 #include "nautilus-desktop-window.h"
diff --git a/src/nautilus-location-entry.c b/src/nautilus-location-entry.c
index ce47e3491..491d64e7d 100644
--- a/src/nautilus-location-entry.c
+++ b/src/nautilus-location-entry.c
@@ -39,14 +39,12 @@
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
-#include <eel/eel-vfs-extensions.h>
 #include <gtk/gtkdnd.h>
 #include <gtk/gtksignal.h>
 #include <glib/gi18n.h>
 #include <gio/gfilenamecompleter.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <libgnomeui/gnome-uidefs.h>
-#include <libgnomevfs/gnome-vfs.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-entry.h>
 #include <libnautilus-private/nautilus-icon-dnd.h>
@@ -75,7 +73,7 @@ EEL_CLASS_BOILERPLATE (NautilusLocationEntry,
 		       nautilus_location_entry,
 		       NAUTILUS_TYPE_ENTRY)
 
-/* routine that performs the tab expansion using gnome-vfs.  Extract the directory name and
+/* routine that performs the tab expansion.  Extract the directory name and
    incomplete basename, then iterate through the directory trying to complete it.  If we
    find something, add it to the entry */
   
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index bff94afbf..7d51cea81 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -50,7 +50,6 @@
 #include <libgnome/gnome-init.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <libgnomeui/gnome-client.h>
-#include <libgnomevfs/gnome-vfs-init.h>
 #include <libnautilus-private/nautilus-debug-log.h>
 #include <libnautilus-private/nautilus-directory-metafile.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index 874ffff55..0e3a71236 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -43,7 +43,6 @@
 #include <eel/eel-gnome-extensions.h>
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
-#include <eel/eel-vfs-extensions.h>
 #include <eel/eel-xml-extensions.h>
 #include <libxml/parser.h>
 #include <gtk/gtkmain.h>
@@ -52,9 +51,6 @@
 #include <libgnome/gnome-util.h>
 #include <libgnomeui/gnome-about.h>
 #include <libgnomeui/gnome-uidefs.h>
-#include <libgnomevfs/gnome-vfs-file-info.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-ui-utilities.h>
 #include <libnautilus-private/nautilus-undo-manager.h>
diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
index dc604df36..cd1f90ca3 100644
--- a/src/nautilus-places-sidebar.c
+++ b/src/nautilus-places-sidebar.c
@@ -55,7 +55,6 @@
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-file-operations.h>
 #include <libnautilus-private/nautilus-trash-monitor.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <gio/gvolumemonitor.h>
 #include <gio/gthemedicon.h>
 
diff --git a/src/nautilus-query-editor.c b/src/nautilus-query-editor.c
index bef44796e..116a1122f 100644
--- a/src/nautilus-query-editor.c
+++ b/src/nautilus-query-editor.c
@@ -46,8 +46,6 @@
 #include <gtk/gtkfilechooserbutton.h>
 #include "gtk/gtkcelllayout.h"
 #include "gtk/gtkcellrenderertext.h"
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnomevfs/gnome-vfs-mime-info.h>
 
 typedef enum {
 	NAUTILUS_QUERY_EDITOR_ROW_LOCATION,
diff --git a/src/nautilus-shell.c b/src/nautilus-shell.c
index f707f486f..4a803b134 100644
--- a/src/nautilus-shell.c
+++ b/src/nautilus-shell.c
@@ -36,7 +36,6 @@
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
-#include <eel/eel-vfs-extensions.h>
 #include <gtk/gtkframe.h>
 #include <gtk/gtkhbox.h>
 #include <gtk/gtklabel.h>
@@ -45,7 +44,6 @@
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <libgnomeui/gnome-uidefs.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
 #include <stdlib.h>
diff --git a/src/nautilus-sidebar-title.c b/src/nautilus-sidebar-title.c
index 1e8894916..49f3dc5d7 100644
--- a/src/nautilus-sidebar-title.c
+++ b/src/nautilus-sidebar-title.c
@@ -44,8 +44,6 @@
 #include <gtk/gtksignal.h>
 #include <gtk/gtkwidget.h>
 #include <glib/gi18n.h>
-#include <libgnomevfs/gnome-vfs-types.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
 #include <libnautilus-private/nautilus-file-attributes.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
 #include <libnautilus-private/nautilus-metadata.h>
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index e61ec689b..2f6116087 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -44,15 +44,11 @@
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
-#include <eel/eel-vfs-extensions.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
 #include <gdk/gdkx.h>
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-icon-theme.h>
-#include <libgnomevfs/gnome-vfs-async-ops.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-extension/nautilus-location-widget-provider.h>
 #include <libnautilus-private/nautilus-debug-log.h>
 #include <libnautilus-private/nautilus-file-attributes.h>
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index aae6455c0..f9bf16fd4 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -55,7 +55,6 @@
 #ifdef HAVE_X11_XF86KEYSYM_H
 #include <X11/XF86keysym.h>
 #endif
-#include <libgnomevfs/gnome-vfs-uri.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-file-attributes.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
diff --git a/test/test-nautilus-mime-actions-set.c b/test/test-nautilus-mime-actions-set.c
index f4c3244ca..7bf6ec49b 100644
--- a/test/test-nautilus-mime-actions-set.c
+++ b/test/test-nautilus-mime-actions-set.c
@@ -25,8 +25,6 @@
 #include <config.h>
 
 #include <gnome.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
-#include <libgnomevfs/gnome-vfs.h>
 #include <libnautilus-private/nautilus-mime-actions.h>
 #include <stdio.h>
 
diff --git a/test/test-nautilus-mime-actions.c b/test/test-nautilus-mime-actions.c
index 79789db5e..4e92e0854 100644
--- a/test/test-nautilus-mime-actions.c
+++ b/test/test-nautilus-mime-actions.c
@@ -25,8 +25,6 @@
 #include <config.h>
 
 #include <gnome.h>
-#include <libgnomevfs/gnome-vfs-mime-handlers.h>
-#include <libgnomevfs/gnome-vfs.h>
 #include <libnautilus-private/nautilus-mime-actions.h>
 #include <stdio.h>
 
diff --git a/test/test.h b/test/test.h
index bb97aa076..3acddeb2b 100644
--- a/test/test.h
+++ b/test/test.h
@@ -4,7 +4,6 @@
 #include <config.h>
 #include <gtk/gtk.h>
 #include <gnome.h>
-#include <libgnomevfs/gnome-vfs-init.h>
 
 #include <eel/eel-art-extensions.h>
 #include <eel/eel-art-gtk-extensions.h>