Index: kernel/arch/abs32le/include/arch/atomic.h
===================================================================
--- kernel/arch/abs32le/include/arch/atomic.h	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/abs32le/include/arch/atomic.h	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -37,5 +37,5 @@
 
 #include <typedefs.h>
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <preemption.h>
 #include <verify.h>
Index: kernel/arch/amd64/include/arch/atomic.h
===================================================================
--- kernel/arch/amd64/include/arch/atomic.h	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/amd64/include/arch/atomic.h	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -37,5 +37,5 @@
 #define KERN_amd64_ATOMIC_H_
 
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <preemption.h>
 #include <trace.h>
Index: kernel/arch/arm32/include/arch/mm/page.h
===================================================================
--- kernel/arch/arm32/include/arch/mm/page.h	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/arm32/include/arch/mm/page.h	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -40,5 +40,5 @@
 #include <mm/mm.h>
 #include <arch/exception.h>
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <arch/cp15.h>
 #include <trace.h>
Index: kernel/arch/arm32/src/exception.c
===================================================================
--- kernel/arch/arm32/src/exception.c	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/arm32/src/exception.c	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -40,5 +40,5 @@
 #include <arch/mm/page_fault.h>
 #include <arch/cp15.h>
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <print.h>
 #include <syscall/syscall.h>
Index: kernel/arch/ia32/include/arch/atomic.h
===================================================================
--- kernel/arch/ia32/include/arch/atomic.h	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/ia32/include/arch/atomic.h	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -38,5 +38,5 @@
 
 #include <typedefs.h>
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <preemption.h>
 #include <trace.h>
Index: kernel/arch/ia64/include/arch/mm/page.h
===================================================================
--- kernel/arch/ia64/include/arch/mm/page.h	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/ia64/include/arch/mm/page.h	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -89,5 +89,5 @@
 #include <arch/mm/frame.h>
 #include <arch/interrupt.h>
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <arch/mm/asid.h>
 #include <typedefs.h>
Index: kernel/arch/ia64/src/drivers/it.c
===================================================================
--- kernel/arch/ia64/src/drivers/it.c	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/ia64/src/drivers/it.c	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -39,5 +39,5 @@
 #include <arch/register.h>
 #include <arch/asm.h>
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <time/clock.h>
 #include <ddi/irq.h>
Index: kernel/arch/ia64/src/interrupt.c
===================================================================
--- kernel/arch/ia64/src/interrupt.c	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/ia64/src/interrupt.c	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -43,5 +43,5 @@
 #include <typedefs.h>
 #include <arch/asm.h>
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <arch/register.h>
 #include <arch.h>
Index: kernel/arch/ia64/src/mm/as.c
===================================================================
--- kernel/arch/ia64/src/mm/as.c	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/ia64/src/mm/as.c	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -41,5 +41,5 @@
 #include <genarch/mm/asid_fifo.h>
 #include <mm/asid.h>
-#include <arch/barrier.h>
+#include <barrier.h>
 
 /** Architecture dependent address space init. */
Index: kernel/arch/ia64/src/mm/page.c
===================================================================
--- kernel/arch/ia64/src/mm/page.c	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/ia64/src/mm/page.c	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -47,5 +47,5 @@
 #include <panic.h>
 #include <arch/asm.h>
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <align.h>
 
Index: kernel/arch/ia64/src/mm/tlb.c
===================================================================
--- kernel/arch/ia64/src/mm/tlb.c	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/ia64/src/mm/tlb.c	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -44,5 +44,5 @@
 #include <arch/mm/page.h>
 #include <arch/mm/vhpt.h>
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <arch/interrupt.h>
 #include <arch/pal/pal.h>
Index: kernel/arch/mips32/src/debugger.c
===================================================================
--- kernel/arch/mips32/src/debugger.c	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/mips32/src/debugger.c	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -34,5 +34,5 @@
 
 #include <arch/debugger.h>
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <console/kconsole.h>
 #include <console/cmd.h>
