diff --git a/core/binary.mk b/core/binary.mk
index 5cb17bcd42..70af9b9da4 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -702,3 +702,6 @@ ifdef LOCAL_EXPORT_C_INCLUDE_DIRS
 else
 	$(hide) touch $@
 endif
+
+# Make sure export_includes gets generated when you are running mm/mmm
+$(LOCAL_BUILT_MODULE) : | $(export_includes)
diff --git a/core/prebuilt.mk b/core/prebuilt.mk
index 0c46341180..b06bb6e0e8 100644
--- a/core/prebuilt.mk
+++ b/core/prebuilt.mk
@@ -56,6 +56,8 @@ ifdef prebuilt_module_is_a_library
 $(intermediates)/export_includes:
 	$(hide) mkdir -p $(dir $@) && rm -f $@
 	$(hide) touch $@
+
+$(LOCAL_BUILT_MODULE) : | $(intermediates)/export_includes
 endif
 endif