diff --git a/modules/objc/generator/gen_objc.py b/modules/objc/generator/gen_objc.py
index 61d5e140ab..2c41833f18 100755
--- a/modules/objc/generator/gen_objc.py
+++ b/modules/objc/generator/gen_objc.py
@@ -1609,7 +1609,7 @@ if __name__ == "__main__":
             with open(srcfiles_fname) as f:
                 srcfiles = [os.path.join(module_location, str(l).strip()) for l in f.readlines() if str(l).strip()]
         else:
-            re_bad = re.compile(r'(private|.inl.hpp$|_inl.hpp$|.details.hpp$|_winrt.hpp$|/cuda/|/legacy/)')
+            re_bad = re.compile(r'(private|.inl.hpp$|_inl.hpp$|.detail.hpp$|.details.hpp$|_winrt.hpp$|/cuda/|/legacy/)')
             # .h files before .hpp
             h_files = []
             hpp_files = []
diff --git a/modules/video/include/opencv2/video/detail/tracking.private.hpp b/modules/video/include/opencv2/video/detail/tracking.detail.hpp
similarity index 100%
rename from modules/video/include/opencv2/video/detail/tracking.private.hpp
rename to modules/video/include/opencv2/video/detail/tracking.detail.hpp
diff --git a/modules/video/src/tracking/detail/tracker_feature.cpp b/modules/video/src/tracking/detail/tracker_feature.cpp
index 47651f6657..b68994dfe2 100644
--- a/modules/video/src/tracking/detail/tracker_feature.cpp
+++ b/modules/video/src/tracking/detail/tracker_feature.cpp
@@ -3,7 +3,7 @@
 // of this distribution and at http://opencv.org/license.html.
 
 #include "../../precomp.hpp"
