Radically reorganize source code.

- Collect all shell modules into a new top-level 'modules' directory:

      $(top_srcdir)/modules/addressbook
      $(top_srcdir)/modules/calendar
      $(top_srcdir)/modules/mail

  Nothing is allowed to link to these, not plugins nor other modules.

  THIS SOLVES BUG #571275 AND OPENS THE DOOR TO PORTING TO MAC OS X.

- Mimic the libevolution-mail-shared library from master (except drop
  the "shared" suffix) and have libevolution-mail-importers and all
  mail-related plugins link to it.

- Discard the a11y subdirectories and have the files live alongside
  their counterpart widgets.

56 files changed, 61 insertions, 61 deletions

diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index cbbd283fb2..c7123d6977 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -84,9 +84,9 @@ widgetsinclude_HEADERS =			\
 	e-spinner.h				\
 	e-timeout-activity.h			\
 	e-url-entry.h				\
-	a11y/ea-calendar-cell.h			\
-	a11y/ea-calendar-item.h			\
-	a11y/ea-widgets.h
+	ea-calendar-cell.h			\
+	ea-calendar-item.h			\
+	ea-widgets.h
 
 libemiscwidgets_la_SOURCES =			\
 	$(widgetsinclude_HEADERS)		\
@@ -145,9 +145,9 @@ libemiscwidgets_la_SOURCES =			\
 	e-signature-tree-view.c			\
 	e-timeout-activity.c			\
 	e-url-entry.c				\
-	a11y/ea-calendar-cell.c			\
-	a11y/ea-calendar-item.c			\
-	a11y/ea-widgets.c
+	ea-calendar-cell.c			\
+	ea-calendar-item.c			\
+	ea-widgets.c
 
 libemiscwidgets_la_LDFLAGS = $(NO_UNDEFINED)
 
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index 9c9bd94b15..890355620b 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -26,7 +26,7 @@
 #endif
 
 #include "e-calendar-item.h"
-#include "a11y/ea-widgets.h"
+#include "ea-widgets.h"
 
 #include <time.h>
 #include <string.h>
diff --git a/widgets/misc/a11y/ea-calendar-cell.c b/widgets/misc/ea-calendar-cell.c
index af9471c5af..af9471c5af 100644
--- a/widgets/misc/a11y/ea-calendar-cell.c
+++ b/widgets/misc/ea-calendar-cell.c
diff --git a/widgets/misc/a11y/ea-calendar-cell.h b/widgets/misc/ea-calendar-cell.h
index fa68fdca55..fa68fdca55 100644
--- a/widgets/misc/a11y/ea-calendar-cell.h
+++ b/widgets/misc/ea-calendar-cell.h
diff --git a/widgets/misc/a11y/ea-calendar-item.c b/widgets/misc/ea-calendar-item.c
index 56a01b510b..56a01b510b 100644
--- a/widgets/misc/a11y/ea-calendar-item.c
+++ b/widgets/misc/ea-calendar-item.c
diff --git a/widgets/misc/a11y/ea-calendar-item.h b/widgets/misc/ea-calendar-item.h
index 36cc671a3b..36cc671a3b 100644
--- a/widgets/misc/a11y/ea-calendar-item.h
+++ b/widgets/misc/ea-calendar-item.h
diff --git a/widgets/misc/a11y/ea-widgets.c b/widgets/misc/ea-widgets.c
index 9deede235e..9deede235e 100644
--- a/widgets/misc/a11y/ea-widgets.c
+++ b/widgets/misc/ea-widgets.c
diff --git a/widgets/misc/a11y/ea-widgets.h b/widgets/misc/ea-widgets.h
index 495222ae05..495222ae05 100644
--- a/widgets/misc/a11y/ea-widgets.h
+++ b/widgets/misc/ea-widgets.h
diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am
index a53b249ce4..c4fc858a74 100644
--- a/widgets/table/Makefile.am
+++ b/widgets/table/Makefile.am
@@ -73,22 +73,22 @@ libetable_la_SOURCES = 				\
 	e-tree-sorted.c				\
 	e-tree-table-adapter.c			\
 	e-tree.c				\
