Adapt to single-include E-D-S libraries.

41 files changed, 21 insertions, 135 deletions

diff --git a/mail/e-http-request.c b/mail/e-http-request.c
index cc2ec62ea8..a9415b248a 100644
--- a/mail/e-http-request.c
+++ b/mail/e-http-request.c
@@ -26,7 +26,6 @@
 #include <webkit/webkit.h>
 
 #include <e-util/e-util.h>
-#include <libedataserver/e-flag.h>
 
 #include <string.h>
 
diff --git a/mail/e-mail-account-manager.c b/mail/e-mail-account-manager.c
index 5cf6012351..9fa71ecbf9 100644
--- a/mail/e-mail-account-manager.c
+++ b/mail/e-mail-account-manager.c
@@ -22,8 +22,6 @@
 #include <glib/gi18n-lib.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <libedataserver/e-source-collection.h>
-
 #include <libemail-engine/e-mail-session.h>
 #include <mail/e-mail-account-tree-view.h>
 
diff --git a/mail/e-mail-account-manager.h b/mail/e-mail-account-manager.h
index a17ff2a317..2ae3ad519a 100644
--- a/mail/e-mail-account-manager.h
+++ b/mail/e-mail-account-manager.h
@@ -20,7 +20,7 @@
 #define E_MAIL_ACCOUNT_MANAGER_H
 
 #include <gtk/gtk.h>
-#include <libedataserver/e-source.h>
+#include <libedataserver/libedataserver.h>
 #include <mail/e-mail-account-store.h>
 
 /* Standard GObject macros */
diff --git a/mail/e-mail-account-store.c b/mail/e-mail-account-store.c
index 1c5dedf52e..502493b5b6 100644
--- a/mail/e-mail-account-store.c
+++ b/mail/e-mail-account-store.c
@@ -22,8 +22,7 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extensible.h>
-#include <libedataserver/e-source-collection.h>
+#include <libebackend/libebackend.h>
 
 #include <e-util/e-marshal.h>
 #include <libevolution-utils/e-alert-dialog.h>
diff --git a/mail/e-mail-autoconfig.c b/mail/e-mail-autoconfig.c
index e3588a8964..65d735394a 100644
--- a/mail/e-mail-autoconfig.c
+++ b/mail/e-mail-autoconfig.c
@@ -34,10 +34,6 @@
 /* For error codes. */
 #include <libsoup/soup.h>
 
-#include <libedataserver/e-source-camel.h>
-#include <libedataserver/e-source-mail-account.h>
-#include <libedataserver/e-source-mail-transport.h>
-
 #define E_MAIL_AUTOCONFIG_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_MAIL_AUTOCONFIG, EMailAutoconfigPrivate))
diff --git a/mail/e-mail-autoconfig.h b/mail/e-mail-autoconfig.h
index 5b03ace7a3..b0cfb93b13 100644
--- a/mail/e-mail-autoconfig.h
+++ b/mail/e-mail-autoconfig.h
@@ -19,8 +19,7 @@
 #ifndef E_MAIL_AUTOCONFIG_H
 #define E_MAIL_AUTOCONFIG_H
 
-#include <gio/gio.h>
-#include <libedataserver/e-source.h>
+#include <libedataserver/libedataserver.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_AUTOCONFIG \
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 60e506d09d..19150cca03 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -31,10 +31,6 @@
 #include <string.h>
 #include <glib/gstdio.h>
 #include <glib/gi18n-lib.h>
-#include <libedataserver/e-data-server-util.h>
-#include <libedataserver/e-source-mail-account.h>
-#include <libedataserver/e-source-mail-composition.h>
-#include <libedataserver/e-source-mail-submission.h>
 
 #include <shell/e-shell.h>
 
diff --git a/mail/e-mail-config-assistant.c b/mail/e-mail-config-assistant.c
index e81a1980ce..16d0e2e42a 100644
--- a/mail/e-mail-config-assistant.c
+++ b/mail/e-mail-config-assistant.c
@@ -21,12 +21,7 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extensible.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 <libedataserver/e-source-mail-transport.h>
+#include <libebackend/libebackend.h>
 
 #include <libevolution-utils/e-alert-sink.h>
 
