diff --git a/samples/cpp/application_trace.cpp b/samples/cpp/application_trace.cpp
index ddddd512e8..fa77542dbd 100644
--- a/samples/cpp/application_trace.cpp
+++ b/samples/cpp/application_trace.cpp
@@ -1,7 +1,9 @@
 /* OpenCV Application Tracing support demo. */
 #include <iostream>
 
-#include <opencv2/opencv.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/highgui.hpp>
 #include <opencv2/core/utils/trace.hpp>
 
 using namespace cv;
diff --git a/samples/cpp/autofocus.cpp b/samples/cpp/autofocus.cpp
index cef279d6f2..a71a2954f2 100644
--- a/samples/cpp/autofocus.cpp
+++ b/samples/cpp/autofocus.cpp
@@ -28,7 +28,9 @@
 #include <cstdio>
 #include <iostream>
 #include <algorithm>
-#include <opencv2/opencv.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/highgui.hpp>
 
 using namespace std;
 using namespace cv;
diff --git a/samples/cpp/detect_blob.cpp b/samples/cpp/detect_blob.cpp
index c240be40e2..3acb8fa1fb 100644
--- a/samples/cpp/detect_blob.cpp
+++ b/samples/cpp/detect_blob.cpp
@@ -1,4 +1,7 @@
-#include <opencv2/opencv.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/highgui.hpp>
+#include <opencv2/features2d.hpp>
 #include <vector>
 #include <map>
 #include <iostream>
diff --git a/samples/cpp/detect_mser.cpp b/samples/cpp/detect_mser.cpp
index daa370817e..a3c3856d2a 100644
--- a/samples/cpp/detect_mser.cpp
+++ b/samples/cpp/detect_mser.cpp
@@ -1,6 +1,8 @@
-#include <opencv2/opencv.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/highgui.hpp>
+#include <opencv2/features2d.hpp>
 #include "opencv2/core/opengl.hpp"
-#include "opencv2/cvconfig.h"
 
 #include <vector>
 #include <map>
diff --git a/samples/cpp/matchmethod_orb_akaze_brisk.cpp b/samples/cpp/matchmethod_orb_akaze_brisk.cpp
index 3a3320d8df..7d39bae443 100644
--- a/samples/cpp/matchmethod_orb_akaze_brisk.cpp
+++ b/samples/cpp/matchmethod_orb_akaze_brisk.cpp
@@ -1,4 +1,7 @@
-#include <opencv2/opencv.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/features2d.hpp>
+#include <opencv2/highgui.hpp>
 #include <vector>
 #include <iostream>
 
diff --git a/samples/cpp/train_svmsgd.cpp b/samples/cpp/train_svmsgd.cpp
index 810f061467..854be5c28d 100644
--- a/samples/cpp/train_svmsgd.cpp
+++ b/samples/cpp/train_svmsgd.cpp
@@ -1,7 +1,8 @@
-#include <opencv2/opencv.hpp>
+#include "opencv2/core.hpp"
 #include "opencv2/video/tracking.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/imgproc.hpp"
+#include "opencv2/highgui.hpp"
+#include "opencv2/ml.hpp"
 
 using namespace cv;
 using namespace cv::ml;
diff --git a/samples/cpp/travelsalesman.cpp b/samples/cpp/travelsalesman.cpp
index 58dc46eb71..256ff55b43 100644
--- a/samples/cpp/travelsalesman.cpp
+++ b/samples/cpp/travelsalesman.cpp
@@ -1,4 +1,7 @@
-#include <opencv2/opencv.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/highgui.hpp>
+#include <opencv2/ml.hpp>
 
 using namespace cv;
 
diff --git a/samples/cpp/tutorial_code/ImgProc/morph_lines_detection/Morphology_3.cpp b/samples/cpp/tutorial_code/ImgProc/morph_lines_detection/Morphology_3.cpp
index 31b3687fdf..9ab0099282 100644
--- a/samples/cpp/tutorial_code/ImgProc/morph_lines_detection/Morphology_3.cpp
+++ b/samples/cpp/tutorial_code/ImgProc/morph_lines_detection/Morphology_3.cpp
@@ -4,7 +4,10 @@
  * @author OpenCV team
  */
 
-#include <opencv2/opencv.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/highgui.hpp>
+#include <iostream>
 
 void show_wait_destroy(const char* winname, cv::Mat img);
 
