Index: plugins/sourceview/Makefile.am
===================================================================
--- plugins/sourceview/Makefile.am	(revision 4586)
+++ plugins/sourceview/Makefile.am	(working copy)
@@ -25,7 +25,7 @@
 	$(WARN_CFLAGS) \
 	$(DEPRECATED_FLAGS) \
 	$(GNOME_PRINT_UI_CFLAGS) \
-	$(GNOME_VFS_CFLAGS) \
+	$(GIO_CFLAGS) \
 	$(PLUGIN_SOURCEVIEW_CFLAGS) \
 	$(LIBANJUTA_CFLAGS)
 
@@ -75,7 +75,7 @@
 # Plugin dependencies
 libanjuta_sourceview_la_LIBADD = \
 	$(GNOME_PRINT_UI_LIBS) \
-	$(GNOME_VFS_LIBS) \
+	$(GIO_LIBS) \
 	$(PLUGIN_SOURCEVIEW_LIBS) \
 	$(GLADE_LIBS) \
 	$(LIBANJUTA_LIBS)
Index: plugins/patch/plugin.c
===================================================================
--- plugins/patch/plugin.c	(revision 4586)
+++ plugins/patch/plugin.c	(working copy)
@@ -16,7 +16,6 @@
  */
 
 #include <config.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <libanjuta/anjuta-shell.h>
 #include <libanjuta/anjuta-debug.h>
 #include <libanjuta/anjuta-plugin.h>
Index: plugins/search/search-replace_backend.c
===================================================================
--- plugins/search/search-replace_backend.c	(revision 4586)
+++ plugins/search/search-replace_backend.c	(working copy)
@@ -830,7 +830,7 @@
 			anjuta_shell_get (ANJUTA_PLUGIN(sr->docman)->shell,
 							  "project_root_uri", G_TYPE_STRING,
 							  &dir_uri, NULL);
-			// FIXME : Replace Standard UNIX IO functions by gnome-vfs 
+			// FIXME : Replace Standard UNIX IO functions by gio 
 			if (dir_uri)			
 				dir = anjuta_util_get_local_path_from_uri(dir_uri);
 			
Index: plugins/valgrind/preferences.c
===================================================================
--- plugins/valgrind/preferences.c	(revision 4586)
+++ plugins/valgrind/preferences.c	(working copy)
@@ -30,7 +30,6 @@
 
 #include <string.h>
 #include <gconf/gconf-client.h>
-#include <libgnomevfs/gnome-vfs.h>
 #include <libanjuta/anjuta-debug.h>
 
 #define EDITOR_KEY      "/apps/anjuta/valgrind/editor"
Index: plugins/valgrind/vggeneralprefs.c
===================================================================
--- plugins/valgrind/vggeneralprefs.c	(revision 4586)
+++ plugins/valgrind/vggeneralprefs.c	(working copy)
@@ -36,7 +36,6 @@
 
 #include <gconf/gconf-client.h>
 #include <glib/gi18n.h>
-#include <libgnomevfs/gnome-vfs.h>
 #include <libanjuta/anjuta-debug.h>
 #include <libanjuta/anjuta-utils.h>
 
Index: plugins/valgrind/vgdefaultview.c
===================================================================
--- plugins/valgrind/vgdefaultview.c	(revision 4586)
+++ plugins/valgrind/vgdefaultview.c	(working copy)
@@ -674,7 +674,7 @@
  * We can only load local files. Support to VFS would require to change all the
  * I/O [i.e. fopen/fwrite/etc...] calls for this plugin. I hope day somebody
  * will write a gnomelib wrapper that supports old I/O methos.
- * Perhaps a solution would be to save the file grabbed by the gnome_vfs to /tmp
+ * Perhaps a solution would be to save the file grabbed by the gvfs to /tmp
  * and then open it with the I/O fopen/fwrite.
  */
  
Index: plugins/gtodo/Makefile.am
===================================================================
--- plugins/gtodo/Makefile.am	(revision 4586)
+++ plugins/gtodo/Makefile.am	(working copy)
@@ -28,7 +28,7 @@
 	$(WARN_CFLAGS) \
 	$(DEPRECATED_FLAGS) \
 	$(GTK_CFLAGS) \
