diff --git a/modules/ccalib/include/opencv2/omnidir.hpp b/modules/ccalib/include/opencv2/omnidir.hpp
index 4d0ad9f6b..ac25a4d82 100644
--- a/modules/ccalib/include/opencv2/omnidir.hpp
+++ b/modules/ccalib/include/opencv2/omnidir.hpp
@@ -38,6 +38,10 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
+
+#include <opencv2/core.hpp>
+#include <vector>
+
 #ifndef __OPENCV_OMNIDIR_HPP__
 #define __OPENCV_OMNIDIR_HPP__
 
diff --git a/modules/ccalib/sample/multiCamCalib.cpp b/modules/ccalib/sample/multiCamCalib.cpp
index c856f01c4..74385786c 100644
--- a/modules/ccalib/sample/multiCamCalib.cpp
+++ b/modules/ccalib/sample/multiCamCalib.cpp
@@ -7,11 +7,11 @@ using namespace cv;
 
 const char * usage =
 "\n example command line for multi-camera calibration by using random pattern \n"
-"   multiCamCalib -nc 5 -pw 800 -ph 600 -ct 1 -fe 0 -nm 10 multi_camera.xml \n"
+"   multiCamCalib -nc 5 -pw 800 -ph 600 -ct 1 -fe 0 -nm 20 multi_camera_omnidir.xml \n"
 "\n"
-" the file multi_camera.xml is generated by imagelist_creator as \n"
-" imagelist_creator multi_camera.xml *.* \n"
-" note the first filename in multi_camera.xml is the pattern, the rest are photo names,\n"
+" the file multi_camera_omnidir.xml is generated by imagelist_creator as \n"
+" imagelist_creator multi_camera_omnidir.xml *.* \n"
+" note the first filename in multi_camera_omnidir.xml is the pattern, the rest are photo names,\n"
 " photo names should be in form of cameraIdx-timestamp.*, and cameraIdx starts from 0";
 
 static void help()
diff --git a/modules/ccalib/sample/omniCalibration.cpp b/modules/ccalib/sample/omniCalibration.cpp
index 626c78bb3..76b04365a 100644
--- a/modules/ccalib/sample/omniCalibration.cpp
+++ b/modules/ccalib/sample/omniCalibration.cpp
@@ -1,7 +1,8 @@
-#include"opencv2/omnidir.hpp"
-#include"opencv2/core/core.hpp"
-#include"opencv2/imgproc/imgproc.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/omnidir.hpp"
+#include "opencv2/core.hpp"
+#include "opencv2/imgproc.hpp"
+#include "opencv2/calib3d.hpp"
+#include "opencv2/highgui.hpp"
 #include <vector>
 #include <iostream>
 #include <string>
@@ -12,10 +13,10 @@ using namespace std;
 
 const char * usage =
 "\n example command line for omnidirectional camera calibration.\n"
-"    omniCalibration -w 6 -h 7 -sw 80 -sh 80 image_list.xml \n"
+"    omniCalibration -w 6 -h 9 -sw 80 -sh 80 imagelist.xml \n"
 " \n"
-" the file image_list.xml is generated by imagelist_creator as\n"
-"imagelist_creator image_list.xml *.*";
+" the file imagelist.xml is generated by imagelist_creator as\n"
+"imagelist_creator imagelist.xml *.*";
 
 static void help()
 {
diff --git a/modules/ccalib/sample/omniStereoCalibration.cpp b/modules/ccalib/sample/omniStereoCalibration.cpp
index 5d52f28be..00fc9c0ac 100644
--- a/modules/ccalib/sample/omniStereoCalibration.cpp
+++ b/modules/ccalib/sample/omniStereoCalibration.cpp
@@ -1,7 +1,8 @@
-#include"opencv2/omnidir.hpp"
-#include"opencv2/core/core.hpp"
-#include"opencv2/imgproc/imgproc.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/omnidir.hpp"
+#include "opencv2/core.hpp"
+#include "opencv2/imgproc.hpp"
+#include "opencv2/highgui.hpp"
+#include "opencv2/calib3d.hpp"
 #include <vector>
 #include <iostream>
 #include <string>
diff --git a/modules/ccalib/sample/randomPatternCalibration.cpp b/modules/ccalib/sample/randomPatternCalibration.cpp
index 33e82da29..a39e5b38f 100644
--- a/modules/ccalib/sample/randomPatternCalibration.cpp
+++ b/modules/ccalib/sample/randomPatternCalibration.cpp
@@ -157,5 +157,5 @@ int main(int argc, char** argv)
     Mat D;
     vector<Mat> rvec, tvec;
     double rms = calibrateCamera(objectPoints, imagePoints, vecImg[0].size(), K, D, rvec, tvec);
-    saveCameraParams("camera_params.xml", vecImg[0].size(), patternWidth, patternHeight, flags, K, D, rvec, tvec, rms);
+    saveCameraParams(outputFilename, vecImg[0].size(), patternWidth, patternHeight, flags, K, D, rvec, tvec, rms);
 }