diff --git a/otafault/Android.mk b/otafault/Android.mk
index 7d65b55..c40fc06 100644
--- a/otafault/Android.mk
+++ b/otafault/Android.mk
@@ -14,12 +14,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifdef project-path-for
-    RECOVERY_PATH := $(call project-path-for,recovery)
-else
-    RECOVERY_PATH := bootable/recovery
-endif
-
 include $(CLEAR_VARS)
 
 otafault_static_libs := \
@@ -39,7 +33,7 @@
 LOCAL_MODULE_TAGS := eng
 LOCAL_MODULE := libotafault
 LOCAL_CLANG := true
-LOCAL_C_INCLUDES := $(RECOVERY_PATH)
+LOCAL_C_INCLUDES := $(commands_recovery_local_path)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 LOCAL_WHOLE_STATIC_LIBRARIES := $(otafault_static_libs)
 
@@ -54,7 +48,7 @@
 LOCAL_MODULE := otafault_test
 LOCAL_STATIC_LIBRARIES := $(otafault_static_libs)
 LOCAL_CFLAGS := -Werror
-LOCAL_C_INCLUDES := $(RECOVERY_PATH)
+LOCAL_C_INCLUDES := $(commands_recovery_local_path)
 LOCAL_FORCE_STATIC_EXECUTABLE := true
 
 include $(BUILD_EXECUTABLE)
diff --git a/tests/Android.mk b/tests/Android.mk
index ff8f3a3..097b633 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -16,12 +16,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifdef project-path-for
-    RECOVERY_PATH := $(call project-path-for,recovery)
-else
-    RECOVERY_PATH := bootable/recovery
-endif
-
 # Unit tests
 include $(CLEAR_VARS)
 LOCAL_CFLAGS := -Werror
@@ -46,7 +40,7 @@
     unit/sysutil_test.cpp \
     unit/zip_test.cpp \
 
-LOCAL_C_INCLUDES := $(RECOVERY_PATH)
+LOCAL_C_INCLUDES := $(commands_recovery_local_path)
 LOCAL_SHARED_LIBRARIES := liblog
 include $(BUILD_NATIVE_TEST)
 
@@ -104,7 +98,7 @@
 
 LOCAL_MODULE := recovery_component_test
 LOCAL_COMPATIBILITY_SUITE := device-tests
-LOCAL_C_INCLUDES := $(RECOVERY_PATH)
+LOCAL_C_INCLUDES := $(commands_recovery_local_path)
 LOCAL_SRC_FILES := \
     component/applypatch_test.cpp \
     component/bootloader_message_test.cpp \