Cleanup: fix include guard comments and names

libeigen/eigen!2517

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cefcaab..d046677 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -412,7 +412,6 @@
     ei_add_cxx_compiler_flag("-Wenum-conversion")
     ei_add_cxx_compiler_flag("-Werror=deprecated-anon-enum-enum-conversion")
     ei_add_cxx_compiler_flag("-Werror=deprecated-enum-enum-conversion")
-    ei_add_cxx_compiler_flag("-Wc++11-extensions")
     ei_add_cxx_compiler_flag("-Wdouble-promotion")
     # ei_add_cxx_compiler_flag("-Wconversion")
     ei_add_cxx_compiler_flag("-Wshadow")
diff --git a/Eigen/src/Core/Array.h b/Eigen/src/Core/Array.h
index f624144..a56b8ab 100644
--- a/Eigen/src/Core/Array.h
+++ b/Eigen/src/Core/Array.h
@@ -145,8 +145,8 @@
    * constructor must match the fixed number of rows (resp. columns) of \c *this.
    *
    *
-   * Example: \include Array_variadic_ctor_cxx11.cpp
-   * Output: \verbinclude Array_variadic_ctor_cxx11.out
+   * Example: \include Array_variadic_ctor.cpp
+   * Output: \verbinclude Array_variadic_ctor.out
    *
    * \sa Array(const std::initializer_list<std::initializer_list<Scalar>>&)
    * \sa Array(const Scalar&), Array(const Scalar&,const Scalar&)
@@ -160,8 +160,8 @@
    *
    * In the general case, the constructor takes a list of rows, each row being represented as a list of coefficients:
    *
-   * Example: \include Array_initializer_list_23_cxx11.cpp
-   * Output: \verbinclude Array_initializer_list_23_cxx11.out
+   * Example: \include Array_initializer_list_23.cpp
+   * Output: \verbinclude Array_initializer_list_23.out
    *
    * Each of the inner initializer lists must contain the exact same number of elements, otherwise an assertion is
    * triggered.
@@ -170,8 +170,8 @@
    * Therefore <code> Array<int,Dynamic,1>{{1,2,3,4,5}}</code> is legal and the more verbose syntax
    * <code>Array<int,Dynamic,1>{{1},{2},{3},{4},{5}}</code> can be avoided:
    *
-   * Example: \include Array_initializer_list_vector_cxx11.cpp
-   * Output: \verbinclude Array_initializer_list_vector_cxx11.out
+   * Example: \include Array_initializer_list_vector.cpp
+   * Output: \verbinclude Array_initializer_list_vector.out
    *
    * In the case of fixed-sized arrays, the initializer list sizes must exactly match the array sizes,
    * and implicit transposition is allowed for compile-time 1D arrays only.
diff --git a/Eigen/src/Core/CwiseNullaryOp.h b/Eigen/src/Core/CwiseNullaryOp.h
index 70a9cb5..d0bc9bb 100644
--- a/Eigen/src/Core/CwiseNullaryOp.h
+++ b/Eigen/src/Core/CwiseNullaryOp.h
@@ -127,8 +127,8 @@
  *
  * The template parameter \a CustomNullaryOp is the type of the functor.
  *
- * Here is an example with std random generators: \include random_cpp11.cpp
- * Output: \verbinclude random_cpp11.out
+ * Here is an example with std random generators: \include random_generators.cpp
+ * Output: \verbinclude random_generators.out
  *
  * \sa class CwiseNullaryOp
  */
diff --git a/Eigen/src/Core/DenseStorage.h b/Eigen/src/Core/DenseStorage.h
index 81a1a3d..f3fb509 100644
--- a/Eigen/src/Core/DenseStorage.h
+++ b/Eigen/src/Core/DenseStorage.h
@@ -544,4 +544,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_MATRIX_H
+#endif  // EIGEN_MATRIXSTORAGE_H
diff --git a/Eigen/src/Core/GeneralProduct.h b/Eigen/src/Core/GeneralProduct.h
index 6e16a6c..e88b7e3 100644
--- a/Eigen/src/Core/GeneralProduct.h
+++ b/Eigen/src/Core/GeneralProduct.h
@@ -516,4 +516,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_PRODUCT_H
+#endif  // EIGEN_GENERAL_PRODUCT_H
diff --git a/Eigen/src/Core/Matrix.h b/Eigen/src/Core/Matrix.h
index 28b8b7f..52ed50c 100644
--- a/Eigen/src/Core/Matrix.h
+++ b/Eigen/src/Core/Matrix.h
@@ -275,8 +275,8 @@
    * constructor must match the fixed number of rows (resp. columns) of \c *this.
    *
    *
-   * Example: \include Matrix_variadic_ctor_cxx11.cpp
-   * Output: \verbinclude Matrix_variadic_ctor_cxx11.out
+   * Example: \include Matrix_variadic_ctor.cpp
+   * Output: \verbinclude Matrix_variadic_ctor.out
    *
    * \sa Matrix(const std::initializer_list<std::initializer_list<Scalar>>&)
    */
@@ -290,8 +290,8 @@
    *
    * In the general case, the constructor takes a list of rows, each row being represented as a list of coefficients:
    *
-   * Example: \include Matrix_initializer_list_23_cxx11.cpp
-   * Output: \verbinclude Matrix_initializer_list_23_cxx11.out
+   * Example: \include Matrix_initializer_list_23.cpp
+   * Output: \verbinclude Matrix_initializer_list_23.out
    *
    * Each of the inner initializer lists must contain the exact same number of elements, otherwise an assertion is
    * triggered.
@@ -300,8 +300,8 @@
    * Therefore <code>VectorXd{{1,2,3,4,5}}</code> is legal and the more verbose syntax
    * <code>RowVectorXd{{1},{2},{3},{4},{5}}</code> can be avoided:
    *
-   * Example: \include Matrix_initializer_list_vector_cxx11.cpp
-   * Output: \verbinclude Matrix_initializer_list_vector_cxx11.out
+   * Example: \include Matrix_initializer_list_vector.cpp
+   * Output: \verbinclude Matrix_initializer_list_vector.out
    *
    * In the case of fixed-sized matrices, the initializer list sizes must exactly match the matrix sizes,
    * and implicit transposition is allowed for compile-time vectors only.
diff --git a/Eigen/src/Core/ProductEvaluators.h b/Eigen/src/Core/ProductEvaluators.h
index 962b524..751f04e 100644
--- a/Eigen/src/Core/ProductEvaluators.h
+++ b/Eigen/src/Core/ProductEvaluators.h
@@ -1780,4 +1780,4 @@
 #pragma warning(pop)
 #endif
 
-#endif  // EIGEN_PRODUCT_EVALUATORS_H
+#endif  // EIGEN_PRODUCTEVALUATORS_H
diff --git a/Eigen/src/Core/VectorwiseOp.h b/Eigen/src/Core/VectorwiseOp.h
index 896c7cb..93be722 100644
--- a/Eigen/src/Core/VectorwiseOp.h
+++ b/Eigen/src/Core/VectorwiseOp.h
@@ -189,8 +189,8 @@
  * return STL-compatible begin/end iterators to the rows or columns of the nested expression.
  * Typical use cases include for-range-loop and calls to STL algorithms:
  *
- * Example: \include MatrixBase_colwise_iterator_cxx11.cpp
- * Output: \verbinclude MatrixBase_colwise_iterator_cxx11.out
+ * Example: \include MatrixBase_colwise_iterator.cpp
+ * Output: \verbinclude MatrixBase_colwise_iterator.out
  *
  * For a partial reduction on an empty input, some rules apply.
  * For the sake of clarity, let's consider a vertical reduction:
diff --git a/Eigen/src/Core/arch/AltiVec/MatrixProductCommon.h b/Eigen/src/Core/arch/AltiVec/MatrixProductCommon.h
index bf1270f..74d53ba 100644
--- a/Eigen/src/Core/arch/AltiVec/MatrixProductCommon.h
+++ b/Eigen/src/Core/arch/AltiVec/MatrixProductCommon.h
@@ -1,6 +1,10 @@
 // #define EIGEN_POWER_USE_PREFETCH  // Use prefetching in gemm routines
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
+
+#ifndef EIGEN_MATRIX_PRODUCT_COMMON_ALTIVEC_H
+#define EIGEN_MATRIX_PRODUCT_COMMON_ALTIVEC_H
+
 #ifdef EIGEN_POWER_USE_PREFETCH
 #define EIGEN_POWER_PREFETCH(p) prefetch(p)
 #else
@@ -205,3 +209,5 @@
 
 }  // end namespace internal
 }  // end namespace Eigen
+
+#endif  // EIGEN_MATRIX_PRODUCT_COMMON_ALTIVEC_H
diff --git a/Eigen/src/Core/functors/UnaryFunctors.h b/Eigen/src/Core/functors/UnaryFunctors.h
index a137be9..3bfb493 100644
--- a/Eigen/src/Core/functors/UnaryFunctors.h
+++ b/Eigen/src/Core/functors/UnaryFunctors.h
@@ -1427,4 +1427,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_FUNCTORS_H
+#endif  // EIGEN_UNARY_FUNCTORS_H
diff --git a/Eigen/src/Core/util/GpuHipCudaDefines.inc b/Eigen/src/Core/util/GpuHipCudaDefines.inc
index b132143..a09c8da 100644
--- a/Eigen/src/Core/util/GpuHipCudaDefines.inc
+++ b/Eigen/src/Core/util/GpuHipCudaDefines.inc
@@ -10,7 +10,7 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #if defined(EIGEN_USE_GPU) && !defined(EIGEN_CORE_GPU_HIP_CUDA_DEFINES_H)
-#define EIGEN_CXX11_TENSOR_GPU_HIP_CUDA_DEFINES_H
+#define EIGEN_CORE_GPU_HIP_CUDA_DEFINES_H
 
 // Note that we are using EIGEN_USE_HIP here instead of EIGEN_HIPCC...this is by design
 // There is code in the Tensorflow codebase that will define EIGEN_USE_GPU,  but
diff --git a/Eigen/src/Eigenvalues/ComplexQZ.h b/Eigen/src/Eigenvalues/ComplexQZ.h
index 500f2cc..a7d2af5 100644
--- a/Eigen/src/Eigenvalues/ComplexQZ.h
+++ b/Eigen/src/Eigenvalues/ComplexQZ.h
@@ -649,4 +649,4 @@
 
 }  // namespace Eigen
 
-#endif  // _COMPLEX_QZ_H_
+#endif  // EIGEN_COMPLEX_QZ_H_
diff --git a/Eigen/src/Eigenvalues/RealQZ.h b/Eigen/src/Eigenvalues/RealQZ.h
index ebb5767..8b7651e 100644
--- a/Eigen/src/Eigenvalues/RealQZ.h
+++ b/Eigen/src/Eigenvalues/RealQZ.h
@@ -587,4 +587,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_REAL_QZ
+#endif  // EIGEN_REAL_QZ_H
diff --git a/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_LAPACKE.h b/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_LAPACKE.h
index d0ae7ff..940f4ab 100644
--- a/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_LAPACKE.h
+++ b/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_LAPACKE.h
@@ -88,4 +88,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_SAEIGENSOLVER_H
+#endif  // EIGEN_SAEIGENSOLVER_LAPACKE_H
diff --git a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
index 6513c8a..5eeb126 100644
--- a/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
+++ b/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
@@ -313,4 +313,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_SPARSELU_MATRIX_H
+#endif  // EIGEN_SPARSELU_SUPERNODAL_MATRIX_H
diff --git a/Eigen/src/ThreadPool/Barrier.h b/Eigen/src/ThreadPool/Barrier.h
index 2098239..701001d 100644
--- a/Eigen/src/ThreadPool/Barrier.h
+++ b/Eigen/src/ThreadPool/Barrier.h
@@ -11,8 +11,8 @@
 // Barrier is an object that allows one or more threads to wait until
 // Notify has been called a specified number of times.
 
-#ifndef EIGEN_CXX11_THREADPOOL_BARRIER_H
-#define EIGEN_CXX11_THREADPOOL_BARRIER_H
+#ifndef EIGEN_THREADPOOL_BARRIER_H
+#define EIGEN_THREADPOOL_BARRIER_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -68,4 +68,4 @@
 
 }  // namespace Eigen
 
-#endif  // EIGEN_CXX11_THREADPOOL_BARRIER_H
+#endif  // EIGEN_THREADPOOL_BARRIER_H
diff --git a/Eigen/src/ThreadPool/EventCount.h b/Eigen/src/ThreadPool/EventCount.h
index cae1754..b6f5fe4 100644
--- a/Eigen/src/ThreadPool/EventCount.h
+++ b/Eigen/src/ThreadPool/EventCount.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_THREADPOOL_EVENTCOUNT_H
-#define EIGEN_CXX11_THREADPOOL_EVENTCOUNT_H
+#ifndef EIGEN_THREADPOOL_EVENTCOUNT_H
+#define EIGEN_THREADPOOL_EVENTCOUNT_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -240,4 +240,4 @@
 
 }  // namespace Eigen
 
-#endif  // EIGEN_CXX11_THREADPOOL_EVENTCOUNT_H
+#endif  // EIGEN_THREADPOOL_EVENTCOUNT_H
diff --git a/Eigen/src/ThreadPool/NonBlockingThreadPool.h b/Eigen/src/ThreadPool/NonBlockingThreadPool.h
index ce33c1a..3b05745 100644
--- a/Eigen/src/ThreadPool/NonBlockingThreadPool.h
+++ b/Eigen/src/ThreadPool/NonBlockingThreadPool.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_THREADPOOL_NONBLOCKING_THREAD_POOL_H
-#define EIGEN_CXX11_THREADPOOL_NONBLOCKING_THREAD_POOL_H
+#ifndef EIGEN_THREADPOOL_NONBLOCKING_THREAD_POOL_H
+#define EIGEN_THREADPOOL_NONBLOCKING_THREAD_POOL_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -587,4 +587,4 @@
 
 }  // namespace Eigen
 
-#endif  // EIGEN_CXX11_THREADPOOL_NONBLOCKING_THREAD_POOL_H
+#endif  // EIGEN_THREADPOOL_NONBLOCKING_THREAD_POOL_H
diff --git a/Eigen/src/ThreadPool/RunQueue.h b/Eigen/src/ThreadPool/RunQueue.h
index 6ca3c6a..02419ed 100644
--- a/Eigen/src/ThreadPool/RunQueue.h
+++ b/Eigen/src/ThreadPool/RunQueue.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_THREADPOOL_RUNQUEUE_H
-#define EIGEN_CXX11_THREADPOOL_RUNQUEUE_H
+#ifndef EIGEN_THREADPOOL_RUNQUEUE_H
+#define EIGEN_THREADPOOL_RUNQUEUE_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -228,4 +228,4 @@
 
 }  // namespace Eigen
 
-#endif  // EIGEN_CXX11_THREADPOOL_RUNQUEUE_H
+#endif  // EIGEN_THREADPOOL_RUNQUEUE_H
diff --git a/Eigen/src/ThreadPool/ThreadCancel.h b/Eigen/src/ThreadPool/ThreadCancel.h
index 321ed9e..4bd804d 100644
--- a/Eigen/src/ThreadPool/ThreadCancel.h
+++ b/Eigen/src/ThreadPool/ThreadCancel.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_THREADPOOL_THREAD_CANCEL_H
-#define EIGEN_CXX11_THREADPOOL_THREAD_CANCEL_H
+#ifndef EIGEN_THREADPOOL_THREAD_CANCEL_H
+#define EIGEN_THREADPOOL_THREAD_CANCEL_H
 
 // Try to come up with a portable way to cancel a thread
 #if EIGEN_OS_GNULINUX
@@ -19,4 +19,4 @@
 #define EIGEN_THREAD_CANCEL(t)
 #endif
 
-#endif  // EIGEN_CXX11_THREADPOOL_THREAD_CANCEL_H
+#endif  // EIGEN_THREADPOOL_THREAD_CANCEL_H
diff --git a/Eigen/src/ThreadPool/ThreadEnvironment.h b/Eigen/src/ThreadPool/ThreadEnvironment.h
index db527cd..578780b 100644
--- a/Eigen/src/ThreadPool/ThreadEnvironment.h
+++ b/Eigen/src/ThreadPool/ThreadEnvironment.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_THREADPOOL_THREAD_ENVIRONMENT_H
-#define EIGEN_CXX11_THREADPOOL_THREAD_ENVIRONMENT_H
+#ifndef EIGEN_THREADPOOL_THREAD_ENVIRONMENT_H
+#define EIGEN_THREADPOOL_THREAD_ENVIRONMENT_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -41,4 +41,4 @@
 
 }  // namespace Eigen
 
-#endif  // EIGEN_CXX11_THREADPOOL_THREAD_ENVIRONMENT_H
+#endif  // EIGEN_THREADPOOL_THREAD_ENVIRONMENT_H
diff --git a/Eigen/src/ThreadPool/ThreadLocal.h b/Eigen/src/ThreadPool/ThreadLocal.h
index 7c2ccd3..e2b3562 100644
--- a/Eigen/src/ThreadPool/ThreadLocal.h
+++ b/Eigen/src/ThreadPool/ThreadLocal.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_THREADPOOL_THREAD_LOCAL_H
-#define EIGEN_CXX11_THREADPOOL_THREAD_LOCAL_H
+#ifndef EIGEN_THREADPOOL_THREAD_LOCAL_H
+#define EIGEN_THREADPOOL_THREAD_LOCAL_H
 
 #ifdef EIGEN_AVOID_THREAD_LOCAL
 
@@ -286,4 +286,4 @@
 
 }  // namespace Eigen
 
-#endif  // EIGEN_CXX11_THREADPOOL_THREAD_LOCAL_H
+#endif  // EIGEN_THREADPOOL_THREAD_LOCAL_H
diff --git a/Eigen/src/ThreadPool/ThreadPoolInterface.h b/Eigen/src/ThreadPool/ThreadPoolInterface.h
index 4cf6fac..59ba761 100644
--- a/Eigen/src/ThreadPool/ThreadPoolInterface.h
+++ b/Eigen/src/ThreadPool/ThreadPoolInterface.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_THREADPOOL_THREAD_POOL_INTERFACE_H
-#define EIGEN_CXX11_THREADPOOL_THREAD_POOL_INTERFACE_H
+#ifndef EIGEN_THREADPOOL_THREAD_POOL_INTERFACE_H
+#define EIGEN_THREADPOOL_THREAD_POOL_INTERFACE_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -48,4 +48,4 @@
 
 }  // namespace Eigen
 
