Index: tests/concurrent/signal/block.c
===================================================================
--- tests/concurrent/signal/block.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/signal/block.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -7,10 +7,10 @@
 
 
-#include <fstream>
-#include <kernel>
-#include <monitor>
-#include <stdlib>
-#include <thread>
-#include <time>
+#include <fstream.hfa>
+#include <kernel.hfa>hfa>
+#include <monitor.hfa>
+#include <stdlib.hfa>
+#include <thread.hfa>
+#include <time.hfa>
 
 #include "long_tests.h"
Index: tests/concurrent/signal/disjoint.c
===================================================================
--- tests/concurrent/signal/disjoint.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/signal/disjoint.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,7 +1,7 @@
-#include <fstream>
-#include <kernel>
-#include <monitor>
-#include <thread>
-#include <time>
+#include <fstream.hfa>
+#include <kernel.hfa>hfa>
+#include <monitor.hfa>
+#include <thread.hfa>
+#include <time.hfa>
 
 #include "long_tests.h"
Index: tests/concurrent/signal/wait.c
===================================================================
--- tests/concurrent/signal/wait.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/signal/wait.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -5,10 +5,10 @@
 
 
-#include <fstream>
-#include <kernel>
-#include <monitor>
-#include <stdlib>
-#include <thread>
-#include <time>
+#include <fstream.hfa>
+#include <kernel.hfa>hfa>
+#include <monitor.hfa>
+#include <stdlib.hfa>
+#include <thread.hfa>
+#include <time.hfa>
 
 #define __kick_rate 12000ul