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

80 files changed, 79 insertions, 183 deletions

diff --git a/modules/addressbook/autocompletion-config.c b/modules/addressbook/autocompletion-config.c
index d57e8f50ea..615328992a 100644
--- a/modules/addressbook/autocompletion-config.c
+++ b/modules/addressbook/autocompletion-config.c
@@ -24,12 +24,8 @@
 
 #include "autocompletion-config.h"
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libedataserver/e-source-address-book.h>
-#include <libedataserver/e-source-autocomplete.h>
-#include <libedataserverui/e-source-selector.h>
-#include <libedataserverui/e-name-selector-entry.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include "e-util/e-datetime-format.h"
 #include "misc/e-autocomplete-selector.h"
diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c
index ac6f8b27b6..8aa7070af6 100644
--- a/modules/addressbook/e-book-shell-backend.c
+++ b/modules/addressbook/e-book-shell-backend.c
@@ -27,12 +27,8 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <libebook/e-book-client.h>
-#include <libedataserver/e-url.h>
-#include <libedataserver/e-source.h>
-#include <libedataserver/e-source-address-book.h>
-#include <libedataserverui/e-client-utils.h>
-#include <libedataserverui/e-book-auth-util.h>
+#include <libebook/libebook.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include "e-util/e-import.h"
 #include "shell/e-shell.h"
diff --git a/modules/addressbook/e-book-shell-content.h b/modules/addressbook/e-book-shell-content.h
index 92bb716d72..63c395cab7 100644
--- a/modules/addressbook/e-book-shell-content.h
+++ b/modules/addressbook/e-book-shell-content.h
@@ -22,7 +22,7 @@
 #ifndef E_BOOK_SHELL_CONTENT_H
 #define E_BOOK_SHELL_CONTENT_H
 
-#include <libebook/e-contact.h>
+#include <libebook/libebook.h>
 
 #include <shell/e-shell-content.h>
 #include <shell/e-shell-searchbar.h>
diff --git a/modules/addressbook/e-book-shell-sidebar.c b/modules/addressbook/e-book-shell-sidebar.c
index 57ea7d3a2c..b7f8b61ef9 100644
--- a/modules/addressbook/e-book-shell-sidebar.c
+++ b/modules/addressbook/e-book-shell-sidebar.c
@@ -28,8 +28,6 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
-#include <libedataserver/e-source-address-book.h>
-
 #include <e-util/e-util.h>
 
 #include "e-book-shell-view.h"
diff --git a/modules/addressbook/e-book-shell-sidebar.h b/modules/addressbook/e-book-shell-sidebar.h
index bf1cdd0baa..9e4d9ec015 100644
--- a/modules/addressbook/e-book-shell-sidebar.h
+++ b/modules/addressbook/e-book-shell-sidebar.h
@@ -22,7 +22,7 @@
 #ifndef E_BOOK_SHELL_SIDEBAR_H
 #define E_BOOK_SHELL_SIDEBAR_H
 
-#include <libedataserverui/e-source-selector.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include <shell/e-shell-sidebar.h>
 #include <shell/e-shell-view.h>
diff --git a/modules/addressbook/e-book-shell-view-private.h b/modules/addressbook/e-book-shell-view-private.h
index a110d37771..928e5e2eb9 100644
--- a/modules/addressbook/e-book-shell-view-private.h
+++ b/modules/addressbook/e-book-shell-view-private.h
@@ -27,11 +27,8 @@
 #include <string.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <libebook/e-book-client.h>
-#include <libedataserver/e-categories.h>
-#include <libedataserver/e-sexp.h>
-#include <libedataserverui/e-client-utils.h>
-#include <libedataserverui/e-source-selector.h>
+#include <libebook/libebook.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include "e-util/e-util.h"
 #include "e-util/e-file-utils.h"
diff --git a/modules/addressbook/eab-composer-util.c b/modules/addressbook/eab-composer-util.c
index 9f17dd34d5..90af295ded 100644
--- a/modules/addressbook/eab-composer-util.c
+++ b/modules/addressbook/eab-composer-util.c
@@ -24,8 +24,7 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <libebook/e-contact.h>
-#include <libebook/e-destination.h>
+#include <libebook/libebook.h>
 
 #include "composer/e-msg-composer.h"
 #include "addressbook/util/eab-book-util.h"
diff --git a/modules/backup-restore/evolution-backup-restore.c b/modules/backup-restore/evolution-backup-restore.c
index 75a070a353..925315b8af 100644
--- a/modules/backup-restore/evolution-backup-restore.c
+++ b/modules/backup-restore/evolution-backup-restore.c
@@ -28,7 +28,7 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <mail/e-mail-config-assistant.h>
 #include <libevolution-utils/e-alert-dialog.h>
diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup-restore/evolution-backup-tool.c
index 38a477e00d..7d1caaf948 100644
--- a/modules/backup-restore/evolution-backup-tool.c
+++ b/modules/backup-restore/evolution-backup-tool.c
@@ -29,7 +29,7 @@
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
 
-#include <libedataserver/e-data-server-util.h>
+#include <libedataserver/libedataserver.h>
 
 #ifdef G_OS_WIN32
 #ifdef DATADIR
diff --git a/modules/book-config-google/evolution-book-config-google.c b/modules/book-config-google/evolution-book-config-google.c
index c924c65d6e..3d49be1f12 100644
--- a/modules/book-config-google/evolution-book-config-google.c
+++ b/modules/book-config-google/evolution-book-config-google.c
@@ -19,9 +19,7 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extension.h>
-#include <libedataserver/e-source-authentication.h>
-#include <libedataserver/e-source-security.h>
+#include <libebackend/libebackend.h>
 
 #include <misc/e-interval-chooser.h>
 #include <misc/e-source-config-backend.h>
