@@ -620,15 +620,15 @@
 }
 
 - (OFString *)readStringWithLength: (size_t)length
 {
 	return [self readStringWithLength: length
-				 encoding: OF_STRING_ENCODING_UTF_8];
+				 encoding: OFStringEncodingUTF8];
 }
 
 - (OFString *)readStringWithLength: (size_t)length
-			  encoding: (of_string_encoding_t)encoding
+			  encoding: (OFStringEncoding)encoding
 {
 	OFString *ret;
 	char *buffer = of_alloc(length + 1, 1);
 	buffer[length] = 0;
 
@@ -640,11 +640,11 @@
 	}
 
 	return ret;
 }
 
-- (OFString *)tryReadLineWithEncoding: (of_string_encoding_t)encoding
+- (OFString *)tryReadLineWithEncoding: (OFStringEncoding)encoding
 {
 	size_t pageSize, bufferLength;
 	char *buffer, *readBuffer;
 	OFString *ret;
 
@@ -789,14 +789,14 @@
 	return nil;
 }
 
 - (OFString *)readLine
 {
-	return [self readLineWithEncoding: OF_STRING_ENCODING_UTF_8];
+	return [self readLineWithEncoding: OFStringEncodingUTF8];
 }
 
-- (OFString *)readLineWithEncoding: (of_string_encoding_t)encoding
+- (OFString *)readLineWithEncoding: (OFStringEncoding)encoding
 {
 	OFString *line = nil;
 
 	while ((line = [self tryReadLineWithEncoding: encoding]) == nil)
 		if (self.atEndOfStream)
@@ -806,21 +806,21 @@
 }
 
 #ifdef OF_HAVE_SOCKETS
 - (void)asyncReadLine
 {
-	[self asyncReadLineWithEncoding: OF_STRING_ENCODING_UTF_8
+	[self asyncReadLineWithEncoding: OFStringEncodingUTF8
 			    runLoopMode: of_run_loop_mode_default];
 }
 
-- (void)asyncReadLineWithEncoding: (of_string_encoding_t)encoding
+- (void)asyncReadLineWithEncoding: (OFStringEncoding)encoding
 {
 	[self asyncReadLineWithEncoding: encoding
 			    runLoopMode: of_run_loop_mode_default];
 }
 
-- (void)asyncReadLineWithEncoding: (of_string_encoding_t)encoding
+- (void)asyncReadLineWithEncoding: (OFStringEncoding)encoding
 		      runLoopMode: (of_run_loop_mode_t)runLoopMode
 {
 	OFStream <OFReadyForReadingObserving> *stream =
 	    (OFStream <OFReadyForReadingObserving> *)self;
 
@@ -834,24 +834,24 @@
 }
 
 # ifdef OF_HAVE_BLOCKS
 - (void)asyncReadLineWithBlock: (of_stream_async_read_line_block_t)block
 {
-	[self asyncReadLineWithEncoding: OF_STRING_ENCODING_UTF_8
+	[self asyncReadLineWithEncoding: OFStringEncodingUTF8
 			    runLoopMode: of_run_loop_mode_default
 				  block: block];
 }
 
-- (void)asyncReadLineWithEncoding: (of_string_encoding_t)encoding
+- (void)asyncReadLineWithEncoding: (OFStringEncoding)encoding
 			    block: (of_stream_async_read_line_block_t)block
 {
 	[self asyncReadLineWithEncoding: encoding
 			    runLoopMode: of_run_loop_mode_default
 				  block: block];
 }
 
-- (void)asyncReadLineWithEncoding: (of_string_encoding_t)encoding
+- (void)asyncReadLineWithEncoding: (OFStringEncoding)encoding
 		      runLoopMode: (of_run_loop_mode_t)runLoopMode
 			    block: (of_stream_async_read_line_block_t)block
 {
 	OFStream <OFReadyForReadingObserving> *stream =
 	    (OFStream <OFReadyForReadingObserving> *)self;
@@ -865,15 +865,15 @@
 # endif
 #endif
 
 - (OFString *)tryReadLine
 {
-	return [self tryReadLineWithEncoding: OF_STRING_ENCODING_UTF_8];
+	return [self tryReadLineWithEncoding: OFStringEncodingUTF8];
 }
 
 - (OFString *)tryReadTillDelimiter: (OFString *)delimiter
-			  encoding: (of_string_encoding_t)encoding
+			  encoding: (OFStringEncoding)encoding
 {
 	const char *delimiterCString;
 	size_t j, delimiterLength, pageSize, bufferLength;
 	char *buffer, *readBuffer;
 	OFString *ret;
@@ -1032,15 +1032,15 @@
 
 
 - (OFString *)readTillDelimiter: (OFString *)delimiter
 {
 	return [self readTillDelimiter: delimiter
-			      encoding: OF_STRING_ENCODING_UTF_8];
+			      encoding: OFStringEncodingUTF8];
 }
 
 - (OFString *)readTillDelimiter: (OFString *)delimiter
-		       encoding: (of_string_encoding_t)encoding
+		       encoding: (OFStringEncoding)encoding
 {
 	OFString *ret = nil;
 
 	while ((ret = [self tryReadTillDelimiter: delimiter
 					encoding: encoding]) == nil)
@@ -1051,11 +1051,11 @@
 }
 
 - (OFString *)tryReadTillDelimiter: (OFString *)delimiter
 {
 	return [self tryReadTillDelimiter: delimiter
-				 encoding: OF_STRING_ENCODING_UTF_8];
+				 encoding: OFStringEncodingUTF8];
 }
 
 - (void)flushWriteBuffer
 {
 	if (_writeBuffer == NULL)
@@ -1115,24 +1115,24 @@
 }
 
 - (void)asyncWriteString: (OFString *)string
 {
 	[self asyncWriteString: string
-		      encoding: OF_STRING_ENCODING_UTF_8
+		      encoding: OFStringEncodingUTF8
 		   runLoopMode: of_run_loop_mode_default];
 }
 
 - (void)asyncWriteString: (OFString *)string
-		encoding: (of_string_encoding_t)encoding
+		encoding: (OFStringEncoding)encoding
 {
 	[self asyncWriteString: string
 		      encoding: encoding
 		   runLoopMode: of_run_loop_mode_default];
 }
 
 - (void)asyncWriteString: (OFString *)string
-		encoding: (of_string_encoding_t)encoding
+		encoding: (OFStringEncoding)encoding
 	     runLoopMode: (of_run_loop_mode_t)runLoopMode
 {
 	OFStream <OFReadyForWritingObserving> *stream =
 	    (OFStream <OFReadyForWritingObserving> *)self;
 
@@ -1171,27 +1171,27 @@
 
 - (void)asyncWriteString: (OFString *)string
 		   block: (of_stream_async_write_string_block_t)block
 {
 	[self asyncWriteString: string
-		      encoding: OF_STRING_ENCODING_UTF_8
+		      encoding: OFStringEncodingUTF8
 		   runLoopMode: of_run_loop_mode_default
 			 block: block];
 }
 
 - (void)asyncWriteString: (OFString *)string
-		encoding: (of_string_encoding_t)encoding
+		encoding: (OFStringEncoding)encoding
 		   block: (of_stream_async_write_string_block_t)block
 {
 	[self asyncWriteString: string
 		      encoding: encoding
 		   runLoopMode: of_run_loop_mode_default
 			 block: block];
 }
 
 - (void)asyncWriteString: (OFString *)string
-		encoding: (of_string_encoding_t)encoding
+		encoding: (OFStringEncoding)encoding
 	     runLoopMode: (of_run_loop_mode_t)runLoopMode
 		   block: (of_stream_async_write_string_block_t)block
 {
 	OFStream <OFReadyForWritingObserving> *stream =
 	    (OFStream <OFReadyForWritingObserving> *)self;
@@ -1559,15 +1559,14 @@
 	return length;
 }
 
 - (size_t)writeString: (OFString *)string
 {
-	return [self writeString: string encoding: OF_STRING_ENCODING_UTF_8];
+	return [self writeString: string encoding: OFStringEncodingUTF8];
 }
 
-- (size_t)writeString: (OFString *)string
-	     encoding: (of_string_encoding_t)encoding
+- (size_t)writeString: (OFString *)string encoding: (OFStringEncoding)encoding
 {
 	void *pool;
 	size_t length;
 
 	if (string == nil)
@@ -1584,14 +1583,14 @@
 	return length;
 }
 
 - (size_t)writeLine: (OFString *)string
 {
-	return [self writeLine: string encoding: OF_STRING_ENCODING_UTF_8];
+	return [self writeLine: string encoding: OFStringEncodingUTF8];
 }
 
-- (size_t)writeLine: (OFString *)string encoding: (of_string_encoding_t)encoding
+- (size_t)writeLine: (OFString *)string encoding: (OFStringEncoding)encoding
 {
 	size_t stringLength = [string cStringLengthWithEncoding: encoding];
 	char *buffer;
 
 	buffer = of_alloc(stringLength + 1, 1);