Implement single-file includes for all E-D-S libraries.

The top-level headers are named after the library:

    #include <libebackend/libebackend.h>
    #include <libebook/libebook.h>
    #include <libecal/libecal.h>
    #include <libedata-book/libedata-book.h>
    #include <libedata-cal/libedata-cal.h>
    #include <libedataserver/libedataserver.h>
    #include <libedataserverui/libedataserverui.h>

Including individual headers will cause a compilation error.

77 files changed, 301 insertions, 38 deletions

diff --git a/libedataserver/Makefile.am b/libedataserver/Makefile.am
index 3a7b83ba6..586a03e6a 100644
--- a/libedataserver/Makefile.am
+++ b/libedataserver/Makefile.am
@@ -24,6 +24,7 @@ libedataserver_1_2_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)							\
 	-I$(top_srcdir)							\
 	-I$(top_srcdir)/private						\
+	-DLIBEDATASERVER_COMPILATION					\
 	-DG_LOG_DOMAIN=\"e-data-server\"				\
 	-DE_DATA_SERVER_PREFIX=\"$(prefix)\"				\
 	-DE_DATA_SERVER_LOCALEDIR=\""$(localedir)"\"			\
@@ -110,6 +111,7 @@ libedataserver_1_2_la_LDFLAGS = \
 libedataserverincludedir = $(privincludedir)/libedataserver
 
 libedataserverinclude_HEADERS =		\
+	libedataserver.h		\
 	e-categories.h			\
 	e-client.h			\
 	e-credentials.h			\
@@ -192,8 +194,7 @@ DISTCLEANFILES = eds-version.h				\
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = --identifier-prefix E --pkg-export \
-	libedataserver-1.2  --c-include="libedataserver/e-account.h" \
-	--c-include="libedataserver/e-source.h"
+	libedataserver-1.2  --c-include="libedataserver/libedataserver.h"
 INTROSPECTION_COMPILER_ARGS =
 
 if HAVE_INTROSPECTION
@@ -203,7 +204,7 @@ introspection_sources = \
 
 EDataServer-1.2.gir: libedataserver-1.2.la
 EDataServer_1_2_gir_INCLUDES = GObject-2.0 libxml2-2.0 Gio-2.0
-EDataServer_1_2_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) $(E_DATA_SERVER_CFLAGS) \
+EDataServer_1_2_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -DLIBEDATASERVER_COMPILATION $(E_DATA_SERVER_CFLAGS) \
 	$(SOUP_CFLAGS)
 EDataServer_1_2_gir_LIBS = libedataserver-1.2.la
 EDataServer_1_2_gir_FILES = $(introspection_sources)
diff --git a/libedataserver/e-categories.h b/libedataserver/e-categories.h
index 4bc048ae6..2baae0f31 100644
--- a/libedataserver/e-categories.h
+++ b/libedataserver/e-categories.h
@@ -17,6 +17,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_CATEGORIES_H
 #define E_CATEGORIES_H
 
diff --git a/libedataserver/e-client-private.h b/libedataserver/e-client-private.h
index 8ae38ef9c..f1da0c414 100644
--- a/libedataserver/e-client-private.h
+++ b/libedataserver/e-client-private.h
@@ -22,10 +22,7 @@
 #ifndef E_CLIENT_PRIVATE_H
 #define E_CLIENT_PRIVATE_H
 
-#include <gio/gio.h>
-
-#include "libedataserver/e-source.h"
-#include "libedataserver/e-client.h"
+#include <libedataserver/libedataserver.h>
 
 G_BEGIN_DECLS
 
diff --git a/libedataserver/e-client.h b/libedataserver/e-client.h
index 5833cf0d8..203f95fc5 100644
--- a/libedataserver/e-client.h
+++ b/libedataserver/e-client.h
@@ -19,6 +19,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_CLIENT_H
 #define E_CLIENT_H
 
diff --git a/libedataserver/e-credentials.h b/libedataserver/e-credentials.h
index 8078fcd67..e3dcd93bf 100644
--- a/libedataserver/e-credentials.h
+++ b/libedataserver/e-credentials.h
@@ -19,6 +19,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef EDS_DISABLE_DEPRECATED
 
 #ifndef E_CREDENTIALS_H
