3 files changed, 6 insertions, 5 deletions

diff --git a/apps/codecs/Tremor/asm_mcf5249.h b/apps/codecs/Tremor/asm_mcf5249.h
index 2dcff021a4..eb6ed759fc 100644
--- a/apps/codecs/Tremor/asm_mcf5249.h
+++ b/apps/codecs/Tremor/asm_mcf5249.h
@@ -29,10 +29,6 @@
 
 #define MB()
 
-static inline void mcf5249_init_mac(void) {
-  asm volatile ("move.l #0x20, %macsr;");  /* frac, truncate, no saturation */
-}
-
 static inline ogg_int32_t MULT32(ogg_int32_t x, ogg_int32_t y) {
 
   asm volatile ("mac.l %[x], %[y], %%acc0;"    /* multiply & shift  */
diff --git a/apps/codecs/Tremor/vorbisfile.c b/apps/codecs/Tremor/vorbisfile.c
index 0d8c04ab91..92f42a313b 100644
--- a/apps/codecs/Tremor/vorbisfile.c
+++ b/apps/codecs/Tremor/vorbisfile.c
@@ -21,6 +21,7 @@
 #include <errno.h>
 #include <string.h>
 #include <math.h>
+#include "system.h"
 
 #include "ivorbiscodec.h"
 #include "ivorbisfile.h"
diff --git a/apps/codecs/mpa.c b/apps/codecs/mpa.c
index fb478222a4..8cfd6eff1c 100644
--- a/apps/codecs/mpa.c
+++ b/apps/codecs/mpa.c
@@ -24,6 +24,7 @@
 #include "playback.h"
 #include "dsp.h"
 #include "lib/codeclib.h"
+#include "system.h"
 
 struct mad_stream Stream IDATA_ATTR;
 struct mad_frame Frame IDATA_ATTR;
@@ -92,7 +93,10 @@ enum codec_status codec_start(struct codec_api* api)
     ci->memset(&Frame, 0, sizeof(struct mad_frame));
     ci->memset(&Synth, 0, sizeof(struct mad_synth));
     ci->memset(&Timer, 0, sizeof(mad_timer_t));
-  
+    
+#if defined(CPU_COLDFIRE) && !defined(SIMULATOR)
+    mcf5249_init_mac();
+#endif
     mad_stream_init(&Stream);
     mad_frame_init(&Frame);
     mad_synth_init(&Synth);