Index: benchmark/Monitor.c
===================================================================
--- benchmark/Monitor.c	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ benchmark/Monitor.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,5 +1,5 @@
-#include <fstream>
-#include <stdlib>
-#include <thread>
+#include <fstream.hfa>
+#include <stdlib.hfa>
+#include <thread.hfa>
 
 #include "bench.h"
Index: benchmark/bench.h
===================================================================
--- benchmark/bench.h	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ benchmark/bench.h	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -11,5 +11,5 @@
 #else
 }
-#include <time>
+#include <time.hfa>
 #endif
 
Index: benchmark/creation/cfa_cor.c
===================================================================
--- benchmark/creation/cfa_cor.c	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ benchmark/creation/cfa_cor.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,4 +1,4 @@
 #include <stdio.h>
-#include <coroutine>
+#include <coroutine.hfa>
 
 #include "bench.h"
Index: benchmark/creation/cfa_thrd.c
===================================================================
--- benchmark/creation/cfa_thrd.c	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ benchmark/creation/cfa_thrd.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,4 +1,4 @@
 #include <stdio.h>
-#include <thread>
+#include <thread.hfa>
 
 #include "bench.h"
Index: benchmark/ctxswitch/cfa_cor.c
===================================================================
--- benchmark/ctxswitch/cfa_cor.c	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ benchmark/ctxswitch/cfa_cor.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <kernel>
-#include <thread>
+#include <kernel.hfa>
+#include <thread.hfa>
 
 #include "bench.h"
Index: benchmark/ctxswitch/cfa_thrd.c
===================================================================
--- benchmark/ctxswitch/cfa_thrd.c	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ benchmark/ctxswitch/cfa_thrd.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,4 +1,4 @@
 #include <stdio.h>
-#include <thread>
+#include <thread.hfa>
 
 #include "bench.h"
Index: benchmark/ctxswitch/cfa_thrd2.c
===================================================================
--- benchmark/ctxswitch/cfa_thrd2.c	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ benchmark/ctxswitch/cfa_thrd2.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,4 +1,4 @@
 #include <stdio.h>
-#include <thread>
+#include <thread.hfa>
 
 #include "bench.h"
Index: benchmark/mutex/cfa1.c
===================================================================
--- benchmark/mutex/cfa1.c	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ benchmark/mutex/cfa1.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,3 +1,3 @@
-#include <monitor>
+#include <monitor.hfa>
 #include <stdio.h>
 
Index: benchmark/mutex/cfa2.c
===================================================================
--- benchmark/mutex/cfa2.c	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ benchmark/mutex/cfa2.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,3 +1,3 @@
-#include <monitor>
+#include <monitor.hfa>
 #include <stdio.h>
 
Index: benchmark/mutex/cfa4.c
===================================================================
--- benchmark/mutex/cfa4.c	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ benchmark/mutex/cfa4.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,3 +1,3 @@
-#include <monitor>
+#include <monitor.hfa>
 #include <stdio.h>
 
Index: benchmark/schedext/cfa1.c
===================================================================
--- benchmark/schedext/cfa1.c	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ benchmark/schedext/cfa1.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,5 +1,5 @@
-#include <kernel>
-#include <monitor>
-#include <thread>
+#include <kernel.hfa>
+#include <monitor.hfa>
+#include <thread.hfa>
 #include <stdio.h>
 
Index: benchmark/schedext/cfa2.c
===================================================================
--- benchmark/schedext/cfa2.c	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ benchmark/schedext/cfa2.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,5 +1,5 @@
-#include <kernel>
-#include <monitor>
-#include <thread>
+#include <kernel.hfa>
+#include <monitor.hfa>
+#include <thread.hfa>
 #include <stdio.h>
 
Index: benchmark/schedext/cfa4.c
===================================================================
--- benchmark/schedext/cfa4.c	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ benchmark/schedext/cfa4.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,5 +1,5 @@
-#include <kernel>
-#include <monitor>
-#include <thread>
+#include <kernel.hfa>
+#include <monitor.hfa>
+#include <thread.hfa>
 #include <stdio.h>
 
Index: benchmark/schedint/cfa1.c
===================================================================
--- benchmark/schedint/cfa1.c	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ benchmark/schedint/cfa1.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,5 +1,5 @@
-#include <kernel>
-#include <monitor>
-#include <thread>
+#include <kernel.hfa>
+#include <monitor.hfa>
+#include <thread.hfa>
 #include <stdio.h>
 
Index: benchmark/schedint/cfa2.c
===================================================================
--- benchmark/schedint/cfa2.c	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ benchmark/schedint/cfa2.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,5 +1,5 @@
-#include <kernel>
-#include <monitor>
-#include <thread>
+#include <kernel.hfa>
+#include <monitor.hfa>
+#include <thread.hfa>
 #include <stdio.h>
 
Index: benchmark/schedint/cfa4.c
===================================================================
--- benchmark/schedint/cfa4.c	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ benchmark/schedint/cfa4.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,5 +1,5 @@
-#include <kernel>
-#include <monitor>
-#include <thread>
+#include <kernel.hfa>
+#include <monitor.hfa>
+#include <thread.hfa>
 #include <stdio.h>