-	a11y/gal-a11y-e-cell.c			\
-	a11y/gal-a11y-e-cell-popup.c		\
-	a11y/gal-a11y-e-cell-registry.c		\
-	a11y/gal-a11y-e-cell-text.c		\
-	a11y/gal-a11y-e-cell-toggle.c		\
-	a11y/gal-a11y-e-cell-tree.c		\
-	a11y/gal-a11y-e-cell-vbox.c		\
-	a11y/gal-a11y-e-table.c			\
-	a11y/gal-a11y-e-table-click-to-add.c	\
-	a11y/gal-a11y-e-table-click-to-add-factory.c	\
-	a11y/gal-a11y-e-table-column-header.c	\
-	a11y/gal-a11y-e-table-factory.c		\
-	a11y/gal-a11y-e-table-item.c		\
-	a11y/gal-a11y-e-table-item-factory.c	\
-	a11y/gal-a11y-e-tree.c			\
-	a11y/gal-a11y-e-tree-factory.c
+	gal-a11y-e-cell.c			\
+	gal-a11y-e-cell-popup.c			\
+	gal-a11y-e-cell-registry.c		\
+	gal-a11y-e-cell-text.c			\
+	gal-a11y-e-cell-toggle.c		\
+	gal-a11y-e-cell-tree.c			\
+	gal-a11y-e-cell-vbox.c			\
+	gal-a11y-e-table.c			\
+	gal-a11y-e-table-click-to-add.c		\
+	gal-a11y-e-table-click-to-add-factory.c	\
+	gal-a11y-e-table-column-header.c	\
+	gal-a11y-e-table-factory.c		\
+	gal-a11y-e-table-item.c			\
+	gal-a11y-e-table-item-factory.c		\
+	gal-a11y-e-tree.c			\
+	gal-a11y-e-tree-factory.c
 
 libetableincludedir = $(privincludedir)/table
 
@@ -155,22 +155,22 @@ libetableinclude_HEADERS = 			\
 	e-tree-sorted.h				\
 	e-tree-table-adapter.h			\
 	e-tree.h				\
-	a11y/gal-a11y-e-cell.h			\
-	a11y/gal-a11y-e-cell-popup.h		\
-	a11y/gal-a11y-e-cell-registry.h		\
-	a11y/gal-a11y-e-cell-text.h		\
-	a11y/gal-a11y-e-cell-toggle.h		\
-	a11y/gal-a11y-e-cell-tree.h		\
-	a11y/gal-a11y-e-cell-vbox.h		\
-	a11y/gal-a11y-e-table.h			\
-	a11y/gal-a11y-e-table-click-to-add.h	\
-	a11y/gal-a11y-e-table-click-to-add-factory.h	\
-	a11y/gal-a11y-e-table-column-header.h	\
-	a11y/gal-a11y-e-table-factory.h		\
-	a11y/gal-a11y-e-table-item.h		\
-	a11y/gal-a11y-e-table-item-factory.h	\
-	a11y/gal-a11y-e-tree.h			\
-	a11y/gal-a11y-e-tree-factory.h
+	gal-a11y-e-cell.h			\
+	gal-a11y-e-cell-popup.h			\
+	gal-a11y-e-cell-registry.h		\
+	gal-a11y-e-cell-text.h			\
+	gal-a11y-e-cell-toggle.h		\
+	gal-a11y-e-cell-tree.h			\
+	gal-a11y-e-cell-vbox.h			\
+	gal-a11y-e-table.h			\
+	gal-a11y-e-table-click-to-add.h		\
+	gal-a11y-e-table-click-to-add-factory.h	\
+	gal-a11y-e-table-column-header.h	\
+	gal-a11y-e-table-factory.h		\
+	gal-a11y-e-table-item.h			\
+	gal-a11y-e-table-item-factory.h		\
+	gal-a11y-e-tree.h			\
+	gal-a11y-e-tree-factory.h
 
 libetable_la_LDFLAGS = $(NO_UNDEFINED)
 
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
index 26897709c2..298f67db82 100644
--- a/widgets/table/e-cell-popup.c
+++ b/widgets/table/e-cell-popup.c
@@ -33,8 +33,8 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#include "a11y/gal-a11y-e-cell-popup.h"
-#include "a11y/gal-a11y-e-cell-registry.h"
+#include "gal-a11y-e-cell-popup.h"
+#include "gal-a11y-e-cell-registry.h"
 #include "e-util/e-util.h"
 
 #include "e-cell-popup.h"
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index c1d5dc88bb..78065025f3 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -45,8 +45,8 @@
 #include <libgnomecanvas/gnome-canvas.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 
