Downgrading to netbsd zlib version

Change-Id: I83cf73d8357ea34ab5e49fe15bd4c45ce54cac01

sys/sys/mount.h

@@ -467,7 +467,10 @@ __END_DECLS
 
 #endif /* _KERNEL */
 #endif /* !_STANDALONE */
+
+#if defined(__minix) && !defined(_STANDALONE)
 #include <sys/statvfs.h>
 #include <minix/mount.h>
+#endif /*  defined(__minix) && !defined(_STANDALONE) */
 
 #endif /* !_SYS_MOUNT_H_ */

sys/sys/socket.h

@@ -204,7 +204,9 @@ typedef	__uid_t		uid_t;		/* user id */
 #define	uid_t		__uid_t
 #endif
 
+#if defined(__minix) && !defined(_STANDALONE)
 #include <sys/ucred.h>
+#endif
 
 /*
  * Structure used by kernel to store most

sys/sys/syslimits.h

@@ -37,6 +37,11 @@
 #if defined(__minix)
 #define __MINIX_OPEN_MAX	255 /* a process may have 255 files open */
 #define __MINIX_PATH_MAX	1024/* a pathname may contain 1023 chars (+ '\0')*/
+
+#if defined(_STANDALONE)
+/* LSC: In NetBSD this gets pulled in through libkern.h */
+#include <sys/null.h>
+#endif /* defined(_STANDALONE) */
 #endif /* defined(__minix) */
 
 #include <sys/featuretest.h>