Index: libcfa/src/concurrency/barrier.hfa
===================================================================
--- libcfa/src/concurrency/barrier.hfa	(revision 8512a2fd42c2d4fc810ffdfdcf6fa95b12afe3f1)
+++ libcfa/src/concurrency/barrier.hfa	(revision 6e6989cd4896156a81bb9fdcf13eed2d8e4be9f7)
Index: libcfa/src/concurrency/channel.hfa
===================================================================
--- libcfa/src/concurrency/channel.hfa	(revision 8512a2fd42c2d4fc810ffdfdcf6fa95b12afe3f1)
+++ libcfa/src/concurrency/channel.hfa	(revision 6e6989cd4896156a81bb9fdcf13eed2d8e4be9f7)
@@ -1,2 +1,4 @@
+#pragma once
+
 #include <locks.hfa>
 
Index: libcfa/src/concurrency/clib/cfathread.cfa
===================================================================
--- libcfa/src/concurrency/clib/cfathread.cfa	(revision 8512a2fd42c2d4fc810ffdfdcf6fa95b12afe3f1)
+++ libcfa/src/concurrency/clib/cfathread.cfa	(revision 6e6989cd4896156a81bb9fdcf13eed2d8e4be9f7)
@@ -17,7 +17,4 @@
 
 #include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/socket.h>
 
 #include "fstream.hfa"
Index: libcfa/src/concurrency/clib/cfathread.h
===================================================================
--- libcfa/src/concurrency/clib/cfathread.h	(revision 8512a2fd42c2d4fc810ffdfdcf6fa95b12afe3f1)
+++ libcfa/src/concurrency/clib/cfathread.h	(revision 6e6989cd4896156a81bb9fdcf13eed2d8e4be9f7)
@@ -10,7 +10,9 @@
 // Created On       : Tue Sep 22 15:31:20 2020
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Feb 25 17:39:20 2023
-// Update Count     : 6
+// Last Modified On : Mon Mar 13 23:48:40 2023
+// Update Count     : 7
 //
+
+#pragma once
 
 #if defined(__cforall) || defined(__cplusplus)
Index: libcfa/src/concurrency/future.hfa
===================================================================
--- libcfa/src/concurrency/future.hfa	(revision 8512a2fd42c2d4fc810ffdfdcf6fa95b12afe3f1)
+++ libcfa/src/concurrency/future.hfa	(revision 6e6989cd4896156a81bb9fdcf13eed2d8e4be9f7)
@@ -14,5 +14,5 @@
 //
 
-// #pragma once
+#pragma once
 
 #include "bits/locks.hfa"
Index: libcfa/src/concurrency/invoke.h
===================================================================
--- libcfa/src/concurrency/invoke.h	(revision 8512a2fd42c2d4fc810ffdfdcf6fa95b12afe3f1)
+++ libcfa/src/concurrency/invoke.h	(revision 6e6989cd4896156a81bb9fdcf13eed2d8e4be9f7)
@@ -10,7 +10,9 @@
 // Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov 29 20:42:21 2022
-// Update Count     : 56
-//
+// Last Modified On : Tue Mar 14 13:39:31 2023
+// Update Count     : 59
+//
+
+// No not use #pragma once was this file is included twice in some places. It has its own guard system.
 
 #include "bits/containers.hfa"
Index: libcfa/src/concurrency/io/types.hfa
===================================================================
--- libcfa/src/concurrency/io/types.hfa	(revision 8512a2fd42c2d4fc810ffdfdcf6fa95b12afe3f1)
+++ libcfa/src/concurrency/io/types.hfa	(revision 6e6989cd4896156a81bb9fdcf13eed2d8e4be9f7)
Index: libcfa/src/concurrency/iofwd.hfa
===================================================================
--- libcfa/src/concurrency/iofwd.hfa	(revision 8512a2fd42c2d4fc810ffdfdcf6fa95b12afe3f1)
+++ libcfa/src/concurrency/iofwd.hfa	(revision 6e6989cd4896156a81bb9fdcf13eed2d8e4be9f7)
@@ -9,7 +9,7 @@
 // Author           : Thierry Delisle
 // Created On       : Thu Apr 23 17:31:00 2020
-// Last Modified By :
-// Last Modified On :
-// Update Count     :
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Mar 13 23:54:57 2023
+// Update Count     : 1
 //
 
@@ -50,13 +50,5 @@
 typedef __off64_t off64_t;
 
