Only use <gio/gio.h> include

2007-12-14  Alexander Larsson  <alexl@redhat.com>

        * libnautilus-private/nautilus-bookmark.c:
        * libnautilus-private/nautilus-bookmark.h:
        * libnautilus-private/nautilus-desktop-icon-file.c:
        * libnautilus-private/nautilus-desktop-link-monitor.c:
        * libnautilus-private/nautilus-desktop-link.c:
        * libnautilus-private/nautilus-desktop-link.h:
        * libnautilus-private/nautilus-directory-private.h:
        * libnautilus-private/nautilus-directory.h:
        * libnautilus-private/nautilus-emblem-utils.h:
        * libnautilus-private/nautilus-file-changes-queue.h:
        * libnautilus-private/nautilus-file-operations.c:
        * libnautilus-private/nautilus-file-operations.h:
        * libnautilus-private/nautilus-file-utilities.c:
        * libnautilus-private/nautilus-file-utilities.h:
        * libnautilus-private/nautilus-file.c:
        * libnautilus-private/nautilus-file.h:
        * libnautilus-private/nautilus-icon-info.c:
        * libnautilus-private/nautilus-icon-info.h:
        * libnautilus-private/nautilus-link.c:
        * libnautilus-private/nautilus-mime-actions.h:
        * libnautilus-private/nautilus-mime-application-chooser.c:
        * libnautilus-private/nautilus-monitor.c:
        * libnautilus-private/nautilus-monitor.h:
        * libnautilus-private/nautilus-open-with-dialog.c:
        * libnautilus-private/nautilus-open-with-dialog.h:
        * libnautilus-private/nautilus-program-choosing.c:
        * libnautilus-private/nautilus-program-choosing.h:
        * libnautilus-private/nautilus-progress-info.h:
        * libnautilus-private/nautilus-recent.h:
        * libnautilus-private/nautilus-search-directory.c:
        * libnautilus-private/nautilus-search-engine-simple.c:
        * libnautilus-private/nautilus-trash-monitor.c:
        * libnautilus-private/nautilus-trash-monitor.h:
        * libnautilus-private/nautilus-ui-utilities.c:
        * libnautilus-private/nautilus-view-factory.h:
        * src/file-manager/fm-directory-view.c:
        * src/file-manager/fm-directory-view.h:
        * src/file-manager/fm-icon-container.c:
        * src/file-manager/fm-icon-view.c:
        * src/file-manager/fm-tree-model.h:
        * src/file-manager/fm-tree-view.c:
        * src/nautilus-application.c:
        * src/nautilus-application.h:
        * src/nautilus-bookmark-list.c:
        * src/nautilus-bookmark-list.h:
        * src/nautilus-desktop-window.c:
        * src/nautilus-image-properties-page.c:
        * src/nautilus-location-entry.c:
        * src/nautilus-navigation-window.c:
        * src/nautilus-pathbar.c:
        * src/nautilus-pathbar.h:
        * src/nautilus-places-sidebar.c:
        * src/nautilus-property-browser.c:
        * src/nautilus-query-editor.c:
        * src/nautilus-window-menus.c:
	Only use <gio/gio.h> include 


svn path=/trunk/; revision=13529

35 files changed, 35 insertions, 54 deletions

diff --git a/libnautilus-private/nautilus-bookmark.c b/libnautilus-private/nautilus-bookmark.c
index ff68097c8..6854e3656 100644
--- a/libnautilus-private/nautilus-bookmark.c
+++ b/libnautilus-private/nautilus-bookmark.c
@@ -38,7 +38,7 @@
 #include <gtk/gtkiconfactory.h>
 #include <libgnome/gnome-macros.h>
 #include <libgnome/gnome-util.h>
