diff --git a/dumux/discretization/box/subcontrolvolume.hh b/dumux/discretization/box/subcontrolvolume.hh
index e8d9d22b5f5d2c061afc2cefcb412711a3e0b1e1..7b4de0db44c8cb774d7c7e0c9ff8c97967fe46c0 100644
--- a/dumux/discretization/box/subcontrolvolume.hh
+++ b/dumux/discretization/box/subcontrolvolume.hh
@@ -24,6 +24,7 @@
 #ifndef DUMUX_DISCRETIZATION_BOX_SUBCONTROLVOLUME_HH
 #define DUMUX_DISCRETIZATION_BOX_SUBCONTROLVOLUME_HH
 
+#include <dune/geometry/type.hh>
 #include <dune/geometry/multilineargeometry.hh>
 
 #include <dumux/common/math.hh>
@@ -63,7 +64,7 @@ struct BoxDefaultScvGeometryTraits
         struct hasSingleGeometryType
         {
             static const bool v = true;
-            static const unsigned int topologyId = Dune::Impl::CubeTopology< mydim >::type::id;
+            static const unsigned int topologyId = Dune::GeometryTypes::cube(mydim).id();
         };
     };
 
diff --git a/dumux/discretization/box/subcontrolvolumeface.hh b/dumux/discretization/box/subcontrolvolumeface.hh
index 22f904470e50ea2aa019d896d41e6fe2f0639584..6ca7d2672ea21c61f9b473db9194eb0be4dbf747 100644
--- a/dumux/discretization/box/subcontrolvolumeface.hh
+++ b/dumux/discretization/box/subcontrolvolumeface.hh
@@ -66,7 +66,7 @@ struct BoxDefaultScvfGeometryTraits
         struct hasSingleGeometryType
         {
             static const bool v = true;
-            static const unsigned int topologyId = Dune::Impl::CubeTopology< mydim >::type::id;
+            static const unsigned int topologyId = Dune::GeometryTypes::cube(mydim).id();
         };
     };
 
diff --git a/dumux/discretization/cellcentered/mpfa/omethod/scvgeometryhelper.hh b/dumux/discretization/cellcentered/mpfa/omethod/scvgeometryhelper.hh
index 32ba0871b92bdea86a6e9de4786069ce0e2d4303..0678285a680432d5ca5f53d7a131c5b37a6140bc 100644
--- a/dumux/discretization/cellcentered/mpfa/omethod/scvgeometryhelper.hh
+++ b/dumux/discretization/cellcentered/mpfa/omethod/scvgeometryhelper.hh
@@ -60,7 +60,7 @@ class CCMpfaOScvGeometryHelper
         struct hasSingleGeometryType
         {
             static const bool v = true;
-            static const unsigned int topologyId = Dune::Impl::CubeTopology< d >::type::id;
+            static const unsigned int topologyId = Dune::GeometryTypes::cube(d).id();
         };
     };
 
diff --git a/dumux/discretization/cellcentered/mpfa/subcontrolvolumeface.hh b/dumux/discretization/cellcentered/mpfa/subcontrolvolumeface.hh
index 67c8730992bcd9a5dc0c77424868ff672cdc857a..8d48f58507a44dc4ffe9d0fdbc1f9d9b873e99c5 100644
--- a/dumux/discretization/cellcentered/mpfa/subcontrolvolumeface.hh
+++ b/dumux/discretization/cellcentered/mpfa/subcontrolvolumeface.hh
@@ -74,7 +74,7 @@ struct CCMpfaDefaultScvfGeometryTraits
         struct hasSingleGeometryType
         {
             static const bool v = true;
-            static const unsigned int topologyId = Dune::Impl::CubeTopology< dim >::type::id;
+            static const unsigned int topologyId = Dune::GeometryTypes::cube(dim).id();
         };
     };