diff --git a/jni/Android.mk b/jni/Android.mk
index e690f6647..8263025d7 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -23,7 +23,7 @@ LOCAL_SHARED_LIBRARIES := libsqlite libselinux
 
 LOCAL_C_INCLUDES := \
 	jni/include \
-	jni/external \
+	jni/external/include \
 	$(LIBSELINUX)
 
 LOCAL_SRC_FILES := \
@@ -89,17 +89,18 @@ LOCAL_MODULE := magiskboot
 LOCAL_STATIC_LIBRARIES := liblzma liblz4 libbz2 libfdt
 LOCAL_C_INCLUDES := \
 	jni/include \
+	jni/external/include \
 	$(LIBLZMA) \
 	$(LIBLZ4) \
 	$(LIBBZ2) \
 	$(LIBFDT)
 
 LOCAL_SRC_FILES := \
+	external/sha1/sha1.c \
 	magiskboot/main.c \
 	magiskboot/bootimg.c \
 	magiskboot/hexpatch.c \
 	magiskboot/compress.c \
-	magiskboot/sha1.c \
 	magiskboot/types.c \
 	magiskboot/dtb.c \
 	magiskboot/ramdisk.c \
diff --git a/jni/external/Android.mk b/jni/external/Android.mk
index 8118275f9..beeb68aeb 100644
--- a/jni/external/Android.mk
+++ b/jni/external/Android.mk
@@ -3,6 +3,7 @@ LOCAL_PATH:= $(call my-dir)
 # libsqlite.so (stub)
 include $(CLEAR_VARS)
 LOCAL_MODULE:= libsqlite
+LOCAL_C_INCLUDES := jni/external/include
 LOCAL_SRC_FILES := stubs/sqlite3_stub.c
 include $(BUILD_SHARED_LIBRARY)
 
@@ -58,7 +59,7 @@ include $(BUILD_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_MODULE := liblzma
 LOCAL_C_INCLUDES += \
-	$(EXT_PATH)/xz_config \
+	$(EXT_PATH)/include/xz_config \
 	$(EXT_PATH)/xz/src/common \
 	$(EXT_PATH)/xz/src/liblzma/api \
 	$(EXT_PATH)/xz/src/liblzma/check \
diff --git a/jni/magiskboot/sha1.h b/jni/external/include/sha1.h
similarity index 100%
rename from jni/magiskboot/sha1.h
rename to jni/external/include/sha1.h
diff --git a/jni/external/sqlite3.h b/jni/external/include/sqlite3.h
similarity index 100%
rename from jni/external/sqlite3.h
rename to jni/external/include/sqlite3.h
diff --git a/jni/external/xz_config/config.h b/jni/external/include/xz_config/config.h
similarity index 100%
rename from jni/external/xz_config/config.h
rename to jni/external/include/xz_config/config.h
diff --git a/jni/magiskboot/sha1.c b/jni/external/sha1/sha1.c
similarity index 100%
rename from jni/magiskboot/sha1.c
rename to jni/external/sha1/sha1.c