Index: libcfa/src/Makefile.am
===================================================================
--- libcfa/src/Makefile.am	(revision 8c2896742a9a9e66f2a94e008e895e495f1e9329)
+++ libcfa/src/Makefile.am	(revision ab388c536b8215ac2ef5f04702372e97e5c026a7)
@@ -106,4 +106,5 @@
 
 inst_thread_headers_src = \
+	concurrency/alarm.hfa \
 	concurrency/coroutine.hfa \
 	concurrency/exception.hfa \
@@ -116,6 +117,4 @@
 thread_libsrc = ${inst_thread_headers_src} ${inst_thread_headers_src:.hfa=.cfa} \
 	bits/signal.hfa \
-	concurrency/alarm.cfa \
-	concurrency/alarm.hfa \
 	concurrency/clib/cfathread.cfa \
 	concurrency/CtxSwitch-@ARCHITECTURE@.S \
Index: tests/unified_locking/timeout_lock.cfa
===================================================================
--- tests/unified_locking/timeout_lock.cfa	(revision 8c2896742a9a9e66f2a94e008e895e495f1e9329)
+++ tests/unified_locking/timeout_lock.cfa	(revision ab388c536b8215ac2ef5f04702372e97e5c026a7)
@@ -1,8 +1,8 @@
 #include <stdio.h>
-#include "locks.hfa"
-#include "alarm.hfa"
+#include <locks.hfa>
+#include <alarm.hfa>
 #include <stdlib.hfa>
 #include <thread.hfa>
-#include "kernel.cfa"
+#include <kernel.hfa>
 
 multiple_acquisition_lock m, n;
@@ -33,5 +33,5 @@
 
 	for ( unsigned int i = 0; i < NoOfTimes + 3; i += 1 ) {
-	    if ( wait( c_m, m, 1000000`ns ) ) { 
+	    if ( wait( c_m, m, 1000000`ns ) ) {
 			// printf("Thread: %p signalled\n", active_thread()); // removed since can't expect non deterministic output
 	    } else {
@@ -73,5 +73,5 @@
 	processor p[2];
 	printf("Start Test 1: surface testing condition variable timeout routines\n");
-	wait( c_m, 1`ns );														// bool wait( condition_variable(L) & this, Duration duration );	
+	wait( c_m, 1`ns );														// bool wait( condition_variable(L) & this, Duration duration );
 	wait( c_m, 10, 1`ns );													// bool wait( condition_variable(L) & this, uintptr_t info, Duration duration );
 	lock(m); wait( c_m, m, 1`ns ); unlock(m); 								// bool wait( condition_variable(L) & this, L & l, Duration duration );