Index: libmpc/branches/r2d/libmpcpsy/Makefile.am
===================================================================
--- libmpc/branches/r2d/libmpcpsy/Makefile.am	(revision 129)
+++ libmpc/branches/r2d/libmpcpsy/Makefile.am	(revision 137)
@@ -1,3 +1,3 @@
-INCLUDES = -I$(top_srcdir)/common
+INCLUDES = -I$(top_srcdir)/include/
 METASOURCES = AUTO
 lib_LIBRARIES = libmpcpsy.a
Index: libmpc/branches/r2d/libmpcpsy/fft4g.c
===================================================================
--- libmpc/branches/r2d/libmpcpsy/fft4g.c	(revision 129)
+++ libmpc/branches/r2d/libmpcpsy/fft4g.c	(revision 137)
@@ -21,5 +21,5 @@
 
 #include "libmpcpsy.h"
-#include "mpcmath.h"
+#include <mpc/mpcmath.h>
 
 /* F U N C T I O N S */
Index: libmpc/branches/r2d/libmpcpsy/fft_routines.c
===================================================================
--- libmpc/branches/r2d/libmpcpsy/fft_routines.c	(revision 129)
+++ libmpc/branches/r2d/libmpcpsy/fft_routines.c	(revision 137)
@@ -22,5 +22,5 @@
 
 #include "libmpcpsy.h"
-#include "mpcmath.h"
+#include <mpc/mpcmath.h>
 
 #define CX0     -1.
Index: libmpc/branches/r2d/libmpcpsy/profile.c
===================================================================
--- libmpc/branches/r2d/libmpcpsy/profile.c	(revision 129)
+++ libmpc/branches/r2d/libmpcpsy/profile.c	(revision 137)
@@ -19,5 +19,5 @@
 
 #include "libmpcpsy.h"
-#include "minimax.h"
+#include <mpc/minimax.h>
 
 
Index: libmpc/branches/r2d/libmpcpsy/psy.c
===================================================================
--- libmpc/branches/r2d/libmpcpsy/psy.c	(revision 129)
+++ libmpc/branches/r2d/libmpcpsy/psy.c	(revision 137)
@@ -56,7 +56,7 @@
 
 #include "libmpcpsy.h"
-#include "datatypes.h"
-#include "minimax.h"
-#include "mpcmath.h"
+#include <mpc/datatypes.h>
+#include <mpc/minimax.h>
+#include <mpc/mpcmath.h>
 
 // psy_tab.c
Index: libmpc/branches/r2d/libmpcpsy/psy_tab.c
===================================================================
--- libmpc/branches/r2d/libmpcpsy/psy_tab.c	(revision 129)
+++ libmpc/branches/r2d/libmpcpsy/psy_tab.c	(revision 137)
@@ -21,6 +21,6 @@
 
 #include "libmpcpsy.h"
-#include "minimax.h"
-#include "mpcmath.h"
+#include <mpc/minimax.h>
+#include <mpc/mpcmath.h>
 
 /*