diff --git a/dune/istl/overlappingschwarz.hh b/dune/istl/overlappingschwarz.hh
index 5358b895cccabc2017577a28b7cfd0c487a363eb..2ac57760d240fcd7d08818798e2a7525f8aeadba 100644
--- a/dune/istl/overlappingschwarz.hh
+++ b/dune/istl/overlappingschwarz.hh
@@ -2,18 +2,21 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_OVERLAPPINGSCHWARZ_HH
 #define DUNE_OVERLAPPINGSCHWARZ_HH
+
 #include <cassert>
 #include <algorithm>
 #include <functional>
 #include <vector>
 #include <set>
+
 #include <dune/common/dynmatrix.hh>
-#include <dune/common/sllist.hh>
-#include "preconditioners.hh"
-#include "superlu.hh"
-#include "bvector.hh"
-#include "bcrsmatrix.hh"
-#include "ilusubdomainsolver.hh"
+#include <dune/common/container/sllist.hh>
+
+#include <dune/istl/preconditioners.hh>
+#include <dune/istl/superlu.hh>
+#include <dune/istl/bvector.hh>
+#include <dune/istl/bcrsmatrix.hh>
+#include <dune/istl/ilusubdomainsolver.hh>
 
 namespace Dune
 {
@@ -1582,8 +1585,8 @@ namespace Dune
     // nothing to do, as the corrections already relaxed and added in operator()
   }
 
-
   /** @} */
-}
 
-#endif
+} // namespace Dune
+
+#endif // #ifndef DUNE_OVERLAPPINGSCHWARZ_HH
diff --git a/dune/istl/paamg/aggregates.hh b/dune/istl/paamg/aggregates.hh
index e6f3c0b4abaad7feea309c111ca666a88e66fcce..053256a9d7e31c1ee2f7e7d5fe66123be2be806a 100644
--- a/dune/istl/paamg/aggregates.hh
+++ b/dune/istl/paamg/aggregates.hh
@@ -4,26 +4,26 @@
 #ifndef DUNE_AMG_AGGREGATES_HH
 #define DUNE_AMG_AGGREGATES_HH
 
+#include <algorithm>
+#include <limits>
+#include <ostream>
+#include <set>
+#include <utility>
 
-#include "parameters.hh"
-#include "graph.hh"
-#include "properties.hh"
-#include "combinedfunctor.hh"
-
+#include <dune/common/container/sllist.hh>
+#include <dune/common/poolallocator.hh>
+#include <dune/common/stdstreams.hh>
 #include <dune/common/timer.hh>
 #include <dune/common/tuples.hh>
-#include <dune/common/stdstreams.hh>
-#include <dune/common/poolallocator.hh>
-#include <dune/common/sllist.hh>
 
-#include <utility>
-#include <set>
-#include <algorithm>
-#include <limits>
-#include <ostream>
+#include <dune/istl/paamg/parameters.hh>
+#include <dune/istl/paamg/graph.hh>
+#include <dune/istl/paamg/properties.hh>
+#include <dune/istl/paamg/combinedfunctor.hh>
 
 namespace Dune
 {
+
   namespace Amg
   {
 
@@ -2472,10 +2472,8 @@ namespace Dune
       os.flags(oldOpts);
     }
 
-
   } // namespace Amg
 
 } // namespace Dune
 
-
-#endif
+#endif // #ifndef DUNE_AMG_AGGREGATES_HH