From d09d8de870b6697c8a8b262e7e077b871a69b315 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Mon, 10 Dec 2012 08:09:59 -0500
Subject: Consolidate base utility libraries into libeutil.

Evolution consists of entirely too many small utility libraries, which
increases linking and loading time, places a burden on higher layers of
the application (e.g. modules) which has to remember to link to all the
small in-tree utility libraries, and makes it difficult to generate API
documentation for these utility libraries in one Gtk-Doc module.

Merge the following utility libraries under the umbrella of libeutil,
and enforce a single-include policy on libeutil so we can reorganize
the files as desired without disrupting its pseudo-public API.

   libemail-utils/libemail-utils.la
   libevolution-utils/libevolution-utils.la
   filter/libfilter.la
   widgets/e-timezone-dialog/libetimezonedialog.la
   widgets/menus/libmenus.la
   widgets/misc/libemiscwidgets.la
   widgets/table/libetable.la
   widgets/text/libetext.la

This also merges libedataserverui from the Evolution-Data-Server module,
since Evolution is its only consumer nowadays, and I'd like to make some
improvements to those APIs without concern for backward-compatibility.

And finally, start a Gtk-Doc module for libeutil.  It's going to be a
project just getting all the symbols _listed_ much less _documented_.
But the skeletal structure is in place and I'm off to a good start.
---
 em-format/Makefile.am                             | 14 +++++++-------
 em-format/e-mail-extension-registry.c             | 13 +++++--------
 em-format/e-mail-formatter-attachment-bar.c       |  5 ++---
 em-format/e-mail-formatter-attachment.c           | 18 ++++++------------
 em-format/e-mail-formatter-error.c                |  4 +---
 em-format/e-mail-formatter-extension.h            |  4 ++--
 em-format/e-mail-formatter-headers.c              | 11 ++++-------
 em-format/e-mail-formatter-image.c                | 14 ++++++--------
 em-format/e-mail-formatter-message-rfc822.c       | 12 ++++--------
 em-format/e-mail-formatter-print-headers.c        | 14 +++++++-------
 em-format/e-mail-formatter-print.c                |  2 --
 em-format/e-mail-formatter-quote-attachment.c     | 11 ++++++-----
 em-format/e-mail-formatter-quote-headers.c        | 14 +++++++-------
 em-format/e-mail-formatter-quote-message-rfc822.c | 13 ++++++-------
 em-format/e-mail-formatter-quote-text-enriched.c  | 10 ++++++----
 em-format/e-mail-formatter-quote-text-html.c      | 13 +++++++------
 em-format/e-mail-formatter-quote-text-plain.c     | 12 +++++++-----
 em-format/e-mail-formatter-secure-button.c        |  4 +---
 em-format/e-mail-formatter-source.c               |  9 ++++-----
 em-format/e-mail-formatter-text-enriched.c        |  9 ++++-----
 em-format/e-mail-formatter-text-html.c            | 16 +++++++---------
 em-format/e-mail-formatter-text-plain.c           | 11 +++++------
 em-format/e-mail-formatter-utils.c                | 12 +++++-------
 em-format/e-mail-formatter.c                      |  2 --
 em-format/e-mail-formatter.h                      |  5 +++--
 em-format/e-mail-parser-application-mbox.c        | 10 +++-------
 em-format/e-mail-parser-application-smime.c       | 10 +++-------
 em-format/e-mail-parser-attachment-bar.c          |  9 +++------
 em-format/e-mail-parser-extension.c               |  2 --
 em-format/e-mail-parser-extension.h               |  2 +-
 em-format/e-mail-parser-headers.c                 |  9 +++------
 em-format/e-mail-parser-image.c                   |  9 ++++-----
 em-format/e-mail-parser-inlinepgp-encrypted.c     | 12 +++++-------
 em-format/e-mail-parser-inlinepgp-signed.c        | 12 +++++-------
 em-format/e-mail-parser-message-deliverystatus.c  |  8 ++------
 em-format/e-mail-parser-message-external.c        | 12 +++++-------
 em-format/e-mail-parser-message-rfc822.c          | 12 ++++--------
 em-format/e-mail-parser-message.c                 | 11 ++++-------
 em-format/e-mail-parser-multipart-alternative.c   | 10 ++++------
 em-format/e-mail-parser-multipart-appledouble.c   |  5 +----
 em-format/e-mail-parser-multipart-digest.c        |  8 +++-----
 em-format/e-mail-parser-multipart-encrypted.c     |  9 ++++-----
 em-format/e-mail-parser-multipart-mixed.c         | 10 ++++------
 em-format/e-mail-parser-multipart-related.c       | 10 ++++------
 em-format/e-mail-parser-multipart-signed.c        |  9 ++++-----
 em-format/e-mail-parser-secure-button.c           |  4 +---
 em-format/e-mail-parser-source.c                  |  7 +++----
 em-format/e-mail-parser-text-enriched.c           |  9 ++++-----
 em-format/e-mail-parser-text-html.c               | 12 +++++-------
 em-format/e-mail-parser-text-plain.c              | 13 ++++++-------
 em-format/e-mail-parser.c                         | 14 +++++---------
 em-format/e-mail-part-attachment-bar.h            |  2 --
 em-format/e-mail-part-utils.c                     |  1 -
 em-format/e-mail-part.h                           |  3 ++-
 54 files changed, 204 insertions(+), 292 deletions(-)

(limited to 'em-format')

diff --git a/em-format/Makefile.am b/em-format/Makefile.am
index 164f3004b5..5b2f4aa0e2 100644
--- a/em-format/Makefile.am
+++ b/em-format/Makefile.am
@@ -25,12 +25,13 @@ libemformat_la_CPPFLAGS =				\
 	-I$(top_srcdir)/em-format			\
 	-I$(top_srcdir)/smime/lib			\
 	-I$(top_srcdir)/smime/gui			\
-	-I$(top_srcdir)/widgets				\
+	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
+	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"	\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
-	$(LIBSOUP_CFLAGS)				\
-	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	\
-	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"
+	$(CHAMPLAIN_CFLAGS)				\
+	$(GTKHTML_CFLAGS)				\
+	$(LIBSOUP_CFLAGS)
 
 if ENABLE_SMIME
 SMIME_EXTENSIONS = e-mail-parser-application-smime.c
@@ -104,14 +105,13 @@ SMIME_LIBS =						\
 endif
 
 libemformat_la_LIBADD =					\
