Retired GAL from Head. The relevant files have moved inside evolution.

2005-06-17  Kaushal Kumar  <kakumar@novell.com>

        * Retired GAL from Head. The relevant files have moved inside
        evolution. Thanks to JP Rosevear for performing the cvs surgery. The
        files have been moved in the following order.

        evolution/e-util <- gal/gal/util
        evolution/a11y <-  gal/gal/a11y
        evolution/a11y/e-table <- gal/gal/a11y/e-table
        evolution/a11y/e-text <- gal/gal/a11y/e-text
        evolution/widgets/table <- gal/gal/e-table
        evolution/widgets/text <- gal/gal/e-text
        evolution/widgets/misc <- gal/gal/widgets
        evolution/widgets/misc/pixmaps <- gal/gal/widgets/pixmaps
        evolution/widgets/menus <- gal/gal/menus

        Following is the summary of changes done to fix the build:-
        - New files added to cvs repository,
                - a11y/e-table/Makefile.am
                - a11y/e-text/Makefile.am
                - widgets/table/Makefile.am
                - widgets/text/Makefile.am
                - widgets/misc/pixmaps/Makefile.am
                - iconv-detect.h
                - iconv-detect.c
        - Updated configure.in.
        - Updated all the relevant Makefile.am files.
        - Updated the include paths to replace all gal references.
        - Updated the marshal list to suit gal files requirements.

svn path=/trunk/; revision=29522

35 files changed, 165 insertions, 80 deletions

diff --git a/a11y/Makefile.am b/a11y/Makefile.am
index c98e486e7f..96a9014b70 100644
--- a/a11y/Makefile.am
+++ b/a11y/Makefile.am
@@ -1,16 +1,28 @@
-SUBDIRS = . calendar widgets addressbook
+SUBDIRS = e-text e-table . calendar widgets addressbook
 
 # for debug
 #A11Y_CFLAGS += -pedantic -ansi -DACC_DEBUG -Werror
 
 privlib_LTLIBRARIES = libevolution-a11y.la
 
-INCLUDES =                                              \
-        -I$(top_srcdir)/a11y                            \
-        $(A11Y_CFLAGS)
+INCLUDES =				\
+	-I$(top_srcdir)/a11y		\
+	$(A11Y_CFLAGS)
 
-libevolution_a11y_la_SOURCES = 		        \
-        ea-factory.h                            \
-        ea-cell-table.h                         \
-        ea-cell-table.c
+libevolution_a11y_la_SOURCES =		\
+	ea-factory.h			\
+	ea-cell-table.h			\
+	ea-cell-table.c			\
+	gal-a11y-util.c
 
+libevolution_a11yincludedir = $(privincludedir)/a11y
+
+libevolution_a11yinclude_HEADERS =		\
+	gal-a11y-util.h				\
+	gal-a11y-factory.h
+
+libevolution_a11y_la_LIBADD =		\
+	e-text/libgal-a11y-etext.la	\
+	e-table/libgal-a11y-etable.la	\
+	$(EXTRA_GNOME_LIBS)		\
+	$(REGEX_LIBS)
diff --git a/a11y/addressbook/Makefile.am b/a11y/addressbook/Makefile.am
index dfabdf27ba..5a39f32581 100644
--- a/a11y/addressbook/Makefile.am
+++ b/a11y/addressbook/Makefile.am
@@ -3,6 +3,7 @@ privlib_LTLIBRARIES = libevolution-addressbook-a11y.la
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"evolution-a11y\"		\
 	-I$(top_srcdir)		                        \
+	-I$(top_srcdir)/widgets	                        \
 	-I$(top_srcdir)/a11y				\
 	-I$(top_srcdir)/a11y/addressbook		\
 	-I$(top_srcdir)/shell				\
diff --git a/a11y/addressbook/ea-addressbook.c b/a11y/addressbook/ea-addressbook.c
index 1abe1f2a4d..f218022ef9 100644
--- a/a11y/addressbook/ea-addressbook.c
+++ b/a11y/addressbook/ea-addressbook.c
@@ -23,7 +23,7 @@
  *
  */
 
