Index: baobab/src/baobab-cell-renderer-progress.h
===================================================================
--- baobab/src/baobab-cell-renderer-progress.h	(revision 8185)
+++ baobab/src/baobab-cell-renderer-progress.h	(working copy)
@@ -21,7 +21,7 @@
 #ifndef __BAOBAB_CELL_RENDERER_PROGRESS_H__
 #define __BAOBAB_CELL_RENDERER_PROGRESS_H__
 
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: baobab/src/gedit-spinner.c
===================================================================
--- baobab/src/gedit-spinner.c	(revision 8185)
+++ baobab/src/gedit-spinner.c	(working copy)
@@ -42,9 +42,7 @@
 #include "gedit-spinner.h"
 
 #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: baobab/src/baobab-chart.h
===================================================================
--- baobab/src/baobab-chart.h	(revision 8185)
+++ baobab/src/baobab-chart.h	(working copy)
@@ -35,7 +35,6 @@
 #define __BAOBAB_CHART_H__
 
 #include <gtk/gtk.h>
-#include <gtk/gtktreemodel.h>
 
 G_BEGIN_DECLS
 
Index: baobab/src/gedit-spinner.h
===================================================================
--- baobab/src/gedit-spinner.h	(revision 8185)
+++ baobab/src/gedit-spinner.h	(working copy)
@@ -35,8 +35,7 @@
 #ifndef __GEDIT_SPINNER_H__
 #define __GEDIT_SPINNER_H__
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkenums.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: baobab/src/baobab-remote-connect-dialog.h
===================================================================
--- baobab/src/baobab-remote-connect-dialog.h	(revision 8185)
+++ baobab/src/baobab-remote-connect-dialog.h	(working copy)
@@ -30,7 +30,7 @@
 #ifndef BAOBAB_REMOTE_CONNECT_DIALOG_H
 #define BAOBAB_REMOTE_CONNECT_DIALOG_H
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include <gio/gio.h>
 
 
Index: gnome-dictionary/libgdict/gdict-strategy-chooser.h
===================================================================
--- gnome-dictionary/libgdict/gdict-strategy-chooser.h	(revision 8185)
+++ gnome-dictionary/libgdict/gdict-strategy-chooser.h	(working copy)
@@ -20,7 +20,7 @@
 #ifndef __GDICT_STRATEGY_CHOOSER_H__
 #define __GDICT_STRATEGY_CHOOSER_H__
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include "gdict-context.h"
 
 G_BEGIN_DECLS
Index: gnome-dictionary/libgdict/gdict-private.h
===================================================================
--- gnome-dictionary/libgdict/gdict-private.h	(revision 8185)
+++ gnome-dictionary/libgdict/gdict-private.h	(working copy)
@@ -17,7 +17,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  */
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "gdict-debug.h"
 
 G_BEGIN_DECLS
Index: gnome-dictionary/libgdict/gdict-database-chooser.c
===================================================================
--- gnome-dictionary/libgdict/gdict-database-chooser.c	(revision 8185)
+++ gnome-dictionary/libgdict/gdict-database-chooser.c	(working copy)
@@ -39,7 +39,6 @@
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkbindings.h>
 #include <glib/gi18n-lib.h>
 
 #include "gdict-database-chooser.h"
Index: gnome-dictionary/libgdict/gdict-speller.c
===================================================================
--- gnome-dictionary/libgdict/gdict-speller.c	(revision 8185)
+++ gnome-dictionary/libgdict/gdict-speller.c	(working copy)
@@ -36,7 +36,6 @@
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkbindings.h>
 #include <glib/gi18n-lib.h>
 
 #include "gdict-speller.h"
Index: gnome-dictionary/libgdict/gdict-defbox.c
===================================================================
--- gnome-dictionary/libgdict/gdict-defbox.c	(revision 8185)
+++ gnome-dictionary/libgdict/gdict-defbox.c	(working copy)
@@ -40,7 +40,6 @@
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkbindings.h>
 #include <glib/gi18n-lib.h>
 
 #include "gdict-defbox.h"
Index: gnome-dictionary/libgdict/gdict-database-chooser.h
===================================================================
--- gnome-dictionary/libgdict/gdict-database-chooser.h	(revision 8185)
+++ gnome-dictionary/libgdict/gdict-database-chooser.h	(working copy)
@@ -20,7 +20,7 @@
 #ifndef __GDICT_DATABASE_CHOOSER_H__
 #define __GDICT_DATABASE_CHOOSER_H__
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include "gdict-context.h"
 
 G_BEGIN_DECLS
Index: gnome-dictionary/libgdict/gdict-speller.h
===================================================================
--- gnome-dictionary/libgdict/gdict-speller.h	(revision 8185)
+++ gnome-dictionary/libgdict/gdict-speller.h	(working copy)
@@ -20,7 +20,7 @@
 #ifndef __GDICT_SPELLER_H__
 #define __GDICT_SPELLER_H__
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 #include "gdict-context.h"
 
 G_BEGIN_DECLS
Index: gnome-dictionary/libgdict/gdict-defbox.h
===================================================================
--- gnome-dictionary/libgdict/gdict-defbox.h	(revision 8185)
+++ gnome-dictionary/libgdict/gdict-defbox.h	(working copy)
@@ -20,7 +20,7 @@
 #ifndef __GDICT_DEFBOX_H__
 #define __GDICT_DEFBOX_H__
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include "gdict-context.h"
 
 G_BEGIN_DECLS
Index: gnome-dictionary/libgdict/gdict-source-chooser.c
===================================================================
--- gnome-dictionary/libgdict/gdict-source-chooser.c	(revision 8185)
+++ gnome-dictionary/libgdict/gdict-source-chooser.c	(working copy)
@@ -37,9 +37,8 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <gdk/gdkkeysyms.h>
+#include <gdk/gdk.h>
 
