diff --git a/modules/core/include/opencv2/core/gpu_private.hpp b/modules/core/include/opencv2/core/private.gpu.hpp
similarity index 98%
rename from modules/core/include/opencv2/core/gpu_private.hpp
rename to modules/core/include/opencv2/core/private.gpu.hpp
index cacc194b93..d26cd0017f 100644
--- a/modules/core/include/opencv2/core/gpu_private.hpp
+++ b/modules/core/include/opencv2/core/private.gpu.hpp
@@ -41,8 +41,8 @@
 //
 //M*/
 
-#ifndef __OPENCV_CORE_GPU_PRIVATE_HPP__
-#define __OPENCV_CORE_GPU_PRIVATE_HPP__
+#ifndef __OPENCV_CORE_PRIVATE_GPU_HPP__
+#define __OPENCV_CORE_PRIVATE_GPU_HPP__
 
 #ifndef __OPENCV_BUILD
 #  error this is a private header which should not be used from outside of the OpenCV library
diff --git a/modules/core/src/precomp.hpp b/modules/core/src/precomp.hpp
index f86f466f22..1a59f6e7bd 100644
--- a/modules/core/src/precomp.hpp
+++ b/modules/core/src/precomp.hpp
@@ -49,7 +49,7 @@
 #include "opencv2/core/opengl.hpp"
 
 #include "opencv2/core/private.hpp"
-#include "opencv2/core/gpu_private.hpp"
+#include "opencv2/core/private.gpu.hpp"
 
 #include <assert.h>
 #include <ctype.h>
diff --git a/modules/gpu/src/precomp.hpp b/modules/gpu/src/precomp.hpp
index ceb560f932..cfd136aa30 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/gpu_private.hpp"
+#include "opencv2/core/private.gpu.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 
diff --git a/modules/gpuarithm/src/precomp.hpp b/modules/gpuarithm/src/precomp.hpp
index 5dbef99817..6aab36a711 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/gpu_private.hpp"
+#include "opencv2/core/private.gpu.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 
diff --git a/modules/gpubgsegm/src/precomp.hpp b/modules/gpubgsegm/src/precomp.hpp
index a381857aff..5f120961b2 100644
--- a/modules/gpubgsegm/src/precomp.hpp
+++ b/modules/gpubgsegm/src/precomp.hpp
@@ -50,6 +50,6 @@
 #include "opencv2/gpufilters.hpp"
 #include "opencv2/gpuimgproc.hpp"
 
-#include "opencv2/core/gpu_private.hpp"
+#include "opencv2/core/private.gpu.hpp"
 
 #endif /* __OPENCV_PRECOMP_H__ */
diff --git a/modules/gpucodec/src/cuvid_video_source.h b/modules/gpucodec/src/cuvid_video_source.h
index a0b78222d5..a4a0e85211 100644
--- a/modules/gpucodec/src/cuvid_video_source.h
+++ b/modules/gpucodec/src/cuvid_video_source.h
@@ -43,7 +43,7 @@
 #ifndef __CUVUD_VIDEO_SOURCE_H__
 #define __CUVUD_VIDEO_SOURCE_H__
 
-#include "opencv2/core/gpu_private.hpp"
+#include "opencv2/core/private.gpu.hpp"
 #include "opencv2/gpucodec.hpp"
 #include "thread.h"
 
diff --git a/modules/gpucodec/src/frame_queue.h b/modules/gpucodec/src/frame_queue.h
index 51e3bcedb0..d9a4433b3d 100644
--- a/modules/gpucodec/src/frame_queue.h
+++ b/modules/gpucodec/src/frame_queue.h
@@ -44,7 +44,7 @@
 #define __FRAME_QUEUE_H__
 
 #include "opencv2/core/utility.hpp"
-#include "opencv2/core/gpu_private.hpp"
+#include "opencv2/core/private.gpu.hpp"
 
 #include <nvcuvid.h>
 
diff --git a/modules/gpucodec/src/precomp.hpp b/modules/gpucodec/src/precomp.hpp
index 9db176e668..c8580c9fe3 100644
--- a/modules/gpucodec/src/precomp.hpp
+++ b/modules/gpucodec/src/precomp.hpp
@@ -52,7 +52,7 @@
 
 #include "opencv2/gpucodec.hpp"
 
-#include "opencv2/core/gpu_private.hpp"
+#include "opencv2/core/private.gpu.hpp"
 
 #ifdef HAVE_NVCUVID
     #include <nvcuvid.h>
diff --git a/modules/gpucodec/src/video_decoder.h b/modules/gpucodec/src/video_decoder.h
index e31ec1a0d6..7a36335cc3 100644
--- a/modules/gpucodec/src/video_decoder.h
+++ b/modules/gpucodec/src/video_decoder.h
@@ -43,7 +43,7 @@
 #ifndef __VIDEO_DECODER_H__
 #define __VIDEO_DECODER_H__
 
-#include "opencv2/core/gpu_private.hpp"
+#include "opencv2/core/private.gpu.hpp"
 #include "opencv2/gpucodec.hpp"
 
 #include <nvcuvid.h>
diff --git a/modules/gpucodec/src/video_parser.h b/modules/gpucodec/src/video_parser.h
index a26dd3eb7e..e11b7eff6a 100644
--- a/modules/gpucodec/src/video_parser.h
+++ b/modules/gpucodec/src/video_parser.h
@@ -43,7 +43,7 @@
 #ifndef __VIDEO_PARSER_H__
 #define __VIDEO_PARSER_H__
 
