3 files changed, 12 insertions, 5 deletions
diff --git a/src/include/bootblock_common.h b/src/include/bootblock_common.h
index 1acbef4855..c8156d0236 100644
--- a/src/include/bootblock_common.h
+++ b/src/include/bootblock_common.h
@@ -16,6 +16,8 @@
 #ifndef __BOOTBLOCK_COMMON_H
 #define __BOOTBLOCK_COMMON_H
 
+#include <main_decl.h>
+
 /* These are defined as weak no-ops that can be overridden by mainboard/SoC. */
 void bootblock_mainboard_early_init(void);
 void bootblock_mainboard_init(void);
diff --git a/src/include/bootstate.h b/src/include/bootstate.h
index c38d2ba959..0889018e18 100644
--- a/src/include/bootstate.h
+++ b/src/include/bootstate.h
@@ -20,6 +20,10 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <stdint.h>
+/* Only declare main() when in ramstage. */
+#if ENV_RAMSTAGE
+#include <main_decl.h>
+#endif
 
 /* Control debugging of the boot state machine. */
 #define BOOT_STATE_DEBUG 0
@@ -168,11 +172,6 @@ int boot_state_unblock(boot_state_t state, boot_state_sequence_t seq);
 void boot_state_current_block(void);
 void boot_state_current_unblock(void);
 
-#if ENV_RAMSTAGE
-/* Entry into the boot state machine. */
-void main(void);
-#endif
-
 /* In order to schedule boot state callbacks at compile-time specify the
  * entries in an array using the BOOT_STATE_INIT_ENTRIES and
  * BOOT_STATE_INIT_ENTRY macros below. */
diff --git a/src/include/main_decl.h b/src/include/main_decl.h
new file mode 100644
index 0000000000..90c17161ed
--- /dev/null
+++ b/src/include/main_decl.h
@@ -0,0 +1,6 @@
+#ifndef _MAIN_DECL_H_
+#define _MAIN_DECL_H_
+
+void main(void);
+
+#endif