diff --git a/ext/opencv/MotionCells.h b/ext/opencv/MotionCells.h
index 6c060a9eea..96b048379d 100644
--- a/ext/opencv/MotionCells.h
+++ b/ext/opencv/MotionCells.h
@@ -45,12 +45,12 @@
 #ifndef MOTIONCELLS_H_
 #define MOTIONCELLS_H_
 
-#include <opencv2/core/core_c.h>
+#include <opencv2/core.hpp>
 #ifdef HAVE_HIGHGUI_H
 #include <highgui.h>            // includes highGUI definitions
 #endif
 #ifdef HAVE_OPENCV2_HIGHGUI_HIGHGUI_C_H
-#include <opencv2/highgui/highgui_c.h>            // includes highGUI definitions
+#include <opencv2/highgui.hpp>            // includes highGUI definitions
 #endif
 #include <fstream>
 #include <vector>
diff --git a/ext/opencv/gstcameracalibrate.h b/ext/opencv/gstcameracalibrate.h
index 9d3419ca23..8fe4a5de9f 100644
--- a/ext/opencv/gstcameracalibrate.h
+++ b/ext/opencv/gstcameracalibrate.h
@@ -48,7 +48,7 @@
 
 #include <gst/opencv/gstopencvvideofilter.h>
 
-#include <opencv2/core/core.hpp>
+#include <opencv2/core.hpp>
 
 G_BEGIN_DECLS
 
diff --git a/ext/opencv/gstcameraundistort.h b/ext/opencv/gstcameraundistort.h
index 7938171bad..4bbe86ec77 100644
--- a/ext/opencv/gstcameraundistort.h
+++ b/ext/opencv/gstcameraundistort.h
@@ -48,7 +48,7 @@
 
 #include <gst/opencv/gstopencvvideofilter.h>
 
-#include <opencv2/core/core.hpp>
+#include <opencv2/core.hpp>
 
 G_BEGIN_DECLS
 
diff --git a/ext/opencv/gstcvdilate.cpp b/ext/opencv/gstcvdilate.cpp
index bc6b032165..673df6bd84 100644
--- a/ext/opencv/gstcvdilate.cpp
+++ b/ext/opencv/gstcvdilate.cpp
@@ -59,7 +59,7 @@
 #endif
 
 #include "gstcvdilate.h"
-#include <opencv2/imgproc/imgproc_c.h>
+#include <opencv2/imgproc.hpp>
 
 GST_DEBUG_CATEGORY_STATIC (gst_cv_dilate_debug);
 #define GST_CAT_DEFAULT gst_cv_dilate_debug
diff --git a/ext/opencv/gstcvdilateerode.cpp b/ext/opencv/gstcvdilateerode.cpp
index 05823d97e1..0d8ee3e9c8 100644
--- a/ext/opencv/gstcvdilateerode.cpp
+++ b/ext/opencv/gstcvdilateerode.cpp
@@ -53,7 +53,7 @@
 #include "gst/opencv/gstopencvutils.h"
 #include "gstcvdilateerode.h"
 
