Index: src/libcfa/Makefile.am
===================================================================
--- src/libcfa/Makefile.am	(revision 8ad653339f39e704e4be3cbd354de857c44a52f4)
+++ src/libcfa/Makefile.am	(revision 0f5605831af289410e02930b6965262873df0fc9)
@@ -11,6 +11,6 @@
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Sun Apr  8 23:49:34 2018
-## Update Count     : 227
+## Last Modified On : Tue Apr 10 15:20:28 2018
+## Update Count     : 230
 ###############################################################################
 
@@ -100,4 +100,5 @@
 	math 				\
 	gmp 				\
+	time_t.h			\
 	bits/align.h 		\
 	bits/containers.h		\
Index: src/libcfa/Makefile.in
===================================================================
--- src/libcfa/Makefile.in	(revision 8ad653339f39e704e4be3cbd354de857c44a52f4)
+++ src/libcfa/Makefile.in	(revision 0f5605831af289410e02930b6965262873df0fc9)
@@ -264,5 +264,5 @@
 	containers/result containers/vector concurrency/coroutine \
 	concurrency/thread concurrency/kernel concurrency/monitor \
-	${shell find stdhdr -type f -printf "%p "} math gmp \
+	${shell find stdhdr -type f -printf "%p "} math gmp time_t.h \
 	bits/align.h bits/containers.h bits/defs.h bits/debug.h \
 	bits/locks.h concurrency/invoke.h
@@ -437,4 +437,5 @@
 	math 				\
 	gmp 				\
+	time_t.h			\
 	bits/align.h 		\
 	bits/containers.h		\
Index: src/libcfa/concurrency/kernel
===================================================================
--- src/libcfa/concurrency/kernel	(revision 8ad653339f39e704e4be3cbd354de857c44a52f4)
+++ src/libcfa/concurrency/kernel	(revision 0f5605831af289410e02930b6965262873df0fc9)
@@ -10,6 +10,6 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 23 17:08:20 2018
-// Update Count     : 3
+// Last Modified On : Tue Apr 10 14:46:49 2018
+// Update Count     : 10
 //
 
@@ -19,5 +19,5 @@
 
 #include "invoke.h"
-#include "time"
+#include "time_t.h"
 
 extern "C" {
Index: src/libcfa/concurrency/kernel.c
===================================================================
--- src/libcfa/concurrency/kernel.c	(revision 8ad653339f39e704e4be3cbd354de857c44a52f4)
+++ src/libcfa/concurrency/kernel.c	(revision 0f5605831af289410e02930b6965262873df0fc9)
@@ -10,6 +10,6 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 30 18:26:11 2018
-// Update Count     : 23
+// Last Modified On : Mon Apr  9 16:11:46 2018
+// Update Count     : 24
 //
 
@@ -25,4 +25,5 @@
 
 //CFA Includes
+#include "time"
 #include "kernel_private.h"
 #include "preemption.h"
Index: src/libcfa/time
===================================================================
--- src/libcfa/time	(revision 8ad653339f39e704e4be3cbd354de857c44a52f4)
+++ src/libcfa/time	(revision 0f5605831af289410e02930b6965262873df0fc9)
@@ -10,6 +10,6 @@
 // Created On       : Wed Mar 14 23:18:57 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Apr  9 13:10:23 2018
-// Update Count     : 616
+// Last Modified On : Tue Apr 10 17:25:34 2018
+// Update Count     : 622
 // 
 
@@ -27,15 +27,8 @@
 enum { TIMEGRAN = 1_000_000_000LL };					// nanosecond granularity, except for timeval
 
+#include <time_t.h>										// Duration (constructors) / Time (constructors)
 
 //######################### Duration #########################
 
-struct Duration {										// private
-	int64_t tv;											// nanoseconds
-}; // Duration
-
-static inline void ?{}( Duration & dur ) with( dur ) { tv = 0; }
-static inline void ?{}( Duration & dur, Duration d ) with( dur ) { tv = d.tv; }
-
-static inline void ?{}( Duration & dur, zero_t ) with( dur ) { tv = 0; }
 static inline Duration ?=?( Duration & dur, zero_t ) { return dur{ 0 }; }
 
@@ -155,12 +148,4 @@
 //######################### Time #########################
 
-struct Time {											// private
-	uint64_t tv;										// nanoseconds since UNIX epoch
-}; // Time
-
-static inline void ?{}( Time & t ) with( t ) { tv = 0; } // fast
-void ?{}( Time & time, int year, int month = 0, int day = 0, int hour = 0, int min = 0, int sec = 0, int nsec = 0 ); // slow
-
-static inline void ?{}( Time & t, zero_t ) { t.tv = 0; }
 static inline Time ?=?( Time & t, zero_t ) { return t{ 0 }; }
 
@@ -247,11 +232,6 @@
 } // resetClock
 
