diff --git a/newlib/libc/locale/setlocale.h b/newlib/libc/locale/setlocale.h
index 7abf92f7e..e91034ac8 100644
--- a/newlib/libc/locale/setlocale.h
+++ b/newlib/libc/locale/setlocale.h
@@ -162,13 +162,15 @@ struct	lc_messages_T
   const char	*noexpr;
   const char	*yesstr;
   const char	*nostr;
-#ifdef __HAVE_LOCALE_INFO_EXTENDED__
+#ifdef __HAVE_LOCALE_INFO__
   const char	*codeset;	 /* codeset for mbtowc conversion */
+#ifdef __HAVE_LOCALE_INFO_EXTENDED__
   const wchar_t	*wyesexpr;
   const wchar_t	*wnoexpr;
   const wchar_t	*wyesstr;
   const wchar_t	*wnostr;
 #endif
+#endif
 };
 extern const struct lc_messages_T _C_messages_locale;