@@ -18,10 +18,11 @@
 #include <errno.h>
 
 #import "OFZIPArchive.h"
 #import "OFZIPArchiveEntry.h"
 #import "OFZIPArchiveEntry+Private.h"
+#import "OFCRC32.h"
 #import "OFData.h"
 #import "OFArray.h"
 #import "OFDictionary.h"
 #import "OFStream.h"
 #import "OFSeekableStream.h"
@@ -29,12 +30,10 @@
 # import "OFFile.h"
 #endif
 #import "OFInflateStream.h"
 #import "OFInflate64Stream.h"
 
-#import "crc32.h"
-
 #import "OFChecksumMismatchException.h"
 #import "OFInvalidArgumentException.h"
 #import "OFInvalidFormatException.h"
 #import "OFNotImplementedException.h"
 #import "OFNotOpenException.h"
@@ -799,11 +798,11 @@
 		length = (size_t)_toRead;
 
 	ret = [_decompressedStream readIntoBuffer: buffer length: length];
 
 	_toRead -= ret;
-	_CRC32 = of_crc32(_CRC32, buffer, ret);
+	_CRC32 = OFCRC32(_CRC32, buffer, ret);
 
 	if (_toRead == 0) {
 		_atEndOfStream = true;
 
 		if (~_CRC32 != _entry.CRC32) {
@@ -884,11 +883,11 @@
 		@throw [OFOutOfRangeException exception];
 
 	bytesWritten = [_stream writeBuffer: buffer length: length];
 
 	_bytesWritten += (int64_t)bytesWritten;
-	_CRC32 = of_crc32(_CRC32, buffer, length);
+	_CRC32 = OFCRC32(_CRC32, buffer, length);
 
 	return bytesWritten;
 }
 
 - (void)close