Index: uspace/lib/libc/generic/async.c
===================================================================
--- uspace/lib/libc/generic/async.c	(revision 9ae22ba11c1a294894242607929d65e81a3c524b)
+++ uspace/lib/libc/generic/async.c	(revision d9f4c767093bd40de86bae3af20838deec81a8b4)
@@ -175,5 +175,5 @@
 
 /** Identifier of the incoming connection handled by the current fibril. */
-__thread connection_t *FIBRIL_connection;
+fibril_local connection_t *FIBRIL_connection;
 
 static void default_client_connection(ipc_callid_t callid, ipc_call_t *call);
Index: uspace/lib/libc/generic/fibril.c
===================================================================
--- uspace/lib/libc/generic/fibril.c	(revision 9ae22ba11c1a294894242607929d65e81a3c524b)
+++ uspace/lib/libc/generic/fibril.c	(revision d9f4c767093bd40de86bae3af20838deec81a8b4)
@@ -65,6 +65,6 @@
 /** Number of threads that are executing a manager fibril and are serialized. */
 static int serialized_threads;	/* Protected by async_futex */
-/** Thread-local count of serialization. If > 0, we must not preempt */
-static __thread int serialization_count;
+/** Fibril-local count of serialization. If > 0, we must not preempt */
+static fibril_local int serialization_count;
 
 /** Setup fibril information into TCB structure */