Convert libemail-engine to a single-include model.

Use: #include <libemail-engine/libemail-engine.h>

58 files changed, 98 insertions, 280 deletions

diff --git a/mail/e-http-request.c b/mail/e-http-request.c
index 971a0eb5c7..5a2601c0e3 100644
--- a/mail/e-http-request.c
+++ b/mail/e-http-request.c
@@ -16,12 +16,11 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "e-http-request.h"
 
+#include <config.h>
+#include <string.h>
+
 #define LIBSOUP_USE_UNSTABLE_REQUEST_API
 #include <libsoup/soup.h>
 #include <libsoup/soup-requester.h>
@@ -30,10 +29,9 @@
 #include <webkit/webkit.h>
 
 #include <e-util/e-util.h>
-#include <mail/em-utils.h>
-#include <libemail-engine/e-mail-engine-enumtypes.h>
+#include <libemail-engine/libemail-engine.h>
 
-#include <string.h>
+#include <mail/em-utils.h>
 
 #include <shell/e-shell.h>
 
diff --git a/mail/e-mail-account-manager.c b/mail/e-mail-account-manager.c
index b1c7731910..65a258dcea 100644
--- a/mail/e-mail-account-manager.c
+++ b/mail/e-mail-account-manager.c
@@ -22,7 +22,8 @@
 #include <glib/gi18n-lib.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <libemail-engine/e-mail-session.h>
+#include <libemail-engine/libemail-engine.h>
+
 #include <mail/e-mail-account-tree-view.h>
 
 #define E_MAIL_ACCOUNT_MANAGER_GET_PRIVATE(obj) \
diff --git a/mail/e-mail-account-store.c b/mail/e-mail-account-store.c
index b4880325f0..781674e9fb 100644
--- a/mail/e-mail-account-store.c
+++ b/mail/e-mail-account-store.c
@@ -24,7 +24,7 @@
 
 #include <libebackend/libebackend.h>
 
-#include <libemail-engine/mail-ops.h>
+#include <libemail-engine/libemail-engine.h>
 
 #include <mail/mail-vfolder-ui.h>
 
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 0d1c4bf5f1..4e8d773705 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -34,13 +34,6 @@
 
 #include <shell/e-shell.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/mail-config.h>
-#include <libemail-engine/mail-folder-cache.h>
-#include <libemail-engine/mail-ops.h>
-
 #include <mail/e-mail-migrate.h>
 #include <mail/e-mail-ui-session.h>
 #include <mail/em-event.h>
diff --git a/mail/e-mail-backend.h b/mail/e-mail-backend.h
index 0bc94f1318..36ecd02aa8 100644
--- a/mail/e-mail-backend.h
+++ b/mail/e-mail-backend.h
@@ -27,7 +27,7 @@
 #define E_MAIL_BACKEND_H
 
 #include <shell/e-shell-backend.h>
-#include <libemail-engine/e-mail-session.h>
+#include <libemail-engine/libemail-engine.h>
 #include <mail/e-mail-send-account-override.h>
 
 /* Standard GObject macros */
diff --git a/mail/e-mail-config-assistant.h b/mail/e-mail-config-assistant.h
index de225af921..18698d835d 100644
--- a/mail/e-mail-config-assistant.h
+++ b/mail/e-mail-config-assistant.h
@@ -20,10 +20,10 @@
 #define E_MAIL_CONFIG_ASSISTANT_H
 
 #include <gtk/gtk.h>
+#include <libemail-engine/libemail-engine.h>
 
 #include <mail/e-mail-config-page.h>
 #include <mail/e-mail-config-service-backend.h>
-#include <libemail-engine/e-mail-session.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_CONFIG_ASSISTANT \
diff --git a/mail/e-mail-config-defaults-page.c b/mail/e-mail-config-defaults-page.c
index 64e29cbb94..f18002dedb 100644
--- a/mail/e-mail-config-defaults-page.c
+++ b/mail/e-mail-config-defaults-page.c
@@ -23,8 +23,6 @@
 
 #include <libebackend/libebackend.h>
 
