@@ -97,25 +97,25 @@
 	if (strcmp([object objCType], objCType) != 0)
 		return false;
 
 	size = of_sizeof_type_encoding(objCType);
 
-	value = of_alloc(1, size);
+	value = OFAllocMemory(1, size);
 	@try {
-		otherValue = of_alloc(1, size);
+		otherValue = OFAllocMemory(1, size);
 	} @catch (id e) {
-		free(value);
+		OFFreeMemory(value);
 		@throw e;
 	}
 
 	@try {
 		[self getValue: value size: size];
 		[object getValue: otherValue size: size];
 		ret = (memcmp(value, otherValue, size) == 0);
 	} @finally {
-		free(value);
-		free(otherValue);
+		OFFreeMemory(value);
+		OFFreeMemory(otherValue);
 	}
 
 	return ret;
 }
 
@@ -123,11 +123,11 @@
 {
 	size_t size = of_sizeof_type_encoding(self.objCType);
 	unsigned char *value;
 	uint32_t hash;
 
-	value = of_alloc(1, size);
+	value = OFAllocMemory(1, size);
 	@try {
 		[self getValue: value size: size];
 
 		OF_HASH_INIT(hash);
 
@@ -134,11 +134,11 @@
 		for (size_t i = 0; i < size; i++)
 			OF_HASH_ADD(hash, value[i]);
 
 		OF_HASH_FINALIZE(hash);
 	} @finally {
-		free(value);
+		OFFreeMemory(value);
 	}
 
 	return hash;
 }
 
@@ -204,11 +204,11 @@
 	OFMutableString *ret =
 	    [OFMutableString stringWithString: @"<OFValue: "];
 	size_t size = of_sizeof_type_encoding(self.objCType);
 	unsigned char *value;
 
-	value = of_alloc(1, size);
+	value = OFAllocMemory(1, size);
 	@try {
 		[self getValue: value size: size];
 
 		for (size_t i = 0; i < size; i++) {
 			if (i > 0)
@@ -215,14 +215,14 @@
 				[ret appendString: @" "];
 
 			[ret appendFormat: @"%02x", value[i]];
 		}
 	} @finally {
-		free(value);
+		OFFreeMemory(value);
 	}
 
 	[ret appendString: @">"];
 
 	[ret makeImmutable];
 	return ret;
 }
 @end