@@ -211,19 +211,19 @@
 	return self.UTF8String;
 }
 
 - (size_t)getCString: (char *)cString_
 	   maxLength: (size_t)maxLength
-	    encoding: (of_string_encoding_t)encoding
+	    encoding: (OFStringEncoding)encoding
 {
 	[self finishInitialization];
 	return [self getCString: cString_
 		      maxLength: maxLength
 		       encoding: encoding];
 }
 
-- (const char *)cStringWithEncoding: (of_string_encoding_t)encoding
+- (const char *)cStringWithEncoding: (OFStringEncoding)encoding
 {
 	[self finishInitialization];
 	return [self cStringWithEncoding: encoding];
 }
 
@@ -237,11 +237,11 @@
 {
 	[self finishInitialization];
 	return self.UTF8StringLength;
 }
 
-- (size_t)cStringLengthWithEncoding: (of_string_encoding_t)encoding
+- (size_t)cStringLengthWithEncoding: (OFStringEncoding)encoding
 {
 	[self finishInitialization];
 	return [self cStringLengthWithEncoding: encoding];
 }
 
@@ -540,11 +540,11 @@
 {
 	[self finishInitialization];
 	return [self UTF32StringWithByteOrder: byteOrder];
 }
 
-- (OFData *)dataWithEncoding: (of_string_encoding_t)encoding
+- (OFData *)dataWithEncoding: (OFStringEncoding)encoding
 {
 	[self finishInitialization];
 	return [self dataWithEncoding: encoding];
 }
 
@@ -575,11 +575,11 @@
 {
 	[self finishInitialization];
 	[self writeToFile: path];
 }
 
-- (void)writeToFile: (OFString *)path encoding: (of_string_encoding_t)encoding
+- (void)writeToFile: (OFString *)path encoding: (OFStringEncoding)encoding
 {
 	[self finishInitialization];
 	[self writeToFile: path encoding: encoding];
 }
 #endif
@@ -588,11 +588,11 @@
 {
 	[self finishInitialization];
 	[self writeToURL: URL];
 }
 
-- (void)writeToURL: (OFURL *)URL encoding: (of_string_encoding_t)encoding
+- (void)writeToURL: (OFURL *)URL encoding: (OFStringEncoding)encoding
 {
 	[self finishInitialization];
 	[self writeToURL: URL encoding: encoding];
 }