Only #include Camel's top-level header.

8 files changed, 5 insertions, 20 deletions

diff --git a/widgets/misc/e-account-combo-box.c b/widgets/misc/e-account-combo-box.c
index 0ded393e72..e850efb5b6 100644
--- a/widgets/misc/e-account-combo-box.c
+++ b/widgets/misc/e-account-combo-box.c
@@ -22,7 +22,6 @@
 #include "e-account-combo-box.h"
 
 #include <string.h>
-#include <camel/camel-store.h>
 
 #define E_ACCOUNT_COMBO_BOX_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/widgets/misc/e-account-combo-box.h b/widgets/misc/e-account-combo-box.h
index 12d4be6c72..3c442f1a29 100644
--- a/widgets/misc/e-account-combo-box.h
+++ b/widgets/misc/e-account-combo-box.h
@@ -23,7 +23,7 @@
 #define E_ACCOUNT_COMBO_BOX_H
 
 #include <gtk/gtk.h>
-#include <camel/camel-session.h>
+#include <camel/camel.h>
 #include <libedataserver/e-account.h>
 #include <libedataserver/e-account-list.h>
 
diff --git a/widgets/misc/e-account-tree-view.c b/widgets/misc/e-account-tree-view.c
index 8c2e21092b..9b083a3f6e 100644
--- a/widgets/misc/e-account-tree-view.c
+++ b/widgets/misc/e-account-tree-view.c
@@ -22,7 +22,7 @@
 #include "e-account-tree-view.h"
 
 #include <glib/gi18n.h>
-#include <camel/camel-url.h>
+#include <camel/camel.h>
 
 #define E_ACCOUNT_TREE_VIEW_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c
index 9725604865..a52b931a13 100644
--- a/widgets/misc/e-attachment-view.c
+++ b/widgets/misc/e-attachment-view.c
@@ -24,7 +24,6 @@
 #include <config.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <camel/camel-stream-mem.h>
 
 #include "e-util/e-binding.h"
 #include "e-util/e-selection.h"
diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c
index 4752251905..dee4bd2aa5 100644
--- a/widgets/misc/e-attachment.c
+++ b/widgets/misc/e-attachment.c
@@ -25,14 +25,6 @@
 #include <config.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
-#include <camel/camel-iconv.h>
-#include <camel/camel-data-wrapper.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-stream-null.h>
-#include <camel/camel-stream-vfs.h>
-#include <camel/camel-stream-fs.h>
 
 #include <libedataserver/e-data-server-util.h>
 
diff --git a/widgets/misc/e-attachment.h b/widgets/misc/e-attachment.h
index a6dff74661..7cd655c6ff 100644
--- a/widgets/misc/e-attachment.h
+++ b/widgets/misc/e-attachment.h
@@ -23,10 +23,7 @@
 #define E_ATTACHMENT_H
 
 #include <gtk/gtk.h>
-#include <camel/camel-cipher-context.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-multipart.h>
+#include <camel/camel.h>
 
 /* Standard GObject macros */
 #define E_TYPE_ATTACHMENT \
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index 7a0dc6de56..4ff266fc85 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -25,8 +25,7 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include <camel/camel-internet-address.h>
-#include <camel/camel-url.h>
+#include <camel/camel.h>
 
 #include <e-util/e-util.h>
 #include <e-util/e-binding.h>
diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c
index 8ad797a9d1..c07293242c 100644
--- a/widgets/table/e-table-sorting-utils.c
+++ b/widgets/table/e-table-sorting-utils.c
@@ -23,8 +23,7 @@
 #include <config.h>
 
 #include <string.h>
-
-#include <camel/camel-string-utils.h>
+#include <camel/camel.h>
 
 #include "e-util/e-util.h"