-static inline void ?{}( Clock & clk ) {
-	resetClock( clk );
-} // Clock
-
-static inline void ?{}( Clock & clk, Duration adj ) {
-	resetClock( clk, adj );
-} // Clock
+static inline void ?{}( Clock & clk ) { resetClock( clk ); }
+static inline void ?{}( Clock & clk, Duration adj ) { resetClock( clk, adj ); }
 
 static inline Duration getRes() {
Index: src/libcfa/time_t.h
===================================================================
--- src/libcfa/time_t.h	(revision 0f5605831af289410e02930b6965262873df0fc9)
+++ src/libcfa/time_t.h	(revision 0f5605831af289410e02930b6965262873df0fc9)
@@ -0,0 +1,43 @@
+// 
+// Cforall Version 1.0.0 Copyright (C) 2018 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// time_t.h -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Tue Apr 10 14:42:03 2018
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Apr 10 16:32:04 2018
+// Update Count     : 3
+// 
+
+#pragma once
+
+
+//######################### Duration #########################
+
+struct Duration {										// private
+	int64_t tv;											// nanoseconds
+}; // Duration
+
+static inline void ?{}( Duration & dur ) with( dur ) { tv = 0; }
+static inline void ?{}( Duration & dur, Duration d ) with( dur ) { tv = d.tv; }
+static inline void ?{}( Duration & dur, zero_t ) with( dur ) { tv = 0; }
+
+
+//######################### Time #########################
+
+struct Time {											// private
+	uint64_t tv;										// nanoseconds since UNIX epoch
+}; // Time
+
+static inline void ?{}( Time & t ) with( t ) { tv = 0; } // fast
+void ?{}( Time & time, int year, int month = 0, int day = 0, int hour = 0, int min = 0, int sec = 0, int nsec = 0 ); // slow
+static inline void ?{}( Time & t, zero_t ) { t.tv = 0; }
+
+// Local Variables: //
+// mode: c //
+// tab-width: 4 //
+// End: //
Index: src/tests/concurrent/preempt.c
===================================================================
--- src/tests/concurrent/preempt.c	(revision 8ad653339f39e704e4be3cbd354de857c44a52f4)
+++ src/tests/concurrent/preempt.c	(revision 0f5605831af289410e02930b6965262873df0fc9)
@@ -1,4 +1,5 @@
 #include <kernel>
 #include <thread>
+#include <time>
 
 #ifndef PREEMPTION_RATE
Index: src/tests/concurrent/signal/block.c
===================================================================
--- src/tests/concurrent/signal/block.c	(revision 8ad653339f39e704e4be3cbd354de857c44a52f4)
+++ src/tests/concurrent/signal/block.c	(revision 0f5605831af289410e02930b6965262873df0fc9)
@@ -12,6 +12,5 @@
 #include <stdlib>
 #include <thread>
-
-#include <time.h>
+#include <time>
 
 #ifdef LONG_TEST
Index: src/tests/concurrent/signal/disjoint.c
===================================================================
--- src/tests/concurrent/signal/disjoint.c	(revision 8ad653339f39e704e4be3cbd354de857c44a52f4)
+++ src/tests/concurrent/signal/disjoint.c	(revision 0f5605831af289410e02930b6965262873df0fc9)
@@ -3,6 +3,5 @@
 #include <monitor>
 #include <thread>
-
-#include <time.h>
+#include <time>
 
 #ifdef LONG_TEST
Index: src/tests/concurrent/signal/wait.c
===================================================================
--- src/tests/concurrent/signal/wait.c	(revision 8ad653339f39e704e4be3cbd354de857c44a52f4)
+++ src/tests/concurrent/signal/wait.c	(revision 0f5605831af289410e02930b6965262873df0fc9)
@@ -10,6 +10,5 @@
 #include <stdlib>
 #include <thread>
-
-#include <time.h>
+#include <time>
 
 #ifdef LONG_TEST