Moved files, fixed header files and paths - Federico

svn path=/trunk/; revision=5513

84 files changed, 180 insertions, 174 deletions

diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c
index be323d028f..71bc3c9212 100644
--- a/e-util/e-text-event-processor-emacs-like.c
+++ b/e-util/e-text-event-processor-emacs-like.c
@@ -21,6 +21,7 @@
 
 #include <gnome.h>
 #include "e-text-event-processor-emacs-like.h"
+
 static void e_text_event_processor_emacs_like_init		(ETextEventProcessorEmacsLike		 *card);
 static void e_text_event_processor_emacs_like_class_init	(ETextEventProcessorEmacsLikeClass	 *klass);
 static gint e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event);
diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h
index 651bb552b3..a2a7bc478c 100644
--- a/e-util/e-text-event-processor-emacs-like.h
+++ b/e-util/e-text-event-processor-emacs-like.h
@@ -22,7 +22,7 @@
 #define __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__
 
 #include <gnome.h>
-#include "e-text-event-processor.h"
+#include <gal/e-text/e-text-event-processor.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index 47f028ca62..cded8171e6 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -21,6 +21,7 @@
 
 #include <gnome.h>
 #include "e-text-event-processor.h"
+
 static void e_text_event_processor_init		(ETextEventProcessor		 *card);
 static void e_text_event_processor_class_init	(ETextEventProcessorClass	 *klass);
 
diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h
index 1fc79f3f70..d6937383f0 100644
--- a/e-util/e-text-event-processor.h
+++ b/e-util/e-text-event-processor.h
@@ -22,7 +22,7 @@
 #define __E_TEXT_EVENT_PROCESSOR_H__
 
 #include <gnome.h>
-#include "e-text-event-processor-types.h"
+#include <gal/e-text/e-text-event-processor-types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index dd08665fa2..7932d40bac 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -26,7 +26,7 @@
 #include "e-canvas-vbox.h"
 #include "e-canvas-utils.h"
 #include "e-canvas.h"
-#include "util/e-util.h"
+#include "gal/util/e-util.h"
 
 static void e_canvas_vbox_init		(ECanvasVbox		 *CanvasVbox);
 static void e_canvas_vbox_class_init	(ECanvasVboxClass	 *klass);
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index 83f276e1f6..78961ae530 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -22,6 +22,7 @@
 
 #include <gnome.h>
 #include "e-canvas.h"
+
 static void e_canvas_init           (ECanvas         *card);
 static void e_canvas_destroy        (GtkObject        *object);
 static void e_canvas_class_init	    (ECanvasClass    *klass);
diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c
index cde82d9f78..14ab11c565 100644
--- a/widgets/misc/e-gui-utils.c
+++ b/widgets/misc/e-gui-utils.c
@@ -13,9 +13,9 @@
 #include <libgnomeui/gnome-messagebox.h>
 #include <libgnomeui/gnome-stock.h>
 #include <gnome.h>
-#include "e-gui-utils.h"
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk-pixbuf/gnome-canvas-pixbuf.h>
+#include "e-gui-utils.h"
 
 void
 e_notice (GtkWindow *window, const char *type, const char *format, ...)
diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c
index 8c1f58908b..f029e88573 100644
--- a/widgets/misc/e-printable.c
+++ b/widgets/misc/e-printable.c
@@ -9,7 +9,7 @@
  */
 #include <config.h>
 #include <gtk/gtksignal.h>
-#include "util/e-util.h"
+#include "gal/util/e-util.h"
 #include "e-printable.h"
 
 #define EP_CLASS(e) ((EPrintableClass *)((GtkObject *)e)->klass)
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index 622e3fb9f9..bbfd37fa10 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -24,10 +24,10 @@
 #include <gnome.h>
 #include <math.h>
 #include "e-reflow.h"
-#include "e-text/e-text.h"
+#include "gal/e-text/e-text.h"
 #include "e-canvas-utils.h"
 #include "e-canvas.h"
-#include <util/e-util.h>
+#include "gal/util/e-util.h"
 
 static void e_reflow_init		(EReflow		 *reflow);
 static void e_reflow_class_init	(EReflowClass	 *klass);
diff --git a/widgets/misc/test-color.c b/widgets/misc/test-color.c
index 0b01682d8f..ed622201c8 100644
--- a/widgets/misc/test-color.c
+++ b/widgets/misc/test-color.c
@@ -3,6 +3,7 @@
 #include "pixmaps/font.xpm"
 #include "widget-color-combo.h"
 #include "color-palette.h"
+
 /* To compile (from src/widgets):
 
 gcc -I..  -I../.. -L. -Wall -o tester tester.c ../color.c `gnome-config --cflags --libs gnome gnomeui` -lwidgets
diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c
index 05bd33bc7e..4d31b53784 100644
--- a/widgets/table/e-cell-checkbox.c
+++ b/widgets/table/e-cell-checkbox.c
@@ -14,7 +14,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <libgnomeui/gnome-canvas.h>
 #include "e-cell-checkbox.h"
-#include "util/e-util.h"
+#include "gal/util/e-util.h"
 #include "e-table-item.h"
 
 #include "check-empty.xpm"
diff --git a/widgets/table/e-cell-checkbox.h b/widgets/table/e-cell-checkbox.h
index 969e4a5edc..1e13ff4f04 100644
--- a/widgets/table/e-cell-checkbox.h
+++ b/widgets/table/e-cell-checkbox.h
@@ -1,7 +1,7 @@
 #ifndef _E_CELL_CHECKBOX_H_
 #define _E_CELL_CHECKBOX_H_
 
-#include "e-cell-toggle.h"
+#include <gal/e-table/e-cell-toggle.h>
 
 #define E_CELL_CHECKBOX_TYPE        (e_cell_checkbox_get_type ())
 #define E_CELL_CHECKBOX(o)          (GTK_CHECK_CAST ((o), E_CELL_CHECKBOX_TYPE, ECellCheckbox))
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 3f2a2e57ba..21133b1188 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -33,14 +33,14 @@
 #include <stdio.h>
 #include <unicode.h>
 #include "e-cell-text.h"
-#include "util/e-util.h"
-#include "widgets/e-canvas.h"
-#include "widgets/e-font.h"
-#include "widgets/e-unicode.h"
+#include "gal/util/e-util.h"
+#include "gal/widgets/e-canvas.h"
+#include "gal/widgets/e-font.h"
+#include "gal/widgets/e-unicode.h"
 #include "e-table-item.h"
-#include "e-text/e-text-event-processor.h"
-#include "e-text/e-text.h"
-#include "e-text/e-text-event-processor-emacs-like.h"
+#include "gal/e-text/e-text-event-processor.h"
+#include "gal/e-text/e-text.h"
+#include "gal/e-text/e-text-event-processor-emacs-like.h"
 #include "e-table-tooltip.h"
 
 #include <gdk/gdkx.h> /* for BlackPixel */
diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h
index e0296998b3..32bcd148e8 100644
--- a/widgets/table/e-cell-text.h
+++ b/widgets/table/e-cell-text.h
@@ -25,7 +25,7 @@
 #define _E_CELL_TEXT_H_
 
 #include <libgnomeui/gnome-canvas.h>
-#include "e-cell.h"
+#include <gal/e-table/e-cell.h>
 
 /* Should return a malloced object. */
 typedef char *(*ECellTextFilter) (const void *);
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index fc54f34087..0dd4fe8d20 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -14,7 +14,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <libgnomeui/gnome-canvas.h>
 #include "e-cell-toggle.h"
-#include "util/e-util.h"
+#include "gal/util/e-util.h"
 #include "e-table-item.h"
 
 #define PARENT_TYPE e_cell_get_type ()
diff --git a/widgets/table/e-cell-toggle.h b/widgets/table/e-cell-toggle.h
index d5773b454a..a30b6ec7b1 100644
--- a/widgets/table/e-cell-toggle.h
+++ b/widgets/table/e-cell-toggle.h
@@ -3,7 +3,7 @@
 
 #include <libgnomeui/gnome-canvas.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include "e-cell.h"
+#include <gal/e-table/e-cell.h>
 
 #define E_CELL_TOGGLE_TYPE        (e_cell_toggle_get_type ())
 #define E_CELL_TOGGLE(o)          (GTK_CHECK_CAST ((o), E_CELL_TOGGLE_TYPE, ECellToggle))
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index 4ecaddd49d..dfeb2c515a 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -24,7 +24,7 @@
 #include "e-table-sorted-variable.h"
 #include "e-tree-model.h"
 #include "e-cell-tree.h"
-#include "util/e-util.h"
+#include "gal/util/e-util.h"
 #include "e-table-item.h"
 
 #include <gdk/gdkx.h> /* for BlackPixel */
diff --git a/widgets/table/e-cell-tree.h b/widgets/table/e-cell-tree.h
index ef6babeda4..6eb67a8dbc 100644
--- a/widgets/table/e-cell-tree.h
+++ b/widgets/table/e-cell-tree.h
@@ -8,7 +8,7 @@
 #define _E_CELL_TREE_H_
 
 #include <libgnomeui/gnome-canvas.h>
-#include "e-cell.h"
+#include <gal/e-table/e-cell.h>
 
 #define E_CELL_TREE_TYPE        (e_cell_tree_get_type ())
 #define E_CELL_TREE(o)          (GTK_CHECK_CAST ((o), E_CELL_TREE_TYPE, ECellTree))
diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c
index af8bfc3406..320f86b726 100644
--- a/widgets/table/e-cell.c
+++ b/widgets/table/e-cell.c
@@ -9,7 +9,7 @@
  */
 #include <config.h>
 #include "e-cell.h"
-#include "util/e-util.h"
+#include "gal/util/e-util.h"
 
 #define PARENT_TYPE gtk_object_get_type ()
 
diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h
index 028cdad077..ecafa582f1 100644
--- a/widgets/table/e-cell.h
+++ b/widgets/table/e-cell.h
@@ -4,8 +4,8 @@
 
 #include <gdk/gdktypes.h>
 #include <libgnomeprint/gnome-print.h>
-#include "e-table-model.h"
-#include "e-table-tooltip.h"
+#include <gal/e-table/e-table-model.h>
+#include <gal/e-table/e-table-tooltip.h>
 
 #define E_CELL_TYPE        (e_cell_get_type ())
 #define E_CELL(o)          (GTK_CHECK_CAST ((o), E_CELL_TYPE, ECell))
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index 3f8c765bcd..986b889190 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -18,9 +18,9 @@
 #include "e-table-click-to-add.h"
 #include "e-table-defines.h"
 #include "e-table-one.h"
