diff --git a/moonlight-common/build.gradle b/moonlight-common/build.gradle
index 02218d64..eb719ead 100644
--- a/moonlight-common/build.gradle
+++ b/moonlight-common/build.gradle
@@ -7,10 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 27
-
-        ndk {
-            abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64"
-        }
     }
 
     buildTypes {
diff --git a/moonlight-common/src/main/jni/Application.mk b/moonlight-common/src/main/jni/Application.mk
index 3ed75151..32615607 100644
--- a/moonlight-common/src/main/jni/Application.mk
+++ b/moonlight-common/src/main/jni/Application.mk
@@ -2,6 +2,3 @@
 
 # Our minimum version is Android 4.1
 APP_PLATFORM := android-16
-
-# Support all modern ABIs
-APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 mips mips64
diff --git a/moonlight-common/src/main/jni/moonlight-core/callbacks.c b/moonlight-common/src/main/jni/moonlight-core/callbacks.c
index 48318323..05b97556 100644
--- a/moonlight-common/src/main/jni/moonlight-core/callbacks.c
+++ b/moonlight-common/src/main/jni/moonlight-core/callbacks.c
@@ -1,6 +1,7 @@
 #include <jni.h>
 
 #include <pthread.h>
+#include <string.h>
 
 #include <Limelight.h>