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>

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/core/core.hpp>
-    #include <opencv2/highgui/highgui.hpp>
+    #include <opencv2/contrib.hpp>
+    #include <opencv2/core.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/contrib/contrib.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/core.hpp"
+#include "opencv2/contrib.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/contrib/contrib.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/core.hpp"
+#include "opencv2/contrib.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/contrib/contrib.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/core.hpp"
+#include "opencv2/contrib.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/contrib/contrib.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/core.hpp"
+#include "opencv2/contrib.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/core/core.hpp"
-#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/contrib.hpp"
+#include "opencv2/core.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/contrib/contrib.hpp"
-#include "opencv2/highgui/highgui.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/objdetect/objdetect.hpp"
+#include "opencv2/core.hpp"
+#include "opencv2/contrib.hpp"
+#include "opencv2/highgui.hpp"
+#include "opencv2/imgproc.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/imgproc/imgproc.hpp"
-#include "opencv2/features2d/features2d.hpp"
-#include "opencv2/objdetect/objdetect.hpp"
+#include "opencv2/core.hpp"
+#include "opencv2/imgproc.hpp"
+#include "opencv2/features2d.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/objdetect/objdetect.hpp>
+#include <opencv2/core.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/operations.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/features2d/features2d.hpp"
+#include "opencv2/core.hpp"
+#include "opencv2/imgproc.hpp"
+#include "opencv2/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/features2d/features2d.hpp"
+#include "opencv2/core.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/features2d/features2d.hpp"
-#include "opencv2/objdetect/objdetect.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/contrib.hpp"
+#include "opencv2/features2d.hpp"
+#include "opencv2/objdetect.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/calib3d/calib3d.hpp"
+#include "opencv2/core.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/contrib/contrib.hpp"
+#include "opencv2/ts.hpp"
+#include "opencv2/contrib.hpp"
 #include <iostream>
 
 #endif