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));