Index: uspace/lib/c/arch/amd64/include/barrier.h
===================================================================
--- uspace/lib/c/arch/amd64/include/barrier.h	(revision 078363490e24c77fddfc84f1361b5b8ee73ced46)
+++ uspace/lib/c/arch/amd64/include/barrier.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/amd64/include/barrier.h
+../../../../../../kernel/arch/amd64/include/arch/barrier.h
Index: uspace/lib/c/arch/amd64/include/context_offset.h
===================================================================
--- uspace/lib/c/arch/amd64/include/context_offset.h	(revision 078363490e24c77fddfc84f1361b5b8ee73ced46)
+++ uspace/lib/c/arch/amd64/include/context_offset.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/amd64/include/context_offset.h
+../../../../../../kernel/arch/amd64/include/arch/context_offset.h
Index: uspace/lib/c/arch/amd64/include/elf.h
===================================================================
--- uspace/lib/c/arch/amd64/include/elf.h	(revision 078363490e24c77fddfc84f1361b5b8ee73ced46)
+++ uspace/lib/c/arch/amd64/include/elf.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/amd64/include/elf.h
+../../../../../../kernel/arch/amd64/include/arch/elf.h
Index: uspace/lib/c/arch/amd64/include/istate.h
===================================================================
--- uspace/lib/c/arch/amd64/include/istate.h	(revision 078363490e24c77fddfc84f1361b5b8ee73ced46)
+++ uspace/lib/c/arch/amd64/include/istate.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/amd64/include/istate.h
+../../../../../../kernel/arch/amd64/include/arch/istate.h