diff --git a/modules/ml/src/ann_mlp.cpp b/modules/ml/src/ann_mlp.cpp
index 5f15c173a1..f4e00aaac7 100644
--- a/modules/ml/src/ann_mlp.cpp
+++ b/modules/ml/src/ann_mlp.cpp
@@ -864,8 +864,8 @@ public:
 
         TermCriteria termcrit;
         termcrit.type = TermCriteria::COUNT + TermCriteria::EPS;
-        termcrit.maxCount = std::max((params.termCrit.type & CV_TERMCRIT_ITER ? params.termCrit.maxCount : MAX_ITER), 1);
-        termcrit.epsilon = std::max((params.termCrit.type & CV_TERMCRIT_EPS ? params.termCrit.epsilon : DEFAULT_EPSILON), DBL_EPSILON);
+        termcrit.maxCount = std::max((params.termCrit.type & TermCriteria::MAX_ITER ? params.termCrit.maxCount : MAX_ITER), 1);
+        termcrit.epsilon = std::max((params.termCrit.type & TermCriteria::EPS ? params.termCrit.epsilon : DEFAULT_EPSILON), DBL_EPSILON);
 
         int iter = 0;
         switch(params.trainMethod){
@@ -901,7 +901,7 @@ public:
         int count = inputs.rows;
 
         int iter = -1, max_iter = termCrit.maxCount*count;
-        double epsilon = (termCrit.type & CV_TERMCRIT_EPS) ? termCrit.epsilon*count : 0;
+        double epsilon = (termCrit.type & TermCriteria::EPS) ? termCrit.epsilon*count : 0;
 
         int l_count = layer_count();
         int ivcount = layer_sizes[0];
diff --git a/modules/ml/src/em.cpp b/modules/ml/src/em.cpp
index 3e0eeb560a..2083617713 100644
--- a/modules/ml/src/em.cpp
+++ b/modules/ml/src/em.cpp
@@ -446,7 +446,7 @@ public:
             CV_Assert(!clusterSamples.empty());
 
             calcCovarMatrix(clusterSamples, covs[clusterIndex], means.row(clusterIndex),
-                CV_COVAR_NORMAL + CV_COVAR_ROWS + CV_COVAR_USE_AVG + CV_COVAR_SCALE, CV_64FC1);
+                COVAR_NORMAL | COVAR_ROWS | COVAR_USE_AVG | COVAR_SCALE, CV_64FC1);
             weights.at<double>(clusterIndex) = static_cast<double>(clusterSamples.rows)/static_cast<double>(nsamples);
         }
 
diff --git a/modules/ml/src/precomp.hpp b/modules/ml/src/precomp.hpp
index 6a91ef98f0..9c3ec06300 100644
--- a/modules/ml/src/precomp.hpp
+++ b/modules/ml/src/precomp.hpp
@@ -43,7 +43,6 @@
 
 #include "opencv2/core.hpp"
 #include "opencv2/ml.hpp"
-#include "opencv2/core/core_c.h"
 #include "opencv2/core/utility.hpp"
 
 #include "opencv2/core/private.hpp"
diff --git a/modules/ml/src/svm.cpp b/modules/ml/src/svm.cpp
index 3bc01ba8ad..9b4b0dcb04 100644
--- a/modules/ml/src/svm.cpp
+++ b/modules/ml/src/svm.cpp
@@ -128,7 +128,7 @@ struct SvmParams
         C = 1;
         nu = 0;
         p = 0;
-        termCrit = TermCriteria( CV_TERMCRIT_ITER+CV_TERMCRIT_EPS, 1000, FLT_EPSILON );
+        termCrit = TermCriteria( TermCriteria::MAX_ITER|TermCriteria::EPS, 1000, FLT_EPSILON );
     }
 
     SvmParams( int _svmType, int _kernelType,
@@ -412,8 +412,7 @@ ParamGrid SVM::getDefaultGrid( int param_id )
         grid.logStep = 7; // total iterations = 3
     }
     else
-        cvError( cv::Error::StsBadArg, "SVM::getDefaultGrid", "Invalid type of parameter "
-                "(use one of SVM::C, SVM::GAMMA et al.)", __FILE__, __LINE__ );
+        CV_Error( cv::Error::StsBadArg, "Invalid type of parameter (use one of SVM::C, SVM::GAMMA et al.)");
     return grid;
 }