Added check for gnome-app-lib. Removed directories that have been moved to

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* configure.in: Added check for gnome-app-lib.  Removed
	directories that have been moved to gal.

From addressbook/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* backend/ebook/Makefile.am, contact-editor/Makefile.am,
	ename/Makefile.am, gui/component/Makefile.am,
	gui/widgets/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.

	* backend/ebook/e-card.c, backend/pas/pas-backend-file.c,
	contact-editor/e-contact-editor-address.c,
	contact-editor/e-contact-editor-categories.c,
	contact-editor/e-contact-editor-categories.h,
	contact-editor/e-contact-editor-fullname.c,
	contact-editor/e-contact-editor.c,
	contact-editor/e-contact-save-as.c, ename/e-address-western.c,
	ename/test-ename-western-gtk.c,
	gui/component/addressbook-factory.c, gui/component/addressbook.c,
	gui/component/e-cardlist-model.h, gui/component/e-ldap-storage.c,
	gui/component/select-names/e-select-names-bonobo.c,
	gui/component/select-names/e-select-names-manager.c,
	gui/component/select-names/e-select-names-model.c,
	gui/component/select-names/e-select-names-table-model.c,
	gui/component/select-names/e-select-names-table-model.h,
	gui/component/select-names/e-select-names-text-model.h,
	gui/component/select-names/e-select-names.c,
	gui/component/select-names/e-select-names.h,
	gui/search/e-addressbook-search-dialog.c,
	gui/widgets/e-addressbook-model.h,
	gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard-label.c,
	gui/widgets/e-minicard-view-widget.c,
	gui/widgets/e-minicard-view-widget.h,
	gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h,
	gui/widgets/e-minicard-widget.h, gui/widgets/e-minicard.c,
	gui/widgets/test-minicard-label.c, gui/widgets/test-reflow.c,
	printing/e-contact-print.c: Fixed the #include lines to deal
	properly with gal.

From calendar/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* gui/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.

	* gui/calendar-model.h, gui/e-calendar-table.c, gui/e-day-view.c,
	gui/e-week-view-event-item.c, gui/e-week-view.c,
	gui/event-editor.c, gui/gncal-todo.c, gui/gnome-cal.c, gui/main.c,
	gui/print.c, gui/dialogs/task-editor.c: Fixed the #include lines
	to deal properly with gal.

	* gui/check-filled.xpm: New file since we can't include it from
	e-table anymore.

From camel/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* camel-folder-search.c, camel-folder-search.h,
	camel-remote-store.c, providers/imap/camel-imap-folder.c,
	providers/imap/camel-imap-store.c: Fixed the #include lines to
	deal properly with gal.

From composer/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.

	* e-msg-composer-address-dialog.c, e-msg-composer-address-entry.c,
	e-msg-composer-attachment.c, e-msg-composer-hdrs.c,
	e-msg-composer.c: Fixed the #include lines to deal properly with
	gal.

From e-util/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* Makefile.am: Removed all the files moved to gal.

	* e-dialog-widgets.c: Fixed the #include lines to deal properly
	with gal.

	* e-gui-utils.c, e-gui-utils.h: Removed all of the functionality
	that was moved to gal.

	* e-canvas-utils.c, e-canvas-utils.h, e-canvas-vbox.c,
	e-canvas-vbox.h, e-canvas.c, e-canvas.h, e-cursors.c, e-cursors.h,
	e-font.c, e-font.h, e-popup-menu.c, e-popup-menu.h, e-printable.c,
	e-printable.h, e-unicode.c, e-unicode.h, e-util.c, e-util.h,
	e-xml-utils.c, e-xml-utils.h: Moved to gal.

From filter/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* filter-editor.c, filter-filter.c, filter-folder.c,
	filter-input.c, filter-message-search.c, filter-option.c,
	filter-rule.c, score-editor.c, vfolder-editor.c, vfolder-rule.c:
	Fixed the #include lines to deal properly with gal.

From mail/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.

	* component-factory.c, folder-browser-factory.c, folder-browser.c,
	mail-callbacks.c, mail-config-gui.c, mail-display.c,
	mail-display.h, main.c, message-list.c, message-list.h: Fixed the
	#include lines to deal properly with gal.

From po/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* POTFILES.in: Removed files that have been moved to gal.

From shell/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.

	* e-component-registry.c, e-corba-storage-registry.c,
	e-corba-storage.c, e-folder-type-registry.c, e-folder.c,
	e-local-folder.c, e-local-storage.c,
	e-shell-folder-creation-dialog.c,
	e-shell-folder-selection-dialog.c, e-shell-folder-title-bar.c,
	e-shell-view.c, e-shell.c, e-shortcuts-view.c, e-shortcuts.c,
	e-storage-set-view.c, e-storage-set-view.h, e-storage-set.c,
	e-storage.c, evolution-local-storage.c, evolution-session.c,
	evolution-shell-client.c, evolution-shell-component-client.c,
	evolution-shell-component.c, evolution-shell-view.c,
	evolution-storage-listener.c, evolution-storage.c, main.c: Fixed
	the #include lines to deal properly with gal.

From widgets/meeting-time-sel/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.

	* e-meeting-time-sel-list-item.c, e-meeting-time-sel.c,
	e-meeting-time-sel.h: Fixed the #include lines to deal properly
	with gal.

If you've read this far, you deserve a prize.  The first email in my
mailbox with the subject "What a commit message!" (and your physical
mailing address somewhere in the message) will receive a free Helix
Code T-shirt mailed to anywhere within the continental United States.
I cannot be held responsible for problems with email systems anywhere.
This is supposed to be for fun, so please don't make a fuss if
something goes wrong and your mail doesn't reach me.  Find my email
elsewhere in this message, and if it's been more than a few days,
you're probably too late.

From widgets/misc/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.

	* e-calendar-item.c, e-calendar.c, e-calendar.h, e-title-bar.c:
	Fixed the #include lines to deal properly with gal.

	* e-scroll-frame.c, e-scroll-frame.h: Moved to gal.