-#include <libemail-engine/e-mail-folder-utils.h>
-
 #include <mail/e-mail-config-page.h>
 #include <mail/em-folder-selection-button.h>
 
diff --git a/mail/e-mail-config-defaults-page.h b/mail/e-mail-config-defaults-page.h
index 0f6371ce08..0a00f464e3 100644
--- a/mail/e-mail-config-defaults-page.h
+++ b/mail/e-mail-config-defaults-page.h
@@ -20,7 +20,7 @@
 #define E_MAIL_CONFIG_DEFAULTS_PAGE_H
 
 #include <gtk/gtk.h>
-#include <libemail-engine/e-mail-session.h>
+#include <libemail-engine/libemail-engine.h>
 
 #include <mail/e-mail-config-page.h>
 
diff --git a/mail/e-mail-config-notebook.h b/mail/e-mail-config-notebook.h
index 3e816c69b4..2c35d946ec 100644
--- a/mail/e-mail-config-notebook.h
+++ b/mail/e-mail-config-notebook.h
@@ -20,8 +20,7 @@
 #define E_MAIL_CONFIG_NOTEBOOK_H
 
 #include <gtk/gtk.h>
-
-#include <libemail-engine/e-mail-session.h>
+#include <libemail-engine/libemail-engine.h>
 
 #include <mail/e-mail-config-page.h>
 
diff --git a/mail/e-mail-config-window.h b/mail/e-mail-config-window.h
index 6699e8ad38..d4d49636d2 100644
--- a/mail/e-mail-config-window.h
+++ b/mail/e-mail-config-window.h
@@ -20,8 +20,7 @@
 #define E_MAIL_CONFIG_WINDOW_H
 
 #include <gtk/gtk.h>
-
-#include <libemail-engine/e-mail-session.h>
+#include <libemail-engine/libemail-engine.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_CONFIG_WINDOW \
diff --git a/mail/e-mail-folder-pane.c b/mail/e-mail-folder-pane.c
index 0a8f237805..789766934f 100644
--- a/mail/e-mail-folder-pane.c
+++ b/mail/e-mail-folder-pane.c
@@ -28,11 +28,10 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
-#include "shell/e-shell.h"
-#include "shell/e-shell-utils.h"
+#include <shell/e-shell.h>
+#include <shell/e-shell-utils.h>
 
-#include "libemail-engine/e-mail-utils.h"
-#include "libemail-engine/mail-tools.h"
+#include <libemail-engine/libemail-engine.h>
 
 #include "e-mail-reader.h"
 #include "e-mail-reader-utils.h"
diff --git a/mail/e-mail-junk-options.c b/mail/e-mail-junk-options.c
index 34793dad6a..7d93a86c5f 100644
--- a/mail/e-mail-junk-options.c
+++ b/mail/e-mail-junk-options.c
@@ -21,8 +21,6 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libemail-engine/e-mail-junk-filter.h>
-
 #define E_MAIL_JUNK_OPTIONS_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_MAIL_JUNK_OPTIONS, EMailJunkOptionsPrivate))
diff --git a/mail/e-mail-junk-options.h b/mail/e-mail-junk-options.h
index 7e9108e7b7..15e8c88244 100644
--- a/mail/e-mail-junk-options.h
+++ b/mail/e-mail-junk-options.h
@@ -20,7 +20,7 @@
 #define E_MAIL_JUNK_OPTIONS_H
 
 #include <gtk/gtk.h>
-#include <libemail-engine/e-mail-session.h>
+#include <libemail-engine/libemail-engine.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_JUNK_OPTIONS \
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index 4a50e7c375..e982b402ed 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -46,10 +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 "libemail-engine/e-mail-folder-utils.h"
+#include <libemail-engine/libemail-engine.h>
 
 #include "e-mail-backend.h"
 #include "em-utils.h"
diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index f8b008a45c..550e44de93 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -20,20 +20,14 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "e-mail-paned-view.h"
 
