diff --git a/cosserat-continuum.cc b/cosserat-continuum.cc
index acb3ef160cb7f208ead7fb6cf6d65ffb96294cf4..0947c7b5f35ccfa8050bd79de66d814bf95cc0f3 100644
--- a/cosserat-continuum.cc
+++ b/cosserat-continuum.cc
@@ -34,7 +34,7 @@ const int dim = 2;
 
 // Image space of the geodesic fe functions
 #ifdef RIGIDBODYMOTION3
-typedef RigidBodyMotion<3> TargetSpace;
+typedef RigidBodyMotion<double,3> TargetSpace;
 #endif
 
 // Tangent vector of the image space
diff --git a/dune.module b/dune.module
index 59d6b9583319187d3210795f83ebf96c02f7a083..8064154e644a77d0de4b40e7981f1881d9fdd632 100644
--- a/dune.module
+++ b/dune.module
@@ -6,4 +6,4 @@
 Module:dune-gfe
 Version: svn
 #depending on 
-Depends:dune-common dune-grid dune-istl dune-localfunctions dune-solvers dune-fufem
+Depends:dune-common dune-grid dune-istl dune-localfunctions dune-solvers dune-fufem dune-geometry
diff --git a/dune/gfe/averageinterface.hh b/dune/gfe/averageinterface.hh
index ff53c8faa9d1d06b6eb6e3ceaf4b4c41d3daa10c..4a0a151845ef6c9720fe522b1665b4257f6afd53 100644
--- a/dune/gfe/averageinterface.hh
+++ b/dune/gfe/averageinterface.hh
@@ -1,6 +1,9 @@
 #ifndef AVERAGE_INTERFACE_HH
 #define AVERAGE_INTERFACE_HH
 
+#include <dune/geometry/referenceelements.hh>
+#include <dune/geometry/quadraturerules.hh>
+
 #include <dune/common/fmatrix.hh>
 #include <dune/localfunctions/lagrange/pqkfactory.hh>
 #include <dune/istl/solvers.hh>
diff --git a/dune/gfe/cosseratenergystiffness.hh b/dune/gfe/cosseratenergystiffness.hh
index 17cf5f1a88e88fc8d8b340ba9b828a7210e416d9..5df5bad083bb8ad307237ad4510a1996729d9bbd 100644
--- a/dune/gfe/cosseratenergystiffness.hh
+++ b/dune/gfe/cosseratenergystiffness.hh
@@ -3,7 +3,7 @@
 
 #include <dune/common/fmatrix.hh>
 #include <dune/common/parametertree.hh>
-#include <dune/grid/common/quadraturerules.hh>
+#include <dune/geometry/quadraturerules.hh>
 
 #include <dune/fufem/functions/virtualgridfunction.hh>
 #include <dune/fufem/boundarypatch.hh>
diff --git a/dune/gfe/geodesicfefunctionadaptor.hh b/dune/gfe/geodesicfefunctionadaptor.hh
index 76a5b725c02e39d4d0f3de3bf995f73a1085e2ae..d4528c095479086cdc894031ab2cd191500c5814 100644
--- a/dune/gfe/geodesicfefunctionadaptor.hh
+++ b/dune/gfe/geodesicfefunctionadaptor.hh
@@ -4,6 +4,8 @@
 #include <vector>
 #include <map>
 
+#include<dune/geometry/referenceelements.hh>
+
 #include <dune/fufem/functionspacebases/p2nodalbasis.hh>
 
 #include "localgeodesicfefunction.hh"
diff --git a/dune/gfe/harmonicenergystiffness.hh b/dune/gfe/harmonicenergystiffness.hh
index 7030b5098d397081d4f6d0aa14a025e55a33b18e..9f81b86a5ef2d88c8ca01351ca4be8ca2307e658 100644
--- a/dune/gfe/harmonicenergystiffness.hh
+++ b/dune/gfe/harmonicenergystiffness.hh
@@ -2,7 +2,7 @@
 #define HARMONIC_ENERGY_LOCAL_STIFFNESS_HH
 
 #include <dune/common/fmatrix.hh>
-#include <dune/grid/common/quadraturerules.hh>
+#include <dune/geometry/quadraturerules.hh>
 
 #include "localgeodesicfestiffness.hh"
 #include "localgeodesicfefunction.hh"
diff --git a/dune/gfe/localgeodesicfefunction.hh b/dune/gfe/localgeodesicfefunction.hh
index ae3238c29532ab5e05bead07c9be5c43715df97f..9d7d5aedc7a9be81fab1d2a9e489f78064eafde5 100644
--- a/dune/gfe/localgeodesicfefunction.hh
+++ b/dune/gfe/localgeodesicfefunction.hh
@@ -5,6 +5,8 @@
 
 #include <dune/common/fvector.hh>
 
+#include <dune/geometry/type.hh>
+
 #include <dune/gfe/averagedistanceassembler.hh>
 #include <dune/gfe/targetspacertrsolver.hh>
 #include <dune/gfe/rigidbodymotion.hh>