diff --git a/libedataserver/e-data-server-util.h b/libedataserver/e-data-server-util.h
index f9ba9cb12..371a41599 100644
--- a/libedataserver/e-data-server-util.h
+++ b/libedataserver/e-data-server-util.h
@@ -19,6 +19,10 @@
  * Authors: Rodrigo Moya <rodrigo@ximian.com>
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_DATA_SERVER_UTIL_H
 #define E_DATA_SERVER_UTIL_H
 
diff --git a/libedataserver/e-debug-log.h b/libedataserver/e-debug-log.h
index 1862a1af8..9e40b07d8 100644
--- a/libedataserver/e-debug-log.h
+++ b/libedataserver/e-debug-log.h
@@ -21,6 +21,10 @@
  * Author: Federico Mena-Quintero <federico@novell.com>
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_DEBUG_LOG_H
 #define E_DEBUG_LOG_H
 
diff --git a/libedataserver/e-flag.h b/libedataserver/e-flag.h
index 10d2fb159..b10d9b905 100644
--- a/libedataserver/e-flag.h
+++ b/libedataserver/e-flag.h
@@ -17,6 +17,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_FLAG_H
 #define E_FLAG_H
 
diff --git a/libedataserver/e-gdbus-templates.h b/libedataserver/e-gdbus-templates.h
index a42be8453..0c45d486c 100644
--- a/libedataserver/e-gdbus-templates.h
+++ b/libedataserver/e-gdbus-templates.h
@@ -19,6 +19,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_GDBUS_TEMPLATES_H
 #define E_GDBUS_TEMPLATES_H
 
diff --git a/libedataserver/e-iterator.h b/libedataserver/e-iterator.h
index 356c23987..1102f8947 100644
--- a/libedataserver/e-iterator.h
+++ b/libedataserver/e-iterator.h
@@ -6,6 +6,10 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef EDS_DISABLE_DEPRECATED
 
 #ifndef E_ITERATOR_H
diff --git a/libedataserver/e-list-iterator.h b/libedataserver/e-list-iterator.h
index 3d3a954b7..e5386b415 100644
--- a/libedataserver/e-list-iterator.h
+++ b/libedataserver/e-list-iterator.h
@@ -6,6 +6,10 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef EDS_DISABLE_DEPRECATED
 
 #ifndef E_LIST_ITERATOR_H
diff --git a/libedataserver/e-list.h b/libedataserver/e-list.h
index 35a969082..7ee10bfc9 100644
--- a/libedataserver/e-list.h
+++ b/libedataserver/e-list.h
@@ -6,6 +6,10 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef EDS_DISABLE_DEPRECATED
 
 #ifndef E_LIST_H
diff --git a/libedataserver/e-memory.h b/libedataserver/e-memory.h
index f223349f2..3ec15de3e 100644
--- a/libedataserver/e-memory.h
+++ b/libedataserver/e-memory.h
@@ -19,6 +19,10 @@
  * USA
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_MEMORY_H
 #define E_MEMORY_H
 
diff --git a/libedataserver/e-operation-pool.h b/libedataserver/e-operation-pool.h
index 375f06747..e5edf3270 100644
--- a/libedataserver/e-operation-pool.h
+++ b/libedataserver/e-operation-pool.h
@@ -19,6 +19,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_OPERATION_POOL_H
 #define E_OPERATION_POOL_H
 
diff --git a/libedataserver/e-proxy.h b/libedataserver/e-proxy.h
index fb1cd3de0..6dfa156f8 100644
--- a/libedataserver/e-proxy.h
+++ b/libedataserver/e-proxy.h
@@ -21,6 +21,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_PROXY_H
 #define E_PROXY_H
 
diff --git a/libedataserver/e-sexp.h b/libedataserver/e-sexp.h
index 17b2f18f1..9ff293516 100644
--- a/libedataserver/e-sexp.h
+++ b/libedataserver/e-sexp.h
@@ -1,6 +1,11 @@
 /*
  * generic s-exp evaluator class
 */
+
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef _E_SEXP_H
 #define _E_SEXP_H
 
diff --git a/libedataserver/e-source-address-book.c b/libedataserver/e-source-address-book.c
index 2687f1d0b..38eb98a04 100644
--- a/libedataserver/e-source-address-book.c
+++ b/libedataserver/e-source-address-book.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-address-book
- * @include: libedataserver/e-source-address-book.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for an address book
  *
  * The #ESourceAddressBook extension identifies the #ESource as an
