diff --git a/dune-solvers/iterationsteps/mmgstep.hh b/dune-solvers/iterationsteps/mmgstep.hh index 3bc66bd964404df8672af9dd83b86e50c9ab131d..d4d42cdd45ea036ca1b33900bbcdd597174d223c 100644 --- a/dune-solvers/iterationsteps/mmgstep.hh +++ b/dune-solvers/iterationsteps/mmgstep.hh @@ -5,8 +5,8 @@ #include <dune-solvers/iterationsteps/projectedblockgsstep.hh> #include <dune-solvers/transferoperators/multigridtransfer.hh> -#include <dune/ag-common/boxconstraint.hh> -#include <dune/ag-common/obstaclerestrictor.hh> +#include <dune-solvers/boxconstraint.hh> +#include <dune-solvers/transferoperators/obstaclerestrictor.hh> /** \brief The general monotone multigrid solver */ diff --git a/dune-solvers/iterationsteps/multigridstep.cc b/dune-solvers/iterationsteps/multigridstep.cc index 9459ee9e1c0a4155b786cbabce661728fcd1c770..e259be79d2de651094f03b8aded57351c1aeb468 100644 --- a/dune-solvers/iterationsteps/multigridstep.cc +++ b/dune-solvers/iterationsteps/multigridstep.cc @@ -6,7 +6,7 @@ #include "dune/ag-common/genericvectortools.hh" #ifdef HAVE_IPOPT -#include "quadraticipopt.hh" +#include <dune/ag-common/quadraticipopt.hh> #endif template <class OperatorType, class VectorType, class BitVectorType> diff --git a/dune-solvers/iterationsteps/projectedblockgsstep.hh b/dune-solvers/iterationsteps/projectedblockgsstep.hh index a81e136ee6f80b39face93580a3d490c4ca04fa0..f4582930ae2aca9d0f3bc03a9ce0865992386a3c 100644 --- a/dune-solvers/iterationsteps/projectedblockgsstep.hh +++ b/dune-solvers/iterationsteps/projectedblockgsstep.hh @@ -4,7 +4,7 @@ #include <vector> #include "blockgsstep.hh" -#include "boxconstraint.hh" +#include <dune-solvers/boxconstraint.hh> template<class OperatorType, class DiscFuncType> class ProjectedBlockGSStep : public BlockGSStep<OperatorType, DiscFuncType> diff --git a/dune-solvers/iterationsteps/truncatedblockgsstep.hh b/dune-solvers/iterationsteps/truncatedblockgsstep.hh index d37855ba26978f7aa00f9c71ff77f7715728eec1..4d1cb464af82b979702de9499c56fb7b39ffea80 100644 --- a/dune-solvers/iterationsteps/truncatedblockgsstep.hh +++ b/dune-solvers/iterationsteps/truncatedblockgsstep.hh @@ -3,7 +3,7 @@ #include <dune/common/bitsetvector.hh> -#include "dune/ag-common/lineariterationstep.hh" +#include <dune-solvers/iterationsteps/lineariterationstep.hh> diff --git a/dune-solvers/iterationsteps/trustregiongsstep.hh b/dune-solvers/iterationsteps/trustregiongsstep.hh index 45a55c2c0b87de4ee9f0c5713a3d35ff214485e8..6ac68d925d44328aecae06abba08f30ec8c475a9 100644 --- a/dune-solvers/iterationsteps/trustregiongsstep.hh +++ b/dune-solvers/iterationsteps/trustregiongsstep.hh @@ -7,7 +7,7 @@ */ #include "projectedblockgsstep.hh" -#include "boxconstraint.hh" +#include <dune-solvers/boxconstraint.hh> /** \brief A Gauss-Seidel iterator which does not assume that the functional is convex, but which expects a bounded admissible set. diff --git a/dune-solvers/transferoperators/obstaclerestrictor.hh b/dune-solvers/transferoperators/obstaclerestrictor.hh index f700ccaf2aeb2c425f749103981113e31ebb5a5d..f03dbfe8873ab1d1421806961719e970a9b46d38 100644 --- a/dune-solvers/transferoperators/obstaclerestrictor.hh +++ b/dune-solvers/transferoperators/obstaclerestrictor.hh @@ -4,7 +4,7 @@ #include <vector> #include <dune-solvers/transferoperators/multigridtransfer.hh> -#include <dune/ag-common/boxconstraint.hh> +#include <dune-solvers/boxconstraint.hh> /** * \todo Do we need the template parameter?