-	$(top_builddir)/libevolution-utils/libevolution-utils.la \
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/shell/libeshell.la		\
-	$(top_builddir)/libemail-utils/libemail-utils.la \
 	$(top_builddir)/libemail-engine/libemail-engine.la \
-	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
+	$(CHAMPLAIN_LIBS)				\
+	$(GTKHTML_LIBS)					\
 	$(LIBSOUP_LIBS)					\
 	$(SMIME_LIBS)
 
diff --git a/em-format/e-mail-extension-registry.c b/em-format/e-mail-extension-registry.c
index e6a78e4e88..7e5f3a9b0b 100644
--- a/em-format/e-mail-extension-registry.c
+++ b/em-format/e-mail-extension-registry.c
@@ -16,18 +16,15 @@
  *
  */
 
-#include <glib-object.h>
-
 #include "e-mail-extension-registry.h"
-#include "e-mail-formatter-extension.h"
-#include "e-mail-parser-extension.h"
-#include <libebackend/libebackend.h>
-#include <camel/camel.h>
-
-#include <glib-object.h>
 
 #include <string.h>
 
+#include <libebackend/libebackend.h>
+
+#include "e-mail-formatter-extension.h"
+#include "e-mail-parser-extension.h"
+
 #define E_MAIL_EXTENSION_REGISTRY_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_MAIL_EXTENSION_REGISTRY, EMailExtensionRegistryPrivate))
diff --git a/em-format/e-mail-formatter-attachment-bar.c b/em-format/e-mail-formatter-attachment-bar.c
index d0e52cb37e..4591501331 100644
--- a/em-format/e-mail-formatter-attachment-bar.c
+++ b/em-format/e-mail-formatter-attachment-bar.c
@@ -19,13 +19,12 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+
 #include "e-mail-part-attachment-bar.h"
-#include <misc/e-attachment-bar.h>
 
 #include <glib/gi18n-lib.h>
 
-#include <em-format/e-mail-formatter-extension.h>
-#include <em-format/e-mail-formatter.h>
+#include "e-mail-formatter-extension.h"
 
 typedef EMailFormatterExtension EMailFormatterAttachmentBar;
 typedef EMailFormatterExtensionClass EMailFormatterAttachmentBarClass;
diff --git a/em-format/e-mail-formatter-attachment.c b/em-format/e-mail-formatter-attachment.c
index 663bf841b4..f800ca2994 100644
--- a/em-format/e-mail-formatter-attachment.c
+++ b/em-format/e-mail-formatter-attachment.c
@@ -20,22 +20,16 @@
 #include <config.h>
 #endif
 
-#include "e-mail-part-attachment.h"
-#include "e-mail-part-attachment-bar.h"
-
-#include <em-format/e-mail-formatter-extension.h>
-#include <em-format/e-mail-formatter.h>
-#include <em-format/e-mail-part-utils.h>
-#include <em-format/e-mail-inline-filter.h>
-#include <e-util/e-util.h>
+#include <glib/gi18n-lib.h>
 
 #include <shell/e-shell.h>
 #include <shell/e-shell-window.h>
 
-#include <widgets/misc/e-attachment-button.h>
-
-#include <glib/gi18n-lib.h>
-#include <camel/camel.h>
+#include "e-mail-formatter-extension.h"
+#include "e-mail-inline-filter.h"
+#include "e-mail-part-attachment-bar.h"
+#include "e-mail-part-attachment.h"
+#include "e-mail-part-utils.h"
 
 #define d(x)
 
diff --git a/em-format/e-mail-formatter-error.c b/em-format/e-mail-formatter-error.c
index 16cfccb049..3adaab90be 100644
--- a/em-format/e-mail-formatter-error.c
+++ b/em-format/e-mail-formatter-error.c
@@ -22,11 +22,9 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <em-format/e-mail-formatter-extension.h>
-#include <em-format/e-mail-formatter.h>
 #include <e-util/e-util.h>
 
-#include <camel/camel.h>
+#include "e-mail-formatter-extension.h"
 
 typedef EMailFormatterExtension EMailFormatterError;
 typedef EMailFormatterExtensionClass EMailFormatterErrorClass;
diff --git a/em-format/e-mail-formatter-extension.h b/em-format/e-mail-formatter-extension.h
index a921696ed5..9c7e4b95b7 100644
--- a/em-format/e-mail-formatter-extension.h
+++ b/em-format/e-mail-formatter-extension.h
@@ -19,10 +19,10 @@
 #ifndef E_MAIL_FORMATTER_EXTENSION_H
 #define E_MAIL_FORMATTER_EXTENSION_H
 
+#include <gtk/gtk.h>
+#include <camel/camel.h>
 #include <em-format/e-mail-part.h>
 #include <em-format/e-mail-formatter.h>
-#include <camel/camel.h>
-#include <gtk/gtk.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_FORMATTER_EXTENSION \
diff --git a/em-format/e-mail-formatter-headers.c b/em-format/e-mail-formatter-headers.c
index 56026b2025..3161d88db9 100644
--- a/em-format/e-mail-formatter-headers.c
+++ b/em-format/e-mail-formatter-headers.c
@@ -20,20 +20,17 @@
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include <em-format/e-mail-formatter-extension.h>
-#include <em-format/e-mail-formatter.h>
-#include <em-format/e-mail-formatter-utils.h>
-#include <em-format/e-mail-inline-filter.h>
 #include <libemail-engine/e-mail-utils.h>
 #include <libedataserver/libedataserver.h>
 #include <e-util/e-util.h>
 #include <shell/e-shell.h>
 
-#include <camel/camel.h>
-
-#include <string.h>
+#include "e-mail-formatter-extension.h"
+#include "e-mail-formatter-utils.h"
+#include "e-mail-inline-filter.h"
 
 typedef EMailFormatterExtension EMailFormatterHeaders;
 typedef EMailFormatterExtensionClass EMailFormatterHeadersClass;
diff --git a/em-format/e-mail-formatter-image.c b/em-format/e-mail-formatter-image.c
index 68bef6a64c..4cdd8443e6 100644
--- a/em-format/e-mail-formatter-image.c
+++ b/em-format/e-mail-formatter-image.c
@@ -20,16 +20,14 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-formatter-extension.h>
-#include <em-format/e-mail-part-utils.h>
-#include <em-format/e-mail-parser.h>
-#include <em-format/e-mail-formatter.h>
-#include <em-format/e-mail-inline-filter.h>
+#include <glib/gi18n-lib.h>
+
 #include <e-util/e-util.h>
 
