diff --git a/crypto/lollipop/Android.mk b/crypto/lollipop/Android.mk
index c98d428..d263a9f 100644
--- a/crypto/lollipop/Android.mk
+++ b/crypto/lollipop/Android.mk
@@ -8,7 +8,7 @@
 	external/openssl/include \
 	external/stlport/stlport \
 	bionic \
-	bootable/recovery/crypto/scrypt/lib/crypto \
+	$(commands_recovery_local_path)/crypto/scrypt/lib/crypto \
 	frameworks/native/include \
 	system/security/keystore \
 	hardware/libhardware/include/hardware \
diff --git a/crypto/scrypt/Scrypt.mk b/crypto/scrypt/Scrypt.mk
index 04fa6f8..d2a2fa4 100644
--- a/crypto/scrypt/Scrypt.mk
+++ b/crypto/scrypt/Scrypt.mk
@@ -24,7 +24,7 @@
 
 LOCAL_SRC_FILES += $(target_src_files)
 LOCAL_CFLAGS += $(target_c_flags)
-LOCAL_C_INCLUDES += $(target_c_includes) bootable/recovery/crypto/scrypt/lib/util
+LOCAL_C_INCLUDES += $(target_c_includes) $(commands_recovery_local_path)/crypto/scrypt/lib/util
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE:= libscrypttwrp_static
 LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies)
@@ -38,7 +38,7 @@
 LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
 LOCAL_SRC_FILES += $(host_src_files)
 LOCAL_CFLAGS += $(host_c_flags)
-LOCAL_C_INCLUDES += $(host_c_includes)
+LOCAL_C_INCLUDES += $(host_c_includes) $(commands_recovery_local_path)/crypto/scrypt/lib/util
 LOCAL_LDLIBS += -ldl
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE:= libscrypttwrp_static