+#include <config.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/libemail-engine.h>
 
 #include "em-utils.h"
 #include "message-list.h"
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index 512af51d62..78f442d806 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -32,17 +32,14 @@
 #include <gtkhtml/gtkhtml.h>
 #include <camel/camel.h>
 
-#include "shell/e-shell-utils.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/libemail-engine.h>
 
-#include "em-format/e-mail-parser.h"
-#include "em-format/e-mail-part-utils.h"
+#include <em-format/e-mail-parser.h>
+#include <em-format/e-mail-part-utils.h>
 
-#include "composer/e-composer-actions.h"
+#include <composer/e-composer-actions.h>
 
 #include "e-mail-backend.h"
 #include "e-mail-browser.h"
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index aee670d60a..9fbed51270 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -32,15 +32,13 @@
 #include <X11/XF86keysym.h>
 #endif
 
-#include "shell/e-shell-utils.h"
+#include <shell/e-shell-utils.h>
 
-#include "libemail-engine/e-mail-utils.h"
-#include "libemail-engine/mail-mt.h"
-#include "libemail-engine/mail-ops.h"
+#include <libemail-engine/libemail-engine.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"
diff --git a/mail/e-mail-sidebar.c b/mail/e-mail-sidebar.c
index 20cf41404c..41d6d5d685 100644
--- a/mail/e-mail-sidebar.c
+++ b/mail/e-mail-sidebar.c
@@ -19,17 +19,12 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "e-mail-sidebar.h"
 
+#include <config.h>
 #include <string.h>
 #include <camel/camel.h>
 
-#include <libemail-engine/e-mail-folder-utils.h>
-
 #include "mail/em-utils.h"
 
 #define E_MAIL_SIDEBAR_GET_PRIVATE(obj) \
diff --git a/mail/e-mail-sidebar.h b/mail/e-mail-sidebar.h
index a57b6d45f8..de1ba44e75 100644
--- a/mail/e-mail-sidebar.h
+++ b/mail/e-mail-sidebar.h
@@ -23,7 +23,7 @@
 #define E_MAIL_SIDEBAR_H
 
 #include <mail/em-folder-tree.h>
-#include <libemail-engine/e-mail-session.h>
+#include <libemail-engine/libemail-engine.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_SIDEBAR \
diff --git a/mail/e-mail-ui-session.c b/mail/e-mail-ui-session.c
index f76b94c142..667fd1b09f 100644
--- a/mail/e-mail-ui-session.c
+++ b/mail/e-mail-ui-session.c
@@ -54,20 +54,13 @@
 #include "shell/e-shell-content.h"
 #include "shell/e-shell-window.h"
 
-#include "libemail-engine/e-mail-folder-utils.h"
-#include "libemail-engine/e-mail-junk-filter.h"
-#include "libemail-engine/e-mail-session.h"
 #include "e-mail-ui-session.h"
 #include "em-composer-utils.h"
 #include "em-filter-context.h"
 #include "em-vfolder-editor-context.h"
 #include "em-filter-rule.h"
 #include "em-utils.h"
-#include "libemail-engine/mail-config.h"
-#include "libemail-engine/mail-mt.h"
-#include "libemail-engine/mail-ops.h"
 #include "mail-send-recv.h"
-#include "libemail-engine/mail-tools.h"
 
 #define E_MAIL_UI_SESSION_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/mail/e-mail-ui-session.h b/mail/e-mail-ui-session.h
index 99e2b22fb6..6b371459e3 100644
--- a/mail/e-mail-ui-session.h
+++ b/mail/e-mail-ui-session.h
@@ -29,8 +29,7 @@
 
 #include <camel/camel.h>
 #include <e-util/e-util.h>
-#include <libemail-engine/e-mail-session.h>
-#include <libemail-engine/mail-folder-cache.h>
+#include <libemail-engine/libemail-engine.h>
 
 #include <mail/e-mail-account-store.h>
 #include <mail/e-mail-label-list-store.h>
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 507f12f91b..62405fdb5b 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -32,13 +32,7 @@
 
 #include <e-util/e-util.h>
 
