-diff -u -r /home/fornwall/lib/android-ndk/platforms/android-19/arch-arm/usr/include/pwd.h ./usr/include/pwd.h
---- /home/fornwall/lib/android-ndk/platforms/android-19/arch-arm/usr/include/pwd.h 2012-08-21 07:23:12.000000000 +0200
-+++ ./usr/include/pwd.h 2014-07-06 04:39:02.731221101 +0200
-@@ -114,6 +114,43 @@
- struct passwd* getpwnam(const char*);
- struct passwd* getpwuid(uid_t);
-
+diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/pwd.h ./usr/include/pwd.h
+--- /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/include/pwd.h 2014-10-14 22:53:49.000000000 -0400
++++ ./usr/include/pwd.h 2015-07-15 09:42:32.974621965 -0400
+@@ -65,6 +65,9 @@
+ #include <sys/cdefs.h>
+ #include <sys/types.h>
+
++/* For access(): */
++#include <unistd.h>
++
+ #define _PATH_PASSWD "/etc/passwd"
+ #define _PATH_MASTERPASSWD "/etc/master.passwd"
+ #define _PATH_MASTERPASSWD_LOCK "/etc/ptmp"
+@@ -119,6 +122,39 @@
+ int getpwnam_r(const char*, struct passwd*, char*, size_t, struct passwd**);
+ int getpwuid_r(uid_t, struct passwd*, char*, size_t, struct passwd**);
+