diff --git a/dune/solvers/common/arithmetic.hh b/dune/solvers/common/arithmetic.hh
index bc05477d7598c2ed528878a595f4b911d6d844c5..16fe0657ddbc8e94b3e2f21ea2fc95262e50ba70 100644
--- a/dune/solvers/common/arithmetic.hh
+++ b/dune/solvers/common/arithmetic.hh
@@ -2,9 +2,9 @@
 #define ARITHMETIC_HH
 
 
+#include <dune/common/diagonalmatrix.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
-#include <dune/istl/diagonalmatrix.hh>
 #include <dune/istl/scaledidmatrix.hh>
 
 /** \brief Namespace containing helper classes and functions for arithmetic operations
diff --git a/dune/solvers/common/staticmatrixtools.hh b/dune/solvers/common/staticmatrixtools.hh
index 52301974731f0324abbed571688299221f2cde38..d21ff4188e6b7d7e417eefad15d203edb30e3b50 100644
--- a/dune/solvers/common/staticmatrixtools.hh
+++ b/dune/solvers/common/staticmatrixtools.hh
@@ -1,9 +1,9 @@
 #ifndef STATIC_MATRIX_TOOL_HH
 #define STATIC_MATRIX_TOOL_HH
 
+#include "dune/common/diagonalmatrix.hh"
 #include "dune/common/fmatrix.hh"
 #include "dune/istl/scaledidmatrix.hh"
-#include "dune/istl/diagonalmatrix.hh"
 #include "dune/istl/bcrsmatrix.hh"
 #include "dune/istl/matrixindexset.hh"