diff --git a/dune/solvers/test/cgsteptest.cc b/dune/solvers/test/cgsteptest.cc
index 792fe56ceffaeaa446b30b2a3fb1caed2c357e68..d1c26af385c0cc1af9d92a8d9f3670ee7e36dbd6 100644
--- a/dune/solvers/test/cgsteptest.cc
+++ b/dune/solvers/test/cgsteptest.cc
@@ -8,7 +8,6 @@
 #include <dune/common/bitsetvector.hh>
 #include <dune/common/parallel/mpihelper.hh>
 
-#include <dune/solvers/norms/energynorm.hh>
 #include <dune/solvers/solvers/loopsolver.hh>
 #include <dune/solvers/iterationsteps/blockgsstep.hh>
 #include <dune/solvers/iterationsteps/cgstep.hh>
diff --git a/dune/solvers/test/common.hh b/dune/solvers/test/common.hh
index 1c585060b19fb0117c8a65b643d92cceb8b85fbe..8d4a7016cc0f830cb0e156a974847928856df2ba 100644
--- a/dune/solvers/test/common.hh
+++ b/dune/solvers/test/common.hh
@@ -6,6 +6,7 @@
 
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
+#include <dune/common/function.hh>
 
 #include <dune/istl/matrixindexset.hh>
 
@@ -26,9 +27,11 @@
 #endif
 
 #if HAVE_DUNE_SUBGRID
-#include "dune/subgrid/subgrid.hh"
+#include <dune/subgrid/subgrid.hh>
 #endif
 
+#include <dune/solvers/norms/energynorm.hh>
+
 template <class DomainType, class RangeType>
 class ConstantFunction :
     public Dune::VirtualFunction<DomainType, RangeType>