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

addressbook/gui/contact-editor/e-contact-editor-fullname.h

@@ -24,7 +24,7 @@
 #define __E_CONTACT_EDITOR_FULLNAME_H__
 
 #include <gtk/gtk.h>
-#include <libebook/e-contact.h>
+#include <libebook/libebook.h>
 
 G_BEGIN_DECLS
 

addressbook/gui/contact-editor/e-contact-editor.c

@@ -35,11 +35,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include <libebook/e-address-western.h>
-#include <libedataserverui/e-client-utils.h>
-#include <libedataserverui/e-categories-dialog.h>
-#include <libedataserverui/e-category-completion.h>
-#include <libedataserverui/e-source-combo-box.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include "addressbook/printing/e-contact-print.h"
 #include "addressbook/gui/widgets/eab-gui-util.h"

addressbook/gui/contact-editor/e-contact-editor.h

@@ -25,9 +25,6 @@
 
 #include "addressbook/gui/contact-editor/eab-editor.h"
 
-#include <libebook/e-book-client.h>
-#include <libebook/e-contact.h>
-
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS

addressbook/gui/contact-editor/e-contact-quick-add.c

@@ -28,11 +28,9 @@
 #include <string.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libebook/e-book-client.h>
-#include <libebook/e-contact.h>
-#include <libedataserverui/e-client-utils.h>
-#include <libedataserverui/e-source-combo-box.h>
-#include <libedataserver/e-source-address-book.h>
+
+#include <libedataserverui/libedataserverui.h>
+
 #include <addressbook/util/eab-book-util.h>
 #include "e-contact-editor.h"
 #include "e-contact-quick-add.h"

addressbook/gui/contact-editor/e-contact-quick-add.h

@@ -23,8 +23,7 @@
 #ifndef __E_CONTACT_QUICK_ADD_H__
 #define __E_CONTACT_QUICK_ADD_H__
 
-#include <libebook/e-contact.h>
-#include <libedataserver/e-source-registry.h>
+#include <libebook/libebook.h>
 
 typedef void	(*EContactQuickAddCallback)	(EContact *new_contact,
 						 gpointer closure);

addressbook/gui/contact-editor/eab-editor.h

@@ -25,7 +25,7 @@
 #define __EAB_EDITOR_H__
 
 #include <gtk/gtk.h>
-#include <libebook/e-contact.h>
+#include <libebook/libebook.h>
 #include <shell/e-shell.h>
 
 /* Standard GObject macros */

addressbook/gui/contact-list-editor/e-contact-list-editor.c

@@ -37,8 +37,6 @@
 #include <gdk/gdkkeysyms.h>
 
 #include <camel/camel.h>
-#include <libedataserverui/e-client-utils.h>
-#include <libedataserverui/e-source-combo-box.h>
 
 #include "e-util/e-util.h"
 #include "addressbook/gui/widgets/eab-gui-util.h"

addressbook/gui/contact-list-editor/e-contact-list-editor.h

@@ -23,14 +23,10 @@
 #ifndef __E_CONTACT_LIST_EDITOR_H__
 #define __E_CONTACT_LIST_EDITOR_H__
 
-#include <libedataserverui/e-name-selector.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include "addressbook/gui/contact-editor/eab-editor.h"
 
-#include <libebook/e-book-client.h>
-#include <libebook/e-contact.h>
-#include <libebook/e-destination.h>
-
 #define E_TYPE_CONTACT_LIST_EDITOR \
 	(e_contact_list_editor_get_type ())
 #define E_CONTACT_LIST_EDITOR(obj) \

addressbook/gui/contact-list-editor/e-contact-list-model.h

@@ -21,8 +21,7 @@
 #define _E_CONTACT_LIST_MODEL_H_
 
 #include <gtk/gtk.h>
-#include <libebook/e-contact.h>
-#include <libebook/e-destination.h>
+#include <libebook/libebook.h>
 
 /* Standard GObject macros */
 #define E_TYPE_CONTACT_LIST_MODEL \

addressbook/gui/merging/eab-contact-compare.c

@@ -27,9 +27,9 @@
 
 #include <ctype.h>
 #include <string.h>
-#include <libebook/e-book-query.h>
-#include <libedataserver/e-source-registry.h>
-#include <libedataserverui/e-client-utils.h>
+
+#include <libedataserverui/libedataserverui.h>
+
 #include "addressbook/util/eab-book-util.h"
 #include "eab-contact-compare.h"
 

