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.

66 files changed, 173 insertions, 317 deletions

diff --git a/mail/Makefile.am b/mail/Makefile.am
index 1995e642d7..52b26cc692 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -6,8 +6,6 @@ mailincludedir = $(privincludedir)/mail
 
 libevolution_mail_la_CPPFLAGS =				\
 	$(AM_CPPFLAGS)					\
-	-I$(top_srcdir)/widgets				\
-	-I$(top_srcdir)/widgets/misc			\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/em-format			\
 	-I$(top_srcdir)/mail				\
@@ -17,13 +15,6 @@ libevolution_mail_la_CPPFLAGS =				\
 	-I$(top_srcdir)/shell				\
 	-I$(top_srcdir)/smime/lib			\
 	-I$(top_srcdir)/smime/gui			\
-	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
-	$(GNOME_PLATFORM_CFLAGS)			\
-	$(CERT_UI_CFLAGS)				\
-	$(CANBERRA_CFLAGS)				\
-	$(CLUTTER_CFLAGS)				\
-	$(GTKHTML_CFLAGS)                               \
-	$(LIBSOUP_CFLAGS)				\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"	\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"	\
@@ -35,7 +26,14 @@ libevolution_mail_la_CPPFLAGS =				\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
 	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\"	\
 	-DPREFIX=\""$(prefix)"\"			\
-	-DG_LOG_DOMAIN=\"evolution-mail\"
+	-DG_LOG_DOMAIN=\"evolution-mail\"		\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
+	$(GNOME_PLATFORM_CFLAGS)			\
+	$(CERT_UI_CFLAGS)				\
+	$(CANBERRA_CFLAGS)				\
+	$(CHAMPLAIN_CFLAGS)				\
+	$(GTKHTML_CFLAGS)				\
+	$(LIBSOUP_CFLAGS)
 
 mailinclude_HEADERS =					\
 	e-http-request.h				\
@@ -193,28 +191,19 @@ SMIME_LIBS =						\
 endif
 
 libevolution_mail_la_LIBADD =				\
-	$(top_builddir)/libemail-utils/libemail-utils.la		\
 	$(top_builddir)/libemail-engine/libemail-engine.la		\
 	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/shell/libeshell.la		\
 	$(top_builddir)/composer/libcomposer.la		\
-	$(top_builddir)/widgets/table/libetable.la	\
-	$(top_builddir)/widgets/text/libetext.la	\
-	$(top_builddir)/widgets/menus/libmenus.la	\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la	\
-	$(top_builddir)/widgets/menus/libmenus.la	\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
 	$(top_builddir)/em-format/libemformat.la	\
-	$(top_builddir)/filter/libfilter.la		\
-	$(top_builddir)/libevolution-utils/libevolution-utils.la \
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
 	$(CERT_UI_LIBS)					\
 	$(CANBERRA_LIBS)				\
-	$(CLUTTER_LIBS)					\
+	$(CHAMPLAIN_LIBS)				\
 	$(GTKHTML_LIBS)					\
-	$(E_WIDGETS_LIBS)				\
 	$(SMIME_LIBS)					\
 	$(LIBSOUP_LIBS)					\
 	-lresolv
diff --git a/mail/e-mail-account-store.c b/mail/e-mail-account-store.c
index 8d8f867312..a2a639d9b4 100644
--- a/mail/e-mail-account-store.c
+++ b/mail/e-mail-account-store.c
@@ -24,9 +24,6 @@
 
 #include <libebackend/libebackend.h>
 
-#include <e-util/e-marshal.h>
-#include <libevolution-utils/e-alert-dialog.h>
-
 #include <libemail-engine/mail-ops.h>
 
 #include <mail/mail-vfolder-ui.h>
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 4fb3291729..0940a78f01 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -34,9 +34,6 @@
 
 #include <shell/e-shell.h>
 
-#include <libevolution-utils/e-alert-dialog.h>
-#include <libevolution-utils/e-alert-sink.h>
-
 #include <libemail-engine/e-mail-folder-utils.h>
 #include <libemail-engine/e-mail-session.h>
 #include <libemail-engine/e-mail-store-utils.h>
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index d0aa556cd1..495bf64895 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -28,13 +28,9 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
-#include "e-util/e-util.h"
-#include "e-util/e-plugin-ui.h"
 #include "shell/e-shell.h"
 #include "shell/e-shell-utils.h"
 #include "shell/e-shell-settings.h"
-#include "widgets/misc/e-popup-action.h"
-#include "widgets/misc/e-preview-pane.h"
 
 #include "mail/e-mail-reader.h"
 #include "mail/e-mail-reader-utils.h"
diff --git a/mail/e-mail-browser.h b/mail/e-mail-browser.h
index 849daebce4..bd636cdaf2 100644
--- a/mail/e-mail-browser.h
+++ b/mail/e-mail-browser.h
@@ -22,8 +22,8 @@
 #ifndef E_MAIL_BROWSER_H
 #define E_MAIL_BROWSER_H
 
+#include <e-util/e-util.h>
 #include <mail/e-mail-backend.h>
-#include <misc/e-focus-tracker.h>
 #include <mail/e-mail-display.h>
 
 /* Standard GObject macros */
diff --git a/mail/e-mail-config-activity-page.c b/mail/e-mail-config-activity-page.c
index 4328555f75..790d1f95bd 100644
--- a/mail/e-mail-config-activity-page.c
+++ b/mail/e-mail-config-activity-page.c
@@ -20,11 +20,6 @@
 
 #include <camel/camel.h>
 
-#include <libevolution-utils/e-alert-sink.h>
-#include <libevolution-utils/e-alert-dialog.h>
-#include <misc/e-activity-bar.h>
-#include <misc/e-alert-bar.h>
-
 #define E_MAIL_CONFIG_ACTIVITY_PAGE_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_MAIL_CONFIG_ACTIVITY_PAGE, EMailConfigActivityPagePrivate))
diff --git a/mail/e-mail-config-activity-page.h b/mail/e-mail-config-activity-page.h
index 62defe20fa..43cc094ef8 100644
--- a/mail/e-mail-config-activity-page.h
+++ b/mail/e-mail-config-activity-page.h
@@ -25,7 +25,7 @@
 #define E_MAIL_CONFIG_ACTIVITY_PAGE_H
 
 #include <gtk/gtk.h>
