Index: libmpc/branches/r2d/libmpcdec/decoder.h
===================================================================
--- libmpc/branches/r2d/libmpcdec/decoder.h	(revision 179)
+++ libmpc/branches/r2d/libmpcdec/decoder.h	(revision 195)
@@ -39,5 +39,5 @@
 #endif
 
-#include <mpcdec/reader.h>
+#include <mpc/reader.h>
 
 #ifdef __cplusplus
Index: libmpc/branches/r2d/libmpcdec/internal.h
===================================================================
--- libmpc/branches/r2d/libmpcdec/internal.h	(revision 179)
+++ libmpc/branches/r2d/libmpcdec/internal.h	(revision 195)
@@ -43,5 +43,5 @@
 #endif
 
-#include <mpcdec/mpcdec.h>
+#include <mpc/mpcdec.h>
 
 /// Big/little endian 32 bit byte swapping routine.
Index: libmpc/branches/r2d/libmpcdec/math.h
===================================================================
--- libmpc/branches/r2d/libmpcdec/math.h	(revision 179)
+++ libmpc/branches/r2d/libmpcdec/math.h	(revision 195)
@@ -75,5 +75,5 @@
 
 #ifdef _DEBUG
-static inline MPC_SAMPLE_FORMAT MPC_MULTIPLY(MPC_SAMPLE_FORMAT item1,MPC_SAMPLE_FORMAT item2)
+static mpc_inline MPC_SAMPLE_FORMAT MPC_MULTIPLY(MPC_SAMPLE_FORMAT item1,MPC_SAMPLE_FORMAT item2)
 {
     MPC_SAMPLE_FORMAT_MULTIPLY temp = MPC_MULTIPLY_NOTRUNCATE(item1,item2);
@@ -82,5 +82,5 @@
 }
 
