diff --git a/newlib/libc/include/locale.h b/newlib/libc/include/locale.h
index d60132c35..95e27e761 100644
--- a/newlib/libc/include/locale.h
+++ b/newlib/libc/include/locale.h
@@ -21,6 +21,7 @@
 #define LC_MESSAGES 6
 
 #if __POSIX_VISIBLE >= 200809
+
 #define LC_ALL_MASK		(1 << LC_ALL)
 #define LC_COLLATE_MASK		(1 << LC_COLLATE)
 #define LC_CTYPE_MASK		(1 << LC_CTYPE)
@@ -33,7 +34,8 @@
 
 struct __locale_t;
 typedef struct __locale_t *locale_t;
-#endif
+
+#endif /* __POSIX_VISIBLE >= 200809 */
 
 _BEGIN_STD_C
 
@@ -69,12 +71,15 @@ struct _reent;
 char *_EXFUN(_setlocale_r,(struct _reent *, int, const char *));
 struct lconv *_EXFUN(_localeconv_r,(struct _reent *));
 
+#if __POSIX_VISIBLE >= 200809
+
 locale_t _newlocale_r (struct _reent *, int, const char *, locale_t);
 void _freelocale_r (struct _reent *, locale_t);
 locale_t _duplocale_r (struct _reent *, locale_t);
 locale_t _uselocale_r (struct _reent *, locale_t);
 
 #ifndef _REENT_ONLY
+
 char *_EXFUN(setlocale,(int, const char *));
 struct lconv *_EXFUN(localeconv,(void));
 
@@ -82,7 +87,10 @@ locale_t newlocale (int, const char *, locale_t);
 void freelocale (locale_t);
 locale_t duplocale (locale_t);
 locale_t uselocale (locale_t);
-#endif
+
+#endif /* _REENT_ONLY */
+
+#endif /* __POSIX_VISIBLE >= 200809 */
 
 _END_STD_C