diff --git a/Makefile.in b/Makefile.in
index 2658629f9183..9f6b6d1162df 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,12 +24,10 @@ endif
 include $(topsrcdir)/config/config.mk
 
 ifneq (mobile/android,$(MOZ_BUILD_APP))
-# We only want to generate buildid.h once, during the export phase.
-ifeq ($(MAKECMDGOALS),buildid.h)
-$(MDDEPDIR)/buildid.h.stub: FORCE
-endif
-ifeq ($(MAKECMDGOALS),source-repo.h)
-$(MDDEPDIR)/source-repo.h.stub: FORCE
+# We only want to generate buildid.h once, during the (recurse) export phase.
+# faster make build the files explicitly so also match thoses
+ifneq ($(filter $(MAKECMDGOALS),recurse_export buildid.h source-repo.h),)
+$(MDDEPDIR)/buildid.h.stub $(MDDEPDIR)/source-repo.h.stub: FORCE
 endif
 endif
 source-repo.h: $(MDDEPDIR)/source-repo.h.stub