Index: /libmpc/trunk/libmpcpsy/cvd.c
===================================================================
--- /libmpc/trunk/libmpcpsy/cvd.c	(revision 339)
+++ /libmpc/trunk/libmpcpsy/cvd.c	(revision 340)
@@ -17,9 +17,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include "mpc/mpc_types.h"
-#include "libmpcpsy.h"
 
 #include <math.h>
 #include <string.h>
+
+#include "mpc/mpc_types.h"
+#include "mpc/mpcmath.h"
+#include "libmpcpsy.h"
 
 void   Cepstrum2048  ( float* cep, const int );
Index: /libmpc/trunk/mpccut/CMakeLists.txt
===================================================================
--- /libmpc/trunk/mpccut/CMakeLists.txt	(revision 339)
+++ /libmpc/trunk/mpccut/CMakeLists.txt	(revision 340)
@@ -8,8 +8,8 @@
 if(MSVC)
 include_directories(${libmpc_SOURCE_DIR}/win32)
-add_executable(mpccut ${libmpc_SOURCE_DIR}/win32/attgetopt)
+add_executable(mpccut mpccut ${libmpc_SOURCE_DIR}/win32/attgetopt)
 endif(MSVC)
 
-add_executable(mpccut mpccut.c)
+add_executable(mpccut mpccut)
 
 target_link_libraries(mpccut mpcdec_static)
Index: /libmpc/trunk/mpcdec/CMakeLists.txt
===================================================================
--- /libmpc/trunk/mpcdec/CMakeLists.txt	(revision 339)
+++ /libmpc/trunk/mpcdec/CMakeLists.txt	(revision 340)
@@ -8,8 +8,8 @@
 if(MSVC)
 include_directories(${libmpc_SOURCE_DIR}/win32)
-add_executable(mpcdec ${libmpc_SOURCE_DIR}/win32/attgetopt)
+add_executable(mpcdec mpcdec ${libmpc_SOURCE_DIR}/win32/attgetopt)
 endif(MSVC)
 
-add_executable(mpcdec mpcdec.c)
+add_executable(mpcdec mpcdec)
 
 if(NOT MSVC)
Index: /libmpc/trunk/mpcenc/CMakeLists.txt
===================================================================
--- /libmpc/trunk/mpcenc/CMakeLists.txt	(revision 339)
+++ /libmpc/trunk/mpcenc/CMakeLists.txt	(revision 340)
@@ -1,4 +1,2 @@
-add_definitions(-DMPP_ENCODER -DFAST_MATH -DCVD_FASTLOG)
-
 if(MPC_ENDIANNESS)
 add_definitions(-DMPC_BIG_ENDIAN)