diff --git a/Makefile.inc b/Makefile.inc
index 9365a4a..ba4f6fa 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -653,6 +653,14 @@
 postcar-c-deps+=$(DEVICETREE_STATIC_C)
 smm-c-deps+=$(DEVICETREE_STATIC_C)
 
+# Ensure fmap_config.h are created before any objects are compiled
+ramstage-c-deps+=$(obj)/fmap_config.h
+romstage-c-deps+=$(obj)/fmap_config.h
+verstage-c-deps+=$(obj)/fmap_config.h
+bootblock-c-deps+=$(obj)/fmap_config.h
+postcar-c-deps+=$(obj)/fmap_config.h
+smm-c-deps+=$(obj)/fmap_config.h
+
 .PHONY: devicetree
 devicetree: $(DEVICETREE_STATIC_C)