diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c19a56..6a44fff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,8 +3,9 @@ project(RSBA)
 
 enable_testing()
 
+OPTION(FORCE_STATIC "Force static buid" OFF)
 
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -std=c++11")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11")
 set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
 
 FIND_PACKAGE(OpenMP)
@@ -14,6 +15,8 @@ if (OPENMP_FOUND)
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
 endif (OPENMP_FOUND)
 
+find_package( OpenCV REQUIRED )
+
 #FIND_PACKAGE(Eigen REQUIRED)
 #include_directories(EIGEN3_INCLUDE_DIR)
 
diff --git a/src/rsba/VideoSfMClient.cc b/src/rsba/VideoSfMClient.cc
index d6665e7..c95478d 100644
--- a/src/rsba/VideoSfMClient.cc
+++ b/src/rsba/VideoSfMClient.cc
@@ -49,7 +49,7 @@ VideoSfMClient::VideoSfMClient(const SfmOptions& opt)
 
 
 
-VideoSfMClient::~VideoSfMClient()
+VideoSfMClient::~VideoSfMClient() throw ()
 {
 }
 
diff --git a/src/rsba/VideoSfMClient.h b/src/rsba/VideoSfMClient.h
index c11f353..09d9e37 100644
--- a/src/rsba/VideoSfMClient.h
+++ b/src/rsba/VideoSfMClient.h
@@ -34,7 +34,7 @@ class VideoSfMClient: public sfm::Session
 {
 public:
   VideoSfMClient(const SfmOptions& opt);
-  virtual ~VideoSfMClient();
+  virtual ~VideoSfMClient() throw();
 
   virtual void start();
   virtual size_t addFrame(const cv::Mat& inFrame, cv::Mat& outFrame);
diff --git a/src/rsba/struct/VideoSfM.cc b/src/rsba/struct/VideoSfM.cc
index e245541..ea0b89f 100644
--- a/src/rsba/struct/VideoSfM.cc
+++ b/src/rsba/struct/VideoSfM.cc
@@ -1,6 +1,6 @@
 #include <vector>
+#include <stdexcept>
 #include <opencv2/core/core.hpp>
-#include <opencv2/nonfree/features2d.hpp>
 
 #include "rsba/struct/VideoSfM.h"
 
diff --git a/src/rsba/struct/VideoSfM.h b/src/rsba/struct/VideoSfM.h
index 6943a1f..e7567df 100644
--- a/src/rsba/struct/VideoSfM.h
+++ b/src/rsba/struct/VideoSfM.h
@@ -2,9 +2,7 @@
 #define _VideoSfM_h
 
 #include <vector>
-#include <glog/logging.h>
 #include <opencv2/core/core.hpp>
-#include <opencv2/nonfree/features2d.hpp>
 
 #include "rsba/gen-cpp/VideoSfM.h"
 #include "rsba/SfmOptions.h"
diff --git a/src/rsba/video_bundler_constV.h b/src/rsba/video_bundler_constV.h
index 73608d2..cb6b416 100644
--- a/src/rsba/video_bundler_constV.h
+++ b/src/rsba/video_bundler_constV.h
@@ -5,7 +5,6 @@
 #include <cstdio>
 #include <iostream>
 #include <thread>
-#include <glog/logging.h>
 
 #include "rsba/ceres/ceres.h"
 #include "rsba/ceres/rotation.h"
diff --git a/src/rsba/video_bundler_life.h b/src/rsba/video_bundler_life.h
index 98d43aa..3efc213 100644
--- a/src/rsba/video_bundler_life.h
+++ b/src/rsba/video_bundler_life.h
@@ -6,7 +6,6 @@
 #include <iostream>
 #include <thread>
 #include <string.h>
-#include <glog/logging.h>
 #include <ceres/ceres.h>
 #include <ceres/rotation.h>
 
diff --git a/src/rsba/video_bundler_structless.h b/src/rsba/video_bundler_structless.h
index f548250..de24f81 100644
--- a/src/rsba/video_bundler_structless.h
+++ b/src/rsba/video_bundler_structless.h
@@ -6,7 +6,6 @@
 #include <iostream>
 #include <thread>
 #include <string.h>
-#include <glog/logging.h>
 #include <ceres/ceres.h>
 #include <ceres/rotation.h>