diff --git a/src/Calib3D.h b/src/Calib3D.h
index 79b4f30..ac9aef0 100644
--- a/src/Calib3D.h
+++ b/src/Calib3D.h
@@ -3,7 +3,9 @@
 
 #include "OpenCV.h"
 
+#if CV_MAJOR_VERSION >= 3
 #include <opencv2/calib3d.hpp>
+#endif
 
 // Implementation of calib3d.hpp functions
 
diff --git a/src/CamShift.cc b/src/CamShift.cc
index 27b5c6a..acdff87 100644
--- a/src/CamShift.cc
+++ b/src/CamShift.cc
@@ -2,7 +2,9 @@
 #include "OpenCV.h"
 #include "Matrix.h"
 
+#if CV_MAJOR_VERSION >= 3
 #include <opencv2/video/tracking.hpp>
+#endif
 
 #define CHANNEL_HUE 0
 #define CHANNEL_SATURATION 1
diff --git a/src/CascadeClassifierWrap.cc b/src/CascadeClassifierWrap.cc
index c8b27d4..a072b14 100755
--- a/src/CascadeClassifierWrap.cc
+++ b/src/CascadeClassifierWrap.cc
@@ -3,11 +3,11 @@
 #include "Matrix.h"
 #include <nan.h>
 
-
+#if CV_MAJOR_VERSION >= 3
 #include <opencv2/objdetect.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/imgcodecs.hpp>
-
+#endif
 
 Persistent<FunctionTemplate> CascadeClassifierWrap::constructor;
 
diff --git a/src/CascadeClassifierWrap.h b/src/CascadeClassifierWrap.h
index a91faa9..14014b4 100755
--- a/src/CascadeClassifierWrap.h
+++ b/src/CascadeClassifierWrap.h
@@ -1,5 +1,8 @@
 #include "OpenCV.h"
+
+#if CV_MAJOR_VERSION >= 3
 #include <opencv2/objdetect.hpp>
+#endif
 
 class CascadeClassifierWrap: public node::ObjectWrap {
   public: 
diff --git a/src/Contours.cc b/src/Contours.cc
index dc0efe9..1b990cd 100755
--- a/src/Contours.cc
+++ b/src/Contours.cc
@@ -4,7 +4,6 @@
 
 #include <iostream>
 
-#include <opencv2/imgproc.hpp>
 
 v8::Persistent<FunctionTemplate> Contour::constructor;
 
diff --git a/src/Matrix.cc b/src/Matrix.cc
index 1f696d8..c125bf1 100755
--- a/src/Matrix.cc
+++ b/src/Matrix.cc
@@ -3,10 +3,10 @@
 #include "OpenCV.h"
 #include <nan.h>
 
-#include <opencv2/core.hpp>
-#include <opencv2/imgproc.hpp>
+#if CV_MAJOR_VERSION >= 3
 #include <opencv2/imgcodecs.hpp>
 #include <opencv2/ml.hpp>
+#endif
 
 v8::Persistent<FunctionTemplate> Matrix::constructor;
 
diff --git a/src/OpenCV.cc b/src/OpenCV.cc
index 264ff77..c3bbec3 100755
--- a/src/OpenCV.cc
+++ b/src/OpenCV.cc
@@ -2,9 +2,10 @@
 #include "Matrix.h"
 #include <nan.h>
 
-#include <opencv2/core.hpp>
-#include <opencv2/imgproc.hpp>
+
+#if CV_MAJOR_VERSION >= 3
 #include <opencv2/imgcodecs.hpp>
+#endif
 
 void
 OpenCV::Init(Handle<Object> target) {
diff --git a/src/OpenCV.h b/src/OpenCV.h
index fa6c267..23e3bec 100755
--- a/src/OpenCV.h
+++ b/src/OpenCV.h
@@ -7,9 +7,11 @@
 #include <node_version.h>
 #include <node_buffer.h>
 #include <opencv/cv.h>
+#if CV_MAJOR_VERSION >= 3
 #include <opencv2/highgui.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/videoio.hpp>
+#endif
 #include <string.h>
 #include <nan.h>
 
diff --git a/src/Stereo.cc b/src/Stereo.cc
index 051a6d9..70868dc 100644
--- a/src/Stereo.cc
+++ b/src/Stereo.cc
@@ -1,8 +1,12 @@
 #include "Stereo.h"
 #include "Matrix.h"
-//#include <opencv2/legacy.hpp>
-#include <opencv2/ml.hpp>
+#if CV_MAJOR_VERSION < 3
+#include <opencv2/legacy.hpp>
+#endif
 
+#if CV_MAJOR_VERSION >= 3
+#include <opencv2/ml.hpp>
+#endif
 // Block matching
 
 v8::Persistent<FunctionTemplate> StereoBM::constructor;
@@ -17,11 +21,11 @@ StereoBM::Init(Handle<Object> target) {
     ctor->SetClassName(NanNew("StereoBM"));
 
     NODE_SET_PROTOTYPE_METHOD(ctor, "compute", Compute);
-
-    ctor->Set(NanNew<String>("BASIC_PRESET"), NanNew<Integer>((int)0));
-    ctor->Set(NanNew<String>("FISH_EYE_PRESET"), NanNew<Integer>((int)1));
-    ctor->Set(NanNew<String>("NARROW_PRESET"), NanNew<Integer>((int)2));
-
+#if CV_MAJOR_VERSION < 3
+    ctor->Set(NanNew<String>("BASIC_PRESET"), NanNew<Integer>((int)cv::StereoBM::BASIC_PRESET));
+    ctor->Set(NanNew<String>("FISH_EYE_PRESET"), NanNew<Integer>((int)cv::StereoBM::FISH_EYE_PRESET));
+    ctor->Set(NanNew<String>("NARROW_PRESET"), NanNew<Integer>((int)cv::StereoBM::NARROW_PRESET));
+#endif
     target->Set(NanNew("StereoBM"), ctor->GetFunction());
 }
 
@@ -229,7 +233,7 @@ NAN_METHOD(StereoSGBM::Compute)
     }
 
 };
-#if 0
+#if CV_VERSION_MAJOR < 3
 // Graph cut
 
 v8::Persistent<FunctionTemplate> StereoGC::constructor;
diff --git a/src/Stereo.h b/src/Stereo.h
index 32637b0..41d6d75 100644
--- a/src/Stereo.h
+++ b/src/Stereo.h
@@ -40,7 +40,9 @@ public:
 
     JSFUNC(Compute);
 };
-#if 0
+
+#if CV_VERSION_MAJOR < 3
+
 struct CvStereoGCState;
 
 class StereoGC: public node::ObjectWrap {
diff --git a/src/init.cc b/src/init.cc
index 95f2fb8..1f2534a 100755
--- a/src/init.cc
+++ b/src/init.cc
@@ -31,8 +31,9 @@ init(Handle<Object> target) {
     ImgProc::Init(target);
     StereoBM::Init(target);
     StereoSGBM::Init(target);
-    //StereoGC::Init(target);
-
+#if CV_MAJOR_VERSION < 3
+    StereoGC::Init(target);
+#endif
 
    #if CV_MAJOR_VERSION >= 2 && CV_MINOR_VERSION >=4
       Features::Init(target);