Index: tests/concurrent/waitfor/barge.c
===================================================================
--- tests/concurrent/waitfor/barge.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/waitfor/barge.c	(revision 9aa9126e40385076b70bce81cfd5925a9c8b56ee)
@@ -6,9 +6,9 @@
 //---------------------------------------------------------
 
-#include <fstream>
-#include <kernel>
-#include <monitor>
-#include <stdlib>
-#include <thread>
+#include <fstream.hfa>
+#include <kernel.hfa>
+#include <monitor.hfa>
+#include <stdlib.hfa>
+#include <thread.hfa>
 
 #include <stdbool.h>
Index: tests/concurrent/waitfor/dtor.c
===================================================================
--- tests/concurrent/waitfor/dtor.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/waitfor/dtor.c	(revision 9aa9126e40385076b70bce81cfd5925a9c8b56ee)
@@ -4,9 +4,9 @@
 //---------------------------------------------------------
 
-#include <fstream>
-#include <kernel>
-#include <monitor>
-#include <stdlib>
-#include <thread>
+#include <fstream.hfa>
+#include <kernel.hfa>
+#include <monitor.hfa>
+#include <stdlib.hfa>
+#include <thread.hfa>
 
 #include <stdbool.h>
Index: tests/concurrent/waitfor/else.c
===================================================================
--- tests/concurrent/waitfor/else.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/waitfor/else.c	(revision 9aa9126e40385076b70bce81cfd5925a9c8b56ee)
@@ -1,4 +1,4 @@
-#include <fstream>
-#include <monitor>
+#include <fstream.hfa>
+#include <monitor.hfa>
 
 #include <stdbool.h>
Index: tests/concurrent/waitfor/parse.c
===================================================================
--- tests/concurrent/waitfor/parse.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/waitfor/parse.c	(revision 9aa9126e40385076b70bce81cfd5925a9c8b56ee)
@@ -8,5 +8,5 @@
 //----------------------------------------------------------------------------------------
 
-#include <monitor>
+#include <monitor.hfa>
 
 monitor M {};
Index: tests/concurrent/waitfor/recurse.c
===================================================================
--- tests/concurrent/waitfor/recurse.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/waitfor/recurse.c	(revision 9aa9126e40385076b70bce81cfd5925a9c8b56ee)
@@ -4,9 +4,9 @@
 //-----------------------------------------------------------------
 
-#include <fstream>
-#include <kernel>
-#include <monitor>
-#include <stdlib>
-#include <thread>
+#include <fstream.hfa>
+#include <kernel.hfa>
+#include <monitor.hfa>
+#include <stdlib.hfa>
+#include <thread.hfa>
 
 #include <stdbool.h>
Index: tests/concurrent/waitfor/simple.c
===================================================================
--- tests/concurrent/waitfor/simple.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/waitfor/simple.c	(revision 9aa9126e40385076b70bce81cfd5925a9c8b56ee)
@@ -1,7 +1,7 @@
-#include <fstream>
-#include <kernel>
-#include <monitor>
-#include <stdlib>
-#include <thread>
+#include <fstream.hfa>
+#include <kernel.hfa>
+#include <monitor.hfa>
+#include <stdlib.hfa>
+#include <thread.hfa>
 
 #include <time.h>
Index: tests/concurrent/waitfor/statment.c
===================================================================
--- tests/concurrent/waitfor/statment.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/waitfor/statment.c	(revision 9aa9126e40385076b70bce81cfd5925a9c8b56ee)
@@ -1,6 +1,6 @@
-#include <fstream>
-#include <kernel>
-#include <monitor>
-#include <thread>
+#include <fstream.hfa>
+#include <kernel.hfa>
+#include <monitor.hfa>
+#include <thread.hfa>
 
 #include <stdbool.h>
Index: tests/concurrent/waitfor/when.c
===================================================================
--- tests/concurrent/waitfor/when.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/waitfor/when.c	(revision 9aa9126e40385076b70bce81cfd5925a9c8b56ee)
@@ -4,9 +4,9 @@
 //-----------------------------------------------------------------
 
-#include <fstream>
-#include <kernel>
-#include <monitor>
-#include <stdlib>
-#include <thread>
+#include <fstream.hfa>
+#include <kernel.hfa>
+#include <monitor.hfa>
+#include <stdlib.hfa>
+#include <thread.hfa>
 
 #include <stdbool.h>