Only #include Camel's top-level header.

12 files changed, 3 insertions, 23 deletions

diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am
index bbabb6cfb2..0beb1285fa 100644
--- a/modules/calendar/Makefile.am
+++ b/modules/calendar/Makefile.am
@@ -7,6 +7,7 @@ libevolution_module_calendar_la_CPPFLAGS =		\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
+	$(CAMEL_CFLAGS)					\
 	$(GNOME_PLATFORM_CFLAGS)			\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
diff --git a/modules/calendar/e-cal-attachment-handler.c b/modules/calendar/e-cal-attachment-handler.c
index b532af85e5..acf975c0bf 100644
--- a/modules/calendar/e-cal-attachment-handler.c
+++ b/modules/calendar/e-cal-attachment-handler.c
@@ -24,7 +24,7 @@
 #include <glib/gi18n.h>
 #include <libical/ical.h>
 #include <libecal/e-cal.h>
-#include <camel/camel-stream-mem.h>
+#include <camel/camel.h>
 #include <libedataserverui/e-source-selector.h>
 
 #include "calendar/common/authentication.h"
diff --git a/modules/calendar/e-memo-shell-migrate.c b/modules/calendar/e-memo-shell-migrate.c
index 3c52672063..771a889845 100644
--- a/modules/calendar/e-memo-shell-migrate.c
+++ b/modules/calendar/e-memo-shell-migrate.c
@@ -23,7 +23,7 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <camel/camel-url.h>
+#include <camel/camel.h>
 #include <libedataserver/e-account.h>
 #include <libedataserver/e-account-list.h>
 #include <libedataserver/e-source.h>
diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c
index 166522a827..f27a107a59 100644
--- a/modules/mail/e-mail-attachment-handler.c
+++ b/modules/mail/e-mail-attachment-handler.c
@@ -22,8 +22,6 @@
 #include "e-mail-attachment-handler.h"
 
 #include <glib/gi18n.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-stream-mem.h>
 
 #include "e-util/e-alert-dialog.h"
 #include "mail/em-composer-utils.h"
diff --git a/modules/mail/e-mail-junk-hook.c b/modules/mail/e-mail-junk-hook.c
index f17290f99d..ae87df1b30 100644
--- a/modules/mail/e-mail-junk-hook.c
+++ b/modules/mail/e-mail-junk-hook.c
@@ -22,7 +22,6 @@
 #include "e-mail-junk-hook.h"
 
 #include <glib/gi18n.h>
-#include <camel/camel-junk-plugin.h>
 
 #include "e-util/e-alert-dialog.h"
 #include "shell/e-shell.h"
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index b3eb0a97c1..105b55285a 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -22,10 +22,6 @@
 #include "e-mail-shell-backend.h"
 
 #include <glib/gi18n.h>
-#include <camel/camel-disco-store.h>
-#include <camel/camel-offline-store.h>
-#include <camel/camel-session.h>
-#include <camel/camel-url.h>
 
 #include "e-util/e-account-utils.h"
 #include "e-util/e-binding.h"
diff --git a/modules/mail/e-mail-shell-backend.h b/modules/mail/e-mail-shell-backend.h
index 36f4064e68..031efab150 100644
--- a/modules/mail/e-mail-shell-backend.h
+++ b/modules/mail/e-mail-shell-backend.h
@@ -24,8 +24,6 @@
 
 #include <mail/e-mail-backend.h>
 
-#include <camel/camel-folder.h>
-#include <camel/camel-store.h>
 #include <e-util/e-signature-list.h>
 #include <libedataserver/e-account-list.h>
 
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index 2113dde9ab..7bfced18e8 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -22,7 +22,6 @@
 #include "e-mail-shell-content.h"
 
 #include <glib/gi18n.h>
-#include <camel/camel-store.h>
 #include <libedataserver/e-data-server-util.h>
 
 #include "e-util/e-util-private.h"
diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h
index de237aff96..a8a86c5054 100644
--- a/modules/mail/e-mail-shell-view-private.h
+++ b/modules/mail/e-mail-shell-view-private.h
@@ -26,12 +26,6 @@
 
 #include <glib/gi18n.h>
 #include <gtkhtml/gtkhtml.h>
-#include <camel/camel-disco-store.h>
-#include <camel/camel-offline-store.h>
-#include <camel/camel-operation.h>
-#include <camel/camel-vee-folder.h>
-#include <camel/camel-vee-store.h>
-#include <camel/camel-vtrash-folder.h>
 #include <camel/camel-search-private.h>  /* for camel_search_word */
 
 #include "e-util/e-util.h"
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c
index df1cdeef27..0ac397fc72 100644
--- a/modules/mail/em-account-prefs.c
+++ b/modules/mail/em-account-prefs.c
@@ -30,8 +30,6 @@
 #include <config.h>
 #endif
 
-#include <camel/camel-url.h>
-
 #include <glib/gi18n.h>
 
 #include "e-util/e-alert-dialog.h"
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 53a9888a47..c817653d20 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -37,8 +37,6 @@
 #include "em-composer-prefs.h"
 #include "composer/e-msg-composer.h"
 
-#include <camel/camel-iconv.h>
-
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index f32fbbf284..fb34805409 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -30,7 +30,6 @@
 #include "em-mailer-prefs.h"
 #include "em-format/em-format.h"
 
-#include <camel/camel-iconv.h>
 #include <gtkhtml/gtkhtml-properties.h>
 #include <libxml/tree.h>