diff --git a/dune-solvers/iterationsteps/iterationstep.hh b/dune-solvers/iterationsteps/iterationstep.hh
index fc1966e5e61beb0b930a60d193ff8b76aff93cf7..022ff305ceb1d5758a37fb63c9485002966b72d2 100644
--- a/dune-solvers/iterationsteps/iterationstep.hh
+++ b/dune-solvers/iterationsteps/iterationstep.hh
@@ -1,7 +1,7 @@
 #ifndef ITERATIONSTEP_HH
 #define ITERATIONSTEP_HH
 
-#include "numproc.hh"
+#include <dune-solvers/numproc.hh>
 #include <vector>
 #include <string>
 
diff --git a/dune-solvers/iterationsteps/mmgstep.hh b/dune-solvers/iterationsteps/mmgstep.hh
index f704fe9a7ee7424cf1895227153977594eac5fe9..29b004e655924f66470a520e97c1bd28576f0930 100644
--- a/dune-solvers/iterationsteps/mmgstep.hh
+++ b/dune-solvers/iterationsteps/mmgstep.hh
@@ -1,9 +1,9 @@
 #ifndef DUNE_MONOTONE_MULTIGRID_STEP_HH
 #define DUNE_MONOTONE_MULTIGRID_STEP_HH
 
-#include <dune/ag-common/multigridstep.hh>
-#include <dune/ag-common/transferoperators/multigridtransfer.hh>
-#include <dune/ag-common/projectedblockgsstep.hh>
+#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/norms/energynorm.hh b/dune-solvers/norms/energynorm.hh
index b24d2f7b993b150a87526a16548f2e1b808d75c3..4db27e2f4b9edd93d0bdfe4987bde01251092e9f 100644
--- a/dune-solvers/norms/energynorm.hh
+++ b/dune-solvers/norms/energynorm.hh
@@ -2,7 +2,7 @@
 #define ENERGY_NORM_HH
 
 #include "norm.hh"
-#include <dune/ag-common/lineariterationstep.hh>
+#include <dune-solvers/iterationsteps/lineariterationstep.hh>
 
     template<class OperatorType, class DiscFuncType>
     class EnergyNorm : public Norm<DiscFuncType>
diff --git a/dune-solvers/solvers/iterativesolver.hh b/dune-solvers/solvers/iterativesolver.hh
index 6c29545305cb8e3516b447e92d15b69517d33bfa..2224c206087ac07501d9a51ea8e4f3c5f941b0b4 100644
--- a/dune-solvers/solvers/iterativesolver.hh
+++ b/dune-solvers/solvers/iterativesolver.hh
@@ -2,8 +2,8 @@
 #define ITERATIVE_SOLVER_HH
 
 #include "solver.hh"
-#include "iterationstep.hh"
-#include "norms/norm.hh"
+#include <dune-solvers/iterationsteps/iterationstep.hh>
+#include <dune-solvers/norms/norm.hh>
 
     /** \brief A generic iterative solver 
      *
diff --git a/dune-solvers/solvers/loopsolver.hh b/dune-solvers/solvers/loopsolver.hh
index fa6fa84d8fa36836dde78eb2873c8535b1a9443e..73cbee8ae06bdb39ca9c6ffab8c3a9bdf026c2e8 100644
--- a/dune-solvers/solvers/loopsolver.hh
+++ b/dune-solvers/solvers/loopsolver.hh
@@ -1,9 +1,9 @@
 #ifndef LOOP_SOLVER_HH
 #define LOOP_SOLVER_HH
 
-#include <dune/ag-common/iterativesolver.hh>
-#include <dune/ag-common/iterationstep.hh>
-#include <dune/ag-common/norms/norm.hh>
+#include <dune-solvers/solvers/iterativesolver.hh>
+#include <dune-solvers/iterationsteps/iterationstep.hh>
+#include <dune-solvers/norms/norm.hh>
 
 /** \brief A solver which consists of a single loop
  *
diff --git a/dune-solvers/solvers/solver.hh b/dune-solvers/solvers/solver.hh
index eeda504f0d8a596ab2464ea0fea6eadc309bafa2..8ca66ab8e36f53e47af4704a4aaba5d7a2eb2d8d 100644
--- a/dune-solvers/solvers/solver.hh
+++ b/dune-solvers/solvers/solver.hh
@@ -1,7 +1,7 @@
 #ifndef DUNE_SOLVER_HH
 #define DUNE_SOLVER_HH
 
-#include "numproc.hh"
+#include <dune-solvers/numproc.hh>
 
     /** \brief The base class for all sorts of solver algorithms */
     class Solver : public NumProc