@@ -27,12 +27,12 @@
 #import "OFExceptions.h"
 #import "OFMacros.h"
 
 #import "asprintf.h"
 
-#import "encodings/iso_8859_15.h"
-#import "encodings/windows_1252.h"
+extern const uint16_t of_iso_8859_15[256];
+extern const uint16_t of_windows_1252[256];
 
 /* References for static linking */
 void _references_to_categories_of_OFString()
 {
 	_OFHashing_reference = 1;
@@ -337,16 +337,14 @@
 				switch (encoding) {
 				case OF_STRING_ENCODING_ISO_8859_1:
 					chr = (uint8_t)str[i];
 					break;
 				case OF_STRING_ENCODING_ISO_8859_15:
-					chr = iso_8859_15_to_unicode[
-					    (uint8_t)str[i]];
+					chr = of_iso_8859_15[(uint8_t)str[i]];
 					break;
 				case OF_STRING_ENCODING_WINDOWS_1252:
-					chr = windows_1252_to_unicode[
-					    (uint8_t)str[i]];
+					chr = of_windows_1252[(uint8_t)str[i]];
 					break;
 				default:
 					/*
 					 * We can't use [super dealloc] on OS X
 					 * here. Compiler bug? Anyway,