** 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

44 files changed, 53 insertions, 233 deletions

diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 863faacc75..4a5a8cf592 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -39,7 +39,7 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
+#include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
 #include <string.h>
@@ -49,22 +49,6 @@
 
 #include <glade/glade.h>
 
-#include <gtk/gtkentry.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtktable.h>
-
-#include <glib/gi18n.h>
 #include <libgnomeui/gnome-druid.h>
 #include <libgnomeui/gnome-druid-page-standard.h>
 
diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h
index 83756701da..c20da7f1bf 100644
--- a/mail/em-account-editor.h
+++ b/mail/em-account-editor.h
@@ -25,13 +25,13 @@
 #ifndef EM_ACCOUNT_EDITOR_H
 #define EM_ACCOUNT_EDITOR_H
 
+#include <gtk/gtk.h>
+
 #ifdef __cplusplus
 extern "C" {
 #pragma }
 #endif /* __cplusplus */
 
-#include <gtk/gtkvbox.h>
-
 struct _EAccount;
 
 typedef struct _EMAccountEditor EMAccountEditor;
diff --git a/mail/em-account-prefs.c b/mail/em-account-prefs.c
index 2558e733bd..0d9549c89c 100644
--- a/mail/em-account-prefs.c
+++ b/mail/em-account-prefs.c
@@ -26,13 +26,6 @@
 
 #include <camel/camel-url.h>
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrenderertext.h>
-
 #include <glib/gi18n.h>
 
 #include "mail-component.h"
diff --git a/mail/em-account-prefs.h b/mail/em-account-prefs.h
index c74d96b470..60d7b6e962 100644
--- a/mail/em-account-prefs.h
+++ b/mail/em-account-prefs.h
@@ -24,16 +24,8 @@
 #ifndef __EM_ACCOUNT_PREFS_H__
 #define __EM_ACCOUNT_PREFS_H__
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkclist.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
-#include <gtk/gtktreeview.h>
 
 #include <table/e-table.h>
 
@@ -41,6 +33,11 @@ extern "C" {
 
 #include <shell/Evolution.h>
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 
 #define EM_ACCOUNT_PREFS_TYPE        (em_account_prefs_get_type ())
 #define EM_ACCOUNT_PREFS(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), EM_ACCOUNT_PREFS_TYPE, EMAccountPrefs))
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 9413a2be46..1494bbda84 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -25,7 +25,7 @@
 #endif
 
 #include <string.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 #include <libedataserver/e-data-server-util.h>
 #include <e-util/e-util.h>
diff --git a/mail/em-config.c b/mail/em-config.c
index e7fdf6964f..840d64114e 100644
--- a/mail/em-config.c
+++ b/mail/em-config.c
@@ -27,16 +27,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <glib.h>
-
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
 
 #include <libgnome/gnome-url.h>
 
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index 5444fd0e32..49821b2bab 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -31,12 +31,7 @@
 
 #include <string.h>
 
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkvpaned.h>
-#include <gtk/gtkhpaned.h>
-#include <gtkhtml/gtkhtml.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gconf/gconf-client.h>
 
@@ -100,6 +95,8 @@
 
 #include "evolution-shell-component-utils.h" /* Pixmap stuff, sigh */
 
+#include <gtkhtml/gtkhtml.h>
+
 extern CamelSession *session;
 CamelStore *vfolder_store; /* the 1 static vfolder store */
 
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index 18267c41c6..e6123fb7b3 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -25,19 +25,7 @@
 
 #include <string.h>
 
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmisc.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 #include <gconf/gconf-client.h>
 
diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c
index a88095082d..fa96101306 100644
--- a/mail/em-folder-selection-button.c
+++ b/mail/em-folder-selection-button.c
@@ -26,10 +26,6 @@
 
 #include <string.h>
 
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhbox.h>
-
 #include <e-util/e-util.h>
 #include <glib/gi18n.h>
 
diff --git a/mail/em-folder-selection-button.h b/mail/em-folder-selection-button.h
index 5077f86f2a..bae3b10ff2 100644
--- a/mail/em-folder-selection-button.h
+++ b/mail/em-folder-selection-button.h
@@ -24,7 +24,7 @@
 #ifndef __EM_FOLDER_SELECTION_BUTTON_H__
 #define __EM_FOLDER_SELECTION_BUTTON_H__
 
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/mail/em-folder-selection.c b/mail/em-folder-selection.c
index fb8ce56f1d..655a16aa6f 100644
--- a/mail/em-folder-selection.c
+++ b/mail/em-folder-selection.c
@@ -26,8 +26,7 @@
 
 #include <string.h>
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include "em-folder-tree.h"
 #include "em-folder-selector.h"
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index 3ed037325f..1fac3210df 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -32,14 +32,6 @@
 #include <e-util/e-util.h>
 #include <misc/e-gui-utils.h>
 
-#include <gtk/gtkentry.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkstock.h>
-
 #include <camel/camel-url.h>
 #include <camel/camel-store.h>
 #include <camel/camel-session.h>
diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h
index 7685a02c08..fa783bb892 100644
--- a/mail/em-folder-selector.h
+++ b/mail/em-folder-selector.h
@@ -23,7 +23,7 @@
 #ifndef EM_FOLDER_SELECTOR_H
 #define EM_FOLDER_SELECTOR_H
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 #ifdef cplusplus
 extern "C" {
diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h
index d4af60f883..fb35b2f13d 100644
--- a/mail/em-folder-tree-model.h
+++ b/mail/em-folder-tree-model.h
@@ -24,8 +24,7 @@
 #ifndef __EM_FOLDER_TREE_MODEL_H__
 #define __EM_FOLDER_TREE_MODEL_H__
 
-#include <gtk/gtktreednd.h>
-#include <gtk/gtktreestore.h>
+#include <gtk/gtk.h>
 
 #include <libxml/tree.h>
 
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 4e94103d44..332c3e8cce 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -36,8 +36,6 @@
 #include <libxml/tree.h>
 
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 
diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h
index 3fe3aa5f81..97ae8e8ce0 100644
--- a/mail/em-folder-tree.h
+++ b/mail/em-folder-tree.h
@@ -24,7 +24,7 @@
 #ifndef __EM_FOLDER_TREE_H__
 #define __EM_FOLDER_TREE_H__
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include <camel/camel-store.h>
 
 #include "mail/em-folder-tree-model.h"
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 99f089dba4..c2493d98be 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -27,12 +27,9 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <glib.h>
 #include <glib/gstdio.h>
-#include <libgnome/gnome-util.h>
-
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#include <libgnome/gnome-util.h>
 
 #ifdef G_OS_WIN32
 /* Work around 'DATADIR' and 'interface' lossage in <windows.h> */
diff --git a/mail/em-folder-view.h b/mail/em-folder-view.h
index e081eb586d..92a55344a7 100644
--- a/mail/em-folder-view.h
+++ b/mail/em-folder-view.h
@@ -23,8 +23,7 @@
 #ifndef EM_FOLDER_VIEW_H
 #define EM_FOLDER_VIEW_H
 
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkprintoperation.h>
+#include <gtk/gtk.h>
 #include "mail/em-popup.h"
 
 /* Standard GObject macros */
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index bd8bcc6c2d..3a04fcd4a8 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -26,7 +26,7 @@
 
 #include <string.h>
 
-#include <glib.h>
+#include <gtk/gtk.h>
 #include <glib/gstdio.h>
 #include <gdk/gdkkeysyms.h>
 
@@ -42,28 +42,6 @@
 #include <gtkhtml/gtkhtml-embedded.h>
 #include <gtkhtml/gtkhtml-search.h>
 
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtktoolbutton.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtksignal.h>
-
 #include <glade/glade.h>
 
 #include <glib/gi18n.h>
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index dc656d56f1..c43ca1aa46 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -1491,6 +1491,7 @@ efh_format_text_header (EMFormatHTML *emfh, CamelStream *stream, const char *lab
 {
 	const char *fmt, *html;
 	char *mhtml = NULL;
+	gboolean is_rtl;
 	
 	if (value == NULL)
 		return;
@@ -1503,7 +1504,7 @@ efh_format_text_header (EMFormatHTML *emfh, CamelStream *stream, const char *lab
 	else 
 		html = value;
 	
-	gboolean is_rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL;
+	is_rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL;
 	if (emfh->simple_headers) {
 		fmt = "<b>%s</b>: %s<br>";
 	} else {
diff --git a/mail/em-html-stream.c b/mail/em-html-stream.c
index 7b54dbe887..9c74504ea4 100644
--- a/mail/em-html-stream.c
+++ b/mail/em-html-stream.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <gtkhtml/gtkhtml.h>
 #include <gtkhtml/gtkhtml-stream.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include "em-html-stream.h"
 
 #define d(x)
diff --git a/mail/em-icon-stream.c b/mail/em-icon-stream.c
index 4f7a369d7e..7f7a1b240d 100644
--- a/mail/em-icon-stream.c
+++ b/mail/em-icon-stream.c
@@ -30,7 +30,7 @@
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk-pixbuf/gdk-pixbuf-loader.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
 #include "em-icon-stream.h"
 #include "e-util/e-icon-factory.h"
 
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c
index df680c9fc1..4ffe2874fd 100644
--- a/mail/em-mailer-prefs.c
+++ b/mail/em-mailer-prefs.c
@@ -35,25 +35,10 @@
 #include "misc/e-charset-picker.h"
 #include <bonobo/bonobo-generic-factory.h>
 
-#include <gtk/gtkcolorbutton.h>
-#include <gtk/gtkfilechooserbutton.h>
-#include <gtk/gtkfontbutton.h>
-
 #include <glade/glade.h>
 
 #include <gconf/gconf-client.h>
 
-#include <gtk/gtkentry.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkmenuitem.h>
-
 #include "libedataserverui/e-cell-renderer-color.h"
 
 #include "e-util/e-util-private.h"
diff --git a/mail/em-mailer-prefs.h b/mail/em-mailer-prefs.h
index e5c9a041df..6688f6f600 100644
--- a/mail/em-mailer-prefs.h
+++ b/mail/em-mailer-prefs.h
@@ -28,7 +28,7 @@ extern "C" {
 #pragma }
 #endif /* __cplusplus */
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include <shell/Evolution.h>
 
 struct _ESignature;
diff --git a/mail/em-menu.c b/mail/em-menu.c
index 77a93aba18..567f5876f3 100644
--- a/mail/em-menu.c
+++ b/mail/em-menu.c
@@ -27,16 +27,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <glib.h>
-
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
 
 #include <libgnome/gnome-url.h>
 
diff --git a/mail/em-message-browser.c b/mail/em-message-browser.c
index 0ef8105e4f..638de4b698 100644
--- a/mail/em-message-browser.c
+++ b/mail/em-message-browser.c
@@ -33,7 +33,6 @@
 #undef interface
 #endif
 
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <gconf/gconf-client.h>
diff --git a/mail/em-message-browser.h b/mail/em-message-browser.h
index 09e34e2cb6..47d2fa38b9 100644
--- a/mail/em-message-browser.h
+++ b/mail/em-message-browser.h
@@ -2,7 +2,7 @@
 #ifndef EM_MESSAGE_BROWSER_H
 #define EM_MESSAGE_BROWSER_H
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "em-folder-view.h"
 
 /* Standard GObject macros */
diff --git a/mail/em-network-prefs.c b/mail/em-network-prefs.c
index 29c79e618b..d6496eafdc 100644
--- a/mail/em-network-prefs.c
+++ b/mail/em-network-prefs.c
@@ -38,13 +38,6 @@
 #include <gconf/gconf-client.h>
 #include <glade/glade.h>
 
-#include <gtk/gtkentry.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtklabel.h>
-
-#include <gtk/gtkfilechooserbutton.h>
 #include <glib/gstdio.h>
 
 #include "e-util/e-error.h"
diff --git a/mail/em-network-prefs.h b/mail/em-network-prefs.h
index 45627cdce0..10266c3f1c 100644
--- a/mail/em-network-prefs.h
+++ b/mail/em-network-prefs.h
@@ -29,8 +29,7 @@ extern "C" {
 #pragma }
 #endif /* __cplusplus */
 
-#include <glib.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 #define EM_NETWORK_PREFS_TYPE        (em_network_prefs_get_type ())
 #define EM_NETWORK_PREFS(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), EM_NETWORK_PREFS_TYPE, EMNetworkPrefs))
diff --git a/mail/em-popup.c b/mail/em-popup.c
index 00c9bcbd1e..531e7421c7 100644
--- a/mail/em-popup.c
+++ b/mail/em-popup.c
@@ -27,20 +27,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <glib.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <gio/gio.h>
-
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
-
 #include <libgnome/gnome-url.h>
 
 #include "em-popup.h"
diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c
index 014c43c3f4..8dea1a0a76 100644
--- a/mail/em-subscribe-editor.c
+++ b/mail/em-subscribe-editor.c
@@ -47,19 +47,6 @@
 #include <glade/glade.h>
 #include <glib/gi18n.h>
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreestore.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkprogressbar.h>
-#include <gtk/gtkmenuitem.h>
-
 #define d(x)
 
 typedef struct _EMSubscribeEditor EMSubscribeEditor;
diff --git a/mail/em-subscribe-editor.h b/mail/em-subscribe-editor.h
index ca02f14bee..c6989af84b 100644
--- a/mail/em-subscribe-editor.h
+++ b/mail/em-subscribe-editor.h
@@ -2,7 +2,7 @@
 #ifndef _EM_SUBSCRIBE_EDITOR_H
 #define _EM_SUBSCRIBE_EDITOR_H
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 GtkDialog *em_subscribe_editor_new(void);
 
diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c
index b65ffe420f..6a308df7fa 100644
--- a/mail/importers/elm-importer.c
+++ b/mail/importers/elm-importer.c
@@ -33,10 +33,8 @@
 #include <dirent.h>
 #include <string.h>
 
-#include <glib.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkcheckbutton.h>
 
 #include <gconf/gconf-client.h>
 
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index 1ad64b91e3..7066473a48 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -35,10 +35,7 @@
 #include <ctype.h>
 #include <string.h>
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
-
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index afc7f7fb1c..3a9caabb7c 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -35,10 +35,8 @@
 #include <dirent.h>
 #include <string.h>
 
-#include <glib.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkcheckbutton.h>
 
 #include <gconf/gconf-client.h>
 
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 850efe70e7..cf06fd0f56 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -74,7 +74,7 @@
 
 #include "e-task-bar.h"
 
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 
 #include <e-util/e-mktemp.h>
 #include <Evolution.h>
diff --git a/mail/mail-config.c b/mail/mail-config.c
index ec89953c05..ec2e491519 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -35,14 +35,13 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <glib.h>
+#include <gtk/gtk.h>
 #include <glib/gstdio.h>
 
 #ifndef G_OS_WIN32
 #include <sys/wait.h>
 #endif
 
-#include <gtk/gtkdialog.h>
 #include <gtkhtml/gtkhtml.h>
 #include <glade/glade.h>
 
@@ -256,9 +255,11 @@ gconf_jh_check_changed (GConfClient *client, guint cnxn_id,
 	if (!config->jh_check) {
 		mail_session_set_junk_headers (NULL, NULL, 0);
 	} else {
-		config->jh_header = gconf_client_get_list (config->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL);
-		GSList *node = config->jh_header;
+		GSList *node;
 		GPtrArray *name, *value;
+
+		config->jh_header = gconf_client_get_list (config->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL);
+		node = config->jh_header;
 		name = g_ptr_array_new ();
 		value = g_ptr_array_new ();
 		while (node && node->data) {
@@ -278,9 +279,11 @@ static void
 gconf_jh_headers_changed (GConfClient *client, guint cnxn_id,
                           GConfEntry *entry, gpointer user_data)
 {
-	config->jh_header = gconf_client_get_list (config->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL);
-	GSList *node = config->jh_header;
+	GSList *node;
 	GPtrArray *name, *value;
+
+	config->jh_header = gconf_client_get_list (config->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL);
+	node = config->jh_header;
 	name = g_ptr_array_new ();
 	value = g_ptr_array_new ();
 	while (node && node->data) {
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 19486dce3f..5563f30dec 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -27,19 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
-/* for the dialog stuff */
-#include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkprogressbar.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktable.h>
 
 #include "libedataserver/e-account-list.h"
 
diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h
index 77ba3dc65c..3a12da4daf 100644
--- a/mail/mail-send-recv.h
+++ b/mail/mail-send-recv.h
@@ -23,13 +23,14 @@
 #ifndef MAIL_SEND_RECV_H
 #define MAIL_SEND_RECV_H
 
+#include <gtk/gtk.h>
+#include "mail-config.h"
+
 #ifdef __cplusplus
 extern "C" {
 #pragma }
 #endif /* __cplusplus */
 
-#include "mail-config.h"
-
 /* send/receive all uri's */
 GtkWidget *mail_send_receive(void);
 /* receive a single uri */
diff --git a/mail/message-list.c b/mail/message-list.c
index 9e5d099202..12bf98f459 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -31,15 +31,11 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <glib.h>
+#include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
 #include <gconf/gconf-client.h>
 
-#include <gtk/gtk.h>
-
-#include <glib/gi18n.h>
-
 #include <camel/camel-exception.h>
 #include <camel/camel-file-utils.h>
 #include <camel/camel-folder.h>
diff --git a/mail/message-list.h b/mail/message-list.h
index db45b36787..61f3264d41 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -24,8 +24,7 @@
 #ifndef _MESSAGE_LIST_H_
 #define _MESSAGE_LIST_H_
 
-#include <gtk/gtkobject.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include <table/e-table-simple.h>
 #include <table/e-tree-scrolled.h>
diff --git a/mail/message-tag-editor.c b/mail/message-tag-editor.c
index d398b7b8d2..e28591faf2 100644
--- a/mail/message-tag-editor.c
+++ b/mail/message-tag-editor.c
@@ -25,8 +25,6 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtkstock.h>
-
 #include "message-tag-editor.h"
 
 static void message_tag_editor_class_init (MessageTagEditorClass *class);
diff --git a/mail/message-tag-editor.h b/mail/message-tag-editor.h
index 8ae3b1926b..408c6df9da 100644
--- a/mail/message-tag-editor.h
+++ b/mail/message-tag-editor.h
@@ -24,8 +24,7 @@
 #ifndef __MESSAGE_TAG_EDITOR_H__
 #define __MESSAGE_TAG_EDITOR_H__
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include <camel/camel-folder.h>
 #include <camel/camel-folder-summary.h>
 
diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c
index f321df2bf7..d65008b6de 100644
--- a/mail/message-tag-followup.c
+++ b/mail/message-tag-followup.c
@@ -26,16 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtkcombo.h>
-#include <gtk/gtklist.h>
-
-#include <gtk/gtkentry.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderertext.h>
-
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 
 #include <gconf/gconf.h>