-struct cluster;
-struct io_context$;
-
-struct iovec;
-struct msghdr;
-struct statx;
 struct epoll_event;
-
-struct io_uring_sqe;
 
 //-----------------------------------------------------------------------
@@ -89,32 +81,32 @@
 // synchronous calls
 #if defined(CFA_HAVE_PREADV2)
-	extern ssize_t cfa_preadv2(int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags, __u64 submit_flags);
+	extern ssize_t cfa_preadv2(int fd, const struct iovec * iov, int iovcnt, off_t offset, int flags, __u64 submit_flags);
 #endif
 #if defined(CFA_HAVE_PWRITEV2)
-	extern ssize_t cfa_pwritev2(int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags, __u64 submit_flags);
+	extern ssize_t cfa_pwritev2(int fd, const struct iovec * iov, int iovcnt, off_t offset, int flags, __u64 submit_flags);
 #endif
 extern int cfa_fsync(int fd, __u64 submit_flags);
-extern int cfa_epoll_ctl(int epfd, int op, int fd, struct epoll_event *event, __u64 submit_flags);
+extern int cfa_epoll_ctl(int epfd, int op, int fd, struct epoll_event * event, __u64 submit_flags);
 extern int cfa_sync_file_range(int fd, off64_t offset, off64_t nbytes, unsigned int flags, __u64 submit_flags);
-extern  ssize_t cfa_sendmsg(int sockfd, const struct msghdr *msg, int flags, __u64 submit_flags);
-extern ssize_t cfa_recvmsg(int sockfd, struct msghdr *msg, int flags, __u64 submit_flags);
-extern ssize_t cfa_send(int sockfd, const void *buf, size_t len, int flags, __u64 submit_flags);
-extern ssize_t cfa_recv(int sockfd, void *buf, size_t len, int flags, __u64 submit_flags);
+extern  ssize_t cfa_sendmsg(int sockfd, const struct msghdr * msg, int flags, __u64 submit_flags);
+extern ssize_t cfa_recvmsg(int sockfd, struct msghdr * msg, int flags, __u64 submit_flags);
+extern ssize_t cfa_send(int sockfd, const void * buf, size_t len, int flags, __u64 submit_flags);
+extern ssize_t cfa_recv(int sockfd, void * buf, size_t len, int flags, __u64 submit_flags);
 extern int cfa_accept4(int sockfd, __SOCKADDR_ARG addr, socklen_t * restrict addrlen, int flags, __u64 submit_flags);
 extern int cfa_connect(int sockfd, __CONST_SOCKADDR_ARG addr, socklen_t addrlen, __u64 submit_flags);
 extern int cfa_fallocate(int fd, int mode, off_t offset, off_t len, __u64 submit_flags);
 extern int cfa_posix_fadvise(int fd, off_t offset, off_t len, int advice, __u64 submit_flags);
-extern int cfa_madvise(void *addr, size_t length, int advice, __u64 submit_flags);
-extern int cfa_openat(int dirfd, const char *pathname, int flags, mode_t mode, __u64 submit_flags);
+extern int cfa_madvise(void * addr, size_t length, int advice, __u64 submit_flags);
+extern int cfa_openat(int dirfd, const char * pathname, int flags, mode_t mode, __u64 submit_flags);
 #if defined(CFA_HAVE_OPENAT2)
-	extern int cfa_openat2(int dirfd, const char *pathname, struct open_how * how, size_t size, __u64 submit_flags);
+	extern int cfa_openat2(int dirfd, const char * pathname, struct open_how * how, size_t size, __u64 submit_flags);
 #endif
 extern int cfa_close(int fd, __u64 submit_flags);
 #if defined(CFA_HAVE_STATX)
-	extern int cfa_statx(int dirfd, const char *pathname, int flags, unsigned int mask, struct statx *statxbuf, __u64 submit_flags);
+	extern int cfa_statx(int dirfd, const char * pathname, int flags, unsigned int mask, struct statx * statxbuf, __u64 submit_flags);
 #endif
 extern ssize_t cfa_read(int fd, void * buf, size_t count, __u64 submit_flags);
 extern ssize_t cfa_write(int fd, void * buf, size_t count, __u64 submit_flags);
