Use "e-minicard" as the log domain.

2000-04-18  Federico Mena Quintero  <federico@helixcode.com>

	* gui/minicard/Makefile.am (INCLUDES): Use "e-minicard" as the log
	domain.

	* gui/component/Makefile.am (INCLUDES): Use
	"evolution-addressbook" as the log domain.

	* backend/pas/Makefile.am: Build libpas.a, not a shared library.
	Do not install any header files.
	(INCLUDES): Remove spurious include paths.

	* backend/pas/*.[ch]: Fix includes.

	* backend/ebook/Makefile.am: Do not install the test programs.
	Fixed some include weirdness.

	* backend/ebook/*.[ch]: Fix includes.

	* contact-editor/Makefile.am (INCLUDES): Set the log domain to
	"contact-editor".
	(INCLUDES): Fix.

	* contact-editor/*.[ch]: Fix includes.

	* gui/minicard/*.[ch]: Fix includes.

svn path=/trunk/; revision=2529

25 files changed, 157 insertions, 140 deletions

diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 486cc9d528..c20864912b 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -1,12 +1,13 @@
-INCLUDES =					\
-	$(EXTRA_GNOME_CFLAGS)			\
-	$(GNOME_INCLUDEDIR)			\
-	-I$(top_srcdir)/widgets/e-text		\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_srcdir)				\
+INCLUDES =						\
+	-DG_LOG_DOMAIN=\"evolution-addressbook\"	\
+	$(EXTRA_GNOME_CFLAGS)				\
+	$(GNOME_INCLUDEDIR)				\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/widgets/e-text			\
 	-I$(top_srcdir)/addressbook/gui/minicard	\
 	-I$(top_srcdir)/addressbook/contact-editor	\
-	-I$(top_srcdir)/addressbook/backend/ebook	\
+	-I$(top_srcdir)/addressbook/backend		\
+	-I$(top_builddir)/addressbook/backend		\
 	$(BONOBO_HTML_GNOME_CFLAGS)			\
 	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
@@ -22,13 +23,13 @@ evolution_addressbook_SOURCES = 	\
 	addressbook.c			\
 	addressbook.h
 
-evolution_addressbook_LDADD =				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(BONOBO_HTML_GNOME_LIBS)			\
-	$(top_builddir)/addressbook/gui/minicard/libeminicard.a	\
-	$(top_builddir)/widgets/e-text/libetext.a	\
-	$(top_builddir)/e-util/libeutil.la		\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
+evolution_addressbook_LDADD =						\
+	$(EXTRA_GNOME_LIBS)						\
+	$(BONOBO_HTML_GNOME_LIBS)					\
+	$(top_builddir)/addressbook/gui/minicard/libeminicard.a		\
+	$(top_builddir)/widgets/e-text/libetext.a			\
+	$(top_builddir)/e-util/libeutil.la				\
+	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
 	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
 	$(top_builddir)/libversit/libversit.la
 
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index e6de7cf9ad..bb4b20406f 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -15,8 +15,8 @@
 
 #include "addressbook.h"
 
-#include "e-book.h"
-#include "e-canvas.h"
+#include <ebook/e-book.h>
+#include <e-util/e-canvas.h>
 #include "e-minicard-view.h"
 #include "e-contact-editor.h"
 
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 0e8b924e5e..0a8b3a8489 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -1,18 +1,20 @@
 imagesdir = $(datadir)/images/evolution
-
 images = email.png head.png phone.png snailmail.png web.png arrow.png briefcase.png netmeeting.png netfreebusy.png
 
 EXTRA_DIST = $(images)
 pkgdata_DATA = $(images)
 
-CPPFLAGS = \
-        -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"           \
+CPPFLAGS =					\
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
 	-DDATADIR=\""$(datadir)"\"
 
 INCLUDES =					\
 	$(GNOME_INCLUDEDIR)			\
-	-I$(top_srcdir)/addressbook/backend/ebook \
-	-DEVOLUTION_IMAGES=\""$(imagesdir)"\"
+	-I$(top_srcdir)				\
+	-I$(top_srcdir)/addressbook/		\
+	-I$(top_srcdir)/addressbook/backend	\
+	-DEVOLUTION_IMAGES=\""$(imagesdir)"\"	\
+	-DG_LOG_DOMAIN=\"contact-editor\"
 
 noinst_LIBRARIES =				\
 	libecontacteditor.a
@@ -21,23 +23,22 @@ libecontacteditor_a_SOURCES = 			\
 	e-contact-editor.c			\
 	e-contact-editor.h
 
-noinst_PROGRAMS =	\
+noinst_PROGRAMS =		\
 	contact-editor-test
 
 contact_editor_test_SOURCES = 	\
 	test-editor.c
 
-contact_editor_test_LDADD =	\
+contact_editor_test_LDADD =					\
 	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/libversit/libversit.la	\
-	$(GNOMEGNORBA_LIBS)				\
-	-lbonobo					\
-	$(top_builddir)/e-util/libeutil.la	\
-	libecontacteditor.a	\
+	$(top_builddir)/libversit/libversit.la			\
+	$(GNOMEGNORBA_LIBS)					\
+	-lbonobo						\
+	$(top_builddir)/e-util/libeutil.la			\
+	libecontacteditor.a					\
 	$(EXTRA_GNOME_LIBS)
 
 gladedir   = $(datadir)/evolution/glade
 
 glade_DATA = 				\
 	contact-editor.glade
-
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 2bb76cebe1..5067b4ff25 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -20,8 +20,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <gnome.h>
 #include "e-contact-editor.h"
+
 static void e_contact_editor_init		(EContactEditor		 *card);
 static void e_contact_editor_class_init	(EContactEditorClass	 *klass);
 static void e_contact_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h
index 72f87e9b08..82f4a22623 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.h
+++ b/addressbook/gui/contact-editor/e-contact-editor.h
@@ -23,7 +23,7 @@
 
 #include <gnome.h>
 #include <glade/glade.h>
-#include "e-card.h"
+#include <ebook/e-card.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/addressbook/gui/minicard/Makefile.am b/addressbook/gui/minicard/Makefile.am
index 46adb6da2b..44cbed0819 100644
--- a/addressbook/gui/minicard/Makefile.am
+++ b/addressbook/gui/minicard/Makefile.am
@@ -1,15 +1,16 @@
-INCLUDES =					\
-	-I$(top_srcdir)/addressbook/backend/ebook	\
+INCLUDES =						\
+	-DG_LOG_DOMAIN=\"e-minicard\"			\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/addressbook/backend		\
+	-I$(top_builddir)/addressbook/backend		\
 	-I$(top_srcdir)/addressbook/contact-editor	\
-	-I$(top_builddir)/addressbook/backend/ebook	\
-	-I$(top_srcdir)/widgets/e-text		\
-	-I$(top_srcdir)/e-util			\
+	-I$(top_srcdir)/widgets/e-text			\
 	$(GNOME_INCLUDEDIR)
 
 noinst_LIBRARIES =				\
 	libeminicard.a
 
-libeminicard_a_SOURCES = 		\
+libeminicard_a_SOURCES =			\
 	e-minicard.c				\
 	e-minicard.h				\
 	e-minicard-label.c			\
@@ -21,61 +22,61 @@ libeminicard_a_SOURCES = 		\
 	e-reflow.c				\
 	e-reflow.h
 
-noinst_PROGRAMS =	\
-	minicard-label-test	\
-	minicard-test		\
-	reflow-test		\
+noinst_PROGRAMS =				\
+	minicard-label-test			\
+	minicard-test				\
+	reflow-test				\
 	minicard-view-test
 
 minicard_label_test_SOURCES = 	\
 	test-minicard-label.c
 
-minicard_label_test_LDADD =	\
-	$(EXTRA_GNOME_LIBS)	\
+minicard_label_test_LDADD =				\
+	$(EXTRA_GNOME_LIBS)				\
 	$(GNOMEGNORBA_LIBS)				\
-	libeminicard.a		\
+	libeminicard.a					\
 	-lbonobo					\
-	$(top_builddir)/e-util/libeutil.la	\
+	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/widgets/e-text/libetext.a
 
 minicard_test_SOURCES = 	\
 	test-minicard.c
 
-minicard_test_LDADD =	\
-	$(EXTRA_GNOME_LIBS)	\
-	$(GNOMEGNORBA_LIBS)				\
-	libeminicard.a	\
-	-lbonobo					\
-	$(top_builddir)/e-util/libeutil.la	\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/libversit/libversit.la	\
+minicard_test_LDADD =							\
+	$(EXTRA_GNOME_LIBS)						\
+	$(GNOMEGNORBA_LIBS)						\
+	libeminicard.a							\
+	-lbonobo							\
+	$(top_builddir)/e-util/libeutil.la				\
+	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
+	$(top_builddir)/libversit/libversit.la				\
 	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
 	$(top_builddir)/widgets/e-text/libetext.a
 
 reflow_test_SOURCES = 	\
 	test-reflow.c
 
-reflow_test_LDADD =	\
-	$(EXTRA_GNOME_LIBS)	\
-	$(GNOMEGNORBA_LIBS)				\
-	libeminicard.a	\
-	-lbonobo					\
-	$(top_builddir)/e-util/libeutil.la	\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/libversit/libversit.la	\
+reflow_test_LDADD =							\
+	$(EXTRA_GNOME_LIBS)						\
+	$(GNOMEGNORBA_LIBS)						\
+	libeminicard.a							\
+	-lbonobo							\
+	$(top_builddir)/e-util/libeutil.la				\
+	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
+	$(top_builddir)/libversit/libversit.la				\
 	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
 	$(top_builddir)/widgets/e-text/libetext.a
 
 minicard_view_test_SOURCES = 	\
 	test-minicard-view.c
 
-minicard_view_test_LDADD =	\
-	$(EXTRA_GNOME_LIBS)	\
-	$(GNOMEGNORBA_LIBS)				\
-	libeminicard.a	\
-	-lbonobo					\
-	$(top_builddir)/e-util/libeutil.la	\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/libversit/libversit.la	\
+minicard_view_test_LDADD =						\
+	$(EXTRA_GNOME_LIBS)						\
+	$(GNOMEGNORBA_LIBS)						\
+	libeminicard.a							\
+	-lbonobo							\
+	$(top_builddir)/e-util/libeutil.la				\
+	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
+	$(top_builddir)/libversit/libversit.la				\
 	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
 	$(top_builddir)/widgets/e-text/libetext.a
diff --git a/addressbook/gui/minicard/e-minicard-label.c b/addressbook/gui/minicard/e-minicard-label.c
index 799eb87cd1..e0e5c98118 100644
--- a/addressbook/gui/minicard/e-minicard-label.c
+++ b/addressbook/gui/minicard/e-minicard-label.c
@@ -20,12 +20,14 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <gnome.h>
 #include "e-minicard-label.h"
 #include "e-text.h"
-#include "e-canvas.h"
-#include "e-util.h"
-#include "e-canvas-utils.h"
+#include <e-util/e-canvas.h>
+#include <e-util/e-util.h>
+#include <e-util/e-canvas-utils.h>
+
 static void e_minicard_label_init		(EMinicardLabel		 *card);
 static void e_minicard_label_class_init	(EMinicardLabelClass	 *klass);
 static void e_minicard_label_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
diff --git a/addressbook/gui/minicard/e-minicard-view.c b/addressbook/gui/minicard/e-minicard-view.c
index 080693b354..35024d9564 100644
--- a/addressbook/gui/minicard/e-minicard-view.c
+++ b/addressbook/gui/minicard/e-minicard-view.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include <gnome.h>
-#include "e-canvas.h"
+#include <e-util/e-canvas.h>
 #include "e-minicard-view.h"
 #include "e-minicard.h"
 static void e_minicard_view_init		(EMinicardView		 *reflow);
diff --git a/addressbook/gui/minicard/e-minicard-view.h b/addressbook/gui/minicard/e-minicard-view.h
index bb50aa99c1..ab0eeb892d 100644
--- a/addressbook/gui/minicard/e-minicard-view.h
+++ b/addressbook/gui/minicard/e-minicard-view.h
@@ -23,7 +23,7 @@
 
 #include <gnome.h>
 #include "e-reflow-sorted.h"
-#include "e-book.h"
+#include <ebook/e-book.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/addressbook/gui/minicard/e-minicard.c b/addressbook/gui/minicard/e-minicard.c
index 0b6cbd428a..addb019510 100644
--- a/addressbook/gui/minicard/e-minicard.c
+++ b/addressbook/gui/minicard/e-minicard.c
@@ -20,16 +20,18 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <gnome.h>
 #include "e-minicard.h"
 #include "e-minicard-label.h"
 #include "e-text.h"
-#include "e-book.h"
-#include "e-canvas.h"
-#include "e-util.h"
-#include "e-canvas-utils.h"
+#include <ebook/e-book.h>
+#include <e-util/e-canvas.h>
+#include <e-util/e-util.h>
+#include <e-util/e-canvas-utils.h>
 #include "e-contact-editor.h"
 #include "e-minicard-view.h"
+
 static void e_minicard_init		(EMinicard		 *card);
 static void e_minicard_class_init	(EMinicardClass	 *klass);
 static void e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
diff --git a/addressbook/gui/minicard/e-minicard.h b/addressbook/gui/minicard/e-minicard.h
index 85481d586e..6844e136bd 100644
--- a/addressbook/gui/minicard/e-minicard.h
+++ b/addressbook/gui/minicard/e-minicard.h
@@ -22,7 +22,7 @@
 #define __E_MINICARD_H__
 
 #include <gnome.h>
-#include "e-card.h"
+#include <ebook/e-card.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/addressbook/gui/minicard/e-reflow-sorted.c b/addressbook/gui/minicard/e-reflow-sorted.c
index 696efe454a..c70d7b2739 100644
--- a/addressbook/gui/minicard/e-reflow-sorted.c
+++ b/addressbook/gui/minicard/e-reflow-sorted.c
@@ -20,13 +20,14 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gnome.h>
+#include <config.h>
 #include <math.h>
+#include <gnome.h>
 #include "e-reflow-sorted.h"
-#include "e-canvas-utils.h"
-#include "e-canvas.h"
-#include "e-util.h"
-#include <glib.h>
+#include <e-util/e-canvas-utils.h>
+#include <e-util/e-canvas.h>
+#include <e-util/e-util.h>
+
 static void e_reflow_sorted_init		(EReflowSorted		 *card);
 static void e_reflow_sorted_class_init	(EReflowSortedClass	 *klass);
 static void e_reflow_sorted_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
diff --git a/addressbook/gui/minicard/e-reflow.c b/addressbook/gui/minicard/e-reflow.c
index 004183727a..6706357ede 100644
--- a/addressbook/gui/minicard/e-reflow.c
+++ b/addressbook/gui/minicard/e-reflow.c
@@ -20,12 +20,14 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <gnome.h>
 #include <math.h>
 #include "e-reflow.h"
-#include "e-canvas-utils.h"
-#include "e-canvas.h"
-#include "e-util.h"
+#include <e-util/e-canvas-utils.h>
+#include <e-util/e-canvas.h>
+#include <e-util/e-util.h>
+
 static void e_reflow_init		(EReflow		 *reflow);
 static void e_reflow_class_init	(EReflowClass	 *klass);
 static void e_reflow_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
diff --git a/addressbook/gui/minicard/test-minicard-label.c b/addressbook/gui/minicard/test-minicard-label.c
index 727d709925..adf092206c 100644
--- a/addressbook/gui/minicard/test-minicard-label.c
+++ b/addressbook/gui/minicard/test-minicard-label.c
@@ -21,7 +21,7 @@
 
 #include <gnome.h>
 #include "e-minicard-label.h"
-#include "e-canvas.h"
+#include <e-util/e-canvas.h>
 
 /* This is a horrible thing to do, but it is just a test. */
 GnomeCanvasItem *label;
