Main module headers are moved 1 level up

e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>

Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>

apps/CMakeLists.txt

@@ -1,3 +1,5 @@
+add_definition(-D__OPENCV_BUILD=1)
+
 add_subdirectory(haartraining)
 add_subdirectory(traincascade)
 add_subdirectory(sft)

apps/haartraining/_cvcommon.h

@@ -42,7 +42,7 @@
 #ifndef __CVCOMMON_H_
 #define __CVCOMMON_H_
 
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "opencv2/core/internal.hpp"
 
 #include "cxcore.h"

apps/haartraining/performance.cpp

@@ -44,7 +44,7 @@
  *
  * Measure performance of classifier
  */
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "opencv2/core/internal.hpp"
 
 #include "cv.h"

apps/sft/dataset.cpp

@@ -41,7 +41,7 @@
 //M*/
 
 #include <sft/dataset.hpp>
-#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/highgui.hpp>
 
 #include <iostream>
 #include <queue>

apps/sft/include/sft/common.hpp

@@ -43,8 +43,8 @@
 #ifndef __SFT_COMMON_HPP__
 #define __SFT_COMMON_HPP__
 
-#include <opencv2/core/core.hpp>
+#include <opencv2/core.hpp>
-#include <opencv2/softcascade/softcascade.hpp>
+#include <opencv2/softcascade.hpp>
 
 namespace cv {using namespace softcascade;}
 namespace sft

apps/traincascade/HOGfeatures.cpp

@@ -1,4 +1,4 @@
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "opencv2/core/internal.hpp"
 
 #include "HOGfeatures.h"

apps/traincascade/boost.cpp

@@ -1,4 +1,4 @@
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "opencv2/core/internal.hpp"
 
 #include "boost.h"

apps/traincascade/cascadeclassifier.cpp

@@ -1,4 +1,4 @@
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "opencv2/core/internal.hpp"
 
 #include "cascadeclassifier.h"

apps/traincascade/features.cpp

@@ -1,4 +1,4 @@
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "opencv2/core/internal.hpp"
 
 #include "traincascade_features.h"

apps/traincascade/haarfeatures.cpp

@@ -1,4 +1,4 @@
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "opencv2/core/internal.hpp"
 
 #include "haarfeatures.h"

apps/traincascade/imagestorage.cpp

@@ -1,4 +1,4 @@
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "opencv2/core/internal.hpp"
 
 #include "cv.h"

apps/traincascade/lbpfeatures.cpp

@@ -1,4 +1,4 @@
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "opencv2/core/internal.hpp"
 
 #include "lbpfeatures.h"

apps/traincascade/traincascade.cpp

@@ -1,4 +1,4 @@
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "opencv2/core/internal.hpp"
 
 #include "cv.h"

cmake/OpenCVModule.cmake

@@ -429,7 +429,7 @@ endmacro()
 macro(ocv_glob_module_sources)
   file(GLOB lib_srcs     "src/*.cpp")
   file(GLOB lib_int_hdrs "src/*.hpp" "src/*.h")
-  file(GLOB lib_hdrs     "include/opencv2/${name}/*.hpp" "include/opencv2/${name}/*.h")
+  file(GLOB lib_hdrs     "include/opencv2/*.hpp" "include/opencv2/${name}/*.hpp" "include/opencv2/${name}/*.h")
   file(GLOB lib_hdrs_detail "include/opencv2/${name}/detail/*.hpp" "include/opencv2/${name}/detail/*.h")
 
   file(GLOB lib_device_srcs "src/cuda/*.cu")

doc/check_docs.py

