Index: libcfa/src/Makefile.am
===================================================================
--- libcfa/src/Makefile.am	(revision 34fcc132e581e17a6ec0541f33661e753a8dfc0a)
+++ libcfa/src/Makefile.am	(revision 3ad9097818f02c2cd28110d35d00b332bf412f5a)
@@ -48,4 +48,5 @@
 	math.hfa \
 	time_t.hfa \
+	bits/algorithm.hfa \
 	bits/align.hfa \
 	bits/containers.hfa \
@@ -59,5 +60,4 @@
 	containers/array.hfa \
 	concurrency/iofwd.hfa \
-	concurrency/mutex_stmt.hfa \
 	containers/list.hfa \
 	containers/queueLockFree.hfa \
@@ -91,5 +91,4 @@
 libsrc = ${inst_headers_src} ${inst_headers_src:.hfa=.cfa} \
 	assert.cfa \
-	bits/algorithm.hfa \
 	bits/debug.cfa \
 	exception.c \
@@ -107,5 +106,6 @@
 	concurrency/invoke.h \
 	concurrency/future.hfa \
-	concurrency/kernel/fwd.hfa
+	concurrency/kernel/fwd.hfa \
+	concurrency/mutex_stmt.hfa
 
 inst_thread_headers_src = \
Index: tests/Makefile.am
===================================================================
--- tests/Makefile.am	(revision 34fcc132e581e17a6ec0541f33661e753a8dfc0a)
+++ tests/Makefile.am	(revision 3ad9097818f02c2cd28110d35d00b332bf412f5a)
@@ -82,5 +82,6 @@
 	concurrent/clib_tls.c \
 	exceptions/with-threads.hfa \
-	exceptions/except-io.hfa
+	exceptions/except-io.hfa \
+	unified_locking/mutex_test.hfa
 
 dist-hook: