Index: uspace/lib/c/arch/abs32le/include/libarch/fibril_context.h
===================================================================
--- uspace/lib/c/arch/abs32le/include/libarch/fibril_context.h	(revision 67ca359bec203b53588e6ce170a1340edd4a904f)
+++ uspace/lib/c/arch/abs32le/include/libarch/fibril_context.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
@@ -36,10 +36,10 @@
  * need to be preserved across function calls.
  */
-typedef struct context {
+typedef struct __context {
 	uintptr_t sp;
 	uintptr_t fp;
 	uintptr_t pc;
 	uintptr_t tls;
-} context_t;
+} __context_t;
 
 #endif
Index: uspace/lib/c/arch/abs32le/src/fibril.c
===================================================================
--- uspace/lib/c/arch/abs32le/src/fibril.c	(revision 67ca359bec203b53588e6ce170a1340edd4a904f)
+++ uspace/lib/c/arch/abs32le/src/fibril.c	(revision a5c78a18893be91b59c28590353ad8d90673105a)
@@ -33,10 +33,10 @@
 #include <stdbool.h>
 
-int __setjmp(context_t *ctx)
+int __setjmp(__context_t *ctx)
 {
 	return 0;
 }
 
-void __longjmp(context_t *ctx, int val)
+void __longjmp(__context_t *ctx, int val)
 {
 	while (true)
Index: uspace/lib/c/arch/amd64/include/libarch/fibril_context.h
===================================================================
--- uspace/lib/c/arch/amd64/include/libarch/fibril_context.h	(revision 67ca359bec203b53588e6ce170a1340edd4a904f)
+++ uspace/lib/c/arch/amd64/include/libarch/fibril_context.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
@@ -30,14 +30,14 @@
 #define LIBC_ARCH_FIBRIL_CONTEXT_H_
 
-#define CONTEXT_OFFSET_SP   0x00
-#define CONTEXT_OFFSET_PC   0x08
-#define CONTEXT_OFFSET_RBX  0x10
-#define CONTEXT_OFFSET_RBP  0x18
-#define CONTEXT_OFFSET_R12  0x20
-#define CONTEXT_OFFSET_R13  0x28
-#define CONTEXT_OFFSET_R14  0x30
-#define CONTEXT_OFFSET_R15  0x38
-#define CONTEXT_OFFSET_TLS  0x40
-#define CONTEXT_SIZE        0x48
+#define __CONTEXT_OFFSET_SP   0x00
+#define __CONTEXT_OFFSET_PC   0x08
+#define __CONTEXT_OFFSET_RBX  0x10
+#define __CONTEXT_OFFSET_RBP  0x18
+#define __CONTEXT_OFFSET_R12  0x20
+#define __CONTEXT_OFFSET_R13  0x28
+#define __CONTEXT_OFFSET_R14  0x30
+#define __CONTEXT_OFFSET_R15  0x38
+#define __CONTEXT_OFFSET_TLS  0x40
+#define __CONTEXT_SIZE        0x48
 
 #ifndef __ASSEMBLER__
@@ -45,5 +45,5 @@
 #include <stdint.h>
 
-typedef struct context {
+typedef struct __context {
 	/*
 	 * We include only registers that must be preserved
@@ -59,5 +59,5 @@
 	uint64_t r15;
 	uint64_t tls;
-} context_t;
+} __context_t;
 
 #endif
Index: uspace/lib/c/arch/amd64/src/fibril.S
===================================================================
--- uspace/lib/c/arch/amd64/src/fibril.S	(revision 67ca359bec203b53588e6ce170a1340edd4a904f)
+++ uspace/lib/c/arch/amd64/src/fibril.S	(revision a5c78a18893be91b59c28590353ad8d90673105a)
@@ -41,16 +41,16 @@
 
 	# in %rdi is passed 1st argument
-	movq %rdx, CONTEXT_OFFSET_PC(%rdi)
-	movq %rsp, CONTEXT_OFFSET_SP(%rdi)
+	movq %rdx, __CONTEXT_OFFSET_PC(%rdi)
+	movq %rsp, __CONTEXT_OFFSET_SP(%rdi)
 
-	movq %rbx, CONTEXT_OFFSET_RBX(%rdi)
-	movq %rbp, CONTEXT_OFFSET_RBP(%rdi)
-	movq %r12, CONTEXT_OFFSET_R12(%rdi)
-	movq %r13, CONTEXT_OFFSET_R13(%rdi)
-	movq %r14, CONTEXT_OFFSET_R14(%rdi)
-	movq %r15, CONTEXT_OFFSET_R15(%rdi)
+	movq %rbx, __CONTEXT_OFFSET_RBX(%rdi)
+	movq %rbp, __CONTEXT_OFFSET_RBP(%rdi)
+	movq %r12, __CONTEXT_OFFSET_R12(%rdi)
+	movq %r13, __CONTEXT_OFFSET_R13(%rdi)
+	movq %r14, __CONTEXT_OFFSET_R14(%rdi)
+	movq %r15, __CONTEXT_OFFSET_R15(%rdi)
 
 	movq %fs:0, %rax
-	movq %rax, CONTEXT_OFFSET_TLS(%rdi)
+	movq %rax, __CONTEXT_OFFSET_TLS(%rdi)
 
 	xorq %rax, %rax                      # __setjmp returns 0
@@ -64,18 +64,18 @@
 #
 FUNCTION_BEGIN(__longjmp)
-	movq CONTEXT_OFFSET_R15(%rdi), %r15
-	movq CONTEXT_OFFSET_R14(%rdi), %r14
-	movq CONTEXT_OFFSET_R13(%rdi), %r13
-	movq CONTEXT_OFFSET_R12(%rdi), %r12
-	movq CONTEXT_OFFSET_RBP(%rdi), %rbp
-	movq CONTEXT_OFFSET_RBX(%rdi), %rbx
+	movq __CONTEXT_OFFSET_R15(%rdi), %r15
+	movq __CONTEXT_OFFSET_R14(%rdi), %r14
+	movq __CONTEXT_OFFSET_R13(%rdi), %r13
+	movq __CONTEXT_OFFSET_R12(%rdi), %r12
+	movq __CONTEXT_OFFSET_RBP(%rdi), %rbp
+	movq __CONTEXT_OFFSET_RBX(%rdi), %rbx
 
-	movq CONTEXT_OFFSET_SP(%rdi), %rsp   # ctx->sp -> %rsp
+	movq __CONTEXT_OFFSET_SP(%rdi), %rsp   # ctx->sp -> %rsp
 
-	movq CONTEXT_OFFSET_PC(%rdi), %rdx
+	movq __CONTEXT_OFFSET_PC(%rdi), %rdx
 
 	movq %rdx,(%rsp)
 
-	movq CONTEXT_OFFSET_TLS(%rdi), %rdi
+	movq __CONTEXT_OFFSET_TLS(%rdi), %rdi
 	movq %rdi, %fs:0
 
Index: uspace/lib/c/arch/arm32/include/libarch/fibril_context.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/fibril_context.h	(revision 67ca359bec203b53588e6ce170a1340edd4a904f)
+++ uspace/lib/c/arch/arm32/include/libarch/fibril_context.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
@@ -41,5 +41,5 @@
 // XXX: This struct must match the assembly code in src/fibril.S
 
-typedef struct context {
+typedef struct __context {
 	uintptr_t sp;
 	uintptr_t pc;
@@ -54,5 +54,5 @@
 	/* r11 */
 	uint32_t fp;
-} context_t;
+} __context_t;
 
 #endif
Index: uspace/lib/c/arch/ia32/include/libarch/fibril_context.h
===================================================================
--- uspace/lib/c/arch/ia32/include/libarch/fibril_context.h	(revision 67ca359bec203b53588e6ce170a1340edd4a904f)
+++ uspace/lib/c/arch/ia32/include/libarch/fibril_context.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
@@ -30,12 +30,12 @@
 #define LIBC_ARCH_FIBRIL_CONTEXT_H_
 
-#define CONTEXT_OFFSET_SP   0x00
-#define CONTEXT_OFFSET_PC   0x04
-#define CONTEXT_OFFSET_EBX  0x08
-#define CONTEXT_OFFSET_ESI  0x0c
-#define CONTEXT_OFFSET_EDI  0x10
-#define CONTEXT_OFFSET_EBP  0x14
-#define CONTEXT_OFFSET_TLS  0x18
-#define CONTEXT_SIZE        0x1c
+#define __CONTEXT_OFFSET_SP   0x00
+#define __CONTEXT_OFFSET_PC   0x04
+#define __CONTEXT_OFFSET_EBX  0x08
+#define __CONTEXT_OFFSET_ESI  0x0c
+#define __CONTEXT_OFFSET_EDI  0x10
+#define __CONTEXT_OFFSET_EBP  0x14
+#define __CONTEXT_OFFSET_TLS  0x18
+#define __CONTEXT_SIZE        0x1c
 
 #ifndef __ASSEMBLER__
@@ -44,5 +44,5 @@
 
 /* We include only registers that must be preserved during function call. */
-typedef struct context {
+typedef struct __context {
 	uint32_t sp;
 	uint32_t pc;
@@ -52,5 +52,5 @@
 	uint32_t ebp;
 	uint32_t tls;
-} context_t;
+} __context_t;
 
 #endif
Index: uspace/lib/c/arch/ia32/src/fibril.S
===================================================================
--- uspace/lib/c/arch/ia32/src/fibril.S	(revision 67ca359bec203b53588e6ce170a1340edd4a904f)
+++ uspace/lib/c/arch/ia32/src/fibril.S	(revision a5c78a18893be91b59c28590353ad8d90673105a)
@@ -42,14 +42,14 @@
 
 	# save registers to the context structure
-	movl %esp, CONTEXT_OFFSET_SP(%edx)	# %esp -> ctx->sp
-	movl %eax, CONTEXT_OFFSET_PC(%edx)	# %eip -> ctx->pc
-	movl %ebx, CONTEXT_OFFSET_EBX(%edx)	# %ebx -> ctx->ebx
-	movl %esi, CONTEXT_OFFSET_ESI(%edx)	# %esi -> ctx->esi
-	movl %edi, CONTEXT_OFFSET_EDI(%edx)	# %edi -> ctx->edi
-	movl %ebp, CONTEXT_OFFSET_EBP(%edx)	# %ebp -> ctx->ebp
+	movl %esp, __CONTEXT_OFFSET_SP(%edx)	# %esp -> ctx->sp
+	movl %eax, __CONTEXT_OFFSET_PC(%edx)	# %eip -> ctx->pc
+	movl %ebx, __CONTEXT_OFFSET_EBX(%edx)	# %ebx -> ctx->ebx
+	movl %esi, __CONTEXT_OFFSET_ESI(%edx)	# %esi -> ctx->esi
+	movl %edi, __CONTEXT_OFFSET_EDI(%edx)	# %edi -> ctx->edi
+	movl %ebp, __CONTEXT_OFFSET_EBP(%edx)	# %ebp -> ctx->ebp
 
 	# save TLS
 	movl %gs:0, %eax
-	movl %eax, CONTEXT_OFFSET_TLS(%edx)	# tls -> ctx->tls
+	movl %eax, __CONTEXT_OFFSET_TLS(%edx)	# tls -> ctx->tls
 
 	xorl %eax, %eax		# __setjmp returns 0
@@ -67,15 +67,15 @@
 
 	# restore registers from the context structure
-	movl CONTEXT_OFFSET_SP(%eax),%esp	# ctx->sp -> %esp
-	movl CONTEXT_OFFSET_PC(%eax),%edx	# ctx->pc -> \pc
-	movl CONTEXT_OFFSET_EBX(%eax),%ebx	# ctx->ebx -> %ebx
-	movl CONTEXT_OFFSET_ESI(%eax),%esi	# ctx->esi -> %esi
-	movl CONTEXT_OFFSET_EDI(%eax),%edi	# ctx->edi -> %edi
-	movl CONTEXT_OFFSET_EBP(%eax),%ebp	# ctx->ebp -> %ebp
+	movl __CONTEXT_OFFSET_SP(%eax),%esp	# ctx->sp -> %esp
+	movl __CONTEXT_OFFSET_PC(%eax),%edx	# ctx->pc -> \pc
+	movl __CONTEXT_OFFSET_EBX(%eax),%ebx	# ctx->ebx -> %ebx
+	movl __CONTEXT_OFFSET_ESI(%eax),%esi	# ctx->esi -> %esi
+	movl __CONTEXT_OFFSET_EDI(%eax),%edi	# ctx->edi -> %edi
+	movl __CONTEXT_OFFSET_EBP(%eax),%ebp	# ctx->ebp -> %ebp
 
 	movl %edx, 0(%esp)  # ctx->pc -> saver's return %eip
 
 	# set thread local storage
-	movl CONTEXT_OFFSET_TLS(%eax), %edx	# Set arg1 to TLS addr
+	movl __CONTEXT_OFFSET_TLS(%eax), %edx	# Set arg1 to TLS addr
 	movl %edx, %gs:0
 
Index: uspace/lib/c/arch/ia64/include/libarch/fibril_context.h
===================================================================
--- uspace/lib/c/arch/ia64/include/libarch/fibril_context.h	(revision 67ca359bec203b53588e6ce170a1340edd4a904f)
+++ uspace/lib/c/arch/ia64/include/libarch/fibril_context.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
@@ -30,46 +30,46 @@
 #define LIBC_ARCH_FIBRIL_CONTEXT_H_
 
-#define CONTEXT_OFFSET_AR_PFS          0x000
-#define CONTEXT_OFFSET_AR_UNAT_CALLER  0x008
-#define CONTEXT_OFFSET_AR_UNAT_CALLEE  0x010
-#define CONTEXT_OFFSET_AR_RSC          0x018
-#define CONTEXT_OFFSET_BSP             0x020
-#define CONTEXT_OFFSET_AR_RNAT         0x028
-#define CONTEXT_OFFSET_AR_LC           0x030
-#define CONTEXT_OFFSET_R1              0x038
-#define CONTEXT_OFFSET_R4              0x040
-#define CONTEXT_OFFSET_R5              0x048
-#define CONTEXT_OFFSET_R6              0x050
-#define CONTEXT_OFFSET_R7              0x058
-#define CONTEXT_OFFSET_SP              0x060
-#define CONTEXT_OFFSET_TP              0x068
-#define CONTEXT_OFFSET_PC              0x070
-#define CONTEXT_OFFSET_B1              0x078
-#define CONTEXT_OFFSET_B2              0x080
-#define CONTEXT_OFFSET_B3              0x088
-#define CONTEXT_OFFSET_B4              0x090
-#define CONTEXT_OFFSET_B5              0x098
-#define CONTEXT_OFFSET_PR              0x0a0
-#define CONTEXT_OFFSET_F2              0x0b0
-#define CONTEXT_OFFSET_F3              0x0c0
-#define CONTEXT_OFFSET_F4              0x0d0
-#define CONTEXT_OFFSET_F5              0x0e0
-#define CONTEXT_OFFSET_F16             0x0f0
-#define CONTEXT_OFFSET_F17             0x100
-#define CONTEXT_OFFSET_F18             0x110
-#define CONTEXT_OFFSET_F19             0x120
-#define CONTEXT_OFFSET_F20             0x130
-#define CONTEXT_OFFSET_F21             0x140
-#define CONTEXT_OFFSET_F22             0x150
-#define CONTEXT_OFFSET_F23             0x160
-#define CONTEXT_OFFSET_F24             0x170
-#define CONTEXT_OFFSET_F25             0x180
-#define CONTEXT_OFFSET_F26             0x190
-#define CONTEXT_OFFSET_F27             0x1a0
-#define CONTEXT_OFFSET_F28             0x1b0
-#define CONTEXT_OFFSET_F29             0x1c0
-#define CONTEXT_OFFSET_F30             0x1d0
-#define CONTEXT_OFFSET_F31             0x1e0
-#define CONTEXT_SIZE                   0x1f0
+#define __CONTEXT_OFFSET_AR_PFS          0x000
+#define __CONTEXT_OFFSET_AR_UNAT_CALLER  0x008
+#define __CONTEXT_OFFSET_AR_UNAT_CALLEE  0x010
+#define __CONTEXT_OFFSET_AR_RSC          0x018
+#define __CONTEXT_OFFSET_BSP             0x020
+#define __CONTEXT_OFFSET_AR_RNAT         0x028
+#define __CONTEXT_OFFSET_AR_LC           0x030
+#define __CONTEXT_OFFSET_R1              0x038
+#define __CONTEXT_OFFSET_R4              0x040
+#define __CONTEXT_OFFSET_R5              0x048
+#define __CONTEXT_OFFSET_R6              0x050
+#define __CONTEXT_OFFSET_R7              0x058
+#define __CONTEXT_OFFSET_SP              0x060
+#define __CONTEXT_OFFSET_TP              0x068
+#define __CONTEXT_OFFSET_PC              0x070
+#define __CONTEXT_OFFSET_B1              0x078
+#define __CONTEXT_OFFSET_B2              0x080
+#define __CONTEXT_OFFSET_B3              0x088
+#define __CONTEXT_OFFSET_B4              0x090
+#define __CONTEXT_OFFSET_B5              0x098
+#define __CONTEXT_OFFSET_PR              0x0a0
+#define __CONTEXT_OFFSET_F2              0x0b0
+#define __CONTEXT_OFFSET_F3              0x0c0
+#define __CONTEXT_OFFSET_F4              0x0d0
+#define __CONTEXT_OFFSET_F5              0x0e0
+#define __CONTEXT_OFFSET_F16             0x0f0
+#define __CONTEXT_OFFSET_F17             0x100
+#define __CONTEXT_OFFSET_F18             0x110
+#define __CONTEXT_OFFSET_F19             0x120
+#define __CONTEXT_OFFSET_F20             0x130
+#define __CONTEXT_OFFSET_F21             0x140
+#define __CONTEXT_OFFSET_F22             0x150
+#define __CONTEXT_OFFSET_F23             0x160
+#define __CONTEXT_OFFSET_F24             0x170
+#define __CONTEXT_OFFSET_F25             0x180
+#define __CONTEXT_OFFSET_F26             0x190
+#define __CONTEXT_OFFSET_F27             0x1a0
+#define __CONTEXT_OFFSET_F28             0x1b0
+#define __CONTEXT_OFFSET_F29             0x1c0
+#define __CONTEXT_OFFSET_F30             0x1d0
+#define __CONTEXT_OFFSET_F31             0x1e0
+#define __CONTEXT_SIZE                   0x1f0
 
 #ifndef __ASSEMBLER__
@@ -79,5 +79,5 @@
 
 // Only save registers that must be preserved across function calls.
-typedef struct context {
+typedef struct __context {
 	// Application registers.
 	uint64_t ar_pfs;
@@ -132,5 +132,5 @@
 	uint128_t f30;
 	uint128_t f31;
-} context_t;
+} __context_t;
 
 #endif  /* __ASSEMBLER__ */
Index: uspace/lib/c/arch/ia64/src/fibril.S
===================================================================
--- uspace/lib/c/arch/ia64/src/fibril.S	(revision 67ca359bec203b53588e6ce170a1340edd4a904f)
+++ uspace/lib/c/arch/ia64/src/fibril.S	(revision a5c78a18893be91b59c28590353ad8d90673105a)
@@ -58,50 +58,50 @@
 	mov loc6 = ar.lc
 
-	add loc8 = CONTEXT_OFFSET_AR_PFS, in0
-	add loc9 = CONTEXT_OFFSET_AR_UNAT_CALLER, in0
-	add loc10 = CONTEXT_OFFSET_AR_UNAT_CALLEE, in0
-	add loc11 = CONTEXT_OFFSET_AR_RSC, in0
-	add loc12 = CONTEXT_OFFSET_BSP, in0
-	add loc13 = CONTEXT_OFFSET_AR_RNAT, in0
-	add loc14 = CONTEXT_OFFSET_AR_LC, in0
-
-	add loc15 = CONTEXT_OFFSET_R1, in0
-	add loc16 = CONTEXT_OFFSET_R4, in0
-	add loc17 = CONTEXT_OFFSET_R5, in0
-	add loc18 = CONTEXT_OFFSET_R6, in0
-	add loc19 = CONTEXT_OFFSET_R7, in0
-	add loc20 = CONTEXT_OFFSET_SP, in0
-	add loc21 = CONTEXT_OFFSET_TP, in0
-
-	add loc22 = CONTEXT_OFFSET_PC, in0
-	add loc23 = CONTEXT_OFFSET_B1, in0
-	add loc24 = CONTEXT_OFFSET_B2, in0
-	add loc25 = CONTEXT_OFFSET_B3, in0
-	add loc26 = CONTEXT_OFFSET_B4, in0
-	add loc27 = CONTEXT_OFFSET_B5, in0
-
-	add loc28 = CONTEXT_OFFSET_PR, in0
-
-	add loc29 = CONTEXT_OFFSET_F2, in0
-	add loc30 = CONTEXT_OFFSET_F3, in0
-	add loc31 = CONTEXT_OFFSET_F4, in0
-	add loc32 = CONTEXT_OFFSET_F5, in0
-
-	add loc33 = CONTEXT_OFFSET_F16, in0
-	add loc34 = CONTEXT_OFFSET_F17, in0
-	add loc35 = CONTEXT_OFFSET_F18, in0
-	add loc36 = CONTEXT_OFFSET_F19, in0
-	add loc37 = CONTEXT_OFFSET_F20, in0
-	add loc38 = CONTEXT_OFFSET_F21, in0
-	add loc39 = CONTEXT_OFFSET_F22, in0
-	add loc40 = CONTEXT_OFFSET_F23, in0
-	add loc41 = CONTEXT_OFFSET_F24, in0
-	add loc42 = CONTEXT_OFFSET_F25, in0
-	add loc43 = CONTEXT_OFFSET_F26, in0
-	add loc44 = CONTEXT_OFFSET_F27, in0
-	add loc45 = CONTEXT_OFFSET_F28, in0
-	add loc46 = CONTEXT_OFFSET_F29, in0
-	add loc47 = CONTEXT_OFFSET_F30, in0
-	add loc48 = CONTEXT_OFFSET_F31, in0 ;;
+	add loc8 = __CONTEXT_OFFSET_AR_PFS, in0
+	add loc9 = __CONTEXT_OFFSET_AR_UNAT_CALLER, in0
+	add loc10 = __CONTEXT_OFFSET_AR_UNAT_CALLEE, in0
+	add loc11 = __CONTEXT_OFFSET_AR_RSC, in0
+	add loc12 = __CONTEXT_OFFSET_BSP, in0
+	add loc13 = __CONTEXT_OFFSET_AR_RNAT, in0
+	add loc14 = __CONTEXT_OFFSET_AR_LC, in0
+
+	add loc15 = __CONTEXT_OFFSET_R1, in0
+	add loc16 = __CONTEXT_OFFSET_R4, in0
+	add loc17 = __CONTEXT_OFFSET_R5, in0
+	add loc18 = __CONTEXT_OFFSET_R6, in0
+	add loc19 = __CONTEXT_OFFSET_R7, in0
+	add loc20 = __CONTEXT_OFFSET_SP, in0
+	add loc21 = __CONTEXT_OFFSET_TP, in0
+
+	add loc22 = __CONTEXT_OFFSET_PC, in0
+	add loc23 = __CONTEXT_OFFSET_B1, in0
+	add loc24 = __CONTEXT_OFFSET_B2, in0
+	add loc25 = __CONTEXT_OFFSET_B3, in0
+	add loc26 = __CONTEXT_OFFSET_B4, in0
+	add loc27 = __CONTEXT_OFFSET_B5, in0
+
+	add loc28 = __CONTEXT_OFFSET_PR, in0
+
+	add loc29 = __CONTEXT_OFFSET_F2, in0
+	add loc30 = __CONTEXT_OFFSET_F3, in0
+	add loc31 = __CONTEXT_OFFSET_F4, in0
+	add loc32 = __CONTEXT_OFFSET_F5, in0
+
+	add loc33 = __CONTEXT_OFFSET_F16, in0
+	add loc34 = __CONTEXT_OFFSET_F17, in0
+	add loc35 = __CONTEXT_OFFSET_F18, in0
+	add loc36 = __CONTEXT_OFFSET_F19, in0
+	add loc37 = __CONTEXT_OFFSET_F20, in0
+	add loc38 = __CONTEXT_OFFSET_F21, in0
+	add loc39 = __CONTEXT_OFFSET_F22, in0
+	add loc40 = __CONTEXT_OFFSET_F23, in0
+	add loc41 = __CONTEXT_OFFSET_F24, in0
+	add loc42 = __CONTEXT_OFFSET_F25, in0
+	add loc43 = __CONTEXT_OFFSET_F26, in0
+	add loc44 = __CONTEXT_OFFSET_F27, in0
+	add loc45 = __CONTEXT_OFFSET_F28, in0
+	add loc46 = __CONTEXT_OFFSET_F29, in0
+	add loc47 = __CONTEXT_OFFSET_F30, in0
+	add loc48 = __CONTEXT_OFFSET_F31, in0 ;;
 
 	/*
@@ -185,50 +185,50 @@
 	alloc loc0 = ar.pfs, 2, 50, 0, 0 ;;
 
-	add loc9 = CONTEXT_OFFSET_AR_PFS, in0
-	add loc10 = CONTEXT_OFFSET_AR_UNAT_CALLER, in0
-	add loc11 = CONTEXT_OFFSET_AR_UNAT_CALLEE, in0
-	add loc12 = CONTEXT_OFFSET_AR_RSC, in0
-	add loc13 = CONTEXT_OFFSET_BSP, in0
-	add loc14 = CONTEXT_OFFSET_AR_RNAT, in0
-	add loc15 = CONTEXT_OFFSET_AR_LC, in0
-
-	add loc16 = CONTEXT_OFFSET_R1, in0
-	add loc17 = CONTEXT_OFFSET_R4, in0
-	add loc18 = CONTEXT_OFFSET_R5, in0
-	add loc19 = CONTEXT_OFFSET_R6, in0
-	add loc20 = CONTEXT_OFFSET_R7, in0
-	add loc21 = CONTEXT_OFFSET_SP, in0
-	add loc22 = CONTEXT_OFFSET_TP, in0
-
-	add loc23 = CONTEXT_OFFSET_PC, in0
-	add loc24 = CONTEXT_OFFSET_B1, in0
-	add loc25 = CONTEXT_OFFSET_B2, in0
-	add loc26 = CONTEXT_OFFSET_B3, in0
-	add loc27 = CONTEXT_OFFSET_B4, in0
-	add loc28 = CONTEXT_OFFSET_B5, in0
-
-	add loc29 = CONTEXT_OFFSET_PR, in0
-
-	add loc30 = CONTEXT_OFFSET_F2, in0
-	add loc31 = CONTEXT_OFFSET_F3, in0
-	add loc32 = CONTEXT_OFFSET_F4, in0
-	add loc33 = CONTEXT_OFFSET_F5, in0
-
-	add loc34 = CONTEXT_OFFSET_F16, in0
-	add loc35 = CONTEXT_OFFSET_F17, in0
-	add loc36 = CONTEXT_OFFSET_F18, in0
-	add loc37 = CONTEXT_OFFSET_F19, in0
-	add loc38 = CONTEXT_OFFSET_F20, in0
-	add loc39 = CONTEXT_OFFSET_F21, in0
-	add loc40 = CONTEXT_OFFSET_F22, in0
-	add loc41 = CONTEXT_OFFSET_F23, in0
-	add loc42 = CONTEXT_OFFSET_F24, in0
-	add loc43 = CONTEXT_OFFSET_F25, in0
-	add loc44 = CONTEXT_OFFSET_F26, in0
-	add loc45 = CONTEXT_OFFSET_F27, in0
-	add loc46 = CONTEXT_OFFSET_F28, in0
-	add loc47 = CONTEXT_OFFSET_F29, in0
-	add loc48 = CONTEXT_OFFSET_F30, in0
-	add loc49 = CONTEXT_OFFSET_F31, in0 ;;
+	add loc9 = __CONTEXT_OFFSET_AR_PFS, in0
+	add loc10 = __CONTEXT_OFFSET_AR_UNAT_CALLER, in0
+	add loc11 = __CONTEXT_OFFSET_AR_UNAT_CALLEE, in0
+	add loc12 = __CONTEXT_OFFSET_AR_RSC, in0
+	add loc13 = __CONTEXT_OFFSET_BSP, in0
+	add loc14 = __CONTEXT_OFFSET_AR_RNAT, in0
+	add loc15 = __CONTEXT_OFFSET_AR_LC, in0
+
+	add loc16 = __CONTEXT_OFFSET_R1, in0
+	add loc17 = __CONTEXT_OFFSET_R4, in0
+	add loc18 = __CONTEXT_OFFSET_R5, in0
+	add loc19 = __CONTEXT_OFFSET_R6, in0
+	add loc20 = __CONTEXT_OFFSET_R7, in0
+	add loc21 = __CONTEXT_OFFSET_SP, in0
+	add loc22 = __CONTEXT_OFFSET_TP, in0
+
+	add loc23 = __CONTEXT_OFFSET_PC, in0
+	add loc24 = __CONTEXT_OFFSET_B1, in0
+	add loc25 = __CONTEXT_OFFSET_B2, in0
+	add loc26 = __CONTEXT_OFFSET_B3, in0
+	add loc27 = __CONTEXT_OFFSET_B4, in0
+	add loc28 = __CONTEXT_OFFSET_B5, in0
+
+	add loc29 = __CONTEXT_OFFSET_PR, in0
+
+	add loc30 = __CONTEXT_OFFSET_F2, in0
+	add loc31 = __CONTEXT_OFFSET_F3, in0
+	add loc32 = __CONTEXT_OFFSET_F4, in0
+	add loc33 = __CONTEXT_OFFSET_F5, in0
+
+	add loc34 = __CONTEXT_OFFSET_F16, in0
+	add loc35 = __CONTEXT_OFFSET_F17, in0
+	add loc36 = __CONTEXT_OFFSET_F18, in0
+	add loc37 = __CONTEXT_OFFSET_F19, in0
+	add loc38 = __CONTEXT_OFFSET_F20, in0
+	add loc39 = __CONTEXT_OFFSET_F21, in0
+	add loc40 = __CONTEXT_OFFSET_F22, in0
+	add loc41 = __CONTEXT_OFFSET_F23, in0
+	add loc42 = __CONTEXT_OFFSET_F24, in0
+	add loc43 = __CONTEXT_OFFSET_F25, in0
+	add loc44 = __CONTEXT_OFFSET_F26, in0
+	add loc45 = __CONTEXT_OFFSET_F27, in0
+	add loc46 = __CONTEXT_OFFSET_F28, in0
+	add loc47 = __CONTEXT_OFFSET_F29, in0
+	add loc48 = __CONTEXT_OFFSET_F30, in0
+	add loc49 = __CONTEXT_OFFSET_F31, in0 ;;
 
 	ld8 loc0 = [loc9]	/* load ar.pfs */
Index: uspace/lib/c/arch/mips32/include/libarch/fibril_context.h
===================================================================
--- uspace/lib/c/arch/mips32/include/libarch/fibril_context.h	(revision 67ca359bec203b53588e6ce170a1340edd4a904f)
+++ uspace/lib/c/arch/mips32/include/libarch/fibril_context.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
@@ -30,29 +30,29 @@
 #define LIBC_ARCH_FIBRIL_CONTEXT_H_
 
-#define CONTEXT_OFFSET_SP   0x00
-#define CONTEXT_OFFSET_PC   0x04
-#define CONTEXT_OFFSET_S0   0x08
-#define CONTEXT_OFFSET_S1   0x0c
-#define CONTEXT_OFFSET_S2   0x10
-#define CONTEXT_OFFSET_S3   0x14
-#define CONTEXT_OFFSET_S4   0x18
-#define CONTEXT_OFFSET_S5   0x1c
-#define CONTEXT_OFFSET_S6   0x20
-#define CONTEXT_OFFSET_S7   0x24
-#define CONTEXT_OFFSET_S8   0x28
-#define CONTEXT_OFFSET_GP   0x2c
-#define CONTEXT_OFFSET_TLS  0x30
-#define CONTEXT_OFFSET_F20  0x34
-#define CONTEXT_OFFSET_F21  0x38
-#define CONTEXT_OFFSET_F22  0x3c
-#define CONTEXT_OFFSET_F23  0x40
-#define CONTEXT_OFFSET_F24  0x44
-#define CONTEXT_OFFSET_F25  0x48
-#define CONTEXT_OFFSET_F26  0x4c
-#define CONTEXT_OFFSET_F27  0x50
-#define CONTEXT_OFFSET_F28  0x54
-#define CONTEXT_OFFSET_F29  0x58
-#define CONTEXT_OFFSET_F30  0x5c
-#define CONTEXT_SIZE        0x60
+#define __CONTEXT_OFFSET_SP   0x00
+#define __CONTEXT_OFFSET_PC   0x04
+#define __CONTEXT_OFFSET_S0   0x08
+#define __CONTEXT_OFFSET_S1   0x0c
+#define __CONTEXT_OFFSET_S2   0x10
+#define __CONTEXT_OFFSET_S3   0x14
+#define __CONTEXT_OFFSET_S4   0x18
+#define __CONTEXT_OFFSET_S5   0x1c
+#define __CONTEXT_OFFSET_S6   0x20
+#define __CONTEXT_OFFSET_S7   0x24
+#define __CONTEXT_OFFSET_S8   0x28
+#define __CONTEXT_OFFSET_GP   0x2c
+#define __CONTEXT_OFFSET_TLS  0x30
+#define __CONTEXT_OFFSET_F20  0x34
+#define __CONTEXT_OFFSET_F21  0x38
+#define __CONTEXT_OFFSET_F22  0x3c
+#define __CONTEXT_OFFSET_F23  0x40
+#define __CONTEXT_OFFSET_F24  0x44
+#define __CONTEXT_OFFSET_F25  0x48
+#define __CONTEXT_OFFSET_F26  0x4c
+#define __CONTEXT_OFFSET_F27  0x50
+#define __CONTEXT_OFFSET_F28  0x54
+#define __CONTEXT_OFFSET_F29  0x58
+#define __CONTEXT_OFFSET_F30  0x5c
+#define __CONTEXT_SIZE        0x60
 
 #ifndef __ASSEMBLER__
@@ -61,5 +61,5 @@
 #include <stdint.h>
 
-typedef struct context {
+typedef struct __context {
 	uint32_t sp;
 	uint32_t pc;
@@ -87,5 +87,5 @@
 	uint32_t f29;
 	uint32_t f30;
-} context_t;
+} __context_t;
 
 #endif
Index: uspace/lib/c/arch/mips32/src/fibril.S
===================================================================
--- uspace/lib/c/arch/mips32/src/fibril.S	(revision 67ca359bec203b53588e6ce170a1340edd4a904f)
+++ uspace/lib/c/arch/mips32/src/fibril.S	(revision a5c78a18893be91b59c28590353ad8d90673105a)
@@ -36,54 +36,54 @@
 
 FUNCTION_BEGIN(__setjmp)
-	sw $s0, CONTEXT_OFFSET_S0($a0)
-	sw $s1, CONTEXT_OFFSET_S1($a0)
-	sw $s2, CONTEXT_OFFSET_S2($a0)
-	sw $s3, CONTEXT_OFFSET_S3($a0)
-	sw $s4, CONTEXT_OFFSET_S4($a0)
-	sw $s5, CONTEXT_OFFSET_S5($a0)
-	sw $s6, CONTEXT_OFFSET_S6($a0)
-	sw $s7, CONTEXT_OFFSET_S7($a0)
-	sw $s8, CONTEXT_OFFSET_S8($a0)
-	sw $gp, CONTEXT_OFFSET_GP($a0)
+	sw $s0, __CONTEXT_OFFSET_S0($a0)
+	sw $s1, __CONTEXT_OFFSET_S1($a0)
+	sw $s2, __CONTEXT_OFFSET_S2($a0)
+	sw $s3, __CONTEXT_OFFSET_S3($a0)
+	sw $s4, __CONTEXT_OFFSET_S4($a0)
+	sw $s5, __CONTEXT_OFFSET_S5($a0)
+	sw $s6, __CONTEXT_OFFSET_S6($a0)
+	sw $s7, __CONTEXT_OFFSET_S7($a0)
+	sw $s8, __CONTEXT_OFFSET_S8($a0)
+	sw $gp, __CONTEXT_OFFSET_GP($a0)
 
-	sw $k1, CONTEXT_OFFSET_TLS($a0)
+	sw $k1, __CONTEXT_OFFSET_TLS($a0)
 
 #ifdef CONFIG_FPU
 	mfc1 $t0, $20
-	sw $t0, CONTEXT_OFFSET_F20($a0)
+	sw $t0, __CONTEXT_OFFSET_F20($a0)
 
 	mfc1 $t0, $21
-	sw $t0, CONTEXT_OFFSET_F21($a0)
+	sw $t0, __CONTEXT_OFFSET_F21($a0)
 
 	mfc1 $t0, $22
-	sw $t0, CONTEXT_OFFSET_F22($a0)
+	sw $t0, __CONTEXT_OFFSET_F22($a0)
 
 	mfc1 $t0, $23
-	sw $t0, CONTEXT_OFFSET_F23($a0)
+	sw $t0, __CONTEXT_OFFSET_F23($a0)
 
 	mfc1 $t0, $24
-	sw $t0, CONTEXT_OFFSET_F24($a0)
+	sw $t0, __CONTEXT_OFFSET_F24($a0)
 
 	mfc1 $t0, $25
-	sw $t0, CONTEXT_OFFSET_F25($a0)
+	sw $t0, __CONTEXT_OFFSET_F25($a0)
 
 	mfc1 $t0, $26
-	sw $t0, CONTEXT_OFFSET_F26($a0)
+	sw $t0, __CONTEXT_OFFSET_F26($a0)
 
 	mfc1 $t0, $27
-	sw $t0, CONTEXT_OFFSET_F27($a0)
+	sw $t0, __CONTEXT_OFFSET_F27($a0)
 
 	mfc1 $t0, $28
-	sw $t0, CONTEXT_OFFSET_F28($a0)
+	sw $t0, __CONTEXT_OFFSET_F28($a0)
 
 	mfc1 $t0, $29
-	sw $t0, CONTEXT_OFFSET_F29($a0)
+	sw $t0, __CONTEXT_OFFSET_F29($a0)
 
 	mfc1 $t0, $30
-	sw $t0, CONTEXT_OFFSET_F30($a0)
+	sw $t0, __CONTEXT_OFFSET_F30($a0)
 #endif /* CONFIG_FPU */
 
-	sw $ra, CONTEXT_OFFSET_PC($a0)
-	sw $sp, CONTEXT_OFFSET_SP($a0)
+	sw $ra, __CONTEXT_OFFSET_PC($a0)
+	sw $sp, __CONTEXT_OFFSET_SP($a0)
 
 	# __setjmp returns 0
@@ -93,53 +93,53 @@
 
 FUNCTION_BEGIN(__longjmp)
-	lw $s0, CONTEXT_OFFSET_S0($a0)
-	lw $s1, CONTEXT_OFFSET_S1($a0)
-	lw $s2, CONTEXT_OFFSET_S2($a0)
-	lw $s3, CONTEXT_OFFSET_S3($a0)
-	lw $s4, CONTEXT_OFFSET_S4($a0)
-	lw $s5, CONTEXT_OFFSET_S5($a0)
-	lw $s6, CONTEXT_OFFSET_S6($a0)
-	lw $s7, CONTEXT_OFFSET_S7($a0)
-	lw $s8, CONTEXT_OFFSET_S8($a0)
-	lw $gp, CONTEXT_OFFSET_GP($a0)
-	lw $k1, CONTEXT_OFFSET_TLS($a0)
+	lw $s0, __CONTEXT_OFFSET_S0($a0)
+	lw $s1, __CONTEXT_OFFSET_S1($a0)
+	lw $s2, __CONTEXT_OFFSET_S2($a0)
+	lw $s3, __CONTEXT_OFFSET_S3($a0)
+	lw $s4, __CONTEXT_OFFSET_S4($a0)
+	lw $s5, __CONTEXT_OFFSET_S5($a0)
+	lw $s6, __CONTEXT_OFFSET_S6($a0)
+	lw $s7, __CONTEXT_OFFSET_S7($a0)
+	lw $s8, __CONTEXT_OFFSET_S8($a0)
+	lw $gp, __CONTEXT_OFFSET_GP($a0)
+	lw $k1, __CONTEXT_OFFSET_TLS($a0)
 
 #ifdef CONFIG_FPU
-	lw $t0, CONTEXT_OFFSET_F20($a0)
+	lw $t0, __CONTEXT_OFFSET_F20($a0)
 	mtc1 $t0, $20
 
-	lw $t0, CONTEXT_OFFSET_F21($a0)
+	lw $t0, __CONTEXT_OFFSET_F21($a0)
 	mtc1 $t0, $21
 
-	lw $t0, CONTEXT_OFFSET_F22($a0)
+	lw $t0, __CONTEXT_OFFSET_F22($a0)
 	mtc1 $t0, $22
 
-	lw $t0, CONTEXT_OFFSET_F23($a0)
+	lw $t0, __CONTEXT_OFFSET_F23($a0)
 	mtc1 $t0, $23
 
-	lw $t0, CONTEXT_OFFSET_F24($a0)
+	lw $t0, __CONTEXT_OFFSET_F24($a0)
 	mtc1 $t0, $24
 
-	lw $t0, CONTEXT_OFFSET_F25($a0)
+	lw $t0, __CONTEXT_OFFSET_F25($a0)
 	mtc1 $t0, $25
 
-	lw $t0, CONTEXT_OFFSET_F26($a0)
+	lw $t0, __CONTEXT_OFFSET_F26($a0)
 	mtc1 $t0, $26
 
-	lw $t0, CONTEXT_OFFSET_F27($a0)
+	lw $t0, __CONTEXT_OFFSET_F27($a0)
 	mtc1 $t0, $27
 
-	lw $t0, CONTEXT_OFFSET_F28($a0)
+	lw $t0, __CONTEXT_OFFSET_F28($a0)
 	mtc1 $t0, $28
 
-	lw $t0, CONTEXT_OFFSET_F29($a0)
+	lw $t0, __CONTEXT_OFFSET_F29($a0)
 	mtc1 $t0, $29
 
-	lw $t0, CONTEXT_OFFSET_F30($a0)
+	lw $t0, __CONTEXT_OFFSET_F30($a0)
 	mtc1 $t0, $30
 #endif /* CONFIG_FPU */
 
-	lw $ra, CONTEXT_OFFSET_PC($a0)
-	lw $sp, CONTEXT_OFFSET_SP($a0)
+	lw $ra, __CONTEXT_OFFSET_PC($a0)
+	lw $sp, __CONTEXT_OFFSET_SP($a0)
 
 	# Just for the jump into first function,
Index: uspace/lib/c/arch/ppc32/include/libarch/fibril_context.h
===================================================================
--- uspace/lib/c/arch/ppc32/include/libarch/fibril_context.h	(revision 67ca359bec203b53588e6ce170a1340edd4a904f)
+++ uspace/lib/c/arch/ppc32/include/libarch/fibril_context.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
@@ -30,28 +30,28 @@
 #define LIBC_ARCH_FIBRIL_CONTEXT_H_
 
-#define CONTEXT_OFFSET_SP   0x00
-#define CONTEXT_OFFSET_PC   0x04
-#define CONTEXT_OFFSET_TLS  0x08
-#define CONTEXT_OFFSET_R13  0x0c
-#define CONTEXT_OFFSET_R14  0x10
-#define CONTEXT_OFFSET_R15  0x14
-#define CONTEXT_OFFSET_R16  0x18
-#define CONTEXT_OFFSET_R17  0x1c
-#define CONTEXT_OFFSET_R18  0x20
-#define CONTEXT_OFFSET_R19  0x24
-#define CONTEXT_OFFSET_R20  0x28
-#define CONTEXT_OFFSET_R21  0x2c
-#define CONTEXT_OFFSET_R22  0x30
-#define CONTEXT_OFFSET_R23  0x34
-#define CONTEXT_OFFSET_R24  0x38
-#define CONTEXT_OFFSET_R25  0x3c
-#define CONTEXT_OFFSET_R26  0x40
-#define CONTEXT_OFFSET_R27  0x44
-#define CONTEXT_OFFSET_R28  0x48
-#define CONTEXT_OFFSET_R29  0x4c
-#define CONTEXT_OFFSET_R30  0x50
-#define CONTEXT_OFFSET_R31  0x54
-#define CONTEXT_OFFSET_CR   0x58
-#define CONTEXT_SIZE        0x5c
+#define __CONTEXT_OFFSET_SP   0x00
+#define __CONTEXT_OFFSET_PC   0x04
+#define __CONTEXT_OFFSET_TLS  0x08
+#define __CONTEXT_OFFSET_R13  0x0c
+#define __CONTEXT_OFFSET_R14  0x10
+#define __CONTEXT_OFFSET_R15  0x14
+#define __CONTEXT_OFFSET_R16  0x18
+#define __CONTEXT_OFFSET_R17  0x1c
+#define __CONTEXT_OFFSET_R18  0x20
+#define __CONTEXT_OFFSET_R19  0x24
+#define __CONTEXT_OFFSET_R20  0x28
+#define __CONTEXT_OFFSET_R21  0x2c
+#define __CONTEXT_OFFSET_R22  0x30
+#define __CONTEXT_OFFSET_R23  0x34
+#define __CONTEXT_OFFSET_R24  0x38
+#define __CONTEXT_OFFSET_R25  0x3c
+#define __CONTEXT_OFFSET_R26  0x40
+#define __CONTEXT_OFFSET_R27  0x44
+#define __CONTEXT_OFFSET_R28  0x48
+#define __CONTEXT_OFFSET_R29  0x4c
+#define __CONTEXT_OFFSET_R30  0x50
+#define __CONTEXT_OFFSET_R31  0x54
+#define __CONTEXT_OFFSET_CR   0x58
+#define __CONTEXT_SIZE        0x5c
 
 #ifndef __ASSEMBLER__
@@ -60,5 +60,5 @@
 #include <stdint.h>
 
-typedef struct context {
+typedef struct __context {
 	uint32_t sp;
 	uint32_t pc;
@@ -84,5 +84,5 @@
 	uint32_t r31;
 	uint32_t cr;
-} context_t;
+} __context_t;
 
 #endif
Index: uspace/lib/c/arch/ppc32/src/fibril.S
===================================================================
--- uspace/lib/c/arch/ppc32/src/fibril.S	(revision 67ca359bec203b53588e6ce170a1340edd4a904f)
+++ uspace/lib/c/arch/ppc32/src/fibril.S	(revision a5c78a18893be91b59c28590353ad8d90673105a)
@@ -34,31 +34,31 @@
 
 FUNCTION_BEGIN(__setjmp)
-	stw sp, CONTEXT_OFFSET_SP(r3)
-	stw r2, CONTEXT_OFFSET_TLS(r3)
-	stw r13, CONTEXT_OFFSET_R13(r3)
-	stw r14, CONTEXT_OFFSET_R14(r3)
-	stw r15, CONTEXT_OFFSET_R15(r3)
-	stw r16, CONTEXT_OFFSET_R16(r3)
-	stw r17, CONTEXT_OFFSET_R17(r3)
-	stw r18, CONTEXT_OFFSET_R18(r3)
-	stw r19, CONTEXT_OFFSET_R19(r3)
-	stw r20, CONTEXT_OFFSET_R20(r3)
-	stw r21, CONTEXT_OFFSET_R21(r3)
-	stw r22, CONTEXT_OFFSET_R22(r3)
-	stw r23, CONTEXT_OFFSET_R23(r3)
-	stw r24, CONTEXT_OFFSET_R24(r3)
-	stw r25, CONTEXT_OFFSET_R25(r3)
-	stw r26, CONTEXT_OFFSET_R26(r3)
-	stw r27, CONTEXT_OFFSET_R27(r3)
-	stw r28, CONTEXT_OFFSET_R28(r3)
-	stw r29, CONTEXT_OFFSET_R29(r3)
-	stw r30, CONTEXT_OFFSET_R30(r3)
-	stw r31, CONTEXT_OFFSET_R31(r3)
+	stw sp, __CONTEXT_OFFSET_SP(r3)
+	stw r2, __CONTEXT_OFFSET_TLS(r3)
+	stw r13, __CONTEXT_OFFSET_R13(r3)
+	stw r14, __CONTEXT_OFFSET_R14(r3)
+	stw r15, __CONTEXT_OFFSET_R15(r3)
+	stw r16, __CONTEXT_OFFSET_R16(r3)
+	stw r17, __CONTEXT_OFFSET_R17(r3)
+	stw r18, __CONTEXT_OFFSET_R18(r3)
+	stw r19, __CONTEXT_OFFSET_R19(r3)
+	stw r20, __CONTEXT_OFFSET_R20(r3)
+	stw r21, __CONTEXT_OFFSET_R21(r3)
+	stw r22, __CONTEXT_OFFSET_R22(r3)
+	stw r23, __CONTEXT_OFFSET_R23(r3)
+	stw r24, __CONTEXT_OFFSET_R24(r3)
+	stw r25, __CONTEXT_OFFSET_R25(r3)
+	stw r26, __CONTEXT_OFFSET_R26(r3)
+	stw r27, __CONTEXT_OFFSET_R27(r3)
+	stw r28, __CONTEXT_OFFSET_R28(r3)
+	stw r29, __CONTEXT_OFFSET_R29(r3)
+	stw r30, __CONTEXT_OFFSET_R30(r3)
+	stw r31, __CONTEXT_OFFSET_R31(r3)
 
 	mflr r4
-	stw r4, CONTEXT_OFFSET_PC(r3)
+	stw r4, __CONTEXT_OFFSET_PC(r3)
 
 	mfcr r4
-	stw r4, CONTEXT_OFFSET_CR(r3)
+	stw r4, __CONTEXT_OFFSET_CR(r3)
 
 	# __setjmp returns 0
@@ -68,30 +68,30 @@
 
 FUNCTION_BEGIN(__longjmp)
-	lwz sp, CONTEXT_OFFSET_SP(r3)
-	lwz r2, CONTEXT_OFFSET_TLS(r3)
-	lwz r13, CONTEXT_OFFSET_R13(r3)
-	lwz r14, CONTEXT_OFFSET_R14(r3)
-	lwz r15, CONTEXT_OFFSET_R15(r3)
-	lwz r16, CONTEXT_OFFSET_R16(r3)
-	lwz r17, CONTEXT_OFFSET_R17(r3)
-	lwz r18, CONTEXT_OFFSET_R18(r3)
-	lwz r19, CONTEXT_OFFSET_R19(r3)
-	lwz r20, CONTEXT_OFFSET_R20(r3)
-	lwz r21, CONTEXT_OFFSET_R21(r3)
-	lwz r22, CONTEXT_OFFSET_R22(r3)
-	lwz r23, CONTEXT_OFFSET_R23(r3)
-	lwz r24, CONTEXT_OFFSET_R24(r3)
-	lwz r25, CONTEXT_OFFSET_R25(r3)
-	lwz r26, CONTEXT_OFFSET_R26(r3)
-	lwz r27, CONTEXT_OFFSET_R27(r3)
-	lwz r28, CONTEXT_OFFSET_R28(r3)
-	lwz r29, CONTEXT_OFFSET_R29(r3)
-	lwz r30, CONTEXT_OFFSET_R30(r3)
-	lwz r31, CONTEXT_OFFSET_R31(r3)
+	lwz sp, __CONTEXT_OFFSET_SP(r3)
+	lwz r2, __CONTEXT_OFFSET_TLS(r3)
+	lwz r13, __CONTEXT_OFFSET_R13(r3)
+	lwz r14, __CONTEXT_OFFSET_R14(r3)
+	lwz r15, __CONTEXT_OFFSET_R15(r3)
+	lwz r16, __CONTEXT_OFFSET_R16(r3)
+	lwz r17, __CONTEXT_OFFSET_R17(r3)
+	lwz r18, __CONTEXT_OFFSET_R18(r3)
+	lwz r19, __CONTEXT_OFFSET_R19(r3)
+	lwz r20, __CONTEXT_OFFSET_R20(r3)
+	lwz r21, __CONTEXT_OFFSET_R21(r3)
+	lwz r22, __CONTEXT_OFFSET_R22(r3)
+	lwz r23, __CONTEXT_OFFSET_R23(r3)
+	lwz r24, __CONTEXT_OFFSET_R24(r3)
+	lwz r25, __CONTEXT_OFFSET_R25(r3)
+	lwz r26, __CONTEXT_OFFSET_R26(r3)
+	lwz r27, __CONTEXT_OFFSET_R27(r3)
+	lwz r28, __CONTEXT_OFFSET_R28(r3)
+	lwz r29, __CONTEXT_OFFSET_R29(r3)
+	lwz r30, __CONTEXT_OFFSET_R30(r3)
+	lwz r31, __CONTEXT_OFFSET_R31(r3)
 
-	lwz r5, CONTEXT_OFFSET_CR(r3)
+	lwz r5, __CONTEXT_OFFSET_CR(r3)
 	mtcr r5
 
-	lwz r5, CONTEXT_OFFSET_PC(r3)
+	lwz r5, __CONTEXT_OFFSET_PC(r3)
 	mtlr r5
 
Index: uspace/lib/c/arch/riscv64/include/libarch/fibril_context.h
===================================================================
--- uspace/lib/c/arch/riscv64/include/libarch/fibril_context.h	(revision 67ca359bec203b53588e6ce170a1340edd4a904f)
+++ uspace/lib/c/arch/riscv64/include/libarch/fibril_context.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
@@ -30,38 +30,38 @@
 #define LIBC_ARCH_FIBRIL_CONTEXT_H_
 
-#define CONTEXT_OFFSET_SP   0x00
-#define CONTEXT_OFFSET_PC   0x08
-#define CONTEXT_OFFSET_ZERO 0x10
-#define CONTEXT_OFFSET_RA   0x18
-#define CONTEXT_OFFSET_X3   0x20
-#define CONTEXT_OFFSET_X4   0x28
-#define CONTEXT_OFFSET_X5   0x30
-#define CONTEXT_OFFSET_X6   0x38
-#define CONTEXT_OFFSET_X7   0x40
-#define CONTEXT_OFFSET_X8   0x48
-#define CONTEXT_OFFSET_X9   0x50
-#define CONTEXT_OFFSET_X10  0x58
-#define CONTEXT_OFFSET_X11  0x60
-#define CONTEXT_OFFSET_X12  0x68
-#define CONTEXT_OFFSET_X13  0x70
-#define CONTEXT_OFFSET_X14  0x78
-#define CONTEXT_OFFSET_X15  0x80
-#define CONTEXT_OFFSET_X16  0x88
-#define CONTEXT_OFFSET_X17  0x90
-#define CONTEXT_OFFSET_X18  0x98
-#define CONTEXT_OFFSET_X19  0xa0
-#define CONTEXT_OFFSET_X20  0xa8
-#define CONTEXT_OFFSET_X21  0xb0
-#define CONTEXT_OFFSET_X22  0xb8
-#define CONTEXT_OFFSET_X23  0xc0
-#define CONTEXT_OFFSET_X24  0xc8
-#define CONTEXT_OFFSET_X25  0xd0
-#define CONTEXT_OFFSET_X26  0xd8
-#define CONTEXT_OFFSET_X27  0xe0
-#define CONTEXT_OFFSET_X28  0xe8
-#define CONTEXT_OFFSET_X29  0xf0
-#define CONTEXT_OFFSET_X30  0xf8
-#define CONTEXT_OFFSET_X31  0x100
-#define CONTEXT_SIZE        0x108
+#define __CONTEXT_OFFSET_SP   0x00
+#define __CONTEXT_OFFSET_PC   0x08
+#define __CONTEXT_OFFSET_ZERO 0x10
+#define __CONTEXT_OFFSET_RA   0x18
+#define __CONTEXT_OFFSET_X3   0x20
+#define __CONTEXT_OFFSET_X4   0x28
+#define __CONTEXT_OFFSET_X5   0x30
+#define __CONTEXT_OFFSET_X6   0x38
+#define __CONTEXT_OFFSET_X7   0x40
+#define __CONTEXT_OFFSET_X8   0x48
+#define __CONTEXT_OFFSET_X9   0x50
+#define __CONTEXT_OFFSET_X10  0x58
+#define __CONTEXT_OFFSET_X11  0x60
+#define __CONTEXT_OFFSET_X12  0x68
+#define __CONTEXT_OFFSET_X13  0x70
+#define __CONTEXT_OFFSET_X14  0x78
+#define __CONTEXT_OFFSET_X15  0x80
+#define __CONTEXT_OFFSET_X16  0x88
+#define __CONTEXT_OFFSET_X17  0x90
+#define __CONTEXT_OFFSET_X18  0x98
+#define __CONTEXT_OFFSET_X19  0xa0
+#define __CONTEXT_OFFSET_X20  0xa8
+#define __CONTEXT_OFFSET_X21  0xb0
+#define __CONTEXT_OFFSET_X22  0xb8
+#define __CONTEXT_OFFSET_X23  0xc0
+#define __CONTEXT_OFFSET_X24  0xc8
+#define __CONTEXT_OFFSET_X25  0xd0
+#define __CONTEXT_OFFSET_X26  0xd8
+#define __CONTEXT_OFFSET_X27  0xe0
+#define __CONTEXT_OFFSET_X28  0xe8
+#define __CONTEXT_OFFSET_X29  0xf0
+#define __CONTEXT_OFFSET_X30  0xf8
+#define __CONTEXT_OFFSET_X31  0x100
+#define __CONTEXT_SIZE        0x108
 
 #ifndef __ASSEMBLER__
@@ -75,5 +75,5 @@
  */
 
-typedef struct context {
+typedef struct __context {
 	uint64_t sp;
 	uint64_t pc;
@@ -109,5 +109,5 @@
 	uint64_t x30;
 	uint64_t x31;
-} context_t;
+} __context_t;
 
 #endif
Index: uspace/lib/c/arch/riscv64/src/fibril.c
===================================================================
--- uspace/lib/c/arch/riscv64/src/fibril.c	(revision 67ca359bec203b53588e6ce170a1340edd4a904f)
+++ uspace/lib/c/arch/riscv64/src/fibril.c	(revision a5c78a18893be91b59c28590353ad8d90673105a)
@@ -33,10 +33,10 @@
 #include <stdbool.h>
 
-int __setjmp(context_t *ctx)
+int __setjmp(__context_t *ctx)
 {
 	return 0;
 }
 
-void __longjmp(context_t *ctx, int ret)
+void __longjmp(__context_t *ctx, int ret)
 {
 	while (true)
Index: uspace/lib/c/arch/sparc64/include/libarch/fibril_context.h
===================================================================
--- uspace/lib/c/arch/sparc64/include/libarch/fibril_context.h	(revision 67ca359bec203b53588e6ce170a1340edd4a904f)
+++ uspace/lib/c/arch/sparc64/include/libarch/fibril_context.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
@@ -30,24 +30,24 @@
 #define LIBC_ARCH_FIBRIL_CONTEXT_H_
 
-#define CONTEXT_OFFSET_SP  0x00
-#define CONTEXT_OFFSET_PC  0x08
-#define CONTEXT_OFFSET_I0  0x10
-#define CONTEXT_OFFSET_I1  0x18
-#define CONTEXT_OFFSET_I2  0x20
-#define CONTEXT_OFFSET_I3  0x28
-#define CONTEXT_OFFSET_I4  0x30
-#define CONTEXT_OFFSET_I5  0x38
-#define CONTEXT_OFFSET_FP  0x40
-#define CONTEXT_OFFSET_I7  0x48
-#define CONTEXT_OFFSET_L0  0x50
-#define CONTEXT_OFFSET_L1  0x58
-#define CONTEXT_OFFSET_L2  0x60
-#define CONTEXT_OFFSET_L3  0x68
-#define CONTEXT_OFFSET_L4  0x70
-#define CONTEXT_OFFSET_L5  0x78
-#define CONTEXT_OFFSET_L6  0x80
-#define CONTEXT_OFFSET_L7  0x88
-#define CONTEXT_OFFSET_TP  0x90
-#define CONTEXT_SIZE       0x98
+#define __CONTEXT_OFFSET_SP  0x00
+#define __CONTEXT_OFFSET_PC  0x08
+#define __CONTEXT_OFFSET_I0  0x10
+#define __CONTEXT_OFFSET_I1  0x18
+#define __CONTEXT_OFFSET_I2  0x20
+#define __CONTEXT_OFFSET_I3  0x28
+#define __CONTEXT_OFFSET_I4  0x30
+#define __CONTEXT_OFFSET_I5  0x38
+#define __CONTEXT_OFFSET_FP  0x40
+#define __CONTEXT_OFFSET_I7  0x48
+#define __CONTEXT_OFFSET_L0  0x50
+#define __CONTEXT_OFFSET_L1  0x58
+#define __CONTEXT_OFFSET_L2  0x60
+#define __CONTEXT_OFFSET_L3  0x68
+#define __CONTEXT_OFFSET_L4  0x70
+#define __CONTEXT_OFFSET_L5  0x78
+#define __CONTEXT_OFFSET_L6  0x80
+#define __CONTEXT_OFFSET_L7  0x88
+#define __CONTEXT_OFFSET_TP  0x90
+#define __CONTEXT_SIZE       0x98
 
 #ifndef __ASSEMBLER__
@@ -56,5 +56,5 @@
 #include <stdint.h>
 
-typedef struct context {
+typedef struct __context {
 	uintptr_t sp;  // %o6
 	uintptr_t pc;  // %o7
@@ -76,5 +76,5 @@
 	uint64_t l7;
 	uint64_t tp;  // %g7
-} context_t;
+} __context_t;
 
 #endif
Index: uspace/lib/c/arch/sparc64/src/fibril.S
===================================================================
--- uspace/lib/c/arch/sparc64/src/fibril.S	(revision 67ca359bec203b53588e6ce170a1340edd4a904f)
+++ uspace/lib/c/arch/sparc64/src/fibril.S	(revision a5c78a18893be91b59c28590353ad8d90673105a)
@@ -37,23 +37,23 @@
 	# should a thread switch occur.
 	#
-	stx %sp, [%o0 + CONTEXT_OFFSET_SP]
-	stx %o7, [%o0 + CONTEXT_OFFSET_PC]
-	stx %i0, [%o0 + CONTEXT_OFFSET_I0]
-	stx %i1, [%o0 + CONTEXT_OFFSET_I1]
-	stx %i2, [%o0 + CONTEXT_OFFSET_I2]
-	stx %i3, [%o0 + CONTEXT_OFFSET_I3]
-	stx %i4, [%o0 + CONTEXT_OFFSET_I4]
-	stx %i5, [%o0 + CONTEXT_OFFSET_I5]
-	stx %fp, [%o0 + CONTEXT_OFFSET_FP]
-	stx %i7, [%o0 + CONTEXT_OFFSET_I7]
-	stx %l0, [%o0 + CONTEXT_OFFSET_L0]
-	stx %l1, [%o0 + CONTEXT_OFFSET_L1]
-	stx %l2, [%o0 + CONTEXT_OFFSET_L2]
-	stx %l3, [%o0 + CONTEXT_OFFSET_L3]
-	stx %l4, [%o0 + CONTEXT_OFFSET_L4]
-	stx %l5, [%o0 + CONTEXT_OFFSET_L5]
-	stx %l6, [%o0 + CONTEXT_OFFSET_L6]
-	stx %l7, [%o0 + CONTEXT_OFFSET_L7]
-	stx %g7, [%o0 + CONTEXT_OFFSET_TP]
+	stx %sp, [%o0 + __CONTEXT_OFFSET_SP]
+	stx %o7, [%o0 + __CONTEXT_OFFSET_PC]
+	stx %i0, [%o0 + __CONTEXT_OFFSET_I0]
+	stx %i1, [%o0 + __CONTEXT_OFFSET_I1]
+	stx %i2, [%o0 + __CONTEXT_OFFSET_I2]
+	stx %i3, [%o0 + __CONTEXT_OFFSET_I3]
+	stx %i4, [%o0 + __CONTEXT_OFFSET_I4]
+	stx %i5, [%o0 + __CONTEXT_OFFSET_I5]
+	stx %fp, [%o0 + __CONTEXT_OFFSET_FP]
+	stx %i7, [%o0 + __CONTEXT_OFFSET_I7]
+	stx %l0, [%o0 + __CONTEXT_OFFSET_L0]
+	stx %l1, [%o0 + __CONTEXT_OFFSET_L1]
+	stx %l2, [%o0 + __CONTEXT_OFFSET_L2]
+	stx %l3, [%o0 + __CONTEXT_OFFSET_L3]
+	stx %l4, [%o0 + __CONTEXT_OFFSET_L4]
+	stx %l5, [%o0 + __CONTEXT_OFFSET_L5]
+	stx %l6, [%o0 + __CONTEXT_OFFSET_L6]
+	stx %l7, [%o0 + __CONTEXT_OFFSET_L7]
+	stx %g7, [%o0 + __CONTEXT_OFFSET_TP]
 	retl
 	mov 0, %o0		! __setjmp returns 0
@@ -69,23 +69,23 @@
 	flushw
 
-	ldx [%o0 + CONTEXT_OFFSET_SP], %sp
-	ldx [%o0 + CONTEXT_OFFSET_PC], %o7
-	ldx [%o0 + CONTEXT_OFFSET_I0], %i0
-	ldx [%o0 + CONTEXT_OFFSET_I1], %i1
-	ldx [%o0 + CONTEXT_OFFSET_I2], %i2
-	ldx [%o0 + CONTEXT_OFFSET_I3], %i3
-	ldx [%o0 + CONTEXT_OFFSET_I4], %i4
-	ldx [%o0 + CONTEXT_OFFSET_I5], %i5
-	ldx [%o0 + CONTEXT_OFFSET_FP], %fp
-	ldx [%o0 + CONTEXT_OFFSET_I7], %i7
-	ldx [%o0 + CONTEXT_OFFSET_L0], %l0
-	ldx [%o0 + CONTEXT_OFFSET_L1], %l1
-	ldx [%o0 + CONTEXT_OFFSET_L2], %l2
-	ldx [%o0 + CONTEXT_OFFSET_L3], %l3
-	ldx [%o0 + CONTEXT_OFFSET_L4], %l4
-	ldx [%o0 + CONTEXT_OFFSET_L5], %l5
-	ldx [%o0 + CONTEXT_OFFSET_L6], %l6
-	ldx [%o0 + CONTEXT_OFFSET_L7], %l7
-	ldx [%o0 + CONTEXT_OFFSET_TP], %g7
+	ldx [%o0 + __CONTEXT_OFFSET_SP], %sp
+	ldx [%o0 + __CONTEXT_OFFSET_PC], %o7
+	ldx [%o0 + __CONTEXT_OFFSET_I0], %i0
+	ldx [%o0 + __CONTEXT_OFFSET_I1], %i1
+	ldx [%o0 + __CONTEXT_OFFSET_I2], %i2
+	ldx [%o0 + __CONTEXT_OFFSET_I3], %i3
+	ldx [%o0 + __CONTEXT_OFFSET_I4], %i4
+	ldx [%o0 + __CONTEXT_OFFSET_I5], %i5
+	ldx [%o0 + __CONTEXT_OFFSET_FP], %fp
+	ldx [%o0 + __CONTEXT_OFFSET_I7], %i7
+	ldx [%o0 + __CONTEXT_OFFSET_L0], %l0
+	ldx [%o0 + __CONTEXT_OFFSET_L1], %l1
+	ldx [%o0 + __CONTEXT_OFFSET_L2], %l2
+	ldx [%o0 + __CONTEXT_OFFSET_L3], %l3
+	ldx [%o0 + __CONTEXT_OFFSET_L4], %l4
+	ldx [%o0 + __CONTEXT_OFFSET_L5], %l5
+	ldx [%o0 + __CONTEXT_OFFSET_L6], %l6
+	ldx [%o0 + __CONTEXT_OFFSET_L7], %l7
+	ldx [%o0 + __CONTEXT_OFFSET_TP], %g7
 	retl
 	mov %o1, %o0	! __longjmp returns second argument
Index: uspace/lib/c/include/context.h
===================================================================
--- uspace/lib/c/include/context.h	(revision 67ca359bec203b53588e6ce170a1340edd4a904f)
+++ uspace/lib/c/include/context.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
@@ -33,4 +33,6 @@
 #include <libarch/fibril_context.h>
 
+typedef __context_t context_t;
+
 /* Context initialization data. */
 typedef struct {
Index: uspace/lib/c/include/setjmp.h
===================================================================
--- uspace/lib/c/include/setjmp.h	(revision 67ca359bec203b53588e6ce170a1340edd4a904f)
+++ uspace/lib/c/include/setjmp.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
@@ -41,5 +41,5 @@
 #include <_bits/__noreturn.h>
 
-typedef context_t jmp_buf[1];
+typedef __context_t jmp_buf[1];
 
 extern int __setjmp(jmp_buf) __attribute__((returns_twice));