@@ -24,11 +24,11 @@
 
 #include <sys/time.h>
 
 #import "OFObject.h"
 #import "OFArray.h"
-#import "OFSystemInfo.h"
+#import "OFLocalization.h"
 #import "OFTimer.h"
 #import "OFRunLoop.h"
 #import "OFThread.h"
 
 #import "OFAllocFailedException.h"
@@ -102,11 +102,11 @@
 static void
 uncaughtExceptionHandler(id exception)
 {
 	OFString *description = [exception description];
 	OFArray *backtrace = nil;
-	of_string_encoding_t encoding = [OFSystemInfo native8BitEncoding];
+	of_string_encoding_t encoding = [OFLocalization encoding];
 
 	fprintf(stderr, "\nRuntime error: Unhandled exception:\n%s\n",
 	    [description cStringWithEncoding: encoding]);
 
 	if ([exception respondsToSelector: @selector(backtrace)])
@@ -198,11 +198,11 @@
 
 const char*
 _NSPrintForDebugger(id object)
 {
 	return [[object description]
-	    cStringWithEncoding: [OFSystemInfo native8BitEncoding]];
+	    cStringWithEncoding: [OFLocalization encoding]];
 }
 
 /* References for static linking */
 void
 _references_to_categories_of_OFObject(void)