Index: uspace/lib/c/generic/async/client.c
===================================================================
--- uspace/lib/c/generic/async/client.c	(revision 47be5121774eb4440e3c88b9bfdac20ed2c047d9)
+++ uspace/lib/c/generic/async/client.c	(revision 9f272d9b29449d9630f3c3682f93e9e5ced70f4e)
@@ -99,4 +99,5 @@
 #include <async.h>
 #include "../private/async.h"
+#include "../private/ns.h"
 #undef LIBC_ASYNC_C_
 
@@ -122,5 +123,5 @@
 
 /** Naming service session */
-async_sess_t *session_ns;
+async_sess_t session_ns;
 
 /** Message data */
@@ -210,21 +211,17 @@
 void __async_client_init(void)
 {
-	session_ns = (async_sess_t *) malloc(sizeof(async_sess_t));
-	if (session_ns == NULL)
-		abort();
-
-	session_ns->iface = 0;
-	session_ns->mgmt = EXCHANGE_ATOMIC;
-	session_ns->phone = PHONE_NS;
-	session_ns->arg1 = 0;
-	session_ns->arg2 = 0;
-	session_ns->arg3 = 0;
-
-	fibril_mutex_initialize(&session_ns->remote_state_mtx);
-	session_ns->remote_state_data = NULL;
-
-	list_initialize(&session_ns->exch_list);
-	fibril_mutex_initialize(&session_ns->mutex);
-	atomic_set(&session_ns->refcnt, 0);
+	session_ns.iface = 0;
+	session_ns.mgmt = EXCHANGE_ATOMIC;
+	session_ns.phone = PHONE_NS;
+	session_ns.arg1 = 0;
+	session_ns.arg2 = 0;
+	session_ns.arg3 = 0;
+
+	fibril_mutex_initialize(&session_ns.remote_state_mtx);
+	session_ns.remote_state_data = NULL;
+
+	list_initialize(&session_ns.exch_list);
+	fibril_mutex_initialize(&session_ns.mutex);
+	atomic_set(&session_ns.refcnt, 0);
 }
 
Index: uspace/lib/c/generic/ns.c
===================================================================
--- uspace/lib/c/generic/ns.c	(revision 47be5121774eb4440e3c88b9bfdac20ed2c047d9)
+++ uspace/lib/c/generic/ns.c	(revision 9f272d9b29449d9630f3c3682f93e9e5ced70f4e)
@@ -155,5 +155,5 @@
 
 	if (sess_ns == NULL) {
-		exch = async_exchange_begin(session_ns);
+		exch = async_exchange_begin(&session_ns);
 		sess_ns = async_connect_me_to_iface(exch, 0, 0, 0);
 		async_exchange_end(exch);
Index: uspace/lib/c/generic/private/ns.h
===================================================================
--- uspace/lib/c/generic/private/ns.h	(revision 47be5121774eb4440e3c88b9bfdac20ed2c047d9)
+++ uspace/lib/c/generic/private/ns.h	(revision 9f272d9b29449d9630f3c3682f93e9e5ced70f4e)
@@ -38,5 +38,5 @@
 #include <async.h>
 
-extern async_sess_t *session_ns;
+extern async_sess_t session_ns;
 
 #endif