Index: kernel/arch/abs32le/src/cpu/cpu.c
===================================================================
--- kernel/arch/abs32le/src/cpu/cpu.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/abs32le/src/cpu/cpu.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -36,5 +36,5 @@
 #include <cpu.h>
 #include <arch.h>
-#include <print.h>
+#include <stdio.h>
 #include <fpu_context.h>
 
Index: kernel/arch/abs32le/src/mm/frame.c
===================================================================
--- kernel/arch/abs32le/src/mm/frame.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/abs32le/src/mm/frame.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -39,6 +39,5 @@
 #include <align.h>
 #include <macros.h>
-
-#include <print.h>
+#include <stdio.h>
 
 void physmem_print(void)
Index: kernel/arch/abs32le/src/mm/page.c
===================================================================
--- kernel/arch/abs32le/src/mm/page.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/abs32le/src/mm/page.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -45,5 +45,5 @@
 #include <arch/asm.h>
 #include <debug.h>
-#include <print.h>
+#include <stdio.h>
 #include <interrupt.h>
 
Index: kernel/arch/amd64/src/cpu/cpu.c
===================================================================
--- kernel/arch/amd64/src/cpu/cpu.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/amd64/src/cpu/cpu.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -39,5 +39,5 @@
 
 #include <arch.h>
-#include <print.h>
+#include <stdio.h>
 #include <fpu_context.h>
 
Index: kernel/arch/amd64/src/interrupt.c
===================================================================
--- kernel/arch/amd64/src/interrupt.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/amd64/src/interrupt.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -35,5 +35,4 @@
 #include <arch/interrupt.h>
 #include <assert.h>
-#include <print.h>
 #include <log.h>
 #include <panic.h>
Index: kernel/arch/amd64/src/mm/page.c
===================================================================
--- kernel/arch/amd64/src/mm/page.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/amd64/src/mm/page.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -42,5 +42,4 @@
 #include <config.h>
 #include <interrupt.h>
-#include <print.h>
 #include <panic.h>
 #include <align.h>
Index: kernel/arch/amd64/src/proc/scheduler.c
===================================================================
--- kernel/arch/amd64/src/proc/scheduler.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/amd64/src/proc/scheduler.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -39,5 +39,4 @@
 #include <arch.h>
 #include <arch/asm.h>
-#include <print.h>
 #include <arch/pm.h>
 #include <arch/ddi/ddi.h>
Index: kernel/arch/amd64/src/syscall.c
===================================================================
--- kernel/arch/amd64/src/syscall.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/amd64/src/syscall.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -40,6 +40,4 @@
 #include <arch/asm.h>
 
-#include <print.h>
-
 extern void syscall_entry(void);
 
Index: kernel/arch/arm32/src/arm32.c
===================================================================
--- kernel/arch/arm32/src/arm32.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/arm32/src/arm32.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -41,5 +41,4 @@
 #include <console/console.h>
 #include <ddi/irq.h>
-#include <print.h>
 #include <config.h>
 #include <interrupt.h>
Index: kernel/arch/arm32/src/cpu/cpu.c
===================================================================
--- kernel/arch/arm32/src/cpu/cpu.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/arm32/src/cpu/cpu.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -39,5 +39,5 @@
 #include <cpu.h>
 #include <arch.h>
-#include <print.h>
+#include <stdio.h>
 
 #ifdef CONFIG_FPU
Index: kernel/arch/arm32/src/exception.c
===================================================================
--- kernel/arch/arm32/src/exception.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/arm32/src/exception.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -41,5 +41,5 @@
 #include <arch/cp15.h>
 #include <barrier.h>
-#include <print.h>
+#include <stdio.h>
 #include <syscall/syscall.h>
 #include <stacktrace.h>
Index: kernel/arch/arm32/src/mm/page_fault.c
===================================================================
--- kernel/arch/arm32/src/mm/page_fault.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/arm32/src/mm/page_fault.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -41,5 +41,4 @@
 #include <arch.h>
 #include <interrupt.h>
