diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc
index 56c976d6f4..9bd5091e76 100644
--- a/src/vendorcode/google/chromeos/Makefile.inc
+++ b/src/vendorcode/google/chromeos/Makefile.inc
@@ -17,8 +17,6 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-romstage-y += chromeos.c
-ramstage-y += chromeos.c
 romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += vbnv.c
 ramstage-$(CONFIG_ARCH_RAMSTAGE_X86_32) += vbnv.c
 romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += vboot.c
@@ -35,6 +33,8 @@ CFLAGS_common += -DMOCK_TPM=0
 endif
 
 ifeq ($(CONFIG_VBOOT_VERIFY_FIRMWARE),y)
+romstage-y += vboot_handoff.c
+ramstage-y += vboot_handoff.c
 romstage-y += vboot_loader.c
 rmodules-y += vboot_wrapper.c
 
diff --git a/src/vendorcode/google/chromeos/chromeos.c b/src/vendorcode/google/chromeos/vboot_handoff.c
similarity index 97%
rename from src/vendorcode/google/chromeos/chromeos.c
rename to src/vendorcode/google/chromeos/vboot_handoff.c
index f8dd7dc3d8..937b2e31c0 100644
--- a/src/vendorcode/google/chromeos/chromeos.c
+++ b/src/vendorcode/google/chromeos/vboot_handoff.c
@@ -19,15 +19,11 @@
 
 #include <stddef.h>
 #include "chromeos.h"
-#if CONFIG_VBOOT_VERIFY_FIRMWARE
-#include "vboot_handoff.h"
-#endif
 #include <boot/coreboot_tables.h>
 #include <cbmem.h>
 #include <console/console.h>
-
-#if CONFIG_VBOOT_VERIFY_FIRMWARE
 #include <payload_loader.h>
+#include "vboot_handoff.h"
 
 int vboot_enable_developer(void)
 {
@@ -117,4 +113,3 @@ int vboot_get_handoff_info(void **addr, uint32_t *size)
 	*size = sizeof(*vboot_handoff);
 	return 0;
 }
-#endif