-#include <libemail-engine/e-mail-folder-utils.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>
+#include <libemail-engine/libemail-engine.h>
 
 #include <em-format/e-mail-parser.h>
 #include <em-format/e-mail-formatter-quote.h>
diff --git a/mail/em-filter-context.h b/mail/em-filter-context.h
index c3f39d642a..b392bdbdad 100644
--- a/mail/em-filter-context.h
+++ b/mail/em-filter-context.h
@@ -26,7 +26,7 @@
 #define EM_FILTER_CONTEXT_H
 
 #include <e-util/e-util.h>
-#include <libemail-engine/e-mail-session.h>
+#include <libemail-engine/libemail-engine.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_FILTER_CONTEXT \
diff --git a/mail/em-filter-editor-folder-element.c b/mail/em-filter-editor-folder-element.c
index 0d2f5d6b8e..2121d6d0e7 100644
--- a/mail/em-filter-editor-folder-element.c
+++ b/mail/em-filter-editor-folder-element.c
@@ -22,12 +22,9 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "em-filter-editor-folder-element.h"
 
+#include <config.h>
 #include <string.h>
 
 #include <gtk/gtk.h>
diff --git a/mail/em-filter-editor-folder-element.h b/mail/em-filter-editor-folder-element.h
index a1d7381c45..7ec2e27b64 100644
--- a/mail/em-filter-editor-folder-element.h
+++ b/mail/em-filter-editor-folder-element.h
@@ -26,8 +26,7 @@
 #define EM_FILTER_EDITOR_FOLDER_ELEMENT_H
 
 #include <e-util/e-util.h>
-#include <libemail-engine/e-mail-session.h>
-#include <libemail-engine/em-filter-folder-element.h>
+#include <libemail-engine/libemail-engine.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_FILTER_EDITOR_FOLDER_ELEMENT \
diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c
index b08c117d34..d6fbd704e1 100644
--- a/mail/em-filter-source-element.c
+++ b/mail/em-filter-source-element.c
@@ -21,12 +21,9 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "em-filter-source-element.h"
 
+#include <config.h>
 #include <string.h>
 
 #include <gtk/gtk.h>
diff --git a/mail/em-filter-source-element.h b/mail/em-filter-source-element.h
index f66a3892be..0f5d9de8a3 100644
--- a/mail/em-filter-source-element.h
+++ b/mail/em-filter-source-element.h
@@ -25,7 +25,7 @@
 #define EM_FILTER_SOURCE_ELEMENT_H
 
 #include <e-util/e-util.h>
-#include <libemail-engine/e-mail-session.h>
+#include <libemail-engine/libemail-engine.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_FILTER_SOURCE_ELEMENT \
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index a3a9e94875..d0ec478dd5 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -33,9 +33,7 @@
 
 #include <shell/e-shell.h>
 
-#include <libemail-engine/e-mail-folder-utils.h>
-#include <libemail-engine/mail-mt.h>
-#include <libemail-engine/mail-ops.h>
+#include <libemail-engine/libemail-engine.h>
 
 #include <e-util/e-util.h>
 
diff --git a/mail/em-folder-properties.h b/mail/em-folder-properties.h
index 08eb2f08d6..663bcaa49e 100644
--- a/mail/em-folder-properties.h
+++ b/mail/em-folder-properties.h
@@ -25,7 +25,7 @@
 #define __EM_FOLDER_PROPERTIES_H__
 
 #include <camel/camel.h>
-#include <libemail-engine/e-mail-session.h>
+#include <e-util/e-util.h>
 
 G_BEGIN_DECLS
 
diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c
index 3779eef5e5..23ce76acda 100644
--- a/mail/em-folder-selection-button.c
+++ b/mail/em-folder-selection-button.c
@@ -20,22 +20,19 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "em-folder-selection-button.h"
 
+#include <config.h>
 #include <string.h>
 #include <glib/gi18n.h>
 #include <e-util/e-util.h>
 