-#include <gal/e-text/e-text.h>
+#include <text/e-text.h>
 #include "ea-factory.h"
 #include "ea-addressbook.h"
 #include "addressbook/ea-minicard.h"
diff --git a/a11y/calendar/ea-cal-view-event.c b/a11y/calendar/ea-cal-view-event.c
index cbd53f4ebd..41330b6ffd 100644
--- a/a11y/calendar/ea-cal-view-event.c
+++ b/a11y/calendar/ea-cal-view-event.c
@@ -27,7 +27,7 @@
 #include "ea-calendar-helpers.h"
 #include "ea-day-view.h"
 #include "ea-week-view.h"
-#include <gal/e-text/e-text.h>
+#include <text/e-text.h>
 #include <libgnome/gnome-i18n.h>
 
 static void ea_cal_view_event_class_init (EaCalViewEventClass *klass);
diff --git a/a11y/calendar/ea-calendar-helpers.c b/a11y/calendar/ea-calendar-helpers.c
index ff3a502a67..089b634732 100644
--- a/a11y/calendar/ea-calendar-helpers.c
+++ b/a11y/calendar/ea-calendar-helpers.c
@@ -29,7 +29,7 @@
 #include "e-day-view.h"
 #include "e-week-view.h"
 
-#include <gal/e-text/e-text.h>
+#include <text/e-text.h>
 #include <libgnomecanvas/gnome-canvas-pixbuf.h>
 
 /**
diff --git a/a11y/calendar/ea-calendar.c b/a11y/calendar/ea-calendar.c
index 614f81e4c8..809a9f75df 100644
--- a/a11y/calendar/ea-calendar.c
+++ b/a11y/calendar/ea-calendar.c
@@ -23,7 +23,7 @@
  *
  */
 
-#include <gal/e-text/e-text.h>
+#include <text/e-text.h>
 #include <libgnomecanvas/gnome-canvas-pixbuf.h>
 #include "ea-calendar-helpers.h"
 #include "ea-factory.h"
diff --git a/a11y/calendar/ea-week-view.c b/a11y/calendar/ea-week-view.c
index 3b36ac246d..32a46028a8 100644
--- a/a11y/calendar/ea-week-view.c
+++ b/a11y/calendar/ea-week-view.c
@@ -29,7 +29,7 @@
 #include "ea-calendar-helpers.h"
 #include "ea-gnome-calendar.h"
 #include "calendar-commands.h"
-#include <gal/e-text/e-text.h>
+#include <text/e-text.h>
 #include <libgnome/gnome-i18n.h>
 
 static void ea_week_view_class_init (EaWeekViewClass *klass);
