6 files changed, 20 insertions, 31 deletions
diff --git a/libcaja-extension/Makefile.am b/libcaja-extension/Makefile.am
index a33bebb9..a35b8882 100644
--- a/libcaja-extension/Makefile.am
+++ b/libcaja-extension/Makefile.am
@@ -42,7 +42,6 @@ libcaja_extension_la_SOURCES = \
 	caja-column-provider.c \
 	caja-column.c \
 	caja-widget-view-provider.c \
-	caja-extension-i18n.h \
 	caja-extension-types.c \
 	caja-extension-private.h \
 	caja-file-info.c \
diff --git a/libcaja-extension/caja-column.c b/libcaja-extension/caja-column.c
index bd3a23f3..db4b6440 100644
--- a/libcaja-extension/caja-column.c
+++ b/libcaja-extension/caja-column.c
@@ -22,9 +22,13 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
+
 #include "caja-column.h"
-#include "caja-extension-i18n.h"
 
 enum {
     PROP_0,
diff --git a/libcaja-extension/caja-extension-i18n.h b/libcaja-extension/caja-extension-i18n.h
deleted file mode 100644
index 34e1b3e6..00000000
--- a/libcaja-extension/caja-extension-i18n.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef CAJA_EXTENSION_I18N_H
-#define CAJA_EXTENSION_I18N_H
-
-#include "config.h"
-
-#ifdef ENABLE_NLS
-#include<libintl.h>
-#define _(String) dgettext(GETTEXT_PACKAGE,String)
-#ifdef gettext_noop
-#define N_(String) gettext_noop(String)
-#else
-#define N_(String) (String)
-#endif
-#else /* NLS is disabled */
-#define _(String) (String)
-#define N_(String) (String)
-#define textdomain(String) (String)
-#define gettext(String) (String)
-#define dgettext(Domain,String) (String)
-#define dcgettext(Domain,String,Type) (String)
-#define bindtextdomain(Domain,Directory) (Domain)
-#endif
-
-#endif
diff --git a/libcaja-extension/caja-menu-item.c b/libcaja-extension/caja-menu-item.c
index 054dd767..bc952218 100644
--- a/libcaja-extension/caja-menu-item.c
+++ b/libcaja-extension/caja-menu-item.c
@@ -22,9 +22,13 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
+#include <glib/gi18n-lib.h>
+
 #include "caja-menu.h"
-#include "caja-extension-i18n.h"
 
 enum {
     ACTIVATE,
diff --git a/libcaja-extension/caja-menu.c b/libcaja-extension/caja-menu.c
index 5ed0fd21..87e2f1a5 100644
--- a/libcaja-extension/caja-menu.c
+++ b/libcaja-extension/caja-menu.c
@@ -21,12 +21,15 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
-#include "caja-menu.h"
-#include "caja-extension-i18n.h"
+#endif
 
+#include <glib/gi18n-lib.h>
 #include <glib.h>
 
+#include "caja-menu.h"
+
 /**
  * SECTION:caja-menu
  * @title: CajaMenu
diff --git a/libcaja-extension/caja-property-page.c b/libcaja-extension/caja-property-page.c
index 461e19ea..cb5e1c74 100644
--- a/libcaja-extension/caja-property-page.c
+++ b/libcaja-extension/caja-property-page.c
@@ -22,10 +22,13 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
-#include "caja-property-page.h"
+#endif
+
+#include <glib/gi18n-lib.h>
 
-#include "caja-extension-i18n.h"
+#include "caja-property-page.h"
 
 enum {
     PROP_0,