6 files changed, 6 insertions, 8 deletions
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 6efa7f38da..c2a0472530 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -44,12 +44,12 @@
 
 #include <shell/evolution-shell-client.h>
 
+#include <gal/util/e-unicode-i18n.h>
 #include <gal/util/e-util.h>
 #include <gal/unicode/gunicode.h>
 #include <gal/widgets/e-gui-utils.h>
 #include <e-util/e-html-utils.h>
 #include <e-util/e-url.h>
-#include <e-util/e-unicode-i18n.h>
 #include <e-util/e-passwords.h>
 #include "mail.h"
 #include "mail-config.h"
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index ffbc210e82..7cf21ca1da 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -36,8 +36,7 @@
 #include <camel/camel-folder.h>
 #include <camel/camel-vtrash-folder.h>
 #include <camel/camel-vee-store.h>
-
-#include "e-util/e-unicode-i18n.h"
+#include <gal/util/e-unicode-i18n.h>
 
 #include "mail-mt.h"
 #include "mail-folder-cache.h"
diff --git a/mail/mail-format.c b/mail/mail-format.c
index a5f21c71db..22831b77ba 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -42,7 +42,7 @@
 #include <camel/camel-stream-null.h>
 #include <shell/e-setup.h>
 #include <e-util/e-html-utils.h>
-#include <e-util/e-unicode-i18n.h>
+#include <gal/util/e-unicode-i18n.h>
 
 #include "mail.h"
 #include "mail-tools.h"
diff --git a/mail/mail-local.c b/mail/mail-local.c
index 74a7c3fbe9..9267878757 100644
--- a/mail/mail-local.c
+++ b/mail/mail-local.c
@@ -39,7 +39,7 @@
 
 #include "gal/widgets/e-gui-utils.h"
 #include "e-util/e-path.h"
-#include "e-util/e-unicode-i18n.h"
+#include "gal/util/e-unicode-i18n.h"
 
 #include "Evolution.h"
 #include "evolution-storage.h"
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 201e8a5e13..54bc2dbbf8 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -32,6 +32,7 @@
 #include <errno.h>
 #include <gal/util/e-util.h>
 #include <gal/widgets/e-unicode.h>
+#include <gal/util/e-unicode-i18n.h>
 #include <camel/camel-mime-filter-from.h>
 #include <camel/camel-operation.h>
 #include <camel/camel-vtrash-folder.h>
@@ -43,7 +44,6 @@
 #include "composer/e-msg-composer.h"
 #include "folder-browser.h"
 #include "e-util/e-html-utils.h"
-#include "e-util/e-unicode-i18n.h"
 
 #include "filter/filter-filter.h"
 
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index ca695f8ae6..c6e0dbac2b 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -33,6 +33,7 @@
 #include "mail-mt.h"
 
 #include "gal/widgets/e-gui-utils.h"
+#include "gal/util/e-unicode-i18n.h"
 
 #include "camel/camel.h"
 #include "camel/camel-remote-store.h"
@@ -42,8 +43,6 @@
 #include "filter/vfolder-context.h"
 #include "filter/vfolder-editor.h"
 
-#include "e-util/e-unicode-i18n.h"
-
 #define d(x) 
 
 static VfolderContext *context;	/* context remains open all time */