-#endif  // EIGEN_CXX11_THREADPOOL_THREAD_POOL_INTERFACE_H
+#endif  // EIGEN_THREADPOOL_THREAD_POOL_INTERFACE_H
diff --git a/Eigen/src/ThreadPool/ThreadYield.h b/Eigen/src/ThreadPool/ThreadYield.h
index e0502a0..649214a 100644
--- a/Eigen/src/ThreadPool/ThreadYield.h
+++ b/Eigen/src/ThreadPool/ThreadYield.h
@@ -8,10 +8,10 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_THREADPOOL_THREAD_YIELD_H
-#define EIGEN_CXX11_THREADPOOL_THREAD_YIELD_H
+#ifndef EIGEN_THREADPOOL_THREAD_YIELD_H
+#define EIGEN_THREADPOOL_THREAD_YIELD_H
 
 // Try to come up with a portable way to yield
 #define EIGEN_THREAD_YIELD() std::this_thread::yield()
 
-#endif  // EIGEN_CXX11_THREADPOOL_THREAD_YIELD_H
+#endif  // EIGEN_THREADPOOL_THREAD_YIELD_H
diff --git a/doc/TutorialSTL.dox b/doc/TutorialSTL.dox
index 290c99b..095c4bf 100644
--- a/doc/TutorialSTL.dox
+++ b/doc/TutorialSTL.dox
@@ -15,10 +15,10 @@
 <table class="example">
 <tr><th>Example:</th><th>Output:</th></tr>
 <tr><td>
-\include Tutorial_range_for_loop_1d_cxx11.cpp
+\include Tutorial_range_for_loop_1d.cpp
 </td>
 <td>
-\verbinclude Tutorial_range_for_loop_1d_cxx11.out
+\verbinclude Tutorial_range_for_loop_1d.out
 </td></tr></table>
 
 One dimensional expressions can also easily be passed to STL algorithms:
@@ -41,10 +41,10 @@
 <table class="example">
 <tr><th>Example:</th><th>Output:</th></tr>
 <tr><td>
-\include Tutorial_range_for_loop_2d_cxx11.cpp
+\include Tutorial_range_for_loop_2d.cpp
 </td>
 <td>
-\verbinclude Tutorial_range_for_loop_2d_cxx11.out
+\verbinclude Tutorial_range_for_loop_2d.out
 </td></tr></table>
 
 \section TutorialSTLRowsColumns Iterating over rows or columns of 2D arrays and matrices
@@ -55,10 +55,10 @@
 <table class="example">
 <tr><th>Example:</th><th>Output:</th></tr>
 <tr><td>
-\include Tutorial_std_sort_rows_cxx11.cpp
+\include Tutorial_std_sort_rows.cpp
 </td>
 <td>
-\verbinclude Tutorial_std_sort_rows_cxx11.out
+\verbinclude Tutorial_std_sort_rows.out
 </td></tr></table>
 
 */
diff --git a/doc/TutorialSlicingIndexing.dox b/doc/TutorialSlicingIndexing.dox
index fdb38e9..328a414 100644
--- a/doc/TutorialSlicingIndexing.dox
+++ b/doc/TutorialSlicingIndexing.dox
@@ -198,20 +198,20 @@
 <table class="example">
 <tr><th>Example:</th><th>Output:</th></tr>
 <tr><td>
-\include Slicing_stdvector_cxx11.cpp
+\include Slicing_stdvector.cpp
 </td>
 <td>
-\verbinclude Slicing_stdvector_cxx11.out
+\verbinclude Slicing_stdvector.out
 </td></tr></table>
 
 You can also directly pass a static array:
 <table class="example">
 <tr><th>Example:</th><th>Output:</th></tr>
 <tr><td>
-\include Slicing_rawarray_cxx11.cpp
+\include Slicing_rawarray.cpp
 </td>
 <td>
-\verbinclude Slicing_rawarray_cxx11.out
+\verbinclude Slicing_rawarray.out
 </td></tr></table>
 
 or expressions:
@@ -241,10 +241,10 @@
 <table class="example">
 <tr><th>Example:</th><th>Output:</th></tr>
 <tr><td>
-\include Slicing_custom_padding_cxx11.cpp
+\include Slicing_custom_padding.cpp
 </td>
 <td>
-\verbinclude Slicing_custom_padding_cxx11.out
+\verbinclude Slicing_custom_padding.out
 </td></tr></table>
 
 <br>
diff --git a/doc/snippets/Array_initializer_list_23_cxx11.cpp b/doc/snippets/Array_initializer_list_23.cpp
similarity index 100%
rename from doc/snippets/Array_initializer_list_23_cxx11.cpp
rename to doc/snippets/Array_initializer_list_23.cpp
diff --git a/doc/snippets/Array_initializer_list_vector_cxx11.cpp b/doc/snippets/Array_initializer_list_vector.cpp
similarity index 100%
rename from doc/snippets/Array_initializer_list_vector_cxx11.cpp
rename to doc/snippets/Array_initializer_list_vector.cpp
diff --git a/doc/snippets/Array_variadic_ctor_cxx11.cpp b/doc/snippets/Array_variadic_ctor.cpp
similarity index 100%
rename from doc/snippets/Array_variadic_ctor_cxx11.cpp
rename to doc/snippets/Array_variadic_ctor.cpp
diff --git a/doc/snippets/MatrixBase_colwise_iterator_cxx11.cpp b/doc/snippets/MatrixBase_colwise_iterator.cpp
similarity index 100%
rename from doc/snippets/MatrixBase_colwise_iterator_cxx11.cpp
rename to doc/snippets/MatrixBase_colwise_iterator.cpp
diff --git a/doc/snippets/Matrix_initializer_list_23_cxx11.cpp b/doc/snippets/Matrix_initializer_list_23.cpp
similarity index 100%
rename from doc/snippets/Matrix_initializer_list_23_cxx11.cpp
rename to doc/snippets/Matrix_initializer_list_23.cpp
diff --git a/doc/snippets/Matrix_initializer_list_vector_cxx11.cpp b/doc/snippets/Matrix_initializer_list_vector.cpp
similarity index 100%
rename from doc/snippets/Matrix_initializer_list_vector_cxx11.cpp
rename to doc/snippets/Matrix_initializer_list_vector.cpp
diff --git a/doc/snippets/Matrix_variadic_ctor_cxx11.cpp b/doc/snippets/Matrix_variadic_ctor.cpp
similarity index 100%
rename from doc/snippets/Matrix_variadic_ctor_cxx11.cpp
rename to doc/snippets/Matrix_variadic_ctor.cpp
diff --git a/doc/snippets/Slicing_custom_padding_cxx11.cpp b/doc/snippets/Slicing_custom_padding.cpp
similarity index 100%
rename from doc/snippets/Slicing_custom_padding_cxx11.cpp
rename to doc/snippets/Slicing_custom_padding.cpp
diff --git a/doc/snippets/Slicing_rawarray_cxx11.cpp b/doc/snippets/Slicing_rawarray.cpp
similarity index 100%
rename from doc/snippets/Slicing_rawarray_cxx11.cpp
rename to doc/snippets/Slicing_rawarray.cpp
diff --git a/doc/snippets/Slicing_stdvector_cxx11.cpp b/doc/snippets/Slicing_stdvector.cpp
similarity index 100%
rename from doc/snippets/Slicing_stdvector_cxx11.cpp
rename to doc/snippets/Slicing_stdvector.cpp
diff --git a/doc/snippets/Tutorial_range_for_loop_1d_cxx11.cpp b/doc/snippets/Tutorial_range_for_loop_1d.cpp
similarity index 100%
rename from doc/snippets/Tutorial_range_for_loop_1d_cxx11.cpp
rename to doc/snippets/Tutorial_range_for_loop_1d.cpp
diff --git a/doc/snippets/Tutorial_range_for_loop_2d_cxx11.cpp b/doc/snippets/Tutorial_range_for_loop_2d.cpp
similarity index 100%
rename from doc/snippets/Tutorial_range_for_loop_2d_cxx11.cpp
rename to doc/snippets/Tutorial_range_for_loop_2d.cpp
diff --git a/doc/snippets/Tutorial_std_sort_rows_cxx11.cpp b/doc/snippets/Tutorial_std_sort_rows.cpp
similarity index 100%
rename from doc/snippets/Tutorial_std_sort_rows_cxx11.cpp
rename to doc/snippets/Tutorial_std_sort_rows.cpp
diff --git a/doc/special_examples/CMakeLists.txt b/doc/special_examples/CMakeLists.txt
index 7b16638..b0e90b0 100644
--- a/doc/special_examples/CMakeLists.txt
+++ b/doc/special_examples/CMakeLists.txt
@@ -22,13 +22,13 @@
   add_dependencies(all_examples Tutorial_sparse_example)
 endif()
 
-add_executable(random_cpp11 random_cpp11.cpp)
-target_link_libraries(random_cpp11 ${EIGEN_STANDARD_LIBRARIES_TO_LINK_TO} Eigen3::Eigen)
-add_dependencies(all_examples random_cpp11)
+add_executable(random_generators random_generators.cpp)
+target_link_libraries(random_generators ${EIGEN_STANDARD_LIBRARIES_TO_LINK_TO} Eigen3::Eigen)
+add_dependencies(all_examples random_generators)
 
 add_custom_command(
-  TARGET random_cpp11
+  TARGET random_generators
   POST_BUILD
-  COMMAND random_cpp11
-  ARGS >${CMAKE_CURRENT_BINARY_DIR}/random_cpp11.out
+  COMMAND random_generators
+  ARGS >${CMAKE_CURRENT_BINARY_DIR}/random_generators.out
 )
diff --git a/doc/special_examples/random_cpp11.cpp b/doc/special_examples/random_generators.cpp
similarity index 100%
rename from doc/special_examples/random_cpp11.cpp
rename to doc/special_examples/random_generators.cpp
diff --git a/scripts/add_spdx_headers.py b/scripts/add_spdx_headers.py
index 44d37ab..7460d8b 100755
--- a/scripts/add_spdx_headers.py
+++ b/scripts/add_spdx_headers.py
@@ -188,7 +188,7 @@
         and parts[1] == "Eigen"
         and parts[-1][:1].isupper()
     ):
-        # unsupported/Eigen/Tensor, unsupported/Eigen/CXX11/Tensor, ...
+        # unsupported/Eigen/Tensor, ...
         return True
     return False
 
diff --git a/test/SafeScalar.h b/test/SafeScalar.h
index a6a9029..ab0718a 100644
--- a/test/SafeScalar.h
+++ b/test/SafeScalar.h
@@ -1,6 +1,9 @@
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
 
+#ifndef EIGEN_TEST_SAFE_SCALAR_H
+#define EIGEN_TEST_SAFE_SCALAR_H
+
 // A Scalar that asserts for uninitialized access.
 template <typename T>
 class SafeScalar {
@@ -32,4 +35,6 @@
 struct NumTraits<SafeScalar<T>> : GenericNumTraits<T> {
   enum { RequireInitialization = 1 };
 };
-}  // namespace Eigen
\ No newline at end of file
+}  // namespace Eigen
+
+#endif  // EIGEN_TEST_SAFE_SCALAR_H
diff --git a/test/bug1213.h b/test/bug1213.h
index 2f4434e..b86391d 100644
--- a/test/bug1213.h
+++ b/test/bug1213.h
@@ -1,9 +1,14 @@
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
 
+#ifndef EIGEN_TEST_BUG1213_H
+#define EIGEN_TEST_BUG1213_H
+
 #include <Eigen/Core>
 
 template <typename T, int dim>
 bool bug1213_2(const Eigen::Matrix<T, dim, 1>& x);
 
 bool bug1213_1(const Eigen::Vector3f& x);
+
+#endif  // EIGEN_TEST_BUG1213_H
diff --git a/test/evaluator_common.h b/test/evaluator_common.h
index f07db27..320e283 100644
--- a/test/evaluator_common.h
+++ b/test/evaluator_common.h
@@ -1,2 +1,7 @@
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
+
+#ifndef EIGEN_TEST_EVALUATOR_COMMON_H
+#define EIGEN_TEST_EVALUATOR_COMMON_H
+
+#endif  // EIGEN_TEST_EVALUATOR_COMMON_H
diff --git a/test/gpu_test_helper.h b/test/gpu_test_helper.h
index 12d0287..0726752 100644
--- a/test/gpu_test_helper.h
+++ b/test/gpu_test_helper.h
@@ -7,6 +7,7 @@
 #include <Eigen/Core>
 
 // Allow gpu** macros for generic tests.
+#define EIGEN_PERMANENTLY_ENABLE_GPU_HIP_CUDA_DEFINES
 #include <Eigen/src/Core/util/GpuHipCudaDefines.inc>
 
 // std::tuple cannot be used on device, so use our custom implementation there.
diff --git a/test/meta.cpp b/test/meta.cpp
index 834d049..2695779 100644
--- a/test/meta.cpp
+++ b/test/meta.cpp
@@ -30,90 +30,6 @@
   void func() {}
 };
 
-EIGEN_DECLARE_TEST(meta) {
-  VERIFY((internal::is_same<float, float>::value));
-  VERIFY((!internal::is_same<float, double>::value));
-  VERIFY((!internal::is_same<float, float&>::value));
-  VERIFY((!internal::is_same<float, const float&>::value));
-
-  VERIFY((internal::is_same<float, internal::remove_all_t<const float&>>::value));
-  VERIFY((internal::is_same<float, internal::remove_all_t<const float*>>::value));
-  VERIFY((internal::is_same<float, internal::remove_all_t<const float*&>>::value));
-  VERIFY((internal::is_same<float, internal::remove_all_t<float**>>::value));
-  VERIFY((internal::is_same<float, internal::remove_all_t<float**&>>::value));
-  VERIFY((internal::is_same<float, internal::remove_all_t<float* const*&>>::value));
-  VERIFY((internal::is_same<float, internal::remove_all_t<float* const>>::value));
-
-  // test add_const_on_value_type
-  VERIFY((internal::is_same<internal::add_const_on_value_type_t<float&>, float const&>::value));
-  VERIFY((internal::is_same<internal::add_const_on_value_type_t<float*>, float const*>::value));
-
-  VERIFY((internal::is_same<internal::add_const_on_value_type_t<float>, const float>::value));
-  VERIFY((internal::is_same<internal::add_const_on_value_type_t<const float>, const float>::value));
-
-  VERIFY((internal::is_same<internal::add_const_on_value_type_t<const float* const>, const float* const>::value));
-  VERIFY((internal::is_same<internal::add_const_on_value_type_t<float* const>, const float* const>::value));
-
-  // is_convertible
-  STATIC_CHECK((internal::is_convertible<float, double>::value));
-  STATIC_CHECK((internal::is_convertible<int, double>::value));
-  STATIC_CHECK((internal::is_convertible<int, short>::value));
-  STATIC_CHECK((internal::is_convertible<short, int>::value));
-  STATIC_CHECK((internal::is_convertible<double, int>::value));
-  STATIC_CHECK((internal::is_convertible<double, std::complex<double>>::value));
-  STATIC_CHECK((!internal::is_convertible<std::complex<double>, double>::value));
-  STATIC_CHECK((internal::is_convertible<Array33f, Matrix3f>::value));
-  STATIC_CHECK((internal::is_convertible<Matrix3f&, Matrix3f>::value));
-  STATIC_CHECK((internal::is_convertible<Matrix3f&, Matrix3f&>::value));
-  STATIC_CHECK((internal::is_convertible<Matrix3f&, const Matrix3f&>::value));
-  STATIC_CHECK((internal::is_convertible<const Matrix3f&, Matrix3f>::value));
-  STATIC_CHECK((internal::is_convertible<const Matrix3f&, const Matrix3f&>::value));
-  STATIC_CHECK((!internal::is_convertible<const Matrix3f&, Matrix3f&>::value));
-  STATIC_CHECK((!internal::is_convertible<const Matrix3f, Matrix3f&>::value));
-  STATIC_CHECK(!(internal::is_convertible<Matrix3f, Matrix3f&>::value));
-
-  STATIC_CHECK(!(internal::is_convertible<int, int&>::value));
-  STATIC_CHECK((internal::is_convertible<const int, const int&>::value));
-
-  // STATIC_CHECK((!internal::is_convertible<Matrix3f,Matrix3d>::value )); //does not even compile because the
-  // conversion is prevented by a static assertion
-  STATIC_CHECK((!internal::is_convertible<Array33f, int>::value));
-  STATIC_CHECK((!internal::is_convertible<MatrixXf, float>::value));
-  {
-    float f = 0.0f;
-    MatrixXf A, B;
-    VectorXf a, b;
-    VERIFY((check_is_convertible(a.dot(b), f)));
-    VERIFY((check_is_convertible(a.transpose() * b, f)));
-    VERIFY((!check_is_convertible(A * B, f)));
-    VERIFY((check_is_convertible(A * B, A)));
-  }
-
-#if (EIGEN_COMP_GNUC_STRICT && EIGEN_COMP_GNUC <= 990) || (EIGEN_COMP_CLANG_STRICT && EIGEN_COMP_CLANG <= 990) || \
-    (EIGEN_COMP_MSVC && EIGEN_COMP_MSVC <= 1914)
-  // See http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1752,
-  // a fix in the c++ standard breaks our is_convertible implementation
-  // for abstract classes.
-  // So the following tests are expected to fail with recent compilers.
-
-  STATIC_CHECK((!internal::is_convertible<MyInterface, MyImpl>::value));
-  STATIC_CHECK((!internal::is_convertible<MyImpl, MyInterface>::value));
-  STATIC_CHECK((internal::is_convertible<MyImpl, const MyInterface&>::value));
-
-#endif
-
-  {
-    int i = 0;
-    VERIFY((check_is_convertible(fix<3>(), i)));
-    VERIFY((!check_is_convertible(i, fix<DynamicIndex>())));
-  }
-
-  VERIFY((internal::has_ReturnType<FooReturnType>::value));
-  VERIFY((internal::has_ReturnType<ScalarBinaryOpTraits<int, int>>::value));
-  VERIFY((!internal::has_ReturnType<MatrixXf>::value));
-  VERIFY((!internal::has_ReturnType<int>::value));
-}
-
 using Eigen::internal::apply_op_from_left;
 using Eigen::internal::apply_op_from_right;
 using Eigen::internal::arg_prod;
@@ -501,7 +417,89 @@
   VERIFY_IS_EQUAL((instantiate_by_c_array<dummy_inst, int, 5>(data).c), 5);
 }
 
