diff --git a/trunk/paradiseo-moeo/src/CMakeLists.txt b/trunk/paradiseo-moeo/src/CMakeLists.txt
index 91d0ced9e..4e7922c50 100644
--- a/trunk/paradiseo-moeo/src/CMakeLists.txt
+++ b/trunk/paradiseo-moeo/src/CMakeLists.txt
@@ -4,6 +4,7 @@
 ######################################################################################
 
 INCLUDE_DIRECTORIES(${EO_SRC_DIR})
+INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 ######################################################################################
diff --git a/trunk/paradiseo-moeo/src/explorer/moeoTSMoveLoopExpl.h b/trunk/paradiseo-moeo/src/explorer/moeoTSMoveLoopExpl.h
index 9f38ad39f..0f51d2a96 100755
--- a/trunk/paradiseo-moeo/src/explorer/moeoTSMoveLoopExpl.h
+++ b/trunk/paradiseo-moeo/src/explorer/moeoTSMoveLoopExpl.h
@@ -35,7 +35,7 @@
 
 #ifndef _moeoTSMoveLoopExpl_h
 #define _moeoTSMoveLoopExpl_h
-#include <mo>
+#include <oldmo>
 #include <moMoveLoopExpl.h>
 #include <moMoveInit.h>
 #include <moNextMove.h>
diff --git a/trunk/paradiseo-moeo/src/fitness/moeoIncrEvalSingleObjectivizer.h b/trunk/paradiseo-moeo/src/fitness/moeoIncrEvalSingleObjectivizer.h
index f4b894014..d316e6cc3 100644
--- a/trunk/paradiseo-moeo/src/fitness/moeoIncrEvalSingleObjectivizer.h
+++ b/trunk/paradiseo-moeo/src/fitness/moeoIncrEvalSingleObjectivizer.h
@@ -40,8 +40,7 @@
 
 #include <moeo>
 #include <eo>
-#include <../../paradiseo-mo/src/moMoveIncrEval.h>
-//#include <mo>
+#include <moMoveIncrEval.h>
 #include <fitness/moeoFitnessAssignment.h>
 #include <fitness/moeoSingleObjectivization.h>
 #include <eoEvalFunc.h>
diff --git a/trunk/paradiseo-moeo/src/utils/moeoDummyRefPointStrategy.h b/trunk/paradiseo-moeo/src/utils/moeoDummyRefPointStrategy.h
index a1b0c0e53..bd3142cd2 100755
--- a/trunk/paradiseo-moeo/src/utils/moeoDummyRefPointStrategy.h
+++ b/trunk/paradiseo-moeo/src/utils/moeoDummyRefPointStrategy.h
@@ -45,7 +45,7 @@ template <class MOEOT>
 class moeoDummyRefPointStrategy : public moeoVariableRefPointStrategy<MOEOT>
   {
 	  public:
-		  virtual void operator()(typename MOEOT::ObjectiveVector &_obj,const MOEOT &_moeo ){}
+		  virtual void operator()(typename MOEOT::ObjectiveVector &_obj, const MOEOT &_moeo ){}
   };
 
 #endif 
diff --git a/trunk/paradiseo-moeo/test/CMakeLists.txt b/trunk/paradiseo-moeo/test/CMakeLists.txt
index 3b928247a..0355adf25 100644
--- a/trunk/paradiseo-moeo/test/CMakeLists.txt
+++ b/trunk/paradiseo-moeo/test/CMakeLists.txt
@@ -10,7 +10,7 @@
 ######################################################################################
 
 INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src)
-INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src)
+INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src)
 INCLUDE_DIRECTORIES(${ParadisEO-MOEO_SOURCE_DIR}/src)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
diff --git a/trunk/paradiseo-moeo/test/t-moeoAnytimeWeightStrategy.cpp b/trunk/paradiseo-moeo/test/t-moeoAnytimeWeightStrategy.cpp
index 588405d79..3ea12ca2c 100644
--- a/trunk/paradiseo-moeo/test/t-moeoAnytimeWeightStrategy.cpp
+++ b/trunk/paradiseo-moeo/test/t-moeoAnytimeWeightStrategy.cpp
@@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------
 
 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO
 #include <moeo>
 
 using std::cout;
diff --git a/trunk/paradiseo-moeo/test/t-moeoAugmentedQexploreWeightStrategy.cpp b/trunk/paradiseo-moeo/test/t-moeoAugmentedQexploreWeightStrategy.cpp
index 3ca617bb7..182582525 100644
--- a/trunk/paradiseo-moeo/test/t-moeoAugmentedQexploreWeightStrategy.cpp
+++ b/trunk/paradiseo-moeo/test/t-moeoAugmentedQexploreWeightStrategy.cpp
@@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------
 
 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO
 #include <moeo>
 
 using std::cout;
diff --git a/trunk/paradiseo-moeo/test/t-moeoDichoWeightStrategy.cpp b/trunk/paradiseo-moeo/test/t-moeoDichoWeightStrategy.cpp
index 642b404b8..319b9f571 100644
--- a/trunk/paradiseo-moeo/test/t-moeoDichoWeightStrategy.cpp
+++ b/trunk/paradiseo-moeo/test/t-moeoDichoWeightStrategy.cpp
@@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------
 
 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO
 #include <moeo>
 
 using std::cout;
diff --git a/trunk/paradiseo-moeo/test/t-moeoFixedTimeBothDirectionWeightStrategy.cpp b/trunk/paradiseo-moeo/test/t-moeoFixedTimeBothDirectionWeightStrategy.cpp
index 1b6202e62..7460b1eb1 100644
--- a/trunk/paradiseo-moeo/test/t-moeoFixedTimeBothDirectionWeightStrategy.cpp
+++ b/trunk/paradiseo-moeo/test/t-moeoFixedTimeBothDirectionWeightStrategy.cpp
@@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------
 
 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO
 #include <moeo>
 
 using std::cout;
