@@ -19,10 +19,11 @@
 
 #import "threading.h"
 
 @class OFDate;
 @class OFSortedList;
+@class OFRunLoop;
 
 #ifdef OF_HAVE_BLOCKS
 typedef id (^of_thread_block_t)(id object);
 #endif
 
@@ -98,16 +99,11 @@
 	} running;
 #ifdef OF_HAVE_BLOCKS
 	of_thread_block_t block;
 #endif
 	id returnValue;
-#ifdef OF_THREAD_M
-@protected
-#else
-@private
-#endif
-	OFSortedList *timersQueue;
+	OFRunLoop *runLoop;
 }
 
 #if defined(OF_HAVE_PROPERTIES) && defined(OF_HAVE_BLOCKS)
 @property (copy) of_thread_block_t block;
 #endif
@@ -276,11 +272,18 @@
  *
  * \return The object returned by the main method of the thread.
  */
 - (id)join;
 
-- (OFSortedList*)_timersQueue;
+/**
+ * \brief Returns the run loop for the thread or nil if it has no run loop.
+ *
+ * \return The run loop for the thread or nil if it has no run loop
+ */
+- (OFRunLoop*)runLoop;
+
+- (void)_setRunLoop: (OFRunLoop*)runLoop;
 @end
 
 /**
  * \brief A class for creating mutual exclusions.
  */