-#include <glib/gi18n-lib.h>
-#include <camel/camel.h>
+#include "e-mail-formatter-extension.h"
+#include "e-mail-inline-filter.h"
+#include "e-mail-parser-extension.h"
+#include "e-mail-part-utils.h"
 
 typedef EMailFormatterExtension EMailFormatterImage;
 typedef EMailFormatterExtensionClass EMailFormatterImageClass;
diff --git a/em-format/e-mail-formatter-message-rfc822.c b/em-format/e-mail-formatter-message-rfc822.c
index 261dfe8d1b..c0179ab848 100644
--- a/em-format/e-mail-formatter-message-rfc822.c
+++ b/em-format/e-mail-formatter-message-rfc822.c
@@ -20,18 +20,14 @@
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <glib/gi18n-lib.h>
-#include <glib-object.h>
 
-#include <em-format/e-mail-formatter-extension.h>
-#include <em-format/e-mail-formatter.h>
-#include <em-format/e-mail-part-list.h>
-#include <em-format/e-mail-part-utils.h>
 #include <e-util/e-util.h>
 
-#include <camel/camel.h>
-
-#include <string.h>
+#include "e-mail-formatter-extension.h"
+#include "e-mail-part-list.h"
+#include "e-mail-part-utils.h"
 
 typedef EMailFormatterExtension EMailFormatterMessageRFC822;
 typedef EMailFormatterExtensionClass EMailFormatterMessageRFC822Class;
diff --git a/em-format/e-mail-formatter-print-headers.c b/em-format/e-mail-formatter-print-headers.c
index 8d183a0e9f..c3f683f6b3 100644
--- a/em-format/e-mail-formatter-print-headers.c
+++ b/em-format/e-mail-formatter-print-headers.c
@@ -20,17 +20,17 @@
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include <em-format/e-mail-formatter-print.h>
-#include <em-format/e-mail-formatter-utils.h>
-#include <em-format/e-mail-inline-filter.h>
-#include <libemail-engine/e-mail-utils.h>
-#include <e-util/e-util.h>
-
 #include <camel/camel.h>
 
-#include <string.h>
+#include <e-util/e-util.h>
+#include <libemail-engine/e-mail-utils.h>
+
+#include "e-mail-formatter-print.h"
+#include "e-mail-formatter-utils.h"
+#include "e-mail-inline-filter.h"
 
 typedef EMailFormatterExtension EMailFormatterPrintHeaders;
 typedef EMailFormatterExtensionClass EMailFormatterPrintHeadersClass;
diff --git a/em-format/e-mail-formatter-print.c b/em-format/e-mail-formatter-print.c
index 4466bed31a..89f06085a8 100644
--- a/em-format/e-mail-formatter-print.c
+++ b/em-format/e-mail-formatter-print.c
@@ -18,8 +18,6 @@
 
 #include "e-mail-formatter-print.h"
 
-#include <camel/camel.h>
-
 #include "e-mail-part-attachment.h"
 #include "e-mail-formatter-extension.h"
 #include "e-mail-formatter-utils.h"
diff --git a/em-format/e-mail-formatter-quote-attachment.c b/em-format/e-mail-formatter-quote-attachment.c
index 5086a3fd0f..628ef97ab0 100644
--- a/em-format/e-mail-formatter-quote-attachment.c
+++ b/em-format/e-mail-formatter-quote-attachment.c
@@ -20,14 +20,15 @@
 #include <config.h>
 #endif
 
-#include "e-mail-part-attachment.h"
+#include <glib/gi18n-lib.h>
+
+#include <camel/camel.h>
 
-#include <em-format/e-mail-formatter-quote.h>
-#include <em-format/e-mail-part-utils.h>
 #include <e-util/e-util.h>
 
-#include <glib/gi18n-lib.h>
-#include <camel/camel.h>
+#include "e-mail-formatter-quote.h"
+#include "e-mail-part-attachment.h"
+#include "e-mail-part-utils.h"
 
 #define d(x)
 
diff --git a/em-format/e-mail-formatter-quote-headers.c b/em-format/e-mail-formatter-quote-headers.c
index 4af48418dd..8fed82d480 100644
--- a/em-format/e-mail-formatter-quote-headers.c
+++ b/em-format/e-mail-formatter-quote-headers.c
@@ -20,17 +20,17 @@
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include <em-format/e-mail-formatter-quote.h>
-#include <em-format/e-mail-formatter-utils.h>
-#include <em-format/e-mail-inline-filter.h>
-#include <libemail-engine/e-mail-utils.h>
-#include <e-util/e-util.h>
-
 #include <camel/camel.h>
 
-#include <string.h>
+#include <e-util/e-util.h>
+#include <libemail-engine/e-mail-utils.h>
+
+#include "e-mail-formatter-quote.h"
+#include "e-mail-formatter-utils.h"
+#include "e-mail-inline-filter.h"
 
 typedef EMailFormatterExtension EMailFormatterQuoteHeaders;
 typedef EMailFormatterExtensionClass EMailFormatterQuoteHeadersClass;
diff --git a/em-format/e-mail-formatter-quote-message-rfc822.c b/em-format/e-mail-formatter-quote-message-rfc822.c
index e891bce69f..42b3ba5af8 100644
--- a/em-format/e-mail-formatter-quote-message-rfc822.c
+++ b/em-format/e-mail-formatter-quote-message-rfc822.c
@@ -20,17 +20,16 @@
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <glib/gi18n-lib.h>
-#include <glib-object.h>
-
-#include <em-format/e-mail-formatter-quote.h>
-#include <em-format/e-mail-part-list.h>
-#include <em-format/e-mail-part-utils.h>
-#include <e-util/e-util.h>
 
 #include <camel/camel.h>
 
-#include <string.h>
+#include <e-util/e-util.h>
+
+#include "e-mail-formatter-quote.h"
+#include "e-mail-part-list.h"
+#include "e-mail-part-utils.h"
 
 typedef EMailFormatterExtension EMailFormatterQuoteMessageRFC822;
 typedef EMailFormatterExtensionClass EMailFormatterQuoteMessageRFC822Class;