-#include "a11y/gal-a11y-e-cell-registry.h"
-#include "a11y/gal-a11y-e-cell-text.h"
+#include "gal-a11y-e-cell-registry.h"
+#include "gal-a11y-e-cell-text.h"
 #include "text/e-text.h"
 #include <glib/gi18n.h>
 #include "e-util/e-text-event-processor.h"
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index baad2027d5..02a7425e41 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -28,8 +28,8 @@
 #include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas.h>
 
-#include "a11y/gal-a11y-e-cell-toggle.h"
-#include "a11y/gal-a11y-e-cell-registry.h"
+#include "gal-a11y-e-cell-toggle.h"
+#include "gal-a11y-e-cell-registry.h"
 #include "e-util/e-util.h"
 #include "misc/e-hsv-utils.h"
 
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index c3ecca939b..2156aa9917 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -38,8 +38,8 @@
 #include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas.h>
 
-#include "a11y/gal-a11y-e-cell-registry.h"
-#include "a11y/gal-a11y-e-cell-tree.h"
+#include "gal-a11y-e-cell-registry.h"
+#include "gal-a11y-e-cell-tree.h"
 #include "e-util/e-util.h"
 
 #include "e-cell-tree.h"
diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c
index 30bb9027a9..210cc84139 100644
--- a/widgets/table/e-cell-vbox.c
+++ b/widgets/table/e-cell-vbox.c
@@ -29,8 +29,8 @@
 
 #include <gtk/gtk.h>
 
-#include "a11y/gal-a11y-e-cell-registry.h"
-#include "a11y/gal-a11y-e-cell-vbox.h"
+#include "gal-a11y-e-cell-registry.h"
+#include "gal-a11y-e-cell-vbox.h"
 #include "e-util/e-util.h"
 
 #include "e-cell-vbox.h"
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index 99a290dea2..d2d1534611 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -29,7 +29,7 @@
 #include <libgnomecanvas/gnome-canvas-util.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include "a11y/gal-a11y-e-table-click-to-add.h"
+#include "gal-a11y-e-table-click-to-add.h"
 #include "text/e-text.h"
 #include <glib/gi18n.h>
 #include "e-util/e-util.h"
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index c5cfa1878f..7448a355f7 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -36,8 +36,8 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include "a11y/gal-a11y-e-table-item-factory.h"
-#include "a11y/gal-a11y-e-table-item.h"
+#include "gal-a11y-e-table-item-factory.h"
+#include "gal-a11y-e-table-item.h"
 #include <glib/gi18n.h>
 #include "e-util/e-util.h"
 #include "misc/e-canvas.h"
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 7f756d95a4..bf18fbb224 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -36,7 +36,7 @@
 #include <libgnomecanvas/gnome-canvas.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 
-#include "a11y/gal-a11y-e-table.h"
+#include "gal-a11y-e-table.h"
 #include <glib/gi18n.h>
 #include "e-util/e-util.h"
 #include "misc/e-canvas.h"
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 8124a59c64..dd07b2b536 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -30,7 +30,7 @@
 #include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 
-#include "a11y/gal-a11y-e-tree.h"
+#include "gal-a11y-e-tree.h"
 #include <glib/gi18n.h>
 #include "e-util/e-util.h"
 #include "misc/e-canvas.h"
diff --git a/widgets/table/a11y/gal-a11y-e-cell-popup.c b/widgets/table/gal-a11y-e-cell-popup.c
index 141ce172a4..141ce172a4 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-popup.c
+++ b/widgets/table/gal-a11y-e-cell-popup.c
diff --git a/widgets/table/a11y/gal-a11y-e-cell-popup.h b/widgets/table/gal-a11y-e-cell-popup.h
index 76ad0ffec9..641d345308 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-popup.h
+++ b/widgets/table/gal-a11y-e-cell-popup.h
@@ -26,7 +26,7 @@
 
 #include <glib-object.h>
 #include <table/e-table-item.h>
