Index: test/atomic/atomic1/test.c
===================================================================
--- test/atomic/atomic1/test.c	(revision 018d957e20e03bd2a5c78e93cd9916eb0d1d222b)
+++ test/atomic/atomic1/test.c	(revision a0bb10ef4dc69531a0f1e07ebe00bdbb239dcfef)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <print.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <debug.h>
 
Index: test/debug/mips1/test.c
===================================================================
--- test/debug/mips1/test.c	(revision 018d957e20e03bd2a5c78e93cd9916eb0d1d222b)
+++ test/debug/mips1/test.c	(revision a0bb10ef4dc69531a0f1e07ebe00bdbb239dcfef)
@@ -32,5 +32,5 @@
 
 #include <test.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <proc/thread.h>
 #include <time/delay.h>
Index: test/fault/fault1/test.c
===================================================================
--- test/fault/fault1/test.c	(revision 018d957e20e03bd2a5c78e93cd9916eb0d1d222b)
+++ test/fault/fault1/test.c	(revision a0bb10ef4dc69531a0f1e07ebe00bdbb239dcfef)
@@ -33,5 +33,5 @@
 
 #include <test.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <proc/thread.h>
 
Index: test/fpu/fpu1/test.c
===================================================================
--- test/fpu/fpu1/test.c	(revision 018d957e20e03bd2a5c78e93cd9916eb0d1d222b)
+++ test/fpu/fpu1/test.c	(revision a0bb10ef4dc69531a0f1e07ebe00bdbb239dcfef)
@@ -33,5 +33,5 @@
 
 #include <test.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <proc/thread.h>
 
Index: test/fpu/mips1/test.c
===================================================================
--- test/fpu/mips1/test.c	(revision 018d957e20e03bd2a5c78e93cd9916eb0d1d222b)
+++ test/fpu/mips1/test.c	(revision a0bb10ef4dc69531a0f1e07ebe00bdbb239dcfef)
@@ -32,5 +32,5 @@
 
 #include <test.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <proc/thread.h>
 #include <time/delay.h>
Index: test/fpu/sse1/test.c
===================================================================
--- test/fpu/sse1/test.c	(revision 018d957e20e03bd2a5c78e93cd9916eb0d1d222b)
+++ test/fpu/sse1/test.c	(revision a0bb10ef4dc69531a0f1e07ebe00bdbb239dcfef)
@@ -32,5 +32,5 @@
 
 #include <test.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <proc/thread.h>
 #include <time/delay.h>
Index: test/mm/falloc2/test.c
===================================================================
--- test/mm/falloc2/test.c	(revision 018d957e20e03bd2a5c78e93cd9916eb0d1d222b)
+++ test/mm/falloc2/test.c	(revision a0bb10ef4dc69531a0f1e07ebe00bdbb239dcfef)
@@ -33,5 +33,5 @@
 #include <arch/mm/page.h>
 #include <arch/types.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <debug.h>
 #include <proc/thread.h>
Index: test/synch/rwlock1/test.c
===================================================================
--- test/synch/rwlock1/test.c	(revision 018d957e20e03bd2a5c78e93cd9916eb0d1d222b)
+++ test/synch/rwlock1/test.c	(revision a0bb10ef4dc69531a0f1e07ebe00bdbb239dcfef)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <arch.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <print.h>
 #include <proc/thread.h>
Index: test/synch/rwlock2/test.c
===================================================================
--- test/synch/rwlock2/test.c	(revision 018d957e20e03bd2a5c78e93cd9916eb0d1d222b)
+++ test/synch/rwlock2/test.c	(revision a0bb10ef4dc69531a0f1e07ebe00bdbb239dcfef)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <arch.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <print.h>
 #include <proc/thread.h>
Index: test/synch/rwlock3/test.c
===================================================================
--- test/synch/rwlock3/test.c	(revision 018d957e20e03bd2a5c78e93cd9916eb0d1d222b)
+++ test/synch/rwlock3/test.c	(revision a0bb10ef4dc69531a0f1e07ebe00bdbb239dcfef)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <arch.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <print.h>
 #include <proc/thread.h>
Index: test/synch/rwlock4/test.c
===================================================================
--- test/synch/rwlock4/test.c	(revision 018d957e20e03bd2a5c78e93cd9916eb0d1d222b)
+++ test/synch/rwlock4/test.c	(revision a0bb10ef4dc69531a0f1e07ebe00bdbb239dcfef)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <arch.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <print.h>
 #include <proc/thread.h>
Index: test/synch/rwlock5/test.c
===================================================================
--- test/synch/rwlock5/test.c	(revision 018d957e20e03bd2a5c78e93cd9916eb0d1d222b)
+++ test/synch/rwlock5/test.c	(revision a0bb10ef4dc69531a0f1e07ebe00bdbb239dcfef)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <arch.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <print.h>
 #include <proc/thread.h>
Index: test/synch/semaphore1/test.c
===================================================================
--- test/synch/semaphore1/test.c	(revision 018d957e20e03bd2a5c78e93cd9916eb0d1d222b)
+++ test/synch/semaphore1/test.c	(revision a0bb10ef4dc69531a0f1e07ebe00bdbb239dcfef)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <arch.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <print.h>
 #include <proc/thread.h>
Index: test/synch/semaphore2/test.c
===================================================================
--- test/synch/semaphore2/test.c	(revision 018d957e20e03bd2a5c78e93cd9916eb0d1d222b)
+++ test/synch/semaphore2/test.c	(revision a0bb10ef4dc69531a0f1e07ebe00bdbb239dcfef)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <arch.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <print.h>
 #include <proc/thread.h>
Index: test/thread/thread1/test.c
===================================================================
--- test/thread/thread1/test.c	(revision 018d957e20e03bd2a5c78e93cd9916eb0d1d222b)
+++ test/thread/thread1/test.c	(revision a0bb10ef4dc69531a0f1e07ebe00bdbb239dcfef)
@@ -33,5 +33,5 @@
 
 #include <test.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <proc/thread.h>