Index: libmpc/branches/r2d/libmpcenc/Makefile.am
===================================================================
--- libmpc/branches/r2d/libmpcenc/Makefile.am	(revision 135)
+++ libmpc/branches/r2d/libmpcenc/Makefile.am	(revision 137)
@@ -1,3 +1,3 @@
-INCLUDES = -I$(top_srcdir)/common
+INCLUDES = -I$(top_srcdir)/include/
 METASOURCES = AUTO
 lib_LIBRARIES = libmpcenc.a
Index: libmpc/branches/r2d/libmpcenc/analy_filter.c
===================================================================
--- libmpc/branches/r2d/libmpcenc/analy_filter.c	(revision 135)
+++ libmpc/branches/r2d/libmpcenc/analy_filter.c	(revision 137)
@@ -21,6 +21,6 @@
 #include <math.h>
 
-#include "mpcmath.h"
-#include "datatypes.h"
+#include <mpc/mpcmath.h>
+#include <mpc/datatypes.h>
 
 #define FASTER
Index: libmpc/branches/r2d/libmpcenc/bitstream.c
===================================================================
--- libmpc/branches/r2d/libmpcenc/bitstream.c	(revision 135)
+++ libmpc/branches/r2d/libmpcenc/bitstream.c	(revision 137)
@@ -89,5 +89,5 @@
 
 	// write block header (key / length)
-	len = encodeSize(e->pos + 2 + (addCRC ? 4 : 0), blockSize, TRUE);
+	len = encodeSize(e->pos + 2 + (addCRC ? 4 : 0), blockSize, MPC_TRUE);
 	fwrite(key, sizeof(char), 2, fp);
 	fwrite(blockSize, sizeof(char), len, fp);
Index: libmpc/branches/r2d/libmpcenc/encode_sv7.c
===================================================================
--- libmpc/branches/r2d/libmpcenc/encode_sv7.c	(revision 135)
+++ libmpc/branches/r2d/libmpcenc/encode_sv7.c	(revision 137)
@@ -88,5 +88,5 @@
 {
 	unsigned char samplesCount[10];
-	int samplesCountLen = encodeSize(SamplesCount, (char *)samplesCount, FALSE);
+	int samplesCountLen = encodeSize(SamplesCount, (char *)samplesCount, MPC_FALSE);
 	int i;
 
@@ -416,5 +416,5 @@
 	e->framesInBlock++;
 	if (e->framesInBlock == FRAMES_PER_BLOCK)
-		writeBlock(e, "AD", FALSE);
+		writeBlock(e, "AD", MPC_FALSE);
 }
 
Index: libmpc/branches/r2d/libmpcenc/libmpcenc.h
===================================================================
--- libmpc/branches/r2d/libmpcenc/libmpcenc.h	(revision 135)
+++ libmpc/branches/r2d/libmpcenc/libmpcenc.h	(revision 137)
@@ -19,5 +19,5 @@
 #pragma once
 
-#include "config_types.h"
+#include <mpc/mpc_types.h>
 #include <stdio.h>
 
Index: libmpc/branches/r2d/libmpcenc/quant.c
===================================================================
--- libmpc/branches/r2d/libmpcenc/quant.c	(revision 135)
+++ libmpc/branches/r2d/libmpcenc/quant.c	(revision 137)
@@ -21,5 +21,5 @@
 
 #include "libmpcenc.h"
-#include "minimax.h"
+#include <mpc/minimax.h>
 
 /* V A R I A B L E S */