Index: examples/ArrayN.c
===================================================================
--- examples/ArrayN.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ examples/ArrayN.c	(revision 7fb92a0bdd3302608869ec4d3ef95c23cd27150e)
@@ -1,3 +1,3 @@
-#include <fstream>
+#include <fstream.hfa>
 
 // [unsigned, unsigned] offset_to_index(unsigned offset, unsigned sx, unsigned sy)
Index: examples/gc_no_raii/bug-repro/blockers/file_scope.c
===================================================================
--- examples/gc_no_raii/bug-repro/blockers/file_scope.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ examples/gc_no_raii/bug-repro/blockers/file_scope.c	(revision 7fb92a0bdd3302608869ec4d3ef95c23cd27150e)
@@ -1,5 +1,5 @@
 
 #include <stdbool.h>
-#include <stdlib>
+#include <stdlib.hfa>
 
 #define POOL_SIZE_EXP 24
Index: examples/gc_no_raii/bug-repro/blockers/recursive_realloc.c
===================================================================
--- examples/gc_no_raii/bug-repro/blockers/recursive_realloc.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ examples/gc_no_raii/bug-repro/blockers/recursive_realloc.c	(revision 7fb92a0bdd3302608869ec4d3ef95c23cd27150e)
@@ -1,5 +1,5 @@
 
 #include <stdbool.h>
-#include <stdlib>
+#include <stdlib.hfa>
 
 trait allocator_c(otype T, otype allocator_t)
Index: examples/gc_no_raii/bug-repro/field.c
===================================================================
--- examples/gc_no_raii/bug-repro/field.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ examples/gc_no_raii/bug-repro/field.c	(revision 7fb92a0bdd3302608869ec4d3ef95c23cd27150e)
@@ -4,5 +4,5 @@
 }
 
-#include <stdlib>
+#include <stdlib.hfa>
 
 //------------------------------------------------------------------------------
Index: examples/gc_no_raii/bug-repro/slow_malloc.c
===================================================================
--- examples/gc_no_raii/bug-repro/slow_malloc.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ examples/gc_no_raii/bug-repro/slow_malloc.c	(revision 7fb92a0bdd3302608869ec4d3ef95c23cd27150e)
@@ -1,3 +1,3 @@
-#include <stdlib>
+#include <stdlib.hfa>
 
 forall(otype T)
Index: examples/gc_no_raii/src/internal/collector.c
===================================================================
--- examples/gc_no_raii/src/internal/collector.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ examples/gc_no_raii/src/internal/collector.c	(revision 7fb92a0bdd3302608869ec4d3ef95c23cd27150e)
@@ -9,5 +9,5 @@
 #endif
 
-#include <fstream>
+#include <fstream.hfa>
 
 #include "state.h"
Index: examples/gc_no_raii/src/internal/state.c
===================================================================
--- examples/gc_no_raii/src/internal/state.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ examples/gc_no_raii/src/internal/state.c	(revision 7fb92a0bdd3302608869ec4d3ef95c23cd27150e)
@@ -1,5 +1,5 @@
 #include "state.h"
 
-#include <stdlib>
+#include <stdlib.hfa>
 
 //general purpouse includes
Index: examples/gc_no_raii/src/internal/state.h
===================================================================
--- examples/gc_no_raii/src/internal/state.h	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ examples/gc_no_raii/src/internal/state.h	(revision 7fb92a0bdd3302608869ec4d3ef95c23cd27150e)
@@ -9,5 +9,5 @@
 }
 #endif
-#include <fstream>
+#include <fstream.hfa>
 #include <vector>
 
Index: examples/gc_no_raii/src/tools/print.h
===================================================================
--- examples/gc_no_raii/src/tools/print.h	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ examples/gc_no_raii/src/tools/print.h	(revision 7fb92a0bdd3302608869ec4d3ef95c23cd27150e)
@@ -3,5 +3,5 @@
 // #ifndef NDEBUG
 //
-// #include <fstream>
+// #include <fstream.hfa>
 //
 // #define DEBUG_OUT(x) sout | x | endl;
