@@ -18,11 +18,11 @@
 
 #include <assert.h>
 
 #import "OFRunLoop.h"
 #import "OFDictionary.h"
-#ifdef OF_THREADS
+#ifdef OF_HAVE_THREADS
 # import "OFThread.h"
 # import "OFMutex.h"
 #endif
 #import "OFSortedList.h"
 #import "OFTimer.h"
@@ -136,11 +136,11 @@
 	return [[mainRunLoop retain] autorelease];
 }
 
 + (OFRunLoop*)currentRunLoop
 {
-#ifdef OF_THREADS
+#ifdef OF_HAVE_THREADS
 	return [[OFThread currentThread] runLoop];
 #else
 	return [self mainRunLoop];
 #endif
 }
@@ -287,11 +287,11 @@
 {
 	self = [super init];
 
 	@try {
 		timersQueue = [[OFSortedList alloc] init];
-#ifdef OF_THREADS
+#ifdef OF_HAVE_THREADS
 		timersQueueLock = [[OFMutex alloc] init];
 #endif
 
 		streamObserver = [[OFStreamObserver alloc] init];
 		[streamObserver setDelegate: self];
@@ -306,11 +306,11 @@
 }
 
 - (void)dealloc
 {
 	[timersQueue release];
-#ifdef OF_THREADS
+#ifdef OF_HAVE_THREADS
 	[timersQueueLock release];
 #endif
 	[streamObserver release];
 	[readQueues release];
 
@@ -317,16 +317,16 @@
 	[super dealloc];
 }
 
 - (void)addTimer: (OFTimer*)timer
 {
-#ifdef OF_THREADS
+#ifdef OF_HAVE_THREADS
 	[timersQueueLock lock];
 	@try {
 #endif
 		[timersQueue insertObject: timer];
-#ifdef OF_THREADS
+#ifdef OF_HAVE_THREADS
 	} @finally {
 		[timersQueueLock unlock];
 	}
 #endif
 
@@ -335,11 +335,11 @@
 	[streamObserver cancel];
 }
 
 - (void)OF_removeTimer: (OFTimer*)timer
 {
-#ifdef OF_THREADS
+#ifdef OF_HAVE_THREADS
 	[timersQueueLock lock];
 	@try {
 #endif
 		of_list_object_t *iter;
 
@@ -348,11 +348,11 @@
 			if ([iter->object isEqual: timer]) {
 				[timersQueue removeListObject: iter];
 				break;
 			}
 		}
-#ifdef OF_THREADS
+#ifdef OF_HAVE_THREADS
 	} @finally {
 		[timersQueueLock unlock];
 	}
 #endif
 }
@@ -589,11 +589,11 @@
 		void *pool = objc_autoreleasePoolPush();
 		OFDate *now = [OFDate date];
 		OFTimer *timer;
 		OFDate *nextTimer;
 
-#ifdef OF_THREADS
+#ifdef OF_HAVE_THREADS
 		[timersQueueLock lock];
 		@try {
 #endif
 			of_list_object_t *listObject =
 			    [timersQueue firstListObject];
@@ -607,25 +607,25 @@
 				[timersQueue removeListObject: listObject];
 
 				[timer OF_setInRunLoop: nil];
 			} else
 				timer = nil;
-#ifdef OF_THREADS
+#ifdef OF_HAVE_THREADS
 		} @finally {
 			[timersQueueLock unlock];
 		}
 #endif
 
 		if ([timer isValid])
 			[timer fire];
 
-#ifdef OF_THREADS
+#ifdef OF_HAVE_THREADS
 		[timersQueueLock lock];
 		@try {
 #endif
 			nextTimer = [[timersQueue firstObject] fireDate];
-#ifdef OF_THREADS
+#ifdef OF_HAVE_THREADS
 		} @finally {
 			[timersQueueLock unlock];
 		}
 #endif