diff --git a/src/arch/x86/lib/Makefile.inc b/src/arch/x86/lib/Makefile.inc
index 49d7e9e60e..82f4e62d21 100644
--- a/src/arch/x86/lib/Makefile.inc
+++ b/src/arch/x86/lib/Makefile.inc
@@ -20,4 +20,7 @@ smm-y += memset.c
 smm-y += memcpy.c
 smm-y += rom_media.c
 
+rmodules-y += memset.c
+rmodules-y += memcpy.c
+
 $(obj)/arch/x86/lib/console.ramstage.o :: $(obj)/build.h
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index 97baaa2be0..132e662d8c 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -29,12 +29,15 @@ bootblock-y += memcmp.c
 
 ifneq ($(CONFIG_HAVE_ARCH_MEMSET),y)
 romstage-y += memset.c
+rmodules-y += memset.c
 endif
 romstage-y += memchr.c
 ifneq ($(CONFIG_HAVE_ARCH_MEMCPY),y)
 romstage-y += memcpy.c
+rmodules-y += memcpy.c
 endif
 romstage-y += memcmp.c
+rmodules-y += memcmp.c
 romstage-y += cbfs.c
 romstage-y += lzma.c
 #romstage-y += lzmadecode.c
@@ -127,3 +130,4 @@ $(strip $(1)): $(strip $(2)) $$(RMODULE_LDSCRIPT) $$(obj)/ldoptions
 endef
 
 endif
+