diff --git a/a11y/e-table/Makefile.am b/a11y/e-table/Makefile.am
new file mode 100644
index 0000000000..2864265080
--- /dev/null
+++ b/a11y/e-table/Makefile.am
@@ -0,0 +1,49 @@
+INCLUDES =					\
+	-I$(top_srcdir)                         \
+	-I$(top_srcdir)/widgets/                \
+	$(EXTRA_GNOME_CFLAGS)			\
+	$(GNOME_BONOBO_CFLAGS)			\
+	$(GNOME_INCLUDEDIR)			\
+	$(ICONV_CFLAGS)				\
+	$(GNOME_FULL_CFLAGS)			\
+        -DG_LOG_DOMAIN=\"e-table\"
+
+noinst_LTLIBRARIES = libgal-a11y-etable.la
+
+libgal_a11y_etable_la_SOURCES =		\
+	gal-a11y-e-tree.c			\
+	gal-a11y-e-tree-factory.c		\
+	gal-a11y-e-cell.c			\
+	gal-a11y-e-cell-text.c			\
+	gal-a11y-e-cell-tree.c			\
+	gal-a11y-e-cell-toggle.c		\
+	gal-a11y-e-cell-popup.c			\
+	gal-a11y-e-cell-registry.c		\
+	gal-a11y-e-cell-vbox.c			\
+	gal-a11y-e-table.c			\
+	gal-a11y-e-table-item.c			\
+	gal-a11y-e-table-item-factory.c		\
+	gal-a11y-e-table-click-to-add.c		\
+	gal-a11y-e-table-column-header.c	\
+	gal-a11y-e-table-click-to-add-factory.c	\
+	gal-a11y-e-table-factory.c		
+
+libgal_a11y_etableincludedir = $(privincludedir)/a11y/e-table
+
+libgal_a11y_etableinclude_HEADERS =		\
+	gal-a11y-e-tree.h			\
+	gal-a11y-e-tree-factory.h		\
+	gal-a11y-e-cell.h			\
+	gal-a11y-e-cell-text.h			\
+	gal-a11y-e-cell-tree.h			\
+	gal-a11y-e-cell-toggle.h		\
+	gal-a11y-e-cell-popup.h			\
+	gal-a11y-e-cell-registry.h		\
+	gal-a11y-e-cell-vbox.h			\
+	gal-a11y-e-table.h			\
+	gal-a11y-e-table-item.h			\
+	gal-a11y-e-table-click-to-add-factory.h	\
+	gal-a11y-e-table-click-to-add.h		\
+	gal-a11y-e-table-column-header.h	\
+	gal-a11y-e-table-item-factory.h		\
+	gal-a11y-e-table-factory.h
diff --git a/a11y/e-table/gal-a11y-e-cell-popup.c b/a11y/e-table/gal-a11y-e-cell-popup.c
index d819a2fcc8..8d5e40d70e 100644
--- a/a11y/e-table/gal-a11y-e-cell-popup.c
+++ b/a11y/e-table/gal-a11y-e-cell-popup.c
@@ -28,9 +28,9 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include "gal/a11y/gal-a11y-util.h"
-#include "gal/e-table/e-cell-popup.h"
-#include "gal/util/e-i18n.h"
+#include "a11y/gal-a11y-util.h"
+#include "table/e-cell-popup.h"
+#include "e-util/e-i18n.h"
 
 #include "gal-a11y-e-cell-popup.h"
 #include "gal-a11y-e-cell-registry.h"
diff --git a/a11y/e-table/gal-a11y-e-cell-popup.h b/a11y/e-table/gal-a11y-e-cell-popup.h
index 4162ed21cc..8131857cf6 100644
--- a/a11y/e-table/gal-a11y-e-cell-popup.h
+++ b/a11y/e-table/gal-a11y-e-cell-popup.h
@@ -27,8 +27,8 @@
 #define __GAL_A11Y_E_CELL_POPUP_H__
 
 #include <glib-object.h>
-#include <gal/e-table/e-table-item.h>
-#include <gal/a11y/e-table/gal-a11y-e-cell.h>
+#include <table/e-table-item.h>
+#include <a11y/e-table/gal-a11y-e-cell.h>
 #include <atk/atkgobjectaccessible.h>
 
 #define GAL_A11Y_TYPE_E_CELL_POPUP            (gal_a11y_e_cell_popup_get_type ())
diff --git a/a11y/e-table/gal-a11y-e-cell-registry.h b/a11y/e-table/gal-a11y-e-cell-registry.h
index eecd41139c..602d6be41e 100644
--- a/a11y/e-table/gal-a11y-e-cell-registry.h
+++ b/a11y/e-table/gal-a11y-e-cell-registry.h
@@ -11,8 +11,8 @@
 
 #include <glib-object.h>
 #include <atk/atkobject.h>