-	$(GNOME_VFS_CFLAGS) \
+	$(GIO_CFLAGS) \
 	$(LIBXSLT_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
 	-DDATADIR="\"$(anjuta_data_dir)\"" \
@@ -38,7 +38,7 @@
 
 libanjuta_gtodo_la_LIBADD = \
 	$(GTK_LIBS) \
-	$(GNOME_VFS_LIBS) \
+	$(GIO_LIBS) \
 	$(LIBXSLT_LIBS) \
 	$(LIBANJUTA_LIBS)
 
Index: plugins/project-manager/plugin.c
===================================================================
--- plugins/project-manager/plugin.c	(revision 4586)
+++ plugins/project-manager/plugin.c	(working copy)
@@ -19,8 +19,6 @@
 */
 
 #include <config.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
 #include <libanjuta/interfaces/ianjuta-file.h>
 #include <libanjuta/interfaces/ianjuta-file-savable.h>
 #include <libanjuta/interfaces/ianjuta-file-loader.h>
@@ -86,18 +84,31 @@
 	status = anjuta_shell_get_status (ANJUTA_PLUGIN (plugin)->shell, NULL);
 	if (project_uri)
 	{
-		gchar* uri_basename;
-		gchar* unescape_basename;
-		gchar* ext;
-		
-		uri_basename = g_path_get_basename (project_uri);
-		unescape_basename = gnome_vfs_unescape_string (uri_basename, "");
-		ext = strrchr (unescape_basename, '.');
-		if (ext)
-			*ext = '\0';
-		anjuta_status_set_title (status, unescape_basename);
-		g_free (unescape_basename);
-		g_free (uri_basename);
+		GFile *file;
+		GFileInfo *file_info;
+
+		file = g_file_new_for_uri (project_uri);
+		file_info = g_file_query_info (file,
+			G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
+			G_FILE_QUERY_INFO_NONE,
+			NULL,
+			NULL);
+		if (file_info)
+		{
+			gchar *dispname;
+			gchar *ext;
+			
+			dispname = g_strdup (
+				g_file_info_get_display_name (file_info));
+			ext = strrchr (dispname, '.');	
+			if (ext)
+				*ext = '\0';
+			anjuta_status_set_title (status, dispname);
+			g_free (dispname);
+			g_object_unref (file_info);
+		}
+
+		g_object_unref (file);
 	}
 	else
 	{
@@ -726,22 +737,27 @@
 on_popup_add_to_project (GtkAction *action, ProjectManagerPlugin *plugin)
 {
 	GtkWindow *win;
-	GnomeVFSFileInfo info;
-	GnomeVFSResult res;
+	GFile *file;
+	GFileInfo *file_info;
 	gchar *parent_directory, *filename;
+	GError *error = NULL;
 	
 	win = get_plugin_parent_window (plugin);
-	res = gnome_vfs_get_file_info (plugin->fm_current_uri, &info,
-								   GNOME_VFS_FILE_INFO_DEFAULT |
-								   GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
-	if (res == GNOME_VFS_OK)
+
+	file = g_file_new_for_uri (plugin->fm_current_uri);
+	file_info = g_file_query_info (file,
+	                               G_FILE_ATTRIBUTE_STANDARD_TYPE,
+								   G_FILE_QUERY_INFO_NONE,
+								   NULL,
+								   &error);
+	if (file_info != NULL)
 	{
 		parent_directory = g_path_get_dirname (plugin->fm_current_uri);
 		if (!parent_directory)
 			parent_directory = g_strdup ("");
 		
 		filename = g_path_get_basename (plugin->fm_current_uri);
-		if (info.type == GNOME_VFS_FILE_TYPE_DIRECTORY)
+		if (g_file_info_get_file_type (file_info) == G_FILE_TYPE_DIRECTORY)
 		{
 			gchar *group_id =
 			ianjuta_project_manager_add_group (IANJUTA_PROJECT_MANAGER (plugin),
@@ -759,20 +775,15 @@
 													NULL);
 			g_free(source_id);
 		}
+		g_object_unref (file_info);
 		g_free (filename);
 		g_free (parent_directory);
 	}
 	else
 	{
-		const gchar *mesg;
-		
-		if (res != GNOME_VFS_OK)
-			mesg = gnome_vfs_result_to_string (res);
-		else
-			mesg = _("The file you selected is a link and can't be added to the project");
-		anjuta_util_dialog_error (win,
-								  _("Failed to retrieve URI info of %s: %s"),
-								  plugin->fm_current_uri, mesg);
+		anjuta_util_dialog_error (win, _("Failed to retrieve URI info of %s: %s"),
+					  plugin->fm_current_uri, error->message);
+		g_error_free (error);
 	}
 }
 
@@ -1179,7 +1190,7 @@
 	
 	root_uri = pm_plugin->project_root_uri;
 	
-	dirname = gnome_vfs_get_local_path_from_uri (root_uri);
+	dirname = anjuta_util_get_local_path_from_uri (root_uri);
 	
 	g_return_if_fail (dirname != NULL);
 	
@@ -1673,12 +1684,26 @@
 
 /* IAnjutaProjectManager implementation */
 
-static GnomeVFSFileType
+static GFileType
 get_uri_vfs_type (const gchar *uri)
 {
-	GnomeVFSFileInfo info;
-	gnome_vfs_get_file_info (uri, &info, 0);
-	return info.type;
+	GFileType retval = G_FILE_TYPE_UNKNOWN;
+	GFile *file;
+	GFileInfo *file_info;
+
+	file = g_file_new_for_uri (uri);
+	file_info = g_file_query_info (file,
+		G_FILE_ATTRIBUTE_STANDARD_TYPE,
+		G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+		NULL, NULL);
+	if (file_info)
+	{
+		retval = g_file_info_get_file_type (file_info);
+		g_object_unref (file_info);
+	}
+
+	g_object_unref (file);
+	return retval;
 }
 
 static gboolean
@@ -1832,7 +1857,7 @@
 		id = g_strdup (target->id);
 		gbf_project_target_free (target);
 	}
-	else if (get_uri_vfs_type (uri) | GNOME_VFS_FILE_TYPE_DIRECTORY)
+	else if (get_uri_vfs_type (uri) | G_FILE_TYPE_DIRECTORY)
 	{
 		id = g_strconcat (get_element_relative_path (plugin, uri, IANJUTA_PROJECT_MANAGER_PROJECT_ROOT_URI), "/", NULL);
 	}
@@ -1848,7 +1873,7 @@
 								   const gchar *element_uri,
 								   GError **err)
 {
-	GnomeVFSFileType ftype;
+	GFileType ftype;
 	ProjectManagerPlugin *plugin;
 	
 	g_return_val_if_fail (ANJUTA_IS_PLUGIN (project_manager),
@@ -1861,7 +1886,7 @@
 						  IANJUTA_PROJECT_MANAGER_UNKNOWN);
 	
 	ftype = get_uri_vfs_type (element_uri);
-	if (ftype | GNOME_VFS_FILE_TYPE_DIRECTORY)
+	if (ftype | G_FILE_TYPE_DIRECTORY)
 	{
 		return IANJUTA_PROJECT_MANAGER_GROUP;
 	}
@@ -1871,7 +1896,7 @@
 	{
 		return IANJUTA_PROJECT_MANAGER_TARGET;
 	}
-	else if (ftype | GNOME_VFS_FILE_TYPE_REGULAR)
+	else if (ftype | G_FILE_TYPE_REGULAR)
 	{
 		return IANJUTA_PROJECT_MANAGER_SOURCE;
 	}
@@ -2410,19 +2435,20 @@
 	AnjutaProfileManager *profile_manager;
 	AnjutaPluginManager *plugin_manager;
 	AnjutaStatus *status;
-	gchar *dirname, *dirname_tmp, *vfs_dir;
 	gchar *session_profile_path, *profile_name;
 	GFile *session_profile;
+	GFile *default_profile;
+	GFile *project_root;
+	GFile *tmp;
 	ProjectManagerPlugin *plugin;
 	GError *error = NULL;
-	gchar* uri = g_file_get_uri (file);
-	GnomeVFSURI* vfs_uri;
 
 	plugin = ANJUTA_PLUGIN_PROJECT_MANAGER (ifile);
 	
 	/* If there is already a project loaded, load in separate anjuta window */
 	if (plugin->project_root_uri)
 	{
+		gchar *uri = g_file_get_uri (file);
 		gchar *quoted_uri = g_shell_quote (uri);
 		gchar *cmd = g_strconcat ("anjuta --no-splash --no-client ", quoted_uri, NULL);
 		g_free (quoted_uri);
@@ -2444,48 +2470,41 @@
 	profile = anjuta_profile_new (PROJECT_PROFILE_NAME, plugin_manager);
 	
 	/* System default profile */
-	session_profile = g_file_new_for_uri (DEFAULT_PROFILE);
-	anjuta_profile_add_plugins_from_xml (profile, session_profile,
+	default_profile = g_file_new_for_uri (DEFAULT_PROFILE);
+	anjuta_profile_add_plugins_from_xml (profile, default_profile,
 										 TRUE, &error);
-	g_object_unref (session_profile);
+	profile_name = g_file_get_basename (default_profile);
+	g_object_unref (default_profile);
 	if (error)
 	{
 		g_propagate_error (e, error);
-
-		g_free(uri);
+		g_free (profile_name);
 		g_object_unref (profile);
 		
 		return;
 	}
 	
 	/* Project default profile */
-	session_profile = g_file_new_for_uri (uri);
-	anjuta_profile_add_plugins_from_xml (profile, session_profile, TRUE, &error);
-	g_object_unref (session_profile);
+	anjuta_profile_add_plugins_from_xml (profile, file, TRUE, &error);
 	if (error)
 	{
 		g_propagate_error (e, error);
-		
-		g_free(uri);
+	
+		g_free (profile_name);
 		g_object_unref (profile);
 
 		return;
 	}
 	
 	/* Project session profile */
-	vfs_uri = gnome_vfs_uri_new (uri);
+	project_root = g_file_get_parent (file);
+	tmp = g_file_get_child (project_root, ".anjuta");
+	session_profile = g_file_get_child (tmp, profile_name);
+	g_object_unref (tmp);
+	g_free (profile_name);
 	
-	dirname_tmp = gnome_vfs_uri_extract_dirname (vfs_uri);
-	dirname = gnome_vfs_unescape_string (dirname_tmp, "");
-	g_free (dirname_tmp);
-	
-	profile_name = g_path_get_basename (DEFAULT_PROFILE);
-	gnome_vfs_uri_unref (vfs_uri);
-	
-	session_profile_path = g_build_filename (dirname, ".anjuta",
-										profile_name, NULL);
+	session_profile_path = g_file_get_path (session_profile);
 	DEBUG_PRINT ("Loading project session profile: %s", session_profile_path);
-	session_profile = g_file_new_for_path (session_profile_path);
 	if (g_file_query_exists (session_profile, NULL))
 	{
 		anjuta_profile_add_plugins_from_xml (profile, session_profile,
@@ -2493,8 +2512,9 @@
 		if (error)
 		{
 			g_propagate_error (e, error);
-			
-			g_free(uri);
+		
+			g_free (session_profile_path);
+			g_object_unref (project_root);
 			g_object_unref (profile);
 			g_object_unref (session_profile);
 			
@@ -2503,16 +2523,14 @@
 	}
 	anjuta_profile_set_sync_file (profile, session_profile); 
 	g_free (session_profile_path);
-	g_free (profile_name);
 	
 	/* Set project uri */
 	g_free (plugin->project_root_uri);
 	g_free (plugin->project_uri);
 	
-	vfs_dir = gnome_vfs_get_uri_from_local_path (dirname);
-	plugin->project_uri = g_strdup (uri);
-	plugin->project_root_uri = vfs_dir;
-	g_free (dirname);
+	plugin->project_uri = g_file_get_uri (file);
+	plugin->project_root_uri = g_file_get_uri (project_root);
+	g_object_unref (project_root);
 	
 	/* Load profile */
 	anjuta_profile_manager_push (profile_manager, profile, &error);
@@ -2529,7 +2547,6 @@
 	update_ui (plugin);
 
 	anjuta_status_progress_tick (status, NULL, _("Project Loaded"));
-	g_free (uri);
 }
 
 static GFile*
Index: plugins/project-manager/gbf-project-model.c
===================================================================
--- plugins/project-manager/gbf-project-model.c	(revision 4586)
+++ plugins/project-manager/gbf-project-model.c	(working copy)
@@ -29,7 +29,6 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
 
 #include "gbf-project-model.h"
 
Index: plugins/project-manager/gbf-tree-data.c
===================================================================
--- plugins/project-manager/gbf-tree-data.c	(revision 4586)
+++ plugins/project-manager/gbf-tree-data.c	(working copy)
@@ -25,7 +25,6 @@
 #include <config.h>
 #endif
 
-#include <libgnomevfs/gnome-vfs-uri.h>
 #include "gbf-tree-data.h"
 
 GType
@@ -81,16 +80,27 @@
 gbf_tree_data_new_source (GbfProject *project, const GbfProjectTargetSource *source)
 {
 	GbfTreeData *node = g_new0 (GbfTreeData, 1);
-	GnomeVFSURI *uri;
+	GFile *file;
+	GFileInfo *file_info;
 	
 	node->type = GBF_TREE_NODE_TARGET_SOURCE;
 	node->id = g_strdup (source->id);
 	node->uri = g_strdup (source->source_uri);
 	
-	uri = gnome_vfs_uri_new (source->source_uri);
-	node->name = gnome_vfs_uri_extract_short_name (uri);
-	gnome_vfs_uri_unref (uri);
-	
+	file = g_file_new_for_uri (source->source_uri);
+	file_info = g_file_query_info (file, 
+		G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
+		G_FILE_QUERY_INFO_NONE,
+		NULL, NULL);
+	if (file_info)
+	{
+		node->name = g_strdup (g_file_info_get_display_name (file_info));
+	}
+	else
+	{
+		node->name = g_strdup ("");
+	}
+
 	return node;
 }
 
Index: plugins/project-manager/gbf-project-util.c
===================================================================
--- plugins/project-manager/gbf-project-util.c	(revision 4586)
+++ plugins/project-manager/gbf-project-util.c	(working copy)
@@ -29,9 +29,7 @@
 #include <glade/glade-xml.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <bonobo/bonobo-file-selector-util.h>
+#include <gio/gio.h>
 
 #include "gbf-tree-data.h"
 #include "gbf-project-view.h"
@@ -541,7 +539,7 @@
 {
     GtkTreeView *tree = user_data;
     gchar *file, *uri;
-    GnomeVFSURI *tmp_uri;
+	GFile *gio_file, *tmp;
     GtkFileChooserDialog* dialog;
 	GtkTreeModel* model;
     GtkTreeIter iter;
@@ -564,13 +562,16 @@
 				      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 				      GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
 				      NULL));
-    tmp_uri = gnome_vfs_uri_new (uri);
+	/* FIXME: this is somewhat UGLY */
+	gio_file = g_file_new_for_uri (uri);
+	tmp = g_file_get_parent (gio_file);
     g_free (uri);
-    uri = NULL;
-    if (tmp_uri) {
-        uri = gnome_vfs_uri_extract_dirname (tmp_uri);
-        gnome_vfs_uri_unref (tmp_uri);
-    }
+	uri = NULL;
+	if (g_file_query_exists (tmp, NULL))
+	{
+	    uri = g_file_get_uri (tmp);
+	}
+
     
     gtk_file_chooser_set_current_folder_uri(GTK_FILE_CHOOSER(dialog),
     	uri ? uri : g_object_get_data (G_OBJECT (widget), "root"));
Index: plugins/indent/indent-util.c
===================================================================
--- plugins/indent/indent-util.c	(revision 4586)
+++ plugins/indent/indent-util.c	(working copy)
@@ -21,7 +21,6 @@
 
 #include <sys/wait.h>
 
-#include <libgnomevfs/gnome-vfs.h>
 #include <gconf/gconf-client.h>
 
 #include <libanjuta/anjuta-utils.h>
@@ -492,37 +491,21 @@
 gchar *
 indent_get_buffer(void)
 {
-	GnomeVFSResult result;
-	GnomeVFSHandle *handle;
-	GnomeVFSFileInfo info;
+	GFile *file;
 	gchar *read_buf = NULL;
-	gchar *text_uri;
+	GError *error = NULL;
+	gsize *size;
 
-	text_uri = gnome_vfs_get_uri_from_local_path(INDENT_FILE_OUTPUT);
-	result = gnome_vfs_get_file_info(text_uri, &info,
-	                                 GNOME_VFS_FILE_INFO_DEFAULT |
-	                                 GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS);
-	if(result != GNOME_VFS_OK )
+	file = g_file_new_for_path (INDENT_FILE_OUTPUT);
+	if (!g_file_load_contents (file, NULL,
+		&read_buf, &size, 
+		NULL, &error))
 	{
-		DEBUG_PRINT("Cannot get info: %s\n", text_uri);
-		return NULL;
+		read_buf = NULL;
+		DEBUG_PRINT ("Error reading file: %s", error->message);
 	}
-	if((result = gnome_vfs_open (&handle, text_uri,
-								 GNOME_VFS_OPEN_READ)) != GNOME_VFS_OK)
-	{
-		DEBUG_PRINT("Cannot open: %s\n", text_uri);
-		return NULL;
-	}
-	read_buf = g_new0(char, info.size + 1);
-	
-	result = gnome_vfs_read (handle, read_buf, info.size, NULL);
-	if(!(result == GNOME_VFS_OK || result == GNOME_VFS_ERROR_EOF))
-	{
-		g_free (read_buf);
-		DEBUG_PRINT("No file: %s\n", text_uri);	
-		return NULL;
-	}
-	gnome_vfs_close (handle);
+	g_object_unref (file);
+
 	return read_buf;
 }
 
Index: plugins/document-manager/Makefile.am
===================================================================
--- plugins/document-manager/Makefile.am	(revision 4586)
+++ plugins/document-manager/Makefile.am	(working copy)
@@ -23,7 +23,7 @@
 	$(DEPRECATED_FLAGS) \
 	$(GDL_CFLAGS) \
 	$(GNOME_PRINT_UI_CFLAGS) \
-	$(GNOME_VFS_CFLAGS) \
+	$(GIO_CFLAGS) \
 	$(LIBANJUTA_CFLAGS) \
 	-DG_LOG_DOMAIN=\"libanjuta-document-manager\"
 
@@ -32,7 +32,7 @@
 libanjuta_document_manager_la_LIBADD = \
 	$(GDL_LIBS) \
 	$(GNOME_PRINT_UI_LIBS) \
-	$(GNOME_VFS_LIBS) \
+	$(GIO_LIBS) \
 	$(LIBANJUTA_LIBS)
 
 libanjuta_document_manager_la_SOURCES= \
Index: plugins/glade/anjuta-design-document.c
===================================================================
--- plugins/glade/anjuta-design-document.c	(revision 4586)
+++ plugins/glade/anjuta-design-document.c	(working copy)
@@ -29,8 +29,6 @@
 #include <libanjuta/interfaces/ianjuta-file-savable.h>
 #include <libanjuta/interfaces/ianjuta-document.h>
 
-#include <libgnomevfs/gnome-vfs-utils.h>
-
 enum
 {
 	PROP_0,
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 4589)
+++ ChangeLog	(working copy)
@@ -1,3 +1,19 @@
+2009-01-15  Jens Georg  <mail@jensge.org>
+
+	* plugins/document-manager/Makefile.am:
+	* plugins/glade/anjuta-design-document.c:
+	* plugins/gtodo/Makefile.am:
+	* plugins/indent/indent-util.c (indent_get_buffer):
+	* plugins/patch/plugin.c:
+	* plugins/search/search-replace_backend.c (create_search_entries):
+	* plugins/sourceview/Makefile.am:
+	* plugins/valgrind/preferences.c:
+	* plugins/valgrind/vgdefaultview.c:
+	* plugins/valgrind/vggeneralprefs.c:
+	
+	#511589 - mostly cosmetical changes like removing #include directives, 
+	makefile references etc.
+
 2009-01-14  Adam Dingle  <adam@medovina.org>
 
 	reviewed by: Massimo Cora'  <mcora@svn.gnome.org>