-#include <opencv2/core/core_c.h>
+#include <opencv2/core.hpp>
 
 /*
 GST_DEBUG_CATEGORY_STATIC (gst_cv_dilate_erode_debug);
diff --git a/ext/opencv/gstcvequalizehist.cpp b/ext/opencv/gstcvequalizehist.cpp
index bd3a7f03f9..7f6327eb8e 100644
--- a/ext/opencv/gstcvequalizehist.cpp
+++ b/ext/opencv/gstcvequalizehist.cpp
@@ -61,7 +61,7 @@
 #endif
 
 #include "gstcvequalizehist.h"
-#include <opencv2/imgproc/imgproc_c.h>
+#include <opencv2/imgproc.hpp>
 
 GST_DEBUG_CATEGORY_STATIC (gst_cv_equalize_hist_debug);
 #define GST_CAT_DEFAULT gst_cv_equalize_hist_debug
diff --git a/ext/opencv/gstcverode.cpp b/ext/opencv/gstcverode.cpp
index 39b72be572..65e4a55d21 100644
--- a/ext/opencv/gstcverode.cpp
+++ b/ext/opencv/gstcverode.cpp
@@ -59,7 +59,7 @@
 #endif
 
 #include "gstcverode.h"
-#include <opencv2/imgproc/imgproc_c.h>
+#include <opencv2/imgproc.hpp>
 
 GST_DEBUG_CATEGORY_STATIC (gst_cv_erode_debug);
 #define GST_CAT_DEFAULT gst_cv_erode_debug
diff --git a/ext/opencv/gstcvlaplace.cpp b/ext/opencv/gstcvlaplace.cpp
index d4baed8bbd..3bac16020e 100644
--- a/ext/opencv/gstcvlaplace.cpp
+++ b/ext/opencv/gstcvlaplace.cpp
@@ -59,7 +59,7 @@
 #endif
 
 #include "gstcvlaplace.h"
-#include <opencv2/imgproc/imgproc_c.h>
+#include <opencv2/imgproc.hpp>
 
 GST_DEBUG_CATEGORY_STATIC (gst_cv_laplace_debug);
 #define GST_CAT_DEFAULT gst_cv_laplace_debug
diff --git a/ext/opencv/gstcvsmooth.cpp b/ext/opencv/gstcvsmooth.cpp
index baf0a1042e..a8d1c5acfa 100644
--- a/ext/opencv/gstcvsmooth.cpp
+++ b/ext/opencv/gstcvsmooth.cpp
@@ -60,7 +60,7 @@
 
 #include "gst/opencv/gstopencvutils.h"
 #include "gstcvsmooth.h"
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/imgproc.hpp>
 
 
 GST_DEBUG_CATEGORY_STATIC (gst_cv_smooth_debug);
diff --git a/ext/opencv/gstcvsobel.cpp b/ext/opencv/gstcvsobel.cpp
index 8c329cbd91..9fc0079b1e 100644
--- a/ext/opencv/gstcvsobel.cpp
+++ b/ext/opencv/gstcvsobel.cpp
@@ -59,7 +59,7 @@
 #endif
 
 #include "gstcvsobel.h"
-#include <opencv2/imgproc/imgproc_c.h>
+#include <opencv2/imgproc.hpp>
 
 GST_DEBUG_CATEGORY_STATIC (gst_cv_sobel_debug);
 #define GST_CAT_DEFAULT gst_cv_sobel_debug
diff --git a/ext/opencv/gstdewarp.h b/ext/opencv/gstdewarp.h
index c8ab32a321..3ef260ddd9 100644
--- a/ext/opencv/gstdewarp.h
+++ b/ext/opencv/gstdewarp.h
@@ -47,8 +47,8 @@
 
 #include <gst/gst.h>
 #include <gst/opencv/gstopencvvideofilter.h>
-#include <opencv2/core/core.hpp>
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
 
 G_BEGIN_DECLS
 /* #defines don't like whitespacey bits */
diff --git a/ext/opencv/gstedgedetect.cpp b/ext/opencv/gstedgedetect.cpp
index c3db499170..3b8cfcaab8 100644
--- a/ext/opencv/gstedgedetect.cpp
+++ b/ext/opencv/gstedgedetect.cpp
@@ -61,7 +61,7 @@
 #endif
 
 #include "gstedgedetect.h"
-#include <opencv2/imgproc/imgproc_c.h>
+#include <opencv2/imgproc.hpp>
 
 GST_DEBUG_CATEGORY_STATIC (gst_edge_detect_debug);
 #define GST_CAT_DEFAULT gst_edge_detect_debug
diff --git a/ext/opencv/gstedgedetect.h b/ext/opencv/gstedgedetect.h
index af1cb8efc5..9248519442 100644
--- a/ext/opencv/gstedgedetect.h
+++ b/ext/opencv/gstedgedetect.h
@@ -47,7 +47,7 @@
 #define __GST_EDGE_DETECT_H__
 
 #include <gst/opencv/gstopencvvideofilter.h>
-#include <opencv2/core/core_c.h>
+#include <opencv2/core.hpp>
 
 G_BEGIN_DECLS
 /* #defines don't like whitespacey bits */
diff --git a/ext/opencv/gstfaceblur.cpp b/ext/opencv/gstfaceblur.cpp
index 4476e14779..682d5e618f 100644
--- a/ext/opencv/gstfaceblur.cpp
+++ b/ext/opencv/gstfaceblur.cpp
@@ -64,8 +64,7 @@
 #include <vector>
 
 #include "gstfaceblur.h"
-#include <opencv2/imgproc/imgproc_c.h>
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/imgproc.hpp>
 
 GST_DEBUG_CATEGORY_STATIC (gst_face_blur_debug);
 #define GST_CAT_DEFAULT gst_face_blur_debug