-#include <gtk/gtkbindings.h>
 #include <gtk/gtk.h>
 
 #include "gdict-source-chooser.h"
Index: gnome-dictionary/libgdict/gdict-strategy-chooser.c
===================================================================
--- gnome-dictionary/libgdict/gdict-strategy-chooser.c	(revision 8185)
+++ gnome-dictionary/libgdict/gdict-strategy-chooser.c	(working copy)
@@ -35,9 +35,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkbindings.h>
 #include <glib/gi18n-lib.h>
 
 #include "gdict-strategy-chooser.h"
Index: gnome-dictionary/libgdict/gdict-source-chooser.h
===================================================================
--- gnome-dictionary/libgdict/gdict-source-chooser.h	(revision 8185)
+++ gnome-dictionary/libgdict/gdict-source-chooser.h	(working copy)
@@ -20,7 +20,7 @@
 #ifndef __GDICT_SOURCE_CHOOSER_H__
 #define __GDICT_SOURCE_CHOOSER_H__
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include "gdict-source-loader.h"
 
 G_BEGIN_DECLS
Index: gnome-dictionary/libgdict/gdict-utils.h
===================================================================
--- gnome-dictionary/libgdict/gdict-utils.h	(revision 8185)
+++ gnome-dictionary/libgdict/gdict-utils.h	(working copy)
@@ -21,7 +21,7 @@
 #define __GDICT_UTILS_H__
 
 #include <glib-object.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: gnome-dictionary/src/gdict-window.c
===================================================================
--- gnome-dictionary/src/gdict-window.c	(revision 8185)
+++ gnome-dictionary/src/gdict-window.c	(working copy)
@@ -30,7 +30,7 @@
 #include <math.h>
 
 #include <gtk/gtk.h>
-#include <glib/goption.h>
+#include <glib.h>
 #include <glib/gi18n.h>
 
 #include <libgdict/gdict.h>
Index: gnome-dictionary/src/gdict-aligned-window.c
===================================================================
--- gnome-dictionary/src/gdict-aligned-window.c	(revision 8185)
+++ gnome-dictionary/src/gdict-aligned-window.c	(working copy)
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include "gdict-aligned-window.h"
 
Index: gnome-dictionary/src/gdict-sidebar.c
===================================================================
--- gnome-dictionary/src/gdict-sidebar.c	(revision 8185)
+++ gnome-dictionary/src/gdict-sidebar.c	(working copy)
@@ -32,7 +32,6 @@
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkbindings.h>
 #include <glib/gi18n.h>
 
 #include "gdict-sidebar.h"
Index: gnome-dictionary/src/gdict-aligned-window.h
===================================================================
--- gnome-dictionary/src/gdict-aligned-window.h	(revision 8185)
+++ gnome-dictionary/src/gdict-aligned-window.h	(working copy)
@@ -23,7 +23,7 @@
 #ifndef __GDICT_ALIGNED_WINDOW_H__
 #define __GDICT_ALIGNED_WINDOW_H__
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
Index: gnome-dictionary/src/gdict-sidebar.h
===================================================================
--- gnome-dictionary/src/gdict-sidebar.h	(revision 8185)
+++ gnome-dictionary/src/gdict-sidebar.h	(working copy)
@@ -24,7 +24,7 @@
 #ifndef __GDICT_SIDEBAR_H__
 #define __GDICT_SIDEBAR_H__
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 #define GDICT_TYPE_SIDEBAR		(gdict_sidebar_get_type ())
 #define GDICT_SIDEBAR(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GDICT_TYPE_SIDEBAR, GdictSidebar))
Index: gnome-dictionary/src/gdict-app.c
===================================================================
--- gnome-dictionary/src/gdict-app.c	(revision 8185)
+++ gnome-dictionary/src/gdict-app.c	(working copy)
@@ -31,7 +31,7 @@
 #include <sys/stat.h>
 
 #include <gtk/gtk.h>
-#include <glib/goption.h>
+#include <glib.h>
 #include <glib/gi18n.h>
 
 #include "gdict-common.h"
Index: gsearchtool/gsearchtool.c
===================================================================
--- gsearchtool/gsearchtool.c	(revision 8185)
+++ gsearchtool/gsearchtool.c	(working copy)
@@ -39,7 +39,7 @@
 #include <unistd.h>
 #include <sys/wait.h>
 #include <glib/gi18n.h>
-#include <gdk/gdkcursor.h>
+#include <gdk/gdk.h>
 #include <libgnomevfs/gnome-vfs-mime.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
Index: gsearchtool/gsearchtool-support.c
===================================================================
--- gsearchtool/gsearchtool-support.c	(revision 8185)
+++ gsearchtool/gsearchtool-support.c	(working copy)
@@ -31,7 +31,7 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <glib/gdate.h>
+#include <glib.h>
 #include <regex.h>
 #include <gdk/gdkx.h>
 #include <libart_lgpl/art_rgb.h>
Index: gsearchtool/gsearchtool-spinner.c
===================================================================
--- gsearchtool/gsearchtool-spinner.c	(revision 8185)
+++ gsearchtool/gsearchtool-spinner.c	(working copy)
@@ -32,9 +32,7 @@
 #include "gsearchtool-spinner.h"
 
 #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: gsearchtool/gsearchtool-spinner.h
===================================================================
--- gsearchtool/gsearchtool-spinner.h	(revision 8185)
+++ gsearchtool/gsearchtool-spinner.h	(working copy)
@@ -30,8 +30,7 @@
 #ifndef _GSEARCHTOOL_SPINNER_H
 #define _GSEARCHTOOL_SPINNER_H
 
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkenums.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
