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

16 files changed, 18 insertions, 21 deletions

diff --git a/shell/e-shell-backend.h b/shell/e-shell-backend.h
index 759a3bdcb7..cd8cf1416e 100644
--- a/shell/e-shell-backend.h
+++ b/shell/e-shell-backend.h
@@ -22,7 +22,7 @@
 #ifndef E_SHELL_BACKEND_H
 #define E_SHELL_BACKEND_H
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <shell/e-shell-common.h>
 #include <e-util/e-activity.h>
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index 24850aeb40..fe35f66676 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -32,7 +32,7 @@
 #include "e-shell-content.h"
 
 #include <glib/gi18n.h>
-#include <libebackend/e-extensible.h>
+#include <libebackend/libebackend.h>
 
 #include "e-util/e-util.h"
 #include "libevolution-utils/e-alert-dialog.h"
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c
index faf40275e9..d746aeff54 100644
--- a/shell/e-shell-migrate.c
+++ b/shell/e-shell-migrate.c
@@ -25,12 +25,13 @@
 
 #include "e-shell-migrate.h"
 
+#include <libedataserver/libedataserver.h>
+
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
-#include <libedataserver/e-xml-utils.h>
 
 #include "libevolution-utils/e-alert-dialog.h"
 #include "e-util/e-file-utils.h"
diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c
index 4299904c70..644293b2a2 100644
--- a/shell/e-shell-searchbar.c
+++ b/shell/e-shell-searchbar.c
@@ -32,7 +32,7 @@
 #include "e-shell-searchbar.h"
 
 #include <glib/gi18n-lib.h>
-#include <libebackend/e-extensible.h>
+#include <libebackend/libebackend.h>
 
 #include "e-util/e-util.h"
 #include "widgets/misc/e-action-combo-box.h"
diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c
index 040d35fac1..d869a2a63a 100644
--- a/shell/e-shell-sidebar.c
+++ b/shell/e-shell-sidebar.c
@@ -31,7 +31,7 @@
 
 #include "e-shell-sidebar.h"
 
-#include <libebackend/e-extensible.h>
+#include <libebackend/libebackend.h>
 
 #include <libevolution-utils/e-alert-sink.h>
 #include <e-util/e-unicode.h>
diff --git a/shell/e-shell-switcher.c b/shell/e-shell-switcher.c
index 74d1a0538f..efbc311945 100644
--- a/shell/e-shell-switcher.c
+++ b/shell/e-shell-switcher.c
@@ -32,7 +32,7 @@
 #include "e-shell-switcher.h"
 
 #include <glib/gi18n.h>
-#include <libebackend/e-extensible.h>
+#include <libebackend/libebackend.h>
 
 #define E_SHELL_SWITCHER_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c
index e272524fa1..3a3d311f7d 100644
--- a/shell/e-shell-taskbar.c
+++ b/shell/e-shell-taskbar.c
@@ -31,7 +31,7 @@
 
 #include "e-shell-taskbar.h"
 
-#include <libebackend/e-extensible.h>
+#include <libebackend/libebackend.h>
 
 #include <e-shell-view.h>
 #include <misc/e-activity-proxy.h>
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
index eef69d6182..1fd63a91e3 100644
--- a/shell/e-shell-utils.c
+++ b/shell/e-shell-utils.c
@@ -33,7 +33,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <libedataserver/e-data-server-util.h>
+#include <libedataserver/libedataserver.h>
 
 #include "widgets/misc/e-import-assistant.h"
 
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index bd66ce2897..fdad1cbd19 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -33,7 +33,7 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <libebackend/e-extensible.h>
+#include <libebackend/libebackend.h>
 
 #include "e-util/e-file-utils.h"
 #include "e-util/e-plugin-ui.h"
diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h
index 0d7aee01ae..726777f2d4 100644
--- a/shell/e-shell-view.h
+++ b/shell/e-shell-view.h
@@ -22,7 +22,7 @@
 #ifndef E_SHELL_VIEW_H
 #define E_SHELL_VIEW_H
 
-#include <libedataserver/e-source.h>
+#include <libedataserver/libedataserver.h>
 
 #include <shell/e-shell-common.h>
 #include <shell/e-shell-backend.h>
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index e05b24b700..293a39b645 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -30,8 +30,7 @@
 #include <e-util/e-print.h>
 #include <gal-define-views-dialog.h>
 
-#include <libedataserverui/e-passwords.h>
-#include <libedataserverui/e-categories-editor.h>
+#include <libedataserverui/libedataserverui.h>
 
 #define EVOLUTION_COPYRIGHT \
 	"Copyright \xC2\xA9 1999 - 2008 Novell, Inc. and Others\n" \
diff --git a/shell/e-shell-window-private.h b/shell/e-shell-window-private.h
index cbb027ca8a..7a2a40cc3f 100644
--- a/shell/e-shell-window-private.h
+++ b/shell/e-shell-window-private.h
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
-#include <libebackend/e-extensible.h>
+#include <libebackend/libebackend.h>
 
 #include <e-util/e-util.h>
 #include <e-util/e-util-private.h>
diff --git a/shell/e-shell.c b/shell/e-shell.c
index ae2641fac4..ae8abb2a50 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -32,9 +32,8 @@
 #include "e-shell.h"
 
 #include <glib/gi18n.h>
-#include <libebackend/e-module.h>
-#include <libebackend/e-extensible.h>
-#include <libedataserverui/e-passwords.h>
+#include <libebackend/libebackend.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include "e-util/e-util.h"
 #include "e-util/e-util-private.h"
diff --git a/shell/e-shell.h b/shell/e-shell.h
index 786e6c8d44..4dcd7e7921 100644
--- a/shell/e-shell.h
+++ b/shell/e-shell.h
@@ -22,7 +22,7 @@
 #ifndef E_SHELL_H
 #define E_SHELL_H
 
-#include <libedataserver/e-source-registry.h>
+#include <libedataserver/libedataserver.h>
 
 #include <e-util/e-activity.h>
 #include <libevolution-utils/e-alert.h>
diff --git a/shell/killev.c b/shell/killev.c
index f444fad0b8..9c99130762 100644
--- a/shell/killev.c
+++ b/shell/killev.c
@@ -29,7 +29,7 @@
 #include <gio/gio.h>
 #include <glib/gi18n.h>
 
-#include <libedataserver/e-data-server-util.h>
+#include <libedataserver/libedataserver.h>
 
 /* Seconds to wait after asking Evolution to terminate gracefully.
  * If the process has not terminated before the timeout expires,
diff --git a/shell/main.c b/shell/main.c
index 6db7947ea5..521f817623 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -58,9 +58,7 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-#include <libedataserver/e-categories.h>
-#include <libedataserver/e-gdbus-templates.h>
-#include <libedataserverui/e-passwords.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include "e-shell.h"
 #include "e-shell-migrate.h"