-#include <print.h>
 
 /**
Index: kernel/arch/ia32/src/cpu/cpu.c
===================================================================
--- kernel/arch/ia32/src/cpu/cpu.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/ia32/src/cpu/cpu.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -39,5 +39,5 @@
 #include <arch.h>
 #include <stdint.h>
-#include <print.h>
+#include <stdio.h>
 #include <fpu_context.h>
 
Index: kernel/arch/ia32/src/interrupt.c
===================================================================
--- kernel/arch/ia32/src/interrupt.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/ia32/src/interrupt.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -36,5 +36,5 @@
 #include <assert.h>
 #include <syscall/syscall.h>
-#include <print.h>
+#include <stdio.h>
 #include <debug.h>
 #include <panic.h>
Index: kernel/arch/ia32/src/mm/frame.c
===================================================================
--- kernel/arch/ia32/src/mm/frame.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/ia32/src/mm/frame.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -44,5 +44,5 @@
 #include <align.h>
 #include <macros.h>
-#include <print.h>
+#include <stdio.h>
 
 #define PHYSMEM_LIMIT32  UINT64_C(0x100000000)
Index: kernel/arch/ia32/src/mm/page.c
===================================================================
--- kernel/arch/ia32/src/mm/page.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/ia32/src/mm/page.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -46,5 +46,4 @@
 #include <arch/asm.h>
 #include <debug.h>
-#include <print.h>
 #include <interrupt.h>
 #include <macros.h>
Index: kernel/arch/ia64/src/cpu/cpu.c
===================================================================
--- kernel/arch/ia64/src/cpu/cpu.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/ia64/src/cpu/cpu.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -36,5 +36,5 @@
 #include <arch.h>
 #include <arch/register.h>
-#include <print.h>
+#include <stdio.h>
 #include <mem.h>
 
Index: kernel/arch/ia64/src/fpu_context.c
===================================================================
--- kernel/arch/ia64/src/fpu_context.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/ia64/src/fpu_context.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -36,5 +36,4 @@
 #include <fpu_context.h>
 #include <arch/register.h>
-#include <print.h>
 
 void fpu_context_save(fpu_context_t *fctx)
Index: kernel/arch/ia64/src/interrupt.c
===================================================================
--- kernel/arch/ia64/src/interrupt.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/ia64/src/interrupt.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -39,5 +39,5 @@
 #include <ddi/irq.h>
 #include <panic.h>
-#include <print.h>
+#include <stdio.h>
 #include <console/console.h>
 #include <typedefs.h>
@@ -47,5 +47,4 @@
 #include <arch.h>
 #include <syscall/syscall.h>
-#include <print.h>
 #include <proc/scheduler.h>
 #include <ipc/sysipc.h>
@@ -56,5 +55,4 @@
 #include <arch/mm/tlb.h>
 #include <symtab.h>
-#include <putchar.h>
 
 #define VECTORS_64_BUNDLE        20
Index: kernel/arch/ia64/src/mm/page.c
===================================================================
--- kernel/arch/ia64/src/mm/page.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/ia64/src/mm/page.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -41,5 +41,4 @@
 #include <arch/mm/vhpt.h>
 #include <typedefs.h>
-#include <print.h>
 #include <mm/page.h>
 #include <mm/frame.h>
Index: kernel/arch/ia64/src/mm/tlb.c
===================================================================
--- kernel/arch/ia64/src/mm/tlb.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/ia64/src/mm/tlb.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -50,5 +50,4 @@
 #include <assert.h>
 #include <panic.h>
-#include <print.h>
 #include <arch.h>
 #include <interrupt.h>
Index: kernel/arch/ia64/src/mm/vhpt.c
===================================================================
--- kernel/arch/ia64/src/mm/vhpt.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/ia64/src/mm/vhpt.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -37,5 +37,4 @@
 #include <arch/mm/vhpt.h>
 #include <mm/frame.h>
-#include <print.h>
 
 static vhpt_entry_t *vhpt_base;
Index: kernel/arch/mips32/src/cpu/cpu.c
===================================================================
--- kernel/arch/mips32/src/cpu/cpu.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/mips32/src/cpu/cpu.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -37,5 +37,5 @@
 #include <arch.h>
 #include <arch/cp0.h>
-#include <print.h>
+#include <stdio.h>
 
 struct data_t {
Index: kernel/arch/mips32/src/debug/stacktrace.c
===================================================================
--- kernel/arch/mips32/src/debug/stacktrace.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/mips32/src/debug/stacktrace.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -66,5 +66,4 @@
 #include <typedefs.h>
 #include <arch/debugger.h>
-#include <print.h>
 
 #define R0	0U
Index: kernel/arch/mips32/src/debugger.c
===================================================================
--- kernel/arch/mips32/src/debugger.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/mips32/src/debugger.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -37,5 +37,5 @@
 #include <console/kconsole.h>
 #include <console/cmd.h>
-#include <print.h>
+#include <stdio.h>
 #include <log.h>
 #include <panic.h>
Index: kernel/arch/mips32/src/exception.c
===================================================================
--- kernel/arch/mips32/src/exception.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/mips32/src/exception.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -41,5 +41,4 @@
 #include <assert.h>
 #include <proc/thread.h>
-#include <print.h>
 #include <interrupt.h>
 #include <halt.h>
Index: kernel/arch/mips32/src/mm/frame.c
===================================================================
--- kernel/arch/mips32/src/mm/frame.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/mips32/src/mm/frame.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -44,5 +44,5 @@
 #endif
 #include <arch/arch.h>
-#include <print.h>
+#include <stdio.h>
 
 #define ZERO_PAGE_MASK    TLB_PAGE_MASK_256K
Index: kernel/arch/mips32/src/mm/tlb.c
===================================================================
--- kernel/arch/mips32/src/mm/tlb.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/mips32/src/mm/tlb.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -42,5 +42,5 @@
 #include <arch.h>
 #include <synch/mutex.h>
-#include <print.h>
+#include <stdio.h>
 #include <log.h>
 #include <assert.h>
Index: kernel/arch/ppc32/src/cpu/cpu.c
===================================================================
--- kernel/arch/ppc32/src/cpu/cpu.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/ppc32/src/cpu/cpu.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -36,5 +36,5 @@
 #include <cpu.h>
 #include <arch.h>
-#include <print.h>
+#include <stdio.h>
 #include <fpu_context.h>
 
Index: kernel/arch/ppc32/src/interrupt.c
===================================================================
--- kernel/arch/ppc32/src/interrupt.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/ppc32/src/interrupt.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -43,5 +43,4 @@
 #include <arch/mm/tlb.h>
 #include <arch/mm/pht.h>
-#include <print.h>
 #include <log.h>
 
Index: kernel/arch/ppc32/src/mm/frame.c
===================================================================
--- kernel/arch/ppc32/src/mm/frame.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/ppc32/src/mm/frame.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -38,5 +38,5 @@
 #include <align.h>
 #include <macros.h>
-#include <print.h>
+#include <stdio.h>
 
 memmap_t memmap;
Index: kernel/arch/ppc32/src/ppc32.c
===================================================================
--- kernel/arch/ppc32/src/ppc32.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/ppc32/src/ppc32.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -57,5 +57,4 @@
 #include <macros.h>
 #include <str.h>
-#include <print.h>
 
 #define IRQ_COUNT  64
Index: kernel/arch/riscv64/src/cpu/cpu.c
===================================================================
--- kernel/arch/riscv64/src/cpu/cpu.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/riscv64/src/cpu/cpu.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -36,5 +36,4 @@
 #include <cpu.h>
 #include <arch.h>
-#include <print.h>
 #include <fpu_context.h>
 
Index: kernel/arch/riscv64/src/mm/frame.c
===================================================================
--- kernel/arch/riscv64/src/mm/frame.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/riscv64/src/mm/frame.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -41,5 +41,4 @@
 #include <align.h>
 #include <macros.h>
-#include <print.h>
 
 uintptr_t physmem_start;
Index: kernel/arch/riscv64/src/mm/page.c
===================================================================
--- kernel/arch/riscv64/src/mm/page.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/riscv64/src/mm/page.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -46,5 +46,4 @@
 #include <arch/asm.h>
 #include <debug.h>
-#include <print.h>
 #include <interrupt.h>
 
Index: kernel/arch/sparc64/src/console.c
===================================================================
--- kernel/arch/sparc64/src/console.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/arch/sparc64/src/console.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -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 bab75df6bdac0b39185034277416374a06d4b37f)
@@ -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 bab75df6bdac0b39185034277416374a06d4b37f)
@@ -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 bab75df6bdac0b39185034277416374a06d4b37f)
@@ -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 bab75df6bdac0b39185034277416374a06d4b37f)
@@ -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 bab75df6bdac0b39185034277416374a06d4b37f)
@@ -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 bab75df6bdac0b39185034277416374a06d4b37f)
@@ -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 bab75df6bdac0b39185034277416374a06d4b37f)
@@ -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 bab75df6bdac0b39185034277416374a06d4b37f)
@@ -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 bab75df6bdac0b39185034277416374a06d4b37f)
@@ -46,5 +46,4 @@
 #include <barrier.h>
 #include <arch/drivers/tick.h>
-#include <print.h>
 #include <arch.h>
 #include <mm/tlb.h>
Index: kernel/genarch/src/drivers/ega/ega.c
===================================================================
--- kernel/genarch/src/drivers/ega/ega.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/genarch/src/drivers/ega/ega.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -37,5 +37,4 @@
 #include <debug.h>
 #include <genarch/drivers/ega/ega.h>
-#include <putchar.h>
 #include <mm/km.h>
 #include <mm/as.h>
Index: kernel/genarch/src/fb/fb.c
===================================================================
--- kernel/genarch/src/fb/fb.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/genarch/src/fb/fb.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -48,5 +48,4 @@
 #include <config.h>
 #include <bitops.h>
-#include <print.h>
 #include <str.h>
 #include <ddi/ddi.h>
Index: kernel/genarch/src/ofw/ofw_tree.c
===================================================================
--- kernel/genarch/src/ofw/ofw_tree.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/genarch/src/ofw/ofw_tree.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -42,5 +42,5 @@
 #include <str.h>
 #include <panic.h>
-#include <print.h>
+#include <stdio.h>
 
 #define PATH_MAX_LEN  256
Index: kernel/generic/src/adt/btree.c
===================================================================
--- kernel/generic/src/adt/btree.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/adt/btree.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -52,5 +52,5 @@
 #include <mm/slab.h>
 #include <panic.h>
-#include <print.h>
+#include <stdio.h>
 #include <trace.h>
 
Index: kernel/generic/src/console/chardev.c
===================================================================
--- kernel/generic/src/console/chardev.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/console/chardev.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -38,5 +38,5 @@
 #include <synch/waitq.h>
 #include <synch/spinlock.h>
-#include <print.h>
+#include <stdio.h>
 #include <halt.h>
 #include <cpu.h>
Index: kernel/generic/src/console/cmd.c
===================================================================
--- kernel/generic/src/console/cmd.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/console/cmd.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -45,5 +45,5 @@
 #include <console/console.h>
 #include <console/kconsole.h>
-#include <print.h>
+#include <stdio.h>
 #include <log.h>
 #include <panic.h>
Index: kernel/generic/src/console/console.c
===================================================================
--- kernel/generic/src/console/console.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/console/console.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -47,5 +47,5 @@
 #include <arch.h>
 #include <panic.h>
-#include <print.h>
+#include <stdio.h>
 #include <putchar.h>
 #include <atomic.h>
Index: kernel/generic/src/console/kconsole.c
===================================================================
--- kernel/generic/src/console/kconsole.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/console/kconsole.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -45,5 +45,5 @@
 #include <console/cmd.h>
 #include <console/prompt.h>
-#include <print.h>
+#include <stdio.h>
 #include <panic.h>
 #include <typedefs.h>
Index: kernel/generic/src/cpu/cpu.c
===================================================================
--- kernel/generic/src/cpu/cpu.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/cpu/cpu.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -47,5 +47,5 @@
 #include <mem.h>
 #include <adt/list.h>
-#include <print.h>
+#include <stdio.h>
 #include <sysinfo/sysinfo.h>
 #include <arch/cycle.h>
Index: kernel/generic/src/debug/debug.c
===================================================================
--- kernel/generic/src/debug/debug.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/debug/debug.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -41,5 +41,5 @@
 #include <symtab.h>
 #include <errno.h>
-#include <print.h>
+#include <stdio.h>
 
 void __cyg_profile_func_enter(void *fn, void *call_site)
Index: kernel/generic/src/debug/panic.c
===================================================================
--- kernel/generic/src/debug/panic.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/debug/panic.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -34,5 +34,5 @@
 
 #include <panic.h>
-#include <print.h>
+#include <stdio.h>
 #include <stacktrace.h>
 #include <halt.h>
Index: kernel/generic/src/debug/stacktrace.c
===================================================================
--- kernel/generic/src/debug/stacktrace.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/debug/stacktrace.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -37,5 +37,5 @@
 #include <interrupt.h>
 #include <symtab.h>
-#include <print.h>
+#include <stdio.h>
 
 #define STACK_FRAMES_MAX  20
Index: kernel/generic/src/debug/symtab.c
===================================================================
--- kernel/generic/src/debug/symtab.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/debug/symtab.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -39,5 +39,5 @@
 #include <byteorder.h>
 #include <str.h>
-#include <print.h>
+#include <stdio.h>
 #include <typedefs.h>
 #include <errno.h>
Index: kernel/generic/src/interrupt/interrupt.c
===================================================================
--- kernel/generic/src/interrupt/interrupt.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/interrupt/interrupt.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -49,5 +49,5 @@
 #include <macros.h>
 #include <panic.h>
-#include <print.h>
+#include <stdio.h>
 #include <stdarg.h>
 #include <symtab.h>
Index: kernel/generic/src/ipc/ipc.c
===================================================================
--- kernel/generic/src/ipc/ipc.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/ipc/ipc.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -55,5 +55,5 @@
 #include <proc/task.h>
 #include <mem.h>
-#include <print.h>
+#include <stdio.h>
 #include <console/console.h>
 #include <proc/thread.h>
Index: kernel/generic/src/ipc/irq.c
===================================================================
--- kernel/generic/src/ipc/irq.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/ipc/irq.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -64,5 +64,4 @@
 #include <syscall/copy.h>
 #include <console/console.h>
-#include <print.h>
 #include <macros.h>
 #include <cap/cap.h>
Index: kernel/generic/src/ipc/kbox.c
===================================================================
--- kernel/generic/src/ipc/kbox.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/ipc/kbox.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -43,5 +43,4 @@
 #include <udebug/udebug_ipc.h>
 #include <ipc/kbox.h>
-#include <print.h>
 #include <proc/thread.h>
 
Index: kernel/generic/src/ipc/sysipc.c
===================================================================
--- kernel/generic/src/ipc/sysipc.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/ipc/sysipc.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -51,5 +51,4 @@
 #include <security/perm.h>
 #include <console/console.h>
-#include <print.h>
 #include <macros.h>
 #include <cap/cap.h>
Index: kernel/generic/src/lib/str.c
===================================================================
--- kernel/generic/src/lib/str.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/lib/str.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -103,5 +103,4 @@
 
 #include <str.h>
-#include <print.h>
 #include <cpu.h>
 #include <arch/asm.h>
Index: kernel/generic/src/main/kinit.c
===================================================================
--- kernel/generic/src/main/kinit.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/main/kinit.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -59,5 +59,5 @@
 #include <mm/frame.h>
 #include <mm/km.h>
-#include <print.h>
+#include <stdio.h>
 #include <log.h>
 #include <mem.h>
Index: kernel/generic/src/main/main.c
===================================================================
--- kernel/generic/src/main/main.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/main/main.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -50,5 +50,5 @@
 #include <debug.h>
 #include <context.h>
-#include <print.h>
+#include <stdio.h>
 #include <panic.h>
 #include <assert.h>
Index: kernel/generic/src/main/shutdown.c
===================================================================
--- kernel/generic/src/main/shutdown.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/main/shutdown.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -39,5 +39,4 @@
 #include <proc/task.h>
 #include <halt.h>
-#include <print.h>
 #include <log.h>
 
Index: kernel/generic/src/main/version.c
===================================================================
--- kernel/generic/src/main/version.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/main/version.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -34,5 +34,5 @@
 
 #include <main/version.h>
-#include <print.h>
+#include <stdio.h>
 #include <macros.h>
 
Index: kernel/generic/src/mm/as.c
===================================================================
--- kernel/generic/src/mm/as.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/mm/as.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -68,5 +68,5 @@
 #include <panic.h>
 #include <assert.h>
-#include <print.h>
+#include <stdio.h>
 #include <mem.h>
 #include <macros.h>
Index: kernel/generic/src/mm/frame.c
===================================================================
--- kernel/generic/src/mm/frame.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/mm/frame.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -53,5 +53,5 @@
 #include <arch/asm.h>
 #include <arch.h>
-#include <print.h>
+#include <stdio.h>
 #include <log.h>
 #include <align.h>
Index: kernel/generic/src/mm/slab.c
===================================================================
--- kernel/generic/src/mm/slab.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/mm/slab.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -110,5 +110,5 @@
 #include <mm/frame.h>
 #include <config.h>
-#include <print.h>
+#include <stdio.h>
 #include <arch.h>
 #include <panic.h>
Index: kernel/generic/src/proc/scheduler.c
===================================================================
--- kernel/generic/src/proc/scheduler.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/proc/scheduler.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -64,5 +64,5 @@
 #include <panic.h>
 #include <cpu.h>
-#include <print.h>
+#include <stdio.h>
 #include <log.h>
 #include <stacktrace.h>
Index: kernel/generic/src/proc/task.c
===================================================================
--- kernel/generic/src/proc/task.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/proc/task.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -54,5 +54,5 @@
 #include <ipc/ipcrsc.h>
 #include <ipc/event.h>
-#include <print.h>
+#include <stdio.h>
 #include <errno.h>
 #include <halt.h>
Index: kernel/generic/src/proc/thread.c
===================================================================
--- kernel/generic/src/proc/thread.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/proc/thread.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -63,5 +63,5 @@
 #include <atomic.h>
 #include <mem.h>
-#include <print.h>
+#include <stdio.h>
 #include <mm/slab.h>
 #include <main/uinit.h>
Index: kernel/generic/src/synch/spinlock.c
===================================================================
--- kernel/generic/src/synch/spinlock.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/synch/spinlock.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -41,5 +41,5 @@
 #include <arch.h>
 #include <preemption.h>
-#include <print.h>
+#include <stdio.h>
 #include <debug.h>
 #include <symtab.h>
Index: kernel/generic/src/syscall/syscall.c
===================================================================
--- kernel/generic/src/syscall/syscall.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/syscall/syscall.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -42,5 +42,4 @@
 #include <mm/as.h>
 #include <mm/page.h>
-#include <print.h>
 #include <arch.h>
 #include <debug.h>
Index: kernel/generic/src/sysinfo/sysinfo.c
===================================================================
--- kernel/generic/src/sysinfo/sysinfo.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/sysinfo/sysinfo.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -37,5 +37,5 @@
 #include <sysinfo/sysinfo.h>
 #include <mm/slab.h>
-#include <print.h>
+#include <stdio.h>
 #include <syscall/copy.h>
 #include <synch/mutex.h>
Index: kernel/generic/src/udebug/udebug.c
===================================================================
--- kernel/generic/src/udebug/udebug.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/udebug/udebug.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -43,5 +43,4 @@
 #include <udebug/udebug.h>
 #include <errno.h>
-#include <print.h>
 #include <arch.h>
 #include <proc/task.h>
Index: kernel/generic/src/udebug/udebug_ops.c
===================================================================
--- kernel/generic/src/udebug/udebug_ops.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/generic/src/udebug/udebug_ops.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -45,5 +45,4 @@
 #include <arch.h>
 #include <errno.h>
-#include <print.h>
 #include <stdbool.h>
 #include <str.h>
Index: kernel/test/atomic/atomic1.c
===================================================================
--- kernel/test/atomic/atomic1.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/atomic/atomic1.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -28,7 +28,5 @@
 
 #include <test.h>
-#include <print.h>
 #include <atomic.h>
-#include <debug.h>
 
 const char *test_atomic1(void)
Index: kernel/test/avltree/avltree1.c
===================================================================
--- kernel/test/avltree/avltree1.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/avltree/avltree1.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -28,7 +28,5 @@
 
 #include <test.h>
-#include <print.h>
 #include <adt/avl.h>
-#include <debug.h>
 #include <typedefs.h>
 
Index: kernel/test/btree/btree1.c
===================================================================
--- kernel/test/btree/btree1.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/btree/btree1.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -28,7 +28,5 @@
 
 #include <test.h>
-#include <print.h>
 #include <adt/btree.h>
-#include <debug.h>
 
 static void *data = (void *) 0xdeadbeef;
Index: kernel/test/cht/cht1.c
===================================================================
--- kernel/test/cht/cht1.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/cht/cht1.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -29,5 +29,4 @@
 #include <assert.h>
 #include <test.h>
-#include <print.h>
 #include <adt/cht.h>
 #include <synch/rcu.h>
Index: kernel/test/debug/mips1.c
===================================================================
--- kernel/test/debug/mips1.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/debug/mips1.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -27,13 +27,5 @@
  */
 
