diff --git a/modules/core/include/opencv2/core/gpu.hpp b/modules/core/include/opencv2/core/cuda.hpp
similarity index 99%
rename from modules/core/include/opencv2/core/gpu.hpp
rename to modules/core/include/opencv2/core/cuda.hpp
index 9f7636ec7..684005fe2 100644
--- a/modules/core/include/opencv2/core/gpu.hpp
+++ b/modules/core/include/opencv2/core/cuda.hpp
@@ -45,11 +45,11 @@
 #define __OPENCV_CORE_GPU_HPP__
 
 #ifndef __cplusplus
-#  error gpu.hpp header must be compiled as C++
+#  error cuda.hpp header must be compiled as C++
 #endif
 
 #include "opencv2/core.hpp"
-#include "opencv2/core/gpu_types.hpp"
+#include "opencv2/core/cuda_types.hpp"
 
 namespace cv { namespace cuda {
 
@@ -673,6 +673,6 @@ template <> CV_EXPORTS void Ptr<cv::cuda::Event::Impl>::delete_obj();
 
 }
 
-#include "opencv2/core/gpu.inl.hpp"
+#include "opencv2/core/cuda.inl.hpp"
 
 #endif /* __OPENCV_CORE_GPU_HPP__ */
diff --git a/modules/core/include/opencv2/core/gpu.inl.hpp b/modules/core/include/opencv2/core/cuda.inl.hpp
similarity index 99%
rename from modules/core/include/opencv2/core/gpu.inl.hpp
rename to modules/core/include/opencv2/core/cuda.inl.hpp
index 599b0c2ae..c2455a61e 100644
--- a/modules/core/include/opencv2/core/gpu.inl.hpp
+++ b/modules/core/include/opencv2/core/cuda.inl.hpp
@@ -44,7 +44,7 @@
 #ifndef __OPENCV_CORE_GPUINL_HPP__
 #define __OPENCV_CORE_GPUINL_HPP__
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 
 namespace cv { namespace cuda {
 
diff --git a/modules/core/include/opencv2/core/cuda/common.hpp b/modules/core/include/opencv2/core/cuda/common.hpp
index 780dd99b5..fa53392ae 100644
--- a/modules/core/include/opencv2/core/cuda/common.hpp
+++ b/modules/core/include/opencv2/core/cuda/common.hpp
@@ -44,7 +44,7 @@
 #define __OPENCV_GPU_COMMON_HPP__
 
 #include <cuda_runtime.h>
-#include "opencv2/core/gpu_types.hpp"
+#include "opencv2/core/cuda_types.hpp"
 #include "opencv2/core/cvdef.h"
 #include "opencv2/core/base.hpp"
 
diff --git a/modules/core/include/opencv2/core/gpu_stream_accessor.hpp b/modules/core/include/opencv2/core/cuda_stream_accessor.hpp
similarity index 97%
rename from modules/core/include/opencv2/core/gpu_stream_accessor.hpp
rename to modules/core/include/opencv2/core/cuda_stream_accessor.hpp
index 42d510add..baf693094 100644
--- a/modules/core/include/opencv2/core/gpu_stream_accessor.hpp
+++ b/modules/core/include/opencv2/core/cuda_stream_accessor.hpp
@@ -44,7 +44,7 @@
 #define __OPENCV_CORE_GPU_STREAM_ACCESSOR_HPP__
 
 #ifndef __cplusplus
-#  error gpu_stream_accessor.hpp header must be compiled as C++
+#  error cuda_stream_accessor.hpp header must be compiled as C++
 #endif
 
 // This is only header file that depends on Cuda. All other headers are independent.
diff --git a/modules/core/include/opencv2/core/gpu_types.hpp b/modules/core/include/opencv2/core/cuda_types.hpp
similarity index 98%
rename from modules/core/include/opencv2/core/gpu_types.hpp
rename to modules/core/include/opencv2/core/cuda_types.hpp
index 9f2a4697a..06c3f1917 100644
--- a/modules/core/include/opencv2/core/gpu_types.hpp
+++ b/modules/core/include/opencv2/core/cuda_types.hpp
@@ -44,7 +44,7 @@
 #define __OPENCV_CORE_GPU_TYPES_HPP__
 
 #ifndef __cplusplus
-#  error gpu_types.hpp header must be compiled as C++
+#  error cuda_types.hpp header must be compiled as C++
 #endif
 
 #ifdef __CUDACC__
diff --git a/modules/core/include/opencv2/core/private.gpu.hpp b/modules/core/include/opencv2/core/private.cuda.hpp
similarity index 98%
rename from modules/core/include/opencv2/core/private.gpu.hpp
rename to modules/core/include/opencv2/core/private.cuda.hpp
index 70279bb02..6fa0cec13 100644
--- a/modules/core/include/opencv2/core/private.gpu.hpp
+++ b/modules/core/include/opencv2/core/private.cuda.hpp
@@ -53,13 +53,13 @@
 #include "opencv2/core/cvdef.h"
 #include "opencv2/core/base.hpp"
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 
 #ifdef HAVE_CUDA
 #  include <cuda.h>
 #  include <cuda_runtime.h>
 #  include <npp.h>
-#  include "opencv2/core/gpu_stream_accessor.hpp"
+#  include "opencv2/core/cuda_stream_accessor.hpp"
 #  include "opencv2/core/cuda/common.hpp"
 
 #  define NPP_VERSION (NPP_VERSION_MAJOR * 1000 + NPP_VERSION_MINOR * 100 + NPP_VERSION_BUILD)
diff --git a/modules/core/src/cuda/gpu_mat.cu b/modules/core/src/cuda/gpu_mat.cu
index 5944c3897..d9332b733 100644
--- a/modules/core/src/cuda/gpu_mat.cu
+++ b/modules/core/src/cuda/gpu_mat.cu
@@ -48,7 +48,7 @@
 
 #else
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/cudev.hpp"
 
 using namespace cv;
diff --git a/modules/core/src/gpu_mat.cpp b/modules/core/src/cuda_gpu_mat.cpp
similarity index 100%
rename from modules/core/src/gpu_mat.cpp
rename to modules/core/src/cuda_gpu_mat.cpp
diff --git a/modules/core/src/gpu_cuda_mem.cpp b/modules/core/src/cuda_host_mem.cpp
similarity index 100%
rename from modules/core/src/gpu_cuda_mem.cpp
rename to modules/core/src/cuda_host_mem.cpp
diff --git a/modules/core/src/gpu_info.cpp b/modules/core/src/cuda_info.cpp
similarity index 100%
rename from modules/core/src/gpu_info.cpp
rename to modules/core/src/cuda_info.cpp
diff --git a/modules/core/src/gpu_stream.cpp b/modules/core/src/cuda_stream.cpp
similarity index 100%
rename from modules/core/src/gpu_stream.cpp
rename to modules/core/src/cuda_stream.cpp
diff --git a/modules/core/src/precomp.hpp b/modules/core/src/precomp.hpp
index 1a59f6e7b..5a022af79 100644
--- a/modules/core/src/precomp.hpp
+++ b/modules/core/src/precomp.hpp
@@ -45,11 +45,11 @@
 
 #include "opencv2/core/utility.hpp"
 #include "opencv2/core/core_c.h"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/core/opengl.hpp"
 
 #include "opencv2/core/private.hpp"
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #include <assert.h>
 #include <ctype.h>
diff --git a/modules/cudev/include/opencv2/cudev/common.hpp b/modules/cudev/include/opencv2/cudev/common.hpp
index ce2048ced..ee2909a5a 100644
--- a/modules/cudev/include/opencv2/cudev/common.hpp
+++ b/modules/cudev/include/opencv2/cudev/common.hpp
@@ -47,8 +47,8 @@
 #define __OPENCV_CUDEV_COMMON_HPP__
 
 #include <cuda_runtime.h>
-#include "opencv2/core/gpu.hpp"
-#include "opencv2/core/gpu_stream_accessor.hpp"
+#include "opencv2/core/cuda.hpp"
+#include "opencv2/core/cuda_stream_accessor.hpp"
 
 namespace cv { namespace cudev {
 
diff --git a/modules/gpu/include/opencv2/gpu.hpp b/modules/gpu/include/opencv2/gpu.hpp
index 0b58825dc..acbca8a9e 100644
--- a/modules/gpu/include/opencv2/gpu.hpp
+++ b/modules/gpu/include/opencv2/gpu.hpp
@@ -44,10 +44,10 @@
 #define __OPENCV_GPU_HPP__
 
 #ifndef __cplusplus
-#  error gpu.hpp header must be compiled as C++
+#  error cuda.hpp header must be compiled as C++
 #endif
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 
 namespace cv { namespace cuda {
 
diff --git a/modules/gpu/src/precomp.hpp b/modules/gpu/src/precomp.hpp
index cfd136aa3..19a4d4ed3 100644
--- a/modules/gpu/src/precomp.hpp
+++ b/modules/gpu/src/precomp.hpp
@@ -49,7 +49,7 @@
 #include "opencv2/calib3d.hpp"
 #include "opencv2/objdetect.hpp"
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 
diff --git a/modules/gpuarithm/include/opencv2/gpuarithm.hpp b/modules/gpuarithm/include/opencv2/gpuarithm.hpp
index 33a3f16af..b45ce9e82 100644
--- a/modules/gpuarithm/include/opencv2/gpuarithm.hpp
+++ b/modules/gpuarithm/include/opencv2/gpuarithm.hpp
@@ -47,7 +47,7 @@
 #  error gpuarithm.hpp header must be compiled as C++
 #endif
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 
 namespace cv { namespace cuda {
 
diff --git a/modules/gpuarithm/src/precomp.hpp b/modules/gpuarithm/src/precomp.hpp
index 6aab36a71..153a9a5f9 100644
--- a/modules/gpuarithm/src/precomp.hpp
+++ b/modules/gpuarithm/src/precomp.hpp
@@ -50,7 +50,7 @@
 #include "opencv2/gpuarithm.hpp"
 #include "opencv2/core/utility.hpp"
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 
diff --git a/modules/gpubgsegm/include/opencv2/gpubgsegm.hpp b/modules/gpubgsegm/include/opencv2/gpubgsegm.hpp
index 451ba4ecb..703eedd12 100644
--- a/modules/gpubgsegm/include/opencv2/gpubgsegm.hpp
+++ b/modules/gpubgsegm/include/opencv2/gpubgsegm.hpp
@@ -47,7 +47,7 @@
 #  error gpubgsegm.hpp header must be compiled as C++
 #endif
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/video/background_segm.hpp"
 
 namespace cv { namespace cuda {
diff --git a/modules/gpubgsegm/src/cuda/fgd.hpp b/modules/gpubgsegm/src/cuda/fgd.hpp
index 07b9135de..2cfab6e40 100644
--- a/modules/gpubgsegm/src/cuda/fgd.hpp
+++ b/modules/gpubgsegm/src/cuda/fgd.hpp
@@ -43,7 +43,7 @@
 #ifndef __FGD_BGFG_COMMON_HPP__
 #define __FGD_BGFG_COMMON_HPP__
 
-#include "opencv2/core/gpu_types.hpp"
+#include "opencv2/core/cuda_types.hpp"
 
 namespace fgd
 {
diff --git a/modules/gpubgsegm/src/precomp.hpp b/modules/gpubgsegm/src/precomp.hpp
index c61cc08bb..d65ba9f29 100644
--- a/modules/gpubgsegm/src/precomp.hpp
+++ b/modules/gpubgsegm/src/precomp.hpp
@@ -47,7 +47,7 @@
 
 #include "opencv2/gpubgsegm.hpp"
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 
diff --git a/modules/gpucodec/include/opencv2/gpucodec.hpp b/modules/gpucodec/include/opencv2/gpucodec.hpp
index 0439487c5..51b5161f2 100644
--- a/modules/gpucodec/include/opencv2/gpucodec.hpp
+++ b/modules/gpucodec/include/opencv2/gpucodec.hpp
@@ -48,7 +48,7 @@
 #  error gpucodec.hpp header must be compiled as C++
 #endif
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 
 namespace cv { namespace cudacodec {
 
diff --git a/modules/gpucodec/src/cuvid_video_source.hpp b/modules/gpucodec/src/cuvid_video_source.hpp
index 65f5526bf..ba2f3de44 100644
--- a/modules/gpucodec/src/cuvid_video_source.hpp
+++ b/modules/gpucodec/src/cuvid_video_source.hpp
@@ -46,7 +46,7 @@
 
 #include <nvcuvid.h>
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 #include "opencv2/gpucodec.hpp"
 #include "video_source.hpp"
 
diff --git a/modules/gpucodec/src/frame_queue.hpp b/modules/gpucodec/src/frame_queue.hpp
index 92c88323e..1ed7e039c 100644
--- a/modules/gpucodec/src/frame_queue.hpp
+++ b/modules/gpucodec/src/frame_queue.hpp
@@ -45,7 +45,7 @@
 #define __FRAME_QUEUE_HPP__
 
 #include "opencv2/core/utility.hpp"
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #include <nvcuvid.h>
 
diff --git a/modules/gpucodec/src/precomp.hpp b/modules/gpucodec/src/precomp.hpp
index 7cef1b7a9..694637eb9 100644
--- a/modules/gpucodec/src/precomp.hpp
+++ b/modules/gpucodec/src/precomp.hpp
@@ -53,7 +53,7 @@
 
 #include "opencv2/gpucodec.hpp"
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #ifdef HAVE_NVCUVID
     #include <nvcuvid.h>
diff --git a/modules/gpucodec/src/video_decoder.hpp b/modules/gpucodec/src/video_decoder.hpp
index 90fa50016..297b3323b 100644
--- a/modules/gpucodec/src/video_decoder.hpp
+++ b/modules/gpucodec/src/video_decoder.hpp
@@ -46,7 +46,7 @@
 
 #include <nvcuvid.h>
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 #include "opencv2/gpucodec.hpp"
 
 namespace cv { namespace cudacodec { namespace detail
diff --git a/modules/gpucodec/src/video_parser.hpp b/modules/gpucodec/src/video_parser.hpp
index 96526ea86..5615cc962 100644
--- a/modules/gpucodec/src/video_parser.hpp
+++ b/modules/gpucodec/src/video_parser.hpp
@@ -46,7 +46,7 @@
 
 #include <nvcuvid.h>
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 #include "opencv2/gpucodec.hpp"
 #include "frame_queue.hpp"
 #include "video_decoder.hpp"
diff --git a/modules/gpucodec/src/video_source.hpp b/modules/gpucodec/src/video_source.hpp
index 802424e42..e56c81242 100644
--- a/modules/gpucodec/src/video_source.hpp
+++ b/modules/gpucodec/src/video_source.hpp
@@ -44,7 +44,7 @@
 #ifndef __GPUCODEC_VIDEO_SOURCE_H__
 #define __GPUCODEC_VIDEO_SOURCE_H__
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 #include "opencv2/gpucodec.hpp"
 #include "thread.hpp"
 
diff --git a/modules/gpufeatures2d/include/opencv2/gpufeatures2d.hpp b/modules/gpufeatures2d/include/opencv2/gpufeatures2d.hpp
index fe20be63a..f8377e136 100644
--- a/modules/gpufeatures2d/include/opencv2/gpufeatures2d.hpp
+++ b/modules/gpufeatures2d/include/opencv2/gpufeatures2d.hpp
@@ -47,7 +47,7 @@
 #  error gpufeatures2d.hpp header must be compiled as C++
 #endif
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/gpufilters.hpp"
 
 namespace cv { namespace cuda {
diff --git a/modules/gpufeatures2d/src/precomp.hpp b/modules/gpufeatures2d/src/precomp.hpp
index 33c5aa7d3..a11387c03 100644
--- a/modules/gpufeatures2d/src/precomp.hpp
+++ b/modules/gpufeatures2d/src/precomp.hpp
@@ -52,6 +52,6 @@
 #include "opencv2/gpuwarping.hpp"
 #include "opencv2/features2d.hpp"
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #endif /* __OPENCV_PRECOMP_H__ */
diff --git a/modules/gpufilters/include/opencv2/gpufilters.hpp b/modules/gpufilters/include/opencv2/gpufilters.hpp
index 6d1b89d0e..0b54be31b 100644
--- a/modules/gpufilters/include/opencv2/gpufilters.hpp
+++ b/modules/gpufilters/include/opencv2/gpufilters.hpp
@@ -47,7 +47,7 @@
 #  error gpufilters.hpp header must be compiled as C++
 #endif
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/imgproc.hpp"
 
 namespace cv { namespace cuda {
diff --git a/modules/gpufilters/src/precomp.hpp b/modules/gpufilters/src/precomp.hpp
index c3d5e020d..5853481cf 100644
--- a/modules/gpufilters/src/precomp.hpp
+++ b/modules/gpufilters/src/precomp.hpp
@@ -49,6 +49,6 @@
 #include "opencv2/gpuarithm.hpp"
 #include "opencv2/imgproc.hpp"
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #endif /* __OPENCV_PRECOMP_H__ */
diff --git a/modules/gpuimgproc/include/opencv2/gpuimgproc.hpp b/modules/gpuimgproc/include/opencv2/gpuimgproc.hpp
index edeb8a53d..b5bb2b196 100644
--- a/modules/gpuimgproc/include/opencv2/gpuimgproc.hpp
+++ b/modules/gpuimgproc/include/opencv2/gpuimgproc.hpp
@@ -47,7 +47,7 @@
 #  error gpuimgproc.hpp header must be compiled as C++
 #endif
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/imgproc.hpp"
 
 namespace cv { namespace cuda {
diff --git a/modules/gpuimgproc/src/precomp.hpp b/modules/gpuimgproc/src/precomp.hpp
index b1edbf123..1fd1c84e8 100644
--- a/modules/gpuimgproc/src/precomp.hpp
+++ b/modules/gpuimgproc/src/precomp.hpp
@@ -47,7 +47,7 @@
 
 #include "opencv2/core/utility.hpp"
 #include "opencv2/core/private.hpp"
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 
diff --git a/modules/gpulegacy/include/opencv2/gpulegacy/private.hpp b/modules/gpulegacy/include/opencv2/gpulegacy/private.hpp
index 5a7d5331d..dd1c00252 100644
--- a/modules/gpulegacy/include/opencv2/gpulegacy/private.hpp
+++ b/modules/gpulegacy/include/opencv2/gpulegacy/private.hpp
@@ -48,7 +48,7 @@
 #  error this is a private header which should not be used from outside of the OpenCV library
 #endif
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #ifndef HAVE_CUDA
 #  error gpulegacy module requires CUDA
diff --git a/modules/gpulegacy/src/precomp.hpp b/modules/gpulegacy/src/precomp.hpp
index 85e6f88e7..9979af8b0 100644
--- a/modules/gpulegacy/src/precomp.hpp
+++ b/modules/gpulegacy/src/precomp.hpp
@@ -56,7 +56,7 @@
 #  include "opencv2/objdetect.hpp"
 #endif
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 #include "opencv2/gpulegacy/private.hpp"
 
 #endif /* __OPENCV_PRECOMP_H__ */
diff --git a/modules/gpulegacy/test/test_precomp.hpp b/modules/gpulegacy/test/test_precomp.hpp
index e1f2d5def..197e79ad5 100644
--- a/modules/gpulegacy/test/test_precomp.hpp
+++ b/modules/gpulegacy/test/test_precomp.hpp
@@ -68,11 +68,11 @@
 #include "opencv2/ts.hpp"
 #include "opencv2/ts/gpu_test.hpp"
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/gpulegacy.hpp"
 #include "opencv2/highgui.hpp"
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #include "cvconfig.h"
 
diff --git a/modules/gpuoptflow/include/opencv2/gpuoptflow.hpp b/modules/gpuoptflow/include/opencv2/gpuoptflow.hpp
index 0921751f2..153bddee7 100644
--- a/modules/gpuoptflow/include/opencv2/gpuoptflow.hpp
+++ b/modules/gpuoptflow/include/opencv2/gpuoptflow.hpp
@@ -47,7 +47,7 @@
 #  error gpuoptflow.hpp header must be compiled as C++
 #endif
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 
 namespace cv { namespace cuda {
 
diff --git a/modules/gpuoptflow/src/precomp.hpp b/modules/gpuoptflow/src/precomp.hpp
index 8a52a9ae9..ce9234a5c 100644
--- a/modules/gpuoptflow/src/precomp.hpp
+++ b/modules/gpuoptflow/src/precomp.hpp
@@ -51,7 +51,7 @@
 #include "opencv2/gpuimgproc.hpp"
 #include "opencv2/video.hpp"
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 
diff --git a/modules/gpustereo/include/opencv2/gpustereo.hpp b/modules/gpustereo/include/opencv2/gpustereo.hpp
index 23e43b176..be0332ea1 100644
--- a/modules/gpustereo/include/opencv2/gpustereo.hpp
+++ b/modules/gpustereo/include/opencv2/gpustereo.hpp
@@ -47,7 +47,7 @@
 #  error gpustereo.hpp header must be compiled as C++
 #endif
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/calib3d.hpp"
 
 namespace cv { namespace cuda {
diff --git a/modules/gpustereo/src/precomp.hpp b/modules/gpustereo/src/precomp.hpp
index 934da9fd2..70dd63777 100644
--- a/modules/gpustereo/src/precomp.hpp
+++ b/modules/gpustereo/src/precomp.hpp
@@ -47,7 +47,7 @@
 
 #include "opencv2/gpustereo.hpp"
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 #include "opencv2/core/utility.hpp"
 
 #endif /* __OPENCV_PRECOMP_H__ */
diff --git a/modules/gpuwarping/include/opencv2/gpuwarping.hpp b/modules/gpuwarping/include/opencv2/gpuwarping.hpp
index 80346ab42..6b5ab0330 100644
--- a/modules/gpuwarping/include/opencv2/gpuwarping.hpp
+++ b/modules/gpuwarping/include/opencv2/gpuwarping.hpp
@@ -47,7 +47,7 @@
 #  error gpuwarping.hpp header must be compiled as C++
 #endif
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/imgproc.hpp"
 
 namespace cv { namespace cuda {
diff --git a/modules/gpuwarping/src/precomp.hpp b/modules/gpuwarping/src/precomp.hpp
index e19853712..78b8fd295 100644
--- a/modules/gpuwarping/src/precomp.hpp
+++ b/modules/gpuwarping/src/precomp.hpp
@@ -45,7 +45,7 @@
 
 #include "opencv2/gpuwarping.hpp"
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 
diff --git a/modules/nonfree/include/opencv2/nonfree/gpu.hpp b/modules/nonfree/include/opencv2/nonfree/gpu.hpp
index c900fc3ea..3853632bc 100644
--- a/modules/nonfree/include/opencv2/nonfree/gpu.hpp
+++ b/modules/nonfree/include/opencv2/nonfree/gpu.hpp
@@ -43,7 +43,7 @@
 #ifndef __OPENCV_NONFREE_GPU_HPP__
 #define __OPENCV_NONFREE_GPU_HPP__
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 
 namespace cv { namespace cuda {
 
diff --git a/modules/nonfree/src/precomp.hpp b/modules/nonfree/src/precomp.hpp
index 7563be228..3fb85a730 100644
--- a/modules/nonfree/src/precomp.hpp
+++ b/modules/nonfree/src/precomp.hpp
@@ -50,7 +50,7 @@
 #include "opencv2/core/private.hpp"
 
 #include "opencv2/nonfree/gpu.hpp"
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 
diff --git a/modules/photo/include/opencv2/photo/gpu.hpp b/modules/photo/include/opencv2/photo/gpu.hpp
index 596b4b609..942eca74f 100644
--- a/modules/photo/include/opencv2/photo/gpu.hpp
+++ b/modules/photo/include/opencv2/photo/gpu.hpp
@@ -43,7 +43,7 @@
 #ifndef __OPENCV_PHOTO_GPU_HPP__
 #define __OPENCV_PHOTO_GPU_HPP__
 
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 
 namespace cv { namespace cuda {
 
diff --git a/modules/photo/src/denoising_gpu.cpp b/modules/photo/src/denoising_gpu.cpp
index 2fb0d6d67..b12e967be 100644
--- a/modules/photo/src/denoising_gpu.cpp
+++ b/modules/photo/src/denoising_gpu.cpp
@@ -43,7 +43,7 @@
 #include "precomp.hpp"
 
 #include "opencv2/photo/gpu.hpp"
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 
diff --git a/modules/softcascade/include/opencv2/softcascade.hpp b/modules/softcascade/include/opencv2/softcascade.hpp
index 0270080c8..ab7fbf407 100644
--- a/modules/softcascade/include/opencv2/softcascade.hpp
+++ b/modules/softcascade/include/opencv2/softcascade.hpp
@@ -46,7 +46,7 @@
 #include <iosfwd>
 
 #include "opencv2/core.hpp"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 
 namespace cv { namespace softcascade {
 
diff --git a/modules/softcascade/src/cuda/channels.cu b/modules/softcascade/src/cuda/channels.cu
index 2e6053604..894b15bbc 100644
--- a/modules/softcascade/src/cuda/channels.cu
+++ b/modules/softcascade/src/cuda/channels.cu
@@ -40,7 +40,7 @@
 //
 //M*/
 
-#include "opencv2/core/gpu_types.hpp"
+#include "opencv2/core/cuda_types.hpp"
 #include "opencv2/core/cuda/common.hpp"
 
 namespace cv { namespace softcascade { namespace cudev
diff --git a/modules/softcascade/src/cuda_invoker.hpp b/modules/softcascade/src/cuda_invoker.hpp
index bd478ee28..00b7fe4b9 100644
--- a/modules/softcascade/src/cuda_invoker.hpp
+++ b/modules/softcascade/src/cuda_invoker.hpp
@@ -44,7 +44,7 @@
 #ifndef __OPENCV_ICF_HPP__
 #define __OPENCV_ICF_HPP__
 
-#include "opencv2/core/gpu_types.hpp"
+#include "opencv2/core/cuda_types.hpp"
 #include "cuda_runtime_api.h"
 
 #if defined __CUDACC__
diff --git a/modules/softcascade/src/precomp.hpp b/modules/softcascade/src/precomp.hpp
index 83ba65b4b..ec5011ba8 100644
--- a/modules/softcascade/src/precomp.hpp
+++ b/modules/softcascade/src/precomp.hpp
@@ -49,7 +49,7 @@
 #include "opencv2/imgproc.hpp"
 
 #include "opencv2/core/private.hpp"
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 namespace cv { namespace softcascade { namespace internal
 {
diff --git a/modules/softcascade/test/test_cuda_softcascade.cpp b/modules/softcascade/test/test_cuda_softcascade.cpp
index 548d7a575..9aa5f8a4c 100644
--- a/modules/softcascade/test/test_cuda_softcascade.cpp
+++ b/modules/softcascade/test/test_cuda_softcascade.cpp
@@ -41,7 +41,7 @@
 //M*/
 
 #include "test_precomp.hpp"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 
 
 #ifdef HAVE_CUDA
diff --git a/modules/softcascade/test/utility.hpp b/modules/softcascade/test/utility.hpp
index f4fc9e80c..896adc4a8 100644
--- a/modules/softcascade/test/utility.hpp
+++ b/modules/softcascade/test/utility.hpp
@@ -43,7 +43,7 @@
 #define __OPENCV_SOFTCASCADE_TEST_UTILITY_HPP__
 
 #include "opencv2/core.hpp"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/ts.hpp"
 
 //////////////////////////////////////////////////////////////////////
diff --git a/modules/stitching/include/opencv2/stitching/detail/warpers.hpp b/modules/stitching/include/opencv2/stitching/detail/warpers.hpp
index ff7d7a29b..b55d20637 100644
--- a/modules/stitching/include/opencv2/stitching/detail/warpers.hpp
+++ b/modules/stitching/include/opencv2/stitching/detail/warpers.hpp
@@ -44,7 +44,7 @@
 #define __OPENCV_STITCHING_WARPERS_HPP__
 
 #include "opencv2/core.hpp"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/opencv_modules.hpp"
 
diff --git a/modules/superres/perf/perf_precomp.hpp b/modules/superres/perf/perf_precomp.hpp
index 72236c4ba..a6899e9d7 100644
--- a/modules/superres/perf/perf_precomp.hpp
+++ b/modules/superres/perf/perf_precomp.hpp
@@ -52,7 +52,7 @@
 #define __OPENCV_PERF_PRECOMP_HPP__
 
 #include "opencv2/core.hpp"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/ts.hpp"
 #include "opencv2/ts/gpu_perf.hpp"
 #include "opencv2/superres.hpp"
diff --git a/modules/superres/src/input_array_utility.hpp b/modules/superres/src/input_array_utility.hpp
index 367df614e..6f17da001 100644
--- a/modules/superres/src/input_array_utility.hpp
+++ b/modules/superres/src/input_array_utility.hpp
@@ -44,7 +44,7 @@
 #define __OPENCV_SUPERRES_INPUT_ARRAY_UTILITY_HPP__
 
 #include "opencv2/core.hpp"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #ifdef HAVE_OPENCV_OCL
 #include "opencv2/ocl.hpp"
 #endif
diff --git a/modules/superres/src/precomp.hpp b/modules/superres/src/precomp.hpp
index 822d48879..89490c70c 100644
--- a/modules/superres/src/precomp.hpp
+++ b/modules/superres/src/precomp.hpp
@@ -48,14 +48,14 @@
 
 #include "opencv2/opencv_modules.hpp"
 #include "opencv2/core.hpp"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/core/opengl.hpp"
 #include "opencv2/core/utility.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/video/tracking.hpp"
 #include "opencv2/core/private.hpp"
 
-#include "opencv2/core/private.gpu.hpp"
+#include "opencv2/core/private.cuda.hpp"
 
 #ifdef HAVE_OPENCV_GPUARITHM
 #  include "opencv2/gpuarithm.hpp"
diff --git a/modules/ts/include/opencv2/ts/gpu_test.hpp b/modules/ts/include/opencv2/ts/gpu_test.hpp
index 83a94b8fb..4ee28582d 100644
--- a/modules/ts/include/opencv2/ts/gpu_test.hpp
+++ b/modules/ts/include/opencv2/ts/gpu_test.hpp
@@ -46,7 +46,7 @@
 #include <stdexcept>
 #include "cvconfig.h"
 #include "opencv2/core.hpp"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/ts.hpp"
diff --git a/modules/ts/src/gpu_perf.cpp b/modules/ts/src/gpu_perf.cpp
index 3a6fd2b1b..dbd01dcb1 100644
--- a/modules/ts/src/gpu_perf.cpp
+++ b/modules/ts/src/gpu_perf.cpp
@@ -42,7 +42,7 @@
 
 #include "precomp.hpp"
 #include "opencv2/ts/gpu_perf.hpp"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 
 #ifdef HAVE_CUDA
     #include <cuda_runtime.h>
diff --git a/modules/ts/src/ts_perf.cpp b/modules/ts/src/ts_perf.cpp
index ba9c07643..851e8b943 100644
--- a/modules/ts/src/ts_perf.cpp
+++ b/modules/ts/src/ts_perf.cpp
@@ -1,7 +1,7 @@
 #include "precomp.hpp"
 
 #ifdef HAVE_CUDA
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #endif
 
 #ifdef ANDROID
diff --git a/modules/videostab/include/opencv2/videostab/wobble_suppression.hpp b/modules/videostab/include/opencv2/videostab/wobble_suppression.hpp
index be6e782a3..b461f0cb0 100644
--- a/modules/videostab/include/opencv2/videostab/wobble_suppression.hpp
+++ b/modules/videostab/include/opencv2/videostab/wobble_suppression.hpp
@@ -45,7 +45,7 @@
 
 #include <vector>
 #include "opencv2/core.hpp"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/videostab/global_motion.hpp"
 #include "opencv2/videostab/log.hpp"
 
diff --git a/samples/gpu/cascadeclassifier_nvidia_api.cpp b/samples/gpu/cascadeclassifier_nvidia_api.cpp
index 6db03769d..e66fcec45 100644
--- a/samples/gpu/cascadeclassifier_nvidia_api.cpp
+++ b/samples/gpu/cascadeclassifier_nvidia_api.cpp
@@ -6,7 +6,7 @@
 #include <iostream>
 #include <iomanip>
 #include <cstdio>
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/gpulegacy.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/imgproc.hpp"
diff --git a/samples/gpu/opengl.cpp b/samples/gpu/opengl.cpp
index e2c83c692..eef8e1a94 100644
--- a/samples/gpu/opengl.cpp
+++ b/samples/gpu/opengl.cpp
@@ -25,7 +25,7 @@ int main()
 
 #include "opencv2/core/core.hpp"
 #include "opencv2/core/opengl.hpp"
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/highgui/highgui.hpp"
 
 using namespace std;
diff --git a/samples/gpu/opticalflow_nvidia_api.cpp b/samples/gpu/opticalflow_nvidia_api.cpp
index 39033f7bb..ebaba7614 100644
--- a/samples/gpu/opticalflow_nvidia_api.cpp
+++ b/samples/gpu/opticalflow_nvidia_api.cpp
@@ -11,7 +11,7 @@
 #include "cvconfig.h"
 #include <iostream>
 #include <iomanip>
-#include "opencv2/core/gpu.hpp"
+#include "opencv2/core/cuda.hpp"
 #include "opencv2/gpulegacy.hpp"
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/highgui/highgui_c.h"