diff --git a/src/arch/x86/bootblock_normal.c b/src/arch/x86/bootblock_normal.c
index 9341ac3325..4bc9b01332 100644
--- a/src/arch/x86/bootblock_normal.c
+++ b/src/arch/x86/bootblock_normal.c
@@ -12,7 +12,7 @@ static const char *get_fallback(const char *stagelist)
 	return ++stagelist;
 }
 
-int legacy_romstage_select_and_load(struct prog *romstage)
+enum cb_err legacy_romstage_select_and_load(struct prog *romstage)
 {
 	static const char *default_filenames = "normal/romstage\0fallback/romstage";
 	const char *boot_candidate;
@@ -24,8 +24,8 @@ int legacy_romstage_select_and_load(struct prog *romstage)
 
 	if (do_normal_boot()) {
 		romstage->name = boot_candidate;
-		if (!cbfs_prog_stage_load(romstage))
-			return 0;
+		if (cbfs_prog_stage_load(romstage) == CB_SUCCESS)
+			return CB_SUCCESS;
 	}
 
 	romstage->name = get_fallback(boot_candidate);
diff --git a/src/include/program_loading.h b/src/include/program_loading.h
index ba42465046..7ff55fc4b5 100644
--- a/src/include/program_loading.h
+++ b/src/include/program_loading.h
@@ -5,8 +5,7 @@
 #include <bootmem.h>
 #include <commonlib/bsd/cbfs_serialized.h>
 #include <commonlib/region.h>
-#include <stdint.h>
-#include <stddef.h>
+#include <types.h>
 
 enum {
 	/* Last segment of program. Can be used to take different actions for
@@ -139,7 +138,7 @@ void platform_prog_run(struct prog *prog);
 void run_romstage(void);
 
 /* Runtime selector for CBFS_PREFIX of romstage. */
-int legacy_romstage_select_and_load(struct prog *romstage);
+enum cb_err legacy_romstage_select_and_load(struct prog *romstage);
 
 /************************
  *   RAMSTAGE LOADING   *
diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c
index a296bd6da5..0e175c6b70 100644
--- a/src/lib/prog_loaders.c
+++ b/src/lib/prog_loaders.c
@@ -27,7 +27,7 @@ void run_romstage(void)
 	timestamp_add_now(TS_COPYROM_START);
 
 	if (ENV_X86 && CONFIG(BOOTBLOCK_NORMAL)) {
-		if (legacy_romstage_select_and_load(&romstage))
+		if (legacy_romstage_select_and_load(&romstage) != CB_SUCCESS)
 			goto fail;
 	} else {
 		if (cbfs_prog_stage_load(&romstage))