Index: libcfa/src/bits/debug.cfa
===================================================================
--- libcfa/src/bits/debug.cfa	(revision 016b1eb1c94e278d77bf3e8460c08846534f9c67)
+++ libcfa/src/bits/debug.cfa	(revision c1ee231b7d3bb492e84c30e961985c2034ca3596)
@@ -10,9 +10,8 @@
 // Created On       : Thu Mar 30 12:30:01 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  4 13:03:16 2020
-// Update Count     : 11
+// Last Modified On : Wed Jun 17 11:07:13 2020
+// Update Count     : 12
 //
 
-extern "C" {
 #include <stdio.h>
 #include <stdlib.h>
@@ -21,5 +20,4 @@
 #include <stdarg.h>
 #include <unistd.h>
-}
 
 enum { buffer_size = 4096 };
Index: libcfa/src/bits/signal.hfa
===================================================================
--- libcfa/src/bits/signal.hfa	(revision 016b1eb1c94e278d77bf3e8460c08846534f9c67)
+++ libcfa/src/bits/signal.hfa	(revision c1ee231b7d3bb492e84c30e961985c2034ca3596)
@@ -19,5 +19,4 @@
 #include "bits/defs.hfa"
 
-extern "C" {
 #include <errno.h>
 #define __USE_GNU
@@ -26,5 +25,4 @@
 #include <stdlib.h>
 #include <string.h>
-}
 
 // Short hands for signal context information
Index: libcfa/src/concurrency/alarm.cfa
===================================================================
--- libcfa/src/concurrency/alarm.cfa	(revision 016b1eb1c94e278d77bf3e8460c08846534f9c67)
+++ libcfa/src/concurrency/alarm.cfa	(revision c1ee231b7d3bb492e84c30e961985c2034ca3596)
@@ -10,17 +10,15 @@
 // Created On       : Fri Jun 2 11:31:25 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jan  5 08:41:36 2020
-// Update Count     : 69
+// Last Modified On : Wed Jun 17 16:11:35 2020
+// Update Count     : 75
 //
 
 #define __cforall_thread__
 
-extern "C" {
 #include <errno.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/time.h>
-}
 
 #include "alarm.hfa"
@@ -55,5 +53,5 @@
 }
 
-void ?{}( alarm_node_t & this, processor   * proc, Time alarm, Duration period ) with( this ) {
+void ?{}( alarm_node_t & this, processor * proc, Time alarm, Duration period ) with( this ) {
 	this.proc = proc;
 	this.alarm = alarm;
Index: libcfa/src/concurrency/preemption.cfa
===================================================================
--- libcfa/src/concurrency/preemption.cfa	(revision 016b1eb1c94e278d77bf3e8460c08846534f9c67)
+++ libcfa/src/concurrency/preemption.cfa	(revision c1ee231b7d3bb492e84c30e961985c2034ca3596)
@@ -10,6 +10,6 @@
 // Created On       : Mon Jun 5 14:20:42 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec  5 16:34:05 2019
-// Update Count     : 43
+// Last Modified On : Wed Jun 17 11:36:25 2020
+// Update Count     : 46
 //
 
@@ -19,5 +19,4 @@
 #include <assert.h>
 
-extern "C" {
 #include <errno.h>
 #include <stdio.h>
@@ -25,5 +24,4 @@
 #include <unistd.h>
 #include <limits.h>										// PTHREAD_STACK_MIN
-}
 
 #include "bits/signal.hfa"
Index: libcfa/src/containers/vector.hfa
===================================================================
--- libcfa/src/containers/vector.hfa	(revision 016b1eb1c94e278d77bf3e8460c08846534f9c67)
+++ libcfa/src/containers/vector.hfa	(revision c1ee231b7d3bb492e84c30e961985c2034ca3596)
@@ -10,13 +10,11 @@
 // Created On       : Tue Jul  5 18:00:07 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 10:01:18 2017
-// Update Count     : 3
+// Last Modified On : Wed Jun 17 11:02:46 2020
+// Update Count     : 4
 //
 
 #pragma once
 
-extern "C" {
 #include <stdbool.h>
-}
 
 //------------------------------------------------------------------------------