diff --git a/ChangeLog b/ChangeLog
index 09057efae..17a2803ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Sep 26 14:37:52 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gen-unicode-tables.pl glib/guniprop.c 
+	  glib/{gunibreak,gunichartables,gunidecomp}.h:
+	Patch from Andrew Taylor to make much of the unicode
+	table data const so that it can be made read-only
+	and shared.
+
 Wed Sep 26 12:41:05 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* glib/gstrfuncs.c (g_strdup_vprintf): Copy if 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 09057efae..17a2803ee 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Wed Sep 26 14:37:52 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gen-unicode-tables.pl glib/guniprop.c 
+	  glib/{gunibreak,gunichartables,gunidecomp}.h:
+	Patch from Andrew Taylor to make much of the unicode
+	table data const so that it can be made read-only
+	and shared.
+
 Wed Sep 26 12:41:05 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* glib/gstrfuncs.c (g_strdup_vprintf): Copy if 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 09057efae..17a2803ee 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Wed Sep 26 14:37:52 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gen-unicode-tables.pl glib/guniprop.c 
+	  glib/{gunibreak,gunichartables,gunidecomp}.h:
+	Patch from Andrew Taylor to make much of the unicode
+	table data const so that it can be made read-only
+	and shared.
+
 Wed Sep 26 12:41:05 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* glib/gstrfuncs.c (g_strdup_vprintf): Copy if 
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 09057efae..17a2803ee 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+Wed Sep 26 14:37:52 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gen-unicode-tables.pl glib/guniprop.c 
+	  glib/{gunibreak,gunichartables,gunidecomp}.h:
+	Patch from Andrew Taylor to make much of the unicode
+	table data const so that it can be made read-only
+	and shared.
+
 Wed Sep 26 12:41:05 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* glib/gstrfuncs.c (g_strdup_vprintf): Copy if 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 09057efae..17a2803ee 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Wed Sep 26 14:37:52 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gen-unicode-tables.pl glib/guniprop.c 
+	  glib/{gunibreak,gunichartables,gunidecomp}.h:
+	Patch from Andrew Taylor to make much of the unicode
+	table data const so that it can be made read-only
+	and shared.
+
 Wed Sep 26 12:41:05 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* glib/gstrfuncs.c (g_strdup_vprintf): Copy if 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 09057efae..17a2803ee 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Wed Sep 26 14:37:52 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gen-unicode-tables.pl glib/guniprop.c 
+	  glib/{gunibreak,gunichartables,gunidecomp}.h:
+	Patch from Andrew Taylor to make much of the unicode
+	table data const so that it can be made read-only
+	and shared.
+
 Wed Sep 26 12:41:05 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* glib/gstrfuncs.c (g_strdup_vprintf): Copy if 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 09057efae..17a2803ee 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Wed Sep 26 14:37:52 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gen-unicode-tables.pl glib/guniprop.c 
+	  glib/{gunibreak,gunichartables,gunidecomp}.h:
+	Patch from Andrew Taylor to make much of the unicode
+	table data const so that it can be made read-only
+	and shared.
+
 Wed Sep 26 12:41:05 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* glib/gstrfuncs.c (g_strdup_vprintf): Copy if 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 09057efae..17a2803ee 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Wed Sep 26 14:37:52 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gen-unicode-tables.pl glib/guniprop.c 
+	  glib/{gunibreak,gunichartables,gunidecomp}.h:
+	Patch from Andrew Taylor to make much of the unicode
+	table data const so that it can be made read-only
+	and shared.
+
 Wed Sep 26 12:41:05 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* glib/gstrfuncs.c (g_strdup_vprintf): Copy if 
diff --git a/glib/gen-unicode-tables.pl b/glib/gen-unicode-tables.pl
index 920492493..47423b2d4 100755
--- a/glib/gen-unicode-tables.pl
+++ b/glib/gen-unicode-tables.pl
@@ -531,7 +531,7 @@ sub print_tables
 					 'page', \&fetch_type);
     }
 
-    print OUT "static char *type_table[256] = {\n";
+    print OUT "static const char *type_table[256] = {\n";
     for ($count = 0; $count <= $last; $count += 256)
     {
 	print OUT ",\n" if $count > 0;
@@ -550,7 +550,7 @@ sub print_tables
 	$row[$count / 256] = &print_row ($count, '', 'unsigned short', 2,
 					 'attrpage', \&fetch_attr);
     }
-    print OUT "static unsigned short *attr_table[256] = {\n";
+    print OUT "static const unsigned short *attr_table[256] = {\n";
     for ($count = 0; $count <= $last; $count += 256)
     {
 	print OUT ",\n" if $count > 0;
@@ -564,7 +564,7 @@ sub print_tables
     #
 
     # FIXME: type.
-    print OUT "static unsigned short title_table[][3] = {\n";
+    print OUT "static const unsigned short title_table[][3] = {\n";
     my ($item);
     my ($first) = 1;
     foreach $item (sort keys %title_to_lower)
@@ -634,7 +634,7 @@ sub print_row
 	return $def_pfx . $values[0];
     }
 
-    printf OUT "static %s %s%d[256] = {\n  ", $typname, $name, $start / 256;
+    printf OUT "static const %s %s%d[256] = {\n  ", $typname, $name, $start / 256;
     my ($column) = 2;
     for ($i = $start; $i < $start + 256; ++$i)
     {
@@ -682,7 +682,7 @@ sub print_decomp
 					 \&fetch_cclass);
     }
 
-    print OUT "static unsigned char *combining_class_table[256] = {\n";
+    print OUT "static const unsigned char *combining_class_table[256] = {\n";
     for ($count = 0; $count <= $last; $count += 256)
     {
 	print OUT ",\n" if $count > 0;
@@ -699,7 +699,7 @@ sub print_decomp
     print OUT "  unsigned char *expansion;\n";
     print OUT "} decomposition;\n\n";
 
-    print OUT "static decomposition decomp_table[] =\n{\n";
+    print OUT "static const decomposition decomp_table[] =\n{\n";
     my ($iter);
     my ($first) = 1;
     for ($count = 0; $count <= $last; ++$count)
@@ -783,7 +783,7 @@ sub print_line_break
                                          \&fetch_break_type);
     }
 