-#include <e-util/e-activity.h>
+#include <e-util/e-util.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_CONFIG_ACTIVITY_PAGE \
diff --git a/mail/e-mail-config-assistant.c b/mail/e-mail-config-assistant.c
index 7caa43fea2..92bd971148 100644
--- a/mail/e-mail-config-assistant.c
+++ b/mail/e-mail-config-assistant.c
@@ -23,8 +23,6 @@
 
 #include <libebackend/libebackend.h>
 
-#include <libevolution-utils/e-alert-sink.h>
-
 #include <mail/e-mail-config-confirm-page.h>
 #include <mail/e-mail-config-identity-page.h>
 #include <mail/e-mail-config-lookup-page.h>
diff --git a/mail/e-mail-config-auth-check.c b/mail/e-mail-config-auth-check.c
index 8abfa6fa09..d60e95f239 100644
--- a/mail/e-mail-config-auth-check.c
+++ b/mail/e-mail-config-auth-check.c
@@ -19,10 +19,9 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libevolution-utils/e-alert.h>
-#include <e-util/e-mktemp.h>
-#include <misc/e-auth-combo-box.h>
-#include <mail/e-mail-config-service-page.h>
+#include "e-util/e-util.h"
+#include "mail/e-mail-config-service-page.h"
+
 #include "e-mail-ui-session.h"
 
 #include "e-mail-config-auth-check.h"
diff --git a/mail/e-mail-config-identity-page.c b/mail/e-mail-config-identity-page.c
index 40b18f4c36..5db923dc2f 100644
--- a/mail/e-mail-config-identity-page.c
+++ b/mail/e-mail-config-identity-page.c
@@ -23,9 +23,7 @@
 
 #include <libebackend/libebackend.h>
 
-#include <e-util/e-marshal.h>
-#include <misc/e-mail-signature-combo-box.h>
-#include <misc/e-mail-signature-editor.h>
+#include "e-util/e-util.h"
 
 #define E_MAIL_CONFIG_IDENTITY_PAGE_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/mail/e-mail-config-provider-page.h b/mail/e-mail-config-provider-page.h
index 1faf187c55..8cf21f3c7e 100644
--- a/mail/e-mail-config-provider-page.h
+++ b/mail/e-mail-config-provider-page.h
@@ -25,7 +25,7 @@
 #include <gtk/gtk.h>
 #include <camel/camel.h>
 
-#include <e-util/e-activity.h>
+#include <e-util/e-util.h>
 #include <mail/e-mail-config-page.h>
 #include <mail/e-mail-config-activity-page.h>
 #include <mail/e-mail-config-service-backend.h>
diff --git a/mail/e-mail-config-window.c b/mail/e-mail-config-window.c
index 5062abca35..218f751579 100644
--- a/mail/e-mail-config-window.c
+++ b/mail/e-mail-config-window.c
@@ -21,12 +21,10 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libevolution-utils/e-alert-dialog.h>
-#include <libevolution-utils/e-alert-sink.h>
-#include <misc/e-alert-bar.h>
+#include "e-util/e-util.h"
 
-#include <mail/e-mail-config-notebook.h>
-#include <mail/e-mail-config-sidebar.h>
+#include "mail/e-mail-config-notebook.h"
+#include "mail/e-mail-config-sidebar.h"
 
 #define E_MAIL_CONFIG_WINDOW_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index 4f706eef10..3181a90c27 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -24,31 +24,24 @@
 #endif
 
 #include "e-mail-display.h"
-#include "e-mail-display-popup-extension.h"
 
 #include <glib/gi18n.h>
 #include <gdk/gdk.h>
 
-#include <em-format/e-mail-part-utils.h>
-#include <em-format/e-mail-formatter-extension.h>
-#include <em-format/e-mail-extension-registry.h>
-#include <em-format/e-mail-part-attachment.h>
-#include <em-format/e-mail-formatter-print.h>
-
-#include "e-util/e-marshal.h"
-#include "e-util/e-util.h"
-#include "e-util/e-plugin-ui.h"
-#include "e-util/e-file-request.h"
-#include "e-util/e-stock-request.h"
-#include "mail/em-composer-utils.h"
-#include "mail/em-utils.h"
-#include "mail/e-mail-request.h"
-#include "mail/e-http-request.h"
-#include "widgets/misc/e-attachment-bar.h"
-#include "widgets/misc/e-attachment-button.h"
-
 #include <camel/camel.h>
 
