@@ -22,11 +22,10 @@
 #include <stdlib.h>	/* include any libc header to get the libc defines */
 #ifdef __GLIBC__
 # undef __USE_XOPEN
 #endif
 
-#include <locale.h>
 #include <unistd.h>
 
 #include "platform.h"
 
 #ifdef OF_MAC_OS_X
@@ -64,10 +63,14 @@
 };
 #endif
 
 static size_t pageSize;
 static size_t numberOfCPUs;
+
+of_string_encoding_t of_system_info_native_8bit_encoding =
+    OF_STRING_ENCODING_UTF_8;
+OFString *of_system_info_decimal_point = @".";
 
 #if defined(OF_X86_64) || defined(OF_X86)
 static OF_INLINE struct x86_regs OF_CONST_FUNC
 x86_cpuid(uint32_t eax, uint32_t ecx)
 {
@@ -144,17 +147,16 @@
 	return numberOfCPUs;
 }
 
 + (of_string_encoding_t)native8BitEncoding
 {
-	/* FIXME */
-	return OF_STRING_ENCODING_UTF_8;
+	return of_system_info_native_8bit_encoding;
 }
 
 + (OFString*)decimalPoint
 {
-	return [OFString stringWithUTF8String: localeconv()->decimal_point];
+	return of_system_info_decimal_point;
 }
 
 + (OFString*)userDataPath
 {
 #if defined(OF_MAC_OS_X) || defined(OF_IOS)