diff --git a/ext/opencv/gstfaceblur.h b/ext/opencv/gstfaceblur.h
index 732276d44d..bf5a038eda 100644
--- a/ext/opencv/gstfaceblur.h
+++ b/ext/opencv/gstfaceblur.h
@@ -48,10 +48,10 @@
 #define __GST_FACE_BLUR_H__
 
 #include <gst/gst.h>
-#include <opencv2/core/version.hpp>
-
 #include <gst/opencv/gstopencvvideofilter.h>
-#include <opencv2/objdetect/objdetect.hpp>
+
+#include <opencv2/core.hpp>
+#include <opencv2/objdetect.hpp>
 
 G_BEGIN_DECLS
 /* #defines don't like whitespacey bits */
diff --git a/ext/opencv/gstfacedetect.h b/ext/opencv/gstfacedetect.h
index 03cf81c2e0..52128e5cc1 100644
--- a/ext/opencv/gstfacedetect.h
+++ b/ext/opencv/gstfacedetect.h
@@ -49,10 +49,10 @@
 #define __GST_FACE_DETECT_H__
 
 #include <gst/gst.h>
-#include <opencv2/core/version.hpp>
-#include <cv.h>
 #include <gst/opencv/gstopencvvideofilter.h>
-#include <opencv2/objdetect/objdetect.hpp>
+
+#include <opencv2/core.hpp>
+#include <opencv2/objdetect.hpp>
 
 G_BEGIN_DECLS
 /* #defines don't like whitespacey bits */
diff --git a/ext/opencv/gstgrabcut.cpp b/ext/opencv/gstgrabcut.cpp
index 2e3aa60e73..235206e18e 100644
--- a/ext/opencv/gstgrabcut.cpp
+++ b/ext/opencv/gstgrabcut.cpp
@@ -85,11 +85,8 @@
 #endif
 
 #include "gstgrabcut.h"
-extern "C"
-{
-#include <opencv2/imgproc/imgproc_c.h>
-}
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/imgproc.hpp>
+
 GST_DEBUG_CATEGORY_STATIC (gst_grabcut_debug);
 #define GST_CAT_DEFAULT gst_grabcut_debug
 
diff --git a/ext/opencv/gstgrabcut.h b/ext/opencv/gstgrabcut.h
index 885c54b1ca..03aacd165d 100644
--- a/ext/opencv/gstgrabcut.h
+++ b/ext/opencv/gstgrabcut.h
@@ -48,7 +48,7 @@
 #include <gst/video/video.h>
 #include <gst/video/gstvideofilter.h>
 #include <gst/opencv/gstopencvvideofilter.h>
-#include <opencv2/core/core_c.h>
+#include <opencv2/core.hpp>
 
 
 
diff --git a/ext/opencv/gsthanddetect.h b/ext/opencv/gsthanddetect.h
index 1137c5aa92..c719311059 100644
--- a/ext/opencv/gsthanddetect.h
+++ b/ext/opencv/gsthanddetect.h
@@ -49,14 +49,14 @@
 
 #include <gst/opencv/gstopencvvideofilter.h>
 /* opencv */
-#include <opencv2/core/version.hpp>
+#include <opencv2/core.hpp>
 #ifdef HAVE_HIGHGUI_H
 #include <highgui.h>            // includes highGUI definitions
 #endif
 #ifdef HAVE_OPENCV2_HIGHGUI_HIGHGUI_C_H
-#include <opencv2/highgui/highgui_c.h>            // includes highGUI definitions
+#include <opencv2/highgui.hpp>            // includes highGUI definitions
 #endif
-#include <opencv2/objdetect/objdetect.hpp>
+#include <opencv2/objdetect.hpp>
 
 G_BEGIN_DECLS
 /* #defines don't like whitespacey bits */
diff --git a/ext/opencv/gstmotioncells.h b/ext/opencv/gstmotioncells.h
index 6f23b21d33..961d2e9f93 100644
--- a/ext/opencv/gstmotioncells.h
+++ b/ext/opencv/gstmotioncells.h
@@ -46,7 +46,7 @@
 #define __GST_MOTIONCELLS_H__
 
 #include <gst/opencv/gstopencvvideofilter.h>
-#include <opencv2/core/core_c.h>
+#include <opencv2/core.hpp>
 #include "motioncells_wrapper.h"
 
 G_BEGIN_DECLS