+#include "em-format/e-mail-part-utils.h"
+#include "em-format/e-mail-formatter-extension.h"
+#include "em-format/e-mail-extension-registry.h"
+#include "em-format/e-mail-part-attachment.h"
+#include "em-format/e-mail-formatter-print.h"
+
+#include "e-http-request.h"
+#include "e-mail-display-popup-extension.h"
+#include "e-mail-request.h"
+#include "em-composer-utils.h"
+#include "em-utils.h"
+
 #define d(x)
 
 G_DEFINE_TYPE (
diff --git a/mail/e-mail-display.h b/mail/e-mail-display.h
index 99ad73a376..7bf4aeed74 100644
--- a/mail/e-mail-display.h
+++ b/mail/e-mail-display.h
@@ -22,8 +22,7 @@
 #ifndef E_MAIL_DISPLAY_H
 #define E_MAIL_DISPLAY_H
 
-#include <misc/e-web-view.h>
-#include <misc/e-search-bar.h>
+#include <e-util/e-util.h>
 
 #include <em-format/e-mail-formatter.h>
 
diff --git a/mail/e-mail-folder-pane.c b/mail/e-mail-folder-pane.c
index e6c0e9213b..985f47b99c 100644
--- a/mail/e-mail-folder-pane.c
+++ b/mail/e-mail-folder-pane.c
@@ -28,24 +28,18 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
-#include "e-util/e-util.h"
-#include "e-util/e-plugin-ui.h"
-
 #include "shell/e-shell.h"
 #include "shell/e-shell-utils.h"
 
-#include "widgets/misc/e-popup-action.h"
-#include "widgets/misc/e-preview-pane.h"
-
 #include "libemail-engine/e-mail-utils.h"
 #include "libemail-engine/mail-tools.h"
 
-#include "mail/e-mail-reader.h"
-#include "mail/e-mail-reader-utils.h"
-#include "mail/em-folder-tree-model.h"
-#include "mail/em-composer-utils.h"
-#include "mail/em-utils.h"
-#include "mail/message-list.h"
+#include "e-mail-reader.h"
+#include "e-mail-reader-utils.h"
+#include "em-folder-tree-model.h"
+#include "em-composer-utils.h"
+#include "em-utils.h"
+#include "message-list.h"
 
 #define E_MAIL_FOLDER_PANE_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index 603bf531f5..24335c9594 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -46,17 +46,10 @@
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
 
-#include <shell/e-shell.h>
-#include <shell/e-shell-migrate.h>
+#include "shell/e-shell.h"
+#include "shell/e-shell-migrate.h"
 
-#include <e-util/e-util.h>
-#include <libevolution-utils/e-xml-utils.h>
-
-#include <libevolution-utils/e-alert-dialog.h>
-#include <e-util/e-util-private.h>
-#include <e-util/e-plugin.h>
-
-#include <libemail-engine/e-mail-folder-utils.h>
+#include "libemail-engine/e-mail-folder-utils.h"
 
 #include "e-mail-backend.h"
 #include "em-utils.h"
diff --git a/mail/e-mail-notebook-view.h b/mail/e-mail-notebook-view.h
index 04b0bd4152..4e1fff64ae 100644
--- a/mail/e-mail-notebook-view.h
+++ b/mail/e-mail-notebook-view.h
@@ -25,7 +25,6 @@
 
 #include <mail/e-mail-view.h>
 #include <shell/e-shell-searchbar.h>
-#include <menus/gal-view-instance.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_NOTEBOOK_VIEW \
diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index 08bedb717b..2fbf48a5f2 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -24,22 +24,16 @@
 #include <config.h>
 #endif
 
-#include <glib/gi18n.h>
 #include "e-mail-paned-view.h"
 
-#include "e-util/e-util-private.h"
-#include "widgets/menus/gal-view-etable.h"
-#include "widgets/menus/gal-view-instance.h"
-#include "widgets/misc/e-paned.h"
-#include "widgets/misc/e-preview-pane.h"
-#include "widgets/misc/e-search-bar.h"
+#include <glib/gi18n.h>
 
-#include <shell/e-shell-window-actions.h>
+#include "shell/e-shell-window-actions.h"
 
-#include <libemail-engine/e-mail-folder-utils.h>
-#include <libemail-engine/e-mail-utils.h>
-#include <libemail-engine/mail-config.h>
-#include <libemail-engine/mail-ops.h>
+#include "libemail-engine/e-mail-folder-utils.h"
+#include "libemail-engine/e-mail-utils.h"
+#include "libemail-engine/mail-config.h"
+#include "libemail-engine/mail-ops.h"
 
 #include "em-utils.h"
 #include "message-list.h"
diff --git a/mail/e-mail-printer.c b/mail/e-mail-printer.c
index 30c8517a50..2f7e1366b4 100644
--- a/mail/e-mail-printer.c
+++ b/mail/e-mail-printer.c
@@ -24,13 +24,12 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <em-format/e-mail-formatter-print.h>
-#include <em-format/e-mail-part-utils.h>
+#include <webkit/webkitdom.h>
 
-#include <e-util/e-print.h>
-#include <e-util/e-marshal.h>
+#include "e-util/e-util.h"
 
-#include <webkit/webkitdom.h>
+#include "em-format/e-mail-formatter-print.h"
+#include "em-format/e-mail-part-utils.h"
 
 #include "e-mail-printer.h"
 #include "e-mail-display.h"
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index 9f027a65fd..cce0046658 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -32,30 +32,27 @@
 #include <gtkhtml/gtkhtml.h>
 #include <camel/camel.h>
 
-#include "libevolution-utils/e-alert-dialog.h"
-#include "filter/e-filter-rule.h"
-#include "misc/e-web-view.h"
 #include "shell/e-shell-utils.h"
 
-#include <libemail-engine/e-mail-folder-utils.h>
-#include <libemail-engine/e-mail-utils.h>
-#include <libemail-engine/mail-ops.h>
-#include <libemail-engine/mail-tools.h>
+#include "libemail-engine/e-mail-folder-utils.h"
+#include "libemail-engine/e-mail-utils.h"
+#include "libemail-engine/mail-ops.h"
+#include "libemail-engine/mail-tools.h"
+
+#include "em-format/e-mail-parser.h"
+#include "em-format/e-mail-part-utils.h"
 
 #include "composer/e-composer-actions.h"
 
-#include "mail/e-mail-backend.h"
-#include "mail/e-mail-browser.h"
-#include "mail/e-mail-printer.h"
-#include "mail/e-mail-display.h"
-#include "mail/em-composer-utils.h"
-#include "mail/em-utils.h"
-#include "mail/mail-autofilter.h"
-#include "mail/mail-vfolder-ui.h"
-#include "mail/message-list.h"
-
-#include <em-format/e-mail-parser.h>
-#include <em-format/e-mail-part-utils.h>
+#include "e-mail-backend.h"
+#include "e-mail-browser.h"
+#include "e-mail-printer.h"
+#include "e-mail-display.h"
+#include "em-composer-utils.h"
+#include "em-utils.h"
+#include "mail-autofilter.h"
+#include "mail-vfolder-ui.h"
+#include "message-list.h"
 
 #define d(x)
 
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index a659404092..c2500a5d59 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -32,36 +32,30 @@
 #include <X11/XF86keysym.h>
 #endif
 
-#include "e-util/e-charset.h"
-#include "e-util/e-util.h"
-#include "libevolution-utils/e-alert-dialog.h"
 #include "shell/e-shell-utils.h"
-#include "widgets/misc/e-popup-action.h"
-#include "widgets/misc/e-menu-tool-action.h"
 
-#include "libemail-utils/mail-mt.h"
-
-#include "libemail-engine/mail-ops.h"
-#include "libemail-engine/e-mail-utils.h"
 #include "libemail-engine/e-mail-enumtypes.h"
+#include "libemail-engine/e-mail-utils.h"
+#include "libemail-engine/mail-mt.h"
+#include "libemail-engine/mail-ops.h"
 
-#include "mail/e-mail-backend.h"
-#include "mail/e-mail-browser.h"
-#include "mail/e-mail-reader-utils.h"
-#include "mail/e-mail-ui-session.h"
-#include "mail/e-mail-view.h"
-#include "mail/em-composer-utils.h"
-#include "mail/em-event.h"
-#include "mail/em-folder-selector.h"
-#include "mail/em-folder-tree.h"
-#include "mail/em-utils.h"
-#include "mail/mail-autofilter.h"
-#include "mail/mail-vfolder-ui.h"
-#include "mail/message-list.h"
-
-#include <em-format/e-mail-formatter.h>
-#include <em-format/e-mail-parser.h>
-#include <em-format/e-mail-part-utils.h>
+#include "em-format/e-mail-formatter.h"
+#include "em-format/e-mail-parser.h"
+#include "em-format/e-mail-part-utils.h"
+
+#include "e-mail-backend.h"
+#include "e-mail-browser.h"
+#include "e-mail-reader-utils.h"
+#include "e-mail-ui-session.h"
+#include "e-mail-view.h"
+#include "em-composer-utils.h"
+#include "em-event.h"
+#include "em-folder-selector.h"
+#include "em-folder-tree.h"
+#include "em-utils.h"
+#include "mail-autofilter.h"
+#include "mail-vfolder-ui.h"
+#include "message-list.h"
 
 #define E_MAIL_READER_GET_PRIVATE(obj) \
 	((EMailReaderPrivate *) g_object_get_qdata \
diff --git a/mail/e-mail-reader.h b/mail/e-mail-reader.h
index b33aee7554..1d513f0a8a 100644
--- a/mail/e-mail-reader.h
+++ b/mail/e-mail-reader.h
@@ -29,10 +29,10 @@
 
 #include <gtk/gtk.h>
 #include <camel/camel.h>
-#include <libevolution-utils/e-alert-sink.h>
+#include <e-util/e-util.h>
+
 #include <mail/e-mail-backend.h>
 #include <mail/e-mail-display.h>
-#include <misc/e-preview-pane.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_READER \
diff --git a/mail/e-mail-request.c b/mail/e-mail-request.c
index 665711f927..000a0b0516 100644
--- a/mail/e-mail-request.c
+++ b/mail/e-mail-request.c
@@ -30,14 +30,11 @@
 #include <glib/gi18n.h>
 #include <camel/camel.h>
 
-#include <em-format/e-mail-formatter.h>
-#include <em-format/e-mail-formatter-utils.h>
-#include <em-format/e-mail-formatter-print.h>
+#include "shell/e-shell.h"
 
-#include <e-util/e-icon-factory.h>
-#include <e-util/e-util.h>
-
-#include <shell/e-shell.h>
+#include "em-format/e-mail-formatter.h"
+#include "em-format/e-mail-formatter-utils.h"
+#include "em-format/e-mail-formatter-print.h"
 
 #define d(x)
 #define dd(x)
diff --git a/mail/e-mail-tag-editor.c b/mail/e-mail-tag-editor.c
index 9039366563..babc4d9c65 100644
--- a/mail/e-mail-tag-editor.c
+++ b/mail/e-mail-tag-editor.c
@@ -31,7 +31,6 @@
 #include <glib/gi18n-lib.h>
 
 #include "e-util/e-util.h"
-#include "widgets/misc/e-dateedit.h"
 
 #define E_MAIL_TAG_EDITOR_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/mail/e-mail-ui-session.c b/mail/e-mail-ui-session.c
index 47eeea2eea..7f80d8b6be 100644
--- a/mail/e-mail-ui-session.c
+++ b/mail/e-mail-ui-session.c
@@ -43,12 +43,10 @@
 #endif
 
 #include <libebackend/libebackend.h>
-#include <libedataserverui/libedataserverui.h>
 
 #include "e-mail-account-store.h"
 
 #include "e-util/e-util.h"
-#include "libevolution-utils/e-alert-dialog.h"
 #include "e-util/e-util-private.h"
 
 #include "shell/e-shell.h"
@@ -66,7 +64,7 @@
 #include "em-filter-rule.h"
 #include "em-utils.h"
 #include "libemail-engine/mail-config.h"
-#include "libemail-utils/mail-mt.h"
+#include "libemail-engine/mail-mt.h"
 #include "libemail-engine/mail-ops.h"
 #include "mail-send-recv.h"
 #include "libemail-engine/mail-tools.h"
diff --git a/mail/e-mail-ui-session.h b/mail/e-mail-ui-session.h
index 86ba4dd3f3..e6a65014b3 100644
--- a/mail/e-mail-ui-session.h
+++ b/mail/e-mail-ui-session.h
@@ -28,11 +28,10 @@
 #define E_MAIL_UI_SESSION_H
 
 #include <camel/camel.h>
+#include <e-util/e-util.h>
 #include <libemail-engine/e-mail-enums.h>
 #include <libemail-engine/e-mail-session.h>
 #include <libemail-engine/mail-folder-cache.h>
-#include <mail/e-mail-account-store.h>
-#include <e-util/e-activity.h>
 
 #include <mail/e-mail-account-store.h>
 #include <mail/e-mail-label-list-store.h>
diff --git a/mail/e-mail-view.h b/mail/e-mail-view.h
index 98072aecb0..1ff9878df2 100644
--- a/mail/e-mail-view.h
+++ b/mail/e-mail-view.h
@@ -25,7 +25,6 @@
 
 #include <shell/e-shell-view.h>
 #include <shell/e-shell-searchbar.h>
-#include <menus/gal-view-instance.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_VIEW \
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 2d8dcc9530..8f0da6141a 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -30,16 +30,13 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <libevolution-utils/e-alert-dialog.h>
-#include <libevolution-utils/e-alert-sink.h>
 #include <e-util/e-util.h>
 
-#include <libemail-utils/mail-mt.h>
-
 #include <libemail-engine/e-mail-folder-utils.h>
-#include <libemail-engine/e-mail-session.h>
 #include <libemail-engine/e-mail-session-utils.h>
+#include <libemail-engine/e-mail-session.h>
 #include <libemail-engine/e-mail-utils.h>
+#include <libemail-engine/mail-mt.h>
 #include <libemail-engine/mail-ops.h>
 #include <libemail-engine/mail-tools.h>
 
diff --git a/mail/em-config.h b/mail/em-config.h
index ede4a0a20b..5de022b6ad 100644
--- a/mail/em-config.h
+++ b/mail/em-config.h
@@ -24,8 +24,7 @@
 #define EM_CONFIG_H
 
 #include <camel/camel.h>
-
-#include "e-util/e-config.h"
+#include <e-util/e-util.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_CONFIG \
diff --git a/mail/em-event.h b/mail/em-event.h
index ef915429fc..8b4c510e16 100644
--- a/mail/em-event.h
+++ b/mail/em-event.h
@@ -24,8 +24,7 @@
 #ifndef EM_EVENT_H
 #define EM_EVENT_H
 
-#include "e-util/e-event.h"
-#include "composer/e-msg-composer.h"
+#include <composer/e-msg-composer.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_EVENT \
diff --git a/mail/em-filter-context.c b/mail/em-filter-context.c
index 41c27ff375..c0fd8be52c 100644
--- a/mail/em-filter-context.c
+++ b/mail/em-filter-context.c
@@ -29,8 +29,6 @@
 
 #include "em-filter-context.h"
 #include "em-filter-rule.h"
-#include "filter/e-filter-option.h"
-#include "filter/e-filter-int.h"
 #include "em-filter-source-element.h"
 
 /* For poking into filter-folder guts */
diff --git a/mail/em-filter-context.h b/mail/em-filter-context.h
index 1f8889d94c..c3f39d642a 100644
--- a/mail/em-filter-context.h
+++ b/mail/em-filter-context.h
@@ -25,7 +25,7 @@
 #ifndef EM_FILTER_CONTEXT_H
 #define EM_FILTER_CONTEXT_H
 
-#include <filter/e-rule-context.h>
+#include <e-util/e-util.h>
 #include <libemail-engine/e-mail-session.h>
 
 /* Standard GObject macros */
diff --git a/mail/em-filter-editor-folder-element.c b/mail/em-filter-editor-folder-element.c
index 6179384e33..0d2f5d6b8e 100644
--- a/mail/em-filter-editor-folder-element.c
+++ b/mail/em-filter-editor-folder-element.c
@@ -26,17 +26,16 @@
 #include <config.h>
 #endif
 
+#include "em-filter-editor-folder-element.h"
+
 #include <string.h>
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include "em-filter-editor-folder-element.h"
 #include "mail/em-folder-selection-button.h"
 #include "mail/em-utils.h"
 #include "shell/e-shell.h"
-#include "filter/e-filter-part.h"
-#include "libevolution-utils/e-alert.h"
 
 #define EM_FILTER_EDITOR_FOLDER_ELEMENT_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/mail/em-filter-editor-folder-element.h b/mail/em-filter-editor-folder-element.h
index acb84bb10e..a1d7381c45 100644
--- a/mail/em-filter-editor-folder-element.h
+++ b/mail/em-filter-editor-folder-element.h
@@ -25,9 +25,9 @@
 #ifndef EM_FILTER_EDITOR_FOLDER_ELEMENT_H
 #define EM_FILTER_EDITOR_FOLDER_ELEMENT_H
 
-#include <filter/e-filter-element.h>
-#include <libemail-utils/em-filter-folder-element.h>
+#include <e-util/e-util.h>
 #include <libemail-engine/e-mail-session.h>
+#include <libemail-engine/em-filter-folder-element.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_FILTER_EDITOR_FOLDER_ELEMENT \
diff --git a/mail/em-filter-editor.h b/mail/em-filter-editor.h
index 3df5b75dc8..7c5da50cf5 100644
--- a/mail/em-filter-editor.h
+++ b/mail/em-filter-editor.h
@@ -25,7 +25,8 @@
 #ifndef EM_FILTER_EDITOR_H
 #define EM_FILTER_EDITOR_H
 
-#include "filter/e-rule-editor.h"
+#include <e-util/e-util.h>
+
 #include "em-filter-context.h"
 
 /* Standard GObject macros */
diff --git a/mail/em-filter-rule.h b/mail/em-filter-rule.h
index 3b5fbd7008..805adadd7d 100644
--- a/mail/em-filter-rule.h
+++ b/mail/em-filter-rule.h
@@ -25,7 +25,7 @@
 #ifndef EM_FILTER_RULE_H
 #define EM_FILTER_RULE_H
 
-#include "filter/e-filter-rule.h"
+#include <e-util/e-util.h>
 
 #define EM_TYPE_FILTER_RULE \
 	(em_filter_rule_get_type ())
diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c
index cdb590564f..b08c117d34 100644
--- a/mail/em-filter-source-element.c
+++ b/mail/em-filter-source-element.c
@@ -25,17 +25,17 @@
 #include <config.h>
 #endif
 
-#include <string.h>
-
 #include "em-filter-source-element.h"
-#include "e-mail-account-store.h"
-#include "e-mail-ui-session.h"
+
+#include <string.h>
 
 #include <gtk/gtk.h>
 #include <camel/camel.h>
 
-#include <shell/e-shell.h>
-#include <filter/e-filter-part.h>
+#include "shell/e-shell.h"
+
+#include "e-mail-account-store.h"
+#include "e-mail-ui-session.h"
 
 #define EM_FILTER_SOURCE_ELEMENT_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/mail/em-filter-source-element.h b/mail/em-filter-source-element.h
index 061a487fc8..f66a3892be 100644
--- a/mail/em-filter-source-element.h
+++ b/mail/em-filter-source-element.h
@@ -24,7 +24,7 @@
 #ifndef EM_FILTER_SOURCE_ELEMENT_H
 #define EM_FILTER_SOURCE_ELEMENT_H
 
-#include <filter/e-filter-element.h>
+#include <e-util/e-util.h>
 #include <libemail-engine/e-mail-session.h>
 
 /* Standard GObject macros */
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index d6ab5acfcb..d17fd69b5d 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -31,8 +31,8 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <libemail-utils/mail-mt.h>
 #include <libemail-engine/e-mail-folder-utils.h>
+#include <libemail-engine/mail-mt.h>
 #include <libemail-engine/mail-ops.h>
 
 #include "e-mail-backend.h"
diff --git a/mail/em-folder-properties.h b/mail/em-folder-properties.h
index a94354dba8..08eb2f08d6 100644
--- a/mail/em-folder-properties.h
+++ b/mail/em-folder-properties.h
@@ -25,7 +25,6 @@
 #define __EM_FOLDER_PROPERTIES_H__
 
 #include <camel/camel.h>
-#include <libevolution-utils/e-alert-sink.h>
 #include <libemail-engine/e-mail-session.h>
 
 G_BEGIN_DECLS
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index 7eca514f54..750c0af208 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -39,12 +39,11 @@
 #include <e-util/e-util.h>
 #include <shell/e-shell.h>
 
-#include <libemail-utils/mail-mt.h>
-
 #include <libemail-engine/e-mail-folder-utils.h>
 #include <libemail-engine/mail-folder-cache.h>
-#include <libemail-engine/mail-tools.h>
+#include <libemail-engine/mail-mt.h>
 #include <libemail-engine/mail-ops.h>
+#include <libemail-engine/mail-tools.h>
 
 #include <e-mail-account-store.h>
 #include <e-mail-ui-session.h>
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 7793f877d0..33a89b1da1 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -39,18 +39,11 @@
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 
-#include "e-util/e-mktemp.h"
-#include "e-util/e-icon-factory.h"
-#include "libevolution-utils/e-alert-dialog.h"
-#include "e-util/e-util.h"
-
-#include "misc/e-selectable.h"
-
 #include "em-vfolder-editor-rule.h"
 
-#include "libemail-utils/mail-mt.h"
 #include "libemail-engine/e-mail-folder-utils.h"
 #include "libemail-engine/e-mail-session.h"
+#include "libemail-engine/mail-mt.h"
 #include "libemail-engine/mail-ops.h"
 #include "libemail-engine/mail-tools.h"
 
diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h
index 74eb111554..97c985c9ab 100644
--- a/mail/em-folder-tree.h
+++ b/mail/em-folder-tree.h
@@ -25,8 +25,7 @@
 #define EM_FOLDER_TREE_H
 
 #include <gtk/gtk.h>
-#include <e-util/e-activity.h>
-#include <libevolution-utils/e-alert-sink.h>
+#include <e-util/e-util.h>
 #include <mail/em-folder-tree-model.h>
 #include <libemail-engine/e-mail-session.h>
 
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index c211c03c44..686750a8c7 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -39,21 +39,18 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib/gi18n.h>
 
-#include "e-util/e-mktemp.h"
-
-#include "libevolution-utils/e-alert-dialog.h"
-#include "e-util/e-dialog-utils.h"
+#include "e-util/e-util.h"
 
 #include "em-vfolder-editor-rule.h"
 
-#include "libemail-utils/mail-mt.h"
 #include "libemail-engine/e-mail-folder-utils.h"
 #include "libemail-engine/e-mail-session.h"
 #include "libemail-engine/e-mail-store-utils.h"
 #include "libemail-engine/e-mail-utils.h"
+#include "libemail-engine/mail-folder-cache.h"
+#include "libemail-engine/mail-mt.h"
 #include "libemail-engine/mail-ops.h"
 #include "libemail-engine/mail-tools.h"
-#include "libemail-engine/mail-folder-cache.h"
 
 #include "e-mail-ui-session.h"
 #include "em-utils.h"
diff --git a/mail/em-search-context.c b/mail/em-search-context.c
index 2a900752aa..95fb097e17 100644
--- a/mail/em-search-context.c
+++ b/mail/em-search-context.c
@@ -26,12 +26,9 @@
 #include <config.h>
 #endif
 
-#include <string.h>
-
 #include "em-search-context.h"
-#include "filter/e-filter-rule.h"
-#include "filter/e-filter-option.h"
-#include "filter/e-filter-int.h"
+
+#include <string.h>
 
 G_DEFINE_TYPE (EMSearchContext, em_search_context, E_TYPE_RULE_CONTEXT)
 
diff --git a/mail/em-search-context.h b/mail/em-search-context.h
index 316a53a909..8a104db005 100644
--- a/mail/em-search-context.h
+++ b/mail/em-search-context.h
@@ -25,7 +25,7 @@
 #ifndef EM_SEARCH_CONTEXT_H
 #define EM_SEARCH_CONTEXT_H
 
-#include <filter/e-rule-context.h>
+#include <e-util/e-util.h>
 
 /* Standard GObject macros */
 #define EM_SEARCH_TYPE_CONTEXT \
diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c
index 1ee5269278..5a372b9117 100644
--- a/mail/em-subscription-editor.c
+++ b/mail/em-subscription-editor.c
@@ -25,13 +25,11 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include <libemail-utils/mail-mt.h>
-#include <libemail-engine/mail-tools.h>
-#include <libemail-engine/mail-ops.h>
+#include "libemail-engine/mail-mt.h"
+#include "libemail-engine/mail-tools.h"
+#include "libemail-engine/mail-ops.h"
 
-#include <e-util/e-dialog-utils.h>
-#include <e-util/e-util.h>
-#include <e-util/e-util-private.h>
+#include "e-util/e-util.h"
 
 #include "em-folder-utils.h"
 
diff --git a/mail/em-utils.c b/mail/em-utils.c
index d533be741d..3bb4b9f647 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -31,6 +31,7 @@
 #include <errno.h>
 #include <time.h>
 
+#include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
 #ifdef G_OS_WIN32
@@ -43,28 +44,18 @@
 
 #include "em-filter-editor.h"
 
-#include <glib/gi18n.h>
-
 #include <libebook/libebook.h>
 
-#include <e-util/e-util.h>
-#include <e-util/e-util-private.h>
-#include <e-util/e-mktemp.h>
-#include <e-util/e-dialog-utils.h>
-#include <libevolution-utils/e-alert-dialog.h>
-
-#include <shell/e-shell.h>
-#include <widgets/misc/e-attachment.h>
-
-#include <em-format/e-mail-parser.h>
-#include <em-format/e-mail-formatter-quote.h>
+#include "shell/e-shell.h"
 
-#include <libemail-utils/mail-mt.h>
+#include "em-format/e-mail-parser.h"
+#include "em-format/e-mail-formatter-quote.h"
 
-#include <libemail-engine/e-mail-folder-utils.h>
-#include <libemail-engine/e-mail-session.h>
-#include <libemail-engine/mail-ops.h>
-#include <libemail-engine/mail-tools.h>
+#include "libemail-engine/e-mail-folder-utils.h"
+#include "libemail-engine/e-mail-session.h"
+#include "libemail-engine/mail-mt.h"
+#include "libemail-engine/mail-ops.h"
+#include "libemail-engine/mail-tools.h"
 
 #include "e-mail-tag-editor.h"
 #include "em-composer-utils.h"
diff --git a/mail/em-vfolder-editor-context.c b/mail/em-vfolder-editor-context.c
index 31a2c20793..622bb5c882 100644
--- a/mail/em-vfolder-editor-context.c
+++ b/mail/em-vfolder-editor-context.c
@@ -26,15 +26,15 @@
 #include <config.h>
 #endif
 
-#include <string.h>
-#include <shell/e-shell.h>
-#include "mail/em-utils.h"
 #include "em-vfolder-editor-context.h"
-#include "em-vfolder-editor-rule.h"
-#include "filter/e-filter-option.h"
-#include "filter/e-filter-int.h"
+
+#include <string.h>
+
+#include "shell/e-shell.h"
 
 #include "em-filter-editor-folder-element.h"
+#include "em-utils.h"
+#include "em-vfolder-editor-rule.h"
 
 #define EM_VFOLDER_EDITOR_CONTEXT_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/mail/em-vfolder-editor-context.h b/mail/em-vfolder-editor-context.h
index 062d8bf08a..e131d92c11 100644
--- a/mail/em-vfolder-editor-context.h
+++ b/mail/em-vfolder-editor-context.h
@@ -25,9 +25,9 @@
 #ifndef EM_VFOLDER_EDITOR_CONTEXT_H
 #define EM_VFOLDER_EDITOR_CONTEXT_H
 
-#include <filter/e-rule-context.h>
-#include <libemail-utils/em-vfolder-context.h>
+#include <e-util/e-util.h>
 #include <libemail-engine/e-mail-session.h>
+#include <libemail-engine/em-vfolder-context.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_VFOLDER_EDITOR_CONTEXT \
diff --git a/mail/em-vfolder-editor-rule.c b/mail/em-vfolder-editor-rule.c
index 6a4cd6c37c..59c3713ed4 100644
--- a/mail/em-vfolder-editor-rule.c
+++ b/mail/em-vfolder-editor-rule.c
@@ -33,7 +33,6 @@
 #include <shell/e-shell.h>
 
 #include <e-util/e-util.h>
-#include <libevolution-utils/e-alert.h>
 #include <e-util/e-util-private.h>
 
 #include <libemail-engine/e-mail-folder-utils.h>
diff --git a/mail/em-vfolder-editor-rule.h b/mail/em-vfolder-editor-rule.h
index 39ad09797d..080ce49e3e 100644
--- a/mail/em-vfolder-editor-rule.h
+++ b/mail/em-vfolder-editor-rule.h
@@ -24,9 +24,9 @@
 #ifndef EM_VFOLDER_EDITOR_RULE_H
 #define EM_VFOLDER_EDITOR_RULE_H
 
-#include <filter/e-filter-rule.h>
-#include <libemail-utils/em-vfolder-rule.h>
+#include <e-util/e-util.h>
 #include <libemail-engine/e-mail-session.h>
+#include <libemail-engine/em-vfolder-rule.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_VFOLDER_EDITOR_RULE \
diff --git a/mail/em-vfolder-editor.h b/mail/em-vfolder-editor.h
index 311a63777f..252dffe035 100644
--- a/mail/em-vfolder-editor.h
+++ b/mail/em-vfolder-editor.h
@@ -24,7 +24,8 @@
 #ifndef EM_VFOLDER_EDITOR_H
 #define EM_VFOLDER_EDITOR_H
 
-#include "filter/e-rule-editor.h"
+#include <e-util/e-util.h>
+
 #include "em-vfolder-editor-context.h"
 
 /* Standard GObject macros */
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index 6d40087a3f..089dae4892 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -5,11 +5,11 @@ libevolution_mail_importers_la_CPPFLAGS = \
 	-I.. 						\
 	-I$(srcdir)/..					\
 	-I$(top_srcdir)					\
-	-I$(top_srcdir)/widgets				\
 	-DG_LOG_DOMAIN=\"evolution-mail-importer\"	\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"	\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)			\
 	$(GNOME_PLATFORM_CFLAGS)			\
+	$(CHAMPLAIN_CFLAGS)				\
 	$(GTKHTML_CFLAGS)
 
 libevolution_mail_importers_la_SOURCES =	\
@@ -24,14 +24,12 @@ libevolution_mail_importers_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 libevolution_mail_importers_la_LIBADD =				\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
-	$(top_builddir)/filter/libfilter.la			\
 	$(top_builddir)/mail/libevolution-mail.la		\
 	$(top_builddir)/shell/libeshell.la			\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/libemail-engine/libemail-engine.la \
-	$(top_builddir)/libemail-utils/libemail-utils.la		\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
+	$(CHAMPLAIN_LIBS)					\
 	$(GTKHTML_LIBS)
 
 -include $(top_srcdir)/git.mk
diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c
index 02d29f5394..8722a8d561 100644
--- a/mail/importers/elm-importer.c
+++ b/mail/importers/elm-importer.c
@@ -38,9 +38,8 @@
 
 #include "mail-importer.h"
 
-#include "libemail-utils/mail-mt.h"
+#include "libemail-engine/mail-mt.h"
 #include "mail/e-mail-backend.h"
-#include "e-util/e-import.h"
 #include "shell/e-shell.h"
 
 #define d(x)
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index 0f1e507f2c..ddbc798374 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -44,17 +44,15 @@
 #include "shell/e-shell-view.h"
 #include "shell/e-shell-sidebar.h"
 
+#include "libemail-engine/mail-mt.h"
+
 #include "mail/e-mail-backend.h"
 #include "mail/em-folder-selection-button.h"
 #include "mail/em-folder-tree-model.h"
 #include "mail/em-folder-tree.h"
-#include "libemail-utils/mail-mt.h"
 
 #include "mail-importer.h"
 
-#include "e-util/e-import.h"
-#include "misc/e-web-view-preview.h"
-
 typedef struct {
 	EImport *import;
 	EImportTarget *target;
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index be821063a6..19df23d03c 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -39,9 +39,9 @@
 #include "e-util/e-util-private.h"
 #include "shell/e-shell-backend.h"
 
-#include "libemail-utils/mail-mt.h"
-#include "libemail-engine/mail-tools.h"
 #include "libemail-engine/e-mail-session.h"
+#include "libemail-engine/mail-mt.h"
+#include "libemail-engine/mail-tools.h"
 
 #include "mail-importer.h"
 
diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h
index bd0335c299..11e97955d6 100644
--- a/mail/importers/mail-importer.h
+++ b/mail/importers/mail-importer.h
@@ -24,8 +24,8 @@
 #ifndef __MAIL_IMPORTER_H__
 #define __MAIL_IMPORTER_H__
 
-#include <e-util/e-import.h>
 #include <camel/camel.h>
+#include <e-util/e-util.h>
 #include <libemail-engine/e-mail-session.h>
 
 EImportImporter *mbox_importer_peek (void);
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index c8904c4e0b..eb7e5ade07 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -40,9 +40,8 @@
 
 #include "mail-importer.h"
 
-#include "libemail-utils/mail-mt.h"
+#include "libemail-engine/mail-mt.h"
 #include "mail/e-mail-backend.h"
-#include "e-util/e-import.h"
 #include "shell/e-shell.h"
 
 #define d(x)
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index 5ce81dd001..c7cefb3735 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -35,7 +35,6 @@
 #include "mail-vfolder-ui.h"
 #include "mail-autofilter.h"
 #include "em-utils.h"
-#include "libevolution-utils/e-alert-dialog.h"
 #include "e-util/e-util-private.h"
 
 #include "em-vfolder-editor-context.h"
@@ -45,8 +44,6 @@
 #include "em-filter-context.h"
 #include "em-filter-rule.h"
 #include "em-filter-editor.h"
-#include "filter/e-filter-option.h"
-#include "filter/e-filter-input.h"
 
 #define d(x)
 
diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h
index a9e4254f9b..79c879317f 100644
--- a/mail/mail-autofilter.h
+++ b/mail/mail-autofilter.h
@@ -26,10 +26,9 @@
 
 #include <camel/camel.h>
 
-#include <filter/e-filter-rule.h>
 #include <mail/em-filter-context.h>
-#include <libemail-utils/em-vfolder-context.h>
 #include <libemail-engine/e-mail-session.h>
+#include <libemail-engine/em-vfolder-context.h>
 
 enum {
 	AUTO_SUBJECT = 1,
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index e5001157a8..7d7f0f94f6 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -32,14 +32,13 @@
 #include <shell/e-shell.h>
 #include <e-util/e-util.h>
 
-#include <libemail-utils/mail-mt.h>
-
 /* This is our hack, not part of libcamel. */
 #include <libemail-engine/camel-null-store.h>
 
 #include <libemail-engine/e-mail-folder-utils.h>
 #include <libemail-engine/e-mail-session.h>
 #include <libemail-engine/mail-folder-cache.h>
+#include <libemail-engine/mail-mt.h>
 #include <libemail-engine/mail-ops.h>
 #include <libemail-engine/mail-tools.h>
 
diff --git a/mail/mail-vfolder-ui.c b/mail/mail-vfolder-ui.c
index efe086c262..48b7fcef66 100644
--- a/mail/mail-vfolder-ui.c
+++ b/mail/mail-vfolder-ui.c
@@ -28,14 +28,13 @@
 
 #include <glib/gi18n.h>
 
-#include "libevolution-utils/e-alert-dialog.h"
 #include "e-util/e-util-private.h"
 
-#include "libemail-utils/mail-mt.h"
-#include "libemail-engine/mail-folder-cache.h"
 #include "libemail-engine/e-mail-folder-utils.h"
 #include "libemail-engine/e-mail-session.h"
 #include "libemail-engine/e-mail-utils.h"
+#include "libemail-engine/mail-folder-cache.h"
+#include "libemail-engine/mail-mt.h"
 #include "libemail-engine/mail-ops.h"
 #include "libemail-engine/mail-tools.h"
 
diff --git a/mail/mail-vfolder-ui.h b/mail/mail-vfolder-ui.h
index 55b838c63b..07bcaa3fe5 100644
--- a/mail/mail-vfolder-ui.h
+++ b/mail/mail-vfolder-ui.h
@@ -24,12 +24,11 @@
 
 #include <camel/camel.h>
 
-#include <filter/e-filter-part.h>
-#include <filter/e-filter-rule.h>
+#include <libemail-engine/em-vfolder-rule.h>
+#include <libemail-engine/mail-vfolder.h>
+
 #include <mail/e-mail-backend.h>
-#include <libemail-utils/em-vfolder-rule.h>
 #include <shell/e-shell-view.h>
-#include <libemail-engine/mail-vfolder.h>
 
 void		vfolder_edit			(EMailBackend *backend,
 						 GtkWindow *parent_window);
diff --git a/mail/message-list.c b/mail/message-list.c
index 473cc4faec..71bc8bbe0c 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -26,6 +26,8 @@
 #include <config.h>
 #endif
 
+#include "message-list.h"
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -36,38 +38,18 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
-#include "e-util/e-icon-factory.h"
-#include "e-util/e-poolv.h"
-#include "e-util/e-util-private.h"
-#include "e-util/e-util.h"
-
-#include "misc/e-selectable.h"
-
 #include "shell/e-shell.h"
 #include "shell/e-shell-settings.h"
 
-#include "table/e-cell-checkbox.h"
-#include "table/e-cell-hbox.h"
-#include "table/e-cell-date.h"
-#include "table/e-cell-size.h"
-#include "table/e-cell-text.h"
-#include "table/e-cell-toggle.h"
-#include "table/e-cell-tree.h"
-#include "table/e-cell-vbox.h"
-#include "table/e-table-sorting-utils.h"
-#include "table/e-tree-memory-callbacks.h"
-#include "table/e-tree-memory.h"
-
-#include "libemail-utils/mail-mt.h"
 #include "libemail-engine/e-mail-utils.h"
 #include "libemail-engine/mail-config.h"
+#include "libemail-engine/mail-mt.h"
 #include "libemail-engine/mail-ops.h"
 #include "libemail-engine/mail-tools.h"
 
-#include "mail/e-mail-label-list-store.h"
-#include "mail/e-mail-ui-session.h"
-#include "mail/em-utils.h"
-#include "mail/message-list.h"
+#include "e-mail-label-list-store.h"
+#include "e-mail-ui-session.h"
+#include "em-utils.h"
 
 /*#define TIMEIT */
 
diff --git a/mail/message-list.h b/mail/message-list.h
index 9c93c46b05..daa27f2c1a 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include <camel/camel.h>
 
-#include <table/e-tree.h>
+#include <e-util/e-util.h>
 #include <libemail-engine/e-mail-session.h>
 
 /* Standard GObject macros */