diff --git a/dune/gfe/averageinterface.hh b/dune/gfe/averageinterface.hh
index 05afb8e1ddd1ccf010f0e356b63044f74a9b5443..d607796eda7fd5ddc99e5a0e84c40d967414e3bd 100644
--- a/dune/gfe/averageinterface.hh
+++ b/dune/gfe/averageinterface.hh
@@ -4,9 +4,9 @@
 #include <dune/common/fmatrix.hh>
 #include <dune/localfunctions/lagrange/pqkfactory.hh>
 
-#include <dune/ag-common/dgindexset.hh>
-#include <dune/ag-common/crossproduct.hh>
-#include <dune/ag-common/surfmassmatrix.hh>
+#include <dune/fufem/dgindexset.hh>
+#include <dune/fufem/crossproduct.hh>
+#include <dune/fufem/surfmassmatrix.hh>
 #include <dune/solvers/numproc.hh>
 
 #include "svd.hh"
diff --git a/dune/gfe/makestraightrod.hh b/dune/gfe/makestraightrod.hh
index 50df6eab86e8b71c6f2dd996d2abc67c43f376c0..c8f605b89445f6e7f6da6a3ed0df35a63a4f8d72 100644
--- a/dune/gfe/makestraightrod.hh
+++ b/dune/gfe/makestraightrod.hh
@@ -3,7 +3,7 @@
 
 #include <vector>
 #include <dune/common/fvector.hh>
-#include <dune/ag-common/crossproduct.hh>
+#include <dune/fufem/crossproduct.hh>
 
 #include "rigidbodymotion.hh"
 
diff --git a/dune/gfe/rodassembler.hh b/dune/gfe/rodassembler.hh
index 5b8351ecebf79f922240dcb6d86c0b00c40dd48c..c8db8c616dafccce97ae71d1ad8ed934a2301236 100644
--- a/dune/gfe/rodassembler.hh
+++ b/dune/gfe/rodassembler.hh
@@ -6,7 +6,7 @@
 #include <dune/istl/matrixindexset.hh>
 #include <dune/istl/matrix.hh>
 
-#include <dune/ag-common/boundarypatch.hh>
+#include <dune/fufem/boundarypatch.hh>
 
 #include "rigidbodymotion.hh"
 #include "rodlocalstiffness.hh"