20 files changed, 19 insertions, 31 deletions
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index f5ba5ea6c..bd5488c04 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -67,8 +67,7 @@
 #include <gtk/gtkenums.h>
 #include <gtk/gtkbindings.h>
 #include <glib/gi18n.h>
-#include <gio/gioerror.h>
-#include <gio/gcontenttype.h>
+#include <gio/gio.h>
 #include <libgnomeui/gnome-help.h>
 #include <libnautilus-private/nautilus-recent.h>
 #include <libnautilus-extension/nautilus-menu-provider.h>
diff --git a/src/file-manager/fm-directory-view.h b/src/file-manager/fm-directory-view.h
index 53aadef6a..3390134b7 100644
--- a/src/file-manager/fm-directory-view.h
+++ b/src/file-manager/fm-directory-view.h
@@ -39,7 +39,7 @@
 #include <libnautilus-private/nautilus-link.h>
 #include <libnautilus-private/nautilus-view.h>
 #include <libnautilus-private/nautilus-window-info.h>
-#include <gio/gappinfo.h>
+#include <gio/gio.h>
 
 typedef struct FMDirectoryView FMDirectoryView;
 typedef struct FMDirectoryViewClass FMDirectoryViewClass;
diff --git a/src/file-manager/fm-icon-container.c b/src/file-manager/fm-icon-container.c
index 7b76024e9..2d24cdfc8 100644
--- a/src/file-manager/fm-icon-container.c
+++ b/src/file-manager/fm-icon-container.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <libgnome/gnome-macros.h>
 #include <glib/gi18n.h>
-#include <gio/gcontenttype.h>
+#include <gio/gio.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
 #include <libnautilus-private/nautilus-file-attributes.h>
 #include <libnautilus-private/nautilus-thumbnails.h>
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index 2caede7e9..321b397cb 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -48,7 +48,7 @@
 #include <gtk/gtkwindow.h>
 #include <gtk/gtkstock.h>
 #include <glib/gi18n.h>
-#include <gio/gcontenttype.h>
+#include <gio/gio.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-tree-model.h b/src/file-manager/fm-tree-model.h
index 585d43fe8..724bfd862 100644
--- a/src/file-manager/fm-tree-model.h
+++ b/src/file-manager/fm-tree-model.h
@@ -29,7 +29,7 @@
 
 #include <glib-object.h>
 #include <gtk/gtktreemodel.h>
-#include <gio/gmount.h>
+#include <gio/gio.h>
 #include <libnautilus-private/nautilus-file.h>
 
 #define FM_TYPE_TREE_MODEL	    (fm_tree_model_get_type ())
diff --git a/src/file-manager/fm-tree-view.c b/src/file-manager/fm-tree-view.c
index f926eb97d..c2211f25c 100644
--- a/src/file-manager/fm-tree-view.c
+++ b/src/file-manager/fm-tree-view.c
@@ -56,8 +56,7 @@
 #include <gtk/gtkmenushell.h>
 #include <gtk/gtkclipboard.h>
 #include <glib/gi18n.h>
-#include <gio/gvolumemonitor.h>
-#include <gio/gthemedicon.h>
+#include <gio/gio.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <libgnomeui/gnome-popup-menu.h>
 #include <libnautilus-private/nautilus-clipboard-monitor.h>
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 23233e2c6..85f408910 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -60,7 +60,7 @@
 #include <libxml/xmlsave.h>
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
-#include <gio/gfile.h>
+#include <gio/gio.h>
 #include <bonobo/bonobo-main.h>
 #include <bonobo/bonobo-object.h>
 #include <eel/eel-gtk-extensions.h>
@@ -68,7 +68,6 @@
 #include <eel/eel-stock-dialogs.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtkwindow.h>
-#include <gio/gfile.h>
 #include <libgnome/gnome-config.h>
 #include <libgnomeui/gnome-authentication-manager.h>
 #include <libgnomeui/gnome-client.h>
@@ -82,8 +81,6 @@
 #include <libnautilus-private/nautilus-signaller.h>
 #include <libnautilus-extension/nautilus-menu-provider.h>
 #include <bonobo-activation/bonobo-activation.h>
-#include <gio/gthemedicon.h>
-#include <gio/gfileicon.h>
 
 #ifdef HAVE_STARTUP_NOTIFICATION
 #define SN_API_NOT_YET_FROZEN Yes_i_know_DO_IT
diff --git a/src/nautilus-application.h b/src/nautilus-application.h
index 870bbddd0..d2cb81a37 100644
--- a/src/nautilus-application.h
+++ b/src/nautilus-application.h
@@ -28,7 +28,7 @@
 #define NAUTILUS_APPLICATION_H
 
 #include <gdk/gdk.h>
-#include <gio/gvolumemonitor.h>
+#include <gio/gio.h>
 #include <bonobo/bonobo-generic-factory.h>
 #include <libnautilus-private/nautilus-undo-manager.h>
 
diff --git a/src/nautilus-bookmark-list.c b/src/nautilus-bookmark-list.c
index d2ced9485..8a29fabba 100644
--- a/src/nautilus-bookmark-list.c
+++ b/src/nautilus-bookmark-list.c
@@ -32,9 +32,7 @@
 #include <libnautilus-private/nautilus-file.h>
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-string.h>
-#include <gio/gfile.h>
-#include <gio/gfilemonitor.h>
-#include <gio/gthemedicon.h>
+#include <gio/gio.h>
 
 #define MAX_BOOKMARK_LENGTH 80
 
