Index: libcfa/src/concurrency/alarm.hfa
===================================================================
--- libcfa/src/concurrency/alarm.hfa	(revision 73abe950d807eab747c9e14353b158fcca827308)
+++ libcfa/src/concurrency/alarm.hfa	(revision 524ed86476e43c6c764a1b5335fc8d4fd281dacd)
@@ -21,5 +21,5 @@
 #include <assert.h>
 
-#include "time"
+#include "time.hfa"
 
 struct thread_desc;
Index: libcfa/src/concurrency/coroutine.cfa
===================================================================
--- libcfa/src/concurrency/coroutine.cfa	(revision 73abe950d807eab747c9e14353b158fcca827308)
+++ libcfa/src/concurrency/coroutine.cfa	(revision 524ed86476e43c6c764a1b5335fc8d4fd281dacd)
@@ -14,5 +14,5 @@
 //
 
-#include "coroutine"
+#include "coroutine.hfa"
 
 extern "C" {
Index: libcfa/src/concurrency/kernel.cfa
===================================================================
--- libcfa/src/concurrency/kernel.cfa	(revision 73abe950d807eab747c9e14353b158fcca827308)
+++ libcfa/src/concurrency/kernel.cfa	(revision 524ed86476e43c6c764a1b5335fc8d4fd281dacd)
@@ -22,10 +22,10 @@
 #include <fenv.h>
 #include <sys/resource.h>
-#include <signal.hfa>
+#include <signal.h>
 #include <unistd.h>
 }
 
 //CFA Includes
-#include "time"
+#include "time.hfa"
 #include "kernel_private.hfa"
 #include "preemption.hfa"
Index: libcfa/src/concurrency/kernel_private.hfa
===================================================================
--- libcfa/src/concurrency/kernel_private.hfa	(revision 73abe950d807eab747c9e14353b158fcca827308)
+++ libcfa/src/concurrency/kernel_private.hfa	(revision 524ed86476e43c6c764a1b5335fc8d4fd281dacd)
@@ -16,6 +16,6 @@
 #pragma once
 
-#include "kernel"
-#include "thread"
+#include "kernel.hfa"
+#include "thread.hfa"
 
 #include "alarm.hfa"
Index: libcfa/src/concurrency/monitor.cfa
===================================================================
--- libcfa/src/concurrency/monitor.cfa	(revision 73abe950d807eab747c9e14353b158fcca827308)
+++ libcfa/src/concurrency/monitor.cfa	(revision 524ed86476e43c6c764a1b5335fc8d4fd281dacd)
@@ -14,5 +14,5 @@
 //
 
-#include "monitor"
+#include "monitor.hfa"
 
 #include <stdlib.hfa>
@@ -21,5 +21,5 @@
 #include "kernel_private.hfa"
 
-#include "bits/algorithms.hfa"
+#include "bits/algorithm.hfa"
 
 //-----------------------------------------------------------------------------
Index: libcfa/src/concurrency/monitor.hfa
===================================================================
--- libcfa/src/concurrency/monitor.hfa	(revision 73abe950d807eab747c9e14353b158fcca827308)
+++ libcfa/src/concurrency/monitor.hfa	(revision 524ed86476e43c6c764a1b5335fc8d4fd281dacd)
@@ -20,5 +20,5 @@
 #include <assert.h>
 #include "invoke.h"
-#include "stdlib"
+#include "stdlib.hfa"
 
 trait is_monitor(dtype T) {
Index: libcfa/src/concurrency/mutex.cfa
===================================================================
--- libcfa/src/concurrency/mutex.cfa	(revision 73abe950d807eab747c9e14353b158fcca827308)
+++ libcfa/src/concurrency/mutex.cfa	(revision 524ed86476e43c6c764a1b5335fc8d4fd281dacd)
@@ -16,5 +16,5 @@
 //
 
-#include "mutex"
+#include "mutex.hfa"
 
 #include "kernel_private.hfa"
Index: libcfa/src/concurrency/mutex.hfa
===================================================================
--- libcfa/src/concurrency/mutex.hfa	(revision 73abe950d807eab747c9e14353b158fcca827308)
+++ libcfa/src/concurrency/mutex.hfa	(revision 524ed86476e43c6c764a1b5335fc8d4fd281dacd)
@@ -20,5 +20,5 @@
 #include <stdbool.h>
 
-#include "bits/algorithms.hfa"
+#include "bits/algorithm.hfa"
 #include "bits/locks.hfa"
 
Index: libcfa/src/concurrency/thread.cfa
===================================================================
--- libcfa/src/concurrency/thread.cfa	(revision 73abe950d807eab747c9e14353b158fcca827308)
+++ libcfa/src/concurrency/thread.cfa	(revision 524ed86476e43c6c764a1b5335fc8d4fd281dacd)
@@ -14,5 +14,5 @@
 //
 
-#include "thread"
+#include "thread.hfa"
 
 #include "kernel_private.hfa"
Index: libcfa/src/concurrency/thread.hfa
===================================================================
--- libcfa/src/concurrency/thread.hfa	(revision 73abe950d807eab747c9e14353b158fcca827308)
+++ libcfa/src/concurrency/thread.hfa	(revision 524ed86476e43c6c764a1b5335fc8d4fd281dacd)
@@ -19,7 +19,7 @@
 #include "invoke.h"
 
-#include "coroutine"
-#include "kernel"
-#include "monitor"
+#include "coroutine.hfa"
+#include "kernel.hfa"
+#include "monitor.hfa"
 
 //-----------------------------------------------------------------------------