Index: tests/Makefile.am
===================================================================
--- tests/Makefile.am	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/Makefile.am	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -46,4 +46,5 @@
 avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c
 
+#----------------------------------------------------------------------------------------------------------------
 all-local :
 	@+${TEST_PY} --debug=${debug} ${concurrent} ${quick_test}
@@ -67,16 +68,5 @@
 	@+${TEST_PY} --debug=${debug} -Iconcurrent
 
-# SKULLDUGGERY like libcfa/Makefile.am prevent extensionless headers from being generated
-# however, here it is more complicated because it must match the dependencies based on how
-# they are generated by gcc
-headers = $(shell find $(top_srcdir)/libcfa/src -type f ! -name "*.*")
-headers_real = $(shell realpath --relative-to=$(top_srcdir)/libcfa/src $(headers))
-headers_deps = $(addprefix %/, $(headers_real))
-$(headers_deps) :
-	echo "Dummy rule, should never be called"
-
-# %/stdlib:
-# 	echo "Dummy rule, should never be called"
-
+#----------------------------------------------------------------------------------------------------------------
 # implicit rule so not all test require a rule
 % : %.c $(CC)
Index: tests/abs.c
===================================================================
--- tests/abs.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/abs.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// abs.c -- 
+// abs.c --
 //
 // Author           : Peter A. Buhr
@@ -14,6 +14,6 @@
 //
 
-#include <fstream>
-#include <stdlib>										// abs
+#include <fstream.hfa>
+#include <stdlib.hfa>										// abs
 
 int main( void ) {
Index: tests/alloc.c
===================================================================
--- tests/alloc.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/alloc.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -18,6 +18,6 @@
 #include <stdint.h>										// uintptr_t
 #include <stdlib.h>										// posix_memalign
-#include <fstream>
-#include <stdlib>										// access C malloc, realloc
+#include <fstream.hfa>
+#include <stdlib.hfa>										// access C malloc, realloc
 
 int * foo( int * p, int c ) { return p; }
Index: tests/ato.c
===================================================================
--- tests/ato.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/ato.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,10 +1,10 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// ato.c -- 
-// 
+//
+// ato.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Thu Feb  4 08:10:57 2016
@@ -12,8 +12,8 @@
 // Last Modified On : Thu Nov 16 18:31:56 2017
 // Update Count     : 89
-// 
+//
 
-#include <fstream>
-#include <stdlib>										// ato, strto
+#include <fstream.hfa>
+#include <stdlib.hfa>										// ato, strto
 
 int main( void ) {
Index: tests/avltree/avl1.c
===================================================================
--- tests/avltree/avl1.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/avltree/avl1.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,5 +1,5 @@
 #include "avl.h"
 // #include "cwrap.h"
-#include <stdlib>
+#include <stdlib.hfa>
 
 forall(otype K | Comparable(K), otype V)
Index: tests/avltree/avl3.c
===================================================================
--- tests/avltree/avl3.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/avltree/avl3.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,5 +1,5 @@
 #include "avl.h"
 #include "avl-private.h"
-#include <stdlib>
+#include <stdlib.hfa>
 
 // swaps the data within two tree nodes
Index: tests/avltree/avl_test.c
===================================================================
--- tests/avltree/avl_test.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/avltree/avl_test.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,5 +1,5 @@
 #include "avl.h"
 #include "avl-private.h"
-#include <stdlib>
+#include <stdlib.hfa>
 
 extern "C" {
Index: tests/complex.c
===================================================================
--- tests/complex.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/complex.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,10 +1,10 @@
-// 
+//
 // 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.
-// 
-// complex.c -- 
-// 
+//
+// complex.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Wed May 24 22:07:31 2017
@@ -12,10 +12,10 @@
 // Last Modified On : Wed May 24 22:08:01 2017
 // Update Count     : 1
-// 
+//
 
 #include <stdio.h>
 #include <complex.h>
 #ifdef __CFA__
-#include <fstream>
+#include <fstream.hfa>
 #endif // __CFA
 
Index: tests/concurrent/coroutineYield.c
===================================================================
--- tests/concurrent/coroutineYield.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/concurrent/coroutineYield.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/concurrent/examples/boundedBufferEXT.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/concurrent/examples/boundedBufferINT.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/concurrent/examples/datingService.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/concurrent/examples/matrixSum.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/concurrent/examples/quickSort.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/concurrent/monitor.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/concurrent/multi-monitor.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/concurrent/preempt.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 ff593a32adef9a2078e1364158421083ef83d50a)
+++ 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 ff593a32adef9a2078e1364158421083ef83d50a)
+++ 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 ff593a32adef9a2078e1364158421083ef83d50a)
+++ 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
Index: tests/concurrent/thread.c
===================================================================
--- tests/concurrent/thread.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/concurrent/thread.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/concurrent/waitfor/barge.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/concurrent/waitfor/dtor.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/concurrent/waitfor/else.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/concurrent/waitfor/parse.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -8,5 +8,5 @@
 //----------------------------------------------------------------------------------------
 
