diff --git a/eo/src/pyeo/PyEO.cpp b/eo/src/pyeo/PyEO.cpp
index 7c3f1b93f..8517c9aad 100644
--- a/eo/src/pyeo/PyEO.cpp
+++ b/eo/src/pyeo/PyEO.cpp
@@ -21,7 +21,7 @@
 #include <sstream>
 
 #include "PyEO.h"
-#include <eoPop.h>
+#include "../eoPop.h"
 
 using namespace std;
 //using namespace boost::python;
diff --git a/eo/src/pyeo/PyEO.h b/eo/src/pyeo/PyEO.h
index 188b7f8da..e9452800e 100644
--- a/eo/src/pyeo/PyEO.h
+++ b/eo/src/pyeo/PyEO.h
@@ -26,7 +26,7 @@
 #include <exception>
 #include <boost/python.hpp>
 
-#include <EO.h>
+#include "../EO.h"
 
 struct index_error : public std::exception
 {
diff --git a/eo/src/pyeo/abstract1.cpp b/eo/src/pyeo/abstract1.cpp
index 43c0dadb9..bb9097967 100644
--- a/eo/src/pyeo/abstract1.cpp
+++ b/eo/src/pyeo/abstract1.cpp
@@ -18,11 +18,11 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <eoEvalFunc.h>
-#include <eoInit.h>
-#include <eoTransform.h>
-#include <eoSGATransform.h>
-#include <eoPopEvalFunc.h>
+#include "../eoEvalFunc.h"
+#include "../eoInit.h"
+#include "../eoTransform.h"
+#include "../eoSGATransform.h"
+#include "../eoPopEvalFunc.h"
 
 #include "PyEO.h"
 #include "def_abstract_functor.h"
diff --git a/eo/src/pyeo/algos.cpp b/eo/src/pyeo/algos.cpp
index caa2fcd33..c95fc3319 100644
--- a/eo/src/pyeo/algos.cpp
+++ b/eo/src/pyeo/algos.cpp
@@ -18,10 +18,10 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <eoSGA.h>
-#include <eoEasyEA.h>
-#include <eoDetSelect.h>
-#include <eoCellularEasyEA.h>
+#include "../eoSGA.h"
+#include "../eoEasyEA.h"
+#include "../eoDetSelect.h"
+#include "../eoCellularEasyEA.h"
 
 #include "PyEO.h"
 #include "def_abstract_functor.h"
diff --git a/eo/src/pyeo/breeders.cpp b/eo/src/pyeo/breeders.cpp
index c66b6bccd..2adc55e16 100644
--- a/eo/src/pyeo/breeders.cpp
+++ b/eo/src/pyeo/breeders.cpp
@@ -18,9 +18,9 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <eoBreed.h>
-#include <eoGeneralBreeder.h>
-#include <eoOneToOneBreeder.h>
+#include "../eoBreed.h"
+#include "../eoGeneralBreeder.h"
+#include "../eoOneToOneBreeder.h"
 
 #include "PyEO.h"
 #include "def_abstract_functor.h"
diff --git a/eo/src/pyeo/continuators.cpp b/eo/src/pyeo/continuators.cpp
index d31613d2c..4d787a09a 100644
--- a/eo/src/pyeo/continuators.cpp
+++ b/eo/src/pyeo/continuators.cpp
@@ -18,13 +18,13 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <eoGenContinue.h>
-#include <eoCombinedContinue.h>
-#include <eoEvalContinue.h>
-#include <eoFitContinue.h>
-#include <eoSteadyFitContinue.h>
-#include <utils/eoCheckPoint.h>
-#include <utils/eoStat.h>
+#include "../eoGenContinue.h"
+#include "../eoCombinedContinue.h"
+#include "../eoEvalContinue.h"
+#include "../eoFitContinue.h"
+#include "../eoSteadyFitContinue.h"
+#include "../utils/eoCheckPoint.h"
+#include "../utils/eoStat.h"
 
 #include "PyEO.h"
 #include "def_abstract_functor.h"
diff --git a/eo/src/pyeo/def_abstract_functor.h b/eo/src/pyeo/def_abstract_functor.h
index 4c3101dfd..5bba6cb3d 100644
--- a/eo/src/pyeo/def_abstract_functor.h
+++ b/eo/src/pyeo/def_abstract_functor.h
@@ -21,7 +21,7 @@
 #ifndef MAKE_ABSTRACT_FUNCTOR_H
 #define MAKE_ABSTRACT_FUNCTOR_H
 
-#include <eoFunctor.h>
+#include "../eoFunctor.h"
 
 // DEFINES for call
 #define WC1 boost::python::with_custodian_and_ward<1,2>()
diff --git a/eo/src/pyeo/geneticOps.cpp b/eo/src/pyeo/geneticOps.cpp
index 40617680e..a67108576 100644
--- a/eo/src/pyeo/geneticOps.cpp
+++ b/eo/src/pyeo/geneticOps.cpp
@@ -18,11 +18,11 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <eoGenOp.h>
-#include <eoOp.h>
-#include <eoCloneOps.h>
-#include <eoPopulator.h>
-#include <eoOpContainer.h>
+#include "../eoGenOp.h"
+#include "../eoOp.h"
+#include "../eoCloneOps.h"
+#include "../eoPopulator.h"
+#include "../eoOpContainer.h"
 
 #include "PyEO.h"
 #include "def_abstract_functor.h"
diff --git a/eo/src/pyeo/mergers.cpp b/eo/src/pyeo/mergers.cpp
index f41af0490..84e0970ba 100644
--- a/eo/src/pyeo/mergers.cpp
+++ b/eo/src/pyeo/mergers.cpp
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <eoMerge.h>
+#include "../eoMerge.h"
 #include "PyEO.h"
 #include "def_abstract_functor.h"
 
diff --git a/eo/src/pyeo/monitors.cpp b/eo/src/pyeo/monitors.cpp
index 02d011d89..f64881659 100644
--- a/eo/src/pyeo/monitors.cpp
+++ b/eo/src/pyeo/monitors.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <utils/eoParam.h>
-#include <utils/eoMonitor.h>
+#include "../utils/eoParam.h"
+#include "../utils/eoMonitor.h"
 #include "PyEO.h"
 
 using namespace boost::python;
diff --git a/eo/src/pyeo/perf2worth.cpp b/eo/src/pyeo/perf2worth.cpp
index a257b0cd9..3c6cc0f04 100644
--- a/eo/src/pyeo/perf2worth.cpp
+++ b/eo/src/pyeo/perf2worth.cpp
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <eoNDSorting.h>
+#include "../eoNDSorting.h"
 
 #include "PyEO.h"
 
diff --git a/eo/src/pyeo/random_numbers.cpp b/eo/src/pyeo/random_numbers.cpp
index c9047385d..01bb883b4 100644
--- a/eo/src/pyeo/random_numbers.cpp
+++ b/eo/src/pyeo/random_numbers.cpp
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <utils/eoRNG.h>
+#include "../utils/eoRNG.h"
 #include <boost/python.hpp>
 
 using namespace boost::python;
diff --git a/eo/src/pyeo/reduce.cpp b/eo/src/pyeo/reduce.cpp
index 6c9b78c64..031ff282a 100644
--- a/eo/src/pyeo/reduce.cpp
+++ b/eo/src/pyeo/reduce.cpp
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <eoReduce.h>
+#include "../eoReduce.h"
 
 #include "PyEO.h"
 
diff --git a/eo/src/pyeo/replacement.cpp b/eo/src/pyeo/replacement.cpp
index eb1bc5d70..f85e4759b 100644
--- a/eo/src/pyeo/replacement.cpp
+++ b/eo/src/pyeo/replacement.cpp
@@ -18,11 +18,11 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <eoReplacement.h>
-#include <eoMergeReduce.h>
-#include <eoReduceMerge.h>
-#include <eoReduceMergeReduce.h>
-#include <eoMGGReplacement.h>
+#include "../eoReplacement.h"
+#include "../eoMergeReduce.h"
+#include "../eoReduceMerge.h"
+#include "../eoReduceMergeReduce.h"
+#include "../eoMGGReplacement.h"
 
 #include "PyEO.h"
 #include "def_abstract_functor.h"
diff --git a/eo/src/pyeo/selectOne.cpp b/eo/src/pyeo/selectOne.cpp
index 5a28fcff3..1adb7d15a 100644
--- a/eo/src/pyeo/selectOne.cpp
+++ b/eo/src/pyeo/selectOne.cpp
@@ -18,12 +18,12 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <eoSelectOne.h>
-#include <eoDetTournamentSelect.h>
-#include <eoRandomSelect.h>
-#include <eoStochTournamentSelect.h>
-#include <eoTruncatedSelectOne.h>
-#include <eoSequentialSelect.h>
+#include "../eoSelectOne.h"
+#include "../eoDetTournamentSelect.h"
+#include "../eoRandomSelect.h"
+#include "../eoStochTournamentSelect.h"
+#include "../eoTruncatedSelectOne.h"
+#include "../eoSequentialSelect.h"
 
 #include "PyEO.h"
 #include "pickle.h"
diff --git a/eo/src/pyeo/selectors.cpp b/eo/src/pyeo/selectors.cpp
index 7c8f4096a..23ce85ccd 100644
--- a/eo/src/pyeo/selectors.cpp
+++ b/eo/src/pyeo/selectors.cpp
@@ -18,13 +18,13 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <eoSelect.h>
-#include <eoDetSelect.h>
-#include <eoSelectMany.h>
-#include <eoSelectNumber.h>
-#include <eoSelectPerc.h>
-#include <eoTruncSelect.h>
-#include <eoTruncatedSelectMany.h>
+#include "../eoSelect.h"
+#include "../eoDetSelect.h"
+#include "../eoSelectMany.h"
+#include "../eoSelectNumber.h"
+#include "../eoSelectPerc.h"
+#include "../eoTruncSelect.h"
+#include "../eoTruncatedSelectMany.h"
 
 #include "PyEO.h"
 #include "def_abstract_functor.h"
diff --git a/eo/src/pyeo/statistics.cpp b/eo/src/pyeo/statistics.cpp
index fbad92694..e48b6f2fa 100644
--- a/eo/src/pyeo/statistics.cpp
+++ b/eo/src/pyeo/statistics.cpp
@@ -1,4 +1,4 @@
-#include <utils/eoStat.h>
+#include "../utils/eoStat.h"
 
 #include "PyEO.h"
 #include "valueParam.h"
diff --git a/eo/src/pyeo/valueParam.cpp b/eo/src/pyeo/valueParam.cpp
index 59ed1a472..6e4b06218 100644
--- a/eo/src/pyeo/valueParam.cpp
+++ b/eo/src/pyeo/valueParam.cpp
@@ -18,7 +18,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <utils/eoParam.h>
+#include "../utils/eoParam.h"
 #include <stdexcept>
 
 // Here's 'len'. Why? dunno