diff --git a/eo/src/PO.h b/eo/src/PO.h
index c3498591a..c4225cf61 100644
--- a/eo/src/PO.h
+++ b/eo/src/PO.h
@@ -27,7 +27,7 @@
 
 //-----------------------------------------------------------------------------
 #include <stdexcept>
-#include <paradiseo/eo/EO.h>
+#include "EO.h"
 //-----------------------------------------------------------------------------
 
 /** PO inheriting from EO is specially designed for particle swarm optimization particle.POs have got a fitness,
diff --git a/eo/src/eoAlgo.h b/eo/src/eoAlgo.h
index 95f9d77c5..b19b7a0e6 100644
--- a/eo/src/eoAlgo.h
+++ b/eo/src/eoAlgo.h
@@ -25,8 +25,8 @@
 #ifndef _EOALGO_H
 #define _EOALGO_H
 
-#include <paradiseo/eo/eoPop.h>                   // for population
-#include <paradiseo/eo/eoFunctor.h>
+#include "eoPop.h"     // for population
+#include "eoFunctor.h"
 
 /**
   @defgroup Algorithms Algorithms
diff --git a/eo/src/eoCtrlCContinue.cpp b/eo/src/eoCtrlCContinue.cpp
index 5efdd4d78..8d2c32de2 100644
--- a/eo/src/eoCtrlCContinue.cpp
+++ b/eo/src/eoCtrlCContinue.cpp
@@ -31,7 +31,7 @@
 #include "utils/eoLogger.h"
 
 #include <signal.h>
-#include "iostream"
+#include <iostream>
 
 /**
  * @addtogroup Continuators
diff --git a/eo/src/eoFunctorStore.cpp b/eo/src/eoFunctorStore.cpp
index 1182117b6..fe3137ada 100644
--- a/eo/src/eoFunctorStore.cpp
+++ b/eo/src/eoFunctorStore.cpp
@@ -5,8 +5,8 @@
 
 #include <cstddef>
 
-#include <paradiseo/eo/eoFunctorStore.h>
-#include <paradiseo/eo/eoFunctor.h>
+#include "eoFunctorStore.h"
+#include "eoFunctor.h"
 
 
 /// clears the memory
diff --git a/eo/src/eoPersistent.cpp b/eo/src/eoPersistent.cpp
index 72870be76..4be731f94 100644
--- a/eo/src/eoPersistent.cpp
+++ b/eo/src/eoPersistent.cpp
@@ -3,7 +3,7 @@
 #pragma warning(disable:4786)
 #endif
 
-#include <paradiseo/eo/eoPersistent.h>
+#include "eoPersistent.h"
 
 //Implementation of these objects
 
diff --git a/eo/src/eoPopEvalFunc.h b/eo/src/eoPopEvalFunc.h
index c637d119c..c3037c20d 100644
--- a/eo/src/eoPopEvalFunc.h
+++ b/eo/src/eoPopEvalFunc.h
@@ -31,11 +31,11 @@
 #include "apply.h"
 
 # ifdef WITH_MPI
-#include <mpi/eoMpi.h>
-#include <mpi/eoTerminateJob.h>
-#include <mpi/eoMpiAssignmentAlgorithm.h>
-#include <mpi/eoParallelApply.h>
-#include <utils/eoParallel.h>
+#include "mpi/eoMpi.h"
+#include "mpi/eoTerminateJob.h"
+#include "mpi/eoMpiAssignmentAlgorithm.h"
+#include "mpi/eoParallelApply.h"
+#include "utils/eoParallel.h"
 
 #include <cmath> // ceil
 # endif // WITH_MPI
diff --git a/eo/src/eoPrintable.cpp b/eo/src/eoPrintable.cpp
index 93954d78b..1f0b4ab4a 100644
--- a/eo/src/eoPrintable.cpp
+++ b/eo/src/eoPrintable.cpp
@@ -7,7 +7,7 @@
 // eoPrintable.cpp
 //-----------------------------------------------------------------------------
 
-#include <paradiseo/eo/eoPrintable.h>
+#include "eoPrintable.h"
 
 //-----------------------------------------------------------------------------
 //Implementation of these objects
diff --git a/eo/src/eoScalarFitnessAssembled.cpp b/eo/src/eoScalarFitnessAssembled.cpp
index b25684615..58f7615fa 100644
--- a/eo/src/eoScalarFitnessAssembled.cpp
+++ b/eo/src/eoScalarFitnessAssembled.cpp
@@ -31,7 +31,7 @@
 #pragma warning(disable:4786)
 #endif
 
-#include <paradiseo/eo/eoScalarFitnessAssembled.h>
+#include "eoScalarFitnessAssembled.h"
 
 
 // need to allocate the static variables of class eoScalarFitnessAssembledTraits
diff --git a/eo/src/utils/eoCheckPoint.h b/eo/src/utils/eoCheckPoint.h
index 2f9b0eba0..ba540bf66 100644
--- a/eo/src/utils/eoCheckPoint.h
+++ b/eo/src/utils/eoCheckPoint.h
@@ -27,7 +27,7 @@
 #ifndef _eoCheckPoint_h
 #define _eoCheckPoint_h
 
-#include "..eoContinue.h"
+#include "../eoContinue.h"
 #include "eoUpdater.h"
 #include "eoMonitor.h"
 #include "eoStat.h"