@@ -92,11 +92,11 @@
 
 static struct {
 	Class isa;
 } allocFailedException;
 
-uint32_t OFHashSeed;
+unsigned long OFHashSeed;
 
 void *
 OFAllocMemory(size_t count, size_t size)
 {
 	void *pointer;
@@ -177,11 +177,11 @@
 #if defined(HAVE_ARC4RANDOM)
 	return arc4random();
 #elif defined(HAVE_GETRANDOM)
 	uint16_t buffer;
 
-	OF_ENSURE(getrandom(&buffer, sizeof(buffer), 0) == sizeof(buffer));
+	OFEnsure(getrandom(&buffer, sizeof(buffer), 0) == sizeof(buffer));
 
 	return buffer;
 #else
 	static OFOnceControl onceControl = OFOnceControlInitValue;
 	OFOnce(&onceControl, initRandom);
@@ -199,11 +199,11 @@
 #if defined(HAVE_ARC4RANDOM)
 	return arc4random();
 #elif defined(HAVE_GETRANDOM)
 	uint32_t buffer;
 
-	OF_ENSURE(getrandom(&buffer, sizeof(buffer), 0) == sizeof(buffer));
+	OFEnsure(getrandom(&buffer, sizeof(buffer), 0) == sizeof(buffer));
 
 	return buffer;
 #else
 	return ((uint32_t)OFRandom16() << 16) | OFRandom16();
 #endif
@@ -219,11 +219,11 @@
 
 	return buffer;
 #elif defined(HAVE_GETRANDOM)
 	uint64_t buffer;
 
-	OF_ENSURE(getrandom(&buffer, sizeof(buffer), 0) == sizeof(buffer));
+	OFEnsure(getrandom(&buffer, sizeof(buffer), 0) == sizeof(buffer));
 
 	return buffer;
 #else
 	return ((uint64_t)OFRandom32() << 32) | OFRandom32();
 #endif
@@ -1068,20 +1068,20 @@
 }
 
 - (unsigned long)hash
 {
 	uintptr_t ptr = (uintptr_t)self;
-	uint32_t hash;
+	unsigned long hash;
 
-	OF_HASH_INIT(hash);
+	OFHashInit(&hash);
 
 	for (size_t i = 0; i < sizeof(ptr); i++) {
-		OF_HASH_ADD(hash, ptr & 0xFF);
+		OFHashAdd(&hash, ptr & 0xFF);
 		ptr >>= 8;
 	}
 
-	OF_HASH_FINALIZE(hash);
+	OFHashFinalize(&hash);
 
 	return hash;
 }
 
 - (OFString *)description
@@ -1118,13 +1118,13 @@
 	PRE_IVARS->retainCount++;
 # ifndef OF_AMIGAOS_M68K
 	Permit();
 # endif
 #else
-	OF_ENSURE(OFSpinlockLock(&PRE_IVARS->retainCountSpinlock) == 0);
+	OFEnsure(OFSpinlockLock(&PRE_IVARS->retainCountSpinlock) == 0);
 	PRE_IVARS->retainCount++;
-	OF_ENSURE(OFSpinlockUnlock(&PRE_IVARS->retainCountSpinlock) == 0);
+	OFEnsure(OFSpinlockUnlock(&PRE_IVARS->retainCountSpinlock) == 0);
 #endif
 
 	return self;
 }
 
@@ -1154,13 +1154,13 @@
 	if (retainCount == 0)
 		[self dealloc];
 #else
 	int retainCount;
 
-	OF_ENSURE(OFSpinlockLock(&PRE_IVARS->retainCountSpinlock) == 0);
+	OFEnsure(OFSpinlockLock(&PRE_IVARS->retainCountSpinlock) == 0);
 	retainCount = --PRE_IVARS->retainCount;
-	OF_ENSURE(OFSpinlockUnlock(&PRE_IVARS->retainCountSpinlock) == 0);
+	OFEnsure(OFSpinlockUnlock(&PRE_IVARS->retainCountSpinlock) == 0);
 
 	if (retainCount == 0)
 		[self dealloc];
 #endif
 }