@@ -131,11 +131,11 @@
 
 	@try {
 		if (itemSize == 0)
 			@throw [OFInvalidArgumentException exception];
 
-		_items = of_malloc(count, itemSize);
+		_items = of_alloc(count, itemSize);
 		_count = count;
 		_itemSize = itemSize;
 		_freeWhenDone = true;
 
 		memcpy(_items, items, count * itemSize);
@@ -195,11 +195,11 @@
 # if ULLONG_MAX > SIZE_MAX
 		if (size > SIZE_MAX)
 			@throw [OFOutOfRangeException exception];
 # endif
 
-		buffer = of_malloc((size_t)size, 1);
+		buffer = of_alloc((size_t)size, 1);
 		file = [[OFFile alloc] initWithPath: path
 					       mode: @"r"];
 		@try {
 			[file readIntoBuffer: buffer
 				 exactLength: (size_t)size];
@@ -247,11 +247,11 @@
 		_count = 0;
 		_itemSize = 1;
 		_freeWhenDone = true;
 
 		pageSize = [OFSystemInfo pageSize];
-		buffer = of_malloc(1, pageSize);
+		buffer = of_alloc(1, pageSize);
 
 		@try {
 			while (!stream.atEndOfStream) {
 				size_t length = [stream
 				    readIntoBuffer: buffer
@@ -290,11 +290,11 @@
 		if (count % 2 != 0)
 			@throw [OFInvalidFormatException exception];
 
 		count /= 2;
 
-		_items = of_malloc(count, 1);
+		_items = of_alloc(count, 1);
 		_count = count;
 		_itemSize = 1;
 		_freeWhenDone = true;
 
 		cString = [string