diff --git a/modules/ccalib/include/opencv2/ccalib/randpattern.hpp b/modules/ccalib/include/opencv2/ccalib/randpattern.hpp
index 1f9491783..9fc08f84e 100644
--- a/modules/ccalib/include/opencv2/ccalib/randpattern.hpp
+++ b/modules/ccalib/include/opencv2/ccalib/randpattern.hpp
@@ -150,7 +150,7 @@ B. Li, L. Heng, K. Kevin  and M. Pollefeys, "A Multiple-Camera System
 Calibration Toolbox Using A Feature Descriptor-Based Calibration
 Pattern", in IROS 2013.
 */
-class RandomPatternGenerator
+class CV_EXPORTS RandomPatternGenerator
 {
 public:
     /* @brief Construct RandomPatternGenerator
diff --git a/modules/ccalib/sample/multi_cameras_calibration.cpp b/modules/ccalib/samples/multi_cameras_calibration.cpp
similarity index 100%
rename from modules/ccalib/sample/multi_cameras_calibration.cpp
rename to modules/ccalib/samples/multi_cameras_calibration.cpp
diff --git a/modules/ccalib/sample/omni_calibration.cpp b/modules/ccalib/samples/omni_calibration.cpp
similarity index 99%
rename from modules/ccalib/sample/omni_calibration.cpp
rename to modules/ccalib/samples/omni_calibration.cpp
index a31d8c078..1121ab483 100644
--- a/modules/ccalib/sample/omni_calibration.cpp
+++ b/modules/ccalib/samples/omni_calibration.cpp
@@ -114,7 +114,7 @@ static void saveCameraParams( const string & filename, Size imageSize, Size boar
 
     if ( flags != 0)
     {
-        sprintf( buf, "flags: %s%s%s%s%s",
+        sprintf( buf, "flags: %s%s%s%s%s%s%s%s%s",
             flags & omnidir::CALIB_USE_GUESS ? "+use_intrinsic_guess" : "",
             flags & omnidir::CALIB_FIX_SKEW ? "+fix_skew" : "",
             flags & omnidir::CALIB_FIX_K1 ? "+fix_k1" : "",
diff --git a/modules/ccalib/sample/omni_stereo_calibration.cpp b/modules/ccalib/samples/omni_stereo_calibration.cpp
similarity index 99%
rename from modules/ccalib/sample/omni_stereo_calibration.cpp
rename to modules/ccalib/samples/omni_stereo_calibration.cpp
index 50026b618..ae19164f4 100644
--- a/modules/ccalib/sample/omni_stereo_calibration.cpp
+++ b/modules/ccalib/samples/omni_stereo_calibration.cpp
@@ -129,7 +129,7 @@ static void saveCameraParams( const string & filename, const int flags, const Ma
 
     if ( flags != 0)
     {
-        sprintf( buf, "flags: %s%s%s%s%s",
+        sprintf( buf, "flags: %s%s%s%s%s%s%s%s%s",
             flags & omnidir::CALIB_USE_GUESS ? "+use_intrinsic_guess" : "",
             flags & omnidir::CALIB_FIX_SKEW ? "+fix_skew" : "",
             flags & omnidir::CALIB_FIX_K1 ? "+fix_k1" : "",
diff --git a/modules/ccalib/sample/random_pattern_calibration.cpp b/modules/ccalib/samples/random_pattern_calibration.cpp
similarity index 100%
rename from modules/ccalib/sample/random_pattern_calibration.cpp
rename to modules/ccalib/samples/random_pattern_calibration.cpp
diff --git a/modules/ccalib/sample/random_pattern_generator.cpp b/modules/ccalib/samples/random_pattern_generator.cpp
similarity index 100%
rename from modules/ccalib/sample/random_pattern_generator.cpp
rename to modules/ccalib/samples/random_pattern_generator.cpp