-EIGEN_DECLARE_TEST(cxx11_meta) {
+EIGEN_DECLARE_TEST(meta) {
+  VERIFY((internal::is_same<float, float>::value));
+  VERIFY((!internal::is_same<float, double>::value));
+  VERIFY((!internal::is_same<float, float&>::value));
+  VERIFY((!internal::is_same<float, const float&>::value));
+
+  VERIFY((internal::is_same<float, internal::remove_all_t<const float&>>::value));
+  VERIFY((internal::is_same<float, internal::remove_all_t<const float*>>::value));
+  VERIFY((internal::is_same<float, internal::remove_all_t<const float*&>>::value));
+  VERIFY((internal::is_same<float, internal::remove_all_t<float**>>::value));
+  VERIFY((internal::is_same<float, internal::remove_all_t<float**&>>::value));
+  VERIFY((internal::is_same<float, internal::remove_all_t<float* const*&>>::value));
+  VERIFY((internal::is_same<float, internal::remove_all_t<float* const>>::value));
+
+  // test add_const_on_value_type
+  VERIFY((internal::is_same<internal::add_const_on_value_type_t<float&>, float const&>::value));
+  VERIFY((internal::is_same<internal::add_const_on_value_type_t<float*>, float const*>::value));
+
+  VERIFY((internal::is_same<internal::add_const_on_value_type_t<float>, const float>::value));
+  VERIFY((internal::is_same<internal::add_const_on_value_type_t<const float>, const float>::value));
+
+  VERIFY((internal::is_same<internal::add_const_on_value_type_t<const float* const>, const float* const>::value));
+  VERIFY((internal::is_same<internal::add_const_on_value_type_t<float* const>, const float* const>::value));
+
+  // is_convertible
+  STATIC_CHECK((internal::is_convertible<float, double>::value));
+  STATIC_CHECK((internal::is_convertible<int, double>::value));
+  STATIC_CHECK((internal::is_convertible<int, short>::value));
+  STATIC_CHECK((internal::is_convertible<short, int>::value));
+  STATIC_CHECK((internal::is_convertible<double, int>::value));
+  STATIC_CHECK((internal::is_convertible<double, std::complex<double>>::value));
+  STATIC_CHECK((!internal::is_convertible<std::complex<double>, double>::value));
+  STATIC_CHECK((internal::is_convertible<Array33f, Matrix3f>::value));
+  STATIC_CHECK((internal::is_convertible<Matrix3f&, Matrix3f>::value));
+  STATIC_CHECK((internal::is_convertible<Matrix3f&, Matrix3f&>::value));
+  STATIC_CHECK((internal::is_convertible<Matrix3f&, const Matrix3f&>::value));
+  STATIC_CHECK((internal::is_convertible<const Matrix3f&, Matrix3f>::value));
+  STATIC_CHECK((internal::is_convertible<const Matrix3f&, const Matrix3f&>::value));
+  STATIC_CHECK((!internal::is_convertible<const Matrix3f&, Matrix3f&>::value));
+  STATIC_CHECK((!internal::is_convertible<const Matrix3f, Matrix3f&>::value));
+  STATIC_CHECK(!(internal::is_convertible<Matrix3f, Matrix3f&>::value));
+
+  STATIC_CHECK(!(internal::is_convertible<int, int&>::value));
+  STATIC_CHECK((internal::is_convertible<const int, const int&>::value));
+
+  // STATIC_CHECK((!internal::is_convertible<Matrix3f,Matrix3d>::value )); //does not even compile because the
+  // conversion is prevented by a static assertion
+  STATIC_CHECK((!internal::is_convertible<Array33f, int>::value));
+  STATIC_CHECK((!internal::is_convertible<MatrixXf, float>::value));
+  {
+    float f = 0.0f;
+    MatrixXf A, B;
+    VectorXf a, b;
+    VERIFY((check_is_convertible(a.dot(b), f)));
+    VERIFY((check_is_convertible(a.transpose() * b, f)));
+    VERIFY((!check_is_convertible(A * B, f)));
+    VERIFY((check_is_convertible(A * B, A)));
+  }
+
+#if (EIGEN_COMP_GNUC_STRICT && EIGEN_COMP_GNUC <= 990) || (EIGEN_COMP_CLANG_STRICT && EIGEN_COMP_CLANG <= 990) || \
+    (EIGEN_COMP_MSVC && EIGEN_COMP_MSVC <= 1914)
+  // See http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1752,
+  // a fix in the c++ standard breaks our is_convertible implementation
+  // for abstract classes.
+  // So the following tests are expected to fail with recent compilers.
+
+  STATIC_CHECK((!internal::is_convertible<MyInterface, MyImpl>::value));
+  STATIC_CHECK((!internal::is_convertible<MyImpl, MyInterface>::value));
+  STATIC_CHECK((internal::is_convertible<MyImpl, const MyInterface&>::value));
+
+#endif
+
+  {
+    int i = 0;
+    VERIFY((check_is_convertible(fix<3>(), i)));
+    VERIFY((!check_is_convertible(i, fix<DynamicIndex>())));
+  }
+
+  VERIFY((internal::has_ReturnType<FooReturnType>::value));
+  VERIFY((internal::has_ReturnType<ScalarBinaryOpTraits<int, int>>::value));
+  VERIFY((!internal::has_ReturnType<MatrixXf>::value));
+  VERIFY((!internal::has_ReturnType<int>::value));
+
   CALL_SUBTEST(test_gen_numeric_list());
   CALL_SUBTEST(test_concat());
   CALL_SUBTEST(test_slice());
diff --git a/test/packetmath_test_shared.h b/test/packetmath_test_shared.h
index 1222680..8b2d55e 100644
--- a/test/packetmath_test_shared.h
+++ b/test/packetmath_test_shared.h
@@ -9,6 +9,9 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
+#ifndef EIGEN_TEST_PACKETMATH_TEST_SHARED_H
+#define EIGEN_TEST_PACKETMATH_TEST_SHARED_H
+
 #include "main.h"
 #include <typeinfo>
 
@@ -318,3 +321,5 @@
 
 }  // namespace test
 }  // namespace Eigen
+
+#endif  // EIGEN_TEST_PACKETMATH_TEST_SHARED_H
diff --git a/test/product.h b/test/product.h
index 17782a1..7b7b15c 100644
--- a/test/product.h
+++ b/test/product.h
@@ -8,6 +8,9 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
+#ifndef EIGEN_TEST_PRODUCT_H
+#define EIGEN_TEST_PRODUCT_H
+
 #include "main.h"
 #include <Eigen/QR>
 
@@ -352,3 +355,5 @@
     VERIFY_IS_APPROX(map1.noalias() += m1 * m2.transpose(), (m1 * m2.transpose()).eval());
   }
 }
+
+#endif  // EIGEN_TEST_PRODUCT_H
diff --git a/test/random_without_cast_overflow.h b/test/random_without_cast_overflow.h
index c248065..b39bcb5 100644
--- a/test/random_without_cast_overflow.h
+++ b/test/random_without_cast_overflow.h
@@ -11,6 +11,9 @@
 // Utilities for generating random numbers without overflows, which might
 // otherwise result in undefined behavior.
 
+#ifndef EIGEN_TEST_RANDOM_WITHOUT_CAST_OVERFLOW_H
+#define EIGEN_TEST_RANDOM_WITHOUT_CAST_OVERFLOW_H
+
 namespace Eigen {
 namespace internal {
 
@@ -190,3 +193,5 @@
 
 }  // namespace internal
 }  // namespace Eigen
+
+#endif  // EIGEN_TEST_RANDOM_WITHOUT_CAST_OVERFLOW_H
diff --git a/test/sparse_solver.h b/test/sparse_solver.h
index 48c63c1..1dec71c 100644
--- a/test/sparse_solver.h
+++ b/test/sparse_solver.h
@@ -8,6 +8,9 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
+#ifndef EIGEN_TEST_SPARSE_SOLVER_H
+#define EIGEN_TEST_SPARSE_SOLVER_H
+
 #include "sparse.h"
 #include <Eigen/SparseCore>
 #include <Eigen/SparseLU>
@@ -150,6 +153,8 @@
   }
 }
 
+#endif  // EIGEN_TEST_SPARSE_SOLVER_H
+
 // specialization of generic check_sparse_solving for SuperLU in order to also test adjoint and transpose solves
 template <typename Scalar, typename Rhs, typename DenseMat, typename DenseRhs>
 void check_sparse_solving(Eigen::SparseLU<Eigen::SparseMatrix<Scalar>>& solver,
diff --git a/test/split_test_helper.h b/test/split_test_helper.h
index 774da43..ff5a205 100644
--- a/test/split_test_helper.h
+++ b/test/split_test_helper.h
@@ -1,6 +1,9 @@
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
 
+#ifndef EIGEN_TEST_SPLIT_TEST_HELPER_H
+#define EIGEN_TEST_SPLIT_TEST_HELPER_H
+
 #if defined(EIGEN_TEST_PART_1) || defined(EIGEN_TEST_PART_ALL)
 #define CALL_SUBTEST_1(FUNC) CALL_SUBTEST(FUNC)
 #else
@@ -5994,3 +5997,5 @@
 #else
 #define CALL_SUBTEST_999(FUNC)
 #endif
+
+#endif  // EIGEN_TEST_SPLIT_TEST_HELPER_H
diff --git a/test/svd_fill.h b/test/svd_fill.h
index d2d316b..bc82bff 100644
--- a/test/svd_fill.h
+++ b/test/svd_fill.h
@@ -8,6 +8,9 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
+#ifndef EIGEN_TEST_SVD_FILL_H
+#define EIGEN_TEST_SVD_FILL_H
+
 template <typename T>
 Array<T, 4, 1> four_denorms();
 
@@ -133,3 +136,5 @@
     }
   }
 }
+
+#endif  // EIGEN_TEST_SVD_FILL_H
diff --git a/test/threads_eventcount.cpp b/test/threads_eventcount.cpp
index 6135036..4577b61 100644
--- a/test/threads_eventcount.cpp
+++ b/test/threads_eventcount.cpp
@@ -132,7 +132,7 @@
   }
 }
 
-EIGEN_DECLARE_TEST(cxx11_eventcount) {
+EIGEN_DECLARE_TEST(threads_eventcount) {
   CALL_SUBTEST(test_basic_eventcount());
   CALL_SUBTEST(test_stress_eventcount());
 }
diff --git a/test/threads_non_blocking_thread_pool.cpp b/test/threads_non_blocking_thread_pool.cpp
index a167689..d37ba71 100644
--- a/test/threads_non_blocking_thread_pool.cpp
+++ b/test/threads_non_blocking_thread_pool.cpp
@@ -178,7 +178,7 @@
   }
 }
 
