Index: kernel/arch/sparc64/src/console.c
===================================================================
--- kernel/arch/sparc64/src/console.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/sparc64/src/console.c	(revision ad2cf042bea2029414bd5597a2ce547b208ff957)
@@ -48,5 +48,4 @@
 #include <panic.h>
 #include <str.h>
-#include <print.h>
 
 #define KEYBOARD_POLL_PAUSE	50000	/* 50ms */
Index: kernel/arch/sparc64/src/cpu/sun4u/cpu.c
===================================================================
--- kernel/arch/sparc64/src/cpu/sun4u/cpu.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/sparc64/src/cpu/sun4u/cpu.c	(revision ad2cf042bea2029414bd5597a2ce547b208ff957)
@@ -38,5 +38,5 @@
 #include <genarch/ofw/ofw_tree.h>
 #include <arch/drivers/tick.h>
-#include <print.h>
+#include <stdio.h>
 #include <arch/cpu_node.h>
 
Index: kernel/arch/sparc64/src/cpu/sun4v/cpu.c
===================================================================
--- kernel/arch/sparc64/src/cpu/sun4v/cpu.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/sparc64/src/cpu/sun4v/cpu.c	(revision ad2cf042bea2029414bd5597a2ce547b208ff957)
@@ -38,5 +38,5 @@
 #include <genarch/ofw/ofw_tree.h>
 #include <arch/drivers/tick.h>
-#include <print.h>
+#include <stdio.h>
 #include <arch/sun4v/md.h>
 #include <arch/sun4v/hypercall.h>
Index: kernel/arch/sparc64/src/drivers/niagara.c
===================================================================
--- kernel/arch/sparc64/src/drivers/niagara.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/sparc64/src/drivers/niagara.c	(revision ad2cf042bea2029414bd5597a2ce547b208ff957)
@@ -47,5 +47,4 @@
 #include <sysinfo/sysinfo.h>
 #include <ipc/irq.h>
-#include <print.h>
 #include <proc/thread.h>
 #include <console/console.h>
Index: kernel/arch/sparc64/src/drivers/scr.c
===================================================================
--- kernel/arch/sparc64/src/drivers/scr.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/sparc64/src/drivers/scr.c	(revision ad2cf042bea2029414bd5597a2ce547b208ff957)
@@ -45,5 +45,4 @@
 #include <str.h>
 #include <align.h>
-#include <print.h>
 #include <log.h>
 
Index: kernel/arch/sparc64/src/mm/sun4u/tlb.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4u/tlb.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/sparc64/src/mm/sun4u/tlb.c	(revision ad2cf042bea2029414bd5597a2ce547b208ff957)
@@ -44,5 +44,5 @@
 #include <interrupt.h>
 #include <arch.h>
-#include <print.h>
+#include <stdio.h>
 #include <typedefs.h>
 #include <config.h>
Index: kernel/arch/sparc64/src/mm/sun4v/tlb.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4v/tlb.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/sparc64/src/mm/sun4v/tlb.c	(revision ad2cf042bea2029414bd5597a2ce547b208ff957)
@@ -46,5 +46,5 @@
 #include <interrupt.h>
 #include <arch.h>
-#include <print.h>
+#include <stdio.h>
 #include <log.h>
 #include <typedefs.h>
Index: kernel/arch/sparc64/src/smp/sun4v/smp.c
===================================================================
--- kernel/arch/sparc64/src/smp/sun4v/smp.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/sparc64/src/smp/sun4v/smp.c	(revision ad2cf042bea2029414bd5597a2ce547b208ff957)
@@ -48,5 +48,5 @@
 #include <stdint.h>
 #include <synch/waitq.h>
-#include <print.h>
+#include <stdio.h>
 #include <arch/sun4v/hypercall.h>
 #include <arch/sun4v/md.h>
Index: kernel/arch/sparc64/src/trap/exception.c
===================================================================
--- kernel/arch/sparc64/src/trap/exception.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/sparc64/src/trap/exception.c	(revision ad2cf042bea2029414bd5597a2ce547b208ff957)
@@ -41,5 +41,5 @@
 #include <arch/register.h>
 #include <debug.h>
-#include <print.h>
+#include <stdio.h>
 #include <symtab.h>
 
Index: kernel/arch/sparc64/src/trap/interrupt.c
===================================================================
--- kernel/arch/sparc64/src/trap/interrupt.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/sparc64/src/trap/interrupt.c	(revision ad2cf042bea2029414bd5597a2ce547b208ff957)
@@ -46,5 +46,4 @@
 #include <barrier.h>
 #include <arch/drivers/tick.h>
-#include <print.h>
 #include <arch.h>
 #include <mm/tlb.h>