diff --git a/em-format/e-mail-formatter-quote-text-enriched.c b/em-format/e-mail-formatter-quote-text-enriched.c
index 9bbbc534c4..031cc664db 100644
--- a/em-format/e-mail-formatter-quote-text-enriched.c
+++ b/em-format/e-mail-formatter-quote-text-enriched.c
@@ -20,13 +20,15 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-formatter-quote.h>
-#include <em-format/e-mail-inline-filter.h>
-#include <e-util/e-util.h>
-
 #include <glib/gi18n-lib.h>
+
 #include <camel/camel.h>
 
+#include <e-util/e-util.h>
+
+#include "e-mail-formatter-quote.h"
+#include "e-mail-inline-filter.h"
+
 typedef EMailFormatterExtension EMailFormatterQuoteTextEnriched;
 typedef EMailFormatterExtensionClass EMailFormatterQuoteTextEnrichedClass;
 
diff --git a/em-format/e-mail-formatter-quote-text-html.c b/em-format/e-mail-formatter-quote-text-html.c
index 4d3a71f4af..71c7d63554 100644
--- a/em-format/e-mail-formatter-quote-text-html.c
+++ b/em-format/e-mail-formatter-quote-text-html.c
@@ -20,15 +20,16 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-formatter-quote.h>
-#include <em-format/e-mail-stripsig-filter.h>
-#include <em-format/e-mail-part-utils.h>
-#include <e-util/e-util.h>
-
+#include <string.h>
 #include <glib/gi18n-lib.h>
+
 #include <camel/camel.h>
 
-#include <string.h>
+#include <e-util/e-util.h>
+
+#include "e-mail-formatter-quote.h"
+#include "e-mail-part-utils.h"
+#include "e-mail-stripsig-filter.h"
 
 typedef EMailFormatterExtension EMailFormatterQuoteTextHTML;
 typedef EMailFormatterExtensionClass EMailFormatterQuoteTextHTMLClass;
diff --git a/em-format/e-mail-formatter-quote-text-plain.c b/em-format/e-mail-formatter-quote-text-plain.c
index 5f14c8ea1e..71f1762991 100644
--- a/em-format/e-mail-formatter-quote-text-plain.c
+++ b/em-format/e-mail-formatter-quote-text-plain.c
@@ -20,14 +20,16 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-formatter-quote.h>
-#include <em-format/e-mail-part-utils.h>
-#include <em-format/e-mail-stripsig-filter.h>
-#include <e-util/e-util.h>
-
 #include <glib/gi18n-lib.h>
+
 #include <camel/camel.h>
 
+#include <e-util/e-util.h>
+
+#include "e-mail-formatter-quote.h"
+#include "e-mail-part-utils.h"
+#include "e-mail-stripsig-filter.h"
+
 typedef EMailFormatterExtension EMailFormatterQuoteTextPlain;
 typedef EMailFormatterExtensionClass EMailFormatterQuoteTextPlainClass;
 
diff --git a/em-format/e-mail-formatter-secure-button.c b/em-format/e-mail-formatter-secure-button.c
index 2b61a74d93..c07e042533 100644
--- a/em-format/e-mail-formatter-secure-button.c
+++ b/em-format/e-mail-formatter-secure-button.c
@@ -22,8 +22,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <em-format/e-mail-formatter-extension.h>
-#include <em-format/e-mail-formatter.h>
 #include <e-util/e-util.h>
 
 #if defined (HAVE_NSS) && defined (ENABLE_SMIME)
@@ -31,7 +29,7 @@
 #include "e-cert-db.h"
 #endif
 
-#include <camel/camel.h>
+#include "e-mail-formatter-extension.h"
 
 typedef EMailFormatterExtension EMailFormatterSecureButton;
 typedef EMailFormatterExtensionClass EMailFormatterSecureButtonClass;
diff --git a/em-format/e-mail-formatter-source.c b/em-format/e-mail-formatter-source.c
index b37af49026..e4ee288261 100644
--- a/em-format/e-mail-formatter-source.c
+++ b/em-format/e-mail-formatter-source.c
@@ -20,13 +20,12 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-formatter-extension.h>
-#include <em-format/e-mail-formatter.h>
-#include <em-format/e-mail-inline-filter.h>
+#include <glib/gi18n-lib.h>
+
 #include <e-util/e-util.h>
 
-#include <glib/gi18n-lib.h>
-#include <camel/camel.h>
+#include "e-mail-formatter-extension.h"
+#include "e-mail-inline-filter.h"
 
 typedef EMailFormatterExtension EMailFormatterSource;
 typedef EMailFormatterExtensionClass EMailFormatterSourceClass;
diff --git a/em-format/e-mail-formatter-text-enriched.c b/em-format/e-mail-formatter-text-enriched.c
index be3b1b029b..1ea46e8138 100644
--- a/em-format/e-mail-formatter-text-enriched.c
+++ b/em-format/e-mail-formatter-text-enriched.c
@@ -20,13 +20,12 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-formatter-extension.h>
-#include <em-format/e-mail-formatter.h>
-#include <em-format/e-mail-inline-filter.h>
+#include <glib/gi18n-lib.h>
+
 #include <e-util/e-util.h>
 
-#include <glib/gi18n-lib.h>
-#include <camel/camel.h>
+#include "e-mail-formatter-extension.h"
+#include "e-mail-inline-filter.h"
 
 typedef EMailFormatterExtension EMailFormatterTextEnriched;
 typedef EMailFormatterExtensionClass EMailFormatterTextEnrichedClass;
diff --git a/em-format/e-mail-formatter-text-html.c b/em-format/e-mail-formatter-text-html.c
index aabfa72a98..4809c35e4d 100644
--- a/em-format/e-mail-formatter-text-html.c
+++ b/em-format/e-mail-formatter-text-html.c
@@ -20,17 +20,15 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-formatter-extension.h>
-#include <em-format/e-mail-formatter.h>
-#include <em-format/e-mail-inline-filter.h>
-#include <em-format/e-mail-part-utils.h>
-#include <e-util/e-util.h>
-
-#include <glib/gi18n-lib.h>
-#include <camel/camel.h>
-
 #include <ctype.h>
 #include <string.h>
+#include <glib/gi18n-lib.h>
+
+#include <e-util/e-util.h>
+
+#include "e-mail-formatter-extension.h"
+#include "e-mail-inline-filter.h"
+#include "e-mail-part-utils.h"
 
 typedef EMailFormatterExtension EMailFormatterTextHTML;
 typedef EMailFormatterExtensionClass EMailFormatterTextHTMLClass;
