diff --git a/arch/sparc64/kernel/power.c b/arch/sparc64/kernel/power.c
index 627083abd1cfc0f01a764851b22f35769de1549c..9aee3eb553c263ba68b2853bd654c3ca027e6a46 100644
--- a/arch/sparc64/kernel/power.c
+++ b/arch/sparc64/kernel/power.c
@@ -11,6 +11,7 @@
 #include <linux/signal.h>
 #include <linux/delay.h>
 
+#include <asm/system.h>
 #include <asm/ebus.h>
 
 #define __KERNEL_SYSCALLS__
@@ -37,8 +38,6 @@ extern void machine_halt(void);
 extern void machine_alt_power_off(void);
 static void (*poweroff_method)(void) = machine_alt_power_off;
 
-extern int serial_console;
-
 void machine_power_off(void)
 {
 	if (!serial_console) {
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c
index ab54ef26009960f14b11e7ce0e7f8f838e366582..d2cac7fe44ca1e70ad6d81ba4894b65b48883f39 100644
--- a/arch/sparc64/kernel/process.c
+++ b/arch/sparc64/kernel/process.c
@@ -110,7 +110,6 @@ int cpu_idle(void)
 extern char reboot_command [];
 
 extern void (*prom_palette)(int);
-extern int serial_console;
 extern void (*prom_keyboard)(void);
 
 void machine_halt(void)
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index f898042c2cb3ed99e7835037ae290b24bc6be2d9..2841993cd2a20936017ba7bd3d2317f728e9a1fc 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -484,7 +484,6 @@ extern void paging_init(void);
 
 void __init setup_arch(char **cmdline_p)
 {
-	extern int serial_console;  /* in console.c, of course */
 	unsigned long highest_paddr;
 	int i;
 
diff --git a/arch/sparc64/prom/misc.c b/arch/sparc64/prom/misc.c
index 5a58b70944abb54ccbf7842ad3bc3d7c025835c6..7315aa68e963b89967bafd71c95f91574c7986f4 100644
--- a/arch/sparc64/prom/misc.c
+++ b/arch/sparc64/prom/misc.c
@@ -14,6 +14,7 @@
 #include <linux/delay.h>
 #include <asm/openprom.h>
 #include <asm/oplib.h>
+#include <asm/system.h>
 
 /* Reset and reboot the machine with the command 'bcommand'. */
 void prom_reboot(char *bcommand)
@@ -33,7 +34,6 @@ void prom_feval(char *fstring)
 
 /* We want to do this more nicely some day. */
 extern void (*prom_palette)(int);
-extern int serial_console;
 
 #ifdef CONFIG_SMP
 extern void smp_capture(void);