From widgets/shortcut-bar/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.

	* e-icon-bar.c, e-icon-bar.h, e-shortcut-bar.c,
	e-shortcut-model.c, test-shortcut-bar.c: Fixed the #include lines
	to deal properly with gal.

From widgets/ChangeLog:

2000-09-18  Christopher James Lahey  <clahey@helixcode.com>

	* Makefile.am: Removed directories that have been moved to gal.

	* e-paned/.cvsignore, e-paned/Makefile.am, e-paned/e-hpaned.c,
	e-paned/e-hpaned.h, e-paned/e-paned.c, e-paned/e-paned.h,
	e-paned/e-vpaned.c, e-paned/e-vpaned.h: Moved to gal.

	* e-reflow/.cvsignore, e-reflow/Makefile.am,
	e-reflow/e-reflow-sorted.c, e-reflow/e-reflow-sorted.h,
	e-reflow/e-reflow.c, e-reflow/e-reflow.h: Moved to gal.

	* e-table/.cvsignore, e-table/ChangeLog, e-table/LICENSE,
	e-table/Makefile.am, e-table/ROADMAP.e-table, e-table/TODO,
	e-table/add-col.xpm, e-table/arrow-down.xpm, e-table/arrow-up.xpm,
	e-table/check-empty.xpm, e-table/check-filled.xpm,
	e-table/clip.png, e-table/e-cell-checkbox.c,
	e-table/e-cell-checkbox.h, e-table/e-cell-string.c,
	e-table/e-cell-text.c, e-table/e-cell-text.h,
	e-table/e-cell-toggle.c, e-table/e-cell-toggle.h,
	e-table/e-cell-tree.c, e-table/e-cell-tree.h, e-table/e-cell.c,
	e-table/e-cell.h, e-table/e-table-click-to-add.c,
	e-table/e-table-click-to-add.h, e-table/e-table-col-dnd.h,
	e-table/e-table-col.c, e-table/e-table-col.h,
	e-table/e-table-column-model.h, e-table/e-table-column.c,
	e-table/e-table-config.c, e-table/e-table-config.glade,
	e-table/e-table-config.glade.h, e-table/e-table-config.h,
	e-table/e-table-defines.h, e-table/e-table-example-1.c,
	e-table/e-table-example-2.c,
	e-table/e-table-field-chooser-dialog.c,
	e-table/e-table-field-chooser-dialog.h,
	e-table/e-table-field-chooser-item.c,
	e-table/e-table-field-chooser-item.h,
	e-table/e-table-field-chooser.c,
	e-table/e-table-field-chooser.glade,
	e-table/e-table-field-chooser.glade.h,
	e-table/e-table-field-chooser.h,
	e-table/e-table-group-container.c,
	e-table/e-table-group-container.h, e-table/e-table-group-leaf.c,
	e-table/e-table-group-leaf.h, e-table/e-table-group.c,
	e-table/e-table-group.glade, e-table/e-table-group.glade.h,
	e-table/e-table-group.h, e-table/e-table-header-item.c,
	e-table/e-table-header-item.h, e-table/e-table-header.c,
	e-table/e-table-header.h, e-table/e-table-item.c,
	e-table/e-table-item.h, e-table/e-table-model.c,
	e-table/e-table-model.h, e-table/e-table-one.c,
	e-table/e-table-one.h, e-table/e-table-scrolled.c,
	e-table/e-table-scrolled.h, e-table/e-table-selection-model.c,
	e-table/e-table-selection-model.h, e-table/e-table-simple.c,
	e-table/e-table-simple.h, e-table/e-table-size-test.c,
	e-table/e-table-sort-info.c, e-table/e-table-sort-info.h,
	e-table/e-table-sorted-variable.c,
	e-table/e-table-sorted-variable.h, e-table/e-table-sorted.c,
	e-table/e-table-sorted.h, e-table/e-table-sorter.c,
	e-table/e-table-sorter.h, e-table/e-table-subset-variable.c,
	e-table/e-table-subset-variable.h, e-table/e-table-subset.c,
	e-table/e-table-subset.h, e-table/e-table-text-model.c,
	e-table/e-table-text-model.h, e-table/e-table-tooltip.h,
	e-table/e-table-tree.h, e-table/e-table.c, e-table/e-table.h,
	e-table/e-tree-example-1.c, e-table/e-tree-example-2.c,
	e-table/e-tree-model.c, e-table/e-tree-model.h,
	e-table/e-tree-simple.c, e-table/e-tree-simple.h,
	e-table/image1.png, e-table/image2.png, e-table/image3.png,
	e-table/remove-col.xpm, e-table/sample.table,
	e-table/table-test.c, e-table/table-test.h, e-table/test-check.c,
	e-table/test-cols.c, e-table/test-table.c: Moved to gal.

	* e-text/.cvsignore, e-text/Makefile.am, e-text/e-entry-test.c,
	e-text/e-entry.c, e-text/e-entry.h,
	e-text/e-text-event-processor-emacs-like.c,
	e-text/e-text-event-processor-emacs-like.h,
	e-text/e-text-event-processor-types.h,
	e-text/e-text-event-processor.c, e-text/e-text-event-processor.h,
	e-text/e-text-model.c, e-text/e-text-model.h,
	e-text/e-text-test.c, e-text/e-text.c, e-text/e-text.h: Moved to
	gal.

i.e.,

...

changed evolution to work with gal.

svn path=/trunk/; revision=5490

