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/gpu/CMakeLists.txt

@@ -7,7 +7,7 @@ ocv_add_module(gpu opencv_imgproc opencv_calib3d opencv_objdetect opencv_video o
 
 ocv_module_include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/cuda")
 
-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_device_hdrs        "include/opencv2/${name}/device/*.hpp"        "include/opencv2/${name}/device/*.h")
 file(GLOB lib_device_hdrs_detail "include/opencv2/${name}/device/detail/*.hpp" "include/opencv2/${name}/device/detail/*.h")
 file(GLOB lib_int_hdrs           "src/*.hpp"      "src/*.h")

modules/gpu/app/nv_perf_test/main.cpp

@@ -1,12 +1,11 @@
 #include <cstdio>
 #define HAVE_CUDA 1
-#include <opencv2/core/core.hpp>
-#include <opencv2/gpu/gpu.hpp>
-#include <opencv2/highgui/highgui.hpp>
-#include <opencv2/video/video.hpp>
-#include <opencv2/legacy/legacy.hpp>
-#include <opencv2/ts/ts.hpp>
-#include <opencv2/ts/ts_perf.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/gpu.hpp>
+#include <opencv2/highgui.hpp>
+#include <opencv2/video.hpp>
+#include <opencv2/legacy.hpp>
+#include <opencv2/ts.hpp>
 
 static void printOsInfo()
 {

modules/gpu/include/opencv2/gpu.hpp

@@ -50,9 +50,9 @@
 #endif
 
 #include "opencv2/core/gpumat.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/objdetect/objdetect.hpp"
-#include "opencv2/features2d/features2d.hpp"
+#include "opencv2/imgproc.hpp"
+#include "opencv2/objdetect.hpp"
+#include "opencv2/features2d.hpp"
 
 namespace cv { namespace gpu {
 

modules/gpu/include/opencv2/gpu/stream_accessor.hpp

@@ -43,7 +43,7 @@
 #ifndef __OPENCV_GPU_STREAM_ACCESSOR_HPP__
 #define __OPENCV_GPU_STREAM_ACCESSOR_HPP__
 
-#include "opencv2/gpu/gpu.hpp"
+#include "opencv2/gpu.hpp"
 #include "cuda_runtime_api.h"
 
 namespace cv

modules/gpu/perf/perf_precomp.hpp

@@ -18,18 +18,17 @@
 #include <cuda_runtime.h>
 #endif
 
-#include "opencv2/ts/ts.hpp"
-#include "opencv2/ts/ts_perf.hpp"
+#include "opencv2/ts.hpp"
 
-#include "opencv2/core/core.hpp"
-#include "opencv2/highgui/highgui.hpp"
-#include "opencv2/gpu/gpu.hpp"
-#include "opencv2/calib3d/calib3d.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/video/video.hpp"
-#include "opencv2/nonfree/nonfree.hpp"
-#include "opencv2/legacy/legacy.hpp"
-#include "opencv2/photo/photo.hpp"
+#include "opencv2/core.hpp"
+#include "opencv2/highgui.hpp"
+#include "opencv2/gpu.hpp"
+#include "opencv2/calib3d.hpp"
+#include "opencv2/imgproc.hpp"
+#include "opencv2/video.hpp"
+#include "opencv2/nonfree.hpp"
+#include "opencv2/legacy.hpp"
+#include "opencv2/photo.hpp"
 
 #include "utility.hpp"
 

modules/gpu/perf/utility.hpp

@@ -1,8 +1,8 @@
 #ifndef __OPENCV_PERF_GPU_UTILITY_HPP__
 #define __OPENCV_PERF_GPU_UTILITY_HPP__
 
-#include "opencv2/core/core.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/core.hpp"
+#include "opencv2/imgproc.hpp"
 #include "opencv2/ts/ts_perf.hpp"
 
 cv::Mat readImage(const std::string& fileName, int flags = cv::IMREAD_COLOR);

modules/gpu/perf4au/main.cpp

@@ -2,13 +2,12 @@
 #ifdef HAVE_CVCONFIG_H
 #include "cvconfig.h"
 #endif
-#include "opencv2/core/core.hpp"
-#include "opencv2/gpu/gpu.hpp"
-#include "opencv2/highgui/highgui.hpp"
-#include "opencv2/video/video.hpp"
-#include "opencv2/legacy/legacy.hpp"
-#include "opencv2/ts/ts.hpp"
-#include "opencv2/ts/ts_perf.hpp"
+#include "opencv2/core.hpp"
+#include "opencv2/gpu.hpp"
+#include "opencv2/highgui.hpp"
+#include "opencv2/video.hpp"
+#include "opencv2/legacy.hpp"
+#include "opencv2/ts.hpp"
 
 static void printOsInfo()
 {

modules/gpu/src/precomp.hpp

@@ -66,12 +66,12 @@
 #include <memory>
 #include <string>
 
-#include "opencv2/gpu/gpu.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/gpu.hpp"
+#include "opencv2/imgproc.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
-#include "opencv2/calib3d/calib3d.hpp"
+#include "opencv2/calib3d.hpp"
 #include "opencv2/core/internal.hpp"
-#include "opencv2/video/video.hpp"
+#include "opencv2/video.hpp"
 
 #if defined WIN32 || defined WINCE
     #include <windows.h>

modules/gpu/test/interpolation.hpp

@@ -42,8 +42,8 @@
 #ifndef __OPENCV_TEST_INTERPOLATION_HPP__
 #define __OPENCV_TEST_INTERPOLATION_HPP__
 
-#include "opencv2/core/core.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/core.hpp"
+#include "opencv2/imgproc.hpp"
 
 template <typename T> T readVal(const cv::Mat& src, int y, int x, int c, int border_type, cv::Scalar borderVal = cv::Scalar())
 {

modules/gpu/test/nvidia/NCVTestSourceProvider.hpp

@@ -14,7 +14,7 @@
 #include <memory>
 
 #include "NCV.hpp"
-#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/highgui.hpp>
 
 
 template <class T>

modules/gpu/test/test_precomp.hpp

@@ -69,17 +69,16 @@
     #include <cuda.h>
     #include <cuda_runtime.h>
 
-    #include "opencv2/core/core.hpp"
-    #include "opencv2/core/opengl_interop.hpp"
-    #include "opencv2/highgui/highgui.hpp"
-    #include "opencv2/calib3d/calib3d.hpp"
-    #include "opencv2/imgproc/imgproc.hpp"
-    #include "opencv2/video/video.hpp"
-    #include "opencv2/ts/ts.hpp"
-    #include "opencv2/ts/ts_perf.hpp"
-    #include "opencv2/gpu/gpu.hpp"
-    #include "opencv2/nonfree/nonfree.hpp"
-    #include "opencv2/legacy/legacy.hpp"
+    #include "opencv2/core.hpp"
+    #include "opencv2/core/opengl.hpp"
+    #include "opencv2/highgui.hpp"
+    #include "opencv2/calib3d.hpp"
+    #include "opencv2/imgproc.hpp"
+    #include "opencv2/video.hpp"
+    #include "opencv2/ts.hpp"
+    #include "opencv2/gpu.hpp"
+    #include "opencv2/nonfree.hpp"
+    #include "opencv2/legacy.hpp"
 
     #include "utility.hpp"
     #include "interpolation.hpp"

modules/gpu/test/utility.hpp

@@ -42,11 +42,10 @@
 #ifndef __OPENCV_GPU_TEST_UTILITY_HPP__
 #define __OPENCV_GPU_TEST_UTILITY_HPP__
 
-#include "opencv2/core/core.hpp"
+#include "opencv2/core.hpp"
 #include "opencv2/core/gpumat.hpp"
-#include "opencv2/highgui/highgui.hpp"
-#include "opencv2/ts/ts.hpp"
-#include "opencv2/ts/ts_perf.hpp"
+#include "opencv2/highgui.hpp"
+#include "opencv2/ts.hpp"
 
 //////////////////////////////////////////////////////////////////////
 // random generators