diff --git a/application/AprilCalib/AprilCalib.cpp b/application/AprilCalib/AprilCalib.cpp
index 6398e35..21203b1 100644
--- a/application/AprilCalib/AprilCalib.cpp
+++ b/application/AprilCalib/AprilCalib.cpp
@@ -414,7 +414,7 @@ int main(const int argc, const char **argv )
 	tagli("the Calibration Rig is:\n"<<std::string(gRig));
 	AprilCalibprocessor processor;
 	processor.isPhoto = is->isClass<helper::ImageSource_Photo>();
-	processor.outputDir = helper::legalDir( cfg.get("outputDir", is->getSourceDir()) );
+	//processor.outputDir = helper::legalDir( cfg.get("outputDir", is->getSourceDir()) );
 	{//create outputDir
 #ifdef _WIN32
 		std::string cmd = "if not exist \"" + processor.outputDir + "\" mkdir \"" + processor.outputDir + "\"";
diff --git a/include/AllOpenCVHeaders.h b/include/AllOpenCVHeaders.h
index 8df44e3..2928dfa 100644
--- a/include/AllOpenCVHeaders.h
+++ b/include/AllOpenCVHeaders.h
@@ -2,10 +2,13 @@
 
 #include "opencv2/opencv.hpp"
 
+/*
 #if (CV_MAJOR_VERSION*100+CV_MINOR_VERSION*10+CV_SUBMINOR_VERSION)>=233
-#include "opencv2/nonfree/nonfree.hpp"
+//#include "opencv2/nonfree/nonfree.hpp"
+#include "opencv2/contrib/contrib.hpp"
 #include "opencv2/legacy/legacy.hpp"
 #endif
+*/
 
 #pragma once
 
@@ -13,17 +16,18 @@
 
 ///////////////////////////////////////////////////////////////////////
 // defines for headers
-//
+
 #if		CV_MAJOR_VERSION == 2
-#define	UTIL_OPENCV_HEADER(module)	<opencv2/##module/##module.hpp>
+#define	UTIL_OPENCV_HEADER(module)	<opencv2/module/module.hpp>
 #elif	CV_MAJOR_VERSION == 3
-#define	UTIL_OPENCV_HEADER(module)	<opencv2/##module.hpp>
+#define	UTIL_OPENCV_HEADER(module)	<opencv2/module.hpp>
 #endif
 
+
 // include those headers by default
-#include UTIL_OPENCV_HEADER(core)
-#include UTIL_OPENCV_HEADER(imgproc)
-#include UTIL_OPENCV_HEADER(highgui)
+//#include UTIL_OPENCV_HEADER(core)
+//#include UTIL_OPENCV_HEADER(imgproc)
+//#include UTIL_OPENCV_HEADER(highgui)
 
 // additional headers can be specified as follows
 //#include UTIL_OPENCV_HEADER(features2d)