Only #include Camel's top-level header.

61 files changed, 35 insertions, 246 deletions

diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 4ab444027f..17b8b4b9a0 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -24,8 +24,6 @@
 
 #include "e-mail-backend.h"
 
-#include <camel/camel.h>
-
 #include "e-util/e-account-utils.h"
 #include "e-util/e-alert-dialog.h"
 
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index 9e63645bfa..67adeec352 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -23,7 +23,6 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <camel/camel-folder.h>
 
 #include "e-util/e-util.h"
 #include "e-util/e-plugin-ui.h"
diff --git a/mail/e-mail-label-list-store.c b/mail/e-mail-label-list-store.c
index ed0d4cdd6b..bad13c99fd 100644
--- a/mail/e-mail-label-list-store.c
+++ b/mail/e-mail-label-list-store.c
@@ -22,7 +22,7 @@
 #include "e-mail-label-list-store.h"
 
 #include <glib/gi18n.h>
-#include <camel/camel-utf8.h>
+#include <camel/camel.h>
 #include "e-util/gconf-bridge.h"
 
 #define E_MAIL_LABEL_LIST_STORE_GET_PRIVATE(obj) \
diff --git a/mail/e-mail-local.h b/mail/e-mail-local.h
index b8dda29857..b5b7e8ab8c 100644
--- a/mail/e-mail-local.h
+++ b/mail/e-mail-local.h
@@ -23,8 +23,7 @@
 #define E_MAIL_LOCAL_H
 
 #include <glib.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
 
 G_BEGIN_DECLS
 
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index 3659c73466..968aaa653f 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -41,12 +41,6 @@
 
 #include <gconf/gconf-client.h>
 
-#include <camel/camel.h>
-#include <camel/camel-store.h>
-#include <camel/camel-session.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-disco-folder.h>
-
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index b525345d4a..f41c4e2d68 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -25,9 +25,7 @@
 
 #include <glib/gi18n.h>
 #include <gtkhtml/gtkhtml.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-vee-store.h>
+#include <camel/camel.h>
 
 #include "e-util/e-alert-dialog.h"
 #include "filter/e-filter-rule.h"
diff --git a/mail/e-mail-reader.h b/mail/e-mail-reader.h
index a79d7f5274..8a13223df9 100644
--- a/mail/e-mail-reader.h
+++ b/mail/e-mail-reader.h
@@ -28,7 +28,7 @@
  *     a GtkWidget pointer which almost always has to be type casted. */
 
 #include <gtk/gtk.h>
-#include <camel/camel-folder.h>
+#include <camel/camel.h>
 #include <mail/em-format-html-display.h>
 #include <shell/e-shell-backend.h>
 
diff --git a/mail/e-mail-store.c b/mail/e-mail-store.c
index f088b9f805..1024ec6b68 100644
--- a/mail/e-mail-store.c
+++ b/mail/e-mail-store.c
@@ -22,9 +22,7 @@
 #include "e-mail-store.h"
 
 #include <glib/gi18n.h>
-#include <camel/camel-service.h>
-#include <camel/camel-session.h>
-#include <camel/camel-url.h>
+#include <camel/camel.h>
 #include <libedataserver/e-account.h>
 #include <libedataserver/e-account-list.h>
 
diff --git a/mail/e-mail-store.h b/mail/e-mail-store.h
index bfd1ab47c8..7d42fc3647 100644
--- a/mail/e-mail-store.h
+++ b/mail/e-mail-store.h
@@ -23,7 +23,7 @@
 #define E_MAIL_STORE_H
 
 #include <glib.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
 
 G_BEGIN_DECLS
 
diff --git a/mail/e-mail-tag-editor.h b/mail/e-mail-tag-editor.h
index b28674cff6..fe2365c903 100644
--- a/mail/e-mail-tag-editor.h
+++ b/mail/e-mail-tag-editor.h
@@ -25,8 +25,7 @@
 #define E_MAIL_TAG_EDITOR_H
 
 #include <gtk/gtk.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-folder-summary.h>
+#include <camel/camel.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_TAG_EDITOR \
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index fc312c8ae4..ec6ab34088 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -59,13 +59,6 @@
 #include "em-format-quote.h"
 #include "em-event.h"
 
