Index: libcfa/src/concurrency/clib/cfathread.cfa
===================================================================
--- libcfa/src/concurrency/clib/cfathread.cfa	(revision ce44c5f70ab0a50322bed0d103a046e00bbadaa7)
+++ libcfa/src/concurrency/clib/cfathread.cfa	(revision 601bd9e9f3b5aea55f6bb776a5794aa880af3c04)
@@ -16,7 +16,8 @@
 // #define EPOLL_FOR_SOCKETS
 
-#include <sys/socket.h> // first include because of anonymous types __SOCKADDR_ARG, __CONST_SOCKADDR_ARG
 #include <string.h>
 #include <errno.h>
+#include <unistd.h>
+#include <sys/socket.h>
 
 #include "fstream.hfa"
@@ -27,5 +28,5 @@
 #include "time.hfa"
 #include "stdlib.hfa"
-
+#include "iofwd.hfa"
 #include "cfathread.h"
 
@@ -470,8 +471,4 @@
 }
 
-#include <unistd.h>
-
-#include <iofwd.hfa>
-
 extern "C" {
 	//--------------------
Index: libcfa/src/concurrency/clib/cfathread.h
===================================================================
--- libcfa/src/concurrency/clib/cfathread.h	(revision ce44c5f70ab0a50322bed0d103a046e00bbadaa7)
+++ libcfa/src/concurrency/clib/cfathread.h	(revision 601bd9e9f3b5aea55f6bb776a5794aa880af3c04)
@@ -10,12 +10,12 @@
 // Created On       : Tue Sep 22 15:31:20 2020
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 16 12:00:32 2023
-// Update Count     : 5
+// Last Modified On : Sat Feb 25 17:39:20 2023
+// Update Count     : 6
 //
 
 #if defined(__cforall) || defined(__cplusplus)
-#include <sys/socket.h> // first include because of anonymous types __SOCKADDR_ARG, __CONST_SOCKADDR_ARG
 #include <unistd.h>
 #include <errno.h>
+#include <sys/socket.h>
 
 extern "C" {
Index: libcfa/src/concurrency/io/call.cfa.in
===================================================================
--- libcfa/src/concurrency/io/call.cfa.in	(revision ce44c5f70ab0a50322bed0d103a046e00bbadaa7)
+++ libcfa/src/concurrency/io/call.cfa.in	(revision 601bd9e9f3b5aea55f6bb776a5794aa880af3c04)
@@ -31,7 +31,7 @@
 Prelude = """#define __cforall_thread__
 
-#include <sys/socket.h> // first include because of anonymous types __SOCKADDR_ARG, __CONST_SOCKADDR_ARG
 #include <unistd.h>
 #include <errno.h>
+#include <sys/socket.h>
 #include <time.hfa>
 
Index: libcfa/src/concurrency/iofwd.hfa
===================================================================
--- libcfa/src/concurrency/iofwd.hfa	(revision ce44c5f70ab0a50322bed0d103a046e00bbadaa7)
+++ libcfa/src/concurrency/iofwd.hfa	(revision 601bd9e9f3b5aea55f6bb776a5794aa880af3c04)
@@ -16,6 +16,6 @@
 #pragma once
 
-#include <sys/socket.h> // first include because of anonymous types __SOCKADDR_ARG, __CONST_SOCKADDR_ARG
 #include <unistd.h>
+#include <sys/socket.h>
 
 extern "C" {
Index: libcfa/src/concurrency/kernel/cluster.hfa
===================================================================
--- libcfa/src/concurrency/kernel/cluster.hfa	(revision ce44c5f70ab0a50322bed0d103a046e00bbadaa7)
+++ libcfa/src/concurrency/kernel/cluster.hfa	(revision 601bd9e9f3b5aea55f6bb776a5794aa880af3c04)
@@ -146,7 +146,7 @@
 }
 
-static struct {
-	const unsigned readyq;
-	const unsigned io;
+const static struct {
+	unsigned readyq;
+	unsigned io;
 } __shard_factor = { 2, 1 };
 
Index: libcfa/src/concurrency/mutex_stmt.hfa
===================================================================
--- libcfa/src/concurrency/mutex_stmt.hfa	(revision ce44c5f70ab0a50322bed0d103a046e00bbadaa7)
+++ libcfa/src/concurrency/mutex_stmt.hfa	(revision 601bd9e9f3b5aea55f6bb776a5794aa880af3c04)
@@ -4,5 +4,6 @@
 //-----------------------------------------------------------------------------
 // is_lock
-trait is_lock(L & | sized(L)) {
+forall(L & | sized(L))
+trait is_lock {
 	// For acquiring a lock
 	void lock( L & );