Move all of Nautilus to single Gtk+ includes, because Mitch says so.

2008-05-21 A. Walton <awalton@gnome.org> * */*.[ch]: Move all of Nautilus to single Gtk+ includes, because Mitch says so. Closes Bug #530315. svn path=/trunk/; revision=14182
2024-08-24 18:25:50 +00:00 · 2008-05-21 18:19:36 +00:00 · 2008-05-21 18:19:36 +00:00 · 26fac7efa5
parent 3befbe347e
commit 26fac7efa5
133 changed files with 138 additions and 447 deletions
--- a/6
+++ b/6
@ -1,3 +1,9 @@
+2008-05-21  A. Walton  <awalton@gnome.org>
+
+	* */*.[ch]:
+	Move all of Nautilus to single Gtk+ includes, because Mitch says so.
+	Closes Bug #530315.
+
 2008-05-20  Cosimo Cecchi  <cosimoc@gnome.org>

 	* libnautilus-private/nautilus-clipboard.c:
--- a/libnautilus-private/nautilus-autorun.h
+++ b/libnautilus-private/nautilus-autorun.h
@ -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>

--- a/libnautilus-private/nautilus-bookmark.c
+++ b/libnautilus-private/nautilus-bookmark.c
@ -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>
--- a/libnautilus-private/nautilus-bookmark.h
+++ b/libnautilus-private/nautilus-bookmark.h
@ -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;

--- a/libnautilus-private/nautilus-cell-renderer-pixbuf-emblem.h
+++ b/libnautilus-private/nautilus-cell-renderer-pixbuf-emblem.h
@ -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 ())
--- a/libnautilus-private/nautilus-cell-renderer-text-ellipsized.h
+++ b/libnautilus-private/nautilus-cell-renderer-text-ellipsized.h
@ -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 ())
--- a/libnautilus-private/nautilus-clipboard-monitor.c
+++ b/libnautilus-private/nautilus-clipboard-monitor.c
@ -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
--- a/libnautilus-private/nautilus-clipboard-monitor.h
+++ b/libnautilus-private/nautilus-clipboard-monitor.h
@ -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 ())
--- a/libnautilus-private/nautilus-clipboard.c
+++ b/libnautilus-private/nautilus-clipboard.c
@ -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 <eel/eel-glib-extensions.h>
 #include <string.h>

--- a/libnautilus-private/nautilus-clipboard.h
+++ b/libnautilus-private/nautilus-clipboard.h
@ -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.
--- a/libnautilus-private/nautilus-column-chooser.c
+++ b/libnautilus-private/nautilus-column-chooser.c
@ -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"
--- a/libnautilus-private/nautilus-column-chooser.h
+++ b/libnautilus-private/nautilus-column-chooser.h
@ -25,7 +25,7 @@
 #ifndef NAUTILUS_COLUMN_CHOOSER_H
 #define NAUTILUS_COLUMN_CHOOSER_H

-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>

 #define NAUTILUS_TYPE_COLUMN_CHOOSER                (nautilus_column_chooser_get_type ())
 #define NAUTILUS_COLUMN_CHOOSER(obj)                (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_COLUMN_CHOOSER, NautilusColumnChooser))
--- a/libnautilus-private/nautilus-customization-data.h
+++ b/libnautilus-private/nautilus-customization-data.h
@ -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"

--- a/libnautilus-private/nautilus-desktop-directory-file.c
+++ b/libnautilus-private/nautilus-desktop-directory-file.c
@ -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>

