diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index 24a17b2703361a99b503009a18972eff7a9c3bfa..70d8893bd335489fec0c09b722b49d5477002f5c 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -67,7 +67,7 @@
 #include <dune/solvers/norms/energynorm.hh>
 #include <dune/solvers/norms/sumnorm.hh>
 #include <dune/solvers/solvers/loopsolver.hh>
-#include <dune/solvers/solvers/solver.hh> // Solver::FULL
+#include <dune/solvers/solvers/solver.hh>
 #include <dune/tnnmg/problem-classes/convexproblem.hh>
 #include <dune/tnnmg/nonlinearities/zerononlinearity.hh>
 #include <dune/tnnmg/problem-classes/blocknonlineartnnmgproblem.hh>
diff --git a/src/solverfactory.cc b/src/solverfactory.cc
index cdd188529bc4cc94f8e881cdc64978ea6c5cea92..e2a5e8af1c176bf539748839fe9646ab4dc83ff9 100644
--- a/src/solverfactory.cc
+++ b/src/solverfactory.cc
@@ -6,8 +6,8 @@
 #undef HAVE_IPOPT
 #endif
 
-#include <dune/solvers/common/numproc.hh> // Solver::FULL
 #include <dune/fufem/assemblers/transferoperatorassembler.hh>
+#include <dune/solvers/solvers/solver.hh>
 
 #include "solverfactory.hh"
 
diff --git a/src/solverfactory.hh b/src/solverfactory.hh
index 4b8c533e6cdc9e86d6aff343a4633d87aa735ba6..033ae4cc421d5fdc67c8d55f13412bdc2ad2cd50 100644
--- a/src/solverfactory.hh
+++ b/src/solverfactory.hh
@@ -8,8 +8,8 @@
 #include <dune/solvers/iterationsteps/truncatedblockgsstep.hh>
 #include <dune/solvers/norms/energynorm.hh>
 #include <dune/solvers/solvers/loopsolver.hh>
-#include <dune/tnnmg/iterationsteps/genericnonlineargs.hh>
 #include <dune/solvers/transferoperators/compressedmultigridtransfer.hh>
+#include <dune/tnnmg/iterationsteps/genericnonlineargs.hh>
 #include <dune/tnnmg/iterationsteps/tnnmgstep.hh>
 
 template <size_t dim, class BlockProblemTypeTEMPLATE, class GridType>