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

45 files changed, 37 insertions, 235 deletions

diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c
index 6394eb986a..cf653148d2 100644
--- a/plugins/audio-inline/audio-inline.c
+++ b/plugins/audio-inline/audio-inline.c
@@ -10,6 +10,8 @@
 #include "config.h"
 #endif
 
+#include <gtk/gtk.h>
+#include <glib/gstdio.h>
 #include "e-util/e-icon-factory.h"
 #include "e-util/e-mktemp.h"
 #include "camel/camel-medium.h"
@@ -18,11 +20,6 @@
 #include "camel/camel-stream-fs.h"
 #include "mail/em-format-hook.h"
 #include "mail/em-format-html.h"
-#include "glib/gstdio.h"
-#include "gtk/gtkbutton.h"
-#include "gtk/gtkbox.h"
-#include "gtk/gtkimage.h"
-#include "gtk/gtkhbbox.h"
 #include "gtkhtml/gtkhtml-embedded.h"
 #include "gst/gst.h"
 
diff --git a/plugins/calendar-file/calendar-file.c b/plugins/calendar-file/calendar-file.c
index 38add141c0..8d2e262eae 100644
--- a/plugins/calendar-file/calendar-file.c
+++ b/plugins/calendar-file/calendar-file.c
@@ -19,14 +19,7 @@
  *
  */
 
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 #include <e-util/e-config.h>
 #include <calendar/gui/e-cal-config.h>
 #include <libedataserver/e-source.h>
diff --git a/plugins/calendar-http/calendar-http.c b/plugins/calendar-http/calendar-http.c
index b2caa62e4f..21a100e093 100644
--- a/plugins/calendar-http/calendar-http.c
+++ b/plugins/calendar-http/calendar-http.c
@@ -19,16 +19,7 @@
  *
  */
 
-#include <glib-object.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkcheckbutton.h>
+#include <gtk/gtk.h>
 #include <e-util/e-config.h>
 #include <calendar/gui/e-cal-config.h>
 #include <libedataserver/e-source.h>
diff --git a/plugins/copy-tool/copy-tool.c b/plugins/copy-tool/copy-tool.c
index d241f6c5ae..e61c0800aa 100644
--- a/plugins/copy-tool/copy-tool.c
+++ b/plugins/copy-tool/copy-tool.c
@@ -16,7 +16,7 @@
 
 #include "mail/em-popup.h"
 
-#include <gtk/gtkclipboard.h>
+#include <gtk/gtk.h>
 
 #include "camel/camel-internet-address.h"
 #include "camel/camel-url.h"
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index cdd4a14a69..5dbf214f48 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -23,10 +23,6 @@
 #endif
 
 #include <string.h>
-#include <glib.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtktable.h>
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
 #include <e-util/e-error.h>
