Index: tests/concurrent/coroutineYield.c
===================================================================
--- tests/concurrent/coroutineYield.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/coroutineYield.c	(revision 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -1,7 +1,7 @@
-#include <fstream>
-#include <kernel>
-#include <stdlib>
-#include <thread>
-#include <time>
+#include <fstream.hfa>
+#include <kernel.hfa>hfa>
+#include <stdlib.hfa>
+#include <thread.hfa>
+#include <time.hfa>
 
 #define __kick_rate 150000ul
Index: tests/concurrent/examples/boundedBufferEXT.c
===================================================================
--- tests/concurrent/examples/boundedBufferEXT.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/examples/boundedBufferEXT.c	(revision 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -12,8 +12,8 @@
 //
 
-#include <stdlib>										// random
-#include <fstream>
-#include <kernel>
-#include <thread>
+#include <stdlib.hfa>										// random
+#include <fstream.hfa>
+#include <kernel.hfa>
+#include <thread.hfa>
 #include <unistd.h>										// getpid
 
Index: tests/concurrent/examples/boundedBufferINT.c
===================================================================
--- tests/concurrent/examples/boundedBufferINT.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/examples/boundedBufferINT.c	(revision 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -12,8 +12,8 @@
 //
 
-#include <stdlib>										// random
-#include <fstream>
-#include <kernel>
-#include <thread>
+#include <stdlib.hfa>										// random
+#include <fstream.hfa>
+#include <kernel.hfa>
+#include <thread.hfa>
 #include <unistd.h>										// getpid
 
Index: tests/concurrent/examples/datingService.c
===================================================================
--- tests/concurrent/examples/datingService.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/examples/datingService.c	(revision 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -12,8 +12,8 @@
 //
 
-#include <stdlib>										// random
-#include <fstream>
-#include <kernel>
-#include <thread>
+#include <stdlib.hfa>										// random
+#include <fstream.hfa>
+#include <kernel.hfa>
+#include <thread.hfa>
 #include <unistd.h>										// getpid
 
Index: tests/concurrent/examples/matrixSum.c
===================================================================
--- tests/concurrent/examples/matrixSum.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/examples/matrixSum.c	(revision 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -1,11 +1,11 @@
-//                               -*- Mode: C -*- 
-// 
+//                               -*- Mode: C -*-
+//
 // Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// matrixSum.c -- 
-// 
+//
+// matrixSum.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Mon Oct  9 08:29:28 2017
@@ -13,9 +13,9 @@
 // Last Modified On : Fri May 25 09:34:27 2018
 // Update Count     : 10
-// 
+//
 
-#include <fstream>
-#include <kernel>
-#include <thread>
+#include <fstream.hfa>
+#include <kernel.hfa>
+#include <thread.hfa>
 
 thread Adder {
Index: tests/concurrent/examples/quickSort.c
===================================================================
--- tests/concurrent/examples/quickSort.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/examples/quickSort.c	(revision 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -13,8 +13,8 @@
 //
 
-#include <fstream>
-#include <stdlib>
-#include <kernel>
-#include <thread>
+#include <fstream.hfa>
+#include <stdlib.hfa>
+#include <kernel.hfa>
+#include <thread.hfa>
 #include <string.h>										// strcmp
 
Index: tests/concurrent/monitor.c
===================================================================
--- tests/concurrent/monitor.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/monitor.c	(revision 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -1,6 +1,6 @@
-#include <fstream>
-#include <kernel>
-#include <monitor>
-#include <thread>
+#include <fstream.hfa>
+#include <kernel.hfa>
+#include <monitor.hfa>
+#include <thread.hfa>
 
 monitor global_t {
Index: tests/concurrent/multi-monitor.c
===================================================================
--- tests/concurrent/multi-monitor.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/multi-monitor.c	(revision 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -1,6 +1,6 @@
-#include <fstream>
-#include <kernel>
-#include <monitor>
-#include <thread>
+#include <fstream.hfa>
+#include <kernel.hfa>
+#include <monitor.hfa>
+#include <thread.hfa>
 
 static int global12, global23, global13;
Index: tests/concurrent/preempt.c
===================================================================
--- tests/concurrent/preempt.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/preempt.c	(revision 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -1,5 +1,5 @@
-#include <kernel>
-#include <thread>
-#include <time>
+#include <kernel.hfa>hfa>
+#include <thread.hfa>
+#include <time.hfa>
 
 #include "long_tests.h"
Index: tests/concurrent/signal/block.c
===================================================================
--- tests/concurrent/signal/block.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/signal/block.c	(revision 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -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 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -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 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -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
Index: tests/concurrent/thread.c
===================================================================
--- tests/concurrent/thread.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/thread.c	(revision 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -1,6 +1,6 @@
-#include <fstream>
-#include <kernel>
-#include <stdlib>
-#include <thread>
+#include <fstream.hfa>
+#include <kernel.hfa>
+#include <stdlib.hfa>
+#include <thread.hfa>
 
 thread First  { semaphore* lock; };
Index: tests/concurrent/waitfor/barge.c
===================================================================
--- tests/concurrent/waitfor/barge.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ tests/concurrent/waitfor/barge.c	(revision 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -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 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -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 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -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 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -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 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -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 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -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 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -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 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -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>