3 files changed, 40 insertions, 45 deletions
diff --git a/Eigen/Array b/Eigen/Array
index b35242f1a..9c0b5809b 100644
--- a/Eigen/Array
+++ b/Eigen/Array
@@ -1,49 +1,12 @@
 #ifndef EIGEN_ARRAY_MODULE_H
 #define EIGEN_ARRAY_MODULE_H
 
-#include "Core"
-
-#include "src/Core/util/DisableMSVCWarnings.h"
-
-namespace Eigen {
-
-/** \defgroup Array_Module Array module
-  * This module provides several handy features to manipulate matrices as simple array of values.
-  * In addition to listed classes, it defines various methods of the Cwise interface
-  * (accessible from MatrixBase::cwise()), including:
-  *  - matrix-scalar sum,
-  *  - coeff-wise comparison operators,
-  *  - sin, cos, sqrt, pow, exp, log, square, cube, inverse (reciprocal).
-  *
-  * This module also provides various MatrixBase methods, including:
-  *  - boolean reductions: \ref MatrixBase::all() "all", \ref MatrixBase::any() "any", \ref MatrixBase::count() "count",
-  *  - \ref MatrixBase::Random() "random matrix initialization",
-  *  - a \ref MatrixBase::select() "select" function mimicking the trivariate ?: operator,
-  *  - \ref MatrixBase::colwise() "column-wise" and \ref MatrixBase::rowwise() "row-wise" reductions,
-  *  - \ref MatrixBase::reverse() "matrix reverse",
-  *  - \ref MatrixBase::lpNorm() "generic matrix norm".
-  *
-  * \code
-  * #include <Eigen/Array>
-  * \endcode
-  */
+// No idea how to do that per file for gcc...
+#ifdef _MSC_VER
+#pragma message("The inclusion of Eigen/Array is deprecated. The array module is \
+  available as soon as Eigen/Core is included.");
+#endif
 
-#include "src/Array/Functors.h"
-#include "src/Array/BooleanRedux.h"
-#include "src/Array/Select.h"
-#include "src/Array/VectorwiseOp.h"
-#include "src/Array/Random.h"
-#include "src/Array/Norms.h"
-#include "src/Array/Replicate.h"
-#include "src/Array/Reverse.h"
-#include "src/Array/ArrayBase.h"
-#include "src/Array/ArrayWrapper.h"
-#include "src/Array/Array.h"
-
-} // namespace Eigen
-
-#include "src/Core/util/EnableMSVCWarnings.h"
+#include "Core"
 
 #endif // EIGEN_ARRAY_MODULE_H
-/* vim: set filetype=cpp et sw=2 ts=2 ai: */
-
diff --git a/Eigen/Core b/Eigen/Core
index 1f71dfdb5..2a9ee08e8 100644
--- a/Eigen/Core
+++ b/Eigen/Core
@@ -217,6 +217,40 @@ struct Dense {};
 #include "src/Core/products/TriangularSolverMatrix.h"
 #include "src/Core/BandMatrix.h"
 
+/** \defgroup Array_Module Array module
+  * \ingroup Core_Module
+  * This module provides several handy features to manipulate matrices as simple array of values.
+  * In addition to listed classes, it defines various methods of the Cwise interface
+  * (accessible from MatrixBase::cwise()), including:
+  *  - matrix-scalar sum,
+  *  - coeff-wise comparison operators,
+  *  - sin, cos, sqrt, pow, exp, log, square, cube, inverse (reciprocal).
+  *
+  * This module also provides various MatrixBase methods, including:
+  *  - boolean reductions: \ref MatrixBase::all() "all", \ref MatrixBase::any() "any", \ref MatrixBase::count() "count",
+  *  - \ref MatrixBase::Random() "random matrix initialization",
+  *  - a \ref MatrixBase::select() "select" function mimicking the trivariate ?: operator,
+  *  - \ref MatrixBase::colwise() "column-wise" and \ref MatrixBase::rowwise() "row-wise" reductions,
+  *  - \ref MatrixBase::reverse() "matrix reverse",
+  *  - \ref MatrixBase::lpNorm() "generic matrix norm".
+  *
+  * \code
+  * #include <Eigen/Core>
+  * \endcode
+  */
+
+#include "src/Array/Functors.h"
+#include "src/Array/BooleanRedux.h"
+#include "src/Array/Select.h"
+#include "src/Array/VectorwiseOp.h"
+#include "src/Array/Random.h"
+#include "src/Array/Norms.h"
+#include "src/Array/Replicate.h"
+#include "src/Array/Reverse.h"
+#include "src/Array/ArrayBase.h"
+#include "src/Array/ArrayWrapper.h"
+#include "src/Array/Array.h"
+
 } // namespace Eigen
 
 #include "src/Core/util/EnableMSVCWarnings.h"
@@ -226,4 +260,3 @@ struct Dense {};
 #endif
 
 #endif // EIGEN_CORE_H
-/* vim: set filetype=cpp et sw=2 ts=2 ai: */
diff --git a/Eigen/Dense b/Eigen/Dense
index 9655edcd7..6177b67ac 100644
--- a/Eigen/Dense
+++ b/Eigen/Dense
@@ -1,5 +1,4 @@
 #include "Core"
-#include "Array"
 #include "LU"
 #include "Cholesky"
 #include "QR"