3 files changed, 28 insertions, 4 deletions
diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h
index 6ed13d97d9..212fda7c2f 100644
--- a/widgets/misc/e-canvas.h
+++ b/widgets/misc/e-canvas.h
@@ -21,7 +21,6 @@
 #ifndef __E_CANVAS_H__
 #define __E_CANVAS_H__
 
-#include <glib.h>
 #include <libgnomeui/gnome-canvas.h>
 
 #ifdef __cplusplus
diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c
index 4e2ff17378..da28926677 100644
--- a/widgets/misc/e-popup-menu.c
+++ b/widgets/misc/e-popup-menu.c
@@ -17,9 +17,35 @@ nnn *
 #include <gtk/gtksignal.h>
 #include <libgnomeui/gtkpixmapmenuitem.h>
 #include <libgnomeui/gnome-stock.h>
+
 #include "e-popup-menu.h"
 #include "e-gui-utils.h"
-#include "gal/util/e-i18n.h"
+
+#include <libgnome/gnome-i18n.h>
+
+#ifndef GNOME_APP_HELPER_H
+/* Copied this i18n function to use for the same purpose */
+
+#ifdef ENABLE_NLS
+#define L_(x) gnome_app_helper_gettext(x)
+
+static gchar *
+gnome_app_helper_gettext (const gchar *str)
+{
+	char *s;
+
+        s = gettext (str);
+	if ( s == str )
+	        s = dgettext (PACKAGE, str);
+
+	return s;
+}
+
+#else
+#define L_(x) x
+#endif
+
+#endif
 
 /*
  * Creates an item with an optional icon
@@ -86,7 +112,7 @@ e_popup_menu_create (EPopupMenu *menu_list, guint32 disable_mask, guint32 hide_m
 		if ((!(seperator && last_item_seperator)) && !(menu_list [i].disable_mask & hide_mask)) {
 			GtkWidget *item;
 			
-			item = make_item (menu, seperator ? "" : _(menu_list[i].name), menu_list[i].pixname);
+			item = make_item (menu, seperator ? "" : L_(menu_list[i].name), menu_list[i].pixname);
 			gtk_menu_append (menu, item);
 			
 			if (!menu_list[i].submenu) {
diff --git a/widgets/misc/e-reflow.h b/widgets/misc/e-reflow.h
index 205bdb042c..641a4af0e5 100644
--- a/widgets/misc/e-reflow.h
+++ b/widgets/misc/e-reflow.h
@@ -21,7 +21,6 @@
 #ifndef __E_REFLOW_H__
 #define __E_REFLOW_H__
 
-#include <glib.h>
 #include <libgnomeui/gnome-canvas.h>
 
 #ifdef __cplusplus