update the old and the new-style headers after moving some old stuff to the legacy

include/opencv/cv.h

@@ -69,6 +69,7 @@
 #include "opencv2/flann/flann.hpp"
 #include "opencv2/calib3d/calib3d.hpp"
 #include "opencv2/objdetect/objdetect.hpp"
+#include "opencv2/legacy/compat.hpp"
 
 #if !defined(CV_IMPL)
 #define CV_IMPL extern "C"

include/opencv/cvaux.h

@@ -51,12 +51,13 @@
 #include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/video/tracking.hpp"
-#include "opencv2/video/blobtrack.hpp"
 #include "opencv2/video/background_segm.hpp"
 #include "opencv2/features2d/features2d.hpp"
 #include "opencv2/calib3d/calib3d.hpp"
 #include "opencv2/objdetect/objdetect.hpp"
 #include "opencv2/legacy/legacy.hpp"
+#include "opencv2/legacy/compat.hpp"
+#include "opencv2/legacy/blobtrack.hpp"
 #include "opencv2/contrib/contrib.hpp"
 
 #endif

include/opencv2/opencv.hpp

@@ -58,7 +58,6 @@
 #include "opencv2/ml/ml.hpp"
 #include "opencv2/highgui/highgui_c.h"
 #include "opencv2/highgui/highgui.hpp"
-#include "opencv2/legacy/legacy.hpp"
 #include "opencv2/contrib/contrib.hpp"
 
 #endif