-#include <libemail-engine/e-mail-folder-utils.h>
+#include <libemail-engine/libemail-engine.h>
 
 #include "em-folder-tree.h"
 #include "em-folder-selector.h"
 #include "em-utils.h"
 
-#include "em-folder-selection-button.h"
-
 #define EM_FOLDER_SELECTION_BUTTON_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), EM_TYPE_FOLDER_SELECTION_BUTTON, EMFolderSelectionButtonPrivate))
diff --git a/mail/em-folder-selection-button.h b/mail/em-folder-selection-button.h
index 945f1dab0b..1cb202e373 100644
--- a/mail/em-folder-selection-button.h
+++ b/mail/em-folder-selection-button.h
@@ -25,7 +25,7 @@
 #define EM_FOLDER_SELECTION_BUTTON_H
 
 #include <gtk/gtk.h>
-#include <libemail-engine/e-mail-session.h>
+#include <libemail-engine/libemail-engine.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_FOLDER_SELECTION_BUTTON \
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index 7d35674e11..3f4f26205d 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -21,18 +21,16 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "em-folder-selector.h"
 
+#include <config.h>
 #include <string.h>
 #include <glib/gi18n.h>
-#include <e-util/e-util.h>
 
-#include <libemail-engine/e-mail-session.h>
+#include <e-util/e-util.h>
+#include <libemail-engine/libemail-engine.h>
 
 #include "em-folder-tree.h"
-#include "em-folder-selector.h"
 #include "em-folder-utils.h"
 #include "em-utils.h"
 
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index a7039f28d1..69c80959b1 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -20,12 +20,9 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "em-folder-tree-model.h"
 
+#include <config.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
@@ -39,23 +36,11 @@
 #include <e-util/e-util.h>
 #include <shell/e-shell.h>
 
-#include <libemail-engine/e-mail-folder-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 <e-mail-account-store.h>
-#include <e-mail-ui-session.h>
-#include <em-utils.h>
-#include <em-folder-utils.h>
-#include <em-event.h>
-
-#define EM_FOLDER_TREE_MODEL_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), EM_TYPE_FOLDER_TREE_MODEL, EMFolderTreeModelPrivate))
-
-#define d(x)
+#include "e-mail-account-store.h"
+#include "e-mail-ui-session.h"
+#include "em-utils.h"
+#include "em-folder-utils.h"
+#include "em-event.h"
 
 #define EM_FOLDER_TREE_MODEL_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h
index af8acd72ff..6d9f211eea 100644
--- a/mail/em-folder-tree-model.h
+++ b/mail/em-folder-tree-model.h
@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include <camel/camel.h>
 
-#include <libemail-engine/e-mail-session.h>
+#include <libemail-engine/libemail-engine.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_FOLDER_TREE_MODEL \
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index fb2441b1d5..27091e2f5c 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -20,10 +20,9 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "em-folder-tree.h"
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -37,18 +36,10 @@
 
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <glib/gi18n.h>
 
 #include "em-vfolder-editor-rule.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 "em-utils.h"
-#include "em-folder-tree.h"
 #include "em-folder-utils.h"
 #include "em-folder-selector.h"
 #include "em-folder-properties.h"
diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h
index 97c985c9ab..adf4528c35 100644
--- a/mail/em-folder-tree.h
+++ b/mail/em-folder-tree.h
@@ -27,7 +27,7 @@
 #include <gtk/gtk.h>
 #include <e-util/e-util.h>
 #include <mail/em-folder-tree-model.h>
-#include <libemail-engine/e-mail-session.h>
+#include <libemail-engine/libemail-engine.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_FOLDER_TREE \
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index f96f7d18cd..5633abc8f8 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -20,10 +20,9 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "em-folder-utils.h"
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -39,24 +38,14 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib/gi18n.h>
 
-#include "e-util/e-util.h"
+#include <e-util/e-util.h>
 
 #include "em-vfolder-editor-rule.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 "e-mail-ui-session.h"
 #include "em-utils.h"
 #include "em-folder-tree.h"
 #include "em-folder-tree-model.h"
