diff --git a/eo/src/utils/eoAssembledFitnessStat.h b/eo/src/utils/eoAssembledFitnessStat.h
index 44586932b..43e922f3f 100644
--- a/eo/src/utils/eoAssembledFitnessStat.h
+++ b/eo/src/utils/eoAssembledFitnessStat.h
@@ -33,8 +33,8 @@
 #ifndef _eoAssembledFitnessStat_h
 #define _eoAssembledFitnessStat_h
 
-#include <utils/eoStat.h>
-#include <eoScalarFitnessAssembled.h>
+#include "eoStat.h"
+#include "../eoScalarFitnessAssembled.h"
 
 /** @addtogroup Stats
  * @{
diff --git a/eo/src/utils/eoCheckPoint.h b/eo/src/utils/eoCheckPoint.h
index ea562e8bf..2f9b0eba0 100644
--- a/eo/src/utils/eoCheckPoint.h
+++ b/eo/src/utils/eoCheckPoint.h
@@ -27,10 +27,10 @@
 #ifndef _eoCheckPoint_h
 #define _eoCheckPoint_h
 
-#include <eoContinue.h>
-#include <utils/eoUpdater.h>
-#include <utils/eoMonitor.h>
-#include <utils/eoStat.h>
+#include "..eoContinue.h"
+#include "eoUpdater.h"
+#include "eoMonitor.h"
+#include "eoStat.h"
 
 /** @defgroup Checkpoints Checkpointing
  *
diff --git a/eo/src/utils/eoDistance.h b/eo/src/utils/eoDistance.h
index 35ce9a109..661b5f7cb 100644
--- a/eo/src/utils/eoDistance.h
+++ b/eo/src/utils/eoDistance.h
@@ -26,7 +26,7 @@
 #ifndef _eoDistance_H
 #define _eoDistance_H
 
-#include <eoFunctor.h>
+#include "../eoFunctor.h"
 
 /** @addtogroup Stats
  * @{
diff --git a/eo/src/utils/eoFDCStat.h b/eo/src/utils/eoFDCStat.h
index 1d2050b78..b8536db53 100644
--- a/eo/src/utils/eoFDCStat.h
+++ b/eo/src/utils/eoFDCStat.h
@@ -27,9 +27,9 @@
 #ifndef _eoFDCStat_h
 #define _eoFDCStat_h
 
-#include <utils/eoStat.h>
-#include <utils/eoDistance.h>
-#include <utils/eoFileSnapshot.h>
+#include "eoStat.h"
+#include "eoDistance.h"
+#include "eoFileSnapshot.h"
 
 /**
     The Fitness Distance Correlation computation.
diff --git a/eo/src/utils/eoFileMonitor.cpp b/eo/src/utils/eoFileMonitor.cpp
index 80b7afaff..e1e58ba21 100644
--- a/eo/src/utils/eoFileMonitor.cpp
+++ b/eo/src/utils/eoFileMonitor.cpp
@@ -7,9 +7,9 @@
 #include <fstream>
 #include <stdexcept>
 
-#include <utils/eoFileMonitor.h>
-#include <utils/compatibility.h>
-#include <utils/eoParam.h>
+#include "eoFileMonitor.h"
+#include "compatibility.h"
+#include "eoParam.h"
 
 using namespace std;
 
diff --git a/eo/src/utils/eoFileMonitor.h b/eo/src/utils/eoFileMonitor.h
index dcd48e4c4..0d23dcbf5 100644
--- a/eo/src/utils/eoFileMonitor.h
+++ b/eo/src/utils/eoFileMonitor.h
@@ -31,8 +31,8 @@
 #include <fstream>
 #include <stdexcept>
 
-#include "utils/eoMonitor.h"
-#include "eoObject.h"
+#include "eoMonitor.h"
+#include "../eoObject.h"
 
 
 /** Prints statistics to file
diff --git a/eo/src/utils/eoFileSnapshot.h b/eo/src/utils/eoFileSnapshot.h
index cdd2e36cc..c474a9293 100644
--- a/eo/src/utils/eoFileSnapshot.h
+++ b/eo/src/utils/eoFileSnapshot.h
@@ -29,9 +29,9 @@
 #include <fstream>
 #include <string>
 
-#include <utils/eoParam.h>
-#include <utils/eoMonitor.h>
-#include <eoObject.h>
+#include "eoParam.h"
+#include "eoMonitor.h"
+#include "../eoObject.h"
 
 
 /**
diff --git a/eo/src/utils/eoFuncPtrStat.h b/eo/src/utils/eoFuncPtrStat.h
index c77281577..b97e53105 100644
--- a/eo/src/utils/eoFuncPtrStat.h
+++ b/eo/src/utils/eoFuncPtrStat.h
@@ -1,8 +1,8 @@
 #ifndef eoFuncPtrStat_h
 #define eoFuncPtrStat_h
 
-#include <eoFunctorStore.h>
-#include <utils/eoStat.h>
+#include "../eoFunctorStore.h"
+#include "eoStat.h"
 
 
 
diff --git a/eo/src/utils/eoGenCounter.h b/eo/src/utils/eoGenCounter.h
index a06949c21..1ac9b8719 100644
--- a/eo/src/utils/eoGenCounter.h
+++ b/eo/src/utils/eoGenCounter.h
@@ -22,7 +22,7 @@
 #define _eoGenCounter_h
 
 #include <string>
-#include <utils/eoStat.h>
+#include "eoStat.h"
 
 /**
     An eoStat that simply gives the current generation index
diff --git a/eo/src/utils/eoGnuplot1DMonitor.cpp b/eo/src/utils/eoGnuplot1DMonitor.cpp
index c0cff842c..ab54b1132 100644
--- a/eo/src/utils/eoGnuplot1DMonitor.cpp
+++ b/eo/src/utils/eoGnuplot1DMonitor.cpp
@@ -29,8 +29,8 @@
 
 #include <sstream>
 
-#include "utils/eoGnuplot1DMonitor.h"
-#include "utils/eoParam.h"
+#include "eoGnuplot1DMonitor.h"
+#include "eoParam.h"
 
 
 eoMonitor& eoGnuplot1DMonitor::operator() (void)
diff --git a/eo/src/utils/eoGnuplot1DMonitor.h b/eo/src/utils/eoGnuplot1DMonitor.h
index e32e22275..0d1dc8b37 100644
--- a/eo/src/utils/eoGnuplot1DMonitor.h
+++ b/eo/src/utils/eoGnuplot1DMonitor.h
@@ -27,10 +27,10 @@
 #include <fstream>
 #include <string>
 
-#include "eoObject.h"
-#include "utils/eoFileMonitor.h"
-#include "utils/eoGnuplot.h"
-#include "utils/pipecom.h"
+#include "../eoObject.h"
+#include "eoFileMonitor.h"
+#include "eoGnuplot.h"
+#include "pipecom.h"
 
 /** Plot eoStat
 
diff --git a/eo/src/utils/eoGnuplot1DSnapshot.h b/eo/src/utils/eoGnuplot1DSnapshot.h
index 38c5af745..10519e26e 100644
--- a/eo/src/utils/eoGnuplot1DSnapshot.h
+++ b/eo/src/utils/eoGnuplot1DSnapshot.h
@@ -32,11 +32,11 @@
 #include <sstream>
 #include <string>
 
-#include <eoObject.h>
+#include "../eoObject.h"
 #include "eoRealVectorBounds.h"
-#include <utils/pipecom.h>
-#include <utils/eoFileSnapshot.h>
-#include <utils/eoGnuplot.h>
+#include "pipecom.h"
+#include "eoFileSnapshot.h"
+#include "eoGnuplot.h"
 
 /** Plot stats through gnuplot
 
diff --git a/eo/src/utils/eoHowMany.h b/eo/src/utils/eoHowMany.h
index 1105f3b73..bb47417a1 100644
--- a/eo/src/utils/eoHowMany.h
+++ b/eo/src/utils/eoHowMany.h
@@ -31,7 +31,7 @@ Contact: http://eodev.sourceforge.net
 
 #include <sstream>
 
-#include <utils/eoLogger.h>
+#include "eoLogger.h"
 
 
 /** A helper class, to determine a number of individuals from another one
diff --git a/eo/src/utils/eoIntBounds.h b/eo/src/utils/eoIntBounds.h
index 2127c92f7..924d0e022 100644
--- a/eo/src/utils/eoIntBounds.h
+++ b/eo/src/utils/eoIntBounds.h
@@ -28,7 +28,7 @@
 #define _eoIntBounds_h
 
 #include <stdexcept>               // std::exceptions!
-#include <utils/eoRNG.h>
+#include "eoRNG.h"
 
 /**
 \class eoIntBounds eoIntBounds.h es/eoIntBounds.h
diff --git a/eo/src/utils/eoLogger.h b/eo/src/utils/eoLogger.h
index 9ac1c2115..a3c377fed 100644
--- a/eo/src/utils/eoLogger.h
+++ b/eo/src/utils/eoLogger.h
@@ -92,7 +92,7 @@ Caner Candan <caner.candan@thalesgroup.com>
 #include <string>
 #include <iosfwd>
 
-#include "eoObject.h"
+#include "../eoObject.h"
 #include "eoParser.h"
 
 namespace eo
diff --git a/eo/src/utils/eoMOFitnessStat.h b/eo/src/utils/eoMOFitnessStat.h
index 8e1b2d3fd..3f7b14d00 100644
--- a/eo/src/utils/eoMOFitnessStat.h
+++ b/eo/src/utils/eoMOFitnessStat.h
@@ -27,7 +27,7 @@
 #ifndef _eoFitnessStat_h
 #define _eoFitnessStat_h
 
-#include <utils/eoStat.h>
+#include "eoStat.h"
 
 /**
     The fitnesses of a whole population, as a vector
diff --git a/eo/src/utils/eoMonitor.h b/eo/src/utils/eoMonitor.h
index 1c92e9c00..0a00f9ead 100644
--- a/eo/src/utils/eoMonitor.h
+++ b/eo/src/utils/eoMonitor.h
@@ -27,7 +27,7 @@
 
 #include <vector>
 #include <iostream>
-#include <eoFunctor.h>
+#include "../eoFunctor.h"
 
 /** @defgroup Monitors Monitoring
  *
diff --git a/eo/src/utils/eoOStreamMonitor.cpp b/eo/src/utils/eoOStreamMonitor.cpp
index b9e848c58..edb091690 100644
--- a/eo/src/utils/eoOStreamMonitor.cpp
+++ b/eo/src/utils/eoOStreamMonitor.cpp
@@ -9,10 +9,10 @@
 #include <iomanip>
 #include <ios>
 
-#include <utils/eoOStreamMonitor.h>
-#include <utils/compatibility.h>
-#include <utils/eoParam.h>
-#include <eoLogger.h>
+#include "eoOStreamMonitor.h"
+#include "compatibility.h"
+#include "eoParam.h"
+#include "eoLogger.h"
 
 //using namespace std;
 
diff --git a/eo/src/utils/eoOStreamMonitor.h b/eo/src/utils/eoOStreamMonitor.h
index 032665224..dab0ea776 100644
--- a/eo/src/utils/eoOStreamMonitor.h
+++ b/eo/src/utils/eoOStreamMonitor.h
@@ -30,9 +30,9 @@ Authors:
 #include <string>
 #include <iostream>
 
-#include <utils/eoMonitor.h>
-#include <utils/eoLogger.h>
-#include <eoObject.h>
+#include "eoMonitor.h"
+#include "eoLogger.h"
+#include "../eoObject.h"
 
 /**
     Prints statistics to a given ostream.
diff --git a/eo/src/utils/eoParallel.h b/eo/src/utils/eoParallel.h
index c7a15a4f9..6608706dc 100644
--- a/eo/src/utils/eoParallel.h
+++ b/eo/src/utils/eoParallel.h
@@ -31,7 +31,7 @@ Authors:
 #ifndef eoParallel_h
 #define eoParallel_h
 
-#include "eoObject.h"
+#include "../eoObject.h"
 #include "eoParser.h"
 
 /**
diff --git a/eo/src/utils/eoParam.h b/eo/src/utils/eoParam.h
index e3a09f215..d2c39efbd 100644
--- a/eo/src/utils/eoParam.h
+++ b/eo/src/utils/eoParam.h
@@ -33,7 +33,7 @@
 #include <sstream>
 #include <string>
 #include <vector>
-#include <eoScalarFitness.h>
+#include "../eoScalarFitness.h"
 
 /** @defgroup Parameters Parameters management
  *
diff --git a/eo/src/utils/eoParser.cpp b/eo/src/utils/eoParser.cpp
index cc306bf73..15a66105a 100644
--- a/eo/src/utils/eoParser.cpp
+++ b/eo/src/utils/eoParser.cpp
@@ -37,9 +37,9 @@ Authors:
 #include <iomanip>
 #include <cctype>
 
-#include <utils/compatibility.h>
-#include <utils/eoParser.h>
-#include <utils/eoLogger.h>
+#include "compatibility.h"
+#include "eoParser.h"
+#include "eoLogger.h"
 
 
 using namespace std;
diff --git a/eo/src/utils/eoParser.h b/eo/src/utils/eoParser.h
index a53230da8..793da622c 100644
--- a/eo/src/utils/eoParser.h
+++ b/eo/src/utils/eoParser.h
@@ -30,9 +30,9 @@ Authors:
 #include <string>
 
 #include "eoParam.h"
-#include "eoObject.h"
-#include "eoPersistent.h"
-#include "eoExceptions.h"
+#include "../eoObject.h"
+#include "../eoPersistent.h"
+#include "../eoExceptions.h"
 
 /** Parameter saving and loading
 
diff --git a/eo/src/utils/eoPopStat.h b/eo/src/utils/eoPopStat.h
index f3f091a6e..8102af087 100644
--- a/eo/src/utils/eoPopStat.h
+++ b/eo/src/utils/eoPopStat.h
@@ -35,7 +35,7 @@ that can be used to dump to the screen
 #ifndef _eoPopStat_h
 #define _eoPopStat_h
 
-#include <utils/eoStat.h>
+#include "eoStat.h"
 
 
 /** Thanks to MS/VC++, eoParam mechanism is unable to handle std::vectors of stats.
diff --git a/eo/src/utils/eoRNG.h b/eo/src/utils/eoRNG.h
index ce648cabf..ad5c440bf 100644
--- a/eo/src/utils/eoRNG.h
+++ b/eo/src/utils/eoRNG.h
@@ -50,8 +50,9 @@ typedef unsigned long uint32_t;
 
 #include <cmath>
 #include <vector>
-#include "eoPersistent.h"
-#include "eoObject.h"
+// Relative includes
+#include "../eoPersistent.h"
+#include "../eoObject.h"
 
 
 /** Random Number Generator
diff --git a/eo/src/utils/eoRealBounds.h b/eo/src/utils/eoRealBounds.h
index 8d55d793a..5d28c1741 100644
--- a/eo/src/utils/eoRealBounds.h
+++ b/eo/src/utils/eoRealBounds.h
@@ -31,7 +31,7 @@
 #include <sstream>
 #include <stdexcept>               // std::exceptions!
 
-#include <utils/eoRNG.h>
+#include "eoRNG.h"
 #include "eoLogger.h"
 
 /**
diff --git a/eo/src/utils/eoRealVectorBounds.h b/eo/src/utils/eoRealVectorBounds.h
index 56feff345..7fb880f53 100644
--- a/eo/src/utils/eoRealVectorBounds.h
+++ b/eo/src/utils/eoRealVectorBounds.h
@@ -28,8 +28,8 @@
 #define _eoRealVectorBounds_h
 
 #include <stdexcept>               // std::exceptions!
-#include <utils/eoRNG.h>
-#include <utils/eoRealBounds.h>
+#include "eoRNG.h"
+#include "eoRealBounds.h"
 
 /**
 Vector type for bounds (see eoRealBounds.h for scalar types)
diff --git a/eo/src/utils/eoRndGenerators.h b/eo/src/utils/eoRndGenerators.h
index 62e62ccff..454845b17 100644
--- a/eo/src/utils/eoRndGenerators.h
+++ b/eo/src/utils/eoRndGenerators.h
@@ -30,7 +30,7 @@
 #define eoRndGenerators_h
 
 #include "eoRNG.h"
-#include <eoFunctor.h>
+#include "../eoFunctor.h"
 #include <stdexcept>
 
 /** @defgroup Random Random number generation
diff --git a/eo/src/utils/eoScalarFitnessStat.h b/eo/src/utils/eoScalarFitnessStat.h
index e56e46822..0260baa2a 100644
--- a/eo/src/utils/eoScalarFitnessStat.h
+++ b/eo/src/utils/eoScalarFitnessStat.h
@@ -27,8 +27,8 @@
 #ifndef _eoScalarFitnessStat_h
 #define _eoScalarFitnessStat_h
 
-#include <utils/eoRealVectorBounds.h>
-#include <utils/eoStat.h>
+#include "eoRealVectorBounds.h"
+#include "eoStat.h"
 
 /**
     The fitnesses of a whole population, as a std::vector
diff --git a/eo/src/utils/eoSignal.cpp b/eo/src/utils/eoSignal.cpp
index 745d21bd3..eb12382fd 100644
--- a/eo/src/utils/eoSignal.cpp
+++ b/eo/src/utils/eoSignal.cpp
@@ -23,7 +23,7 @@
 	   Caner.Candan@univ-angers.fr
 */
 
