--- libs/mutex/src/util.h	2008-08-19 13:39:54.000000000 +1000
+++ libs/mutex/src/util-new.h	2008-08-19 13:39:44.000000000 +1000
@@ -57,8 +57,10 @@
  */
 
 #include <l4/types.h>
+#include <l4/thread.h> 
 #include <mutex/mutex.h>
 
+
 /** @todo FIXME: Add prototypes with doxygen comments - awiggins. */
 
 #if defined(CONFIG_HYBRID_MUTEXES)

--- libs/mutex/include/mutex.h	2008-08-19 13:44:29.000000000 +1000
+++ libs/mutex/include/mutex-new.h	2008-08-19 13:44:53.000000000 +1000
@@ -59,8 +59,6 @@
 #ifndef __LIBMUTEX__MUTEX_H__
 #define __LIBMUTEX__MUTEX_H__
 
-#include <l4/thread.h>
-
 #if !defined(CONFIG_USER_MUTEXES)
 #include <l4/mutex.h>
 #endif

 --- libs/c/src/sys-iguana/sys_threadstate.c	2008-08-19 13:43:08.000000000 +1000
+++ libs/c/src/sys-iguana/sys_threadstate-new.c	2008-08-19 13:42:01.000000000 +1000
@@ -60,6 +60,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
+#include <l4/thread.h> 
 #include <threadstate.h>
 
 void __thread_state_init(void *thread_state_p);