diff --git a/addressbook/gui/minicard/test-minicard-view.c b/addressbook/gui/minicard/test-minicard-view.c
index d3ceff228e..c03d11d07e 100644
--- a/addressbook/gui/minicard/test-minicard-view.c
+++ b/addressbook/gui/minicard/test-minicard-view.c
@@ -20,7 +20,7 @@
 #include <gnome.h>
 #include <libgnorba/gnorba.h>
 #include <bonobo.h>
-#include "e-canvas.h"
+#include <e-util/e-canvas.h>
 #include "e-minicard-view.h"
 
 /* This is a horrible thing to do, but it is just a test. */
diff --git a/addressbook/gui/minicard/test-reflow.c b/addressbook/gui/minicard/test-reflow.c
index f80448b687..4817d13120 100644
--- a/addressbook/gui/minicard/test-reflow.c
+++ b/addressbook/gui/minicard/test-reflow.c
@@ -48,7 +48,7 @@
 #include "config.h"
 
 #include <gnome.h>
-#include "e-canvas.h"
+#include <e-util/e-canvas.h>
 #include "e-reflow.h"
 #include "e-minicard.h"
 
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 46adb6da2b..44cbed0819 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -1,15 +1,16 @@
-INCLUDES =					\
-	-I$(top_srcdir)/addressbook/backend/ebook	\
+INCLUDES =						\
+	-DG_LOG_DOMAIN=\"e-minicard\"			\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/addressbook/backend		\
+	-I$(top_builddir)/addressbook/backend		\
 	-I$(top_srcdir)/addressbook/contact-editor	\
-	-I$(top_builddir)/addressbook/backend/ebook	\
-	-I$(top_srcdir)/widgets/e-text		\
-	-I$(top_srcdir)/e-util			\
+	-I$(top_srcdir)/widgets/e-text			\
 	$(GNOME_INCLUDEDIR)
 
 noinst_LIBRARIES =				\
 	libeminicard.a
 
