diff --git a/modules/ccalib/include/opencv2/ccalib.hpp b/modules/ccalib/include/opencv2/ccalib.hpp
index 780613cdc..53285e2be 100644
--- a/modules/ccalib/include/opencv2/ccalib.hpp
+++ b/modules/ccalib/include/opencv2/ccalib.hpp
@@ -49,7 +49,7 @@
 
 #include <vector>
 
-namespace cv{
+namespace cv{ namespace ccalib{
 
 class CV_EXPORTS CustomPattern : public Algorithm
 {
@@ -144,6 +144,6 @@ private:
 	void refineKeypointsPos(const Mat& img, std::vector<KeyPoint>& kp);
 };
 
-} // cv
+}} // namespace ccalib, cv
 
 #endif
diff --git a/modules/ccalib/src/ccalib.cpp b/modules/ccalib/src/ccalib.cpp
index 5b1b48408..861fbedb2 100644
--- a/modules/ccalib/src/ccalib.cpp
+++ b/modules/ccalib/src/ccalib.cpp
@@ -55,17 +55,17 @@
 #include <vector>
 #include <cstring>
 
+namespace cv{ namespace ccalib{
+
 using namespace std;
 
-#define MIN_CONTOUR_AREA_PX     100
-#define MIN_CONTOUR_AREA_RATIO  0.2
-#define MAX_CONTOUR_AREA_RATIO  5
+const int MIN_CONTOUR_AREA_PX      = 100;
+const float MIN_CONTOUR_AREA_RATIO = 0.2;
+const float MAX_CONTOUR_AREA_RATIO = 5.0;
 
-#define MIN_POINTS_FOR_H        10
+const int MIN_POINTS_FOR_H         = 10;
 
-#define MAX_PROJ_ERROR_PX       5.0
-
-namespace cv{
+const float MAX_PROJ_ERROR_PX      = 5.0;
 
 CustomPattern::CustomPattern()
 {
@@ -487,8 +487,8 @@ void CustomPattern::drawOrientation(InputOutputArray image, InputArray tvec, Inp
     img.copyTo(image);
 }
 
-} // namespace cv
+}} // namespace ccalib, cv
 
-#endif //_CPP
+#endif // __OPENCV_CCALIB_CPP__
 #endif // cplusplus