diff --git a/Makefile.inc b/Makefile.inc
index 7caf359844..927548e0df 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -48,7 +48,7 @@ PHONY+= clean-abuild coreboot lint lint-stable build-dirs
 
 #######################################################################
 # root source directories of coreboot
-subdirs-y := src/lib src/boot src/console src/devices src/ec src/southbridge
+subdirs-y := src/lib src/console src/devices src/ec src/southbridge
 subdirs-y += src/northbridge src/superio src/drivers src/cpu src/vendorcode
 subdirs-y += util/cbfstool util/sconfig util/nvramtool
 subdirs-y += src/arch/$(ARCHDIR-y)
diff --git a/src/boot/Makefile.inc b/src/boot/Makefile.inc
deleted file mode 100644
index a61f89ed00..0000000000
--- a/src/boot/Makefile.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-ramstage-y += hardwaremain.c
-ramstage-y += selfboot.c
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index f99ca1b002..3b161705ed 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -39,6 +39,8 @@ romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
 romstage-y += compute_ip_checksum.c
 romstage-y += memmove.c
 
+ramstage-y += hardwaremain.c
+ramstage-y += selfboot.c
 ifneq ($(CONFIG_HAVE_ARCH_MEMSET),y)
 ramstage-y += memset.c
 endif
diff --git a/src/boot/hardwaremain.c b/src/lib/hardwaremain.c
similarity index 100%
rename from src/boot/hardwaremain.c
rename to src/lib/hardwaremain.c
diff --git a/src/boot/selfboot.c b/src/lib/selfboot.c
similarity index 100%
rename from src/boot/selfboot.c
rename to src/lib/selfboot.c