Index: src/tests/coroutine.c
===================================================================
--- src/tests/coroutine.c	(revision 64ac636b5de5a469279d560f5378e5e32e271eec)
+++ src/tests/coroutine.c	(revision 7c700890e7a60235a8c2486a9ee74d5b67a7024f)
@@ -4,5 +4,5 @@
 struct Fibonacci {
       int fn; // used for communication
-      coroutine_desc c;
+      coroutine_desc __cor;
 };
 
@@ -12,5 +12,5 @@
 
 coroutine_desc* get_coroutine(Fibonacci* this) {
-      return &this->c;
+      return &this->__cor;
 }
 
@@ -18,5 +18,5 @@
 #ifdef MORE_DEBUG
       sout | "Starting main of coroutine " | this | endl;
-      sout | "Started from " | this->c.last | endl;
+      sout | "Started from " | this->__cor.last | endl;
 #endif
       int fn1, fn2; 		// retained between resumes
Index: src/tests/monitor.c
===================================================================
--- src/tests/monitor.c	(revision 64ac636b5de5a469279d560f5378e5e32e271eec)
+++ src/tests/monitor.c	(revision 7c700890e7a60235a8c2486a9ee74d5b67a7024f)
@@ -13,19 +13,23 @@
 }
 
+monitor_desc * get_monitor( global_t * this ) {
+	return &this->m;
+}
+
 static global_t global;
 
-void increment( /*mutex*/ global_t * this ) {
-	monitor_desc * mon = &this->m;
-	monitor_guard_t g1 = { &mon };
-	{
-		monitor_guard_t g2 = { &mon };
-		{
-			monitor_guard_t g3 = { &mon };
-			this->value += 1;
-		}
-	}
+void increment3( global_t * mutex this ) {
+	this->value += 1;
 }
 
-struct MyThread { thread_desc t; };
+void increment2( global_t * mutex this ) {
+	increment3( this );
+}
+
+void increment( global_t * mutex this ) {
+	increment2( this );
+}
+
+struct MyThread { thread_desc __thrd; };
 
 DECL_THREAD(MyThread);
Index: src/tests/multi-monitor.c
===================================================================
--- src/tests/multi-monitor.c	(revision 64ac636b5de5a469279d560f5378e5e32e271eec)
+++ src/tests/multi-monitor.c	(revision 7c700890e7a60235a8c2486a9ee74d5b67a7024f)
@@ -6,14 +6,20 @@
 static int global12, global23, global13;
 
-static monitor_desc m1, m2, m3;
+struct monitor_t {
+	monitor_desc m;
+};
 
-void increment( /*mutex*/ monitor_desc * p1, /*mutex*/ monitor_desc * p2, int * value ) {
-	monitor_desc * mons[] = { p1, p2 };
-	monitor_guard_t g = { mons, 2 };
+monitor_desc * get_monitor( monitor_t * this ) {
+	return &this->m;
+}
+
+static monitor_t m1, m2, m3;
+
+void increment( monitor_t * mutex p1, monitor_t * mutex p2, int * value ) {
 	*value += 1;
 }
 
 struct MyThread { 
-	thread_desc t; 
+	thread_desc __thrd; 
 	int target;
 };
Index: src/tests/thread.c
===================================================================
--- src/tests/thread.c	(revision 64ac636b5de5a469279d560f5378e5e32e271eec)
+++ src/tests/thread.c	(revision 7c700890e7a60235a8c2486a9ee74d5b67a7024f)
@@ -4,6 +4,6 @@
 #include <thread>
 
-struct First { thread_desc t; signal_once* lock; };
-struct Second { thread_desc t; signal_once* lock; };
+struct First { thread_desc __thrd; signal_once* lock; };
+struct Second { thread_desc __thrd; signal_once* lock; };
 
 DECL_THREAD(First);