diff --git a/crypto/lollipop/Android.mk b/crypto/lollipop/Android.mk
index fb98609..c98d428 100644
--- a/crypto/lollipop/Android.mk
+++ b/crypto/lollipop/Android.mk
@@ -8,7 +8,7 @@
 	external/openssl/include \
 	external/stlport/stlport \
 	bionic \
-	external/scrypt/lib/crypto \
+	bootable/recovery/crypto/scrypt/lib/crypto \
 	frameworks/native/include \
 	system/security/keystore \
 	hardware/libhardware/include/hardware \
@@ -51,20 +51,4 @@
 
 include $(BUILD_SHARED_LIBRARY)
 
-include $(CLEAR_VARS)
-
-LOCAL_SHARED_LIBRARIES := libcutils liblog
-
-LOCAL_INCLUDES += $(LOCAL_PATH) $(LOCAL_PATH)\libminhardware
-
-LOCAL_CFLAGS  += -DQEMU_HARDWARE
-QEMU_HARDWARE := true
-
-LOCAL_SHARED_LIBRARIES += libdl
-
-LOCAL_SRC_FILES += libminhardware/hardware.c
-
-LOCAL_MODULE:= libminhardware
-
-include $(BUILD_SHARED_LIBRARY)
 endif
diff --git a/crypto/scrypt/Scrypt.mk b/crypto/scrypt/Scrypt.mk
index 45af97f..04fa6f8 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)
+LOCAL_C_INCLUDES += $(target_c_includes) bootable/recovery/crypto/scrypt/lib/util
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE:= libscrypttwrp_static
 LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies)
diff --git a/crypto/scrypt/tests/Android.mk b/crypto/scrypt/tests/Android.mk
index 07c2102..c20b41d 100644
--- a/crypto/scrypt/tests/Android.mk
+++ b/crypto/scrypt/tests/Android.mk
@@ -20,6 +20,7 @@
     libgtest \
     libgtest_main
 
+LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := scrypttwrp_test
 
 include $(BUILD_NATIVE_TEST)