@@ -150,11 +150,11 @@
 				_capacity *= 2;
 
 		if (_capacity < MIN_CAPACITY)
 			_capacity = MIN_CAPACITY;
 
-		_buckets = of_alloc_zeroed(_capacity, sizeof(*_buckets));
+		_buckets = OFAllocZeroedMemory(_capacity, sizeof(*_buckets));
 
 		if (of_hash_seed != 0)
 			_rotate = of_random16() & 31;
 	} @catch (id e) {
 		[self release];
@@ -169,15 +169,15 @@
 	for (unsigned long i = 0; i < _capacity; i++) {
 		if (_buckets[i] != NULL && _buckets[i] != &deleted) {
 			_keyFunctions.release(_buckets[i]->key);
 			_objectFunctions.release(_buckets[i]->object);
 
-			free(_buckets[i]);
+			OFFreeMemory(_buckets[i]);
 		}
 	}
 
-	free(_buckets);
+	OFFreeMemory(_buckets);
 
 	[super dealloc];
 }
 
 static void
@@ -208,11 +208,11 @@
 	 */
 	if ((capacity < self->_capacity && count > self->_count) ||
 	    capacity < MIN_CAPACITY)
 		return;
 
-	buckets = of_alloc_zeroed(capacity, sizeof(*buckets));
+	buckets = OFAllocZeroedMemory(capacity, sizeof(*buckets));
 
 	for (unsigned long i = 0; i < self->_capacity; i++) {
 		if (self->_buckets[i] != NULL &&
 		    self->_buckets[i] != &deleted) {
 			unsigned long j, last;
@@ -235,11 +235,11 @@
 
 			buckets[j] = self->_buckets[i];
 		}
 	}
 
-	free(self->_buckets);
+	OFFreeMemory(self->_buckets);
 	self->_buckets = buckets;
 	self->_capacity = capacity;
 }
 
 static void
@@ -302,24 +302,24 @@
 		}
 
 		if (i >= last)
 			@throw [OFOutOfRangeException exception];
 
-		bucket = of_alloc(1, sizeof(*bucket));
+		bucket = OFAllocMemory(1, sizeof(*bucket));
 
 		@try {
 			bucket->key = self->_keyFunctions.retain(key);
 		} @catch (id e) {
-			free(bucket);
+			OFFreeMemory(bucket);
 			@throw e;
 		}
 
 		@try {
 			bucket->object = self->_objectFunctions.retain(object);
 		} @catch (id e) {
 			self->_keyFunctions.release(bucket->key);
-			free(bucket);
+			OFFreeMemory(bucket);
 			@throw e;
 		}
 
 		bucket->hash = hash;
 
@@ -463,11 +463,11 @@
 			_mutations++;
 
 			_keyFunctions.release(_buckets[i]->key);
 			_objectFunctions.release(_buckets[i]->object);
 
-			free(_buckets[i]);
+			OFFreeMemory(_buckets[i]);
 			_buckets[i] = &deleted;
 
 			_count--;
 			resizeForCount(self, _count);
 
@@ -487,11 +487,11 @@
 
 		if (_keyFunctions.equal(_buckets[i]->key, key)) {
 			_keyFunctions.release(_buckets[i]->key);
 			_objectFunctions.release(_buckets[i]->object);
 
-			free(_buckets[i]);
+			OFFreeMemory(_buckets[i]);
 			_buckets[i] = &deleted;
 
 			_count--;
 			_mutations++;
 			resizeForCount(self, _count);
@@ -511,18 +511,18 @@
 			}
 
 			_keyFunctions.release(_buckets[i]->key);
 			_objectFunctions.release(_buckets[i]->object);
 
-			free(_buckets[i]);
+			OFFreeMemory(_buckets[i]);
 			_buckets[i] = NULL;
 		}
 	}
 
 	_count = 0;
 	_capacity = MIN_CAPACITY;
-	_buckets = of_realloc(_buckets, _capacity, sizeof(*_buckets));
+	_buckets = OFResizeMemory(_buckets, _capacity, sizeof(*_buckets));
 
 	/*
 	 * Get a new random value for _rotate, so that it is not less secure
 	 * than creating a new hash map.
 	 */