-#include "opencv2/core/gpu_private.hpp"
+#include "opencv2/core/private.gpu.hpp"
 #include "opencv2/gpucodec.hpp"
 #include "frame_queue.h"
 #include "video_decoder.h"
diff --git a/modules/gpufeatures2d/src/precomp.hpp b/modules/gpufeatures2d/src/precomp.hpp
index 9fbecc71ec..33c5aa7d3e 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/gpu_private.hpp"
+#include "opencv2/core/private.gpu.hpp"
 
 #endif /* __OPENCV_PRECOMP_H__ */
diff --git a/modules/gpufilters/src/precomp.hpp b/modules/gpufilters/src/precomp.hpp
index e8e46ffdaa..3add0f2af1 100644
--- a/modules/gpufilters/src/precomp.hpp
+++ b/modules/gpufilters/src/precomp.hpp
@@ -48,7 +48,7 @@
 #include "opencv2/gpufilters.hpp"
 #include "opencv2/imgproc.hpp"
 
-#include "opencv2/core/gpu_private.hpp"
+#include "opencv2/core/private.gpu.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 
diff --git a/modules/gpuimgproc/src/precomp.hpp b/modules/gpuimgproc/src/precomp.hpp
index 00cca17012..1417c874bb 100644
--- a/modules/gpuimgproc/src/precomp.hpp
+++ b/modules/gpuimgproc/src/precomp.hpp
@@ -47,7 +47,7 @@
 #include "opencv2/gpufilters.hpp"
 
 #include "opencv2/core/private.hpp"
-#include "opencv2/core/gpu_private.hpp"
+#include "opencv2/core/private.gpu.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 b8c9dd50af..26c76d4dde 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/gpu_private.hpp"
+#include "opencv2/core/private.gpu.hpp"
 
 #ifndef HAVE_CUDA
 #  error gpulegacy module requires CUDA
diff --git a/modules/gpulegacy/src/precomp.hpp b/modules/gpulegacy/src/precomp.hpp
index c871296b2f..85e6f88e73 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/gpu_private.hpp"
+#include "opencv2/core/private.gpu.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 90fc4d2fae..90485a90a1 100644
--- a/modules/gpulegacy/test/test_precomp.hpp
+++ b/modules/gpulegacy/test/test_precomp.hpp
@@ -72,7 +72,7 @@
 #include "opencv2/gpulegacy.hpp"
 #include "opencv2/highgui.hpp"
 
-#include "opencv2/core/gpu_private.hpp"
+#include "opencv2/core/private.gpu.hpp"
 
 #include "NCVTest.hpp"
 #include "NCVAutoTestLister.hpp"
diff --git a/modules/gpuoptflow/src/precomp.hpp b/modules/gpuoptflow/src/precomp.hpp
index 27743b457a..8a52a9ae9e 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/gpu_private.hpp"
+#include "opencv2/core/private.gpu.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 
diff --git a/modules/gpustereo/src/precomp.hpp b/modules/gpustereo/src/precomp.hpp
index a552d5ff31..963cb4d07a 100644
--- a/modules/gpustereo/src/precomp.hpp
+++ b/modules/gpustereo/src/precomp.hpp
@@ -47,6 +47,6 @@
 
 #include "opencv2/gpustereo.hpp"
 
-#include "opencv2/core/gpu_private.hpp"
+#include "opencv2/core/private.gpu.hpp"
 
 #endif /* __OPENCV_PRECOMP_H__ */
diff --git a/modules/gpuwarping/src/precomp.hpp b/modules/gpuwarping/src/precomp.hpp
index 52cc69a346..e19853712f 100644
--- a/modules/gpuwarping/src/precomp.hpp
+++ b/modules/gpuwarping/src/precomp.hpp
@@ -45,7 +45,7 @@
 
 #include "opencv2/gpuwarping.hpp"
 
-#include "opencv2/core/gpu_private.hpp"
+#include "opencv2/core/private.gpu.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 
diff --git a/modules/nonfree/src/precomp.hpp b/modules/nonfree/src/precomp.hpp
index f89e1566e9..7563be2284 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/gpu_private.hpp"
+#include "opencv2/core/private.gpu.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 
diff --git a/modules/photo/src/denoising_gpu.cpp b/modules/photo/src/denoising_gpu.cpp
index 954b1611bf..2c1fabe14a 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/gpu_private.hpp"
+#include "opencv2/core/private.gpu.hpp"
 
 #include "opencv2/opencv_modules.hpp"
 
diff --git a/modules/softcascade/src/precomp.hpp b/modules/softcascade/src/precomp.hpp
index 194aec56dc..ac8eed4e44 100644
--- a/modules/softcascade/src/precomp.hpp
+++ b/modules/softcascade/src/precomp.hpp
@@ -47,7 +47,7 @@
 #include "opencv2/imgproc.hpp"
 
 #include "opencv2/core/private.hpp"
-#include "opencv2/core/gpu_private.hpp"
+#include "opencv2/core/private.gpu.hpp"
 
 namespace cv { namespace softcascade { namespace internal
 {
diff --git a/modules/superres/src/precomp.hpp b/modules/superres/src/precomp.hpp
index 300894ecfe..f3c993e42a 100644
--- a/modules/superres/src/precomp.hpp
+++ b/modules/superres/src/precomp.hpp
@@ -55,7 +55,7 @@
 #include "opencv2/video/tracking.hpp"
 #include "opencv2/core/private.hpp"
 
-#include "opencv2/core/gpu_private.hpp"
+#include "opencv2/core/private.gpu.hpp"
 
 #ifdef HAVE_OPENCV_GPUARITHM
 #  include "opencv2/gpuarithm.hpp"