calib3d module in opencv is split into 3 modules: 3d, calib and stereo.

stereo module in opencv_contrib is renamed to xstereo

samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp

@@ -7,7 +7,8 @@
 #include <opencv2/core.hpp>
 #include <opencv2/core/utility.hpp>
 #include <opencv2/imgproc.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
+#include <opencv2/calib.hpp>
 #include <opencv2/imgcodecs.hpp>
 #include <opencv2/videoio.hpp>
 #include <opencv2/highgui.hpp>

samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/PnPProblem.cpp

@@ -11,7 +11,7 @@
 #include "PnPProblem.h"
 #include "Mesh.h"
 
-#include <opencv2/calib3d/calib3d.hpp>
+#include <opencv2/3d.hpp>
 
 /* Functions for Möller-Trumbore intersection algorithm */
 static cv::Point3f CROSS(cv::Point3f v1, cv::Point3f v2)

samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/Utils.cpp

@@ -13,7 +13,7 @@
 
 #include <opencv2/opencv_modules.hpp>
 #include <opencv2/imgproc.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 #include <opencv2/flann.hpp>
 #if defined (HAVE_OPENCV_XFEATURES2D)
 #include <opencv2/xfeatures2d.hpp>
@@ -182,7 +182,7 @@ double get_rotation_error(const cv::Mat &R_true, const cv::Mat &R)
 {
     cv::Mat error_vec, error_mat;
     error_mat = -R_true * R.t();
-    cv::Rodrigues(error_mat, error_vec);
+    Rodrigues(error_mat, error_vec);
 
     return cv::norm(error_vec);
 }

samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/main_detection.cpp

@@ -5,7 +5,7 @@
 #include <opencv2/core/utils/filesystem.hpp>
 #include <opencv2/highgui.hpp>
 #include <opencv2/imgproc.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 #include <opencv2/video/tracking.hpp>
 // PnP Tutorial
 #include "Mesh.h"

samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/src/main_registration.cpp

@@ -3,7 +3,7 @@
 // OpenCV
 #include <opencv2/core.hpp>
 #include <opencv2/imgproc.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 #include <opencv2/features2d.hpp>
 // PnP Tutorial
 #include "Mesh.h"