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