@@ -308,11 +308,11 @@
 #elif defined(OF_AMIGAOS)
 		void *pool = objc_autoreleasePoolPush();
 		OFFileManager *fileManager = [OFFileManager defaultManager];
 		OFArray *envContents =
 		    [fileManager contentsOfDirectoryAtPath: @"ENV:"];
-		const of_string_encoding_t encoding = [OFLocale encoding];
+		OFStringEncoding encoding = [OFLocale encoding];
 		struct Process *proc;
 		struct LocalVar *firstLocalVar;
 
 		for (OFString *name in envContents) {
 			void *pool2 = objc_autoreleasePoolPush();
@@ -374,12 +374,11 @@
 # else
 		char **env = *_NSGetEnviron();
 # endif
 
 		if (env != NULL) {
-			const of_string_encoding_t encoding =
-			    [OFLocale encoding];
+			OFStringEncoding encoding = [OFLocale encoding];
 
 			for (; *env != NULL; env++) {
 				void *pool = objc_autoreleasePoolPush();
 				OFString *key, *value;
 				char *sep;
@@ -466,11 +465,11 @@
 
 - (void)of_setArgumentCount: (int *)argc andArgumentValues: (char ***)argv
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFMutableArray *arguments;
-	of_string_encoding_t encoding;
+	OFStringEncoding encoding;
 
 	_argc = argc;
 	_argv = argv;
 
 	encoding = [OFLocale encoding];
@@ -605,11 +604,11 @@
 #ifdef OF_HAVE_SANDBOX
 - (void)of_activateSandbox: (OFSandbox *)sandbox
 {
 # ifdef OF_HAVE_PLEDGE
 	void *pool = objc_autoreleasePoolPush();
-	of_string_encoding_t encoding = [OFLocale encoding];
+	OFStringEncoding encoding = [OFLocale encoding];
 	OFArray OF_GENERIC(of_sandbox_unveil_path_t) *unveiledPaths;
 	size_t unveiledPathsCount;
 	const char *promises;
 
 	if (_activeSandbox != nil && sandbox != _activeSandbox)