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

8 files changed, 9 insertions, 23 deletions

diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index 57e0d2e899..ccba649037 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -29,8 +29,7 @@
 #include <gconf/gconf-client.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include <libedataserver/e-url.h>
-#include <libedataserverui/e-passwords.h>
+
 #include <calendar/gui/e-cal-config.h>
 #include <shell/es-event.h>
 #include <e-util/e-util.h>
diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c
index d6ba7e5c74..c2ec12e100 100644
--- a/plugins/publish-calendar/publish-format-fb.c
+++ b/plugins/publish-calendar/publish-format-fb.c
@@ -27,12 +27,6 @@
 #include <string.h>
 #include <time.h>
 #include <glib/gi18n.h>
-#include <libedataserver/e-source.h>
-#include <libedataserver/e-source-registry.h>
-#include <libedataserverui/e-client-utils.h>
-#include <libecal/e-cal-client.h>
-#include <libecal/e-cal-util.h>
-#include <libecal/e-cal-time-util.h>
 
 #include <shell/e-shell.h>
 
diff --git a/plugins/publish-calendar/publish-format-fb.h b/plugins/publish-calendar/publish-format-fb.h
index 6d758f1465..8279315be3 100644
--- a/plugins/publish-calendar/publish-format-fb.h
+++ b/plugins/publish-calendar/publish-format-fb.h
@@ -21,7 +21,8 @@
  *
  */
 
-#include <gio/gio.h>
+#include <libecal/libecal.h>
+
 #include "publish-location.h"
 
 #ifndef PUBLISH_FORMAT_FB_H
diff --git a/plugins/publish-calendar/publish-format-ical.c b/plugins/publish-calendar/publish-format-ical.c
index 8ff029301a..08c8c287d5 100644
--- a/plugins/publish-calendar/publish-format-ical.c
+++ b/plugins/publish-calendar/publish-format-ical.c
@@ -26,11 +26,6 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <libedataserver/e-source.h>
-#include <libedataserver/e-source-registry.h>
-#include <libedataserverui/e-client-utils.h>
-#include <libecal/e-cal-client.h>
-#include <libecal/e-cal-util.h>
 
 #include <shell/e-shell.h>
 
diff --git a/plugins/publish-calendar/publish-format-ical.h b/plugins/publish-calendar/publish-format-ical.h
index d4955ca9dd..fc9638a253 100644
--- a/plugins/publish-calendar/publish-format-ical.h
+++ b/plugins/publish-calendar/publish-format-ical.h
@@ -21,7 +21,8 @@
  *
  */
 
-#include <gio/gio.h>
+#include <libecal/libecal.h>
+
 #include "publish-location.h"
 
 #ifndef PUBLISH_FORMAT_ICAL_H
diff --git a/plugins/publish-calendar/publish-location.c b/plugins/publish-calendar/publish-location.c
index 4bb4271037..12fd8a3b5b 100644
--- a/plugins/publish-calendar/publish-location.c
+++ b/plugins/publish-calendar/publish-location.c
@@ -26,11 +26,11 @@
 #endif
 
 #include "publish-location.h"
+
+#include <string.h>
 #include <libxml/tree.h>
 #include <gconf/gconf-client.h>
-#include <libedataserver/e-url.h>
-#include <libedataserverui/e-passwords.h>
-#include <string.h>
+#include <libedataserverui/libedataserverui.h>
 
 static EPublishUri *
 migrateURI (const gchar *xml,
diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c
index ea697fd185..c5483d5e14 100644
--- a/plugins/publish-calendar/url-editor-dialog.c
+++ b/plugins/publish-calendar/url-editor-dialog.c
@@ -29,10 +29,6 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
-#include <libedataserver/e-source-calendar.h>
-#include <libedataserverui/e-passwords.h>
-#include <libedataserver/e-url.h>
-
 #include <e-util/e-util.h>
 #include <e-util/e-util-private.h>
 
diff --git a/plugins/publish-calendar/url-editor-dialog.h b/plugins/publish-calendar/url-editor-dialog.h
index 7283c6fd1b..96fb154c6f 100644
--- a/plugins/publish-calendar/url-editor-dialog.h
+++ b/plugins/publish-calendar/url-editor-dialog.h
@@ -24,7 +24,7 @@
 #define URL_EDITOR_DIALOG_H
 
 #include <gtk/gtk.h>
-#include <libedataserverui/e-source-selector.h>
+#include <libedataserverui/libedataserverui.h>
 #include "publish-location.h"
 
 G_BEGIN_DECLS