-EIGEN_DECLARE_TEST(cxx11_non_blocking_thread_pool) {
+EIGEN_DECLARE_TEST(threads_non_blocking_thread_pool) {
   CALL_SUBTEST(test_create_destroy_empty_pool());
   CALL_SUBTEST(test_parallelism(true));
   CALL_SUBTEST(test_parallelism(false));
diff --git a/test/threads_runqueue.cpp b/test/threads_runqueue.cpp
index f1fdb57..93ce0a0 100644
--- a/test/threads_runqueue.cpp
+++ b/test/threads_runqueue.cpp
@@ -224,7 +224,7 @@
   VERIFY(total.load() == 0);
 }
 
-EIGEN_DECLARE_TEST(cxx11_runqueue) {
+EIGEN_DECLARE_TEST(threads_runqueue) {
   CALL_SUBTEST_1(test_basic_runqueue());
   CALL_SUBTEST_2(test_empty_runqueue());
   CALL_SUBTEST_3(test_stress_runqueue());
diff --git a/unsupported/Eigen/CXX11/Tensor b/unsupported/Eigen/CXX11/Tensor
index 7b8be3e..e8e4873 100644
--- a/unsupported/Eigen/CXX11/Tensor
+++ b/unsupported/Eigen/CXX11/Tensor
@@ -1,4 +1,10 @@
 // Forwarding header for backward compatibility.
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
+
+#ifndef EIGEN_UNSUPPORTED_CXX11_TENSOR_FORWARD_H
+#define EIGEN_UNSUPPORTED_CXX11_TENSOR_FORWARD_H
+
 #include "../Tensor"  // IWYU pragma: export
+
+#endif  // EIGEN_UNSUPPORTED_CXX11_TENSOR_FORWARD_H
diff --git a/unsupported/Eigen/CXX11/TensorSymmetry b/unsupported/Eigen/CXX11/TensorSymmetry
index 169c1c1..d9513b8 100644
--- a/unsupported/Eigen/CXX11/TensorSymmetry
+++ b/unsupported/Eigen/CXX11/TensorSymmetry
@@ -1,4 +1,10 @@
 // Forwarding header for backward compatibility.
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
+
+#ifndef EIGEN_UNSUPPORTED_CXX11_TENSORSYMMETRY_FORWARD_H
+#define EIGEN_UNSUPPORTED_CXX11_TENSORSYMMETRY_FORWARD_H
+
 #include "../TensorSymmetry"  // IWYU pragma: export
+
+#endif  // EIGEN_UNSUPPORTED_CXX11_TENSORSYMMETRY_FORWARD_H
diff --git a/unsupported/Eigen/CXX11/ThreadPool b/unsupported/Eigen/CXX11/ThreadPool
index 0fac27e..703791b 100644
--- a/unsupported/Eigen/CXX11/ThreadPool
+++ b/unsupported/Eigen/CXX11/ThreadPool
@@ -1,4 +1,10 @@
 // Forwarding header for backward compatibility.
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
+
+#ifndef EIGEN_UNSUPPORTED_CXX11_THREADPOOL_FORWARD_H
+#define EIGEN_UNSUPPORTED_CXX11_THREADPOOL_FORWARD_H
+
 #include "../ThreadPool"  // IWYU pragma: export
+
+#endif  // EIGEN_UNSUPPORTED_CXX11_THREADPOOL_FORWARD_H
diff --git a/unsupported/Eigen/Tensor b/unsupported/Eigen/Tensor
index b65fb63..4366674 100644
--- a/unsupported/Eigen/Tensor
+++ b/unsupported/Eigen/Tensor
@@ -9,8 +9,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_MODULE_H
-#define EIGEN_CXX11_TENSOR_MODULE_H
+#ifndef EIGEN_TENSOR_MODULE_H
+#define EIGEN_TENSOR_MODULE_H
 
 #include "../../Eigen/Core"
 
@@ -23,7 +23,7 @@
 #include "../../Eigen/src/Core/util/MaxSizeVector.h"
 // IWYU pragma: end_exports
 
-/** \defgroup CXX11_Tensor_Module Tensor Module
+/** \defgroup Tensor_Module Tensor Module
  *
  * This module provides a Tensor class for storing arbitrarily indexed
  * objects.
@@ -140,4 +140,4 @@
 
 #include "../../Eigen/src/Core/util/ReenableStupidWarnings.h"
 
-#endif  // EIGEN_CXX11_TENSOR_MODULE_H
+#endif  // EIGEN_TENSOR_MODULE_H
diff --git a/unsupported/Eigen/TensorSymmetry b/unsupported/Eigen/TensorSymmetry
index 4ffc307..491a0e1 100644
--- a/unsupported/Eigen/TensorSymmetry
+++ b/unsupported/Eigen/TensorSymmetry
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSORSYMMETRY_MODULE_H
-#define EIGEN_CXX11_TENSORSYMMETRY_MODULE_H
+#ifndef EIGEN_TENSORSYMMETRY_MODULE_H
+#define EIGEN_TENSORSYMMETRY_MODULE_H
 
 #include "Tensor"
 
@@ -38,4 +38,4 @@
 
 #include "../../Eigen/src/Core/util/ReenableStupidWarnings.h"
 
-#endif  // EIGEN_CXX11_TENSORSYMMETRY_MODULE_H
+#endif  // EIGEN_TENSORSYMMETRY_MODULE_H
diff --git a/unsupported/Eigen/ThreadPool b/unsupported/Eigen/ThreadPool
index 6996fca..4020064 100644
--- a/unsupported/Eigen/ThreadPool
+++ b/unsupported/Eigen/ThreadPool
@@ -1,4 +1,9 @@
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
 
+#ifndef EIGEN_UNSUPPORTED_THREADPOOL_FORWARD_H
+#define EIGEN_UNSUPPORTED_THREADPOOL_FORWARD_H
+
 #include "../../Eigen/ThreadPool"  // IWYU pragma: export
+
+#endif  // EIGEN_UNSUPPORTED_THREADPOOL_FORWARD_H
diff --git a/unsupported/Eigen/src/ArpackSupport/ArpackSelfAdjointEigenSolver.h b/unsupported/Eigen/src/ArpackSupport/ArpackSelfAdjointEigenSolver.h
index 9bd1258..4ae5261 100644
--- a/unsupported/Eigen/src/ArpackSupport/ArpackSelfAdjointEigenSolver.h
+++ b/unsupported/Eigen/src/ArpackSupport/ArpackSelfAdjointEigenSolver.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_ARPACKGENERALIZEDSELFADJOINTEIGENSOLVER_H
-#define EIGEN_ARPACKGENERALIZEDSELFADJOINTEIGENSOLVER_H
+#ifndef EIGEN_ARPACKSELFADJOINTEIGENSOLVER_H
+#define EIGEN_ARPACKSELFADJOINTEIGENSOLVER_H
 
 #include "../../../../Eigen/Dense"
 
diff --git a/unsupported/Eigen/src/AutoDiff/CoherentPadOp.h b/unsupported/Eigen/src/AutoDiff/CoherentPadOp.h
index bef142d..4875c15 100644
--- a/unsupported/Eigen/src/AutoDiff/CoherentPadOp.h
+++ b/unsupported/Eigen/src/AutoDiff/CoherentPadOp.h
@@ -150,4 +150,4 @@
 
 }  // namespace Eigen
 
-#endif  // EIGEN_CWISE_BINARY_OP_H
+#endif  // EIGEN_COHERENT_PAD_OP_H
diff --git a/unsupported/Eigen/src/FFT/duccfft_impl.h b/unsupported/Eigen/src/FFT/duccfft_impl.h
index 8711ab9..15ec0a0 100644
--- a/unsupported/Eigen/src/FFT/duccfft_impl.h
+++ b/unsupported/Eigen/src/FFT/duccfft_impl.h
@@ -7,6 +7,9 @@
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
 
+#ifndef EIGEN_FFT_DUCCFFT_IMPL_H
+#define EIGEN_FFT_DUCCFFT_IMPL_H
+
 namespace Eigen {
 
 namespace internal {
@@ -71,3 +74,5 @@
 
 }  // namespace internal
 }  // namespace Eigen
+
+#endif  // EIGEN_FFT_DUCCFFT_IMPL_H
diff --git a/unsupported/Eigen/src/FFT/fftw_impl.h b/unsupported/Eigen/src/FFT/fftw_impl.h
index cb2f1b8..63e473f 100644
--- a/unsupported/Eigen/src/FFT/fftw_impl.h
+++ b/unsupported/Eigen/src/FFT/fftw_impl.h
@@ -8,6 +8,9 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
+#ifndef EIGEN_FFT_FFTW_IMPL_H
+#define EIGEN_FFT_FFTW_IMPL_H
+
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
 
@@ -215,3 +218,5 @@
 }  // end namespace internal
 
 }  // end namespace Eigen
+
+#endif  // EIGEN_FFT_FFTW_IMPL_H
diff --git a/unsupported/Eigen/src/FFT/imklfft_impl.h b/unsupported/Eigen/src/FFT/imklfft_impl.h
index 1b3114b..a32aef6 100644
--- a/unsupported/Eigen/src/FFT/imklfft_impl.h
+++ b/unsupported/Eigen/src/FFT/imklfft_impl.h
@@ -7,6 +7,9 @@
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
 
+#ifndef EIGEN_FFT_IMKLFFT_IMPL_H
+#define EIGEN_FFT_IMKLFFT_IMPL_H
+
 #include <mkl_dfti.h>
 
 // IWYU pragma: private
@@ -248,3 +251,5 @@
 }  // namespace imklfft
 }  // namespace internal
 }  // namespace Eigen
+
+#endif  // EIGEN_FFT_IMKLFFT_IMPL_H
diff --git a/unsupported/Eigen/src/FFT/kissfft_impl.h b/unsupported/Eigen/src/FFT/kissfft_impl.h
index 08eb896..7cd2d0f 100644
--- a/unsupported/Eigen/src/FFT/kissfft_impl.h
+++ b/unsupported/Eigen/src/FFT/kissfft_impl.h
@@ -8,6 +8,9 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
+#ifndef EIGEN_FFT_KISSFFT_IMPL_H
+#define EIGEN_FFT_KISSFFT_IMPL_H
+
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
 
@@ -415,3 +418,5 @@
 }  // end namespace internal
 
 }  // end namespace Eigen
+
+#endif  // EIGEN_FFT_KISSFFT_IMPL_H
diff --git a/unsupported/Eigen/src/FFT/pocketfft_impl.h b/unsupported/Eigen/src/FFT/pocketfft_impl.h
index 095b6ae..6bcb25d 100644
--- a/unsupported/Eigen/src/FFT/pocketfft_impl.h
+++ b/unsupported/Eigen/src/FFT/pocketfft_impl.h
@@ -7,6 +7,9 @@
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
 
+#ifndef EIGEN_FFT_POCKETFFT_IMPL_H
+#define EIGEN_FFT_POCKETFFT_IMPL_H
+
 namespace Eigen {
 
 namespace internal {
@@ -67,3 +70,5 @@
 
 }  // namespace internal
 }  // namespace Eigen
+
+#endif  // EIGEN_FFT_POCKETFFT_IMPL_H
diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixSquareRoot.h b/unsupported/Eigen/src/MatrixFunctions/MatrixSquareRoot.h
index d329824..752c0ee 100644
--- a/unsupported/Eigen/src/MatrixFunctions/MatrixSquareRoot.h
+++ b/unsupported/Eigen/src/MatrixFunctions/MatrixSquareRoot.h
@@ -343,4 +343,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_MATRIX_FUNCTION
+#endif  // EIGEN_MATRIX_SQUARE_ROOT
diff --git a/unsupported/Eigen/src/NonLinearOptimization/chkder.h b/unsupported/Eigen/src/NonLinearOptimization/chkder.h
index 3c2ada9..1eb20eb 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/chkder.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/chkder.h
@@ -1,6 +1,9 @@
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
 
+#ifndef EIGEN_NONLINEAROPTIMIZATION_CHKDER_H
+#define EIGEN_NONLINEAROPTIMIZATION_CHKDER_H
+
 #define chkder_log10e 0.43429448190325182765
 #define chkder_factor 100.
 
@@ -58,3 +61,5 @@
 }  // end namespace internal
 
 }  // end namespace Eigen
+
+#endif  // EIGEN_NONLINEAROPTIMIZATION_CHKDER_H
diff --git a/unsupported/Eigen/src/NonLinearOptimization/covar.h b/unsupported/Eigen/src/NonLinearOptimization/covar.h
index 1dbac6d..adc8840 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/covar.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/covar.h
@@ -1,6 +1,10 @@
 // IWYU pragma: private
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
+
+#ifndef EIGEN_NONLINEAROPTIMIZATION_COVAR_H
+#define EIGEN_NONLINEAROPTIMIZATION_COVAR_H
+
 #include "./InternalHeaderCheck.h"
 
 namespace Eigen {
@@ -66,3 +70,5 @@
 }  // end namespace internal
 
 }  // end namespace Eigen
+
+#endif  // EIGEN_NONLINEAROPTIMIZATION_COVAR_H
diff --git a/unsupported/Eigen/src/NonLinearOptimization/dogleg.h b/unsupported/Eigen/src/NonLinearOptimization/dogleg.h
index f79844e..e34d945 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/dogleg.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/dogleg.h
@@ -1,6 +1,10 @@
 // IWYU pragma: private
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
+
+#ifndef EIGEN_NONLINEAROPTIMIZATION_DOGLEG_H
+#define EIGEN_NONLINEAROPTIMIZATION_DOGLEG_H
+
 #include "./InternalHeaderCheck.h"
 
 namespace Eigen {
@@ -103,3 +107,5 @@
 }  // end namespace internal
 
 }  // end namespace Eigen
+
+#endif  // EIGEN_NONLINEAROPTIMIZATION_DOGLEG_H
diff --git a/unsupported/Eigen/src/NonLinearOptimization/fdjac1.h b/unsupported/Eigen/src/NonLinearOptimization/fdjac1.h
index 4a3f180..b83f9f1 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/fdjac1.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/fdjac1.h
@@ -1,6 +1,10 @@
 // IWYU pragma: private
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
+
+#ifndef EIGEN_NONLINEAROPTIMIZATION_FDJAC1_H
+#define EIGEN_NONLINEAROPTIMIZATION_FDJAC1_H
+
 #include "./InternalHeaderCheck.h"
 
 namespace Eigen {
@@ -73,3 +77,5 @@
 }  // end namespace internal
 
 }  // end namespace Eigen
+
+#endif  // EIGEN_NONLINEAROPTIMIZATION_FDJAC1_H
diff --git a/unsupported/Eigen/src/NonLinearOptimization/lmpar.h b/unsupported/Eigen/src/NonLinearOptimization/lmpar.h
index 4975c47..3b12dee 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/lmpar.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/lmpar.h
@@ -1,6 +1,10 @@
 // IWYU pragma: private
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
+
+#ifndef EIGEN_NONLINEAROPTIMIZATION_LMPAR_H
+#define EIGEN_NONLINEAROPTIMIZATION_LMPAR_H
+
 #include "./InternalHeaderCheck.h"
 
 namespace Eigen {
@@ -263,3 +267,5 @@
 }  // end namespace internal
 
 }  // end namespace Eigen
+
+#endif  // EIGEN_NONLINEAROPTIMIZATION_LMPAR_H
diff --git a/unsupported/Eigen/src/NonLinearOptimization/qrsolv.h b/unsupported/Eigen/src/NonLinearOptimization/qrsolv.h
index 512682b..951b646 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/qrsolv.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/qrsolv.h
@@ -1,6 +1,10 @@
 // IWYU pragma: private
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
+
+#ifndef EIGEN_NONLINEAROPTIMIZATION_QRSOLV_H
+#define EIGEN_NONLINEAROPTIMIZATION_QRSOLV_H
+
 #include "./InternalHeaderCheck.h"
 
 namespace Eigen {
@@ -89,3 +93,5 @@
 }  // end namespace internal
 
 }  // end namespace Eigen
+
+#endif  // EIGEN_NONLINEAROPTIMIZATION_QRSOLV_H
diff --git a/unsupported/Eigen/src/NonLinearOptimization/r1mpyq.h b/unsupported/Eigen/src/NonLinearOptimization/r1mpyq.h
index a835e19..0a1fea1 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/r1mpyq.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/r1mpyq.h
@@ -1,6 +1,10 @@
 // IWYU pragma: private
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
+
+#ifndef EIGEN_NONLINEAROPTIMIZATION_R1MPYQ_H
+#define EIGEN_NONLINEAROPTIMIZATION_R1MPYQ_H
+
 #include "./InternalHeaderCheck.h"
 
 namespace Eigen {
@@ -33,3 +37,5 @@
 }  // end namespace internal
 
 }  // end namespace Eigen
+
+#endif  // EIGEN_NONLINEAROPTIMIZATION_R1MPYQ_H
diff --git a/unsupported/Eigen/src/NonLinearOptimization/r1updt.h b/unsupported/Eigen/src/NonLinearOptimization/r1updt.h
index 0c91193..25a7857 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/r1updt.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/r1updt.h
@@ -1,6 +1,10 @@
 // IWYU pragma: private
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
+
+#ifndef EIGEN_NONLINEAROPTIMIZATION_R1UPDT_H
+#define EIGEN_NONLINEAROPTIMIZATION_R1UPDT_H
+
 #include "./InternalHeaderCheck.h"
 
 namespace Eigen {
@@ -96,3 +100,5 @@
 }  // end namespace internal
 
 }  // end namespace Eigen
+
+#endif  // EIGEN_NONLINEAROPTIMIZATION_R1UPDT_H
diff --git a/unsupported/Eigen/src/NonLinearOptimization/rwupdt.h b/unsupported/Eigen/src/NonLinearOptimization/rwupdt.h
index 64f705e..0358ad4 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/rwupdt.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/rwupdt.h
@@ -1,6 +1,10 @@
 // IWYU pragma: private
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
+
+#ifndef EIGEN_NONLINEAROPTIMIZATION_RWUPDT_H
+#define EIGEN_NONLINEAROPTIMIZATION_RWUPDT_H
+
 #include "./InternalHeaderCheck.h"
 
 namespace Eigen {
@@ -47,3 +51,5 @@
 }  // end namespace internal
 
 }  // end namespace Eigen
+
+#endif  // EIGEN_NONLINEAROPTIMIZATION_RWUPDT_H
diff --git a/unsupported/Eigen/src/Tensor/InternalHeaderCheck.h b/unsupported/Eigen/src/Tensor/InternalHeaderCheck.h
index 517466b..80c79ef 100644
--- a/unsupported/Eigen/src/Tensor/InternalHeaderCheck.h
+++ b/unsupported/Eigen/src/Tensor/InternalHeaderCheck.h
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_MODULE_H
+#ifndef EIGEN_TENSOR_MODULE_H
 #error "Please include unsupported/Eigen/Tensor instead of including headers inside the src directory directly."
 #endif
diff --git a/unsupported/Eigen/src/Tensor/Tensor.h b/unsupported/Eigen/src/Tensor/Tensor.h
index f506bb9..8a859ef 100644
--- a/unsupported/Eigen/src/Tensor/Tensor.h
+++ b/unsupported/Eigen/src/Tensor/Tensor.h
@@ -9,8 +9,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_H
-#define EIGEN_CXX11_TENSOR_TENSOR_H
+#ifndef EIGEN_TENSOR_TENSOR_H
+#define EIGEN_TENSOR_TENSOR_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -18,7 +18,7 @@
 namespace Eigen {
 
 /** \class Tensor
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief The tensor class.
  *
@@ -380,4 +380,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_H
+#endif  // EIGEN_TENSOR_TENSOR_H
diff --git a/unsupported/Eigen/src/Tensor/TensorArgMax.h b/unsupported/Eigen/src/Tensor/TensorArgMax.h
index a65d6e6..601bdbb 100644
--- a/unsupported/Eigen/src/Tensor/TensorArgMax.h
+++ b/unsupported/Eigen/src/Tensor/TensorArgMax.h
@@ -9,8 +9,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_ARG_MAX_H
-#define EIGEN_CXX11_TENSOR_TENSOR_ARG_MAX_H
+#ifndef EIGEN_TENSOR_TENSOR_ARG_MAX_H
+#define EIGEN_TENSOR_TENSOR_ARG_MAX_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -43,7 +43,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor + Index Pair class.
  */
@@ -119,7 +119,7 @@
 namespace internal {
 
 /** \class TensorPairIndex
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Converts to Tensor<Pair<Index, Scalar> > and reduces to Tensor<Index>.
  *
@@ -280,4 +280,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_ARG_MAX_H
+#endif  // EIGEN_TENSOR_TENSOR_ARG_MAX_H
diff --git a/unsupported/Eigen/src/Tensor/TensorAssign.h b/unsupported/Eigen/src/Tensor/TensorAssign.h
index 472783a..0436843 100644
--- a/unsupported/Eigen/src/Tensor/TensorAssign.h
+++ b/unsupported/Eigen/src/Tensor/TensorAssign.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_ASSIGN_H
-#define EIGEN_CXX11_TENSOR_TENSOR_ASSIGN_H
+#ifndef EIGEN_TENSOR_TENSOR_ASSIGN_H
+#define EIGEN_TENSOR_TENSOR_ASSIGN_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -47,7 +47,7 @@
 }  // end namespace internal
 
 /** The tensor assignment class.
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * This class represents the assignment of the values resulting from the evaluation of
  * the rhs expression to the memory locations denoted by the lhs expression.
@@ -209,4 +209,4 @@
 
 }  // namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_ASSIGN_H
+#endif  // EIGEN_TENSOR_TENSOR_ASSIGN_H
diff --git a/unsupported/Eigen/src/Tensor/TensorBase.h b/unsupported/Eigen/src/Tensor/TensorBase.h
index 9890a1c..be43a18 100644
--- a/unsupported/Eigen/src/Tensor/TensorBase.h
+++ b/unsupported/Eigen/src/Tensor/TensorBase.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_BASE_H
-#define EIGEN_CXX11_TENSOR_TENSOR_BASE_H
+#ifndef EIGEN_TENSOR_TENSOR_BASE_H
+#define EIGEN_TENSOR_TENSOR_BASE_H
 
 // clang-format off
 
@@ -19,7 +19,7 @@
 namespace Eigen {
 
 /** \class TensorBase
-  * \ingroup CXX11_Tensor_Module
+  * \ingroup Tensor_Module
   *
   * \brief The tensor base class.
   *
@@ -1242,4 +1242,4 @@
 #endif // EIGEN_PARSED_BY_DOXYGEN
 } // end namespace Eigen
 
-#endif // EIGEN_CXX11_TENSOR_TENSOR_BASE_H
+#endif // EIGEN_TENSOR_TENSOR_BASE_H
diff --git a/unsupported/Eigen/src/Tensor/TensorBlock.h b/unsupported/Eigen/src/Tensor/TensorBlock.h
index c0c9880..45da4eb 100644
--- a/unsupported/Eigen/src/Tensor/TensorBlock.h
+++ b/unsupported/Eigen/src/Tensor/TensorBlock.h
@@ -7,8 +7,8 @@
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_BLOCK_H
-#define EIGEN_CXX11_TENSOR_TENSOR_BLOCK_H
+#ifndef EIGEN_TENSOR_TENSOR_BLOCK_H
+#define EIGEN_TENSOR_TENSOR_BLOCK_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -1473,4 +1473,4 @@
 }  // namespace internal
 }  // namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_BLOCK_H
+#endif  // EIGEN_TENSOR_TENSOR_BLOCK_H
diff --git a/unsupported/Eigen/src/Tensor/TensorBroadcasting.h b/unsupported/Eigen/src/Tensor/TensorBroadcasting.h
index 113d636..e1b8bff 100644
--- a/unsupported/Eigen/src/Tensor/TensorBroadcasting.h
+++ b/unsupported/Eigen/src/Tensor/TensorBroadcasting.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_BROADCASTING_H
-#define EIGEN_CXX11_TENSOR_TENSOR_BROADCASTING_H
+#ifndef EIGEN_TENSOR_TENSOR_BROADCASTING_H
+#define EIGEN_TENSOR_TENSOR_BROADCASTING_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -61,7 +61,7 @@
 }  // end namespace internal
 
 /** Tensor broadcasting class.
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  */
 template <typename Broadcast, typename XprType>
 class TensorBroadcastingOp : public TensorBase<TensorBroadcastingOp<Broadcast, XprType>, ReadOnlyAccessors> {
@@ -1004,4 +1004,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_BROADCASTING_H
+#endif  // EIGEN_TENSOR_TENSOR_BROADCASTING_H
diff --git a/unsupported/Eigen/src/Tensor/TensorChipping.h b/unsupported/Eigen/src/Tensor/TensorChipping.h
index 0b6583c..89a9f4a 100644
--- a/unsupported/Eigen/src/Tensor/TensorChipping.h
+++ b/unsupported/Eigen/src/Tensor/TensorChipping.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_CHIPPING_H
-#define EIGEN_CXX11_TENSOR_TENSOR_CHIPPING_H
+#ifndef EIGEN_TENSOR_TENSOR_CHIPPING_H
+#define EIGEN_TENSOR_TENSOR_CHIPPING_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -60,7 +60,7 @@
 }  // end namespace internal
 
 /** A chip is a thin slice, corresponding to a column or a row in a 2-d tensor.
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  */
 template <DenseIndex DimId, typename XprType>
 class TensorChippingOp : public TensorBase<TensorChippingOp<DimId, XprType> > {
@@ -467,4 +467,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_CHIPPING_H
+#endif  // EIGEN_TENSOR_TENSOR_CHIPPING_H
diff --git a/unsupported/Eigen/src/Tensor/TensorConcatenation.h b/unsupported/Eigen/src/Tensor/TensorConcatenation.h
index be45353..cade426 100644
--- a/unsupported/Eigen/src/Tensor/TensorConcatenation.h
+++ b/unsupported/Eigen/src/Tensor/TensorConcatenation.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_CONCATENATION_H
-#define EIGEN_CXX11_TENSOR_TENSOR_CONCATENATION_H
+#ifndef EIGEN_TENSOR_TENSOR_CONCATENATION_H
+#define EIGEN_TENSOR_TENSOR_CONCATENATION_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -51,7 +51,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor concatenation class.
  */
@@ -441,4 +441,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_CONCATENATION_H
+#endif  // EIGEN_TENSOR_TENSOR_CONCATENATION_H
diff --git a/unsupported/Eigen/src/Tensor/TensorContraction.h b/unsupported/Eigen/src/Tensor/TensorContraction.h
index 7bcf8a7..e23c48a 100644
--- a/unsupported/Eigen/src/Tensor/TensorContraction.h
+++ b/unsupported/Eigen/src/Tensor/TensorContraction.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_CONTRACTION_H
-#define EIGEN_CXX11_TENSOR_TENSOR_CONTRACTION_H
+#ifndef EIGEN_TENSOR_TENSOR_CONTRACTION_H
+#define EIGEN_TENSOR_TENSOR_CONTRACTION_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -338,7 +338,7 @@
 };
 
 /** Tensor contraction class.
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  */
 template <typename Indices, typename LhsXprType, typename RhsXprType,
           typename OutputKernelType = const NoOpOutputKernel>
@@ -1054,4 +1054,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_CONTRACTION_H
+#endif  // EIGEN_TENSOR_TENSOR_CONTRACTION_H
diff --git a/unsupported/Eigen/src/Tensor/TensorContractionBlocking.h b/unsupported/Eigen/src/Tensor/TensorContractionBlocking.h
index f608bb0..7997068 100644
--- a/unsupported/Eigen/src/Tensor/TensorContractionBlocking.h
+++ b/unsupported/Eigen/src/Tensor/TensorContractionBlocking.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_CONTRACTION_BLOCKING_H
-#define EIGEN_CXX11_TENSOR_TENSOR_CONTRACTION_BLOCKING_H
+#ifndef EIGEN_TENSOR_TENSOR_CONTRACTION_BLOCKING_H
+#define EIGEN_TENSOR_TENSOR_CONTRACTION_BLOCKING_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -68,4 +68,4 @@
 }  // end namespace internal
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_CONTRACTION_BLOCKING_H
+#endif  // EIGEN_TENSOR_TENSOR_CONTRACTION_BLOCKING_H
diff --git a/unsupported/Eigen/src/Tensor/TensorContractionCuda.h b/unsupported/Eigen/src/Tensor/TensorContractionCuda.h
index cfab797..bf8117e 100644
--- a/unsupported/Eigen/src/Tensor/TensorContractionCuda.h
+++ b/unsupported/Eigen/src/Tensor/TensorContractionCuda.h
@@ -1,9 +1,14 @@
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
 
+#ifndef EIGEN_TENSOR_TENSOR_CONTRACTION_CUDA_H
+#define EIGEN_TENSOR_TENSOR_CONTRACTION_CUDA_H
+
 #if defined(__clang__) || defined(__GNUC__)
 #warning \
     "Deprecated header file, please either include the main unsupported/Eigen/Tensor header or the respective TensorContractionGpu.h file"
 #endif
 
 #include "TensorContractionGpu.h"
+
+#endif  // EIGEN_TENSOR_TENSOR_CONTRACTION_CUDA_H
diff --git a/unsupported/Eigen/src/Tensor/TensorContractionGpu.h b/unsupported/Eigen/src/Tensor/TensorContractionGpu.h
index 20e2915..93976d1 100644
--- a/unsupported/Eigen/src/Tensor/TensorContractionGpu.h
+++ b/unsupported/Eigen/src/Tensor/TensorContractionGpu.h
@@ -10,8 +10,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_CONTRACTION_GPU_H
-#define EIGEN_CXX11_TENSOR_TENSOR_CONTRACTION_GPU_H
+#ifndef EIGEN_TENSOR_TENSOR_CONTRACTION_GPU_H
+#define EIGEN_TENSOR_TENSOR_CONTRACTION_GPU_H
 
 #if defined(EIGEN_USE_GPU) && defined(EIGEN_GPUCC)
 
@@ -1387,4 +1387,4 @@
 }  // end namespace Eigen
 
 #endif  // EIGEN_USE_GPU and EIGEN_GPUCC
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_CONTRACTION_GPU_H
+#endif  // EIGEN_TENSOR_TENSOR_CONTRACTION_GPU_H
diff --git a/unsupported/Eigen/src/Tensor/TensorContractionMapper.h b/unsupported/Eigen/src/Tensor/TensorContractionMapper.h
index 111d88e..cebfb08 100644
--- a/unsupported/Eigen/src/Tensor/TensorContractionMapper.h
+++ b/unsupported/Eigen/src/Tensor/TensorContractionMapper.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_CONTRACTION_MAPPER_H
-#define EIGEN_CXX11_TENSOR_TENSOR_CONTRACTION_MAPPER_H
+#ifndef EIGEN_TENSOR_TENSOR_CONTRACTION_MAPPER_H
+#define EIGEN_TENSOR_TENSOR_CONTRACTION_MAPPER_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -527,4 +527,4 @@
 }  // end namespace internal
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_CONTRACTION_MAPPER_H
+#endif  // EIGEN_TENSOR_TENSOR_CONTRACTION_MAPPER_H
diff --git a/unsupported/Eigen/src/Tensor/TensorContractionSycl.h b/unsupported/Eigen/src/Tensor/TensorContractionSycl.h
index 6559350..1ff7225 100644
--- a/unsupported/Eigen/src/Tensor/TensorContractionSycl.h
+++ b/unsupported/Eigen/src/Tensor/TensorContractionSycl.h
@@ -18,8 +18,8 @@
  *
  *****************************************************************/
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_CONTRACTION_SYCL_H
-#define EIGEN_CXX11_TENSOR_TENSOR_CONTRACTION_SYCL_H
+#ifndef EIGEN_TENSOR_TENSOR_CONTRACTION_SYCL_H
+#define EIGEN_TENSOR_TENSOR_CONTRACTION_SYCL_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -1652,4 +1652,4 @@
   }
 };
 }  // namespace Eigen
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_CONTRACTION_SYCL_H
+#endif  // EIGEN_TENSOR_TENSOR_CONTRACTION_SYCL_H
diff --git a/unsupported/Eigen/src/Tensor/TensorContractionThreadPool.h b/unsupported/Eigen/src/Tensor/TensorContractionThreadPool.h
index 6e72060..e2473d7 100644
--- a/unsupported/Eigen/src/Tensor/TensorContractionThreadPool.h
+++ b/unsupported/Eigen/src/Tensor/TensorContractionThreadPool.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_CONTRACTION_THREAD_POOL_H
-#define EIGEN_CXX11_TENSOR_TENSOR_CONTRACTION_THREAD_POOL_H
+#ifndef EIGEN_TENSOR_TENSOR_CONTRACTION_THREAD_POOL_H
+#define EIGEN_TENSOR_TENSOR_CONTRACTION_THREAD_POOL_H
 
 // evaluator for thread pool device
 #ifdef EIGEN_USE_THREADS
