diff --git a/ndk/platforms/android-21/include/GLES2/gl2ext.h b/ndk/platforms/android-21/include/GLES2/gl2ext.h
index 9749f9fdb..882a32ace 100644
--- a/ndk/platforms/android-21/include/GLES2/gl2ext.h
+++ b/ndk/platforms/android-21/include/GLES2/gl2ext.h
@@ -1,6 +1,8 @@
 #ifndef __gl2ext_h_
 #define __gl2ext_h_ 1
 
+#include <GLES2/gl2.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/ndk/platforms/android-21/include/android/dlext.h b/ndk/platforms/android-21/include/android/dlext.h
index 5c3a206a4..6482f481e 100644
--- a/ndk/platforms/android-21/include/android/dlext.h
+++ b/ndk/platforms/android-21/include/android/dlext.h
@@ -19,6 +19,7 @@
 
 #include <stddef.h>
 #include <sys/cdefs.h>
+#include <stdint.h>
 
 __BEGIN_DECLS
 
diff --git a/ndk/platforms/android-21/include/fts.h b/ndk/platforms/android-21/include/fts.h
index da26a8823..d18fc2cc7 100644
--- a/ndk/platforms/android-21/include/fts.h
+++ b/ndk/platforms/android-21/include/fts.h
@@ -35,6 +35,8 @@
 #ifndef	_FTS_H_
 #define	_FTS_H_
 
+#include <sys/types.h>
+
 typedef struct {
 	struct _ftsent *fts_cur;	/* current node */
 	struct _ftsent *fts_child;	/* linked list of children */
diff --git a/ndk/platforms/android-21/include/sgidefs.h b/ndk/platforms/android-21/include/sgidefs.h
index 8b37bf087..5614e592a 100644
--- a/ndk/platforms/android-21/include/sgidefs.h
+++ b/ndk/platforms/android-21/include/sgidefs.h
@@ -29,6 +29,8 @@
 #ifndef _SGIDEFS_H_
 #define _SGIDEFS_H_
 
+#ifdef __mips__
 #include <asm/sgidefs.h>
+#endif
 
 #endif /* _SGIDEFS_H_ */
diff --git a/ndk/platforms/android-21/include/sys/user.h b/ndk/platforms/android-21/include/sys/user.h
index 6e88d162a..07a112082 100644
--- a/ndk/platforms/android-21/include/sys/user.h
+++ b/ndk/platforms/android-21/include/sys/user.h
@@ -31,6 +31,7 @@
 
 #include <sys/cdefs.h>
 #include <limits.h> /* For PAGE_SIZE. */
+#include <stddef.h> /* For size_t */
 
 __BEGIN_DECLS
 
diff --git a/ndk/platforms/android-3/include/sys/user.h b/ndk/platforms/android-3/include/sys/user.h
index 18684f183..753149e3c 100644
--- a/ndk/platforms/android-3/include/sys/user.h
+++ b/ndk/platforms/android-3/include/sys/user.h
@@ -31,6 +31,7 @@
 
 #include <sys/cdefs.h>
 #include <limits.h> /* For PAGE_SIZE. */
+#include <stddef.h> /* For size_t */
 
 __BEGIN_DECLS