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

22 files changed, 31 insertions, 58 deletions

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"