diff --git a/dune-solvers/iterationsteps/amgstep.hh b/dune-solvers/iterationsteps/amgstep.hh
index 5f9daded9e0395ad3723d098839e8e65922e957c..268860bbb4bc627b55bbd3d636658b26737a9a80 100644
--- a/dune-solvers/iterationsteps/amgstep.hh
+++ b/dune-solvers/iterationsteps/amgstep.hh
@@ -5,7 +5,7 @@
     \brief A wrapper class for the ISTL AMG implementation
  */
 
-#include <dune/ag-common/lineariterationstep.hh>
+#include <dune-solvers/iterationsteps/lineariterationstep.hh>
 #include <dune/istl/paamg/amg.hh>
 
 /** \brief A wrapper class for the ISTL AMG implementation
diff --git a/dune-solvers/iterationsteps/mmgstep.cc b/dune-solvers/iterationsteps/mmgstep.cc
index c8d38738a1546e29a9179bcc7663bd9eaf122e7a..5f2aad8e8d6190cfaeda2f174b012acbea80a6e3 100644
--- a/dune-solvers/iterationsteps/mmgstep.cc
+++ b/dune-solvers/iterationsteps/mmgstep.cc
@@ -1,5 +1,6 @@
-#include <dune/ag-common/transferoperators/truncatedmgtransfer.hh>
-#include <dune/ag-common/projectedblockgsstep.hh>
+#include <dune-solvers/transferoperators/truncatedmgtransfer.hh>
+#include <dune-solvers/iterationsteps/projectedblockgsstep.hh>
+
 #include <dune/ag-common/computeenergy.hh>
 
 
diff --git a/dune-solvers/iterationsteps/mmgstep.hh b/dune-solvers/iterationsteps/mmgstep.hh
index 29b004e655924f66470a520e97c1bd28576f0930..3bc66bd964404df8672af9dd83b86e50c9ab131d 100644
--- a/dune-solvers/iterationsteps/mmgstep.hh
+++ b/dune-solvers/iterationsteps/mmgstep.hh
@@ -4,6 +4,7 @@
 #include <dune-solvers/iterationsteps/multigridstep.hh>
 #include <dune-solvers/iterationsteps/projectedblockgsstep.hh>
 #include <dune-solvers/transferoperators/multigridtransfer.hh>
+
 #include <dune/ag-common/boxconstraint.hh>
 #include <dune/ag-common/obstaclerestrictor.hh>
 
diff --git a/dune-solvers/iterationsteps/multigridstep.cc b/dune-solvers/iterationsteps/multigridstep.cc
index 214ba2efaf8f5c19179b6e6d4cd4c9d559192029..9459ee9e1c0a4155b786cbabce661728fcd1c770 100644
--- a/dune-solvers/iterationsteps/multigridstep.cc
+++ b/dune-solvers/iterationsteps/multigridstep.cc
@@ -1,7 +1,7 @@
 #include <typeinfo>
 
-#include <dune/ag-common/transferoperators/multigridtransfer.hh>
-#include <dune/ag-common/solvers/loopsolver.hh>
+#include <dune-solvers/transferoperators/multigridtransfer.hh>
+#include <dune-solvers/solvers/loopsolver.hh>
 #include "blockgsstep.hh"
 #include "dune/ag-common/genericvectortools.hh"
 
diff --git a/dune-solvers/iterationsteps/multigridstep.hh b/dune-solvers/iterationsteps/multigridstep.hh
index 8913f97f6ec5932b1efcda4a28bd87c191d8a17f..32436cde1e4aa1d20797c318e65a337bfefc201d 100644
--- a/dune-solvers/iterationsteps/multigridstep.hh
+++ b/dune-solvers/iterationsteps/multigridstep.hh
@@ -3,10 +3,12 @@
 
 #include <vector>
 #include <dune/common/bitsetvector.hh>
-#include "iterativesolver.hh"
+
+#include <dune-solvers/transferoperators/multigridtransfer.hh>
+#include <dune-solvers/solvers/iterativesolver.hh>
+
 #include "lineariterationstep.hh"
 
-#include <dune/ag-common/transferoperators/multigridtransfer.hh>
 
     template<
         class OperatorType,