-#include <print.h>
-#include <debug.h>
-
 #include <test.h>
-#include <atomic.h>
-#include <proc/thread.h>
-#include <time/delay.h>
-
-#include <arch.h>
 
 const char *test_mips1(void)
Index: kernel/test/fault/fault1.c
===================================================================
--- kernel/test/fault/fault1.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/fault/fault1.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -28,12 +28,5 @@
  */
 
-#include <print.h>
-#include <debug.h>
-
 #include <test.h>
-#include <atomic.h>
-#include <proc/thread.h>
-
-#include <arch.h>
 
 const char *test_fault1(void)
Index: kernel/test/mm/falloc1.c
===================================================================
--- kernel/test/mm/falloc1.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/mm/falloc1.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -27,5 +27,4 @@
  */
 
-#include <print.h>
 #include <test.h>
 #include <mm/page.h>
@@ -34,5 +33,4 @@
 #include <arch/mm/page.h>
 #include <typedefs.h>
-#include <debug.h>
 #include <align.h>
 
Index: kernel/test/mm/falloc2.c
===================================================================
--- kernel/test/mm/falloc2.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/mm/falloc2.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -27,5 +27,4 @@
  */
 
-#include <print.h>
 #include <test.h>
 #include <mm/page.h>
@@ -35,5 +34,4 @@
 #include <typedefs.h>
 #include <atomic.h>
