diff --git a/dune/solvers/iterationsteps/cgstep.cc b/dune/solvers/iterationsteps/cgstep.cc
index 5985a01cc5bc3b60cbff72177dbb58e8c40bc38e..fb28263ecfb64f7348961e0e4284c63e6792ca10 100644
--- a/dune/solvers/iterationsteps/cgstep.cc
+++ b/dune/solvers/iterationsteps/cgstep.cc
@@ -4,6 +4,9 @@
 #include <dune/solvers/common/canignore.hh>
 #include <dune/matrix-vector/genericvectortools.hh>
 
+namespace Dune {
+namespace Solvers {
+
 template <class MatrixType, class VectorType, class Ignore>
 void CGStep<MatrixType, VectorType, Ignore>::check() const
 {
@@ -59,3 +62,6 @@ void CGStep<MatrixType, VectorType, Ignore>::iterate()
     p_ += q;
     r_squared_old_ = r_squared;
 }
+
+} /* namespace Solvers */
+} /* namespace Dune */
diff --git a/dune/solvers/iterationsteps/cgstep.hh b/dune/solvers/iterationsteps/cgstep.hh
index 5e4e5bcc9ce9e46a623d6230dbabb325c250ecc7..7b037a6f3fce00a7197223728eafed3bf785ceae 100644
--- a/dune/solvers/iterationsteps/cgstep.hh
+++ b/dune/solvers/iterationsteps/cgstep.hh
@@ -60,9 +60,9 @@ namespace Dune {
             Preconditioner* preconditioner_;
         };
 
-
-#include "cgstep.cc"
     }
 }
 
+#include "cgstep.cc"
+
 #endif