diff --git a/mo/src/neighborhood/moBackableNeighbor.h b/mo/src/neighborhood/moBackableNeighbor.h
index 4a851c451..608674938 100644
--- a/mo/src/neighborhood/moBackableNeighbor.h
+++ b/mo/src/neighborhood/moBackableNeighbor.h
@@ -35,7 +35,7 @@
 #ifndef _BackableNeighbor_h
 #define _BackableNeighbor_h
 
-#include <neighborhood/moNeighbor.h>
+#include "moNeighbor.h"
 
 /**
  * Neighbor with a move back function to use in a moFullEvalByModif
diff --git a/mo/src/neighborhood/moBackwardVectorVNSelection.h b/mo/src/neighborhood/moBackwardVectorVNSelection.h
index b3050c439..cb9c41035 100644
--- a/mo/src/neighborhood/moBackwardVectorVNSelection.h
+++ b/mo/src/neighborhood/moBackwardVectorVNSelection.h
@@ -30,7 +30,7 @@
 #ifndef _moBackwardVectorVNSelection_h
 #define _moBackwardVectorVNSelection_h
 
-#include <neighborhood/moVectorVNSelection.h>
+#include "moVectorVNSelection.h"
 
 /**
  *  This class is used for the Variable Neighborhood Search explorer inherits from moVectorVNSelection
diff --git a/mo/src/neighborhood/moDummyNeighbor.h b/mo/src/neighborhood/moDummyNeighbor.h
index a8cd01087..09913cb64 100644
--- a/mo/src/neighborhood/moDummyNeighbor.h
+++ b/mo/src/neighborhood/moDummyNeighbor.h
@@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moDummyNeighbor_h
 #define _moDummyNeighbor_h
 
-#include <neighborhood/moNeighbor.h>
+#include "moNeighbor.h"
 
 /**
  * Dummy Neighborhood
diff --git a/mo/src/neighborhood/moDummyNeighborhood.h b/mo/src/neighborhood/moDummyNeighborhood.h
index 26c62163c..954416078 100644
--- a/mo/src/neighborhood/moDummyNeighborhood.h
+++ b/mo/src/neighborhood/moDummyNeighborhood.h
@@ -30,8 +30,8 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moDummyNeighborhood_h
 #define _moDummyNeighborhood_h
 
-#include <neighborhood/moDummyNeighbor.h>
-#include <neighborhood/moNeighborhood.h>
+#include "moDummyNeighbor.h"
+#include "moNeighborhood.h"
 
 /**
  * Dummy Neighborhood
diff --git a/mo/src/neighborhood/moEvaluatedNeighborhood.h b/mo/src/neighborhood/moEvaluatedNeighborhood.h
index 52f1f54d8..ac303ce4d 100644
--- a/mo/src/neighborhood/moEvaluatedNeighborhood.h
+++ b/mo/src/neighborhood/moEvaluatedNeighborhood.h
@@ -35,8 +35,8 @@
 #ifndef _moEvaluatedNeighborhood_h
 #define _moEvaluatedNeighborhood_h
 
-#include <neighborhood/moNeighborhood.h>
-#include <eval/moNeighborhoodEvaluation.h>
+#include "moNeighborhood.h"
+#include "../eval/moNeighborhoodEvaluation.h"
 
 /**
  * A Neighborhood for the evaluation of all neighbors
diff --git a/mo/src/neighborhood/moForwardVectorVNSelection.h b/mo/src/neighborhood/moForwardVectorVNSelection.h
index d7d3546cb..b6ba0f7f9 100644
--- a/mo/src/neighborhood/moForwardVectorVNSelection.h
+++ b/mo/src/neighborhood/moForwardVectorVNSelection.h
@@ -30,7 +30,7 @@
 #ifndef _moForwardVectorVNSelection_h
 #define _moForwardVectorVNSelection_h
 
-#include <neighborhood/moVectorVNSelection.h>
+#include "moVectorVNSelection.h"
 
 /**
  *  This class is used for the Variable Neighborhood Search explorer inherits from moVectorVNSelection
diff --git a/mo/src/neighborhood/moIndexNeighbor.h b/mo/src/neighborhood/moIndexNeighbor.h
index eaf302966..35e822f6b 100644
--- a/mo/src/neighborhood/moIndexNeighbor.h
+++ b/mo/src/neighborhood/moIndexNeighbor.h
@@ -35,7 +35,7 @@
 #ifndef _IndexNeighbor_h
 #define _IndexNeighbor_h
 
-#include <neighborhood/moNeighbor.h>
+#include "moNeighbor.h"
 
 /**
  * Index Neighbor
diff --git a/mo/src/neighborhood/moIndexNeighborhood.h b/mo/src/neighborhood/moIndexNeighborhood.h
index 83d06b267..4eed4b826 100644
--- a/mo/src/neighborhood/moIndexNeighborhood.h
+++ b/mo/src/neighborhood/moIndexNeighborhood.h
@@ -35,7 +35,7 @@
 #ifndef _moIndexNeighborhood_h
 #define _moIndexNeighborhood_h
 
-#include <neighborhood/moNeighborhood.h>
+#include "moNeighborhood.h"
 
 /**
  * A Indexed Neighborhood
diff --git a/mo/src/neighborhood/moNeighbor.h b/mo/src/neighborhood/moNeighbor.h
index 889dd6817..a5dcad4cf 100644
--- a/mo/src/neighborhood/moNeighbor.h
+++ b/mo/src/neighborhood/moNeighbor.h
@@ -36,9 +36,9 @@
 #define _moNeighbor_h
 
 //EO inclusion
-#include <EO.h>
-#include <eoObject.h>
-#include <eoPersistent.h>
+#include <paradiseo/eo/EO.h>
+#include <paradiseo/eo/eoObject.h>
+#include <paradiseo/eo/eoPersistent.h>
 
 /**
  * Container of the neighbor informations
diff --git a/mo/src/neighborhood/moNeighborhood.h b/mo/src/neighborhood/moNeighborhood.h
index 60d11c1f2..08f830bd2 100644
--- a/mo/src/neighborhood/moNeighborhood.h
+++ b/mo/src/neighborhood/moNeighborhood.h
@@ -35,7 +35,7 @@
 #ifndef _moNeighborhood_h
 #define _moNeighborhood_h
 
-#include <eoObject.h>
+#include <paradiseo/eo/eoObject.h>
 
 /**
  * A Neighborhood
diff --git a/mo/src/neighborhood/moOrderNeighborhood.h b/mo/src/neighborhood/moOrderNeighborhood.h
index 384d0dda7..ac3a9276d 100644
--- a/mo/src/neighborhood/moOrderNeighborhood.h
+++ b/mo/src/neighborhood/moOrderNeighborhood.h
@@ -35,7 +35,7 @@
 #ifndef _moOrderNeighborhood_h
 #define _moOrderNeighborhood_h
 
-#include <neighborhood/moIndexNeighborhood.h>
+#include "moIndexNeighborhood.h"
 
 /**
  * An ordered Neighborhood
diff --git a/mo/src/neighborhood/moRndNeighborhood.h b/mo/src/neighborhood/moRndNeighborhood.h
index 9c7ec2d22..a9a9d28fa 100644
--- a/mo/src/neighborhood/moRndNeighborhood.h
+++ b/mo/src/neighborhood/moRndNeighborhood.h
@@ -30,7 +30,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #ifndef _moRndNeighborhood_h
 #define _moRndNeighborhood_h
 
-#include <neighborhood/moNeighborhood.h>
+#include "moNeighborhood.h"
 
 /**
  * Class used to specify a neighborhood is random
diff --git a/mo/src/neighborhood/moRndVectorVNSelection.h b/mo/src/neighborhood/moRndVectorVNSelection.h
index 3debb85d4..b35ed7525 100644
--- a/mo/src/neighborhood/moRndVectorVNSelection.h
+++ b/mo/src/neighborhood/moRndVectorVNSelection.h
@@ -30,10 +30,10 @@
 #ifndef _moRndVectorVNSelection_h
 #define _moRndVectorVNSelection_h
 
-#include <utils/eoRndGenerators.h>
-#include <utils/rnd_generators.h>
+#include "../utils/eoRndGenerators.h"
+#include "../utils/rnd_generators.h"
 
-#include <neighborhood/moVectorVNSelection.h>
+#include "moVectorVNSelection.h"
 
 /**
  *  This class is used for the Variable Neighborhood Search explorer inherits from moVectorVNSelection
diff --git a/mo/src/neighborhood/moRndWithReplNeighborhood.h b/mo/src/neighborhood/moRndWithReplNeighborhood.h
index 89537bf09..40f6b9e42 100644
--- a/mo/src/neighborhood/moRndWithReplNeighborhood.h
+++ b/mo/src/neighborhood/moRndWithReplNeighborhood.h
@@ -35,9 +35,9 @@
 #ifndef _moRndWithReplNeighborhood_h
 #define _moRndWithReplNeighborhood_h
 
-#include <neighborhood/moIndexNeighborhood.h>
-#include <neighborhood/moRndNeighborhood.h>
-#include <utils/eoRNG.h>
+#include "moIndexNeighborhood.h"
+#include "moRndNeighborhood.h"
+#include <paradiseo/eo/utils/eoRNG.h>
 
 /**
  * A Random With replacement Neighborhood
diff --git a/mo/src/neighborhood/moRndWithoutReplNeighborhood.h b/mo/src/neighborhood/moRndWithoutReplNeighborhood.h
index e51c6d6e7..77d598831 100644
--- a/mo/src/neighborhood/moRndWithoutReplNeighborhood.h
+++ b/mo/src/neighborhood/moRndWithoutReplNeighborhood.h
@@ -35,9 +35,9 @@
 #ifndef _moRndWithoutReplNeighborhood_h
 #define _moRndWithoutReplNeighborhood_h
 
-#include <neighborhood/moIndexNeighborhood.h>
-#include <neighborhood/moRndNeighborhood.h>
-#include <utils/eoRNG.h>
+#include "moIndexNeighborhood.h"
+#include "moRndNeighborhood.h"
+#include <paradiseo/eo/utils/eoRNG.h>
 
 /**
  * A Random without replacement Neighborhood
diff --git a/mo/src/neighborhood/moVariableNeighborhoodSelection.h b/mo/src/neighborhood/moVariableNeighborhoodSelection.h
index 99af9a98d..9260523da 100644
--- a/mo/src/neighborhood/moVariableNeighborhoodSelection.h
+++ b/mo/src/neighborhood/moVariableNeighborhoodSelection.h
@@ -30,7 +30,7 @@
 #ifndef _moVariableNeighborhoodSelection_h
 #define _moVariableNeighborhoodSelection_h
 
-#include <eoOp.h>
+#include <paradiseo/eo/eoOp.h>
 #include <vector>
 
 /**
diff --git a/mo/src/neighborhood/moVectorVNSelection.h b/mo/src/neighborhood/moVectorVNSelection.h
index 3070e0e9a..6863e015d 100644
--- a/mo/src/neighborhood/moVectorVNSelection.h
+++ b/mo/src/neighborhood/moVectorVNSelection.h
@@ -30,8 +30,8 @@
 #ifndef _moVectorVNSelection_h
 #define _moVectorVNSelection_h
 
-#include <neighborhood/moVariableNeighborhoodSelection.h>
-#include <eoOp.h>
+#include "moVariableNeighborhoodSelection.h"
+#include <paradiseo/eo/eoOp.h>
 
 /**
  *  This class is used for the Variable Neighborhood Search explorer inherits from moVariableNeighborhoodSelection