-#include <utils/eoSignal.h>
+#include "eoSignal.h"
 
 /**
  * @addtogroup Continuators
diff --git a/eo/src/utils/eoSignal.h b/eo/src/utils/eoSignal.h
index 9a89cb196..c9f7ecf57 100644
--- a/eo/src/utils/eoSignal.h
+++ b/eo/src/utils/eoSignal.h
@@ -27,8 +27,8 @@
 #define _eoSignal_h
 
 #include <csignal>
-#include <utils/eoCheckPoint.h>
-#include <utils/eoLogger.h>
+#include "eoCheckPoint.h"
+#include "eoLogger.h"
 
 #include <map>
 #include <vector>
diff --git a/eo/src/utils/eoStat.h b/eo/src/utils/eoStat.h
index 313426c3f..5610ecbee 100644
--- a/eo/src/utils/eoStat.h
+++ b/eo/src/utils/eoStat.h
@@ -35,12 +35,12 @@ Contact: http://eodev.sourceforge.net
 #include <iostream>
 #include <numeric> // accumulate
 
-#include <eoFunctor.h>
-#include <utils/eoParam.h>
-#include <eoPop.h>
-#include <utils/eoMonitor.h>
-//#include <utils/eoCheckPoint.h>
-#include <utils/eoLogger.h>
+#include "../eoFunctor.h"
+#include "eoParam.h"
+#include "../eoPop.h"
+#include "eoMonitor.h"
+//#include "eoCheckPoint.h"
+#include "eoLogger.h"
 
 /** @defgroup Stats Statistics computation
  *
diff --git a/eo/src/utils/eoState.cpp b/eo/src/utils/eoState.cpp
index c6d385001..884549244 100644
--- a/eo/src/utils/eoState.cpp
+++ b/eo/src/utils/eoState.cpp
@@ -11,8 +11,8 @@
 #include <sstream>
 
 #include "eoState.h"
-#include "eoObject.h"
-#include "eoPersistent.h"
+#include "../eoObject.h"
+#include "../eoPersistent.h"
 
 using namespace std;
 
diff --git a/eo/src/utils/eoState.h b/eo/src/utils/eoState.h
index 256dcd965..e96917e9d 100644
--- a/eo/src/utils/eoState.h
+++ b/eo/src/utils/eoState.h
@@ -33,7 +33,7 @@
 #include <vector>
 #include <assert.h>
 
-#include <eoFunctorStore.h>
+#include "../eoFunctorStore.h"
 
 class eoObject;
 class eoPersistent;
diff --git a/eo/src/utils/eoStdoutMonitor.h b/eo/src/utils/eoStdoutMonitor.h
index d886aed3a..dba8be98c 100644
--- a/eo/src/utils/eoStdoutMonitor.h
+++ b/eo/src/utils/eoStdoutMonitor.h
@@ -32,8 +32,8 @@ Authors:
 
 #include <string>
 
-#include <utils/eoOStreamMonitor.h>
-#include <eoObject.h>
+#include "eoOStreamMonitor.h"
+#include "../eoObject.h"
 
 /**
     Prints statistics to stdout
diff --git a/eo/src/utils/eoTimedMonitor.h b/eo/src/utils/eoTimedMonitor.h
index a06ae6cce..93abc4aa3 100644
--- a/eo/src/utils/eoTimedMonitor.h
+++ b/eo/src/utils/eoTimedMonitor.h
@@ -30,8 +30,8 @@
 #include <ctime>
 #include <string>
 
-#include <utils/eoMonitor.h>
-#include <eoObject.h>
+#include "eoMonitor.h"
+#include "../eoObject.h"
 
 /**
     Holds a collection of monitors and only fires them when a time limit
diff --git a/eo/src/utils/eoTimer.h b/eo/src/utils/eoTimer.h
index 8a1fbb1a8..5ced8c6bd 100644
--- a/eo/src/utils/eoTimer.h
+++ b/eo/src/utils/eoTimer.h
@@ -28,9 +28,9 @@ Authors:
 # include <vector> // std::vector
 # include <map> // std::map
 
-# include "utils/eoParallel.h" // eo::parallel
+# include "eoParallel.h" // eo::parallel
 
-# include "serial/eoSerial.h" // eo::Persistent
+# include "../serial/eoSerial.h" // eo::Persistent
 
 /**
  * @brief Timer allowing to measure time between a start point and a stop point.
diff --git a/eo/src/utils/eoUniformInit.h b/eo/src/utils/eoUniformInit.h
index cede61b73..8f4cd9d86 100644
--- a/eo/src/utils/eoUniformInit.h
+++ b/eo/src/utils/eoUniformInit.h
@@ -39,7 +39,7 @@
 #define eoUniformInit_h
 
 #include "eoRNG.h"
-#include "eoInit.h"
+#include "../eoInit.h"
 #include "eoRealBounds.h"
 #include <stdexcept>
 
diff --git a/eo/src/utils/eoUpdatable.h b/eo/src/utils/eoUpdatable.h
index 202ef962c..1c1103afc 100644
--- a/eo/src/utils/eoUpdatable.h
+++ b/eo/src/utils/eoUpdatable.h
@@ -27,7 +27,7 @@
 #ifndef _eoUpdatable_h
 #define _eoUpdatable_h
 
-#include <utils/eoUpdater.h>
+#include "eoUpdater.h"
 
 /**
     eoUpdatable is a generic class for adding updatation to an existing class
diff --git a/eo/src/utils/eoUpdater.cpp b/eo/src/utils/eoUpdater.cpp
index dd6a38960..de2d0ba8a 100644
--- a/eo/src/utils/eoUpdater.cpp
+++ b/eo/src/utils/eoUpdater.cpp
@@ -8,8 +8,8 @@
 
 #include <sstream>
 
-#include <utils/eoState.h>
-#include <utils/eoUpdater.h>
+#include "eoState.h"
+#include "eoUpdater.h"
 
 using namespace std;
 
diff --git a/eo/src/utils/eoUpdater.h b/eo/src/utils/eoUpdater.h
index 072b9a9bb..0ae3b9c25 100644
--- a/eo/src/utils/eoUpdater.h
+++ b/eo/src/utils/eoUpdater.h
@@ -28,9 +28,9 @@
 #define _eoUpdater_h
 
 #include <string>
-#include <eoFunctor.h>
-#include <utils/eoState.h>
-#include <utils/eoParam.h>
+#include "../eoFunctor.h"
+#include "eoState.h"
+#include "eoParam.h"
 
 template <class EOT> class eoCheckPoint;
 
diff --git a/eo/src/utils/make_help.cpp b/eo/src/utils/make_help.cpp
index a7ab040cd..fd2c5efb3 100644
--- a/eo/src/utils/make_help.cpp
+++ b/eo/src/utils/make_help.cpp
@@ -30,7 +30,7 @@
 #include <fstream>
 #include <stdexcept>
 
-#include <utils/eoParser.h>
+#include "eoParser.h"
 
 using namespace std;
 
diff --git a/eo/src/utils/selectors.h b/eo/src/utils/selectors.h
index 37df7997b..43992ac3c 100644
--- a/eo/src/utils/selectors.h
+++ b/eo/src/utils/selectors.h
@@ -41,7 +41,7 @@
 #include <stdexcept>
 
 #include "eoRNG.h"
-#include <eoPop.h>
+#include "../eoPop.h"
 /**
 @addtogroup Selectors
 @{