Index: libcfa/src/Makefile.am
===================================================================
--- libcfa/src/Makefile.am	(revision 9c438546124986f69543f60d68dfa32a64f1ad68)
+++ libcfa/src/Makefile.am	(revision 893da07039c696d8bf1e6e895a30513b17778992)
@@ -39,7 +39,8 @@
 #----------------------------------------------------------------------------------------------------------------
 if BUILDLIB
-headers_nosrc = bitmanip.hfa math.hfa gmp.hfa time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa containers/list.hfa
+headers_nosrc = bitmanip.hfa math.hfa gmp.hfa time_t.hfa clock.hfa \
+		bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa containers/list.hfa
 headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
-	  containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
+		containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
 
 libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa ${headers:.hfa=.cfa}
Index: libcfa/src/Makefile.in
===================================================================
--- libcfa/src/Makefile.in	(revision 9c438546124986f69543f60d68dfa32a64f1ad68)
+++ libcfa/src/Makefile.in	(revision 893da07039c696d8bf1e6e895a30513b17778992)
@@ -240,5 +240,5 @@
 	containers/maybe.hfa containers/pair.hfa containers/result.hfa \
 	containers/vector.hfa bitmanip.hfa math.hfa gmp.hfa time_t.hfa \
-	bits/align.hfa bits/containers.hfa bits/defs.hfa \
+	clock.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa \
 	bits/debug.hfa bits/locks.hfa containers/list.hfa \
 	concurrency/coroutine.hfa concurrency/thread.hfa \
@@ -464,8 +464,10 @@
 
 #----------------------------------------------------------------------------------------------------------------
-@BUILDLIB_TRUE@headers_nosrc = bitmanip.hfa math.hfa gmp.hfa time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa containers/list.hfa
+@BUILDLIB_TRUE@headers_nosrc = bitmanip.hfa math.hfa gmp.hfa time_t.hfa clock.hfa \
+@BUILDLIB_TRUE@		bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa containers/list.hfa
+
 @BUILDLIB_FALSE@headers = 
 @BUILDLIB_TRUE@headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
-@BUILDLIB_TRUE@	  containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
+@BUILDLIB_TRUE@		containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
 
 @BUILDLIB_FALSE@libsrc =