-#include <gal/e-table/e-table-item.h>
-#include <gal/e-table/e-cell.h>
+#include <table/e-table-item.h>
+#include <table/e-cell.h>
 
 #define GAL_A11Y_TYPE_E_CELL_REGISTRY            (gal_a11y_e_cell_registry_get_type ())
 #define GAL_A11Y_E_CELL_REGISTRY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL_REGISTRY, GalA11yECellRegistry))
diff --git a/a11y/e-table/gal-a11y-e-cell-text.c b/a11y/e-table/gal-a11y-e-cell-text.c
index 37785bfbf5..e1a485cd55 100644
--- a/a11y/e-table/gal-a11y-e-cell-text.c
+++ b/a11y/e-table/gal-a11y-e-cell-text.c
@@ -12,9 +12,9 @@
 
 #include <atk/atk.h>
 
-#include "gal/a11y/gal-a11y-util.h"
-#include "gal/e-table/e-cell-text.h"
-#include "gal/util/e-i18n.h"
+#include "a11y/gal-a11y-util.h"
+#include "table/e-cell-text.h"
+#include "e-util/e-i18n.h"
 
 #include "gal-a11y-e-cell-text.h"
 
diff --git a/a11y/e-table/gal-a11y-e-cell-text.h b/a11y/e-table/gal-a11y-e-cell-text.h
index b2cfef2bd4..1398325429 100644
--- a/a11y/e-table/gal-a11y-e-cell-text.h
+++ b/a11y/e-table/gal-a11y-e-cell-text.h
@@ -10,9 +10,9 @@
 #define __GAL_A11Y_E_CELL_TEXT_H__
 
 #include <glib-object.h>
-#include <gal/e-table/e-table-item.h>
-#include <gal/e-table/e-cell-text.h>
-#include <gal/a11y/e-table/gal-a11y-e-cell.h>
+#include <table/e-table-item.h>
+#include <table/e-cell-text.h>
+#include <a11y/e-table/gal-a11y-e-cell.h>
 
 #define GAL_A11Y_TYPE_E_CELL_TEXT            (gal_a11y_e_cell_text_get_type ())
 #define GAL_A11Y_E_CELL_TEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL_TEXT, GalA11yECellText))
diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.c b/a11y/e-table/gal-a11y-e-cell-toggle.c
index 4c9e47bbaf..7706062908 100644
--- a/a11y/e-table/gal-a11y-e-cell-toggle.c
+++ b/a11y/e-table/gal-a11y-e-cell-toggle.c
@@ -1,8 +1,8 @@
 #include <gtk/gtk.h>
 
-#include "gal/e-table/e-cell-toggle.h"
-#include "gal/e-table/e-table-model.h"
-#include "gal/util/e-i18n.h"
+#include "table/e-cell-toggle.h"
+#include "table/e-table-model.h"
+#include "e-util/e-i18n.h"
 
 #include "gal-a11y-e-cell-toggle.h"
 
diff --git a/a11y/e-table/gal-a11y-e-cell-tree.c b/a11y/e-table/gal-a11y-e-cell-tree.c
index 64ebfffb89..068658cafa 100644
--- a/a11y/e-table/gal-a11y-e-cell-tree.c
+++ b/a11y/e-table/gal-a11y-e-cell-tree.c
@@ -10,11 +10,11 @@
 
 #include <atk/atk.h>
 
-#include "gal/a11y/gal-a11y-util.h"
-#include "gal/e-table/e-cell-tree.h"
-#include "gal/e-table/e-table.h"
-#include "gal/e-table/e-tree-table-adapter.h"
-#include "gal/util/e-i18n.h"
+#include "a11y/gal-a11y-util.h"
+#include "table/e-cell-tree.h"
+#include "table/e-table.h"
+#include "table/e-tree-table-adapter.h"
+#include "e-util/e-i18n.h"
 
 #include "gal-a11y-e-cell-tree.h"
 #include "gal-a11y-e-cell-registry.h"
