diff --git a/Android.bp b/Android.bp
index ac1d5cb640dcc34da743abd42f914d77ca009c5a..dfbfd28146ae7a21c84f6cde5e074593f25287f0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -76,6 +76,7 @@ cc_binary {
   srcs: [
     "src/afl-fuzz*.c",
     "src/afl-common.c",
+    "src/afl-forkserver.c",
     "src/afl-sharedmem.c",
     "src/afl-forkserver.c",
     "src/afl-performance.c",
diff --git a/src/afl-cc.c b/src/afl-cc.c
index 2667ae285bffb265f6631bc2d11924e731988bb1..4a56169f352452fed3d28fc3e4ed6707ab2cb764 100644
--- a/src/afl-cc.c
+++ b/src/afl-cc.c
@@ -396,7 +396,7 @@ static void edit_params(u32 argc, char **argv, char **envp) {
           snprintf(llvm_fullpath, sizeof(llvm_fullpath), "%s/clang",
                    LLVM_BINDIR);
         else
-          snprintf(llvm_fullpath, sizeof(llvm_fullpath), CLANG_BIN);
+          snprintf(llvm_fullpath, sizeof(llvm_fullpath), "%s", CLANG_BIN);
         alt_cc = llvm_fullpath;
 
       }
diff --git a/src/afl-common.c b/src/afl-common.c
index b232b44536b3202d1cf5127f63473b8d09425740..7f482e7da47abbceafddf4343c21a9d401dc842c 100644
--- a/src/afl-common.c
+++ b/src/afl-common.c
@@ -25,8 +25,12 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#define _GNU_SOURCE
-#define __USE_GNU
+#ifndef _GNU_SOURCE
+  #define _GNU_SOURCE
+#endif
+#ifndef __USE_GNU
+  #define __USE_GNU
+#endif
 #include <string.h>
 #include <strings.h>
 #include <math.h>
@@ -718,7 +722,7 @@ char *get_afl_env(char *env) {
   if ((val = getenv(env))) {
 
     if (*val) {
-      
+
       if (!be_quiet) {
 
         OKF("Enabled environment variable %s with value %s", env, val);