Index: kernel/test/avltree/avltree1.c
===================================================================
--- kernel/test/avltree/avltree1.c	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/test/avltree/avltree1.c	(revision 1b1164e8b3cea0b45a167fb0933b14cf0c22c374)
@@ -31,5 +31,5 @@
 #include <adt/avl.h>
 #include <debug.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define NODE_COUNT 100
Index: kernel/test/mm/falloc1.c
===================================================================
--- kernel/test/mm/falloc1.c	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/test/mm/falloc1.c	(revision 1b1164e8b3cea0b45a167fb0933b14cf0c22c374)
@@ -33,5 +33,5 @@
 #include <mm/slab.h>
 #include <arch/mm/page.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 #include <align.h>
Index: kernel/test/mm/falloc2.c
===================================================================
--- kernel/test/mm/falloc2.c	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/test/mm/falloc2.c	(revision 1b1164e8b3cea0b45a167fb0933b14cf0c22c374)
@@ -33,5 +33,5 @@
 #include <mm/slab.h>
 #include <arch/mm/page.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <atomic.h>
 #include <debug.h>
Index: kernel/test/mm/mapping1.c
===================================================================
--- kernel/test/mm/mapping1.c	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/test/mm/mapping1.c	(revision 1b1164e8b3cea0b45a167fb0933b14cf0c22c374)
@@ -33,5 +33,5 @@
 #include <mm/as.h>
 #include <arch/mm/page.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 
Index: kernel/test/mm/purge1.c
===================================================================
--- kernel/test/mm/purge1.c	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/test/mm/purge1.c	(revision 1b1164e8b3cea0b45a167fb0933b14cf0c22c374)
@@ -34,5 +34,5 @@
 #include <arch/mm/page.h>
 #include <arch/mm/tlb.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <debug.h>
 
Index: kernel/test/synch/rwlock4.c
===================================================================
--- kernel/test/synch/rwlock4.c	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/test/synch/rwlock4.c	(revision 1b1164e8b3cea0b45a167fb0933b14cf0c22c374)
@@ -32,5 +32,5 @@
 #include <print.h>
 #include <proc/thread.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/context.h>
 #include <context.h>
Index: kernel/test/synch/semaphore2.c
===================================================================
--- kernel/test/synch/semaphore2.c	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/test/synch/semaphore2.c	(revision 1b1164e8b3cea0b45a167fb0933b14cf0c22c374)
@@ -32,5 +32,5 @@
 #include <print.h>
 #include <proc/thread.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/context.h>
 
Index: kernel/test/test.h
===================================================================
--- kernel/test/test.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/test/test.h	(revision 1b1164e8b3cea0b45a167fb0933b14cf0c22c374)
@@ -36,5 +36,4 @@
 #define KERN_TEST_H_
 
-#include <arch/types.h>
 #include <typedefs.h>