-#include "em-folder-utils.h"
 #include "em-folder-selector.h"
 #include "em-folder-properties.h"
 #include "mail-vfolder-ui.h"
diff --git a/mail/em-folder-utils.h b/mail/em-folder-utils.h
index db3853042c..4701db9c5f 100644
--- a/mail/em-folder-utils.h
+++ b/mail/em-folder-utils.h
@@ -26,7 +26,7 @@
 
 #include <gtk/gtk.h>
 #include <camel/camel.h>
-#include <libemail-engine/e-mail-session.h>
+#include <libemail-engine/libemail-engine.h>
 #include <mail/em-folder-tree.h>
 
 G_BEGIN_DECLS
diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c
index 77fb6b2bb1..52a7314ec5 100644
--- a/mail/em-subscription-editor.c
+++ b/mail/em-subscription-editor.c
@@ -16,20 +16,13 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "em-subscription-editor.h"
 
+#include <config.h>
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include "libemail-engine/mail-mt.h"
-#include "libemail-engine/mail-tools.h"
-#include "libemail-engine/mail-ops.h"
-
-#include "e-util/e-util.h"
+#include <e-util/e-util.h>
 
 #include "em-folder-utils.h"
 
@@ -44,10 +37,6 @@
 	((folder_info) != NULL && \
 	((folder_info)->flags & CAMEL_FOLDER_SUBSCRIBED) != 0)
 
-#define EM_SUBSCRIPTION_EDITOR_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), EM_TYPE_SUBSCRIPTION_EDITOR, EMSubscriptionEditorPrivate))
-
 typedef struct _AsyncContext AsyncContext;
 typedef struct _TreeRowData TreeRowData;
 typedef struct _StoreData StoreData;
diff --git a/mail/em-subscription-editor.h b/mail/em-subscription-editor.h
index b9abedb166..856b49e149 100644
--- a/mail/em-subscription-editor.h
+++ b/mail/em-subscription-editor.h
@@ -21,7 +21,7 @@
 
 #include <gtk/gtk.h>
 #include <camel/camel.h>
-#include <libemail-engine/e-mail-session.h>
+#include <libemail-engine/libemail-engine.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_SUBSCRIPTION_EDITOR \
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 03a6ce56a1..db68b96003 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -20,10 +20,9 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "em-utils.h"
 
+#include <config.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
@@ -42,25 +41,17 @@
 #undef interface
 #endif
 
-#include "em-filter-editor.h"
-
 #include <libebook/libebook.h>
 
-#include "shell/e-shell.h"
+#include <shell/e-shell.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-mt.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-formatter-quote.h>
 
+#include "e-mail-printer.h"
 #include "e-mail-tag-editor.h"
 #include "em-composer-utils.h"
-#include "em-utils.h"
-#include "e-mail-printer.h"
+#include "em-filter-editor.h"
 
 /* How many is too many? */
 /* Used in em_util_ask_open_many() */
diff --git a/mail/em-utils.h b/mail/em-utils.h
index cb71f155f5..d23dc396b7 100644
--- a/mail/em-utils.h
+++ b/mail/em-utils.h
@@ -27,8 +27,7 @@
 #include <sys/types.h>
 #include <camel/camel.h>
 
-#include <libemail-engine/e-mail-session.h>
-#include <libemail-engine/e-mail-utils.h>
+#include <libemail-engine/libemail-engine.h>
 
 #include <mail/e-mail-reader.h>
 #include <mail/em-folder-tree.h>
diff --git a/mail/em-vfolder-editor-context.h b/mail/em-vfolder-editor-context.h
index e131d92c11..3886f1d04c 100644
--- a/mail/em-vfolder-editor-context.h
+++ b/mail/em-vfolder-editor-context.h
@@ -26,8 +26,7 @@
 #define EM_VFOLDER_EDITOR_CONTEXT_H
 
 #include <e-util/e-util.h>