-libeminicard_a_SOURCES = 		\
+libeminicard_a_SOURCES =			\
 	e-minicard.c				\
 	e-minicard.h				\
 	e-minicard-label.c			\
@@ -21,61 +22,61 @@ libeminicard_a_SOURCES = 		\
 	e-reflow.c				\
 	e-reflow.h
 
-noinst_PROGRAMS =	\
-	minicard-label-test	\
-	minicard-test		\
-	reflow-test		\
+noinst_PROGRAMS =				\
+	minicard-label-test			\
+	minicard-test				\
+	reflow-test				\
 	minicard-view-test
 
 minicard_label_test_SOURCES = 	\
 	test-minicard-label.c
 
-minicard_label_test_LDADD =	\
-	$(EXTRA_GNOME_LIBS)	\
+minicard_label_test_LDADD =				\
+	$(EXTRA_GNOME_LIBS)				\
 	$(GNOMEGNORBA_LIBS)				\
-	libeminicard.a		\
+	libeminicard.a					\
 	-lbonobo					\
-	$(top_builddir)/e-util/libeutil.la	\
+	$(top_builddir)/e-util/libeutil.la		\
 	$(top_builddir)/widgets/e-text/libetext.a
 
 minicard_test_SOURCES = 	\
 	test-minicard.c
 
