Index: libmpc/branches/r2d/mpcgain/mpcgain.c
===================================================================
--- libmpc/branches/r2d/mpcgain/mpcgain.c	(revision 195)
+++ libmpc/branches/r2d/mpcgain/mpcgain.c	(revision 219)
@@ -39,8 +39,6 @@
 
 #include "../libmpcdec/internal.h"
-
-// mpc_bits_reader.c
-int mpc_bits_get_block(mpc_bits_reader * r, mpc_block * p_block);
-unsigned int mpc_bits_get_size(mpc_bits_reader * r, mpc_uint64_t * p_size);
+#include "../libmpcdec/huffman.h"
+#include "../libmpcdec/mpc_bits_reader.h"
 
 // crc32.c