Index: kernel/generic/include/synch/rcu.h
===================================================================
--- kernel/generic/include/synch/rcu.h	(revision 96c30c81327e058d9ccd42a8628f09c4f75b398a)
+++ kernel/generic/include/synch/rcu.h	(revision e2625b1a1e5a2895b86f0e39c2d70a39e49e042a)
@@ -38,5 +38,5 @@
 #include <assert.h>
 #include <synch/rcu_types.h>
-#include <compiler/barrier.h>
+#include <barrier.h>
 
 
Index: kernel/generic/include/synch/spinlock.h
===================================================================
--- kernel/generic/include/synch/spinlock.h	(revision 96c30c81327e058d9ccd42a8628f09c4f75b398a)
+++ kernel/generic/include/synch/spinlock.h	(revision e2625b1a1e5a2895b86f0e39c2d70a39e49e042a)
@@ -37,5 +37,5 @@
 
 #include <stdbool.h>
-#include <arch/barrier.h>
+#include <barrier.h>
 #include <assert.h>
 #include <preemption.h>