--- a/core/base/file.cpp
+++ b/core/base/file.cpp
@@ -20,6 +20,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <string.h>
 
 #include <string>
 
--- a/core/liblog/log_read.c
+++ b/core/liblog/log_read.c
@@ -26,6 +26,7 @@
 #include <string.h>
 #include <sys/cdefs.h>
 #include <unistd.h>
+#include <sys/user.h>
 
 #include <cutils/list.h>
 #include <cutils/sockets.h>

--- a/libselinux/src/label_internal.h
+++ b/libselinux/src/label_internal.h
@@ -10,6 +10,7 @@
 
 #include <stdlib.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <selinux/selinux.h>
 #include <selinux/label.h>
 #include "dso.h"
diff -upr core.orig/include/utils/Compat.h core/include/utils/Compat.h
--- a/core/include/utils/Compat.h	2016-07-10 15:30:25.935363345 +0200
+++ b/core/include/utils/Compat.h	2016-07-10 15:31:01.785149166 +0200
@@ -35,10 +35,11 @@ static inline ssize_t pread64(int fd, vo
 
 #endif /* __APPLE__ */
 
+#define DEFFILEMODE 0666
+
 #if defined(_WIN32)
 #define O_CLOEXEC O_NOINHERIT
 #define O_NOFOLLOW 0
-#define DEFFILEMODE 0666
 #endif /* _WIN32 */
 
 #if defined(_WIN32)
diff -upr core/adb/adb_auth_host.cpp core.orig/adb/adb_auth_host.cpp
--- a/core/adb/adb_auth_host.cpp	2016-04-22 04:11:37.000000000 +0200
+++ b/core/adb/adb_auth_host.cpp	2016-07-10 20:28:54.553727489 +0200
@@ -46,6 +46,7 @@
 #include <base/strings.h>
 #include <cutils/list.h>
 
+#include <openssl/bn.h>
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/pem.h>
diff -upr core.orig/include/ziparchive/zip_archive.h core/include/ziparchive/zip_archive.h
--- a/core/include/ziparchive/zip_archive.h	2016-07-10 20:41:30.509065561 +0200
+++ b/core/include/ziparchive/zip_archive.h	2016-07-10 20:41:47.117424874 +0200
@@ -23,6 +23,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <sys/types.h>
+#include <sys/cdefs.h>
 #include <utils/Compat.h>
 
 __BEGIN_DECLS