Index: kernel/arch/sparc64/include/arch/asm.h
===================================================================
--- kernel/arch/sparc64/include/arch/asm.h	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/sparc64/include/arch/asm.h	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -41,5 +41,5 @@
 #include <config.h>
 #include <arch/stack.h>
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <trace.h>
 
Index: kernel/arch/sparc64/include/arch/atomic.h
===================================================================
--- kernel/arch/sparc64/include/arch/atomic.h	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/sparc64/include/arch/atomic.h	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -36,5 +36,5 @@
 #define KERN_sparc64_ATOMIC_H_
 
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <typedefs.h>
 #include <preemption.h>
Index: kernel/arch/sparc64/include/arch/mm/sun4u/mmu.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4u/mmu.h	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/sparc64/include/arch/mm/sun4u/mmu.h	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -90,5 +90,5 @@
 
 #include <arch/asm.h>
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <stdint.h>
 
Index: kernel/arch/sparc64/include/arch/mm/sun4u/tlb.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4u/tlb.h	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/sparc64/include/arch/mm/sun4u/tlb.h	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -98,5 +98,5 @@
 #include <arch/mm/page.h>
 #include <arch/asm.h>
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <typedefs.h>
 #include <trace.h>
Index: kernel/arch/sparc64/include/arch/mm/sun4v/tlb.h
===================================================================
--- kernel/arch/sparc64/include/arch/mm/sun4v/tlb.h	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/sparc64/include/arch/mm/sun4v/tlb.h	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -47,5 +47,5 @@
 #include <arch/mm/page.h>
 #include <arch/asm.h>
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <typedefs.h>
 #include <arch/register.h>
Index: kernel/arch/sparc64/src/mm/sun4u/tsb.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4u/tsb.c	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/sparc64/src/mm/sun4u/tsb.c	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -36,5 +36,5 @@
 #include <arch/mm/tlb.h>
 #include <arch/mm/page.h>
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <assert.h>
 #include <mm/as.h>
Index: kernel/arch/sparc64/src/mm/sun4v/tsb.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4v/tsb.c	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/sparc64/src/mm/sun4v/tsb.c	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -38,5 +38,5 @@
 #include <arch/mm/tlb.h>
 #include <arch/mm/page.h>
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <assert.h>
 #include <mm/as.h>
Index: kernel/arch/sparc64/src/smp/sun4u/ipi.c
===================================================================
--- kernel/arch/sparc64/src/smp/sun4u/ipi.c	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/sparc64/src/smp/sun4u/ipi.c	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -45,5 +45,5 @@
 #include <arch/interrupt.h>
 #include <arch/trap/interrupt.h>
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <preemption.h>
 #include <time/delay.h>
Index: kernel/arch/sparc64/src/trap/interrupt.c
===================================================================
--- kernel/arch/sparc64/src/trap/interrupt.c	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/sparc64/src/trap/interrupt.c	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -44,5 +44,5 @@
 #include <debug.h>
 #include <arch/asm.h>
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <arch/drivers/tick.h>
 #include <print.h>
Index: kernel/arch/sparc64/src/trap/sun4u/interrupt.c
===================================================================
--- kernel/arch/sparc64/src/trap/sun4u/interrupt.c	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/sparc64/src/trap/sun4u/interrupt.c	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -41,5 +41,5 @@
 #include <debug.h>
 #include <arch/asm.h>
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <log.h>
 #include <arch.h>
Index: kernel/arch/sparc64/src/trap/sun4v/interrupt.c
===================================================================
--- kernel/arch/sparc64/src/trap/sun4v/interrupt.c	(revision b13d80b2d3d6107331beeefec2ede2df8f661cba)
+++ kernel/arch/sparc64/src/trap/sun4v/interrupt.c	(revision 05882233d8ca97c6879ac5c42456c344c8569d89)
@@ -41,5 +41,5 @@
 #include <debug.h>
 #include <arch/asm.h>
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <log.h>
 #include <arch.h>