-#include "e-text/e-text.h"
-#include "widgets/e-canvas.h"
-#include "widgets/e-canvas-utils.h"
+#include "gal/e-text/e-text.h"
+#include "gal/widgets/e-canvas.h"
+#include "gal/widgets/e-canvas-utils.h"
 
 enum {
 	CURSOR_CHANGE,
diff --git a/widgets/table/e-table-click-to-add.h b/widgets/table/e-table-click-to-add.h
index 1dcbf9ef52..a238d69670 100644
--- a/widgets/table/e-table-click-to-add.h
+++ b/widgets/table/e-table-click-to-add.h
@@ -4,10 +4,10 @@
 
 #include <libgnomeui/gnome-canvas.h>
 #include <gnome-xml/tree.h>
-#include "e-table-header.h"
-#include "e-table-sort-info.h"
-#include "e-table-item.h"
-#include "e-table-selection-model.h"
+#include <gal/e-table/e-table-header.h>
+#include <gal/e-table/e-table-sort-info.h>
+#include <gal/e-table/e-table-item.h>
+#include <gal/e-table/e-table-selection-model.h>
 
 #define E_TABLE_CLICK_TO_ADD_TYPE        (e_table_click_to_add_get_type ())
 #define E_TABLE_CLICK_TO_ADD(o)          (GTK_CHECK_CAST ((o), E_TABLE_CLICK_TO_ADD_TYPE, ETableClickToAdd))
diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c
index fd2ff33807..0ac588972f 100644
--- a/widgets/table/e-table-col.c
+++ b/widgets/table/e-table-col.c
@@ -11,7 +11,7 @@
 #include <gtk/gtkobject.h>
 #include <gtk/gtksignal.h>
 #include "e-table-col.h"
-#include "util/e-util.h"
+#include "gal/util/e-util.h"
 
 #define PARENT_TYPE (gtk_object_get_type ())
 
diff --git a/widgets/table/e-table-col.h b/widgets/table/e-table-col.h
index c2585f8166..7faefe1447 100644
--- a/widgets/table/e-table-col.h
+++ b/widgets/table/e-table-col.h
@@ -2,8 +2,8 @@
 #ifndef _E_TABLE_COL_H_
 #define _E_TABLE_COL_H_
 
-#include "e-cell.h"
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gal/e-table/e-cell.h>
 
 #define E_TABLE_COL_TYPE        (e_table_col_get_type ())
 #define E_TABLE_COL(o)          (GTK_CHECK_CAST ((o), E_TABLE_COL_TYPE, ETableCol))
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index 12c5ff262a..ee3027e5d3 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -11,9 +11,9 @@
 #include <gnome.h>
 #include <glade/glade.h>
 #include <gnome-xml/xmlmemory.h>
-#include "util/e-util.h"
-#include "util/e-xml-utils.h"
-#include "widgets/e-canvas.h"
+#include "gal/util/e-util.h"
+#include "gal/util/e-xml-utils.h"
+#include "gal/widgets/e-canvas.h"
 #include "e-table.h"
 #include "e-table-header-item.h"
 #include "e-table-subset.h"
diff --git a/widgets/table/e-table-example-1.c b/widgets/table/e-table-example-1.c
index 7c289778aa..d989c34df7 100644
--- a/widgets/table/e-table-example-1.c
+++ b/widgets/table/e-table-example-1.c
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <gnome.h>
-#include "e-util/e-cursors.h"
+#include "gal/e-util/e-cursors.h"
 #include "e-table-simple.h"
 #include "e-table-header.h"
 #include "e-table-header-item.h"
diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c
index e9d8d9ea80..6d9dc4abf1 100644
--- a/widgets/table/e-table-example-2.c
+++ b/widgets/table/e-table-example-2.c
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <gnome.h>
-#include "e-util/e-cursors.h"
+#include "gal/e-util/e-cursors.h"
 #include "e-table-simple.h"
 #include "e-table-header.h"
 #include "e-table-header-item.h"
diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c
index b54c57e80e..1cb5a1d117 100644
--- a/widgets/table/e-table-field-chooser-dialog.c
+++ b/widgets/table/e-table-field-chooser-dialog.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include <gnome.h>
-#include <e-table-field-chooser-dialog.h>
+#include "e-table-field-chooser-dialog.h"
 
 static void e_table_field_chooser_dialog_init		(ETableFieldChooserDialog		 *card);
 static void e_table_field_chooser_dialog_class_init	(ETableFieldChooserDialogClass	 *klass);
diff --git a/widgets/table/e-table-field-chooser-dialog.h b/widgets/table/e-table-field-chooser-dialog.h
index c209210dda..ec151850f0 100644
--- a/widgets/table/e-table-field-chooser-dialog.h
+++ b/widgets/table/e-table-field-chooser-dialog.h
@@ -23,8 +23,8 @@
 
 #include <gnome.h>
 #include <glade/glade.h>
-#include "e-table-field-chooser.h"
-#include "e-table-header.h"
+#include <gal/e-table/e-table-field-chooser.h>
+#include <gal/e-table/e-table-header.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 6f82393ed6..e7d3cb95b0 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -16,8 +16,8 @@
 #include <libgnomeui/gnome-canvas-rect-ellipse.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include "util/e-xml-utils.h"
-#include "widgets/e-canvas.h"
+#include "gal/util/e-xml-utils.h"
+#include "gal/widgets/e-canvas.h"
 
 #include "e-table-header.h"
 #include "e-table-col-dnd.h"
diff --git a/widgets/table/e-table-field-chooser-item.h b/widgets/table/e-table-field-chooser-item.h
index 4b349f40e3..cc2a916a94 100644
--- a/widgets/table/e-table-field-chooser-item.h
+++ b/widgets/table/e-table-field-chooser-item.h
@@ -4,7 +4,7 @@
 
 #include <libgnomeui/gnome-canvas.h>
 #include <gnome-xml/tree.h>
-#include "e-table-header.h"
+#include <gal/e-table/e-table-header.h>
 
 #define E_TABLE_FIELD_CHOOSER_ITEM_TYPE        (e_table_field_chooser_item_get_type ())
 #define E_TABLE_FIELD_CHOOSER_ITEM(o)          (GTK_CHECK_CAST ((o), E_TABLE_FIELD_CHOOSER_ITEM_TYPE, ETableFieldChooserItem))
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
index 0d56945f7f..52db886cda 100644
--- a/widgets/table/e-table-field-chooser.c
+++ b/widgets/table/e-table-field-chooser.c
@@ -22,8 +22,8 @@
 
 #include <config.h>
 #include <gnome.h>
-#include <e-table-field-chooser.h>
-#include <e-table-field-chooser-item.h>
+#include "e-table-field-chooser.h"
+#include "e-table-field-chooser-item.h"
 
 static void e_table_field_chooser_init		(ETableFieldChooser		 *card);
 static void e_table_field_chooser_class_init	(ETableFieldChooserClass	 *klass);
diff --git a/widgets/table/e-table-field-chooser.h b/widgets/table/e-table-field-chooser.h
index d84aafdc63..ff9c0ab69a 100644
--- a/widgets/table/e-table-field-chooser.h
+++ b/widgets/table/e-table-field-chooser.h
@@ -23,7 +23,7 @@
 
 #include <gnome.h>
 #include <glade/glade.h>
-#include "e-table-header.h"
+#include <gal/e-table/e-table-header.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index b481070566..3281174291 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -11,14 +11,14 @@
 
 #include <config.h>
 #include <gtk/gtksignal.h>
+#include <libgnomeui/gnome-canvas-rect-ellipse.h>
 #include "e-table-group-container.h"
 #include "e-table-group-leaf.h"
 #include "e-table-item.h"
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include "util/e-util.h"
-#include "widgets/e-canvas.h"
-#include "widgets/e-canvas-utils.h"
-#include "e-text/e-text.h"
+#include "gal/util/e-util.h"
+#include "gal/widgets/e-canvas.h"
+#include "gal/widgets/e-canvas-utils.h"
+#include "gal/e-text/e-text.h"
 #include "e-table-defines.h"
 
 #define TITLE_HEIGHT         16
diff --git a/widgets/table/e-table-group-container.h b/widgets/table/e-table-group-container.h
index bdb717b92d..69f6f9fc97 100644
--- a/widgets/table/e-table-group-container.h
+++ b/widgets/table/e-table-group-container.h
@@ -3,10 +3,10 @@
 #define _E_TABLE_GROUP_CONTAINER_H_
 
 #include <libgnomeui/gnome-canvas.h>
-#include "e-table-model.h"
-#include "e-table-header.h"
-#include "e-table-group.h"
-#include "e-table-item.h"
+#include <gal/e-table/e-table-model.h>
+#include <gal/e-table/e-table-header.h>
+#include <gal/e-table/e-table-group.h>
+#include <gal/e-table/e-table-item.h>
 
 #define E_TABLE_GROUP_CONTAINER_TYPE        (e_table_group_container_get_type ())
 #define E_TABLE_GROUP_CONTAINER(o)          (GTK_CHECK_CAST ((o), E_TABLE_GROUP_CONTAINER_TYPE, ETableGroupContainer))
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index 9dbfd4232f..bcc00c20a6 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -10,11 +10,11 @@
 
 #include <config.h>
 #include <gtk/gtksignal.h>
+#include <libgnomeui/gnome-canvas-rect-ellipse.h>
 #include "e-table-group-leaf.h"
 #include "e-table-item.h"
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include "util/e-util.h"
-#include "widgets/e-canvas.h"
+#include "gal/util/e-util.h"
+#include "gal/widgets/e-canvas.h"
 
 #define PARENT_TYPE e_table_group_get_type ()
 
diff --git a/widgets/table/e-table-group-leaf.h b/widgets/table/e-table-group-leaf.h
index 1cc041206b..34e8fcbb2e 100644
--- a/widgets/table/e-table-group-leaf.h
+++ b/widgets/table/e-table-group-leaf.h
@@ -3,9 +3,9 @@
 #define _E_TABLE_GROUP_LEAF_H_
 
 #include <libgnomeui/gnome-canvas.h>
-#include "e-table-group.h"
-#include "e-table-sorted-variable.h"
-#include "e-table-item.h"
+#include <gal/e-table/e-table-group.h>
+#include <gal/e-table/e-table-sorted-variable.h>
+#include <gal/e-table/e-table-item.h>
 
 #define E_TABLE_GROUP_LEAF_TYPE        (e_table_group_leaf_get_type ())
 #define E_TABLE_GROUP_LEAF(o)          (GTK_CHECK_CAST ((o), E_TABLE_GROUP_LEAF_TYPE, ETableGroupLeaf))
diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
index 764a39d387..c4fc0fdfda 100644
--- a/widgets/table/e-table-group.c
+++ b/widgets/table/e-table-group.c
@@ -11,12 +11,12 @@
 
 #include <config.h>
 #include <gtk/gtksignal.h>
+#include <libgnomeui/gnome-canvas-rect-ellipse.h>
 #include "e-table-group.h"
 #include "e-table-group-container.h"
 #include "e-table-group-leaf.h"
 #include "e-table-item.h"
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include "util/e-util.h"
+#include "gal/util/e-util.h"
 
 #define PARENT_TYPE gnome_canvas_group_get_type ()
 
diff --git a/widgets/table/e-table-group.h b/widgets/table/e-table-group.h
index b84ab4fd83..f9de386ff7 100644
--- a/widgets/table/e-table-group.h
+++ b/widgets/table/e-table-group.h
@@ -3,12 +3,12 @@
 #define _E_TABLE_GROUP_H_
 
 #include <libgnomeui/gnome-canvas.h>
-#include "e-table-model.h"
-#include "e-table-header.h"
-#include "e-table-sort-info.h"
-#include "e-table-defines.h"
-#include "util/e-util.h"
-#include "widgets/e-printable.h"
+#include <gal/e-table/e-table-model.h>
+#include <gal/e-table/e-table-header.h>
+#include <gal/e-table/e-table-sort-info.h>
+#include <gal/e-table/e-table-defines.h>
+#include <gal/util/e-util.h>
+#include <gal/widgets/e-printable.h>
 
 #define E_TABLE_GROUP_TYPE        (e_table_group_get_type ())
 #define E_TABLE_GROUP(o)          (GTK_CHECK_CAST ((o), E_TABLE_GROUP_TYPE, ETableGroup))
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 9bb8f66aec..9335c5fc89 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -15,9 +15,9 @@
 #include <libgnomeui/gnome-canvas-polygon.h>
 #include <libgnomeui/gnome-canvas-rect-ellipse.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include "widgets/e-cursors.h"
-#include "util/e-xml-utils.h"
-#include "widgets/e-popup-menu.h"
+#include "gal/widgets/e-cursors.h"
+#include "gal/util/e-xml-utils.h"
+#include "gal/widgets/e-popup-menu.h"
 #include "e-table-header.h"
 #include "e-table-header-item.h"
 #include "e-table-col-dnd.h"
diff --git a/widgets/table/e-table-header-item.h b/widgets/table/e-table-header-item.h
index 15b627bfa9..7511106c16 100644
--- a/widgets/table/e-table-header-item.h
+++ b/widgets/table/e-table-header-item.h
@@ -4,8 +4,8 @@
 
 #include <libgnomeui/gnome-canvas.h>
 #include <gnome-xml/tree.h>
-#include "e-table-header.h"
-#include "e-table-sort-info.h"
+#include <gal/e-table/e-table-header.h>
+#include <gal/e-table/e-table-sort-info.h>
 
 #define E_TABLE_HEADER_ITEM_TYPE        (e_table_header_item_get_type ())
 #define E_TABLE_HEADER_ITEM(o)          (GTK_CHECK_CAST ((o), E_TABLE_HEADER_ITEM_TYPE, ETableHeaderItem))
diff --git a/widgets/table/e-table-header.h b/widgets/table/e-table-header.h
index dcdcc440ed..564d4e5aa9 100644
--- a/widgets/table/e-table-header.h
+++ b/widgets/table/e-table-header.h
@@ -4,8 +4,8 @@
 
 #include <gtk/gtkobject.h>
 #include <gdk/gdk.h>
-#include "e-table-sort-info.h"
-#include "e-table-col.h"
+#include <gal/e-table/e-table-sort-info.h>
+#include <gal/e-table/e-table-col.h>
 
 typedef struct _ETableHeader ETableHeader;
 
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 055b1281e9..e33c8b4b9c 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -19,9 +19,9 @@
 #include "e-table-item.h"
 #include "e-table-subset.h"
 #include "e-cell.h"
-#include "widgets/e-canvas.h"
-#include "widgets/e-canvas-utils.h"
-#include "util/e-util.h"
+#include "gal/widgets/e-canvas.h"
+#include "gal/widgets/e-canvas-utils.h"
+#include "gal/util/e-util.h"
 
 #define PARENT_OBJECT_TYPE gnome_canvas_item_get_type ()
 
diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h
index 6156781467..58efb63abc 100644
--- a/widgets/table/e-table-item.h
+++ b/widgets/table/e-table-item.h
@@ -3,12 +3,12 @@
 #define _E_TABLE_ITEM_H_
 
 #include <libgnomeui/gnome-canvas.h>
-#include "e-table-model.h"
-#include "e-table-header.h"
-#include "e-table-selection-model.h"
-#include "e-table-defines.h"
-#include "e-table-tooltip.h"
-#include <widgets/e-printable.h>
+#include <gal/e-table/e-table-model.h>
+#include <gal/e-table/e-table-header.h>
+#include <gal/e-table/e-table-selection-model.h>
+#include <gal/e-table/e-table-defines.h>
+#include <gal/e-table/e-table-tooltip.h>
+#include <gal/widgets/e-printable.h>
 
 #define E_TABLE_ITEM_TYPE        (e_table_item_get_type ())
 #define E_TABLE_ITEM(o)          (GTK_CHECK_CAST ((o), E_TABLE_ITEM_TYPE, ETableItem))
diff --git a/widgets/table/e-table-one.h b/widgets/table/e-table-one.h
index c6958cee3a..1ac32fa6d6 100644
--- a/widgets/table/e-table-one.h
+++ b/widgets/table/e-table-one.h
@@ -2,7 +2,7 @@
 #ifndef _E_TABLE_ONE_H_
 #define _E_TABLE_ONE_H_
 
-#include "e-table-model.h"
+#include <gal/e-table/e-table-model.h>
 
 #define E_TABLE_ONE_TYPE        (e_table_one_get_type ())
 #define E_TABLE_ONE(o)          (GTK_CHECK_CAST ((o), E_TABLE_ONE_TYPE, ETableOne))
diff --git a/widgets/table/e-table-scrolled.h b/widgets/table/e-table-scrolled.h
index 867b89834c..0dd9168803 100644
--- a/widgets/table/e-table-scrolled.h
+++ b/widgets/table/e-table-scrolled.h
@@ -2,11 +2,11 @@
 #ifndef _E_TABLE_SCROLLED_H_
 #define _E_TABLE_SCROLLED_H_
 
-#include "widgets/e-scroll-frame.h"
-#include "e-table-model.h"
-#include "e-table-header.h"
-#include "e-table.h"
-#include "widgets/e-printable.h"
+#include <gal/widgets/e-scroll-frame.h>
+#include <gal/e-table/e-table-model.h>
+#include <gal/e-table/e-table-header.h>
+#include <gal/e-table/e-table.h>
+#include <gal/widgets/e-printable.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c
index 665cc5a92c..024ef2abc1 100644
--- a/widgets/table/e-table-selection-model.c
+++ b/widgets/table/e-table-selection-model.c
@@ -10,7 +10,7 @@
 #include <config.h>
 #include <gtk/gtksignal.h>
 #include "e-table-selection-model.h"
-#include "util/e-util.h"
+#include "gal/util/e-util.h"
 
 #define ETSM_CLASS(e) ((ETableSelectionModelClass *)((GtkObject *)e)->klass)
 
diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h
index 34e5d01142..cc8b721049 100644
--- a/widgets/table/e-table-selection-model.h
+++ b/widgets/table/e-table-selection-model.h
@@ -3,9 +3,9 @@
 #define _E_TABLE_SELECTION_MODEL_H_
 
 #include <gtk/gtkobject.h>
-#include "e-table-model.h"
-#include "e-table-defines.h"
-#include "e-table-sorter.h"
+#include <gal/e-table/e-table-model.h>
+#include <gal/e-table/e-table-defines.h>
+#include <gal/e-table/e-table-sorter.h>
 
 #define E_TABLE_SELECTION_MODEL_TYPE        (e_table_selection_model_get_type ())
 #define E_TABLE_SELECTION_MODEL(o)          (GTK_CHECK_CAST ((o), E_TABLE_SELECTION_MODEL_TYPE, ETableSelectionModel))
diff --git a/widgets/table/e-table-simple.h b/widgets/table/e-table-simple.h
index 34e76eed79..ca44464325 100644
--- a/widgets/table/e-table-simple.h
+++ b/widgets/table/e-table-simple.h
@@ -2,7 +2,7 @@
 #ifndef _E_TABLE_SIMPLE_H_
 #define _E_TABLE_SIMPLE_H_
 
-#include "e-table-model.h"
+#include <gal/e-table/e-table-model.h>
 
 #define E_TABLE_SIMPLE_TYPE        (e_table_simple_get_type ())
 #define E_TABLE_SIMPLE(o)          (GTK_CHECK_CAST ((o), E_TABLE_SIMPLE_TYPE, ETableSimple))
diff --git a/widgets/table/e-table-size-test.c b/widgets/table/e-table-size-test.c
index 2bc18235e8..9d334583ac 100644
--- a/widgets/table/e-table-size-test.c
+++ b/widgets/table/e-table-size-test.c
@@ -3,7 +3,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <gnome.h>
-#include "e-util/e-cursors.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include "gal/e-util/e-cursors.h"
 #include "e-table-simple.h"
 #include "e-table-header.h"
 #include "e-table-header-item.h"
@@ -12,8 +13,6 @@
 #include "e-cell-checkbox.h"
 #include "e-table.h"
 
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
 #include "table-test.h"
 
 /*
diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c
index ba97524e26..87fa818163 100644
--- a/widgets/table/e-table-sort-info.c
+++ b/widgets/table/e-table-sort-info.c
@@ -10,7 +10,7 @@
 #include <config.h>
 #include <gtk/gtksignal.h>
 #include "e-table-sort-info.h"
-#include "util/e-util.h"
+#include "gal/util/e-util.h"
 
 #define ETM_CLASS(e) ((ETableSortInfoClass *)((GtkObject *)e)->klass)
 
diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c
index 72817aee2f..a9907079d0 100644
--- a/widgets/table/e-table-sorted-variable.c
+++ b/widgets/table/e-table-sorted-variable.c
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <gtk/gtksignal.h>
 #include <string.h>
-#include "util/e-util.h"
+#include "gal/util/e-util.h"
 #include "e-table-sorted-variable.h"
 
 #define PARENT_TYPE E_TABLE_SUBSET_VARIABLE_TYPE
diff --git a/widgets/table/e-table-sorted-variable.h b/widgets/table/e-table-sorted-variable.h
index c6a57c5ede..b533346bc7 100644
--- a/widgets/table/e-table-sorted-variable.h
+++ b/widgets/table/e-table-sorted-variable.h
@@ -3,10 +3,10 @@
 #define _E_TABLE_SORTED_VARIABLE_H_
 
 #include <gtk/gtkobject.h>
-#include "e-table-model.h"
-#include "e-table-subset-variable.h"
-#include "e-table-sort-info.h"
-#include "e-table-header.h"
+#include <gal/e-table/e-table-model.h>
+#include <gal/e-table/e-table-subset-variable.h>
+#include <gal/e-table/e-table-sort-info.h>
+#include <gal/e-table/e-table-header.h>
 
 #define E_TABLE_SORTED_VARIABLE_TYPE        (e_table_sorted_variable_get_type ())
 #define E_TABLE_SORTED_VARIABLE(o)          (GTK_CHECK_CAST ((o), E_TABLE_SORTED_VARIABLE_TYPE, ETableSortedVariable))
diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c
index 817a55a939..99b4dc510f 100644
--- a/widgets/table/e-table-sorted.c
+++ b/widgets/table/e-table-sorted.c
@@ -8,7 +8,7 @@
  */
 #include <config.h>
 #include <stdlib.h>
-#include "util/e-util.h"
+#include "gal/util/e-util.h"
 #include "e-table-sorted.h"
 
 #define PARENT_TYPE E_TABLE_SUBSET_TYPE
diff --git a/widgets/table/e-table-sorted.h b/widgets/table/e-table-sorted.h
index 92bd8d1522..97246f7d0b 100644
--- a/widgets/table/e-table-sorted.h
+++ b/widgets/table/e-table-sorted.h
@@ -2,8 +2,8 @@
 #define _E_TABLE_SORTED_H_
 
 #include <gtk/gtkobject.h>
-#include "e-table-model.h"
-#include "e-table-subset.h"
+#include <gal/e-table/e-table-model.h>
+#include <gal/e-table/e-table-subset.h>
 
 #define E_TABLE_SORTED_TYPE        (e_table_sorted_get_type ())
 #define E_TABLE_SORTED(o)          (GTK_CHECK_CAST ((o), E_TABLE_SORTED_TYPE, ETableSorted))
diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c
index 09db5c70c7..2350e50616 100644
--- a/widgets/table/e-table-sorter.c
+++ b/widgets/table/e-table-sorter.c
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <gtk/gtksignal.h>
 #include <string.h>
-#include "util/e-util.h"
+#include "gal/util/e-util.h"
 #include "e-table-sorter.h"
 
 #define PARENT_TYPE gtk_object_get_type()
diff --git a/widgets/table/e-table-sorter.h b/widgets/table/e-table-sorter.h
index f5a71565a3..43959a0a93 100644
--- a/widgets/table/e-table-sorter.h
+++ b/widgets/table/e-table-sorter.h
@@ -3,10 +3,10 @@
 #define _E_TABLE_SORTER_H_
 
 #include <gtk/gtkobject.h>
-#include "e-table-model.h"
-#include "e-table-subset-variable.h"
-#include "e-table-sort-info.h"
-#include "e-table-header.h"
+#include <gal/e-table/e-table-model.h>
+#include <gal/e-table/e-table-subset-variable.h>
+#include <gal/e-table/e-table-sort-info.h>
+#include <gal/e-table/e-table-header.h>
 
 #define E_TABLE_SORTER_TYPE        (e_table_sorter_get_type ())
 #define E_TABLE_SORTER(o)          (GTK_CHECK_CAST ((o), E_TABLE_SORTER_TYPE, ETableSorter))
diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c
index 62da01f7f4..e0b9096f25 100644
--- a/widgets/table/e-table-subset-variable.c
+++ b/widgets/table/e-table-subset-variable.c
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <gtk/gtksignal.h>
 #include <string.h>
-#include "util/e-util.h"
+#include "gal/util/e-util.h"
 #include "e-table-subset-variable.h"
 
 #define ETSSV_CLASS(e) ((ETableSubsetVariableClass *)((GtkObject *)e)->klass)
diff --git a/widgets/table/e-table-subset-variable.h b/widgets/table/e-table-subset-variable.h
index 9d44828728..73387d859c 100644
--- a/widgets/table/e-table-subset-variable.h
+++ b/widgets/table/e-table-subset-variable.h
@@ -3,7 +3,7 @@
 #define _E_TABLE_SUBSET_VARIABLE_H_
 
 #include <gtk/gtkobject.h>
-#include "e-table-subset.h"
+#include <gal/e-table/e-table-subset.h>
 
 #define E_TABLE_SUBSET_VARIABLE_TYPE        (e_table_subset_variable_get_type ())
 #define E_TABLE_SUBSET_VARIABLE(o)          (GTK_CHECK_CAST ((o), E_TABLE_SUBSET_VARIABLE_TYPE, ETableSubsetVariable))
diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c
index 5b95f29c16..6727243778 100644
--- a/widgets/table/e-table-subset.c
+++ b/widgets/table/e-table-subset.c
@@ -10,7 +10,7 @@
 #include <config.h>
 #include <stdlib.h>
 #include <gtk/gtksignal.h>
-#include "util/e-util.h"
+#include "gal/util/e-util.h"
 #include "e-table-subset.h"
 
 #define PARENT_TYPE E_TABLE_MODEL_TYPE
diff --git a/widgets/table/e-table-subset.h b/widgets/table/e-table-subset.h
index 9e10de7a4b..1b32ea933e 100644
--- a/widgets/table/e-table-subset.h
+++ b/widgets/table/e-table-subset.h
@@ -3,7 +3,7 @@
 #define _E_TABLE_SUBSET_H_
 
 #include <gtk/gtkobject.h>
-#include "e-table-model.h"
+#include <gal/e-table/e-table-model.h>
 
 #define E_TABLE_SUBSET_TYPE        (e_table_subset_get_type ())
 #define E_TABLE_SUBSET(o)          (GTK_CHECK_CAST ((o), E_TABLE_SUBSET_TYPE, ETableSubset))
diff --git a/widgets/table/e-table-text-model.h b/widgets/table/e-table-text-model.h
index 23430950d1..f4d477ecd4 100644
--- a/widgets/table/e-table-text-model.h
+++ b/widgets/table/e-table-text-model.h
@@ -20,8 +20,8 @@
 #define E_TABLE_TEXT_MODEL_H
 
 #include <gnome.h>
-#include "e-text/e-text-model.h"
-#include "e-table-model.h"
+#include <gal/e-text/e-text-model.h>
+#include <gal/e-table/e-table-model.h>
 
 
 BEGIN_GNOME_DECLS
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 24fe906a88..3fcd21332a 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -21,10 +21,10 @@
 #include <gnome-xml/parser.h>
 #include <gnome-xml/xmlmemory.h>
 
-#include "util/e-util.h"
-#include "util/e-xml-utils.h"
-#include "widgets/e-canvas.h"
-#include "widgets/e-canvas-vbox.h"
+#include "gal/util/e-util.h"
+#include "gal/util/e-xml-utils.h"
+#include "gal/widgets/e-canvas.h"
+#include "gal/widgets/e-canvas-vbox.h"
 #include "e-table.h"
 #include "e-table-header-item.h"
 #include "e-table-subset.h"
diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h
index 69a4b987ac..b3a2805fed 100644
--- a/widgets/table/e-table.h
+++ b/widgets/table/e-table.h
@@ -5,13 +5,13 @@
 #include <libgnomeui/gnome-canvas.h>
 #include <gtk/gtktable.h>
 #include <gnome-xml/tree.h>
-#include "e-table-model.h"
-#include "e-table-header.h"
-#include "e-table-group.h"
-#include "e-table-sort-info.h"
-#include "e-table-item.h"
-#include "e-table-selection-model.h"
-#include "widgets/e-printable.h"
+#include <gal/e-table/e-table-model.h>
+#include <gal/e-table/e-table-header.h>
+#include <gal/e-table/e-table-group.h>
+#include <gal/e-table/e-table-sort-info.h>
+#include <gal/e-table/e-table-item.h>
+#include <gal/e-table/e-table-selection-model.h>
+#include <gal/widgets/e-printable.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/widgets/table/e-tree-example-1.c b/widgets/table/e-tree-example-1.c
index abc40a0449..75e32c0a25 100644
--- a/widgets/table/e-tree-example-1.c
+++ b/widgets/table/e-tree-example-1.c
@@ -3,7 +3,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <gnome.h>
-#include "e-util/e-cursors.h"
+#include <libgnomeprint/gnome-print.h>
+#include <libgnomeprint/gnome-print-preview.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include "gal/e-util/e-cursors.h"
 #include "e-table-header.h"
 #include "e-table-header-item.h"
 #include "e-table-item.h"
@@ -12,10 +15,6 @@
 #include "e-cell-checkbox.h"
 #include "e-table.h"
 #include "e-tree-simple.h"
-#include "libgnomeprint/gnome-print.h"
-#include "libgnomeprint/gnome-print-preview.h"
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "art/tree-expanded.xpm"
 #include "art/tree-unexpanded.xpm"
diff --git a/widgets/table/e-tree-example-2.c b/widgets/table/e-tree-example-2.c
index 6324333c19..dbacf1740e 100644
--- a/widgets/table/e-tree-example-2.c
+++ b/widgets/table/e-tree-example-2.c
@@ -27,10 +27,12 @@
 
 #include <stdio.h>
 #include <gnome.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include "e-hpaned.h"
-#include "e-util/e-cursors.h"
+#include "gal/e-util/e-cursors.h"
 #include "e-table-header.h"
 #include "e-table-header-item.h"
 #include "e-table-item.h"
@@ -39,7 +41,6 @@
 #include "e-cell-checkbox.h"
 #include "e-table-scrolled.h"
 #include "e-tree-simple.h"
-#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "art/tree-expanded.xpm"
 #include "art/tree-unexpanded.xpm"
diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c
index 56843991b7..998e39cef3 100644
--- a/widgets/table/e-tree-model.c
+++ b/widgets/table/e-tree-model.c
@@ -12,7 +12,7 @@
 #include <config.h>
 #include <gtk/gtksignal.h>
 #include <stdlib.h>
-#include "util/e-util.h"
+#include "gal/util/e-util.h"
 #include "e-tree-model.h"
 
 #define ETM_CLASS(e) ((ETreeModelClass *)((GtkObject *)e)->klass)
diff --git a/widgets/table/e-tree-model.h b/widgets/table/e-tree-model.h
index 70464f094c..318faaa0a4 100644
--- a/widgets/table/e-tree-model.h
+++ b/widgets/table/e-tree-model.h
@@ -2,8 +2,8 @@
 #ifndef _E_TREE_MODEL_H_
 #define _E_TREE_MODEL_H_
 
-#include "e-table-model.h"
-#include "gdk-pixbuf/gdk-pixbuf.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gal/e-table/e-table-model.h>
 
 #define E_TREE_MODEL_TYPE        (e_tree_model_get_type ())
 #define E_TREE_MODEL(o)          (GTK_CHECK_CAST ((o), E_TREE_MODEL_TYPE, ETreeModel))
diff --git a/widgets/table/e-tree-simple.c b/widgets/table/e-tree-simple.c
index 01e33894df..fa8e8babaa 100644
--- a/widgets/table/e-tree-simple.c
+++ b/widgets/table/e-tree-simple.c
@@ -10,7 +10,7 @@
 
 #include <config.h>
 #include <gtk/gtksignal.h>
-#include "util/e-util.h"
+#include "gal/util/e-util.h"
 #include "e-tree-simple.h"
 
 #define PARENT_TYPE E_TREE_MODEL_TYPE
diff --git a/widgets/table/e-tree-simple.h b/widgets/table/e-tree-simple.h
index 46d910c39f..f726cb6db7 100644
--- a/widgets/table/e-tree-simple.h
+++ b/widgets/table/e-tree-simple.h
@@ -3,8 +3,8 @@
 #ifndef _E_TREE_SIMPLE_H_
 #define _E_TREE_SIMPLE_H_
 
-#include "e-tree-model.h"
-#include "e-table-simple.h"
+#include <gal/e-table/e-tree-model.h>
+#include <gal/e-table/e-table-simple.h>
 
 #define E_TREE_SIMPLE_TYPE        (e_tree_simple_get_type ())
 #define E_TREE_SIMPLE(o)          (GTK_CHECK_CAST ((o), E_TREE_SIMPLE_TYPE, ETreeSimple))
diff --git a/widgets/table/table-test.c b/widgets/table/table-test.c
index f83b6e2808..dd0dee4d24 100644
--- a/widgets/table/table-test.c
+++ b/widgets/table/table-test.c
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <fcntl.h>
 #include <gnome.h>
-#include "e-util/e-cursors.h"
+#include "gal/e-util/e-cursors.h"
 #include "table-test.h"
 
 int
diff --git a/widgets/table/test-check.c b/widgets/table/test-check.c
index 3ce8a4a90e..0cf1baf48a 100644
--- a/widgets/table/test-check.c
+++ b/widgets/table/test-check.c
@@ -13,10 +13,10 @@
 #include "e-table-header.h"
 #include "e-table-header-item.h"
 #include "e-table-item.h"
-#include "widgets/e-cursors.h"
-#include "widgets/e-canvas-utils.h"
-#include "widgets/e-canvas.h"
-#include "util/e-util.h"
+#include "gal/widgets/e-cursors.h"
+#include "gal/widgets/e-canvas-utils.h"
+#include "gal/widgets/e-canvas.h"
+#include "gal/util/e-util.h"
 #include "e-cell-text.h"
 #include "e-cell-checkbox.h"
 
diff --git a/widgets/table/test-cols.c b/widgets/table/test-cols.c
index 498d4017dc..a82dae639a 100644
--- a/widgets/table/test-cols.c
+++ b/widgets/table/test-cols.c
@@ -9,10 +9,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <gnome.h>
-#include "widgets/e-canvas-utils.h"
-#include "widgets/e-canvas.h"
-#include "widgets/e-cursors.h"
-#include "util/e-util.h"
+#include "gal/widgets/e-canvas-utils.h"
+#include "gal/widgets/e-canvas.h"
+#include "gal/widgets/e-cursors.h"
+#include "gal/util/e-util.h"
 #include "e-table-simple.h"
 #include "e-table-header.h"
 #include "e-table-header-item.h"
diff --git a/widgets/table/test-table.c b/widgets/table/test-table.c
index b30b412f08..011bc90035 100644
--- a/widgets/table/test-table.c
+++ b/widgets/table/test-table.c
@@ -9,8 +9,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <gnome.h>
-#include "e-util/e-cursors.h"
-#include "e-util/e-canvas.h"
+#include "gal/e-util/e-cursors.h"
+#include "gal/e-util/e-canvas.h"
 #include "e-table-simple.h"
 #include "e-table-header.h"
 #include "e-table-header-item.h"
diff --git a/widgets/text/e-entry.c b/widgets/text/e-entry.c
index e0e6d7f951..3beebfcdfa 100644
--- a/widgets/text/e-entry.c
+++ b/widgets/text/e-entry.c
@@ -19,9 +19,9 @@
 #include <libgnomeui/gnome-canvas.h>
 #include <gtk/gtksignal.h>
 #include <gnome-xml/parser.h>
-#include "util/e-util.h"
-#include "widgets/e-canvas.h"
-#include "widgets/e-canvas-utils.h"
+#include "gal/util/e-util.h"
+#include "gal/widgets/e-canvas.h"
+#include "gal/widgets/e-canvas-utils.h"
 #include "e-entry.h"
 
 #define MIN_ENTRY_WIDTH  150
diff --git a/widgets/text/e-entry.h b/widgets/text/e-entry.h
index ad349659c3..ddb6ee8795 100644
--- a/widgets/text/e-entry.h
+++ b/widgets/text/e-entry.h
@@ -5,7 +5,7 @@
 #include <libgnomeui/gnome-canvas.h>
 #include <gtk/gtktable.h>
 #include <gnome-xml/tree.h>
-#include "e-text.h"
+#include <gal/e-text/e-text.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/widgets/text/e-table-text-model.h b/widgets/text/e-table-text-model.h
index 23430950d1..f4d477ecd4 100644
--- a/widgets/text/e-table-text-model.h
+++ b/widgets/text/e-table-text-model.h
@@ -20,8 +20,8 @@
 #define E_TABLE_TEXT_MODEL_H
 
 #include <gnome.h>
-#include "e-text/e-text-model.h"
-#include "e-table-model.h"
+#include <gal/e-text/e-text-model.h>
+#include <gal/e-table/e-table-model.h>
 
 
 BEGIN_GNOME_DECLS
diff --git a/widgets/text/e-text-event-processor-emacs-like.c b/widgets/text/e-text-event-processor-emacs-like.c
index be323d028f..71bc3c9212 100644
--- a/widgets/text/e-text-event-processor-emacs-like.c
+++ b/widgets/text/e-text-event-processor-emacs-like.c
@@ -21,6 +21,7 @@
 
 #include <gnome.h>
 #include "e-text-event-processor-emacs-like.h"
+
 static void e_text_event_processor_emacs_like_init		(ETextEventProcessorEmacsLike		 *card);
 static void e_text_event_processor_emacs_like_class_init	(ETextEventProcessorEmacsLikeClass	 *klass);
 static gint e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event);