diff --git a/libedataserver/e-source-address-book.h b/libedataserver/e-source-address-book.h
index bd9dc2566..dbe2f4ed6 100644
--- a/libedataserver/e-source-address-book.h
+++ b/libedataserver/e-source-address-book.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_ADDRESS_BOOK_H
 #define E_SOURCE_ADDRESS_BOOK_H
 
diff --git a/libedataserver/e-source-alarms.c b/libedataserver/e-source-alarms.c
index 57bdcc4c1..8238a07d8 100644
--- a/libedataserver/e-source-alarms.c
+++ b/libedataserver/e-source-alarms.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-alarms
- * @include: libedataserver/e-source-alarms.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for alarm state
  *
  * The #ESourceAlarms extension tracks alarm state for a calendar.
diff --git a/libedataserver/e-source-alarms.h b/libedataserver/e-source-alarms.h
index cacc7d581..630aa4f8e 100644
--- a/libedataserver/e-source-alarms.h
+++ b/libedataserver/e-source-alarms.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_ALARMS_H
 #define E_SOURCE_ALARMS_H
 
diff --git a/libedataserver/e-source-authentication.c b/libedataserver/e-source-authentication.c
index 9246c2c42..712273434 100644
--- a/libedataserver/e-source-authentication.c
+++ b/libedataserver/e-source-authentication.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-authentication
- * @include: libedataserver/e-source-authentication.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for authentication settings
  *
  * The #ESourceAuthentication extension tracks authentication settings
diff --git a/libedataserver/e-source-authentication.h b/libedataserver/e-source-authentication.h
index 86faaf05a..3d2fbe14b 100644
--- a/libedataserver/e-source-authentication.h
+++ b/libedataserver/e-source-authentication.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_AUTHENTICATION_H
 #define E_SOURCE_AUTHENTICATION_H
 
diff --git a/libedataserver/e-source-authenticator.c b/libedataserver/e-source-authenticator.c
index 7d9959907..3e9936bb9 100644
--- a/libedataserver/e-source-authenticator.c
+++ b/libedataserver/e-source-authenticator.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-authenticator
- * @include: libedataserver/e-source-authenticator.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: Interface for authentication attempts
  *
  * An object implementing the #ESourceAuthenticator interface gets passed
diff --git a/libedataserver/e-source-authenticator.h b/libedataserver/e-source-authenticator.h
index c40d09bef..e9c0b7f90 100644
--- a/libedataserver/e-source-authenticator.h
+++ b/libedataserver/e-source-authenticator.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_AUTHENTICATOR_H
 #define E_SOURCE_AUTHENTICATOR_H
 
diff --git a/libedataserver/e-source-autocomplete.c b/libedataserver/e-source-autocomplete.c
index 5aa9d13df..93148e2a6 100644
--- a/libedataserver/e-source-autocomplete.c
+++ b/libedataserver/e-source-autocomplete.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-autocomplete
- * @include: libedataserver/e-source-autocomplete.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for autocomplete settings
  *
  * The #ESourceAutocomplete extension tracks contact autocompletion
diff --git a/libedataserver/e-source-autocomplete.h b/libedataserver/e-source-autocomplete.h
index db42606db..56ec8c87b 100644
--- a/libedataserver/e-source-autocomplete.h
+++ b/libedataserver/e-source-autocomplete.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_AUTOCOMPLETE_H
 #define E_SOURCE_AUTOCOMPLETE_H
 
diff --git a/libedataserver/e-source-backend.c b/libedataserver/e-source-backend.c
index e9be2ab21..301ceb272 100644
--- a/libedataserver/e-source-backend.c
+++ b/libedataserver/e-source-backend.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-backend
- * @include: libedataserver/e-source-backend.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: Base class for backend-based data sources
  *
  * #ESourceBackend is an abstract base class for data sources requiring
diff --git a/libedataserver/e-source-backend.h b/libedataserver/e-source-backend.h
index 5d3baee4c..20c8dba72 100644
--- a/libedataserver/e-source-backend.h
+++ b/libedataserver/e-source-backend.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_BACKEND_H
 #define E_SOURCE_BACKEND_H
 