-#include <libemail-engine/e-mail-session.h>
-#include <libemail-engine/em-vfolder-context.h>
+#include <libemail-engine/libemail-engine.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 1319bdcee0..9d85356537 100644
--- a/mail/em-vfolder-editor-rule.c
+++ b/mail/em-vfolder-editor-rule.c
@@ -21,10 +21,9 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "em-vfolder-editor-rule.h"
 
+#include <config.h>
 #include <string.h>
 
 #include <gtk/gtk.h>
@@ -35,13 +34,10 @@
 #include <e-util/e-util.h>
 #include <e-util/e-util-private.h>
 
-#include <libemail-engine/e-mail-folder-utils.h>
-
 #include "em-folder-selector.h"
 #include "em-folder-tree.h"
 #include "em-utils.h"
 #include "em-vfolder-editor-context.h"
-#include "em-vfolder-editor-rule.h"
 
 #define EM_VFOLDER_EDITOR_RULE_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/mail/em-vfolder-editor-rule.h b/mail/em-vfolder-editor-rule.h
index 080ce49e3e..617bcd24b9 100644
--- a/mail/em-vfolder-editor-rule.h
+++ b/mail/em-vfolder-editor-rule.h
@@ -25,8 +25,7 @@
 #define EM_VFOLDER_EDITOR_RULE_H
 
 #include <e-util/e-util.h>
-#include <libemail-engine/e-mail-session.h>
-#include <libemail-engine/em-vfolder-rule.h>
+#include <libemail-engine/libemail-engine.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_VFOLDER_EDITOR_RULE \
diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c
index 97ee58d474..c8975bf2c0 100644
--- a/mail/importers/elm-importer.c
+++ b/mail/importers/elm-importer.c
@@ -21,10 +21,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
 #include <stdio.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -38,7 +35,6 @@
 
 #include "mail-importer.h"
 
-#include "libemail-engine/mail-mt.h"
 #include "mail/e-mail-backend.h"
 #include "shell/e-shell.h"
 
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index 3149441ff9..5eb59e82f0 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -21,10 +21,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -44,8 +41,6 @@
 #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"
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index a54cd08a82..0af34a3861 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -21,10 +21,9 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "mail-importer.h"
 
+#include <config.h>
 #include <errno.h>
 #include <string.h>
 #include <sys/types.h>
@@ -39,12 +38,6 @@
 #include "e-util/e-util-private.h"
 #include "shell/e-shell-backend.h"
 
