diff --git a/src/drivers/smmstore/Makefile.inc b/src/drivers/smmstore/Makefile.inc
index 1c2e3367ae..b37637b2b5 100644
--- a/src/drivers/smmstore/Makefile.inc
+++ b/src/drivers/smmstore/Makefile.inc
@@ -1,13 +1,5 @@
 all-$(CONFIG_SMMSTORE) += store.c
 
-ifeq ($(CONFIG_SMMSTORE),y)
-$(call src-to-obj,bootblock,$(dir)/store.c) : $(obj)/fmap_config.h
-$(call src-to-obj,verstage,$(dir)/store.c) : $(obj)/fmap_config.h
-$(call src-to-obj,romstage,$(dir)/store.c) : $(obj)/fmap_config.h
-$(call src-to-obj,postcar,$(dir)/store.c) : $(obj)/fmap_config.h
-$(call src-to-obj,ramstage,$(dir)/store.c) : $(obj)/fmap_config.h
-$(call src-to-obj,smm,$(dir)/store.c) : $(obj)/fmap_config.h
-endif
 ramstage-$(CONFIG_SMMSTORE_V2) += ramstage.c
 
 smm-$(CONFIG_SMMSTORE) += store.c smi.c
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 28e8dd39c1..53ff2d36cf 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -241,13 +241,6 @@ $(call src-to-obj,smm,$(dir)/version.c) : $(obj)/build.h
 $(call src-to-obj,verstage,$(dir)/version.c) : $(obj)/build.h
 $(call src-to-obj,postcar,$(dir)/version.c) : $(obj)/build.h
 
-$(call src-to-obj,bootblock,$(dir)/fmap.c) : $(obj)/fmap_config.h
-$(call src-to-obj,romstage,$(dir)/fmap.c) : $(obj)/fmap_config.h
-$(call src-to-obj,ramstage,$(dir)/fmap.c) : $(obj)/fmap_config.h
-$(call src-to-obj,smm,$(dir)/fmap.c) : $(obj)/fmap_config.h
-$(call src-to-obj,verstage,$(dir)/fmap.c) : $(obj)/fmap_config.h
-$(call src-to-obj,postcar,$(dir)/fmap.c) : $(obj)/fmap_config.h
-
 bootblock-y += bootmode.c
 romstage-y += bootmode.c
 ramstage-y += bootmode.c
@@ -412,10 +405,7 @@ cbfs_master_header-file := cbfs_master_header.c:struct
 cbfs_master_header-type := "cbfs header"
 cbfs_master_header-position := 0
 
-ifeq ($(CONFIG_ARCH_X86),y)
-$(call src-to-obj,bootblock,$(dir)/master_header_pointer.c): $(obj)/fmap_config.h
-bootblock-y += master_header_pointer.c
-endif
+bootblock-$(CONFIG_ARCH_X86) += master_header_pointer.c
 
 NEED_CBFS_POINTER=
 
diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc
index ba83c3bd6a..62a566019f 100644
--- a/src/security/vboot/Makefile.inc
+++ b/src/security/vboot/Makefile.inc
@@ -73,11 +73,6 @@ romstage-$(CONFIG_VBOOT_VBNV_CMOS) += vbnv_cmos.c
 ramstage-$(CONFIG_VBOOT_VBNV_CMOS) += vbnv_cmos.c
 postcar-$(CONFIG_VBOOT_VBNV_CMOS) += vbnv_cmos.c
 
-$(call src-to-obj,bootblock,$(dir)/vbnv_flash.c) : $(obj)/fmap_config.h
-$(call src-to-obj,verstage,$(dir)/vbnv_flash.c) : $(obj)/fmap_config.h
-$(call src-to-obj,romstage,$(dir)/vbnv_flash.c) : $(obj)/fmap_config.h
-$(call src-to-obj,ramstage,$(dir)/vbnv_flash.c) : $(obj)/fmap_config.h
-$(call src-to-obj,postcar,$(dir)/vbnv_flash.c) : $(obj)/fmap_config.h
 bootblock-$(CONFIG_VBOOT_VBNV_CMOS_BACKUP_TO_FLASH) += vbnv_flash.c
 verstage-$(CONFIG_VBOOT_VBNV_CMOS_BACKUP_TO_FLASH) += vbnv_flash.c
 romstage-$(CONFIG_VBOOT_VBNV_CMOS_BACKUP_TO_FLASH) += vbnv_flash.c
diff --git a/src/soc/amd/common/block/apob/Makefile.inc b/src/soc/amd/common/block/apob/Makefile.inc
index 746e015103..ae550bc522 100644
--- a/src/soc/amd/common/block/apob/Makefile.inc
+++ b/src/soc/amd/common/block/apob/Makefile.inc
@@ -3,7 +3,4 @@ ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_APOB),y)
 romstage-y += apob_cache.c
 ramstage-y += apob_cache.c
 
-$(call src-to-obj,romstage,$(dir)/apob_cache.c) : $(obj)/fmap_config.h
-$(call src-to-obj,ramstage,$(dir)/apob_cache.c) : $(obj)/fmap_config.h
-
 endif # CONFIG_SOC_AMD_COMMON_BLOCK_APOB
diff --git a/src/vendorcode/eltan/security/verified_boot/Makefile.inc b/src/vendorcode/eltan/security/verified_boot/Makefile.inc
index aef81943a8..9158760322 100644
--- a/src/vendorcode/eltan/security/verified_boot/Makefile.inc
+++ b/src/vendorcode/eltan/security/verified_boot/Makefile.inc
@@ -10,11 +10,6 @@ postcar-y += vboot_check.c
 romstage-y += vboot_check.c
 ramstage-y += vboot_check.c
 
-$(call src-to-obj,bootblock,$(dir)/vboot_check.c) : $(obj)/fmap_config.h
-$(call src-to-obj,postcar,$(dir)/vboot_check.c) : $(obj)/fmap_config.h
-$(call src-to-obj,romstage,$(dir)/vboot_check.c) : $(obj)/fmap_config.h
-$(call src-to-obj,ramstage,$(dir)/vboot_check.c) : $(obj)/fmap_config.h
-
 ifeq ($(CONFIG_VENDORCODE_ELTAN_VBOOT),y)
 cbfs-files-y += oemmanifest.bin
 oemmanifest.bin-file     := $(obj)/oemmanifest.bin