@@ -54,18 +54,18 @@
 	    initWithUTF8String: UTF8String
 			length: UTF8StringLength];
 }
 
 - (instancetype)initWithCString: (const char *)cString
-		       encoding: (of_string_encoding_t)encoding
+		       encoding: (OFStringEncoding)encoding
 {
 	return (id)[[OFMutableUTF8String alloc] initWithCString: cString
 						       encoding: encoding];
 }
 
 - (instancetype)initWithCString: (const char *)cString
-		       encoding: (of_string_encoding_t)encoding
+		       encoding: (OFStringEncoding)encoding
 			 length: (size_t)cStringLength
 {
 	return (id)[[OFMutableUTF8String alloc] initWithCString: cString
 						       encoding: encoding
 							 length: cStringLength];
@@ -164,11 +164,11 @@
 {
 	return (id)[[OFMutableUTF8String alloc] initWithContentsOfFile: path];
 }
 
 - (instancetype)initWithContentsOfFile: (OFString *)path
-			      encoding: (of_string_encoding_t)encoding
+			      encoding: (OFStringEncoding)encoding
 {
 	return (id)[[OFMutableUTF8String alloc]
 	    initWithContentsOfFile: path
 			  encoding: encoding];
 }
@@ -178,11 +178,11 @@
 {
 	return (id)[[OFMutableUTF8String alloc] initWithContentsOfURL: URL];
 }
 
 - (instancetype)initWithContentsOfURL: (OFURL *)URL
-			     encoding: (of_string_encoding_t)encoding
+			     encoding: (OFStringEncoding)encoding
 {
 	return (id)[[OFMutableUTF8String alloc]
 	    initWithContentsOfURL: URL
 			 encoding: encoding];
 }
@@ -322,20 +322,20 @@
 						    length: UTF8StringLength]];
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)appendCString: (const char *)cString
-	     encoding: (of_string_encoding_t)encoding
+	     encoding: (OFStringEncoding)encoding
 {
 	void *pool = objc_autoreleasePoolPush();
 	[self appendString: [OFString stringWithCString: cString
 					       encoding: encoding]];
 	objc_autoreleasePoolPop(pool);
 }
 
 - (void)appendCString: (const char *)cString
-	     encoding: (of_string_encoding_t)encoding
+	     encoding: (OFStringEncoding)encoding
 	       length: (size_t)cStringLength
 {
 	void *pool = objc_autoreleasePoolPush();
 	[self appendString: [OFString stringWithCString: cString
 					       encoding: encoding