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>