diff --git a/dune/gfe/localgeodesicfefunction.hh b/dune/gfe/localgeodesicfefunction.hh
index b89f645ac50e9719daebe7740885d5032a99fbe2..5f3e7063a5f7339c9c5ab03bca6aedaebf85193d 100644
--- a/dune/gfe/localgeodesicfefunction.hh
+++ b/dune/gfe/localgeodesicfefunction.hh
@@ -6,10 +6,10 @@
 #include <dune/common/fvector.hh>
 #include <dune/common/geometrytype.hh>
 
-#include <dune/src/averagedistanceassembler.hh>
-#include <dune/src/targetspacertrsolver.hh>
+#include <dune/gfe/averagedistanceassembler.hh>
+#include <dune/gfe/targetspacertrsolver.hh>
 
-#include <dune/src/svd.hh>
+#include <dune/gfe/svd.hh>
 
 /** \brief A geodesic function from the reference element to a manifold 
     
diff --git a/dune/gfe/riemanniantrsolver.cc b/dune/gfe/riemanniantrsolver.cc
index fd442219342887b9e431d9ed0801fcde7545664c..a1f9e54d9ca585a8b77c65596ea44a8b7df1a224 100644
--- a/dune/gfe/riemanniantrsolver.cc
+++ b/dune/gfe/riemanniantrsolver.cc
@@ -23,7 +23,7 @@
 
 
 // for debugging
-#include "../test/fdcheck.hh"
+#include <test/fdcheck.hh>
 
 template <class GridType, class TargetSpace>
 void RiemannianTrustRegionSolver<GridType,TargetSpace>::
diff --git a/dune/gfe/rodassembler.cc b/dune/gfe/rodassembler.cc
index 2718ba2ef90a1696af5b7f103e810e32aa12d61e..87f6eb5195cb38403b05566efae8092b52aacb56 100644
--- a/dune/gfe/rodassembler.cc
+++ b/dune/gfe/rodassembler.cc
@@ -7,7 +7,7 @@
 
 #include <dune/localfunctions/lagrange/p1.hh>
 
-#include "src/rodlocalstiffness.hh"
+#include <dune/gfe/rodlocalstiffness.hh>
 
 
 
diff --git a/harmonicmaps.cc b/harmonicmaps.cc
index 395a50b058e27a1ea60883fac7ba0ebbb079dc9c..2f7111e8f229be53747c6081881125f100af127b 100644
--- a/harmonicmaps.cc
+++ b/harmonicmaps.cc
@@ -20,12 +20,12 @@
 #include <dune/solvers/solvers/iterativesolver.hh>
 #include <dune/solvers/norms/energynorm.hh>
 
-#include "src/rotation.hh"
-#include "src/unitvector.hh"
-#include "src/realtuple.hh"
-#include "src/harmonicenergystiffness.hh"
-#include "src/geodesicfeassembler.hh"
-#include "src/riemanniantrsolver.hh"
+#include <dune/gfe/rotation.hh>
+#include <dune/gfe/unitvector.hh>
+#include <dune/gfe/realtuple.hh>
+#include <dune/gfe/harmonicenergystiffness.hh>
+#include <dune/gfe/geodesicfeassembler.hh>
+#include <dune/gfe/riemanniantrsolver.hh>
 
 // grid dimension
 const int dim = 2;
diff --git a/rod3d.cc b/rod3d.cc
index 3ef4082f1c547b3b575ae5c0b01e0d7bdd4004ca..e525f784509744cc088eb5964c9a192c29ba6b4b 100644
--- a/rod3d.cc
+++ b/rod3d.cc
@@ -11,12 +11,12 @@
 #include <dune/solvers/solvers/iterativesolver.hh>
 #include <dune/solvers/norms/energynorm.hh>
 
-#include "src/rigidbodymotion.hh"
-#include "src/geodesicdifference.hh"
-#include "src/rodwriter.hh"
-#include "src/rotation.hh"
-#include "src/rodassembler.hh"
-#include "src/riemanniantrsolver.hh"
+#include <dune/gfe/rigidbodymotion.hh>
+#include <dune/gfe/geodesicdifference.hh>
+#include <dune/gfe/rodwriter.hh>
+#include <dune/gfe/rotation.hh>
+#include <dune/gfe/rodassembler.hh>
+#include <dune/gfe/riemanniantrsolver.hh>
 
 typedef RigidBodyMotion<3> TargetSpace;
 
diff --git a/rodobstacle.cc b/rodobstacle.cc
index 416469bd09e4073baf2cc98413f530894be5cf85..d7f35e5e2a66e199149920c09b7c4c5e6318888f 100644
--- a/rodobstacle.cc
+++ b/rodobstacle.cc
@@ -16,8 +16,8 @@
 #include <dune/ag-common/estimators/geometricmarking.hh>
 #include <dune/ag-common/boundarypatch.hh>
 
-#include "src/rodwriter.hh"
-#include "src/rodassembler.hh"
+#include <dune/gfe/rodwriter.hh>
+#include <dune/gfe/rodassembler.hh>
 
 
 // 3 (x, y, theta) for a planar rod
diff --git a/test/fdcheck.hh b/test/fdcheck.hh
index 69241acf9c992bc005dbadf357f459fd362af585..9184cc5a719cacf2b054ae35c6e933350ed37bf0 100644
--- a/test/fdcheck.hh
+++ b/test/fdcheck.hh
@@ -1,8 +1,8 @@
 #ifndef ASSEMBLER_FINITE_DIFFERENCE_CHECK
 #define ASSEMBLER_FINITE_DIFFERENCE_CHECK
 
-#include "src/rigidbodymotion.hh"
-#include "src/rodassembler.hh"
+#include <dune/gfe/rigidbodymotion.hh>
+#include <dune/gfe/rodassembler.hh>
 
 #define ABORT_ON_ERROR