-minicard_test_LDADD =	\
-	$(EXTRA_GNOME_LIBS)	\
-	$(GNOMEGNORBA_LIBS)				\
-	libeminicard.a	\
-	-lbonobo					\
-	$(top_builddir)/e-util/libeutil.la	\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/libversit/libversit.la	\
+minicard_test_LDADD =							\
+	$(EXTRA_GNOME_LIBS)						\
+	$(GNOMEGNORBA_LIBS)						\
+	libeminicard.a							\
+	-lbonobo							\
+	$(top_builddir)/e-util/libeutil.la				\
+	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
+	$(top_builddir)/libversit/libversit.la				\
 	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
 	$(top_builddir)/widgets/e-text/libetext.a
 
 reflow_test_SOURCES = 	\
 	test-reflow.c
 
-reflow_test_LDADD =	\
-	$(EXTRA_GNOME_LIBS)	\
-	$(GNOMEGNORBA_LIBS)				\
-	libeminicard.a	\
-	-lbonobo					\
-	$(top_builddir)/e-util/libeutil.la	\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/libversit/libversit.la	\
+reflow_test_LDADD =							\
+	$(EXTRA_GNOME_LIBS)						\
+	$(GNOMEGNORBA_LIBS)						\
+	libeminicard.a							\
+	-lbonobo							\
+	$(top_builddir)/e-util/libeutil.la				\
+	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
+	$(top_builddir)/libversit/libversit.la				\
 	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
 	$(top_builddir)/widgets/e-text/libetext.a
 
 minicard_view_test_SOURCES = 	\
 	test-minicard-view.c
 