diff --git a/modules/book-config-ldap/e-source-ldap.c b/modules/book-config-ldap/e-source-ldap.c
index 4e182dc625..88ee6bc634 100644
--- a/modules/book-config-ldap/e-source-ldap.c
+++ b/modules/book-config-ldap/e-source-ldap.c
@@ -20,9 +20,7 @@
 
 #include <ldap.h>
 
-#include <libedataserver/e-data-server-util.h>
-#include <libedataserver/e-source-authentication.h>
-#include <libedataserver/e-source-security.h>
+#include <libedataserver/libedataserver.h>
 
 #define E_SOURCE_LDAP_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/modules/book-config-ldap/e-source-ldap.h b/modules/book-config-ldap/e-source-ldap.h
index ea9cb9fd8c..118346192b 100644
--- a/modules/book-config-ldap/e-source-ldap.h
+++ b/modules/book-config-ldap/e-source-ldap.h
@@ -19,7 +19,7 @@
 #ifndef E_SOURCE_LDAP_H
 #define E_SOURCE_LDAP_H
 
-#include <libedataserver/e-source-extension.h>
+#include <libedataserver/libedataserver.h>
 
 /* Standard GObject macros */
 #define E_TYPE_SOURCE_LDAP \
diff --git a/modules/book-config-ldap/evolution-book-config-ldap.c b/modules/book-config-ldap/evolution-book-config-ldap.c
index a957e4c94a..e174783f6f 100644
--- a/modules/book-config-ldap/evolution-book-config-ldap.c
+++ b/modules/book-config-ldap/evolution-book-config-ldap.c
@@ -20,8 +20,7 @@
 #include <stdlib.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extension.h>
-#include <libedataserver/e-source-authentication.h>
+#include <libebackend/libebackend.h>
 
 #include <libevolution-utils/e-alert-dialog.h>
 #include <misc/e-source-config-backend.h>
diff --git a/modules/book-config-local/evolution-book-config-local.c b/modules/book-config-local/evolution-book-config-local.c
index 0f7bb2c78d..6cbcc27a0d 100644
--- a/modules/book-config-local/evolution-book-config-local.c
+++ b/modules/book-config-local/evolution-book-config-local.c
@@ -19,7 +19,7 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <misc/e-source-config-backend.h>
 #include <addressbook/gui/widgets/e-book-source-config.h>
diff --git a/modules/book-config-webdav/evolution-book-config-webdav.c b/modules/book-config-webdav/evolution-book-config-webdav.c
index cccb7922d9..c352a3365f 100644
--- a/modules/book-config-webdav/evolution-book-config-webdav.c
+++ b/modules/book-config-webdav/evolution-book-config-webdav.c
@@ -19,9 +19,7 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extension.h>
-#include <libedataserver/e-source-authentication.h>
-#include <libedataserver/e-source-webdav.h>
+#include <libebackend/libebackend.h>
 
 #include <misc/e-source-config-backend.h>
 #include <addressbook/gui/widgets/e-book-source-config.h>
diff --git a/modules/cal-config-caldav/e-caldav-chooser.c b/modules/cal-config-caldav/e-caldav-chooser.c
index 841007bc85..e5904fb4c5 100644
--- a/modules/cal-config-caldav/e-caldav-chooser.c
+++ b/modules/cal-config-caldav/e-caldav-chooser.c
@@ -28,12 +28,7 @@
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
 
-#include <libedataserver/e-source-authentication.h>
-#include <libedataserver/e-source-authenticator.h>
-#include <libedataserver/e-source-calendar.h>
-#include <libedataserver/e-source-webdav.h>
-#include <libedataserverui/e-cell-renderer-color.h>
-#include <libedataserverui/e-passwords.h>
+#include <libedataserverui/libedataserverui.h>
 
 #define E_CALDAV_CHOOSER_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/modules/cal-config-caldav/e-caldav-chooser.h b/modules/cal-config-caldav/e-caldav-chooser.h
index b436161fdb..3c48b42675 100644
--- a/modules/cal-config-caldav/e-caldav-chooser.h
+++ b/modules/cal-config-caldav/e-caldav-chooser.h
@@ -20,8 +20,7 @@
 #define E_CALDAV_CHOOSER_H
 
 #include <gtk/gtk.h>
-#include <libecal/e-cal-client.h>
-#include <libedataserver/e-source-registry.h>
+#include <libecal/libecal.h>
 
 /* Standard GObject macros */
 #define E_TYPE_CALDAV_CHOOSER \
diff --git a/modules/cal-config-caldav/evolution-cal-config-caldav.c b/modules/cal-config-caldav/evolution-cal-config-caldav.c
index 0d8d6dd6cf..932f55a059 100644
--- a/modules/cal-config-caldav/evolution-cal-config-caldav.c
+++ b/modules/cal-config-caldav/evolution-cal-config-caldav.c
@@ -19,10 +19,7 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extension.h>
-#include <libedataserver/e-source-authentication.h>
-#include <libedataserver/e-source-security.h>
-#include <libedataserver/e-source-webdav.h>
+#include <libebackend/libebackend.h>
 
 #include <misc/e-interval-chooser.h>
 #include <misc/e-source-config-backend.h>
diff --git a/modules/cal-config-contacts/e-contacts-selector.c b/modules/cal-config-contacts/e-contacts-selector.c
index 80b10754aa..1386177346 100644
--- a/modules/cal-config-contacts/e-contacts-selector.c
+++ b/modules/cal-config-contacts/e-contacts-selector.c
@@ -18,8 +18,6 @@
 
 #include "e-contacts-selector.h"
 