-#include <debug.h>
 #include <proc/thread.h>
 #include <mem.h>
Index: kernel/test/mm/mapping1.c
===================================================================
--- kernel/test/mm/mapping1.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/mm/mapping1.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -27,5 +27,4 @@
  */
 
-#include <print.h>
 #include <test.h>
 #include <mm/page.h>
@@ -34,5 +33,4 @@
 #include <mm/km.h>
 #include <typedefs.h>
-#include <debug.h>
 #include <arch.h>
 
Index: kernel/test/mm/purge1.c
===================================================================
--- kernel/test/mm/purge1.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/mm/purge1.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -27,5 +27,4 @@
  */
 
-#include <print.h>
 #include <test.h>
 #include <mm/page.h>
@@ -35,5 +34,4 @@
 #include <arch/mm/tlb.h>
 #include <typedefs.h>
-#include <debug.h>
 
 extern void tlb_invalidate_all(void);
Index: kernel/test/mm/slab1.c
===================================================================
--- kernel/test/mm/slab1.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/mm/slab1.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -29,5 +29,4 @@
 #include <test.h>
 #include <mm/slab.h>
-#include <print.h>
 #include <proc/thread.h>
 #include <arch.h>
Index: kernel/test/mm/slab2.c
===================================================================
--- kernel/test/mm/slab2.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/mm/slab2.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -29,5 +29,4 @@
 #include <test.h>
 #include <mm/slab.h>