--- a/libnautilus-private/nautilus-desktop-directory.c
+++ b/libnautilus-private/nautilus-desktop-directory.c
@ -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 {
--- a/libnautilus-private/nautilus-desktop-link-monitor.c
+++ b/libnautilus-private/nautilus-desktop-link-monitor.c
@ -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>
--- a/libnautilus-private/nautilus-desktop-link-monitor.h
+++ b/libnautilus-private/nautilus-desktop-link-monitor.h
@ -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 \
--- a/libnautilus-private/nautilus-directory-async.c
+++ b/libnautilus-private/nautilus-directory-async.c
@ -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>
--- a/libnautilus-private/nautilus-directory-background.c
+++ b/libnautilus-private/nautilus-directory-background.c
@ -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 <string.h>

 static void background_changed_callback     (EelBackground *background, 
--- a/libnautilus-private/nautilus-directory.c
+++ b/libnautilus-private/nautilus-directory.c
@ -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,
--- a/libnautilus-private/nautilus-directory.h
+++ b/libnautilus-private/nautilus-directory.h
@ -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>

--- a/libnautilus-private/nautilus-dnd.c
+++ b/libnautilus-private/nautilus-dnd.c
@ -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>
--- a/libnautilus-private/nautilus-dnd.h
+++ b/libnautilus-private/nautilus-dnd.h
@ -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"
--- a/libnautilus-private/nautilus-emblem-utils.c
+++ b/libnautilus-private/nautilus-emblem-utils.c
@ -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"
--- a/libnautilus-private/nautilus-emblem-utils.h
+++ b/libnautilus-private/nautilus-emblem-utils.h
@ -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);
--- a/libnautilus-private/nautilus-entry.c
+++ b/libnautilus-private/nautilus-entry.c
@ -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 {
--- a/libnautilus-private/nautilus-entry.h
+++ b/libnautilus-private/nautilus-entry.h
@ -27,7 +27,7 @@
 #ifndef NAUTILUS_ENTRY_H
 #define NAUTILUS_ENTRY_H

-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>

 G_BEGIN_DECLS

--- a/libnautilus-private/nautilus-file-changes-queue.h
+++ b/libnautilus-private/nautilus-file-changes-queue.h
@ -23,7 +23,7 @@
 #ifndef NAUTILUS_FILE_CHANGES_QUEUE_H
 #define NAUTILUS_FILE_CHANGES_QUEUE_H

-#include <gdk/gdktypes.h>
+#include <gdk/gdk.h>
 #include <gio/gio.h>

 void nautilus_file_changes_queue_file_added                      (GFile      *location);
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@ -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"
--- a/libnautilus-private/nautilus-file-operations.h
+++ b/libnautilus-private/nautilus-file-operations.h
@ -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,
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@ -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>
--- a/libnautilus-private/nautilus-file.h
+++ b/libnautilus-private/nautilus-file.h
@ -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>
--- a/libnautilus-private/nautilus-horizontal-splitter.h
+++ b/libnautilus-private/nautilus-horizontal-splitter.h
@ -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

--- a/libnautilus-private/nautilus-icon-canvas-item.c
+++ b/libnautilus-private/nautilus-icon-canvas-item.c
@ -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>
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@ -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>
--- a/libnautilus-private/nautilus-icon-dnd.c
+++ b/libnautilus-private/nautilus-icon-dnd.c
@ -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>
--- a/libnautilus-private/nautilus-icon-info.c
+++ b/libnautilus-private/nautilus-icon-info.c
@ -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>

--- a/libnautilus-private/nautilus-idle-queue.c
+++ b/libnautilus-private/nautilus-idle-queue.c
@ -26,7 +26,7 @@
 #include <config.h>
 #include "nautilus-idle-queue.h"

-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>

 struct NautilusIdleQueue {
 	GList *functions;
--- a/libnautilus-private/nautilus-keep-last-vertical-box.h
+++ b/libnautilus-private/nautilus-keep-last-vertical-box.h
@ -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))
--- a/libnautilus-private/nautilus-link.h
+++ b/libnautilus-private/nautilus-link.h
@ -25,7 +25,7 @@
 #ifndef NAUTILUS_LINK_H
 #define NAUTILUS_LINK_H

-#include <gdk/gdktypes.h>
+#include <gdk/gdk.h>
 #include <libgnome/gnome-desktop-item.h>

 gboolean         nautilus_link_local_create                      (const char        *directory_uri,
--- a/libnautilus-private/nautilus-merged-directory.c
+++ b/libnautilus-private/nautilus-merged-directory.c
@ -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 {
--- a/libnautilus-private/nautilus-metafile.c
+++ b/libnautilus-private/nautilus-metafile.c
@ -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>
--- a/libnautilus-private/nautilus-mime-application-chooser.c
+++ b/libnautilus-private/nautilus-mime-application-chooser.c
@ -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 {
--- a/libnautilus-private/nautilus-mime-application-chooser.h
+++ b/libnautilus-private/nautilus-mime-application-chooser.h
@ -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))
--- a/libnautilus-private/nautilus-open-with-dialog.c
+++ b/libnautilus-private/nautilus-open-with-dialog.c
@ -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):""))
--- a/libnautilus-private/nautilus-open-with-dialog.h
+++ b/libnautilus-private/nautilus-open-with-dialog.h
@ -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 ())
--- a/libnautilus-private/nautilus-program-choosing.h
+++ b/libnautilus-private/nautilus-program-choosing.h
@ -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>

--- a/libnautilus-private/nautilus-recent.h
+++ b/libnautilus-private/nautilus-recent.h
@ -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>

--- a/libnautilus-private/nautilus-search-directory-file.c
+++ b/libnautilus-private/nautilus-search-directory-file.c
@ -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>

--- a/libnautilus-private/nautilus-search-directory.c
+++ b/libnautilus-private/nautilus-search-directory.c
@ -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>
--- a/libnautilus-private/nautilus-sidebar.h
+++ b/libnautilus-private/nautilus-sidebar.h
@ -26,7 +26,7 @@
 #define NAUTILUS_SIDEBAR_H

 #include <glib-object.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>

 G_BEGIN_DECLS

--- a/libnautilus-private/nautilus-thumbnails.c
+++ b/libnautilus-private/nautilus-thumbnails.c
@ -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>
--- a/libnautilus-private/nautilus-trash-monitor.h
+++ b/libnautilus-private/nautilus-trash-monitor.h
@ -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;
--- a/libnautilus-private/nautilus-tree-view-drag-dest.c
+++ b/libnautilus-private/nautilus-tree-view-drag-dest.c
@ -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"
--- a/libnautilus-private/nautilus-tree-view-drag-dest.h
+++ b/libnautilus-private/nautilus-tree-view-drag-dest.h
@ -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"

