diff --git a/dumux/assembly/staggeredlocalassembler.hh b/dumux/assembly/staggeredlocalassembler.hh
index 7fee790e90021ea1791e3480475ffeb2338e619d..f1174e31f74119b562572e179d3fe8349d364dd1 100644
--- a/dumux/assembly/staggeredlocalassembler.hh
+++ b/dumux/assembly/staggeredlocalassembler.hh
@@ -25,7 +25,6 @@
 #ifndef DUMUX_STAGGERED_LOCAL_ASSEMBLER_HH
 #define DUMUX_STAGGERED_LOCAL_ASSEMBLER_HH
 
-#include <dune/common/version.hh>
 #include <dune/common/hybridutilities.hh>
 #include <dune/common/rangeutilities.hh>
 
diff --git a/dumux/common/defaultmappertraits.hh b/dumux/common/defaultmappertraits.hh
index e36274aea316b88b68a376596f294642ad7b5cbb..5c485118a4ed16db45d72492b3254f2aa2f069c5 100644
--- a/dumux/common/defaultmappertraits.hh
+++ b/dumux/common/defaultmappertraits.hh
@@ -24,7 +24,6 @@
 #ifndef DUMUX_DEFAULT_MAPPER_TRAITS_HH
 #define DUMUX_DEFAULT_MAPPER_TRAITS_HH
 
