Index: src/file-manager/fm-list-view.c
===================================================================
--- src/file-manager/fm-list-view.c	(revision 14785)
+++ src/file-manager/fm-list-view.c	(working copy)
@@ -35,7 +35,7 @@
 #include <eel/eel-vfs-extensions.h>
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-gtk-macros.h>
-#include <gdk/gdkcursor.h>
+#include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <libegg/eggtreemultidnd.h>
Index: src/file-manager/fm-list-model.c
===================================================================
--- src/file-manager/fm-list-model.c	(revision 14785)
+++ src/file-manager/fm-list-model.c	(working copy)
@@ -35,7 +35,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libnautilus-private/nautilus-dnd.h>
-#include <glib/gsequence.h>
+#include <glib.h>
 
 enum {
 	SUBDIRECTORY_UNLOADED,
Index: src/file-manager/fm-list-model.h
===================================================================
--- src/file-manager/fm-list-model.h	(revision 14785)
+++ src/file-manager/fm-list-model.h	(working copy)
@@ -23,7 +23,7 @@
 */
 
 #include <gtk/gtk.h>
-#include <gdk/gdkdnd.h>
+#include <gdk/gdk.h>
 #include <libnautilus-private/nautilus-file.h>
 #include <libnautilus-private/nautilus-directory.h>
 #include <libnautilus-extension/nautilus-column.h>
Index: src/nautilus-emblem-sidebar.h
===================================================================
--- src/nautilus-emblem-sidebar.h	(revision 14785)
+++ src/nautilus-emblem-sidebar.h	(working copy)
@@ -27,7 +27,7 @@
 #ifndef NAUTILUS_EMBLEM_SIDEBAR_H
 #define NAUTILUS_EMBLEM_SIDEBAR_H
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 #define NAUTILUS_TYPE_EMBLEM_SIDEBAR \
 	(nautilus_emblem_sidebar_get_type ())
Index: src/nautilus-notebook.c
===================================================================
--- src/nautilus-notebook.c	(revision 14785)
+++ src/nautilus-notebook.c	(working copy)
@@ -36,15 +36,7 @@
 
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
 
 #define TAB_WIDTH_N_CHARS 15
 
Index: src/nautilus-notebook.h
===================================================================
--- src/nautilus-notebook.h	(revision 14785)
+++ src/nautilus-notebook.h	(working copy)
@@ -28,7 +28,7 @@
 #define NAUTILUS_NOTEBOOK_H
 
 #include <glib.h>
-#include <gtk/gtknotebook.h>
+#include <gtk/gtk.h>
 #include "nautilus-window-slot.h"
 
 G_BEGIN_DECLS
Index: libnautilus-private/nautilus-icon-info.h
===================================================================
--- libnautilus-private/nautilus-icon-info.h	(revision 14785)
+++ libnautilus-private/nautilus-icon-info.h	(working copy)
@@ -3,7 +3,7 @@
 
 #include <glib-object.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdktypes.h>
+#include <gdk/gdk.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
Index: libnautilus-private/nautilus-monitor.h
===================================================================
--- libnautilus-private/nautilus-monitor.h	(revision 14785)
+++ libnautilus-private/nautilus-monitor.h	(working copy)
@@ -26,7 +26,7 @@
 #ifndef NAUTILUS_MONITOR_H
 #define NAUTILUS_MONITOR_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <gio/gio.h>
 
 typedef struct NautilusMonitor NautilusMonitor;
Index: libnautilus-private/nautilus-idle-queue.h
===================================================================
--- libnautilus-private/nautilus-idle-queue.h	(revision 14785)
+++ libnautilus-private/nautilus-idle-queue.h	(working copy)
@@ -26,7 +26,7 @@
 #ifndef NAUTILUS_IDLE_QUEUE_H
 #define NAUTILUS_IDLE_QUEUE_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
Index: libnautilus-private/nautilus-search-engine-simple.c
===================================================================
--- libnautilus-private/nautilus-search-engine-simple.c	(revision 14785)
+++ libnautilus-private/nautilus-search-engine-simple.c	(working copy)
@@ -25,7 +25,7 @@
 #include "nautilus-search-engine-simple.h"
 
 #include <string.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <eel/eel-gtk-macros.h>
 #include <eel/eel-glib-extensions.h>
 #include <gio/gio.h>
Index: libnautilus-private/nautilus-file-operations.c
===================================================================
--- libnautilus-private/nautilus-file-operations.c	(revision 14785)
+++ libnautilus-private/nautilus-file-operations.c	(working copy)
@@ -53,10 +53,10 @@
 
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
-#include <gdk/gdkdnd.h>
+#include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-#include <glib/gurifuncs.h>
+#include <glib.h>
 #include "nautilus-file-changes-queue.h"
 #include "nautilus-file-private.h"
 #include "nautilus-desktop-icon-file.h"
Index: libnautilus-private/nautilus-file.c
===================================================================
--- libnautilus-private/nautilus-file.c	(revision 14785)
+++ libnautilus-private/nautilus-file.c	(working copy)
@@ -58,8 +58,7 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gio/gio.h>
-#include <glib/gurifuncs.h>
-#include <glib/gfileutils.h>
+#include <glib.h>
 #include <libnautilus-extension/nautilus-file-info.h>
 #include <libxml/parser.h>
 #include <pwd.h>
Index: libnautilus-private/nautilus-directory-notify.h
===================================================================
--- libnautilus-private/nautilus-directory-notify.h	(revision 14785)
+++ libnautilus-private/nautilus-directory-notify.h	(working copy)
@@ -22,7 +22,7 @@
    Author: Darin Adler <darin@bentspoon.com>
 */
 
-#include <gdk/gdktypes.h>
+#include <gdk/gdk.h>
 #include <libnautilus-private/nautilus-file.h>
 
 typedef struct {
Index: libnautilus-extension/nautilus-menu.c
===================================================================
--- libnautilus-extension/nautilus-menu.c	(revision 14785)
+++ libnautilus-extension/nautilus-menu.c	(working copy)
@@ -25,7 +25,7 @@
 #include "nautilus-menu.h"
 #include "nautilus-extension-i18n.h"
 
-#include <glib/glist.h>
+#include <glib.h>
 
 #define NAUTILUS_MENU_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NAUTILUS_TYPE_MENU, NautilusMenuPrivate))
 
Index: cut-n-paste-code/libegg/eggtreemultidnd.c
===================================================================
--- cut-n-paste-code/libegg/eggtreemultidnd.c	(revision 14785)
+++ cut-n-paste-code/libegg/eggtreemultidnd.c	(working copy)
@@ -18,10 +18,7 @@
  */
 
 #include <string.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include "eggtreemultidnd.h"
 
 #define EGG_TREE_MULTI_DND_STRING "EggTreeMultiDndString"
Index: cut-n-paste-code/libegg/eggtreemultidnd.h
===================================================================
--- cut-n-paste-code/libegg/eggtreemultidnd.h	(revision 14785)
+++ cut-n-paste-code/libegg/eggtreemultidnd.h	(working copy)
@@ -20,9 +20,7 @@
 #ifndef __EGG_TREE_MULTI_DND_H__
 #define __EGG_TREE_MULTI_DND_H__
 
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkdnd.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
