diff --git a/src/core/mpi/MPIWrapper.h b/src/core/mpi/MPIWrapper.h
index 4e2a85bc844ad75283baac40a69bb924c740d788..9caab0b13cf546a723471386149777469d8018af 100755
--- a/src/core/mpi/MPIWrapper.h
+++ b/src/core/mpi/MPIWrapper.h
@@ -55,9 +55,7 @@
 #pragma warning ( push, 1 )
 #endif
 
-namespace walberla {
 #include <mpi.h>
-}
 
 #ifdef _MSC_VER
 #pragma warning ( pop )
@@ -75,6 +73,7 @@ namespace walberla {
 
 namespace walberla {
 
+namespace mpistubs {
 
 
 typedef int MPI_Comm;
@@ -260,6 +259,9 @@ inline double MPI_Wtime() { WALBERLA_MPI_FUNCTION_ERROR }
 
 #undef WALBERLA_MPI_FUNCTION_ERROR
 
+} // namespace mpistubs
+using namesapce mpistubs
+
 } // namespace walberla
 
 #endif // WALBERLA_BUILD_WITH_MPI