diff --git a/test/averagedistanceassemblertest.cc b/test/averagedistanceassemblertest.cc
index 62c4f1d796eb04f13dbbf6d3fcb5bf19f9d9279c..42c0522fa9db29f025225efa4a8b07a9d4c02d73 100644
--- a/test/averagedistanceassemblertest.cc
+++ b/test/averagedistanceassemblertest.cc
@@ -5,11 +5,11 @@
 #include <dune/common/fvector.hh>
 #include <dune/grid/common/quadraturerules.hh>
 
-#include <dune/src/rotation.hh>
-#include <dune/src/realtuple.hh>
-#include <dune/src/unitvector.hh>
+#include <dune/gfe/rotation.hh>
+#include <dune/gfe/realtuple.hh>
+#include <dune/gfe/unitvector.hh>
 
-#include <dune/src/localgeodesicfefunction.hh>
+#include <dune/gfe/localgeodesicfefunction.hh>
 
 // Domain dimension
 const int dim = 2;
diff --git a/test/fdcheck.cc b/test/fdcheck.cc
index 079caa45b5ef85188ca94d04951b4adcaf6b5cb9..172d3272e8b09e8c2ecf7cfc18d3fdcf2c96de36 100644
--- a/test/fdcheck.cc
+++ b/test/fdcheck.cc
@@ -1,18 +1,14 @@
 #include <config.h>
 
-#include <dune/common/bitfield.hh>
 #include <dune/common/configparser.hh>
 
 #include <dune/grid/onedgrid.hh>
 
 #include <dune/istl/io.hh>
 
-
-#include "../common/iterativesolver.hh"
-
-#include "src/configuration.hh"
-#include "src/quaternion.hh"
-#include "src/rodassembler.hh"
+#include <dune/gfe/configuration.hh>
+#include <dune/gfe/quaternion.hh>
+#include <dune/gfe/rodassembler.hh>
 
 #include "fdcheck.hh"
 
diff --git a/test/frameinvariancetest.cc b/test/frameinvariancetest.cc
index 3f8b7f848b0d590809fc2635e2c2235951c7a06e..949f4a487c9425d0d60ac9e2512a152f8a217ffb 100644
--- a/test/frameinvariancetest.cc
+++ b/test/frameinvariancetest.cc
@@ -5,13 +5,12 @@
 
 #include <dune/istl/io.hh>
 
-#include <dune/common/bitfield.hh>
-#include "src/quaternion.hh"
+#include <dune/gfe/quaternion.hh>
 
-#include "src/rodassembler.hh"
+#include <dune/gfe/rodassembler.hh>
 
-#include "src/configuration.hh"
-#include "src/rodwriter.hh"
+#include <dune/gfe/configuration.hh>
+#include <dune/gfe/rodwriter.hh>
 
 // Number of degrees of freedom: 
 // 7 (x, y, z, q_1, q_2, q_3, q_4) for a spatial rod
diff --git a/test/harmonicenergytest.cc b/test/harmonicenergytest.cc
index 7a15f469c98d3898fe79dc9a9ee8c3a3c3095f2d..36babb83ddd35170b04f004e635a16b95fcaac23 100644
--- a/test/harmonicenergytest.cc
+++ b/test/harmonicenergytest.cc
@@ -1,8 +1,8 @@
 
 #include <dune/grid/uggrid.hh>
 
-#include <dune/src/unitvector.hh>
-#include <dune/src/harmonicenergystiffness.hh>
+#include <dune/gfe/unitvector.hh>
+#include <dune/gfe/harmonicenergystiffness.hh>
 
 const int dim = 2;
 
diff --git a/test/localgeodesicfefunctiontest.cc b/test/localgeodesicfefunctiontest.cc
index a7605dea84a6fb012314bfc94b658c0c4abf7233..b2333bf5e882986d599b8c8f724d2692115fed71 100644
--- a/test/localgeodesicfefunctiontest.cc
+++ b/test/localgeodesicfefunctiontest.cc
@@ -6,11 +6,11 @@
 #include <dune/common/fvector.hh>
 #include <dune/grid/common/quadraturerules.hh>
 
-#include <dune/src/rotation.hh>
-#include <dune/src/realtuple.hh>
-#include <dune/src/unitvector.hh>
+#include <dune/gfe/rotation.hh>
+#include <dune/gfe/realtuple.hh>
+#include <dune/gfe/unitvector.hh>
 
-#include <dune/src/localgeodesicfefunction.hh>
+#include <dune/gfe/localgeodesicfefunction.hh>
 
 // Domain dimension
 const int dim = 2;
diff --git a/test/rotationtest.cc b/test/rotationtest.cc
index f781aa2eb84844adfcca91c2128801ea848cd075..74a0581bf93c7b912c9c24095dbd48cd4e6505f1 100644
--- a/test/rotationtest.cc
+++ b/test/rotationtest.cc
@@ -4,8 +4,8 @@
 
 #include <dune/common/fmatrix.hh>
 
-#include "src/quaternion.hh"
-#include "src/svd.hh"
+#include <dune/gfe/quaternion.hh>
+#include <dune/gfe/svd.hh>
 
 using namespace Dune;
 
diff --git a/test/unitcircletest.cc b/test/unitcircletest.cc
index 425f47797cbed3406f1f6084a0b3e3d748d43607..b2b35ef65f08a6ff5011da266ce2a5c13b2291b0 100644
--- a/test/unitcircletest.cc
+++ b/test/unitcircletest.cc
@@ -1,7 +1,7 @@
 #include <config.h>
 
-#include <dune/src/unitvector.hh>
-#include <dune/src/rotation.hh>
+#include <dune/gfe/unitvector.hh>
+#include <dune/gfe/rotation.hh>
 
 
 using namespace Dune;