-#include <gio/gthemedicon.h>
+#include <gio/gio.h>
 #include <libnautilus-private/nautilus-file.h>
 
 enum {
diff --git a/libnautilus-private/nautilus-bookmark.h b/libnautilus-private/nautilus-bookmark.h
index 92341af22..bb12c5d6a 100644
--- a/libnautilus-private/nautilus-bookmark.h
+++ b/libnautilus-private/nautilus-bookmark.h
@@ -27,8 +27,7 @@
 
 #include <gtk/gtkenums.h>
 #include <gtk/gtkwidget.h>
-#include <gio/gfile.h>
-#include <gio/gicon.h>
+#include <gio/gio.h>
 typedef struct NautilusBookmark NautilusBookmark;
 
 #define NAUTILUS_TYPE_BOOKMARK \
diff --git a/libnautilus-private/nautilus-desktop-icon-file.c b/libnautilus-private/nautilus-desktop-icon-file.c
index bfa986ad9..614f44006 100644
--- a/libnautilus-private/nautilus-desktop-icon-file.c
+++ b/libnautilus-private/nautilus-desktop-icon-file.c
@@ -35,7 +35,7 @@
 #include "nautilus-desktop-directory.h"
 #include <glib/gi18n.h>
 #include <string.h>
-#include <gio/gdrive.h>
+#include <gio/gio.h>
 
 struct NautilusDesktopIconFileDetails {
 	NautilusDesktopLink *link;
diff --git a/libnautilus-private/nautilus-desktop-link-monitor.c b/libnautilus-private/nautilus-desktop-link-monitor.c
index 1dca6d9fb..d1734ea9f 100644
--- a/libnautilus-private/nautilus-desktop-link-monitor.c
+++ b/libnautilus-private/nautilus-desktop-link-monitor.c
@@ -39,7 +39,7 @@
 #include <gtk/gtksignal.h>
 #include <gtk/gtkstock.h>
 #include <glib/gi18n.h>
-#include <gio/gvolumemonitor.h>
+#include <gio/gio.h>
 #include <libnautilus-private/nautilus-trash-monitor.h>
 #include <string.h>
 
diff --git a/libnautilus-private/nautilus-desktop-link.c b/libnautilus-private/nautilus-desktop-link.c
index c03591a95..053ac7b0f 100644
--- a/libnautilus-private/nautilus-desktop-link.c
+++ b/libnautilus-private/nautilus-desktop-link.c
@@ -29,9 +29,7 @@
 #include "nautilus-directory-private.h"
 #include "nautilus-desktop-directory.h"
 #include <glib/gi18n.h>
-#include <gio/gthemedicon.h>
-#include <gio/gmount.h>
-#include <gio/gvolume.h>
+#include <gio/gio.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-trash-monitor.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
diff --git a/libnautilus-private/nautilus-desktop-link.h b/libnautilus-private/nautilus-desktop-link.h
index 2db056983..16eaf3981 100644
--- a/libnautilus-private/nautilus-desktop-link.h
+++ b/libnautilus-private/nautilus-desktop-link.h
@@ -26,7 +26,7 @@
 #define NAUTILUS_DESKTOP_LINK_H
 
 #include <libnautilus-private/nautilus-file.h>
-#include <gio/gmount.h>
+#include <gio/gio.h>
 
 #define NAUTILUS_TYPE_DESKTOP_LINK \
 	(nautilus_desktop_link_get_type ())
diff --git a/libnautilus-private/nautilus-directory-private.h b/libnautilus-private/nautilus-directory-private.h
index dad6bb4a8..8c9fac087 100644
--- a/libnautilus-private/nautilus-directory-private.h
+++ b/libnautilus-private/nautilus-directory-private.h
@@ -22,7 +22,7 @@
    Author: Darin Adler <darin@bentspoon.com>
 */
 
-#include <gio/gfile.h>
+#include <gio/gio.h>
 #include <eel/eel-vfs-extensions.h>
 #include <libnautilus-private/nautilus-directory.h>
 #include <libnautilus-private/nautilus-file-queue.h>
diff --git a/libnautilus-private/nautilus-directory.h b/libnautilus-private/nautilus-directory.h
index 40397b863..246c7f367 100644
--- a/libnautilus-private/nautilus-directory.h
+++ b/libnautilus-private/nautilus-directory.h
@@ -26,7 +26,7 @@
 #define NAUTILUS_DIRECTORY_H
 
 #include <gtk/gtkobject.h>
-#include <gio/gfile.h>
+#include <gio/gio.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-emblem-utils.h b/libnautilus-private/nautilus-emblem-utils.h
index ffdc74d27..d203b5153 100644
--- a/libnautilus-private/nautilus-emblem-utils.h
+++ b/libnautilus-private/nautilus-emblem-utils.h
@@ -23,7 +23,7 @@
 */
 
 #include <glib.h>
-#include <gio/gfile.h>
+#include <gio/gio.h>
 #include <gtk/gtkwindow.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
diff --git a/libnautilus-private/nautilus-file-changes-queue.h b/libnautilus-private/nautilus-file-changes-queue.h
index 573dad30f..185def413 100644
--- a/libnautilus-private/nautilus-file-changes-queue.h
+++ b/libnautilus-private/nautilus-file-changes-queue.h
@@ -24,7 +24,7 @@
 #define NAUTILUS_FILE_CHANGES_QUEUE_H
 
 #include <gdk/gdktypes.h>
-#include <gio/gfile.h>
+#include <gio/gio.h>
 
 void nautilus_file_changes_queue_file_added                      (GFile      *location);
 void nautilus_file_changes_queue_file_changed                    (GFile      *location);
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index cbae74056..107ae2511 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -62,9 +62,8 @@
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libgnomevfs/gnome-vfs-volume.h>
 #include <libgnomevfs/gnome-vfs-volume-monitor.h>
-#include <gio/gfile.h>
+#include <gio/gio.h>
 #include <glib/gurifuncs.h>
-#include <gio/gioscheduler.h>
 #include "nautilus-file-changes-queue.h"
 #include "nautilus-file-private.h"
 #include "nautilus-desktop-icon-file.h"
diff --git a/libnautilus-private/nautilus-file-operations.h b/libnautilus-private/nautilus-file-operations.h
index 12b67ee92..123dd1c96 100644
--- a/libnautilus-private/nautilus-file-operations.h
+++ b/libnautilus-private/nautilus-file-operations.h
@@ -29,7 +29,7 @@
 
 #include <gdk/gdkdnd.h>
 #include <gtk/gtkwidget.h>
-#include <gio/gmount.h>
+#include <gio/gio.h>
 
 typedef void (* NautilusCopyCallback)      (GHashTable *debuting_uris,
 					    gpointer    callback_data);
diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c
index 1f89f64d0..d7ddb78cb 100644
--- a/libnautilus-private/nautilus-file-utilities.c
+++ b/libnautilus-private/nautilus-file-utilities.c
@@ -37,7 +37,7 @@
 #include <eel/eel-debug.h>
 #include <libgnome/gnome-util.h>
 #include <glib/gi18n.h>
-#include <gio/gfilemonitor.h>
+#include <gio/gio.h>
 #include <unistd.h>
 #include <stdlib.h>
 
diff --git a/libnautilus-private/nautilus-file-utilities.h b/libnautilus-private/nautilus-file-utilities.h
index 4f290ae37..97bb15c5b 100644
--- a/libnautilus-private/nautilus-file-utilities.h
+++ b/libnautilus-private/nautilus-file-utilities.h
@@ -25,7 +25,7 @@
 #ifndef NAUTILUS_FILE_UTILITIES_H
 #define NAUTILUS_FILE_UTILITIES_H
 
-#include <gio/gfile.h>
+#include <gio/gio.h>
 
 #define NAUTILUS_SAVED_SEARCH_EXTENSION ".savedSearch"
 #define NAUTILUS_SAVED_SEARCH_MIMETYPE "application/x-gnome-saved-search"
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index dbe8b84e4..80d585173 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -55,12 +55,10 @@
 #include <grp.h>
 #include <gtk/gtksignal.h>
 #include <glib/gi18n.h>
-#include <gio/gcontenttype.h>
+#include <gio/gio.h>
 #include <glib/gurifuncs.h>
 #include <libgnome/gnome-macros.h>
 #include <glib/gfileutils.h>
-#include <gio/gthemedicon.h>
-#include <gio/gfileicon.h>
 #include <libnautilus-extension/nautilus-file-info.h>
 #include <libxml/parser.h>
 #include <pwd.h>
diff --git a/libnautilus-private/nautilus-file.h b/libnautilus-private/nautilus-file.h
index b2c94481d..55812b2c0 100644
--- a/libnautilus-private/nautilus-file.h
+++ b/libnautilus-private/nautilus-file.h
@@ -26,9 +26,7 @@
 #define NAUTILUS_FILE_H
 
 #include <gtk/gtkobject.h>
-#include <gio/gfileinfo.h>
-#include <gio/gfile.h>
-#include <gio/gioerror.h>
+#include <gio/gio.h>
 #include <libnautilus-private/nautilus-file-attributes.h>
 #include <libnautilus-private/nautilus-icon-info.h>
 
diff --git a/libnautilus-private/nautilus-icon-info.c b/libnautilus-private/nautilus-icon-info.c
index cbf387eed..0081954df 100644
--- a/libnautilus-private/nautilus-icon-info.c
+++ b/libnautilus-private/nautilus-icon-info.c
@@ -23,8 +23,7 @@
 #include "nautilus-default-file-icon.h"
 #include <gtk/gtkicontheme.h>
 #include <gtk/gtkiconfactory.h>
-#include <gio/gloadableicon.h>
-#include <gio/gthemedicon.h>
+#include <gio/gio.h>
 #include <eel/eel-gdk-pixbuf-extensions.h>
 
 #define NAUTILUS_EMBLEM_NAME_PREFIX "emblem-"
diff --git a/libnautilus-private/nautilus-icon-info.h b/libnautilus-private/nautilus-icon-info.h
index 55cda6c51..85dd618b0 100644
--- a/libnautilus-private/nautilus-icon-info.h
+++ b/libnautilus-private/nautilus-icon-info.h
@@ -4,7 +4,7 @@
 #include <glib-object.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdktypes.h>
-#include <gio/gicon.h>
+#include <gio/gio.h>
 #include <gtk/gtkstock.h>
 
 G_BEGIN_DECLS
diff --git a/libnautilus-private/nautilus-link.c b/libnautilus-private/nautilus-link.c
index ccf6f9d89..0892dd970 100644
--- a/libnautilus-private/nautilus-link.c
+++ b/libnautilus-private/nautilus-link.c
@@ -33,9 +33,7 @@
 #include "nautilus-program-choosing.h"
 #include <eel/eel-vfs-extensions.h>
 #include <glib/gi18n.h>
-#include <gio/gfile.h>
-#include <gio/gfileinfo.h>
-#include <gio/gcontenttype.h>
+#include <gio/gio.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/libnautilus-private/nautilus-mime-actions.h b/libnautilus-private/nautilus-mime-actions.h
index 888fc5646..71ff4909e 100644
--- a/libnautilus-private/nautilus-mime-actions.h
+++ b/libnautilus-private/nautilus-mime-actions.h
@@ -25,7 +25,7 @@
 #ifndef NAUTILUS_MIME_ACTIONS_H
 #define NAUTILUS_MIME_ACTIONS_H
 
-#include <gio/gappinfo.h>
+#include <gio/gio.h>
 
 #include <libnautilus-private/nautilus-file.h>
 #include <libnautilus-private/nautilus-window-info.h>
diff --git a/libnautilus-private/nautilus-mime-application-chooser.c b/libnautilus-private/nautilus-mime-application-chooser.c
index 92adbebd9..e8cbca45a 100644
--- a/libnautilus-private/nautilus-mime-application-chooser.c
+++ b/libnautilus-private/nautilus-mime-application-chooser.c
@@ -53,9 +53,7 @@
 #include <gtk/gtktreeview.h>
 #include <gtk/gtktreeselection.h>
 #include <gtk/gtkvbox.h>
-#include <gio/gcontenttype.h>
-#include <gio/gthemedicon.h>
-#include <gio/gfileicon.h>
+#include <gio/gio.h>
 
 struct _NautilusMimeApplicationChooserDetails {
 	char *uri;
diff --git a/libnautilus-private/nautilus-monitor.c b/libnautilus-private/nautilus-monitor.c
index 63c07e327..4a70e6b19 100644
--- a/libnautilus-private/nautilus-monitor.c
+++ b/libnautilus-private/nautilus-monitor.c
@@ -29,7 +29,7 @@
 #include "nautilus-file-changes-queue.h"
 #include "nautilus-file-utilities.h"
 
-#include <gio/gdirectorymonitor.h>
+#include <gio/gio.h>
 #include <libgnome/gnome-util.h>
 
 struct NautilusMonitor {
diff --git a/libnautilus-private/nautilus-monitor.h b/libnautilus-private/nautilus-monitor.h
index 17781eebd..f1ff3c846 100644
--- a/libnautilus-private/nautilus-monitor.h
+++ b/libnautilus-private/nautilus-monitor.h
@@ -27,7 +27,7 @@
 #define NAUTILUS_MONITOR_H
 
 #include <glib/gtypes.h>
-#include <gio/gfile.h>
+#include <gio/gio.h>
 
 typedef struct NautilusMonitor NautilusMonitor;
 
diff --git a/libnautilus-private/nautilus-open-with-dialog.c b/libnautilus-private/nautilus-open-with-dialog.c
index efebec17d..dd8b7513e 100644
--- a/libnautilus-private/nautilus-open-with-dialog.c
+++ b/libnautilus-private/nautilus-open-with-dialog.c
@@ -51,9 +51,7 @@
 #include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtkcellrendererpixbuf.h>
 #include <gtk/gtkvbox.h>
-#include <gio/gcontenttype.h>
-#include <gio/gthemedicon.h>
-#include <gio/gfileicon.h>
+#include <gio/gio.h>
 
 #define sure_string(s)                    ((const char *)((s)!=NULL?(s):""))
 #define DESKTOP_ENTRY_GROUP		  "Desktop Entry"
diff --git a/libnautilus-private/nautilus-open-with-dialog.h b/libnautilus-private/nautilus-open-with-dialog.h
index b8d3d10ff..dd3c8bf6a 100644
--- a/libnautilus-private/nautilus-open-with-dialog.h
+++ b/libnautilus-private/nautilus-open-with-dialog.h
@@ -27,7 +27,7 @@
 #define NAUTILUS_OPEN_WITH_DIALOG_H
 
 #include <gtk/gtkdialog.h>
-#include <gio/gappinfo.h>
+#include <gio/gio.h>
 
 #define NAUTILUS_TYPE_OPEN_WITH_DIALOG         (nautilus_open_with_dialog_get_type ())
 #define NAUTILUS_OPEN_WITH_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_OPEN_WITH_DIALOG, NautilusOpenWithDialog))
diff --git a/libnautilus-private/nautilus-program-choosing.c b/libnautilus-private/nautilus-program-choosing.c
index 7bb7d9e40..73bb0810d 100644
--- a/libnautilus-private/nautilus-program-choosing.c
+++ b/libnautilus-private/nautilus-program-choosing.c
@@ -39,8 +39,7 @@
 #include <gtk/gtk.h>
 #include <libgnome/gnome-config.h>
 #include <glib/gi18n.h>
-#include <gio/gfileicon.h>
-#include <gio/gthemedicon.h>
+#include <gio/gio.h>
 #include <libgnome/gnome-util.h>
 #include <libgnome/gnome-desktop-item.h>
 #include <libgnome/gnome-url.h>
diff --git a/libnautilus-private/nautilus-program-choosing.h b/libnautilus-private/nautilus-program-choosing.h
index 796d3a376..a1018d39d 100644
--- a/libnautilus-private/nautilus-program-choosing.h
+++ b/libnautilus-private/nautilus-program-choosing.h
@@ -27,7 +27,7 @@
 #define NAUTILUS_PROGRAM_CHOOSING_H
 
 #include <gtk/gtkwindow.h>
-#include <gio/gappinfo.h>
+#include <gio/gio.h>
 #include <libnautilus-private/nautilus-file.h>
 
 #define NAUTILUS_COMMAND_SPECIFIER "command:"
diff --git a/libnautilus-private/nautilus-progress-info.h b/libnautilus-private/nautilus-progress-info.h
index 30ecda28c..eea2936c2 100644
--- a/libnautilus-private/nautilus-progress-info.h
+++ b/libnautilus-private/nautilus-progress-info.h
@@ -26,7 +26,7 @@
 #define NAUTILUS_PROGRESS_INFO_H
 
 #include <glib-object.h>
-#include <gio/gcancellable.h>
+#include <gio/gio.h>
 
 #define NAUTILUS_TYPE_PROGRESS_INFO         (nautilus_progress_info_get_type ())
 #define NAUTILUS_PROGRESS_INFO(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_PROGRESS_INFO, NautilusProgressInfo))
diff --git a/libnautilus-private/nautilus-recent.h b/libnautilus-private/nautilus-recent.h
index 706329b15..3dcc5da11 100644
--- a/libnautilus-private/nautilus-recent.h
+++ b/libnautilus-private/nautilus-recent.h
@@ -5,7 +5,7 @@
 
 #include <gtk/gtkrecentmanager.h>
 #include <libnautilus-private/nautilus-file.h>
-#include <gio/gappinfo.h>
+#include <gio/gio.h>
 
 void nautilus_recent_add_file (NautilusFile *file,
 			       GAppInfo *application);
diff --git a/libnautilus-private/nautilus-search-directory.c b/libnautilus-private/nautilus-search-directory.c
index 3341cfb1f..10c7cadcd 100644
--- a/libnautilus-private/nautilus-search-directory.c
+++ b/libnautilus-private/nautilus-search-directory.c
@@ -31,7 +31,7 @@
 #include "nautilus-search-engine.h"
 #include <eel/eel-glib-extensions.h>
 #include <gtk/gtksignal.h>
-#include <gio/gioerror.h>
+#include <gio/gio.h>
 #include <libgnome/gnome-macros.h>
 #include <string.h>
 #include <sys/time.h>
diff --git a/libnautilus-private/nautilus-search-engine-simple.c b/libnautilus-private/nautilus-search-engine-simple.c
index 56108674c..8c91444f3 100644
--- a/libnautilus-private/nautilus-search-engine-simple.c
+++ b/libnautilus-private/nautilus-search-engine-simple.c
@@ -28,9 +28,7 @@
 #include <glib/gstrfuncs.h>
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-glib-extensions.h>
-#include <gio/gfile.h>
-#include <gio/gfileenumerator.h>
-#include <gio/gcontenttype.h>
+#include <gio/gio.h>
 
 #define BATCH_SIZE 500
 
diff --git a/libnautilus-private/nautilus-trash-monitor.c b/libnautilus-private/nautilus-trash-monitor.c
index 54f2551f5..337c7ff9a 100644
--- a/libnautilus-private/nautilus-trash-monitor.c
+++ b/libnautilus-private/nautilus-trash-monitor.c
@@ -30,8 +30,7 @@
 #include "nautilus-directory.h"
 #include "nautilus-file-attributes.h"
 #include <eel/eel-debug.h>
-#include <gio/gthemedicon.h>
-#include <gio/gfilemonitor.h>
+#include <gio/gio.h>
 #include <string.h>
 
 struct NautilusTrashMonitorDetails {
diff --git a/libnautilus-private/nautilus-trash-monitor.h b/libnautilus-private/nautilus-trash-monitor.h
index 838e2f328..33c305b4d 100644
--- a/libnautilus-private/nautilus-trash-monitor.h
+++ b/libnautilus-private/nautilus-trash-monitor.h
@@ -27,7 +27,7 @@
 #define NAUTILUS_TRASH_MONITOR_H
 
 #include <gtk/gtkobject.h>
-#include <gio/gicon.h>
+#include <gio/gio.h>
 
 typedef struct NautilusTrashMonitor NautilusTrashMonitor;
 typedef struct NautilusTrashMonitorClass NautilusTrashMonitorClass;
diff --git a/libnautilus-private/nautilus-ui-utilities.c b/libnautilus-private/nautilus-ui-utilities.c
index f5c0d5269..b01341702 100644
--- a/libnautilus-private/nautilus-ui-utilities.c
+++ b/libnautilus-private/nautilus-ui-utilities.c
@@ -25,7 +25,7 @@
 #include <config.h>
 #include "nautilus-ui-utilities.h"
 #include "nautilus-icon-info.h"
-#include <gio/gthemedicon.h>
+#include <gio/gio.h>
 
 #include <gtk/gtkenums.h>
 #include <eel/eel-debug.h>
diff --git a/libnautilus-private/nautilus-view-factory.h b/libnautilus-private/nautilus-view-factory.h
index 07315c58d..d75b130de 100644
--- a/libnautilus-private/nautilus-view-factory.h
+++ b/libnautilus-private/nautilus-view-factory.h
@@ -29,7 +29,7 @@
 
 #include <libnautilus-private/nautilus-view.h>
 #include <libnautilus-private/nautilus-window-info.h>
-#include <gio/gfileinfo.h>
+#include <gio/gio.h>
 
 G_BEGIN_DECLS