diff --git a/widgets/text/e-text-event-processor-emacs-like.h b/widgets/text/e-text-event-processor-emacs-like.h
index 651bb552b3..a2a7bc478c 100644
--- a/widgets/text/e-text-event-processor-emacs-like.h
+++ b/widgets/text/e-text-event-processor-emacs-like.h
@@ -22,7 +22,7 @@
 #define __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__
 
 #include <gnome.h>
-#include "e-text-event-processor.h"
+#include <gal/e-text/e-text-event-processor.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/widgets/text/e-text-event-processor.c b/widgets/text/e-text-event-processor.c
index 47f028ca62..cded8171e6 100644
--- a/widgets/text/e-text-event-processor.c
+++ b/widgets/text/e-text-event-processor.c
@@ -21,6 +21,7 @@
 
 #include <gnome.h>
 #include "e-text-event-processor.h"
+
 static void e_text_event_processor_init		(ETextEventProcessor		 *card);
 static void e_text_event_processor_class_init	(ETextEventProcessorClass	 *klass);
 
diff --git a/widgets/text/e-text-event-processor.h b/widgets/text/e-text-event-processor.h
index 1fc79f3f70..d6937383f0 100644
--- a/widgets/text/e-text-event-processor.h
+++ b/widgets/text/e-text-event-processor.h
@@ -22,7 +22,7 @@
 #define __E_TEXT_EVENT_PROCESSOR_H__
 
 #include <gnome.h>
