diff --git a/dune/istl/ldl.hh b/dune/istl/ldl.hh
index 4b1ff065a561569a7b6c5d2f8275013942e96820..eaca1f2b0c16895b95ae0c8d9fb8259aec2645fe 100644
--- a/dune/istl/ldl.hh
+++ b/dune/istl/ldl.hh
@@ -6,8 +6,7 @@
 #if HAVE_LDL || defined DOXYGEN
 
 #include <iostream>
-#include<complex>
-#include<type_traits>
+#include <type_traits>
 
 #ifdef __cplusplus
 extern "C"
@@ -17,12 +16,12 @@ extern "C"
 }
 #endif
 
-#include<dune/common/exceptions.hh>
-#include<dune/common/unused.hh>
+#include <dune/common/exceptions.hh>
+#include <dune/common/unused.hh>
 
-#include<dune/istl/solvers.hh>
-#include<dune/istl/solvertype.hh>
-#include<dune/istl/colcompmatrix.hh>
+#include <dune/istl/colcompmatrix.hh>
+#include <dune/istl/solvers.hh>
+#include <dune/istl/solvertype.hh>
 
 namespace Dune {
   /**
diff --git a/dune/istl/spqr.hh b/dune/istl/spqr.hh
index 11663600ec91282d03cddf3ca6abc7b12e27d6da..8819d5d946c72ae002a16ccfccee74fb15c0300d 100644
--- a/dune/istl/spqr.hh
+++ b/dune/istl/spqr.hh
@@ -5,16 +5,17 @@
 
 #if HAVE_SPQR || defined DOXYGEN
 
-#include<complex>
-#include<type_traits>
+#include <complex>
+#include <type_traits>
 
-#include<SuiteSparseQR.hpp>
-#include<dune/common/exceptions.hh>
-#include<dune/common/unused.hh>
+#include <SuiteSparseQR.hpp>
 
-#include<dune/istl/solvers.hh>
-#include<dune/istl/solvertype.hh>
-#include<dune/istl/colcompmatrix.hh>
+#include <dune/common/exceptions.hh>
+#include <dune/common/unused.hh>
+
+#include <dune/istl/colcompmatrix.hh>
+#include <dune/istl/solvers.hh>
+#include <dune/istl/solvertype.hh>
 
 namespace Dune {
   /**
diff --git a/dune/istl/test/ldltest.cc b/dune/istl/test/ldltest.cc
index 7187e5aea1ebfce412c737793758418dc545b635..b2147a6156f051b594bd7b8804e88c62b7b51467 100644
--- a/dune/istl/test/ldltest.cc
+++ b/dune/istl/test/ldltest.cc
@@ -1,5 +1,5 @@
-#include "config.h"
-#include<iostream>
+#include <config.h>
+#include <iostream>
 
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>
@@ -7,8 +7,8 @@
 #include <dune/istl/bvector.hh>
 #include <dune/istl/colcompmatrix.hh>
 #include <dune/istl/io.hh>
-#include <dune/istl/operators.hh>
 #include <dune/istl/ldl.hh>
+#include <dune/istl/operators.hh>
 
 #include "laplacian.hh"
 
@@ -21,9 +21,11 @@ int main(int argc, char** argv)
     const int BS=1;
     std::size_t N=100;
 
-    if(argc>1)
+    if (argc > 1)
+    {
       N = atoi(argv[1]);
-    std::cout<<"testing for N="<<N<<" BS="<<1<<std::endl;
+    }
+    std::cout << "testing for N=" << N << " BS=" << BS << std::endl;
 
     typedef Dune::FieldMatrix<FIELD_TYPE,BS,BS> MatrixBlock;
     typedef Dune::BCRSMatrix<MatrixBlock> BCRSMat;
@@ -75,5 +77,7 @@ int main(int argc, char** argv)
     std::cerr << "Dune reported error: " << e << std::endl;
   }
   catch (...)
-  {}
+  {
+    std::cerr << "Unknown exception" << std::endl;
+  }
 }
diff --git a/dune/istl/test/spqrtest.cc b/dune/istl/test/spqrtest.cc
index 396b4b4c66bd0b302b379b9c6381260e6661cb53..0c9e2ae8adb0d7dd613b356dca6bd5f73fa640f4 100644
--- a/dune/istl/test/spqrtest.cc
+++ b/dune/istl/test/spqrtest.cc
@@ -1,6 +1,6 @@
-#include "config.h"
+#include <config.h>
 #include <complex>
-#include<iostream>
+#include <iostream>
 
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>
@@ -23,9 +23,11 @@ int main(int argc, char** argv)
     const int BS=1;
     std::size_t N=100;
 
-    if(argc>1)
+    if (argc > 1)
+    {
       N = atoi(argv[1]);
-    std::cout<<"testing for N="<<N<<" BS="<<1<<std::endl;
+    }
+    std::cout << "testing for N=" << N << " BS=" << BS << std::endl;
 
     typedef Dune::FieldMatrix<FIELD_TYPE,BS,BS> MatrixBlock;
     typedef Dune::BCRSMatrix<MatrixBlock> BCRSMat;
@@ -76,5 +78,7 @@ int main(int argc, char** argv)
     std::cerr << "Dune reported error: " << e << std::endl;
   }
   catch (...)
-  {}
+  {
+    std::cerr << "Unknown exception" << std::endl;
+  }
 }