@@ -16,27 +16,32 @@
 #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"
 #import "OFTruncatedDataException.h"
 #import "OFWriteFailedException.h"
+
+enum {
+	modeRead,
+	modeWrite,
+	modeAppend
+};
 
 OF_DIRECT_MEMBERS
 @interface OFLHAArchiveFileReadStream: OFStream <OFReadyForReadingObserving>
 {
 	OFStream *_stream, *_decompressedStream;
@@ -53,20 +58,20 @@
 
 OF_DIRECT_MEMBERS
 @interface OFLHAArchiveFileWriteStream: OFStream <OFReadyForWritingObserving>
 {
 	OFMutableLHAArchiveEntry *_entry;
-	of_string_encoding_t _encoding;
+	OFStringEncoding _encoding;
 	OFSeekableStream *_stream;
-	of_offset_t _headerOffset;
+	OFFileOffset _headerOffset;
 	uint32_t _bytesWritten;
 	uint16_t _CRC16;
 }
 
 - (instancetype)of_initWithStream: (OFSeekableStream *)stream
 			    entry: (OFLHAArchiveEntry *)entry
-			 encoding: (of_string_encoding_t)encoding;
+			 encoding: (OFStringEncoding)encoding;
 @end
 
 @implementation OFLHAArchive
 @synthesize encoding = _encoding;
 
@@ -93,28 +98,27 @@
 
 	@try {
 		_stream = [stream retain];
 
 		if ([mode isEqual: @"r"])
-			_mode = OF_LHA_ARCHIVE_MODE_READ;
+			_mode = modeRead;
 		else if ([mode isEqual: @"w"])
-			_mode = OF_LHA_ARCHIVE_MODE_WRITE;
+			_mode = modeWrite;
 		else if ([mode isEqual: @"a"])
-			_mode = OF_LHA_ARCHIVE_MODE_APPEND;
+			_mode = modeAppend;
 		else
 			@throw [OFInvalidArgumentException exception];
 
-		if ((_mode == OF_LHA_ARCHIVE_MODE_WRITE ||
-		    _mode == OF_LHA_ARCHIVE_MODE_APPEND) &&
+		if ((_mode == modeWrite || _mode == modeAppend) &&
 		    ![_stream isKindOfClass: [OFSeekableStream class]])
 			@throw [OFInvalidArgumentException exception];
 
-		if (_mode == OF_LHA_ARCHIVE_MODE_APPEND)
+		if (_mode == modeAppend)
 			[(OFSeekableStream *)_stream seekToOffset: 0
 							   whence: SEEK_END];
 
-		_encoding = OF_STRING_ENCODING_ISO_8859_1;
+		_encoding = OFStringEncodingISO8859_1;
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
@@ -153,11 +157,11 @@
 {
 	OFLHAArchiveEntry *entry;
 	char header[21];
 	size_t headerLen;
 
-	if (_mode != OF_LHA_ARCHIVE_MODE_READ)
+	if (_mode != modeRead)
 		@throw [OFInvalidArgumentException exception];
 
 	[(OFLHAArchiveFileReadStream *)_lastReturnedStream of_skip];
 	@try {
 		[_lastReturnedStream close];
@@ -194,11 +198,11 @@
 	return entry;
 }
 
 - (OFStream *)streamForReadingCurrentEntry
 {
-	if (_mode != OF_LHA_ARCHIVE_MODE_READ)
+	if (_mode != modeRead)
 		@throw [OFInvalidArgumentException exception];
 
 	if (_lastReturnedStream == nil)
 		@throw [OFInvalidArgumentException exception];
 
@@ -208,12 +212,11 @@
 
 - (OFStream *)streamForWritingEntry: (OFLHAArchiveEntry *)entry
 {
 	OFString *compressionMethod;
 
-	if (_mode != OF_LHA_ARCHIVE_MODE_WRITE &&
-	    _mode != OF_LHA_ARCHIVE_MODE_APPEND)
+	if (_mode != modeWrite && _mode != modeAppend)
 		@throw [OFInvalidArgumentException exception];
 
 	compressionMethod = entry.compressionMethod;
 
 	if (![compressionMethod isEqual: @"-lh0-"] &&
@@ -333,11 +336,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) {
@@ -393,12 +396,12 @@
 
 		stream = _stream;
 	}
 
 	if ([stream isKindOfClass: [OFSeekableStream class]] &&
-	    (sizeof(of_offset_t) > 4 || toRead < INT32_MAX))
-		[(OFSeekableStream *)stream seekToOffset: (of_offset_t)toRead
+	    (sizeof(OFFileOffset) > 4 || toRead < INT32_MAX))
+		[(OFSeekableStream *)stream seekToOffset: (OFFileOffset)toRead
 						  whence: SEEK_CUR];
 	else {
 		while (toRead > 0) {
 			char buffer[512];
 			size_t min = toRead;
@@ -432,11 +435,11 @@
 @end
 
 @implementation OFLHAArchiveFileWriteStream
 - (instancetype)of_initWithStream: (OFSeekableStream *)stream
 			    entry: (OFLHAArchiveEntry *)entry
-			 encoding: (of_string_encoding_t)encoding
+			 encoding: (OFStringEncoding)encoding
 {
 	self = [super init];
 
 	@try {
 		_entry = [entry mutableCopy];
@@ -481,17 +484,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
@@ -508,11 +511,11 @@
 	    .fileDescriptorForWriting;
 }
 
 - (void)close
 {
-	of_offset_t offset;
+	OFFileOffset offset;
 
 	if (_stream == nil)
 		@throw [OFNotOpenException exceptionWithObject: self];
 
 	_entry.uncompressedSize = _bytesWritten;