diff --git a/eo/src/mpi/eoMpi.h b/eo/src/mpi/eoMpi.h
index a47ce8a33..0bef5fea8 100644
--- a/eo/src/mpi/eoMpi.h
+++ b/eo/src/mpi/eoMpi.h
@@ -24,10 +24,10 @@ Authors:
 
 # include <vector>  // std::vector
 
-# include <utils/eoLogger.h>
-# include <utils/eoTimer.h>
-# include <eoFunctor.h>
-# include <eoExceptions.h>
+# include "../utils/eoLogger.h"
+# include "../utils/eoTimer.h"
+# include "../eoFunctor.h"
+# include "../eoExceptions.h"
 
 # include "eoMpiNode.h"
 # include "eoMpiAssignmentAlgorithm.h"
diff --git a/eo/src/mpi/eoMpiNode.cpp b/eo/src/mpi/eoMpiNode.cpp
index 69f06576b..ba6424bc4 100644
--- a/eo/src/mpi/eoMpiNode.cpp
+++ b/eo/src/mpi/eoMpiNode.cpp
@@ -19,7 +19,7 @@ Contact: http://eodev.sourceforge.net
 Authors:
     Benjamin Bouvier <benjamin.bouvier@gmail.com>
 */
-# include "eoMpiNode.h"
+#include "eoMpiNode.h"
 
 namespace eo
 {
diff --git a/eo/src/mpi/eoMultiStart.h b/eo/src/mpi/eoMultiStart.h
index 23a8cc04a..71e084bb4 100644
--- a/eo/src/mpi/eoMultiStart.h
+++ b/eo/src/mpi/eoMultiStart.h
@@ -1,7 +1,7 @@
 # ifndef __EO_MULTISTART_H__
 # define __EO_MULTISTART_H__
 
-# include <eo>
+# include "../eo"
 # include "eoMpi.h"
 
 /**
diff --git a/eo/src/mpi/eoParallelApply.h b/eo/src/mpi/eoParallelApply.h
index 671c3843f..dfb66e027 100644
--- a/eo/src/mpi/eoParallelApply.h
+++ b/eo/src/mpi/eoParallelApply.h
@@ -24,7 +24,7 @@ Authors:
 
 # include "eoMpi.h"
 
-# include <eoFunctor.h> // eoUF
+# include "../eoFunctor.h" // eoUF
 # include <vector> // std::vector population
 
 /**
diff --git a/eo/src/mpi/eoTerminateJob.h b/eo/src/mpi/eoTerminateJob.h
index fe231f0e3..2f299916b 100644
--- a/eo/src/mpi/eoTerminateJob.h
+++ b/eo/src/mpi/eoTerminateJob.h
@@ -19,10 +19,10 @@ Contact: http://eodev.sourceforge.net
 Authors:
     Benjamin Bouvier <benjamin.bouvier@gmail.com>
 */
-# ifndef __EO_TERMINATE_H__
-# define __EO_TERMINATE_H__
+#ifndef __EO_TERMINATE_H__
+#define __EO_TERMINATE_H__
 
-# include "eoMpi.h"
+#include "eoMpi.h"
 
 namespace eo
 {
diff --git a/eo/src/mpi/implMpi.cpp b/eo/src/mpi/implMpi.cpp
index 6ae0c0996..16b9ea2ce 100644
--- a/eo/src/mpi/implMpi.cpp
+++ b/eo/src/mpi/implMpi.cpp
@@ -19,7 +19,7 @@ Contact: http://eodev.sourceforge.net
 Authors:
     Benjamin Bouvier <benjamin.bouvier@gmail.com>
 */
-# include "implMpi.h"
+#include "implMpi.h"
 
 namespace mpi
 {
diff --git a/eo/src/mpi/implMpi.h b/eo/src/mpi/implMpi.h
index b7c1cd4ba..c55cff6f8 100644
--- a/eo/src/mpi/implMpi.h
+++ b/eo/src/mpi/implMpi.h
@@ -19,11 +19,11 @@ Contact: http://eodev.sourceforge.net
 Authors:
     Benjamin Bouvier <benjamin.bouvier@gmail.com>
 */
-# ifndef __EO_IMPL_MPI_HPP__
-# define __EO_IMPL_MPI_HPP__
+#ifndef __EO_IMPL_MPI_HPP__
+#define __EO_IMPL_MPI_HPP__
 
-# include <mpi.h>
-# include <serial/eoSerial.h>
+#include "eoMpi.h"
+#include "../serial/eoSerial.h"
 
 /**
  * This namespace contains reimplementations of some parts of the Boost::MPI API in C++, so as to be used in