Index: src/nautilus-notes-viewer.h
===================================================================
--- src/nautilus-notes-viewer.h	(revision 14107)
+++ src/nautilus-notes-viewer.h	(working copy)
@@ -26,10 +26,9 @@
 #ifndef _NAUTILUS_NOTES_VIEWER_H
 #define _NAUTILUS_NOTES_VIEWER_H
 
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include <libnautilus-private/nautilus-view.h>
 #include <libnautilus-private/nautilus-window-info.h>
-#include <gtk/gtkscrolledwindow.h>
 
 #define NAUTILUS_NOTES_SIDEBAR_ID    "NautilusNotesSidebar"
 
Index: src/nautilus-window-menus.c
===================================================================
--- src/nautilus-window-menus.c	(revision 14107)
+++ src/nautilus-window-menus.c	(working copy)
@@ -39,10 +39,7 @@
 #include "nautilus-window-private.h"
 #include "nautilus-desktop-window.h"
 #include "nautilus-search-bar.h"
-#include <gtk/gtkmain.h>
-#include <gtk/gtkaboutdialog.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkversion.h>
+#include <gtk/gtk.h>
 #include <gio/gio.h>
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-help.h>
Index: src/nautilus-connect-server-dialog.h
===================================================================
--- src/nautilus-connect-server-dialog.h	(revision 14107)
+++ src/nautilus-connect-server-dialog.h	(working copy)
@@ -25,7 +25,7 @@
 #define NAUTILUS_CONNECT_SERVER_DIALOG_H
 
 #include <gio/gio.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include "nautilus-window.h"
 
 #define NAUTILUS_TYPE_CONNECT_SERVER_DIALOG         (nautilus_connect_server_dialog_get_type ())
Index: src/nautilus-navigation-bar.c
===================================================================
--- src/nautilus-navigation-bar.c	(revision 14107)
+++ src/nautilus-navigation-bar.c	(working copy)
@@ -31,8 +31,7 @@
 
 #include <eel/eel-gtk-macros.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkbindings.h>
