diff --git a/libc/include/ctype.h b/libc/include/ctype.h
index 302a88e..a07f9c8 100644
--- a/libc/include/ctype.h
+++ b/libc/include/ctype.h
@@ -54,6 +54,9 @@
 #define _CTYPE_R (_CTYPE_P|_CTYPE_U|_CTYPE_L|_CTYPE_D|_CTYPE_B)
 #define _CTYPE_A (_CTYPE_L|_CTYPE_U)
 
+/* _CTYPE_N was added to NDK r10 and is expected by gnu-libstdc++ */
+#define _CTYPE_N _CTYPE_D
+
 __BEGIN_DECLS
 
 extern const char* _ctype_;
diff --git a/libc/include/stdio.h b/libc/include/stdio.h
index 3e666d4..621caa8 100644
--- a/libc/include/stdio.h
+++ b/libc/include/stdio.h
@@ -55,13 +55,23 @@
 struct __sFILE;
 typedef struct __sFILE FILE;
 
+#if __ANDROID_API__ >= 23
 extern FILE* stdin __INTRODUCED_IN(23);
 extern FILE* stdout __INTRODUCED_IN(23);
 extern FILE* stderr __INTRODUCED_IN(23);
+
 /* C99 and earlier plus current C++ standards say these must be macros. */
 #define stdin stdin
 #define stdout stdout
 #define stderr stderr
+#else
+/* Before M the actual symbols for stdin and friends had different names. */
+extern FILE* __sF[] __REMOVED_IN(23);
+
+#define stdin __sF[0]
+#define stdout __sF[1]
+#define stderr __sF[2]
+#endif
 
 /*
  * The following three definitions are for ANSI C, which took them