Index: configure.in
===================================================================
--- configure.in	(revision 4593)
+++ configure.in	(working copy)
@@ -158,7 +158,7 @@
 
 PKG_CHECK_MODULES(GLADE, libglade-2.0 >= $LIBGLADE_REQUIRED)
 
-PKG_CHECK_MODULES(GNOME, libgnome-2.0 >= $GNOME_REQUIRED libgnomeui-2.0 >= $GNOME_REQUIRED gnome-vfs-2.0 >= $GNOME_REQUIRED libgnomecanvas-2.0 >= $GNOME_REQUIRED gnome-vfs-module-2.0 >= $GNOME_REQUIRED libgnomeprint-2.2 >= $GNOME_REQUIRED libgnomeprintui-2.2 >= $GNOME_REQUIRED)
+PKG_CHECK_MODULES(GNOME, libgnome-2.0 >= $GNOME_REQUIRED libgnomeui-2.0 >= $GNOME_REQUIRED libgnomecanvas-2.0 >= $GNOME_REQUIRED libgnomeprint-2.2 >= $GNOME_REQUIRED libgnomeprintui-2.2 >= $GNOME_REQUIRED)
 
 PKG_CHECK_MODULES(GCONF, gconf-2.0 >= $GCONF_REQUIRED)
 
Index: src/main.c
===================================================================
--- src/main.c	(revision 4593)
+++ src/main.c	(working copy)
@@ -30,7 +30,6 @@
 
 #include <libgnome/gnome-program.h>
 #include <gtk/gtk.h>
-#include <libgnomevfs/gnome-vfs.h>
 #include <libanjuta/resources.h>
 #include <libanjuta/anjuta-debug.h>
 #include <libanjuta/interfaces/ianjuta-file-loader.h>
@@ -118,8 +117,9 @@
 	{
 		gchar path[PATH_MAX+1];
 		gchar *uri_scheme;
+		GFile *file = g_file_new_for_commandline_arg (file_name);
 		
-		uri_scheme = gnome_vfs_get_uri_scheme (file_name);
+		uri_scheme = g_file_get_uri_scheme (file);
 		if (!uri_scheme)
 		{
 			memset(path, '\0', PATH_MAX+1);
@@ -127,6 +127,7 @@
 			return g_strdup (path);
 		}
 		g_free (uri_scheme);
+		g_object_unref (file);
 		return g_strdup (file_name);
 	}
 	else
@@ -399,7 +400,5 @@
 	gtk_widget_show (GTK_WIDGET (app));
 	gtk_main();
 	
-	gnome_vfs_shutdown();
-	
 	return 0;
 }
Index: plugins/glade/plugin.c
===================================================================
--- plugins/glade/plugin.c	(revision 4593)
+++ plugins/glade/plugin.c	(working copy)
@@ -20,7 +20,6 @@
 
 #include <config.h>
 
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <libanjuta/anjuta-shell.h>
 #include <libanjuta/anjuta-debug.h>
 #include <libanjuta/interfaces/ianjuta-file.h>
@@ -325,12 +324,14 @@
 			if (project->path)
 #endif
 			{
-				uri = gnome_vfs_get_uri_from_local_path (
+				GFile *file = g_file_new_for_path (
 #if (GLADEUI_VERSION >= 330)
 					ppath);
 #else
 					project->path);
 #endif
+				uri = g_file_get_uri (file);
+				g_object_unref (file);
 				if (uri)
 				{
 					/ * FIXME only log file if it's still open in docman * /
Index: src/anjuta.c
===================================================================
--- src/anjuta.c	(revision 4593)
+++ src/anjuta.c	(working copy)
@@ -138,7 +138,7 @@
 	
 	/*
 	 * We want to be somewhere at last to start, otherwise bonobo-activation
-	 * and gnome-vfs gets screwed up at start up
+	 * gets screwed up at start up
 	 */
 	gnome_client_set_priority (client, 80);
 	
Index: libanjuta/anjuta-utils.c
===================================================================
--- libanjuta/anjuta-utils.c	(revision 4593)
+++ libanjuta/anjuta-utils.c	(working copy)
@@ -55,8 +55,6 @@
 #include <libanjuta/anjuta-utils.h>
 #include <libanjuta/anjuta-debug.h>
 
-#include <libgnomevfs/gnome-vfs.h>
-
 #define FILE_BUFFER_SIZE 1024
 
 static void
Index: libanjuta/anjuta-preferences.c
===================================================================
--- libanjuta/anjuta-preferences.c	(revision 4593)
+++ libanjuta/anjuta-preferences.c	(working copy)
@@ -67,7 +67,6 @@
 
 #include <glade/glade-parser.h>
 #include <gconf/gconf-client.h>
-#include <libgnomevfs/gnome-vfs.h>
 
 #include <libanjuta/anjuta-preferences.h>
 #include <libanjuta/anjuta-utils.h>
Index: libanjuta/anjuta-plugin-manager.c
===================================================================
--- libanjuta/anjuta-plugin-manager.c	(revision 4593)
+++ libanjuta/anjuta-plugin-manager.c	(working copy)
@@ -30,7 +30,6 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <string.h>
-#include <libgnomevfs/gnome-vfs.h>
 
 #include <libanjuta/anjuta-plugin-manager.h>
 #include <libanjuta/anjuta-marshal.h>
