10 files changed, 11 insertions, 37 deletions
diff --git a/libemail-engine/e-mail-authenticator.h b/libemail-engine/e-mail-authenticator.h
index bcc3299d1a..864d32dea0 100644
--- a/libemail-engine/e-mail-authenticator.h
+++ b/libemail-engine/e-mail-authenticator.h
@@ -20,7 +20,7 @@
 #define E_MAIL_AUTHENTICATOR_H
 
 #include <camel/camel.h>
-#include <libedataserver/e-source-authenticator.h>
+#include <libedataserver/libedataserver.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_AUTHENTICATOR \
diff --git a/libemail-engine/e-mail-junk-filter.h b/libemail-engine/e-mail-junk-filter.h
index 74a7840c2d..375a0f2c60 100644
--- a/libemail-engine/e-mail-junk-filter.h
+++ b/libemail-engine/e-mail-junk-filter.h
@@ -20,7 +20,7 @@
 #define E_MAIL_JUNK_FILTER_H
 
 #include <gtk/gtk.h>
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_JUNK_FILTER \
diff --git a/libemail-engine/e-mail-session-utils.c b/libemail-engine/e-mail-session-utils.c
index 26d4639867..0c05a26df9 100644
--- a/libemail-engine/e-mail-session-utils.c
+++ b/libemail-engine/e-mail-session-utils.c
@@ -23,7 +23,7 @@
 #include "e-mail-session-utils.h"
 
 #include <glib/gi18n-lib.h>
-#include <libedataserver/e-source-mail-submission.h>
+#include <libedataserver/libedataserver.h>
 
 #include <libemail-engine/e-mail-folder-utils.h>
 #include <libemail-engine/e-mail-utils.h>
diff --git a/libemail-engine/e-mail-session.c b/libemail-engine/e-mail-session.c
index ee1427ef7d..c2eb5d3905 100644
--- a/libemail-engine/e-mail-session.c
+++ b/libemail-engine/e-mail-session.c
@@ -42,18 +42,8 @@
 #include <canberra-gtk.h>
 #endif
 
-#include <libedataserver/e-flag.h>
-#include <libedataserver/e-proxy.h>
-#include <libebackend/e-extensible.h>
-#include <libedataserver/e-source-authentication.h>
-#include <libedataserver/e-source-camel.h>
-#include <libedataserver/e-source-mail-account.h>
-#include <libedataserver/e-source-mail-identity.h>
-#include <libedataserver/e-source-mail-submission.h>
-#include <libedataserver/e-source-mail-transport.h>
-#include <libedataserver/e-source-refresh.h>
-#include <libedataserverui/e-passwords.h>
-#include <libedataserver/e-data-server-util.h>
+#include <libebackend/libebackend.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include "libemail-utils/mail-mt.h"
 
diff --git a/libemail-engine/e-mail-session.h b/libemail-engine/e-mail-session.h
index bf436c7f1c..bd4b2f6727 100644
--- a/libemail-engine/e-mail-session.h
+++ b/libemail-engine/e-mail-session.h
@@ -26,7 +26,7 @@
 #define E_MAIL_SESSION_H
 
 #include <camel/camel.h>
-#include <libedataserver/e-source-registry.h>
+#include <libedataserver/libedataserver.h>
 #include <libemail-engine/e-mail-enums.h>
 #include <libemail-engine/mail-folder-cache.h>
 #include <libemail-utils/em-vfolder-context.h>
diff --git a/libemail-engine/e-mail-utils.c b/libemail-engine/e-mail-utils.c
index 3838de3547..9e13a74aa8 100644
--- a/libemail-engine/e-mail-utils.c
+++ b/libemail-engine/e-mail-utils.c
@@ -36,22 +36,8 @@
 #undef interface
 #endif
 
-#include <libebook/e-book-client.h>
-#include <libebook/e-book-query.h>
-
 #include <glib/gi18n.h>
-
-#include <gio/gio.h>
-
-#include <libedataserver/e-data-server-util.h>
-#include <libedataserver/e-flag.h>
-#include <libedataserver/e-proxy.h>
-#include <libedataserver/e-source-address-book.h>
-#include <libedataserver/e-source-autocomplete.h>
-#include <libedataserver/e-source-mail-account.h>
-#include <libedataserver/e-source-mail-composition.h>
-#include <libedataserver/e-source-mail-identity.h>
-#include <libedataserver/e-source-mail-submission.h>
+#include <libebook/libebook.h>
 
 #include <libemail-utils/mail-mt.h>
 
diff --git a/libemail-engine/e-mail-utils.h b/libemail-engine/e-mail-utils.h
index b3782876f4..505249a0ac 100644
--- a/libemail-engine/e-mail-utils.h
+++ b/libemail-engine/e-mail-utils.h
@@ -23,7 +23,7 @@
 #define E_MAIL_UTILS_H
 
 #include <camel/camel.h>
-#include <libedataserver/e-source-registry.h>
+#include <libedataserver/libedataserver.h>
 
 gboolean	em_utils_folder_is_drafts	(ESourceRegistry *registry,
 						 CamelFolder *folder);
diff --git a/libemail-engine/mail-config.c b/libemail-engine/mail-config.c
index af193f5844..04753aa9fd 100644
--- a/libemail-engine/mail-config.c
+++ b/libemail-engine/mail-config.c
@@ -29,7 +29,7 @@
 
 #include <gtk/gtk.h>
 
-#include <libedataserver/e-data-server-util.h>
+#include <libedataserver/libedataserver.h>
 
 #include "e-mail-folder-utils.h"
 #include "mail-config.h"
diff --git a/libemail-engine/mail-folder-cache.c b/libemail-engine/mail-folder-cache.c
index ebc392fb62..6ce4e2d1ca 100644
--- a/libemail-engine/mail-folder-cache.c
+++ b/libemail-engine/mail-folder-cache.c
@@ -38,7 +38,7 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
-#include <libedataserver/e-data-server-util.h>
+#include <libedataserver/libedataserver.h>
 
 #include <libemail-utils/mail-mt.h>
 
diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c
index 91e424b2f7..9e821a0fcf 100644
--- a/libemail-engine/mail-ops.c
+++ b/libemail-engine/mail-ops.c
@@ -34,9 +34,7 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 
-#include <libedataserver/e-data-server-util.h>
-#include <libedataserver/e-source-mail-account.h>
-#include <libedataserver/e-source-mail-submission.h>
+#include <libedataserver/libedataserver.h>
 
 #include <libemail-utils/mail-mt.h>