diff --git a/jni/Application.mk b/jni/Application.mk
index ec94853b3..52d77327c 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -1,3 +1,4 @@
 APP_ABI := x86 x86_64 armeabi-v7a arm64-v8a
 APP_PLATFORM := android-21
+APP_UNIFIED_HEADERS := true
 APP_CPPFLAGS += -std=c++11
diff --git a/jni/magisk.h b/jni/magisk.h
index 91c788fb7..39dce334d 100644
--- a/jni/magisk.h
+++ b/jni/magisk.h
@@ -23,6 +23,10 @@
 
 #define LOG_TAG    "Magisk"
 
+#ifndef ARG_MAX
+#define ARG_MAX 4096
+#endif
+
 // Global handler for PLOGE
 extern __thread void (*err_handler)(void);
 
diff --git a/jni/ndk-compression b/jni/ndk-compression
index b0579533d..278ea8034 160000
--- a/jni/ndk-compression
+++ b/jni/ndk-compression
@@ -1 +1 @@
-Subproject commit b0579533d17f527137633825724231cafb245ebd
+Subproject commit 278ea80348b7e36bf2d37f2aabf6af6ed64d8f0c
diff --git a/jni/selinux b/jni/selinux
index 11a8f7c25..0b14ed89a 160000
--- a/jni/selinux
+++ b/jni/selinux
@@ -1 +1 @@
-Subproject commit 11a8f7c25d689d84c4eae8ef6245af57a51b1dc5
+Subproject commit 0b14ed89aa516778284094c0980eebb498464779
diff --git a/jni/su b/jni/su
index 85b080113..b1d6ff60e 160000
--- a/jni/su
+++ b/jni/su
@@ -1 +1 @@
-Subproject commit 85b080113f43bccd6764cefe9144d82dc0492426
+Subproject commit b1d6ff60e0f7d533746097058b4d4815d39270aa