diff --git a/trunk/paradiseo-moeo/test/t-moeoFixedTimeOneDirectionWeightStrategy.cpp b/trunk/paradiseo-moeo/test/t-moeoFixedTimeOneDirectionWeightStrategy.cpp
index a0c442018..42c96d969 100644
--- a/trunk/paradiseo-moeo/test/t-moeoFixedTimeOneDirectionWeightStrategy.cpp
+++ b/trunk/paradiseo-moeo/test/t-moeoFixedTimeOneDirectionWeightStrategy.cpp
@@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------
 
 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO
 #include <moeo>
 
 using std::cout;
diff --git a/trunk/paradiseo-moeo/test/t-moeoHC.cpp b/trunk/paradiseo-moeo/test/t-moeoHC.cpp
index 484feb86a..f6e20549d 100644
--- a/trunk/paradiseo-moeo/test/t-moeoHC.cpp
+++ b/trunk/paradiseo-moeo/test/t-moeoHC.cpp
@@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------
 
 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO
 #include <moeo>
 
 using std::cout;
diff --git a/trunk/paradiseo-moeo/test/t-moeoILS_HC.cpp b/trunk/paradiseo-moeo/test/t-moeoILS_HC.cpp
index 343e96c6b..839b5735f 100644
--- a/trunk/paradiseo-moeo/test/t-moeoILS_HC.cpp
+++ b/trunk/paradiseo-moeo/test/t-moeoILS_HC.cpp
@@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------
 
 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO
 #include <moeo>
 
 using std::cout;
diff --git a/trunk/paradiseo-moeo/test/t-moeoILS_SA.cpp b/trunk/paradiseo-moeo/test/t-moeoILS_SA.cpp
index 4db8f78e3..9b83c79ad 100644
--- a/trunk/paradiseo-moeo/test/t-moeoILS_SA.cpp
+++ b/trunk/paradiseo-moeo/test/t-moeoILS_SA.cpp
@@ -39,7 +39,7 @@
 //-----------------------------------------------------------------------------
 
 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO
 #include <moeo>
 
 using std::cout;
diff --git a/trunk/paradiseo-moeo/test/t-moeoILS_TS.cpp b/trunk/paradiseo-moeo/test/t-moeoILS_TS.cpp
index 135ea24f6..49a492008 100755
--- a/trunk/paradiseo-moeo/test/t-moeoILS_TS.cpp
+++ b/trunk/paradiseo-moeo/test/t-moeoILS_TS.cpp
@@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------
 
 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO
 #include <moeo>
 
 using std::cout;
diff --git a/trunk/paradiseo-moeo/test/t-moeoQexploreWeightStrategy.cpp b/trunk/paradiseo-moeo/test/t-moeoQexploreWeightStrategy.cpp
index ffd8e31ca..5e5eb1911 100644
--- a/trunk/paradiseo-moeo/test/t-moeoQexploreWeightStrategy.cpp
+++ b/trunk/paradiseo-moeo/test/t-moeoQexploreWeightStrategy.cpp
@@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------
 
 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO
 #include <moeo>
 
 using std::cout;
diff --git a/trunk/paradiseo-moeo/test/t-moeoTS.cpp b/trunk/paradiseo-moeo/test/t-moeoTS.cpp
index ee15d7093..9f4b791ce 100644
--- a/trunk/paradiseo-moeo/test/t-moeoTS.cpp
+++ b/trunk/paradiseo-moeo/test/t-moeoTS.cpp
@@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------
 
 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO
 #include <moeo>
 
 using std::cout;
diff --git a/trunk/paradiseo-moeo/test/t-moeoVFAS.cpp b/trunk/paradiseo-moeo/test/t-moeoVFAS.cpp
index 9570af43f..951ddd22e 100644
--- a/trunk/paradiseo-moeo/test/t-moeoVFAS.cpp
+++ b/trunk/paradiseo-moeo/test/t-moeoVFAS.cpp
@@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------
 
 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO
 #include <moeo>
 
 using std::cout;
diff --git a/trunk/paradiseo-moeo/test/t-moeoVNS.cpp b/trunk/paradiseo-moeo/test/t-moeoVNS.cpp
index e95e7421d..f562ef150 100755
--- a/trunk/paradiseo-moeo/test/t-moeoVNS.cpp
+++ b/trunk/paradiseo-moeo/test/t-moeoVNS.cpp
@@ -39,7 +39,7 @@
 //-----------------------------------------------------------------------------
 
 #include <eo>  // EO
-#include <mo>  // MO
+#include <oldmo>  // MO
 #include <moeo>
 #include <cassert>
 
diff --git a/trunk/paradiseo-moeo/tutorial/CMakeLists.txt b/trunk/paradiseo-moeo/tutorial/CMakeLists.txt
index 6c5881a7a..dea0167c2 100644
--- a/trunk/paradiseo-moeo/tutorial/CMakeLists.txt
+++ b/trunk/paradiseo-moeo/tutorial/CMakeLists.txt
@@ -3,6 +3,7 @@
 ### 1) Definitions
 ######################################################################################
 INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src)
+INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src)
 SET(FLOWSHOP_SRC_DIR ${ParadisEO-MOEO_SOURCE_DIR}/tutorial/examples/flowshop)
 SET(FLOWSHOP_BINARY_DIR ${ParadisEO-MOEO_BINARY_DIR}/tutorial/examples/flowshop)