diff --git a/ext/opencv/gstretinex.cpp b/ext/opencv/gstretinex.cpp
index 9ad932560e..d7f4c9d111 100644
--- a/ext/opencv/gstretinex.cpp
+++ b/ext/opencv/gstretinex.cpp
@@ -63,8 +63,7 @@
 #endif
 
 #include "gstretinex.h"
-#include <opencv2/imgproc/imgproc_c.h>
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/imgproc.hpp>
 
 GST_DEBUG_CATEGORY_STATIC (gst_retinex_debug);
 #define GST_CAT_DEFAULT gst_retinex_debug
diff --git a/ext/opencv/gstretinex.h b/ext/opencv/gstretinex.h
index 716829b420..1f2a6d11ec 100644
--- a/ext/opencv/gstretinex.h
+++ b/ext/opencv/gstretinex.h
@@ -44,7 +44,7 @@
 #ifndef __GST_RETINEX_H__
 #define __GST_RETINEX_H__
 
-#include <opencv2/core/core_c.h>
+#include <opencv2/core.hpp>
 
 #include <gst/opencv/gstopencvvideofilter.h>
 
diff --git a/ext/opencv/gstsegmentation.cpp b/ext/opencv/gstsegmentation.cpp
index 727ba9b09a..d75433984f 100644
--- a/ext/opencv/gstsegmentation.cpp
+++ b/ext/opencv/gstsegmentation.cpp
@@ -91,7 +91,7 @@
 #endif
 
 #include "gstsegmentation.h"
-#include <opencv2/imgproc/imgproc_c.h>
+#include <opencv2/imgproc.hpp>
 
 GST_DEBUG_CATEGORY_STATIC (gst_segmentation_debug);
 #define GST_CAT_DEFAULT gst_segmentation_debug
diff --git a/ext/opencv/gstskindetect.cpp b/ext/opencv/gstskindetect.cpp
index e2fcb59205..4d31bc3e8f 100644
--- a/ext/opencv/gstskindetect.cpp
+++ b/ext/opencv/gstskindetect.cpp
@@ -59,7 +59,7 @@
 #endif
 
 #include "gstskindetect.h"
-#include <opencv2/imgproc/imgproc_c.h>
+#include <opencv2/imgproc.hpp>
 
 GST_DEBUG_CATEGORY_STATIC (gst_skin_detect_debug);
 #define GST_CAT_DEFAULT gst_skin_detect_debug
diff --git a/ext/opencv/gsttemplatematch.h b/ext/opencv/gsttemplatematch.h
index f27d9f3ddf..a51ef9f6c6 100644
--- a/ext/opencv/gsttemplatematch.h
+++ b/ext/opencv/gsttemplatematch.h
@@ -52,7 +52,7 @@
 #include <highgui.h>            // includes highGUI definitions
 #endif
 #ifdef HAVE_OPENCV2_HIGHGUI_HIGHGUI_C_H
-#include <opencv2/highgui/highgui_c.h>            // includes highGUI definitions
+#include <opencv2/highgui.hpp>            // includes highGUI definitions
 #endif
 
 G_BEGIN_DECLS
diff --git a/gst-libs/gst/opencv/gstopencvutils.cpp b/gst-libs/gst/opencv/gstopencvutils.cpp
index a58b5a9bd7..da24e93439 100644
--- a/gst-libs/gst/opencv/gstopencvutils.cpp
+++ b/gst-libs/gst/opencv/gstopencvutils.cpp
@@ -24,7 +24,7 @@
 #endif
 
 #include "gstopencvutils.h"
-#include <opencv2/core/core_c.h>
+#include <opencv2/core.hpp>
 
 /*
 The various opencv image containers or headers store the following information:
diff --git a/gst-libs/gst/opencv/gstopencvvideofilter.cpp b/gst-libs/gst/opencv/gstopencvvideofilter.cpp
index 7f520b10e0..ae18cdc538 100644
--- a/gst-libs/gst/opencv/gstopencvvideofilter.cpp
+++ b/gst-libs/gst/opencv/gstopencvvideofilter.cpp
@@ -50,7 +50,7 @@
 #include "gstopencvvideofilter.h"
 #include "gstopencvutils.h"
 
-#include <opencv2/core/core_c.h>
+#include <opencv2/core.hpp>
 
 GST_DEBUG_CATEGORY_STATIC (gst_opencv_video_filter_debug);
 #define GST_CAT_DEFAULT gst_opencv_video_filter_debug