diff --git a/mail/e-mail-config-confirm-page.c b/mail/e-mail-config-confirm-page.c
index f58da035b6..ac3585ad08 100644
--- a/mail/e-mail-config-confirm-page.c
+++ b/mail/e-mail-config-confirm-page.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extensible.h>
+#include <libebackend/libebackend.h>
 
 #define E_MAIL_CONFIG_CONFIRM_PAGE_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/mail/e-mail-config-defaults-page.c b/mail/e-mail-config-defaults-page.c
index d815f0560c..ae4f14029d 100644
--- a/mail/e-mail-config-defaults-page.c
+++ b/mail/e-mail-config-defaults-page.c
@@ -21,14 +21,7 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extensible.h>
-#include <libedataserver/e-source-camel.h>
-#include <libedataserver/e-source-enumtypes.h>
-#include <libedataserver/e-source-mail-account.h>
-#include <libedataserver/e-source-mail-composition.h>
-#include <libedataserver/e-source-mail-submission.h>
-#include <libedataserver/e-source-mdn.h>
-#include <libedataserver/e-data-server-util.h>
+#include <libebackend/libebackend.h>
 
 #include <libemail-engine/e-mail-folder-utils.h>
 
diff --git a/mail/e-mail-config-identity-page.c b/mail/e-mail-config-identity-page.c
index a0920ab1a3..b42f0dd49f 100644
--- a/mail/e-mail-config-identity-page.c
+++ b/mail/e-mail-config-identity-page.c
@@ -21,8 +21,7 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extensible.h>
-#include <libedataserver/e-source-mail-identity.h>
+#include <libebackend/libebackend.h>
 
 #include <e-util/e-marshal.h>
 #include <misc/e-mail-signature-combo-box.h>
diff --git a/mail/e-mail-config-identity-page.h b/mail/e-mail-config-identity-page.h
index 51d879e45f..cfc6ea139e 100644
--- a/mail/e-mail-config-identity-page.h
+++ b/mail/e-mail-config-identity-page.h
@@ -20,7 +20,7 @@
 #define E_MAIL_CONFIG_IDENTITY_PAGE_H
 
 #include <gtk/gtk.h>
-#include <libedataserver/e-source-registry.h>
+#include <libedataserver/libedataserver.h>
 
 #include <mail/e-mail-config-page.h>
 
diff --git a/mail/e-mail-config-notebook.c b/mail/e-mail-config-notebook.c
index 999ee1baf2..70f790dd3f 100644
--- a/mail/e-mail-config-notebook.c
+++ b/mail/e-mail-config-notebook.c
@@ -18,9 +18,7 @@
 
 #include "e-mail-config-notebook.h"
 
-#include <libebackend/e-extensible.h>
-#include <libedataserver/e-source-goa.h>
-#include <libedataserver/e-source-mail-identity.h>
+#include <libebackend/libebackend.h>
 
 #include <mail/e-mail-config-defaults-page.h>
 #include <mail/e-mail-config-identity-page.h>
diff --git a/mail/e-mail-config-provider-page.c b/mail/e-mail-config-provider-page.c
index 1474ff3263..b4d3bd6c90 100644
--- a/mail/e-mail-config-provider-page.c
+++ b/mail/e-mail-config-provider-page.c
@@ -22,8 +22,7 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extensible.h>
-#include <libedataserver/e-data-server-util.h>
+#include <libebackend/libebackend.h>
 
 #include <libevolution-utils/e-alert-sink.h>
 #include <libevolution-utils/e-alert-dialog.h>
diff --git a/mail/e-mail-config-provider-page.h b/mail/e-mail-config-provider-page.h
index fbbdf7f34a..8278151a00 100644
--- a/mail/e-mail-config-provider-page.h
+++ b/mail/e-mail-config-provider-page.h
@@ -21,7 +21,6 @@
 
 #include <gtk/gtk.h>
 #include <camel/camel.h>
-#include <libedataserver/e-source-registry.h>
 
 #include <e-util/e-activity.h>
 #include <mail/e-mail-config-page.h>
