@@ -39,11 +39,11 @@
 	0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0
 };
 const size_t of_codepage_437_table_offset =
     256 - (sizeof(of_codepage_437_table) / sizeof(*of_codepage_437_table));
 
-static const char page0[] = {
+static const unsigned char page0[] = {
 	0xFF, 0xAD, 0x9B, 0x9C, 0x00, 0x9D, 0x00, 0x00,
 	0x00, 0x00, 0xA6, 0xAE, 0xAA, 0x00, 0x00, 0x00,
 	0xF8, 0xF1, 0xFD, 0x00, 0x00, 0xE6, 0x00, 0xFA,
 	0x00, 0x00, 0xA7, 0xAF, 0xAC, 0xAB, 0x00, 0xA8,
 	0x00, 0x00, 0x00, 0x00, 0x8E, 0x8F, 0x92, 0x80,
@@ -54,42 +54,38 @@
 	0x8A, 0x82, 0x88, 0x89, 0x8D, 0xA1, 0x8C, 0x8B,
 	0x00, 0xA4, 0x95, 0xA2, 0x93, 0x00, 0x94, 0xF6,
 	0x00, 0x97, 0xA3, 0x96, 0x81, 0x00, 0x00, 0x98
 };
 static const uint8_t page0Start = 0xA0;
-static const uint16_t page0Size = sizeof(page0) / sizeof(*page0);
 
-static const char page1[] = {
+static const unsigned char page1[] = {
 	0x9F
 };
 static const uint8_t page1Start = 0x92;
-static const uint16_t page1Size = sizeof(page1) / sizeof(*page1);
 
-static const char page3[] = {
+static const unsigned char page3[] = {
 	0xE2, 0x00, 0x00, 0x00, 0x00, 0xE9, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0xE4, 0x00, 0x00, 0xE8, 0x00, 0x00, 0xEA, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0x00,
 	0x00, 0xEB, 0xEE, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0xE3, 0x00, 0x00,
 	0xE5, 0xE7, 0x00, 0xED
 };
 static const uint8_t page3Start = 0x93;
-static const uint16_t page3Size = sizeof(page3) / sizeof(*page3);
 
-static const char page20[] = {
+static const unsigned char page20[] = {
 	0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x9E
 };
 static const uint8_t page20Start = 0x7F;
-static const uint16_t page20Size = sizeof(page20) / sizeof(*page20);
 
-static const char page22[] = {
+static const unsigned char page22[] = {
 	0xF9, 0xFB, 0x00, 0x00, 0x00, 0xEC, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0xEF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -98,21 +94,19 @@
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0xF0, 0x00, 0x00, 0xF3, 0xF2
 };
 static const uint8_t page22Start = 0x19;
-static const uint16_t page22Size = sizeof(page22) / sizeof(*page22);
 
-static const char page23[] = {
+static const unsigned char page23[] = {
 	0xA9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0xF4, 0xF5
 };
 static const uint8_t page23Start = 0x10;
-static const uint16_t page23Size = sizeof(page23) / sizeof(*page23);
 
-static const char page25[] = {
+static const unsigned char page25[] = {
 	0xC4, 0x00, 0xB3, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0xDA, 0x00, 0x00, 0x00,
 	0xBF, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00,
 	0xD9, 0x00, 0x00, 0x00, 0xC3, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0xB4, 0x00, 0x00, 0x00,
@@ -132,11 +126,10 @@
 	0xDE, 0xB0, 0xB1, 0xB2, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0xFE
 };
 static const uint8_t page25Start = 0x00;
-static const uint16_t page25Size = sizeof(page25) / sizeof(*page25);
 
 bool
 of_unicode_to_codepage_437(const of_unichar_t *input, unsigned char *output,
     size_t length, bool lossy)
 {