-#include <table/a11y/gal-a11y-e-cell.h>
+#include <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/widgets/table/a11y/gal-a11y-e-cell-registry.c b/widgets/table/gal-a11y-e-cell-registry.c
index 9dc9598608..9dc9598608 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-registry.c
+++ b/widgets/table/gal-a11y-e-cell-registry.c
diff --git a/widgets/table/a11y/gal-a11y-e-cell-registry.h b/widgets/table/gal-a11y-e-cell-registry.h
index 0620fd1b9c..0620fd1b9c 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-registry.h
+++ b/widgets/table/gal-a11y-e-cell-registry.h
diff --git a/widgets/table/a11y/gal-a11y-e-cell-text.c b/widgets/table/gal-a11y-e-cell-text.c
index 77823b0a7c..77823b0a7c 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-text.c
+++ b/widgets/table/gal-a11y-e-cell-text.c
diff --git a/widgets/table/a11y/gal-a11y-e-cell-text.h b/widgets/table/gal-a11y-e-cell-text.h
index 1a378a459c..bb400b38e3 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-text.h
+++ b/widgets/table/gal-a11y-e-cell-text.h
@@ -26,7 +26,7 @@
 #include <glib-object.h>
 #include <table/e-table-item.h>
 #include <table/e-cell-text.h>
