diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc
index 4f0c2ef613..3311849941 100644
--- a/src/console/Makefile.inc
+++ b/src/console/Makefile.inc
@@ -8,8 +8,8 @@ ramstage-$(CONFIG_RAMSTAGE_LIBHWBASE) += hw-debug_sink.adb
 endif
 
 smm-$(CONFIG_DEBUG_SMI) += init.c console.c vtxprintf.c printk.c
-smm-$(CONFIG_SMM_TSEG) += die.c
-smm-$(CONFIG_SMM_TSEG) += post.c
+smm-y += die.c
+smm-y += post.c
 
 verstage-y += init.c
 verstage-y += printk.c
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index f6d3f6deb5..f0738eef4e 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -117,7 +117,6 @@ ramstage-y += fmap.c
 ramstage-y += memchr.c
 ramstage-y += memcmp.c
 ramstage-y += malloc.c
-smm-$(CONFIG_SMM_TSEG) += malloc.c
 ramstage-y += dimm_info_util.c
 ramstage-y += delay.c
 ramstage-y += fallback_boot.c
@@ -190,6 +189,7 @@ romstage-y += boot_device.c
 ramstage-y += boot_device.c
 
 smm-y += boot_device.c
+smm-y += malloc.c
 smm-y += delay.c
 smm-y += fmap.c
 smm-y += cbfs.c memcmp.c