-static inline MPC_SAMPLE_FORMAT MPC_MULTIPLY_EX(MPC_SAMPLE_FORMAT item1,MPC_SAMPLE_FORMAT item2,unsigned shift)
+static mpc_inline MPC_SAMPLE_FORMAT MPC_MULTIPLY_EX(MPC_SAMPLE_FORMAT item1,MPC_SAMPLE_FORMAT item2,unsigned shift)
 {
     MPC_SAMPLE_FORMAT_MULTIPLY temp = MPC_MULTIPLY_EX_NOTRUNCATE(item1,item2,shift);
Index: libmpc/branches/r2d/libmpcdec/mpc_bits_reader.c
===================================================================
--- libmpc/branches/r2d/libmpcdec/mpc_bits_reader.c	(revision 179)
+++ libmpc/branches/r2d/libmpcdec/mpc_bits_reader.c	(revision 195)
@@ -33,5 +33,5 @@
 */
 
-#include <mpcdec/mpcdec.h>
+#include <mpc/mpcdec.h>
 #include "internal.h"
 #include "huffman.h"
Index: libmpc/branches/r2d/libmpcdec/mpc_decoder.c
===================================================================
--- libmpc/branches/r2d/libmpcdec/mpc_decoder.c	(revision 179)
+++ libmpc/branches/r2d/libmpcdec/mpc_decoder.c	(revision 195)
@@ -35,5 +35,5 @@
 /// Core decoding routines and logic.
 #include <string.h>
-#include <mpcdec/mpcdec.h>
+#include <mpc/mpcdec.h>
 #include <mpc/minimax.h>
 #include "decoder.h"
Index: libmpc/branches/r2d/libmpcdec/mpc_demux.c
===================================================================
--- libmpc/branches/r2d/libmpcdec/mpc_demux.c	(revision 179)
+++ libmpc/branches/r2d/libmpcdec/mpc_demux.c	(revision 195)
@@ -34,6 +34,6 @@
 
 #include <string.h>
-#include <mpcdec/streaminfo.h>
-#include <mpcdec/mpcdec.h>
+#include <mpc/streaminfo.h>
+#include <mpc/mpcdec.h>
 #include "internal.h"
 #include "decoder.h"
Index: libmpc/branches/r2d/libmpcdec/mpc_reader.c
===================================================================
--- libmpc/branches/r2d/libmpcdec/mpc_reader.c	(revision 179)
+++ libmpc/branches/r2d/libmpcdec/mpc_reader.c	(revision 195)
@@ -34,5 +34,5 @@
 /// \file mpc_reader.c
 /// Contains implementations for simple file-based mpc_reader
-#include <mpcdec/reader.h>
+#include <mpc/reader.h>
 #include "internal.h"
 #include <stdio.h>
Index: libmpc/branches/r2d/libmpcdec/requant.c
===================================================================
--- libmpc/branches/r2d/libmpcdec/requant.c	(revision 179)
+++ libmpc/branches/r2d/libmpcdec/requant.c	(revision 195)
@@ -35,5 +35,5 @@
 /// Requantization function implementations.
 /// \todo document me
-#include <mpcdec/mpcdec.h>
+#include <mpc/mpcdec.h>
 
 #include "requant.h"
Index: libmpc/branches/r2d/libmpcdec/streaminfo.c
===================================================================
--- libmpc/branches/r2d/libmpcdec/streaminfo.c	(revision 179)
+++ libmpc/branches/r2d/libmpcdec/streaminfo.c	(revision 195)
@@ -35,6 +35,6 @@
 /// Implementation of streaminfo reading functions.
 
-#include <mpcdec/mpcdec.h>
-#include <mpcdec/streaminfo.h>
+#include <mpc/mpcdec.h>
+#include <mpc/streaminfo.h>
 #include <stdio.h>
 #include "internal.h"
Index: libmpc/branches/r2d/libmpcdec/synth_filter.c
===================================================================
--- libmpc/branches/r2d/libmpcdec/synth_filter.c	(revision 179)
+++ libmpc/branches/r2d/libmpcdec/synth_filter.c	(revision 195)
@@ -36,5 +36,5 @@
 /// \todo document me
 #include <string.h>
-#include <mpcdec/mpcdec.h>
+#include <mpc/mpcdec.h>
 #include "decoder.h"
 #include "math.h"
@@ -283,5 +283,5 @@
     A15 = MPC_SCALE_CONST_SHL((B14 - B15) , 0.7071067691f , 31, MPC_FIXED_POINT_SYNTH_FIX);
 
-    // mehrfach verwendete Ausdrücke: A04+A06+A07, A09+A13+A15
+    // mehrfach verwendete Ausdrcke: A04+A06+A07, A09+A13+A15
     pV[ 5] = (pV[11] = (pV[13] = A07 + (pV[15] = A15)) + A11) + A05 + A13;
     pV[ 7] = (pV[ 9] = A03 + A11 + A15) + A13;
@@ -289,9 +289,9 @@
     pV[35] = -(pV[ 3] = A05 + A07 + A09 + A13 + A15) - A06 - A14;
     pV[37] = (tmp = -(A10 + A11 + A13 + A14 + A15)) - A05 - A06 - A07;
-    pV[39] = tmp - A02 - A03;                      // abhängig vom Befehl drüber
-    pV[41] = (tmp += A13 - A12) - A02 - A03;       // abhängig vom Befehl 2 drüber
-    pV[43] = tmp - A04 - A06 - A07;                // abhängig von Befehlen 1 und 3 drüber
+    pV[39] = tmp - A02 - A03;                      // abhï¿œgig vom Befehl drber
+    pV[41] = (tmp += A13 - A12) - A02 - A03;       // abhï¿œgig vom Befehl 2 drber
+    pV[43] = tmp - A04 - A06 - A07;                // abhï¿œgig von Befehlen 1 und 3 drber
     pV[47] = (tmp = -(A08 + A12 + A14 + A15)) - A00;
-    pV[45] = tmp - A04 - A06 - A07;                // abhängig vom Befehl drüber
+    pV[45] = tmp - A04 - A06 - A07;                // abhï¿œgig vom Befehl drber
 
     pV[32] = -pV[ 0];
@@ -329,5 +329,5 @@
 }
 
-static void 
+static void
 mpc_synthese_filter_float_internal(MPC_SAMPLE_FORMAT* p_out, MPC_SAMPLE_FORMAT* pV, const MPC_SAMPLE_FORMAT* pY)
 {
@@ -356,5 +356,5 @@
 
 void
-mpc_decoder_synthese_filter_float(mpc_decoder* p_dec, MPC_SAMPLE_FORMAT* p_out) 
+mpc_decoder_synthese_filter_float(mpc_decoder* p_dec, MPC_SAMPLE_FORMAT* p_out)
 {
     /********* left channel ********/
@@ -411,5 +411,5 @@
  */
 mpc_uint32_t
-mpc_random_int(mpc_decoder* p_dec) 
+mpc_random_int(mpc_decoder* p_dec)
 {
 #if 1
