Index: tests/concurrency/waitfor/autogen_destructor.cfa
===================================================================
--- tests/concurrency/waitfor/autogen_destructor.cfa	(revision f1cb1937a0ab02686fc201e2066ee4fc8a157ce6)
+++ tests/concurrency/waitfor/autogen_destructor.cfa	(revision 2b3ebe5f5e7cddf25d1a8ef1e4b2c2dc0bd64128)
@@ -1,3 +1,3 @@
-#include "nodestructor.hfa"
+#include "gendestructor.hfa"
 
 int main(int, char*[]) {
Index: tests/concurrency/waitfor/gendestructor.cfa
===================================================================
--- tests/concurrency/waitfor/gendestructor.cfa	(revision 2b3ebe5f5e7cddf25d1a8ef1e4b2c2dc0bd64128)
+++ tests/concurrency/waitfor/gendestructor.cfa	(revision 2b3ebe5f5e7cddf25d1a8ef1e4b2c2dc0bd64128)
@@ -0,0 +1,8 @@
+#include "gendestructor.hfa"
+
+#include <fstream.hfa>
+
+void main(MyThread &t) {
+	waitfor(^?{} : t);
+	sout | "Destructor called";
+}
Index: tests/concurrency/waitfor/gendestructor.hfa
===================================================================
--- tests/concurrency/waitfor/gendestructor.hfa	(revision 2b3ebe5f5e7cddf25d1a8ef1e4b2c2dc0bd64128)
+++ tests/concurrency/waitfor/gendestructor.hfa	(revision 2b3ebe5f5e7cddf25d1a8ef1e4b2c2dc0bd64128)
@@ -0,0 +1,5 @@
+#include <thread.hfa>
+
+thread MyThread {};
+
+void main(MyThread &t);
Index: tests/concurrency/waitfor/inlinemutex.cfa
===================================================================
--- tests/concurrency/waitfor/inlinemutex.cfa	(revision 2b3ebe5f5e7cddf25d1a8ef1e4b2c2dc0bd64128)
+++ tests/concurrency/waitfor/inlinemutex.cfa	(revision 2b3ebe5f5e7cddf25d1a8ef1e4b2c2dc0bd64128)
@@ -0,0 +1,11 @@
+#include "inlinemutex.hfa"
+
+void main( Cleaner & this ) {
+	waitfor( cleanup : this ) {
+		sout | "Cleaning";
+	}
+
+	waitfor( ^?{} : this ) {
+		sout | "Done";
+	}
+}
Index: tests/concurrency/waitfor/inlinemutex.hfa
===================================================================
--- tests/concurrency/waitfor/inlinemutex.hfa	(revision 2b3ebe5f5e7cddf25d1a8ef1e4b2c2dc0bd64128)
+++ tests/concurrency/waitfor/inlinemutex.hfa	(revision 2b3ebe5f5e7cddf25d1a8ef1e4b2c2dc0bd64128)
@@ -0,0 +1,10 @@
+#include <fstream.hfa>
+#include <thread.hfa>
+
+thread Cleaner {};
+
+static inline void ^?{} ( Cleaner &mutex this ) {}
+
+static inline void cleanup( Cleaner &mutex this ) {}
+
+void main( Cleaner & this );
Index: tests/concurrency/waitfor/nodestructor.cfa
===================================================================
--- tests/concurrency/waitfor/nodestructor.cfa	(revision f1cb1937a0ab02686fc201e2066ee4fc8a157ce6)
+++ 	(revision )
@@ -1,8 +1,0 @@
-#include "nodestructor.hfa"
-
-#include <fstream.hfa>
-
-void main(MyThread &t) {
-	waitfor(^?{} : t);
-	sout | "Destructor called";
-}
Index: tests/concurrency/waitfor/nodestructor.hfa
===================================================================
--- tests/concurrency/waitfor/nodestructor.hfa	(revision f1cb1937a0ab02686fc201e2066ee4fc8a157ce6)
+++ 	(revision )
@@ -1,5 +1,0 @@
-#include <thread.hfa>
-
-thread MyThread {};
-
-void main(MyThread &t);
Index: tests/concurrency/waitfor/static_inline.cfa
===================================================================
--- tests/concurrency/waitfor/static_inline.cfa	(revision f1cb1937a0ab02686fc201e2066ee4fc8a157ce6)
+++ tests/concurrency/waitfor/static_inline.cfa	(revision 2b3ebe5f5e7cddf25d1a8ef1e4b2c2dc0bd64128)
@@ -1,20 +1,3 @@
-#include <fstream.hfa>
-#include <thread.hfa>
-
-thread Cleaner {};
-
-static inline void ^?{} ( Cleaner &mutex this ) {}
-
-static inline void cleanup( Cleaner &mutex this ) {}
-
-void main( Cleaner & this ) {
-	waitfor( cleanup : this ) {
-		sout | "Cleaning";
-	}
-
-	waitfor( ^?{} : this ) {
-		sout | "Done";
-	}
-}
+#include "inlinemutex.hfa"
 
 int main() {