diff --git a/Eigen/Core b/Eigen/Core
index 264398139..e0da49907 100644
--- a/Eigen/Core
+++ b/Eigen/Core
@@ -258,10 +258,9 @@ using std::ptrdiff_t;
 #include "src/Core/functors/StlFunctors.h"
 #include "src/Core/functors/AssignmentFunctors.h"
 
-// Specialized functors to enable the processing of complex numbers
-// on CUDA devices
-#ifdef EIGEN_CUDACC
-#include "src/Core/arch/CUDA/Complex.h"
+// Specialized functors for GPU.
+#ifdef EIGEN_GPUCC
+#include "src/Core/arch/GPU/Complex.h"
 #endif
 
 #include "src/Core/util/IndexedViewHelper.h"
diff --git a/Eigen/src/Core/arch/CUDA/Complex.h b/Eigen/src/Core/arch/GPU/Complex.h
similarity index 98%
rename from Eigen/src/Core/arch/CUDA/Complex.h
rename to Eigen/src/Core/arch/GPU/Complex.h
index 425e6c2b5..c2b4c38c7 100644
--- a/Eigen/src/Core/arch/CUDA/Complex.h
+++ b/Eigen/src/Core/arch/GPU/Complex.h
@@ -8,8 +8,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_COMPLEX_CUDA_H
-#define EIGEN_COMPLEX_CUDA_H
+#ifndef EIGEN_COMPLEX_GPU_H
+#define EIGEN_COMPLEX_GPU_H
 
 // Many std::complex methods such as operator+, operator-, operator* and
 // operator/ are not constexpr. Due to this, GCC and older versions of clang do
@@ -30,7 +30,7 @@
 //  - Compiling with ICC requires defining _USE_COMPLEX_SPECIALIZATION_ prior
 //    to the first inclusion of <complex>.
 
-#if defined(EIGEN_CUDACC) && defined(EIGEN_GPU_COMPILE_PHASE)
+#if defined(EIGEN_GPUCC) && defined(EIGEN_GPU_COMPILE_PHASE)
     
 // ICC already specializes std::complex<float> and std::complex<double>
 // operators, preventing us from making them device functions here.
@@ -266,6 +266,6 @@ EIGEN_USING_STD_COMPLEX_OPERATORS
 
 #endif  // !(EIGEN_COMP_ICC && _USE_COMPLEX_SPECIALIZATION_)
 
-#endif  // EIGEN_CUDACC && EIGEN_GPU_COMPILE_PHASE
+#endif  // EIGEN_GPUCC && EIGEN_GPU_COMPILE_PHASE
 
-#endif  // EIGEN_COMPLEX_CUDA_H
+#endif  // EIGEN_COMPLEX_GPU_H
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorReductionCuda.h b/unsupported/Eigen/CXX11/src/Tensor/TensorReductionCuda.h
deleted file mode 100644
index 68780cd3c..000000000
--- a/unsupported/Eigen/CXX11/src/Tensor/TensorReductionCuda.h
+++ /dev/null
@@ -1,6 +0,0 @@
-
-#if defined(__clang__) || defined(__GNUC__)
-#warning "Deprecated header file, please either include the main Eigen/CXX11/Tensor header or the respective TensorReductionGpu.h file"
-#endif
-
-#include "TensorReductionGpu.h"