@@ -125,11 +125,11 @@
 # endif
 
 			page = preallocatedPages[numPreallocatedPages];
 
 			if (numPreallocatedPages == 0) {
-				free(preallocatedPages);
+				OFFreeMemory(preallocatedPages);
 				preallocatedPages = NULL;
 # if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
 				OF_ENSURE(OFTLSKeySet(preallocatedPagesKey,
 				    preallocatedPages) == 0);
 # endif
@@ -137,22 +137,22 @@
 
 			return page;
 		}
 	}
 
-	page = of_alloc(1, sizeof(*page));
+	page = OFAllocMemory(1, sizeof(*page));
 	@try {
-		page->map = of_alloc_zeroed(1, mapSize);
+		page->map = OFAllocZeroedMemory(1, mapSize);
 	} @catch (id e) {
-		free(page);
+		OFFreeMemory(page);
 		@throw e;
 	}
 	@try {
 		page->page = mapPages(1);
 	} @catch (id e) {
-		free(page->map);
-		free(page);
+		OFFreeMemory(page->map);
+		OFFreeMemory(page);
 		@throw e;
 	}
 	of_explicit_memset(page->page, 0, pageSize);
 
 # if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
@@ -191,11 +191,11 @@
 	for (size_t i = 0; i < mapSize; i++)
 		if (map[i] != 0)
 			return;
 
 	unmapPages(page->page, 1);
-	free(page->map);
+	OFFreeMemory(page->map);
 
 	if (page->previous != NULL)
 		page->previous->next = page->next;
 	if (page->next != NULL)
 		page->next->previous = page->previous;
@@ -210,11 +210,11 @@
 		OF_ENSURE(OFTLSKeySet(firstPageKey, page->next) == 0);
 	if (OFTLSKeyGet(lastPageKey) == page)
 		OF_ENSURE(OFTLSKeySet(lastPageKey, page->previous) == 0);
 # endif
 
-	free(page);
+	OFFreeMemory(page);
 }
 
 static void *
 allocateMemory(struct page *page, size_t bytes)
 {
@@ -292,11 +292,11 @@
 	size_t i;
 
 	if (preallocatedPages != NULL)
 		@throw [OFInvalidArgumentException exception];
 
-	preallocatedPages = of_alloc_zeroed(numPages, sizeof(struct page));
+	preallocatedPages = OFAllocZeroedMemory(numPages, sizeof(struct page));
 # if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
 	OF_ENSURE(OFTLSKeySet(preallocatedPagesKey, preallocatedPages) == 0);
 # endif
 
 	@try {
@@ -304,11 +304,11 @@
 			preallocatedPages[i] = addPage(false);
 	} @catch (id e) {
 		for (size_t j = 0; j < i; j++)
 			removePageIfEmpty(preallocatedPages[j]);
 
-		free(preallocatedPages);
+		OFFreeMemory(preallocatedPages);
 		preallocatedPages = NULL;
 
 		@throw e;
 	}
 
@@ -413,11 +413,11 @@
 
 		if (count > SIZE_MAX / itemSize)
 			@throw [OFOutOfRangeException exception];
 
 		if (allowsSwappableMemory) {
-			_items = of_alloc(count, itemSize);
+			_items = OFAllocMemory(count, itemSize);
 			_freeWhenDone = true;
 			memset(_items, 0, count * itemSize);
 #if defined(HAVE_MMAP) && defined(HAVE_MLOCK) && defined(MAP_ANON)
 		} else if (count * itemSize >= pageSize)
 			_items = mapPages(OF_ROUND_UP_POW2(pageSize,