diff -up player-release-3-1-0/server/drivers/blobfinder/shapetracker/orientation.h.opencv4 player-release-3-1-0/server/drivers/blobfinder/shapetracker/orientation.h
--- player-release-3-1-0/server/drivers/blobfinder/shapetracker/orientation.h.opencv4 2017-04-08 19:05:52.000000000 +0200
+++ player-release-3-1-0/server/drivers/blobfinder/shapetracker/orientation.h 2019-12-30 17:00:25.594935366 +0100
@@ -38,7 +38,7 @@ extern "C"
#include <stdio.h>
#include <math.h>
-#include <cv.h>
+#include <opencv2/opencv.hpp>
//Estimate the length between two points (cvpoint)
diff -up player-release-3-1-0/server/drivers/blobfinder/simpleshape/simpleshape.cc.opencv4 player-release-3-1-0/server/drivers/blobfinder/simpleshape/simpleshape.cc
--- player-release-3-1-0/server/drivers/blobfinder/simpleshape/simpleshape.cc.opencv4 2019-12-30 17:00:25.591935353 +0100
+++ player-release-3-1-0/server/drivers/blobfinder/simpleshape/simpleshape.cc 2019-12-30 17:00:25.594935366 +0100
@@ -106,8 +106,7 @@ driver
#include <string.h>
#include "../../base/imagebase.h"
-#include <cv.h>
-#include <highgui.h>
+#include <opencv2/opencv.hpp>
#include <opencv2/imgproc.hpp>
// Invariant feature set for a contour
diff -up player-release-3-1-0/server/drivers/blobfinder/upcbarcode/upcbarcode.cc.opencv4 player-release-3-1-0/server/drivers/blobfinder/upcbarcode/upcbarcode.cc
--- player-release-3-1-0/server/drivers/blobfinder/upcbarcode/upcbarcode.cc.opencv4 2017-04-08 19:05:52.000000000 +0200
+++ player-release-3-1-0/server/drivers/blobfinder/upcbarcode/upcbarcode.cc 2019-12-30 17:06:42.321594294 +0100
@@ -108,8 +108,8 @@ driver
#include "../../base/imagebase.h"
-#include <cv.h>
-#include <highgui.h>
+#include <opencv2/opencv.hpp>
+#include <opencv2/imgproc/imgproc_c.h>
// Info on potential blobs.
struct blob_t
diff -up player-release-3-1-0/server/drivers/camera/cvcam/cvcam.cc.opencv4 player-release-3-1-0/server/drivers/camera/cvcam/cvcam.cc
--- player-release-3-1-0/server/drivers/camera/cvcam/cvcam.cc.opencv4 2017-04-08 19:05:52.000000000 +0200
+++ player-release-3-1-0/server/drivers/camera/cvcam/cvcam.cc 2019-12-30 17:09:08.086236172 +0100
@@ -87,8 +87,9 @@ driver
#include <pthread.h>
#include <libplayercore/playercore.h>
-#include <cv.h>
-#include <highgui.h>
+#include <opencv2/opencv.hpp>
+#include <opencv2/videoio/videoio_c.h>
+#include <opencv2/videoio/legacy/constants_c.h>
//---------------------------------
diff -up player-release-3-1-0/server/drivers/camera/imageseq/imageseq.cc.opencv4 player-release-3-1-0/server/drivers/camera/imageseq/imageseq.cc
--- player-release-3-1-0/server/drivers/camera/imageseq/imageseq.cc.opencv4 2017-04-08 19:05:52.000000000 +0200
+++ player-release-3-1-0/server/drivers/camera/imageseq/imageseq.cc 2019-12-30 17:16:36.603211705 +0100
@@ -96,8 +96,8 @@ driver
#include <libplayercore/playercore.h>
-#include <cv.h>
-#include <highgui.h>
+#include <opencv2/opencv.hpp>
+#include <opencv2/imgproc/imgproc_c.h>
class ImageSeq : public ThreadedDriver
diff -up player-release-3-1-0/server/drivers/camera/videocanny/videocanny.cc.opencv4 player-release-3-1-0/server/drivers/camera/videocanny/videocanny.cc
--- player-release-3-1-0/server/drivers/camera/videocanny/videocanny.cc.opencv4 2017-04-08 19:05:52.000000000 +0200
+++ player-release-3-1-0/server/drivers/camera/videocanny/videocanny.cc 2019-12-30 17:17:23.672419155 +0100
@@ -86,8 +86,11 @@ driver
#include <libplayercore/playercore.h>
#include <libplayerjpeg/playerjpeg.h>
-#include <cv.h>
-#include <highgui.h>
+#include <opencv2/opencv.hpp>
+#include <opencv2/core/core_c.h>
+#include <opencv2/core/types_c.h>
+#include <opencv2/imgproc/imgproc_c.h>
+
typedef enum { canny = 0, sobel, laplace } func_t;