diff --git a/core/Makefile b/core/Makefile
index e7eafe8..f0e8458 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1,9 +1,5 @@
 # Put some miscellaneous rules here
 
-# HACK: clear LOCAL_PATH from including last build target before calling
-# intermedites-dir-for
-LOCAL_PATH := $(BUILD_SYSTEM)
-
 # Pick a reasonable string to use to identify files.
 ifneq "" "$(filter eng.%,$(BUILD_NUMBER))"
   # BUILD_NUMBER has a timestamp in it, which means that
@@ -654,6 +650,10 @@
 
 INSTALLED_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img
 
+# HACK: clear LOCAL_PATH from including last build target before calling
+# intermedites-dir-for
+LOCAL_PATH := $(call my-dir)
+
 recovery_initrc := $(call include-path-for, recovery)/etc/init.rc
 recovery_kernel := $(INSTALLED_KERNEL_TARGET) # same as a non-recovery system
 recovery_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.img
diff --git a/core/definitions.mk b/core/definitions.mk
index 94e7432..783cf3d 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -118,15 +118,14 @@
 
 ###########################################################
 ## Retrieve the directory of the current makefile
-## Must be called before including any other makefile!!
 ###########################################################
 
 # Figure out where we are.
 define my-dir
 $(strip \
   $(eval LOCAL_MODULE_MAKEFILE := $$(lastword $$(MAKEFILE_LIST))) \
-  $(if $(filter $(BUILD_SYSTEM)/% $(OUT_DIR)/%,$(LOCAL_MODULE_MAKEFILE)), \
-    $(error my-dir must be called before including any other makefile.) \
+  $(if $(filter $(CLEAR_VARS),$(LOCAL_MODULE_MAKEFILE)), \
+    $(error LOCAL_PATH must be set before including $$(CLEAR_VARS)) \
    , \
     $(patsubst %/,%,$(dir $(LOCAL_MODULE_MAKEFILE))) \
    ) \
@@ -155,7 +154,6 @@
 
 ###########################################################
 ## Retrieve a list of all makefiles immediately below your directory
-## Must be called before including any other makefile!!
 ###########################################################
 
 define all-subdir-makefiles
@@ -165,7 +163,6 @@
 ###########################################################
 ## Look in the named list of directories for makefiles,
 ## relative to the current directory.
-## Must be called before including any other makefile!!
 ###########################################################
 
 # $(1): List of directories to look for under this directory