Index: uspace/lib/c/generic/async/client.c
===================================================================
--- uspace/lib/c/generic/async/client.c	(revision d57c7c22ec10cecc3ee30ee28e44f7702e425a37)
+++ uspace/lib/c/generic/async/client.c	(revision 45c8eea59f6dced36c60fa4742c6087a34cd81bd)
@@ -122,5 +122,5 @@
 #include "../private/fibril.h"
 
-static FIBRIL_RMUTEX_INITIALIZE(message_mutex);
+static fibril_rmutex_t message_mutex;
 
 /** Naming service session */
@@ -173,4 +173,7 @@
 void __async_client_init(void)
 {
+	if (fibril_rmutex_initialize(&message_mutex) != EOK)
+		abort();
+
 	session_ns.iface = 0;
 	session_ns.mgmt = EXCHANGE_ATOMIC;
Index: uspace/lib/c/generic/async/ports.c
===================================================================
--- uspace/lib/c/generic/async/ports.c	(revision d57c7c22ec10cecc3ee30ee28e44f7702e425a37)
+++ uspace/lib/c/generic/async/ports.c	(revision 45c8eea59f6dced36c60fa4742c6087a34cd81bd)
@@ -100,5 +100,5 @@
 
 /** Futex guarding the interface hash table. */
-static FIBRIL_RMUTEX_INITIALIZE(interface_mutex);
+static fibril_rmutex_t interface_mutex;
 static hash_table_t interface_hash_table;
 
@@ -292,4 +292,7 @@
 void __async_ports_init(void)
 {
+	if (fibril_rmutex_initialize(&interface_mutex) != EOK)
+		abort();
+
 	if (!hash_table_create(&interface_hash_table, 0, 0,
 	    &interface_hash_table_ops))
Index: uspace/lib/c/generic/async/server.c
===================================================================
--- uspace/lib/c/generic/async/server.c	(revision d57c7c22ec10cecc3ee30ee28e44f7702e425a37)
+++ uspace/lib/c/generic/async/server.c	(revision 45c8eea59f6dced36c60fa4742c6087a34cd81bd)
@@ -216,9 +216,9 @@
 }
 
-static FIBRIL_RMUTEX_INITIALIZE(client_mutex);
+static fibril_rmutex_t client_mutex;
 static hash_table_t client_hash_table;
 
 // TODO: lockfree notification_queue?
-static FIBRIL_RMUTEX_INITIALIZE(notification_mutex);
+static fibril_rmutex_t notification_mutex;
 static hash_table_t notification_hash_table;
 static LIST_INITIALIZE(notification_queue);
@@ -1013,4 +1013,9 @@
 void __async_server_init(void)
 {
+	if (fibril_rmutex_initialize(&client_mutex) != EOK)
+		abort();
+	if (fibril_rmutex_initialize(&notification_mutex) != EOK)
+		abort();
+
 	if (!hash_table_create(&client_hash_table, 0, 0, &client_hash_table_ops))
 		abort();