Index: uspace/drv/audio/sb16/dsp.c
===================================================================
--- uspace/drv/audio/sb16/dsp.c	(revision 21a0d8a1c491bebee19acc5f968c67b94c31f0b6)
+++ uspace/drv/audio/sb16/dsp.c	(revision 0abc2aea144199fee5fb2b5b1ffcf9f0ac6528ce)
@@ -39,5 +39,5 @@
 #include <device/hw_res.h>
 #include <libarch/ddi.h>
-#include <libarch/barrier.h>
+#include <barrier.h>
 #include <macros.h>
 #include <str_error.h>
Index: uspace/drv/bus/usb/ehci/endpoint_list.c
===================================================================
--- uspace/drv/bus/usb/ehci/endpoint_list.c	(revision 21a0d8a1c491bebee19acc5f968c67b94c31f0b6)
+++ uspace/drv/bus/usb/ehci/endpoint_list.c	(revision 0abc2aea144199fee5fb2b5b1ffcf9f0ac6528ce)
@@ -37,5 +37,5 @@
 #include <assert.h>
 #include <errno.h>
-#include <libarch/barrier.h>
+#include <barrier.h>
 
 #include <usb/debug.h>
Index: uspace/drv/bus/usb/ehci/hw_struct/mem_access.h
===================================================================
--- uspace/drv/bus/usb/ehci/hw_struct/mem_access.h	(revision 21a0d8a1c491bebee19acc5f968c67b94c31f0b6)
+++ uspace/drv/bus/usb/ehci/hw_struct/mem_access.h	(revision 0abc2aea144199fee5fb2b5b1ffcf9f0ac6528ce)
@@ -36,5 +36,5 @@
 
 #include <byteorder.h>
-#include <libarch/barrier.h>
+#include <barrier.h>
 
 #define EHCI_MEM32_WR(reg, val) reg = host2uint32_t_le(val)
Index: uspace/drv/bus/usb/ohci/endpoint_list.c
===================================================================
--- uspace/drv/bus/usb/ohci/endpoint_list.c	(revision 21a0d8a1c491bebee19acc5f968c67b94c31f0b6)
+++ uspace/drv/bus/usb/ohci/endpoint_list.c	(revision 0abc2aea144199fee5fb2b5b1ffcf9f0ac6528ce)
@@ -37,5 +37,5 @@
 #include <assert.h>
 #include <errno.h>
-#include <libarch/barrier.h>
+#include <barrier.h>
 
 #include <usb/debug.h>
Index: uspace/drv/bus/usb/uhci/transfer_list.c
===================================================================
--- uspace/drv/bus/usb/uhci/transfer_list.c	(revision 21a0d8a1c491bebee19acc5f968c67b94c31f0b6)
+++ uspace/drv/bus/usb/uhci/transfer_list.c	(revision 0abc2aea144199fee5fb2b5b1ffcf9f0ac6528ce)
@@ -37,5 +37,5 @@
 #include <assert.h>
 #include <errno.h>
-#include <libarch/barrier.h>
+#include <barrier.h>
 #include <stdint.h>
 #include <usb/debug.h>
Index: uspace/drv/bus/usb/xhci/hw_struct/trb.h
===================================================================
--- uspace/drv/bus/usb/xhci/hw_struct/trb.h	(revision 21a0d8a1c491bebee19acc5f968c67b94c31f0b6)
+++ uspace/drv/bus/usb/xhci/hw_struct/trb.h	(revision 0abc2aea144199fee5fb2b5b1ffcf9f0ac6528ce)
@@ -40,5 +40,5 @@
 
 #include "common.h"
-#include <libarch/barrier.h>
+#include <barrier.h>
 
 /**
Index: uspace/drv/bus/usb/xhci/trb_ring.c
===================================================================
--- uspace/drv/bus/usb/xhci/trb_ring.c	(revision 21a0d8a1c491bebee19acc5f968c67b94c31f0b6)
+++ uspace/drv/bus/usb/xhci/trb_ring.c	(revision 0abc2aea144199fee5fb2b5b1ffcf9f0ac6528ce)
@@ -32,5 +32,5 @@
 #include <as.h>
 #include <align.h>
-#include <libarch/barrier.h>
+#include <barrier.h>
 #include <usb/debug.h>
 #include "hw_struct/trb.h"
Index: uspace/drv/nic/rtl8139/driver.c
===================================================================
--- uspace/drv/nic/rtl8139/driver.c	(revision 21a0d8a1c491bebee19acc5f968c67b94c31f0b6)
+++ uspace/drv/nic/rtl8139/driver.c	(revision 0abc2aea144199fee5fb2b5b1ffcf9f0ac6528ce)
@@ -32,5 +32,5 @@
 #include <align.h>
 #include <byteorder.h>
-#include <libarch/barrier.h>
+#include <barrier.h>
 #include <as.h>
 #include <ddf/log.h>
Index: uspace/drv/nic/rtl8169/driver.c
===================================================================
--- uspace/drv/nic/rtl8169/driver.c	(revision 21a0d8a1c491bebee19acc5f968c67b94c31f0b6)
+++ uspace/drv/nic/rtl8169/driver.c	(revision 0abc2aea144199fee5fb2b5b1ffcf9f0ac6528ce)
@@ -33,5 +33,5 @@
 #include <align.h>
 #include <byteorder.h>
-#include <libarch/barrier.h>
+#include <barrier.h>
 #include <stdbool.h>
 
Index: uspace/drv/time/cmos-rtc/cmos-rtc.c
===================================================================
--- uspace/drv/time/cmos-rtc/cmos-rtc.c	(revision 21a0d8a1c491bebee19acc5f968c67b94c31f0b6)
+++ uspace/drv/time/cmos-rtc/cmos-rtc.c	(revision 0abc2aea144199fee5fb2b5b1ffcf9f0ac6528ce)
@@ -39,5 +39,5 @@
 #include <ddi.h>
 #include <as.h>
-#include <libarch/barrier.h>
+#include <barrier.h>
 #include <stdio.h>
 #include <ddf/driver.h>