@@ -25,10 +25,11 @@
 #import "OFFile.h"
 #import "OFURL.h"
 #import "OFHTTPClient.h"
 #import "OFHTTPRequest.h"
 #import "OFXMLElement.h"
+#import "OFSystemInfo.h"
 
 #import "OFHTTPRequestFailedException.h"
 #import "OFInvalidArgumentException.h"
 #import "OFInvalidFormatException.h"
 #import "OFOutOfMemoryException.h"
@@ -110,17 +111,18 @@
 						       mode: @"rb"];
 
 		itemSize = 1;
 
 		@try {
-			char *buffer = [self allocMemoryWithSize: of_pagesize];
+			size_t pageSize = [OFSystemInfo pageSize];
+			char *buffer = [self allocMemoryWithSize: pageSize];
 
 			while (![file isAtEndOfStream]) {
 				size_t length;
 
 				length = [file readIntoBuffer: buffer
-						       length: of_pagesize];
+						       length: pageSize];
 				[self addItems: buffer
 					 count: length];
 			}
 
 			[self freeMemory: buffer];
@@ -581,11 +583,11 @@
 	size_t newSize, lastPageByte;
 
 	if (SIZE_MAX - count < 1 || count + 1 > SIZE_MAX / itemSize)
 		@throw [OFOutOfRangeException exceptionWithClass: [self class]];
 
-	lastPageByte = of_pagesize - 1;
+	lastPageByte = [OFSystemInfo pageSize] - 1;
 	newSize = ((count + 1) * itemSize + lastPageByte) & ~lastPageByte;
 
 	if (size != newSize)
 		items = [self resizeMemory: items
 				      size: newSize];
@@ -602,11 +604,11 @@
 	size_t newSize, lastPageByte;
 
 	if (count_ > SIZE_MAX - count || count + count_ > SIZE_MAX / itemSize)
 		@throw [OFOutOfRangeException exceptionWithClass: [self class]];
 
-	lastPageByte = of_pagesize - 1;
+	lastPageByte = [OFSystemInfo pageSize] - 1;
 	newSize = ((count + count_) * itemSize + lastPageByte) & ~lastPageByte;
 
 	if (size != newSize)
 		items = [self resizeMemory: items
 				      size: newSize];
@@ -625,11 +627,11 @@
 
 	if (count_ > SIZE_MAX - count || index > count ||
 	    count + count_ > SIZE_MAX / itemSize)
 		@throw [OFOutOfRangeException exceptionWithClass: [self class]];
 
-	lastPageByte = of_pagesize - 1;
+	lastPageByte = [OFSystemInfo pageSize] - 1;
 	newSize = ((count + count_) * itemSize + lastPageByte) & ~lastPageByte;
 
 	if (size != newSize)
 		items = [self resizeMemory: items
 				      size: newSize];
@@ -653,11 +655,11 @@
 	memmove(items + range.location * itemSize,
 	    items + (range.location + range.length) * itemSize,
 	    (count - range.location - range.length) * itemSize);
 
 	count -= range.length;
-	lastPageByte = of_pagesize - 1;
+	lastPageByte = [OFSystemInfo pageSize] - 1;
 	newSize = (count * itemSize + lastPageByte) & ~lastPageByte;
 
 	if (size != newSize)
 		items = [self resizeMemory: items
 				      size: newSize];
@@ -670,11 +672,11 @@
 
 	if (count == 0)
 		return;
 
 	count--;
-	lastPageByte = of_pagesize - 1;
+	lastPageByte = [OFSystemInfo pageSize] - 1;
 	newSize = (count * itemSize + lastPageByte) & ~lastPageByte;
 
 	if (size != newSize) {
 		@try {
 			items = [self resizeMemory: items