-extern ssize_t cfa_splice(int fd_in, __off64_t *off_in, int fd_out, __off64_t *off_out, size_t len, unsigned int flags, __u64 submit_flags);
+extern ssize_t cfa_splice(int fd_in, __off64_t * off_in, int fd_out, __off64_t * off_out, size_t len, unsigned int flags, __u64 submit_flags);
 extern ssize_t cfa_tee(int fd_in, int fd_out, size_t len, unsigned int flags, __u64 submit_flags);
 
@@ -122,32 +114,32 @@
 // asynchronous calls
 #if defined(CFA_HAVE_PREADV2)
-	extern void async_preadv2(io_future_t & future, int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags, __u64 submit_flags);
+	extern void async_preadv2(io_future_t & future, int fd, const struct iovec * iov, int iovcnt, off_t offset, int flags, __u64 submit_flags);
 #endif
 #if defined(CFA_HAVE_PWRITEV2)
-	extern void async_pwritev2(io_future_t & future, int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags, __u64 submit_flags);
+	extern void async_pwritev2(io_future_t & future, int fd, const struct iovec * iov, int iovcnt, off_t offset, int flags, __u64 submit_flags);
 #endif
 extern void async_fsync(io_future_t & future, int fd, __u64 submit_flags);
-extern void async_epoll_ctl(io_future_t & future, int epfd, int op, int fd, struct epoll_event *event, __u64 submit_flags);
+extern void async_epoll_ctl(io_future_t & future, int epfd, int op, int fd, struct epoll_event * event, __u64 submit_flags);
 extern void async_sync_file_range(io_future_t & future, int fd, off64_t offset, off64_t nbytes, unsigned int flags, __u64 submit_flags);
-extern void async_sendmsg(io_future_t & future, int sockfd, const struct msghdr *msg, int flags, __u64 submit_flags);
-extern void async_recvmsg(io_future_t & future, int sockfd, struct msghdr *msg, int flags, __u64 submit_flags);
-extern void async_send(io_future_t & future, int sockfd, const void *buf, size_t len, int flags, __u64 submit_flags);
-extern void async_recv(io_future_t & future, int sockfd, void *buf, size_t len, int flags, __u64 submit_flags);
+extern void async_sendmsg(io_future_t & future, int sockfd, const struct msghdr * msg, int flags, __u64 submit_flags);
+extern void async_recvmsg(io_future_t & future, int sockfd, struct msghdr * msg, int flags, __u64 submit_flags);
+extern void async_send(io_future_t & future, int sockfd, const void * buf, size_t len, int flags, __u64 submit_flags);
+extern void async_recv(io_future_t & future, int sockfd, void * buf, size_t len, int flags, __u64 submit_flags);
 extern void async_accept4(io_future_t & future, int sockfd, __SOCKADDR_ARG addr, socklen_t * restrict addrlen, int flags, __u64 submit_flags);
 extern void async_connect(io_future_t & future, int sockfd, __CONST_SOCKADDR_ARG addr, socklen_t addrlen, __u64 submit_flags);
 extern void async_fallocate(io_future_t & future, int fd, int mode, off_t offset, off_t len, __u64 submit_flags);
 extern void async_posix_fadvise(io_future_t & future, int fd, off_t offset, off_t len, int advice, __u64 submit_flags);
-extern void async_madvise(io_future_t & future, void *addr, size_t length, int advice, __u64 submit_flags);
-extern void async_openat(io_future_t & future, int dirfd, const char *pathname, int flags, mode_t mode, __u64 submit_flags);
+extern void async_madvise(io_future_t & future, void * addr, size_t length, int advice, __u64 submit_flags);
+extern void async_openat(io_future_t & future, int dirfd, const char * pathname, int flags, mode_t mode, __u64 submit_flags);
 #if defined(CFA_HAVE_OPENAT2)
-	extern void async_openat2(io_future_t & future, int dirfd, const char *pathname, struct open_how * how, size_t size, __u64 submit_flags);
+	extern void async_openat2(io_future_t & future, int dirfd, const char * pathname, struct open_how * how, size_t size, __u64 submit_flags);
 #endif
 extern void async_close(io_future_t & future, int fd, __u64 submit_flags);
 #if defined(CFA_HAVE_STATX)
-	extern void async_statx(io_future_t & future, int dirfd, const char *pathname, int flags, unsigned int mask, struct statx *statxbuf, __u64 submit_flags);
+	extern void async_statx(io_future_t & future, int dirfd, const char * pathname, int flags, unsigned int mask, struct statx * statxbuf, __u64 submit_flags);
 #endif
 void async_read(io_future_t & future, int fd, void * buf, size_t count, __u64 submit_flags);
 extern void async_write(io_future_t & future, int fd, void * buf, size_t count, __u64 submit_flags);
