diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 67f8364aa8..36591adbb6 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -52,10 +52,18 @@ verstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
 
 ifeq ($(MOCK_TPM),1)
 libverstage-y += mocked_tlcl.c
+romstage-$(CONFIG_SEPARATE_VERSTAGE) += mocked_tlcl.c
 else
 libverstage-$(CONFIG_TPM) += tlcl.c
 libverstage-$(CONFIG_TPM2) += tpm2_marshaling.c
 libverstage-$(CONFIG_TPM2) += tpm2_tlcl.c
+
+ifeq ($(CONFIG_SEPARATE_VERSTAGE),y)
+romstage-$(CONFIG_TPM) += tlcl.c
+romstage-$(CONFIG_TPM2) += tpm2_marshaling.c
+romstage-$(CONFIG_TPM2) += tpm2_tlcl.c
+endif # CONFIG_SEPARATE_VERSTAGE
+
 endif
 
 verstage-$(CONFIG_GENERIC_UDELAY) += timer.c
diff --git a/src/vboot/Makefile.inc b/src/vboot/Makefile.inc
index 82b4ac2e9e..05870cab68 100644
--- a/src/vboot/Makefile.inc
+++ b/src/vboot/Makefile.inc
@@ -67,8 +67,10 @@ verstage-y += common.c
 verstage-y += verstage.c
 ifeq (${CONFIG_VBOOT_MOCK_SECDATA},y)
 libverstage-y += secdata_mock.c
+romstage-$(CONFIG_SEPARATE_VERSTAGE) += secdata_mock.c
 else
 libverstage-y += secdata_tpm.c
+romstage-$(CONFIG_SEPARATE_VERSTAGE) += secdata_tpm.c
 endif
 romstage-y += vboot_handoff.c common.c