@@ -6,15 +6,15 @@ sys.path.append("../modules/python/src2/")
 import hdr_parser as hp
 
 opencv_hdr_list = [
-"../modules/core/include/opencv2/core/core.hpp",
+"../modules/core/include/opencv2/core.hpp",
-"../modules/ml/include/opencv2/ml/ml.hpp",
+"../modules/ml/include/opencv2/ml.hpp",
-"../modules/imgproc/include/opencv2/imgproc/imgproc.hpp",
+"../modules/imgproc/include/opencv2/imgproc.hpp",
-"../modules/calib3d/include/opencv2/calib3d/calib3d.hpp",
+"../modules/calib3d/include/opencv2/calib3d.hpp",
-"../modules/features2d/include/opencv2/features2d/features2d.hpp",
+"../modules/features2d/include/opencv2/features2d.hpp",
 "../modules/video/include/opencv2/video/tracking.hpp",
 "../modules/video/include/opencv2/video/background_segm.hpp",
-"../modules/objdetect/include/opencv2/objdetect/objdetect.hpp",
+"../modules/objdetect/include/opencv2/objdetect.hpp",
-"../modules/highgui/include/opencv2/highgui/highgui.hpp",
+"../modules/highgui/include/opencv2/highgui.hpp",
 ]
 
 opencv_module_list = [

doc/tutorials/core/interoperability_with_OpenCV_1/interoperability_with_OpenCV_1.rst

@@ -23,9 +23,9 @@ OpenCV 2 received reorganization. No longer are all the functions crammed into a
 
 .. code-block:: cpp
 
-   #include <opencv2/core/core.hpp>
+   #include <opencv2/core.hpp>
-   #include <opencv2/imgproc/imgproc.hpp>
+   #include <opencv2/imgproc.hpp>
-   #include <opencv2/highgui/highgui.hpp>
+   #include <opencv2/highgui.hpp>
 
 
 All the OpenCV related stuff is put into the *cv* namespace to avoid name conflicts with other libraries data structures and functions. Therefore, either you need to prepend the *cv::* keyword before everything that comes from OpenCV or after the includes, you just add a directive to use this:

doc/tutorials/features2d/feature_description/feature_description.rst

@@ -29,10 +29,10 @@ This tutorial code's is shown lines below. You can also download it from `here <
 
    #include <stdio.h>
    #include <iostream>
-   #include "opencv2/core/core.hpp"
+   #include "opencv2/core.hpp"
-   #include "opencv2/features2d/features2d.hpp"
+   #include "opencv2/features2d.hpp"
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
-   #include "opencv2/nonfree/features2d.hpp"
+   #include "opencv2/nonfree.hpp"
 
    using namespace cv;
 

doc/tutorials/features2d/feature_detection/feature_detection.rst

@@ -28,9 +28,9 @@ This tutorial code's is shown lines below. You can also download it from `here <
 
    #include <stdio.h>
    #include <iostream>
-   #include "opencv2/core/core.hpp"
+   #include "opencv2/core.hpp"
-   #include "opencv2/features2d/features2d.hpp"
+   #include "opencv2/features2d.hpp"
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
 
    using namespace cv;
 

doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst

@@ -25,9 +25,9 @@ This tutorial code's is shown lines below. You can also download it from `here <
 
    #include <stdio.h>
    #include <iostream>
-   #include "opencv2/core/core.hpp"
+   #include "opencv2/core.hpp"
-   #include "opencv2/features2d/features2d.hpp"
+   #include "opencv2/features2d.hpp"
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
 
    using namespace cv;
 

doc/tutorials/features2d/feature_homography/feature_homography.rst

@@ -26,10 +26,10 @@ This tutorial code's is shown lines below. You can also download it from `here <
 
    #include <stdio.h>
    #include <iostream>
-   #include "opencv2/core/core.hpp"
+   #include "opencv2/core.hpp"
-   #include "opencv2/features2d/features2d.hpp"
+   #include "opencv2/features2d.hpp"
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
-   #include "opencv2/calib3d/calib3d.hpp"
+   #include "opencv2/calib3d.hpp"
 
    using namespace cv;
 

doc/tutorials/features2d/trackingmotion/corner_subpixeles/corner_subpixeles.rst

@@ -23,8 +23,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
 
 .. code-block:: cpp
 
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
    #include <iostream>
    #include <stdio.h>
    #include <stdlib.h>

doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.rst

@@ -22,8 +22,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
 
 .. code-block:: cpp
 
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
    #include <iostream>
    #include <stdio.h>
    #include <stdlib.h>

doc/tutorials/features2d/trackingmotion/harris_detector/harris_detector.rst

@@ -155,8 +155,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
 
 .. code-block:: cpp
 
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
    #include <iostream>
    #include <stdio.h>
    #include <stdlib.h>

doc/tutorials/imgproc/erosion_dilatation/erosion_dilatation.rst

@@ -74,8 +74,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
 
 .. code-block:: cpp
 
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
    #include "highgui.h"
    #include <stdlib.h>
    #include <stdio.h>

doc/tutorials/imgproc/gausian_median_blur_bilateral_filter/gausian_median_blur_bilateral_filter.rst

@@ -122,8 +122,8 @@ Code
 
 .. code-block:: cpp
 
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
 
    using namespace std;
    using namespace cv;

doc/tutorials/imgproc/histograms/back_projection/back_projection.rst

@@ -107,8 +107,8 @@ Code
 
 .. code-block:: cpp
 
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
 
    #include <iostream>
 

doc/tutorials/imgproc/histograms/histogram_calculation/histogram_calculation.rst

@@ -88,8 +88,8 @@ Code
 
 .. code-block:: cpp
 
-    #include "opencv2/highgui/highgui.hpp"
+    #include "opencv2/highgui.hpp"
-    #include "opencv2/imgproc/imgproc.hpp"
+    #include "opencv2/imgproc.hpp"
     #include <iostream>
     #include <stdio.h>
 

doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst

@@ -86,8 +86,8 @@ Code
 
 .. code-block:: cpp
 
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
    #include <iostream>
    #include <stdio.h>
 

doc/tutorials/imgproc/histograms/histogram_equalization/histogram_equalization.rst

@@ -89,8 +89,8 @@ Code
 
 .. code-block:: cpp
 
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
    #include <iostream>
    #include <stdio.h>
 

doc/tutorials/imgproc/histograms/template_matching/template_matching.rst

@@ -131,8 +131,8 @@ Code
 
 .. code-block:: cpp
 
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
    #include <iostream>
    #include <stdio.h>
 

doc/tutorials/imgproc/imgtrans/canny_detector/canny_detector.rst

@@ -90,8 +90,8 @@ Code
 
 .. code-block::  cpp
 
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
    #include <stdlib.h>
    #include <stdio.h>
 

doc/tutorials/imgproc/imgtrans/copyMakeBorder/copyMakeBorder.rst

@@ -52,8 +52,8 @@ Code
 
 .. code-block:: cpp
 
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
    #include <stdlib.h>
    #include <stdio.h>
 

doc/tutorials/imgproc/imgtrans/filter_2d/filter_2d.rst

@@ -77,8 +77,8 @@ Code
 
 .. code-block:: cpp
 
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
    #include <stdlib.h>
    #include <stdio.h>
 

doc/tutorials/imgproc/imgtrans/hough_circle/hough_circle.rst

@@ -48,8 +48,8 @@ Code
 
 .. code-block:: cpp
 
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
    #include <iostream>
    #include <stdio.h>
 

doc/tutorials/imgproc/imgtrans/hough_lines/hough_lines.rst

@@ -104,8 +104,8 @@ Code
 
 .. code-block:: cpp
 
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
 
    #include <iostream>
 

doc/tutorials/imgproc/imgtrans/laplace_operator/laplace_operator.rst

@@ -59,8 +59,8 @@ Code
 
 .. code-block:: cpp
 
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
    #include <stdlib.h>
    #include <stdio.h>
 

doc/tutorials/imgproc/imgtrans/remap/remap.rst

@@ -63,8 +63,8 @@ Code
 
 .. code-block:: cpp
 
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
    #include <iostream>
    #include <stdio.h>
 

doc/tutorials/imgproc/imgtrans/sobel_derivatives/sobel_derivatives.rst

@@ -125,8 +125,8 @@ Code
 
 .. code-block:: cpp
 
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
    #include <stdlib.h>
    #include <stdio.h>
 

doc/tutorials/imgproc/imgtrans/warp_affine/warp_affine.rst

@@ -97,8 +97,8 @@ Code
 
 .. code-block:: cpp
 
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
    #include <iostream>
    #include <stdio.h>
 

doc/tutorials/imgproc/opening_closing_hats/opening_closing_hats.rst

@@ -115,8 +115,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
 
 .. code-block:: cpp
 
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
    #include <stdlib.h>
    #include <stdio.h>
 

doc/tutorials/imgproc/pyramids/pyramids.rst

@@ -84,8 +84,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
 
 .. code-block:: cpp
 
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
    #include <math.h>
    #include <stdlib.h>
    #include <stdio.h>

doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.rst

@@ -25,8 +25,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
 
 .. code-block:: cpp
 
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
    #include <iostream>
    #include <stdio.h>
    #include <stdlib.h>

doc/tutorials/imgproc/shapedescriptors/bounding_rotated_ellipses/bounding_rotated_ellipses.rst

@@ -25,8 +25,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
 
 .. code-block:: cpp
 
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
    #include <iostream>
    #include <stdio.h>
    #include <stdlib.h>

doc/tutorials/imgproc/shapedescriptors/find_contours/find_contours.rst

@@ -23,8 +23,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
 
 .. code-block:: cpp
 
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
    #include <iostream>
    #include <stdio.h>
    #include <stdlib.h>

doc/tutorials/imgproc/shapedescriptors/hull/hull.rst

@@ -23,8 +23,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
 
 .. code-block:: cpp
 
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
    #include <iostream>
    #include <stdio.h>
    #include <stdlib.h>

doc/tutorials/imgproc/shapedescriptors/moments/moments.rst

@@ -25,8 +25,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
 
 .. code-block:: cpp
 
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
    #include <iostream>
    #include <stdio.h>
    #include <stdlib.h>

doc/tutorials/imgproc/shapedescriptors/point_polygon_test/point_polygon_test.rst

@@ -23,8 +23,8 @@ This tutorial code's is shown lines below. You can also download it from `here <
 
 .. code-block:: cpp
 
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
    #include <iostream>
    #include <stdio.h>
    #include <stdlib.h>

doc/tutorials/imgproc/threshold/threshold.rst

@@ -134,8 +134,8 @@ The tutorial code's is shown lines below. You can also download it from `here <h
 
 .. code-block:: cpp
 
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
    #include <stdlib.h>
    #include <stdio.h>
 

doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst

@@ -26,9 +26,9 @@ This tutorial code's is shown lines below. You can also download it from `here <
 
 .. code-block:: cpp
 
-   #include "opencv2/objdetect/objdetect.hpp"
+   #include "opencv2/objdetect.hpp"
-   #include "opencv2/highgui/highgui.hpp"
+   #include "opencv2/highgui.hpp"
-   #include "opencv2/imgproc/imgproc.hpp"
+   #include "opencv2/imgproc.hpp"
 
    #include <iostream>
    #include <stdio.h>

include/opencv/cv.h

@@ -61,14 +61,14 @@
 //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/core.hpp"
+#include "opencv2/core.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/imgproc.hpp"
-#include "opencv2/video/tracking.hpp"
+#include "opencv2/video.hpp"
-#include "opencv2/features2d/features2d.hpp"
+#include "opencv2/features2d.hpp"
-#include "opencv2/flann/flann.hpp"
+#include "opencv2/flann.hpp"
-#include "opencv2/calib3d/calib3d.hpp"
+#include "opencv2/calib3d.hpp"
-#include "opencv2/objdetect/objdetect.hpp"
+#include "opencv2/objdetect.hpp"
 #include "opencv2/legacy/compat.hpp"
 
 #if !defined(CV_IMPL)

include/opencv/cvaux.h

@@ -47,18 +47,17 @@
 //#endif
 
 #include "opencv2/core/core_c.h"
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/imgproc.hpp"
-#include "opencv2/video/tracking.hpp"
+#include "opencv2/video.hpp"
-#include "opencv2/video/background_segm.hpp"
+#include "opencv2/features2d.hpp"
-#include "opencv2/features2d/features2d.hpp"
+#include "opencv2/calib3d.hpp"
-#include "opencv2/calib3d/calib3d.hpp"
+#include "opencv2/objdetect.hpp"
-#include "opencv2/objdetect/objdetect.hpp"
+#include "opencv2/legacy.hpp"
-#include "opencv2/legacy/legacy.hpp"
 #include "opencv2/legacy/compat.hpp"
 #include "opencv2/legacy/blobtrack.hpp"
-#include "opencv2/contrib/contrib.hpp"
+#include "opencv2/contrib.hpp"
 
 #endif
 

include/opencv/cxcore.h

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

include/opencv/highgui.h

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

include/opencv/ml.h

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

include/opencv2/opencv.hpp

@@ -44,18 +44,18 @@
 #define __OPENCV_ALL_HPP__
 
 #include "opencv2/core/core_c.h"
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "opencv2/flann/miniflann.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/imgproc.hpp"
-#include "opencv2/photo/photo.hpp"
+#include "opencv2/photo.hpp"
-#include "opencv2/video/video.hpp"
+#include "opencv2/video.hpp"
-#include "opencv2/features2d/features2d.hpp"
+#include "opencv2/features2d.hpp"
-#include "opencv2/objdetect/objdetect.hpp"
+#include "opencv2/objdetect.hpp"
-#include "opencv2/calib3d/calib3d.hpp"
+#include "opencv2/calib3d.hpp"
-#include "opencv2/ml/ml.hpp"
+#include "opencv2/ml.hpp"
 #include "opencv2/highgui/highgui_c.h"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui.hpp"
-#include "opencv2/contrib/contrib.hpp"
+#include "opencv2/contrib.hpp"
 
 #endif

modules/CMakeLists.txt

@@ -1,3 +1,5 @@
+add_definition(-D__OPENCV_BUILD=1)
+
 if(NOT OPENCV_MODULES_PATH)
   set(OPENCV_MODULES_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
 endif()

modules/androidcamera/include/camera_activity.hpp

@@ -2,7 +2,6 @@
 #define _CAMERAACTIVITY_H_
 
 #include <camera_properties.h>
-//#include <opencv2/core/core.hpp>
 
 class CameraActivity
 {

modules/calib3d/include/opencv2/calib3d.hpp

@@ -43,8 +43,8 @@
 #ifndef __OPENCV_CALIB3D_HPP__
 #define __OPENCV_CALIB3D_HPP__
 
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
-#include "opencv2/features2d/features2d.hpp"
+#include "opencv2/features2d.hpp"
 
 #ifdef __cplusplus
 extern "C" {

modules/calib3d/perf/perf_precomp.hpp

@@ -9,10 +9,10 @@
 #ifndef __OPENCV_PERF_PRECOMP_HPP__
 #define __OPENCV_PERF_PRECOMP_HPP__
 
-#include "opencv2/ts/ts.hpp"
+#include "opencv2/ts.hpp"
-#include "opencv2/calib3d/calib3d.hpp"
+#include "opencv2/calib3d.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/imgproc.hpp"
 
 #ifdef GTEST_CREATE_SHARED_LIBRARY
 #error no modules except ts should have GTEST_CREATE_SHARED_LIBRARY defined

modules/calib3d/src/calibinit.cpp

@@ -69,7 +69,7 @@
 #ifdef DEBUG_CHESSBOARD
 #  include "opencv2/opencv_modules.hpp"
 #  ifdef HAVE_OPENCV_HIGHGUI
-#    include "opencv2/highgui/highgui.hpp"
+#    include "opencv2/highgui.hpp"
 #  else
 #    undef DEBUG_CHESSBOARD
 #  endif

modules/calib3d/src/checkchessboard.cpp

@@ -49,7 +49,7 @@
 #if defined(DEBUG_WINDOWS)
 #  include "opencv2/opencv_modules.hpp"
 #  ifdef HAVE_OPENCV_HIGHGUI
-#    include "opencv2/highgui/highgui.hpp"
+#    include "opencv2/highgui.hpp"
 #  else
 #    undef DEBUG_WINDOWS
 #  endif

modules/calib3d/src/circlesgrid.cpp

@@ -46,7 +46,7 @@
 #ifdef DEBUG_CIRCLES
 #  include "opencv2/opencv_modules.hpp"
 #  ifdef HAVE_OPENCV_HIGHGUI
-#    include "opencv2/highgui/highgui.hpp"
+#    include "opencv2/highgui.hpp"
 #  else
 #    undef DEBUG_CIRCLES
 #  endif

modules/calib3d/src/precomp.hpp

@@ -46,11 +46,11 @@
 #include "cvconfig.h"
 #endif
 
-#include "opencv2/calib3d/calib3d.hpp"
+#include "opencv2/calib3d.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/imgproc.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/core/internal.hpp"
-#include "opencv2/features2d/features2d.hpp"
+#include "opencv2/features2d.hpp"
 #include <vector>
 
 #ifdef HAVE_TEGRA_OPTIMIZATION

modules/calib3d/test/test_chessboardgenerator.hpp

@@ -1,7 +1,7 @@
 #ifndef CV_CHESSBOARDGENERATOR_H143KJTVYM389YTNHKFDHJ89NYVMO3VLMEJNTBGUEIYVCM203P
 #define CV_CHESSBOARDGENERATOR_H143KJTVYM389YTNHKFDHJ89NYVMO3VLMEJNTBGUEIYVCM203P
 
-#include "opencv2/calib3d/calib3d.hpp"
+#include "opencv2/calib3d.hpp"
 
 namespace cv
 {

modules/calib3d/test/test_precomp.hpp

@@ -9,11 +9,11 @@
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 
-#include "opencv2/ts/ts.hpp"
+#include "opencv2/ts.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/imgproc.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
-#include "opencv2/calib3d/calib3d.hpp"
+#include "opencv2/calib3d.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui.hpp"
 #include <iostream>
 
 namespace cvtest

modules/contrib/doc/facerec/colormaps.rst

@@ -42,9 +42,9 @@ In OpenCV 2.4 you only need :ocv:func:`applyColorMap` to apply a colormap on a g
 
 .. code-block:: cpp
 
-    #include <opencv2/contrib/contrib.hpp>
+    #include <opencv2/contrib.hpp>
-    #include <opencv2/core/core.hpp>
+    #include <opencv2/core.hpp>
-    #include <opencv2/highgui/highgui.hpp>
+    #include <opencv2/highgui.hpp>
 
     using namespace cv;
 

modules/contrib/doc/facerec/src/facerec_demo.cpp

@@ -16,9 +16,9 @@
  *   See <http://www.opensource.org/licenses/bsd-license>
  */
 
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
-#include "opencv2/contrib/contrib.hpp"
+#include "opencv2/contrib.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui.hpp"
 
 
 #include <iostream>

modules/contrib/doc/facerec/src/facerec_eigenfaces.cpp

@@ -16,9 +16,9 @@
  *   See <http://www.opensource.org/licenses/bsd-license>
  */
 
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
-#include "opencv2/contrib/contrib.hpp"
+#include "opencv2/contrib.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui.hpp"
 
 #include <iostream>
 #include <fstream>

modules/contrib/doc/facerec/src/facerec_fisherfaces.cpp

@@ -16,9 +16,9 @@
  *   See <http://www.opensource.org/licenses/bsd-license>
  */
 
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
-#include "opencv2/contrib/contrib.hpp"
+#include "opencv2/contrib.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui.hpp"
 
 #include <iostream>
 #include <fstream>

modules/contrib/doc/facerec/src/facerec_lbph.cpp

@@ -16,9 +16,9 @@
  *   See <http://www.opensource.org/licenses/bsd-license>
  */
 
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
-#include "opencv2/contrib/contrib.hpp"
+#include "opencv2/contrib.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui.hpp"
 
 #include <iostream>
 #include <fstream>

modules/contrib/doc/facerec/src/facerec_save_load.cpp

@@ -16,9 +16,9 @@
  *   See <http://www.opensource.org/licenses/bsd-license>
  */
 
-#include "opencv2/contrib/contrib.hpp"
+#include "opencv2/contrib.hpp"
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui.hpp"
 
 #include <iostream>
 #include <fstream>

modules/contrib/doc/facerec/src/facerec_video.cpp

@@ -16,11 +16,11 @@
  *   See <http://www.opensource.org/licenses/bsd-license>
  */
 
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
-#include "opencv2/contrib/contrib.hpp"
+#include "opencv2/contrib.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/imgproc.hpp"
-#include "opencv2/objdetect/objdetect.hpp"
+#include "opencv2/objdetect.hpp"
 
 #include <iostream>
 #include <fstream>

modules/contrib/include/opencv2/contrib.hpp

@@ -43,10 +43,10 @@
 #ifndef __OPENCV_CONTRIB_HPP__
 #define __OPENCV_CONTRIB_HPP__
 
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/imgproc.hpp"
-#include "opencv2/features2d/features2d.hpp"
+#include "opencv2/features2d.hpp"
-#include "opencv2/objdetect/objdetect.hpp"
+#include "opencv2/objdetect.hpp"
 
 #ifdef __cplusplus
 
@@ -972,4 +972,3 @@ namespace cv
 #endif
 
 #endif
-

modules/contrib/include/opencv2/contrib/detection_based_tracker.hpp

@@ -2,8 +2,8 @@
 
 #if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(ANDROID)
 
-#include <opencv2/core/core.hpp>
+#include <opencv2/core.hpp>
-#include <opencv2/objdetect/objdetect.hpp>
+#include <opencv2/objdetect.hpp>
 
 #include <vector>
 

modules/contrib/include/opencv2/contrib/hybridtracker.hpp

@@ -43,12 +43,11 @@
 #ifndef __OPENCV_HYBRIDTRACKER_H_
 #define __OPENCV_HYBRIDTRACKER_H_
 
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
-#include "opencv2/core/operations.hpp"
+#include "opencv2/imgproc.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/features2d.hpp"
-#include "opencv2/features2d/features2d.hpp"
 #include "opencv2/video/tracking.hpp"
-#include "opencv2/ml/ml.hpp"
+#include "opencv2/ml.hpp"
 
 #ifdef __cplusplus
 

modules/contrib/include/opencv2/contrib/openfabmap.hpp

@@ -52,8 +52,8 @@
 #ifndef __OPENCV_OPENFABMAP_H_
 #define __OPENCV_OPENFABMAP_H_
 
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
-#include "opencv2/features2d/features2d.hpp"
+#include "opencv2/features2d.hpp"
 
 #include <vector>
 #include <list>

modules/contrib/include/opencv2/contrib/retina.hpp

@@ -72,7 +72,7 @@
  *      Author: Alexandre Benoit
  */
 
-#include "opencv2/core/core.hpp" // for all OpenCV core functionalities access, including cv::Exception support
+#include "opencv2/core.hpp" // for all OpenCV core functionalities access, including cv::Exception support
 #include <valarray>
 
 namespace cv

modules/contrib/src/ba.cpp

@@ -40,7 +40,7 @@
 //M*/
 
 #include "precomp.hpp"
-#include "opencv2/calib3d/calib3d.hpp"
+#include "opencv2/calib3d.hpp"
 #include <iostream>
 
 using namespace cv;

modules/contrib/src/chamfermatching.cpp

@@ -46,7 +46,7 @@
 #include "precomp.hpp"
 #include "opencv2/opencv_modules.hpp"
 #ifdef HAVE_OPENCV_HIGHGUI
-#  include "opencv2/highgui/highgui.hpp"
+#  include "opencv2/highgui.hpp"
 #endif
 #include <iostream>
 #include <queue>

modules/contrib/src/featuretracker.cpp

@@ -42,7 +42,7 @@
 #include "precomp.hpp"
 #include <stdio.h>
 #include <iostream>
-#include "opencv2/calib3d/calib3d.hpp"
+#include "opencv2/calib3d.hpp"
 #include "opencv2/contrib/hybridtracker.hpp"
 
 using namespace cv;

modules/contrib/src/gencolors.cpp

@@ -39,7 +39,6 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-#include "opencv2/core/core.hpp"
 #include "precomp.hpp"
 
 #include <iostream>

modules/contrib/src/inputoutput.cpp

@@ -1,5 +1,5 @@
 
-#include "opencv2/contrib/contrib.hpp"
+#include "opencv2/contrib.hpp"
 
 #ifdef WIN32
     #include <windows.h>

modules/contrib/src/precomp.hpp

@@ -47,10 +47,10 @@
 #include "cvconfig.h"
 #endif
 
-#include "opencv2/contrib/contrib.hpp"
+#include "opencv2/contrib.hpp"
-#include "opencv2/features2d/features2d.hpp"
+#include "opencv2/features2d.hpp"
-#include "opencv2/objdetect/objdetect.hpp"
+#include "opencv2/objdetect.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/imgproc.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/core/internal.hpp"
 

modules/contrib/src/rgbdodometry.cpp

@@ -44,11 +44,11 @@
 
 #define SHOW_DEBUG_IMAGES 0
 
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
-#include "opencv2/calib3d/calib3d.hpp"
+#include "opencv2/calib3d.hpp"
 
 #if SHOW_DEBUG_IMAGES
-#  include "opencv2/highgui/highgui.hpp"
+#  include "opencv2/highgui.hpp"
 #endif
 
 #include <iostream>

modules/contrib/test/test_precomp.hpp

@@ -9,8 +9,8 @@
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 
-#include "opencv2/ts/ts.hpp"
+#include "opencv2/ts.hpp"
-#include "opencv2/contrib/contrib.hpp"
+#include "opencv2/contrib.hpp"
 #include <iostream>
 
 #endif

modules/core/doc/basic_structures.rst

@@ -2425,7 +2425,7 @@ The class provides the following features for all derived classes:
 Here is example of SIFT use in your application via Algorithm interface: ::
 
     #include "opencv2/opencv.hpp"
-    #include "opencv2/nonfree/nonfree.hpp"
+    #include "opencv2/nonfree.hpp"
 
     ...
 

modules/core/doc/intro.rst

@@ -30,14 +30,14 @@ All the OpenCV classes and functions are placed into the ``cv`` namespace. There
 
 .. code-block:: c
 
-    #include "opencv2/core/core.hpp"
+    #include "opencv2/core.hpp"
     ...
     cv::Mat H = cv::findHomography(points1, points2, CV_RANSAC, 5);
     ...
 
 or ::
 
-    #include "opencv2/core/core.hpp"
+    #include "opencv2/core.hpp"
     using namespace cv;
     ...
     Mat H = findHomography(points1, points2, CV_RANSAC, 5 );

modules/core/include/opencv2/core/eigen.hpp

@@ -46,7 +46,7 @@
 #ifdef __cplusplus
 
 #include "opencv2/core/core_c.h"
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 
 #if defined _MSC_VER && _MSC_VER >= 1200
 #pragma warning( disable: 4714 ) //__forceinline is not inlined

modules/core/include/opencv2/core/gpumat.hpp

@@ -45,7 +45,7 @@
 
 #ifdef __cplusplus
 
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "opencv2/core/cuda_devptrs.hpp"
 
 namespace cv { namespace gpu

modules/core/include/opencv2/core/opengl.hpp

@@ -45,7 +45,7 @@
 
 #ifdef __cplusplus
 
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 
 namespace cv { namespace ogl {
 

modules/core/perf/perf_precomp.hpp

@@ -9,7 +9,7 @@
 #ifndef __OPENCV_PERF_PRECOMP_HPP__
 #define __OPENCV_PERF_PRECOMP_HPP__
 
-#include "opencv2/ts/ts.hpp"
+#include "opencv2/ts.hpp"
 
 #ifdef GTEST_CREATE_SHARED_LIBRARY
 #error no modules except ts should have GTEST_CREATE_SHARED_LIBRARY defined

modules/core/src/gl_core_3_1.cpp

@@ -1,7 +1,7 @@
 #include <string>
 #include <sstream>
 #include "cvconfig.h"
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "gl_core_3_1.hpp"
 
 #ifdef HAVE_OPENGL

modules/core/src/matrix.cpp

@@ -42,7 +42,7 @@
 
 #include "precomp.hpp"
 #include "opencv2/core/gpumat.hpp"
-#include "opencv2/core/opengl_interop.hpp"
+#include "opencv2/core/opengl.hpp"
 
 /****************************************************************************************\
 *                           [scaled] Identity matrix initialization                      *

modules/core/src/opengl_interop.cpp

@@ -41,7 +41,7 @@
 //M*/
 
 #include "precomp.hpp"
-#include "opencv2/core/opengl_interop.hpp"
+#include "opencv2/core/opengl.hpp"
 #include "opencv2/core/gpumat.hpp"
 
 #ifdef HAVE_OPENGL

modules/core/src/precomp.hpp

@@ -47,7 +47,7 @@
 #include "cvconfig.h"
 #endif
 
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "opencv2/core/core_c.h"
 #include "opencv2/core/internal.hpp"
 

modules/core/test/test_precomp.hpp

@@ -9,7 +9,7 @@
 #ifndef __OPENCV_TEST_PRECOMP_HPP__
 #define __OPENCV_TEST_PRECOMP_HPP__
 
-#include "opencv2/ts/ts.hpp"
+#include "opencv2/ts.hpp"
 #include "opencv2/core/core_c.h"
 #include <iostream>
 

modules/features2d/include/opencv2/features2d.hpp

@@ -43,7 +43,7 @@
 #ifndef __OPENCV_FEATURES_2D_HPP__
 #define __OPENCV_FEATURES_2D_HPP__
 
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "opencv2/flann/miniflann.hpp"
 
 #ifdef __cplusplus

modules/features2d/perf/perf_precomp.hpp

@@ -9,9 +9,9 @@
 #ifndef __OPENCV_PERF_PRECOMP_HPP__
 #define __OPENCV_PERF_PRECOMP_HPP__
 
-#include "opencv2/ts/ts.hpp"
+#include "opencv2/ts.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/highgui.hpp"
-#include "opencv2/features2d/features2d.hpp"
+#include "opencv2/features2d.hpp"
 
 #ifdef GTEST_CREATE_SHARED_LIBRARY
 #error no modules except ts should have GTEST_CREATE_SHARED_LIBRARY defined