diff --git a/mail/e-mail-config-receiving-page.c b/mail/e-mail-config-receiving-page.c
index 7106f20414..aef28b1ce1 100644
--- a/mail/e-mail-config-receiving-page.c
+++ b/mail/e-mail-config-receiving-page.c
@@ -21,8 +21,6 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libedataserver/e-source-mail-account.h>
-
 /* Forward Declarations */
 static void	e_mail_config_receiving_page_interface_init
 					(EMailConfigPageInterface *interface);
diff --git a/mail/e-mail-config-security-page.c b/mail/e-mail-config-security-page.c
index 911e40bb47..a41e251175 100644
--- a/mail/e-mail-config-security-page.c
+++ b/mail/e-mail-config-security-page.c
@@ -21,10 +21,7 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extensible.h>
-#include <libedataserver/e-source-mail-composition.h>
-#include <libedataserver/e-source-openpgp.h>
-#include <libedataserver/e-source-smime.h>
+#include <libebackend/libebackend.h>
 
 #if defined (HAVE_NSS)
 #include <smime/gui/e-cert-selector.h>
diff --git a/mail/e-mail-config-security-page.h b/mail/e-mail-config-security-page.h
index 79174eaed0..5efa1f49bc 100644
--- a/mail/e-mail-config-security-page.h
+++ b/mail/e-mail-config-security-page.h
@@ -20,7 +20,7 @@
 #define E_MAIL_CONFIG_SECURITY_PAGE_H
 
 #include <gtk/gtk.h>
-#include <libedataserver/e-source.h>
+#include <libedataserver/libedataserver.h>
 
 #include <mail/e-mail-config-page.h>
 
diff --git a/mail/e-mail-config-sending-page.c b/mail/e-mail-config-sending-page.c
index 198a3ea4ac..4f11b003d1 100644
--- a/mail/e-mail-config-sending-page.c
+++ b/mail/e-mail-config-sending-page.c
@@ -21,8 +21,6 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libedataserver/e-source-mail-transport.h>
-
 /* Forward Declarations */
 static void	e_mail_config_sending_page_interface_init
 					(EMailConfigPageInterface *interface);
diff --git a/mail/e-mail-config-service-backend.c b/mail/e-mail-config-service-backend.c
index a4c97fcd18..49019c5fb7 100644
--- a/mail/e-mail-config-service-backend.c
+++ b/mail/e-mail-config-service-backend.c
@@ -18,10 +18,6 @@
 
 #include "e-mail-config-service-backend.h"
 
-#include <libedataserver/e-source-camel.h>
-#include <libedataserver/e-source-backend.h>
-#include <libedataserver/e-source-collection.h>
-
 #include <mail/e-mail-config-receiving-page.h>
 #include <mail/e-mail-config-sending-page.h>
 
diff --git a/mail/e-mail-config-service-backend.h b/mail/e-mail-config-service-backend.h
index 6ba4ad3d13..87e2d3663d 100644
--- a/mail/e-mail-config-service-backend.h
+++ b/mail/e-mail-config-service-backend.h
@@ -21,8 +21,7 @@
 
 #include <gtk/gtk.h>
 #include <camel/camel.h>
-#include <libebackend/e-extension.h>
-#include <libedataserver/e-source.h>
+#include <libebackend/libebackend.h>
 
 #include <mail/e-mail-autoconfig.h>
 
diff --git a/mail/e-mail-config-service-page.c b/mail/e-mail-config-service-page.c
index 1f53ed5ddb..41618affe1 100644
--- a/mail/e-mail-config-service-page.c
+++ b/mail/e-mail-config-service-page.c
@@ -22,8 +22,7 @@
 #include <glib/gi18n-lib.h>
 
 #include <camel/camel.h>
-#include <libebackend/e-extensible.h>
-#include <libedataserver/e-source-backend.h>
+#include <libebackend/libebackend.h>
 
 #include <libevolution-utils/e-alert-sink.h>
 #include <libevolution-utils/e-alert-dialog.h>
diff --git a/mail/e-mail-config-service-page.h b/mail/e-mail-config-service-page.h
index 3c5a40e1c0..513356fd26 100644
--- a/mail/e-mail-config-service-page.h
+++ b/mail/e-mail-config-service-page.h
@@ -25,8 +25,6 @@
 
 #include <gtk/gtk.h>
 #include <camel/camel.h>
