diff --git a/Eigen/src/Core/BandMatrix.h b/Eigen/src/Core/BandMatrix.h
index 5c9ee1a44..e9aaa01b9 100644
--- a/Eigen/src/Core/BandMatrix.h
+++ b/Eigen/src/Core/BandMatrix.h
@@ -25,6 +25,8 @@
 #ifndef EIGEN_BANDMATRIX_H
 #define EIGEN_BANDMATRIX_H
 
+namespace internal {
+
 /**
   * \class BandMatrix
   * \ingroup Core_Module
@@ -44,7 +46,6 @@
   * \sa class TridiagonalMatrix
   */
 
-namespace internal {
 template<typename _Scalar, int Rows, int Cols, int Supers, int Subs, int Options>
 struct traits<BandMatrix<_Scalar,Rows,Cols,Supers,Subs,Options> >
 {
@@ -60,7 +61,6 @@ struct traits<BandMatrix<_Scalar,Rows,Cols,Supers,Subs,Options> >
     Flags = LvalueBit
   };
 };
-}
 
 template<typename _Scalar, int Rows, int Cols, int Supers, int Subs, int Options>
 class BandMatrix : public EigenBase<BandMatrix<_Scalar,Rows,Cols,Supers,Subs,Options> >
@@ -238,4 +238,6 @@ class TridiagonalMatrix : public BandMatrix<Scalar,Size,Size,Options&SelfAdjoint
   protected:
 };
 
+} // end namespace internal
+
 #endif // EIGEN_BANDMATRIX_H
diff --git a/Eigen/src/Core/util/ForwardDeclarations.h b/Eigen/src/Core/util/ForwardDeclarations.h
index 355bacffe..a07c723c9 100644
--- a/Eigen/src/Core/util/ForwardDeclarations.h
+++ b/Eigen/src/Core/util/ForwardDeclarations.h
@@ -128,7 +128,9 @@ template<typename DecompositionType> struct image_retval_base;
 template<typename DecompositionType> struct image_retval;
 } // end namespace internal
 
+namespace internal {
 template<typename _Scalar, int Rows=Dynamic, int Cols=Dynamic, int Supers=Dynamic, int Subs=Dynamic, int Options=0> class BandMatrix;
+}
 
 namespace internal {
 template<typename Lhs, typename Rhs> struct product_type;
diff --git a/test/bandmatrix.cpp b/test/bandmatrix.cpp
index 6dfaa1879..84fc387e0 100644
--- a/test/bandmatrix.cpp
+++ b/test/bandmatrix.cpp
@@ -73,6 +73,8 @@ template<typename MatrixType> void bandmatrix(const MatrixType& _m)
 
 }
 
+using Eigen::internal::BandMatrix;
+
 void test_bandmatrix()
 {
   typedef BandMatrix<float>::Index Index;