Index: tests/preempt_longrun/create.c
===================================================================
--- tests/preempt_longrun/create.c	(revision 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ tests/preempt_longrun/create.c	(revision 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -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 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ tests/preempt_longrun/enter.c	(revision 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -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 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ tests/preempt_longrun/enter3.c	(revision 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -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 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ tests/preempt_longrun/processor.c	(revision 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -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 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ tests/preempt_longrun/stack.c	(revision 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -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 534e4e460878f8a2e7d24b4a0413515e6acd1dae)
+++ tests/preempt_longrun/yield.c	(revision 58b6d1b3b8da710a22441043f60cb988a2c2e56d)
@@ -1,5 +1,5 @@
-#include <kernel>
-#include <thread>
-#include <time>
+#include <kernel.hfa>
+#include <thread.hfa>
+#include <time.hfa>
 
 #define __kick_rate 550000ul