Index: libc/include/uchar.h
===================================================================
--- libc/include/uchar.h
+++ libc/include/uchar.h
@@ -22,13 +22,13 @@
 #if !defined(__cplusplus) && defined(__STDC_UTF_16__) && (__STDC_VERSION__ >= 201112L)
 /* ISO9899:2011 7.28: Define char16_t if __STDC_UTF_32__ is set. */
 #define __CHAR16_TYPE__
-typedef uint_least16_t  char16_t;
+typedef __UINT_LEAST16__TYPE__  char16_t;
 #endif /* __STDC_UTF_16__ */
 
 #if !defined(__cplusplus) && defined(__STDC_UTF_32__) && (__STDC_VERSION__ >= 201112L)
 /* ISO9899:2011 7.28: Define char32_t if __STDC_UTF_32__ is enabled. */
 #define __CHAR32_TYPE__
-typedef uint_least32_t  char32_t;
+typedef __UINT_LEAST32_TYPE__  char32_t;
 #endif /* __STDC_UTF_32__ */
 
 __BEGIN_C_DECLS