Index: examples/gc_no_raii/src/tools/worklist.h
===================================================================
--- examples/gc_no_raii/src/tools/worklist.h	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ examples/gc_no_raii/src/tools/worklist.h	(revision 7fb92a0bdd3302608869ec4d3ef95c23cd27150e)
@@ -10,5 +10,5 @@
 #endif
 
-#include <vector>
+#include <vector.hfa>
 
 typedef vector(intptr_t*, heap_allocator(intptr_t*)) worklist_t;
Index: examples/gc_no_raii/test/gctest.c
===================================================================
--- examples/gc_no_raii/test/gctest.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ examples/gc_no_raii/test/gctest.c	(revision 7fb92a0bdd3302608869ec4d3ef95c23cd27150e)
@@ -1,3 +1,3 @@
-#include <fstream>
+#include <fstream.hfa>
 
 #include "gc.h"
Index: examples/multicore.c
===================================================================
--- examples/multicore.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ examples/multicore.c	(revision 7fb92a0bdd3302608869ec4d3ef95c23cd27150e)
@@ -1,4 +1,4 @@
-#include <kernel>
-#include <thread>
+#include <kernel.hfa>
+#include <thread.hfa>
 
 struct MyThread { thread_desc __thrd; };
Index: examples/prolog.c
===================================================================
--- examples/prolog.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ examples/prolog.c	(revision 7fb92a0bdd3302608869ec4d3ef95c23cd27150e)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// prolog.c -- 
+// prolog.c --
 //
 // Author           : Richard C. Bilson
@@ -14,5 +14,5 @@
 //
 
-#include <fstream>
+#include <fstream.hfa>
 
 void printResult( int x ) { sout | "int" | endl; }
Index: examples/quad.c
===================================================================
--- examples/quad.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ examples/quad.c	(revision 7fb92a0bdd3302608869ec4d3ef95c23cd27150e)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// quad.c -- 
+// quad.c --
 //
 // Author           : Richard C. Bilson
@@ -14,5 +14,5 @@
 //
 
-#include <fstream>
+#include <fstream.hfa>
 
 forall( otype T | { T ?*?( T, T ); } )
Index: examples/square.c
===================================================================
--- examples/square.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ examples/square.c	(revision 7fb92a0bdd3302608869ec4d3ef95c23cd27150e)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// square.c -- 
+// square.c --
 //
 // Author           : Richard C. Bilson
@@ -14,5 +14,5 @@
 //
 
-#include <fstream>
+#include <fstream.hfa>
 
 forall( otype T | { T ?*?( T, T ); } )
Index: examples/twice.c
===================================================================
--- examples/twice.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ examples/twice.c	(revision 7fb92a0bdd3302608869ec4d3ef95c23cd27150e)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// twice.c -- 
+// twice.c --
 //
 // Author           : Richard C. Bilson
@@ -14,5 +14,5 @@
 //
 
-#include <fstream>
+#include <fstream.hfa>
 
 forall( otype T | { T ?+?( T, T ); T ?++( T * ); [T] ?+=?( T *, T ); } )
Index: examples/wrapper/src/pointer.h
===================================================================
--- examples/wrapper/src/pointer.h	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ examples/wrapper/src/pointer.h	(revision 7fb92a0bdd3302608869ec4d3ef95c23cd27150e)
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <fstream>
+#include <fstream.hfa>
 #include <stddef.h>
-#include <stdlib>
+#include <stdlib.hfa>
 
 //==============================================================================
Index: examples/zero_one.c
===================================================================
--- examples/zero_one.c	(revision bf71cfdb7285490eee552b461158846f626cc52f)
+++ examples/zero_one.c	(revision 7fb92a0bdd3302608869ec4d3ef95c23cd27150e)
@@ -1,3 +1,3 @@
-#include <fstream>
+#include <fstream.hfa>
 
 void foo(zero_t o)
@@ -16,5 +16,5 @@
 }
 
-int main() 
+int main()
 {
 	foo(0);