-#include <dune/common/version.hh>
 #include <dune/grid/common/mcmgmapper.hh>
 
 namespace Dumux {
diff --git a/dumux/common/fvproblem.hh b/dumux/common/fvproblem.hh
index 3e9d4c316e8e4fb5275dfab8fc42ddf99b042611..64c76771e29ade958eba9cb3ca83044a582f4ee5 100644
--- a/dumux/common/fvproblem.hh
+++ b/dumux/common/fvproblem.hh
@@ -27,7 +27,6 @@
 #include <memory>
 #include <map>
 
-#include <dune/common/version.hh>
 #include <dune/common/fvector.hh>
 #include <dune/grid/common/gridenums.hh>
 
diff --git a/dumux/common/geometry/geometricentityset.hh b/dumux/common/geometry/geometricentityset.hh
index 686c59e4edf33d31f0081d581a2e741e038f3d8f..9640b5dfe92f379277965afc87c9ca186699b986 100644
--- a/dumux/common/geometry/geometricentityset.hh
+++ b/dumux/common/geometry/geometricentityset.hh
@@ -25,7 +25,6 @@
 #define DUMUX_GRIDVIEW_GEOMETRIC_ENTITY_SET_HH
 
 #include <memory>
-#include <dune/common/version.hh>
 #include <dune/grid/common/mcmgmapper.hh>
 #include <dumux/common/entitymap.hh>
 
diff --git a/dumux/common/geometry/geometryintersection.hh b/dumux/common/geometry/geometryintersection.hh
index deabdfb94ee7026d22e96a78650abccf102fefa7..54240d6fc391edbbee967d18a80cb92bfdf54f72 100644
--- a/dumux/common/geometry/geometryintersection.hh
+++ b/dumux/common/geometry/geometryintersection.hh
@@ -23,7 +23,6 @@
 #ifndef DUMUX_GEOMETRY_INTERSECTION_HH
 #define DUMUX_GEOMETRY_INTERSECTION_HH
 
-#include <dune/common/version.hh>
 #include <dune/common/exceptions.hh>
 #include <dune/common/promotiontraits.hh>
 #include <dune/geometry/referenceelements.hh>
diff --git a/dumux/common/geometry/makegeometry.hh b/dumux/common/geometry/makegeometry.hh
index ba1471ac5de458ea067a7b4968c4a78cb11bac57..5907b7faf0e99f59a1c61b23fb4f1ddefa3332f6 100644
--- a/dumux/common/geometry/makegeometry.hh
+++ b/dumux/common/geometry/makegeometry.hh
@@ -26,7 +26,6 @@
 #include <array>
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
-#include <dune/common/version.hh>
 #include <dune/geometry/multilineargeometry.hh>
 #include <dumux/common/math.hh>
 #include <dumux/common/geometry/grahamconvexhull.hh>
diff --git a/dumux/common/intersectionmapper.hh b/dumux/common/intersectionmapper.hh
index 8bad3ff9e6ad8a6c8b6284b42dfbdbcaa454a019..a2067d2cae83cadf1acdb1ee58b02a70d7aab85f 100644
--- a/dumux/common/intersectionmapper.hh
+++ b/dumux/common/intersectionmapper.hh
@@ -29,7 +29,6 @@
 #include <dune/grid/common/mcmgmapper.hh>
 #include <dune/grid/common/rangegenerators.hh>
 
-#include <dune/common/version.hh>
 
 namespace Dumux {
 
diff --git a/dumux/common/properties/grid.hh b/dumux/common/properties/grid.hh
index 089f5f99b38ac7efeb2d8bb6ba618b0fad93b6f9..2f4803a0b543ae8d825d217d36f88e90dda76eaf 100644
--- a/dumux/common/properties/grid.hh
+++ b/dumux/common/properties/grid.hh
@@ -24,7 +24,6 @@
 #ifndef DUMUX_GRID_PROPERTIES_HH
 #define DUMUX_GRID_PROPERTIES_HH
 
-#include <dune/common/version.hh>
 #include <dune/common/fvector.hh>
 
 #include <dumux/common/properties.hh>
diff --git a/dumux/common/staggeredfvproblem.hh b/dumux/common/staggeredfvproblem.hh
index d5b669f9b0f0ab1ca8a58d04e8787da0d8070f29..d0dcc587d3fcf3777ba260c231fa8195934422b4 100644
--- a/dumux/common/staggeredfvproblem.hh
+++ b/dumux/common/staggeredfvproblem.hh
@@ -24,7 +24,6 @@
 #ifndef DUMUX_STAGGERD_FV_PROBLEM_HH
 #define DUMUX_STAGGERD_FV_PROBLEM_HH
 
-#include <dune/common/version.hh>
 #include <dune/common/rangeutilities.hh>
 
 #include <dumux/common/properties.hh>
diff --git a/dumux/discretization/basefvgridgeometry.hh b/dumux/discretization/basefvgridgeometry.hh
index d0a6b4b9d2250ff3ccabc399c54bef3fe701e860..0bf49c8922beafa402e06154a7850cf94f296207 100644
--- a/dumux/discretization/basefvgridgeometry.hh
+++ b/dumux/discretization/basefvgridgeometry.hh
@@ -24,7 +24,6 @@
 #ifndef DUMUX_DISCRETIZATION_BASE_FV_GRID_GEOMETRY_HH
 #define DUMUX_DISCRETIZATION_BASE_FV_GRID_GEOMETRY_HH
 
-#include <dune/common/version.hh>
 #include <dune/grid/common/mcmgmapper.hh>
 
 #include <dumux/common/properties.hh>
diff --git a/dumux/discretization/box/boxgeometryhelper.hh b/dumux/discretization/box/boxgeometryhelper.hh
index d1fadc2d0495efc5961e92dbc98b6cd969cf9b7f..5766d9afd5320cd0230af78961bccd6814ca2c72 100644
--- a/dumux/discretization/box/boxgeometryhelper.hh
+++ b/dumux/discretization/box/boxgeometryhelper.hh
@@ -25,7 +25,6 @@
 #define DUMUX_DISCRETIZATION_BOX_GEOMETRY_HELPER_HH
 
 #include <array>
-#include <dune/common/version.hh>
 #include <dune/geometry/referenceelements.hh>
 
 #include <dumux/common/math.hh>
diff --git a/dumux/discretization/box/fvelementgeometry.hh b/dumux/discretization/box/fvelementgeometry.hh
index c4ef5e65895b44d0de204846c05d5350703420a4..8de69cfe7f5a513c82d02eac73ee604fae334be4 100644
--- a/dumux/discretization/box/fvelementgeometry.hh
+++ b/dumux/discretization/box/fvelementgeometry.hh
@@ -26,7 +26,6 @@
 #ifndef DUMUX_DISCRETIZATION_BOX_FV_ELEMENT_GEOMETRY_HH
 #define DUMUX_DISCRETIZATION_BOX_FV_ELEMENT_GEOMETRY_HH
 
-#include <dune/common/version.hh>
 #include <dune/geometry/referenceelements.hh>
 #include <dune/localfunctions/lagrange/pqkfactory.hh>
 
diff --git a/dumux/discretization/box/subcontrolvolume.hh b/dumux/discretization/box/subcontrolvolume.hh
index 68e10116976f3bffaa8c0cc38cc5e9bada435413..2513c41daa124e0aff47f5040fc96218c5adf93b 100644
--- a/dumux/discretization/box/subcontrolvolume.hh
+++ b/dumux/discretization/box/subcontrolvolume.hh
@@ -24,7 +24,6 @@
 #ifndef DUMUX_DISCRETIZATION_BOX_SUBCONTROLVOLUME_HH
 #define DUMUX_DISCRETIZATION_BOX_SUBCONTROLVOLUME_HH
 
-#include <dune/common/version.hh>
 #include <dune/geometry/multilineargeometry.hh>
 
 #include <dumux/discretization/subcontrolvolumebase.hh>
diff --git a/dumux/discretization/box/subcontrolvolumeface.hh b/dumux/discretization/box/subcontrolvolumeface.hh
index 9a0a0420233dd454a750615408cfbd1123c0af30..7d2c8396e2d303c8f9222fe0f5b96d6e202352a8 100644
--- a/dumux/discretization/box/subcontrolvolumeface.hh
+++ b/dumux/discretization/box/subcontrolvolumeface.hh
@@ -26,7 +26,6 @@
 #include <utility>
 
 #include <dune/geometry/type.hh>
-#include <dune/common/version.hh>
 #include <dune/geometry/multilineargeometry.hh>
 
 #include <dumux/common/boundaryflag.hh>
diff --git a/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh b/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh
index be31dde46ce7514ddb6a052a23bc74a6b8f273d6..fca047585f819d632ecd88ebc432d7e313ccb001 100644
--- a/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh
+++ b/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh
@@ -26,7 +26,6 @@
 #ifndef DUMUX_DISCRETIZATION_CCMPFA_FV_ELEMENT_GEOMETRY_HH
 #define DUMUX_DISCRETIZATION_CCMPFA_FV_ELEMENT_GEOMETRY_HH
 
-#include <dune/common/version.hh>
 #include <dune/common/exceptions.hh>
 #include <dune/common/iteratorrange.hh>
 #include <dune/geometry/referenceelements.hh>
diff --git a/dumux/discretization/cellcentered/mpfa/helper.hh b/dumux/discretization/cellcentered/mpfa/helper.hh
index 3e7858c563679884de182eb74a8d15197fd8de92..75e974d8621f08dbfd9c6ed549144ed507c6d980 100644
--- a/dumux/discretization/cellcentered/mpfa/helper.hh
+++ b/dumux/discretization/cellcentered/mpfa/helper.hh
@@ -24,7 +24,6 @@
 #ifndef DUMUX_DISCRETIZATION_CC_MPFA_HELPER_HH
 #define DUMUX_DISCRETIZATION_CC_MPFA_HELPER_HH
 
-#include <dune/common/version.hh>
 #include <dune/common/exceptions.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
diff --git a/dumux/discretization/cellcentered/mpfa/subcontrolvolumeface.hh b/dumux/discretization/cellcentered/mpfa/subcontrolvolumeface.hh
index f39d2d0b4124234fbbf0bdccd2844a3eeeb2eda7..d1306bc173d5c4e6b98f16d549f5492e5d84a645 100644
--- a/dumux/discretization/cellcentered/mpfa/subcontrolvolumeface.hh
+++ b/dumux/discretization/cellcentered/mpfa/subcontrolvolumeface.hh
@@ -26,7 +26,6 @@
 
 #include <vector>
 #include <array>
-#include <dune/common/version.hh>
 #include <dune/common/reservedvector.hh>
 #include <dune/common/fvector.hh>
 #include <dune/geometry/type.hh>
diff --git a/dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh b/dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh
index 34a7a3d979075ff44ffaae92d15308c2bf6d8692..c906d0f6e94d4edf1ca4790bb0da3276786971f0 100644
--- a/dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh
+++ b/dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh
@@ -24,7 +24,6 @@
 #ifndef DUMUX_DISCRETIZATION_STAGGERED_GEOMETRY_HELPER_HH
 #define DUMUX_DISCRETIZATION_STAGGERED_GEOMETRY_HELPER_HH
 
-#include <dune/common/version.hh>
 #include <dune/geometry/multilineargeometry.hh>
 #include <dune/geometry/referenceelements.hh>
 
diff --git a/dumux/freeflow/navierstokes/staggered/fluxoversurface.hh b/dumux/freeflow/navierstokes/staggered/fluxoversurface.hh
index 39c9add1cc2d7c79365e759e54d64dca82ce6f64..9e396b3d9457dbc0472e48bee60bd0a0f327da51 100644
--- a/dumux/freeflow/navierstokes/staggered/fluxoversurface.hh
+++ b/dumux/freeflow/navierstokes/staggered/fluxoversurface.hh
@@ -29,7 +29,6 @@
 #include <type_traits>
 
 #include <dune/common/exceptions.hh>
-#include <dune/common/version.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
 #include <dune/geometry/type.hh>
diff --git a/dumux/io/adaptivegridrestart.hh b/dumux/io/adaptivegridrestart.hh
index 9c3e9ca504922716f77a69f43babce1c7b387fd7..addb5a801f440042487b13e6c060649113edc68a 100644
--- a/dumux/io/adaptivegridrestart.hh
+++ b/dumux/io/adaptivegridrestart.hh
@@ -24,7 +24,6 @@
 #ifndef DUMUX_ADAPTIVEGRIDRESTART_HH
 #define DUMUX_ADAPTIVEGRIDRESTART_HH
 
-#include <dune/common/version.hh>
 
 #if HAVE_DUNE_ALUGRID
 #include <dune/alugrid/grid.hh>
diff --git a/dumux/io/cakegridcreator.hh b/dumux/io/cakegridcreator.hh
index 0d928cf2fc39840e3f5b12d670bcd85bb137d720..8bbaea8b3e3573c01d44a3733f422ac99c9b359b 100644
--- a/dumux/io/cakegridcreator.hh
+++ b/dumux/io/cakegridcreator.hh
@@ -30,7 +30,6 @@
 #include <cmath>
 #include <algorithm>
 
-#include <dune/common/version.hh>
 #include <dune/common/dynvector.hh>
 #include <dune/grid/common/gridfactory.hh>
 #include <dumux/common/properties.hh>
diff --git a/dumux/io/gridcreator.hh b/dumux/io/gridcreator.hh
index 970c5aefcef398ddd323c217a1a0ebb98160cea1..767ee716c8f097b7398a06d0db3bad9cdd3f5f3e 100644
--- a/dumux/io/gridcreator.hh
+++ b/dumux/io/gridcreator.hh
@@ -32,7 +32,6 @@
 #include <memory>
 #include <sstream>
 
-#include <dune/common/version.hh>
 #include <dune/common/exceptions.hh>
 #include <dune/common/classname.hh>
 #include <dune/common/parallel/collectivecommunication.hh>
@@ -65,7 +64,6 @@
 // FoamGrid specific includes
 #if HAVE_DUNE_FOAMGRID
 #include <dune/foamgrid/foamgrid.hh>
-#include <dune/common/version.hh>
 #include <dune/foamgrid/dgffoam.hh>
 #endif
 
diff --git a/dumux/io/vtkmultiwriter.hh b/dumux/io/vtkmultiwriter.hh
index 473d0eb3cf4e5f6719ebc59f7d3544775013d765..d67c210abf0e69cd5e48c00d7bbd7ff52d80fab8 100644
--- a/dumux/io/vtkmultiwriter.hh
+++ b/dumux/io/vtkmultiwriter.hh
@@ -41,7 +41,6 @@
 
 #include <dumux/common/valgrind.hh>
 
-#include <dune/common/version.hh>
 #include <dune/common/deprecated.hh>
 
 #if HAVE_MPI
diff --git a/dumux/io/vtkoutputmodule.hh b/dumux/io/vtkoutputmodule.hh
index f1f115f9d7e906541b89d57dfa36335a234c56fb..4c6b375593587b587e7361567d5fc1a9ac3d0f5e 100644
--- a/dumux/io/vtkoutputmodule.hh
+++ b/dumux/io/vtkoutputmodule.hh
@@ -26,7 +26,6 @@
 
 #include <functional>
 
-#include <dune/common/version.hh>
 #include <dune/common/timer.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/typetraits.hh>
diff --git a/dumux/linear/seqsolverbackend.hh b/dumux/linear/seqsolverbackend.hh
index c3365903cdeb436951c3db9d00c2f210ca87eb7b..58e6ed9855eca0514e302850f3e4942dfaecd593 100644
--- a/dumux/linear/seqsolverbackend.hh
+++ b/dumux/linear/seqsolverbackend.hh
@@ -30,7 +30,6 @@
 #include <dune/istl/solvers.hh>
 #include <dune/istl/superlu.hh>
 #include <dune/istl/umfpack.hh>
-#include <dune/common/version.hh>
 
 #include <dumux/common/parameters.hh>
 #include <dumux/common/properties.hh>
diff --git a/dumux/material/spatialparams/gstatrandomfield.hh b/dumux/material/spatialparams/gstatrandomfield.hh
index a5fcc7907f4000e587383ebe30245f6977822290..3eaf7a322231500c7d3d34ee0f283c2c5b83c6ed 100644
--- a/dumux/material/spatialparams/gstatrandomfield.hh
+++ b/dumux/material/spatialparams/gstatrandomfield.hh
@@ -29,7 +29,6 @@
 #include <dune/grid/common/mcmgmapper.hh>
 #include <dune/grid/io/file/vtk.hh>
 
-#include <dune/common/version.hh>
 
 namespace Dumux
 {
diff --git a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/velocity.hh b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/velocity.hh
index 1c8fbc235de806e5e38f964c279ac14139fc67b3..8f2a9f8bbff8de4b27dc1f37380bf87d9dd2241a 100644
--- a/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/velocity.hh
+++ b/dumux/porousmediumflow/1p/sequential/diffusion/cellcentered/velocity.hh
@@ -19,7 +19,6 @@
 #ifndef DUMUX_FVVELOCITY1P_HH
 #define DUMUX_FVVELOCITY1P_HH
 
-#include <dune/common/version.hh>
 #include <dumux/porousmediumflow/1p/sequential/properties.hh>
 
 /*!
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh
index 04ae4c5a9e15207fc4974ec075c820ceebaa7995..f696e8d132b147454c682532c8a89a6c9583e21a 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/cellcentered/velocity.hh
@@ -24,7 +24,6 @@
 #ifndef DUMUX_FVVELOCITY2P_HH
 #define DUMUX_FVVELOCITY2P_HH
 
-#include <dune/common/version.hh>
 #include <dune/common/float_cmp.hh>
 #include <dune/grid/common/gridenums.hh>
 #include <dumux/porousmediumflow/2p/sequential/diffusion/properties.hh>
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/croperator.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/croperator.hh
index 17d52e48f2ecfa3dedb76b8c16d73760bbec0884..ada0e849d566cf11863b23878be339fd6a689e15 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/croperator.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/croperator.hh
@@ -34,7 +34,6 @@
 #include<dune/common/fvector.hh>
 #include<dune/common/fmatrix.hh>
 #include<dune/common/exceptions.hh>
-#include<dune/common/version.hh>
 #include<dune/geometry/type.hh>
 #include<dune/grid/common/grid.hh>
 #include<dune/grid/common/mcmgmapper.hh>
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/mimetic.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/mimetic.hh
index b84ef09573c779f4cbab67eb7d00c850cbd1abbb..164cede101bcbf10870d7fd279cd745a1643c4d7 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/mimetic.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/mimetic.hh
@@ -32,7 +32,6 @@
 #include<sstream>
 
 #include<dune/common/exceptions.hh>
-#include<dune/common/version.hh>
 #include<dune/grid/common/grid.hh>
 #include<dune/geometry/type.hh>
 #include<dune/geometry/quadraturerules.hh>
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressure.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressure.hh
index 259d24297f2bd7899779a19ce954d0414276c748..0b1c7ce86028bb34cd4895cdef7a568daeae8ae4 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressure.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressure.hh
@@ -24,7 +24,6 @@
 #ifndef DUMUX_MIMETICPRESSURE2P_HH
 #define DUMUX_MIMETICPRESSURE2P_HH
 
-#include <dune/common/version.hh>
 
 // dumux environment
 #include <dumux/porousmediumflow/sequential/mimetic/properties.hh>
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressureadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressureadaptive.hh
index 7e501315e01121a2f2dce6701e1c78207c7c0d42..db56d4a8b62672cbc22442af07deaf5753173459 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressureadaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mimetic/pressureadaptive.hh
@@ -24,7 +24,6 @@
 #ifndef DUMUX_MIMETICPRESSURE2PADAPTIVE_HH
 #define DUMUX_MIMETICPRESSURE2PADAPTIVE_HH
 
-#include <dune/common/version.hh>
 
 // dumux environment
 #include <dumux/porousmediumflow/sequential/mimetic/properties.hh>
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressure.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressure.hh
index 15942fda28b7d537a7d6f8bd0c4f692813fa4d24..c526b6a72498165bff5e25112d5e4c205920c8a7 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressure.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressure.hh
@@ -22,7 +22,6 @@
 #ifndef DUMUX_FVMPFAL2DPRESSURE2P_HH
 #define DUMUX_FVMPFAL2DPRESSURE2P_HH
 
-#include <dune/common/version.hh>
 
 // dumux environment
 #include <dumux/porousmediumflow/sequential/cellcentered/pressure.hh>
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressureadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressureadaptive.hh
index 694fb7da924e70fe96fe987ea7afafe2c69f2fea..d4badd94d085b1aca90a6a937e3d4d84d2c50a5b 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressureadaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressureadaptive.hh
@@ -22,7 +22,6 @@
 #ifndef DUMUX_FVMPFAL2DPRESSURE2P_ADAPTIVE_HH
 #define DUMUX_FVMPFAL2DPRESSURE2P_ADAPTIVE_HH
 
-#include <dune/common/version.hh>
 
 // dumux environment
 #include <dumux/porousmediumflow/sequential/cellcentered/pressure.hh>
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocity.hh
index 8b3fcf77301c9e1725d7446b315f5d1dfaefec04..7353319fa45014fae07aee1cffbf9af5a8d357eb 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocity.hh
@@ -22,7 +22,6 @@
 #ifndef DUMUX_MPFAL2DPRESSUREVELOCITY2P_HH
 #define DUMUX_MPFAL2DPRESSUREVELOCITY2P_HH
 
-#include <dune/common/version.hh>
 #include <dune/common/float_cmp.hh>
 
 #include "2dpressure.hh"
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocityadaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocityadaptive.hh
index 55e4c6d0b81f21bfbf58a3bbc1656d0d7079552e..1e6e4d2ec46f3d2e25eae9679841654db83be1ca 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocityadaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dpressurevelocityadaptive.hh
@@ -22,7 +22,6 @@
 #ifndef DUMUX_MPFAL2DPRESSUREVELOCITIES2P_ADAPTIVE_HH
 #define DUMUX_MPFAL2DPRESSUREVELOCITIES2P_ADAPTIVE_HH
 
-#include <dune/common/version.hh>
 #include <dune/common/float_cmp.hh>
 
 #include "2dpressureadaptive.hh"
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocity.hh
index 80910bfdc71f868ffcff09ef611de76bc220d853..b026b3b422ddd8ed87612f4e67c7d9fd2cb90203 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/2dvelocity.hh
@@ -24,7 +24,6 @@
 #ifndef DUMUX_FVMPFAL2DVELOCITY2P_HH
 #define DUMUX_FVMPFAL2DVELOCITY2P_HH
 
-#include <dune/common/version.hh>
 #include <dune/grid/common/gridenums.hh>
 #include <dumux/porousmediumflow/2p/sequential/diffusion/properties.hh>
 #include <dumux/porousmediumflow/sequential/cellcentered/mpfa/properties.hh>
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontainer.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontainer.hh
index 90482362db87554c18f86be5500806af8476ddbf..cd07e2af37ecc4a756c6571344e8171b5a27df8a 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontainer.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontainer.hh
@@ -24,7 +24,6 @@
 #ifndef DUMUX_FVMPFAL3D_INTERACTIONVOLUMECONTAINER_HH
 #define DUMUX_FVMPFAL3D_INTERACTIONVOLUMECONTAINER_HH
 
-#include <dune/common/version.hh>
 
 // dumux environment
 #include <dumux/porousmediumflow/sequential/pressureproperties.hh>
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontaineradaptive.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontaineradaptive.hh
index e6e821f9dfafa55463f7498f4dd9d42fb07f4916..35ac01e742ad7632d9e189d0570080e376ed2f3f 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontaineradaptive.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dinteractionvolumecontaineradaptive.hh
@@ -24,7 +24,6 @@
 #ifndef DUMUX_FVMPFAL3D_INTERACTIONVOLUMECONTAINER_ADAPTIVE_HH
 #define DUMUX_FVMPFAL3D_INTERACTIONVOLUMECONTAINER_ADAPTIVE_HH
 
-#include <dune/common/version.hh>
 
 // dumux environment
 #include <dumux/porousmediumflow/sequential/pressureproperties.hh>
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurevelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurevelocity.hh
index e91b75cc8189c2f71641aebe0b6f174140273e9c..44e75af5247eb12c97d2a2de7657d7c4786acbdd 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurevelocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/lmethod/3dpressurevelocity.hh
@@ -24,7 +24,6 @@
 #ifndef DUMUX_FVMPFAL2PFABOUND3DVELOCITIES2P_HH
 #define DUMUX_FVMPFAL2PFABOUND3DVELOCITIES2P_HH
 
-#include <dune/common/version.hh>
 #include <dune/common/float_cmp.hh>
 #include "3dpressure.hh"
 #include "3dvelocity.hh"
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressure.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressure.hh
index 6fea5f1c047eb3df9eafe25581b3700a43a1bed2..0ba8eb8e078885b71a77d5ef73bc644d01755b73 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressure.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressure.hh
@@ -22,7 +22,6 @@
 #ifndef DUMUX_FVMPFAO2DPRESSURE2P_HH
 #define DUMUX_FVMPFAO2DPRESSURE2P_HH
 
-#include <dune/common/version.hh>
 
 // dumux environment
 #include <dumux/porousmediumflow/sequential/cellcentered/pressure.hh>
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressurevelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressurevelocity.hh
index 6d422752d184b29e77a5df6e70b078168badb62d..e310bede75575dd835ef76d06c1d54e817f6fe80 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressurevelocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dpressurevelocity.hh
@@ -22,7 +22,6 @@
 #ifndef DUMUX_MPFAO2DPRESSUREVELOCITIES2P_HH
 #define DUMUX_MPFAO2DPRESSUREVELOCITIES2P_HH
 
-#include <dune/common/version.hh>
 #include <dune/common/float_cmp.hh>
 #include "2dpressure.hh"
 #include "2dvelocity.hh"
diff --git a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dvelocity.hh b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dvelocity.hh
index b1066bf581b9f9b0bf08abda8b7b4c0ba657f25c..5f9aa4853952592b508f359138ae6a8a8769de70 100644
--- a/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dvelocity.hh
+++ b/dumux/porousmediumflow/2p/sequential/diffusion/mpfa/omethod/2dvelocity.hh
@@ -24,7 +24,6 @@
 #ifndef DUMUX_FVMPFAO2DVELOCITY2P_HH
 #define DUMUX_FVMPFAO2DVELOCITY2P_HH
 
-#include <dune/common/version.hh>
 #include <dune/grid/common/gridenums.hh>
 #include <dumux/porousmediumflow/2p/sequential/diffusion/properties.hh>
 #include <dumux/porousmediumflow/sequential/cellcentered/mpfa/properties.hh>
diff --git a/dumux/porousmediumflow/2p2c/sequential/fv3dpressureadaptive.hh b/dumux/porousmediumflow/2p2c/sequential/fv3dpressureadaptive.hh
index acadc586def13afa20ed8e6191b39ff327bda1ea..f83840f0874be9ba775cb133b521a23963221ea8 100644
--- a/dumux/porousmediumflow/2p2c/sequential/fv3dpressureadaptive.hh
+++ b/dumux/porousmediumflow/2p2c/sequential/fv3dpressureadaptive.hh
@@ -20,7 +20,6 @@
 #define DUMUX_FV3DPRESSURE2P2C_ADAPTIVE_HH
 
 // dune environent:
-#include <dune/common/version.hh>
 #include <dune/istl/bvector.hh>
 #include <dune/istl/operators.hh>
 #include <dune/istl/solvers.hh>
diff --git a/dumux/porousmediumflow/sequential/properties.hh b/dumux/porousmediumflow/sequential/properties.hh
index cfc7a6e4899ce7e226eb72107cf9f2540c6ffa02..3250d6d29f467d0a14588075cb326b64a7e6b3f7 100644
--- a/dumux/porousmediumflow/sequential/properties.hh
+++ b/dumux/porousmediumflow/sequential/properties.hh
@@ -26,7 +26,6 @@
 #include <dumux/porousmediumflow/sequential/gridadaptproperties.hh>
 #include <dumux/porousmediumflow/sequential/gridadaptinitializationindicatordefault.hh>
 
-#include <dune/common/version.hh>
 
 /*!
  * \ingroup Sequential
diff --git a/dumux/porousmediumflow/sequential/variableclass.hh b/dumux/porousmediumflow/sequential/variableclass.hh
index c0c5ddefe74b35d1580e75325d5ffcfc0a777775..833dd9e52feaaed8ad9515b86408c1db546779a2 100644
--- a/dumux/porousmediumflow/sequential/variableclass.hh
+++ b/dumux/porousmediumflow/sequential/variableclass.hh
@@ -21,7 +21,6 @@
 
 #include "properties.hh"
 
-#include <dune/common/version.hh>
 
 // for  parallelization
 //#include <dumux/parallel/elementhandles.hh>
diff --git a/dumux/porousmediumflow/velocityoutput.hh b/dumux/porousmediumflow/velocityoutput.hh
index cc6c86ef7cf46c6e8099ff4752c8e3a7904343dd..2237092d969bf94f78635c83c74c7d3657bb13d5 100644
--- a/dumux/porousmediumflow/velocityoutput.hh
+++ b/dumux/porousmediumflow/velocityoutput.hh
@@ -24,7 +24,6 @@
 #ifndef DUMUX_POROUSMEDIUMFLOW_VELOCITYOUTPUT_HH
 #define DUMUX_POROUSMEDIUMFLOW_VELOCITYOUTPUT_HH
 
-#include <dune/common/version.hh>
 #include <dune/common/fvector.hh>
 #include <dune/istl/bvector.hh>
 #include <dune/geometry/referenceelements.hh>
diff --git a/test/common/boundingboxtree/test_bboxtree.cc b/test/common/boundingboxtree/test_bboxtree.cc
index b3a2c75155b9bdc6d50a81477ca68d59dcbcc3d4..803ed959850fde8546c2ebf0fc8b40400e11df80 100644
--- a/test/common/boundingboxtree/test_bboxtree.cc
+++ b/test/common/boundingboxtree/test_bboxtree.cc
@@ -11,7 +11,6 @@
 
 #if HAVE_DUNE_FOAMGRID
 #include <dune/foamgrid/foamgrid.hh>
-#include <dune/common/version.hh>
 #include <dune/foamgrid/dgffoam.hh>
 #endif
 
diff --git a/test/common/boundingboxtree/test_geometry_fracture.cc b/test/common/boundingboxtree/test_geometry_fracture.cc
index 45638708a560901addb057d93d679c0c6a3cab58..4785597b7690524060b138e33f722b06955b5d9a 100644
--- a/test/common/boundingboxtree/test_geometry_fracture.cc
+++ b/test/common/boundingboxtree/test_geometry_fracture.cc
@@ -11,7 +11,6 @@
 #include <dune/grid/yaspgrid.hh>
 
 #include <dune/foamgrid/foamgrid.hh>
-#include <dune/common/version.hh>
 #include <dune/foamgrid/dgffoam.hh>
 
 #include <dumux/common/exceptions.hh>
diff --git a/test/common/geometry/test_1d3d_intersection.cc b/test/common/geometry/test_1d3d_intersection.cc
index 45eb434e8c7f2aeac6b28bafe386ff3dd7d1da3d..ba71f82c728e24c63fc378ab0fe0602127496791 100644
--- a/test/common/geometry/test_1d3d_intersection.cc
+++ b/test/common/geometry/test_1d3d_intersection.cc
@@ -4,7 +4,6 @@
 #include <algorithm>
 #include <initializer_list>
 
-#include <dune/common/version.hh>
 #include <dune/common/exceptions.hh>
 #include <dune/common/parallel/mpihelper.hh>
 #include <dune/common/fvector.hh>
diff --git a/test/io/gridcreator/test_gridcreator_gmsh.cc b/test/io/gridcreator/test_gridcreator_gmsh.cc
index 3ac92c60a193a8ff58ef80071f621b3298abb677..ead51c03f26d912149b12e2ce78f1e84119142cc 100644
--- a/test/io/gridcreator/test_gridcreator_gmsh.cc
+++ b/test/io/gridcreator/test_gridcreator_gmsh.cc
@@ -22,7 +22,6 @@
 #include <config.h>
 #include <iostream>
 
-#include <dune/common/version.hh>
 #include <dune/geometry/referenceelements.hh>
 #include <dune/grid/io/file/vtk.hh>
 #include <dune/grid/common/mcmgmapper.hh>