@@ -102,19 +102,19 @@
 {
 	OFString *description = [exception description];
 	OFArray *backtrace = nil;
 
 	fprintf(stderr, "\nRuntime error: Unhandled exception:\n%s\n",
-	    [description cStringWithEncoding: OF_STRING_ENCODING_NATIVE]);
+	    [description cStringWithEncoding: [OFString nativeOSEncoding]]);
 
 	if ([exception respondsToSelector: @selector(backtrace)])
 		backtrace = [exception backtrace];
 
 	if (backtrace != nil) {
 		OFString *s = [backtrace componentsJoinedByString: @"\n  "];
 		fprintf(stderr, "\nBacktrace:\n  %s\n\n",
-		      [s cStringWithEncoding: OF_STRING_ENCODING_NATIVE]);
+		    [s cStringWithEncoding: [OFString nativeOSEncoding]]);
 	}
 
 	abort();
 }
 #endif
@@ -203,11 +203,11 @@
 
 const char*
 _NSPrintForDebugger(id object)
 {
 	return [[object description]
-	    cStringWithEncoding: OF_STRING_ENCODING_NATIVE];
+	    cStringWithEncoding: [OFString nativeOSEncoding]];
 }
 
 /* References for static linking */
 void _references_to_categories_of_OFObject(void)
 {