diff --git a/dune/solvers/common/genericvectortools.hh b/dune/solvers/common/genericvectortools.hh
index 0635e1ac0037c75159eee0a93eccabf791aef629..8c79fc66b3c7ba3b17145b5b5cca10cbe96e6fa5 100644
--- a/dune/solvers/common/genericvectortools.hh
+++ b/dune/solvers/common/genericvectortools.hh
@@ -12,6 +12,7 @@
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
 #include <dune/common/static_assert.hh>
+#include <dune/common/diagonalmatrix.hh>
 
 #include <dune/istl/scaledidmatrix.hh>
 #include <dune/istl/bcrsmatrix.hh>
diff --git a/dune/solvers/test/lowrankoperatortest.cc b/dune/solvers/test/lowrankoperatortest.cc
index d758e2eb714ee54c47c149c2141f83660fbd36a9..fda0172fbe2235e76d672e44eb7813dbb75a5a10 100644
--- a/dune/solvers/test/lowrankoperatortest.cc
+++ b/dune/solvers/test/lowrankoperatortest.cc
@@ -6,10 +6,10 @@
 #include <dune/common/exceptions.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
+#include <dune/common/diagonalmatrix.hh>
 
 #include <dune/istl/bvector.hh>
 #include <dune/istl/matrix.hh>
-#include <dune/istl/diagonalmatrix.hh>
 #include <dune/istl/scaledidmatrix.hh>
 #include <dune/istl/io.hh>
 
diff --git a/dune/solvers/test/nulloperatortest.cc b/dune/solvers/test/nulloperatortest.cc
index c7f345cd134b7a9fbefe5623158d7799c4841824..ccd95f917c70904a032a4092d85922d78367d8f7 100644
--- a/dune/solvers/test/nulloperatortest.cc
+++ b/dune/solvers/test/nulloperatortest.cc
@@ -5,10 +5,10 @@
 
 #include <dune/common/exceptions.hh>
 #include <dune/common/fvector.hh>
-#include <dune/istl/bvector.hh>
-
 #include <dune/common/fmatrix.hh>
-#include <dune/istl/diagonalmatrix.hh>
+#include <dune/common/diagonalmatrix.hh>
+
+#include <dune/istl/bvector.hh>
 #include <dune/istl/scaledidmatrix.hh>
 
 #include <dune/solvers/operators/nulloperator.hh>
diff --git a/dune/solvers/test/sumoperatortest.cc b/dune/solvers/test/sumoperatortest.cc
index cf7130ec457d9b62feb50d6f03ea4889e8b980b1..25a39c5bba1b7bcd56a9bba16e5514f30944f333 100644
--- a/dune/solvers/test/sumoperatortest.cc
+++ b/dune/solvers/test/sumoperatortest.cc
@@ -6,11 +6,11 @@
 #include <dune/common/exceptions.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
+#include <dune/common/diagonalmatrix.hh>
 
 #include <dune/istl/bvector.hh>
 #include <dune/istl/matrix.hh>
 #include <dune/istl/matrixindexset.hh>
-#include <dune/istl/diagonalmatrix.hh>
 #include <dune/istl/scaledidmatrix.hh>
 #include <dune/istl/io.hh>