diff --git a/Android.mk b/Android.mk
index af49367..2725a0b 100755
--- a/Android.mk
+++ b/Android.mk
@@ -143,6 +143,7 @@
     LOCAL_SHARED_LIBRARIES += libstlport
     LOCAL_CFLAGS += -DTW_NO_SHA2_LIBRARY
 endif
+LOCAL_CFLAGS += -DSDK_VERSION=$(PLATFORM_SDK_VERSION)
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 25; echo $$?),0)
     LOCAL_CFLAGS += -DUSE_OLD_BASE_INCLUDE
 endif
diff --git a/twrp.cpp b/twrp.cpp
index f7ad7cb..6df37d9 100755
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -44,10 +44,12 @@
 #include "data.hpp"
 #include "partitions.hpp"
 
-#ifdef USE_OLD_BASE_INCLUDE
-#include <strings.h>
-#else
+#if SDK_VERSION >= 24
 #include <android-base/strings.h>
+#elif SDK_VERSION == 23
+#include <base/strings.h>
+#else
+#include <strings.h>
 #endif
 #include "openrecoveryscript.hpp"
 #include "variables.h"