@@ -1541,4 +1541,4 @@
 }  // end namespace Eigen
 
 #endif  // EIGEN_USE_THREADS
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_CONTRACTION_THREAD_POOL_H
+#endif  // EIGEN_TENSOR_TENSOR_CONTRACTION_THREAD_POOL_H
diff --git a/unsupported/Eigen/src/Tensor/TensorConversion.h b/unsupported/Eigen/src/Tensor/TensorConversion.h
index 2c256aa..6a9b045 100644
--- a/unsupported/Eigen/src/Tensor/TensorConversion.h
+++ b/unsupported/Eigen/src/Tensor/TensorConversion.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_CONVERSION_H
-#define EIGEN_CXX11_TENSOR_TENSOR_CONVERSION_H
+#ifndef EIGEN_TENSOR_TENSOR_CONVERSION_H
+#define EIGEN_TENSOR_TENSOR_CONVERSION_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -157,7 +157,7 @@
 };
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor conversion class. This class makes it possible to vectorize
  * type casting operations when the number of scalars per packet in the source
@@ -414,4 +414,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_CONVERSION_H
+#endif  // EIGEN_TENSOR_TENSOR_CONVERSION_H
diff --git a/unsupported/Eigen/src/Tensor/TensorConvolution.h b/unsupported/Eigen/src/Tensor/TensorConvolution.h
index f2f45ed..1d7ef74 100644
--- a/unsupported/Eigen/src/Tensor/TensorConvolution.h
+++ b/unsupported/Eigen/src/Tensor/TensorConvolution.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_CONVOLUTION_H
-#define EIGEN_CXX11_TENSOR_TENSOR_CONVOLUTION_H
+#ifndef EIGEN_TENSOR_TENSOR_CONVOLUTION_H
+#define EIGEN_TENSOR_TENSOR_CONVOLUTION_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -226,7 +226,7 @@
 }  // end namespace internal
 
 /** Tensor convolution class.
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  */
 template <typename Indices, typename InputXprType, typename KernelXprType>
 class TensorConvolutionOp
@@ -1110,4 +1110,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_CONVOLUTION_H
+#endif  // EIGEN_TENSOR_TENSOR_CONVOLUTION_H
diff --git a/unsupported/Eigen/src/Tensor/TensorConvolutionSycl.h b/unsupported/Eigen/src/Tensor/TensorConvolutionSycl.h
index e96ef6e..135736a 100644
--- a/unsupported/Eigen/src/Tensor/TensorConvolutionSycl.h
+++ b/unsupported/Eigen/src/Tensor/TensorConvolutionSycl.h
@@ -13,8 +13,8 @@
 // Public License v. 2.0. If a copy of the MPL was not distributed
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_CONVOLUTION_SYCL_H
-#define EIGEN_CXX11_TENSOR_TENSOR_CONVOLUTION_SYCL_H
+#ifndef EIGEN_TENSOR_TENSOR_CONVOLUTION_SYCL_H
+#define EIGEN_TENSOR_TENSOR_CONVOLUTION_SYCL_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -536,4 +536,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_CONVOLUTION_H
+#endif  // EIGEN_TENSOR_TENSOR_CONVOLUTION_SYCL_H
diff --git a/unsupported/Eigen/src/Tensor/TensorCostModel.h b/unsupported/Eigen/src/Tensor/TensorCostModel.h
index bc77973..c165d69 100644
--- a/unsupported/Eigen/src/Tensor/TensorCostModel.h
+++ b/unsupported/Eigen/src/Tensor/TensorCostModel.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_COST_MODEL_H
-#define EIGEN_CXX11_TENSOR_TENSOR_COST_MODEL_H
+#ifndef EIGEN_TENSOR_TENSOR_COST_MODEL_H
+#define EIGEN_TENSOR_TENSOR_COST_MODEL_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -129,7 +129,7 @@
 };
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief A cost model used to limit the number of threads used for evaluating
  * tensor expression.
@@ -247,4 +247,4 @@
 
 }  // namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_COST_MODEL_H
+#endif  // EIGEN_TENSOR_TENSOR_COST_MODEL_H
diff --git a/unsupported/Eigen/src/Tensor/TensorCustomOp.h b/unsupported/Eigen/src/Tensor/TensorCustomOp.h
index efac3cf..23a60f5 100644
--- a/unsupported/Eigen/src/Tensor/TensorCustomOp.h
+++ b/unsupported/Eigen/src/Tensor/TensorCustomOp.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_CUSTOM_OP_H
-#define EIGEN_CXX11_TENSOR_TENSOR_CUSTOM_OP_H
+#ifndef EIGEN_TENSOR_TENSOR_CUSTOM_OP_H
+#define EIGEN_TENSOR_TENSOR_CUSTOM_OP_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -42,7 +42,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor custom class.
  */
@@ -150,7 +150,7 @@
 };
 
 /** \class TensorCustomBinaryOp
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor custom class.
  *
@@ -305,4 +305,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_CUSTOM_OP_H
+#endif  // EIGEN_TENSOR_TENSOR_CUSTOM_OP_H
diff --git a/unsupported/Eigen/src/Tensor/TensorDevice.h b/unsupported/Eigen/src/Tensor/TensorDevice.h
index 979e339..7898f9e 100644
--- a/unsupported/Eigen/src/Tensor/TensorDevice.h
+++ b/unsupported/Eigen/src/Tensor/TensorDevice.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_DEVICE_H
-#define EIGEN_CXX11_TENSOR_TENSOR_DEVICE_H
+#ifndef EIGEN_TENSOR_TENSOR_DEVICE_H
+#define EIGEN_TENSOR_TENSOR_DEVICE_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -17,7 +17,7 @@
 namespace Eigen {
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Pseudo expression providing an operator = that will evaluate its argument
  * on the specified computing 'device' (GPU, thread pool, ...)
@@ -71,7 +71,7 @@
 };
 
 /** \class TensorAsyncDevice
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Pseudo expression providing an operator = that will evaluate its
  * argument asynchronously on the specified device. Currently only
@@ -136,4 +136,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_DEVICE_H
+#endif  // EIGEN_TENSOR_TENSOR_DEVICE_H
diff --git a/unsupported/Eigen/src/Tensor/TensorDeviceCuda.h b/unsupported/Eigen/src/Tensor/TensorDeviceCuda.h
index d96f66c..f1d986a 100644
--- a/unsupported/Eigen/src/Tensor/TensorDeviceCuda.h
+++ b/unsupported/Eigen/src/Tensor/TensorDeviceCuda.h
@@ -1,9 +1,14 @@
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
 
+#ifndef EIGEN_TENSOR_TENSOR_DEVICE_CUDA_H
+#define EIGEN_TENSOR_TENSOR_DEVICE_CUDA_H
+
 #if defined(__clang__) || defined(__GNUC__)
 #warning \
     "Deprecated header file, please either include the main unsupported/Eigen/Tensor header or the respective TensorDeviceGpu.h file"
 #endif
 
 #include "TensorDeviceGpu.h"
+
+#endif  // EIGEN_TENSOR_TENSOR_DEVICE_CUDA_H
diff --git a/unsupported/Eigen/src/Tensor/TensorDeviceDefault.h b/unsupported/Eigen/src/Tensor/TensorDeviceDefault.h
index 1772c5c..efb4bb4 100644
--- a/unsupported/Eigen/src/Tensor/TensorDeviceDefault.h
+++ b/unsupported/Eigen/src/Tensor/TensorDeviceDefault.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_DEVICE_DEFAULT_H
-#define EIGEN_CXX11_TENSOR_TENSOR_DEVICE_DEFAULT_H
+#ifndef EIGEN_TENSOR_TENSOR_DEVICE_DEFAULT_H
+#define EIGEN_TENSOR_TENSOR_DEVICE_DEFAULT_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -111,4 +111,4 @@
 
 }  // namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_DEVICE_DEFAULT_H
+#endif  // EIGEN_TENSOR_TENSOR_DEVICE_DEFAULT_H
diff --git a/unsupported/Eigen/src/Tensor/TensorDeviceGpu.h b/unsupported/Eigen/src/Tensor/TensorDeviceGpu.h
index 85fdfe9..1cd5767 100644
--- a/unsupported/Eigen/src/Tensor/TensorDeviceGpu.h
+++ b/unsupported/Eigen/src/Tensor/TensorDeviceGpu.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#if defined(EIGEN_USE_GPU) && !defined(EIGEN_CXX11_TENSOR_TENSOR_DEVICE_GPU_H)
-#define EIGEN_CXX11_TENSOR_TENSOR_DEVICE_GPU_H
+#if defined(EIGEN_USE_GPU) && !defined(EIGEN_TENSOR_TENSOR_DEVICE_GPU_H)
+#define EIGEN_TENSOR_TENSOR_DEVICE_GPU_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -348,4 +348,4 @@
 // undefine all the gpu* macros we defined at the beginning of the file
 #include "../../../../Eigen/src/Core/util/GpuHipCudaUndefines.inc"
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_DEVICE_GPU_H
+#endif  // EIGEN_TENSOR_TENSOR_DEVICE_GPU_H
diff --git a/unsupported/Eigen/src/Tensor/TensorDeviceSycl.h b/unsupported/Eigen/src/Tensor/TensorDeviceSycl.h
index c078736..24226f5 100644
--- a/unsupported/Eigen/src/Tensor/TensorDeviceSycl.h
+++ b/unsupported/Eigen/src/Tensor/TensorDeviceSycl.h
@@ -13,8 +13,8 @@
 // Public License v. 2.0. If a copy of the MPL was not distributed
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#if defined(EIGEN_USE_SYCL) && !defined(EIGEN_CXX11_TENSOR_TENSOR_DEVICE_SYCL_H)
-#define EIGEN_CXX11_TENSOR_TENSOR_DEVICE_SYCL_H
+#if defined(EIGEN_USE_SYCL) && !defined(EIGEN_TENSOR_TENSOR_DEVICE_SYCL_H)
+#define EIGEN_TENSOR_TENSOR_DEVICE_SYCL_H
 #include <unordered_set>
 
 // IWYU pragma: private
@@ -565,4 +565,4 @@
 };
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_DEVICE_SYCL_H
+#endif  // EIGEN_TENSOR_TENSOR_DEVICE_SYCL_H
diff --git a/unsupported/Eigen/src/Tensor/TensorDeviceThreadPool.h b/unsupported/Eigen/src/Tensor/TensorDeviceThreadPool.h
index b12ca9d..23ec1ae 100644
--- a/unsupported/Eigen/src/Tensor/TensorDeviceThreadPool.h
+++ b/unsupported/Eigen/src/Tensor/TensorDeviceThreadPool.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#if defined(EIGEN_USE_THREADS) && !defined(EIGEN_CXX11_TENSOR_TENSOR_DEVICE_THREAD_POOL_H)
-#define EIGEN_CXX11_TENSOR_TENSOR_DEVICE_THREAD_POOL_H
+#if defined(EIGEN_USE_THREADS) && !defined(EIGEN_TENSOR_TENSOR_DEVICE_THREAD_POOL_H)
+#define EIGEN_TENSOR_TENSOR_DEVICE_THREAD_POOL_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -343,4 +343,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_DEVICE_THREAD_POOL_H
+#endif  // EIGEN_TENSOR_TENSOR_DEVICE_THREAD_POOL_H
diff --git a/unsupported/Eigen/src/Tensor/TensorDimensionList.h b/unsupported/Eigen/src/Tensor/TensorDimensionList.h
index 90f0d9e..d0fbb43 100644
--- a/unsupported/Eigen/src/Tensor/TensorDimensionList.h
+++ b/unsupported/Eigen/src/Tensor/TensorDimensionList.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_DIMENSION_LIST_H
-#define EIGEN_CXX11_TENSOR_TENSOR_DIMENSION_LIST_H
+#ifndef EIGEN_TENSOR_TENSOR_DIMENSION_LIST_H
+#define EIGEN_TENSOR_TENSOR_DIMENSION_LIST_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -18,7 +18,7 @@
 
 /** \internal
  *
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Special case of tensor index list used to list all the dimensions of a tensor of rank n.
  *
@@ -111,4 +111,4 @@
 }  // end namespace internal
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_DIMENSION_LIST_H
+#endif  // EIGEN_TENSOR_TENSOR_DIMENSION_LIST_H
diff --git a/unsupported/Eigen/src/Tensor/TensorDimensions.h b/unsupported/Eigen/src/Tensor/TensorDimensions.h
index 55dde46..91eec4c 100644
--- a/unsupported/Eigen/src/Tensor/TensorDimensions.h
+++ b/unsupported/Eigen/src/Tensor/TensorDimensions.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_DIMENSIONS_H
-#define EIGEN_CXX11_TENSOR_TENSOR_DIMENSIONS_H
+#ifndef EIGEN_TENSOR_TENSOR_DIMENSIONS_H
+#define EIGEN_TENSOR_TENSOR_DIMENSIONS_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -67,7 +67,7 @@
 
 /** \internal
  *
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Fixed dimensions of a Tensor.
  *
@@ -158,7 +158,7 @@
 
 /** \internal
  *
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Dynamic dimensions of a Tensor.
  *
@@ -335,4 +335,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_DIMENSIONS_H
+#endif  // EIGEN_TENSOR_TENSOR_DIMENSIONS_H
diff --git a/unsupported/Eigen/src/Tensor/TensorEvalTo.h b/unsupported/Eigen/src/Tensor/TensorEvalTo.h
index e3b257f..177d93a 100644
--- a/unsupported/Eigen/src/Tensor/TensorEvalTo.h
+++ b/unsupported/Eigen/src/Tensor/TensorEvalTo.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_EVAL_TO_H
-#define EIGEN_CXX11_TENSOR_TENSOR_EVAL_TO_H
+#ifndef EIGEN_TENSOR_TENSOR_EVAL_TO_H
+#define EIGEN_TENSOR_TENSOR_EVAL_TO_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -186,4 +186,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_EVAL_TO_H
+#endif  // EIGEN_TENSOR_TENSOR_EVAL_TO_H
diff --git a/unsupported/Eigen/src/Tensor/TensorEvaluator.h b/unsupported/Eigen/src/Tensor/TensorEvaluator.h
index 7b6974c..bfc4f0e 100644
--- a/unsupported/Eigen/src/Tensor/TensorEvaluator.h
+++ b/unsupported/Eigen/src/Tensor/TensorEvaluator.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_EVALUATOR_H
-#define EIGEN_CXX11_TENSOR_TENSOR_EVALUATOR_H
+#ifndef EIGEN_TENSOR_TENSOR_EVALUATOR_H
+#define EIGEN_TENSOR_TENSOR_EVALUATOR_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -18,7 +18,7 @@
 
 // Generic evaluator
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief The tensor evaluator class.
  *
@@ -862,4 +862,4 @@
     std::enable_if_t<!std::is_trivially_copyable<Eigen::TensorEvaluator<Derived, Device>>::value>> : std::true_type {};
 #endif
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_EVALUATOR_H
+#endif  // EIGEN_TENSOR_TENSOR_EVALUATOR_H
diff --git a/unsupported/Eigen/src/Tensor/TensorExecutor.h b/unsupported/Eigen/src/Tensor/TensorExecutor.h
index b73c9a6..2053c98 100644
--- a/unsupported/Eigen/src/Tensor/TensorExecutor.h
+++ b/unsupported/Eigen/src/Tensor/TensorExecutor.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_EXECUTOR_H
-#define EIGEN_CXX11_TENSOR_TENSOR_EXECUTOR_H
+#ifndef EIGEN_TENSOR_TENSOR_EXECUTOR_H
+#define EIGEN_TENSOR_TENSOR_EXECUTOR_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -58,7 +58,7 @@
 // -------------------------------------------------------------------------- //
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief The tensor executor class.
  *
@@ -668,4 +668,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_EXECUTOR_H
+#endif  // EIGEN_TENSOR_TENSOR_EXECUTOR_H
diff --git a/unsupported/Eigen/src/Tensor/TensorExpr.h b/unsupported/Eigen/src/Tensor/TensorExpr.h
index 8fc4a8e..2d48c37 100644
--- a/unsupported/Eigen/src/Tensor/TensorExpr.h
+++ b/unsupported/Eigen/src/Tensor/TensorExpr.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_EXPR_H
-#define EIGEN_CXX11_TENSOR_TENSOR_EXPR_H
+#ifndef EIGEN_TENSOR_TENSOR_EXPR_H
+#define EIGEN_TENSOR_TENSOR_EXPR_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -32,7 +32,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor nullary expression.
  *
@@ -88,7 +88,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor unary expression.
  *
@@ -160,7 +160,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor binary expression.
  *
@@ -336,4 +336,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_EXPR_H
+#endif  // EIGEN_TENSOR_TENSOR_EXPR_H
diff --git a/unsupported/Eigen/src/Tensor/TensorFFT.h b/unsupported/Eigen/src/Tensor/TensorFFT.h
index 9887371..ffe16d9 100644
--- a/unsupported/Eigen/src/Tensor/TensorFFT.h
+++ b/unsupported/Eigen/src/Tensor/TensorFFT.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_FFT_H
-#define EIGEN_CXX11_TENSOR_TENSOR_FFT_H
+#ifndef EIGEN_TENSOR_TENSOR_FFT_H
+#define EIGEN_TENSOR_TENSOR_FFT_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -89,7 +89,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor FFT class.
  *
@@ -666,4 +666,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_FFT_H
+#endif  // EIGEN_TENSOR_TENSOR_FFT_H
diff --git a/unsupported/Eigen/src/Tensor/TensorFixedSize.h b/unsupported/Eigen/src/Tensor/TensorFixedSize.h
index d626e05..5fa966b 100644
--- a/unsupported/Eigen/src/Tensor/TensorFixedSize.h
+++ b/unsupported/Eigen/src/Tensor/TensorFixedSize.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_FIXED_SIZE_H
-#define EIGEN_CXX11_TENSOR_TENSOR_FIXED_SIZE_H
+#ifndef EIGEN_TENSOR_TENSOR_FIXED_SIZE_H
+#define EIGEN_TENSOR_TENSOR_FIXED_SIZE_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -17,7 +17,7 @@
 namespace Eigen {
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief The fixed sized version of the tensor class.
  *
@@ -219,4 +219,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_FIXED_SIZE_H
+#endif  // EIGEN_TENSOR_TENSOR_FIXED_SIZE_H
diff --git a/unsupported/Eigen/src/Tensor/TensorForcedEval.h b/unsupported/Eigen/src/Tensor/TensorForcedEval.h
index 6364912..e3523ab 100644
--- a/unsupported/Eigen/src/Tensor/TensorForcedEval.h
+++ b/unsupported/Eigen/src/Tensor/TensorForcedEval.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_FORCED_EVAL_H
-#define EIGEN_CXX11_TENSOR_TENSOR_FORCED_EVAL_H
+#ifndef EIGEN_TENSOR_TENSOR_FORCED_EVAL_H
+#define EIGEN_TENSOR_TENSOR_FORCED_EVAL_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -47,7 +47,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor forced evaluation class.
  */