-    print OUT "static char *break_property_table[256] = {\n";
+    print OUT "static const char *break_property_table[256] = {\n";
     for ($count = 0; $count <= $last; $count += 256)
     {
 	print OUT ",\n" if $count > 0;
@@ -892,7 +892,7 @@ sub output_special_case_table
  * other than the case of the codepoint, in the order [Ll],[Lu],[Lt],
  * separated and terminated by a double NUL.
  */
-static guchar special_case_table[][$special_case_len] = {
+static const guchar special_case_table[][$special_case_len] = {
 EOT
 
     for $case (@special_cases) {
@@ -1046,7 +1046,7 @@ sub output_composition_table
 					 sub { exists $vals{$_[0]} ? $vals{$_[0]} : 0; });
     }
 
-    print OUT "static unsigned short *compose_table[256] = {\n";
+    print OUT "static const unsigned short *compose_table[256] = {\n";
     for (my $count = 0; $count <= $last; $count += 256)
     {
 	print OUT ",\n" if $count > 0;
@@ -1057,7 +1057,7 @@ sub output_composition_table
 
     # Output first singletons
 
-    print OUT "static gushort compose_first_single[][2] = {\n";
+    print OUT "static const gushort compose_first_single[][2] = {\n";
     $i = 0;				     
     for $record (@first_singletons) {
 	print OUT ",\n" if $i++ > 0;
@@ -1069,7 +1069,7 @@ sub output_composition_table
 		  
     # Output second singletons
 
-    print OUT "static gushort compose_second_single[][2] = {\n";
+    print OUT "static const gushort compose_second_single[][2] = {\n";
     $i = 0;				     
     for $record (@second_singletons) {
 	print OUT ",\n" if $i++ > 0;
@@ -1082,7 +1082,7 @@ sub output_composition_table
     # Output array of composition pairs
 
     print OUT <<EOT;
-static gushort compose_array[$n_first][$n_second] = {
+static const gushort compose_array[$n_first][$n_second] = {
 EOT
 			
     for (my $i = 0; $i < $n_first; $i++) {
@@ -1117,7 +1117,7 @@ sub output_casefold_table
 
 /* Table of casefolding cases that can't be derived by lowercasing
  */
-static struct {
+static const struct {
   guint16 ch;
   gchar data[$casefoldlen];
 } casefold_table[] = {
diff --git a/glib/gunibreak.h b/glib/gunibreak.h
index c8294a078..ef8311a0c 100644
--- a/glib/gunibreak.h
+++ b/glib/gunibreak.h
@@ -8,7 +8,7 @@
 
 #define G_UNICODE_LAST_CHAR 0xffff
 
-static char page0[256] = {
+static const char page0[256] = {
   G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
   G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
   G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
@@ -137,7 +137,7 @@ static char page0[256] = {
   G_UNICODE_BREAK_ALPHABETIC
 };
 
-static char page1[256] = {
+static const char page1[256] = {
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_AMBIGUOUS, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -268,7 +268,7 @@ static char page1[256] = {
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
 };
 
-static char page2[256] = {
+static const char page2[256] = {
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -392,7 +392,7 @@ static char page2[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page3[256] = {
+static const char page3[256] = {
   G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
   G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
   G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
@@ -515,7 +515,7 @@ static char page3[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page4[256] = {
+static const char page4[256] = {
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_AMBIGUOUS, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -645,7 +645,7 @@ static char page4[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page5[256] = {
+static const char page5[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -764,7 +764,7 @@ static char page5[256] = {
   G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page6[256] = {
+static const char page6[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -885,7 +885,7 @@ static char page6[256] = {
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page7[256] = {
+static const char page7[256] = {
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -995,7 +995,7 @@ static char page7[256] = {
   G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page9[256] = {
+static const char page9[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMBINING_MARK, 
   G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC, 
@@ -1117,7 +1117,7 @@ static char page9[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page10[256] = {
+static const char page10[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
   G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_UNKNOWN, 
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC, 
@@ -1234,7 +1234,7 @@ static char page10[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page11[256] = {
+static const char page11[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMBINING_MARK, 
   G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC, 
@@ -1349,7 +1349,7 @@ static char page11[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page12[256] = {
+static const char page12[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMBINING_MARK, 
   G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC, 
@@ -1465,7 +1465,7 @@ static char page12[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page13[256] = {
+static const char page13[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
   G_UNICODE_BREAK_COMBINING_MARK, G_UNICODE_BREAK_COMBINING_MARK, 
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC, 
@@ -1584,7 +1584,7 @@ static char page13[256] = {
   G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page14[256] = {
+static const char page14[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_COMPLEX_CONTEXT, 
   G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT, 
   G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT, 
@@ -1699,7 +1699,7 @@ static char page14[256] = {
   G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page15[256] = {
+static const char page15[256] = {
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -1819,7 +1819,7 @@ static char page15[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page16[256] = {
+static const char page16[256] = {
   G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT, 
   G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT, 
   G_UNICODE_BREAK_COMPLEX_CONTEXT, G_UNICODE_BREAK_COMPLEX_CONTEXT, 
@@ -1934,7 +1934,7 @@ static char page16[256] = {
   G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page17[256] = {
+static const char page17[256] = {
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -2063,7 +2063,7 @@ static char page17[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page18[256] = {
+static const char page18[256] = {
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -2194,7 +2194,7 @@ static char page18[256] = {
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
 };
 
-static char page19[256] = {
+static const char page19[256] = {
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -2316,7 +2316,7 @@ static char page19[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page20[256] = {
+static const char page20[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -2447,7 +2447,7 @@ static char page20[256] = {
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC
 };
 
-static char page22[256] = {
+static const char page22[256] = {
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -2574,7 +2574,7 @@ static char page22[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page23[256] = {
+static const char page23[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -2679,7 +2679,7 @@ static char page23[256] = {
   G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page24[256] = {
+static const char page24[256] = {
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -2793,7 +2793,7 @@ static char page24[256] = {
   G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page30[256] = {
+static const char page30[256] = {
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -2923,7 +2923,7 @@ static char page30[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page31[256] = {
+static const char page31[256] = {
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -3054,7 +3054,7 @@ static char page31[256] = {
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page32[256] = {
+static const char page32[256] = {
   G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, 
   G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_AFTER, 
   G_UNICODE_BREAK_AFTER, G_UNICODE_BREAK_NON_BREAKING_GLUE, 
@@ -3163,7 +3163,7 @@ static char page32[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page33[256] = {
+static const char page33[256] = {
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_POSTFIX, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_AMBIGUOUS, 
@@ -3287,7 +3287,7 @@ static char page33[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page34[256] = {
+static const char page34[256] = {
   G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -3416,7 +3416,7 @@ static char page34[256] = {
   G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page35[256] = {
+static const char page35[256] = {
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -3531,7 +3531,7 @@ static char page35[256] = {
   G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page36[256] = {
+static const char page36[256] = {
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -3652,7 +3652,7 @@ static char page36[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page37[256] = {
+static const char page37[256] = {
   G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS, 
   G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS, 
   G_UNICODE_BREAK_AMBIGUOUS, G_UNICODE_BREAK_AMBIGUOUS, 
@@ -3781,7 +3781,7 @@ static char page37[256] = {
   G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page38[256] = {
+static const char page38[256] = {
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_AMBIGUOUS, 
@@ -3888,7 +3888,7 @@ static char page38[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page39[256] = {
+static const char page39[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_UNKNOWN, 
@@ -4007,7 +4007,7 @@ static char page39[256] = {
   G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page46[256] = {
+static const char page46[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -4115,7 +4115,7 @@ static char page46[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page47[256] = {
+static const char page47[256] = {
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -4242,7 +4242,7 @@ static char page47[256] = {
   G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page48[256] = {
+static const char page48[256] = {
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_CLOSE_PUNCTUATION, 
   G_UNICODE_BREAK_CLOSE_PUNCTUATION, G_UNICODE_BREAK_IDEOGRAPHIC, 
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_NON_STARTER, 
@@ -4373,7 +4373,7 @@ static char page48[256] = {
   G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page49[256] = {
+static const char page49[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -4491,7 +4491,7 @@ static char page49[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page50[256] = {
+static const char page50[256] = {
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -4615,7 +4615,7 @@ static char page50[256] = {
   G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page51[256] = {
+static const char page51[256] = {
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -4746,7 +4746,7 @@ static char page51[256] = {
   G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page77[256] = {
+static const char page77[256] = {
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -4865,7 +4865,7 @@ static char page77[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page159[256] = {
+static const char page159[256] = {
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -4981,7 +4981,7 @@ static char page159[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page164[256] = {
+static const char page164[256] = {
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -5103,7 +5103,7 @@ static char page164[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page215[256] = {
+static const char page215[256] = {
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -5219,7 +5219,7 @@ static char page215[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page250[256] = {
+static const char page250[256] = {
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
@@ -5315,7 +5315,7 @@ static char page250[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page251[256] = {
+static const char page251[256] = {
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -5439,7 +5439,7 @@ static char page251[256] = {
   G_UNICODE_BREAK_ALPHABETIC
 };
 
-static char page253[256] = {
+static const char page253[256] = {
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
   G_UNICODE_BREAK_ALPHABETIC, G_UNICODE_BREAK_ALPHABETIC, 
@@ -5561,7 +5561,7 @@ static char page253[256] = {
   G_UNICODE_BREAK_UNKNOWN
 };
 
-static char page254[256] = {
+static const char page254[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_UNKNOWN, 
@@ -5684,7 +5684,7 @@ static char page254[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_NON_BREAKING_GLUE
 };
 
-static char page255[256] = {
+static const char page255[256] = {
   G_UNICODE_BREAK_UNKNOWN, G_UNICODE_BREAK_EXCLAMATION, 
   G_UNICODE_BREAK_IDEOGRAPHIC, G_UNICODE_BREAK_IDEOGRAPHIC, 
   G_UNICODE_BREAK_PREFIX, G_UNICODE_BREAK_POSTFIX, 
@@ -5813,7 +5813,7 @@ static char page255[256] = {
   G_UNICODE_BREAK_UNKNOWN
 };
 
-static char *break_property_table[256] = {
+static const char *break_property_table[256] = {
   page0,
   page1,
   page2,
diff --git a/glib/gunichartables.h b/glib/gunichartables.h
index d71700e70..f6c685532 100644
--- a/glib/gunichartables.h
+++ b/glib/gunichartables.h
@@ -8,7 +8,7 @@
 
 #define G_UNICODE_LAST_CHAR 0xffff
 
-static char page0[256] = {
+static const char page0[256] = {
   G_UNICODE_CONTROL, G_UNICODE_CONTROL, G_UNICODE_CONTROL, G_UNICODE_CONTROL, 
   G_UNICODE_CONTROL, G_UNICODE_CONTROL, G_UNICODE_CONTROL, G_UNICODE_CONTROL, 
   G_UNICODE_CONTROL, G_UNICODE_CONTROL, G_UNICODE_CONTROL, G_UNICODE_CONTROL, 
@@ -121,7 +121,7 @@ static char page0[256] = {
   G_UNICODE_LOWERCASE_LETTER
 };
 
-static char page1[256] = {
+static const char page1[256] = {
   G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
   G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
   G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
@@ -252,7 +252,7 @@ static char page1[256] = {
   G_UNICODE_LOWERCASE_LETTER
 };
 
-static char page2[256] = {
+static const char page2[256] = {
   G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
   G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
   G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
@@ -374,7 +374,7 @@ static char page2[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
 };
 
-static char page3[256] = {
+static const char page3[256] = {
   G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
   G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
   G_UNICODE_NON_SPACING_MARK, G_UNICODE_NON_SPACING_MARK, 
@@ -494,7 +494,7 @@ static char page3[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
 };
 
-static char page4[256] = {
+static const char page4[256] = {
   G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
   G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
   G_UNICODE_UPPERCASE_LETTER, G_UNICODE_UPPERCASE_LETTER, 
@@ -621,7 +621,7 @@ static char page4[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
 };
 
-static char page5[256] = {
+static const char page5[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -733,7 +733,7 @@ static char page5[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
 };
 
-static char page6[256] = {
+static const char page6[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -831,7 +831,7 @@ static char page6[256] = {
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED
 };
 
-static char page7[256] = {
+static const char page7[256] = {
   G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
   G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
   G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
@@ -929,7 +929,7 @@ static char page7[256] = {
   G_UNICODE_UNASSIGNED
 };
 
-static char page9[256] = {
+static const char page9[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
   G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -1026,7 +1026,7 @@ static char page9[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
 };
 
-static char page10[256] = {
+static const char page10[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, 
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -1121,7 +1121,7 @@ static char page10[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
 };
 
-static char page11[256] = {
+static const char page11[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_NON_SPACING_MARK, G_UNICODE_COMBINING_MARK, 
   G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -1214,7 +1214,7 @@ static char page11[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
 };
 
-static char page12[256] = {
+static const char page12[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_COMBINING_MARK, G_UNICODE_COMBINING_MARK, 
   G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -1308,7 +1308,7 @@ static char page12[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
 };
 
-static char page13[256] = {
+static const char page13[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_COMBINING_MARK, 
   G_UNICODE_COMBINING_MARK, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -1401,7 +1401,7 @@ static char page13[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
 };
 
-static char page14[256] = {
+static const char page14[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -1498,7 +1498,7 @@ static char page14[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
 };
 
-static char page15[256] = {
+static const char page15[256] = {
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_PUNCTUATION, 
   G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
@@ -1603,7 +1603,7 @@ static char page15[256] = {
   G_UNICODE_UNASSIGNED
 };
 
-static char page16[256] = {
+static const char page16[256] = {
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -1702,7 +1702,7 @@ static char page16[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
 };
 
-static char page17[256] = {
+static const char page17[256] = {
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -1791,7 +1791,7 @@ static char page17[256] = {
   G_UNICODE_UNASSIGNED
 };
 
-static char page18[256] = {
+static const char page18[256] = {
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
@@ -1880,7 +1880,7 @@ static char page18[256] = {
   G_UNICODE_OTHER_LETTER
 };
 
-static char page19[256] = {
+static const char page19[256] = {
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -1971,7 +1971,7 @@ static char page19[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
 };
 
-static char page20[256] = {
+static const char page20[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -2060,7 +2060,7 @@ static char page20[256] = {
   G_UNICODE_OTHER_LETTER
 };
 
-static char page22[256] = {
+static const char page22[256] = {
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -2150,7 +2150,7 @@ static char page22[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
 };
 
-static char page23[256] = {
+static const char page23[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -2246,7 +2246,7 @@ static char page23[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
 };
 
-static char page24[256] = {
+static const char page24[256] = {
   G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
   G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
   G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
@@ -2338,7 +2338,7 @@ static char page24[256] = {
   G_UNICODE_UNASSIGNED
 };
 
-static char page30[256] = {
+static const char page30[256] = {
   G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
   G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
   G_UNICODE_UPPERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
@@ -2468,7 +2468,7 @@ static char page30[256] = {
   G_UNICODE_UNASSIGNED
 };
 
-static char page31[256] = {
+static const char page31[256] = {
   G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
   G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
   G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
@@ -2595,7 +2595,7 @@ static char page31[256] = {
   G_UNICODE_MODIFIER_SYMBOL, G_UNICODE_UNASSIGNED
 };
 
-static char page32[256] = {
+static const char page32[256] = {
   G_UNICODE_SPACE_SEPARATOR, G_UNICODE_SPACE_SEPARATOR, 
   G_UNICODE_SPACE_SEPARATOR, G_UNICODE_SPACE_SEPARATOR, 
   G_UNICODE_SPACE_SEPARATOR, G_UNICODE_SPACE_SEPARATOR, 
@@ -2700,7 +2700,7 @@ static char page32[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
 };
 
-static char page33[256] = {
+static const char page33[256] = {
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_UPPERCASE_LETTER, 
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_UPPERCASE_LETTER, G_UNICODE_OTHER_SYMBOL, 
@@ -2794,7 +2794,7 @@ static char page33[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
 };
 
-static char page34[256] = {
+static const char page34[256] = {
   G_UNICODE_MATH_SYMBOL, G_UNICODE_MATH_SYMBOL, G_UNICODE_MATH_SYMBOL, 
   G_UNICODE_MATH_SYMBOL, G_UNICODE_MATH_SYMBOL, G_UNICODE_MATH_SYMBOL, 
   G_UNICODE_MATH_SYMBOL, G_UNICODE_MATH_SYMBOL, G_UNICODE_MATH_SYMBOL, 
@@ -2883,7 +2883,7 @@ static char page34[256] = {
   G_UNICODE_UNASSIGNED
 };
 
-static char page35[256] = {
+static const char page35[256] = {
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_MATH_SYMBOL, 
@@ -2972,7 +2972,7 @@ static char page35[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
 };
 
-static char page36[256] = {
+static const char page36[256] = {
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -3061,7 +3061,7 @@ static char page36[256] = {
   G_UNICODE_UNASSIGNED
 };
 
-static char page37[256] = {
+static const char page37[256] = {
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -3150,7 +3150,7 @@ static char page37[256] = {
   G_UNICODE_UNASSIGNED
 };
 
-static char page38[256] = {
+static const char page38[256] = {
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -3239,7 +3239,7 @@ static char page38[256] = {
   G_UNICODE_UNASSIGNED
 };
 
-static char page39[256] = {
+static const char page39[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, 
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -3328,7 +3328,7 @@ static char page39[256] = {
   G_UNICODE_UNASSIGNED
 };
 
-static char page46[256] = {
+static const char page46[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -3417,7 +3417,7 @@ static char page46[256] = {
   G_UNICODE_UNASSIGNED
 };
 
-static char page47[256] = {
+static const char page47[256] = {
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -3506,7 +3506,7 @@ static char page47[256] = {
   G_UNICODE_UNASSIGNED
 };
 
-static char page48[256] = {
+static const char page48[256] = {
   G_UNICODE_SPACE_SEPARATOR, G_UNICODE_OTHER_PUNCTUATION, 
   G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_MODIFIER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -3603,7 +3603,7 @@ static char page48[256] = {
   G_UNICODE_MODIFIER_LETTER, G_UNICODE_UNASSIGNED
 };
 
-static char page49[256] = {
+static const char page49[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -3692,7 +3692,7 @@ static char page49[256] = {
   G_UNICODE_UNASSIGNED
 };
 
-static char page50[256] = {
+static const char page50[256] = {
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -3781,7 +3781,7 @@ static char page50[256] = {
   G_UNICODE_UNASSIGNED
 };
 
-static char page51[256] = {
+static const char page51[256] = {
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, G_UNICODE_OTHER_SYMBOL, 
@@ -3870,7 +3870,7 @@ static char page51[256] = {
   G_UNICODE_UNASSIGNED
 };
 
-static char page77[256] = {
+static const char page77[256] = {
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -3959,7 +3959,7 @@ static char page77[256] = {
   G_UNICODE_UNASSIGNED
 };
 
-static char page159[256] = {
+static const char page159[256] = {
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -4048,7 +4048,7 @@ static char page159[256] = {
   G_UNICODE_UNASSIGNED
 };
 
-static char page164[256] = {
+static const char page164[256] = {
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -4137,7 +4137,7 @@ static char page164[256] = {
   G_UNICODE_UNASSIGNED
 };
 
-static char page215[256] = {
+static const char page215[256] = {
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -4226,7 +4226,7 @@ static char page215[256] = {
   G_UNICODE_UNASSIGNED
 };
 
-static char page250[256] = {
+static const char page250[256] = {
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -4315,7 +4315,7 @@ static char page250[256] = {
   G_UNICODE_UNASSIGNED
 };
 
-static char page251[256] = {
+static const char page251[256] = {
   G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
   G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
   G_UNICODE_LOWERCASE_LETTER, G_UNICODE_LOWERCASE_LETTER, 
@@ -4406,7 +4406,7 @@ static char page251[256] = {
   G_UNICODE_OTHER_LETTER
 };
 
-static char page253[256] = {
+static const char page253[256] = {
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
   G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, G_UNICODE_OTHER_LETTER, 
@@ -4495,7 +4495,7 @@ static char page253[256] = {
   G_UNICODE_UNASSIGNED
 };
 
-static char page254[256] = {
+static const char page254[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
   G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED, 
@@ -4593,7 +4593,7 @@ static char page254[256] = {
   G_UNICODE_FORMAT
 };
 
-static char page255[256] = {
+static const char page255[256] = {
   G_UNICODE_UNASSIGNED, G_UNICODE_OTHER_PUNCTUATION, 
   G_UNICODE_OTHER_PUNCTUATION, G_UNICODE_OTHER_PUNCTUATION, 
   G_UNICODE_CURRENCY_SYMBOL, G_UNICODE_OTHER_PUNCTUATION, 
@@ -4698,7 +4698,7 @@ static char page255[256] = {
   G_UNICODE_OTHER_SYMBOL, G_UNICODE_UNASSIGNED, G_UNICODE_UNASSIGNED
 };
 
-static char *type_table[256] = {
+static const char *type_table[256] = {
   page0,
   page1,
   page2,
@@ -4957,7 +4957,7 @@ static char *type_table[256] = {
   page255
 };
 
-static unsigned short attrpage0[256] = {
+static const unsigned short attrpage0[256] = {
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -4989,7 +4989,7 @@ static unsigned short attrpage0[256] = {
   0x00dc, 0x00dd, 0x00de, 0x0178
 };
 
-static unsigned short attrpage1[256] = {
+static const unsigned short attrpage1[256] = {
   0x0101, 0x0100, 0x0103, 0x0102, 0x0105, 0x0104, 0x0107, 0x0106, 0x0109, 
   0x0108, 0x010b, 0x010a, 0x010d, 0x010c, 0x010f, 0x010e, 0x0111, 0x0110, 
   0x0113, 0x0112, 0x0115, 0x0114, 0x0117, 0x0116, 0x0119, 0x0118, 0x011b, 
@@ -5021,7 +5021,7 @@ static unsigned short attrpage1[256] = {
   0x01fd, 0x01fc, 0x01ff, 0x01fe
 };
 
-static unsigned short attrpage2[256] = {
+static const unsigned short attrpage2[256] = {
   0x0201, 0x0200, 0x0203, 0x0202, 0x0205, 0x0204, 0x0207, 0x0206, 0x0209, 
   0x0208, 0x020b, 0x020a, 0x020d, 0x020c, 0x020f, 0x020e, 0x0211, 0x0210, 
   0x0213, 0x0212, 0x0215, 0x0214, 0x0217, 0x0216, 0x0219, 0x0218, 0x021b, 
@@ -5053,7 +5053,7 @@ static unsigned short attrpage2[256] = {
   0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static unsigned short attrpage3[256] = {
+static const unsigned short attrpage3[256] = {
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -5085,7 +5085,7 @@ static unsigned short attrpage3[256] = {
   0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static unsigned short attrpage4[256] = {
+static const unsigned short attrpage4[256] = {
   0x0450, 0x0451, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457, 0x0458, 
   0x0459, 0x045a, 0x045b, 0x045c, 0x045d, 0x045e, 0x045f, 0x0430, 0x0431, 
   0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043a, 
@@ -5117,7 +5117,7 @@ static unsigned short attrpage4[256] = {
   0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static unsigned short attrpage5[256] = {
+static const unsigned short attrpage5[256] = {
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -5149,7 +5149,7 @@ static unsigned short attrpage5[256] = {
   0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static unsigned short attrpage6[256] = {
+static const unsigned short attrpage6[256] = {
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -5181,7 +5181,7 @@ static unsigned short attrpage6[256] = {
   0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static unsigned short attrpage9[256] = {
+static const unsigned short attrpage9[256] = {
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -5213,7 +5213,7 @@ static unsigned short attrpage9[256] = {
   0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static unsigned short attrpage10[256] = {
+static const unsigned short attrpage10[256] = {
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -5245,7 +5245,7 @@ static unsigned short attrpage10[256] = {
   0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static unsigned short attrpage11[256] = {
+static const unsigned short attrpage11[256] = {
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -5277,7 +5277,7 @@ static unsigned short attrpage11[256] = {
   0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static unsigned short attrpage12[256] = {
+static const unsigned short attrpage12[256] = {
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -5309,7 +5309,7 @@ static unsigned short attrpage12[256] = {
   0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static unsigned short attrpage13[256] = {
+static const unsigned short attrpage13[256] = {
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -5341,7 +5341,7 @@ static unsigned short attrpage13[256] = {
   0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static unsigned short attrpage14[256] = {
+static const unsigned short attrpage14[256] = {
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -5373,7 +5373,7 @@ static unsigned short attrpage14[256] = {
   0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static unsigned short attrpage15[256] = {
+static const unsigned short attrpage15[256] = {
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -5405,7 +5405,7 @@ static unsigned short attrpage15[256] = {
   0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static unsigned short attrpage16[256] = {
+static const unsigned short attrpage16[256] = {
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -5437,7 +5437,7 @@ static unsigned short attrpage16[256] = {
   0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static unsigned short attrpage19[256] = {
+static const unsigned short attrpage19[256] = {
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -5469,7 +5469,7 @@ static unsigned short attrpage19[256] = {
   0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static unsigned short attrpage23[256] = {
+static const unsigned short attrpage23[256] = {
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -5501,7 +5501,7 @@ static unsigned short attrpage23[256] = {
   0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static unsigned short attrpage24[256] = {
+static const unsigned short attrpage24[256] = {
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 
   0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x0000, 
@@ -5533,7 +5533,7 @@ static unsigned short attrpage24[256] = {
   0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static unsigned short attrpage30[256] = {
+static const unsigned short attrpage30[256] = {
   0x1e01, 0x1e00, 0x1e03, 0x1e02, 0x1e05, 0x1e04, 0x1e07, 0x1e06, 0x1e09, 
   0x1e08, 0x1e0b, 0x1e0a, 0x1e0d, 0x1e0c, 0x1e0f, 0x1e0e, 0x1e11, 0x1e10, 
   0x1e13, 0x1e12, 0x1e15, 0x1e14, 0x1e17, 0x1e16, 0x1e19, 0x1e18, 0x1e1b, 
@@ -5565,7 +5565,7 @@ static unsigned short attrpage30[256] = {
   0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static unsigned short attrpage31[256] = {
+static const unsigned short attrpage31[256] = {
   0x1f08, 0x1f09, 0x1f0a, 0x1f0b, 0x1f0c, 0x1f0d, 0x1f0e, 0x1f0f, 0x1f00, 
   0x1f01, 0x1f02, 0x1f03, 0x1f04, 0x1f05, 0x1f06, 0x1f07, 0x1f18, 0x1f19, 
   0x1f1a, 0x1f1b, 0x1f1c, 0x1f1d, 0x0000, 0x0000, 0x1f10, 0x1f11, 0x1f12, 
@@ -5597,7 +5597,7 @@ static unsigned short attrpage31[256] = {
   0xd85c, 0x0000, 0x0000, 0x0000
 };
 
-static unsigned short attrpage33[256] = {
+static const unsigned short attrpage33[256] = {
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
@@ -5629,7 +5629,7 @@ static unsigned short attrpage33[256] = {
   0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static unsigned short attrpage251[256] = {
+static const unsigned short attrpage251[256] = {
   0xd801, 0xd802, 0xd803, 0xd804, 0xd805, 0xd806, 0xd807, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0xd809, 0xd80a, 0xd80b, 0xd80c, 0xd80d, 0x0000, 0x0000, 0x0000, 
@@ -5661,7 +5661,7 @@ static unsigned short attrpage251[256] = {
   0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static unsigned short attrpage255[256] = {
+static const unsigned short attrpage255[256] = {
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
   0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 
   0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x0000, 
@@ -5693,7 +5693,7 @@ static unsigned short attrpage255[256] = {
   0x0000, 0x0000, 0x0000, 0x0000
 };
 
-static unsigned short *attr_table[256] = {
+static const unsigned short *attr_table[256] = {
   attrpage0,
   attrpage1,
   attrpage2,
@@ -5952,7 +5952,7 @@ static unsigned short *attr_table[256] = {
   attrpage255
 };
 
-static unsigned short title_table[][3] = {
+static const unsigned short title_table[][3] = {
   { 0x01c5, 0x01c4, 0x01c6 },
   { 0x01c8, 0x01c7, 0x01c9 },
   { 0x01cb, 0x01ca, 0x01cc },
@@ -5993,7 +5993,7 @@ static unsigned short title_table[][3] = {
  * other than the case of the codepoint, in the order [Ll],[Lu],[Lt],
  * separated and terminated by a double NUL.
  */
-static guchar special_case_table[][18] = {
+static const guchar special_case_table[][18] = {
  "\x00\x00\x00\x53\x00\x53\x00\x00\x00\x53\x00\x73\0",
  "\x00\x00\x00\x46\x00\x46\x00\x00\x00\x46\x00\x66\0",
  "\x00\x00\x00\x46\x00\x49\x00\x00\x00\x46\x00\x69\0",
@@ -6101,7 +6101,7 @@ static guchar special_case_table[][18] = {
 
 /* Table of casefolding cases that can't be derived by lowercasing
  */
-static struct {
+static const struct {
   guint16 ch;
   gchar data[7];
 } casefold_table[] = {
diff --git a/glib/gunicomp.h b/glib/gunicomp.h
index f2414ca56..b1b4965fa 100644
--- a/glib/gunicomp.h
+++ b/glib/gunicomp.h
@@ -3,7 +3,7 @@
 #define COMPOSE_SECOND_START 357
 #define COMPOSE_SECOND_SINGLE_START 388
 
-static gushort compose_page0[256] = {
+static const gushort compose_page0[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 147, 148, 149, 0, 0, 1, 2, 3, 4, 5, 150, 6, 
@@ -18,7 +18,7 @@ static gushort compose_page0[256] = {
   164, 0, 0, 0, 60, 0, 0, 0
 };
 
-static gushort compose_page1[256] = {
+static const gushort compose_page1[256] = {
   0, 0, 61, 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, 64, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -32,7 +32,7 @@ static gushort compose_page1[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static gushort compose_page2[256] = {
+static const gushort compose_page2[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 177, 178, 179, 180, 0, 0, 0, 0, 181, 
   182, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -46,7 +46,7 @@ static gushort compose_page2[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static gushort compose_page3[256] = {
+static const gushort compose_page3[256] = {
   357, 358, 359, 360, 361, 0, 362, 363, 364, 365, 366, 367, 368, 0, 0, 369, 
   0, 370, 0, 371, 372, 0, 0, 0, 0, 0, 0, 373, 0, 0, 0, 0, 0, 0, 0, 374, 375, 
   376, 377, 378, 379, 0, 0, 0, 0, 380, 381, 0, 382, 383, 0, 0, 0, 0, 0, 0, 0, 
@@ -61,7 +61,7 @@ static gushort compose_page3[256] = {
   0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static gushort compose_page4[256] = {
+static const gushort compose_page4[256] = {
   0, 0, 0, 0, 0, 0, 188, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 0, 0, 189, 0, 90, 91, 
   190, 92, 0, 191, 0, 0, 0, 192, 0, 0, 0, 0, 93, 0, 0, 0, 193, 0, 0, 0, 194, 
   0, 195, 0, 0, 94, 0, 0, 196, 0, 95, 96, 197, 97, 0, 198, 0, 0, 0, 199, 0, 
@@ -75,7 +75,7 @@ static gushort compose_page4[256] = {
   208, 209, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static gushort compose_page6[256] = {
+static const gushort compose_page6[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 99, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 210, 0, 
@@ -89,7 +89,7 @@ static gushort compose_page6[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static gushort compose_page9[256] = {
+static const gushort compose_page9[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 215, 0, 0, 0, 0, 0, 0, 0, 216, 
   0, 0, 217, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -103,7 +103,7 @@ static gushort compose_page9[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static gushort compose_page11[256] = {
+static const gushort compose_page11[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 393, 0, 0, 0, 0, 0, 0, 0, 0, 101, 0, 0, 
@@ -117,7 +117,7 @@ static gushort compose_page11[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static gushort compose_page12[256] = {
+static const gushort compose_page12[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 220, 0, 0, 0, 
@@ -131,7 +131,7 @@ static gushort compose_page12[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static gushort compose_page13[256] = {
+static const gushort compose_page13[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 401, 0, 0, 0, 0, 0, 0, 0, 104, 223, 0, 
@@ -145,7 +145,7 @@ static gushort compose_page13[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static gushort compose_page16[256] = {
+static const gushort compose_page16[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 225, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -159,7 +159,7 @@ static gushort compose_page16[256] = {
   0, 0, 0, 0, 0, 0, 0
 };
 
-static gushort compose_page30[256] = {
+static const gushort compose_page30[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 226, 227, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -173,7 +173,7 @@ static gushort compose_page30[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static gushort compose_page31[256] = {
+static const gushort compose_page31[256] = {
   108, 109, 236, 237, 238, 239, 240, 241, 110, 111, 242, 243, 244, 245, 246, 
   247, 112, 113, 0, 0, 0, 0, 0, 0, 114, 115, 0, 0, 0, 0, 0, 0, 116, 117, 248, 
   249, 250, 251, 252, 253, 118, 119, 254, 255, 256, 257, 258, 259, 120, 121, 
@@ -189,7 +189,7 @@ static gushort compose_page31[256] = {
   136, 0
 };
 
-static gushort compose_page33[256] = {
+static const gushort compose_page33[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -203,7 +203,7 @@ static gushort compose_page33[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static gushort compose_page34[256] = {
+static const gushort compose_page34[256] = {
   0, 0, 0, 284, 0, 0, 0, 0, 285, 0, 0, 286, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 287, 0, 288, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 289, 0, 0, 0, 0, 0, 0, 290, 0, 291, 
@@ -218,7 +218,7 @@ static gushort compose_page34[256] = {
   0, 0, 0, 0
 };
 
-static gushort compose_page48[256] = {
+static const gushort compose_page48[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 319, 0, 0, 0, 
@@ -233,7 +233,7 @@ static gushort compose_page48[256] = {
   354, 355, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 356, 0, 0
 };
 
-static unsigned short *compose_table[256] = {
+static const unsigned short *compose_table[256] = {
   compose_page0,
   compose_page1,
   compose_page2,
@@ -285,7 +285,7 @@ static unsigned short *compose_table[256] = {
   compose_page48
 };
 
-static gushort compose_first_single[][2] = {
+static const gushort compose_first_single[][2] = {
  { 0x0338, 0x226e },
  { 0x0338, 0x2260 },
  { 0x0338, 0x226f },
@@ -497,7 +497,7 @@ static gushort compose_first_single[][2] = {
  { 0x3099, 0x30fa },
  { 0x3099, 0x30fe }
 };
-static gushort compose_second_single[][2] = {
+static const gushort compose_second_single[][2] = {
  { 0x0627, 0x0622 },
  { 0x0627, 0x0623 },
  { 0x0627, 0x0625 },
@@ -517,7 +517,7 @@ static gushort compose_second_single[][2] = {
  { 0x0dd9, 0x0ddc },
  { 0x0dd9, 0x0dde }
 };
-static gushort compose_array[146][31] = {
+static const gushort compose_array[146][31] = {
  { 0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x0100, 0x0102, 0x0226, 0x00c4, 0x1ea2, 0x00c5,      0, 0x01cd, 0x0200, 0x0202,      0,      0,      0, 0x1ea0,      0, 0x1e00,      0,      0, 0x0104,      0,      0,      0,      0,      0,      0,      0,      0 },
  {      0,      0,      0,      0,      0,      0, 0x1e02,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0, 0x1e04,      0,      0,      0,      0,      0,      0,      0,      0, 0x1e06,      0,      0,      0,      0 },
  {      0, 0x0106, 0x0108,      0,      0,      0, 0x010a,      0,      0,      0,      0, 0x010c,      0,      0,      0,      0,      0,      0,      0,      0,      0, 0x00c7,      0,      0,      0,      0,      0,      0,      0,      0,      0 },
diff --git a/glib/gunidecomp.h b/glib/gunidecomp.h
index 983ee553f..d33a9a9a9 100644
--- a/glib/gunidecomp.h
+++ b/glib/gunidecomp.h
@@ -5,7 +5,7 @@
 
 #define G_UNICODE_LAST_CHAR 0xffff
 
-static unsigned char cclass3[256] = {
+static const unsigned char cclass3[256] = {
   230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, 
   230, 230, 230, 230, 230, 230, 232, 220, 220, 220, 220, 232, 216, 220, 220, 
   220, 220, 220, 202, 202, 220, 220, 220, 220, 202, 202, 220, 220, 220, 220, 
@@ -21,7 +21,7 @@ static unsigned char cclass3[256] = {
   0, 0, 0, 0, 0, 0, 0
 };
 
-static unsigned char cclass4[256] = {
+static const unsigned char cclass4[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -35,7 +35,7 @@ static unsigned char cclass4[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static unsigned char cclass5[256] = {
+static const unsigned char cclass5[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -50,7 +50,7 @@ static unsigned char cclass5[256] = {
   0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static unsigned char cclass6[256] = {
+static const unsigned char cclass6[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -64,7 +64,7 @@ static unsigned char cclass6[256] = {
   220, 230, 230, 220, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static unsigned char cclass7[256] = {
+static const unsigned char cclass7[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, 
   220, 230, 230, 220, 230, 230, 220, 220, 220, 230, 220, 220, 230, 220, 230, 
@@ -78,7 +78,7 @@ static unsigned char cclass7[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static unsigned char cclass9[256] = {
+static const unsigned char cclass9[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -92,7 +92,7 @@ static unsigned char cclass9[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static unsigned char cclass10[256] = {
+static const unsigned char cclass10[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -106,7 +106,7 @@ static unsigned char cclass10[256] = {
   0, 0, 0, 0, 0, 0
 };
 
-static unsigned char cclass11[256] = {
+static const unsigned char cclass11[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -120,7 +120,7 @@ static unsigned char cclass11[256] = {
   0, 0, 0, 0, 0, 0
 };
 
-static unsigned char cclass12[256] = {
+static const unsigned char cclass12[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -134,7 +134,7 @@ static unsigned char cclass12[256] = {
   0, 0, 0, 0, 0, 0, 0
 };
 
-static unsigned char cclass13[256] = {
+static const unsigned char cclass13[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -148,7 +148,7 @@ static unsigned char cclass13[256] = {
   0, 0, 0, 0, 0, 0
 };
 
-static unsigned char cclass14[256] = {
+static const unsigned char cclass14[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 103, 103, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 107, 
@@ -162,7 +162,7 @@ static unsigned char cclass14[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static unsigned char cclass15[256] = {
+static const unsigned char cclass15[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   220, 220, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 220, 0, 220, 0, 216, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -176,7 +176,7 @@ static unsigned char cclass15[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static unsigned char cclass16[256] = {
+static const unsigned char cclass16[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 7, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -190,7 +190,7 @@ static unsigned char cclass16[256] = {
   0, 0, 0, 0, 0, 0
 };
 
-static unsigned char cclass23[256] = {
+static const unsigned char cclass23[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -204,7 +204,7 @@ static unsigned char cclass23[256] = {
   0, 0, 0, 0, 0, 0
 };
 
-static unsigned char cclass24[256] = {
+static const unsigned char cclass24[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -218,7 +218,7 @@ static unsigned char cclass24[256] = {
   0, 0, 0, 0, 0, 0, 0
 };
 
-static unsigned char cclass32[256] = {
+static const unsigned char cclass32[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -232,7 +232,7 @@ static unsigned char cclass32[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static unsigned char cclass48[256] = {
+static const unsigned char cclass48[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 218, 228, 232, 222, 224, 
   224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -246,7 +246,7 @@ static unsigned char cclass48[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static unsigned char cclass251[256] = {
+static const unsigned char cclass251[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -260,7 +260,7 @@ static unsigned char cclass251[256] = {
   0, 0, 0, 0, 0, 0
 };
 
-static unsigned char cclass254[256] = {
+static const unsigned char cclass254[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 230, 230, 230, 230, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
@@ -274,7 +274,7 @@ static unsigned char cclass254[256] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static unsigned char *combining_class_table[256] = {
+static const unsigned char *combining_class_table[256] = {
   (unsigned char *) 0,
   (unsigned char *) 0,
   (unsigned char *) 0,
@@ -541,7 +541,7 @@ typedef struct
   unsigned char *expansion;
 } decomposition;
 
-static decomposition decomp_table[] =
+static const decomposition decomp_table[] =
 {
   { 0x00a0, 255, 0, "\x00\x20\0" },
   { 0x00a8, 255, 0, "\x00\x20\x03\x08\0" },
diff --git a/glib/guniprop.c b/glib/guniprop.c
index fc2fe84d9..e41a8b4bb 100644
--- a/glib/guniprop.c
+++ b/glib/guniprop.c
@@ -360,7 +360,7 @@ g_unichar_toupper (gunichar c)
       gunichar val = ATTTABLE (c >> 8, c & 0xff);
       if (val >= 0xd800 && val < 0xdc00)
 	{
-	  guchar *p = special_case_table[val - 0xd800];
+	  const guchar *p = special_case_table[val - 0xd800];
 	  return p[0] * 256 + p[1];
 	}
       else
@@ -397,7 +397,7 @@ g_unichar_tolower (gunichar c)
       gunichar val = ATTTABLE (c >> 8, c & 0xff);
       if (val >= 0xd800 && val < 0xdc00)
 	{
-	  guchar *p = special_case_table[val - 0xd800];
+	  const guchar *p = special_case_table[val - 0xd800];
 	  return p[0] * 256 + p[1];
 	}
       else
@@ -562,7 +562,7 @@ output_special_case (gchar *out_buffer,
 		     int    type,
 		     int    which)
 {
-  guchar *p = special_case_table[index];
+  const guchar *p = special_case_table[index];
 
   if (type != G_UNICODE_TITLECASE_LETTER)
     p += 2; /* +2 to skip over "best single match" */