diff --git a/em-format/e-mail-formatter-text-plain.c b/em-format/e-mail-formatter-text-plain.c
index afe5ed200d..3d0de8215c 100644
--- a/em-format/e-mail-formatter-text-plain.c
+++ b/em-format/e-mail-formatter-text-plain.c
@@ -20,14 +20,13 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-formatter-extension.h>
-#include <em-format/e-mail-formatter.h>
-#include <em-format/e-mail-inline-filter.h>
-#include <em-format/e-mail-part-utils.h>
+#include <glib/gi18n-lib.h>
+
 #include <e-util/e-util.h>
 
-#include <glib/gi18n-lib.h>
-#include <camel/camel.h>
+#include "e-mail-formatter-extension.h"
+#include "e-mail-inline-filter.h"
+#include "e-mail-part-utils.h"
 
 typedef EMailFormatterExtension EMailFormatterTextPlain;
 typedef EMailFormatterExtensionClass EMailFormatterTextPlainClass;
diff --git a/em-format/e-mail-formatter-utils.c b/em-format/e-mail-formatter-utils.c
index 11dcc0e10b..5ceeb921e7 100644
--- a/em-format/e-mail-formatter-utils.c
+++ b/em-format/e-mail-formatter-utils.c
@@ -22,17 +22,15 @@
 
 #include "e-mail-formatter-utils.h"
 
+#include <string.h>
+#include <glib/gi18n.h>
+
 #include <camel/camel.h>
+#include <libedataserver/libedataserver.h>
 
+#include <e-util/e-util.h>
 #include <libemail-engine/e-mail-utils.h>
 #include <libemail-engine/mail-config.h>
