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

11 files changed, 8 insertions, 24 deletions

diff --git a/calendar/alarm-notify/alarm-notify-dialog.c b/calendar/alarm-notify/alarm-notify-dialog.c
index f4bc1f41c9..cf94366ae9 100644
--- a/calendar/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/alarm-notify/alarm-notify-dialog.c
@@ -29,8 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib/gi18n.h>
-#include <libedataserver/e-time-utils.h>
-#include <libecal/e-cal-time-util.h>
+
 #include "alarm-notify-dialog.h"
 #include "config-data.h"
 #include "util.h"
diff --git a/calendar/alarm-notify/alarm-notify-dialog.h b/calendar/alarm-notify/alarm-notify-dialog.h
index f61bdba9c8..68e322540a 100644
--- a/calendar/alarm-notify/alarm-notify-dialog.h
+++ b/calendar/alarm-notify/alarm-notify-dialog.h
@@ -25,7 +25,7 @@
 
 #include <time.h>
 #include <gtk/gtk.h>
-#include <libecal/e-cal-component.h>
+#include <libecal/libecal.h>
 
 typedef enum {
 	ALARM_NOTIFY_CLOSE,
diff --git a/calendar/alarm-notify/alarm-notify.c b/calendar/alarm-notify/alarm-notify.c
index 3af3a206a7..a41ba95923 100644
--- a/calendar/alarm-notify/alarm-notify.c
+++ b/calendar/alarm-notify/alarm-notify.c
@@ -26,13 +26,6 @@
 
 #include <string.h>
 #include <camel/camel.h>
-#include <libecal/e-cal-client.h>
-#include <libedataserver/e-data-server-util.h>
-#include <libedataserver/e-source-alarms.h>
-#include <libedataserver/e-source-authentication.h>
-#include <libedataserver/e-source-calendar.h>
-#include <libedataserver/e-source-registry.h>
-#include <libedataserverui/e-client-utils.h>
 
 #include "alarm.h"
 #include "alarm-notify.h"
diff --git a/calendar/alarm-notify/alarm-notify.h b/calendar/alarm-notify/alarm-notify.h
index 1dc46eed80..61097f310a 100644
--- a/calendar/alarm-notify/alarm-notify.h
+++ b/calendar/alarm-notify/alarm-notify.h
@@ -27,8 +27,8 @@
 #define ALARM_NOTIFY_H
 
 #include <gtk/gtk.h>
-#include <libecal/e-cal-client.h>
-#include <libedataserverui/e-client-utils.h>
+#include <libecal/libecal.h>
+#include <libedataserverui/libedataserverui.h>
 
 /* Standard GObject macros */
 #define TYPE_ALARM_NOTIFY \
diff --git a/calendar/alarm-notify/alarm-queue.c b/calendar/alarm-notify/alarm-queue.c
index 7d3a082d5a..a3a5351acd 100644
--- a/calendar/alarm-notify/alarm-queue.c
+++ b/calendar/alarm-notify/alarm-queue.c
@@ -34,10 +34,6 @@
 #include <canberra-gtk.h>
 #endif
 
-#include <libecal/e-cal-client-view.h>
-#include <libecal/e-cal-time-util.h>
-#include <libecal/e-cal-component.h>
-
 #ifdef HAVE_LIBNOTIFY
 #include <libnotify/notify.h>
 #endif
diff --git a/calendar/alarm-notify/alarm-queue.h b/calendar/alarm-notify/alarm-queue.h
index e43027bd60..c2e8990527 100644
--- a/calendar/alarm-notify/alarm-queue.h
+++ b/calendar/alarm-notify/alarm-queue.h
@@ -26,7 +26,7 @@
 #ifndef ALARM_QUEUE_H
 #define ALARM_QUEUE_H
 
-#include <libecal/e-cal-client.h>
+#include <libecal/libecal.h>
 
 void alarm_queue_init (gpointer);
 void alarm_queue_done (void);
diff --git a/calendar/alarm-notify/config-data.c b/calendar/alarm-notify/config-data.c
index 5129ed5ce3..94dd813ab8 100644
--- a/calendar/alarm-notify/config-data.c
+++ b/calendar/alarm-notify/config-data.c
@@ -27,7 +27,6 @@
 #endif
 
 #include <string.h>
-#include <libedataserver/e-source-alarms.h>
 #include "config-data.h"
 
 /* Whether we have initied ourselves by reading
diff --git a/calendar/alarm-notify/config-data.h b/calendar/alarm-notify/config-data.h
index 8eb0cf8b3e..c97c0f7415 100644
--- a/calendar/alarm-notify/config-data.h
+++ b/calendar/alarm-notify/config-data.h
@@ -27,7 +27,7 @@
 #define CONFIG_DATA_H
 
 #include <libical/ical.h>
-#include <libecal/e-cal-client.h>
+#include <libecal/libecal.h>
 
 icaltimezone *	config_data_get_timezone	(void);
 gboolean	config_data_get_24_hour_format	(void);
diff --git a/calendar/alarm-notify/notify-main.c b/calendar/alarm-notify/notify-main.c
index c0d8d725ab..0ddfc5866b 100644
--- a/calendar/alarm-notify/notify-main.c
+++ b/calendar/alarm-notify/notify-main.c
@@ -32,8 +32,6 @@
 
 #include <dbus/dbus-glib.h>
 
-#include <libedataserver/e-gdbus-templates.h>
-
 #include "alarm-notify.h"
 
 #ifdef G_OS_WIN32
diff --git a/calendar/alarm-notify/util.c b/calendar/alarm-notify/util.c
index 891ea131bc..0eee6d5510 100644
--- a/calendar/alarm-notify/util.c
+++ b/calendar/alarm-notify/util.c
@@ -27,8 +27,7 @@
 #endif
 
 #include <glib/gi18n.h>
-#include <libedataserver/e-time-utils.h>
-#include <libecal/e-cal-time-util.h>
+
 #include "config-data.h"
 #include "util.h"
 
diff --git a/calendar/alarm-notify/util.h b/calendar/alarm-notify/util.h
index bb6935729a..a95f6d8e11 100644
--- a/calendar/alarm-notify/util.h
+++ b/calendar/alarm-notify/util.h
@@ -26,7 +26,7 @@
 #ifndef UTIL_H
 #define UTIL_H
 
-#include <libecal/e-cal-component.h>
+#include <libecal/libecal.h>
 
 gchar *timet_to_str_with_zone (time_t t, icaltimezone *zone);
 gchar *calculate_time (time_t start, time_t end);