diff --git a/mtp/ffs/Android.mk b/mtp/ffs/Android.mk
old mode 100644
new mode 100755
index 9e75e0d..740afcb
--- a/mtp/ffs/Android.mk
+++ b/mtp/ffs/Android.mk
@@ -5,14 +5,17 @@
 include $(CLEAR_VARS)
 LOCAL_MODULE := libtwrpmtp-ffs
 LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64 -DMTP_DEVICE -DMTP_HOST -fno-strict-aliasing -Wno-unused-variable -Wno-format -Wno-unused-parameter -Wno-unused-private-field
-LOCAL_C_INCLUDES += $(LOCAL_PATH) bionic frameworks/base/include system/core/include bionic/libc/private/ bootable/recovery/twrplibusbhost/include
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0)
-    LOCAL_C_INCLUDES += external/stlport/stlport
-    LOCAL_SHARED_LIBRARIES += libstlport
-else
-    LOCAL_SHARED_LIBRARIES += libc++
-endif
+LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64 -DMTP_DEVICE -DMTP_HOST -fno-strict-aliasing \
+    -Wno-unused-variable -Wno-format -Wno-unused-parameter -Wno-unused-private-field \
+    -Wno-implicit-fallthrough
+LOCAL_C_INCLUDES += $(LOCAL_PATH) bionic \
+    frameworks/base/include \
+    system/core/include \
+    bionic/libc/private/ \
+    bootable/recovery/twrplibusbhost/include \
+    bootable/recovery/install/include
+
+LOCAL_SHARED_LIBRARIES += libc++ libaosprecovery
 
 LOCAL_SRC_FILES = \
     MtpDataPacket.cpp \
@@ -54,7 +57,6 @@
                           libdl \
                           libcutils \
                           libutils \
-                          libaosprecovery \
                           libselinux \
                           libbase
 
diff --git a/mtp/ffs/MtpStorage.h b/mtp/ffs/MtpStorage.h
index 9d6d291..8d12b07 100755
--- a/mtp/ffs/MtpStorage.h
+++ b/mtp/ffs/MtpStorage.h
@@ -23,7 +23,7 @@
 #include "MtpTypes.h"
 #include "mtp.h"
 #include "btree.hpp"
-#include "../../tw_atomic.hpp"
+#include "tw_atomic.hpp"
 
 class MtpDatabase;