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 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 73abe950d807eab747c9e14353b158fcca827308)
@@ -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 73abe950d807eab747c9e14353b158fcca827308)
@@ -1,3 +1,3 @@
-#include <fstream>
+#include <fstream.hfa>
 
 #include "gc.h"