Index: /libmpc/trunk/libmpcdec/huffman.h
===================================================================
--- /libmpc/trunk/libmpcdec/huffman.h	(revision 381)
+++ /libmpc/trunk/libmpcdec/huffman.h	(revision 382)
@@ -65,5 +65,5 @@
 /// Type used for huffman LUT decoding
 typedef struct mpc_lut_data_t {
-	const mpc_huffman * table;
+	mpc_huffman const * const table;
 	mpc_huff_lut lut[1 << LUT_DEPTH];
 } mpc_lut_data;
@@ -71,6 +71,6 @@
 /// Type used for canonical huffman decoding
 typedef struct mpc_can_data_t {
-	const mpc_huffman * table;
-	const mpc_int8_t * sym;
+	mpc_huffman const * const table;
+	mpc_int8_t const * const sym;
 	mpc_huff_lut lut[1 << LUT_DEPTH];
 } mpc_can_data;
Index: /libmpc/trunk/libmpcdec/streaminfo.c
===================================================================
--- /libmpc/trunk/libmpcdec/streaminfo.c	(revision 381)
+++ /libmpc/trunk/libmpcdec/streaminfo.c	(revision 382)
@@ -46,5 +46,5 @@
 
 static const char na[] = "n.a.";
-static const char *versionNames[] = {
+static char const * const versionNames[] = {
     na, "'Unstable/Experimental'", na, na, na, "'quality 0'", "'quality 1'",
     "'Telephone'", "'Thumb'", "'Radio'", "'Standard'", "'Extreme'", "'Insane'",
Index: /libmpc/trunk/libmpcenc/encode_sv7.c
===================================================================
--- /libmpc/trunk/libmpcenc/encode_sv7.c	(revision 381)
+++ /libmpc/trunk/libmpcenc/encode_sv7.c	(revision 382)
@@ -28,12 +28,12 @@
 
 // huffsv7.c
-extern const Huffman_t HuffBands [33];
-extern const Huffman_t HuffRes [2][17];
-extern Huffman_t HuffSCFI_1 [4];         // contains tables for SV7-scalefactor select
-extern Huffman_t HuffSCFI_2 [16];         // contains tables for SV7-scalefactor select
-extern Huffman_t HuffDSCF_1 [64];         // contains tables for SV7-scalefactor coding
-extern Huffman_t HuffDSCF_2 [65];         // contains tables for SV7-scalefactor coding
-extern const Huffman_t * HuffQ [2][8];         // points to tables for SV7-sample coding
-extern const Huffman_t HuffQ9up [256];
+extern Huffman_t const HuffBands [33];
+extern Huffman_t const HuffRes [2][17];
+extern Huffman_t const HuffSCFI_1 [4];         // contains tables for SV7-scalefactor select
+extern Huffman_t const HuffSCFI_2 [16];         // contains tables for SV7-scalefactor select
+extern Huffman_t const HuffDSCF_1 [64];         // contains tables for SV7-scalefactor coding
+extern Huffman_t const HuffDSCF_2 [65];         // contains tables for SV7-scalefactor coding
+extern Huffman_t const * const HuffQ [2][8];         // points to tables for SV7-sample coding
+extern Huffman_t const HuffQ9up [256];
 
 /*
Index: /libmpc/trunk/libmpcenc/huffsv7.c
===================================================================
--- /libmpc/trunk/libmpcenc/huffsv7.c	(revision 381)
+++ /libmpc/trunk/libmpcenc/huffsv7.c	(revision 382)
@@ -104,5 +104,5 @@
 };
 
-const Huffman_t* HuffQ [2] [8] = {
+Huffman_t const * const HuffQ [2] [8] = {
 	{ HuffQ1, HuffQ2[0], HuffQ3, HuffQ4, HuffQ5[0], HuffQ6[0], HuffQ7[0], HuffQ8[0] },
 	{ HuffQ1, HuffQ2[1], HuffQ3, HuffQ4, HuffQ5[1], HuffQ6[1], HuffQ7[1], HuffQ8[1] }