20 files changed, 36 insertions, 36 deletions
diff --git a/mail/em-account-prefs.h b/mail/em-account-prefs.h
index f33a934e71..99cf676b2c 100644
--- a/mail/em-account-prefs.h
+++ b/mail/em-account-prefs.h
@@ -35,7 +35,7 @@ extern "C" {
 #include <glade/glade.h>
 #include <gtk/gtktreeview.h>
 
-#include <gal/e-table/e-table.h>
+#include <table/e-table.h>
 
 #include "evolution-config-control.h"
 
diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c
index de1cbd57fb..5106ca5529 100644
--- a/mail/em-composer-prefs.c
+++ b/mail/em-composer-prefs.c
@@ -39,7 +39,7 @@
 #include <bonobo/bonobo-generic-factory.h>
 
 #include <libedataserver/e-iconv.h>
-#include <gal/widgets/e-gui-utils.h>
+#include <widgets/misc/e-gui-utils.h>
 
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtkliststore.h>
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 38bcb99a4b..dc5581f08b 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <gtk/gtkdialog.h>
 
-#include <gal/util/e-util.h>
+#include <e-util/e-util.h>
 #include <libgnome/gnome-i18n.h>
 
 #include "mail-mt.h"
diff --git a/mail/em-config.c b/mail/em-config.c
index 1728fffb81..9e3e60e9ef 100644
--- a/mail/em-config.c
+++ b/mail/em-config.c
@@ -61,7 +61,7 @@
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 
-#include <gal/util/e-util.h>
+#include <e-util/e-util.h>
 
 static GObjectClass *emp_parent;
 
diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c
index 337ec3555b..97f165e1b4 100644
--- a/mail/em-folder-selection-button.c
+++ b/mail/em-folder-selection-button.c
@@ -30,7 +30,7 @@
 #include <gtk/gtklabel.h>
 #include <gtk/gtkhbox.h>
 
-#include <gal/util/e-util.h>
+#include <e-util/e-util.h>
 #include <libgnome/gnome-i18n.h>
 
 #include "mail-component.h"
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index c0ba28d7f4..ffa0ff3bda 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -29,8 +29,8 @@
 
 #include <libgnome/gnome-i18n.h>
 
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-gui-utils.h>
+#include <e-util/e-util.h>
+#include <widgets/misc/e-gui-utils.h>
 
 #include <gtk/gtkentry.h>
 #include <gtk/gtkbox.h>
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index 40cf8de1e9..266928eb5c 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -36,7 +36,7 @@
 
 #include <e-util/e-mktemp.h>
 
-#include <gal/util/e-xml-utils.h>
+#include <e-util/e-xml-utils.h>
 #include <libgnome/gnome-i18n.h>
 
 #include <camel/camel-file-utils.h>
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index e60d0e9a21..70c1037279 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -40,9 +40,9 @@
 
 #include <gconf/gconf-client.h>
 
-#include <gal/menus/gal-view-etable.h>
-#include <gal/menus/gal-view-factory-etable.h>
-#include <gal/menus/gal-view-instance.h>
+#include <widgets/menus/gal-view-etable.h>
+#include <widgets/menus/gal-view-factory-etable.h>
+#include <widgets/menus/gal-view-instance.h>
 #include "widgets/menus/gal-view-menus.h"
 
 #include <camel/camel-mime-message.h>
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index c835dd1541..f04b7ee416 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -66,7 +66,7 @@
 #include <camel/camel-string-utils.h>
 
 /* should this be in e-util rather than gal? */
-#include <gal/util/e-util.h>
+#include <e-util/e-util.h>
 
 #include <libedataserver/e-msgport.h>
 #include <e-util/e-gui-utils.h>
diff --git a/mail/em-menu.c b/mail/em-menu.c
index e5a5087c61..e896f40836 100644
--- a/mail/em-menu.c
+++ b/mail/em-menu.c
@@ -61,7 +61,7 @@
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 
-#include <gal/util/e-util.h>
+#include <e-util/e-util.h>
 
 static void emp_standard_menu_factory(EMenu *emp, void *data);
 
diff --git a/mail/em-migrate.c b/mail/em-migrate.c
index 94db5d7325..8b01766350 100644
--- a/mail/em-migrate.c
+++ b/mail/em-migrate.c
@@ -53,9 +53,9 @@
 
 #include <libgnome/gnome-i18n.h>
 
-#include <gal/util/e-util.h>
+#include <e-util/e-util.h>
 #include <libedataserver/e-iconv.h>
-#include <gal/util/e-xml-utils.h>
+#include <e-util/e-xml-utils.h>
 
 #include "e-util/e-bconf-map.h"
 #include "e-util/e-account-list.h"
diff --git a/mail/em-popup.c b/mail/em-popup.c
index ecda95612c..c419e8a1d4 100644
--- a/mail/em-popup.c
+++ b/mail/em-popup.c
@@ -63,7 +63,7 @@
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 
-#include <gal/util/e-util.h>
+#include <e-util/e-util.h>
 
 static void emp_standard_menu_factory(EPopup *emp, void *data);
 
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 3f05696302..38b89078ec 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -58,7 +58,7 @@
 #include <e-util/e-dialog-utils.h>
 #include "e-util/e-error.h"
 
-#include <gal/util/e-util.h>
+#include <e-util/e-util.h>
 
 #include "em-utils.h"
 #include "em-composer-utils.h"
diff --git a/mail/mail-component.c b/mail/mail-component.c
index a63fe06ff3..8ad596cc2d 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -73,8 +73,8 @@
 
 #include <e-util/e-mktemp.h>
 
-#include <gal/e-table/e-tree.h>
-#include <gal/e-table/e-tree-memory.h>
+#include <table/e-tree.h>
+#include <table/e-tree-memory.h>
 #include <libgnome/gnome-i18n.h>
 
 #include <camel/camel-file-utils.h>
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 413048ccaa..1ce5111cd4 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -51,8 +51,8 @@
 #include <bonobo/bonobo-moniker-util.h>
 #include <bonobo/bonobo-exception.h>
 
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-gui-utils.h>
+#include <e-util/e-util.h>
+#include <widgets/misc/e-gui-utils.h>
 
 #include <e-util/e-account-list.h>
 #include <e-util/e-signature-list.h>
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index bd2990bf6b..dcf7723a23 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -16,7 +16,7 @@
 #include <gtk/gtkstock.h>
 #include <gtk/gtkmessagedialog.h>
 #include <libgnome/gnome-i18n.h>
-#include <gal/widgets/e-gui-utils.h>
+#include <widgets/misc/e-gui-utils.h>
 
 #include "libedataserver/e-msgport.h"
 #include "e-util/e-error.h"
diff --git a/mail/mail-offline-handler.c b/mail/mail-offline-handler.c
index c79b8ae36a..3095124ad1 100644
--- a/mail/mail-offline-handler.c
+++ b/mail/mail-offline-handler.c
@@ -38,7 +38,7 @@
 
 #include <gtk/gtkmain.h>
 
-#include <gal/util/e-util.h>
+#include <e-util/e-util.h>
 
 
 #define PARENT_TYPE bonobo_object_get_type ()
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index d66cb5d22a..e7770fc017 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <errno.h>
 #include <libgnome/gnome-exec.h>
-#include <gal/util/e-util.h>
+#include <e-util/e-util.h>
 #include <libgnome/gnome-i18n.h>
 
 #include <camel/camel-mime-filter-from.h>
diff --git a/mail/message-list.c b/mail/message-list.c
index 573151743f..cdb3963153 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -42,16 +42,16 @@
 #include <libgnome/gnome-i18n.h>
 #include <atk/atkutil.h>
 
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/e-table/e-cell-text.h>
-#include <gal/e-table/e-cell-toggle.h>
-#include <gal/e-table/e-cell-checkbox.h>
-#include <gal/e-table/e-cell-tree.h>
-#include <gal/e-table/e-cell-date.h>
-#include <gal/e-table/e-cell-size.h>
-#include <gal/e-table/e-tree-memory.h>
-#include <gal/e-table/e-tree-memory-callbacks.h>
+#include <e-util/e-util.h>
+#include <widgets/misc/e-gui-utils.h>
+#include <table/e-cell-text.h>
+#include <table/e-cell-toggle.h>
+#include <table/e-cell-checkbox.h>
+#include <table/e-cell-tree.h>
+#include <table/e-cell-date.h>
+#include <table/e-cell-size.h>
+#include <table/e-tree-memory.h>
+#include <table/e-tree-memory-callbacks.h>
 
 #include <camel/camel-exception.h>
 #include <camel/camel-file-utils.h>
diff --git a/mail/message-list.h b/mail/message-list.h
index bbb4db3f69..e53fca65db 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -27,8 +27,8 @@
 #include <gtk/gtkobject.h>
 #include <gtk/gtkwidget.h>
 
-#include <gal/e-table/e-table-simple.h>
-#include <gal/e-table/e-tree-scrolled.h>
+#include <table/e-table-simple.h>
+#include <table/e-tree-scrolled.h>
 
 #ifdef __cplusplus
 extern "C" {