@@ -12,16 +12,27 @@
  * Public License, either version 2 or 3, which can be found in the file
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
-#import "OFMutex.h"
+#import "OFObject.h"
+#import "OFLocking.h"
+
+#import "threading.h"
 
 /**
  * \brief A class for creating mutual exclusions which can be entered
  *	  recursively.
  */
-@interface OFRecursiveMutex: OFMutex
+@interface OFRecursiveMutex: OFObject <OFLocking>
 {
 	of_rmutex_t rmutex;
+	BOOL initialized;
 }
+
+/**
+ * \brief Creates a new recursive mutex.
+ *
+ * \return A new autoreleased recursive mutex.
+ */
++ (instancetype)mutex;
 @end