-#include <table/a11y/gal-a11y-e-cell.h>
+#include <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/widgets/table/a11y/gal-a11y-e-cell-toggle.c b/widgets/table/gal-a11y-e-cell-toggle.c
index df687f4005..df687f4005 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-toggle.c
+++ b/widgets/table/gal-a11y-e-cell-toggle.c
diff --git a/widgets/table/a11y/gal-a11y-e-cell-toggle.h b/widgets/table/gal-a11y-e-cell-toggle.h
index 8e9b4def08..8e9b4def08 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-toggle.h
+++ b/widgets/table/gal-a11y-e-cell-toggle.h
diff --git a/widgets/table/a11y/gal-a11y-e-cell-tree.c b/widgets/table/gal-a11y-e-cell-tree.c
index aaf490c726..aaf490c726 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-tree.c
+++ b/widgets/table/gal-a11y-e-cell-tree.c
diff --git a/widgets/table/a11y/gal-a11y-e-cell-tree.h b/widgets/table/gal-a11y-e-cell-tree.h
index 497590b351..497590b351 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-tree.h
+++ b/widgets/table/gal-a11y-e-cell-tree.h
diff --git a/widgets/table/a11y/gal-a11y-e-cell-vbox.c b/widgets/table/gal-a11y-e-cell-vbox.c
index b3f92a695a..b3f92a695a 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-vbox.c
+++ b/widgets/table/gal-a11y-e-cell-vbox.c
diff --git a/widgets/table/a11y/gal-a11y-e-cell-vbox.h b/widgets/table/gal-a11y-e-cell-vbox.h
index 657cb5d9a5..657cb5d9a5 100644
--- a/widgets/table/a11y/gal-a11y-e-cell-vbox.h
+++ b/widgets/table/gal-a11y-e-cell-vbox.h
diff --git a/widgets/table/a11y/gal-a11y-e-cell.c b/widgets/table/gal-a11y-e-cell.c
index e09b5456d9..e09b5456d9 100644
--- a/widgets/table/a11y/gal-a11y-e-cell.c
+++ b/widgets/table/gal-a11y-e-cell.c
diff --git a/widgets/table/a11y/gal-a11y-e-cell.h b/widgets/table/gal-a11y-e-cell.h
index c61e5e2d22..c61e5e2d22 100644
--- a/widgets/table/a11y/gal-a11y-e-cell.h
+++ b/widgets/table/gal-a11y-e-cell.h
diff --git a/widgets/table/a11y/gal-a11y-e-table-click-to-add-factory.c b/widgets/table/gal-a11y-e-table-click-to-add-factory.c
index 0ebb3c4621..0ebb3c4621 100644
--- a/widgets/table/a11y/gal-a11y-e-table-click-to-add-factory.c
+++ b/widgets/table/gal-a11y-e-table-click-to-add-factory.c
diff --git a/widgets/table/a11y/gal-a11y-e-table-click-to-add-factory.h b/widgets/table/gal-a11y-e-table-click-to-add-factory.h
index 9f249f0178..9f249f0178 100644
--- a/widgets/table/a11y/gal-a11y-e-table-click-to-add-factory.h
+++ b/widgets/table/gal-a11y-e-table-click-to-add-factory.h
diff --git a/widgets/table/a11y/gal-a11y-e-table-click-to-add.c b/widgets/table/gal-a11y-e-table-click-to-add.c
index 8a8fe56796..8a8fe56796 100644
--- a/widgets/table/a11y/gal-a11y-e-table-click-to-add.c
+++ b/widgets/table/gal-a11y-e-table-click-to-add.c
diff --git a/widgets/table/a11y/gal-a11y-e-table-click-to-add.h b/widgets/table/gal-a11y-e-table-click-to-add.h
index 17d6940d08..17d6940d08 100644
--- a/widgets/table/a11y/gal-a11y-e-table-click-to-add.h
+++ b/widgets/table/gal-a11y-e-table-click-to-add.h
diff --git a/widgets/table/a11y/gal-a11y-e-table-column-header.c b/widgets/table/gal-a11y-e-table-column-header.c
index 41e6ab0fca..41e6ab0fca 100644
--- a/widgets/table/a11y/gal-a11y-e-table-column-header.c
+++ b/widgets/table/gal-a11y-e-table-column-header.c
diff --git a/widgets/table/a11y/gal-a11y-e-table-column-header.h b/widgets/table/gal-a11y-e-table-column-header.h
index d0b1ff5aeb..d0b1ff5aeb 100644
--- a/widgets/table/a11y/gal-a11y-e-table-column-header.h
+++ b/widgets/table/gal-a11y-e-table-column-header.h
diff --git a/widgets/table/a11y/gal-a11y-e-table-factory.c b/widgets/table/gal-a11y-e-table-factory.c
index f459f3b67c..f459f3b67c 100644
--- a/widgets/table/a11y/gal-a11y-e-table-factory.c
+++ b/widgets/table/gal-a11y-e-table-factory.c
diff --git a/widgets/table/a11y/gal-a11y-e-table-factory.h b/widgets/table/gal-a11y-e-table-factory.h
index 3439cf0bdc..3439cf0bdc 100644
--- a/widgets/table/a11y/gal-a11y-e-table-factory.h
+++ b/widgets/table/gal-a11y-e-table-factory.h
diff --git a/widgets/table/a11y/gal-a11y-e-table-item-factory.c b/widgets/table/gal-a11y-e-table-item-factory.c
index fa14652788..fa14652788 100644
--- a/widgets/table/a11y/gal-a11y-e-table-item-factory.c
+++ b/widgets/table/gal-a11y-e-table-item-factory.c
diff --git a/widgets/table/a11y/gal-a11y-e-table-item-factory.h b/widgets/table/gal-a11y-e-table-item-factory.h
index f27c491a4d..f27c491a4d 100644
--- a/widgets/table/a11y/gal-a11y-e-table-item-factory.h
+++ b/widgets/table/gal-a11y-e-table-item-factory.h
diff --git a/widgets/table/a11y/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c
index 561b9a84d6..561b9a84d6 100644
--- a/widgets/table/a11y/gal-a11y-e-table-item.c
+++ b/widgets/table/gal-a11y-e-table-item.c
diff --git a/widgets/table/a11y/gal-a11y-e-table-item.h b/widgets/table/gal-a11y-e-table-item.h
index 27d6a8244b..27d6a8244b 100644
--- a/widgets/table/a11y/gal-a11y-e-table-item.h
+++ b/widgets/table/gal-a11y-e-table-item.h
diff --git a/widgets/table/a11y/gal-a11y-e-table.c b/widgets/table/gal-a11y-e-table.c
index bf75227af4..bf75227af4 100644
--- a/widgets/table/a11y/gal-a11y-e-table.c
+++ b/widgets/table/gal-a11y-e-table.c
diff --git a/widgets/table/a11y/gal-a11y-e-table.h b/widgets/table/gal-a11y-e-table.h
index d8f972df81..d8f972df81 100644
--- a/widgets/table/a11y/gal-a11y-e-table.h
+++ b/widgets/table/gal-a11y-e-table.h
diff --git a/widgets/table/a11y/gal-a11y-e-tree-factory.c b/widgets/table/gal-a11y-e-tree-factory.c
index 8dc06e2936..8dc06e2936 100644
--- a/widgets/table/a11y/gal-a11y-e-tree-factory.c
+++ b/widgets/table/gal-a11y-e-tree-factory.c
diff --git a/widgets/table/a11y/gal-a11y-e-tree-factory.h b/widgets/table/gal-a11y-e-tree-factory.h
index 3d97c7a3b1..3d97c7a3b1 100644
--- a/widgets/table/a11y/gal-a11y-e-tree-factory.h
+++ b/widgets/table/gal-a11y-e-tree-factory.h
diff --git a/widgets/table/a11y/gal-a11y-e-tree.c b/widgets/table/gal-a11y-e-tree.c
index 879b517aab..879b517aab 100644
--- a/widgets/table/a11y/gal-a11y-e-tree.c
+++ b/widgets/table/gal-a11y-e-tree.c
diff --git a/widgets/table/a11y/gal-a11y-e-tree.h b/widgets/table/gal-a11y-e-tree.h
index d2aa8a0d2a..d2aa8a0d2a 100644
--- a/widgets/table/a11y/gal-a11y-e-tree.h
+++ b/widgets/table/gal-a11y-e-tree.h
diff --git a/widgets/text/Makefile.am b/widgets/text/Makefile.am
index e035d8714d..70adbfec39 100644
--- a/widgets/text/Makefile.am
+++ b/widgets/text/Makefile.am
@@ -14,8 +14,8 @@ libetext_la_SOURCES =				\
 	e-text.c				\
 	e-reflow.c				\
 	e-reflow-model.c			\
