Completely separate C and C++ API of OpenCV core

include/opencv/cv.h

@@ -61,8 +61,6 @@
 //CV_WARNING("This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module")
 
 #include "opencv2/core/core_c.h"
-#include "opencv2/core.hpp"
-#include "opencv2/core/utility.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/video.hpp"
@@ -76,9 +74,5 @@
 #define CV_IMPL extern "C"
 #endif //CV_IMPL
 
-#if defined(__cplusplus)
-#include "opencv2/core/internal.hpp"
-#endif //__cplusplus
-
 #endif // __OPENCV_OLD_CV_H_
 

include/opencv/cv.hpp

@@ -47,6 +47,7 @@
 //#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
 //#endif
 
-#include <cv.h>
+#include "cv.h"
+#include "opencv2/core.hpp"
 
 #endif

include/opencv/cvaux.h

@@ -47,7 +47,6 @@
 //#endif
 
 #include "opencv2/core/core_c.h"
-#include "opencv2/core.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/video.hpp"

include/opencv/cvaux.hpp

@@ -46,6 +46,7 @@
 //#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
 //#endif
 
-#include <cvaux.h>
+#include "cvaux.h"
+#include "opencv2/core/utility.hpp"
 
 #endif

include/opencv/cxcore.h

@@ -48,6 +48,5 @@
 //#endif
 
 #include "opencv2/core/core_c.h"
-#include "opencv2/core.hpp"
 
 #endif

include/opencv/cxcore.hpp

@@ -47,6 +47,7 @@
 //#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
 //#endif
 
-#include <cxcore.h>
+#include "cxcore.h"
+#include "opencv2/core.hpp"
 
 #endif

include/opencv/highgui.h

@@ -43,7 +43,6 @@
 #define __OPENCV_OLD_HIGHGUI_H__
 
 #include "opencv2/core/core_c.h"
-#include "opencv2/core.hpp"
 #include "opencv2/highgui/highgui_c.h"
 #include "opencv2/highgui.hpp"
 

include/opencv/ml.h

@@ -42,7 +42,6 @@
 #define __OPENCV_OLD_ML_H__
 
 #include "opencv2/core/core_c.h"
-#include "opencv2/core.hpp"
 #include "opencv2/ml.hpp"
 
 #endif