diff --git a/ndk/platforms/android-21/include/uchar.h b/ndk/platforms/android-21/include/uchar.h
index e1fcb5c65..a5e72eade 100644
--- a/ndk/platforms/android-21/include/uchar.h
+++ b/ndk/platforms/android-21/include/uchar.h
@@ -34,6 +34,11 @@
 
 __BEGIN_DECLS
 
+#if __STDC_VERSION__ >= 201112L && !defined(__cplusplus)
+typedef __CHAR16_TYPE__ char16_t;
+typedef __CHAR32_TYPE__ char32_t;
+#endif
+
 #define __STD_UTF_16__ 1
 #define __STD_UTF_32__ 1