@@ -16,20 +16,19 @@
 #include "config.h"
 
 #import "OFLHAArchive.h"
 #import "OFLHAArchiveEntry.h"
 #import "OFLHAArchiveEntry+Private.h"
+#import "OFCRC16.h"
 #ifdef OF_HAVE_FILES
 # import "OFFile.h"
 #endif
 #import "OFLHADecompressingStream.h"
 #import "OFStream.h"
 #import "OFSeekableStream.h"
 #import "OFString.h"
 
-#import "crc16.h"
-
 #import "OFChecksumMismatchException.h"
 #import "OFInvalidArgumentException.h"
 #import "OFNotImplementedException.h"
 #import "OFNotOpenException.h"
 #import "OFOutOfRangeException.h"
@@ -332,11 +331,11 @@
 		length = _toRead;
 
 	ret = [_decompressedStream readIntoBuffer: buffer length: length];
 
 	_toRead -= ret;
-	_CRC16 = of_crc16(_CRC16, buffer, ret);
+	_CRC16 = OFCRC16(_CRC16, buffer, ret);
 
 	if (_toRead == 0) {
 		_atEndOfStream = true;
 
 		if (_CRC16 != _entry.CRC16) {
@@ -480,17 +479,17 @@
 	@try {
 		bytesWritten = (uint32_t)[_stream writeBuffer: buffer
 						       length: length];
 	} @catch (OFWriteFailedException *e) {
 		_bytesWritten += e.bytesWritten;
-		_CRC16 = of_crc16(_CRC16, buffer, e.bytesWritten);
+		_CRC16 = OFCRC16(_CRC16, buffer, e.bytesWritten);
 
 		@throw e;
 	}
 
 	_bytesWritten += (uint32_t)bytesWritten;
-	_CRC16 = of_crc16(_CRC16, buffer, bytesWritten);
+	_CRC16 = OFCRC16(_CRC16, buffer, bytesWritten);
 
 	return bytesWritten;
 }
 
 - (bool)lowlevelIsAtEndOfStream