-#include <e-util/e-util.h>
-#include <e-util/e-datetime-format.h>
-#include <libedataserver/libedataserver.h>
-
-#include <glib/gi18n.h>
-
-#include <string.h>
 
 static const gchar *addrspec_hdrs[] = {
 	"Sender", "From", "Reply-To", "To", "Cc", "Bcc",
diff --git a/em-format/e-mail-formatter.c b/em-format/e-mail-formatter.c
index bc671b8072..dcea08133e 100644
--- a/em-format/e-mail-formatter.c
+++ b/em-format/e-mail-formatter.c
@@ -18,8 +18,6 @@
 
 #include "e-mail-formatter.h"
 
-#include <camel/camel.h>
-
 #include "e-mail-formatter-extension.h"
 #include "e-mail-formatter-utils.h"
 #include "e-mail-part.h"
diff --git a/em-format/e-mail-formatter.h b/em-format/e-mail-formatter.h
index de625a2555..d17a3ac6da 100644
--- a/em-format/e-mail-formatter.h
+++ b/em-format/e-mail-formatter.h
@@ -19,11 +19,12 @@
 #ifndef E_MAIL_FORMATTER_H_
 #define E_MAIL_FORMATTER_H_
 
-#include <em-format/e-mail-part-list.h>
-#include <em-format/e-mail-extension-registry.h>
 #include <gdk/gdk.h>
 #include <libemail-engine/e-mail-enums.h>
 
+#include <em-format/e-mail-extension-registry.h>
+#include <em-format/e-mail-part-list.h>
+
 /* Standard GObject macros */
 #define E_TYPE_MAIL_FORMATTER \
 	(e_mail_formatter_get_type ())
diff --git a/em-format/e-mail-parser-application-mbox.c b/em-format/e-mail-parser-application-mbox.c
index 7007b89624..b0fde83b2e 100644
--- a/em-format/e-mail-parser-application-mbox.c
+++ b/em-format/e-mail-parser-application-mbox.c
@@ -20,17 +20,13 @@
 #include <config.h>
 #endif
 
-#include <glib-object.h>
+#include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-parser.h>
-#include <em-format/e-mail-part-utils.h>
 #include <e-util/e-util.h>
 
-#include <camel/camel.h>
-
-#include <string.h>
+#include "e-mail-parser-extension.h"
+#include "e-mail-part-utils.h"
 
 typedef EMailParserExtension EMailParserApplicationMBox;
 typedef EMailParserExtensionClass EMailParserApplicationMBoxClass;
diff --git a/em-format/e-mail-parser-application-smime.c b/em-format/e-mail-parser-application-smime.c
index 4f42b26825..13c3d739c1 100644
--- a/em-format/e-mail-parser-application-smime.c
+++ b/em-format/e-mail-parser-application-smime.c
@@ -20,17 +20,13 @@
 #include <config.h>
 #endif
 
-#include <glib-object.h>
+#include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-parser.h>
-#include <em-format/e-mail-part-utils.h>
 #include <e-util/e-util.h>
 
-#include <camel/camel.h>
-
-#include <string.h>
+#include "e-mail-parser-extension.h"
+#include "e-mail-part-utils.h"
 
 typedef EMailParserExtension EMailParserApplicationSMIME;
 typedef EMailParserExtensionClass EMailParserApplicationSMIMEClass;
diff --git a/em-format/e-mail-parser-attachment-bar.c b/em-format/e-mail-parser-attachment-bar.c
index a8939371c5..44fbb9cc82 100644
--- a/em-format/e-mail-parser-attachment-bar.c
+++ b/em-format/e-mail-parser-attachment-bar.c
@@ -20,16 +20,13 @@
 #include <config.h>
 #endif
 
-#include <glib/gi18n-lib.h>
 #include "e-mail-part-attachment-bar.h"
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-parser.h>
-#include <e-util/e-util.h>
+#include <glib/gi18n-lib.h>
 
-#include <widgets/misc/e-attachment-bar.h>
+#include <e-util/e-util.h>
 
-#include <camel/camel.h>
+#include "e-mail-parser-extension.h"
 
 static void
 mail_part_attachment_bar_free (EMailPart *part)
diff --git a/em-format/e-mail-parser-extension.c b/em-format/e-mail-parser-extension.c
index 05fd952fe6..28b3be3133 100644
--- a/em-format/e-mail-parser-extension.c
+++ b/em-format/e-mail-parser-extension.c
@@ -16,8 +16,6 @@
  *
  */
 
-#include <camel/camel.h>
-
 #include "e-mail-parser-extension.h"
 
 G_DEFINE_ABSTRACT_TYPE (
diff --git a/em-format/e-mail-parser-extension.h b/em-format/e-mail-parser-extension.h
index 4c0b88f902..2b486a6dda 100644
--- a/em-format/e-mail-parser-extension.h
+++ b/em-format/e-mail-parser-extension.h
@@ -19,8 +19,8 @@
 #ifndef E_MAIL_PARSER_EXTENSION_H
 #define E_MAIL_PARSER_EXTENSION_H
 
-#include <em-format/e-mail-parser.h>
 #include <camel/camel.h>
+#include <em-format/e-mail-parser.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_PARSER_EXTENSION \
diff --git a/em-format/e-mail-parser-headers.c b/em-format/e-mail-parser-headers.c
index d81089d384..f2900945d1 100644
--- a/em-format/e-mail-parser-headers.c
+++ b/em-format/e-mail-parser-headers.c
@@ -20,16 +20,13 @@
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-parser.h>
-#include <libemail-engine/e-mail-utils.h>
 #include <e-util/e-util.h>
+#include <libemail-engine/e-mail-utils.h>
 
-#include <camel/camel.h>
-
-#include <string.h>
+#include "e-mail-parser-extension.h"
 
 typedef EMailParserExtension EMailParserHeaders;
 typedef EMailParserExtensionClass EMailParserHeadersClass;
diff --git a/em-format/e-mail-parser-image.c b/em-format/e-mail-parser-image.c
index 4ad4b617bf..a602a9b26d 100644
--- a/em-format/e-mail-parser-image.c
+++ b/em-format/e-mail-parser-image.c
@@ -20,13 +20,12 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-part-utils.h>
-#include <em-format/e-mail-parser.h>
+#include <glib/gi18n-lib.h>
+
 #include <e-util/e-util.h>
 
-#include <glib/gi18n-lib.h>
-#include <camel/camel.h>
+#include "e-mail-parser-extension.h"
+#include "e-mail-part-utils.h"
 
 typedef EMailParserExtension EMailParserImage;
 typedef EMailParserExtensionClass EMailParserImageClass;
diff --git a/em-format/e-mail-parser-inlinepgp-encrypted.c b/em-format/e-mail-parser-inlinepgp-encrypted.c
index 5db01aeff6..b7d5738275 100644
--- a/em-format/e-mail-parser-inlinepgp-encrypted.c
+++ b/em-format/e-mail-parser-inlinepgp-encrypted.c
@@ -20,15 +20,13 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-parser.h>
-#include <em-format/e-mail-part-utils.h>
-#include <e-util/e-util.h>
-
+#include <string.h>
 #include <glib/gi18n-lib.h>
-#include <camel/camel.h>
 
-#include <string.h>
+#include <e-util/e-util.h>
+
+#include "e-mail-parser-extension.h"
+#include "e-mail-part-utils.h"
 
 typedef EMailParserExtension EMailParserInlinePGPEncrypted;
 typedef EMailParserExtensionClass EMailParserInlinePGPEncryptedClass;
diff --git a/em-format/e-mail-parser-inlinepgp-signed.c b/em-format/e-mail-parser-inlinepgp-signed.c
index cec1db0594..2b11d6e412 100644
--- a/em-format/e-mail-parser-inlinepgp-signed.c
+++ b/em-format/e-mail-parser-inlinepgp-signed.c
@@ -20,15 +20,13 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-parser.h>
-#include <em-format/e-mail-part-utils.h>
-#include <e-util/e-util.h>
-
+#include <string.h>
 #include <glib/gi18n-lib.h>
-#include <camel/camel.h>
 
-#include <string.h>
+#include <e-util/e-util.h>
+
+#include "e-mail-parser-extension.h"
+#include "e-mail-part-utils.h"
 
 typedef EMailParserExtension EMailParserInlinePGPSigned;
 typedef EMailParserExtensionClass EMailParserInlinePGPSignedClass;
diff --git a/em-format/e-mail-parser-message-deliverystatus.c b/em-format/e-mail-parser-message-deliverystatus.c
index e99adbc6a1..d02bbf9149 100644
--- a/em-format/e-mail-parser-message-deliverystatus.c
+++ b/em-format/e-mail-parser-message-deliverystatus.c
@@ -20,15 +20,11 @@
 #include <config.h>
 #endif
 
-#include <glib-object.h>
+#include <string.h>
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-parser.h>
 #include <e-util/e-util.h>
 
-#include <camel/camel.h>
-
-#include <string.h>
+#include "e-mail-parser-extension.h"
 
 typedef EMailParserExtension EMailParserMessageDeliveryStatus;
 typedef EMailParserExtensionClass EMailParserMessageDeliveryStatusClass;
diff --git a/em-format/e-mail-parser-message-external.c b/em-format/e-mail-parser-message-external.c
index 0c49497869..d24bb657e1 100644
--- a/em-format/e-mail-parser-message-external.c
+++ b/em-format/e-mail-parser-message-external.c
@@ -20,15 +20,13 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-parser.h>
-#include <e-util/e-util.h>
-
-#include <glib/gi18n-lib.h>
-#include <camel/camel.h>
-
 #include <string.h>
 #include <ctype.h>
+#include <glib/gi18n-lib.h>
+
+#include <e-util/e-util.h>
+
+#include "e-mail-parser-extension.h"
 
 typedef EMailParserExtension EMailParserMessageExternal;
 typedef EMailParserExtensionClass EMailParserMessageExternalClass;
diff --git a/em-format/e-mail-parser-message-rfc822.c b/em-format/e-mail-parser-message-rfc822.c
index 2fbfb2d287..ca9dd67df9 100644
--- a/em-format/e-mail-parser-message-rfc822.c
+++ b/em-format/e-mail-parser-message-rfc822.c
@@ -20,18 +20,14 @@
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <glib/gi18n-lib.h>
-#include <glib-object.h>
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-parser.h>
-#include <em-format/e-mail-part-list.h>
-#include <em-format/e-mail-part-utils.h>
 #include <e-util/e-util.h>
 
-#include <camel/camel.h>
-
-#include <string.h>
+#include "e-mail-parser-extension.h"
+#include "e-mail-part-list.h"
+#include "e-mail-part-utils.h"
 
 typedef EMailParserExtension EMailParserMessageRFC822;
 typedef EMailParserExtensionClass EMailParserMessageRFC822Class;
diff --git a/em-format/e-mail-parser-message.c b/em-format/e-mail-parser-message.c
index 3adbc55305..9cd0a2d76c 100644
--- a/em-format/e-mail-parser-message.c
+++ b/em-format/e-mail-parser-message.c
@@ -20,17 +20,14 @@
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-parser.h>
-#include "e-mail-part-utils.h"
-#include <libemail-engine/e-mail-utils.h>
 #include <e-util/e-util.h>
+#include <libemail-engine/e-mail-utils.h>
 
-#include <camel/camel.h>
-
-#include <string.h>
+#include "e-mail-parser-extension.h"
+#include "e-mail-part-utils.h"
 
 typedef EMailParserExtension EMailParserMessage;
 typedef EMailParserExtensionClass EMailParserMessageClass;
diff --git a/em-format/e-mail-parser-multipart-alternative.c b/em-format/e-mail-parser-multipart-alternative.c
index 902812b02f..cc1c8724db 100644
--- a/em-format/e-mail-parser-multipart-alternative.c
+++ b/em-format/e-mail-parser-multipart-alternative.c
@@ -20,14 +20,12 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-parser.h>
-#include <em-format/e-mail-part-utils.h>
-#include <e-util/e-util.h>
+#include <string.h>
 
-#include <camel/camel.h>
+#include <e-util/e-util.h>
 
-#include <string.h>
+#include "e-mail-parser-extension.h"
+#include "e-mail-part-utils.h"
 
 typedef EMailParserExtension EMailParserMultipartAlternative;
 typedef EMailParserExtensionClass EMailParserMultipartAlternativeClass;
diff --git a/em-format/e-mail-parser-multipart-appledouble.c b/em-format/e-mail-parser-multipart-appledouble.c
index add3fad384..a866363717 100644
--- a/em-format/e-mail-parser-multipart-appledouble.c
+++ b/em-format/e-mail-parser-multipart-appledouble.c
@@ -20,10 +20,7 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-parser.h>
-
-#include <camel/camel.h>
+#include "e-mail-parser-extension.h"
 
 typedef EMailParserExtension EMailParserMultipartAppleDouble;
 typedef EMailParserExtensionClass EMailParserMultipartAppleDoubleClass;
diff --git a/em-format/e-mail-parser-multipart-digest.c b/em-format/e-mail-parser-multipart-digest.c
index b62d066411..64d4882a8c 100644
--- a/em-format/e-mail-parser-multipart-digest.c
+++ b/em-format/e-mail-parser-multipart-digest.c
@@ -20,13 +20,11 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-parser.h>
-#include <e-util/e-util.h>
+#include <string.h>
 
-#include <camel/camel.h>
+#include <e-util/e-util.h>
 
-#include <string.h>
+#include "e-mail-parser-extension.h"
 
 typedef EMailParserExtension EMailParserMultipartDigest;
 typedef EMailParserExtensionClass EMailParserMultipartDigestClass;
diff --git a/em-format/e-mail-parser-multipart-encrypted.c b/em-format/e-mail-parser-multipart-encrypted.c
index fa358013fb..c815ab543c 100644
--- a/em-format/e-mail-parser-multipart-encrypted.c
+++ b/em-format/e-mail-parser-multipart-encrypted.c
@@ -20,14 +20,13 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-parser.h>
-#include <em-format/e-mail-part-utils.h>
-
 #include <glib/gi18n-lib.h>
-#include <camel/camel.h>
+
 #include <libedataserver/libedataserver.h>
 
+#include "e-mail-parser-extension.h"
+#include "e-mail-part-utils.h"
+
 typedef EMailParserExtension EMailParserMultipartEncrypted;
 typedef EMailParserExtensionClass EMailParserMultipartEncryptedClass;
 
diff --git a/em-format/e-mail-parser-multipart-mixed.c b/em-format/e-mail-parser-multipart-mixed.c
index 8a2bfd930a..9e876eef4e 100644
--- a/em-format/e-mail-parser-multipart-mixed.c
+++ b/em-format/e-mail-parser-multipart-mixed.c
@@ -20,14 +20,12 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-parser.h>
-#include <e-util/e-util.h>
-#include <em-format/e-mail-part-utils.h>
+#include <string.h>
 
-#include <camel/camel.h>
+#include <e-util/e-util.h>
 
-#include <string.h>
+#include "e-mail-parser-extension.h"
+#include "e-mail-part-utils.h"
 
 typedef EMailParserExtension EMailParserMultipartMixed;
 typedef EMailParserExtensionClass EMailParserMultipartMixedClass;
diff --git a/em-format/e-mail-parser-multipart-related.c b/em-format/e-mail-parser-multipart-related.c
index a9beac570f..f58a5a0f97 100644
--- a/em-format/e-mail-parser-multipart-related.c
+++ b/em-format/e-mail-parser-multipart-related.c
@@ -20,14 +20,12 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-parser.h>
-#include <em-format/e-mail-part-utils.h>
-#include <e-util/e-util.h>
+#include <string.h>
 
-#include <camel/camel.h>
+#include <e-util/e-util.h>
 
-#include <string.h>
+#include "e-mail-parser-extension.h"
+#include "e-mail-part-utils.h"
 
 typedef EMailParserExtension EMailParserMultipartRelated;
 typedef EMailParserExtensionClass EMailParserMultipartRelatedClass;
diff --git a/em-format/e-mail-parser-multipart-signed.c b/em-format/e-mail-parser-multipart-signed.c
index 05e64a8df8..514d40fafb 100644
--- a/em-format/e-mail-parser-multipart-signed.c
+++ b/em-format/e-mail-parser-multipart-signed.c
@@ -20,14 +20,13 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-parser.h>
-#include <em-format/e-mail-part-utils.h>
-
 #include <glib/gi18n-lib.h>
-#include <camel/camel.h>
+
 #include <libedataserver/libedataserver.h>
 
+#include "e-mail-parser-extension.h"
+#include "e-mail-part-utils.h"
+
 typedef EMailParserExtension EMailParserMultipartSigned;
 typedef EMailParserExtensionClass EMailParserMultipartSignedClass;
 
diff --git a/em-format/e-mail-parser-secure-button.c b/em-format/e-mail-parser-secure-button.c
index cb1f98ee7f..38368592c7 100644
--- a/em-format/e-mail-parser-secure-button.c
+++ b/em-format/e-mail-parser-secure-button.c
@@ -22,11 +22,9 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-parser.h>
 #include <e-util/e-util.h>
 
-#include <camel/camel.h>
+#include "e-mail-parser-extension.h"
 
 typedef EMailParserExtension EMailParserSecureButton;
 typedef EMailParserExtensionClass EMailParserSecureButtonClass;
diff --git a/em-format/e-mail-parser-source.c b/em-format/e-mail-parser-source.c
index 0521650966..ff8355db15 100644
--- a/em-format/e-mail-parser-source.c
+++ b/em-format/e-mail-parser-source.c
@@ -20,12 +20,11 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-parser.h>
+#include <glib/gi18n-lib.h>
+
 #include <e-util/e-util.h>
 
-#include <glib/gi18n-lib.h>
-#include <camel/camel.h>
+#include "e-mail-parser-extension.h"
 
 typedef EMailParserExtension EMailParserSource;
 typedef EMailParserExtensionClass EMailParserSourceClass;
diff --git a/em-format/e-mail-parser-text-enriched.c b/em-format/e-mail-parser-text-enriched.c
index 18b72512c1..024d160196 100644
--- a/em-format/e-mail-parser-text-enriched.c
+++ b/em-format/e-mail-parser-text-enriched.c
@@ -20,13 +20,12 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-parser.h>
-#include <em-format/e-mail-part-utils.h>
+#include <glib/gi18n-lib.h>
+
 #include <e-util/e-util.h>
 
-#include <glib/gi18n-lib.h>
-#include <camel/camel.h>
+#include "e-mail-parser-extension.h"
+#include "e-mail-part-utils.h"
 
 typedef EMailParserExtension EMailParserTextEnriched;
 typedef EMailParserExtensionClass EMailParserTextEnrichedClass;
diff --git a/em-format/e-mail-parser-text-html.c b/em-format/e-mail-parser-text-html.c
index 0014e2c4bc..ccfc5d6eb3 100644
--- a/em-format/e-mail-parser-text-html.c
+++ b/em-format/e-mail-parser-text-html.c
@@ -20,15 +20,13 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-parser.h>
-#include <em-format/e-mail-part-utils.h>
-#include <e-util/e-util.h>
-
+#include <string.h>
 #include <glib/gi18n-lib.h>
-#include <camel/camel.h>
 
-#include <string.h>
+#include <e-util/e-util.h>
+
+#include "e-mail-parser-extension.h"
+#include "e-mail-part-utils.h"
 
 typedef EMailParserExtension EMailParserTextHTML;
 typedef EMailParserExtensionClass EMailParserTextHTMLClass;
diff --git a/em-format/e-mail-parser-text-plain.c b/em-format/e-mail-parser-text-plain.c
index f5e3064a91..f0b34e4b2c 100644
--- a/em-format/e-mail-parser-text-plain.c
+++ b/em-format/e-mail-parser-text-plain.c
@@ -20,15 +20,14 @@
 #include <config.h>
 #endif
 
-#include <em-format/e-mail-parser-extension.h>
-#include <em-format/e-mail-parser.h>
-#include <em-format/e-mail-inline-filter.h>
-#include <em-format/e-mail-part-utils.h>
+#include <ctype.h>
+#include <glib/gi18n-lib.h>
+
 #include <e-util/e-util.h>
 
-#include <glib/gi18n-lib.h>
-#include <camel/camel.h>
-#include <ctype.h>
+#include "e-mail-inline-filter.h"
+#include "e-mail-parser-extension.h"
+#include "e-mail-part-utils.h"
 
 typedef EMailParserExtension EMailParserTextPlain;
 typedef EMailParserExtensionClass EMailParserTextPlainClass;
diff --git a/em-format/e-mail-parser.c b/em-format/e-mail-parser.c
index 4ba17bb681..359efe7d9b 100644
--- a/em-format/e-mail-parser.c
+++ b/em-format/e-mail-parser.c
@@ -17,21 +17,17 @@
  */
 
 #include "e-mail-parser.h"
-#include "e-mail-parser-extension.h"
-#include "e-mail-part-attachment.h"
-#include "e-mail-part-utils.h"
 
-#include <camel/camel.h>
-#include <libebackend/libebackend.h>
+#include <string.h>
 
-#include <e-util/e-util.h>
+#include <libebackend/libebackend.h>
 
 #include <shell/e-shell.h>
 #include <shell/e-shell-window.h>
 
-#include <widgets/misc/e-attachment.h>
-
-#include <string.h>
+#include "e-mail-parser-extension.h"
+#include "e-mail-part-attachment.h"
+#include "e-mail-part-utils.h"
 
 #define E_MAIL_PARSER_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/em-format/e-mail-part-attachment-bar.h b/em-format/e-mail-part-attachment-bar.h
index e6d65428cb..87b6311b5d 100644
--- a/em-format/e-mail-part-attachment-bar.h
+++ b/em-format/e-mail-part-attachment-bar.h
@@ -23,8 +23,6 @@
 
 #include <em-format/e-mail-part.h>
 
-#include <widgets/misc/e-attachment-store.h>
-
 typedef struct _EMailPartAttachmentBar {
 	EMailPart parent;
 
diff --git a/em-format/e-mail-part-utils.c b/em-format/e-mail-part-utils.c
index 665a7b5996..2e2b5f66f2 100644
--- a/em-format/e-mail-part-utils.c
+++ b/em-format/e-mail-part-utils.c
@@ -25,7 +25,6 @@
 #include "e-mail-part-utils.h"
 #include "e-mail-parser-extension.h"
 
-#include <camel/camel.h>
 #include <e-util/e-util.h>
 #include <gdk/gdk.h>
 
diff --git a/em-format/e-mail-part.h b/em-format/e-mail-part.h
index 82e417cb80..774828eb23 100644
--- a/em-format/e-mail-part.h
+++ b/em-format/e-mail-part.h
@@ -20,9 +20,10 @@
 #define E_MAIL_PART_H_
 
 #include <camel/camel.h>
-#include <misc/e-attachment.h>
 #include <webkit/webkitdom.h>
 
+#include <e-util/e-util.h>
+
 #define E_MAIL_PART_IS(p,s_t) \
 		((p != NULL) && (e_mail_part_get_instance_size (p) == sizeof (s_t)))
 #define E_MAIL_PART(o) ((EMailPart *) o)
-- 
cgit v1.2.3