@@ -80,11 +80,11 @@
 #endif
 
 struct pre_ivar {
 	int retainCount;
 #if !defined(OF_HAVE_ATOMIC_OPS) && !defined(OF_AMIGAOS)
-	of_spinlock_t retainCountSpinlock;
+	OFSpinlock retainCountSpinlock;
 #endif
 };
 
 #define PRE_IVARS_ALIGN ((sizeof(struct pre_ivar) + \
     (OF_BIGGEST_ALIGNMENT - 1)) & ~(OF_BIGGEST_ALIGNMENT - 1))
@@ -306,11 +306,11 @@
 	}
 
 	((struct pre_ivar *)instance)->retainCount = 1;
 
 #if !defined(OF_HAVE_ATOMIC_OPS) && !defined(OF_AMIGAOS)
-	if OF_UNLIKELY (of_spinlock_new(
+	if OF_UNLIKELY (OFSpinlockNew(
 	    &((struct pre_ivar *)instance)->retainCountSpinlock) != 0) {
 		free(instance);
 		@throw [OFInitializationFailedException
 		    exceptionWithClass: class];
 	}
@@ -1112,13 +1112,13 @@
 	PRE_IVARS->retainCount++;
 # ifndef OF_AMIGAOS_M68K
 	Permit();
 # endif
 #else
-	OF_ENSURE(of_spinlock_lock(&PRE_IVARS->retainCountSpinlock) == 0);
+	OF_ENSURE(OFSpinlockLock(&PRE_IVARS->retainCountSpinlock) == 0);
 	PRE_IVARS->retainCount++;
-	OF_ENSURE(of_spinlock_unlock(&PRE_IVARS->retainCountSpinlock) == 0);
+	OF_ENSURE(OFSpinlockUnlock(&PRE_IVARS->retainCountSpinlock) == 0);
 #endif
 
 	return self;
 }
 
@@ -1148,13 +1148,13 @@
 	if (retainCount == 0)
 		[self dealloc];
 #else
 	int retainCount;
 
-	OF_ENSURE(of_spinlock_lock(&PRE_IVARS->retainCountSpinlock) == 0);
+	OF_ENSURE(OFSpinlockLock(&PRE_IVARS->retainCountSpinlock) == 0);
 	retainCount = --PRE_IVARS->retainCount;
-	OF_ENSURE(of_spinlock_unlock(&PRE_IVARS->retainCountSpinlock) == 0);
+	OF_ENSURE(OFSpinlockUnlock(&PRE_IVARS->retainCountSpinlock) == 0);
 
 	if (retainCount == 0)
 		[self dealloc];
 #endif
 }