diff --git a/modules/cudev/test/test_precomp.hpp b/modules/cudev/test/test_precomp.hpp
index b2ed2d0348..18e7cc1ce2 100644
--- a/modules/cudev/test/test_precomp.hpp
+++ b/modules/cudev/test/test_precomp.hpp
@@ -52,4 +52,6 @@
 #include "opencv2/ts.hpp"
 #include "opencv2/ts/gpu_test.hpp"
 
+#include "cvconfig.h"
+
 #endif
diff --git a/modules/gpu/test/test_precomp.hpp b/modules/gpu/test/test_precomp.hpp
index f2b0bf4051..0a9c1df3dc 100644
--- a/modules/gpu/test/test_precomp.hpp
+++ b/modules/gpu/test/test_precomp.hpp
@@ -62,4 +62,6 @@
 #include "opencv2/calib3d.hpp"
 #include "opencv2/objdetect.hpp"
 
+#include "cvconfig.h"
+
 #endif
diff --git a/modules/gpuarithm/test/test_precomp.hpp b/modules/gpuarithm/test/test_precomp.hpp
index d25aa0c264..faa0f5adbd 100644
--- a/modules/gpuarithm/test/test_precomp.hpp
+++ b/modules/gpuarithm/test/test_precomp.hpp
@@ -60,4 +60,6 @@
 #include "opencv2/core.hpp"
 #include "opencv2/imgproc.hpp"
 
+#include "cvconfig.h"
+
 #endif
diff --git a/modules/gpubgsegm/test/test_precomp.hpp b/modules/gpubgsegm/test/test_precomp.hpp
index 9422c2a80b..783e9e64cd 100644
--- a/modules/gpubgsegm/test/test_precomp.hpp
+++ b/modules/gpubgsegm/test/test_precomp.hpp
@@ -60,5 +60,6 @@
 #include "opencv2/video.hpp"
 
 #include "opencv2/opencv_modules.hpp"
+#include "cvconfig.h"
 
 #endif
diff --git a/modules/gpucodec/test/test_precomp.hpp b/modules/gpucodec/test/test_precomp.hpp
index 0dc79935dd..95e70d46df 100644
--- a/modules/gpucodec/test/test_precomp.hpp
+++ b/modules/gpucodec/test/test_precomp.hpp
@@ -57,4 +57,6 @@
 #include "opencv2/gpucodec.hpp"
 #include "opencv2/highgui.hpp"
 
+#include "cvconfig.h"
+
 #endif
diff --git a/modules/gpufeatures2d/test/test_precomp.hpp b/modules/gpufeatures2d/test/test_precomp.hpp
index 7725d3f3d6..4ce8f78496 100644
--- a/modules/gpufeatures2d/test/test_precomp.hpp
+++ b/modules/gpufeatures2d/test/test_precomp.hpp
@@ -57,4 +57,6 @@
 #include "opencv2/gpufeatures2d.hpp"
 #include "opencv2/features2d.hpp"
 
+#include "cvconfig.h"
+
 #endif
diff --git a/modules/gpufilters/test/test_precomp.hpp b/modules/gpufilters/test/test_precomp.hpp
index 95984929fa..7dfe713d3a 100644
--- a/modules/gpufilters/test/test_precomp.hpp
+++ b/modules/gpufilters/test/test_precomp.hpp
@@ -57,4 +57,6 @@
 #include "opencv2/gpufilters.hpp"
 #include "opencv2/imgproc.hpp"
 
+#include "cvconfig.h"
+
 #endif
diff --git a/modules/gpuimgproc/test/test_precomp.hpp b/modules/gpuimgproc/test/test_precomp.hpp
index 71ba4020ce..7a8b1cbcd1 100644
--- a/modules/gpuimgproc/test/test_precomp.hpp
+++ b/modules/gpuimgproc/test/test_precomp.hpp
@@ -57,4 +57,6 @@
 #include "opencv2/gpuimgproc.hpp"
 #include "opencv2/imgproc.hpp"
 
+#include "cvconfig.h"
+
 #endif
