Index: src/benchmark/bench.h
===================================================================
--- src/benchmark/bench.h	(revision 8ad653339f39e704e4be3cbd354de857c44a52f4)
+++ src/benchmark/bench.h	(revision 399a908cc97cdaad27d16bbf3d5672d0e4db6110)
@@ -6,13 +6,11 @@
 	#include <stdlib.h>
 	#include <unistd.h>					// sysconf
-	#include <sys/times.h>					// times
-	#include <time.h>
 #if defined(__cforall)
 }
-//#include <bits/cfatime.h>
+#include <time>
 #endif
 
 
-static inline unsigned long long int Time() {
+static inline unsigned long long int bench_time() {
     struct timespec ts;
     clock_gettime(
@@ -41,11 +39,11 @@
 	}						\
 	long long int StartTime, EndTime;	\
-	StartTime = Time();			\
+	StartTime = bench_time();			\
 	statement;					\
-	EndTime = Time();				\
+	EndTime = bench_time();				\
 	unsigned long long int output = 	\
 	( EndTime - StartTime ) / n;
 
-__cfa_time_t default_preemption() {
+Duration default_preemption() {
 	return 0;
 }
Index: src/benchmark/ctxswitch/cfa_cor.c
===================================================================
--- src/benchmark/ctxswitch/cfa_cor.c	(revision 8ad653339f39e704e4be3cbd354de857c44a52f4)
+++ src/benchmark/ctxswitch/cfa_cor.c	(revision 399a908cc97cdaad27d16bbf3d5672d0e4db6110)
@@ -1,3 +1,4 @@
 #include <stdio.h>
+#include <kernel>
 #include <thread>