-#include "e-text-event-processor-types.h"
+#include <gal/e-text/e-text-event-processor-types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/widgets/text/e-text-test.c b/widgets/text/e-text-test.c
index 38fd1cfb4c..e3931da02f 100644
--- a/widgets/text/e-text-test.c
+++ b/widgets/text/e-text-test.c
@@ -7,8 +7,9 @@
 
 #include "e-text.h"
 #include <gnome.h>
-#include "widgets/e-canvas.h"
-#include "widgets/e-unicode.h"
+#include "gal/widgets/e-canvas.h"
+#include "gal/widgets/e-unicode.h"
+
 GnomeCanvasItem *rect;
 
 static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, GnomeCanvasItem *item)
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index 6723f54172..b740a6d36b 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -19,16 +19,16 @@
 #include <config.h>
 #include <math.h>
 #include <ctype.h>
-#include "e-text.h"
 #include <gdk/gdkx.h> /* for BlackPixel */
+#include <unicode.h>
+#include <gtk/gtkinvisible.h>
+#include "e-text.h"
+#include "gal/widgets/e-canvas.h"
+#include "gal/widgets/e-canvas-utils.h"
+#include "gal/widgets/e-unicode.h"
 #include <libart_lgpl/art_affine.h>
 #include <libart_lgpl/art_rgb.h>
 #include <libart_lgpl/art_rgb_bitmap_affine.h>
-#include <unicode.h>
-#include <gtk/gtkinvisible.h>
-#include "widgets/e-canvas.h"
-#include "widgets/e-canvas-utils.h"
-#include "widgets/e-unicode.h"
 
 #include "e-text-event-processor-emacs-like.h"
 
diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h
index af1d6f946f..fca7578079 100644
--- a/widgets/text/e-text.h
+++ b/widgets/text/e-text.h
@@ -20,9 +20,9 @@
 #define E_TEXT_H
 
 #include <gnome.h>
-#include "widgets/e-font.h"
-#include "e-text-event-processor.h"
-#include "e-text-model.h"
+#include <gal/widgets/e-font.h>
+#include <gal/e-text/e-text-event-processor.h>
+#include <gal/e-text/e-text-model.h>
 
 
 BEGIN_GNOME_DECLS