diff --git a/src/intl/gettext/bindtextdom.c b/src/intl/gettext/bindtextdom.c
index 179528fa..834bb146 100644
--- a/src/intl/gettext/bindtextdom.c
+++ b/src/intl/gettext/bindtextdom.c
@@ -30,7 +30,7 @@
 #include "util/string.h"
 
 /* Contains the default location of the message catalogs.  */
-extern const unsigned char _nl_default_dirname__[];
+extern const unsigned char *_nl_default_dirname__;
 
 /* List with bindings of specific domains.  */
 extern struct binding *_nl_domain_bindings__;
diff --git a/src/intl/gettext/dcigettext.c b/src/intl/gettext/dcigettext.c
index 1e17610d..7dca6224 100644
--- a/src/intl/gettext/dcigettext.c
+++ b/src/intl/gettext/dcigettext.c
@@ -187,13 +187,17 @@ transcmp(const void *p1, const void *p2)
 
 /* Name of the default domain used for gettext(3) prior any call to
    textdomain(3).  The default value for this is "messages".  */
-const unsigned char _nl_default_default_domain__[] = "messages";
+const char _AAA_nl_default_default_domain__[] = "messages";
+
+const unsigned char *_nl_default_default_domain__ = (const unsigned char *)_AAA_nl_default_default_domain__;
 
 /* Value used as the default domain for gettext(3).  */
-const unsigned char *_nl_current_default_domain__ = _nl_default_default_domain__;
+const char *_nl_current_default_domain__ = _nl_default_default_domain__;
 
 /* Contains the default location of the message catalogs.  */
-const unsigned char _nl_default_dirname__[] = LOCALEDIR;
+const char _AAA_nl_default_dirname__[] = LOCALEDIR;
+
+const unsigned char *_nl_default_dirname__ = (const unsigned char *)_AAA_nl_default_dirname__;
 
 /* Contains application-specific LANGUAGE variation, taking precedence to the
  * $LANGUAGE environment variable.  */
diff --git a/src/intl/gettext/libgnuintl.h b/src/intl/gettext/libgnuintl.h
index 52684881..24ef5c65 100644
--- a/src/intl/gettext/libgnuintl.h
+++ b/src/intl/gettext/libgnuintl.h
@@ -40,10 +40,6 @@
 #define gettext gettext
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Look up MSGID in the current default message catalog for the current
    LC_MESSAGES locale.  If not found, returns MSGID itself (the default
    text).  */
@@ -107,7 +103,4 @@ extern "C" {
 
 #endif				/* Optimizing. */
 
-#ifdef __cplusplus
-}
-#endif
 #endif				/* libintl.h */
diff --git a/src/intl/gettext/textdomain.c b/src/intl/gettext/textdomain.c
index 1b1f7814..4cebc334 100644
--- a/src/intl/gettext/textdomain.c
+++ b/src/intl/gettext/textdomain.c
@@ -29,7 +29,7 @@
 #include "util/string.h"
 
 /* Name of the default text domain.  */
-extern const unsigned char _nl_default_default_domain__[];
+extern const unsigned char *_nl_default_default_domain__;
 
 /* Default text domain in which entries for gettext(3) are to be found.  */
 extern const unsigned char *_nl_current_default_domain__;