-#include <print.h>
 #include <proc/thread.h>
 #include <arch.h>
Index: kernel/test/print/print1.c
===================================================================
--- kernel/test/print/print1.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/print/print1.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -27,5 +27,4 @@
  */
 
-#include <print.h>
 #include <stddef.h>
 #include <test.h>
Index: kernel/test/print/print2.c
===================================================================
--- kernel/test/print/print2.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/print/print2.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -27,5 +27,4 @@
  */
 
-#include <print.h>
 #include <stddef.h>
 #include <test.h>
Index: kernel/test/print/print3.c
===================================================================
--- kernel/test/print/print3.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/print/print3.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -28,5 +28,4 @@
 
 #include <macros.h>
-#include <print.h>
 #include <stddef.h>
 #include <test.h>
Index: kernel/test/print/print4.c
===================================================================
--- kernel/test/print/print4.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/print/print4.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -27,5 +27,4 @@
  */
 
-#include <print.h>
 #include <stddef.h>
 #include <test.h>
Index: kernel/test/print/print5.c
===================================================================
--- kernel/test/print/print5.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/print/print5.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -39,5 +39,4 @@
 #pragma GCC diagnostic ignored "-Wformat"
 
-#include <print.h>
 #include <stddef.h>
 #include <test.h>
Index: kernel/test/smpcall/smpcall1.c
===================================================================
--- kernel/test/smpcall/smpcall1.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/smpcall/smpcall1.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -26,7 +26,4 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-#include <print.h>
-#include <debug.h>
 
 #include <assert.h>