-#include "libemail-engine/e-mail-session.h"
-#include "libemail-engine/mail-mt.h"
-#include "libemail-engine/mail-tools.h"
-
-#include "mail-importer.h"
-
 struct _import_mbox_msg {
 	MailMsg base;
 
diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h
index 11e97955d6..fcbd298895 100644
--- a/mail/importers/mail-importer.h
+++ b/mail/importers/mail-importer.h
@@ -26,7 +26,7 @@
 
 #include <camel/camel.h>
 #include <e-util/e-util.h>
-#include <libemail-engine/e-mail-session.h>
+#include <libemail-engine/libemail-engine.h>
 
 EImportImporter *mbox_importer_peek (void);
 
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index 4fd5f37e93..f5ae3fdd28 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -21,10 +21,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
 #include <stdio.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -40,7 +37,6 @@
 
 #include "mail-importer.h"
 
-#include "libemail-engine/mail-mt.h"
 #include "mail/e-mail-backend.h"
 #include "shell/e-shell.h"
 
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index 62d1f6ee92..af18cb525b 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -20,18 +20,12 @@
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 
+#include <config.h>
 #include <ctype.h>
 #include <string.h>
-
 #include <glib/gi18n.h>
 
-#include <libemail-engine/e-mail-folder-utils.h>
-#include <libemail-engine/e-mail-session.h>
-
 #include "mail-vfolder-ui.h"
 #include "mail-autofilter.h"
 #include "em-utils.h"
diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h
index 79c879317f..6e62bcd44e 100644
--- a/mail/mail-autofilter.h
+++ b/mail/mail-autofilter.h
@@ -25,10 +25,9 @@
 #define MAIL_AUTOFILTER_H
 
 #include <camel/camel.h>
+#include <libemail-engine/libemail-engine.h>
 
 #include <mail/em-filter-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 76859c687e..d524242898 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -20,34 +20,21 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "mail-send-recv.h"
 
+#include <config.h>
 #include <stdio.h>
 #include <string.h>
-
 #include <glib/gi18n.h>
 
 #include <shell/e-shell.h>
 #include <e-util/e-util.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>
-
 #include "e-mail-account-store.h"
 #include "e-mail-ui-session.h"
 #include "em-event.h"
 #include "em-filter-rule.h"
 #include "em-utils.h"
-#include "mail-send-recv.h"
 
 #define d(x)
 
diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h
index fb49493060..ffd0b63143 100644
--- a/mail/mail-send-recv.h
+++ b/mail/mail-send-recv.h
@@ -24,7 +24,7 @@
 #define MAIL_SEND_RECV_H
 
 #include <gtk/gtk.h>
-#include <libemail-engine/e-mail-session.h>
+#include <libemail-engine/libemail-engine.h>
 
 G_BEGIN_DECLS
 
diff --git a/mail/mail-vfolder-ui.c b/mail/mail-vfolder-ui.c
index 48b7fcef66..09e2c944b6 100644
--- a/mail/mail-vfolder-ui.c
+++ b/mail/mail-vfolder-ui.c
@@ -20,24 +20,14 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "mail-vfolder-ui.h"
 
+#include <config.h>
 #include <string.h>
-
 #include <glib/gi18n.h>
 
 #include "e-util/e-util-private.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"
-
 #include "e-mail-backend.h"
 #include "em-folder-tree-model.h"
 #include "em-utils.h"
@@ -45,7 +35,6 @@
 #include "em-vfolder-editor.h"
 #include "em-vfolder-editor-rule.h"
 #include "mail-autofilter.h"
-#include "mail-vfolder-ui.h"
 #include "e-mail-ui-session.h"
 
 #define d(x)  /* (printf("%s:%s: ",  G_STRLOC, G_STRFUNC), (x))*/
diff --git a/mail/mail-vfolder-ui.h b/mail/mail-vfolder-ui.h
index 07bcaa3fe5..8bd8acdd98 100644
--- a/mail/mail-vfolder-ui.h
+++ b/mail/mail-vfolder-ui.h
@@ -19,13 +19,12 @@
  *
  */
 
-#ifndef _MAIL_VFOLDER_UI_H
-#define _MAIL_VFOLDER_UI_H
+#ifndef MAIL_VFOLDER_UI_H
+#define MAIL_VFOLDER_UI_H
 
 #include <camel/camel.h>
 
-#include <libemail-engine/em-vfolder-rule.h>
-#include <libemail-engine/mail-vfolder.h>
+#include <libemail-engine/libemail-engine.h>
 
 #include <mail/e-mail-backend.h>
 #include <shell/e-shell-view.h>
@@ -46,4 +45,5 @@ void		vfolder_gui_add_from_address	(EMailSession *session,
 						 CamelInternetAddress *addr,
 						 gint flags,
 						 CamelFolder *folder);
-#endif
+
+#endif /* MAIL_VFOLDER_UI_H */
diff --git a/mail/message-list.c b/mail/message-list.c
index fb4eaf835b..89a473a7ff 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -22,28 +22,18 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "message-list.h"
 
+#include <config.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-
 #include <string.h>
 #include <ctype.h>
 
 #include <glib/gi18n.h>
 #include <glib/gstdio.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 "e-mail-label-list-store.h"
 #include "e-mail-ui-session.h"
 #include "em-utils.h"
diff --git a/mail/message-list.h b/mail/message-list.h
index c3233db6a2..89a4c65122 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -27,7 +27,7 @@
 #include <camel/camel.h>
 
 #include <e-util/e-util.h>
-#include <libemail-engine/e-mail-session.h>
+#include <libemail-engine/libemail-engine.h>
 
 /* Standard GObject macros */
 #define MESSAGE_LIST_TYPE \