diff --git a/misc/unictabl/mk_encodings.sh b/misc/unictabl/mk_encodings.sh
index 45d894953b..90e3177ca3 100755
--- a/misc/unictabl/mk_encodings.sh
+++ b/misc/unictabl/mk_encodings.sh
@@ -78,7 +78,7 @@ echo "
  *
  */
 
-static struct {
+static const struct {
     wxUint16 c  /*code*/;
     wxUint8  s /*inaccurate substitution*/;
 } encoding_unicode_fallback[] = {
@@ -92,7 +92,7 @@ done
 echo "    {0, 0}" >> unictabl.inc
 echo " };" >> unictabl.inc
 echo "
-static unsigned encoding_unicode_fallback_count = "`cat Fallbacks | wc -l`";" >> unictabl.inc
+static const unsigned encoding_unicode_fallback_count = "`cat Fallbacks | wc -l`";" >> unictabl.inc
 
 
 echo "  * adding reference table..."
@@ -108,7 +108,7 @@ echo "
  *
  */
 
-static struct {
+static const struct {
     wxFontEncoding encoding; // encoding identifier
     const wxUint16 *table;         // 8bit to unicode table
 } encodings_list[] = {
diff --git a/src/common/unictabl.inc b/src/common/unictabl.inc
index 8810bb78c3..de258f6d50 100644
--- a/src/common/unictabl.inc
+++ b/src/common/unictabl.inc
@@ -621,7 +621,7 @@ static const wxUint16 encoding_table__KOI8_U[128] = {
  *
  */
 
-static struct {
+static const struct {
     wxUint16 c  /*code*/;
     wxUint8  s /*inaccurate substitution*/;
 } encoding_unicode_fallback[] = {
@@ -829,7 +829,7 @@ static struct {
     {0, 0}
  };
 
-static unsigned encoding_unicode_fallback_count =  200;
+static const unsigned encoding_unicode_fallback_count =  200;
 
 
 
@@ -840,7 +840,7 @@ static unsigned encoding_unicode_fallback_count =  200;
  *
  */
 
-static struct {
+static const struct {
     wxFontEncoding encoding; // encoding identifier
     const wxUint16 *table;         // 8bit to unicode table
 } encodings_list[] = {