@@ -450,11 +450,11 @@
 	else
 		defaultNS = _defaultNamespace;
 
 	i = 0;
 	length = _name.UTF8StringLength + 3 + (level * indentation);
-	cString = of_alloc(length, 1);
+	cString = OFAllocMemory(length, 1);
 
 	@try {
 		memset(cString + i, ' ', level * indentation);
 		i += level * indentation;
 
@@ -461,11 +461,11 @@
 		/* Start of tag */
 		cString[i++] = '<';
 
 		if (prefix != nil && ![_namespace isEqual: defaultNS]) {
 			length += prefix.UTF8StringLength + 1;
-			cString = of_realloc(cString, length, 1);
+			cString = OFResizeMemory(cString, length, 1);
 
 			memcpy(cString + i, prefix.UTF8String,
 			    prefix.UTF8StringLength);
 			i += prefix.UTF8StringLength;
 			cString[i++] = ':';
@@ -477,11 +477,11 @@
 		/* xmlns if necessary */
 		if (prefix == nil && ((_namespace != nil &&
 		    ![_namespace isEqual: defaultNS]) ||
 		    (_namespace == nil && defaultNS != nil))) {
 			length += _namespace.UTF8StringLength + 9;
-			cString = of_realloc(cString, length, 1);
+			cString = OFResizeMemory(cString, length, 1);
 
 			memcpy(cString + i, " xmlns='", 8);
 			i += 8;
 			memcpy(cString + i, _namespace.UTF8String,
 			    _namespace.UTF8StringLength);
@@ -510,11 +510,11 @@
 						   element: self];
 
 			length += attributeNameLength + (attributePrefix != nil
 			    ? attributePrefix.UTF8StringLength + 1 : 0) +
 			    tmp.UTF8StringLength + 4;
-			cString = of_realloc(cString, length, 1);
+			cString = OFResizeMemory(cString, length, 1);
 
 			cString[i++] = ' ';
 			if (attributePrefix != nil) {
 				memcpy(cString + i, attributePrefix.UTF8String,
 				    attributePrefix.UTF8StringLength);
@@ -580,11 +580,11 @@
 			if (indent)
 				[tmp addItem: "\n"];
 
 			length += tmp.count + _name.UTF8StringLength + 2 +
 			    (indent ? level * indentation : 0);
-			cString = of_realloc(cString, length, 1);
+			cString = OFResizeMemory(cString, length, 1);
 
 			cString[i++] = '>';
 
 			memcpy(cString + i, tmp.items, tmp.count);
 			i += tmp.count;
@@ -596,11 +596,11 @@
 
 			cString[i++] = '<';
 			cString[i++] = '/';
 			if (prefix != nil) {
 				length += prefix.UTF8StringLength + 1;
-				cString = of_realloc(cString, length, 1);
+				cString = OFResizeMemory(cString, length, 1);
 
 				memcpy(cString + i, prefix.UTF8String,
 				    prefix.UTF8StringLength);
 				i += prefix.UTF8StringLength;
 				cString[i++] = ':';
@@ -617,11 +617,11 @@
 		objc_autoreleasePoolPop(pool);
 
 		ret = [OFString stringWithUTF8String: cString
 					      length: length];
 	} @finally {
-		free(cString);
+		OFFreeMemory(cString);
 	}
 	return ret;
 }
 
 - (OFString *)XMLString