diff --git a/dune/gfe/mixedriemanniantrsolver.hh b/dune/gfe/mixedriemanniantrsolver.hh
index d291e0e8a7b40c6bd83759b85ed9261169120e6a..197388783636b2427c11172d5cfb546e5f36d8c3 100644
--- a/dune/gfe/mixedriemanniantrsolver.hh
+++ b/dune/gfe/mixedriemanniantrsolver.hh
@@ -11,7 +11,7 @@
 
 #include <dune/grid/utility/globalindexset.hh>
 
-#include <dune/functions/common/tuplevector.hh>
+#include <dune/common/tuplevector.hh>
 
 #include <dune/solvers/common/boxconstraint.hh>
 #include <dune/solvers/norms/h1seminorm.hh>
@@ -47,7 +47,7 @@ class MixedRiemannianTrustRegionSolver
     typedef Dune::BlockVector<Dune::FieldVector<field_type, blocksize0> >             CorrectionType0;
     typedef Dune::BlockVector<Dune::FieldVector<field_type, blocksize1> >             CorrectionType1;
     typedef Dune::MultiTypeBlockVector<CorrectionType0, CorrectionType1> CorrectionType;
-    typedef Dune::Functions::TupleVector<std::vector<TargetSpace0>, std::vector<TargetSpace1> > SolutionType;
+    typedef Dune::TupleVector<std::vector<TargetSpace0>, std::vector<TargetSpace1> > SolutionType;
 
 public:
 
diff --git a/src/mixed-cosserat-continuum.cc b/src/mixed-cosserat-continuum.cc
index 6682be6d98954c94cc0fdb471bdbe6b4649e5db0..f44f25d79e24f48994f2a9be555e697064eee888 100644
--- a/src/mixed-cosserat-continuum.cc
+++ b/src/mixed-cosserat-continuum.cc
@@ -24,6 +24,7 @@ namespace Dune {
 #include <dune/common/bitsetvector.hh>
 #include <dune/common/parametertree.hh>
 #include <dune/common/parametertreeparser.hh>
+#include <dune/common/tuplevector.hh>
 
 #include <dune/grid/uggrid.hh>
 #include <dune/grid/onedgrid.hh>
@@ -31,7 +32,6 @@ namespace Dune {
 
 #include <dune/grid/io/file/gmshreader.hh>
 
-#include <dune/functions/common/tuplevector.hh>
 #include <dune/functions/functionspacebases/pqknodalbasis.hh>
 #include <dune/functions/functionspacebases/compositebasis.hh>
 
@@ -93,7 +93,7 @@ int main (int argc, char *argv[]) try
         << std::endl;
 
     using namespace Dune::TypeTree::Indices;
-    typedef Dune::Functions::TupleVector<std::vector<RealTuple<double,3> >,
+    typedef Dune::TupleVector<std::vector<RealTuple<double,3> >,
                                          std::vector<Rotation<double,3> > > SolutionType;
 
     // parse data file