48 files changed, 136 insertions, 106 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 062ded4a3d..cf2ad34980 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,39 @@
+2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
+
+	* backend/ebook/Makefile.am, contact-editor/Makefile.am,
+	ename/Makefile.am, gui/component/Makefile.am,
+	gui/widgets/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
+	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
+
+	* backend/ebook/e-card.c, backend/pas/pas-backend-file.c,
+	contact-editor/e-contact-editor-address.c,
+	contact-editor/e-contact-editor-categories.c,
+	contact-editor/e-contact-editor-categories.h,
+	contact-editor/e-contact-editor-fullname.c,
+	contact-editor/e-contact-editor.c,
+	contact-editor/e-contact-save-as.c, ename/e-address-western.c,
+	ename/test-ename-western-gtk.c,
+	gui/component/addressbook-factory.c, gui/component/addressbook.c,
+	gui/component/e-cardlist-model.h, gui/component/e-ldap-storage.c,
+	gui/component/select-names/e-select-names-bonobo.c,
+	gui/component/select-names/e-select-names-manager.c,
+	gui/component/select-names/e-select-names-model.c,
+	gui/component/select-names/e-select-names-table-model.c,
+	gui/component/select-names/e-select-names-table-model.h,
+	gui/component/select-names/e-select-names-text-model.h,
+	gui/component/select-names/e-select-names.c,
+	gui/component/select-names/e-select-names.h,
+	gui/search/e-addressbook-search-dialog.c,
+	gui/widgets/e-addressbook-model.h,
+	gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard-label.c,
+	gui/widgets/e-minicard-view-widget.c,
+	gui/widgets/e-minicard-view-widget.h,
+	gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h,
+	gui/widgets/e-minicard-widget.h, gui/widgets/e-minicard.c,
+	gui/widgets/test-minicard-label.c, gui/widgets/test-reflow.c,
+	printing/e-contact-print.c: Fixed the #include lines to deal
+	properly with gal.
+	
 2000-09-15  Christopher James Lahey  <clahey@helixcode.com>
 
 	* contact-editor/e-contact-editor.h,
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index 4b49660e7f..e3569a8df4 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -24,7 +24,8 @@ INCLUDES =						\
 	-I$(top_srcdir)/addressbook/ename		\
 	-I$(top_builddir)/addressbook/backend		\
 	-I$(top_builddir)/addressbook/ename		\
-        $(BONOBO_GNOME_CFLAGS)
+        $(BONOBO_GNOME_CFLAGS)				\
+	$(EXTRA_GNOME_CFLAGS)
 
 lib_LTLIBRARIES = libebook.la
 
@@ -67,6 +68,7 @@ test_client_SOURCES =					\
 test_client_LDADD =					\
 	libebook.la					\
 	$(BONOBO_GNOME_LIBS)				\
+	$(EXTRA_GNOME_LIBS)				\
 	$(top_builddir)/libversit/libversit.la		\
 	$(top_builddir)/addressbook/ename/libename.la	\
 	$(top_builddir)/e-util/libeutil.la
@@ -77,6 +79,7 @@ test_client_list_SOURCES =				\
 test_client_list_LDADD =				\
 	libebook.la					\
 	$(BONOBO_GNOME_LIBS)				\
+	$(EXTRA_GNOME_LIBS)				\
 	$(top_builddir)/addressbook/ename/libename.la	\
 	$(top_builddir)/libversit/libversit.la		\
 	$(top_builddir)/e-util/libeutil.la
@@ -87,6 +90,7 @@ test_card_SOURCES =					\
 test_card_LDADD =					\
 	libebook.la					\
 	$(BONOBO_GNOME_LIBS)				\
+	$(EXTRA_GNOME_LIBS)				\
 	$(top_builddir)/addressbook/ename/libename.la	\
 	$(top_builddir)/libversit/libversit.la		\
 	$(top_builddir)/e-util/libeutil.la
@@ -98,6 +102,7 @@ load_pine_addressbook_SOURCES =				\
 load_pine_addressbook_LDADD =				\
 	libebook.la					\
 	$(BONOBO_GNOME_LIBS)				\
+	$(EXTRA_GNOME_LIBS)				\
 	$(top_builddir)/addressbook/ename/libename.la	\
 	$(top_builddir)/libversit/libversit.la		\
 	$(top_builddir)/e-util/libeutil.la
@@ -109,6 +114,7 @@ load_gnomecard_addressbook_SOURCES =			\
 load_gnomecard_addressbook_LDADD =			\
 	libebook.la					\
 	$(BONOBO_GNOME_LIBS)				\
+	$(EXTRA_GNOME_LIBS)				\
 	$(top_builddir)/addressbook/ename/libename.la	\
 	$(top_builddir)/libversit/libversit.la		\
 	$(top_builddir)/e-util/libeutil.la
diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c
index 83f321bc24..c2ab80a734 100644
--- a/addressbook/backend/ebook/e-card.c
+++ b/addressbook/backend/ebook/e-card.c
@@ -20,7 +20,7 @@
 #include "e-name-western.h"
 #include "e-address-western.h"
 
-#include <e-util/e-util.h>
+#include <gal/util/e-util.h>
 
 #define is_a_prop_of(obj,prop) (isAPropertyOf ((obj),(prop)))
 #define str_val(obj) (the_str = (vObjectValueType (obj))? fakeCString (vObjectUStringZValue (obj)) : calloc (1, 1))
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
index dbcae01d25..aa88609775 100644
--- a/addressbook/backend/pas/pas-backend-file.c
+++ b/addressbook/backend/pas/pas-backend-file.c
@@ -26,8 +26,8 @@
 #include "pas-card-cursor.h"
 #include <ebook/e-card-simple.h>
 #include <e-util/e-sexp.h>
-#include <e-util/e-util.h>
-#include <e-util/e-unicode.h>
+#include <gal/util/e-util.h>
+#include <gal/widgets/e-unicode.h>
 
 #define PAS_BACKEND_FILE_VERSION_NAME "PAS-DB-VERSION"
 #define PAS_BACKEND_FILE_VERSION "0.1"
diff --git a/addressbook/contact-editor/Makefile.am b/addressbook/contact-editor/Makefile.am
index bdf16bde6a..64fc447da4 100644
--- a/addressbook/contact-editor/Makefile.am
+++ b/addressbook/contact-editor/Makefile.am
@@ -5,6 +5,7 @@ CPPFLAGS =					\
 
 INCLUDES =					\
 	$(BONOBO_GNOME_CFLAGS)			\
+	$(EXTRA_GNOME_CFLAGS)			\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/addressbook/		\
 	-I$(top_srcdir)/addressbook/backend	\
@@ -41,10 +42,8 @@ contact_editor_test_LDADD =					\
 	$(top_builddir)/libversit/libversit.la			\
 	$(GNOMEGNORBA_LIBS)					\
 	$(BONOBO_GNOME_LIBS)				\