@@ -228,4 +228,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_FORCED_EVAL_H
+#endif  // EIGEN_TENSOR_TENSOR_FORCED_EVAL_H
diff --git a/unsupported/Eigen/src/Tensor/TensorForwardDeclarations.h b/unsupported/Eigen/src/Tensor/TensorForwardDeclarations.h
index 3014992..2e84ce3 100644
--- a/unsupported/Eigen/src/Tensor/TensorForwardDeclarations.h
+++ b/unsupported/Eigen/src/Tensor/TensorForwardDeclarations.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_FORWARD_DECLARATIONS_H
-#define EIGEN_CXX11_TENSOR_TENSOR_FORWARD_DECLARATIONS_H
+#ifndef EIGEN_TENSOR_TENSOR_FORWARD_DECLARATIONS_H
+#define EIGEN_TENSOR_TENSOR_FORWARD_DECLARATIONS_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -213,4 +213,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_FORWARD_DECLARATIONS_H
+#endif  // EIGEN_TENSOR_TENSOR_FORWARD_DECLARATIONS_H
diff --git a/unsupported/Eigen/src/Tensor/TensorFunctors.h b/unsupported/Eigen/src/Tensor/TensorFunctors.h
index 50a65ed..34ff95d 100644
--- a/unsupported/Eigen/src/Tensor/TensorFunctors.h
+++ b/unsupported/Eigen/src/Tensor/TensorFunctors.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_FUNCTORS_H
-#define EIGEN_CXX11_TENSOR_TENSOR_FUNCTORS_H
+#ifndef EIGEN_TENSOR_TENSOR_FUNCTORS_H
+#define EIGEN_TENSOR_TENSOR_FUNCTORS_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -420,4 +420,4 @@
 }  // end namespace internal
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_FUNCTORS_H
+#endif  // EIGEN_TENSOR_TENSOR_FUNCTORS_H
diff --git a/unsupported/Eigen/src/Tensor/TensorGenerator.h b/unsupported/Eigen/src/Tensor/TensorGenerator.h
index 90d9473..ee44dd2 100644
--- a/unsupported/Eigen/src/Tensor/TensorGenerator.h
+++ b/unsupported/Eigen/src/Tensor/TensorGenerator.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_GENERATOR_H
-#define EIGEN_CXX11_TENSOR_TENSOR_GENERATOR_H
+#ifndef EIGEN_TENSOR_TENSOR_GENERATOR_H
+#define EIGEN_TENSOR_TENSOR_GENERATOR_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -43,7 +43,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor generator class.
  */
@@ -267,4 +267,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_GENERATOR_H
+#endif  // EIGEN_TENSOR_TENSOR_GENERATOR_H
diff --git a/unsupported/Eigen/src/Tensor/TensorGlobalFunctions.h b/unsupported/Eigen/src/Tensor/TensorGlobalFunctions.h
index 5fb0251..6ba80bc 100644
--- a/unsupported/Eigen/src/Tensor/TensorGlobalFunctions.h
+++ b/unsupported/Eigen/src/Tensor/TensorGlobalFunctions.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_GLOBAL_FUNCTIONS_H
-#define EIGEN_CXX11_TENSOR_TENSOR_GLOBAL_FUNCTIONS_H
+#ifndef EIGEN_TENSOR_TENSOR_GLOBAL_FUNCTIONS_H
+#define EIGEN_TENSOR_TENSOR_GLOBAL_FUNCTIONS_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -34,4 +34,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_GLOBAL_FUNCTIONS_H
+#endif  // EIGEN_TENSOR_TENSOR_GLOBAL_FUNCTIONS_H
diff --git a/unsupported/Eigen/src/Tensor/TensorIO.h b/unsupported/Eigen/src/Tensor/TensorIO.h
index 7e3ae65..8ef2aaa 100644
--- a/unsupported/Eigen/src/Tensor/TensorIO.h
+++ b/unsupported/Eigen/src/Tensor/TensorIO.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_IO_H
-#define EIGEN_CXX11_TENSOR_TENSOR_IO_H
+#ifndef EIGEN_TENSOR_TENSOR_IO_H
+#define EIGEN_TENSOR_TENSOR_IO_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -411,4 +411,4 @@
 }
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_IO_H
+#endif  // EIGEN_TENSOR_TENSOR_IO_H
diff --git a/unsupported/Eigen/src/Tensor/TensorImagePatch.h b/unsupported/Eigen/src/Tensor/TensorImagePatch.h
index 110a832..7ae4a79 100644
--- a/unsupported/Eigen/src/Tensor/TensorImagePatch.h
+++ b/unsupported/Eigen/src/Tensor/TensorImagePatch.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_IMAGE_PATCH_H
-#define EIGEN_CXX11_TENSOR_TENSOR_IMAGE_PATCH_H
+#ifndef EIGEN_TENSOR_TENSOR_IMAGE_PATCH_H
+#define EIGEN_TENSOR_TENSOR_IMAGE_PATCH_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -45,7 +45,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Patch extraction specialized for image processing.
  * This assumes that the input has a least 3 dimensions ordered as follow:
@@ -616,4 +616,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_IMAGE_PATCH_H
+#endif  // EIGEN_TENSOR_TENSOR_IMAGE_PATCH_H
diff --git a/unsupported/Eigen/src/Tensor/TensorIndexList.h b/unsupported/Eigen/src/Tensor/TensorIndexList.h
index aaae4d3..4b85fad 100644
--- a/unsupported/Eigen/src/Tensor/TensorIndexList.h
+++ b/unsupported/Eigen/src/Tensor/TensorIndexList.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_INDEX_LIST_H
-#define EIGEN_CXX11_TENSOR_TENSOR_INDEX_LIST_H
+#ifndef EIGEN_TENSOR_TENSOR_INDEX_LIST_H
+#define EIGEN_TENSOR_TENSOR_INDEX_LIST_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -253,7 +253,7 @@
 
 /** \internal
  *
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Set of classes used to encode a set of Tensor dimensions/indices.
  *
@@ -617,4 +617,4 @@
 }  // end namespace internal
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_INDEX_LIST_H
+#endif  // EIGEN_TENSOR_TENSOR_INDEX_LIST_H
diff --git a/unsupported/Eigen/src/Tensor/TensorInflation.h b/unsupported/Eigen/src/Tensor/TensorInflation.h
index f8c8787..088cab1 100644
--- a/unsupported/Eigen/src/Tensor/TensorInflation.h
+++ b/unsupported/Eigen/src/Tensor/TensorInflation.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_INFLATION_H
-#define EIGEN_CXX11_TENSOR_TENSOR_INFLATION_H
+#ifndef EIGEN_TENSOR_TENSOR_INFLATION_H
+#define EIGEN_TENSOR_TENSOR_INFLATION_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -43,7 +43,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor inflation class.
  */
@@ -222,4 +222,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_INFLATION_H
+#endif  // EIGEN_TENSOR_TENSOR_INFLATION_H
diff --git a/unsupported/Eigen/src/Tensor/TensorInitializer.h b/unsupported/Eigen/src/Tensor/TensorInitializer.h
index 4232aa7..be661a3 100644
--- a/unsupported/Eigen/src/Tensor/TensorInitializer.h
+++ b/unsupported/Eigen/src/Tensor/TensorInitializer.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_INITIALIZER_H
-#define EIGEN_CXX11_TENSOR_TENSOR_INITIALIZER_H
+#ifndef EIGEN_TENSOR_TENSOR_INITIALIZER_H
+#define EIGEN_TENSOR_TENSOR_INITIALIZER_H
 
 #include <initializer_list>
 
@@ -21,7 +21,7 @@
 namespace internal {
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Helper template to initialize Tensors from std::initializer_lists.
  */
@@ -76,4 +76,4 @@
 }  // namespace internal
 }  // namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_INITIALIZER_H
+#endif  // EIGEN_TENSOR_TENSOR_INITIALIZER_H
diff --git a/unsupported/Eigen/src/Tensor/TensorIntDiv.h b/unsupported/Eigen/src/Tensor/TensorIntDiv.h
index f6cca7f..a988ee0 100644
--- a/unsupported/Eigen/src/Tensor/TensorIntDiv.h
+++ b/unsupported/Eigen/src/Tensor/TensorIntDiv.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_INTDIV_H
-#define EIGEN_CXX11_TENSOR_TENSOR_INTDIV_H
+#ifndef EIGEN_TENSOR_TENSOR_INTDIV_H
+#define EIGEN_TENSOR_TENSOR_INTDIV_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -126,7 +126,7 @@
 
 /** \internal
  *
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Fast integer division by a constant.
  *
@@ -256,4 +256,4 @@
 }  // end namespace internal
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_INTDIV_H
+#endif  // EIGEN_TENSOR_TENSOR_INTDIV_H
diff --git a/unsupported/Eigen/src/Tensor/TensorLayoutSwap.h b/unsupported/Eigen/src/Tensor/TensorLayoutSwap.h
index 753325b..2c91784 100644
--- a/unsupported/Eigen/src/Tensor/TensorLayoutSwap.h
+++ b/unsupported/Eigen/src/Tensor/TensorLayoutSwap.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_LAYOUT_SWAP_H
-#define EIGEN_CXX11_TENSOR_TENSOR_LAYOUT_SWAP_H
+#ifndef EIGEN_TENSOR_TENSOR_LAYOUT_SWAP_H
+#define EIGEN_TENSOR_TENSOR_LAYOUT_SWAP_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -43,7 +43,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Swap the layout from col-major to row-major, or row-major
  * to col-major, and invert the order of the dimensions.
@@ -200,4 +200,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_LAYOUT_SWAP_H
+#endif  // EIGEN_TENSOR_TENSOR_LAYOUT_SWAP_H
diff --git a/unsupported/Eigen/src/Tensor/TensorMacros.h b/unsupported/Eigen/src/Tensor/TensorMacros.h
index fb8a17d..27ca7b6 100644
--- a/unsupported/Eigen/src/Tensor/TensorMacros.h
+++ b/unsupported/Eigen/src/Tensor/TensorMacros.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_META_MACROS_H
-#define EIGEN_CXX11_TENSOR_TENSOR_META_MACROS_H
+#ifndef EIGEN_TENSOR_TENSOR_META_MACROS_H
+#define EIGEN_TENSOR_TENSOR_META_MACROS_H
 
 /** use this macro in sfinae selection in templated functions
  *
diff --git a/unsupported/Eigen/src/Tensor/TensorMap.h b/unsupported/Eigen/src/Tensor/TensorMap.h
index fcecaf6..639e4c1 100644
--- a/unsupported/Eigen/src/Tensor/TensorMap.h
+++ b/unsupported/Eigen/src/Tensor/TensorMap.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_MAP_H
-#define EIGEN_CXX11_TENSOR_TENSOR_MAP_H
+#ifndef EIGEN_TENSOR_TENSOR_MAP_H
+#define EIGEN_TENSOR_TENSOR_MAP_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -19,7 +19,7 @@
 // FIXME: Use proper doxygen documentation (e.g. \tparam MakePointer_).
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief A tensor expression mapping an existing array of data.
  *
@@ -187,4 +187,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_MAP_H
+#endif  // EIGEN_TENSOR_TENSOR_MAP_H
diff --git a/unsupported/Eigen/src/Tensor/TensorMeta.h b/unsupported/Eigen/src/Tensor/TensorMeta.h
index 47ae08d..d59d890 100644
--- a/unsupported/Eigen/src/Tensor/TensorMeta.h
+++ b/unsupported/Eigen/src/Tensor/TensorMeta.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_META_H
-#define EIGEN_CXX11_TENSOR_TENSOR_META_H
+#ifndef EIGEN_TENSOR_TENSOR_META_H
+#define EIGEN_TENSOR_TENSOR_META_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -289,4 +289,4 @@
 
 }  // namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_META_H
+#endif  // EIGEN_TENSOR_TENSOR_META_H
diff --git a/unsupported/Eigen/src/Tensor/TensorMorphing.h b/unsupported/Eigen/src/Tensor/TensorMorphing.h
index 943967a..5734bc8 100644
--- a/unsupported/Eigen/src/Tensor/TensorMorphing.h
+++ b/unsupported/Eigen/src/Tensor/TensorMorphing.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_MORPHING_H
-#define EIGEN_CXX11_TENSOR_TENSOR_MORPHING_H
+#ifndef EIGEN_TENSOR_TENSOR_MORPHING_H
+#define EIGEN_TENSOR_TENSOR_MORPHING_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -44,7 +44,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor reshaping class.
  */
