Index: libcfa/src/Makefile.am
===================================================================
--- libcfa/src/Makefile.am	(revision 702839bb373fc6e7f9395187edf2d4a1c5de6931)
+++ libcfa/src/Makefile.am	(revision 5b7c8b5971147c258fdef4412288013139672cdd)
@@ -59,4 +59,5 @@
 	containers/array.hfa \
 	concurrency/iofwd.hfa \
+	concurrency/mutex_stmt.hfa \
 	containers/list.hfa \
 	containers/queueLockFree.hfa \
Index: src/Concurrency/Keywords.cc
===================================================================
--- src/Concurrency/Keywords.cc	(revision 702839bb373fc6e7f9395187edf2d4a1c5de6931)
+++ src/Concurrency/Keywords.cc	(revision 5b7c8b5971147c258fdef4412288013139672cdd)
@@ -669,4 +669,6 @@
 		lock_fn_type->get_parameters().push_back( this_decl->clone() );
 		unlock_fn_type->get_parameters().push_back( this_decl->clone() );
+		fixupGenerics(lock_fn_type, decl);
+		fixupGenerics(unlock_fn_type, decl);
 
 		delete this_decl;
@@ -689,5 +691,4 @@
 			Type::Inline
 		);
-		fixupGenerics(lock_fn_type, decl);
 
 		UntypedExpr * get_monitor_lock =  new UntypedExpr (
@@ -725,5 +726,4 @@
 			Type::Inline
 		);
-		fixupGenerics(unlock_fn_type, decl);
 
 		CompoundStmt * unlock_statement = new CompoundStmt();