-#include <libedataserver/e-source-extension.h>
-#include <libedataserver/e-source-registry.h>
 
 #include <e-util/e-activity.h>
 #include <mail/e-mail-autoconfig.h>
diff --git a/mail/e-mail-config-summary-page.c b/mail/e-mail-config-summary-page.c
index db6520ab1f..03a9ed19b4 100644
--- a/mail/e-mail-config-summary-page.c
+++ b/mail/e-mail-config-summary-page.c
@@ -22,15 +22,7 @@
 #include <glib/gi18n-lib.h>
 
 #include <camel/camel.h>
-
-#include <libebackend/e-extensible.h>
-#include <libedataserver/e-source-authentication.h>
-#include <libedataserver/e-source-collection.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-security.h>
+#include <libebackend/libebackend.h>
 
 #define E_MAIL_CONFIG_SUMMARY_PAGE_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/mail/e-mail-config-summary-page.h b/mail/e-mail-config-summary-page.h
index 564207c9e1..2bfc03af8e 100644
--- a/mail/e-mail-config-summary-page.h
+++ b/mail/e-mail-config-summary-page.h
@@ -20,7 +20,6 @@
 #define E_MAIL_CONFIG_SUMMARY_PAGE_H
 
 #include <gtk/gtk.h>
-#include <libedataserver/e-source.h>
 
 #include <mail/e-mail-config-page.h>
 #include <mail/e-mail-config-service-backend.h>
diff --git a/mail/e-mail-config-welcome-page.c b/mail/e-mail-config-welcome-page.c
index 6cb9fd19a6..905c42849c 100644
--- a/mail/e-mail-config-welcome-page.c
+++ b/mail/e-mail-config-welcome-page.c
@@ -21,7 +21,7 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extensible.h>
+#include <libebackend/libebackend.h>
 
 #define E_MAIL_CONFIG_WELCOME_PAGE_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/mail/e-mail-config-window.c b/mail/e-mail-config-window.c
index 746e1c3e80..18cd143a7d 100644
--- a/mail/e-mail-config-window.c
+++ b/mail/e-mail-config-window.c
@@ -21,10 +21,6 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libedataserver/e-source-collection.h>
-#include <libedataserver/e-source-mail-account.h>
-#include <libedataserver/e-source-mail-submission.h>
-
 #include <libevolution-utils/e-alert-dialog.h>
 #include <libevolution-utils/e-alert-sink.h>
 #include <misc/e-alert-bar.h>
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index a485a1e0d2..8f913bb7c8 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -48,12 +48,6 @@
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
 
-#include <libedataserver/e-xml-utils.h>
-#include <libedataserver/e-data-server-util.h>
-#include <libedataserver/e-source-camel.h>
-#include <libedataserver/e-source-registry.h>
-#include <libedataserver/e-source-mail-account.h>
-
 #include <shell/e-shell.h>
 #include <shell/e-shell-migrate.h>
 
diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index 29910d8c4a..24db42dda9 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -27,8 +27,6 @@
 #include <glib/gi18n.h>
 #include "e-mail-paned-view.h"
 
-#include <libedataserver/e-data-server-util.h>
-
 #include "e-util/e-util-private.h"
 #include "widgets/menus/gal-view-etable.h"
 #include "widgets/menus/gal-view-instance.h"
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 1bd80b20d5..af8a0eea94 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -28,8 +28,6 @@
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <libedataserver/e-source-mail-account.h>
-
 #ifdef HAVE_XFREE
 #include <X11/XF86keysym.h>
 #endif
diff --git a/mail/e-mail-ui-session.c b/mail/e-mail-ui-session.c
index f5f5bddf3b..e946bbbe9a 100644
--- a/mail/e-mail-ui-session.c
+++ b/mail/e-mail-ui-session.c
@@ -42,11 +42,8 @@
 #include <canberra-gtk.h>
 #endif
 
-#include <libedataserver/e-flag.h>
-#include <libedataserver/e-proxy.h>
-#include <libedataserver/e-source-mail-account.h>
-#include <libebackend/e-extensible.h>
-#include <libedataserverui/e-passwords.h>
+#include <libebackend/libebackend.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include "e-mail-account-store.h"
 
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index a39a5f834d..4fe141447a 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -30,13 +30,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <libedataserver/e-data-server-util.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 <libedataserver/e-source-mdn.h>
-
 #include <libevolution-utils/e-alert-dialog.h>
 #include <libevolution-utils/e-alert-sink.h>
 #include <e-util/e-util.h>
diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c
index 4362b11dc2..007591d346 100644
--- a/mail/em-filter-source-element.c
+++ b/mail/em-filter-source-element.c
@@ -32,9 +32,6 @@
 #include <gtk/gtk.h>
 #include <camel/camel.h>
 
-#include <libedataserver/e-source-mail-account.h>
-#include <libedataserver/e-source-mail-identity.h>
-
 #include <shell/e-shell.h>
 #include <filter/e-filter-part.h>
 
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index d533c47fea..b264beef31 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -36,11 +36,6 @@
 
 #include <glib/gi18n.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 <e-util/e-util.h>
 #include <shell/e-shell.h>
 
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 47dbba8439..efa5881542 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -50,8 +50,6 @@
 #include <shell/e-shell.h>
 #include <shell/e-shell-utils.h>
 
-#include <libedataserver/e-flag.h>
-
 #if defined (HAVE_NSS) && defined (ENABLE_SMIME)
 #include "certificate-viewer.h"
 #include "e-cert-db.h"
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index f60346dc24..bb80d3957b 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -42,9 +42,7 @@
 #undef interface
 #endif
 
-#include <libebackend/e-extensible.h>
-#include <libedataserver/e-time-utils.h>
-#include <libedataserver/e-data-server-util.h>	/* for e_utf8_strftime, what about e_time_format_time? */
+#include <libebackend/libebackend.h>
 
 #include "e-util/e-datetime-format.h"
 #include "e-util/e-icon-factory.h"
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 11dc1217c7..bf75253d34 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -45,22 +45,7 @@
 
 #include <glib/gi18n.h>
 
-#include <gio/gio.h>
-
-#include <libebook/e-book-client.h>
-#include <libebook/e-book-query.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 <libedataserver/e-data-server-util.h>
-#include <libedataserver/e-flag.h>
-#include <libedataserver/e-proxy.h>
+#include <libebook/libebook.h>
 
 #include <e-util/e-util.h>
 #include <e-util/e-util-private.h>
diff --git a/mail/em-utils.h b/mail/em-utils.h
index 303f0efddd..092b75933c 100644
--- a/mail/em-utils.h
+++ b/mail/em-utils.h
@@ -26,7 +26,6 @@
 #include <gtk/gtk.h>
 #include <sys/types.h>
 #include <camel/camel.h>
-#include <libedataserver/e-proxy.h>
 
 #include <libemail-engine/e-mail-session.h>
 #include <libemail-engine/e-mail-utils.h>
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index f59557cf6d..b5dcd38cd7 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -38,10 +38,7 @@
 
 #include <gconf/gconf-client.h>
 
-#include <libebook/e-book-client.h>
-#include <libebook/e-destination.h>
-#include <libedataserver/e-source-registry.h>
-#include <libedataserver/e-source-address-book.h>
+#include <libebook/libebook.h>
 
 #include "mail-importer.h"
 
diff --git a/mail/mail-guess-servers.c b/mail/mail-guess-servers.c
index 21f1868bc2..f9e602bfef 100644
--- a/mail/mail-guess-servers.c
+++ b/mail/mail-guess-servers.c
@@ -42,8 +42,6 @@
 #include <libxml/tree.h>
 #include <libxml/xmlmemory.h>
 
-#include <libedataserver/e-proxy.h>
-
 #include <shell/e-shell.h>
 #include <e-util/e-util-private.h>
 
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index d68b928124..a132327585 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -29,9 +29,6 @@
 
 #include <glib/gi18n.h>
 
-#include <libedataserver/e-source-mail-account.h>
-#include <libedataserver/e-source-mail-submission.h>
-
 #include <shell/e-shell.h>
 #include <e-util/e-util.h>