Index: mppenc/branches/r2d/libmpcpsy/Makefile.am
===================================================================
--- mppenc/branches/r2d/libmpcpsy/Makefile.am	(revision 61)
+++ mppenc/branches/r2d/libmpcpsy/Makefile.am	(revision 64)
@@ -1,3 +1,3 @@
-INCLUDES = 
+INCLUDES = -I../../common
 METASOURCES = AUTO
 lib_LIBRARIES = libmpcpsy.a
Index: mppenc/branches/r2d/libmpcpsy/fft4g.c
===================================================================
--- mppenc/branches/r2d/libmpcpsy/fft4g.c	(revision 61)
+++ mppenc/branches/r2d/libmpcpsy/fft4g.c	(revision 64)
@@ -19,4 +19,5 @@
 
 #include "libmpcpsy.h"
+#include "mpcmath.h"
 
 /* F U N C T I O N S */
Index: mppenc/branches/r2d/libmpcpsy/libmpcpsy.h
===================================================================
--- mppenc/branches/r2d/libmpcpsy/libmpcpsy.h	(revision 61)
+++ mppenc/branches/r2d/libmpcpsy/libmpcpsy.h	(revision 64)
@@ -43,19 +43,4 @@
 #define MS2SPAT4             0.0625f
 
-// common ?
-#ifndef M_PI
-# define M_PI            3.1415926535897932384626433832795029     // 4*atan(1)
-# define M_PIl           3.1415926535897932384626433832795029L
-# define M_LN2           0.6931471805599453094172321214581766     // ln(2)
-# define M_LN2l          0.6931471805599453094172321214581766L
-# define M_LN10          2.3025850929940456840179914546843642     // ln 10 */
-# define M_LN10l         2.3025850929940456840179914546843642L
-#endif
-
-// mppenc.h
-#define CENTER            448                   // offset for centering current data in Main-array
-#define BLOCK            1152                   // blocksize
-#define ANABUFFER    (BLOCK + CENTER)           // size of PCM-data array for analysis
-
 
 #define KBD1	2.
@@ -68,16 +53,4 @@
 	float  S [32];
 } SMRTyp;
-
-typedef struct {
-	float  L [36];
-	float  R [36];
-} SubbandFloatTyp;
-
-typedef struct {
-	float  L [ANABUFFER];
-	float  R [ANABUFFER];
-	float  M [ANABUFFER];
-	float  S [ANABUFFER];
-} PCMDataTyp;
 
 typedef struct {
Index: mppenc/branches/r2d/libmpcpsy/psy.c
===================================================================
--- mppenc/branches/r2d/libmpcpsy/psy.c	(revision 61)
+++ mppenc/branches/r2d/libmpcpsy/psy.c	(revision 64)
@@ -57,4 +57,5 @@
 #include "libmpcpsy.h"
 #include "fastmath.h"
+#include "datatypes.h"