-minicard_view_test_LDADD =	\
-	$(EXTRA_GNOME_LIBS)	\
-	$(GNOMEGNORBA_LIBS)				\
-	libeminicard.a	\
-	-lbonobo					\
-	$(top_builddir)/e-util/libeutil.la	\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\
-	$(top_builddir)/libversit/libversit.la	\
+minicard_view_test_LDADD =						\
+	$(EXTRA_GNOME_LIBS)						\
+	$(GNOMEGNORBA_LIBS)						\
+	libeminicard.a							\
+	-lbonobo							\
+	$(top_builddir)/e-util/libeutil.la				\
+	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
+	$(top_builddir)/libversit/libversit.la				\
 	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
 	$(top_builddir)/widgets/e-text/libetext.a
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 799eb87cd1..e0e5c98118 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -20,12 +20,14 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <gnome.h>
 #include "e-minicard-label.h"
 #include "e-text.h"
-#include "e-canvas.h"
-#include "e-util.h"
-#include "e-canvas-utils.h"
+#include <e-util/e-canvas.h>
+#include <e-util/e-util.h>
+#include <e-util/e-canvas-utils.h>
+
 static void e_minicard_label_init		(EMinicardLabel		 *card);
 static void e_minicard_label_class_init	(EMinicardLabelClass	 *klass);
 static void e_minicard_label_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 080693b354..35024d9564 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include <gnome.h>
