diff --git a/include/android-ashmem.h b/include/android-ashmem.h
index 3a0b99699c4998c62d62de7f8218067d264255c0..6fdcb1ba27412305a4906d929efc06c856d9d827 100644
--- a/include/android-ashmem.h
+++ b/include/android-ashmem.h
@@ -26,6 +26,8 @@
 #ifndef _ANDROID_ASHMEM_H
 #define _ANDROID_ASHMEM_H
 
+#ifdef __ANDROID__
+
 #include <fcntl.h>
 #include <linux/shm.h>
 #include <linux/ashmem.h>
@@ -103,5 +105,7 @@ static inline void *shmat(int __shmid, const void *__shmaddr, int __shmflg) {
 
 }
 
+#endif /* __ANDROID__ */
+
 #endif
 
diff --git a/include/forkserver.h b/include/forkserver.h
index d76dfc7a5a63c09288c98a519fb6438d6da50c1d..18a287ad3bb680c8d50a2400cd04a3972fe13741 100644
--- a/include/forkserver.h
+++ b/include/forkserver.h
@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 
+#include "types.h"
 typedef struct afl_forkserver {
 
   /* a program that includes afl-forkserver needs to define these */
diff --git a/include/sharedmem.h b/include/sharedmem.h
index 6aef4b84a77062c71f6546c8ee45e8e52d8eb533..066a9904755b02e81d3a211d0f01f2ecc65cddb5 100644
--- a/include/sharedmem.h
+++ b/include/sharedmem.h
@@ -28,6 +28,8 @@
 #ifndef __AFL_SHAREDMEM_H
 #define __AFL_SHAREDMEM_H
 
+#include "types.h"
+
 typedef struct sharedmem {
 
   // extern unsigned char *trace_bits;