-#include <monitor>
+#include <monitor.hfa>
 
 monitor M {};
Index: tests/concurrent/waitfor/recurse.c
===================================================================
--- tests/concurrent/waitfor/recurse.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/concurrent/waitfor/recurse.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/concurrent/waitfor/simple.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/concurrent/waitfor/statment.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/concurrent/waitfor/when.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -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/coroutine/.in/fmtLines.txt
===================================================================
--- tests/coroutine/.in/fmtLines.txt	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/coroutine/.in/fmtLines.txt	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,10 +1,10 @@
-// 
+//
 // 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.
-// 
-// fmtLines.cc -- 
-// 
+//
+// fmtLines.cc --
+//
 // Author           : Peter A. Buhr
 // Created On       : Sun Sep 17 21:56:15 2017
@@ -12,8 +12,8 @@
 // Last Modified On : Mon Sep 18 11:35:57 2017
 // Update Count     : 31
-// 
+//
 
-#include <fstream>
-#include <coroutine>
+#include <fstream.hfa>
+#include <coroutine.hfa>
 
 coroutine Format {
Index: tests/coroutine/fibonacci.c
===================================================================
--- tests/coroutine/fibonacci.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/coroutine/fibonacci.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -15,6 +15,6 @@
 //
 
-#include <fstream>
-#include <coroutine>
+#include <fstream.hfa>
+#include <coroutine.hfa>
 
 coroutine Fibonacci { int fn; };						// used for communication
Index: tests/coroutine/fmtLines.c
===================================================================
--- tests/coroutine/fmtLines.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/coroutine/fmtLines.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,10 +1,10 @@
-// 
+//
 // 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.
-// 
+//
 // fmtLines.cc -- format characters into blocks of 4 and groups of 5 blocks per line
-// 
+//
 // Author           : Peter A. Buhr
 // Created On       : Sun Sep 17 21:56:15 2017
@@ -12,8 +12,8 @@
 // Last Modified On : Tue May 15 12:25:33 2018
 // Update Count     : 42
-// 
+//
 
-#include <fstream>
-#include <coroutine>
+#include <fstream.hfa>
+#include <coroutine.hfa>
 
 coroutine Format {
Index: tests/coroutine/pingpong.c
===================================================================
--- tests/coroutine/pingpong.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/coroutine/pingpong.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,10 +1,10 @@
-// 
+//
 // 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.
-// 
-// pingpong.c -- 
-// 
+//
+// pingpong.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Wed Sep 20 11:55:23 2017
@@ -12,8 +12,8 @@
 // Last Modified On : Wed Sep 20 13:41:39 2017
 // Update Count     : 26
-// 
+//
 
-#include <coroutine>
-#include <fstream>
+#include <coroutine.hfa>
+#include <fstream.hfa>
 
 coroutine PingPong {
Index: tests/coroutine/prodcons.c
===================================================================
--- tests/coroutine/prodcons.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/coroutine/prodcons.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,10 +1,10 @@
-// 
+//
 // 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.
-// 
-// prodcons.c -- 
-// 
+//
+// prodcons.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Mon Sep 18 12:23:39 2017
@@ -12,9 +12,9 @@
 // Last Modified On : Tue Jan  2 12:17:01 2018
 // Update Count     : 47
-// 
+//
 
-#include <fstream>
-#include <coroutine>
-#include <stdlib>										// random
+#include <fstream.hfa>
+#include <coroutine.hfa>
+#include <stdlib.hfa>										// random
 #include <unistd.h>										// getpid
 
Index: tests/coroutine/runningTotal.c
===================================================================
--- tests/coroutine/runningTotal.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/coroutine/runningTotal.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,10 +1,10 @@
-// 
+//
 // 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.
-// 
-// runningTotal.c -- 
-// 
+//
+// runningTotal.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Wed Dec  6 08:05:27 2017
@@ -12,8 +12,8 @@
 // Last Modified On : Wed Dec  6 08:09:24 2017
 // Update Count     : 2
-// 
+//
 
-#include <fstream>
-#include <coroutine>
+#include <fstream.hfa>
+#include <coroutine.hfa>
 
 coroutine RunTotal {									// input numbers and return running total
Index: tests/div.c
===================================================================
--- tests/div.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/div.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,10 +1,10 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// div.c -- 
-// 
+//
+// div.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Tue Aug  8 16:28:43 2017
@@ -12,8 +12,8 @@
 // Last Modified On : Thu Dec  7 09:06:52 2017
 // Update Count     : 18
-// 
+//
 
-#include <fstream>
-#include <stdlib>										// div
+#include <fstream.hfa>
+#include <stdlib.hfa>										// div
 
 struct T { int i; };
Index: tests/except-2.c
===================================================================
--- tests/except-2.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/except-2.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -2,5 +2,5 @@
 
 
-#include <stdlib>
+#include <stdlib.hfa>
 #include "except-mac.h"
 
Index: tests/fstream_test.c
===================================================================
--- tests/fstream_test.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/fstream_test.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// fstream_test.c -- 
+// fstream_test.c --
 //
 // Author           : Peter A. Buhr
@@ -14,18 +14,18 @@
 //
 
-#include <fstream>
+#include <fstream.hfa>
 
 int main( void ) {
 	int nombre;
-	sout | "Entrez un nombre, s'il vous plaît:" | endl;
+	sout | "Entrez un nombre, s'il vous pla�t:" | endl;
 	sin  | nombre;
-	sout | "Vous avez entré" | nombre | endl;
+	sout | "Vous avez entr�" | nombre | endl;
 	sout | "le nombre" | nombre | "est"
-		 | (nombre > 0 ? "positif" : nombre == 0 ? "zéro" : "négatif") | endl;
+		 | (nombre > 0 ? "positif" : nombre == 0 ? "z�ro" : "n�gatif") | endl;
 
-	sout | "Entrez trois nombres, s'il vous plaît: " | endl;
+	sout | "Entrez trois nombres, s'il vous pla�t: " | endl;
 	int i, j, k;
 	sin  | i | j | k;
-	sout | "Vous avez entré" | "i:" | "" | i | "j:" | "" | j | "k:" | "" | k | endl;
+	sout | "Vous avez entr�" | "i:" | "" | i | "j:" | "" | j | "k:" | "" | k | endl;
 }
 
Index: tests/function-operator.c
===================================================================
--- tests/function-operator.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/function-operator.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -14,6 +14,6 @@
 //
 
-#include <fstream>
-#include <stdlib>
+#include <fstream.hfa>
+#include <stdlib.hfa>
 
 #define length(array) (sizeof((array))/sizeof((array)[0]))
Index: tests/genericUnion.c
===================================================================
--- tests/genericUnion.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/genericUnion.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,3 +1,3 @@
-#include <limits>
+#include <limits.hfa>
 
 forall(otype T)
Index: tests/gmp.c
===================================================================
--- tests/gmp.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/gmp.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,10 +1,10 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// gmp.c -- 
-// 
+//
+// gmp.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Tue Apr 19 08:55:51 2016
@@ -12,9 +12,9 @@
 // Last Modified On : Thu Sep 28 18:33:51 2017
 // Update Count     : 555
-// 
+//
 
 // NOTE: UBUNTU DOES NOT SUPPORT GMP MULTILIB, SO ONLY 64-BIT GMP IS TESTED.
 
-#include <gmp>
+#include <gmp.hfa>
 
 int main( void ) {
Index: tests/heap.c
===================================================================
--- tests/heap.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/heap.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,8 +1,8 @@
-#include <thread>
-#include <kernel>										// processor
-#include <stdlib>										// *allocs
+#include <thread.hfa>
+#include <kernel.hfa>										// processor
+#include <stdlib.hfa>										// *allocs
 #include <malloc.h>										// malloc_*
 
-// #include <time>
+// #include <time.hfa>
 // #define __CFA_DEFAULT_PREEMPTION__ 1000`us
 // //#define __CFA_DEFAULT_PREEMPTION__ 0
Index: tests/hello.c
===================================================================
--- tests/hello.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/hello.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// hello.c -- 
+// hello.c --
 //
 // Author           : Peter A. Buhr
@@ -14,5 +14,5 @@
 //
 
-#include <fstream>
+#include <fstream.hfa>
 
 int main() {
Index: tests/identity.c
===================================================================
--- tests/identity.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/identity.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// identity.c -- 
+// identity.c --
 //
 // Author           : Peter A. Buhr
@@ -14,5 +14,5 @@
 //
 
-#include <fstream>
+#include <fstream.hfa>
 
 forall( otype T )
Index: tests/ifwhileCtl.c
===================================================================
--- tests/ifwhileCtl.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/ifwhileCtl.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -14,5 +14,5 @@
 //
 
-#include <fstream>
+#include <fstream.hfa>
 
 int f( int r ) { return r; }
Index: tests/io1.c
===================================================================
--- tests/io1.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/io1.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,10 +1,10 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// io1.c -- 
-// 
+//
+// io1.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Wed Mar  2 16:56:02 2016
@@ -12,7 +12,7 @@
 // Last Modified On : Thu May 24 21:17:56 2018
 // Update Count     : 104
-// 
+//
 
-#include <fstream>
+#include <fstream.hfa>
 
 int main() {
@@ -31,9 +31,9 @@
 		 | "x =" | 4
 		 | "x $" | 5
-		 | "x £" | 6
-		 | "x ¥" | 7
-		 | "x ¡" | 8
-		 | "x ¿" | 9
-		 | "x «" | 10
+		 | "x �" | 6
+		 | "x �" | 7
+		 | "x �" | 8
+		 | "x �" | 9
+		 | "x �" | 10
 		 | endl | endl;
 
@@ -46,6 +46,6 @@
 		 | 5 | "? x"
 		 | 6 | "% x"
-		 | 7 | "¢ x"
-		 | 8 | "» x"
+		 | 7 | "� x"
+		 | 8 | "� x"
 		 | 9 | ") x"
 		 | 10 | "] x"
Index: tests/io2.c
===================================================================
--- tests/io2.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/io2.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -14,5 +14,5 @@
 //
 
-#include <fstream>
+#include <fstream.hfa>
 
  #define xstr(s) str(s)
Index: tests/limits.c
===================================================================
--- tests/limits.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/limits.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -14,5 +14,5 @@
 //
 
-#include <limits>
+#include <limits.hfa>
 
 // Integral Constants
Index: tests/literals.c
===================================================================
--- tests/literals.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/literals.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,10 +1,10 @@
-// 
+//
 // 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.
-// 
-// literals.c -- 
-// 
+//
+// literals.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Sat Sep  9 16:34:38 2017
@@ -12,9 +12,9 @@
 // Last Modified On : Sun Jul  1 15:12:15 2018
 // Update Count     : 137
-// 
+//
 
 #ifdef __CFA__
 #include <stdint.h>
-#include <fstream>
+#include <fstream.hfa>
 
 void f( char v ) { sout | "char " | v | endl; }
@@ -221,5 +221,5 @@
 	-0123456789.0123456789E+09L32;  -0123456789.0123456789E+09L64;  -0123456789.0123456789E+09L80;  -0123456789.0123456789E+09L128;
 	 0123456789.0123456789E-09L32;   0123456789.0123456789E-09L64;   0123456789.0123456789E-09L80;   0123456789.0123456789E-09L128;
-	
+
 	 0x0123456789.p09l32;   0x0123456789.p09l64;   0x0123456789.p09l80;   0x0123456789.p09l128;
 	+0x0123456789.p09l32;  +0x0123456789.p09l64;  +0x0123456789.p09l80;  +0x0123456789.p09l128;
Index: tests/math1.c
===================================================================
--- tests/math1.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/math1.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,10 +1,10 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// math1.c -- 
-// 
+//
+// math1.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Fri Apr 22 14:59:21 2016
@@ -12,8 +12,8 @@
 // Last Modified On : Thu May 24 21:01:15 2018
 // Update Count     : 85
-// 
+//
 
-#include <fstream>
-#include <math>
+#include <fstream.hfa>
+#include <math.hfa>
 
 int main( void ) {
Index: tests/math2.c
===================================================================
--- tests/math2.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/math2.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,10 +1,10 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// math2.c -- 
-// 
+//
+// math2.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Fri Apr 22 14:59:21 2016
@@ -12,8 +12,8 @@
 // Last Modified On : Thu May 24 21:06:10 2018
 // Update Count     : 82
-// 
+//
 
-#include <fstream>
-#include <math>
+#include <fstream.hfa>
+#include <math.hfa>
 
 int main( void ) {
Index: tests/math3.c
===================================================================
--- tests/math3.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/math3.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,10 +1,10 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// math3.c -- 
-// 
+//
+// math3.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Fri Apr 22 14:59:21 2016
@@ -12,8 +12,8 @@
 // Last Modified On : Thu May 24 21:06:12 2018
 // Update Count     : 82
-// 
+//
 
-#include <fstream>
-#include <math>
+#include <fstream.hfa>
+#include <math.hfa>
 
 int main( void ) {
Index: tests/math4.c
===================================================================
--- tests/math4.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/math4.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,10 +1,10 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// math4.c -- 
-// 
+//
+// math4.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Thu May 24 20:56:54 2018
@@ -12,8 +12,8 @@
 // Last Modified On : Thu May 24 20:58:06 2018
 // Update Count     : 2
-// 
+//
 
-#include <fstream>
-#include <math>
+#include <fstream.hfa>
+#include <math.hfa>
 
 int main( void ) {
Index: tests/minmax.c
===================================================================
--- tests/minmax.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/minmax.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// minmax.c -- 
+// minmax.c --
 //
 // Author           : Peter A. Buhr
@@ -14,6 +14,6 @@
 //
 
-#include <fstream>
-#include <stdlib>										// min, max
+#include <fstream.hfa>
+#include <stdlib.hfa>										// min, max
 
 int main( void ) {
Index: tests/preempt_longrun/create.c
===================================================================
--- tests/preempt_longrun/create.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/preempt_longrun/create.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,5 +1,5 @@
-#include <kernel>
-#include <thread>
-#include <time>
+#include <kernel.hfa>
+#include <thread.hfa>
+#include <time.hfa>
 
 #include "long_tests.h"
Index: tests/preempt_longrun/enter.c
===================================================================
--- tests/preempt_longrun/enter.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/preempt_longrun/enter.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,6 +1,6 @@
-#include <kernel>
-#include <monitor>
-#include <thread>
-#include <time>
+#include <kernel.hfa>
+#include <monitor.hfa>
+#include <thread.hfa>
+#include <time.hfa>
 
 #define __kick_rate 75000ul
Index: tests/preempt_longrun/enter3.c
===================================================================
--- tests/preempt_longrun/enter3.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/preempt_longrun/enter3.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,6 +1,6 @@
-#include <kernel>
-#include <monitor>
-#include <thread>
-#include <time>
+#include <kernel.hfa>
+#include <monitor.hfa>
+#include <thread.hfa>
+#include <time.hfa>
 
 #define __kick_rate 75000ul
Index: tests/preempt_longrun/processor.c
===================================================================
--- tests/preempt_longrun/processor.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/preempt_longrun/processor.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,5 +1,5 @@
-#include <kernel>
-#include <thread>
-#include <time>
+#include <kernel.hfa>
+#include <thread.hfa>
+#include <time.hfa>
 
 #include <unistd.h>
Index: tests/preempt_longrun/stack.c
===================================================================
--- tests/preempt_longrun/stack.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/preempt_longrun/stack.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,6 +1,6 @@
-#include <kernel>
-#include <math>
-#include <thread>
-#include <time>
+#include <kernel.hfa>
+#include <math.hfa>
+#include <thread.hfa>
+#include <time.hfa>
 
 #define __kick_rate 5000000ul
Index: tests/preempt_longrun/yield.c
===================================================================
--- tests/preempt_longrun/yield.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/preempt_longrun/yield.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,5 +1,5 @@
-#include <kernel>
-#include <thread>
-#include <time>
+#include <kernel.hfa>
+#include <thread.hfa>
+#include <time.hfa>
 
 #define __kick_rate 550000ul
Index: tests/quoted_keyword.c
===================================================================
--- tests/quoted_keyword.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/quoted_keyword.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -14,5 +14,5 @@
 //
 
-#include <fstream>
+#include <fstream.hfa>
 
 struct {
Index: tests/raii/dtor-early-exit.c
===================================================================
--- tests/raii/dtor-early-exit.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/raii/dtor-early-exit.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -14,6 +14,6 @@
 //
 
-#include <fstream>
-#include <stdlib>
+#include <fstream.hfa>
+#include <stdlib.hfa>
 extern "C" {
 #define false ((int)0)	// until stdbool.h works
Index: tests/raii/globals.c
===================================================================
--- tests/raii/globals.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/raii/globals.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,3 +1,3 @@
-#include <fstream>
+#include <fstream.hfa>
 
 struct value_t {
Index: tests/random.c
===================================================================
--- tests/random.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/random.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,10 +1,10 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// random.c -- 
-// 
+//
+// random.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Tue Jul  5 21:29:30 2016
@@ -12,8 +12,8 @@
 // Last Modified On : Tue Jan  2 12:19:34 2018
 // Update Count     : 19
-// 
+//
 
-#include <fstream>
-#include <stdlib>										// random
+#include <fstream.hfa>
+#include <stdlib.hfa>										// random
 #include <unistd.h>										// getpid
 
Index: tests/rational.c
===================================================================
--- tests/rational.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/rational.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -14,8 +14,8 @@
 //
 
-#include <rational>
-#include <limits>
-#include <stdlib>
-#include <fstream>
+#include <rational.hfa>
+#include <limits.hfa>
+#include <stdlib.hfa>
+#include <fstream.hfa>
 
 // UNNECESSARY, FIX ME
Index: tests/searchsort.c
===================================================================
--- tests/searchsort.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/searchsort.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,10 +1,10 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// searchsort.c -- 
-// 
+//
+// searchsort.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Thu Feb  4 18:17:50 2016
@@ -12,8 +12,8 @@
 // Last Modified On : Tue Jan  2 08:01:17 2018
 // Update Count     : 100
-// 
+//
 
-#include <fstream>
-#include <stdlib>										// bsearch, qsort
+#include <fstream.hfa>
+#include <stdlib.hfa>										// bsearch, qsort
 #include <stdlib.h>										// C version of bsearch
 
Index: tests/shortCircuit.c
===================================================================
--- tests/shortCircuit.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/shortCircuit.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -22,5 +22,5 @@
 }
 
-#include <fstream>
+#include <fstream.hfa>
 
 struct test_t {
Index: tests/sum.c
===================================================================
--- tests/sum.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/sum.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -15,6 +15,6 @@
 //
 
-#include <fstream>
-#include <stdlib>
+#include <fstream.hfa>
+#include <stdlib.hfa>
 
 void ?{}( int & c, zero_t ) { c = 0; }					// not in prelude
Index: tests/swap.c
===================================================================
--- tests/swap.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/swap.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// swap.c -- 
+// swap.c --
 //
 // Author           : Peter A. Buhr
@@ -14,6 +14,6 @@
 //
 
-#include <fstream>
-#include <stdlib>										// swap
+#include <fstream.hfa>
+#include <stdlib.hfa>										// swap
 
 int main( void ) {
Index: tests/time.c
===================================================================
--- tests/time.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/time.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,10 +1,10 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// time.c -- 
-// 
+//
+// time.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Tue Mar 27 17:24:56 2018
@@ -12,8 +12,8 @@
 // Last Modified On : Fri Apr  6 11:27:23 2018
 // Update Count     : 16
-// 
+//
 
 #include "time"
-#include <fstream>
+#include <fstream.hfa>
 
 int main() {
Index: tests/tuple/tupleAssign.c
===================================================================
--- tests/tuple/tupleAssign.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/tuple/tupleAssign.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -14,5 +14,5 @@
 //
 
-#include <fstream>
+#include <fstream.hfa>
 
 int main() {
Index: tests/user_literals.c
===================================================================
--- tests/user_literals.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/user_literals.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,10 +1,10 @@
-// 
+//
 // 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.
-// 
-// user_literals.c -- 
-// 
+//
+// user_literals.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Wed Sep  6 21:40:50 2017
@@ -12,7 +12,7 @@
 // Last Modified On : Sun Apr 29 16:51:42 2018
 // Update Count     : 54
-// 
+//
 
-#include <fstream>
+#include <fstream.hfa>
 #include <wchar.h>
 #include <uchar.h>
Index: tests/vector.c
===================================================================
--- tests/vector.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/vector.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -14,6 +14,6 @@
 //
 
-#include <fstream>
-#include <vector>
+#include <fstream.hfa>
+#include <vector.hfa>
 
 #undef assert
Index: tests/virtualCast.c
===================================================================
--- tests/virtualCast.c	(revision ff593a32adef9a2078e1364158421083ef83d50a)
+++ tests/virtualCast.c	(revision 73abe950d807eab747c9e14353b158fcca827308)
@@ -9,5 +9,5 @@
  */
 
-#include <stdlib>
+#include <stdlib.hfa>
 #include <assert.h>