-	$(top_builddir)/widgets/e-table/libetable.a		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a \
 	$(top_builddir)/e-util/libeutil.la			\
-	$(top_builddir)/widgets/e-text/libetext.a		\
 	$(GNOME_PRINT_LIBS)					\
 	$(EXTRA_GNOME_LIBS)
 
diff --git a/addressbook/contact-editor/e-contact-editor-address.c b/addressbook/contact-editor/e-contact-editor-address.c
index cf6cc382cd..10160facae 100644
--- a/addressbook/contact-editor/e-contact-editor-address.c
+++ b/addressbook/contact-editor/e-contact-editor-address.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include <gnome.h>
-#include <e-util/e-unicode.h>
+#include <gal/widgets/e-unicode.h>
 #include <e-contact-editor-address.h>
 
 static void e_contact_editor_address_init		(EContactEditorAddress		 *card);
diff --git a/addressbook/contact-editor/e-contact-editor-categories.c b/addressbook/contact-editor/e-contact-editor-categories.c
index f48100ae9f..1845fc65ff 100644
--- a/addressbook/contact-editor/e-contact-editor-categories.c
+++ b/addressbook/contact-editor/e-contact-editor-categories.c
@@ -23,12 +23,12 @@
 #include <config.h>
 #include <gnome.h>
 #include <e-contact-editor-categories.h>
-#include <e-table-scrolled.h>
-#include <e-table.h>
-#include <e-table-simple.h>
-#include <e-cell-text.h>
-#include <e-cell-checkbox.h>
-#include <e-util/e-unicode.h>
+#include <gal/e-table/e-table-scrolled.h>
+#include <gal/e-table/e-table.h>
+#include <gal/e-table/e-table-simple.h>
+#include <gal/e-table/e-cell-text.h>
+#include <gal/e-table/e-cell-checkbox.h>
+#include <gal/widgets/e-unicode.h>
 
 static void e_contact_editor_categories_init		(EContactEditorCategories		 *card);
 static void e_contact_editor_categories_class_init	(EContactEditorCategoriesClass	 *klass);
diff --git a/addressbook/contact-editor/e-contact-editor-categories.h b/addressbook/contact-editor/e-contact-editor-categories.h
index 529ef71b68..3edff76b4b 100644
--- a/addressbook/contact-editor/e-contact-editor-categories.h
+++ b/addressbook/contact-editor/e-contact-editor-categories.h
@@ -24,7 +24,7 @@
 #include <gnome.h>
 #include <glade/glade.h>
 #include <ebook/e-card.h>
-#include <widgets/e-table/e-table-model.h>
+#include <gal/e-table/e-table-model.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/addressbook/contact-editor/e-contact-editor-fullname.c b/addressbook/contact-editor/e-contact-editor-fullname.c
index d3f8f399bb..79f458aa22 100644
--- a/addressbook/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/contact-editor/e-contact-editor-fullname.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include <gnome.h>
-#include <e-util/e-unicode.h>
+#include <gal/widgets/e-unicode.h>
 #include <e-contact-editor-fullname.h>
 
 static void e_contact_editor_fullname_init		(EContactEditorFullname		 *card);
diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c
index 4d147def56..6dd00aa273 100644
--- a/addressbook/contact-editor/e-contact-editor.c
+++ b/addressbook/contact-editor/e-contact-editor.c
@@ -28,8 +28,9 @@
 #include <e-contact-editor-categories.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-#include <e-util/e-gui-utils.h>
-#include <e-util/e-unicode.h>
+#include "e-util/e-gui-utils.h"
+#include <gal/widgets/e-gui-utils.h>
+#include <gal/widgets/e-unicode.h>
 #include <e-contact-save-as.h>
 #include "addressbook/printing/e-contact-print.h"
 
diff --git a/addressbook/contact-editor/e-contact-save-as.c b/addressbook/contact-editor/e-contact-save-as.c
index 51cb2619e7..7209c5e8f8 100644
--- a/addressbook/contact-editor/e-contact-save-as.c
+++ b/addressbook/contact-editor/e-contact-save-as.c
@@ -20,7 +20,7 @@
  */
 
 #include <e-contact-save-as.h>
-#include <e-util/e-util.h>
+#include <gal/util/e-util.h>
 #include <unistd.h>
 #include <fcntl.h>
 
diff --git a/addressbook/ename/Makefile.am b/addressbook/ename/Makefile.am
index 068de01d90..46b3ca0132 100644
--- a/addressbook/ename/Makefile.am
+++ b/addressbook/ename/Makefile.am
@@ -8,11 +8,13 @@ INCLUDES =						\
 	-I.. 						\
 	-I$(top_builddir)				\
         -I$(includedir)                                 \
-        $(GNOME_INCLUDEDIR)
+        $(GNOME_INCLUDEDIR)				\
+	$(EXTRA_GNOME_CFLAGS)
 
 gnome_libs =						\
 	$(BONOBO_GNOME_LIBS)				\
-	$(INTLLIBS)
+	$(INTLLIBS)					\
+	$(EXTRA_GNOME_LIBS)
 
 ename_libs = 						\
 	libename.la 					\
@@ -44,7 +46,8 @@ noinst_PROGRAMS =					\
 test_ename_western_SOURCES =				\
 	test-ename-western.c
 
-test_ename_western_LDADD = $(ename_libs)
+test_ename_western_LDADD = $(ename_libs)		\
+	$(EXTRA_GNOME_LIBS)
 
 test_ename_western_gtk_SOURCES =				\
 	test-ename-western-gtk.c
diff --git a/addressbook/ename/e-address-western.c b/addressbook/ename/e-address-western.c
index a8e16e1eba..7ee9a831c9 100644
--- a/addressbook/ename/e-address-western.c
+++ b/addressbook/ename/e-address-western.c
@@ -20,7 +20,7 @@
 #else
 
 #include <ename/e-address-western.h>
-#include <e-util/e-util.h>
+#include <gal/util/e-util.h>
 
 #endif
 
