diff --git a/dumux/common/dgfgridcreator.hh b/dumux/common/dgfgridcreator.hh
index 52a11c59320ccded04fe6dc0fbabb244e3dc629d..75e87dd097834352b4180e3672e9464778bdfe05 100644
--- a/dumux/common/dgfgridcreator.hh
+++ b/dumux/common/dgfgridcreator.hh
@@ -23,11 +23,16 @@
 #ifndef DUMUX_DGF_GRID_CREATOR_HH
 #define DUMUX_DGF_GRID_CREATOR_HH
 
-#include <dune/grid/io/file/dgfparser.hh>
+#include <dune/common/version.hh>
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
+#include <dune/common/parallel/mpihelper.hh>
+#else
 #include <dune/common/mpihelper.hh>
+#endif
+#include <dune/grid/io/file/dgfparser.hh>
 
-#include <dumux/common/propertysystem.hh>
-#include <dumux/common/parameters.hh>
+#include "propertysystem.hh"
+#include "parameters.hh"
 
 namespace Dumux
 {
diff --git a/dumux/common/start.hh b/dumux/common/start.hh
index a52d8805e85f8bd725ba717eb7937a1cae95bfc7..e17ff4615d724a5966862697d79f1b46ee8c560d 100644
--- a/dumux/common/start.hh
+++ b/dumux/common/start.hh
@@ -25,16 +25,20 @@
 
 #include <iostream>
 
-#include "propertysystem.hh"
-#include "parameters.hh"
-#include "valgrind.hh"
-
-#include <dune/common/mpihelper.hh>
-#include <dune/common/version.hh>
 #include <dune/common/parametertreeparser.hh>
+#include <dune/common/version.hh>
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
+#include <dune/common/parallel/mpihelper.hh>
+#else
+#include <dune/common/mpihelper.hh>
+#endif
 
 #include <dune/grid/io/file/dgfparser.hh>
 
+#include "propertysystem.hh"
+#include "parameters.hh"
+#include "valgrind.hh"
+
 namespace Dumux
 {
 // forward declaration of property tags
diff --git a/dumux/common/timemanager.hh b/dumux/common/timemanager.hh
index 5ba113b1d2785dcd7d7a037a2e831ac30f4979a6..38ea60b1c2b3a83539c6b740e5c12bfa3e81a379 100644
--- a/dumux/common/timemanager.hh
+++ b/dumux/common/timemanager.hh
@@ -23,11 +23,15 @@
 #ifndef DUMUX_TIME_MANAGER_HH
 #define DUMUX_TIME_MANAGER_HH
 
-#include <dumux/common/propertysystem.hh>
-
 #include <dune/common/timer.hh>
+#include <dune/common/version.hh>
+#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
+#include <dune/common/parallel/mpihelper.hh>
+#else
 #include <dune/common/mpihelper.hh>
+#endif
 
+#include "propertysystem.hh"
 
 namespace Dumux
 {