diff --git a/modules/gpulegacy/test/test_precomp.hpp b/modules/gpulegacy/test/test_precomp.hpp
index 90485a90a1..e1f2d5def4 100644
--- a/modules/gpulegacy/test/test_precomp.hpp
+++ b/modules/gpulegacy/test/test_precomp.hpp
@@ -74,6 +74,8 @@
 
 #include "opencv2/core/private.gpu.hpp"
 
+#include "cvconfig.h"
+
 #include "NCVTest.hpp"
 #include "NCVAutoTestLister.hpp"
 #include "NCVTestSourceProvider.hpp"
diff --git a/modules/gpuoptflow/test/test_precomp.hpp b/modules/gpuoptflow/test/test_precomp.hpp
index 32a7443e8e..afac60d876 100644
--- a/modules/gpuoptflow/test/test_precomp.hpp
+++ b/modules/gpuoptflow/test/test_precomp.hpp
@@ -59,4 +59,6 @@
 #include "opencv2/gpuoptflow.hpp"
 #include "opencv2/video.hpp"
 
+#include "cvconfig.h"
+
 #endif
diff --git a/modules/gpustereo/test/test_precomp.hpp b/modules/gpustereo/test/test_precomp.hpp
index d55b1ec0d9..eb34fcb568 100644
--- a/modules/gpustereo/test/test_precomp.hpp
+++ b/modules/gpustereo/test/test_precomp.hpp
@@ -57,4 +57,6 @@
 #include "opencv2/gpustereo.hpp"
 #include "opencv2/calib3d.hpp"
 
+#include "cvconfig.h"
+
 #endif
diff --git a/modules/gpuwarping/test/test_precomp.hpp b/modules/gpuwarping/test/test_precomp.hpp
index 90a28fe1a7..9ac7fc0b83 100644
--- a/modules/gpuwarping/test/test_precomp.hpp
+++ b/modules/gpuwarping/test/test_precomp.hpp
@@ -57,6 +57,8 @@
 #include "opencv2/gpuwarping.hpp"
 #include "opencv2/imgproc.hpp"
 
+#include "cvconfig.h"
+
 #include "interpolation.hpp"
 
 #endif
diff --git a/modules/nonfree/perf/perf_precomp.hpp b/modules/nonfree/perf/perf_precomp.hpp
index 5e3f3c3cb3..e8fad3b7be 100644
--- a/modules/nonfree/perf/perf_precomp.hpp
+++ b/modules/nonfree/perf/perf_precomp.hpp
@@ -14,6 +14,7 @@
 #include "opencv2/highgui.hpp"
 
 #include "opencv2/opencv_modules.hpp"
+#include "cvconfig.h"
 
 #ifdef HAVE_OPENCV_OCL
 #  include "opencv2/nonfree/ocl.hpp"
diff --git a/modules/nonfree/test/test_precomp.hpp b/modules/nonfree/test/test_precomp.hpp
index 563dad43be..965e651e56 100644
--- a/modules/nonfree/test/test_precomp.hpp
+++ b/modules/nonfree/test/test_precomp.hpp
@@ -19,6 +19,7 @@
 #include "opencv2/ts/gpu_test.hpp"
 
 #include "opencv2/opencv_modules.hpp"
+#include "cvconfig.h"
 
 #ifdef HAVE_OPENCV_OCL
 #  include "opencv2/nonfree/ocl.hpp"
diff --git a/modules/photo/test/test_denoising_gpu.cpp b/modules/photo/test/test_denoising_gpu.cpp
index caf3b23f27..f8de826f2a 100644
--- a/modules/photo/test/test_denoising_gpu.cpp
+++ b/modules/photo/test/test_denoising_gpu.cpp
@@ -46,6 +46,7 @@
 #include "opencv2/ts/gpu_test.hpp"
 
 #include "opencv2/opencv_modules.hpp"
+#include "cvconfig.h"
 
 #if defined (HAVE_CUDA) && defined(HAVE_OPENCV_GPUARITHM) && defined(HAVE_OPENCV_GPUIMGPROC)
 
