14 files changed, 17 insertions, 14 deletions
diff --git a/apps/codecs/libmusepack/crc32.c b/apps/codecs/libmusepack/crc32.c
index f9f3b8a73d..7613f1c2c8 100755..100644
--- a/apps/codecs/libmusepack/crc32.c
+++ b/apps/codecs/libmusepack/crc32.c
@@ -4,6 +4,7 @@
 *  code from http://www.w3.org/TR/PNG/#D-CRCAppendix
 *
 */
+#include "internal.h"
 
 /* Table of CRCs of all 8-bit messages. */
 static unsigned long crc_table[256];
diff --git a/apps/codecs/libmusepack/huffman.c b/apps/codecs/libmusepack/huffman.c
index c304775623..c304775623 100755..100644
--- a/apps/codecs/libmusepack/huffman.c
+++ b/apps/codecs/libmusepack/huffman.c
diff --git a/apps/codecs/libmusepack/internal.h b/apps/codecs/libmusepack/internal.h
index d12c39c96b..c4d789f617 100644
--- a/apps/codecs/libmusepack/internal.h
+++ b/apps/codecs/libmusepack/internal.h
@@ -100,6 +100,18 @@ static mpc_inline mpc_status mpc_check_key(char * key)
 mpc_uint32_t mpc_random_int(mpc_decoder *d); // in synth_filter.c
 void mpc_decoder_init_quant(mpc_decoder *d, double scale_factor);
 void mpc_decoder_synthese_filter_float(mpc_decoder *d, MPC_SAMPLE_FORMAT* OutData, mpc_int_t channels);
+unsigned long mpc_crc32(unsigned char *buf, int len);
+
+// streaminfo.c
+mpc_status streaminfo_read_header_sv8(mpc_streaminfo* si,
+                                      const mpc_bits_reader * r_in,
+                                      mpc_size_t block_size);
+mpc_status streaminfo_read_header_sv7(mpc_streaminfo* si, mpc_bits_reader * r_in);
+void  streaminfo_encoder_info(mpc_streaminfo* si, const mpc_bits_reader * r_in);
+void  streaminfo_gain(mpc_streaminfo* si, const mpc_bits_reader * r_in);
+
+// mpc_decoder.c
+void mpc_decoder_reset_scf(mpc_decoder * d, int value);
 
 #ifdef __cplusplus
 }
diff --git a/apps/codecs/libmusepack/minimax.h b/apps/codecs/libmusepack/minimax.h
index 1192626567..1192626567 100755..100644
--- a/apps/codecs/libmusepack/minimax.h
+++ b/apps/codecs/libmusepack/minimax.h
diff --git a/apps/codecs/libmusepack/mpc_bits_reader.c b/apps/codecs/libmusepack/mpc_bits_reader.c
index 58b3f37e08..58b3f37e08 100755..100644
--- a/apps/codecs/libmusepack/mpc_bits_reader.c
+++ b/apps/codecs/libmusepack/mpc_bits_reader.c
diff --git a/apps/codecs/libmusepack/mpc_bits_reader.h b/apps/codecs/libmusepack/mpc_bits_reader.h
index 1233720c74..1233720c74 100755..100644
--- a/apps/codecs/libmusepack/mpc_bits_reader.h
+++ b/apps/codecs/libmusepack/mpc_bits_reader.h
diff --git a/apps/codecs/libmusepack/mpc_decoder.c b/apps/codecs/libmusepack/mpc_decoder.c
index 3f8fbc7aad..bbc916db8b 100644
--- a/apps/codecs/libmusepack/mpc_decoder.c
+++ b/apps/codecs/libmusepack/mpc_decoder.c
@@ -133,7 +133,7 @@ void mpc_decoder_reset_scf(mpc_decoder * d, int value)
     memset(d->SCF_Index_R, value, sizeof d->SCF_Index_R );
 }
 
-void mpc_decoder_setup(mpc_decoder *d)
+static void mpc_decoder_setup(mpc_decoder *d)
 {
     memset(d, 0, sizeof *d);
 
@@ -148,7 +148,7 @@ void mpc_decoder_setup(mpc_decoder *d)
     mpc_decoder_init_quant(d, 1.0f);
 }
 
