@@ -198,11 +198,11 @@
 		return copy;
 	}
 
 	if ([(id)block isMemberOfClass: (Class)&_NSConcreteMallocBlock]) {
 #ifdef OF_HAVE_ATOMIC_OPS
-		of_atomic_int_inc(&block->flags);
+		OFAtomicIntIncrease(&block->flags);
 #else
 		unsigned hash = SPINLOCK_HASH(block);
 
 		OF_ENSURE(OFSpinlockLock(&blockSpinlocks[hash]) == 0);
 		block->flags++;
@@ -220,11 +220,12 @@
 
 	if (object_getClass((id)block) != (Class)&_NSConcreteMallocBlock)
 		return;
 
 #ifdef OF_HAVE_ATOMIC_OPS
-	if ((of_atomic_int_dec(&block->flags) & OF_BLOCK_REFCOUNT_MASK) == 0) {
+	if ((OFAtomicIntDecrease(&block->flags) &
+	    OF_BLOCK_REFCOUNT_MASK) == 0) {
 		if (block->flags & OF_BLOCK_HAS_COPY_DISPOSE)
 			block->descriptor->dispose_helper(block);
 
 		free(block);
 	}
@@ -284,12 +285,12 @@
 
 			if (src->flags & OF_BLOCK_HAS_COPY_DISPOSE)
 				src->byref_keep(*dst, src);
 
 #ifdef OF_HAVE_ATOMIC_OPS
-			if (!of_atomic_ptr_cmpswap((void **)&src->forwarding,
-			    src, *dst)) {
+			if (!OFAtomicPointerCompareAndSwap(
+			    (void **)&src->forwarding, src, *dst)) {
 				src->byref_dispose(*dst);
 				free(*dst);
 
 				*dst = src->forwarding;
 			}
@@ -310,11 +311,11 @@
 #endif
 		} else
 			*dst = src;
 
 #ifdef OF_HAVE_ATOMIC_OPS
-		of_atomic_int_inc(&(*dst)->flags);
+		OFAtomicIntIncrease(&(*dst)->flags);
 #else
 		unsigned hash = SPINLOCK_HASH(*dst);
 
 		OF_ENSURE(OFSpinlockLock(&byrefSpinlocks[hash]) == 0);
 		(*dst)->flags++;
@@ -345,11 +346,11 @@
 		struct byref *object = (struct byref *)object_;
 
 		object = object->forwarding;
 
 #ifdef OF_HAVE_ATOMIC_OPS
-		if ((of_atomic_int_dec(&object->flags) &
+		if ((OFAtomicIntDecrease(&object->flags) &
 		    OF_BLOCK_REFCOUNT_MASK) == 0) {
 			if (object->flags & OF_BLOCK_HAS_COPY_DISPOSE)
 				object->byref_dispose(object);
 
 			free(object);