diff --git a/src/nautilus-bookmark-list.h b/src/nautilus-bookmark-list.h
index 1ad01aad9..0f2dd0d7e 100644
--- a/src/nautilus-bookmark-list.h
+++ b/src/nautilus-bookmark-list.h
@@ -29,7 +29,7 @@
 #define NAUTILUS_BOOKMARK_LIST_H
 
 #include <libnautilus-private/nautilus-bookmark.h>
-#include <gio/gfilemonitor.h>
+#include <gio/gio.h>
 
 typedef struct NautilusBookmarkList NautilusBookmarkList;
 typedef struct NautilusBookmarkListClass NautilusBookmarkListClass;
diff --git a/src/nautilus-desktop-window.c b/src/nautilus-desktop-window.c
index aa939b90b..0470c593a 100644
--- a/src/nautilus-desktop-window.c
+++ b/src/nautilus-desktop-window.c
@@ -34,7 +34,7 @@
 #include <eel/eel-vfs-extensions.h>
 #include <libgnome/gnome-macros.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
-#include <gio/gthemedicon.h>
+#include <gio/gio.h>
 
 struct NautilusDesktopWindowDetails {
 	int dummy;
diff --git a/src/nautilus-image-properties-page.c b/src/nautilus-image-properties-page.c
index 7988a03f8..b6152d326 100644
--- a/src/nautilus-image-properties-page.c
+++ b/src/nautilus-image-properties-page.c
@@ -30,7 +30,7 @@
 #include <gtk/gtklabel.h>
 #include <libgnome/gnome-macros.h>
 #include <glib/gi18n.h>
-#include <gio/gfile.h>
+#include <gio/gio.h>
 #include <eel/eel-vfs-extensions.h>
 #include <libnautilus-extension/nautilus-property-page-provider.h>
 #include <libnautilus-private/nautilus-module.h>
diff --git a/src/nautilus-location-entry.c b/src/nautilus-location-entry.c
index 491d64e7d..884efcc02 100644
--- a/src/nautilus-location-entry.c
+++ b/src/nautilus-location-entry.c
@@ -42,14 +42,13 @@
 #include <gtk/gtkdnd.h>
 #include <gtk/gtksignal.h>
 #include <glib/gi18n.h>
-#include <gio/gfilenamecompleter.h>
+#include <gio/gio.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-entry.h>
 #include <libnautilus-private/nautilus-icon-dnd.h>
 #include <libnautilus-private/nautilus-clipboard.h>
-#include <gio/gfilenamecompleter.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 0d21e665e..f22e2cd73 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -78,7 +78,6 @@
 #include <libnautilus-private/nautilus-signaller.h>
 #include <math.h>
 #include <sys/time.h>
-#include <gio/gthemedicon.h>
 
 
 /* FIXME bugzilla.gnome.org 41243: 
diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c
index 25b369478..dbf65c08d 100644
--- a/src/nautilus-pathbar.c
+++ b/src/nautilus-pathbar.c
@@ -33,8 +33,7 @@
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkmain.h>
 #include <glib/gi18n.h>
-#include <gio/gthemedicon.h>
-#include <gio/gvolumemonitor.h>
+#include <gio/gio.h>
 #include <libnautilus-private/nautilus-file.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
diff --git a/src/nautilus-pathbar.h b/src/nautilus-pathbar.h
index 7a6f0d8bf..b233c215e 100644
--- a/src/nautilus-pathbar.h
+++ b/src/nautilus-pathbar.h
@@ -22,7 +22,7 @@
 #define NAUTILUS_PATHBAR_H
 
 #include <gtk/gtkcontainer.h>
-#include <gio/gfile.h>
+#include <gio/gio.h>
 
 typedef struct _NautilusPathBar      NautilusPathBar;
 typedef struct _NautilusPathBarClass NautilusPathBarClass;
diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
index d94856dec..683193760 100644
--- a/src/nautilus-places-sidebar.c
+++ b/src/nautilus-places-sidebar.c
@@ -55,8 +55,7 @@
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-file-operations.h>
 #include <libnautilus-private/nautilus-trash-monitor.h>
-#include <gio/gvolumemonitor.h>
-#include <gio/gthemedicon.h>
+#include <gio/gio.h>
 
 #include "nautilus-bookmark-list.h"
 #include "nautilus-places-sidebar.h"
diff --git a/src/nautilus-property-browser.c b/src/nautilus-property-browser.c
index e242ab5a6..045182f77 100644
--- a/src/nautilus-property-browser.c
+++ b/src/nautilus-property-browser.c
@@ -67,8 +67,7 @@
 #include <gtk/gtkviewport.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
-#include <gio/gfile.h>
-#include <gio/gcontenttype.h>
+#include <gio/gio.h>
 #include <libgnome/gnome-util.h>
 #include <libgnome/gnome-help.h>
 #include <libgnomeui/gnome-color-picker.h>
diff --git a/src/nautilus-query-editor.c b/src/nautilus-query-editor.c
index 116a1122f..c7cc9a072 100644
--- a/src/nautilus-query-editor.c
+++ b/src/nautilus-query-editor.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <libnautilus-private/nautilus-marshal.h>
 #include <glib/gi18n.h>
-#include <gio/gcontenttype.h>
+#include <gio/gio.h>
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-glib-extensions.h>
 #include <gdk/gdkkeysyms.h>
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 63b04c72e..0de17a564 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -45,7 +45,7 @@
 #include <gtk/gtkaboutdialog.h>
 #include <gtk/gtkenums.h>
 #include <gtk/gtkversion.h>
-#include <gio/gvfs.h>
+#include <gio/gio.h>
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-help.h>
 #include <libnautilus-extension/nautilus-menu-provider.h>