@@ -53,11 +53,11 @@
 					format: @"%Y-%m-%d %H:%M:%S"];
 }
 
 static void
 parseFileNameExtension(OFLHAArchiveEntry *entry, OFData *extension,
-    of_string_encoding_t encoding)
+    OFStringEncoding encoding)
 {
 	[entry->_fileName release];
 	entry->_fileName = nil;
 
 	entry->_fileName = [[OFString alloc]
@@ -66,11 +66,11 @@
 		     length: [extension count] - 1];
 }
 
 static void
 parseDirectoryNameExtension(OFLHAArchiveEntry *entry, OFData *extension,
-    of_string_encoding_t encoding)
+    OFStringEncoding encoding)
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFMutableData *data = [[extension mutableCopy] autorelease];
 	char *items = data.mutableItems;
 	size_t count = data.count;
@@ -97,11 +97,11 @@
 	objc_autoreleasePoolPop(pool);
 }
 
 static void
 parseCommentExtension(OFLHAArchiveEntry *entry, OFData *extension,
-    of_string_encoding_t encoding)
+    OFStringEncoding encoding)
 {
 	[entry->_fileComment release];
 	entry->_fileComment = nil;
 
 	entry->_fileComment = [[OFString alloc]
@@ -110,11 +110,11 @@
 		     length: extension.count - 1];
 }
 
 static void
 parsePermissionsExtension(OFLHAArchiveEntry *entry, OFData *extension,
-    of_string_encoding_t encoding)
+    OFStringEncoding encoding)
 {
 	uint16_t mode;
 
 	if (extension.count != 3)
 		@throw [OFInvalidFormatException exception];
@@ -128,11 +128,11 @@
 	entry->_mode = [[OFNumber alloc] initWithUnsignedShort: mode];
 }
 
 static void
 parseGIDUIDExtension(OFLHAArchiveEntry *entry, OFData *extension,
-    of_string_encoding_t encoding)
+    OFStringEncoding encoding)
 {
 	uint16_t UID, GID;
 
 	if (extension.count != 5)
 		@throw [OFInvalidFormatException exception];
@@ -153,11 +153,11 @@
 	entry->_UID = [[OFNumber alloc] initWithUnsignedShort: UID];
 }
 
 static void
 parseGroupExtension(OFLHAArchiveEntry *entry, OFData *extension,
-    of_string_encoding_t encoding)
+    OFStringEncoding encoding)
 {
 	[entry->_group release];
 	entry->_group = nil;
 
 	entry->_group = [[OFString alloc]
@@ -166,11 +166,11 @@
 		     length: extension.count - 1];
 }
 
 static void
 parseOwnerExtension(OFLHAArchiveEntry *entry, OFData *extension,
-    of_string_encoding_t encoding)
+    OFStringEncoding encoding)
 {
 	[entry->_owner release];
 	entry->_owner = nil;
 
 	entry->_owner = [[OFString alloc]
@@ -179,11 +179,11 @@
 		     length: extension.count - 1];
 }
 
 static void
 parseModificationDateExtension(OFLHAArchiveEntry *entry, OFData *extension,
-    of_string_encoding_t encoding)
+    OFStringEncoding encoding)
 {
 	uint32_t modificationDate;
 
 	if (extension.count != 5)
 		@throw [OFInvalidFormatException exception];
@@ -198,13 +198,13 @@
 	    initWithTimeIntervalSince1970: modificationDate];
 }
 
 static bool
 parseExtension(OFLHAArchiveEntry *entry, OFData *extension,
-    of_string_encoding_t encoding, bool allowFileName)
+    OFStringEncoding encoding, bool allowFileName)
 {
-	void (*function)(OFLHAArchiveEntry *, OFData *, of_string_encoding_t) =
+	void (*function)(OFLHAArchiveEntry *, OFData *, OFStringEncoding) =
 	    NULL;
 
 	switch (*(char *)[extension itemAtIndex: 0]) {
 	case 0x01:
 		if (allowFileName)
@@ -240,11 +240,11 @@
 	return true;
 }
 
 static void
 readExtensions(OFLHAArchiveEntry *entry, OFStream *stream,
-    of_string_encoding_t encoding, bool allowFileName)
+    OFStringEncoding encoding, bool allowFileName)
 {
 	uint16_t size;
 
 	while ((size = [stream readLittleEndianInt16]) > 0) {
 		OFData *extension;
@@ -265,12 +265,11 @@
 		}
 	}
 }
 
 static void
-getFileNameAndDirectoryName(OFLHAArchiveEntry *entry,
-    of_string_encoding_t encoding,
+getFileNameAndDirectoryName(OFLHAArchiveEntry *entry, OFStringEncoding encoding,
     const char **fileName, size_t *fileNameLength,
     const char **directoryName, size_t *directoryNameLength)
 {
 	OFMutableData *data;
 	char *cString;
@@ -331,20 +330,20 @@
 	return self;
 }
 
 - (instancetype)of_initWithHeader: (char [21])header
 			   stream: (OFStream *)stream
-			 encoding: (of_string_encoding_t)encoding
+			 encoding: (OFStringEncoding)encoding
 {
 	self = [super init];
 
 	@try {
 		uint32_t date;
 
 		_compressionMethod = [[OFString alloc]
 		    initWithCString: header + 2
-			   encoding: OF_STRING_ENCODING_ASCII
+			   encoding: OFStringEncodingASCII
 			     length: 5];
 
 		memcpy(&_compressedSize, header + 7, 4);
 		_compressedSize = OF_BSWAP32_IF_BE(_compressedSize);
 
@@ -553,11 +552,11 @@
 {
 	return _extensions;
 }
 
 - (void)of_writeToStream: (OFStream *)stream
-		encoding: (of_string_encoding_t)encoding
+		encoding: (OFStringEncoding)encoding
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFMutableData *data = [OFMutableData dataWithCapacity: 24];
 	const char *fileName, *directoryName;
 	size_t fileNameLength, directoryNameLength;
@@ -564,11 +563,11 @@
 	uint16_t tmp16;
 	uint32_t tmp32;
 	size_t headerSize;
 
 	if ([_compressionMethod cStringLengthWithEncoding:
-	    OF_STRING_ENCODING_ASCII] != 5)
+	    OFStringEncodingASCII] != 5)
 		@throw [OFInvalidArgumentException exception];
 
 	getFileNameAndDirectoryName(self, encoding, &fileName, &fileNameLength,
 	    &directoryName, &directoryNameLength);
 
@@ -578,11 +577,11 @@
 
 	/* Length. Filled in after we're done. */
 	[data increaseCountBy: 2];
 
 	[data addItems: [_compressionMethod
-			    cStringWithEncoding: OF_STRING_ENCODING_ASCII]
+			    cStringWithEncoding: OFStringEncodingASCII]
 		 count: 5];
 
 	tmp32 = OF_BSWAP32_IF_BE(_compressedSize);
 	[data addItems: &tmp32 count: sizeof(tmp32)];