6 files changed, 24 insertions, 83 deletions
diff --git a/mail/mail-config.c b/mail/mail-config.c
index be2125bcc0..4914f26135 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -14,10 +14,12 @@
  *
  *
  * Authors:
- *		Jeffrey Stedfast <fejj@ximian.com>
- *      Radek Doulik <rodo@ximian.com>
+ *   Jeffrey Stedfast <fejj@ximian.com>
+ *   Radek Doulik <rodo@ximian.com>
+ *   Jonathon Jongsma <jonathon.jongsma@collabora.co.uk>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ * Copyright (C) 2009 Intel Corporation
  *
  */
 
@@ -25,43 +27,19 @@
 #include <config.h>
 #endif
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <errno.h>
-
-#include <string.h>
-#include <ctype.h>
-
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>
-#include <glib/gi18n-lib.h>
-
-#include <gtkhtml/gtkhtml.h>
-
-#include <libxml/tree.h>
-#include <libxml/parser.h>
 
 #include <libedataserver/e-data-server-util.h>
 #include <e-util/e-util.h>
-#include <misc/e-gui-utils.h>
 #include "e-util/e-account-utils.h"
 #include "e-util/e-signature-utils.h"
 
-#include <camel/camel-service.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-mime-filter-charset.h>
-#include <camel/camel-stream-filter.h>
-
-#include <libedataserverui/e-passwords.h>
+#include <gconf/gconf-client.h>
 
 #include "e-mail-local.h"
 #include "mail-config.h"
 #include "mail-folder-cache.h"
-#include "mail-mt.h"
 #include "mail-session.h"
 #include "mail-tools.h"
 
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 93120359c8..3695800bc7 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -23,24 +23,17 @@
 #include <errno.h>
 
 #include <glib.h>
-
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
 
-#include <libedataserver/e-data-server-util.h>
 #include <libedataserver/e-flag.h>
 
-#include <camel/camel-url.h>
+#include <camel/camel-object.h>
 #include <camel/camel-operation.h>
 
 #include "shell/e-shell.h"
-#include "misc/e-gui-utils.h"
 #include "e-util/e-alert-activity.h"
 #include "e-util/e-alert-dialog.h"
-#include "e-util/e-icon-factory.h"
 
-#include "mail-config.h"
-#include "mail-session.h"
 #include "mail-mt.h"
 
 /*#define MALLOC_CHECK*/
diff --git a/mail/mail-mt.h b/mail/mail-mt.h
index 7497c377eb..e9d552a41c 100644
--- a/mail/mail-mt.h
+++ b/mail/mail-mt.h
@@ -24,7 +24,6 @@
 #define _MAIL_MT
 
 #include "camel/camel-exception.h"
-#include "camel/camel-object.h"
 #include "camel/camel-operation.h"
 
 typedef struct _MailMsg MailMsg;
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index e07fe19a67..73ad926390 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -16,8 +16,8 @@
  *
  *
  * Authors:
- *		Dan Winship <danw@ximian.com>
- *	Jeffrey Stedfast <fejj@ximian.com>
+ *      Dan Winship <danw@ximian.com>
+ *      Jeffrey Stedfast <fejj@ximian.com>
  *      Peter Williams <peterw@ximian.com>
  *      Michael Zucchi <notzed@ximian.com>
  *
@@ -27,47 +27,32 @@
 
 #include <config.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
 #include <errno.h>
 
 #include <glib.h>
 #include <glib/gstdio.h>
-
 #include <glib/gi18n.h>
 
+#include <camel/camel-disco-folder.h>
+#include <camel/camel-disco-store.h>
 #include <camel/camel-mime-filter-from.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-stream-vfs.h>
-#include <camel/camel-mime-filter-charset.h>
 #include <camel/camel-offline-folder.h>
 #include <camel/camel-offline-store.h>
-#include <camel/camel-disco-folder.h>
-#include <camel/camel-disco-store.h>
-#include <camel/camel-operation.h>
-#include <camel/camel-vtrash-folder.h>
-#include <camel/camel-vee-store.h>
+#include <camel/camel-stream-filter.h>
+#include <camel/camel-stream-vfs.h>
 #include <camel/camel-transport.h>
-#include <camel/camel-multipart.h>
-
-#include "composer/e-msg-composer.h"
+#include <camel/camel-vee-folder.h>
+#include <camel/camel-vee-store.h>
 
 #include <libedataserver/e-data-server-util.h>
-#include "e-util/e-util.h"
 #include "e-util/e-account-utils.h"
-#include "e-util/e-util-private.h"
 
 #include "em-filter-rule.h"
 #include "em-utils.h"
-#include "mail-config.h"
 #include "mail-mt.h"
 #include "mail-ops.h"
 #include "mail-session.h"
 #include "mail-tools.h"
-#include "mail-vfolder.h"
 
 #include "e-mail-local.h"
 
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index be806ef260..1f2ee35a84 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -31,26 +31,25 @@
 
 #include "libedataserver/e-account-list.h"
 
-#include "em-filter-rule.h"
 #include "camel/camel-filter-driver.h"
 #include "camel/camel-folder.h"
 #include "camel/camel-operation.h"
 #include "camel/camel-store.h"
 
-#include "mail-mt.h"
-#include "mail-config.h"
-#include "mail-session.h"
-#include "mail-tools.h"
-#include "mail-ops.h"
-#include "mail-send-recv.h"
-#include "mail-folder-cache.h"
-#include "em-event.h"
-
 #include "shell/e-shell.h"
 #include "e-util/e-account-utils.h"
 #include "e-util/gconf-bridge.h"
 
 #include "e-mail-local.h"
+#include "em-event.h"
+#include "em-filter-rule.h"
+#include "mail-config.h"
+#include "mail-folder-cache.h"
+#include "mail-mt.h"
+#include "mail-ops.h"
+#include "mail-send-recv.h"
+#include "mail-session.h"
+#include "mail-tools.h"
 
 #define d(x)
 
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index 53bf2be0c6..8259abd6c9 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -34,29 +34,16 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
-
 #include <glib/gi18n.h>
 
-#include <camel/camel-file-utils.h>
+#include <camel/camel-store.h>
 #include <camel/camel-mime-message.h>
 #include <camel/camel-movemail.h>
-#include <camel/camel-vee-folder.h>
-
-#include "filter/e-filter-option.h"
-#include "filter/e-filter-input.h"
 
-#include <libedataserver/e-data-server-util.h>
 #include "em-utils.h"
-#include "em-vfolder-context.h"
-#include "em-vfolder-rule.h"
-#include "mail-config.h"
 #include "mail-folder-cache.h"
-#include "mail-mt.h"
 #include "mail-session.h"
 #include "mail-tools.h"
-#include "mail-vfolder.h"
 
 /* **************************************** */