diff --git a/addressbook/ename/test-ename-western-gtk.c b/addressbook/ename/test-ename-western-gtk.c
index 38f3c1e0fe..74adb2a0b4 100644
--- a/addressbook/ename/test-ename-western-gtk.c
+++ b/addressbook/ename/test-ename-western-gtk.c
@@ -1,5 +1,5 @@
 #include <gnome.h>
-#include <e-util/e-unicode.h>
+#include <gal/widgets/e-unicode.h>
 #include <ename/e-name-western.h>
 
 ENameWestern *name;
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index bb81ffec5d..84c961c0c8 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -11,8 +11,6 @@ INCLUDES =						\
 	-I$(top_builddir)				\
 	-I$(top_srcdir)/shell				\
 	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/widgets/e-text			\
-	-I$(top_srcdir)/widgets/e-table			\
 	-I$(top_srcdir)/widgets/misc			\
 	-I$(top_srcdir)/addressbook/gui/minicard	\
 	-I$(top_srcdir)/addressbook/gui/widgets		\
@@ -53,9 +51,6 @@ evolution_addressbook_LDADD =						\
 	$(top_builddir)/addressbook/ename/libename.la			\
 	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
 	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/widgets/e-reflow/libereflow.a 			\
-	$(top_builddir)/widgets/e-text/libetext.a			\
-	$(top_builddir)/widgets/e-table/libetable.a			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
 	$(top_builddir)/addressbook/printing/libecontactprint.a		\
 	$(top_builddir)/addressbook/gui/search/libeaddressbooksearch.a	\
diff --git a/addressbook/gui/component/addressbook-factory.c b/addressbook/gui/component/addressbook-factory.c
index 4a072d09cd..6b2d194a42 100644
--- a/addressbook/gui/component/addressbook-factory.c
+++ b/addressbook/gui/component/addressbook-factory.c
@@ -13,7 +13,7 @@
 #include <bonobo.h>
 #include <liboaf/liboaf.h>
 #include <glade/glade.h>
-#include <e-util/e-cursors.h>
+#include <gal/widgets/e-cursors.h>
 #include <unicode.h>
 
 #include "addressbook.h"
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index bf66bbde2e..1ff63b32c4 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -17,8 +17,8 @@
 #include "addressbook.h"
 
 #include <ebook/e-book.h>
-#include <e-util/e-util.h>
-#include <e-util/e-unicode.h>
+#include <gal/util/e-util.h>
+#include <gal/widgets/e-unicode.h>
 #include "addressbook/gui/search/e-addressbook-search-dialog.h"
 
 #include "addressbook/gui/widgets/e-addressbook-view.h"
@@ -361,7 +361,7 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih,
 	bonobo_ui_container_freeze (container, NULL);
 
 	fname = bonobo_ui_util_get_ui_fname (
-		"evolution-addressbook.xml");
+		EVOLUTION_DATADIR, "evolution-addressbook.xml");
 	g_warning ("Attempting ui load from '%s'", fname);
 		
 	ui = bonobo_ui_util_new_ui (component, fname, "evolution-addressbook");
diff --git a/addressbook/gui/component/e-cardlist-model.h b/addressbook/gui/component/e-cardlist-model.h
index b7df356342..0b9a7a2265 100644
--- a/addressbook/gui/component/e-cardlist-model.h
+++ b/addressbook/gui/component/e-cardlist-model.h
@@ -2,7 +2,7 @@
 #ifndef _E_CARDLIST_MODEL_H_
 #define _E_CARDLIST_MODEL_H_
 
-#include "e-table-model.h"
+#include <gal/e-table/e-table-model.h>
 #include <ebook/e-book.h>
 #include <ebook/e-book-view.h>
 #include <ebook/e-card-simple.h>
diff --git a/addressbook/gui/component/e-ldap-storage.c b/addressbook/gui/component/e-ldap-storage.c
index be9b085f7d..11861b0ac2 100644
--- a/addressbook/gui/component/e-ldap-storage.c
+++ b/addressbook/gui/component/e-ldap-storage.c
@@ -53,8 +53,8 @@
 #include "e-ldap-storage.h"
 #include "e-ldap-server-dialog.h"
 
-#include "e-util/e-util.h"
-#include "e-util/e-xml-utils.h"
+#include <gal/util/e-util.h>
+#include <gal/util/e-xml-utils.h>
 
 #include <sys/types.h>
 #include <sys/fcntl.h>
diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.c b/addressbook/gui/component/select-names/e-select-names-bonobo.c
index a7b8f5b11f..8c0e868bb1 100644
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.c
+++ b/addressbook/gui/component/select-names/e-select-names-bonobo.c
@@ -32,7 +32,7 @@
 
 #include "Evolution-Addressbook-SelectNames.h"
 
-#include "e-util/e-util.h"
+#include <gal/util/e-util.h>
 #include "e-select-names-manager.h"
 
 #include "e-select-names-bonobo.h"
diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c
index b67ea282e9..37426879f4 100644
--- a/addressbook/gui/component/select-names/e-select-names-manager.c
+++ b/addressbook/gui/component/select-names/e-select-names-manager.c
@@ -16,7 +16,7 @@
 #include "e-select-names-model.h"
 #include "e-select-names-text-model.h"
 #include "e-select-names.h"