-void mpc_decoder_set_streaminfo(mpc_decoder *d, mpc_streaminfo *si)
+static void mpc_decoder_set_streaminfo(mpc_decoder *d, mpc_streaminfo *si)
 {
     d->stream_version     = si->stream_version;
     d->ms                 = si->ms;
diff --git a/apps/codecs/libmusepack/mpc_demux.c b/apps/codecs/libmusepack/mpc_demux.c
index 75d02bae54..244ef25644 100755..100644
--- a/apps/codecs/libmusepack/mpc_demux.c
+++ b/apps/codecs/libmusepack/mpc_demux.c
@@ -52,17 +52,6 @@ static mpc_uint8_t g_buffer[DEMUX_BUFFER_SIZE + MAX_FRAME_SIZE];
 static mpc_seek_t g_seek_table[MAX_SEEK_TABLE_SIZE];
 static mpc_demux g_mpc_demux IBSS_ATTR;
 
-// streaminfo.c
-mpc_status streaminfo_read_header_sv8(mpc_streaminfo* si,
-                                      const mpc_bits_reader * r_in,
-                                      mpc_size_t block_size);
-mpc_status streaminfo_read_header_sv7(mpc_streaminfo* si, mpc_bits_reader * r_in);
-void  streaminfo_encoder_info(mpc_streaminfo* si, const mpc_bits_reader * r_in);
-void  streaminfo_gain(mpc_streaminfo* si, const mpc_bits_reader * r_in);
-
-// mpc_decoder.c
-void mpc_decoder_reset_scf(mpc_decoder * d, int value);
-
 enum {
     MPC_BUFFER_SWAP = 1,
     MPC_BUFFER_FULL = 2,
diff --git a/apps/codecs/libmusepack/mpc_types.h b/apps/codecs/libmusepack/mpc_types.h
index 61ee5ea67f..61ee5ea67f 100755..100644
--- a/apps/codecs/libmusepack/mpc_types.h
+++ b/apps/codecs/libmusepack/mpc_types.h
diff --git a/apps/codecs/libmusepack/mpcdec.h b/apps/codecs/libmusepack/mpcdec.h
index be18cfec95..be18cfec95 100755..100644
--- a/apps/codecs/libmusepack/mpcdec.h
+++ b/apps/codecs/libmusepack/mpcdec.h
diff --git a/apps/codecs/libmusepack/mpcdec_math.h b/apps/codecs/libmusepack/mpcdec_math.h
index 55295dba32..55295dba32 100755..100644
--- a/apps/codecs/libmusepack/mpcdec_math.h
+++ b/apps/codecs/libmusepack/mpcdec_math.h
diff --git a/apps/codecs/libmusepack/requant.c b/apps/codecs/libmusepack/requant.c
index d8ded7ecf9..ad26867204 100644
--- a/apps/codecs/libmusepack/requant.c
+++ b/apps/codecs/libmusepack/requant.c
@@ -38,6 +38,7 @@
 #include "requant.h"
 #include "mpcdec_math.h"
 #include "decoder.h"
+#include "internal.h"
 
 /* C O N S T A N T S */
 // Bits per sample for chosen quantizer
diff --git a/apps/codecs/libmusepack/streaminfo.c b/apps/codecs/libmusepack/streaminfo.c
index 5c135ef64a..2d8ece704a 100644
--- a/apps/codecs/libmusepack/streaminfo.c
+++ b/apps/codecs/libmusepack/streaminfo.c
@@ -42,7 +42,6 @@
 #include "huffman.h"
 #include "mpc_bits_reader.h"
 
-unsigned long mpc_crc32(unsigned char *buf, int len);
 /* rockbox: not used
 static const char na[] = "n.a.";
 static char const * const versionNames[] = {
diff --git a/apps/codecs/libmusepack/synth_filter.c b/apps/codecs/libmusepack/synth_filter.c
index b6caf4a3d7..0f415a4838 100644
--- a/apps/codecs/libmusepack/synth_filter.c
+++ b/apps/codecs/libmusepack/synth_filter.c
@@ -39,6 +39,7 @@
 #include "mpcdec.h"
 #include "decoder.h"
 #include "mpcdec_math.h"
+#include "internal.h"
 
 /* C O N S T A N T S */
 #undef _