-	a11y/gal-a11y-e-text-factory.c		\
-	a11y/gal-a11y-e-text.c
+	gal-a11y-e-text-factory.c		\
+	gal-a11y-e-text.c
 
 libetextincludedir = $(privincludedir)/text
 
@@ -25,8 +25,8 @@ libetextinclude_HEADERS = 			\
 	e-text.h				\
 	e-reflow.h				\
 	e-reflow-model.h			\
-	a11y/gal-a11y-e-text-factory.h		\
-	a11y/gal-a11y-e-text.h
+	gal-a11y-e-text-factory.h		\
+	gal-a11y-e-text.h
 
 libetext_la_LDFLAGS = $(NO_UNDEFINED)
 
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index f6371aa551..7c542d8f5f 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -46,7 +46,7 @@
 #include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
 
-#include "a11y/gal-a11y-e-text.h"
+#include "gal-a11y-e-text.h"
 #include "misc/e-canvas.h"
 #include "misc/e-canvas-utils.h"
 #include "e-util/e-unicode.h"
diff --git a/widgets/text/a11y/gal-a11y-e-text-factory.c b/widgets/text/gal-a11y-e-text-factory.c
index 2df9241014..2df9241014 100644
--- a/widgets/text/a11y/gal-a11y-e-text-factory.c
+++ b/widgets/text/gal-a11y-e-text-factory.c
diff --git a/widgets/text/a11y/gal-a11y-e-text-factory.h b/widgets/text/gal-a11y-e-text-factory.h
index df7638f64f..df7638f64f 100644
--- a/widgets/text/a11y/gal-a11y-e-text-factory.h
+++ b/widgets/text/gal-a11y-e-text-factory.h
diff --git a/widgets/text/a11y/gal-a11y-e-text.c b/widgets/text/gal-a11y-e-text.c
index 99fb4e8a94..99fb4e8a94 100644
--- a/widgets/text/a11y/gal-a11y-e-text.c
+++ b/widgets/text/gal-a11y-e-text.c
diff --git a/widgets/text/a11y/gal-a11y-e-text.h b/widgets/text/gal-a11y-e-text.h
index 6a5bb80de0..6a5bb80de0 100644
--- a/widgets/text/a11y/gal-a11y-e-text.h
+++ b/widgets/text/gal-a11y-e-text.h