@@ -268,10 +264,12 @@ epech_load_from_gconf (GConfClient *client,const char *path,CustomHeaderOptionsD
 	header_list = gconf_client_get_list (client,path,GCONF_VALUE_STRING, NULL);
 
 	for (q = header_list,pos = 0; q != NULL; q = q->next,pos++) {
+		gchar **parse_header_list;
+
 		memset(&temp_header_value_details,0,sizeof(CustomSubHeader));
 		temp_header_details.sub_header_type_value = g_array_new (TRUE, TRUE, sizeof (CustomSubHeader));
 		buffer = q->data;
-		gchar **parse_header_list = g_strsplit_set (buffer, "=;,", -1);
+		parse_header_list = g_strsplit_set (buffer, "=;,", -1);
 		str_colon = g_strconcat (parse_header_list[0], ":", NULL);
 		temp_header_details.header_type_value = g_string_new("");
 		if (temp_header_details.header_type_value) {
diff --git a/plugins/email-custom-header/email-custom-header.h b/plugins/email-custom-header/email-custom-header.h
index b32d598054..98b67495a6 100644
--- a/plugins/email-custom-header/email-custom-header.h
+++ b/plugins/email-custom-header/email-custom-header.h
@@ -20,7 +20,7 @@
 #ifndef __EMAIL_CUSTOM_HEADEROPTIONS_DIALOG_H__
 #define __EMAIL_CUSTOM_HEADEROPTIONS_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #define EMAIL_CUSTOM_HEADER_OPTIONS_DIALOG       (epech_dialog_get_type ())
 #define EMAIL_CUSTOM_HEADEROPTIONS_DIALOG(obj)       (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMAIL_CUSTOM_HEADER_OPTIONS_DIALOG, CustomHeaderOptionsDialog))
diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c
index 8df2bbbd2f..db60ffcc3d 100644
--- a/plugins/exchange-operations/exchange-account-setup.c
+++ b/plugins/exchange-operations/exchange-account-setup.c
@@ -28,10 +28,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/stat.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <glade/glade.h>
-#include <gtk/gtk.h>
-#include <gtk/gtkdialog.h>
 #include <gconf/gconf-client.h>
 #include <camel/camel-provider.h>
 #include <camel/camel-url.h>
diff --git a/plugins/exchange-operations/exchange-change-password.c b/plugins/exchange-operations/exchange-change-password.c
index 9ccf0617e3..69ca5351cf 100644
--- a/plugins/exchange-operations/exchange-change-password.c
+++ b/plugins/exchange-operations/exchange-change-password.c
@@ -29,9 +29,7 @@
 #include <e2k-utils.h>
 
 #include <glade/glade-xml.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 
 #define FILENAME EVOLUTION_GLADEDIR "/exchange-change-password.glade"
 #define ROOTNODE "pass_dialog"
diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c
index ef82d388ab..a719059a5e 100644
--- a/plugins/exchange-operations/exchange-delegates-user.c
+++ b/plugins/exchange-operations/exchange-delegates-user.c
@@ -43,17 +43,6 @@
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-dialog-widgets.h>
 #include <glade/glade.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkmenushell.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktogglebutton.h>
-
-#include <gtk/gtkoptionmenu.h>
-
-#include <glib.h>
 
 #include <string.h>
 
diff --git a/plugins/exchange-operations/exchange-delegates-user.h b/plugins/exchange-operations/exchange-delegates-user.h
index 9a705f0d9d..02ae3dce26 100644
--- a/plugins/exchange-operations/exchange-delegates-user.h
+++ b/plugins/exchange-operations/exchange-delegates-user.h
@@ -6,7 +6,7 @@
 
 #include <exchange-types.h>
 #include <e2k-security-descriptor.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c
index 46088b9ba8..4ec12c35a7 100644
--- a/plugins/exchange-operations/exchange-delegates.c
+++ b/plugins/exchange-operations/exchange-delegates.c
@@ -43,12 +43,6 @@
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-error.h>
 #include <glade/glade-xml.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
 
 typedef struct {
 	const char *uri;
diff --git a/plugins/exchange-operations/exchange-delegates.h b/plugins/exchange-operations/exchange-delegates.h
index 3e87e06b38..facccd8e98 100644
--- a/plugins/exchange-operations/exchange-delegates.h
+++ b/plugins/exchange-operations/exchange-delegates.h
@@ -5,7 +5,7 @@
 #define __EXCHANGE_DELEGATES_H__
 
 #include <exchange-types.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/exchange-operations/exchange-folder-permission.c b/plugins/exchange-operations/exchange-folder-permission.c
index a770044a12..c6e3ff9b99 100644
--- a/plugins/exchange-operations/exchange-folder-permission.c
+++ b/plugins/exchange-operations/exchange-folder-permission.c
@@ -25,7 +25,6 @@
 #include <glib/gi18n.h>
 #include <glade/glade.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkdialog.h>
 #include <gconf/gconf-client.h>
 #include <exchange-account.h>
 #include <e-util/e-dialog-utils.h>
diff --git a/plugins/exchange-operations/exchange-folder-size-display.c b/plugins/exchange-operations/exchange-folder-size-display.c
index 594ce34c0c..1cd6924176 100644
--- a/plugins/exchange-operations/exchange-folder-size-display.c
+++ b/plugins/exchange-operations/exchange-folder-size-display.c
@@ -28,11 +28,6 @@
 #include <glib/gi18n.h>
 #include <e-util/e-dialog-utils.h>
 #include <glade/glade-xml.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
 #include "exchange-folder-size-display.h"
 
 enum {
diff --git a/plugins/exchange-operations/exchange-folder-size-display.h b/plugins/exchange-operations/exchange-folder-size-display.h
index 2f109277c6..46b5ffe0c5 100644
--- a/plugins/exchange-operations/exchange-folder-size-display.h
+++ b/plugins/exchange-operations/exchange-folder-size-display.h
@@ -4,8 +4,7 @@
 #ifndef __EXCHANGE_FOLDER_SIZE_DISPLAY_H__
 #define __EXCHANGE_FOLDER_SIZE_DISPLAY_H__
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c
index e7a877c103..5ea6e0b619 100644
--- a/plugins/exchange-operations/exchange-folder.c
+++ b/plugins/exchange-operations/exchange-folder.c
@@ -25,7 +25,6 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkdialog.h>
 #include <gconf/gconf-client.h>
 #include <e-folder-exchange.h>
 #include <exchange-hierarchy.h>
diff --git a/plugins/exchange-operations/exchange-permissions-dialog.c b/plugins/exchange-operations/exchange-permissions-dialog.c
index 179cc3d62a..9b4ed097e8 100644
--- a/plugins/exchange-operations/exchange-permissions-dialog.c
+++ b/plugins/exchange-operations/exchange-permissions-dialog.c
@@ -40,16 +40,6 @@
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-error.h>
 #include <glade/glade-xml.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkmenushell.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtk.h>
 
 struct _ExchangePermissionsDialogPrivate {
 	ExchangeAccount *account;
diff --git a/plugins/exchange-operations/exchange-permissions-dialog.h b/plugins/exchange-operations/exchange-permissions-dialog.h
index 11598a5e62..e08d80bb49 100644
--- a/plugins/exchange-operations/exchange-permissions-dialog.h
+++ b/plugins/exchange-operations/exchange-permissions-dialog.h
@@ -4,7 +4,7 @@
 #ifndef __EXCHANGE_PERMISSIONS_DIALOG_H__
 #define __EXCHANGE_PERMISSIONS_DIALOG_H__
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include "e-folder.h"
 #include "exchange-types.h"
 
diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c
index a48fd72c77..f433a45438 100644
--- a/plugins/exchange-operations/exchange-send-options.c
+++ b/plugins/exchange-operations/exchange-send-options.c
@@ -23,14 +23,10 @@
 #endif
 
 #include <string.h>
-#include <glib.h>
 #include <libedataserverui/e-name-selector.h>
 #include <libedataserverui/e-contact-store.h>
 #include "exchange-operations.h"
 #include <e-util/e-error.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtk.h>
 #include <libgnome/libgnome.h>
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
diff --git a/plugins/exchange-operations/exchange-send-options.h b/plugins/exchange-operations/exchange-send-options.h
index f759d0f722..13e10e0f58 100644
--- a/plugins/exchange-operations/exchange-send-options.h
+++ b/plugins/exchange-operations/exchange-send-options.h
@@ -20,7 +20,6 @@
 #ifndef __EXCHANGE_SENDOPTIONS_DIALOG_H__
 #define __EXCHANGE_SENDOPTIONS_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
 #include <gtk/gtk.h>
 
 
diff --git a/plugins/exchange-operations/exchange-user-dialog.c b/plugins/exchange-operations/exchange-user-dialog.c
index bd5da39a70..48c9170736 100644
--- a/plugins/exchange-operations/exchange-user-dialog.c
+++ b/plugins/exchange-operations/exchange-user-dialog.c
@@ -28,11 +28,6 @@
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-widget.h>
 #include <e-util/e-dialog-utils.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkvbox.h>
 #include <libedataserverui/e-name-selector.h>
 #include "e2k-xml-utils.h"
 
diff --git a/plugins/exchange-operations/exchange-user-dialog.h b/plugins/exchange-operations/exchange-user-dialog.h
index cd8059b00f..2c68e90378 100644
--- a/plugins/exchange-operations/exchange-user-dialog.h
+++ b/plugins/exchange-operations/exchange-user-dialog.h
@@ -4,7 +4,7 @@
 #ifndef __E2K_USER_DIALOG_H__
 #define __E2K_USER_DIALOG_H__
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 #define E2K_TYPE_USER_DIALOG		(e2k_user_dialog_get_type ())
 #define E2K_USER_DIALOG(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), E2K_TYPE_USER_DIALOG, E2kUserDialog))
diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c
index aaa06d3c73..698b39ffb9 100644
--- a/plugins/external-editor/external-editor.c
+++ b/plugins/external-editor/external-editor.c
@@ -201,8 +201,6 @@ show_composer_dialog (EMsgComposer *composer)
 
 void org_gnome_external_editor (EPlugin *ep, EMMenuTargetSelect *select)
 {
-	d(printf ("\n\nexternal_editor plugin is launched \n\n"));
-
 	/* The template to be used in the external editor */
 
 	/* README: I have not marked this for translation. 
@@ -212,6 +210,11 @@ void org_gnome_external_editor (EPlugin *ep, EMMenuTargetSelect *select)
 
 	gint fd;
 	char *filename = NULL;
+	char *editor = NULL;
+	GConfClient *gconf;
+	GArray *array;
+
+	d(printf ("\n\nexternal_editor plugin is launched \n\n"));
 
 	fd = g_file_open_tmp (NULL, &filename, NULL);
 	if (fd > 0) {
@@ -225,9 +228,6 @@ void org_gnome_external_editor (EPlugin *ep, EMMenuTargetSelect *select)
 		return ;
 	}
 
-	char *editor = NULL;
-	GConfClient *gconf;
-
 	gconf = gconf_client_get_default ();
 	editor = gconf_client_get_string (gconf, EDITOR_GCONF_KEY, NULL);
 	if (!editor) {
@@ -240,7 +240,6 @@ void org_gnome_external_editor (EPlugin *ep, EMMenuTargetSelect *select)
 	}
 	g_object_unref (gconf);
 
-	GArray *array;
 	array = g_array_sized_new (TRUE, TRUE, sizeof (gpointer), 2 * sizeof(gpointer));
 	array = g_array_append_val (array, editor);
 	array = g_array_append_val (array, filename);
diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c
index fb4019c3ef..f338e2d91d 100644
--- a/plugins/google-account-setup/google-source.c
+++ b/plugins/google-account-setup/google-source.c
@@ -304,6 +304,7 @@ plugin_google  (EPlugin                    *epl,
 	GtkWidget    *widget;
 	GtkWidget    *luser;
 	GtkWidget    *user;
+	GtkWidget    *label;
 	char         *uri;
 	char         *username;
 	const char   *ssl_prop;
@@ -372,7 +373,7 @@ plugin_google  (EPlugin                    *epl,
 
 	gtk_label_set_mnemonic_widget (GTK_LABEL (luser), user);
 
-	GtkWidget *label = gtk_label_new_with_mnemonic (_("Re_fresh:"));
+	label = gtk_label_new_with_mnemonic (_("Re_fresh:"));
 	gtk_widget_show (label);
 	gtk_misc_set_alignment (GTK_MISC(label), 0.0, 0.5);
 	gtk_table_attach (GTK_TABLE (parent),
diff --git a/plugins/groupwise-features/addressbook-groupwise.c b/plugins/groupwise-features/addressbook-groupwise.c
index 002eeaa0d4..9e76401a61 100644
--- a/plugins/groupwise-features/addressbook-groupwise.c
+++ b/plugins/groupwise-features/addressbook-groupwise.c
@@ -18,14 +18,7 @@
  *
  */
 
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 #include <e-util/e-config.h>
 #include <addressbook/gui/widgets/eab-config.h>
 #include <libedataserver/e-source.h>
diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c
index 87ce3774d5..ef81dffe85 100644
--- a/plugins/groupwise-features/junk-settings.c
+++ b/plugins/groupwise-features/junk-settings.c
@@ -24,17 +24,7 @@
 #endif
 #include <glade/glade.h>
 #include "junk-settings.h"
-#include <glib/gmain.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkbutton.h>
 #include <gtk/gtk.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrenderertext.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <libgnome/gnome-init.h>
 #include <glib/gi18n.h>
diff --git a/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h
index 59204e1f14..f41d8c8fe0 100644
--- a/plugins/groupwise-features/junk-settings.h
+++ b/plugins/groupwise-features/junk-settings.h
@@ -28,8 +28,6 @@ extern "C" {
 #pragma }
 #endif /* __cplusplus */
 
-#include <glib.h>
-#include <gtk/gtkvbox.h>
 #include <gtk/gtk.h>
 #include <camel/camel-store.h>
 #include <e-gw-connection.h>
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index 6259336728..9a9c7a39da 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -27,21 +27,9 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
 #include <string.h>
 #include <glib/gi18n.h>
 #include <glade/glade.h>
-#include <glib/gmain.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtk.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrenderertext.h>
 
 #include <libedataserverui/e-passwords.h>
 #include <mail/mail-component.h>
diff --git a/plugins/groupwise-features/proxy-login.h b/plugins/groupwise-features/proxy-login.h
index 3d329a9edc..2fc63bcd04 100644
--- a/plugins/groupwise-features/proxy-login.h
+++ b/plugins/groupwise-features/proxy-login.h
@@ -19,7 +19,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <gtk/gtkwidget.h>
 #include <gtk/gtk.h>
 
 #define TYPE_PROXY_LOGIN       (proxy_login_get_type ())
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 7ad11da2e3..f36155c354 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -28,18 +28,6 @@
 #include <stdlib.h>
 #include <glib/gi18n.h>
 #include <glade/glade.h>
-#include <glib/gmain.h>
-
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtk.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrenderertext.h>
 
 #include <libedataserverui/e-contact-store.h>
 
diff --git a/plugins/groupwise-features/proxy.h b/plugins/groupwise-features/proxy.h
index 0f49760a16..9c1d8b0d3c 100644
--- a/plugins/groupwise-features/proxy.h
+++ b/plugins/groupwise-features/proxy.h
@@ -21,7 +21,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <gtk/gtkwidget.h>
 #include <libedataserver/e-account.h>
 #include <gtk/gtk.h>
 
diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c
index 93ae7c8909..7bca14eba6 100644
--- a/plugins/groupwise-features/share-folder.c
+++ b/plugins/groupwise-features/share-folder.c
@@ -24,18 +24,7 @@
 #endif
 #include <glade/glade.h>
 #include "share-folder.h"
-#include <glib/gmain.h>
 #include <glib/gi18n-lib.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtk.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrenderertext.h>
 #include <libedataserverui/e-contact-store.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <libgnome/gnome-init.h>
diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h
index 76516ac778..a5c1c2de5a 100644
--- a/plugins/groupwise-features/share-folder.h
+++ b/plugins/groupwise-features/share-folder.h
@@ -28,8 +28,6 @@ extern "C" {
 #pragma }
 #endif /* __cplusplus */
 
-#include <glib.h>
-#include <gtk/gtkvbox.h>
 #include <gtk/gtk.h>
 #include <camel/camel-store.h>
 #include <e-gw-connection.h>
diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c
index 4f6fbf77d8..b438579e7d 100644
--- a/plugins/imap-features/imap-headers.c
+++ b/plugins/imap-features/imap-headers.c
@@ -29,8 +29,6 @@
 #include <mail/em-config.h>
 #include <mail/mail-config.h>
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtktreemodel.h>
 #include <gtk/gtk.h>
 
 #include <libedataserver/e-account.h>
diff --git a/plugins/ipod-sync/ical-format.c b/plugins/ipod-sync/ical-format.c
index 3c47a6555d..594edfc811 100644
--- a/plugins/ipod-sync/ical-format.c
+++ b/plugins/ipod-sync/ical-format.c
@@ -23,13 +23,8 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkstock.h>
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <libedataserver/e-source.h>
 #include <libedataserverui/e-source-selector.h>
 #include <libecal/e-cal.h>
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index dde61923ac..85db1d424c 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -25,8 +25,6 @@
 #endif
 
 #include <string.h>
-#include <glib.h>
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
 #include <camel/camel-stream.h>
diff --git a/plugins/itip-formatter/itip-view.h b/plugins/itip-formatter/itip-view.h
index 2e9f119642..22216d1283 100644
--- a/plugins/itip-formatter/itip-view.h
+++ b/plugins/itip-formatter/itip-view.h
@@ -25,8 +25,7 @@
 
 #include <stdarg.h>
 #include <unistd.h>
-#include <glib-object.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 #include <libedataserver/e-source-list.h>
 #include <libecal/e-cal.h>
 
diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c
index fc98ee7bc7..60dc3de3e6 100644
--- a/plugins/mailing-list-actions/mailing-list-actions.c
+++ b/plugins/mailing-list-actions/mailing-list-actions.c
@@ -11,15 +11,8 @@
 #include <glib/gi18n-lib.h>
 #include <stdio.h>
 #include <string.h>
+#include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkdialog.h>
 #include <libgnome/gnome-url.h>
 
 #include "camel/camel-multipart.h"
diff --git a/plugins/plugin-manager/plugin-manager.c b/plugins/plugin-manager/plugin-manager.c
index d423cf82ed..61db73cd1b 100644
--- a/plugins/plugin-manager/plugin-manager.c
+++ b/plugins/plugin-manager/plugin-manager.c
@@ -10,26 +10,11 @@
 #include "config.h"
 #endif
 
+#include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 #include <string.h>
 #include <stdio.h>
 
-#include <gtk/gtklabel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreesortable.h>
-#include <gtk/gtktreemodelsort.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtknotebook.h>
-
 #include "e-util/e-plugin.h"
 #include "shell/es-menu.h"
 
diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c
index 0365c297e8..ba70c4288f 100644
--- a/plugins/prefer-plain/prefer-plain.c
+++ b/plugins/prefer-plain/prefer-plain.c
@@ -7,6 +7,7 @@
 #include "config.h"
 #endif
 
+#include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 #include <string.h>
 #include <stdio.h>
@@ -17,12 +18,6 @@
 #include "mail/em-format.h"
 
 #include <gconf/gconf-client.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
 #include "mail/em-config.h"
 
 void org_gnome_prefer_plain_multipart_alternative(void *ep, EMFormatHookTarget *t);
diff --git a/plugins/save-attachments/save-attachments.c b/plugins/save-attachments/save-attachments.c
index c1d8646c2a..8e9fe41e84 100644
--- a/plugins/save-attachments/save-attachments.c
+++ b/plugins/save-attachments/save-attachments.c
@@ -28,26 +28,10 @@
 #include <string.h>
 #include <stdio.h>
 
-#include <glib.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtktreestore.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkfilechooserbutton.h>
-
 #include <camel/camel-folder.h>
 #include <camel/camel-exception.h>
 #include <camel/camel-mime-message.h>
diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c
index 5fae1846fd..595fb151a3 100644
--- a/plugins/save-calendar/csv-format.c
+++ b/plugins/save-calendar/csv-format.c
@@ -22,13 +22,9 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkstock.h>
+
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <libedataserver/e-source.h>
 #include <libecal/e-cal-time-util.h>
 #include <libedataserver/e-data-server-util.h>
diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c
index b871657280..0c89e647ff 100644
--- a/plugins/save-calendar/ical-format.c
+++ b/plugins/save-calendar/ical-format.c
@@ -23,13 +23,9 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkstock.h>
+
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <libedataserver/e-source.h>
 #include <libedataserverui/e-source-selector.h>
 #include <libecal/e-cal.h>
diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c
index 58b81459a0..94d08f392b 100644
--- a/plugins/save-calendar/rdf-format.c
+++ b/plugins/save-calendar/rdf-format.c
@@ -22,13 +22,9 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkstock.h>
+
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <libedataserver/e-source.h>
 #include <libedataserverui/e-source-selector.h>
 #include <libecal/e-cal.h>
diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c
index 0ed4030b8b..61579224b9 100644
--- a/plugins/save-calendar/save-calendar.c
+++ b/plugins/save-calendar/save-calendar.c
@@ -26,14 +26,8 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkstock.h>
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 #include <libedataserver/e-source.h>
 #include <libedataserverui/e-source-selector.h>
 #include <libecal/e-cal.h>