4 files changed, 5 insertions, 13 deletions
diff --git a/src/arch/armv7/bootblock_simple.c b/src/arch/armv7/bootblock_simple.c
index 6ed63ce1d0..2c8e05394c 100644
--- a/src/arch/armv7/bootblock_simple.c
+++ b/src/arch/armv7/bootblock_simple.c
@@ -25,19 +25,10 @@
 #include <arch/stages.h>
 #include <cbfs.h>
 #include <console/console.h>
+#include <smp/node.h>
 
 #include "stages.c"
 
-static int boot_cpu(void)
-{
-	/*
-	 * FIXME: This is a stub for now. All non-boot CPUs should be
-	 * waiting for an interrupt. We could move the chunk of assembly
-	 * which puts them to sleep in here...
-	 */
-	return 1;
-}
-
 void main(void)
 {
 	const char *stage_name = "fallback/romstage";
diff --git a/src/arch/x86/init/bootblock_normal.c b/src/arch/x86/init/bootblock_normal.c
index 82bad53d17..f227e8e9dd 100644
--- a/src/arch/x86/init/bootblock_normal.c
+++ b/src/arch/x86/init/bootblock_normal.c
@@ -1,3 +1,4 @@
+#include <smp/node.h>
 #include <bootblock_common.h>
 #include <pc80/mc146818rtc.h>
 
diff --git a/src/arch/x86/init/bootblock_simple.c b/src/arch/x86/init/bootblock_simple.c
index 204636e072..34f55cac35 100644
--- a/src/arch/x86/init/bootblock_simple.c
+++ b/src/arch/x86/init/bootblock_simple.c
@@ -1,3 +1,4 @@
+#include <smp/node.h>
 #include <bootblock_common.h>
 
 static void main(unsigned long bist)
diff --git a/src/arch/x86/lib/romstage_console.c b/src/arch/x86/lib/romstage_console.c
index 0eb3dc2779..68b10eb8af 100644
--- a/src/arch/x86/lib/romstage_console.c
+++ b/src/arch/x86/lib/romstage_console.c
@@ -17,8 +17,10 @@
  * MA 02110-1301 USA
  */
 
+#include <smp/node.h>
 #include <console/console.h>
 #include <console/vtxprintf.h>
+
 #if CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM
 #include <uart8250.h>
 #endif
@@ -31,9 +33,6 @@
 #if CONFIG_SPKMODEM
 #include <console/spkmodem.h>
 #endif
-#if CONFIG_SQUELCH_EARLY_SMP
-#include <cpu/x86/lapic.h>
-#endif
 
 void console_tx_byte(unsigned char byte)
 {