diff --git a/a11y/e-table/gal-a11y-e-cell-tree.h b/a11y/e-table/gal-a11y-e-cell-tree.h
index 355670b5a4..8f621cba1d 100644
--- a/a11y/e-table/gal-a11y-e-cell-tree.h
+++ b/a11y/e-table/gal-a11y-e-cell-tree.h
@@ -10,8 +10,8 @@
 #define __GAL_A11Y_E_CELL_TREE_H__
 
 #include <glib-object.h>
-#include <gal/e-table/e-table-item.h>
-#include <gal/e-table/e-cell-tree.h>
+#include <table/e-table-item.h>
+#include <table/e-cell-tree.h>
 #include "gal-a11y-e-cell.h"
 
 #define GAL_A11Y_TYPE_E_CELL_TREE            (gal_a11y_e_cell_tree_get_type ())
diff --git a/a11y/e-table/gal-a11y-e-cell-vbox.c b/a11y/e-table/gal-a11y-e-cell-vbox.c
index 6363b8c5c1..0a5125338c 100644
--- a/a11y/e-table/gal-a11y-e-cell-vbox.c
+++ b/a11y/e-table/gal-a11y-e-cell-vbox.c
@@ -23,7 +23,7 @@
 
 #include <atk/atk.h>
 
-#include "gal/e-table/e-cell-vbox.h"
+#include "table/e-cell-vbox.h"
 
 #include "gal-a11y-e-cell-registry.h"
 #include "gal-a11y-e-cell-vbox.h"
diff --git a/a11y/e-table/gal-a11y-e-cell.c b/a11y/e-table/gal-a11y-e-cell.c
index 08273637fc..85d577f8e5 100644
--- a/a11y/e-table/gal-a11y-e-cell.c
+++ b/a11y/e-table/gal-a11y-e-cell.c
@@ -12,10 +12,10 @@
 
 #include <gtk/gtk.h>
 
-#include "gal/a11y/gal-a11y-util.h"
-#include "gal/e-table/e-table.h"
-#include "gal/e-table/e-tree.h"
-#include "gal/util/e-i18n.h"
+#include "a11y/gal-a11y-util.h"
+#include "table/e-table.h"
+#include "table/e-tree.h"
+#include "e-util/e-i18n.h"
 
 #include "gal-a11y-e-cell.h"
 #include "gal-a11y-e-cell-vbox.h"
diff --git a/a11y/e-table/gal-a11y-e-cell.h b/a11y/e-table/gal-a11y-e-cell.h
index 53a6c0089d..b3f5ef3277 100644
--- a/a11y/e-table/gal-a11y-e-cell.h
+++ b/a11y/e-table/gal-a11y-e-cell.h
@@ -10,8 +10,8 @@
 #define __GAL_A11Y_E_CELL_H__
 
 #include <glib-object.h>
-#include <gal/e-table/e-table-item.h>
-#include <gal/e-table/e-cell.h>
+#include <table/e-table-item.h>
+#include <table/e-cell.h>
 
 #define GAL_A11Y_TYPE_E_CELL            (gal_a11y_e_cell_get_type ())
 #define GAL_A11Y_E_CELL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL, GalA11yECell))
diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c
index c959003a8b..ab98b4a10b 100644
--- a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c
+++ b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c
@@ -8,8 +8,8 @@
 
 #include <atk/atk.h>
 
-#include "gal/e-table/e-table.h"
-#include "gal/e-table/e-table-click-to-add.h"
+#include "table/e-table.h"
+#include "table/e-table-click-to-add.h"
 
 #include "gal-a11y-e-table.h"
 #include "gal-a11y-e-table-click-to-add.h"
diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add.c b/a11y/e-table/gal-a11y-e-table-click-to-add.c
index 5d7eba16e3..9d96f3cf18 100644
--- a/a11y/e-table/gal-a11y-e-table-click-to-add.c
+++ b/a11y/e-table/gal-a11y-e-table-click-to-add.c
@@ -9,11 +9,11 @@
 
 #include <atk/atk.h>
 
