@@ -38,11 +38,11 @@
 	string = self.UTF8String;
 	length = self.UTF8StringLength;
 
 	j = 0;
 	retLength = length;
-	retCString = of_alloc(retLength, 1);
+	retCString = OFAllocMemory(retLength, 1);
 
 	for (size_t i = 0; i < length; i++) {
 		switch (string[i]) {
 		case '<':
 			append = "&lt;";
@@ -73,14 +73,14 @@
 			appendLen = 0;
 		}
 
 		if (append != NULL) {
 			@try {
-				retCString = of_realloc(retCString, 1,
+				retCString = OFResizeMemory(retCString, 1,
 				    retLength + appendLen);
 			} @catch (id e) {
-				free(retCString);
+				OFFreeMemory(retCString);
 				@throw e;
 			}
 			retLength += appendLen - 1;
 
 			memcpy(retCString + j, append, appendLen);
@@ -94,10 +94,10 @@
 
 	@try {
 		ret = [OFString stringWithUTF8String: retCString
 					      length: retLength];
 	} @finally {
-		free(retCString);
+		OFFreeMemory(retCString);
 	}
 	return ret;
 }
 @end