@@ -249,7 +249,7 @@
 };
 
 /** \class TensorSlicing
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor slicing class.
  *
@@ -977,4 +977,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_MORPHING_H
+#endif  // EIGEN_TENSOR_TENSOR_MORPHING_H
diff --git a/unsupported/Eigen/src/Tensor/TensorPadding.h b/unsupported/Eigen/src/Tensor/TensorPadding.h
index ca62c79..dec3d53 100644
--- a/unsupported/Eigen/src/Tensor/TensorPadding.h
+++ b/unsupported/Eigen/src/Tensor/TensorPadding.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_PADDING_H
-#define EIGEN_CXX11_TENSOR_TENSOR_PADDING_H
+#ifndef EIGEN_TENSOR_TENSOR_PADDING_H
+#define EIGEN_TENSOR_TENSOR_PADDING_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -44,7 +44,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor padding class.
  * At the moment only padding with a constant value is supported.
@@ -618,4 +618,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_PADDING_H
+#endif  // EIGEN_TENSOR_TENSOR_PADDING_H
diff --git a/unsupported/Eigen/src/Tensor/TensorPatch.h b/unsupported/Eigen/src/Tensor/TensorPatch.h
index 5c332e6..d8eaa35 100644
--- a/unsupported/Eigen/src/Tensor/TensorPatch.h
+++ b/unsupported/Eigen/src/Tensor/TensorPatch.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_PATCH_H
-#define EIGEN_CXX11_TENSOR_TENSOR_PATCH_H
+#ifndef EIGEN_TENSOR_TENSOR_PATCH_H
+#define EIGEN_TENSOR_TENSOR_PATCH_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -43,7 +43,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor patch class.
  */
@@ -256,4 +256,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_PATCH_H
+#endif  // EIGEN_TENSOR_TENSOR_PATCH_H
diff --git a/unsupported/Eigen/src/Tensor/TensorRandom.h b/unsupported/Eigen/src/Tensor/TensorRandom.h
index 85ba673..fc0cfb6 100644
--- a/unsupported/Eigen/src/Tensor/TensorRandom.h
+++ b/unsupported/Eigen/src/Tensor/TensorRandom.h
@@ -9,8 +9,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_RANDOM_H
-#define EIGEN_CXX11_TENSOR_TENSOR_RANDOM_H
+#ifndef EIGEN_TENSOR_TENSOR_RANDOM_H
+#define EIGEN_TENSOR_TENSOR_RANDOM_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -295,4 +295,4 @@
 }  // end namespace internal
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_RANDOM_H
+#endif  // EIGEN_TENSOR_TENSOR_RANDOM_H
diff --git a/unsupported/Eigen/src/Tensor/TensorReduction.h b/unsupported/Eigen/src/Tensor/TensorReduction.h
index ab33a08..d7091c8 100644
--- a/unsupported/Eigen/src/Tensor/TensorReduction.h
+++ b/unsupported/Eigen/src/Tensor/TensorReduction.h
@@ -9,8 +9,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_REDUCTION_H
-#define EIGEN_CXX11_TENSOR_TENSOR_REDUCTION_H
+#ifndef EIGEN_TENSOR_TENSOR_REDUCTION_H
+#define EIGEN_TENSOR_TENSOR_REDUCTION_H
 
 // clang is incompatible with the CUDA syntax wrt making a kernel a class friend,
 // so we'll use a macro to make clang happy.
@@ -493,7 +493,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor reduction class.
  *
@@ -1021,4 +1021,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_REDUCTION_H
+#endif  // EIGEN_TENSOR_TENSOR_REDUCTION_H
diff --git a/unsupported/Eigen/src/Tensor/TensorReductionGpu.h b/unsupported/Eigen/src/Tensor/TensorReductionGpu.h
index 85d30a2..48fbecb 100644
--- a/unsupported/Eigen/src/Tensor/TensorReductionGpu.h
+++ b/unsupported/Eigen/src/Tensor/TensorReductionGpu.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_REDUCTION_GPU_H
-#define EIGEN_CXX11_TENSOR_TENSOR_REDUCTION_GPU_H
+#ifndef EIGEN_TENSOR_TENSOR_REDUCTION_GPU_H
+#define EIGEN_TENSOR_TENSOR_REDUCTION_GPU_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -911,4 +911,4 @@
 }  // end namespace internal
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_REDUCTION_GPU_H
+#endif  // EIGEN_TENSOR_TENSOR_REDUCTION_GPU_H
diff --git a/unsupported/Eigen/src/Tensor/TensorReductionSycl.h b/unsupported/Eigen/src/Tensor/TensorReductionSycl.h
index 49b87ad..2ac304f 100644
--- a/unsupported/Eigen/src/Tensor/TensorReductionSycl.h
+++ b/unsupported/Eigen/src/Tensor/TensorReductionSycl.h
@@ -27,8 +27,8 @@
  *
  *****************************************************************/
 
-#ifndef UNSUPPORTED_EIGEN_CXX11_SRC_TENSOR_TENSOR_REDUCTION_SYCL_HPP
-#define UNSUPPORTED_EIGEN_CXX11_SRC_TENSOR_TENSOR_REDUCTION_SYCL_HPP
+#ifndef UNSUPPORTED_EIGEN_SRC_TENSOR_TENSOR_REDUCTION_SYCL_HPP
+#define UNSUPPORTED_EIGEN_SRC_TENSOR_TENSOR_REDUCTION_SYCL_HPP
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
 
@@ -583,4 +583,4 @@
 }  // namespace internal
 }  // namespace Eigen
 
-#endif  // UNSUPPORTED_EIGEN_CXX11_SRC_TENSOR_TENSOR_REDUCTION_SYCL_HPP
+#endif  // UNSUPPORTED_EIGEN_SRC_TENSOR_TENSOR_REDUCTION_SYCL_HPP
diff --git a/unsupported/Eigen/src/Tensor/TensorRef.h b/unsupported/Eigen/src/Tensor/TensorRef.h
index df77f11..3a45bb5 100644
--- a/unsupported/Eigen/src/Tensor/TensorRef.h
+++ b/unsupported/Eigen/src/Tensor/TensorRef.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_REF_H
-#define EIGEN_CXX11_TENSOR_TENSOR_REF_H
+#ifndef EIGEN_TENSOR_TENSOR_REF_H
+#define EIGEN_TENSOR_TENSOR_REF_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -231,7 +231,7 @@
 }  // namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief A reference to a tensor expression
  * The expression will be evaluated lazily (as much as possible).
@@ -295,7 +295,7 @@
 };
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief A reference to a constant tensor expression
  * The expression will be evaluated lazily (as much as possible).
@@ -388,4 +388,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_REF_H
+#endif  // EIGEN_TENSOR_TENSOR_REF_H
diff --git a/unsupported/Eigen/src/Tensor/TensorReverse.h b/unsupported/Eigen/src/Tensor/TensorReverse.h
index 771e6f2..ac6fe07 100644
--- a/unsupported/Eigen/src/Tensor/TensorReverse.h
+++ b/unsupported/Eigen/src/Tensor/TensorReverse.h
@@ -9,8 +9,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_REVERSE_H
-#define EIGEN_CXX11_TENSOR_TENSOR_REVERSE_H
+#ifndef EIGEN_TENSOR_TENSOR_REVERSE_H
+#define EIGEN_TENSOR_TENSOR_REVERSE_H
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
 
@@ -44,7 +44,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor reverse elements class.
  *
@@ -419,4 +419,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_REVERSE_H
+#endif  // EIGEN_TENSOR_TENSOR_REVERSE_H
diff --git a/unsupported/Eigen/src/Tensor/TensorRoll.h b/unsupported/Eigen/src/Tensor/TensorRoll.h
index aacf043..fd33451 100644
--- a/unsupported/Eigen/src/Tensor/TensorRoll.h
+++ b/unsupported/Eigen/src/Tensor/TensorRoll.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_ROLL_H
-#define EIGEN_CXX11_TENSOR_TENSOR_ROLL_H
+#ifndef EIGEN_TENSOR_TENSOR_ROLL_H
+#define EIGEN_TENSOR_TENSOR_ROLL_H
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
 
@@ -42,7 +42,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor roll (circular shift) elements class.
  *
@@ -376,4 +376,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_ROLL_H
+#endif  // EIGEN_TENSOR_TENSOR_ROLL_H
diff --git a/unsupported/Eigen/src/Tensor/TensorScan.h b/unsupported/Eigen/src/Tensor/TensorScan.h
index e1dccfb..a6e7253 100644
--- a/unsupported/Eigen/src/Tensor/TensorScan.h
+++ b/unsupported/Eigen/src/Tensor/TensorScan.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_SCAN_H
-#define EIGEN_CXX11_TENSOR_TENSOR_SCAN_H
+#ifndef EIGEN_TENSOR_TENSOR_SCAN_H
+#define EIGEN_TENSOR_TENSOR_SCAN_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -42,7 +42,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor scan class.
  */
@@ -489,4 +489,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_SCAN_H
+#endif  // EIGEN_TENSOR_TENSOR_SCAN_H
diff --git a/unsupported/Eigen/src/Tensor/TensorScanSycl.h b/unsupported/Eigen/src/Tensor/TensorScanSycl.h
index 7af82f4..02cbc07 100644
--- a/unsupported/Eigen/src/Tensor/TensorScanSycl.h
+++ b/unsupported/Eigen/src/Tensor/TensorScanSycl.h
@@ -36,8 +36,8 @@
  *1, no. 1 (2008): 1-17.
  *****************************************************************/
 
-#ifndef UNSUPPORTED_EIGEN_CXX11_SRC_TENSOR_TENSOR_SYCL_SYCL_HPP
-#define UNSUPPORTED_EIGEN_CXX11_SRC_TENSOR_TENSOR_SYCL_SYCL_HPP
+#ifndef UNSUPPORTED_EIGEN_SRC_TENSOR_TENSOR_SYCL_SYCL_HPP
+#define UNSUPPORTED_EIGEN_SRC_TENSOR_TENSOR_SYCL_SYCL_HPP
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -505,4 +505,4 @@
 }  // namespace internal
 }  // namespace Eigen
 
-#endif  // UNSUPPORTED_EIGEN_CXX11_SRC_TENSOR_TENSOR_SYCL_SYCL_HPP
+#endif  // UNSUPPORTED_EIGEN_SRC_TENSOR_TENSOR_SYCL_SYCL_HPP
diff --git a/unsupported/Eigen/src/Tensor/TensorShuffling.h b/unsupported/Eigen/src/Tensor/TensorShuffling.h
index 5c30ec2..6db7a3c 100644
--- a/unsupported/Eigen/src/Tensor/TensorShuffling.h
+++ b/unsupported/Eigen/src/Tensor/TensorShuffling.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_SHUFFLING_H
-#define EIGEN_CXX11_TENSOR_TENSOR_SHUFFLING_H
+#ifndef EIGEN_TENSOR_TENSOR_SHUFFLING_H
+#define EIGEN_TENSOR_TENSOR_SHUFFLING_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -43,7 +43,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor shuffling class.
  */
@@ -411,4 +411,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_SHUFFLING_H
+#endif  // EIGEN_TENSOR_TENSOR_SHUFFLING_H
diff --git a/unsupported/Eigen/src/Tensor/TensorStorage.h b/unsupported/Eigen/src/Tensor/TensorStorage.h
index a133ccf..a12379a 100644
--- a/unsupported/Eigen/src/Tensor/TensorStorage.h
+++ b/unsupported/Eigen/src/Tensor/TensorStorage.h
@@ -9,8 +9,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSORSTORAGE_H
-#define EIGEN_CXX11_TENSOR_TENSORSTORAGE_H
+#ifndef EIGEN_TENSOR_TENSORSTORAGE_H
+#define EIGEN_TENSOR_TENSORSTORAGE_H
 
 #ifdef EIGEN_TENSOR_STORAGE_CTOR_PLUGIN
 #define EIGEN_INTERNAL_TENSOR_STORAGE_CTOR_PLUGIN EIGEN_TENSOR_STORAGE_CTOR_PLUGIN;
@@ -25,7 +25,7 @@
 
 /** \internal
  *
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Stores the data of a tensor
  *
@@ -141,4 +141,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSORSTORAGE_H
+#endif  // EIGEN_TENSOR_TENSORSTORAGE_H
diff --git a/unsupported/Eigen/src/Tensor/TensorStriding.h b/unsupported/Eigen/src/Tensor/TensorStriding.h
index 696664b..9292d74 100644
--- a/unsupported/Eigen/src/Tensor/TensorStriding.h
+++ b/unsupported/Eigen/src/Tensor/TensorStriding.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_STRIDING_H
-#define EIGEN_CXX11_TENSOR_TENSOR_STRIDING_H
+#ifndef EIGEN_TENSOR_TENSOR_STRIDING_H
+#define EIGEN_TENSOR_TENSOR_STRIDING_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -43,7 +43,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor striding class.
  */
@@ -310,4 +310,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_STRIDING_H
+#endif  // EIGEN_TENSOR_TENSOR_STRIDING_H
diff --git a/unsupported/Eigen/src/Tensor/TensorTrace.h b/unsupported/Eigen/src/Tensor/TensorTrace.h
index 419b60b..46d24b0 100644
--- a/unsupported/Eigen/src/Tensor/TensorTrace.h
+++ b/unsupported/Eigen/src/Tensor/TensorTrace.h
@@ -9,8 +9,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_TRACE_H
-#define EIGEN_CXX11_TENSOR_TENSOR_TRACE_H
+#ifndef EIGEN_TENSOR_TENSOR_TRACE_H
+#define EIGEN_TENSOR_TENSOR_TRACE_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -47,7 +47,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Tensor Trace class.
  */
@@ -279,4 +279,4 @@
 
 }  // End namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_TRACE_H
+#endif  // EIGEN_TENSOR_TENSOR_TRACE_H
diff --git a/unsupported/Eigen/src/Tensor/TensorTraits.h b/unsupported/Eigen/src/Tensor/TensorTraits.h
index 2ed1457..1b539f7 100644
--- a/unsupported/Eigen/src/Tensor/TensorTraits.h
+++ b/unsupported/Eigen/src/Tensor/TensorTraits.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_TRAITS_H
-#define EIGEN_CXX11_TENSOR_TENSOR_TRAITS_H
+#ifndef EIGEN_TENSOR_TENSOR_TRAITS_H
+#define EIGEN_TENSOR_TENSOR_TRAITS_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -230,4 +230,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_TRAITS_H
+#endif  // EIGEN_TENSOR_TENSOR_TRAITS_H
diff --git a/unsupported/Eigen/src/Tensor/TensorUInt128.h b/unsupported/Eigen/src/Tensor/TensorUInt128.h
index 87d23c4..6734bf0 100644
--- a/unsupported/Eigen/src/Tensor/TensorUInt128.h
+++ b/unsupported/Eigen/src/Tensor/TensorUInt128.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_UINT128_H
-#define EIGEN_CXX11_TENSOR_TENSOR_UINT128_H
+#ifndef EIGEN_TENSOR_TENSOR_UINT128_H
+#define EIGEN_TENSOR_TENSOR_UINT128_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -226,4 +226,4 @@
 }  // namespace internal
 }  // namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_UINT128_H
