@@ -81,21 +81,21 @@
 	OFListItem *next;
 
 	for (OFListItem *iter = _firstListItem; iter != NULL; iter = next) {
 		[iter->object release];
 		next = iter->next;
-		free(iter);
+		OFFreeMemory(iter);
 	}
 
 	[super dealloc];
 }
 
 - (OFListItem *)appendObject: (id)object
 {
 	OFListItem *listItem;
 
-	listItem = of_alloc(1, sizeof(OFListItem));
+	listItem = OFAllocMemory(1, sizeof(OFListItem));
 	listItem->object = [object retain];
 	listItem->next = NULL;
 	listItem->previous = _lastListItem;
 
 	if (_lastListItem != NULL)
@@ -112,11 +112,11 @@
 	return listItem;
 }
 
 - (OFListItem *)prependObject: (id)object
 {
-	OFListItem *listItem = of_alloc(1, sizeof(OFListItem));
+	OFListItem *listItem = OFAllocMemory(1, sizeof(OFListItem));
 
 	listItem->object = [object retain];
 	listItem->next = _firstListItem;
 	listItem->previous = NULL;
 
@@ -134,11 +134,11 @@
 }
 
 - (OFListItem *)insertObject: (id)object
 	      beforeListItem: (OFListItem *)listItem
 {
-	OFListItem *newListItem = of_alloc(1, sizeof(OFListItem));
+	OFListItem *newListItem = OFAllocMemory(1, sizeof(OFListItem));
 
 	newListItem->object = [object retain];
 	newListItem->next = listItem;
 	newListItem->previous = listItem->previous;
 
@@ -157,11 +157,11 @@
 }
 
 - (OFListItem *)insertObject: (id)object
 	       afterListItem: (OFListItem *)listItem
 {
-	OFListItem *newListItem = of_alloc(1, sizeof(OFListItem));
+	OFListItem *newListItem = OFAllocMemory(1, sizeof(OFListItem));
 
 	newListItem->object = [object retain];
 	newListItem->next = listItem->next;
 	newListItem->previous = listItem;
 
@@ -193,11 +193,11 @@
 
 	_count--;
 	_mutations++;
 
 	[listItem->object release];
-	free(listItem);
+	OFFreeMemory(listItem);
 }
 
 - (id)firstObject
 {
 	return (_firstListItem != NULL ? _firstListItem->object : nil);
@@ -272,11 +272,11 @@
 	_mutations++;
 
 	for (OFListItem *iter = _firstListItem; iter != NULL; iter = next) {
 		[iter->object release];
 		next = iter->next;
-		free(iter);
+		OFFreeMemory(iter);
 	}
 
 	_firstListItem = _lastListItem = NULL;
 }
 
@@ -289,11 +289,11 @@
 	previous = NULL;
 
 	@try {
 		for (OFListItem *iter = _firstListItem;
 		    iter != NULL; iter = iter->next) {
-			listItem = of_alloc(1, sizeof(OFListItem));
+			listItem = OFAllocMemory(1, sizeof(OFListItem));
 			listItem->object = [iter->object retain];
 			listItem->next = NULL;
 			listItem->previous = previous;
 
 			if (copy->_firstListItem == NULL)