** Allow evolution to build with G_DISABLE_SINGLE_INCLUDES and

2008-06-06  Matthew Barnes  <mbarnes@redhat.com>

	** Allow evolution to build with G_DISABLE_SINGLE_INCLUDES and
	   GTK_DISABLE_SINGLE_INCLUDES defined.  (#536637)


svn path=/trunk/; revision=35606

83 files changed, 62 insertions, 229 deletions

diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c
index f711155231..eee8f645e5 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.c
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.c
@@ -26,13 +26,6 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtklabel.h>
-#include <gnome.h>
 #include <glade/glade.h>
 #include <misc/e-map.h>
 #include <libecal/e-cal-time-util.h>
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.h b/widgets/e-timezone-dialog/e-timezone-dialog.h
index 7ce78c381a..aac919f203 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.h
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.h
@@ -22,7 +22,7 @@
 #ifndef __E_TIMEZONE_DIALOG_H__
 #define __E_TIMEZONE_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <libical/ical.h>
 
 
diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c
index cbd6d23e06..8d099df961 100644
--- a/widgets/menus/gal-define-views-dialog.c
+++ b/widgets/menus/gal-define-views-dialog.c
@@ -23,8 +23,6 @@
 
 #include <config.h>
 
-#include <gtk/gtk.h>
-#include <gtk/gtklabel.h>
 #include <glib/gi18n.h>
 
 #include "e-util/e-util.h"
diff --git a/widgets/menus/gal-define-views-dialog.h b/widgets/menus/gal-define-views-dialog.h
index e353886d21..bc92350a52 100644
--- a/widgets/menus/gal-define-views-dialog.h
+++ b/widgets/menus/gal-define-views-dialog.h
@@ -24,9 +24,7 @@
 #ifndef __GAL_DEFINE_VIEWS_DIALOG_H__
 #define __GAL_DEFINE_VIEWS_DIALOG_H__
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 
 #include <widgets/menus/gal-view-collection.h>
diff --git a/widgets/menus/gal-view-collection.h b/widgets/menus/gal-view-collection.h
index d5a1e493ef..23d2248958 100644
--- a/widgets/menus/gal-view-collection.h
+++ b/widgets/menus/gal-view-collection.h
@@ -24,7 +24,7 @@
 #ifndef _GAL_VIEW_SET_H_
 #define _GAL_VIEW_SET_H_
 
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 #include <widgets/menus/gal-view-factory.h>
 
 G_BEGIN_DECLS
diff --git a/widgets/menus/gal-view-etable.h b/widgets/menus/gal-view-etable.h
index 83d1259fca..0209a17995 100644
--- a/widgets/menus/gal-view-etable.h
+++ b/widgets/menus/gal-view-etable.h
@@ -24,7 +24,7 @@
 #ifndef _GAL_VIEW_ETABLE_H_
 #define _GAL_VIEW_ETABLE_H_
 
-#include <gtk/gtkobject.h>
+#include <gtk/gtk.h>
 #include <widgets/menus/gal-view.h>
 #include <table/e-table-state.h>
 #include <table/e-table-specification.h>
diff --git a/widgets/menus/gal-view-factory-etable.h b/widgets/menus/gal-view-factory-etable.h
index 2535ef01b4..c85927969d 100644
--- a/widgets/menus/gal-view-factory-etable.h
+++ b/widgets/menus/gal-view-factory-etable.h
@@ -24,7 +24,7 @@
 #ifndef _GAL_VIEW_FACTORY_ETABLE_H_
 #define _GAL_VIEW_FACTORY_ETABLE_H_
 
-#include <gtk/gtkobject.h>
+#include <gtk/gtk.h>
 #include <widgets/menus/gal-view-factory.h>
 #include <table/e-table-specification.h>
 
diff --git a/widgets/menus/gal-view-factory.h b/widgets/menus/gal-view-factory.h
index 939917d488..739695bea5 100644
--- a/widgets/menus/gal-view-factory.h
+++ b/widgets/menus/gal-view-factory.h
@@ -24,7 +24,7 @@
 #ifndef _GAL_VIEW_FACTORY_H_
 #define _GAL_VIEW_FACTORY_H_
 
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 #include <widgets/menus/gal-view.h>
 
 #ifdef __cplusplus
diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c
index 7fcaf6699d..9e207c9104 100644
--- a/widgets/menus/gal-view-instance-save-as-dialog.c
+++ b/widgets/menus/gal-view-instance-save-as-dialog.c
@@ -23,8 +23,6 @@
 
 #include <config.h>
 
-#include <gtk/gtk.h>
-
 #include <glib/gi18n.h>
 #include "e-util/e-util.h"
 #include "e-util/e-util-private.h"
diff --git a/widgets/menus/gal-view-instance-save-as-dialog.h b/widgets/menus/gal-view-instance-save-as-dialog.h
index f3d30ad7d0..a96d5bc9ed 100644
--- a/widgets/menus/gal-view-instance-save-as-dialog.h
+++ b/widgets/menus/gal-view-instance-save-as-dialog.h
@@ -24,10 +24,8 @@
 #ifndef __GAL_VIEW_INSTANCE_SAVE_AS_DIALOG_H__
 #define __GAL_VIEW_INSTANCE_SAVE_AS_DIALOG_H__
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreemodel.h>
 #include <widgets/menus/gal-view-collection.h>
 #include <widgets/menus/gal-view-instance.h>
 
diff --git a/widgets/menus/gal-view-instance.h b/widgets/menus/gal-view-instance.h
index f1ebf1cdfa..1612cb91e6 100644
--- a/widgets/menus/gal-view-instance.h
+++ b/widgets/menus/gal-view-instance.h
@@ -24,7 +24,7 @@
 #ifndef _GAL_VIEW_INSTANCE_H_
 #define _GAL_VIEW_INSTANCE_H_
 
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 #include <widgets/menus/gal-view-collection.h>
 #include <misc/e-popup-menu.h>
 
diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c
index 5fab621174..dfc3e87159 100644
--- a/widgets/menus/gal-view-new-dialog.c
+++ b/widgets/menus/gal-view-new-dialog.c
@@ -23,8 +23,6 @@
 
 #include <config.h>
 
-#include <gtk/gtk.h>
-
 #include "table/e-table-scrolled.h"
 #include <glib/gi18n.h>
 #include "e-util/e-util.h"
diff --git a/widgets/menus/gal-view-new-dialog.h b/widgets/menus/gal-view-new-dialog.h
index 3d898d45cd..a8b493799c 100644
--- a/widgets/menus/gal-view-new-dialog.h
+++ b/widgets/menus/gal-view-new-dialog.h
@@ -24,8 +24,7 @@
 #ifndef __GAL_VIEW_NEW_DIALOG_H__
 #define __GAL_VIEW_NEW_DIALOG_H__
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <gal-view-collection.h>
 
diff --git a/widgets/menus/gal-view.h b/widgets/menus/gal-view.h
index bad347e824..ae682c7395 100644
--- a/widgets/menus/gal-view.h
+++ b/widgets/menus/gal-view.h
@@ -24,7 +24,7 @@
 #ifndef _GAL_VIEW_H_
 #define _GAL_VIEW_H_
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <libxml/tree.h>
 
 #ifdef __cplusplus
diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c
index 08eecebc26..e9aae8614d 100644
--- a/widgets/misc/e-activity-handler.c
+++ b/widgets/misc/e-activity-handler.c
@@ -551,9 +551,9 @@ e_activity_handler_make_error (EActivityHandler *activity_handler,
 	unsigned int activity_id;
 	GSList *p;
 	char *information = g_object_get_data((GObject *) error, "primary");
-	priv = activity_handler->priv;
 	const char *img;
 
+	priv = activity_handler->priv;
 	activity_id = get_new_activity_id (activity_handler);
 
 	activity_info = activity_info_new (component_id, activity_id, NULL, information, TRUE);
diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c
index b48d528428..7991877693 100644
--- a/widgets/misc/e-attachment.c
+++ b/widgets/misc/e-attachment.c
@@ -26,8 +26,6 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
-
 #ifdef G_OS_WIN32
 /* Include <windows.h> early (as the gio stuff below will
  * include it anyway, sigh) to workaround the DATADIR problem.
@@ -46,11 +44,6 @@
 #include <errno.h>
 
 #include <camel/camel.h>
-#include <gtk/gtk.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkdialog.h>
-#include <gio/gio.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
diff --git a/widgets/misc/e-attachment.h b/widgets/misc/e-attachment.h
index d2cf892c11..743f445694 100644
--- a/widgets/misc/e-attachment.h
+++ b/widgets/misc/e-attachment.h
@@ -25,13 +25,11 @@
 #ifndef __E_ATTACHMENT_H__
 #define __E_ATTACHMENT_H__
 
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <glade/glade-xml.h>
 #include <camel/camel-mime-part.h>
 #include <camel/camel-exception.h>
 #include <camel/camel-cipher-context.h>
-#include <gio/gio.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index 73e201e694..47f685a9da 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -36,12 +36,7 @@
 
 #include <time.h>
 #include <string.h>
-#include <glib.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 #include <libedataserver/e-data-server-util.h>
diff --git a/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c
index 3fe1ff1596..80e6d653e0 100644
--- a/widgets/misc/e-calendar.c
+++ b/widgets/misc/e-calendar.c
@@ -36,12 +36,7 @@
 
 #include "e-calendar.h"
 
-#include <glib.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkpixmap.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas-widget.h>
 #include <glib/gi18n.h>
 
diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h
index a31fccceff..3c80401775 100644
--- a/widgets/misc/e-calendar.h
+++ b/widgets/misc/e-calendar.h
@@ -23,7 +23,7 @@
 #ifndef _E_CALENDAR_H_
 #define _E_CALENDAR_H_
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <misc/e-canvas.h>
 #include "e-calendar-item.h"
 
diff --git a/widgets/misc/e-canvas-vbox.h b/widgets/misc/e-canvas-vbox.h
index 6fb7ab3852..5490cec1d7 100644
--- a/widgets/misc/e-canvas-vbox.h
+++ b/widgets/misc/e-canvas-vbox.h
@@ -24,7 +24,7 @@
 #ifndef __E_CANVAS_VBOX_H__
 #define __E_CANVAS_VBOX_H__
 
-#include <gtk/gtktypeutils.h>
+#include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas.h>
 
 #ifdef __cplusplus
diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h
index 63b0fb3107..6b10a8c46b 100644
--- a/widgets/misc/e-canvas.h
+++ b/widgets/misc/e-canvas.h
@@ -24,7 +24,7 @@
 #ifndef __E_CANVAS_H__
 #define __E_CANVAS_H__
 
-#include <gtk/gtkimcontext.h>
+#include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas.h>
 
 #ifdef __cplusplus
diff --git a/widgets/misc/e-cell-renderer-combo.c b/widgets/misc/e-cell-renderer-combo.c
index e1d7ea0034..aea4209995 100644
--- a/widgets/misc/e-cell-renderer-combo.c
+++ b/widgets/misc/e-cell-renderer-combo.c
@@ -24,10 +24,6 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkbutton.h>
-
 #include "e-combo-cell-editable.h"
 #include "e-cell-renderer-combo.h"
 
diff --git a/widgets/misc/e-cell-renderer-combo.h b/widgets/misc/e-cell-renderer-combo.h
index 6b4b161c29..822b55a6a6 100644
--- a/widgets/misc/e-cell-renderer-combo.h
+++ b/widgets/misc/e-cell-renderer-combo.h
@@ -23,7 +23,7 @@
 #ifndef __E_CELL_RENDERER_COMBO_H__
 #define __E_CELL_RENDERER_COMBO_H__
 
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/misc/e-colors.c b/widgets/misc/e-colors.c
index 69664f6a1e..c9fd0cc535 100644
--- a/widgets/misc/e-colors.c
+++ b/widgets/misc/e-colors.c
@@ -27,8 +27,6 @@
 
 #include <config.h>
 
-#include <gtk/gtk.h>
-
 #include "e-colors.h"
 
 GdkColor e_white, e_dark_gray, e_black;
diff --git a/widgets/misc/e-colors.h b/widgets/misc/e-colors.h
index 6427b62480..a82eadc4d5 100644
--- a/widgets/misc/e-colors.h
+++ b/widgets/misc/e-colors.h
@@ -24,9 +24,7 @@
 #ifndef GNOME_APP_LIBS_COLOR_H
 #define GNOME_APP_LIBS_COLOR_H
 
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/misc/e-combo-button.c b/widgets/misc/e-combo-button.c
index 541d476d2e..91e6e2e8cd 100644
--- a/widgets/misc/e-combo-button.c
+++ b/widgets/misc/e-combo-button.c
@@ -28,14 +28,6 @@
 #include "ea-widgets.h"
 #include <e-util/e-icon-factory.h>
 
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtksignal.h>
-
 struct _EComboButtonPrivate {
 	GdkPixbuf *icon;
 
diff --git a/widgets/misc/e-combo-button.h b/widgets/misc/e-combo-button.h
index f8b27f7dde..f0de2d05ce 100644
--- a/widgets/misc/e-combo-button.h
+++ b/widgets/misc/e-combo-button.h
@@ -27,10 +27,7 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkmenu.h>
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/widgets/misc/e-combo-cell-editable.c b/widgets/misc/e-combo-cell-editable.c
index 1abfbbd61a..ff8949d577 100644
--- a/widgets/misc/e-combo-cell-editable.c
+++ b/widgets/misc/e-combo-cell-editable.c
@@ -22,18 +22,6 @@
 
 #include <config.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcelleditable.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkwindow.h>
 
 #include "e-combo-cell-editable.h"
 
diff --git a/widgets/misc/e-combo-cell-editable.h b/widgets/misc/e-combo-cell-editable.h
index 7d3b4d731b..12192d33f6 100644
--- a/widgets/misc/e-combo-cell-editable.h
+++ b/widgets/misc/e-combo-cell-editable.h
@@ -23,7 +23,7 @@
 #ifndef __E_COMBO_CELL_EDITABLE_H__
 #define __E_COMBO_CELL_EDITABLE_H__
 
-#include <gtk/gtkeventbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/misc/e-config-page.h b/widgets/misc/e-config-page.h
index 957d314d5b..f7cce532e7 100644
--- a/widgets/misc/e-config-page.h
+++ b/widgets/misc/e-config-page.h
@@ -27,7 +27,7 @@
 #include <config.h>
 #endif
 
-#include <gnome.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index 4c982f3d3c..185fb1423d 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -42,21 +42,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcomboboxentry.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkdrawingarea.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkmessagedialog.h>
 #include <atk/atkrelation.h>
 #include <atk/atkrelationset.h>
 #include <glib/gi18n.h>
diff --git a/widgets/misc/e-dateedit.h b/widgets/misc/e-dateedit.h
index e9a3d715c7..65f5805fc2 100644
--- a/widgets/misc/e-dateedit.h
+++ b/widgets/misc/e-dateedit.h
@@ -41,9 +41,7 @@
 #define __E_DATE_EDIT_H_
 
 #include <time.h>
-#include <glib.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #define E_TYPE_DATE_EDIT            (e_date_edit_get_type ())
 #define E_DATE_EDIT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_DATE_EDIT, EDateEdit))
diff --git a/widgets/misc/e-dropdown-button.c b/widgets/misc/e-dropdown-button.c
index dad8cc723f..739f7ef95d 100644
--- a/widgets/misc/e-dropdown-button.c
+++ b/widgets/misc/e-dropdown-button.c
@@ -29,11 +29,6 @@
 #include "e-dropdown-button.h"
 
 #include <stdio.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkwidget.h>
 #include <libgnomeui/gnome-popup-menu.h>
 
 struct _EDropdownButtonPrivate {
diff --git a/widgets/misc/e-dropdown-button.h b/widgets/misc/e-dropdown-button.h
index 2571913e2d..7ec9ed2786 100644
--- a/widgets/misc/e-dropdown-button.h
+++ b/widgets/misc/e-dropdown-button.h
@@ -27,8 +27,7 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkmenu.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/widgets/misc/e-expander.c b/widgets/misc/e-expander.c
index 7c60c28d4b..7886e23859 100644
--- a/widgets/misc/e-expander.c
+++ b/widgets/misc/e-expander.c
@@ -26,8 +26,6 @@
 #include "e-expander.h"
 #include "ea-widgets.h"
 
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcontainer.h>
 #include <gdk/gdkkeysyms.h>
 
 #define DEFAULT_EXPANDER_SIZE 10
diff --git a/widgets/misc/e-expander.h b/widgets/misc/e-expander.h
index d3e6721b23..b7aa330d28 100644
--- a/widgets/misc/e-expander.h
+++ b/widgets/misc/e-expander.h
@@ -24,7 +24,7 @@
 #ifndef _E_EXPANDER_H_
 #define _E_EXPANDER_H_
 
-#include <gtk/gtkbin.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/misc/e-gui-utils.h b/widgets/misc/e-gui-utils.h
index 7c23362223..46d96db825 100644
--- a/widgets/misc/e-gui-utils.h
+++ b/widgets/misc/e-gui-utils.h
@@ -24,9 +24,7 @@
 #ifndef GAL_GUI_UTILS_H
 #define GAL_GUI_UTILS_H
 
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkwindow.h>
-
+#include <gtk/gtk.h>
 #include <glade/glade-xml.h>
 
 G_BEGIN_DECLS
diff --git a/widgets/misc/e-icon-entry.c b/widgets/misc/e-icon-entry.c
index c246edc04c..8a30d5505f 100644
--- a/widgets/misc/e-icon-entry.c
+++ b/widgets/misc/e-icon-entry.c
@@ -36,12 +36,6 @@
 
 #include "e-icon-entry.h"
 
-#include <gtk/gtkentry.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkimage.h>
-
 #define E_ICON_ENTRY_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), E_TYPE_ICON_ENTRY, EIconEntryPrivate))
 
 struct _EIconEntryPrivate
diff --git a/widgets/misc/e-icon-entry.h b/widgets/misc/e-icon-entry.h
index db3f01dc56..5312fa4fbc 100644
--- a/widgets/misc/e-icon-entry.h
+++ b/widgets/misc/e-icon-entry.h
@@ -37,7 +37,7 @@
 #ifndef E_ICON_ENTRY_H
 #define E_ICON_ENTRY_H
 
-#include <gtk/gtkbin.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c
index b80da133ec..06e70c9426 100644
--- a/widgets/misc/e-image-chooser.c
+++ b/widgets/misc/e-image-chooser.c
@@ -23,12 +23,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkdnd.h>
-
 #include <glib/gi18n.h>
 
 #include "e-image-chooser.h"
diff --git a/widgets/misc/e-image-chooser.h b/widgets/misc/e-image-chooser.h
index ff876038ae..4f6fcece82 100644
--- a/widgets/misc/e-image-chooser.h
+++ b/widgets/misc/e-image-chooser.h
@@ -21,7 +21,7 @@
 #ifndef _E_IMAGE_CHOOSER_H_
 #define _E_IMAGE_CHOOSER_H_
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/misc/e-info-label.c b/widgets/misc/e-info-label.c
index 8e08386ba7..57a2492671 100644
--- a/widgets/misc/e-info-label.c
+++ b/widgets/misc/e-info-label.c
@@ -24,10 +24,8 @@
 #endif
 
 #include <string.h>
-#include <gtk/gtkimage.h>
 
 #include "e-info-label.h"
-#include <gtk/gtklabel.h>
 
 #include <e-util/e-icon-factory.h>
 
diff --git a/widgets/misc/e-info-label.h b/widgets/misc/e-info-label.h
index c5da3fef19..a131823df8 100644
--- a/widgets/misc/e-info-label.h
+++ b/widgets/misc/e-info-label.h
@@ -22,7 +22,7 @@
 #ifndef _E_INFO_LABEL_H
 #define _E_INFO_LABEL_H
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
index 3c7005dc00..e717a9434c 100644
--- a/widgets/misc/e-map.c
+++ b/widgets/misc/e-map.c
@@ -24,8 +24,6 @@
 #include <math.h>
 #include <stdlib.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtksignal.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib/gi18n.h>
 
 #include "e-util/e-util-private.h"
diff --git a/widgets/misc/e-map.h b/widgets/misc/e-map.h
index 9b67a24e6f..bf0afee024 100644
--- a/widgets/misc/e-map.h
+++ b/widgets/misc/e-map.h
@@ -23,7 +23,7 @@
 #ifndef E_MAP_H
 #define E_MAP_H
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #define TYPE_E_MAP            (e_map_get_type ())
 #define E_MAP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_E_MAP, EMap))
diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c
index 762b87bc77..101f7ee04b 100644
--- a/widgets/misc/e-multi-config-dialog.c
+++ b/widgets/misc/e-multi-config-dialog.c
@@ -32,8 +32,7 @@
 #include <table/e-cell-vbox.h>
 #include <table/e-cell-text.h>
 
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
+#include <libgnome/gnome-help.h>
 
 #define SWITCH_PAGE_INTERVAL 250
 
diff --git a/widgets/misc/e-multi-config-dialog.h b/widgets/misc/e-multi-config-dialog.h
index 0847576ab5..737406c1c1 100644
--- a/widgets/misc/e-multi-config-dialog.h
+++ b/widgets/misc/e-multi-config-dialog.h
@@ -29,8 +29,7 @@
 
 #include "e-config-page.h"
 
-#include <gtk/gtkdialog.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/widgets/misc/e-popup-menu.h b/widgets/misc/e-popup-menu.h
index 7153e36efd..d5580ea524 100644
--- a/widgets/misc/e-popup-menu.h
+++ b/widgets/misc/e-popup-menu.h
@@ -26,8 +26,7 @@
 #ifndef E_POPUP_MENU_H
 #define E_POPUP_MENU_H
 
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/misc/e-printable.h b/widgets/misc/e-printable.h
index cadefc81c0..acf174dcea 100644
--- a/widgets/misc/e-printable.h
+++ b/widgets/misc/e-printable.h
@@ -24,7 +24,6 @@
 #ifndef _E_PRINTABLE_H_
 #define _E_PRINTABLE_H_
 
-#include <gtk/gtkobject.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 3361e4ea90..a40c626ab9 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -30,15 +30,6 @@
 #endif
 
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkdrawingarea.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkversion.h>
 
 #include <misc/e-unicode.h>
 #include <misc/e-gui-utils.h>
diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h
index 7c4144ce2f..c2de0b36b8 100644
--- a/widgets/misc/e-search-bar.h
+++ b/widgets/misc/e-search-bar.h
@@ -20,8 +20,7 @@
 #ifndef __E_SEARCH_BAR_H__
 #define __E_SEARCH_BAR_H__
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtktooltips.h>
+#include <gtk/gtk.h>
 
 #include <bonobo/bonobo-ui-component.h>
 
diff --git a/widgets/misc/e-selection-model-array.h b/widgets/misc/e-selection-model-array.h
index 8d729267f1..9ecc41dec2 100644
--- a/widgets/misc/e-selection-model-array.h
+++ b/widgets/misc/e-selection-model-array.h
@@ -24,7 +24,7 @@
 #ifndef _E_SELECTION_MODEL_ARRAY_H_
 #define _E_SELECTION_MODEL_ARRAY_H_
 
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 #include <misc/e-selection-model.h>
 #include <e-util/e-bit-array.h>
 
diff --git a/widgets/misc/e-selection-model.h b/widgets/misc/e-selection-model.h
index e9b76723f2..2bf31460db 100644
--- a/widgets/misc/e-selection-model.h
+++ b/widgets/misc/e-selection-model.h
@@ -24,9 +24,8 @@
 #ifndef _E_SELECTION_MODEL_H_
 #define _E_SELECTION_MODEL_H_
 
-#include <gtk/gtkobject.h>
+#include <gtk/gtk.h>
 #include <e-util/e-sorter.h>
-#include <gdk/gdkevents.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c
index cb84f1e5b0..9f8c23ba53 100644
--- a/widgets/misc/e-send-options.c
+++ b/widgets/misc/e-send-options.c
@@ -23,10 +23,6 @@
 #endif
 
 #include <string.h>
-#include <glib.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtk.h>
 #include <libgnome/libgnome.h>
 #include <glib/gi18n.h>
 #include <glade/glade.h>
diff --git a/widgets/misc/e-send-options.h b/widgets/misc/e-send-options.h
index 9817ff61b1..8e0597d409 100644
--- a/widgets/misc/e-send-options.h
+++ b/widgets/misc/e-send-options.h
@@ -22,7 +22,6 @@
 #ifndef __E_SENDOPTIONS_DIALOG_H__
 #define __E_SENDOPTIONS_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
 #include <gtk/gtk.h>
 #include <time.h>
 
diff --git a/widgets/misc/e-spinner.c b/widgets/misc/e-spinner.c
index c5a247044d..26a77e6126 100644
--- a/widgets/misc/e-spinner.c
+++ b/widgets/misc/e-spinner.c
@@ -36,11 +36,6 @@
 #define START_PROFILER(name)
 #define STOP_PROFILER(name)
 
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtksettings.h>
-
 #include "e-util/e-icon-factory.h"
 
 /* Spinner cache implementation */
diff --git a/widgets/misc/e-spinner.h b/widgets/misc/e-spinner.h
index e438b43aab..5a1cd42c5e 100644
--- a/widgets/misc/e-spinner.h
+++ b/widgets/misc/e-spinner.h
@@ -28,8 +28,7 @@
 #ifndef E_SPINNER_H
 #define E_SPINNER_H
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkenums.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/misc/e-task-bar.c b/widgets/misc/e-task-bar.c
index a03b58c2fa..d1635aa7cd 100644
--- a/widgets/misc/e-task-bar.c
+++ b/widgets/misc/e-task-bar.c
@@ -26,10 +26,6 @@
 
 #include "e-task-bar.h"
 
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmisc.h>
-
 struct _ETaskBarPrivate
 {
 	GtkWidget *message_label;
diff --git a/widgets/misc/e-task-bar.h b/widgets/misc/e-task-bar.h
index 0ef0c18049..bc3a10b09d 100644
--- a/widgets/misc/e-task-bar.h
+++ b/widgets/misc/e-task-bar.h
@@ -25,7 +25,7 @@
 
 #include "e-task-widget.h"
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/widgets/misc/e-task-widget.c b/widgets/misc/e-task-widget.c
index 7b06e9a464..8fbba6e36d 100644
--- a/widgets/misc/e-task-widget.c
+++ b/widgets/misc/e-task-widget.c
@@ -28,14 +28,6 @@
 #include "e-spinner.h"
 #include <e-util/e-icon-factory.h>
 
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtktooltips.h>
-#include <gtk/gtktoolbutton.h>
-#include <gtk/gtkbox.h>
-
 #include <glib/gi18n.h>
 
 
diff --git a/widgets/misc/e-task-widget.h b/widgets/misc/e-task-widget.h
index 5d1864050c..af2c376634 100644
--- a/widgets/misc/e-task-widget.h
+++ b/widgets/misc/e-task-widget.h
@@ -23,8 +23,7 @@
 #ifndef _E_TASK_WIDGET_H_
 #define _E_TASK_WIDGET_H_
 
-#include <gtk/gtkeventbox.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/widgets/misc/test-calendar.c b/widgets/misc/test-calendar.c
index 1021905f16..d26ac3e14d 100644
--- a/widgets/misc/test-calendar.c
+++ b/widgets/misc/test-calendar.c
@@ -29,9 +29,7 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 #include <libgnomeui/gnome-app.h>
 #include <libgnomeui/gnome-ui-init.h>
diff --git a/widgets/misc/test-dateedit.c b/widgets/misc/test-dateedit.c
index f5017c223c..bb85d4aecc 100644
--- a/widgets/misc/test-dateedit.c
+++ b/widgets/misc/test-dateedit.c
@@ -29,11 +29,7 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <libgnomeui/gnome-app.h>
 #include "e-dateedit.h"
diff --git a/widgets/misc/test-dropdown-button.c b/widgets/misc/test-dropdown-button.c
index 80c6a37a14..c169a0d09d 100644
--- a/widgets/misc/test-dropdown-button.c
+++ b/widgets/misc/test-dropdown-button.c
@@ -27,11 +27,7 @@
 #endif
 
 #include <stdio.h>
-#include <glib.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include <libgnomeui/gnome-app.h>
 #include <libgnomeui/gnome-app-helper.h>
diff --git a/widgets/misc/test-info-label.c b/widgets/misc/test-info-label.c
index 1557a27889..55fbfcc309 100644
--- a/widgets/misc/test-info-label.c
+++ b/widgets/misc/test-info-label.c
@@ -24,11 +24,7 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtkbox.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
-
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-app.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <e-util/e-icon-factory.h>
diff --git a/widgets/misc/test-multi-config-dialog.c b/widgets/misc/test-multi-config-dialog.c
index 9fa90b1143..c0aba09ab9 100644
--- a/widgets/misc/test-multi-config-dialog.c
+++ b/widgets/misc/test-multi-config-dialog.c
@@ -23,7 +23,9 @@
 
 #include "e-multi-config-dialog.c"
 
-#include <gnome.h>
+#include <gtk/gtk.h>
+#include <libgnomeui/gnome-app.h>
+#include <libgnomeui/gnome-ui-init.h>
 
 
 #define NUM_PAGES 10
diff --git a/widgets/table/e-cell-spin-button.h b/widgets/table/e-cell-spin-button.h
index 6bbd79bc99..df64d9007d 100644
--- a/widgets/table/e-cell-spin-button.h
+++ b/widgets/table/e-cell-spin-button.h
@@ -30,8 +30,7 @@
 #ifndef __E_CELL_SPIN_BUTTON_H__
 #define __E_CELL_SPIN_BUTTON_H__
 
-#include <glib.h>
-#include <gtk/gtktypeutils.h>
+#include <gtk/gtk.h>
 #include <table/e-cell.h>
 
 #define E_CELL_SPIN_BUTTON_TYPE        (e_cell_spin_button_get_type ())
diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h
index 93b958be0d..d92d02b7c8 100644
--- a/widgets/table/e-cell-text.h
+++ b/widgets/table/e-cell-text.h
@@ -36,7 +36,8 @@
 
 #ifndef _E_CELL_TEXT_H_
 #define _E_CELL_TEXT_H_
-#include <gtk/gtkmenu.h>
+
+#include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas.h>
 #include <table/e-cell.h>
 
diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h
index b92e493e19..65be53f816 100644
--- a/widgets/table/e-cell.h
+++ b/widgets/table/e-cell.h
@@ -25,7 +25,6 @@
 #ifndef _E_CELL_H_
 #define _E_CELL_H_
 
-#include <gdk/gdktypes.h>
 #include <gtk/gtk.h>
 #include <table/e-table-model.h>
 #include <table/e-table-tooltip.h>
diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h
index ca81b5bb6d..47c730c925 100644
--- a/widgets/table/e-table-config.h
+++ b/widgets/table/e-table-config.h
@@ -30,7 +30,7 @@
 #include <table/e-table-without.h>
 #include <table/e-table-subset-variable.h>
 #include <table/e-table.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/table/e-table-field-chooser-dialog.h b/widgets/table/e-table-field-chooser-dialog.h
index 32012e4494..e175a5d17f 100644
--- a/widgets/table/e-table-field-chooser-dialog.h
+++ b/widgets/table/e-table-field-chooser-dialog.h
@@ -24,7 +24,7 @@
 #ifndef __E_TABLE_FIELD_CHOOSER_DIALOG_H__
 #define __E_TABLE_FIELD_CHOOSER_DIALOG_H__
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include <table/e-table-field-chooser.h>
 #include <table/e-table-header.h>
 
diff --git a/widgets/table/e-table-field-chooser.h b/widgets/table/e-table-field-chooser.h
index f6dca643d7..928558b75e 100644
--- a/widgets/table/e-table-field-chooser.h
+++ b/widgets/table/e-table-field-chooser.h
@@ -25,7 +25,7 @@
 #define __E_TABLE_FIELD_CHOOSER_H__
 
 #include <glade/glade.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include <table/e-table-header.h>
 
 G_BEGIN_DECLS
diff --git a/widgets/table/e-table-scrolled.h b/widgets/table/e-table-scrolled.h
index 1c7c0b48fd..239fc15d1e 100644
--- a/widgets/table/e-table-scrolled.h
+++ b/widgets/table/e-table-scrolled.h
@@ -24,7 +24,7 @@
 #ifndef _E_TABLE_SCROLLED_H_
 #define _E_TABLE_SCROLLED_H_
 
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
 #include <table/e-table-model.h>
 #include <table/e-table.h>
 
diff --git a/widgets/table/e-table-search.h b/widgets/table/e-table-search.h
index ecb3efa6e9..67fddac8a3 100644
--- a/widgets/table/e-table-search.h
+++ b/widgets/table/e-table-search.h
@@ -24,7 +24,7 @@
 #ifndef _E_TABLE_SEARCH_H_
 #define _E_TABLE_SEARCH_H_
 
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h
index 60b7812413..075939a8a5 100644
--- a/widgets/table/e-table-selection-model.h
+++ b/widgets/table/e-table-selection-model.h
@@ -24,7 +24,7 @@
 #ifndef _E_TABLE_SELECTION_MODEL_H_
 #define _E_TABLE_SELECTION_MODEL_H_
 
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 #include <misc/e-selection-model-array.h>
 #include <table/e-table-model.h>
 #include <table/e-table-header.h>
diff --git a/widgets/table/e-table-without.h b/widgets/table/e-table-without.h
index 57d6a4cfe2..7788509b7b 100644
--- a/widgets/table/e-table-without.h
+++ b/widgets/table/e-table-without.h
@@ -24,7 +24,7 @@
 #ifndef _E_TABLE_WITHOUT_H_
 #define _E_TABLE_WITHOUT_H_
 
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 #include <table/e-table-subset.h>
 
 #ifdef __cplusplus
diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h
index 7d6bb2a97e..5e7f3544bb 100644
--- a/widgets/table/e-table.h
+++ b/widgets/table/e-table.h
@@ -26,8 +26,7 @@
 #define _E_TABLE_H_
 
 #include <libgnomecanvas/gnome-canvas.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtktable.h>
+#include <gtk/gtk.h>
 #include <libxml/tree.h>
 #include <table/e-table-model.h>
 #include <table/e-table-header.h>
diff --git a/widgets/table/e-tree-scrolled.h b/widgets/table/e-tree-scrolled.h
index 9671061222..1e35828989 100644
--- a/widgets/table/e-tree-scrolled.h
+++ b/widgets/table/e-tree-scrolled.h
@@ -24,7 +24,7 @@
 #ifndef _E_TREE_SCROLLED_H_
 #define _E_TREE_SCROLLED_H_
 
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
 #include <table/e-tree-model.h>
 #include <table/e-tree.h>
 
diff --git a/widgets/table/e-tree-selection-model.h b/widgets/table/e-tree-selection-model.h
index 2920ac6a9e..ffac924ad3 100644
--- a/widgets/table/e-tree-selection-model.h
+++ b/widgets/table/e-tree-selection-model.h
@@ -24,8 +24,7 @@
 #ifndef _E_TREE_SELECTION_MODEL_H_
 #define _E_TREE_SELECTION_MODEL_H_
 
-#include <gdk/gdktypes.h>
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 #include <e-util/e-sorter.h>
 #include <misc/e-selection-model.h>
 #include <table/e-tree-model.h>
diff --git a/widgets/table/e-tree.h b/widgets/table/e-tree.h
index 03c67a0563..f497b4721f 100644
--- a/widgets/table/e-tree.h
+++ b/widgets/table/e-tree.h
@@ -24,8 +24,7 @@
 #ifndef _E_TREE_H_
 #define _E_TREE_H_
 
-#include <gtk/gtkdnd.h>
-#include <gtk/gtktable.h>
+#include <gtk/gtk.h>
 #include <libxml/tree.h>
 #include <libgnomecanvas/gnome-canvas.h>
 #include <misc/e-printable.h>
diff --git a/widgets/text/e-text-model.h b/widgets/text/e-text-model.h
index d45e3f37cd..98965f94d5 100644
--- a/widgets/text/e-text-model.h
+++ b/widgets/text/e-text-model.h
@@ -24,8 +24,7 @@
 #ifndef E_TEXT_MODEL_H
 #define E_TEXT_MODEL_H
 
-#include <glib.h>
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 
 G_BEGIN_DECLS
 
diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h
index 60e28a0b44..c4c4b89f1b 100644
--- a/widgets/text/e-text.h
+++ b/widgets/text/e-text.h
@@ -37,7 +37,7 @@
 #ifndef E_TEXT_H
 #define E_TEXT_H
 
-#include <gtk/gtkmenu.h>
+#include <gtk/gtk.h>
 
 #include <e-util/e-text-event-processor.h>
 #include <text/e-text-model.h>