-#include "opencv2/video/detail/tracking.private.hpp"
+#include "opencv2/video/detail/tracking.detail.hpp"
 
 namespace cv {
 namespace detail {
diff --git a/modules/video/src/tracking/detail/tracker_feature_haar.impl.hpp b/modules/video/src/tracking/detail/tracker_feature_haar.impl.hpp
index 6590abf34f..30a3eb3acd 100644
--- a/modules/video/src/tracking/detail/tracker_feature_haar.impl.hpp
+++ b/modules/video/src/tracking/detail/tracker_feature_haar.impl.hpp
@@ -3,8 +3,8 @@
 // of this distribution and at http://opencv.org/license.html.
 
 #include "../../precomp.hpp"
-#include "opencv2/video/detail/tracking.private.hpp"
-#include "opencv2/video/detail/tracking_feature.private.hpp"
+#include "opencv2/video/detail/tracking.detail.hpp"
+#include "tracking_feature.hpp"
 
 namespace cv {
 namespace detail {
diff --git a/modules/video/src/tracking/detail/tracker_feature_set.cpp b/modules/video/src/tracking/detail/tracker_feature_set.cpp
index 43f3203c52..96eb9981f9 100644
--- a/modules/video/src/tracking/detail/tracker_feature_set.cpp
+++ b/modules/video/src/tracking/detail/tracker_feature_set.cpp
@@ -3,7 +3,7 @@
 // of this distribution and at http://opencv.org/license.html.
 
 #include "../../precomp.hpp"
-#include "opencv2/video/detail/tracking.private.hpp"
+#include "opencv2/video/detail/tracking.detail.hpp"
 
 namespace cv {
 namespace detail {
diff --git a/modules/video/src/tracking/detail/tracker_mil_model.hpp b/modules/video/src/tracking/detail/tracker_mil_model.hpp
index 04d9176298..dddfae5536 100644
--- a/modules/video/src/tracking/detail/tracker_mil_model.hpp
+++ b/modules/video/src/tracking/detail/tracker_mil_model.hpp
@@ -5,7 +5,7 @@
 #ifndef __OPENCV_TRACKER_MIL_MODEL_HPP__
 #define __OPENCV_TRACKER_MIL_MODEL_HPP__
 
-#include "opencv2/video/detail/tracking.private.hpp"
+#include "opencv2/video/detail/tracking.detail.hpp"
 #include "tracker_mil_state.hpp"
 
 namespace cv {
diff --git a/modules/video/src/tracking/detail/tracker_mil_state.cpp b/modules/video/src/tracking/detail/tracker_mil_state.cpp
index 63591382b0..b3de09c880 100644
--- a/modules/video/src/tracking/detail/tracker_mil_state.cpp
+++ b/modules/video/src/tracking/detail/tracker_mil_state.cpp
@@ -3,7 +3,7 @@
 // of this distribution and at http://opencv.org/license.html.
 
 #include "../../precomp.hpp"
-#include "opencv2/video/detail/tracking.private.hpp"
+#include "opencv2/video/detail/tracking.detail.hpp"
 #include "tracker_mil_state.hpp"
 
 namespace cv {
diff --git a/modules/video/src/tracking/detail/tracker_mil_state.hpp b/modules/video/src/tracking/detail/tracker_mil_state.hpp
index e78b19dec2..12af1c33df 100644
--- a/modules/video/src/tracking/detail/tracker_mil_state.hpp
+++ b/modules/video/src/tracking/detail/tracker_mil_state.hpp
@@ -5,7 +5,7 @@
 #ifndef OPENCV_VIDEO_DETAIL_TRACKING_MIL_STATE_HPP
 #define OPENCV_VIDEO_DETAIL_TRACKING_MIL_STATE_HPP
 
-#include "opencv2/video/detail/tracking.private.hpp"
+#include "opencv2/video/detail/tracking.detail.hpp"
 #include "tracking_online_mil.hpp"
 
 namespace cv {
diff --git a/modules/video/src/tracking/detail/tracker_model.cpp b/modules/video/src/tracking/detail/tracker_model.cpp
index c9ea424aaf..d06e5515bd 100644
--- a/modules/video/src/tracking/detail/tracker_model.cpp
+++ b/modules/video/src/tracking/detail/tracker_model.cpp
@@ -3,7 +3,7 @@
 // of this distribution and at http://opencv.org/license.html.
 
 #include "../../precomp.hpp"
-#include "opencv2/video/detail/tracking.private.hpp"
+#include "opencv2/video/detail/tracking.detail.hpp"
 
 namespace cv {
 namespace detail {
diff --git a/modules/video/src/tracking/detail/tracker_sampler.cpp b/modules/video/src/tracking/detail/tracker_sampler.cpp
index ec11656958..4e73ea3734 100644
--- a/modules/video/src/tracking/detail/tracker_sampler.cpp
+++ b/modules/video/src/tracking/detail/tracker_sampler.cpp
@@ -4,7 +4,7 @@
 
 #include "../../precomp.hpp"
 
-#include "opencv2/video/detail/tracking.private.hpp"
+#include "opencv2/video/detail/tracking.detail.hpp"
 
 namespace cv {
 namespace detail {
diff --git a/modules/video/src/tracking/detail/tracker_sampler_algorithm.cpp b/modules/video/src/tracking/detail/tracker_sampler_algorithm.cpp
index b5eb285e1a..ba5ae41b80 100644
--- a/modules/video/src/tracking/detail/tracker_sampler_algorithm.cpp
+++ b/modules/video/src/tracking/detail/tracker_sampler_algorithm.cpp
@@ -3,7 +3,7 @@
 // of this distribution and at http://opencv.org/license.html.
 
 #include "../../precomp.hpp"
-#include "opencv2/video/detail/tracking.private.hpp"
+#include "opencv2/video/detail/tracking.detail.hpp"
 
 namespace cv {
 namespace detail {
diff --git a/modules/video/src/tracking/detail/tracker_state_estimator.cpp b/modules/video/src/tracking/detail/tracker_state_estimator.cpp
index 2410b5b076..ea48a739d8 100644
--- a/modules/video/src/tracking/detail/tracker_state_estimator.cpp
+++ b/modules/video/src/tracking/detail/tracker_state_estimator.cpp
@@ -3,7 +3,7 @@
 // of this distribution and at http://opencv.org/license.html.
 
 #include "../../precomp.hpp"
-#include "opencv2/video/detail/tracking.private.hpp"
+#include "opencv2/video/detail/tracking.detail.hpp"
 
 namespace cv {
 namespace detail {
diff --git a/modules/video/src/tracking/detail/tracking_feature.cpp b/modules/video/src/tracking/detail/tracking_feature.cpp
index 1850995fee..0d9a88c1a5 100644
--- a/modules/video/src/tracking/detail/tracking_feature.cpp
+++ b/modules/video/src/tracking/detail/tracking_feature.cpp
@@ -3,8 +3,8 @@
 // of this distribution and at http://opencv.org/license.html.
 
 #include "../../precomp.hpp"
-#include "opencv2/video/detail/tracking.private.hpp"
-#include "opencv2/video/detail/tracking_feature.private.hpp"
+#include "opencv2/video/detail/tracking.detail.hpp"
+#include "tracking_feature.hpp"
 
 namespace cv {
 namespace detail {
diff --git a/modules/video/include/opencv2/video/detail/tracking_feature.private.hpp b/modules/video/src/tracking/detail/tracking_feature.hpp
similarity index 100%
rename from modules/video/include/opencv2/video/detail/tracking_feature.private.hpp
rename to modules/video/src/tracking/detail/tracking_feature.hpp