-#include "e-canvas.h"
+#include <e-util/e-canvas.h>
 #include "e-minicard-view.h"
 #include "e-minicard.h"
 static void e_minicard_view_init		(EMinicardView		 *reflow);
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
index bb50aa99c1..ab0eeb892d 100644
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ b/addressbook/gui/widgets/e-minicard-view.h
@@ -23,7 +23,7 @@
 
 #include <gnome.h>
 #include "e-reflow-sorted.h"
-#include "e-book.h"
+#include <ebook/e-book.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 0b6cbd428a..addb019510 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -20,16 +20,18 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <gnome.h>
 #include "e-minicard.h"
 #include "e-minicard-label.h"
 #include "e-text.h"
-#include "e-book.h"
-#include "e-canvas.h"
-#include "e-util.h"
-#include "e-canvas-utils.h"
+#include <ebook/e-book.h>
+#include <e-util/e-canvas.h>
+#include <e-util/e-util.h>
+#include <e-util/e-canvas-utils.h>
 #include "e-contact-editor.h"
 #include "e-minicard-view.h"
+
 static void e_minicard_init		(EMinicard		 *card);
 static void e_minicard_class_init	(EMinicardClass	 *klass);
 static void e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h
index 85481d586e..6844e136bd 100644
--- a/addressbook/gui/widgets/e-minicard.h
+++ b/addressbook/gui/widgets/e-minicard.h
@@ -22,7 +22,7 @@
 #define __E_MINICARD_H__
 
 #include <gnome.h>
-#include "e-card.h"
+#include <ebook/e-card.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/addressbook/gui/widgets/test-minicard-label.c b/addressbook/gui/widgets/test-minicard-label.c
index 727d709925..adf092206c 100644
--- a/addressbook/gui/widgets/test-minicard-label.c
+++ b/addressbook/gui/widgets/test-minicard-label.c
@@ -21,7 +21,7 @@
 
 #include <gnome.h>
 #include "e-minicard-label.h"
-#include "e-canvas.h"
+#include <e-util/e-canvas.h>
 
 /* This is a horrible thing to do, but it is just a test. */
 GnomeCanvasItem *label;
diff --git a/addressbook/gui/widgets/test-minicard-view.c b/addressbook/gui/widgets/test-minicard-view.c
index d3ceff228e..c03d11d07e 100644
--- a/addressbook/gui/widgets/test-minicard-view.c
+++ b/addressbook/gui/widgets/test-minicard-view.c
@@ -20,7 +20,7 @@
 #include <gnome.h>
 #include <libgnorba/gnorba.h>
 #include <bonobo.h>
-#include "e-canvas.h"
+#include <e-util/e-canvas.h>
 #include "e-minicard-view.h"
 
 /* This is a horrible thing to do, but it is just a test. */
diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c
index f80448b687..4817d13120 100644
--- a/addressbook/gui/widgets/test-reflow.c
+++ b/addressbook/gui/widgets/test-reflow.c
@@ -48,7 +48,7 @@
 #include "config.h"
 
 #include <gnome.h>
-#include "e-canvas.h"
+#include <e-util/e-canvas.h>
 #include "e-reflow.h"
 #include "e-minicard.h"