Index: uspace/lib/libc/arch/amd64/src/fibril.S
===================================================================
--- uspace/lib/libc/arch/amd64/src/fibril.S	(revision 296426ad73fda60a9115a372a0a27ca7185a37dc)
+++ uspace/lib/libc/arch/amd64/src/fibril.S	(revision 2f60a5290eb6b781b8644febd27bc3c984f97c1b)
@@ -32,5 +32,5 @@
 .global context_restore
 
-#include <libarch/context_offset.h>
+#include <kernel/arch/context_offset.h>
 
 ## Save current CPU context
@@ -41,15 +41,8 @@
 context_save:
 	movq (%rsp), %rdx     # the caller's return %eip
+	
 	# In %edi is passed 1st argument
-	movq %rdx, OFFSET_PC(%rdi)
-	movq %rsp, OFFSET_SP(%rdi)
+	CONTEXT_SAVE_ARCH_CORE %rdi %rdx 
 	
-	movq %rbx, OFFSET_RBX(%rdi)
-	movq %rbp, OFFSET_RBP(%rdi)
-	movq %r12, OFFSET_R12(%rdi)
-	movq %r13, OFFSET_R13(%rdi)
-	movq %r14, OFFSET_R14(%rdi)
-	movq %r15, OFFSET_R15(%rdi)
-
 	# Save TLS
 	movq %fs:0, %rax
@@ -67,14 +60,7 @@
 #
 context_restore:
-	movq OFFSET_R15(%rdi), %r15
-	movq OFFSET_R14(%rdi), %r14
-	movq OFFSET_R13(%rdi), %r13
-	movq OFFSET_R12(%rdi), %r12
-	movq OFFSET_RBP(%rdi), %rbp
-	movq OFFSET_RBX(%rdi), %rbx	
 	
-	movq OFFSET_SP(%rdi), %rsp   # ctx->sp -> %rsp
+	CONTEXT_RESTORE_ARCH_CORE %rdi %rdx
 	
-	movq OFFSET_PC(%rdi), %rdx
 	movq %rdx,(%rsp)