@@ -426,11 +426,11 @@
 
 # ifdef OF_HAVE_THREADS
 	[passwdMutex lock];
 	@try {
 # endif
-		of_string_encoding_t encoding = [OFLocale encoding];
+		OFStringEncoding encoding = [OFLocale encoding];
 		struct passwd *passwd = getpwuid(s->st_uid);
 		struct group *group_ = getgrgid(s->st_gid);
 
 		if (passwd != NULL) {
 			OFString *owner = [OFString
@@ -462,11 +462,11 @@
 setSymbolicLinkDestinationAttribute(of_mutable_file_attributes_t attributes,
     OFURL *URL)
 {
 	OFString *path = URL.fileSystemRepresentation;
 # ifndef OF_WINDOWS
-	of_string_encoding_t encoding = [OFLocale encoding];
+	OFStringEncoding encoding = [OFLocale encoding];
 	char destinationC[PATH_MAX];
 	ssize_t length;
 	OFString *destination;
 	of_file_attribute_key_t key;
 
@@ -800,11 +800,11 @@
 {
 #ifdef OF_FILE_MANAGER_SUPPORTS_OWNER
 	OFString *path = URL.fileSystemRepresentation;
 	uid_t uid = -1;
 	gid_t gid = -1;
-	of_string_encoding_t encoding;
+	OFStringEncoding encoding;
 
 	if (owner == nil && group == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	encoding = [OFLocale encoding];
@@ -1065,11 +1065,11 @@
 						  errNo: retrieveError()];
 		} @finally {
 			FindClose(handle);
 		}
 	} else {
-		of_string_encoding_t encoding = [OFLocale encoding];
+		OFStringEncoding encoding = [OFLocale encoding];
 		WIN32_FIND_DATA fd;
 
 		if ((handle = FindFirstFileA(
 		    [path cStringWithEncoding: encoding], &fd)) ==
 		    INVALID_HANDLE_VALUE)
@@ -1105,11 +1105,11 @@
 		} @finally {
 			FindClose(handle);
 		}
 	}
 #elif defined(OF_AMIGAOS)
-	of_string_encoding_t encoding = [OFLocale encoding];
+	OFStringEncoding encoding = [OFLocale encoding];
 	BPTR lock;
 
 	if ((lock = Lock([path cStringWithEncoding: encoding],
 	    SHARED_LOCK)) == 0)
 		@throw [OFOpenItemFailedException
@@ -1175,11 +1175,11 @@
 					  errNo: retrieveError()];
 	} @finally {
 		UnLock(lock);
 	}
 #else
-	of_string_encoding_t encoding = [OFLocale encoding];
+	OFStringEncoding encoding = [OFLocale encoding];
 	DIR *dir;
 	if ((dir = opendir([path cStringWithEncoding: encoding])) == NULL)
 		@throw [OFOpenItemFailedException exceptionWithURL: URL
 							      mode: nil
 							     errNo: errno];
@@ -1357,11 +1357,11 @@
 
 	sourcePath = source.fileSystemRepresentation;
 	destinationPath = destination.fileSystemRepresentation;
 
 # ifndef OF_WINDOWS
-	of_string_encoding_t encoding = [OFLocale encoding];
+	OFStringEncoding encoding = [OFLocale encoding];
 
 	if (link([sourcePath cStringWithEncoding: encoding],
 	    [destinationPath cStringWithEncoding: encoding]) != 0)
 		@throw [OFLinkFailedException
 		    exceptionWithSourceURL: source
@@ -1398,11 +1398,11 @@
 		@throw [OFInvalidArgumentException exception];
 
 	path = URL.fileSystemRepresentation;
 
 # ifndef OF_WINDOWS
-	of_string_encoding_t encoding = [OFLocale encoding];
+	OFStringEncoding encoding = [OFLocale encoding];
 
 	if (symlink([target cStringWithEncoding: encoding],
 	    [path cStringWithEncoding: encoding]) != 0)
 		@throw [OFCreateSymbolicLinkFailedException
 		    exceptionWithURL: URL
@@ -1439,11 +1439,11 @@
 				     errNo: EEXIST];
 
 	pool = objc_autoreleasePoolPush();
 
 #ifdef OF_AMIGAOS
-	of_string_encoding_t encoding = [OFLocale encoding];
+	OFStringEncoding encoding = [OFLocale encoding];
 
 	if (!Rename([source.fileSystemRepresentation
 	    cStringWithEncoding: encoding],
 	    [destination.fileSystemRepresentation
 	    cStringWithEncoding: encoding]))
@@ -1458,11 +1458,11 @@
 	if ([OFSystemInfo isWindowsNT])
 		status = _wrename(source.fileSystemRepresentation.UTF16String,
 		    destination.fileSystemRepresentation.UTF16String);
 	else {
 # endif
-		of_string_encoding_t encoding = [OFLocale encoding];
+		OFStringEncoding encoding = [OFLocale encoding];
 
 		status = rename([source.fileSystemRepresentation
 		    cStringWithEncoding: encoding],
 		    [destination.fileSystemRepresentation
 		    cStringWithEncoding: encoding]);