diff --git a/libedataserver/e-source-calendar.c b/libedataserver/e-source-calendar.c
index 13d0d527e..5714f9b29 100644
--- a/libedataserver/e-source-calendar.c
+++ b/libedataserver/e-source-calendar.c
@@ -21,7 +21,7 @@
 
 /**
  * SECTION: e-source-calendar
- * @include: libedataserver/e-source-calendar.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for a calendar
  *
  * The #ESourceCalendar extension identifies the #ESource as a calendar.
@@ -39,7 +39,7 @@
 
 /**
  * SECTION: e-source-memo-list
- * @include: libedataserver/e-source-calendar.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for a memo list
  *
  * The #ESourceCalendar extension identifies the #ESource as a memo list.
@@ -57,7 +57,7 @@
 
 /**
  * SECTION: e-source-task-list
- * @include: libedataserver/e-source-calendar.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for a task list
  *
  * The #ESourceCalendar extension identifies the #ESource as a task list.
diff --git a/libedataserver/e-source-calendar.h b/libedataserver/e-source-calendar.h
index ac84bc406..573e0be5e 100644
--- a/libedataserver/e-source-calendar.h
+++ b/libedataserver/e-source-calendar.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_CALENDAR_H
 #define E_SOURCE_CALENDAR_H
 
diff --git a/libedataserver/e-source-camel.c b/libedataserver/e-source-camel.c
index df0d67b23..107fc2d24 100644
--- a/libedataserver/e-source-camel.c
+++ b/libedataserver/e-source-camel.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-camel
- * @include: libedataserver/e-source-camel.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for #CamelSettings
  *
  * #ESourceCamel itself is abstract.  Its sole function is to
diff --git a/libedataserver/e-source-camel.h b/libedataserver/e-source-camel.h
index 703955e57..98d526517 100644
--- a/libedataserver/e-source-camel.h
+++ b/libedataserver/e-source-camel.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_CAMEL_H
 #define E_SOURCE_CAMEL_H
 
diff --git a/libedataserver/e-source-collection.c b/libedataserver/e-source-collection.c
index 4a80c4a8a..ce8922616 100644
--- a/libedataserver/e-source-collection.c
+++ b/libedataserver/e-source-collection.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-collection
- * @include: libedataserver/e-source-collection.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for grouping related resources
  *
  * The #ESourceCollection extension identifies the #ESource as the root
diff --git a/libedataserver/e-source-collection.h b/libedataserver/e-source-collection.h
index b7e95beba..36806d525 100644
--- a/libedataserver/e-source-collection.h
+++ b/libedataserver/e-source-collection.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_COLLECTION_H
 #define E_SOURCE_COLLECTION_H
 
diff --git a/libedataserver/e-source-enums.h b/libedataserver/e-source-enums.h
index d4c7214d6..8e7bf0528 100644
--- a/libedataserver/e-source-enums.h
+++ b/libedataserver/e-source-enums.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_ENUMS_H
 #define E_SOURCE_ENUMS_H
 
diff --git a/libedataserver/e-source-extension.c b/libedataserver/e-source-extension.c
index 07024cf9d..4d7ea7648 100644
--- a/libedataserver/e-source-extension.c
+++ b/libedataserver/e-source-extension.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-extension
- * @include: libedataserver/e-source-extension.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: Base class for #ESource extensions
  *
  * #ESourceExtension is an abstract base class for #ESource extension
diff --git a/libedataserver/e-source-extension.h b/libedataserver/e-source-extension.h
index 40956963d..a51e4dfa5 100644
--- a/libedataserver/e-source-extension.h
+++ b/libedataserver/e-source-extension.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_EXTENSION_H
 #define E_SOURCE_EXTENSION_H
 
diff --git a/libedataserver/e-source-goa.c b/libedataserver/e-source-goa.c
index 3fd17b9c3..9efd00938 100644
--- a/libedataserver/e-source-goa.c
+++ b/libedataserver/e-source-goa.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-goa
- * @include: libedataserver/e-source-goa.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for GNOME Online Accounts
  *
  * The #ESourceGoa extension associates an #ESource with a #GoaAccount.
diff --git a/libedataserver/e-source-goa.h b/libedataserver/e-source-goa.h
index ed68d9fef..bbbbb678c 100644
--- a/libedataserver/e-source-goa.h
+++ b/libedataserver/e-source-goa.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_GOA_H
 #define E_SOURCE_GOA_H
 
diff --git a/libedataserver/e-source-mail-account.c b/libedataserver/e-source-mail-account.c
index 65c269821..8331a8721 100644
--- a/libedataserver/e-source-mail-account.c
+++ b/libedataserver/e-source-mail-account.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-mail-account
- * @include: libedataserver/e-source-mail-account.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for an email account
  *
  * The #ESourceMailAccount extension identifies the #ESource as a
diff --git a/libedataserver/e-source-mail-account.h b/libedataserver/e-source-mail-account.h
index c956ae326..506182cdf 100644
--- a/libedataserver/e-source-mail-account.h
+++ b/libedataserver/e-source-mail-account.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_MAIL_ACCOUNT_H
 #define E_SOURCE_MAIL_ACCOUNT_H
 
diff --git a/libedataserver/e-source-mail-composition.c b/libedataserver/e-source-mail-composition.c
index db42b88b8..d26668c75 100644
--- a/libedataserver/e-source-mail-composition.c
+++ b/libedataserver/e-source-mail-composition.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-mail-composition
- * @include: libedataserver/e-source-mail-composition.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for mail composition settings
  *
  * The #ESourceMailComposition extension tracks settings to be applied
diff --git a/libedataserver/e-source-mail-composition.h b/libedataserver/e-source-mail-composition.h
index 29c8ffd33..54304336b 100644
--- a/libedataserver/e-source-mail-composition.h
+++ b/libedataserver/e-source-mail-composition.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_MAIL_COMPOSITION_H
 #define E_SOURCE_MAIL_COMPOSITION_H
 
diff --git a/libedataserver/e-source-mail-identity.c b/libedataserver/e-source-mail-identity.c
index 2f1797bb1..7e7a33063 100644
--- a/libedataserver/e-source-mail-identity.c
+++ b/libedataserver/e-source-mail-identity.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-mail-identity
- * @include: libedataserver/e-source-mail-identity.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for an email identity
  *
  * The #ESourceMailIdentity extension describes an "identity" for a mail
diff --git a/libedataserver/e-source-mail-identity.h b/libedataserver/e-source-mail-identity.h
index 276fc84c5..9b2cef0e0 100644
--- a/libedataserver/e-source-mail-identity.h
+++ b/libedataserver/e-source-mail-identity.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_MAIL_IDENTITY_H
 #define E_SOURCE_MAIL_IDENTITY_H
 
diff --git a/libedataserver/e-source-mail-signature.c b/libedataserver/e-source-mail-signature.c
index fc198d71c..38601399b 100644
--- a/libedataserver/e-source-mail-signature.c
+++ b/libedataserver/e-source-mail-signature.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-mail-signature
- * @include: libedataserver/e-source-mail-signature.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for email signatures
  *
  * The #ESourceMailSignature extension refers to a personalized email
diff --git a/libedataserver/e-source-mail-signature.h b/libedataserver/e-source-mail-signature.h
index 3922f8faf..668c8be7c 100644
--- a/libedataserver/e-source-mail-signature.h
+++ b/libedataserver/e-source-mail-signature.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_MAIL_SIGNATURE_H
 #define E_SOURCE_MAIL_SIGNATURE_H
 
diff --git a/libedataserver/e-source-mail-submission.c b/libedataserver/e-source-mail-submission.c
index 32d84c7aa..448939f4d 100644
--- a/libedataserver/e-source-mail-submission.c
+++ b/libedataserver/e-source-mail-submission.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-mail-submission
- * @include: libedataserver/e-source-mail-submission.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for submitting emails
  *
  * The #ESourceMailSubmission extension tracks settings to be applied
diff --git a/libedataserver/e-source-mail-submission.h b/libedataserver/e-source-mail-submission.h
index 08336095d..d23e5415f 100644
--- a/libedataserver/e-source-mail-submission.h
+++ b/libedataserver/e-source-mail-submission.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_MAIL_SUBMISSION_H
 #define E_SOURCE_MAIL_SUBMISSION_H
 
diff --git a/libedataserver/e-source-mail-transport.c b/libedataserver/e-source-mail-transport.c
index d54f99385..847fa9e97 100644
--- a/libedataserver/e-source-mail-transport.c
+++ b/libedataserver/e-source-mail-transport.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-mail-transport
- * @include: libedataserver/e-source-mail-transport.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for an email transport
  *
  * The #ESourceMailTransport extension identifies the #ESource as a
diff --git a/libedataserver/e-source-mail-transport.h b/libedataserver/e-source-mail-transport.h
index de55111d5..72c18bf64 100644
--- a/libedataserver/e-source-mail-transport.h
+++ b/libedataserver/e-source-mail-transport.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_MAIL_TRANSPORT_H
 #define E_SOURCE_MAIL_TRANSPORT_H
 
diff --git a/libedataserver/e-source-mdn.c b/libedataserver/e-source-mdn.c
index e63d64590..6776e88b8 100644
--- a/libedataserver/e-source-mdn.c
+++ b/libedataserver/e-source-mdn.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-mdn
- * @include: libedataserver/e-source-mdn.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for MDN settings
  *
  * The #ESourceMDN extension tracks Message Disposition Notification
diff --git a/libedataserver/e-source-mdn.h b/libedataserver/e-source-mdn.h
index 016ef7db6..404ea000d 100644
--- a/libedataserver/e-source-mdn.h
+++ b/libedataserver/e-source-mdn.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_MDN_H
 #define E_SOURCE_MDN_H
 
diff --git a/libedataserver/e-source-offline.c b/libedataserver/e-source-offline.c
index b5f60f4de..2a34cb950 100644
--- a/libedataserver/e-source-offline.c
+++ b/libedataserver/e-source-offline.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-offline
- * @include: libedataserver/e-source-offline.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for offline settings
  *
  * The #ESourceOffline extension tracks whether data from a remote
diff --git a/libedataserver/e-source-offline.h b/libedataserver/e-source-offline.h
index 00053db20..5f34a6a9c 100644
--- a/libedataserver/e-source-offline.h
+++ b/libedataserver/e-source-offline.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_OFFLINE_H
 #define E_SOURCE_OFFLINE_H
 
diff --git a/libedataserver/e-source-openpgp.c b/libedataserver/e-source-openpgp.c
index 18aa3abb2..ebdfbafba 100644
--- a/libedataserver/e-source-openpgp.c
+++ b/libedataserver/e-source-openpgp.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-openpgp
- * @include: libedataserver/e-source-openpgp.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for OpenPGP settings
  *
  * The #ESourceOpenPGP extension tracks OpenPGP (RFC 4880) settings to be
diff --git a/libedataserver/e-source-openpgp.h b/libedataserver/e-source-openpgp.h
index 840b9296c..c4d53488b 100644
--- a/libedataserver/e-source-openpgp.h
+++ b/libedataserver/e-source-openpgp.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_OPENPGP_H
 #define E_SOURCE_OPENPGP_H
 
diff --git a/libedataserver/e-source-refresh.c b/libedataserver/e-source-refresh.c
index 7c5fa570f..8c0e4936e 100644
--- a/libedataserver/e-source-refresh.c
+++ b/libedataserver/e-source-refresh.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-refresh
- * @include: libedataserver/e-source-refresh.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for refresh settings
  *
  * The #ESourceRefresh extension tracks the interval for fetching
diff --git a/libedataserver/e-source-refresh.h b/libedataserver/e-source-refresh.h
index 9b05ba993..1856176dd 100644
--- a/libedataserver/e-source-refresh.h
+++ b/libedataserver/e-source-refresh.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_REFRESH_H
 #define E_SOURCE_REFRESH_H
 
diff --git a/libedataserver/e-source-registry.c b/libedataserver/e-source-registry.c
index 6d4f5a028..01237b12c 100644
--- a/libedataserver/e-source-registry.c
+++ b/libedataserver/e-source-registry.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-registry
- * @include: libedataserver/e-source-registry.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: A central repository for data sources
  *
  * The #ESourceRegistry is a global singleton store for all #ESource
diff --git a/libedataserver/e-source-registry.h b/libedataserver/e-source-registry.h
index c675fa70f..8ee290f38 100644
--- a/libedataserver/e-source-registry.h
+++ b/libedataserver/e-source-registry.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_REGISTRY_H
 #define E_SOURCE_REGISTRY_H
 
diff --git a/libedataserver/e-source-security.c b/libedataserver/e-source-security.c
index 6bc916d5c..b2d945b07 100644
--- a/libedataserver/e-source-security.c
+++ b/libedataserver/e-source-security.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-security
- * @include: libedataserver/e-source-security.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for security settings
  *
  * The #ESourceSecurity extension tracks settings for establishing a
diff --git a/libedataserver/e-source-security.h b/libedataserver/e-source-security.h
index 28e2e851f..67d083e65 100644
--- a/libedataserver/e-source-security.h
+++ b/libedataserver/e-source-security.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_SECURITY_H
 #define E_SOURCE_SECURITY_H
 
diff --git a/libedataserver/e-source-selectable.c b/libedataserver/e-source-selectable.c
index 564538763..1e9aede05 100644
--- a/libedataserver/e-source-selectable.c
+++ b/libedataserver/e-source-selectable.c
@@ -18,10 +18,9 @@
 
 /**
  * SECTION: e-source-selectable
- * @include: libedataserver/e-source-selectable.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: Base class for selectable data sources
- * @see_also: #ESourceAddressBook, #ESourceCalendar, #ESourceMemoList,
- *            #ESourceTaskList
+ * @see_also: #ESourceCalendar, #ESourceMemoList, #ESourceTaskList
  *
  * #ESourceSelectable is an abstract base class for data sources
  * that can be selected in an #ESourceSelector or similar widget.
diff --git a/libedataserver/e-source-selectable.h b/libedataserver/e-source-selectable.h
index 07d43b06b..59df45137 100644
--- a/libedataserver/e-source-selectable.h
+++ b/libedataserver/e-source-selectable.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_SELECTABLE_H
 #define E_SOURCE_SELECTABLE_H
 
diff --git a/libedataserver/e-source-smime.c b/libedataserver/e-source-smime.c
index 7bb7fb681..4e631fbf5 100644
--- a/libedataserver/e-source-smime.c
+++ b/libedataserver/e-source-smime.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-smime
- * @include: libedataserver/e-source-smime.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for S/MIME settings
  *
  * The #ESourceSMIME extension tracks Secure/Multipurpose Internet Mail
diff --git a/libedataserver/e-source-smime.h b/libedataserver/e-source-smime.h
index 841727f25..4a1659db2 100644
--- a/libedataserver/e-source-smime.h
+++ b/libedataserver/e-source-smime.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_SMIME_H
 #define E_SOURCE_SMIME_H
 
diff --git a/libedataserver/e-source-webdav.c b/libedataserver/e-source-webdav.c
index 917a5681e..e09f1e364 100644
--- a/libedataserver/e-source-webdav.c
+++ b/libedataserver/e-source-webdav.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source-webdav
- * @include: libedataserver/e-source-webdav.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: #ESource extension for WebDAV settings
  *
  * The #ESourceWebdav extension tracks settings for accessing resources
diff --git a/libedataserver/e-source-webdav.h b/libedataserver/e-source-webdav.h
index 387127784..1e69471fc 100644
--- a/libedataserver/e-source-webdav.h
+++ b/libedataserver/e-source-webdav.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_WEBDAV_H
 #define E_SOURCE_WEBDAV_H
 
diff --git a/libedataserver/e-source.c b/libedataserver/e-source.c
index 62a7a9a28..4e668fd84 100644
--- a/libedataserver/e-source.c
+++ b/libedataserver/e-source.c
@@ -18,7 +18,7 @@
 
 /**
  * SECTION: e-source
- * @include: libedataserver/e-source.h
+ * @include: libedataserver/libedataserver.h
  * @short_description: Hierarchical data sources
  *
  * An #ESource (or "data source") is a description of a file or network
diff --git a/libedataserver/e-source.h b/libedataserver/e-source.h
index df2b5206f..8e42ef52a 100644
--- a/libedataserver/e-source.h
+++ b/libedataserver/e-source.h
@@ -16,6 +16,10 @@
  *
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_SOURCE_H
 #define E_SOURCE_H
 
diff --git a/libedataserver/e-time-utils.h b/libedataserver/e-time-utils.h
index 78a5a8d5f..a7918563a 100644
--- a/libedataserver/e-time-utils.h
+++ b/libedataserver/e-time-utils.h
@@ -8,6 +8,10 @@
  * (C) 2001 Ximian, Inc.
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_TIME_UTILS_H
 #define E_TIME_UTILS_H
 
diff --git a/libedataserver/e-uid.h b/libedataserver/e-uid.h
index 7286d7376..a0b80c7b4 100644
--- a/libedataserver/e-uid.h
+++ b/libedataserver/e-uid.h
@@ -20,6 +20,10 @@
  * Author: Dan Winship <danw@ximian.com>
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_UID_H
 #define E_UID_H
 
diff --git a/libedataserver/e-url.h b/libedataserver/e-url.h
index 168cbaee8..783bb2d50 100644
--- a/libedataserver/e-url.h
+++ b/libedataserver/e-url.h
@@ -25,6 +25,10 @@
  * USA.
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_URL_H
 #define E_URL_H
 
diff --git a/libedataserver/e-xml-hash-utils.h b/libedataserver/e-xml-hash-utils.h
index 0150f06fd..88c6821b8 100644
--- a/libedataserver/e-xml-hash-utils.h
+++ b/libedataserver/e-xml-hash-utils.h
@@ -17,6 +17,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_XML_HASH_UTILS_H
 #define E_XML_HASH_UTILS_H
 
diff --git a/libedataserver/e-xml-utils.h b/libedataserver/e-xml-utils.h
index cda2b1c98..663671c3e 100644
--- a/libedataserver/e-xml-utils.h
+++ b/libedataserver/e-xml-utils.h
@@ -17,6 +17,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#if !defined (__LIBEDATASERVER_H_INSIDE__) && !defined (LIBEDATASERVER_COMPILATION)
+#error "Only <libedataserver/libedataserver.h> should be included directly."
+#endif
+
 #ifndef E_XML_UTILS_H
 #define E_XML_UTILS_H
 
diff --git a/libedataserver/libedataserver.h b/libedataserver/libedataserver.h
new file mode 100644
index 000000000..98d999d45
--- /dev/null
+++ b/libedataserver/libedataserver.h
@@ -0,0 +1,77 @@
+/*
+ * libedataserver.h
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#ifndef LIBEDATASERVER_H
+#define LIBEDATASERVER_H
+
+#define __LIBEDATASERVER_H_INSIDE__
+
+#include <libedataserver/e-categories.h>
+#include <libedataserver/e-client.h>
+#include <libedataserver/e-credentials.h>
+#include <libedataserver/e-data-server-util.h>
+#include <libedataserver/e-debug-log.h>
+#include <libedataserver/e-flag.h>
+#include <libedataserver/e-gdbus-marshallers.h>
+#include <libedataserver/e-gdbus-templates.h>
+#include <libedataserver/e-iterator.h>
+#include <libedataserver/e-list-iterator.h>
+#include <libedataserver/e-list.h>
+#include <libedataserver/e-memory.h>
+#include <libedataserver/e-operation-pool.h>
+#include <libedataserver/e-proxy.h>
+#include <libedataserver/e-sexp.h>
+#include <libedataserver/e-source-address-book.h>
+#include <libedataserver/e-source-alarms.h>
+#include <libedataserver/e-source-authentication.h>
+#include <libedataserver/e-source-autocomplete.h>
+#include <libedataserver/e-source-backend.h>
+#include <libedataserver/e-source-calendar.h>
+#include <libedataserver/e-source-camel.h>
+#include <libedataserver/e-source-collection.h>
+#include <libedataserver/e-source-enums.h>
+#include <libedataserver/e-source-enumtypes.h>
+#include <libedataserver/e-source-extension.h>
+#include <libedataserver/e-source-goa.h>
+#include <libedataserver/e-source-mail-account.h>
+#include <libedataserver/e-source-mail-composition.h>
+#include <libedataserver/e-source-mail-identity.h>
+#include <libedataserver/e-source-mail-signature.h>
+#include <libedataserver/e-source-mail-submission.h>
+#include <libedataserver/e-source-mail-transport.h>
+#include <libedataserver/e-source-mdn.h>
+#include <libedataserver/e-source-offline.h>
+#include <libedataserver/e-source-openpgp.h>
+#include <libedataserver/e-source-refresh.h>
+#include <libedataserver/e-source-registry.h>
+#include <libedataserver/e-source-security.h>
+#include <libedataserver/e-source-selectable.h>
+#include <libedataserver/e-source-smime.h>
+#include <libedataserver/e-source-webdav.h>
+#include <libedataserver/e-source.h>
+#include <libedataserver/e-time-utils.h>
+#include <libedataserver/e-uid.h>
+#include <libedataserver/e-url.h>
+#include <libedataserver/e-xml-hash-utils.h>
+#include <libedataserver/e-xml-utils.h>
+#include <libedataserver/eds-version.h>
+
+#undef __LIBEDATASERVER_H_INSIDE__
+
+#endif /* LIBEDATASERVER_H */
+