@@ -162,11 +162,11 @@
 #elif defined(OF_WINDOWS)
 # ifdef OF_HAVE_FILES
 	void *pool = objc_autoreleasePoolPush();
 
 	@try {
-		of_string_encoding_t encoding = [OFLocale encoding];
+		OFStringEncoding encoding = [OFLocale encoding];
 		char systemDir[PATH_MAX];
 		UINT systemDirLen;
 		OFString *systemDirString;
 		const char *path;
 		void *buffer;
@@ -539,11 +539,11 @@
 	buffer[0] = regs.ebx;
 	buffer[1] = regs.edx;
 	buffer[2] = regs.ecx;
 
 	return [OFString stringWithCString: (char *)buffer
-				  encoding: OF_STRING_ENCODING_ASCII
+				  encoding: OFStringEncodingASCII
 				    length: 12];
 #else
 	return nil;
 #endif
 }
@@ -563,11 +563,11 @@
 		buffer[i++] = regs.ecx;
 		buffer[i++] = regs.edx;
 	}
 
 	return [OFString stringWithCString: (char *)buffer
-				  encoding: OF_STRING_ENCODING_ASCII];
+				  encoding: OFStringEncodingASCII];
 #elif defined(OF_AMIGAOS4)
 	CONST_STRPTR model, version;
 
 	GetCPUInfoTags(GCIT_ModelString, &model,
 	    GCIT_VersionString, &version, TAG_END);
@@ -574,11 +574,11 @@
 
 	if (version != NULL)
 		return [OFString stringWithFormat: @"%s V%s", model, version];
 	else
 		return [OFString stringWithCString: model
-					  encoding: OF_STRING_ENCODING_ASCII];
+					  encoding: OFStringEncodingASCII];
 #else
 	return nil;
 #endif
 }