Index: libcfa/src/concurrency/clib/cfathread.cfa
===================================================================
--- libcfa/src/concurrency/clib/cfathread.cfa	(revision b1ad41f13d1856f4c932e91d4a04fbe0e27ddda8)
+++ libcfa/src/concurrency/clib/cfathread.cfa	(revision 8603c103d67729d4e4cec233b1b6f1f2a5e89d90)
@@ -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 b1ad41f13d1856f4c932e91d4a04fbe0e27ddda8)
+++ libcfa/src/concurrency/clib/cfathread.h	(revision 8603c103d67729d4e4cec233b1b6f1f2a5e89d90)
@@ -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 b1ad41f13d1856f4c932e91d4a04fbe0e27ddda8)
+++ libcfa/src/concurrency/io/call.cfa.in	(revision 8603c103d67729d4e4cec233b1b6f1f2a5e89d90)
@@ -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 b1ad41f13d1856f4c932e91d4a04fbe0e27ddda8)
+++ libcfa/src/concurrency/iofwd.hfa	(revision 8603c103d67729d4e4cec233b1b6f1f2a5e89d90)
@@ -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" {