--- a/libnautilus-private/nautilus-ui-utilities.c
+++ b/libnautilus-private/nautilus-ui-utilities.c
@ -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
--- a/libnautilus-private/nautilus-ui-utilities.h
+++ b/libnautilus-private/nautilus-ui-utilities.h
@ -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);
--- a/libnautilus-private/nautilus-undo-manager.c
+++ b/libnautilus-private/nautilus-undo-manager.c
@ -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"

--- a/libnautilus-private/nautilus-undo-transaction.c
+++ b/libnautilus-private/nautilus-undo-transaction.c
@ -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"

--- a/libnautilus-private/nautilus-undo.c
+++ b/libnautilus-private/nautilus-undo.c
@ -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"
--- a/libnautilus-private/nautilus-view.h
+++ b/libnautilus-private/nautilus-view.h
@ -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>
--- a/libnautilus-private/nautilus-window-info.h
+++ b/libnautilus-private/nautilus-window-info.h
@ -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
--- a/src/ephy-spinner.c
+++ b/src/ephy-spinner.c
@ -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 */

--- a/src/ephy-spinner.h
+++ b/src/ephy-spinner.h
@ -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

--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@ -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
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@ -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>
--- a/src/file-manager/fm-directory-view.h
+++ b/src/file-manager/fm-directory-view.h
@ -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>
--- a/src/file-manager/fm-ditem-page.c
+++ b/src/file-manager/fm-ditem-page.c
@ -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>
--- a/src/file-manager/fm-error-reporting.h
+++ b/src/file-manager/fm-error-reporting.h
@ -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>

--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@ -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>
--- a/src/file-manager/fm-list-model.c
+++ b/src/file-manager/fm-list-model.c
@ -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>
--- a/src/file-manager/fm-list-model.h
+++ b/src/file-manager/fm-list-model.h
@ -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>
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@ -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>
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@ -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>
--- a/src/file-manager/fm-properties-window.h
+++ b/src/file-manager/fm-properties-window.h
@ -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;
--- a/src/file-manager/fm-tree-model.c
+++ b/src/file-manager/fm-tree-model.c
@ -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 {
--- a/src/file-manager/fm-tree-model.h
+++ b/src/file-manager/fm-tree-model.h
@ -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>

--- a/src/file-manager/fm-tree-view.c
+++ b/src/file-manager/fm-tree-view.c
@ -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>
--- a/src/file-manager/fm-tree-view.h
+++ b/src/file-manager/fm-tree-view.h
@ -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))
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@ -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>
--- a/src/nautilus-bookmarks-window.c
+++ b/src/nautilus-bookmarks-window.c
@ -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>
--- a/src/nautilus-bookmarks-window.h
+++ b/src/nautilus-bookmarks-window.h
@ -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,
--- a/src/nautilus-connect-server-dialog-main.c
+++ b/src/nautilus-connect-server-dialog-main.c
@ -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>
--- a/src/nautilus-connect-server-dialog.c
+++ b/src/nautilus-connect-server-dialog.c
@ -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>

--- a/src/nautilus-connect-server-dialog.h
+++ b/src/nautilus-connect-server-dialog.h
@ -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 ())
--- a/src/nautilus-desktop-window.c
+++ b/src/nautilus-desktop-window.c
@ -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>
--- a/src/nautilus-emblem-sidebar.c
+++ b/src/nautilus-emblem-sidebar.c
@ -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>
--- a/src/nautilus-file-management-properties-main.c
+++ b/src/nautilus-file-management-properties-main.c
@ -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>
--- a/src/nautilus-file-management-properties.h
+++ b/src/nautilus-file-management-properties.h
@ -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

--- a/src/nautilus-history-sidebar.c
+++ b/src/nautilus-history-sidebar.c
@ -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>
--- a/src/nautilus-history-sidebar.h
+++ b/src/nautilus-history-sidebar.h
@ -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"

--- a/src/nautilus-image-properties-page.c
+++ b/src/nautilus-image-properties-page.c
@ -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>
--- a/src/nautilus-image-properties-page.h
+++ b/src/nautilus-image-properties-page.h
@ -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))
--- a/src/nautilus-information-panel.c
+++ b/src/nautilus-information-panel.c
@ -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>
--- a/src/nautilus-location-bar.c
+++ b/src/nautilus-location-bar.c
@ -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>
--- a/src/nautilus-location-bar.h
+++ b/src/nautilus-location-bar.h
@ -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) \
--- a/src/nautilus-location-dialog.c
+++ b/src/nautilus-location-dialog.c
@ -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"
--- a/src/nautilus-location-dialog.h
+++ b/src/nautilus-location-dialog.h
@ -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 ())
--- a/src/nautilus-location-entry.c
+++ b/src/nautilus-location-entry.c
@ -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>
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@ -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>
--- a/Show more
+++ b/Show more