diff --git a/dune/gfe/localgfetestfunctionbasis.hh b/dune/gfe/localgfetestfunctionbasis.hh
index f0d0381189f69ace2f87cf1ede6e5d754aff7384..cf5707fa067605ba21d2c11fd12269011f18e1fa 100644
--- a/dune/gfe/localgfetestfunctionbasis.hh
+++ b/dune/gfe/localgfetestfunctionbasis.hh
@@ -5,7 +5,7 @@
 
 #include <dune/common/fvector.hh>
 #include <dune/common/array.hh>
-#include <dune/common/geometrytype.hh>
+#include <dune/geometry/type.hh>
 
 #include <dune/gfe/localgeodesicfefunction.hh>
 #include <dune/gfe/tensor3.hh>
diff --git a/dune/gfe/rodassembler.cc b/dune/gfe/rodassembler.cc
index bf6b08f013ff21c50cf149f520477a64e790ae12..1076504af0dc86e0f162992557e6259c4cf02f2c 100644
--- a/dune/gfe/rodassembler.cc
+++ b/dune/gfe/rodassembler.cc
@@ -3,7 +3,7 @@
 #include <dune/istl/matrixindexset.hh>
 #include <dune/istl/matrix.hh>
 
-#include <dune/grid/common/quadraturerules.hh>
+#include <dune/geometry/quadraturerules.hh>
 
 #include <dune/localfunctions/lagrange/p1.hh>
 
diff --git a/dune/gfe/rodlocalstiffness.hh b/dune/gfe/rodlocalstiffness.hh
index a526da4bf800d98bc699e7abcbdfcbed38450153..73efd23049aa89d25147b467f2bdb8318fd7c629 100644
--- a/dune/gfe/rodlocalstiffness.hh
+++ b/dune/gfe/rodlocalstiffness.hh
@@ -3,7 +3,7 @@
 
 #include <dune/common/fmatrix.hh>
 #include <dune/istl/matrix.hh>
-#include <dune/grid/common/quadraturerules.hh>
+#include <dune/geometry/quadraturerules.hh>
 #include <dune/localfunctions/lagrange/p1.hh>
 
 #include <dune/fufem/functionspacebases/p1nodalbasis.hh>
diff --git a/test/averagedistanceassemblertest.cc b/test/averagedistanceassemblertest.cc
index e1361137dfcc74203976f0071672d16c33e3cacb..0f49c4a40b4e511cd225eeec82fe5490f692a5ae 100644
--- a/test/averagedistanceassemblertest.cc
+++ b/test/averagedistanceassemblertest.cc
@@ -3,7 +3,8 @@
 #include <iostream>
 
 #include <dune/common/fvector.hh>
-#include <dune/grid/common/quadraturerules.hh>
+#include <dune/geometry/quadraturerules.hh>
+#include <dune/geometry/type.hh>
 
 #include <dune/gfe/rotation.hh>
 #include <dune/gfe/realtuple.hh>
diff --git a/test/cosseratenergytest.cc b/test/cosseratenergytest.cc
index 02e8b9b350147358ec9e16a273a3b9d028ae42e8..b475c29a67afa3849a7eb1d2bd0524f921a93064 100644
--- a/test/cosseratenergytest.cc
+++ b/test/cosseratenergytest.cc
@@ -2,6 +2,9 @@
 
 #include <dune/grid/uggrid.hh>
 
+#include <dune/geometry/type.hh>
+#include <dune/geometry/quadraturerules.hh>
+
 #include <dune/localfunctions/lagrange/pqkfactory.hh>
 
 #include <dune/fufem/functions/constantfunction.hh>
diff --git a/test/localgeodesicfefunctiontest.cc b/test/localgeodesicfefunctiontest.cc
index 94da4b3de1915b3d4c3ef56b34c8df21086aee1f..f506ca6dc586eb1ea5314268284c9521f7ce7fa7 100644
--- a/test/localgeodesicfefunctiontest.cc
+++ b/test/localgeodesicfefunctiontest.cc
@@ -4,7 +4,10 @@
 #include <iostream>
 
 #include <dune/common/fvector.hh>
-#include <dune/grid/common/quadraturerules.hh>
+
+#include <dune/geometry/quadraturerules.hh>
+#include <dune/geometry/type.hh>
+#include <dune/geometry/referenceelements.hh>
 
 #include <dune/localfunctions/lagrange/pqkfactory.hh>
 
diff --git a/test/localgeodesicfestiffnesstest.cc b/test/localgeodesicfestiffnesstest.cc
index 7391cc056a0a9e2f683ca80863d6f134314b0378..a126a7d98acac02202cfeb856ebc68b318a7e4d4 100644
--- a/test/localgeodesicfestiffnesstest.cc
+++ b/test/localgeodesicfestiffnesstest.cc
@@ -5,6 +5,8 @@
 
 #include <dune/istl/io.hh>
 
+#include <dune/geometry/type.hh>
+
 #include <dune/gfe/unitvector.hh>
 #include <dune/gfe/realtuple.hh>
 #include <dune/gfe/localgeodesicfestiffness.hh>