addressbook/gui/merging/eab-contact-compare.h

@@ -26,9 +26,7 @@
 #ifndef __EAB_CONTACT_COMPARE_H__
 #define __EAB_CONTACT_COMPARE_H__
 
-#include <libebook/e-contact.h>
-#include <libebook/e-book-client.h>
-#include <libedataserver/e-source-registry.h>
+#include <libebook/libebook.h>
 
 typedef enum {
 	EAB_CONTACT_MATCH_NOT_APPLICABLE = 0,

addressbook/gui/merging/eab-contact-merging.h

@@ -26,8 +26,7 @@
 #ifndef __E_CONTACT_MERGING_H__
 #define __E_CONTACT_MERGING_H__
 
-#include <libebook/e-book-client.h>
-#include <libedataserver/e-source-registry.h>
+#include <libebook/libebook.h>
 
 G_BEGIN_DECLS
 

addressbook/gui/widgets/e-addressbook-model.h

@@ -21,10 +21,7 @@
 #ifndef E_ADDRESSBOOK_MODEL_H
 #define E_ADDRESSBOOK_MODEL_H
 
-#include <libebook/e-book-client.h>
-#include <libebook/e-book-client-view.h>
-#include <libebook/e-book-query.h>
-#include <libedataserver/e-source-registry.h>
+#include <libebook/libebook.h>
 
 /* Standard GObject macros */
 #define E_TYPE_ADDRESSBOOK_MODEL \

addressbook/gui/widgets/e-addressbook-reflow-adapter.h

@@ -21,8 +21,9 @@
 #ifndef _E_ADDRESSBOOK_REFLOW_ADAPTER_H_
 #define _E_ADDRESSBOOK_REFLOW_ADAPTER_H_
 
+#include <libebook/libebook.h>
 #include <text/e-reflow-model.h>
-#include <libebook/e-contact.h>
+
 #include "e-addressbook-model.h"
 
 #define E_TYPE_ADDRESSBOOK_REFLOW_ADAPTER        (e_addressbook_reflow_adapter_get_type ())

addressbook/gui/widgets/e-addressbook-selector.c

@@ -24,9 +24,6 @@
 
 #include "e-addressbook-selector.h"
 
-#include <libedataserverui/e-client-utils.h>
-#include <libedataserver/e-source-address-book.h>
-
 #include <e-util/e-selection.h>
 
 #include <eab-book-util.h>

addressbook/gui/widgets/e-addressbook-selector.h

@@ -21,7 +21,8 @@
 #ifndef E_ADDRESSBOOK_SELECTOR_H
 #define E_ADDRESSBOOK_SELECTOR_H
 
-#include <libedataserverui/e-source-selector.h>
+#include <libedataserverui/libedataserverui.h>
+
 #include "e-addressbook-view.h"
 
 /* Standard GObject macros */

addressbook/gui/widgets/e-addressbook-table-adapter.c

@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <libebook/e-book-client.h>
+#include <libebook/libebook.h>
 
 #include "e-addressbook-model.h"
 #include "e-addressbook-table-adapter.h"

addressbook/gui/widgets/e-addressbook-view.c

@@ -41,8 +41,6 @@
 #include "e-util/e-print.h"
 #include "e-util/e-selection.h"
 #include "e-util/e-util.h"
-#include "libedataserver/e-sexp.h"
-#include <libedataserver/e-categories.h>
 
 #include "gal-view-minicard.h"
 #include "gal-view-factory-minicard.h"

addressbook/gui/widgets/e-addressbook-view.h

@@ -23,8 +23,7 @@
 #ifndef E_ADDRESSBOOK_VIEW_H
 #define E_ADDRESSBOOK_VIEW_H
 
-#include <libebook/e-book-client.h>
-#include <libebook/e-contact.h>
+#include <libebook/libebook.h>
 
 #include <menus/gal-view-instance.h>
 #include <misc/e-selection-model.h>

addressbook/gui/widgets/e-book-source-config.c

@@ -21,10 +21,6 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libedataserver/e-source-address-book.h>
-#include <libedataserver/e-source-autocomplete.h>
-#include <libedataserver/e-source-offline.h>
-
 #define E_BOOK_SOURCE_CONFIG_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_BOOK_SOURCE_CONFIG, EBookSourceConfigPrivate))