Move border type constants and Moments class to core module

modules/video/include/opencv2/video/tracking.hpp

@@ -48,7 +48,7 @@
 #  include "opencv2/imgproc.hpp"
 #endif
 
-#include "opencv2/imgproc/imgproc_c.h"
+#include "opencv2/imgproc/types_c.h"
 
 #ifdef __cplusplus
 extern "C" {

modules/video/src/affineflow.cpp

@@ -41,6 +41,7 @@
 //M*/
 
 #include "precomp.hpp"
+#include "opencv2/imgproc/imgproc_c.h"
 
 // to be moved to legacy
 

modules/video/src/bgfg_gmg.cpp

@@ -49,6 +49,7 @@
  */
 
 #include "precomp.hpp"
+#include <limits>
 
 namespace cv
 {
@@ -72,7 +73,7 @@ public:
         minVal_ = maxVal_ = 0;
         name_ = "BackgroundSubtractor.GMG";
     }
-    
+
     ~BackgroundSubtractorGMGImpl()
     {
     }

modules/video/src/precomp.hpp

@@ -44,9 +44,8 @@
 #define __OPENCV_PRECOMP_H__
 
 #include "opencv2/video.hpp"
-#include "opencv2/imgproc/imgproc_c.h"
-#include "opencv2/core/utility.hpp"
 
+#include "opencv2/core/utility.hpp"
 #include "opencv2/core/private.hpp"
 
 #include <list>

modules/video/src/tvl1flow.cpp

@@ -73,6 +73,7 @@
 */
 
 #include "precomp.hpp"
+#include <limits>
 
 using namespace cv;
 

modules/video/test/test_accum.cpp

@@ -40,6 +40,7 @@
 //M*/
 
 #include "test_precomp.hpp"
+#include "opencv2/imgproc/imgproc_c.h"
 
 using namespace cv;
 using namespace std;

modules/video/test/test_precomp.hpp

@@ -12,7 +12,6 @@
 #include <iostream>
 #include "opencv2/ts.hpp"
 #include "opencv2/imgproc.hpp"
-#include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/video.hpp"
 #include "opencv2/highgui.hpp"