diff --git a/dirneucoupling.cc b/dirneucoupling.cc
index abb5b02e674cf9c075fec6b27552c797d251154c..aab88cb20696bd30cd262bcc2434553ccff20110 100644
--- a/dirneucoupling.cc
+++ b/dirneucoupling.cc
@@ -13,14 +13,14 @@
 #include <dune/common/bitsetvector.hh>
 #include <dune/common/configparser.hh>
 
-#include <dune/ag-common/multigridstep.hh>
-#include <dune/ag-common/solvers/loopsolver.hh>
-#include <dune/ag-common/projectedblockgsstep.hh>
+#include <dune-solvers/iterationsteps/multigridstep.hh>
+#include <dune-solvers/solvers/loopsolver.hh>
+#include <dune-solvers/iterationsteps/projectedblockgsstep.hh>
 #ifdef HAVE_IPOPT
 #include <dune/ag-common/quadraticipopt.hh>
 #endif
 #include <dune/ag-common/readbitfield.hh>
-#include <dune/ag-common/norms/energynorm.hh>
+#include <dune-solvers/norms/energynorm.hh>
 #include <dune/ag-common/boundarypatch.hh>
 #include <dune/ag-common/prolongboundarypatch.hh>
 #include <dune/ag-common/sampleonbitfield.hh>
diff --git a/rod3d.cc b/rod3d.cc
index 103ff2cb4c086c0676a0def55e539a9e20d27494..b5eaa1aa771356d0f6de8a431deaf2eac76703ff 100644
--- a/rod3d.cc
+++ b/rod3d.cc
@@ -8,8 +8,8 @@
 #include <dune/istl/io.hh>
 
 
-#include <dune/ag-common/iterativesolver.hh>
-#include <dune/ag-common/norms/energynorm.hh>
+#include <dune-solvers/solvers/iterativesolver.hh>
+#include <dune-solvers/norms/energynorm.hh>
 
 #include "src/configuration.hh"
 #include "src/roddifference.hh"
diff --git a/src/rodsolver.cc b/src/rodsolver.cc
index fc0cc387b28ab16fd15a42f59164ba3b8dfe85f4..48eaea69d43b4acb9d73d18d11d9cb8a3b9bcc48 100644
--- a/src/rodsolver.cc
+++ b/src/rodsolver.cc
@@ -6,14 +6,14 @@
 #include <dune/disc/miscoperators/laplace.hh>
 #include <dune/disc/operators/p1operator.hh>
 
-#include <dune/ag-common/trustregiongsstep.hh>
-#include <dune/ag-common/solvers/mmgstep.hh>
-#include <dune/ag-common/transferoperators/truncatedcompressedmgtransfer.hh>
-#include <dune/ag-common/mandelobsrestrictor.hh>
-#include <dune/ag-common/iterativesolver.hh>
-
-#include <dune/ag-common/norms/energynorm.hh>
-#include <dune/ag-common/norms/h1seminorm.hh>
+#include <dune-solvers/iterationsteps/trustregiongsstep.hh>
+#include <dune-solvers/iterationsteps/mmgstep.hh>
+#include <dune-solvers/transferoperators/truncatedcompressedmgtransfer.hh>
+#include <dune-solvers/transferoperators/mandelobsrestrictor.hh>
+#include <dune-solvers/solvers/iterativesolver.hh>
+
+#include <dune-solvers/norms/energynorm.hh>
+#include <dune-solvers/norms/h1seminorm.hh>
 
 #include "configuration.hh"
 #include "quaternion.hh"
diff --git a/src/rodsolver.hh b/src/rodsolver.hh
index f7f70601e5a9def97e9f5065c933a54c9d7881cc..6af9804b338f145e2434f9bccaa4139e4191b186 100644
--- a/src/rodsolver.hh
+++ b/src/rodsolver.hh
@@ -8,9 +8,9 @@
 #include <dune/istl/bcrsmatrix.hh>
 #include <dune/istl/bvector.hh>
 
-#include <dune/ag-common/boxconstraint.hh>
-#include <dune/ag-common/norms/h1seminorm.hh>
-#include <dune/ag-common/solvers/loopsolver.hh>
+#include <dune-solvers/boxconstraint.hh>
+#include <dune-solvers/norms/h1seminorm.hh>
+#include <dune-solvers/solvers/loopsolver.hh>
 
 #include "rodassembler.hh"
 
diff --git a/staticrod.cc b/staticrod.cc
index 8278528ca6bf493eba00b997eb5875cac2dd51df..ce7308b11df9ecc02247624d7e4ff8f116a4fee1 100644
--- a/staticrod.cc
+++ b/staticrod.cc
@@ -8,13 +8,12 @@
 #include <dune/istl/io.hh>
 
 #include <dune/ag-common/boundarypatch.hh>
-#include <dune/ag-common/projectedblockgsstep.hh>
-#include <dune/ag-common/solvers/mmgstep.hh>
-#include <dune/ag-common/solvers/loopsolver.hh>
-#include <dune/ag-common/geomestimator.hh>
-#include <dune/ag-common/norms/energynorm.hh>
-#include <dune/ag-common/mandelobsrestrictor.hh>
-#include <dune/ag-common/transferoperators/truncatedcompressedmgtransfer.hh>
+#include <dune-solvers/iterationsteps/projectedblockgsstep.hh>
+#include <dune-solvers/iterationsteps/mmgstep.hh>
+#include <dune-solvers/solvers/loopsolver.hh>
+#include <dune-solvers/norms/energynorm.hh>
+#include <dune-solvers/transferoperators/mandelobsrestrictor.hh>
+#include <dune-solvers/transferoperators/truncatedcompressedmgtransfer.hh>
 
 #include "src/rodwriter.hh"
 #include "src/planarrodassembler.hh"
diff --git a/staticrod2.cc b/staticrod2.cc
index 0bc2250d04f61b280714a2ffd8faa8a80717b5da..d75ec8dc38acb64823400f7f74d9bc46f2c76fe3 100644
--- a/staticrod2.cc
+++ b/staticrod2.cc
@@ -9,14 +9,14 @@
 
 #include <dune/disc/operators/p1operator.hh>
 
+#include <dune-solvers/iterationsteps/projectedblockgsstep.hh>
+#include <dune-solvers/iterationsteps/mmgstep.hh>
+#include <dune-solvers/solvers/loopsolver.hh>
+#include <dune-solvers/norms/energynorm.hh>
+#include <dune-solvers/transferoperators/mandelobsrestrictor.hh>
+#include <dune-solvers/transferoperators/truncatedcompressedmgtransfer.hh>
+#include <dune/ag-common/estimators/geometricmarking.hh>
 #include <dune/ag-common/boundarypatch.hh>
-#include <dune/ag-common/projectedblockgsstep.hh>
-#include <dune/ag-common/solvers/mmgstep.hh>
-#include <dune/ag-common/solvers/loopsolver.hh>
-#include <dune/ag-common/geomestimator.hh>
-#include <dune/ag-common/norms/energynorm.hh>
-#include <dune/ag-common/mandelobsrestrictor.hh>
-#include <dune/ag-common/transferoperators/truncatedcompressedmgtransfer.hh>
 
 #include "src/rodwriter.hh"
 #include "src/planarrodassembler.hh"