Index: kernel/test/atomic/atomic1.c
===================================================================
--- kernel/test/atomic/atomic1.c	(revision 482f968b8b53156bb4454e6c369c1e92dc426ea9)
+++ kernel/test/atomic/atomic1.c	(revision c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -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 c74b9de1187f3b60a7db1aad1e1fcd51ae134f24)
@@ -27,7 +27,4 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-#include <print.h>
-#include <debug.h>
 
 #include <test.h>