-#include "gal/a11y/gal-a11y-util.h"
-#include "gal/e-table/e-table-click-to-add.h"
-#include "gal/e-table/e-table-group.h"
-#include "gal/e-table/e-table-group-leaf.h"
-#include "gal/util/e-i18n.h"
+#include "a11y/gal-a11y-util.h"
+#include "table/e-table-click-to-add.h"
+#include "table/e-table-group.h"
+#include "table/e-table-group-leaf.h"
+#include "e-util/e-i18n.h"
 
 #include "gal-a11y-e-table-click-to-add.h"
 #include "gal-a11y-e-table-click-to-add-factory.h"
diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add.h b/a11y/e-table/gal-a11y-e-table-click-to-add.h
index ea31ff6ef6..6160eadf47 100644
--- a/a11y/e-table/gal-a11y-e-table-click-to-add.h
+++ b/a11y/e-table/gal-a11y-e-table-click-to-add.h
@@ -4,7 +4,7 @@
 #define __GAL_A11Y_E_TABLE_CLICK_TO_ADD_H__
 
 #include <glib-object.h>
-#include <gal/e-table/e-table-item.h>
+#include <table/e-table-item.h>
 #include <atk/atkgobjectaccessible.h>
 
 #define GAL_A11Y_TYPE_E_TABLE_CLICK_TO_ADD            (gal_a11y_e_table_click_to_add_get_type ())
diff --git a/a11y/e-table/gal-a11y-e-table-column-header.c b/a11y/e-table/gal-a11y-e-table-column-header.c
index 3891c884e0..3303978a65 100644
--- a/a11y/e-table/gal-a11y-e-table-column-header.c
+++ b/a11y/e-table/gal-a11y-e-table-column-header.c
@@ -8,8 +8,8 @@
 #include <glib/gi18n.h>
 #include <atk/atkobject.h>
 #include <atk/atkregistry.h>
-#include "gal/e-table/e-table-header-item.h"
-#include "gal/a11y/gal-a11y-util.h"
+#include "table/e-table-header-item.h"
+#include "a11y/gal-a11y-util.h"
 #include "gal-a11y-e-table-column-header.h"
 
 static GObjectClass *parent_class;
diff --git a/a11y/e-table/gal-a11y-e-table-item-factory.c b/a11y/e-table/gal-a11y-e-table-item-factory.c
index f773471772..959de7e718 100644
--- a/a11y/e-table/gal-a11y-e-table-item-factory.c
+++ b/a11y/e-table/gal-a11y-e-table-item-factory.c
@@ -8,8 +8,8 @@
 
 #include <atk/atk.h>
 
-#include "gal/e-table/e-table.h"
-#include "gal/e-table/e-tree.h"
+#include "table/e-table.h"
+#include "table/e-tree.h"
 
 #include "gal-a11y-e-table.h"
 #include "gal-a11y-e-table-item.h"
diff --git a/a11y/e-table/gal-a11y-e-table-item.c b/a11y/e-table/gal-a11y-e-table-item.c
index 3ba5a0067a..a5ed0c331e 100644
--- a/a11y/e-table/gal-a11y-e-table-item.c
+++ b/a11y/e-table/gal-a11y-e-table-item.c
@@ -13,13 +13,13 @@
 
 #include <atk/atk.h>
 
-#include "gal/a11y/gal-a11y-util.h"
-#include "gal/e-table/e-table-click-to-add.h"
-#include "gal/e-table/e-table-subset.h"
-#include "gal/e-table/e-table.h"
-#include "gal/e-table/e-tree.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-selection-model.h"
+#include "a11y/gal-a11y-util.h"
+#include "table/e-table-click-to-add.h"
+#include "table/e-table-subset.h"
+#include "table/e-table.h"
+#include "table/e-tree.h"
+#include "widgets/misc/e-canvas.h"
+#include "widgets/misc/e-selection-model.h"
 
 #include "gal-a11y-e-table-item.h"
 #include "gal-a11y-e-table-item-factory.h"
