Index: libcfa/src/concurrency/io/call.cfa.in
===================================================================
--- libcfa/src/concurrency/io/call.cfa.in	(revision 26544f91e0ffc7c7785fad9b83dda0e613a2a34b)
+++ libcfa/src/concurrency/io/call.cfa.in	(revision fbdfcd83585b2a3ef34770330c0628c3911372df)
@@ -31,4 +31,9 @@
 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 <time.hfa>
+
 #include "bits/defs.hfa"
 #include "kernel.hfa"
@@ -43,7 +48,5 @@
 	#include <assert.h>
 	#include <stdint.h>
-	#include <errno.h>
 	#include <linux/io_uring.h>
-
 	#include "kernel/fwd.hfa"
 
@@ -82,15 +85,6 @@
 // I/O Forwards
 //=============================================================================================
-#include <time.hfa>
-
-// Some forward declarations
-#include <errno.h>
-#include <unistd.h>
 
 extern "C" {
-	#include <asm/types.h>
-	#include <sys/socket.h>
-	#include <sys/syscall.h>
-
 #if defined(CFA_HAVE_PREADV2)
 	struct iovec;
@@ -118,6 +112,4 @@
 	extern ssize_t send(int sockfd, const void *buf, size_t len, int flags);
 	extern ssize_t recv(int sockfd, void *buf, size_t len, int flags);
-	extern int accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags);
-	extern int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen);
 
 	extern int fallocate(int fd, int mode, off_t offset, off_t len);
@@ -292,5 +284,5 @@
 	}),
 	# CFA_HAVE_IORING_OP_ACCEPT
-	Call('ACCEPT', 'int accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags)', {
+	Call('ACCEPT', 'int accept4(int sockfd, __SOCKADDR_ARG addr, socklen_t * restrict addrlen, int flags)', {
 		'fd': 'sockfd',
 		'addr': '(uintptr_t)addr',
@@ -299,5 +291,5 @@
 	}),
 	# CFA_HAVE_IORING_OP_CONNECT
-	Call('CONNECT', 'int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen)', {
+	Call('CONNECT', 'int connect(int sockfd, __CONST_SOCKADDR_ARG addr, socklen_t addrlen)', {
 		'fd': 'sockfd',
 		'addr': '(uintptr_t)addr',
Index: libcfa/src/concurrency/io/setup.cfa
===================================================================
--- libcfa/src/concurrency/io/setup.cfa	(revision 26544f91e0ffc7c7785fad9b83dda0e613a2a34b)
+++ libcfa/src/concurrency/io/setup.cfa	(revision fbdfcd83585b2a3ef34770330c0628c3911372df)
@@ -15,5 +15,4 @@
 
 #define __cforall_thread__
-#define _GNU_SOURCE
 
 #if defined(__CFA_DEBUG__)