@@ -17,11 +17,11 @@
 #import "OFObject.h"
 
 @class OFTimer;
 @class OFDate;
 @class OFRunLoop;
-#ifdef OF_THREADS
+#ifdef OF_HAVE_THREADS
 @class OFCondition;
 #endif
 
 #ifdef OF_HAVE_BLOCKS
 typedef void (^of_timer_block_t)(OFTimer*);
@@ -40,11 +40,11 @@
 	BOOL repeats;
 #ifdef OF_HAVE_BLOCKS
 	of_timer_block_t block;
 #endif
 	BOOL isValid;
-#ifdef OF_THREADS
+#ifdef OF_HAVE_THREADS
 	OFCondition *condition;
 	BOOL done;
 #endif
 	OFRunLoop *inRunLoop;
 }
@@ -313,14 +313,14 @@
  * @return The time interval in which the timer will repeat, if it is a
  *	   repeating timer
  */
 - (double)timeInterval;
 
-#ifdef OF_THREADS
+#ifdef OF_HAVE_THREADS
 /*!
  * @brief Waits until the timer fired.
  */
 - (void)waitUntilDone;
 #endif
 
 - (void)OF_setInRunLoop: (OFRunLoop*)inRunLoop;
 @end