@@ -239,11 +239,11 @@
 static void
 uncaughtExceptionHandler(id exception)
 {
 	OFString *description = [exception description];
 	OFArray *backtrace = nil;
-	of_string_encoding_t encoding = [OFLocale encoding];
+	OFStringEncoding encoding = [OFLocale encoding];
 
 	fprintf(stderr, "\nRuntime error: Unhandled exception:\n%s\n",
 	    [description cStringWithEncoding: encoding]);
 
 	if ([exception respondsToSelector: @selector(backtrace)])
@@ -405,11 +405,11 @@
 }
 
 + (OFString *)className
 {
 	return [OFString stringWithCString: class_getName(self)
-				  encoding: OF_STRING_ENCODING_ASCII];
+				  encoding: OFStringEncodingASCII];
 }
 
 + (bool)isSubclassOfClass: (Class)class
 {
 	for (Class iter = self; iter != Nil; iter = class_getSuperclass(iter))
@@ -560,11 +560,11 @@
 }
 
 - (OFString *)className
 {
 	return [OFString stringWithCString: object_getClassName(self)
-				  encoding: OF_STRING_ENCODING_ASCII];
+				  encoding: OFStringEncodingASCII];
 }
 
 - (bool)isKindOfClass: (Class)class
 {
 	for (Class iter = object_getClass(self); iter != Nil;