diff --git a/samples/cpp/tutorial_code/ImgTrans/imageSegmentation.cpp b/samples/cpp/tutorial_code/ImgTrans/imageSegmentation.cpp
index bdaed0c1b1..87a5436a6d 100644
--- a/samples/cpp/tutorial_code/ImgTrans/imageSegmentation.cpp
+++ b/samples/cpp/tutorial_code/ImgTrans/imageSegmentation.cpp
@@ -4,7 +4,9 @@
  * @author OpenCV Team
  */
 
-#include <opencv2/opencv.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/highgui.hpp>
 #include <iostream>
 
 using namespace std;
diff --git a/samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp b/samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp
index 35247817a2..87fb4604e2 100644
--- a/samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp
+++ b/samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp
@@ -245,11 +245,6 @@ static inline void read(const FileNode& node, Settings& x, const Settings& defau
         x.read(node);
 }
 
-static inline void write(FileStorage& fs, const String&, const Settings& s )
-{
-    s.write(fs);
-}
-
 enum { DETECTION = 0, CAPTURING = 1, CALIBRATED = 2 };
 
 bool runCalibrationAndSave(Settings& s, Size imageSize, Mat&  cameraMatrix, Mat& distCoeffs,
diff --git a/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/CsvWriter.h b/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/CsvWriter.h
index d8132f5b41..06314bbd89 100644
--- a/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/CsvWriter.h
+++ b/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/CsvWriter.h
@@ -3,7 +3,7 @@
 
 #include <iostream>
 #include <fstream>
-#include <opencv2/core/core.hpp>
+#include <opencv2/core.hpp>
 #include "Utils.h"
 
 using namespace std;
diff --git a/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/ModelRegistration.h b/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/ModelRegistration.h
index f1e7aca469..7491ede45a 100644
--- a/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/ModelRegistration.h
+++ b/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/ModelRegistration.h
@@ -9,7 +9,7 @@
 #define MODELREGISTRATION_H_
 
 #include <iostream>
-#include <opencv2/core/core.hpp>
+#include <opencv2/core.hpp>
 
 class ModelRegistration
 {
diff --git a/samples/cpp/tutorial_code/features2D/AKAZE_tracking/planar_tracking.cpp b/samples/cpp/tutorial_code/features2D/AKAZE_tracking/planar_tracking.cpp
index fdf1104336..83c4daad64 100755
--- a/samples/cpp/tutorial_code/features2D/AKAZE_tracking/planar_tracking.cpp
+++ b/samples/cpp/tutorial_code/features2D/AKAZE_tracking/planar_tracking.cpp
@@ -1,6 +1,7 @@
 #include <opencv2/features2d.hpp>
 #include <opencv2/videoio.hpp>
-#include <opencv2/opencv.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/calib3d.hpp>
 #include <opencv2/highgui.hpp>      //for imshow
 #include <vector>
 #include <iostream>
diff --git a/samples/cpp/tutorial_code/features2D/Homography/decompose_homography.cpp b/samples/cpp/tutorial_code/features2D/Homography/decompose_homography.cpp
index 805f8ce0e2..3673c3f632 100644
--- a/samples/cpp/tutorial_code/features2D/Homography/decompose_homography.cpp
+++ b/samples/cpp/tutorial_code/features2D/Homography/decompose_homography.cpp
@@ -1,7 +1,10 @@
 #include <iostream>
 #include <opencv2/opencv_modules.hpp>
 #ifdef HAVE_OPENCV_ARUCO
-#include <opencv2/opencv.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/videoio.hpp>
+#include <opencv2/highgui.hpp>
+#include <opencv2/calib3d.hpp>
 #include <opencv2/aruco.hpp>
 
 using namespace std;
diff --git a/samples/cpp/tutorial_code/features2D/Homography/homography_from_camera_displacement.cpp b/samples/cpp/tutorial_code/features2D/Homography/homography_from_camera_displacement.cpp
index 005d122d0d..ce2f76fa38 100644
--- a/samples/cpp/tutorial_code/features2D/Homography/homography_from_camera_displacement.cpp
+++ b/samples/cpp/tutorial_code/features2D/Homography/homography_from_camera_displacement.cpp
@@ -1,7 +1,10 @@
 #include <iostream>
 #include <opencv2/opencv_modules.hpp>
 #ifdef HAVE_OPENCV_ARUCO
-#include <opencv2/opencv.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/highgui.hpp>
+#include <opencv2/calib3d.hpp>
 #include <opencv2/aruco.hpp>
 
 using namespace std;
diff --git a/samples/cpp/tutorial_code/features2D/Homography/panorama_stitching_rotating_camera.cpp b/samples/cpp/tutorial_code/features2D/Homography/panorama_stitching_rotating_camera.cpp
index c2eedc5f94..88dcf47477 100755
--- a/samples/cpp/tutorial_code/features2D/Homography/panorama_stitching_rotating_camera.cpp
+++ b/samples/cpp/tutorial_code/features2D/Homography/panorama_stitching_rotating_camera.cpp
@@ -1,5 +1,8 @@
 #include <iostream>
-#include <opencv2/opencv.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/highgui.hpp>
+#include <opencv2/stitching.hpp>
 
 using namespace std;
 using namespace cv;
diff --git a/samples/cpp/tutorial_code/features2D/Homography/perspective_correction.cpp b/samples/cpp/tutorial_code/features2D/Homography/perspective_correction.cpp
index c23c515e8d..16476c6830 100644
--- a/samples/cpp/tutorial_code/features2D/Homography/perspective_correction.cpp
+++ b/samples/cpp/tutorial_code/features2D/Homography/perspective_correction.cpp
@@ -1,7 +1,10 @@
 #include <iostream>
 #include <opencv2/opencv_modules.hpp>
 #ifdef HAVE_OPENCV_ARUCO
-#include <opencv2/opencv.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/calib3d.hpp>
+#include <opencv2/highgui.hpp>
 #include <opencv2/aruco.hpp>
 
 using namespace std;
@@ -17,32 +20,6 @@ Scalar randomColor( RNG& rng )
   return Scalar( icolor & 255, (icolor >> 8) & 255, (icolor >> 16) & 255 );
 }
 
-void calcChessboardCorners(Size boardSize, float squareSize, vector<Point3f>& corners, Pattern patternType = CHESSBOARD)
-{
-    corners.resize(0);
-
-    switch (patternType)
-    {
-    case CHESSBOARD:
-    case CIRCLES_GRID:
-        for( int i = 0; i < boardSize.height; i++ )
-            for( int j = 0; j < boardSize.width; j++ )
-                corners.push_back(Point3f(float(j*squareSize),
-                                          float(i*squareSize), 0));
-        break;
-
-    case ASYMMETRIC_CIRCLES_GRID:
-        for( int i = 0; i < boardSize.height; i++ )
-            for( int j = 0; j < boardSize.width; j++ )
-                corners.push_back(Point3f(float((2*j + i % 2)*squareSize),
-                                          float(i*squareSize), 0));
-        break;
-
-    default:
-        CV_Error(Error::StsBadArg, "Unknown pattern type\n");
-    }
-}
-
 void perspectiveCorrection(const string &img1Path, const string &img2Path, const Size &patternSize, RNG &rng)
 {
     Mat img1 = imread(img1Path);
diff --git a/samples/cpp/tutorial_code/features2D/Homography/pose_from_homography.cpp b/samples/cpp/tutorial_code/features2D/Homography/pose_from_homography.cpp
index 4fc29a7f88..50a16c223e 100644
--- a/samples/cpp/tutorial_code/features2D/Homography/pose_from_homography.cpp
+++ b/samples/cpp/tutorial_code/features2D/Homography/pose_from_homography.cpp
@@ -1,7 +1,10 @@
 #include <iostream>
 #include <opencv2/opencv_modules.hpp>
 #ifdef HAVE_OPENCV_ARUCO
-#include <opencv2/opencv.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/calib3d.hpp>
+#include <opencv2/highgui.hpp>
 #include <opencv2/aruco.hpp>
 
 using namespace std;
diff --git a/samples/cpp/tutorial_code/snippets/core_various.cpp b/samples/cpp/tutorial_code/snippets/core_various.cpp
index 01f69496aa..6e220788ed 100644
--- a/samples/cpp/tutorial_code/snippets/core_various.cpp
+++ b/samples/cpp/tutorial_code/snippets/core_various.cpp
@@ -1,4 +1,7 @@
-#include <opencv2/opencv.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/highgui.hpp>
+#include <opencv2/features2d.hpp>
 
 using namespace std;
 using namespace cv;
diff --git a/samples/cpp/tutorial_code/snippets/imgcodecs_imwrite.cpp b/samples/cpp/tutorial_code/snippets/imgcodecs_imwrite.cpp
index a42fce2672..10f4151694 100644
--- a/samples/cpp/tutorial_code/snippets/imgcodecs_imwrite.cpp
+++ b/samples/cpp/tutorial_code/snippets/imgcodecs_imwrite.cpp
@@ -1,4 +1,4 @@
-#include <opencv2/opencv.hpp>
+#include <opencv2/imgcodecs.hpp>
 
 using namespace cv;
 using namespace std;
diff --git a/samples/cpp/tutorial_code/viz/histo3D.cpp b/samples/cpp/tutorial_code/viz/histo3D.cpp
index 0fb3735542..c01d756c2e 100644
--- a/samples/cpp/tutorial_code/viz/histo3D.cpp
+++ b/samples/cpp/tutorial_code/viz/histo3D.cpp
@@ -1,4 +1,6 @@
-#include <opencv2/opencv.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/highgui.hpp>
 #include <iostream>
 
 using namespace std;
@@ -6,6 +8,8 @@ using namespace cv;
 
 #ifdef HAVE_OPENCV_VIZ
 
+#include <opencv2/viz.hpp>
+
 const String keys =
 "{Aide h usage ? help  |     | print this message   }"
 "{@arg1                |     | Full path to color imag (3 channels)}"
diff --git a/samples/cpp/tutorial_code/xfeatures2D/LATCH_match.cpp b/samples/cpp/tutorial_code/xfeatures2D/LATCH_match.cpp
index 04f2c3c6fa..2d1282d89d 100644
--- a/samples/cpp/tutorial_code/xfeatures2D/LATCH_match.cpp
+++ b/samples/cpp/tutorial_code/xfeatures2D/LATCH_match.cpp
@@ -4,10 +4,12 @@
 
 #ifdef HAVE_OPENCV_XFEATURES2D
 
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/highgui.hpp>
 #include <opencv2/features2d.hpp>
 #include <opencv2/xfeatures2d.hpp>
 #include <opencv2/imgcodecs.hpp>
-#include <opencv2/opencv.hpp>
 #include <vector>
 
 // If you find this code useful, please add a reference to the following paper in your work:
diff --git a/samples/cpp/videocapture_basic.cpp b/samples/cpp/videocapture_basic.cpp
index ae77b05448..6f46715458 100644
--- a/samples/cpp/videocapture_basic.cpp
+++ b/samples/cpp/videocapture_basic.cpp
@@ -5,7 +5,9 @@
   @date Aug 24, 2016
 */
 
-#include <opencv2/opencv.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/videoio.hpp>
+#include <opencv2/highgui.hpp>
 #include <iostream>
 #include <stdio.h>
 
@@ -49,4 +51,4 @@ int main(int, char**)
     }
     // the camera will be deinitialized automatically in VideoCapture destructor
     return 0;
-}
\ No newline at end of file
+}
diff --git a/samples/cpp/videowriter_basic.cpp b/samples/cpp/videowriter_basic.cpp
index 9ab4efcc90..76f92ec0e0 100644
--- a/samples/cpp/videowriter_basic.cpp
+++ b/samples/cpp/videowriter_basic.cpp
@@ -5,7 +5,9 @@
   @date Aug 24, 2016
 */
 
-#include <opencv2/opencv.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/videoio.hpp>
+#include <opencv2/highgui.hpp>
 #include <iostream>
 #include <stdio.h>
 
@@ -62,4 +64,4 @@ int main(int, char**)
     }
     // the videofile will be closed and released automatically in VideoWriter destructor
     return 0;
-}
\ No newline at end of file
+}
diff --git a/samples/opencl/opencl-opencv-interop.cpp b/samples/opencl/opencl-opencv-interop.cpp
index 4f96280cb2..c6630ea45b 100644
--- a/samples/opencl/opencl-opencv-interop.cpp
+++ b/samples/opencl/opencl-opencv-interop.cpp
@@ -16,7 +16,7 @@
 
 #define CL_USE_DEPRECATED_OPENCL_2_0_APIS // eliminate build warning
 
-#if __APPLE__
+#ifdef __APPLE__
 #include <OpenCL/cl.h>
 #else
 #include <CL/cl.h>