-#include <libedataserver/e-source-address-book.h>
-
 #include "e-source-contacts.h"
 
 G_DEFINE_DYNAMIC_TYPE (
diff --git a/modules/cal-config-contacts/e-contacts-selector.h b/modules/cal-config-contacts/e-contacts-selector.h
index 0afb02113f..5ba1ea9dca 100644
--- a/modules/cal-config-contacts/e-contacts-selector.h
+++ b/modules/cal-config-contacts/e-contacts-selector.h
@@ -19,7 +19,7 @@
 #ifndef E_CONTACTS_SELECTOR_H
 #define E_CONTACTS_SELECTOR_H
 
-#include <libedataserverui/e-source-selector.h>
+#include <libedataserverui/libedataserverui.h>
 
 /* Standard GObject macros */
 #define E_TYPE_CONTACTS_SELECTOR \
diff --git a/modules/cal-config-contacts/e-source-contacts.h b/modules/cal-config-contacts/e-source-contacts.h
index 95d9b8363c..d18fd92d0e 100644
--- a/modules/cal-config-contacts/e-source-contacts.h
+++ b/modules/cal-config-contacts/e-source-contacts.h
@@ -19,7 +19,7 @@
 #ifndef E_SOURCE_CONTACTS_H
 #define E_SOURCE_CONTACTS_H
 
-#include <libedataserver/e-source-extension.h>
+#include <libedataserver/libedataserver.h>
 
 /* Standard GObject macros */
 #define E_TYPE_SOURCE_CONTACTS \
diff --git a/modules/cal-config-contacts/evolution-cal-config-contacts.c b/modules/cal-config-contacts/evolution-cal-config-contacts.c
index 6b0fa896ec..b310917170 100644
--- a/modules/cal-config-contacts/evolution-cal-config-contacts.c
+++ b/modules/cal-config-contacts/evolution-cal-config-contacts.c
@@ -19,7 +19,7 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <misc/e-source-config-backend.h>
 #include <calendar/gui/e-cal-source-config.h>
diff --git a/modules/cal-config-google/e-google-chooser-button.c b/modules/cal-config-google/e-google-chooser-button.c
index 700760811d..2613bf7385 100644
--- a/modules/cal-config-google/e-google-chooser-button.c
+++ b/modules/cal-config-google/e-google-chooser-button.c
@@ -21,8 +21,6 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libedataserver/e-source-webdav.h>
-
 #include "e-google-chooser-dialog.h"
 
 #define E_GOOGLE_CHOOSER_BUTTON_GET_PRIVATE(obj) \
diff --git a/modules/cal-config-google/e-google-chooser.c b/modules/cal-config-google/e-google-chooser.c
index d5a4064b0f..9dd2b326e7 100644
--- a/modules/cal-config-google/e-google-chooser.c
+++ b/modules/cal-config-google/e-google-chooser.c
@@ -23,11 +23,7 @@
 #include <gdata/gdata.h>
 #include <glib/gi18n-lib.h>
 
-#include <libedataserver/e-source-authentication.h>
-#include <libedataserver/e-source-calendar.h>
-#include <libedataserver/e-source-webdav.h>
-#include <libedataserverui/e-cell-renderer-color.h>
-#include <libedataserverui/e-passwords.h>
+#include <libedataserverui/libedataserverui.h>
 
 #define E_GOOGLE_CHOOSER_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/modules/cal-config-google/e-google-chooser.h b/modules/cal-config-google/e-google-chooser.h
index f2cd28a6c5..8c973142e9 100644
--- a/modules/cal-config-google/e-google-chooser.h
+++ b/modules/cal-config-google/e-google-chooser.h
@@ -20,7 +20,7 @@
 #define E_GOOGLE_CHOOSER_H
 
 #include <gtk/gtk.h>
-#include <libedataserver/e-source.h>
+#include <libedataserver/libedataserver.h>
 
 /* Standard GObject macros */
 #define E_TYPE_GOOGLE_CHOOSER \
diff --git a/modules/cal-config-google/evolution-cal-config-google.c b/modules/cal-config-google/evolution-cal-config-google.c
index 589adf5aec..eb2f1337a0 100644
--- a/modules/cal-config-google/evolution-cal-config-google.c
+++ b/modules/cal-config-google/evolution-cal-config-google.c
@@ -19,10 +19,7 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extension.h>
-#include <libedataserver/e-source-authentication.h>
-#include <libedataserver/e-source-calendar.h>
-#include <libedataserver/e-source-webdav.h>
+#include <libebackend/libebackend.h>
 
 #include <misc/e-source-config-backend.h>
 #include <calendar/gui/e-cal-source-config.h>
diff --git a/modules/cal-config-local/e-source-local.h b/modules/cal-config-local/e-source-local.h
index 7eed749966..3d534f8849 100644
--- a/modules/cal-config-local/e-source-local.h
+++ b/modules/cal-config-local/e-source-local.h
@@ -19,7 +19,7 @@
 #ifndef E_SOURCE_LOCAL_H
 #define E_SOURCE_LOCAL_H
 
-#include <libedataserver/e-source-extension.h>
+#include <libedataserver/libedataserver.h>
 
 /* Standard GObject macros */
 #define E_TYPE_SOURCE_LOCAL \
diff --git a/modules/cal-config-local/evolution-cal-config-local.c b/modules/cal-config-local/evolution-cal-config-local.c
index ab83f8c68c..a8f7696033 100644
--- a/modules/cal-config-local/evolution-cal-config-local.c
+++ b/modules/cal-config-local/evolution-cal-config-local.c
@@ -19,7 +19,7 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <misc/e-source-config-backend.h>
 #include <calendar/gui/e-cal-source-config.h>
diff --git a/modules/cal-config-weather/e-source-weather.c b/modules/cal-config-weather/e-source-weather.c
index 0f7e581ce8..e00c79907a 100644
--- a/modules/cal-config-weather/e-source-weather.c
+++ b/modules/cal-config-weather/e-source-weather.c
@@ -18,8 +18,6 @@
 
 #include "e-source-weather.h"
 
-#include <libedataserver/e-data-server-util.h>
-
 #define E_SOURCE_WEATHER_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_SOURCE_WEATHER, ESourceWeatherPrivate))
diff --git a/modules/cal-config-weather/e-source-weather.h b/modules/cal-config-weather/e-source-weather.h
index 85ad991f64..fd191cf27b 100644
--- a/modules/cal-config-weather/e-source-weather.h
+++ b/modules/cal-config-weather/e-source-weather.h
@@ -19,7 +19,7 @@
 #ifndef E_SOURCE_WEATHER_H
 #define E_SOURCE_WEATHER_H
 
-#include <libedataserver/e-source-extension.h>
+#include <libedataserver/libedataserver.h>
 
 /* Standard GObject macros */
 #define E_TYPE_SOURCE_WEATHER \
diff --git a/modules/cal-config-weather/evolution-cal-config-weather.c b/modules/cal-config-weather/evolution-cal-config-weather.c
index c6e8c47d08..28df80eb1f 100644
--- a/modules/cal-config-weather/evolution-cal-config-weather.c
+++ b/modules/cal-config-weather/evolution-cal-config-weather.c
@@ -19,7 +19,7 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
 #include <libgweather/location-entry.h>
diff --git a/modules/cal-config-webcal/evolution-cal-config-webcal.c b/modules/cal-config-webcal/evolution-cal-config-webcal.c
index 9a42219c10..94a209b77f 100644
--- a/modules/cal-config-webcal/evolution-cal-config-webcal.c
+++ b/modules/cal-config-webcal/evolution-cal-config-webcal.c
@@ -19,9 +19,7 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extension.h>
-#include <libedataserver/e-source-authentication.h>
-#include <libedataserver/e-source-webdav.h>
+#include <libebackend/libebackend.h>
 
 #include <misc/e-interval-chooser.h>
 #include <misc/e-source-config-backend.h>
diff --git a/modules/calendar/e-cal-attachment-handler.c b/modules/calendar/e-cal-attachment-handler.c
index dedab0241d..efe087da3f 100644
--- a/modules/calendar/e-cal-attachment-handler.c
+++ b/modules/calendar/e-cal-attachment-handler.c
@@ -27,11 +27,9 @@
 
 #include <glib/gi18n.h>
 #include <libical/ical.h>
-#include <libecal/e-cal-client.h>
 #include <camel/camel.h>
-#include <libedataserver/e-source-calendar.h>
-#include <libedataserverui/e-source-selector.h>
-#include <libedataserverui/e-client-utils.h>
+#include <libecal/libecal.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include <shell/e-shell.h>
 
diff --git a/modules/calendar/e-cal-config-calendar-item.c b/modules/calendar/e-cal-config-calendar-item.c
index d0d6e11b90..56fa6e5133 100644
--- a/modules/calendar/e-cal-config-calendar-item.c
+++ b/modules/calendar/e-cal-config-calendar-item.c
@@ -22,7 +22,7 @@
 
 #include "e-cal-config-calendar-item.h"
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <shell/e-shell.h>
 #include <misc/e-calendar-item.h>
diff --git a/modules/calendar/e-cal-config-comp-editor.c b/modules/calendar/e-cal-config-comp-editor.c
index dc37c748c3..c2d296cefc 100644
--- a/modules/calendar/e-cal-config-comp-editor.c
+++ b/modules/calendar/e-cal-config-comp-editor.c
@@ -22,7 +22,7 @@
 
 #include "e-cal-config-comp-editor.h"
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <shell/e-shell.h>
 #include <calendar/gui/dialogs/comp-editor.h>
diff --git a/modules/calendar/e-cal-config-date-edit.c b/modules/calendar/e-cal-config-date-edit.c
index 48a5848f73..f936a0b182 100644
--- a/modules/calendar/e-cal-config-date-edit.c
+++ b/modules/calendar/e-cal-config-date-edit.c
@@ -22,7 +22,7 @@
 
 #include "e-cal-config-date-edit.h"
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <shell/e-shell.h>
 #include <misc/e-dateedit.h>
diff --git a/modules/calendar/e-cal-config-meeting-store.c b/modules/calendar/e-cal-config-meeting-store.c
index 7b4f2dec30..570d14eec6 100644
--- a/modules/calendar/e-cal-config-meeting-store.c
+++ b/modules/calendar/e-cal-config-meeting-store.c
@@ -22,7 +22,7 @@
 
 #include "e-cal-config-meeting-store.h"
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <shell/e-shell.h>
 #include <calendar/gui/e-meeting-store.h>
diff --git a/modules/calendar/e-cal-config-meeting-time-selector.c b/modules/calendar/e-cal-config-meeting-time-selector.c
index 249d541274..c54ccde39b 100644
--- a/modules/calendar/e-cal-config-meeting-time-selector.c
+++ b/modules/calendar/e-cal-config-meeting-time-selector.c
@@ -22,7 +22,7 @@
 
 #include "e-cal-config-meeting-time-selector.h"
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <shell/e-shell.h>
 #include <calendar/gui/e-meeting-time-sel.h>
diff --git a/modules/calendar/e-cal-config-model.c b/modules/calendar/e-cal-config-model.c
index f7a0e162af..8c9bcc0229 100644
--- a/modules/calendar/e-cal-config-model.c
+++ b/modules/calendar/e-cal-config-model.c
@@ -22,7 +22,7 @@
 
 #include "e-cal-config-model.h"
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <shell/e-shell.h>
 #include <calendar/gui/e-cal-model.h>
diff --git a/modules/calendar/e-cal-config-view.c b/modules/calendar/e-cal-config-view.c
index afe747dd80..8883f4fadf 100644
--- a/modules/calendar/e-cal-config-view.c
+++ b/modules/calendar/e-cal-config-view.c
@@ -22,7 +22,7 @@
 
 #include "e-cal-config-view.h"
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <shell/e-shell.h>
 #include <calendar/gui/e-day-view.h>
diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c
index c49ad8a571..a5283b0fe8 100644
--- a/modules/calendar/e-cal-shell-backend.c
+++ b/modules/calendar/e-cal-shell-backend.c
@@ -27,12 +27,8 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <libecal/e-cal-client.h>
-#include <libecal/e-cal-time-util.h>
-#include <libedataserver/e-url.h>
-#include <libedataserver/e-source.h>
-#include <libedataserver/e-source-calendar.h>
-#include <libedataserverui/e-client-utils.h>
+#include <libecal/libecal.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include "e-util/e-import.h"
 #include "shell/e-shell.h"
diff --git a/modules/calendar/e-cal-shell-settings.c b/modules/calendar/e-cal-shell-settings.c
index 045ca28f3b..943e28e38f 100644
--- a/modules/calendar/e-cal-shell-settings.c
+++ b/modules/calendar/e-cal-shell-settings.c
@@ -25,7 +25,7 @@
 
 #include "e-cal-shell-settings.h"
 
-#include <libecal/e-cal-util.h>
+#include <libecal/libecal.h>
 
 #include <e-util/e-util.h>
 #include <e-util/e-util-enumtypes.h>
diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c
index 5cecc3ca40..63d14658d5 100644
--- a/modules/calendar/e-cal-shell-sidebar.c
+++ b/modules/calendar/e-cal-shell-sidebar.c
@@ -27,8 +27,7 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <libedataserver/e-source-calendar.h>
-#include <libedataserverui/e-client-utils.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include "libevolution-utils/e-alert-dialog.h"
 #include "widgets/misc/e-paned.h"
diff --git a/modules/calendar/e-cal-shell-sidebar.h b/modules/calendar/e-cal-shell-sidebar.h
index d687c63c74..2ddfff0a20 100644
--- a/modules/calendar/e-cal-shell-sidebar.h
+++ b/modules/calendar/e-cal-shell-sidebar.h
@@ -22,8 +22,8 @@
 #ifndef E_CAL_SHELL_SIDEBAR_H
 #define E_CAL_SHELL_SIDEBAR_H
 
-#include <libecal/e-cal-client.h>
-#include <libedataserverui/e-source-selector.h>
+#include <libecal/libecal.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include <shell/e-shell-sidebar.h>
 #include <shell/e-shell-view.h>
diff --git a/modules/calendar/e-cal-shell-view-private.h b/modules/calendar/e-cal-shell-view-private.h
index 2687c74f52..4a08388736 100644
--- a/modules/calendar/e-cal-shell-view-private.h
+++ b/modules/calendar/e-cal-shell-view-private.h
@@ -27,13 +27,8 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
-#include <libecal/e-cal-time-util.h>
-#include <libecal/e-cal-system-timezone.h>
-#include <libedataserver/e-categories.h>
-#include <libedataserver/e-data-server-util.h>
-#include <libedataserver/e-sexp.h>
-#include <libedataserver/e-source-registry.h>
-#include <libedataserverui/e-client-utils.h>
+#include <libecal/libecal.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include <e-util/e-selection.h>
 #include <e-util/e-dialog-utils.h>
diff --git a/modules/calendar/e-calendar-preferences.h b/modules/calendar/e-calendar-preferences.h
index 5cb05e50b4..a9809f2bcf 100644
--- a/modules/calendar/e-calendar-preferences.h
+++ b/modules/calendar/e-calendar-preferences.h
@@ -24,10 +24,9 @@
 #ifndef CAL_PREFERENCES_H
 #define CAL_PREFERENCES_H
 
-#include <gtk/gtk.h>
+#include <libedataserverui/libedataserverui.h>
+
 #include <shell/e-shell.h>
-#include <libedataserver/e-source-registry.h>
-#include <libedataserverui/e-source-selector.h>
 #include <widgets/misc/e-preferences-window.h>
 
 /* Standard GObject macros */
diff --git a/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c
index efafe383f0..be69870116 100644
--- a/modules/calendar/e-memo-shell-backend.c
+++ b/modules/calendar/e-memo-shell-backend.c
@@ -27,11 +27,8 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <libecal/e-cal-client.h>
-#include <libedataserver/e-url.h>
-#include <libedataserver/e-source.h>
-#include <libedataserver/e-source-calendar.h>
-#include <libedataserverui/e-client-utils.h>
+#include <libecal/libecal.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include "shell/e-shell.h"
 #include "shell/e-shell-backend.h"
diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c
index c42ce3e3bd..bc342830b2 100644
--- a/modules/calendar/e-memo-shell-sidebar.c
+++ b/modules/calendar/e-memo-shell-sidebar.c
@@ -27,9 +27,7 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <libecal/e-cal-client.h>
-#include <libedataserver/e-source-calendar.h>
-#include <libedataserverui/e-client-utils.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include "libevolution-utils/e-alert-dialog.h"
 #include "e-util/e-util.h"
diff --git a/modules/calendar/e-memo-shell-sidebar.h b/modules/calendar/e-memo-shell-sidebar.h
index 298673c2fa..b0de9f5fe4 100644
--- a/modules/calendar/e-memo-shell-sidebar.h
+++ b/modules/calendar/e-memo-shell-sidebar.h
@@ -22,8 +22,8 @@
 #ifndef E_MEMO_SHELL_SIDEBAR_H
 #define E_MEMO_SHELL_SIDEBAR_H
 
-#include <libecal/e-cal-client.h>
-#include <libedataserverui/e-source-selector.h>
+#include <libecal/libecal.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include <shell/e-shell-sidebar.h>
 #include <shell/e-shell-view.h>
diff --git a/modules/calendar/e-memo-shell-view-private.h b/modules/calendar/e-memo-shell-view-private.h
index c232901008..84def2810a 100644
--- a/modules/calendar/e-memo-shell-view-private.h
+++ b/modules/calendar/e-memo-shell-view-private.h
@@ -26,8 +26,6 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <libedataserver/e-categories.h>
-#include <libedataserver/e-sexp.h>
 
 #include "e-util/e-dialog-utils.h"
 #include "e-util/e-file-utils.h"
diff --git a/modules/calendar/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c
index f8c21a8e41..7ecad1c986 100644
--- a/modules/calendar/e-task-shell-backend.c
+++ b/modules/calendar/e-task-shell-backend.c
@@ -27,11 +27,8 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <libecal/e-cal-client.h>
-#include <libedataserver/e-url.h>
-#include <libedataserver/e-source.h>
-#include <libedataserver/e-source-calendar.h>
-#include <libedataserverui/e-client-utils.h>
+#include <libecal/libecal.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include "shell/e-shell.h"
 #include "shell/e-shell-backend.h"
diff --git a/modules/calendar/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c
index d8969aa85c..9e28af2411 100644
--- a/modules/calendar/e-task-shell-sidebar.c
+++ b/modules/calendar/e-task-shell-sidebar.c
@@ -27,9 +27,7 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <libecal/e-cal-client.h>
-#include <libedataserver/e-source-calendar.h>
-#include <libedataserverui/e-client-utils.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include "libevolution-utils/e-alert-dialog.h"
 #include "e-util/e-util.h"
diff --git a/modules/calendar/e-task-shell-sidebar.h b/modules/calendar/e-task-shell-sidebar.h
index a2cc92ac0e..7518a4b856 100644
--- a/modules/calendar/e-task-shell-sidebar.h
+++ b/modules/calendar/e-task-shell-sidebar.h
@@ -22,8 +22,8 @@
 #ifndef E_TASK_SHELL_SIDEBAR_H
 #define E_TASK_SHELL_SIDEBAR_H
 
-#include <libecal/e-cal-client.h>
-#include <libedataserverui/e-source-selector.h>
+#include <libecal/libecal.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include <shell/e-shell-sidebar.h>
 #include <shell/e-shell-view.h>
diff --git a/modules/calendar/e-task-shell-view-private.h b/modules/calendar/e-task-shell-view-private.h
index d76ee1cab6..1bb0c5ce4e 100644
--- a/modules/calendar/e-task-shell-view-private.h
+++ b/modules/calendar/e-task-shell-view-private.h
@@ -26,10 +26,8 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <libecal/e-cal-time-util.h>
-#include <libedataserver/e-categories.h>
-#include <libedataserver/e-sexp.h>
-#include <libedataserverui/e-client-utils.h>
+#include <libecal/libecal.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include "e-util/e-dialog-utils.h"
 #include "e-util/e-file-utils.h"
diff --git a/modules/composer-autosave/e-composer-autosave.c b/modules/composer-autosave/e-composer-autosave.c
index 893db7f966..e24b1640c0 100644
--- a/modules/composer-autosave/e-composer-autosave.c
+++ b/modules/composer-autosave/e-composer-autosave.c
@@ -20,7 +20,7 @@
 #include <config.h>
 #endif
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <libevolution-utils/e-alert-dialog.h>
 #include <composer/e-msg-composer.h>
diff --git a/modules/composer-autosave/e-composer-registry.c b/modules/composer-autosave/e-composer-registry.c
index 03c227b64d..76736c8fe6 100644
--- a/modules/composer-autosave/e-composer-registry.c
+++ b/modules/composer-autosave/e-composer-registry.c
@@ -21,7 +21,7 @@
 #endif
 
 #include <glib/gstdio.h>
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <shell/e-shell.h>
 #include <shell/e-shell-window.h>
diff --git a/modules/imap-features/e-mail-config-imap-headers-page.c b/modules/imap-features/e-mail-config-imap-headers-page.c
index 6c9eaecbcb..e40d9f88ab 100644
--- a/modules/imap-features/e-mail-config-imap-headers-page.c
+++ b/modules/imap-features/e-mail-config-imap-headers-page.c
@@ -21,9 +21,6 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libedataserver/e-source-camel.h>
-#include <libedataserver/e-source-mail-account.h>
-
 #include <mail/e-mail-config-security-page.h>
 
 #include "e-mail-config-header-manager.h"
diff --git a/modules/imap-features/e-mail-config-imap-headers-page.h b/modules/imap-features/e-mail-config-imap-headers-page.h
index 87a1a50ff6..b99d9898aa 100644
--- a/modules/imap-features/e-mail-config-imap-headers-page.h
+++ b/modules/imap-features/e-mail-config-imap-headers-page.h
@@ -20,7 +20,7 @@
 #define E_MAIL_CONFIG_IMAP_HEADERS_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/modules/imap-features/evolution-imap-features.c b/modules/imap-features/evolution-imap-features.c
index 1b99daf62d..e6f2922017 100644
--- a/modules/imap-features/evolution-imap-features.c
+++ b/modules/imap-features/evolution-imap-features.c
@@ -19,8 +19,7 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extension.h>
-#include <libedataserver/e-source-mail-account.h>
+#include <libebackend/libebackend.h>
 
 #include <mail/e-mail-config-notebook.h>
 
diff --git a/modules/mail-config/e-mail-config-google-summary.c b/modules/mail-config/e-mail-config-google-summary.c
index c53202f68f..e4e383d3f8 100644
--- a/modules/mail-config/e-mail-config-google-summary.c
+++ b/modules/mail-config/e-mail-config-google-summary.c
@@ -21,11 +21,6 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libedataserver/e-data-server-util.h>
-#include <libedataserver/e-source-authentication.h>
-#include <libedataserver/e-source-collection.h>
-#include <libedataserver/e-source-mail-identity.h>
-
 #include <mail/e-mail-config-summary-page.h>
 
 #define E_MAIL_CONFIG_GOOGLE_SUMMARY_GET_PRIVATE(obj) \
diff --git a/modules/mail-config/e-mail-config-google-summary.h b/modules/mail-config/e-mail-config-google-summary.h
index 22c0c6fc14..54a8e218e5 100644
--- a/modules/mail-config/e-mail-config-google-summary.h
+++ b/modules/mail-config/e-mail-config-google-summary.h
@@ -19,7 +19,7 @@
 #ifndef E_MAIL_CONFIG_GOOGLE_SUMMARY_H
 #define E_MAIL_CONFIG_GOOGLE_SUMMARY_H
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_CONFIG_GOOGLE_SUMMARY \
diff --git a/modules/mail-config/e-mail-config-local-accounts.c b/modules/mail-config/e-mail-config-local-accounts.c
index c796065919..1f36eedcdf 100644
--- a/modules/mail-config/e-mail-config-local-accounts.c
+++ b/modules/mail-config/e-mail-config-local-accounts.c
@@ -20,7 +20,7 @@
 #include <glib/gi18n-lib.h>
 
 #include <camel/camel.h>
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <mail/e-mail-config-service-page.h>
 
diff --git a/modules/mail-config/e-mail-config-remote-accounts.c b/modules/mail-config/e-mail-config-remote-accounts.c
index 3fae662c8a..984438e768 100644
--- a/modules/mail-config/e-mail-config-remote-accounts.c
+++ b/modules/mail-config/e-mail-config-remote-accounts.c
@@ -20,9 +20,7 @@
 #include <glib/gi18n-lib.h>
 
 #include <camel/camel.h>
-#include <libebackend/e-extension.h>
-#include <libedataserver/e-source-backend.h>
-#include <libedataserver/e-data-server-util.h>
+#include <libebackend/libebackend.h>
 
 #include <misc/e-port-entry.h>
 
diff --git a/modules/mail-config/e-mail-config-smtp-backend.c b/modules/mail-config/e-mail-config-smtp-backend.c
index 15b3814afe..0a9a65abfa 100644
--- a/modules/mail-config/e-mail-config-smtp-backend.c
+++ b/modules/mail-config/e-mail-config-smtp-backend.c
@@ -22,9 +22,7 @@
 #include <glib/gi18n-lib.h>
 
 #include <camel/camel.h>
-#include <libebackend/e-extension.h>
-#include <libedataserver/e-source-backend.h>
-#include <libedataserver/e-data-server-util.h>
+#include <libebackend/libebackend.h>
 
 #include <misc/e-port-entry.h>
 
diff --git a/modules/mail-config/e-mail-config-yahoo-summary.c b/modules/mail-config/e-mail-config-yahoo-summary.c
index d922845ba1..204424ca1a 100644
--- a/modules/mail-config/e-mail-config-yahoo-summary.c
+++ b/modules/mail-config/e-mail-config-yahoo-summary.c
@@ -21,11 +21,6 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libedataserver/e-data-server-util.h>
-#include <libedataserver/e-source-authentication.h>
-#include <libedataserver/e-source-collection.h>
-#include <libedataserver/e-source-mail-identity.h>
-
 #include <mail/e-mail-config-summary-page.h>
 
 #define E_MAIL_CONFIG_YAHOO_SUMMARY_GET_PRIVATE(obj) \
diff --git a/modules/mail-config/e-mail-config-yahoo-summary.h b/modules/mail-config/e-mail-config-yahoo-summary.h
index 33de592992..d80170110a 100644
--- a/modules/mail-config/e-mail-config-yahoo-summary.h
+++ b/modules/mail-config/e-mail-config-yahoo-summary.h
@@ -19,7 +19,7 @@
 #ifndef E_MAIL_CONFIG_YAHOO_SUMMARY_H
 #define E_MAIL_CONFIG_YAHOO_SUMMARY_H
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_CONFIG_YAHOO_SUMMARY \
diff --git a/modules/mail/e-mail-config-format-html.c b/modules/mail/e-mail-config-format-html.c
index dad5f9a518..527f720159 100644
--- a/modules/mail/e-mail-config-format-html.c
+++ b/modules/mail/e-mail-config-format-html.c
@@ -22,7 +22,7 @@
 
 #include "e-mail-config-format-html.h"
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <shell/e-shell.h>
 #include <e-util/e-util.h>
diff --git a/modules/mail/e-mail-config-reader.c b/modules/mail/e-mail-config-reader.c
index b284fbdd8d..3926d05a7d 100644
--- a/modules/mail/e-mail-config-reader.c
+++ b/modules/mail/e-mail-config-reader.c
@@ -22,7 +22,7 @@
 
 #include "e-mail-config-reader.h"
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <shell/e-shell.h>
 #include <mail/e-mail-reader.h>
diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c
index 813256efd1..12e75dfbdf 100644
--- a/modules/mail/e-mail-config-web-view.c
+++ b/modules/mail/e-mail-config-web-view.c
@@ -25,7 +25,7 @@
 
 #include "e-mail-config-web-view.h"
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <shell/e-shell.h>
 #include <misc/e-web-view.h>
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index 2f8e9c8b71..f5bb100c39 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -27,9 +27,6 @@
 
 #include <glib/gi18n.h>
 
-#include <libedataserver/e-source-registry.h>
-#include <libedataserver/e-source-mail-transport.h>
-
 #include <e-util/e-import.h>
 #include <e-util/e-util.h>
 
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index 1bf6d4e29a..15d477a3c0 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -26,7 +26,6 @@
 #include "e-mail-shell-content.h"
 
 #include <glib/gi18n.h>
-#include <libedataserver/e-data-server-util.h>
 
 #include <e-util/e-util-private.h>
 
diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h
index f9c3ba2080..4a7f342085 100644
--- a/modules/mail/e-mail-shell-view-private.h
+++ b/modules/mail/e-mail-shell-view-private.h
@@ -27,7 +27,6 @@
 #include <glib/gi18n.h>
 #include <gtkhtml/gtkhtml.h>
 #include <camel/camel-search-private.h>  /* for camel_search_word */
-#include <libedataserver/e-source-mail-account.h>
 
 #include <e-util/e-util.h>
 #include <e-util/e-ui-manager.h>
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index cf20b8f777..00334d7559 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -33,8 +33,6 @@
 #include <gtkhtml/gtkhtml-properties.h>
 #include <libxml/tree.h>
 
-#include "libedataserverui/e-cell-renderer-color.h"
-
 #include <e-util/e-util.h>
 #include <e-util/e-datetime-format.h>
 #include <e-util/e-util-private.h>
diff --git a/modules/mailto-handler/evolution-mailto-handler.c b/modules/mailto-handler/evolution-mailto-handler.c
index 98e03516ce..d31d27e45e 100644
--- a/modules/mailto-handler/evolution-mailto-handler.c
+++ b/modules/mailto-handler/evolution-mailto-handler.c
@@ -21,7 +21,7 @@
 #endif
 
 #include <glib/gi18n-lib.h>
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <shell/e-shell.h>
 
diff --git a/modules/mdn/evolution-mdn.c b/modules/mdn/evolution-mdn.c
index 41243d335c..c30e875982 100644
--- a/modules/mdn/evolution-mdn.c
+++ b/modules/mdn/evolution-mdn.c
@@ -20,11 +20,7 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extension.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-mdn.h>
+#include <libebackend/libebackend.h>
 
 #include <libevolution-utils/e-alert-dialog.h>
 
diff --git a/modules/offline-alert/evolution-offline-alert.c b/modules/offline-alert/evolution-offline-alert.c
index 4c3678f477..3a600c093e 100644
--- a/modules/offline-alert/evolution-offline-alert.c
+++ b/modules/offline-alert/evolution-offline-alert.c
@@ -20,7 +20,7 @@
 #include <config.h>
 #endif
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <shell/e-shell-view.h>
 #include <shell/e-shell-window-actions.h>
diff --git a/modules/online-accounts/camel-sasl-xoauth.c b/modules/online-accounts/camel-sasl-xoauth.c
index 10e3223976..df07b9a7ac 100644
--- a/modules/online-accounts/camel-sasl-xoauth.c
+++ b/modules/online-accounts/camel-sasl-xoauth.c
@@ -24,8 +24,6 @@
 
 #include <goa/goa.h>
 
-#include <libedataserver/e-source-goa.h>
-
 #include <libemail-engine/e-mail-session.h>
 
 #include "camel-sasl-xoauth.h"
diff --git a/modules/plugin-manager/evolution-plugin-manager.c b/modules/plugin-manager/evolution-plugin-manager.c
index f95af37b23..482f3368fe 100644
--- a/modules/plugin-manager/evolution-plugin-manager.c
+++ b/modules/plugin-manager/evolution-plugin-manager.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <glib/gi18n-lib.h>
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <e-util/e-plugin.h>
 #include <shell/e-shell-window.h>
diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c
index 3c34f296b5..ef3cdb5afe 100644
--- a/modules/startup-wizard/evolution-startup-wizard.c
+++ b/modules/startup-wizard/evolution-startup-wizard.c
@@ -21,8 +21,7 @@
 #endif
 
 #include <glib/gi18n-lib.h>
-#include <libebackend/e-extension.h>
-#include <libedataserver/e-source-mail-account.h>
+#include <libebackend/libebackend.h>
 
 #include <shell/e-shell.h>
 
diff --git a/modules/web-inspector/evolution-web-inspector.c b/modules/web-inspector/evolution-web-inspector.c
index 27a21e0693..5a7585fbbb 100644
--- a/modules/web-inspector/evolution-web-inspector.c
+++ b/modules/web-inspector/evolution-web-inspector.c
@@ -20,7 +20,7 @@
 #include <glib/gi18n-lib.h>
 
 #include <misc/e-web-view.h>
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 /* Standard GObject macros */
 #define E_TYPE_WEB_INSPECTOR \