+#endif  // EIGEN_TENSOR_TENSOR_UINT128_H
diff --git a/unsupported/Eigen/src/Tensor/TensorVolumePatch.h b/unsupported/Eigen/src/Tensor/TensorVolumePatch.h
index 0516419..411adb9 100644
--- a/unsupported/Eigen/src/Tensor/TensorVolumePatch.h
+++ b/unsupported/Eigen/src/Tensor/TensorVolumePatch.h
@@ -3,8 +3,8 @@
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSOR_TENSOR_VOLUME_PATCH_H
-#define EIGEN_CXX11_TENSOR_TENSOR_VOLUME_PATCH_H
+#ifndef EIGEN_TENSOR_TENSOR_VOLUME_PATCH_H
+#define EIGEN_TENSOR_TENSOR_VOLUME_PATCH_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -40,7 +40,7 @@
 }  // end namespace internal
 
 /**
- * \ingroup CXX11_Tensor_Module
+ * \ingroup Tensor_Module
  *
  * \brief Patch extraction specialized for processing of volumetric data.
  * This assumes that the input has a least 4 dimensions ordered as follows:
@@ -620,4 +620,4 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSOR_TENSOR_VOLUME_PATCH_H
+#endif  // EIGEN_TENSOR_TENSOR_VOLUME_PATCH_H
diff --git a/unsupported/Eigen/src/TensorSymmetry/DynamicSymmetry.h b/unsupported/Eigen/src/TensorSymmetry/DynamicSymmetry.h
index 33d98ac..44dcf68 100644
--- a/unsupported/Eigen/src/TensorSymmetry/DynamicSymmetry.h
+++ b/unsupported/Eigen/src/TensorSymmetry/DynamicSymmetry.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSORSYMMETRY_DYNAMICSYMMETRY_H
-#define EIGEN_CXX11_TENSORSYMMETRY_DYNAMICSYMMETRY_H
+#ifndef EIGEN_TENSORSYMMETRY_DYNAMICSYMMETRY_H
+#define EIGEN_TENSORSYMMETRY_DYNAMICSYMMETRY_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -290,7 +290,7 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSORSYMMETRY_DYNAMICSYMMETRY_H
+#endif  // EIGEN_TENSORSYMMETRY_DYNAMICSYMMETRY_H
 
 /*
  * kate: space-indent on; indent-width 2; mixedindent off; indent-mode cstyle;
diff --git a/unsupported/Eigen/src/TensorSymmetry/InternalHeaderCheck.h b/unsupported/Eigen/src/TensorSymmetry/InternalHeaderCheck.h
index 1ddc070..fd713ee 100644
--- a/unsupported/Eigen/src/TensorSymmetry/InternalHeaderCheck.h
+++ b/unsupported/Eigen/src/TensorSymmetry/InternalHeaderCheck.h
@@ -1,6 +1,6 @@
 // SPDX-FileCopyrightText: The Eigen Authors
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSORSYMMETRY_MODULE_H
+#ifndef EIGEN_TENSORSYMMETRY_MODULE_H
 #error "Please include unsupported/Eigen/TensorSymmetry instead of including headers inside the src directory directly."
 #endif
diff --git a/unsupported/Eigen/src/TensorSymmetry/StaticSymmetry.h b/unsupported/Eigen/src/TensorSymmetry/StaticSymmetry.h
index 0deda1c..b7402db 100644
--- a/unsupported/Eigen/src/TensorSymmetry/StaticSymmetry.h
+++ b/unsupported/Eigen/src/TensorSymmetry/StaticSymmetry.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSORSYMMETRY_STATICSYMMETRY_H
-#define EIGEN_CXX11_TENSORSYMMETRY_STATICSYMMETRY_H
+#ifndef EIGEN_TENSORSYMMETRY_STATICSYMMETRY_H
+#define EIGEN_TENSORSYMMETRY_STATICSYMMETRY_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -217,7 +217,7 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSORSYMMETRY_STATICSYMMETRY_H
+#endif  // EIGEN_TENSORSYMMETRY_STATICSYMMETRY_H
 
 /*
  * kate: space-indent on; indent-width 2; mixedindent off; indent-mode cstyle;
diff --git a/unsupported/Eigen/src/TensorSymmetry/Symmetry.h b/unsupported/Eigen/src/TensorSymmetry/Symmetry.h
index 0d642d2..3e75d5c 100644
--- a/unsupported/Eigen/src/TensorSymmetry/Symmetry.h
+++ b/unsupported/Eigen/src/TensorSymmetry/Symmetry.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSORSYMMETRY_SYMMETRY_H
-#define EIGEN_CXX11_TENSORSYMMETRY_SYMMETRY_H
+#ifndef EIGEN_TENSORSYMMETRY_SYMMETRY_H
+#define EIGEN_TENSORSYMMETRY_SYMMETRY_H
 
 // IWYU pragma: private
 #include "./InternalHeaderCheck.h"
@@ -328,7 +328,7 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSORSYMMETRY_SYMMETRY_H
+#endif  // EIGEN_TENSORSYMMETRY_SYMMETRY_H
 
 /*
  * kate: space-indent on; indent-width 2; mixedindent off; indent-mode cstyle;
diff --git a/unsupported/Eigen/src/TensorSymmetry/util/TemplateGroupTheory.h b/unsupported/Eigen/src/TensorSymmetry/util/TemplateGroupTheory.h
index 9ec6c08..8421679 100644
--- a/unsupported/Eigen/src/TensorSymmetry/util/TemplateGroupTheory.h
+++ b/unsupported/Eigen/src/TensorSymmetry/util/TemplateGroupTheory.h
@@ -8,8 +8,8 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
-#ifndef EIGEN_CXX11_TENSORSYMMETRY_TEMPLATEGROUPTHEORY_H
-#define EIGEN_CXX11_TENSORSYMMETRY_TEMPLATEGROUPTHEORY_H
+#ifndef EIGEN_TENSORSYMMETRY_TEMPLATEGROUPTHEORY_H
+#define EIGEN_TENSORSYMMETRY_TEMPLATEGROUPTHEORY_H
 
 // IWYU pragma: private
 #include "../InternalHeaderCheck.h"
@@ -21,7 +21,7 @@
 namespace group_theory {
 
 /** \internal
- * \file CXX11/src/TensorSymmetry/util/TemplateGroupTheory.h
+ * \file src/TensorSymmetry/util/TemplateGroupTheory.h
  * This file contains C++ templates that implement group theory algorithms.
  *
  * The algorithms allow for a compile-time analysis of finite groups.
@@ -110,7 +110,7 @@
 /** \internal
  *
  * \class strip_identities
- * \ingroup CXX11_TensorSymmetry_Module
+ * \ingroup TensorSymmetry_Module
  *
  * \brief Cleanse a list of group elements of the identity element
  *
@@ -142,7 +142,7 @@
 /** \internal
  *
  * \class dimino_first_step_elements_helper
- * \ingroup CXX11_TensorSymmetry_Module
+ * \ingroup TensorSymmetry_Module
  *
  * \brief Recursive template that adds powers of the first generator to the list of group elements
  *
@@ -176,7 +176,7 @@
 /** \internal
  *
  * \class dimino_first_step_elements
- * \ingroup CXX11_TensorSymmetry_Module
+ * \ingroup TensorSymmetry_Module
  *
  * \brief Add all powers of the first generator to the list of group elements
  *
@@ -203,7 +203,7 @@
 /** \internal
  *
  * \class dimino_get_coset_elements
- * \ingroup CXX11_TensorSymmetry_Module
+ * \ingroup TensorSymmetry_Module
  *
  * \brief Generate all elements of a specific coset
  *
@@ -235,7 +235,7 @@
 /** \internal
  *
  * \class dimino_add_cosets_for_rep
- * \ingroup CXX11_TensorSymmetry_Module
+ * \ingroup TensorSymmetry_Module
  *
  * \brief Recursive template for adding coset spaces
  *
@@ -289,7 +289,7 @@
 /** \internal
  *
  * \class dimino_add_all_coset_spaces
- * \ingroup CXX11_TensorSymmetry_Module
+ * \ingroup TensorSymmetry_Module
  *
  * \brief Recursive template for adding all coset spaces for a new generator
  *
@@ -333,7 +333,7 @@
 /** \internal
  *
  * \class dimino_add_generator
- * \ingroup CXX11_TensorSymmetry_Module
+ * \ingroup TensorSymmetry_Module
  *
  * \brief Enlarge the group by adding a new generator.
  *
@@ -380,7 +380,7 @@
 /** \internal
  *
  * \class dimino_add_remaining_generators
- * \ingroup CXX11_TensorSymmetry_Module
+ * \ingroup TensorSymmetry_Module
  *
  * \brief Recursive template that adds all remaining generators to a group
  *
@@ -420,7 +420,7 @@
 /** \internal
  *
  * \class enumerate_group_elements_noid
- * \ingroup CXX11_TensorSymmetry_Module
+ * \ingroup TensorSymmetry_Module
  *
  * \brief Helper template that implements group element enumeration
  *
@@ -458,7 +458,7 @@
 /** \internal
  *
  * \class enumerate_group_elements
- * \ingroup CXX11_TensorSymmetry_Module
+ * \ingroup TensorSymmetry_Module
  *
  * \brief Enumerate all elements in a finite group
  *
@@ -485,7 +485,7 @@
 
 }  // end namespace Eigen
 
-#endif  // EIGEN_CXX11_TENSORSYMMETRY_TEMPLATEGROUPTHEORY_H
+#endif  // EIGEN_TENSORSYMMETRY_TEMPLATEGROUPTHEORY_H
 
 /*
  * kate: space-indent on; indent-width 2; mixedindent off; indent-mode cstyle;
diff --git a/unsupported/benchmarks/Tensor/bench_broadcasting.cpp b/unsupported/benchmarks/Tensor/bench_broadcasting.cpp
index 3ada0e3..39028f2 100644
--- a/unsupported/benchmarks/Tensor/bench_broadcasting.cpp
+++ b/unsupported/benchmarks/Tensor/bench_broadcasting.cpp
@@ -6,8 +6,8 @@
 #define EIGEN_USE_THREADS
 
 #include <benchmark/benchmark.h>
-#include <unsupported/Eigen/CXX11/Tensor>
-#include <unsupported/Eigen/CXX11/ThreadPool>
+#include <unsupported/Eigen/Tensor>
+#include <unsupported/Eigen/ThreadPool>
 
 using namespace Eigen;
 
diff --git a/unsupported/benchmarks/Tensor/bench_chained_expressions.cpp b/unsupported/benchmarks/Tensor/bench_chained_expressions.cpp
index 2ae08e3..6084f24 100644
--- a/unsupported/benchmarks/Tensor/bench_chained_expressions.cpp
+++ b/unsupported/benchmarks/Tensor/bench_chained_expressions.cpp
@@ -6,8 +6,8 @@
 #define EIGEN_USE_THREADS
 
 #include <benchmark/benchmark.h>
-#include <unsupported/Eigen/CXX11/Tensor>
-#include <unsupported/Eigen/CXX11/ThreadPool>
+#include <unsupported/Eigen/Tensor>
+#include <unsupported/Eigen/ThreadPool>
 
 using namespace Eigen;
 
diff --git a/unsupported/benchmarks/Tensor/bench_coefficient_wise.cpp b/unsupported/benchmarks/Tensor/bench_coefficient_wise.cpp
index 9ac5453..cde00a9 100644
--- a/unsupported/benchmarks/Tensor/bench_coefficient_wise.cpp
+++ b/unsupported/benchmarks/Tensor/bench_coefficient_wise.cpp
@@ -6,8 +6,8 @@
 #define EIGEN_USE_THREADS
 
 #include <benchmark/benchmark.h>
-#include <unsupported/Eigen/CXX11/Tensor>
-#include <unsupported/Eigen/CXX11/ThreadPool>
+#include <unsupported/Eigen/Tensor>
+#include <unsupported/Eigen/ThreadPool>
 
 using namespace Eigen;
 
diff --git a/unsupported/benchmarks/Tensor/bench_contraction.cpp b/unsupported/benchmarks/Tensor/bench_contraction.cpp
index d38207a..20b6c60 100644
--- a/unsupported/benchmarks/Tensor/bench_contraction.cpp
+++ b/unsupported/benchmarks/Tensor/bench_contraction.cpp
@@ -6,8 +6,8 @@
 #define EIGEN_USE_THREADS
 
 #include <benchmark/benchmark.h>
-#include <unsupported/Eigen/CXX11/Tensor>
-#include <unsupported/Eigen/CXX11/ThreadPool>
+#include <unsupported/Eigen/Tensor>
+#include <unsupported/Eigen/ThreadPool>
 
 using namespace Eigen;
 
diff --git a/unsupported/benchmarks/Tensor/bench_convolution.cpp b/unsupported/benchmarks/Tensor/bench_convolution.cpp
index 6d5f836..4637c99 100644
--- a/unsupported/benchmarks/Tensor/bench_convolution.cpp
+++ b/unsupported/benchmarks/Tensor/bench_convolution.cpp
@@ -5,8 +5,8 @@
 #define EIGEN_USE_THREADS
 
 #include <benchmark/benchmark.h>
-#include <unsupported/Eigen/CXX11/Tensor>
-#include <unsupported/Eigen/CXX11/ThreadPool>
+#include <unsupported/Eigen/Tensor>
+#include <unsupported/Eigen/ThreadPool>
 
 using namespace Eigen;
 
diff --git a/unsupported/benchmarks/Tensor/bench_image_patch.cpp b/unsupported/benchmarks/Tensor/bench_image_patch.cpp
index d82fe16..027777b 100644
--- a/unsupported/benchmarks/Tensor/bench_image_patch.cpp
+++ b/unsupported/benchmarks/Tensor/bench_image_patch.cpp
@@ -5,8 +5,8 @@
 #define EIGEN_USE_THREADS
 
 #include <benchmark/benchmark.h>
-#include <unsupported/Eigen/CXX11/Tensor>
-#include <unsupported/Eigen/CXX11/ThreadPool>
+#include <unsupported/Eigen/Tensor>
+#include <unsupported/Eigen/ThreadPool>
 
 using namespace Eigen;
 
diff --git a/unsupported/benchmarks/Tensor/bench_layout_swap.cpp b/unsupported/benchmarks/Tensor/bench_layout_swap.cpp
index 029bd53..881ebd1 100644
--- a/unsupported/benchmarks/Tensor/bench_layout_swap.cpp
+++ b/unsupported/benchmarks/Tensor/bench_layout_swap.cpp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #include <benchmark/benchmark.h>
-#include <unsupported/Eigen/CXX11/Tensor>
+#include <unsupported/Eigen/Tensor>
 
 using namespace Eigen;
 
diff --git a/unsupported/benchmarks/Tensor/bench_morphing.cpp b/unsupported/benchmarks/Tensor/bench_morphing.cpp
index 438a71c..743c358 100644
--- a/unsupported/benchmarks/Tensor/bench_morphing.cpp
+++ b/unsupported/benchmarks/Tensor/bench_morphing.cpp
@@ -5,8 +5,8 @@
 #define EIGEN_USE_THREADS
 
 #include <benchmark/benchmark.h>
-#include <unsupported/Eigen/CXX11/Tensor>
-#include <unsupported/Eigen/CXX11/ThreadPool>
+#include <unsupported/Eigen/Tensor>
+#include <unsupported/Eigen/ThreadPool>
 
 using namespace Eigen;
 
diff --git a/unsupported/benchmarks/Tensor/bench_reduction.cpp b/unsupported/benchmarks/Tensor/bench_reduction.cpp
index 7304e96..68e9575 100644
--- a/unsupported/benchmarks/Tensor/bench_reduction.cpp
+++ b/unsupported/benchmarks/Tensor/bench_reduction.cpp
@@ -6,8 +6,8 @@
 #define EIGEN_USE_THREADS
 
 #include <benchmark/benchmark.h>
-#include <unsupported/Eigen/CXX11/Tensor>
-#include <unsupported/Eigen/CXX11/ThreadPool>
+#include <unsupported/Eigen/Tensor>
+#include <unsupported/Eigen/ThreadPool>
 
 using namespace Eigen;
 
diff --git a/unsupported/benchmarks/Tensor/bench_reverse.cpp b/unsupported/benchmarks/Tensor/bench_reverse.cpp
index 69292e8..aea8103 100644
--- a/unsupported/benchmarks/Tensor/bench_reverse.cpp
+++ b/unsupported/benchmarks/Tensor/bench_reverse.cpp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #include <benchmark/benchmark.h>
-#include <unsupported/Eigen/CXX11/Tensor>
+#include <unsupported/Eigen/Tensor>
 
 using namespace Eigen;
 
diff --git a/unsupported/benchmarks/Tensor/bench_roll.cpp b/unsupported/benchmarks/Tensor/bench_roll.cpp
index 0205382..8ebc0cf 100644
--- a/unsupported/benchmarks/Tensor/bench_roll.cpp
+++ b/unsupported/benchmarks/Tensor/bench_roll.cpp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #include <benchmark/benchmark.h>
-#include <unsupported/Eigen/CXX11/Tensor>
+#include <unsupported/Eigen/Tensor>
 
 using namespace Eigen;
 
diff --git a/unsupported/benchmarks/Tensor/bench_shuffling.cpp b/unsupported/benchmarks/Tensor/bench_shuffling.cpp
index f10ff9c..3f5f31e 100644
--- a/unsupported/benchmarks/Tensor/bench_shuffling.cpp
+++ b/unsupported/benchmarks/Tensor/bench_shuffling.cpp
@@ -5,8 +5,8 @@
 #define EIGEN_USE_THREADS
 
 #include <benchmark/benchmark.h>
-#include <unsupported/Eigen/CXX11/Tensor>
-#include <unsupported/Eigen/CXX11/ThreadPool>
+#include <unsupported/Eigen/Tensor>
+#include <unsupported/Eigen/ThreadPool>
 
 using namespace Eigen;
 
diff --git a/unsupported/benchmarks/Tensor/bench_tensor_fft.cpp b/unsupported/benchmarks/Tensor/bench_tensor_fft.cpp
index cfd69d2..6f4d5fb 100644
--- a/unsupported/benchmarks/Tensor/bench_tensor_fft.cpp
+++ b/unsupported/benchmarks/Tensor/bench_tensor_fft.cpp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #include <benchmark/benchmark.h>
-#include <unsupported/Eigen/CXX11/Tensor>
+#include <unsupported/Eigen/Tensor>
 
 using namespace Eigen;
 
diff --git a/unsupported/test/CMakeLists.txt b/unsupported/test/CMakeLists.txt
index 93b8fe3..7d2f3fc 100644
--- a/unsupported/test/CMakeLists.txt
+++ b/unsupported/test/CMakeLists.txt
@@ -81,11 +81,9 @@
 
 find_path(POCKETFFT  pocketfft_hdronly.h)
 if(POCKETFFT)
-  if(EIGEN_TEST_CXX11)
-    ei_add_property(EIGEN_TESTED_BACKENDS "pocketfft, ")
-    include_directories( ${POCKETFFT} )
-    ei_add_test(pocketfft "-pthread" "${CMAKE_THREAD_LIBS_INIT}" )
-  endif()
+  ei_add_property(EIGEN_TESTED_BACKENDS "pocketfft, ")
+  include_directories( ${POCKETFFT} )
+  ei_add_test(pocketfft "-pthread" "${CMAKE_THREAD_LIBS_INIT}" )
 else()
   ei_add_property(EIGEN_MISSING_BACKENDS "pocketfft, ")
 endif()
diff --git a/unsupported/test/autodiff.cpp b/unsupported/test/autodiff.cpp
index da91de6..74b1266 100644
--- a/unsupported/test/autodiff.cpp
+++ b/unsupported/test/autodiff.cpp
@@ -134,7 +134,7 @@
 };
 
 template <typename Func>
-void forward_jacobian_cpp11(const Func& f) {
+void forward_jacobian_with_scalar_arg(const Func& f) {
   typedef typename Func::ValueType::Scalar Scalar;
   typedef typename Func::ValueType ValueType;
   typedef typename Func::InputType InputType;
@@ -217,7 +217,7 @@
   CALL_SUBTEST((forward_jacobian(TestFunc1<double, 3, 2>())));
   CALL_SUBTEST((forward_jacobian(TestFunc1<double, 3, 3>())));
   CALL_SUBTEST((forward_jacobian(TestFunc1<double>(3, 3))));
-  CALL_SUBTEST((forward_jacobian_cpp11(integratorFunctor<double>(10))));
+  CALL_SUBTEST((forward_jacobian_with_scalar_arg(integratorFunctor<double>(10))));
 }
 
 template <int>
diff --git a/unsupported/test/fft_test_shared.h b/unsupported/test/fft_test_shared.h
index 21f6167..bceb4e6 100644
--- a/unsupported/test/fft_test_shared.h
+++ b/unsupported/test/fft_test_shared.h
@@ -8,6 +8,9 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
+#ifndef EIGEN_UNSUPPORTED_TEST_FFT_TEST_SHARED_H
+#define EIGEN_UNSUPPORTED_TEST_FFT_TEST_SHARED_H
+
 #include "main.h"
 #include <unsupported/Eigen/FFT>
 
@@ -310,3 +313,5 @@
   CALL_SUBTEST((test_complex2d<double, 60, 24>()));
 #endif
 }
+
+#endif  // EIGEN_UNSUPPORTED_TEST_FFT_TEST_SHARED_H
diff --git a/unsupported/test/matrix_functions.h b/unsupported/test/matrix_functions.h
index deb069f..b744b31 100644
--- a/unsupported/test/matrix_functions.h
+++ b/unsupported/test/matrix_functions.h
@@ -8,6 +8,9 @@
 // with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // SPDX-License-Identifier: MPL-2.0
 
+#ifndef EIGEN_UNSUPPORTED_TEST_MATRIX_FUNCTIONS_H
+#define EIGEN_UNSUPPORTED_TEST_MATRIX_FUNCTIONS_H
+
 #include "main.h"
 #include <unsupported/Eigen/MatrixFunctions>
 
@@ -79,3 +82,5 @@
 typename Derived::RealScalar relerr(const MatrixBase<Derived>& A, const MatrixBase<OtherDerived>& B) {
   return std::sqrt((A - B).cwiseAbs2().sum() / (std::min)(A.cwiseAbs2().sum(), B.cwiseAbs2().sum()));
 }
+
+#endif  // EIGEN_UNSUPPORTED_TEST_MATRIX_FUNCTIONS_H