-extern void async_splice(io_future_t & future, int fd_in, __off64_t *off_in, int fd_out, __off64_t *off_out, size_t len, unsigned int flags, __u64 submit_flags);
+extern void async_splice(io_future_t & future, int fd_in, __off64_t * off_in, int fd_out, __off64_t * off_out, size_t len, unsigned int flags, __u64 submit_flags);
 extern void async_tee(io_future_t & future, int fd_in, int fd_out, size_t len, unsigned int flags, __u64 submit_flags);
 
Index: libcfa/src/concurrency/kernel/startup.cfa
===================================================================
--- libcfa/src/concurrency/kernel/startup.cfa	(revision 8512a2fd42c2d4fc810ffdfdcf6fa95b12afe3f1)
+++ libcfa/src/concurrency/kernel/startup.cfa	(revision 6e6989cd4896156a81bb9fdcf13eed2d8e4be9f7)
@@ -33,5 +33,5 @@
 #include "kernel/private.hfa"
 #include "iofwd.hfa"
-#include "startup.hfa"					// STARTUP_PRIORITY_XXX
+#include "startup.hfa"									// STARTUP_PRIORITY_XXX
 #include "limits.hfa"
 #include "math.hfa"
Index: libcfa/src/concurrency/mutex_stmt.hfa
===================================================================
--- libcfa/src/concurrency/mutex_stmt.hfa	(revision 8512a2fd42c2d4fc810ffdfdcf6fa95b12afe3f1)
+++ libcfa/src/concurrency/mutex_stmt.hfa	(revision 6e6989cd4896156a81bb9fdcf13eed2d8e4be9f7)
@@ -1,2 +1,4 @@
+#pragma once
+
 #include "bits/algorithm.hfa"
 #include "bits/defs.hfa"
Index: libcfa/src/concurrency/once.hfa
===================================================================
--- libcfa/src/concurrency/once.hfa	(revision 8512a2fd42c2d4fc810ffdfdcf6fa95b12afe3f1)
+++ libcfa/src/concurrency/once.hfa	(revision 6e6989cd4896156a81bb9fdcf13eed2d8e4be9f7)
Index: libcfa/src/concurrency/pthread.cfa
===================================================================
--- libcfa/src/concurrency/pthread.cfa	(revision 8512a2fd42c2d4fc810ffdfdcf6fa95b12afe3f1)
+++ libcfa/src/concurrency/pthread.cfa	(revision 6e6989cd4896156a81bb9fdcf13eed2d8e4be9f7)
@@ -598,5 +598,5 @@
 		if (t->pthreadData == NULL) return NULL;
 		lock(key_lock);
-		pthread_values &entry = ((pthread_values *)t->pthreadData)[key];
+		pthread_values & entry = ((pthread_values *)t->pthreadData)[key];
 		if ( ! entry.in_use ) {
 			unlock( key_lock );
Index: libcfa/src/concurrency/ready_subqueue.hfa
===================================================================
--- libcfa/src/concurrency/ready_subqueue.hfa	(revision 8512a2fd42c2d4fc810ffdfdcf6fa95b12afe3f1)
+++ libcfa/src/concurrency/ready_subqueue.hfa	(revision 6e6989cd4896156a81bb9fdcf13eed2d8e4be9f7)
Index: libcfa/src/concurrency/select.hfa
===================================================================
--- libcfa/src/concurrency/select.hfa	(revision 8512a2fd42c2d4fc810ffdfdcf6fa95b12afe3f1)
+++ libcfa/src/concurrency/select.hfa	(revision 6e6989cd4896156a81bb9fdcf13eed2d8e4be9f7)
@@ -1,2 +1,4 @@
+#pragma once
+
 #include "containers/list.hfa"
 #include <stdint.h>
Index: libcfa/src/concurrency/snzi.hfa
===================================================================
--- libcfa/src/concurrency/snzi.hfa	(revision 8512a2fd42c2d4fc810ffdfdcf6fa95b12afe3f1)
+++ libcfa/src/concurrency/snzi.hfa	(revision 6e6989cd4896156a81bb9fdcf13eed2d8e4be9f7)