+#include <gtk/gtk.h>
 #include <string.h>
 
 enum {
Index: src/nautilus-application.c
===================================================================
--- src/nautilus-application.c	(revision 14107)
+++ src/nautilus-application.c	(working copy)
@@ -67,7 +67,7 @@
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-stock-dialogs.h>
 #include <gdk/gdkx.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <libgnome/gnome-config.h>
 #include <libgnomeui/gnome-authentication-manager.h>
 #include <libgnomeui/gnome-client.h>
Index: src/nautilus-location-dialog.c
===================================================================
--- src/nautilus-location-dialog.c	(revision 14107)
+++ src/nautilus-location-dialog.c	(working copy)
@@ -26,9 +26,7 @@
 
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-stock-dialogs.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-help.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include "nautilus-location-entry.h"
Index: src/nautilus-navigation-bar.h
===================================================================
--- src/nautilus-navigation-bar.h	(revision 14107)
+++ src/nautilus-navigation-bar.h	(working copy)
@@ -29,7 +29,7 @@
 #ifndef NAUTILUS_NAVIGATION_BAR_H
 #define NAUTILUS_NAVIGATION_BAR_H
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 #define NAUTILUS_TYPE_NAVIGATION_BAR (nautilus_navigation_bar_get_type ())
 #define NAUTILUS_NAVIGATION_BAR(obj) \
Index: src/nautilus-location-entry.c
===================================================================
--- src/nautilus-location-entry.c	(revision 14107)
+++ src/nautilus-location-entry.c	(working copy)
@@ -39,8 +39,7 @@
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <libgnomeui/gnome-stock-icons.h>
Index: src/nautilus-location-dialog.h
===================================================================
--- src/nautilus-location-dialog.h	(revision 14107)
+++ src/nautilus-location-dialog.h	(working copy)
@@ -24,7 +24,7 @@
 #ifndef NAUTILUS_LOCATION_DIALOG_H
 #define NAUTILUS_LOCATION_DIALOG_H
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include "nautilus-window.h"
 
 #define NAUTILUS_TYPE_LOCATION_DIALOG         (nautilus_location_dialog_get_type ())
Index: src/ephy-spinner.c
===================================================================
--- src/ephy-spinner.c	(revision 14107)
+++ src/ephy-spinner.c	(working copy)
@@ -34,9 +34,7 @@
 #define STOP_PROFILER(name)
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtksettings.h>
+#include <gtk/gtk.h>
 
 /* Spinner cache implementation */
 
Index: src/nautilus-pathbar.c
===================================================================
--- src/nautilus-pathbar.c	(revision 14107)
+++ src/nautilus-pathbar.c	(working copy)
@@ -24,14 +24,7 @@
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-preferences.h>
 #include <eel/eel-string.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <libnautilus-private/nautilus-file.h>
Index: src/nautilus-information-panel.c
===================================================================
--- src/nautilus-information-panel.c	(revision 14107)
+++ src/nautilus-information-panel.c	(working copy)
@@ -36,8 +36,7 @@
 #include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <libnautilus-private/nautilus-dnd.h>
Index: src/ephy-spinner.h
===================================================================
--- src/ephy-spinner.h	(revision 14107)
+++ src/ephy-spinner.h	(working copy)
@@ -25,8 +25,7 @@
 #ifndef EPHY_SPINNER_H
 #define EPHY_SPINNER_H
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkenums.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: src/nautilus-pathbar.h
===================================================================
--- src/nautilus-pathbar.h	(revision 14107)
+++ src/nautilus-pathbar.h	(working copy)
@@ -21,7 +21,7 @@
 #ifndef NAUTILUS_PATHBAR_H
 #define NAUTILUS_PATHBAR_H
 
-#include <gtk/gtkcontainer.h>
+#include <gtk/gtk.h>
 #include <gio/gio.h>
 
 typedef struct _NautilusPathBar      NautilusPathBar;
Index: src/nautilus-window-manage-views.c
===================================================================
--- src/nautilus-window-manage-views.c	(revision 14107)
+++ src/nautilus-window-manage-views.c	(working copy)
@@ -46,8 +46,7 @@
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
 #include <eel/eel-mount-operation.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-icon-theme.h>
Index: src/nautilus-navigation-window-menus.c
===================================================================
--- src/nautilus-navigation-window-menus.c	(revision 14107)
+++ src/nautilus-navigation-window-menus.c	(working copy)
@@ -45,7 +45,7 @@
 #include <eel/eel-string.h>
 #include <eel/eel-xml-extensions.h>
 #include <libxml/parser.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <libgnome/gnome-help.h>
 #include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
Index: src/nautilus-zoom-control.c
===================================================================
--- src/nautilus-zoom-control.c	(revision 14107)
+++ src/nautilus-zoom-control.c	(working copy)
@@ -36,11 +36,7 @@
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-graphic-effects.h>
 #include <eel/eel-gtk-extensions.h>
-#include <gtk/gtkaccessible.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkbindings.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <libgnome/gnome-macros.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
Index: src/nautilus-navigation-window.c
===================================================================
--- src/nautilus-navigation-window.c	(revision 14107)
+++ src/nautilus-navigation-window.c	(working copy)
@@ -46,15 +46,7 @@
 #include <eel/eel-string.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdkx.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenubar.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #ifdef HAVE_X11_XF86KEYSYM_H
 #include <X11/XF86keysym.h>
Index: src/file-manager/fm-icon-view.c
===================================================================
--- src/file-manager/fm-icon-view.c	(revision 14107)
+++ src/file-manager/fm-icon-view.c	(working copy)
@@ -39,14 +39,7 @@
 #include <eel/eel-vfs-extensions.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkradioaction.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <libnautilus-private/nautilus-directory-background.h>
Index: src/file-manager/fm-properties-window.c
===================================================================
--- src/file-manager/fm-properties-window.c	(revision 14107)
+++ src/file-manager/fm-properties-window.c	(working copy)
@@ -37,27 +37,7 @@
 #include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
 #include <eel/eel-wrap-table.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkeditable.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libgnome/gnome-macros.h>
 #include <libgnomeui/gnome-dialog.h>
Index: src/file-manager/fm-properties-window.h
===================================================================
--- src/file-manager/fm-properties-window.h	(revision 14107)
+++ src/file-manager/fm-properties-window.h	(working copy)
@@ -26,7 +26,7 @@
 #ifndef FM_PROPERTIES_WINDOW_H
 #define FM_PROPERTIES_WINDOW_H
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <libnautilus-private/nautilus-file.h>
 
 typedef struct FMPropertiesWindow FMPropertiesWindow;
Index: src/file-manager/fm-tree-view.c
===================================================================
--- src/file-manager/fm-tree-view.c	(revision 14107)
+++ src/file-manager/fm-tree-view.c	(working copy)
@@ -40,21 +40,7 @@
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-preferences.h>
 #include <eel/eel-stock-dialogs.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktreemodelsort.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenushell.h>
-#include <gtk/gtkclipboard.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <libgnomeui/gnome-uidefs.h>
Index: src/file-manager/fm-tree-view.h
===================================================================
--- src/file-manager/fm-tree-view.h	(revision 14107)
+++ src/file-manager/fm-tree-view.h	(working copy)
@@ -29,7 +29,7 @@
 #ifndef FM_TREE_VIEW_H
 #define FM_TREE_VIEW_H
 
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
 
 #define FM_TYPE_TREE_VIEW	           (fm_tree_view_get_type ())
 #define FM_TREE_VIEW(obj)	           (GTK_CHECK_CAST ((obj), FM_TYPE_TREE_VIEW, FMTreeView))
Index: src/file-manager/fm-ditem-page.c
===================================================================
--- src/file-manager/fm-ditem-page.c	(revision 14107)
+++ src/file-manager/fm-ditem-page.c	(working copy)
@@ -27,15 +27,7 @@
 #include <string.h>
 
 #include <eel/eel-glib-extensions.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkfilechooserdialog.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <libnautilus-extension/nautilus-extension-types.h>
Index: src/file-manager/fm-list-view.c
===================================================================
--- src/file-manager/fm-list-view.c	(revision 14107)
+++ src/file-manager/fm-list-view.c	(working copy)
@@ -37,16 +37,7 @@
 #include <eel/eel-gtk-macros.h>
 #include <gdk/gdkcursor.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include <libegg/eggtreemultidnd.h>
 #include <glib/gi18n.h>
 #include <libgnome/gnome-macros.h>
Index: src/file-manager/fm-tree-model.c
===================================================================
--- src/file-manager/fm-tree-model.c	(revision 14107)
+++ src/file-manager/fm-tree-model.c	(working copy)
@@ -35,7 +35,7 @@
 #include <libnautilus-private/nautilus-directory.h>
 #include <libnautilus-private/nautilus-file-attributes.h>
 #include <libnautilus-private/nautilus-file.h>
-#include <gtk/gtkenums.h>
+#include <gtk/gtk.h>
 #include <string.h>
 
 enum {
Index: src/file-manager/fm-tree-model.h
===================================================================
--- src/file-manager/fm-tree-model.h	(revision 14107)
+++ src/file-manager/fm-tree-model.h	(working copy)
@@ -28,7 +28,7 @@
 #define FM_TREE_MODEL_H
 
 #include <glib-object.h>
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <gio/gio.h>
 #include <libnautilus-private/nautilus-file.h>
 
Index: src/file-manager/fm-error-reporting.h
===================================================================
--- src/file-manager/fm-error-reporting.h	(revision 14107)
+++ src/file-manager/fm-error-reporting.h	(working copy)
@@ -26,7 +26,7 @@
 #ifndef FM_ERROR_REPORTING_H
 #define FM_ERROR_REPORTING_H
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <libgnomevfs/gnome-vfs-types.h>
 #include <libnautilus-private/nautilus-file.h>
 
Index: src/file-manager/fm-desktop-icon-view.c
===================================================================
--- src/file-manager/fm-desktop-icon-view.c	(revision 14107)
+++ src/file-manager/fm-desktop-icon-view.c	(working copy)
@@ -30,7 +30,7 @@
 #include "fm-actions.h"
 
 #include <X11/Xatom.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <dirent.h>
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-gnome-extensions.h>
@@ -41,7 +41,6 @@
 #include <eel/eel-vfs-extensions.h>
 #include <fcntl.h>
 #include <gdk/gdkx.h>
-#include <gtk/gtkcheckmenuitem.h>
 #include <glib/gi18n.h>
 #include <libgnome/gnome-util.h>
 #include <libnautilus-private/nautilus-desktop-icon-file.h>
@@ -65,7 +64,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <gtk/gtkmessagedialog.h>
 
 /* Timeout to check the desktop directory for updates */
 #define RESCAN_TIMEOUT 4000
Index: src/file-manager/fm-list-model.c
===================================================================
--- src/file-manager/fm-list-model.c	(revision 14107)
+++ src/file-manager/fm-list-model.c	(working copy)
@@ -32,8 +32,7 @@
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-gdk-pixbuf-extensions.h>
-#include <gtk/gtktreednd.h>
-#include <gtk/gtktreesortable.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libnautilus-private/nautilus-dnd.h>
 #include <glib/gsequence.h>
Index: src/file-manager/fm-directory-view.c
===================================================================
--- src/file-manager/fm-directory-view.c	(revision 14107)
+++ src/file-manager/fm-directory-view.c	(working copy)
@@ -50,22 +50,7 @@
 #include <eel/eel-vfs-extensions.h>
 #include <eel/eel-marshal.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkclipboard.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkfilechooserbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtktoggleaction.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkbindings.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <libgnomeui/gnome-help.h>
Index: src/file-manager/fm-list-model.h
===================================================================
--- src/file-manager/fm-list-model.h	(revision 14107)
+++ src/file-manager/fm-list-model.h	(working copy)
@@ -22,8 +22,7 @@
    Authors: Anders Carlsson <andersca@gnu.org>
 */
 
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkdnd.h>
 #include <libnautilus-private/nautilus-file.h>
 #include <libnautilus-private/nautilus-directory.h>
Index: src/file-manager/fm-directory-view.h
===================================================================
--- src/file-manager/fm-directory-view.h	(revision 14107)
+++ src/file-manager/fm-directory-view.h	(working copy)
@@ -28,10 +28,7 @@
 #ifndef FM_DIRECTORY_VIEW_H
 #define FM_DIRECTORY_VIEW_H
 
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <eel/eel-background.h>
 #include <libnautilus-private/nautilus-directory.h>
 #include <libnautilus-private/nautilus-file.h>
Index: src/nautilus-file-management-properties-main.c
===================================================================
--- src/nautilus-file-management-properties-main.c	(revision 14107)
+++ src/nautilus-file-management-properties-main.c	(working copy)
@@ -24,8 +24,7 @@
 
 #include <config.h>
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 #include <libgnome/gnome-program.h>
 #include <libgnomeui/gnome-ui-init.h>
Index: src/nautilus-search-bar.c
===================================================================
--- src/nautilus-search-bar.c	(revision 14107)
+++ src/nautilus-search-bar.c	(working copy)
@@ -27,13 +27,7 @@
 #include <glib/gi18n.h>
 #include <eel/eel-gtk-macros.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 
 struct NautilusSearchBarDetails {
 	GtkWidget *entry;
Index: src/nautilus-zoom-control.h
===================================================================
--- src/nautilus-zoom-control.h	(revision 14107)
+++ src/nautilus-zoom-control.h	(working copy)
@@ -28,7 +28,7 @@
 #ifndef NAUTILUS_ZOOM_CONTROL_H
 #define NAUTILUS_ZOOM_CONTROL_H
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 #include <libnautilus-private/nautilus-icon-info.h> /* For NautilusZoomLevel */
 
 #define NAUTILUS_TYPE_ZOOM_CONTROL	      (nautilus_zoom_control_get_type ())
Index: src/nautilus-emblem-sidebar.c
===================================================================
--- src/nautilus-emblem-sidebar.c	(revision 14107)
+++ src/nautilus-emblem-sidebar.c	(working copy)
@@ -41,19 +41,7 @@
 #include <eel/eel-gdk-pixbuf-extensions.h>
 #include <eel/eel-stock-dialogs.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenushell.h>
+#include <gtk/gtk.h>
 #include <librsvg/rsvg.h>
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-uidefs.h>
Index: src/nautilus-history-sidebar.c
===================================================================
--- src/nautilus-history-sidebar.c	(revision 14107)
+++ src/nautilus-history-sidebar.c	(working copy)
@@ -31,12 +31,7 @@
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-preferences.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeselection.h>
+#include <gtk/gtk.h>
 #include <libgnome/gnome-macros.h>
 #include <glib/gi18n.h>
 #include <libnautilus-private/nautilus-bookmark.h>
Index: src/nautilus-navigation-window.h
===================================================================
--- src/nautilus-navigation-window.h	(revision 14107)
+++ src/nautilus-navigation-window.h	(working copy)
@@ -31,7 +31,7 @@
 #define NAUTILUS_NAVIGATION_WINDOW_H
 
 #include <bonobo/bonobo-window.h>
-#include <gtk/gtktoolitem.h>
+#include <gtk/gtk.h>
 #include <eel/eel-glib-extensions.h>
 #include <libnautilus-private/nautilus-bookmark.h>
 #include <libnautilus-private/nautilus-sidebar.h>
Index: src/nautilus-search-bar.h
===================================================================
--- src/nautilus-search-bar.h	(revision 14107)
+++ src/nautilus-search-bar.h	(working copy)
@@ -24,7 +24,7 @@
 #ifndef NAUTILUS_SEARCH_BAR_H
 #define NAUTILUS_SEARCH_BAR_H
 
-#include <gtk/gtkeventbox.h>
+#include <gtk/gtk.h>
 #include <libnautilus-private/nautilus-query.h>
 
 #define NAUTILUS_TYPE_SEARCH_BAR (nautilus_search_bar_get_type ())
Index: src/nautilus-connect-server-dialog-main.c
===================================================================
--- src/nautilus-connect-server-dialog-main.c	(revision 14107)
+++ src/nautilus-connect-server-dialog-main.c	(working copy)
@@ -28,8 +28,7 @@
 
 #include <glib/gi18n.h>
 
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include <libgnome/gnome-program.h>
 #include <libgnomeui/gnome-ui-init.h>
Index: src/nautilus-history-sidebar.h
===================================================================
--- src/nautilus-history-sidebar.h	(revision 14107)
+++ src/nautilus-history-sidebar.h	(working copy)
@@ -27,10 +27,9 @@
 #ifndef _NAUTILUS_HISTORY_SIDEBAR_H
 #define _NAUTILUS_HISTORY_SIDEBAR_H
 
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include <libnautilus-private/nautilus-view.h>
 #include <libnautilus-private/nautilus-window-info.h>
-#include <gtk/gtkscrolledwindow.h>
 
 #define NAUTILUS_HISTORY_SIDEBAR_ID    "NautilusHistorySidebar"
 
Index: src/nautilus-image-properties-page.c
===================================================================
--- src/nautilus-image-properties-page.c	(revision 14107)
+++ src/nautilus-image-properties-page.c	(working copy)
@@ -26,8 +26,7 @@
 #include <config.h>
 #include "nautilus-image-properties-page.h"
 
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 #include <libgnome/gnome-macros.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
Index: src/nautilus-sidebar-title.c
===================================================================
--- src/nautilus-sidebar-title.c	(revision 14107)
+++ src/nautilus-sidebar-title.c	(working copy)
@@ -38,11 +38,7 @@
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-pango-extensions.h>
 #include <eel/eel-string.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libnautilus-private/nautilus-file-attributes.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
Index: src/nautilus-window-toolbars.c
===================================================================
--- src/nautilus-window-toolbars.c	(revision 14107)
+++ src/nautilus-window-toolbars.c	(working copy)
@@ -37,8 +37,7 @@
 #include <eel/eel-gnome-extensions.h>
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-string.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktogglebutton.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-popup-menu.h>
Index: src/nautilus-image-properties-page.h
===================================================================
--- src/nautilus-image-properties-page.h	(revision 14107)
+++ src/nautilus-image-properties-page.h	(working copy)
@@ -24,7 +24,7 @@
 #ifndef NAUTILUS_IMAGE_PROPERTIES_PAGE_H
 #define NAUTILUS_IMAGE_PROPERTIES_PAGE_H
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 #define NAUTILUS_TYPE_IMAGE_PROPERTIES_PAGE	     (nautilus_image_properties_page_get_type ())
 #define NAUTILUS_IMAGE_PROPERTIES_PAGE(obj)	     (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_IMAGE_PROPERTIES_PAGE, NautilusImagePropertiesPage))
Index: src/nautilus-sidebar-title.h
===================================================================
--- src/nautilus-sidebar-title.h	(revision 14107)
+++ src/nautilus-sidebar-title.h	(working copy)
@@ -29,7 +29,7 @@
 #ifndef NAUTILUS_SIDEBAR_TITLE_H
 #define NAUTILUS_SIDEBAR_TITLE_H
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include <eel/eel-background.h>
 #include <libnautilus-private/nautilus-file.h>
 
Index: src/nautilus-spatial-window.c
===================================================================
--- src/nautilus-spatial-window.c	(revision 14107)
+++ src/nautilus-spatial-window.c	(working copy)
@@ -48,12 +48,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenubar.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libnautilus-private/nautilus-dnd.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
Index: src/nautilus-property-browser.c
===================================================================
--- src/nautilus-property-browser.c	(revision 14107)
+++ src/nautilus-property-browser.c	(working copy)
@@ -45,26 +45,7 @@
 #include <eel/eel-xml-extensions.h>
 #include <librsvg/rsvg.h>
 #include <libxml/parser.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkcolorseldialog.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkviewport.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gio/gio.h>
Index: src/nautilus-shell.c
===================================================================
--- src/nautilus-shell.c	(revision 14107)
+++ src/nautilus-shell.c	(working copy)
@@ -36,11 +36,7 @@
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <libgnomeui/gnome-uidefs.h>
Index: src/nautilus-window.c
===================================================================
--- src/nautilus-window.c	(revision 14107)
+++ src/nautilus-window.c	(working copy)
@@ -46,11 +46,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenubar.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #ifdef HAVE_X11_XF86KEYSYM_H
 #include <X11/XF86keysym.h>
Index: src/nautilus-property-browser.h
===================================================================
--- src/nautilus-property-browser.h	(revision 14107)
+++ src/nautilus-property-browser.h	(working copy)
@@ -32,7 +32,7 @@
 #define NAUTILUS_PROPERTY_BROWSER_H
 
 #include <gdk/gdk.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 typedef struct NautilusPropertyBrowser NautilusPropertyBrowser;
 typedef struct NautilusPropertyBrowserClass  NautilusPropertyBrowserClass;
Index: src/nautilus-navigation-action.c
===================================================================
--- src/nautilus-navigation-action.c	(revision 14107)
+++ src/nautilus-navigation-action.c	(working copy)
@@ -32,10 +32,7 @@
 #include "nautilus-navigation-action.h"
 #include "nautilus-navigation-window.h"
 
-#include <gtk/gtkimage.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtkmenutoolbutton.h>
+#include <gtk/gtk.h>
 
 static void nautilus_navigation_action_init       (NautilusNavigationAction *action);
 static void nautilus_navigation_action_class_init (NautilusNavigationActionClass *class);
Index: src/nautilus-window.h
===================================================================
--- src/nautilus-window.h	(revision 14107)
+++ src/nautilus-window.h	(working copy)
@@ -29,8 +29,7 @@
 #ifndef NAUTILUS_WINDOW_H
 #define NAUTILUS_WINDOW_H
 
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <eel/eel-glib-extensions.h>
 #include <libnautilus-private/nautilus-bookmark.h>
 #include <libnautilus-private/nautilus-window-info.h>
Index: src/nautilus-desktop-window.c
===================================================================
--- src/nautilus-desktop-window.c	(revision 14107)
+++ src/nautilus-desktop-window.c	(working copy)
@@ -29,7 +29,7 @@
 
 #include <X11/Xatom.h>
 #include <gdk/gdkx.h>
-#include <gtk/gtklayout.h>
+#include <gtk/gtk.h>
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-vfs-extensions.h>
 #include <libgnome/gnome-macros.h>
Index: src/nautilus-navigation-action.h
===================================================================
--- src/nautilus-navigation-action.h	(revision 14107)
+++ src/nautilus-navigation-action.h	(working copy)
@@ -31,7 +31,7 @@
 #ifndef NAUTILUS_NAVIGATION_ACTION_H
 #define NAUTILUS_NAVIGATION_ACTION_H
 
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>
 
 #define NAUTILUS_TYPE_NAVIGATION_ACTION            (nautilus_navigation_action_get_type ())
 #define NAUTILUS_NAVIGATION_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_NAVIGATION_ACTION, NautilusNavigationAction))
Index: src/nautilus-main.c
===================================================================
--- src/nautilus-main.c	(revision 14107)
+++ src/nautilus-main.c	(working copy)
@@ -42,10 +42,7 @@
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-self-checks.h>
 #include <gdk/gdkx.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtksignal.h>
-#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gdesktopappinfo.h>
 #include <libgnome/gnome-init.h>
Index: src/nautilus-file-management-properties.h
===================================================================
--- src/nautilus-file-management-properties.h	(revision 14107)
+++ src/nautilus-file-management-properties.h	(working copy)
@@ -26,7 +26,7 @@
 #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_H
 
 #include <glib-object.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: src/nautilus-query-editor.c
===================================================================
--- src/nautilus-query-editor.c	(revision 14107)
+++ src/nautilus-query-editor.c	(working copy)
@@ -31,21 +31,7 @@
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-glib-extensions.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkdialog.h>
-#include "gtk/gtkliststore.h"
-#include "gtk/gtktreeselection.h"
-#include "gtk/gtkscrolledwindow.h"
-#include <gtk/gtkfilechooserbutton.h>
-#include "gtk/gtkcelllayout.h"
-#include "gtk/gtkcellrenderertext.h"
+#include <gtk/gtk.h>
 
 typedef enum {
 	NAUTILUS_QUERY_EDITOR_ROW_LOCATION,
Index: src/nautilus-main.h
===================================================================
--- src/nautilus-main.h	(revision 14107)
+++ src/nautilus-main.h	(working copy)
@@ -27,7 +27,7 @@
 #ifndef NAUTILUS_MAIN_H
 #define NAUTILUS_MAIN_H
 
-#include <gtk/gtktypeutils.h>
+#include <gtk/gtk.h>
 
 void     nautilus_main_event_loop_register    (GtkObject *object);
 gboolean nautilus_main_is_event_loop_mainstay (GtkObject *object);
Index: src/nautilus-bookmarks-window.c
===================================================================
--- src/nautilus-bookmarks-window.c	(revision 14107)
+++ src/nautilus-bookmarks-window.c	(working copy)
@@ -35,8 +35,7 @@
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-gnome-extensions.h>
 #include <libnautilus-private/nautilus-undo-signal-handlers.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkhbbox.h>
+#include <gtk/gtk.h>
 #include <gnome.h>
 #include <libgnomeui/gnome-help.h>
 #include <glade/glade.h>
Index: src/nautilus-query-editor.h
===================================================================
--- src/nautilus-query-editor.h	(revision 14107)
+++ src/nautilus-query-editor.h	(working copy)
@@ -24,8 +24,7 @@
 #ifndef NAUTILUS_QUERY_EDITOR_H
 #define NAUTILUS_QUERY_EDITOR_H
 
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>
 #include <libnautilus-private/nautilus-query.h>
 #include <nautilus-search-bar.h>
 
Index: src/nautilus-bookmarks-window.h
===================================================================
--- src/nautilus-bookmarks-window.h	(revision 14107)
+++ src/nautilus-bookmarks-window.h	(working copy)
@@ -28,7 +28,7 @@
 #ifndef NAUTILUS_BOOKMARKS_WINDOW_H
 #define NAUTILUS_BOOKMARKS_WINDOW_H
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include "nautilus-bookmark-list.h"
 
 GtkWindow *create_bookmarks_window                 (NautilusBookmarkList *bookmarks,
Index: src/nautilus-side-pane.c
===================================================================
--- src/nautilus-side-pane.c	(revision 14107)
+++ src/nautilus-side-pane.c	(working copy)
@@ -27,16 +27,7 @@
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-gtk-macros.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktogglebutton.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 typedef struct {
Index: src/nautilus-location-bar.c
===================================================================
--- src/nautilus-location-bar.c	(revision 14107)
+++ src/nautilus-location-bar.c	(working copy)
@@ -42,8 +42,7 @@
 #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 <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <libgnomeui/gnome-uidefs.h>
Index: src/nautilus-side-pane.h
===================================================================
--- src/nautilus-side-pane.h	(revision 14107)
+++ src/nautilus-side-pane.h	(working copy)
@@ -24,7 +24,7 @@
 #ifndef NAUTILUS_SIDE_PANE_H
 #define NAUTILUS_SIDE_PANE_H
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: src/nautilus-places-sidebar.c
===================================================================
--- src/nautilus-places-sidebar.c	(revision 14107)
+++ src/nautilus-places-sidebar.c	(working copy)
@@ -30,18 +30,7 @@
 #include <eel/eel-string.h>
 #include <eel/eel-stock-dialogs.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksizegroup.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkimagemenuitem.h>
+#include <gtk/gtk.h>
 #include <libgnome/gnome-macros.h>
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-popup-menu.h>
Index: src/nautilus-location-bar.h
===================================================================
--- src/nautilus-location-bar.h	(revision 14107)
+++ src/nautilus-location-bar.h	(working copy)
@@ -32,9 +32,7 @@
 
 #include "nautilus-navigation-bar.h"
 #include "nautilus-navigation-window.h"
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>
 
 #define NAUTILUS_TYPE_LOCATION_BAR (nautilus_location_bar_get_type ())
 #define NAUTILUS_LOCATION_BAR(obj) \
Index: src/nautilus-places-sidebar.h
===================================================================
--- src/nautilus-places-sidebar.h	(revision 14107)
+++ src/nautilus-places-sidebar.h	(working copy)
@@ -24,10 +24,9 @@
 #ifndef _NAUTILUS_PLACES_SIDEBAR_H
 #define _NAUTILUS_PLACES_SIDEBAR_H
 
-#include <gtk/gtktreeview.h>
 #include <libnautilus-private/nautilus-view.h>
 #include <libnautilus-private/nautilus-window-info.h>
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
 
 #define NAUTILUS_PLACES_SIDEBAR_ID    "NautilusPlacesSidebar"
 
Index: src/nautilus-notes-viewer.c
===================================================================
--- src/nautilus-notes-viewer.c	(revision 14107)
+++ src/nautilus-notes-viewer.c	(working copy)
@@ -32,12 +32,7 @@
 #include <eel/eel-debug.h>
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-string.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libnautilus-private/nautilus-file-attributes.h>
 #include <libnautilus-private/nautilus-file.h>
Index: src/nautilus-connect-server-dialog.c
===================================================================
--- src/nautilus-connect-server-dialog.c	(revision 14107)
+++ src/nautilus-connect-server-dialog.c	(working copy)
@@ -31,17 +31,7 @@
 #include <libgnomeui/gnome-help.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkcombobox.h>
+#include <gtk/gtk.h>
 #include "nautilus-location-entry.h"
 #include <libnautilus-private/nautilus-global-preferences.h>
 
Index: libnautilus-private/nautilus-horizontal-splitter.h
===================================================================
--- libnautilus-private/nautilus-horizontal-splitter.h	(revision 14107)
+++ libnautilus-private/nautilus-horizontal-splitter.h	(working copy)
@@ -25,7 +25,7 @@
 #ifndef NAUTILUS_HORIZONTAL_SPLITTER_H
 #define NAUTILUS_HORIZONTAL_SPLITTER_H
 
-#include <gtk/gtkhpaned.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: libnautilus-private/nautilus-directory.c
===================================================================
--- libnautilus-private/nautilus-directory.c	(revision 14107)
+++ libnautilus-private/nautilus-directory.c	(working copy)
@@ -41,8 +41,7 @@
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-string.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 
 enum {
 	FILES_ADDED,
Index: libnautilus-private/nautilus-merged-directory.c
===================================================================
--- libnautilus-private/nautilus-merged-directory.c	(revision 14107)
+++ libnautilus-private/nautilus-merged-directory.c	(working copy)
@@ -30,7 +30,7 @@
 #include "nautilus-directory-notify.h"
 #include "nautilus-file.h"
 #include <eel/eel-glib-extensions.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <libgnome/gnome-macros.h>
 
 struct NautilusMergedDirectoryDetails {
Index: libnautilus-private/nautilus-directory.h
===================================================================
--- libnautilus-private/nautilus-directory.h	(revision 14107)
+++ libnautilus-private/nautilus-directory.h	(working copy)
@@ -25,7 +25,7 @@
 #ifndef NAUTILUS_DIRECTORY_H
 #define NAUTILUS_DIRECTORY_H
 
-#include <gtk/gtkobject.h>
+#include <gtk/gtk.h>
 #include <gio/gio.h>
 #include <libnautilus-private/nautilus-file-attributes.h>
 
Index: libnautilus-private/nautilus-directory-async.c
===================================================================
--- libnautilus-private/nautilus-directory-async.c	(revision 14107)
+++ libnautilus-private/nautilus-directory-async.c	(working copy)
@@ -37,7 +37,7 @@
 #include "nautilus-metafile.h"
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-string.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <libxml/parser.h>
 #include <stdio.h>
 #include <stdlib.h>
Index: libnautilus-private/nautilus-program-choosing.h
===================================================================
--- libnautilus-private/nautilus-program-choosing.h	(revision 14107)
+++ libnautilus-private/nautilus-program-choosing.h	(working copy)
@@ -26,7 +26,7 @@
 #ifndef NAUTILUS_PROGRAM_CHOOSING_H
 #define NAUTILUS_PROGRAM_CHOOSING_H
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <gio/gio.h>
 #include <libnautilus-private/nautilus-file.h>
 
Index: libnautilus-private/nautilus-entry.c
===================================================================
--- libnautilus-private/nautilus-entry.c	(revision 14107)
+++ libnautilus-private/nautilus-entry.c	(working copy)
@@ -33,8 +33,7 @@
 #include <eel/eel-gdk-extensions.h>
 #include <eel/eel-gtk-macros.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 struct NautilusEntryDetails {
Index: libnautilus-private/nautilus-autorun.h
===================================================================
--- libnautilus-private/nautilus-autorun.h	(revision 14107)
+++ libnautilus-private/nautilus-autorun.h	(working copy)
@@ -40,7 +40,7 @@
 #ifndef NAUTILUS_AUTORUN_H
 #define NAUTILUS_AUTORUN_H
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include <eel/eel-background.h>
 #include <libnautilus-private/nautilus-file.h>
 
Index: libnautilus-private/nautilus-cell-renderer-text-ellipsized.h
===================================================================
--- libnautilus-private/nautilus-cell-renderer-text-ellipsized.h	(revision 14107)
+++ libnautilus-private/nautilus-cell-renderer-text-ellipsized.h	(working copy)
@@ -27,8 +27,7 @@
 #ifndef NAUTILUS_CELL_RENDERER_TEXT_ELLIPSIZED_H
 #define NAUTILUS_CELL_RENDERER_TEXT_ELLIPSIZED_H
 
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
 
 #define NAUTILUS_TYPE_CELL_RENDERER_TEXT_ELLIPSIZED \
 	(nautilus_cell_renderer_text_ellipsized_get_type ())
Index: libnautilus-private/nautilus-icon-info.c
===================================================================
--- libnautilus-private/nautilus-icon-info.c	(revision 14107)
+++ libnautilus-private/nautilus-icon-info.c	(working copy)
@@ -21,8 +21,7 @@
 #include <string.h>
 #include "nautilus-icon-info.h"
 #include "nautilus-default-file-icon.h"
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
 #include <gio/gio.h>
 #include <eel/eel-gdk-pixbuf-extensions.h>
 
Index: libnautilus-private/nautilus-ui-utilities.c
===================================================================
--- libnautilus-private/nautilus-ui-utilities.c	(revision 14107)
+++ libnautilus-private/nautilus-ui-utilities.c	(working copy)
@@ -27,7 +27,7 @@
 #include "nautilus-icon-info.h"
 #include <gio/gio.h>
 
-#include <gtk/gtkenums.h>
+#include <gtk/gtk.h>
 #include <eel/eel-debug.h>
 
 void
Index: libnautilus-private/nautilus-mime-application-chooser.c
===================================================================
--- libnautilus-private/nautilus-mime-application-chooser.c	(revision 14107)
+++ libnautilus-private/nautilus-mime-application-chooser.c	(working copy)
@@ -38,23 +38,7 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkalignment.h> 
-#include <gtk/gtkbox.h> 
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include <gio/gio.h>
 
 struct _NautilusMimeApplicationChooserDetails {
Index: libnautilus-private/nautilus-undo-transaction.c
===================================================================
--- libnautilus-private/nautilus-undo-transaction.c	(revision 14107)
+++ libnautilus-private/nautilus-undo-transaction.c	(working copy)
@@ -30,7 +30,7 @@
 #include <libnautilus-private/nautilus-undo-transaction.h>
 
 #include "nautilus-undo-private.h"
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 
 #define NAUTILUS_UNDO_TRANSACTION_LIST_DATA "Nautilus undo transaction list"
 
Index: libnautilus-private/nautilus-ui-utilities.h
===================================================================
--- libnautilus-private/nautilus-ui-utilities.h	(revision 14107)
+++ libnautilus-private/nautilus-ui-utilities.h	(working copy)
@@ -24,7 +24,7 @@
 #ifndef NAUTILUS_UI_UTILITIES_H
 #define NAUTILUS_UI_UTILITIES_H
 
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
 #include <libnautilus-extension/nautilus-menu-item.h>
 
 char *      nautilus_get_ui_directory              (void);
Index: libnautilus-private/nautilus-mime-application-chooser.h
===================================================================
--- libnautilus-private/nautilus-mime-application-chooser.h	(revision 14107)
+++ libnautilus-private/nautilus-mime-application-chooser.h	(working copy)
@@ -26,7 +26,7 @@
 #ifndef NAUTILUS_MIME_APPLICATION_CHOOSER_H
 #define NAUTILUS_MIME_APPLICATION_CHOOSER_H
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 #define NAUTILUS_TYPE_MIME_APPLICATION_CHOOSER         (nautilus_mime_application_chooser_get_type ())
 #define NAUTILUS_MIME_APPLICATION_CHOOSER(obj)         (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_MIME_APPLICATION_CHOOSER, NautilusMimeApplicationChooser))
Index: libnautilus-private/nautilus-bookmark.c
===================================================================
--- libnautilus-private/nautilus-bookmark.c	(revision 14107)
+++ libnautilus-private/nautilus-bookmark.c	(working copy)
@@ -31,11 +31,7 @@
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
-#include <gtk/gtkaccellabel.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
 #include <libgnome/gnome-macros.h>
 #include <libgnome/gnome-util.h>
 #include <gio/gio.h>
Index: libnautilus-private/nautilus-undo.c
===================================================================
--- libnautilus-private/nautilus-undo.c	(revision 14107)
+++ libnautilus-private/nautilus-undo.c	(working copy)
@@ -28,8 +28,7 @@
 
 #include "nautilus-undo-private.h"
 #include "nautilus-undo-transaction.h"
-#include <gtk/gtksignal.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas.h>
 
 #define NAUTILUS_UNDO_MANAGER_DATA "Nautilus undo manager"
Index: libnautilus-private/nautilus-bookmark.h
===================================================================
--- libnautilus-private/nautilus-bookmark.h	(revision 14107)
+++ libnautilus-private/nautilus-bookmark.h	(working copy)
@@ -25,8 +25,7 @@
 #ifndef NAUTILUS_BOOKMARK_H
 #define NAUTILUS_BOOKMARK_H
 
-#include <gtk/gtkenums.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <gio/gio.h>
 typedef struct NautilusBookmark NautilusBookmark;
 
Index: libnautilus-private/nautilus-recent.h
===================================================================
--- libnautilus-private/nautilus-recent.h	(revision 14107)
+++ libnautilus-private/nautilus-recent.h	(working copy)
@@ -3,7 +3,7 @@
 #ifndef __NAUTILUS_RECENT_H__
 #define __NAUTILUS_RECENT_H__
 
-#include <gtk/gtkrecentmanager.h>
+#include <gtk/gtk.h>
 #include <libnautilus-private/nautilus-file.h>
 #include <gio/gio.h>
 
Index: libnautilus-private/nautilus-metafile.c
===================================================================
--- libnautilus-private/nautilus-metafile.c	(revision 14107)
+++ libnautilus-private/nautilus-metafile.c	(working copy)
@@ -38,7 +38,7 @@
 #include <eel/eel-xml-extensions.h>
 #include <glib/gurifuncs.h>
 #include <libxml/parser.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
Index: libnautilus-private/nautilus-desktop-link-monitor.c
===================================================================
--- libnautilus-private/nautilus-desktop-link-monitor.c	(revision 14107)
+++ libnautilus-private/nautilus-desktop-link-monitor.c	(working copy)
@@ -35,9 +35,7 @@
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-vfs-extensions.h>
 #include <eel/eel-stock-dialogs.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <libnautilus-private/nautilus-trash-monitor.h>
Index: libnautilus-private/nautilus-icon-dnd.c
===================================================================
--- libnautilus-private/nautilus-icon-dnd.c	(revision 14107)
+++ libnautilus-private/nautilus-icon-dnd.c	(working copy)
@@ -52,9 +52,7 @@
 #include <eel/eel-vfs-extensions.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <eel/eel-canvas-rect-ellipse.h>
 #include <libgnomeui/gnome-stock-icons.h>
Index: libnautilus-private/nautilus-desktop-link-monitor.h
===================================================================
--- libnautilus-private/nautilus-desktop-link-monitor.h	(revision 14107)
+++ libnautilus-private/nautilus-desktop-link-monitor.h	(working copy)
@@ -25,7 +25,7 @@
 #ifndef NAUTILUS_DESKTOP_LINK_MONITOR_H
 #define NAUTILUS_DESKTOP_LINK_MONITOR_H
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <libnautilus-private/nautilus-desktop-link.h>
 
 #define NAUTILUS_TYPE_DESKTOP_LINK_MONITOR \
Index: libnautilus-private/nautilus-idle-queue.c
===================================================================
--- libnautilus-private/nautilus-idle-queue.c	(revision 14107)
+++ libnautilus-private/nautilus-idle-queue.c	(working copy)
@@ -26,7 +26,7 @@
 #include <config.h>
 #include "nautilus-idle-queue.h"
 
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 struct NautilusIdleQueue {
 	GList *functions;
Index: libnautilus-private/nautilus-emblem-utils.c
===================================================================
--- libnautilus-private/nautilus-emblem-utils.c	(revision 14107)
+++ libnautilus-private/nautilus-emblem-utils.c	(working copy)
@@ -35,7 +35,7 @@
 #include <eel/eel-gdk-pixbuf-extensions.h>
 #include <eel/eel-stock-dialogs.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 #include "nautilus-emblem-utils.h"
 
 #define EMBLEM_NAME_TRASH   "emblem-trash"
Index: libnautilus-private/nautilus-emblem-utils.h
===================================================================
--- libnautilus-private/nautilus-emblem-utils.h	(revision 14107)
+++ libnautilus-private/nautilus-emblem-utils.h	(working copy)
@@ -24,7 +24,7 @@
 
 #include <glib.h>
 #include <gio/gio.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 GList *    nautilus_emblem_list_available             (void);
Index: libnautilus-private/nautilus-dnd.c
===================================================================
--- libnautilus-private/nautilus-dnd.c	(revision 14107)
+++ libnautilus-private/nautilus-dnd.c	(working copy)
@@ -35,9 +35,7 @@
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkseparatormenuitem.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
Index: libnautilus-private/nautilus-open-with-dialog.c
===================================================================
--- libnautilus-private/nautilus-open-with-dialog.c	(revision 14107)
+++ libnautilus-private/nautilus-open-with-dialog.c	(working copy)
@@ -33,24 +33,7 @@
 
 #include <string.h>
 #include <glib/gi18n-lib.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkexpander.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include <gio/gio.h>
 
 #define sure_string(s)                    ((const char *)((s)!=NULL?(s):""))
Index: libnautilus-private/nautilus-dnd.h
===================================================================
--- libnautilus-private/nautilus-dnd.h	(revision 14107)
+++ libnautilus-private/nautilus-dnd.h	(working copy)
@@ -27,7 +27,7 @@
 #ifndef NAUTILUS_DND_H
 #define NAUTILUS_DND_H
 
-#include <gtk/gtkdnd.h>
+#include <gtk/gtk.h>
 
 /* Drag & Drop target names. */
 #define NAUTILUS_ICON_DND_GNOME_ICON_LIST_TYPE  "x-special/gnome-icon-list"
Index: libnautilus-private/nautilus-open-with-dialog.h
===================================================================
--- libnautilus-private/nautilus-open-with-dialog.h	(revision 14107)
+++ libnautilus-private/nautilus-open-with-dialog.h	(working copy)
@@ -26,7 +26,7 @@
 #ifndef NAUTILUS_OPEN_WITH_DIALOG_H
 #define NAUTILUS_OPEN_WITH_DIALOG_H
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include <gio/gio.h>
 
 #define NAUTILUS_TYPE_OPEN_WITH_DIALOG         (nautilus_open_with_dialog_get_type ())
Index: libnautilus-private/nautilus-icon-canvas-item.c
===================================================================
--- libnautilus-private/nautilus-icon-canvas-item.c	(revision 14107)
+++ libnautilus-private/nautilus-icon-canvas-item.c	(working copy)
@@ -42,7 +42,7 @@
 #include <eel/eel-string.h>
 #include <eel/eel-accessibility.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include <librsvg/rsvg.h>
 #include <glib/gi18n.h>
Index: libnautilus-private/nautilus-clipboard.c
===================================================================
--- libnautilus-private/nautilus-clipboard.c	(revision 14107)
+++ libnautilus-private/nautilus-clipboard.c	(working copy)
@@ -32,13 +32,7 @@
 #include "nautilus-file-utilities.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtkclipboard.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkinvisible.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktext.h>
-#include <gtk/gtktextview.h>
+#include <gtk/gtk.h>
 #include <string.h>
 
 typedef struct _TargetCallbackData TargetCallbackData;
Index: libnautilus-private/nautilus-clipboard.h
===================================================================
--- libnautilus-private/nautilus-clipboard.h	(revision 14107)
+++ libnautilus-private/nautilus-clipboard.h	(working copy)
@@ -26,9 +26,7 @@
 #ifndef NAUTILUS_CLIPBOARD_H
 #define NAUTILUS_CLIPBOARD_H
 
-#include <gtk/gtkeditable.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
 
 /* This makes this editable or text view put clipboard commands into
  * the passed UI manager when the editable/text view is in focus.
Index: libnautilus-private/nautilus-icon-container.c
===================================================================
--- libnautilus-private/nautilus-icon-container.c	(revision 14107)
+++ libnautilus-private/nautilus-icon-container.c	(working copy)
@@ -48,10 +48,7 @@
 #include <eel/eel-canvas-rect-ellipse.h>
 #include <libgnomeui/gnome-icon-item.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkaccessible.h>
-#include <gtk/gtklayout.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libgnome/gnome-macros.h>
 #include <stdio.h>
Index: libnautilus-private/nautilus-tree-view-drag-dest.c
===================================================================
--- libnautilus-private/nautilus-tree-view-drag-dest.c	(revision 14107)
+++ libnautilus-private/nautilus-tree-view-drag-dest.c	(working copy)
@@ -31,8 +31,7 @@
 #include "nautilus-tree-view-drag-dest.h"
 
 #include <eel/eel-gtk-macros.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <libgnome/gnome-macros.h>
 #include "nautilus-file-dnd.h"
 #include "nautilus-icon-dnd.h"
Index: libnautilus-private/nautilus-directory-background.c
===================================================================
--- libnautilus-private/nautilus-directory-background.c	(revision 14107)
+++ libnautilus-private/nautilus-directory-background.c	(working copy)
@@ -34,7 +34,7 @@
 #include "nautilus-global-preferences.h"
 #include "nautilus-metadata.h"
 #include "nautilus-file-attributes.h"
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <libbackground/preferences.h>
 
 static void background_changed_callback     (EelBackground *background, 
Index: libnautilus-private/nautilus-customization-data.h
===================================================================
--- libnautilus-private/nautilus-customization-data.h	(revision 14107)
+++ libnautilus-private/nautilus-customization-data.h	(working copy)
@@ -31,7 +31,7 @@
 #define NAUTILUS_CUSTOMIZATION_DATA_H
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 
 #define RESET_IMAGE_NAME "reset.png"
 
Index: libnautilus-private/nautilus-tree-view-drag-dest.h
===================================================================
--- libnautilus-private/nautilus-tree-view-drag-dest.h	(revision 14107)
+++ libnautilus-private/nautilus-tree-view-drag-dest.h	(working copy)
@@ -30,7 +30,7 @@
 #ifndef NAUTILUS_TREE_VIEW_DRAG_DEST_H
 #define NAUTILUS_TREE_VIEW_DRAG_DEST_H
 
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 
 #include "nautilus-file.h"
 
Index: libnautilus-private/nautilus-thumbnails.c
===================================================================
--- libnautilus-private/nautilus-thumbnails.c	(revision 14107)
+++ libnautilus-private/nautilus-thumbnails.c	(working copy)
@@ -34,7 +34,7 @@
 #include <eel/eel-graphic-effects.h>
 #include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <librsvg/rsvg.h>
 #include <errno.h>
 #include <stdio.h>
Index: libnautilus-private/nautilus-desktop-directory.c
===================================================================
--- libnautilus-private/nautilus-desktop-directory.c	(revision 14107)
+++ libnautilus-private/nautilus-desktop-directory.c	(working copy)
@@ -33,8 +33,7 @@
 #include "nautilus-file-utilities.h"
 #include "nautilus-global-preferences.h"
 #include <eel/eel-glib-extensions.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <libgnome/gnome-macros.h>
 
 struct NautilusDesktopDirectoryDetails {
Index: libnautilus-private/nautilus-trash-monitor.h
===================================================================
--- libnautilus-private/nautilus-trash-monitor.h	(revision 14107)
+++ libnautilus-private/nautilus-trash-monitor.h	(working copy)
@@ -26,7 +26,7 @@
 #ifndef NAUTILUS_TRASH_MONITOR_H
 #define NAUTILUS_TRASH_MONITOR_H
 
-#include <gtk/gtkobject.h>
+#include <gtk/gtk.h>
 #include <gio/gio.h>
 
 typedef struct NautilusTrashMonitor NautilusTrashMonitor;
Index: libnautilus-private/nautilus-sidebar.h
===================================================================
--- libnautilus-private/nautilus-sidebar.h	(revision 14107)
+++ libnautilus-private/nautilus-sidebar.h	(working copy)
@@ -26,7 +26,7 @@
 #define NAUTILUS_SIDEBAR_H
 
 #include <glib-object.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: libnautilus-private/nautilus-search-directory-file.c
===================================================================
--- libnautilus-private/nautilus-search-directory-file.c	(revision 14107)
+++ libnautilus-private/nautilus-search-directory-file.c	(working copy)
@@ -33,7 +33,7 @@
 #include "nautilus-file-utilities.h"
 #include <eel/eel-glib-extensions.h>
 #include "nautilus-search-directory.h"
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <string.h>
 
Index: libnautilus-private/nautilus-clipboard-monitor.c
===================================================================
--- libnautilus-private/nautilus-clipboard-monitor.c	(revision 14107)
+++ libnautilus-private/nautilus-clipboard-monitor.c	(working copy)
@@ -29,7 +29,7 @@
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-glib-extensions.h>
-#include <gtk/gtkclipboard.h>
+#include <gtk/gtk.h>
 
 /* X11 has a weakness when it comes to clipboard handling,
  * there is no way to get told when the owner of the clipboard
Index: libnautilus-private/nautilus-keep-last-vertical-box.h
===================================================================
--- libnautilus-private/nautilus-keep-last-vertical-box.h	(revision 14107)
+++ libnautilus-private/nautilus-keep-last-vertical-box.h	(working copy)
@@ -26,7 +26,7 @@
 #ifndef NAUTILUS_KEEP_LAST_VERTICAL_BOX_H
 #define NAUTILUS_KEEP_LAST_VERTICAL_BOX_H
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 #define NAUTILUS_TYPE_KEEP_LAST_VERTICAL_BOX            (nautilus_keep_last_vertical_box_get_type ())
 #define NAUTILUS_KEEP_LAST_VERTICAL_BOX(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_KEEP_LAST_VERTICAL_BOX, NautilusKeepLastVerticalBox))
Index: libnautilus-private/nautilus-clipboard-monitor.h
===================================================================
--- libnautilus-private/nautilus-clipboard-monitor.h	(revision 14107)
+++ libnautilus-private/nautilus-clipboard-monitor.h	(working copy)
@@ -25,7 +25,7 @@
 #ifndef NAUTILUS_CLIPBOARD_MONITOR_H
 #define NAUTILUS_CLIPBOARD_MONITOR_H
 
-#include <gtk/gtkobject.h>
+#include <gtk/gtk.h>
 
 #define NAUTILUS_TYPE_CLIPBOARD_MONITOR \
 	(nautilus_clipboard_monitor_get_type ())
Index: libnautilus-private/nautilus-column-chooser.c
===================================================================
--- libnautilus-private/nautilus-column-chooser.c	(revision 14107)
+++ libnautilus-private/nautilus-column-chooser.c	(working copy)
@@ -26,19 +26,7 @@
 #include "nautilus-column-chooser.h"
 
 #include <string.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #include "nautilus-column-utilities.h"
Index: libnautilus-private/nautilus-file-operations.c
===================================================================
--- libnautilus-private/nautilus-file-operations.c	(revision 14107)
+++ libnautilus-private/nautilus-file-operations.c	(working copy)
@@ -51,9 +51,7 @@
 #include <glib/gstdio.h>
 #include <gnome.h>
 #include <gdk/gdkdnd.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <gio/gio.h>
 #include <glib/gurifuncs.h>
 #include "nautilus-file-changes-queue.h"
Index: libnautilus-private/nautilus-file-operations.h
===================================================================
--- libnautilus-private/nautilus-file-operations.h	(revision 14107)
+++ libnautilus-private/nautilus-file-operations.h	(working copy)
@@ -27,8 +27,7 @@
 #ifndef NAUTILUS_FILE_OPERATIONS_H
 #define NAUTILUS_FILE_OPERATIONS_H
 
-#include <gdk/gdkdnd.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <gio/gio.h>
 
 typedef void (* NautilusCopyCallback)      (GHashTable *debuting_uris,
Index: libnautilus-private/nautilus-window-info.h
===================================================================
--- libnautilus-private/nautilus-window-info.h	(revision 14107)
+++ libnautilus-private/nautilus-window-info.h	(working copy)
@@ -27,7 +27,7 @@
 
 #include <glib-object.h>
 #include <libnautilus-private/nautilus-view.h>
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
 #include "../src/nautilus-bookmark-list.h"
 
 G_BEGIN_DECLS
Index: libnautilus-private/nautilus-undo-manager.c
===================================================================
--- libnautilus-private/nautilus-undo-manager.c	(revision 14107)
+++ libnautilus-private/nautilus-undo-manager.c	(working copy)
@@ -28,7 +28,7 @@
 
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-gtk-extensions.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <bonobo/bonobo-main.h>
 #include "nautilus-undo-private.h"
 
Index: libnautilus-private/nautilus-file.c
===================================================================
--- libnautilus-private/nautilus-file.c	(revision 14107)
+++ libnautilus-private/nautilus-file.c	(working copy)
@@ -54,7 +54,7 @@
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-string.h>
 #include <grp.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <glib/gurifuncs.h>
Index: libnautilus-private/nautilus-view.h
===================================================================
--- libnautilus-private/nautilus-view.h	(revision 14107)
+++ libnautilus-private/nautilus-view.h	(working copy)
@@ -26,7 +26,7 @@
 #define NAUTILUS_VIEW_H
 
 #include <glib-object.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 /* For NautilusZoomLevel */
 #include <libnautilus-private/nautilus-icon-info.h>
Index: libnautilus-private/nautilus-cell-renderer-pixbuf-emblem.h
===================================================================
--- libnautilus-private/nautilus-cell-renderer-pixbuf-emblem.h	(revision 14107)
+++ libnautilus-private/nautilus-cell-renderer-pixbuf-emblem.h	(working copy)
@@ -29,7 +29,7 @@
 #ifndef NAUTILUS_CELL_RENDERER_PIXBUF_EMBLEM_H
 #define NAUTILUS_CELL_RENDERER_PIXBUF_EMBLEM_H
 
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
 
 #define NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM \
 	(nautilus_cell_renderer_pixbuf_emblem_get_type ())
Index: libnautilus-private/nautilus-file.h
===================================================================
--- libnautilus-private/nautilus-file.h	(revision 14107)
+++ libnautilus-private/nautilus-file.h	(working copy)
@@ -25,7 +25,7 @@
 #ifndef NAUTILUS_FILE_H
 #define NAUTILUS_FILE_H
 
-#include <gtk/gtkobject.h>
+#include <gtk/gtk.h>
 #include <gio/gio.h>
 #include <libnautilus-private/nautilus-file-attributes.h>
 #include <libnautilus-private/nautilus-icon-info.h>
Index: libnautilus-private/nautilus-search-directory.c
===================================================================
--- libnautilus-private/nautilus-search-directory.c	(revision 14107)
+++ libnautilus-private/nautilus-search-directory.c	(working copy)
@@ -30,7 +30,7 @@
 #include "nautilus-file-utilities.h"
 #include "nautilus-search-engine.h"
 #include <eel/eel-glib-extensions.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <gio/gio.h>
 #include <libgnome/gnome-macros.h>
 #include <string.h>
Index: libnautilus-private/nautilus-desktop-directory-file.c
===================================================================
--- libnautilus-private/nautilus-desktop-directory-file.c	(revision 14107)
+++ libnautilus-private/nautilus-desktop-directory-file.c	(working copy)
@@ -34,7 +34,7 @@
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-gtk-macros.h>
 #include "nautilus-desktop-directory.h"
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <string.h>
 