diff --git a/a11y/e-table/gal-a11y-e-table-item.h b/a11y/e-table/gal-a11y-e-table-item.h
index 0317132804..4af38acfb4 100644
--- a/a11y/e-table/gal-a11y-e-table-item.h
+++ b/a11y/e-table/gal-a11y-e-table-item.h
@@ -10,7 +10,7 @@
 #define __GAL_A11Y_E_TABLE_ITEM_H__
 
 #include <glib-object.h>
-#include <gal/e-table/e-table-item.h>
+#include <table/e-table-item.h>
 #include <atk/atkgobjectaccessible.h>
 
 #define GAL_A11Y_TYPE_E_TABLE_ITEM            (gal_a11y_e_table_item_get_type ())
diff --git a/a11y/e-table/gal-a11y-e-table.c b/a11y/e-table/gal-a11y-e-table.c
index fc5033c31d..de4a58a50b 100644
--- a/a11y/e-table/gal-a11y-e-table.c
+++ b/a11y/e-table/gal-a11y-e-table.c
@@ -8,12 +8,12 @@
 
 #include <config.h>
 
-#include "gal/a11y/gal-a11y-util.h"
-#include "gal/e-table/e-table.h"
-#include "gal/e-table/e-table-click-to-add.h"
-#include "gal/e-table/e-table-group.h"
-#include "gal/e-table/e-table-group-container.h"
-#include "gal/e-table/e-table-group-leaf.h"
+#include "a11y/gal-a11y-util.h"
+#include "table/e-table.h"
+#include "table/e-table-click-to-add.h"
+#include "table/e-table-group.h"
+#include "table/e-table-group-container.h"
+#include "table/e-table-group-leaf.h"
 
 #include "gal-a11y-e-table.h"
 #include "gal-a11y-e-table-factory.h"
diff --git a/a11y/e-table/gal-a11y-e-tree.c b/a11y/e-table/gal-a11y-e-tree.c
index b4b6f5b45d..f175f78564 100644
--- a/a11y/e-table/gal-a11y-e-tree.c
+++ b/a11y/e-table/gal-a11y-e-tree.c
@@ -6,9 +6,9 @@
 
 #include <config.h>
 
-#include "gal/a11y/gal-a11y-util.h"
-#include "gal/e-table/e-table-item.h"
-#include "gal/e-table/e-tree.h"
+#include "a11y/gal-a11y-util.h"
+#include "table/e-table-item.h"
+#include "table/e-tree.h"
 
 #include "gal-a11y-e-table-item.h"
 #include "gal-a11y-e-tree.h"
diff --git a/a11y/e-text/Makefile.am b/a11y/e-text/Makefile.am
new file mode 100644
index 0000000000..bfbddff088
--- /dev/null
+++ b/a11y/e-text/Makefile.am
@@ -0,0 +1,22 @@
+INCLUDES =					\
+	-I$(top_srcdir)                         \
+	-I$(top_srcdir)/widgets/                \
+	$(EXTRA_GNOME_CFLAGS)			\
+	$(GNOME_BONOBO_CFLAGS)			\
+	$(GNOME_INCLUDEDIR)			\
+	$(ICONV_CFLAGS)				\
+	$(GNOME_FULL_CFLAGS)			\
+	$(GNOME_EXTRA_CFLAGS)			\
+        -DG_LOG_DOMAIN=\"e-text\"
+
+noinst_LTLIBRARIES = libgal-a11y-etext.la
+
+libgal_a11y_etext_la_SOURCES =			\
+	gal-a11y-e-text-factory.c		\
+	gal-a11y-e-text.c
+
+libgal_a11y_etextincludedir = $(privincludedir)/a11y/e-text
+
+libgal_a11y_etextinclude_HEADERS =		\
+	gal-a11y-e-text-factory.h		\
+	gal-a11y-e-text.h
diff --git a/a11y/e-text/gal-a11y-e-text-factory.c b/a11y/e-text/gal-a11y-e-text-factory.c
index 24e3c28116..732bc57af4 100644
--- a/a11y/e-text/gal-a11y-e-text-factory.c
+++ b/a11y/e-text/gal-a11y-e-text-factory.c
@@ -7,7 +7,7 @@
  */
 
 #include <config.h>
