Index: uspace/lib/c/arch/abs32le/include/barrier.h
===================================================================
--- uspace/lib/c/arch/abs32le/include/barrier.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/abs32le/include/barrier.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/abs32le/include/barrier.h
+../../../../../../kernel/arch/abs32le/include/arch/barrier.h
Index: uspace/lib/c/arch/abs32le/include/context_offset.h
===================================================================
--- uspace/lib/c/arch/abs32le/include/context_offset.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/abs32le/include/context_offset.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/abs32le/include/context_offset.h
+../../../../../../kernel/arch/abs32le/include/arch/context_offset.h
Index: uspace/lib/c/arch/abs32le/include/elf.h
===================================================================
--- uspace/lib/c/arch/abs32le/include/elf.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/abs32le/include/elf.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/abs32le/include/elf.h
+../../../../../../kernel/arch/abs32le/include/arch/elf.h
Index: uspace/lib/c/arch/abs32le/include/istate.h
===================================================================
--- uspace/lib/c/arch/abs32le/include/istate.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/abs32le/include/istate.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/abs32le/include/istate.h
+../../../../../../kernel/arch/abs32le/include/arch/istate.h
Index: uspace/lib/c/arch/amd64/include/barrier.h
===================================================================
--- uspace/lib/c/arch/amd64/include/barrier.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ 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 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ 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 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ 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 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ 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
Index: uspace/lib/c/arch/arm32/include/barrier.h
===================================================================
--- uspace/lib/c/arch/arm32/include/barrier.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/arm32/include/barrier.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/arm32/include/barrier.h
+../../../../../../kernel/arch/arm32/include/arch/barrier.h
Index: uspace/lib/c/arch/arm32/include/elf.h
===================================================================
--- uspace/lib/c/arch/arm32/include/elf.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/arm32/include/elf.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/arm32/include/elf.h
+../../../../../../kernel/arch/arm32/include/arch/elf.h
Index: uspace/lib/c/arch/arm32/include/istate.h
===================================================================
--- uspace/lib/c/arch/arm32/include/istate.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/arm32/include/istate.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/arm32/include/istate.h
+../../../../../../kernel/arch/arm32/include/arch/istate.h
Index: uspace/lib/c/arch/arm32/include/regutils.h
===================================================================
--- uspace/lib/c/arch/arm32/include/regutils.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/arm32/include/regutils.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/arm32/include/regutils.h
+../../../../../../kernel/arch/arm32/include/arch/regutils.h
Index: uspace/lib/c/arch/ia32/include/barrier.h
===================================================================
--- uspace/lib/c/arch/ia32/include/barrier.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/ia32/include/barrier.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/ia32/include/barrier.h
+../../../../../../kernel/arch/ia32/include/arch/barrier.h
Index: uspace/lib/c/arch/ia32/include/context_offset.h
===================================================================
--- uspace/lib/c/arch/ia32/include/context_offset.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/ia32/include/context_offset.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/ia32/include/context_offset.h
+../../../../../../kernel/arch/ia32/include/arch/context_offset.h
Index: uspace/lib/c/arch/ia32/include/elf.h
===================================================================
--- uspace/lib/c/arch/ia32/include/elf.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/ia32/include/elf.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/ia32/include/elf.h
+../../../../../../kernel/arch/ia32/include/arch/elf.h
Index: uspace/lib/c/arch/ia32/include/istate.h
===================================================================
--- uspace/lib/c/arch/ia32/include/istate.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/ia32/include/istate.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/ia32/include/istate.h
+../../../../../../kernel/arch/ia32/include/arch/istate.h
Index: uspace/lib/c/arch/ia64/include/barrier.h
===================================================================
--- uspace/lib/c/arch/ia64/include/barrier.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/ia64/include/barrier.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/ia64/include/barrier.h
+../../../../../../kernel/arch/ia64/include/arch/barrier.h
Index: uspace/lib/c/arch/ia64/include/elf.h
===================================================================
--- uspace/lib/c/arch/ia64/include/elf.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/ia64/include/elf.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/ia64/include/elf.h
+../../../../../../kernel/arch/ia64/include/arch/elf.h
Index: uspace/lib/c/arch/ia64/include/istate.h
===================================================================
--- uspace/lib/c/arch/ia64/include/istate.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/ia64/include/istate.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/ia64/include/istate.h
+../../../../../../kernel/arch/ia64/include/arch/istate.h
Index: uspace/lib/c/arch/ia64/include/register.h
===================================================================
--- uspace/lib/c/arch/ia64/include/register.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/ia64/include/register.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/ia64/include/register.h
+../../../../../../kernel/arch/ia64/include/arch/register.h
Index: uspace/lib/c/arch/mips32/include/barrier.h
===================================================================
--- uspace/lib/c/arch/mips32/include/barrier.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/mips32/include/barrier.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/mips32/include/barrier.h
+../../../../../../kernel/arch/mips32/include/arch/barrier.h
Index: uspace/lib/c/arch/mips32/include/context_offset.h
===================================================================
--- uspace/lib/c/arch/mips32/include/context_offset.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/mips32/include/context_offset.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/mips32/include/context_offset.h
+../../../../../../kernel/arch/mips32/include/arch/context_offset.h
Index: uspace/lib/c/arch/mips32/include/cp0.h
===================================================================
--- uspace/lib/c/arch/mips32/include/cp0.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/mips32/include/cp0.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/mips32/include/cp0.h
+../../../../../../kernel/arch/mips32/include/arch/cp0.h
Index: uspace/lib/c/arch/mips32/include/elf.h
===================================================================
--- uspace/lib/c/arch/mips32/include/elf.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/mips32/include/elf.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/mips32/include/elf.h
+../../../../../../kernel/arch/mips32/include/arch/elf.h
Index: uspace/lib/c/arch/mips32/include/istate.h
===================================================================
--- uspace/lib/c/arch/mips32/include/istate.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/mips32/include/istate.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/mips32/include/istate.h
+../../../../../../kernel/arch/mips32/include/arch/istate.h
Index: uspace/lib/c/arch/mips32/include/regname.h
===================================================================
--- uspace/lib/c/arch/mips32/include/regname.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/mips32/include/regname.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/mips32/include/asm/regname.h
+../../../../../../kernel/arch/mips32/include/arch/asm/regname.h
Index: uspace/lib/c/arch/mips32/include/stack.h
===================================================================
--- uspace/lib/c/arch/mips32/include/stack.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/mips32/include/stack.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/mips32/include/stack.h
+../../../../../../kernel/arch/mips32/include/arch/stack.h
Index: uspace/lib/c/arch/mips64/include/barrier.h
===================================================================
--- uspace/lib/c/arch/mips64/include/barrier.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/mips64/include/barrier.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/mips64/include/barrier.h
+../../../../../../kernel/arch/mips64/include/arch/barrier.h
Index: uspace/lib/c/arch/mips64/include/context_offset.h
===================================================================
--- uspace/lib/c/arch/mips64/include/context_offset.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/mips64/include/context_offset.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/mips64/include/context_offset.h
+../../../../../../kernel/arch/mips64/include/arch/context_offset.h
Index: uspace/lib/c/arch/mips64/include/cp0.h
===================================================================
--- uspace/lib/c/arch/mips64/include/cp0.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/mips64/include/cp0.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/mips64/include/cp0.h
+../../../../../../kernel/arch/mips64/include/arch/cp0.h
Index: uspace/lib/c/arch/mips64/include/elf.h
===================================================================
--- uspace/lib/c/arch/mips64/include/elf.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/mips64/include/elf.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/mips64/include/elf.h
+../../../../../../kernel/arch/mips64/include/arch/elf.h
Index: uspace/lib/c/arch/mips64/include/istate.h
===================================================================
--- uspace/lib/c/arch/mips64/include/istate.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/mips64/include/istate.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/mips64/include/istate.h
+../../../../../../kernel/arch/mips64/include/arch/istate.h
Index: uspace/lib/c/arch/mips64/include/regname.h
===================================================================
--- uspace/lib/c/arch/mips64/include/regname.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/mips64/include/regname.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/mips64/include/asm/regname.h
+../../../../../../kernel/arch/mips64/include/arch/asm/regname.h
Index: uspace/lib/c/arch/mips64/include/stack.h
===================================================================
--- uspace/lib/c/arch/mips64/include/stack.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/mips64/include/stack.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/mips64/include/stack.h
+../../../../../../kernel/arch/mips64/include/arch/stack.h
Index: uspace/lib/c/arch/ppc32/include/barrier.h
===================================================================
--- uspace/lib/c/arch/ppc32/include/barrier.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/ppc32/include/barrier.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/ppc32/include/barrier.h
+../../../../../../kernel/arch/ppc32/include/arch/barrier.h
Index: uspace/lib/c/arch/ppc32/include/context_offset.h
===================================================================
--- uspace/lib/c/arch/ppc32/include/context_offset.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/ppc32/include/context_offset.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/ppc32/include/context_offset.h
+../../../../../../kernel/arch/ppc32/include/arch/context_offset.h
Index: uspace/lib/c/arch/ppc32/include/elf.h
===================================================================
--- uspace/lib/c/arch/ppc32/include/elf.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/ppc32/include/elf.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/ppc32/include/elf.h
+../../../../../../kernel/arch/ppc32/include/arch/elf.h
Index: uspace/lib/c/arch/ppc32/include/istate.h
===================================================================
--- uspace/lib/c/arch/ppc32/include/istate.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/ppc32/include/istate.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/ppc32/include/istate.h
+../../../../../../kernel/arch/ppc32/include/arch/istate.h
Index: uspace/lib/c/arch/ppc32/include/msr.h
===================================================================
--- uspace/lib/c/arch/ppc32/include/msr.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/ppc32/include/msr.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/ppc32/include/msr.h
+../../../../../../kernel/arch/ppc32/include/arch/msr.h
Index: uspace/lib/c/arch/sparc64/include/barrier.h
===================================================================
--- uspace/lib/c/arch/sparc64/include/barrier.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/sparc64/include/barrier.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/sparc64/include/barrier.h
+../../../../../../kernel/arch/sparc64/include/arch/barrier.h
Index: uspace/lib/c/arch/sparc64/include/context_offset.h
===================================================================
--- uspace/lib/c/arch/sparc64/include/context_offset.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/sparc64/include/context_offset.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/sparc64/include/context_offset.h
+../../../../../../kernel/arch/sparc64/include/arch/context_offset.h
Index: uspace/lib/c/arch/sparc64/include/elf.h
===================================================================
--- uspace/lib/c/arch/sparc64/include/elf.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/sparc64/include/elf.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/sparc64/include/elf.h
+../../../../../../kernel/arch/sparc64/include/arch/elf.h
Index: uspace/lib/c/arch/sparc64/include/istate.h
===================================================================
--- uspace/lib/c/arch/sparc64/include/istate.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/sparc64/include/istate.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/sparc64/include/istate.h
+../../../../../../kernel/arch/sparc64/include/arch/istate.h
Index: uspace/lib/c/arch/sparc64/include/regdef.h
===================================================================
--- uspace/lib/c/arch/sparc64/include/regdef.h	(revision 849bebe433dfa97df18b4bc9ced2f90a20361270)
+++ uspace/lib/c/arch/sparc64/include/regdef.h	(revision 6ecf5b8322ea8b1cfad0e7246655beef88ab3194)
@@ -1,1 +1,1 @@
-../../../../../../kernel/arch/sparc64/include/regdef.h
+../../../../../../kernel/arch/sparc64/include/arch/regdef.h