Index: kernel/test/synch/rcu1.c
===================================================================
--- kernel/test/synch/rcu1.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/synch/rcu1.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -31,5 +31,4 @@
 #include <arch.h>
 #include <atomic.h>
-#include <print.h>
 #include <proc/thread.h>
 #include <macros.h>
Index: kernel/test/synch/semaphore1.c
===================================================================
--- kernel/test/synch/semaphore1.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/synch/semaphore1.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -30,7 +30,5 @@
 #include <arch.h>
 #include <atomic.h>
-#include <print.h>
 #include <proc/thread.h>
-
 #include <synch/waitq.h>
 #include <synch/semaphore.h>
Index: kernel/test/synch/semaphore2.c
===================================================================
--- kernel/test/synch/semaphore2.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/synch/semaphore2.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -30,9 +30,7 @@
 #include <arch.h>
 #include <atomic.h>
-#include <print.h>
 #include <proc/thread.h>
 #include <typedefs.h>
 #include <arch/context.h>
-
 #include <synch/waitq.h>
 #include <synch/semaphore.h>
Index: kernel/test/synch/workq-test-core.h
===================================================================
--- kernel/test/synch/workq-test-core.h	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/synch/workq-test-core.h	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -31,5 +31,4 @@
 #include <arch.h>
 #include <atomic.h>
-#include <print.h>
 #include <proc/thread.h>
 #include <mem.h>
Index: kernel/test/synch/workqueue2.c
===================================================================
--- kernel/test/synch/workqueue2.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/synch/workqueue2.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -29,5 +29,4 @@
 #include <test.h>
 #include <arch.h>
-#include <print.h>
 #include <synch/workqueue.h>
 
Index: kernel/test/synch/workqueue3.c
===================================================================
--- kernel/test/synch/workqueue3.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/synch/workqueue3.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -29,5 +29,4 @@
 #include <test.h>
 #include <arch.h>
-#include <print.h>
 #include <synch/workqueue.h>
 
Index: kernel/test/test.h
===================================================================
--- kernel/test/test.h	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/test.h	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -37,4 +37,5 @@
 
 #include <stdbool.h>
+#include <stdio.h>
 
 extern bool test_quiet;
Index: kernel/test/thread/thread1.c
===================================================================
--- kernel/test/thread/thread1.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/thread/thread1.c	(revision bab75df6bdac0b39185034277416374a06d4b37f)
@@ -27,7 +27,4 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-#include <print.h>
-#include <debug.h>
 
 #include <test.h>