diff --git a/modules/softcascade/test/test_cuda_softcascade.cpp b/modules/softcascade/test/test_cuda_softcascade.cpp
index 4d97f92082..5973d25f21 100644
--- a/modules/softcascade/test/test_cuda_softcascade.cpp
+++ b/modules/softcascade/test/test_cuda_softcascade.cpp
@@ -313,4 +313,4 @@ INSTANTIATE_TEST_CASE_P(cuda_accelerated, SCascadeTestAll, testing::Combine( ALL
                     testing::Values(Fixture("cascades/inria_caltech-17.01.2013.xml", 7),
                                     Fixture("cascades/sc_cvpr_2012_to_opencv_new_format.xml", 1291))));
 
-#endif
\ No newline at end of file
+#endif
diff --git a/modules/softcascade/test/test_precomp.hpp b/modules/softcascade/test/test_precomp.hpp
index 80bff6536d..4a39744783 100644
--- a/modules/softcascade/test/test_precomp.hpp
+++ b/modules/softcascade/test/test_precomp.hpp
@@ -51,10 +51,11 @@
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 
-# include "opencv2/ts.hpp"
-# include "opencv2/softcascade.hpp"
-# include "opencv2/imgproc.hpp"
-# include "opencv2/highgui.hpp"
-# include "utility.hpp"
+#include "opencv2/ts.hpp"
+#include "opencv2/softcascade.hpp"
+#include "opencv2/imgproc.hpp"
+#include "opencv2/highgui.hpp"
+#include "cvconfig.h"
+#include "utility.hpp"
 
 #endif
diff --git a/modules/superres/test/test_precomp.hpp b/modules/superres/test/test_precomp.hpp
index 4ef73030bd..47334e324a 100644
--- a/modules/superres/test/test_precomp.hpp
+++ b/modules/superres/test/test_precomp.hpp
@@ -56,6 +56,7 @@
 #include "opencv2/imgproc.hpp"
 #include "opencv2/ts.hpp"
 #include "opencv2/superres.hpp"
+#include "cvconfig.h"
 #include "input_array_utility.hpp"
 
 #endif
diff --git a/modules/superres/test/test_superres.cpp b/modules/superres/test/test_superres.cpp
index 445dd3a014..2cede096db 100644
--- a/modules/superres/test/test_superres.cpp
+++ b/modules/superres/test/test_superres.cpp
@@ -274,12 +274,16 @@ TEST_F(SuperResolution, BTVL1_GPU)
 {
     RunTest(cv::superres::createSuperResolution_BTVL1_GPU());
 }
+
 #endif
+
 #if defined(HAVE_OPENCV_OCL) && defined(HAVE_OPENCL)
+
 TEST_F(SuperResolution, BTVL1_OCL)
 {
     std::vector<cv::ocl::Info> infos;
     cv::ocl::getDevice(infos);
     RunTest(cv::superres::createSuperResolution_BTVL1_OCL());
 }
-#endif 
+
+#endif
diff --git a/modules/ts/include/opencv2/ts/gpu_perf.hpp b/modules/ts/include/opencv2/ts/gpu_perf.hpp
index abc17e9942..8f1ba8abc8 100644
--- a/modules/ts/include/opencv2/ts/gpu_perf.hpp
+++ b/modules/ts/include/opencv2/ts/gpu_perf.hpp
@@ -47,6 +47,7 @@
 #include "opencv2/highgui.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/ts/ts_perf.hpp"
+#include "cvconfig.h"
 
 namespace perf
 {
diff --git a/modules/ts/include/opencv2/ts/gpu_test.hpp b/modules/ts/include/opencv2/ts/gpu_test.hpp
index dab5fd3b99..2ff2ca0bfc 100644
--- a/modules/ts/include/opencv2/ts/gpu_test.hpp
+++ b/modules/ts/include/opencv2/ts/gpu_test.hpp
@@ -44,6 +44,7 @@
 #define __OPENCV_GPU_TEST_UTILITY_HPP__
 
 #include <stdexcept>
+#include "cvconfig.h"
 #include "opencv2/core.hpp"
 #include "opencv2/core/gpu.hpp"
 #include "opencv2/highgui.hpp"