5 files changed, 2 insertions, 39 deletions
diff --git a/em-format/em-format-quote.c b/em-format/em-format-quote.c
index bf906530f0..c297b48efa 100644
--- a/em-format/em-format-quote.c
+++ b/em-format/em-format-quote.c
@@ -27,14 +27,6 @@
 
 #include <string.h>
 
-#include <camel/camel-iconv.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-mime-filter-tohtml.h>
-#include <camel/camel-mime-filter-enriched.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-url.h>
-
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
 
@@ -478,11 +470,6 @@ emfq_format_attachment(EMFormat *emf, CamelStream *stream, CamelMimePart *part,
 	}
 }
 
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-url.h>
-
 static void
 emfq_text_plain(EMFormatQuote *emfq, CamelStream *stream, CamelMimePart *part, EMFormatHandler *info)
 {
diff --git a/em-format/em-format-quote.h b/em-format/em-format-quote.h
index afc3675461..100e59d0a8 100644
--- a/em-format/em-format-quote.h
+++ b/em-format/em-format-quote.h
@@ -23,7 +23,6 @@
 #ifndef EM_FORMAT_QUOTE_H
 #define EM_FORMAT_QUOTE_H
 
-#include <camel/camel-stream.h>
 #include "em-format.h"
 
 /* Standard GObject macros */
diff --git a/em-format/em-format.c b/em-format/em-format.c
index f9126cabd2..4c1330bc51 100644
--- a/em-format/em-format.c
+++ b/em-format/em-format.c
@@ -31,23 +31,6 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 
-#include <camel/camel-stream.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-multipart-encrypted.h>
-#include <camel/camel-multipart-signed.h>
-#include <camel/camel-medium.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-gpg-context.h>
-#include <camel/camel-smime-context.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-stream-null.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-mime-filter-charset.h>
-#include <camel/camel-mime-filter-windows.h>
-#include <camel/camel-mime-filter-pgp.h>
-
 #include "em-format.h"
 #include "e-util/e-util.h"
 #include "shell/e-shell.h"
diff --git a/em-format/em-format.h b/em-format/em-format.h
index 39f6240b76..965ca20399 100644
--- a/em-format/em-format.h
+++ b/em-format/em-format.h
@@ -29,13 +29,7 @@
 #define EM_FORMAT_H
 
 #include <glib-object.h>
-#include <camel/camel-url.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-stream.h>
-#include <camel/camel-session.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-cipher-context.h>
+#include <camel/camel.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_FORMAT \
diff --git a/em-format/em-stripsig-filter.h b/em-format/em-stripsig-filter.h
index 39493e5e88..25ea2395e3 100644
--- a/em-format/em-stripsig-filter.h
+++ b/em-format/em-stripsig-filter.h
@@ -23,7 +23,7 @@
 #ifndef __EM_STRIPSIG_FILTER_H__
 #define __EM_STRIPSIG_FILTER_H__
 
-#include <camel/camel-mime-filter.h>
+#include <camel/camel.h>
 
 G_BEGIN_DECLS