-#include "gal/e-text/e-text.h"
+#include "text/e-text.h"
 #include "gal-a11y-e-text-factory.h"
 #include "gal-a11y-e-text.h"
 
diff --git a/a11y/e-text/gal-a11y-e-text.c b/a11y/e-text/gal-a11y-e-text.c
index 1ad9c33665..d23deef07d 100644
--- a/a11y/e-text/gal-a11y-e-text.c
+++ b/a11y/e-text/gal-a11y-e-text.c
@@ -12,9 +12,9 @@
 
 #include <gtk/gtk.h>
 
-#include "gal/a11y/gal-a11y-util.h"
-#include "gal/e-text/e-text.h"
-#include "gal/e-text/e-text-model-repos.h"
+#include "a11y/gal-a11y-util.h"
+#include "text/e-text.h"
+#include "text/e-text-model-repos.h"
 
 #include "gal-a11y-e-text.h"
 #include "gal-a11y-e-text-factory.h"
diff --git a/a11y/e-text/gal-a11y-e-text.h b/a11y/e-text/gal-a11y-e-text.h
index a4b204d296..fce1ca64e4 100644
--- a/a11y/e-text/gal-a11y-e-text.h
+++ b/a11y/e-text/gal-a11y-e-text.h
@@ -10,7 +10,7 @@
 #define __GAL_A11Y_E_TEXT_H__
 
 #include <glib-object.h>
-#include <gal/e-table/e-table-item.h>
+#include <table/e-table-item.h>
 
 #define GAL_A11Y_TYPE_E_TEXT            (gal_a11y_e_text_get_type ())
 #define GAL_A11Y_E_TEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TEXT, GalA11yEText))
diff --git a/a11y/widgets/Makefile.am b/a11y/widgets/Makefile.am
index 6e8e0e4a1d..21bb621394 100644
--- a/a11y/widgets/Makefile.am
+++ b/a11y/widgets/Makefile.am
@@ -6,6 +6,7 @@ privlib_LTLIBRARIES = libevolution-widgets-a11y.la
 
 INCLUDES =						\
 	-DG_LOG_DOMAIN=\"evolution-a11y\"		\
+	-I$(top_srcdir)					\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/a11y				\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
diff --git a/a11y/widgets/ea-calendar-cell.c b/a11y/widgets/ea-calendar-cell.c
index 9601d0b259..4dd4bfab4c 100644
--- a/a11y/widgets/ea-calendar-cell.c
+++ b/a11y/widgets/ea-calendar-cell.c
@@ -24,7 +24,7 @@
  */
 
 #include <gtk/gtk.h>
-#include <gal/util/e-util.h>
+#include <e-util/e-util.h>
 #include "ea-calendar-cell.h"
 #include "ea-calendar-item.h"
 #include "ea-factory.h"
diff --git a/a11y/widgets/ea-calendar-item.c b/a11y/widgets/ea-calendar-item.c
index 82af38ecbc..b3c90532f2 100644
--- a/a11y/widgets/ea-calendar-item.c
+++ b/a11y/widgets/ea-calendar-item.c
@@ -28,9 +28,9 @@
 #include <string.h>
 #include <libgnomecanvas/gnome-canvas.h>
 #include <glib/gdate.h>
-#include <gal/util/e-util.h>
+#include <e-util/e-util.h>
 #include <libgnome/gnome-i18n.h>
-#include <gal/util/e-util.h>
+#include <e-util/e-util.h>
 #include "ea-calendar-item.h"
 #include "ea-calendar-cell.h"
 #include "ea-cell-table.h"