-#include <camel/camel-folder.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-nntp-address.h>
-#include <camel/camel-vee-folder.h>
-
 #ifdef G_OS_WIN32
 /* Undef the similar macro from pthread.h, it doesn't check if
  * gmtime() returns NULL.
diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h
index be29a7ae71..a3c6f1185c 100644
--- a/mail/em-composer-utils.h
+++ b/mail/em-composer-utils.h
@@ -24,9 +24,6 @@
 #ifndef __EM_COMPOSER_UTILS_H__
 #define __EM_COMPOSER_UTILS_H__
 
-#include <glib.h>
-#include <camel/camel-nntp-address.h>
-
 #include <em-format/em-format.h>
 #include <composer/e-msg-composer.h>
 
diff --git a/mail/em-config.c b/mail/em-config.c
index 4b1e835627..67cfddf4f9 100644
--- a/mail/em-config.c
+++ b/mail/em-config.c
@@ -33,17 +33,6 @@
 #include "em-utils.h"
 #include "em-composer-utils.h"
 
-#include <camel/camel-store.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-url.h>
-
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-vtrash-folder.h>
-
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 
diff --git a/mail/em-config.h b/mail/em-config.h
index 62e74bea51..003498d2f6 100644
--- a/mail/em-config.h
+++ b/mail/em-config.h
@@ -23,9 +23,8 @@
 #ifndef __EM_CONFIG_H__
 #define __EM_CONFIG_H__
 
-#include <glib-object.h>
+#include <camel/camel.h>
 #include <gconf/gconf-client.h>
-#include <camel/camel-folder.h>
 #include <libedataserver/e-account.h>
 
 #include "e-util/e-config.h"
diff --git a/mail/em-event.c b/mail/em-event.c
index 7cb4c19a1e..6a77debd7e 100644
--- a/mail/em-event.c
+++ b/mail/em-event.c
@@ -32,17 +32,6 @@
 #include "em-event.h"
 #include "composer/e-msg-composer.h"
 
-#include <camel/camel-store.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-url.h>
-
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-vtrash-folder.h>
-
 static GObjectClass *eme_parent;
 static EMEvent *em_event;
 
diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c
index d080076725..bf185ce60f 100644
--- a/mail/em-filter-source-element.c
+++ b/mail/em-filter-source-element.c
@@ -30,9 +30,9 @@
 #include "em-filter-source-element.h"
 
 #include <gtk/gtk.h>
+#include <camel/camel.h>
 #include <libedataserver/e-sexp.h>
 #include <libedataserver/e-account-list.h>
-#include <camel/camel-url.h>
 
 #include "filter/e-filter-part.h"
 
@@ -44,7 +44,7 @@ static gint source_eq(EFilterElement *fe, EFilterElement *cm);
 static void xml_create(EFilterElement *fe, xmlNodePtr node);
 static xmlNodePtr xml_encode(EFilterElement *fe);
 static gint xml_decode(EFilterElement *fe, xmlNodePtr node);
-static EFilterElement *clone(EFilterElement *fe);
+static EFilterElement *filter_clone(EFilterElement *fe);
 static GtkWidget *get_widget(EFilterElement *fe);
 static void build_code(EFilterElement *fe, GString *out, EFilterPart *ff);
 static void format_sexp(EFilterElement *, GString *);
@@ -106,7 +106,7 @@ em_filter_source_element_class_init(EMFilterSourceElementClass *klass)
 	fe_class->xml_create = xml_create;
 	fe_class->xml_encode = xml_encode;
 	fe_class->xml_decode = xml_decode;
-	fe_class->clone = clone;
+	fe_class->clone = filter_clone;
 	fe_class->get_widget = get_widget;
 	fe_class->build_code = build_code;
 	fe_class->format_sexp = format_sexp;
@@ -212,7 +212,7 @@ xml_decode(EFilterElement *fe, xmlNodePtr node)
 }
 
 static EFilterElement *
-clone(EFilterElement *fe)
+filter_clone(EFilterElement *fe)
 {
 	EMFilterSourceElement *fs = (EMFilterSourceElement *)fe;
 	EMFilterSourceElement *cpy = em_filter_source_element_new();
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index 7b7957149c..e02f039ee2 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -27,15 +27,10 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 #include <gconf/gconf-client.h>
 
-#include <camel/camel-store.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-vtrash-folder.h>
-#include <camel/camel-vee-folder.h>
-#include <glib/gi18n.h>
-
 #include "em-folder-properties.h"
 #include "em-config.h"
 
diff --git a/mail/em-folder-properties.h b/mail/em-folder-properties.h
index 330be151a3..d0809357e8 100644
--- a/mail/em-folder-properties.h
+++ b/mail/em-folder-properties.h
@@ -24,7 +24,7 @@
 #ifndef __EM_FOLDER_PROPERTIES_H__
 #define __EM_FOLDER_PROPERTIES_H__
 
-#include <camel/camel-folder.h>
+#include <camel/camel.h>
 #include <shell/e-shell-view.h>
 
 G_BEGIN_DECLS
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index 1a9123a34a..8ba323c135 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -25,10 +25,6 @@
 #include <glib/gi18n.h>
 #include <e-util/e-util.h>
 
-#include <camel/camel-url.h>
-#include <camel/camel-store.h>
-#include <camel/camel-session.h>
-
 #include "em-folder-tree.h"
 #include "em-folder-selector.h"
 #include "em-folder-utils.h"
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index 3daacc52c5..e34f9110e1 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -35,8 +35,6 @@
 
 #include <glib/gi18n.h>
 
-#include <camel/camel-file-utils.h>
-
 #include "mail-config.h"
 #include "mail-session.h"
 #include "mail-tools.h"
@@ -49,9 +47,6 @@
 #include "em-folder-utils.h"
 #include "em-event.h"
 
-#include <camel/camel-folder.h>
-#include <camel/camel-vee-store.h>
-
 #include "e-mail-local.h"
 #include "shell/e-shell.h"
 
diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h
index e0a73e03b8..82775ae6bf 100644
--- a/mail/em-folder-tree-model.h
+++ b/mail/em-folder-tree-model.h
@@ -24,7 +24,7 @@
 #define EM_FOLDER_TREE_MODEL_H
 
 #include <gtk/gtk.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
 #include <libedataserver/e-account-list.h>
 
 /* Standard GObject macros */
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index bbb9ec379b..badb6f8117 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -39,15 +39,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 
-#include <camel/camel-session.h>
-#include <camel/camel-store.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-vee-store.h>
-#include <camel/camel-vtrash-folder.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-stream-fs.h>
-
 #include "e-util/e-account-utils.h"
 #include "e-util/e-mktemp.h"
 #include "e-util/e-icon-factory.h"
diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h
index 273a87aedf..5bdee73905 100644
--- a/mail/em-folder-tree.h
+++ b/mail/em-folder-tree.h
@@ -25,7 +25,7 @@
 #define EM_FOLDER_TREE_H
 
 #include <gtk/gtk.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
 #include <mail/em-folder-tree-model.h>
 
 /* Standard GObject macros */
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 98168866ae..3381275858 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -39,13 +39,6 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib/gi18n.h>
 
-#include <camel/camel-session.h>
-#include <camel/camel-vee-store.h>
-#include <camel/camel-vtrash-folder.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-stream-fs.h>
-
 #include "e-util/e-mktemp.h"
 
 #include "e-util/e-alert-dialog.h"
diff --git a/mail/em-folder-utils.h b/mail/em-folder-utils.h
index ec150f3066..ec5882d1aa 100644
--- a/mail/em-folder-utils.h
+++ b/mail/em-folder-utils.h
@@ -25,8 +25,7 @@
 #define EM_FOLDER_UTILS_H
 
 #include <gtk/gtk.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
 #include <mail/em-folder-tree.h>
 
 G_BEGIN_DECLS
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index ee3e4ac3e9..e93b51744a 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -43,19 +43,6 @@
 
 #include <glib/gi18n.h>
 
-#include <camel/camel-stream.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-mime-filter-tohtml.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-internet-address.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-cipher-context.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-operation.h>
-
 #include <e-util/e-util.h>
 #include <e-util/e-util-private.h>
 
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index a8ffc2fca1..3e9a26afca 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -54,25 +54,6 @@
 
 #include <glib/gi18n.h>
 
