Index: uspace/lib/c/generic/net/socket_client.c
===================================================================
--- uspace/lib/c/generic/net/socket_client.c	(revision e9460aab031540aa6d1556c9d923416297500cec)
+++ uspace/lib/c/generic/net/socket_client.c	(revision e721462418355c39b2b54d7db7404e894bf38468)
@@ -177,12 +177,5 @@
 //	.last_id = 0,
 	.sockets = NULL,
-	.lock = {
-		.readers = 0,
-		.writers = 0,
-		.waiters = {
-			.prev = &socket_globals.lock.waiters,	/* XXX */
-			.next = &socket_globals.lock.waiters	/* XXX */
-		}
-	}
+	.lock = FIBRIL_RWLOCK_INITIALIZER(socket_globals.lock)
 };
 
Index: uspace/lib/socket/packet/packet_server.c
===================================================================
--- uspace/lib/socket/packet/packet_server.c	(revision e9460aab031540aa6d1556c9d923416297500cec)
+++ uspace/lib/socket/packet/packet_server.c	(revision e721462418355c39b2b54d7db7404e894bf38468)
@@ -85,11 +85,5 @@
 	unsigned int count;
 } ps_globals = {
-	.lock = {
-		.counter = 1,
-		.waiters = {
-			.prev = &ps_globals.lock.waiters,
-			.next = &ps_globals.lock.waiters,
-		}
-	},
+	.lock = FIBRIL_MUTEX_INITIALIZER(ps_globals.lock),
 	.free = {NULL, NULL, NULL, NULL, NULL, NULL, NULL},
 	.sizes = {PAGE_SIZE, PAGE_SIZE * 2, PAGE_SIZE * 4, PAGE_SIZE * 8, PAGE_SIZE * 16, PAGE_SIZE * 32, PAGE_SIZE * 64},