-#include "widgets/e-text/e-entry.h"
+#include <gal/e-text/e-entry.h>
 
 /* Object argument IDs */
 enum {
diff --git a/addressbook/gui/component/select-names/e-select-names-model.c b/addressbook/gui/component/select-names/e-select-names-model.c
index 32f2a85a56..0bbbe588a6 100644
--- a/addressbook/gui/component/select-names/e-select-names-model.c
+++ b/addressbook/gui/component/select-names/e-select-names-model.c
@@ -13,7 +13,7 @@
 #include <gtk/gtk.h>
 
 #include "e-select-names-model.h"
-#include "e-util/e-util.h"
+#include <gal/util/e-util.h>
 #include "addressbook/backend/ebook/e-card-simple.h"
 
 enum {
diff --git a/addressbook/gui/component/select-names/e-select-names-table-model.c b/addressbook/gui/component/select-names/e-select-names-table-model.c
index 0c56606c31..37abcddc70 100644
--- a/addressbook/gui/component/select-names/e-select-names-table-model.c
+++ b/addressbook/gui/component/select-names/e-select-names-table-model.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <gtk/gtk.h>
 
-#include "e-util/e-util.h"
+#include <gal/util/e-util.h>
 #include "e-select-names-table-model.h"
 #include "addressbook/backend/ebook/e-card-simple.h"
 
diff --git a/addressbook/gui/component/select-names/e-select-names-table-model.h b/addressbook/gui/component/select-names/e-select-names-table-model.h
index e0f0f5d804..7a051d337c 100644
--- a/addressbook/gui/component/select-names/e-select-names-table-model.h
+++ b/addressbook/gui/component/select-names/e-select-names-table-model.h
@@ -13,7 +13,7 @@
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include "e-select-names-model.h"
-#include <widgets/e-table/e-table-model.h>
+#include <gal/e-table/e-table-model.h>
 
 #define E_TYPE_SELECT_NAMES_TABLE_MODEL            (e_select_names_table_model_get_type ())
 #define E_SELECT_NAMES_TABLE_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_TABLE_MODEL, ESelectNamesTableModel))
diff --git a/addressbook/gui/component/select-names/e-select-names-text-model.h b/addressbook/gui/component/select-names/e-select-names-text-model.h
index aa23544251..3d6bed468e 100644
--- a/addressbook/gui/component/select-names/e-select-names-text-model.h
+++ b/addressbook/gui/component/select-names/e-select-names-text-model.h
@@ -13,7 +13,7 @@
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include "e-select-names-model.h"
-#include <widgets/e-text/e-text-model.h>
+#include <gal/e-text/e-text-model.h>
 
 #define E_TYPE_SELECT_NAMES_TEXT_MODEL            (e_select_names_text_model_get_type ())
 #define E_SELECT_NAMES_TEXT_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_TEXT_MODEL, ESelectNamesTextModel))
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
index 7f422082e8..4869c4cb8d 100644
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ b/addressbook/gui/component/select-names/e-select-names.c
@@ -22,8 +22,8 @@
 #include <config.h>
 #include <gnome.h>
 #include "e-select-names.h"
-#include <e-table-simple.h>
-#include <e-cell-text.h>
+#include <gal/e-table/e-table-simple.h>
+#include <gal/e-table/e-cell-text.h>
 #include <addressbook/gui/widgets/e-addressbook-model.h>
 #include <addressbook/gui/component/e-cardlist-model.h>
 #include <addressbook/backend/ebook/e-book.h>
diff --git a/addressbook/gui/component/select-names/e-select-names.h b/addressbook/gui/component/select-names/e-select-names.h
index b1c11eb473..dba100e8f0 100644
--- a/addressbook/gui/component/select-names/e-select-names.h
+++ b/addressbook/gui/component/select-names/e-select-names.h
@@ -24,8 +24,8 @@
 #include <gnome.h>
 #include <glade/glade.h>
 #include <e-util/e-list.h>
-#include <widgets/e-table/e-table.h>
-#include <widgets/e-table/e-table-scrolled.h>
+#include <gal/e-table/e-table.h>
+#include <gal/e-table/e-table-scrolled.h>
 #include "e-select-names-model.h"
 
 #ifdef __cplusplus
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index bdf16bde6a..64fc447da4 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -5,6 +5,7 @@ CPPFLAGS =					\
 
 INCLUDES =					\
 	$(BONOBO_GNOME_CFLAGS)			\
+	$(EXTRA_GNOME_CFLAGS)			\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/addressbook/		\
 	-I$(top_srcdir)/addressbook/backend	\
@@ -41,10 +42,8 @@ contact_editor_test_LDADD =					\
 	$(top_builddir)/libversit/libversit.la			\
 	$(GNOMEGNORBA_LIBS)					\
 	$(BONOBO_GNOME_LIBS)				\
-	$(top_builddir)/widgets/e-table/libetable.a		\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a \
 	$(top_builddir)/e-util/libeutil.la			\
-	$(top_builddir)/widgets/e-text/libetext.a		\
 	$(GNOME_PRINT_LIBS)					\
 	$(EXTRA_GNOME_LIBS)
 
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c
index cf6cc382cd..10160facae 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-address.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-address.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include <gnome.h>
-#include <e-util/e-unicode.h>
+#include <gal/widgets/e-unicode.h>
 #include <e-contact-editor-address.h>
 
 static void e_contact_editor_address_init		(EContactEditorAddress		 *card);
diff --git a/addressbook/gui/contact-editor/e-contact-editor-categories.c b/addressbook/gui/contact-editor/e-contact-editor-categories.c
index f48100ae9f..1845fc65ff 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-categories.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-categories.c
@@ -23,12 +23,12 @@
 #include <config.h>
 #include <gnome.h>
 #include <e-contact-editor-categories.h>
-#include <e-table-scrolled.h>
-#include <e-table.h>
-#include <e-table-simple.h>
-#include <e-cell-text.h>
-#include <e-cell-checkbox.h>
-#include <e-util/e-unicode.h>
+#include <gal/e-table/e-table-scrolled.h>
+#include <gal/e-table/e-table.h>
+#include <gal/e-table/e-table-simple.h>
+#include <gal/e-table/e-cell-text.h>
+#include <gal/e-table/e-cell-checkbox.h>
+#include <gal/widgets/e-unicode.h>
 
 static void e_contact_editor_categories_init		(EContactEditorCategories		 *card);
 static void e_contact_editor_categories_class_init	(EContactEditorCategoriesClass	 *klass);
diff --git a/addressbook/gui/contact-editor/e-contact-editor-categories.h b/addressbook/gui/contact-editor/e-contact-editor-categories.h
index 529ef71b68..3edff76b4b 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-categories.h
+++ b/addressbook/gui/contact-editor/e-contact-editor-categories.h
@@ -24,7 +24,7 @@
 #include <gnome.h>
 #include <glade/glade.h>
 #include <ebook/e-card.h>
-#include <widgets/e-table/e-table-model.h>
+#include <gal/e-table/e-table-model.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index d3f8f399bb..79f458aa22 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include <gnome.h>
-#include <e-util/e-unicode.h>
+#include <gal/widgets/e-unicode.h>
 #include <e-contact-editor-fullname.h>
 
 static void e_contact_editor_fullname_init		(EContactEditorFullname		 *card);
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 4d147def56..6dd00aa273 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -28,8 +28,9 @@
 #include <e-contact-editor-categories.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-#include <e-util/e-gui-utils.h>
-#include <e-util/e-unicode.h>
+#include "e-util/e-gui-utils.h"
+#include <gal/widgets/e-gui-utils.h>
+#include <gal/widgets/e-unicode.h>
 #include <e-contact-save-as.h>
 #include "addressbook/printing/e-contact-print.h"
 
diff --git a/addressbook/gui/contact-editor/e-contact-save-as.c b/addressbook/gui/contact-editor/e-contact-save-as.c
index 51cb2619e7..7209c5e8f8 100644
--- a/addressbook/gui/contact-editor/e-contact-save-as.c
+++ b/addressbook/gui/contact-editor/e-contact-save-as.c
@@ -20,7 +20,7 @@
  */
 
 #include <e-contact-save-as.h>
-#include <e-util/e-util.h>
+#include <gal/util/e-util.h>
 #include <unistd.h>
 #include <fcntl.h>
 
diff --git a/addressbook/gui/search/e-addressbook-search-dialog.c b/addressbook/gui/search/e-addressbook-search-dialog.c
index 6c71945886..c6fc3c81ad 100644
--- a/addressbook/gui/search/e-addressbook-search-dialog.c
+++ b/addressbook/gui/search/e-addressbook-search-dialog.c
@@ -22,10 +22,10 @@
 
 #include <config.h>
 #include <gnome.h>
-#include <e-util/e-canvas.h>
+#include <gal/widgets/e-canvas.h>
 #include "e-addressbook-search-dialog.h"
 #include "addressbook/gui/widgets/e-minicard-view-widget.h"
-#include "widgets/misc/e-scroll-frame.h"
+#include <gal/widgets/e-scroll-frame.h>
 
 static void e_addressbook_search_dialog_init		 (EAddressbookSearchDialog		 *widget);
 static void e_addressbook_search_dialog_class_init	 (EAddressbookSearchDialogClass	 *klass);
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 9680a0a2dc..f592cf2ab2 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -11,7 +11,8 @@ INCLUDES =						\
 	-I$(top_srcdir)/widgets/e-reflow		\
 	-I$(top_srcdir)/widgets/e-table			\
 	-I$(top_srcdir)/widgets/misc			\
-	$(BONOBO_GNOME_CFLAGS)
+	$(BONOBO_GNOME_CFLAGS)				\
+	$(EXTRA_GNOME_CFLAGS)
 
 noinst_LIBRARIES =				\
 	libeminicard.a
@@ -48,7 +49,6 @@ minicard_label_test_LDADD =				\
 	$(EXTRA_GNOME_LIBS)				\
 	libeminicard.a					\
 	$(BONOBO_GNOME_LIBS)				\
-	$(top_builddir)/widgets/e-text/libetext.a	\
 	$(top_builddir)/e-util/libeutil.la
 
 minicard_test_SOURCES = 	\
@@ -65,11 +65,8 @@ minicard_test_LDADD =							\
 	$(top_builddir)/addressbook/ename/libename.la			\
 	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
 	$(top_builddir)/addressbook/printing/libecontactprint.a		\
-	$(top_builddir)/widgets/e-table/libetable.a			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-	$(top_builddir)/widgets/e-reflow/libereflow.a 			\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/widgets/e-text/libetext.a
+	$(top_builddir)/e-util/libeutil.la
 
 reflow_test_SOURCES = 	\
 	test-reflow.c
@@ -85,11 +82,8 @@ reflow_test_LDADD =							\
 	$(top_builddir)/addressbook/ename/libename.la			\
 	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
 	$(top_builddir)/addressbook/printing/libecontactprint.a		\
-	$(top_builddir)/widgets/e-table/libetable.a			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-	$(top_builddir)/widgets/e-reflow/libereflow.a 			\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/widgets/e-text/libetext.a
+	$(top_builddir)/e-util/libeutil.la
 
 #minicard_view_test_SOURCES = 	\
 #	test-minicard-view.c
@@ -104,15 +98,13 @@ reflow_test_LDADD =							\
 #	$(top_builddir)/addressbook/ename/libename.la			\
 #	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
 #	$(top_builddir)/addressbook/printing/libecontactprint.a		\
-#	$(top_builddir)/widgets/e-table/libetable.a			\
 #	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-#	$(top_builddir)/e-util/libeutil.la				\
-#	$(top_builddir)/widgets/e-text/libetext.a
+#	$(top_builddir)/e-util/libeutil.la
 
 minicard_widget_test_SOURCES = 	\
 	e-minicard-widget-test.c
 
-minicard_widget_test_LDADD =				\
+minicard_widget_test_LDADD =						\
 	$(EXTRA_GNOME_LIBS)						\
 	$(BONOBO_GNOME_LIBS)						\
 	$(GNOME_PRINT_LIBS)						\
@@ -123,11 +115,8 @@ minicard_widget_test_LDADD =				\
 	$(top_builddir)/addressbook/ename/libename.la			\
 	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
 	$(top_builddir)/addressbook/printing/libecontactprint.a		\
-	$(top_builddir)/widgets/e-table/libetable.a			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-	$(top_builddir)/widgets/e-reflow/libereflow.a 			\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/widgets/e-text/libetext.a
+	$(top_builddir)/e-util/libeutil.la
 
 gladedir   = $(datadir)/evolution/glade
 glade_DATA = alphabet.glade 
diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h
index 267bd1b22a..0bde425a25 100644
--- a/addressbook/gui/widgets/e-addressbook-model.h
+++ b/addressbook/gui/widgets/e-addressbook-model.h
@@ -2,7 +2,7 @@
 #ifndef _E_ADDRESSBOOK_MODEL_H_
 #define _E_ADDRESSBOOK_MODEL_H_
 
-#include "e-table-model.h"
+#include <gal/e-table/e-table-model.h>
 #include "addressbook/backend/ebook/e-book.h"
 #include "addressbook/backend/ebook/e-book-view.h"
 #include "addressbook/backend/ebook/e-card-simple.h"
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 52f8375d53..dfbcbaca2d 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -25,14 +25,16 @@
 
 #include "e-addressbook-view.h"
 
-#include "e-table-scrolled.h"
-#include "e-table-model.h"
-#include "e-table-col.h"
-#include "e-table-header.h"
-#include "e-cell-text.h"
+#include <gal/e-table/e-table-scrolled.h>
+#include <gal/e-table/e-table-model.h>
+#include <gal/e-table/e-table-col.h>
+#include <gal/e-table/e-table-header.h>
+#include <gal/e-table/e-cell-text.h>
+#include <gal/widgets/e-scroll-frame.h>
+#include <gal/widgets/e-popup-menu.h>
+
 #include "e-addressbook-model.h"
 
-#include <e-scroll-frame.h>
 #include "e-minicard-view-widget.h"
 
 #include "e-contact-editor.h"
@@ -41,7 +43,6 @@
 #include "e-card-simple.h"
 #include "e-card.h"
 #include "e-book.h"
-#include "e-util/e-popup-menu.h"
 
 #include "glade/glade-xml.h"
 
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index c0f45f67c9..3bdf1f2c47 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -23,10 +23,10 @@
 #include <config.h>
 #include <gnome.h>
 #include "e-minicard-label.h"
-#include "e-text.h"
-#include <e-util/e-canvas.h>
-#include <e-util/e-util.h>
-#include <e-util/e-canvas-utils.h>
+#include <gal/util/e-util.h>
+#include <gal/e-text/e-text.h>
+#include <gal/widgets/e-canvas.h>
+#include <gal/widgets/e-canvas-utils.h>
 
 static void e_minicard_label_init		(EMinicardLabel		 *card);
 static void e_minicard_label_class_init	(EMinicardLabelClass	 *klass);
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index 3cf1add096..f23d3e4476 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include <gnome.h>
-#include <e-util/e-canvas.h>
+#include <gal/widgets/e-canvas.h>
 #include "e-minicard-view-widget.h"
 static void e_minicard_view_widget_init		 (EMinicardViewWidget		 *widget);
 static void e_minicard_view_widget_class_init	 (EMinicardViewWidgetClass	 *klass);
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h
index 372c061f65..952e60ee65 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.h
+++ b/addressbook/gui/widgets/e-minicard-view-widget.h
@@ -23,7 +23,7 @@
 
 #include <gnome.h>
 #include "e-minicard-view.h"
-#include "e-util/e-canvas.h"
+#include <gal/widgets/e-canvas.h>
 #include "addressbook/backend/ebook/e-book.h"
 
 #ifdef __cplusplus
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 011ff9158f..249c987802 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-util/e-canvas.h>
+#include <gal/widgets/e-canvas.h>
 #include "e-minicard-view.h"
 #include "e-minicard.h"
 #include "e-contact-editor.h"
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
index 93a59dfe2a..f12f0d43cf 100644
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ b/addressbook/gui/widgets/e-minicard-view.h
@@ -22,7 +22,7 @@
 #define __E_MINICARD_VIEW_H__
 
 #include <gnome.h>
-#include "widgets/e-reflow/e-reflow-sorted.h"
+#include <gal/widgets/e-reflow-sorted.h>
 #include "addressbook/backend/ebook/e-book.h"
 
 #ifdef __cplusplus
diff --git a/addressbook/gui/widgets/e-minicard-widget.h b/addressbook/gui/widgets/e-minicard-widget.h
index 8a3ec0ae16..95b56cf3de 100644
--- a/addressbook/gui/widgets/e-minicard-widget.h
+++ b/addressbook/gui/widgets/e-minicard-widget.h
@@ -23,7 +23,7 @@
 
 #include <gnome.h>
 #include "addressbook/backend/ebook/e-card.h"
-#include "e-util/e-canvas.h"
+#include <gal/widgets/e-canvas.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index e461294b5e..792962a5b3 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -24,12 +24,12 @@
 #include <gnome.h>
 #include "e-minicard.h"
 #include "e-minicard-label.h"
-#include "e-text.h"
 #include "addressbook/backend/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-util/e-popup-menu.h>
+#include <gal/e-text/e-text.h>
+#include <gal/util/e-util.h>
+#include <gal/widgets/e-canvas-utils.h>
+#include <gal/widgets/e-canvas.h>
+#include <gal/widgets/e-popup-menu.h>
 #include "addressbook/printing/e-contact-print.h"
 #include "e-contact-editor.h"
 #include "e-contact-save-as.h"
diff --git a/addressbook/gui/widgets/test-minicard-label.c b/addressbook/gui/widgets/test-minicard-label.c
index 57bc69222a..0566a85760 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-util/e-canvas.h>
+#include <gal/widgets/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-reflow.c b/addressbook/gui/widgets/test-reflow.c
index 8013c428d5..2a8e7093fe 100644
--- a/addressbook/gui/widgets/test-reflow.c
+++ b/addressbook/gui/widgets/test-reflow.c
@@ -48,10 +48,10 @@
 #include "config.h"
 
 #include <gnome.h>
-#include <e-util/e-canvas.h>
-#include "e-reflow.h"
+#include <gal/widgets/e-canvas.h>
+#include <gal/widgets/e-reflow.h>
 #include "e-minicard.h"
-#include "e-scroll-frame.h"
+#include <gal/widgets/e-scroll-frame.h>
 
 /* This is a horrible thing to do, but it is just a test. */
 GnomeCanvasItem *reflow;
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index 63e3b674a0..f2cf9ac8f0 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -31,7 +31,7 @@
 #include <gnome-xml/parser.h>
 #include <gnome-xml/xmlmemory.h>
 #include <ctype.h>
-#include <e-util/e-unicode.h>
+#include <gal/widgets/e-unicode.h>
 #include <addressbook/backend/ebook/e-book.h>
 #include <addressbook/backend/ebook/e-card.h>
 #include <addressbook/backend/ebook/e-card-simple.h>