@@ -31,14 +31,14 @@
 
 #import "OFAllocFailedException.h"
 #import "OFInitializationFailedException.h"
 
 #import "macros.h"
-#ifdef OF_ATOMIC_OPS
+#ifdef OF_HAVE_ATOMIC_OPS
 # import "atomic.h"
 #endif
-#ifdef OF_THREADS
+#ifdef OF_HAVE_THREADS
 # import "threading.h"
 #endif
 
 typedef struct of_block_byref_t of_block_byref_t;
 struct of_block_byref_t {
@@ -156,11 +156,11 @@
 
 static struct {
 	Class isa;
 } alloc_failed_exception;
 
-#if !defined(OF_ATOMIC_OPS) && defined(OF_THREADS)
+#ifndef OF_HAVE_ATOMIC_OPS
 # define NUM_SPINLOCKS 8	/* needs to be a power of 2 */
 # define SPINLOCK_HASH(p) ((uintptr_t)p >> 4) & (NUM_SPINLOCKS - 1)
 static of_spinlock_t spinlocks[NUM_SPINLOCKS];
 #endif
 
@@ -187,11 +187,11 @@
 
 		return copy;
 	}
 
 	if (object_getClass((id)block) == (Class)&_NSConcreteMallocBlock) {
-#if defined(OF_ATOMIC_OPS)
+#ifdef OF_HAVE_ATOMIC_OPS
 		of_atomic_inc_int(&block->flags);
 #else
 		unsigned hash = SPINLOCK_HASH(block);
 
 		OF_ENSURE(of_spinlock_lock(&spinlocks[hash]));
@@ -209,11 +209,11 @@
 	of_block_literal_t *block = (of_block_literal_t*)block_;
 
 	if (object_getClass((id)block) != (Class)&_NSConcreteMallocBlock)
 		return;
 
-#ifdef OF_ATOMIC_OPS
+#ifdef OF_HAVE_ATOMIC_OPS
 	if ((of_atomic_dec_int(&block->flags) & OF_BLOCK_REFCOUNT_MASK) == 0) {
 		if (block->flags & OF_BLOCK_HAS_COPY_DISPOSE)
 			block->descriptor->dispose_helper(block);
 
 		free(block);
@@ -373,11 +373,11 @@
 	objc_registerClassPair((Class)&_NSConcreteMallocBlock);
 # endif
 }
 #endif
 
-#if !defined(OF_ATOMIC_OPS)
+#ifndef OF_HAVE_ATOMIC_OPS
 + (void)initialize
 {
 	size_t i;
 
 	for (i = 0; i < NUM_SPINLOCKS; i++)