-#include <camel/camel-iconv.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-mime-filter.h>
-#include <camel/camel-mime-filter-tohtml.h>
-#include <camel/camel-mime-filter-enriched.h>
-#include <camel/camel-mime-filter-basic.h>
-#include <camel/camel-gpg-context.h>
-#include <camel/camel-cipher-context.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-url.h>
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-http-stream.h>
-#include <camel/camel-data-cache.h>
-#include <camel/camel-file-utils.h>
-
 #include "mail-config.h"
 #include "mail-mt.h"
 
@@ -1538,7 +1519,6 @@ efh_object_requested(GtkHTML *html, GtkHTMLEmbedded *eb, EMFormatHTML *efh)
 
 /* ********************************************************************** */
 #include "em-inline-filter.h"
-#include <camel/camel-stream-null.h>
 
 /* FIXME: This is duplicated in em-format-html-display, should be exported or in security module */
 static const struct {
diff --git a/mail/em-format-html.h b/mail/em-format-html.h
index bac45d8ecc..26a6671cea 100644
--- a/mail/em-format-html.h
+++ b/mail/em-format-html.h
@@ -30,10 +30,6 @@
 
 #include <em-format/em-format.h>
 #include <mail/mail-config.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-url.h>
 #include <gtkhtml/gtkhtml.h>
 #include <gtkhtml/gtkhtml-embedded.h>
 
diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c
index 1959b0b7f8..44187551f1 100644
--- a/mail/em-inline-filter.c
+++ b/mail/em-inline-filter.c
@@ -27,9 +27,6 @@
 #include <string.h>
 
 #include "em-inline-filter.h"
-#include <camel/camel-mime-part.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-stream-mem.h>
 
 #include "em-utils.h"
 #include "em-format/em-format.h"
diff --git a/mail/em-inline-filter.h b/mail/em-inline-filter.h
index ac1779f8f0..11aaa7f5b8 100644
--- a/mail/em-inline-filter.h
+++ b/mail/em-inline-filter.h
@@ -24,9 +24,7 @@
 #ifndef EM_INLINE_FILTER_H
 #define EM_INLINE_FILTER_H
 
-#include <camel/camel-mime-filter.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-multipart.h>
+#include <camel/camel.h>
 
 #define EM_INLINE_FILTER_TYPE     (em_inline_filter_get_type ())
 #define EM_INLINE_FILTER(obj)     (CAMEL_CHECK_CAST((obj), EM_INLINE_FILTER_TYPE, EMInlineFilter))
diff --git a/mail/em-junk.h b/mail/em-junk.h
index 79493caf2f..978f5ece7d 100644
--- a/mail/em-junk.h
+++ b/mail/em-junk.h
@@ -25,9 +25,8 @@
 #ifndef EM_JUNK_H
 #define EM_JUNK_H
 
+#include <camel/camel.h>
 #include <e-util/e-plugin.h>
-#include <camel/camel-junk-plugin.h>
-#include <camel/camel-mime-message.h>
 
 #define EM_JUNK_ERROR (em_junk_error_quark ())
 
diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c
index 4211fdac05..6485af4e2f 100644
--- a/mail/em-subscribe-editor.c
+++ b/mail/em-subscribe-editor.c
@@ -30,9 +30,6 @@
 #include "mail-ops.h"
 #include "mail-mt.h"
 /*#include "mail-folder-cache.h"*/
-#include "camel/camel-exception.h"
-#include "camel/camel-store.h"
-#include "camel/camel-session.h"
 
 #include "e-util/e-util.h"
 #include "e-util/e-account-utils.h"
diff --git a/mail/em-sync-stream.c b/mail/em-sync-stream.c
index 982a56c90a..780ae9d7fd 100644
--- a/mail/em-sync-stream.c
+++ b/mail/em-sync-stream.c
@@ -29,7 +29,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <camel/camel-object.h>
 #include <libedataserver/e-flag.h>
 
 #include "mail-mt.h"
diff --git a/mail/em-sync-stream.h b/mail/em-sync-stream.h
index 3d74a02a35..b8684ac109 100644
--- a/mail/em-sync-stream.h
+++ b/mail/em-sync-stream.h
@@ -31,7 +31,7 @@ requests are always handled in the main gui thread in the correct order.
 #define EM_SYNC_STREAM_H
 
 #include <glib.h>
-#include <camel/camel-stream.h>
+#include <camel/camel.h>
 
 #define EM_SYNC_STREAM_TYPE \
 	(em_sync_stream_get_type ())
diff --git a/mail/em-utils.c b/mail/em-utils.c
index a26b61099a..8c83382251 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -42,11 +42,6 @@
 #undef interface
 #endif
 
-#include <camel/camel-stream-fs.h>
-#include <camel/camel-url-scanner.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-string-utils.h>
-
 #include <libebook/e-book.h>
 
 #include "em-filter-editor.h"
@@ -542,10 +537,6 @@ em_utils_flag_for_followup_completed (GtkWindow *parent, CamelFolder *folder, GP
 	em_utils_uids_free (uids);
 }
 
-#include "camel/camel-stream-mem.h"
-#include "camel/camel-stream-filter.h"
-#include "camel/camel-mime-filter-from.h"
-
 /* This kind of sucks, because for various reasons most callers need to run synchronously
    in the gui thread, however this could take a long, blocking time, to run */
 static gint
diff --git a/mail/em-utils.h b/mail/em-utils.h
index 1bbde206ff..1fde390d72 100644
--- a/mail/em-utils.h
+++ b/mail/em-utils.h
@@ -25,12 +25,7 @@
 
 #include <gtk/gtk.h>
 #include <sys/types.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-internet-address.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-stream.h>
+#include <camel/camel.h>
 
 #include <mail/e-mail-reader.h>
 #include <mail/em-folder-tree.h>
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index d151c47f53..e32d319eac 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -30,7 +30,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include "camel/camel-url.h"
 #include "em-vfolder-context.h"
 #include "em-vfolder-rule.h"
 #include "mail/e-mail-store.h"
diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c
index e18da4535d..c9ddcf75d5 100644
--- a/mail/importers/elm-importer.c
+++ b/mail/importers/elm-importer.c
@@ -38,8 +38,6 @@
 
 #include <gconf/gconf-client.h>
 
-#include <camel/camel-operation.h>
-
 #include "mail-importer.h"
 
 #include "mail/mail-mt.h"
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index 2cd8c9864f..758b8a8b62 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -38,8 +38,6 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
-#include <camel/camel-exception.h>
-
 #include "shell/e-shell.h"
 #include "shell/e-shell-window.h"
 #include "shell/e-shell-view.h"
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index f61ce2658b..2f2a7f5494 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -35,14 +35,7 @@
 
 #include <glib.h>
 #include <glib/gstdio.h>
-
 #include <glib/gi18n.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-store.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-mime-parser.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-stream-mem.h>
 
 #include "e-util/e-util-private.h"
 #include "shell/e-shell-backend.h"
diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h
index 7758c0e563..5f2f8c8b26 100644
--- a/mail/importers/mail-importer.h
+++ b/mail/importers/mail-importer.h
@@ -25,7 +25,7 @@
 #define __MAIL_IMPORTER_H__
 
 #include <e-util/e-import.h>
-#include <camel/camel-folder.h>
+#include <camel/camel.h>
 
 EImportImporter *mbox_importer_peek(void);
 
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index 873fc93c46..07b7f22fbb 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -41,8 +41,6 @@
 #include <libebook/e-book.h>
 #include <libebook/e-destination.h>
 
-#include <camel/camel-operation.h>
-
 #include "mail-importer.h"
 
 #include "mail/mail-mt.h"
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index dd6e64afac..dd0423ae07 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -47,9 +47,6 @@
 #include "filter/e-filter-option.h"
 #include "filter/e-filter-input.h"
 
-#include <camel/camel-internet-address.h>
-#include <camel/camel-mime-message.h>
-
 #define d(x)
 
 static void
diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h
index fb474ab04d..2d14120e71 100644
--- a/mail/mail-autofilter.h
+++ b/mail/mail-autofilter.h
@@ -24,7 +24,7 @@
 #ifndef _MAIL_AUTOFILTER_H
 #define _MAIL_AUTOFILTER_H
 
-#include <camel/camel-mime-message.h>
+#include <camel/camel.h>
 
 #include <filter/e-filter-rule.h>
 #include <mail/em-filter-context.h>
diff --git a/mail/mail-config.h b/mail/mail-config.h
index dc55403d93..65dd861940 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -24,7 +24,7 @@
 #define MAIL_CONFIG_H
 
 #include <gtk/gtk.h>
-#include <camel/camel-provider.h>
+#include <camel/camel.h>
 #include <libedataserver/e-account.h>
 #include <libedataserver/e-account-list.h>
 
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index b1a332d4f4..822afa3b25 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -41,17 +41,10 @@
 #include <time.h>
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <glib-object.h>
 #include <glib/gstdio.h>
 
-#include <glib/gi18n.h>
-#include <camel/camel-store.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-vtrash-folder.h>
-#include <camel/camel-vee-store.h>
-#include <camel/camel-offline-store.h>
-#include <camel/camel-disco-store.h>
-
 #include <libedataserver/e-data-server-util.h>
 #include "e-util/e-marshal.h"
 #include "e-util/e-util.h"
diff --git a/mail/mail-folder-cache.h b/mail/mail-folder-cache.h
index dd3a108d03..de6f90570f 100644
--- a/mail/mail-folder-cache.h
+++ b/mail/mail-folder-cache.h
@@ -27,7 +27,7 @@
 #define _MAIL_FOLDER_CACHE_H
 
 #include <glib-object.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
 
 G_BEGIN_DECLS
 
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index eefbd6d0d4..0af59cb1bb 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -27,9 +27,6 @@
 
 #include <libedataserver/e-flag.h>
 
-#include <camel/camel-object.h>
-#include <camel/camel-operation.h>
-
 #include "shell/e-shell.h"
 #include "e-util/e-alert-activity.h"
 #include "e-util/e-alert-dialog.h"
diff --git a/mail/mail-mt.h b/mail/mail-mt.h
index 2e8828c5b2..5cfbf2abe1 100644
--- a/mail/mail-mt.h
+++ b/mail/mail-mt.h
@@ -23,8 +23,7 @@
 #ifndef _MAIL_MT
 #define _MAIL_MT
 
-#include "camel/camel-exception.h"
-#include "camel/camel-operation.h"
+#include <camel/camel.h>
 
 typedef struct _MailMsg MailMsg;
 typedef struct _MailMsgInfo MailMsgInfo;
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 7cbb91bede..c147d22233 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -33,17 +33,6 @@
 #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-offline-folder.h>
-#include <camel/camel-offline-store.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-stream-vfs.h>
-#include <camel/camel-transport.h>
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-vee-store.h>
-
 #include <libedataserver/e-data-server-util.h>
 #include "e-util/e-account-utils.h"
 
diff --git a/mail/mail-ops.h b/mail/mail-ops.h
index 843ada5d54..506de4ce80 100644
--- a/mail/mail-ops.h
+++ b/mail/mail-ops.h
@@ -26,15 +26,10 @@
 
 G_BEGIN_DECLS
 
-#include "mail-mt.h"
-
-#include "camel/camel-store.h"
-#include "camel/camel-folder.h"
-#include "camel/camel-filter-driver.h"
-#include "camel/camel-mime-message.h"
-#include "camel/camel-operation.h"
+#include <camel/camel.h>
+#include <libedataserver/e-account.h>
 
-#include "libedataserver/e-account.h"
+#include "mail-mt.h"
 
 void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info,
 		       void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, gint ok,
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index d66f2ab508..4ffe4fd7a5 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -31,11 +31,6 @@
 
 #include "libedataserver/e-account-list.h"
 
-#include "camel/camel-filter-driver.h"
-#include "camel/camel-folder.h"
-#include "camel/camel-operation.h"
-#include "camel/camel-store.h"
-
 #include "shell/e-shell.h"
 #include "e-util/e-account-utils.h"
 #include "e-util/gconf-bridge.h"
diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h
index 2155a96191..db144e2385 100644
--- a/mail/mail-send-recv.h
+++ b/mail/mail-send-recv.h
@@ -24,7 +24,7 @@
 #define MAIL_SEND_RECV_H
 
 #include <gtk/gtk.h>
-#include <camel/camel-session.h>
+#include <camel/camel.h>
 #include <shell/e-shell-backend.h>
 
 G_BEGIN_DECLS
diff --git a/mail/mail-session.c b/mail/mail-session.c
index a98857a242..84b6c8e065 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -44,9 +44,6 @@
 #include <libedataserverui/e-passwords.h>
 #include <libedataserver/e-flag.h>
 
-#include <camel/camel.h>	/* FIXME: this is where camel_init is defined, it shouldn't include everything else */
-#include <camel/camel-filter-driver.h>
-
 #include "e-util/e-util.h"
 #include "e-util/e-alert-dialog.h"
 #include "e-util/e-util-private.h"
diff --git a/mail/mail-session.h b/mail/mail-session.h
index ff3ee490a1..22dc792b93 100644
--- a/mail/mail-session.h
+++ b/mail/mail-session.h
@@ -24,7 +24,7 @@
 #define MAIL_SESSION_H
 
 #include <glib.h>
-#include <camel/camel-session.h>
+#include <camel/camel.h>
 
 G_BEGIN_DECLS
 
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index f006b1b963..7ccf50cc08 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -36,10 +36,6 @@
 
 #include <glib/gi18n.h>
 
-#include <camel/camel-store.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-movemail.h>
-
 #include "em-utils.h"
 #include "mail-folder-cache.h"
 #include "mail-session.h"
diff --git a/mail/mail-tools.h b/mail/mail-tools.h
index ceb3ce8fb0..544c3601b6 100644
--- a/mail/mail-tools.h
+++ b/mail/mail-tools.h
@@ -24,8 +24,7 @@
 #define MAIL_TOOLS_H
 
 #include <glib.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-mime-message.h>
+#include <camel/camel.h>
 
 /* Get the "inbox" for a url (uses global session) */
 CamelFolder *mail_tool_get_inbox (const gchar *url, CamelException *ex);
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 2fe7a03c53..700baedbe0 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -27,9 +27,6 @@
 
 #include <glib/gi18n.h>
 
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-vee-store.h>
-#include <camel/camel-vtrash-folder.h>
 #include <libedataserver/e-account-list.h>
 
 #include "e-util/e-alert-dialog.h"
diff --git a/mail/mail-vfolder.h b/mail/mail-vfolder.h
index a70cdd8757..84b6a41151 100644
--- a/mail/mail-vfolder.h
+++ b/mail/mail-vfolder.h
@@ -22,8 +22,7 @@
 #ifndef _MAIL_VFOLDER_H
 #define _MAIL_VFOLDER_H
 
-#include <camel/camel-internet-address.h>
-#include <camel/camel-mime-message.h>
+#include <camel/camel.h>
 
 #include <filter/e-filter-part.h>
 #include <filter/e-filter-rule.h>
diff --git a/mail/message-list.c b/mail/message-list.c
index 657ec02a5c..2c1422bff8 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -36,14 +36,6 @@
 
 #include <gconf/gconf-client.h>
 
-#include <camel/camel-exception.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-folder-thread.h>
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-string-utils.h>
-
 #include "e-util/e-icon-factory.h"
 #include "e-util/e-poolv.h"
 #include "e-util/e-profile-event.h"
diff --git a/mail/message-list.h b/mail/message-list.h
index a817047cc6..0b46e8ecd7 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -24,11 +24,9 @@
 #define _MESSAGE_LIST_H_
 
 #include <gtk/gtk.h>
-#include <camel/camel-folder-thread.h>
+#include <camel/camel.h>
 
 #include <table/e-tree.h>
-
-#include <camel/camel-folder.h>
 #include <shell/e-shell-backend.h>
 
 G_BEGIN_DECLS