diff --git a/dune/stuff/la/container/istl.hh b/dune/stuff/la/container/istl.hh
index 247639a62586d4d3ea6783f80df30d5c3407a8aa..c2e1dc031042190b3028178882730ee72a280e2e 100644
--- a/dune/stuff/la/container/istl.hh
+++ b/dune/stuff/la/container/istl.hh
@@ -8,14 +8,14 @@
 
 #include <dune/common/static_assert.hh>
 
-#if HAVE_DUNE_ISTL
-
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
 #include <dune/common/typetraits.hh>
 
+#if HAVE_DUNE_ISTL
 #include <dune/istl/bvector.hh>
 #include <dune/istl/bcrsmatrix.hh>
+#endif // HAVE_DUNE_ISTL
 
 #include "interfaces.hh"
 #include "pattern.hh"
@@ -33,6 +33,8 @@ template <class ScalarImp>
 class IstlRowMajorSparseMatrix;
 
 
+#if HAVE_DUNE_ISTL
+
 /// Traits for IstlDenseVector.
 template <class ScalarImp>
 class IstlDenseVectorTraits
@@ -614,16 +616,8 @@ private:
 }; // class IstlRowMajorSparseMatrix
 
 
-} // namespace LA
-} // namespace Stuff
-} // namespace Dune
-
 #else // HAVE_DUNE_ISTL
 
-namespace Dune {
-namespace Stuff {
-namespace LA {
-
 
 template <class ScalarImp>
 class IstlDenseVector
@@ -638,10 +632,10 @@ class IstlRowMajorSparseMatrix
 };
 
 
+#endif // HAVE_DUNE_ISTL
+
 } // namespace LA
 } // namespace Stuff
 } // namespace Dune
 
-#endif // HAVE_DUNE_ISTL
-
 #endif // DUNE_STUFF_LA_CONTAINER_ISTL_HH