diff --git a/Chapter3_MarkerlessAR/src/ARDrawingContext.hpp b/Chapter3_MarkerlessAR/src/ARDrawingContext.hpp
index 0412b4c..8b8ad6b 100755
--- a/Chapter3_MarkerlessAR/src/ARDrawingContext.hpp
+++ b/Chapter3_MarkerlessAR/src/ARDrawingContext.hpp
@@ -14,12 +14,13 @@
 
 ////////////////////////////////////////////////////////////////////
 // File includes:
+#include <windows.h>
 #include "GeometryTypes.hpp"
 #include "CameraCalibration.hpp"
 
 ////////////////////////////////////////////////////////////////////
 // Standard includes:
-#include <opencv2/opencv.hpp>
+#include <opencv2/highgui/highgui.hpp>
 
 void ARDrawingContextDrawCallback(void* param);
 
diff --git a/Chapter3_MarkerlessAR/src/CameraCalibration.hpp b/Chapter3_MarkerlessAR/src/CameraCalibration.hpp
index eca9141..ea5baea 100755
--- a/Chapter3_MarkerlessAR/src/CameraCalibration.hpp
+++ b/Chapter3_MarkerlessAR/src/CameraCalibration.hpp
@@ -15,7 +15,7 @@
 
 ////////////////////////////////////////////////////////////////////
 // File includes:
-#include <opencv2/opencv.hpp>
+#include <opencv2/core/core.hpp>
 
 /**
 * A camera calibration class that stores intrinsic matrix and distortion coefficients.
diff --git a/Chapter3_MarkerlessAR/src/DebugHelpers.hpp b/Chapter3_MarkerlessAR/src/DebugHelpers.hpp
index eb9146e..5f8c201 100755
--- a/Chapter3_MarkerlessAR/src/DebugHelpers.hpp
+++ b/Chapter3_MarkerlessAR/src/DebugHelpers.hpp
@@ -11,7 +11,9 @@
 
 #ifndef DEBUG_HELPERS_HPP
 #define DEBUG_HELPERS_HPP
-
+#include <opencv2/core/core.hpp>
+#include <opencv2/nonfree/features2d.hpp>
+#include <opencv2/highgui/highgui.hpp>
 #include <string>
 #include <sstream>
 
diff --git a/Chapter3_MarkerlessAR/src/Pattern.hpp b/Chapter3_MarkerlessAR/src/Pattern.hpp
index 59ac878..f370094 100755
--- a/Chapter3_MarkerlessAR/src/Pattern.hpp
+++ b/Chapter3_MarkerlessAR/src/Pattern.hpp
@@ -17,7 +17,9 @@
 #include "GeometryTypes.hpp"
 #include "CameraCalibration.hpp"
 
-#include <opencv2/opencv.hpp>
+#include <opencv2/calib3d/calib3d.hpp>
+#include <opencv2/nonfree/features2d.hpp>
+#include <opencv2/highgui/highgui.hpp>
 
 /**
  * Store the image data and computed descriptors of target pattern
diff --git a/Chapter3_MarkerlessAR/src/PatternDetector.cpp b/Chapter3_MarkerlessAR/src/PatternDetector.cpp
index 13f0083..a44548a 100755
--- a/Chapter3_MarkerlessAR/src/PatternDetector.cpp
+++ b/Chapter3_MarkerlessAR/src/PatternDetector.cpp
@@ -9,6 +9,8 @@
 *   http://www.packtpub.com/cool-projects-with-opencv/book
 *****************************************************************************/
 
+#define NOMINMAX
+
 ////////////////////////////////////////////////////////////////////
 // File includes:
 #include "PatternDetector.hpp"
diff --git a/Chapter3_MarkerlessAR/src/PatternDetector.hpp b/Chapter3_MarkerlessAR/src/PatternDetector.hpp
index ce0ae78..30a6e20 100755
--- a/Chapter3_MarkerlessAR/src/PatternDetector.hpp
+++ b/Chapter3_MarkerlessAR/src/PatternDetector.hpp
@@ -16,7 +16,8 @@
 // File includes:
 #include "Pattern.hpp"
 
-#include <opencv2/opencv.hpp>
+#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/calib3d/calib3d.hpp>
 #include <opencv2/nonfree/features2d.hpp>
 
 class PatternDetector
diff --git a/Chapter3_MarkerlessAR/src/main.cpp b/Chapter3_MarkerlessAR/src/main.cpp
index 480e5bd..1891ab5 100755
--- a/Chapter3_MarkerlessAR/src/main.cpp
+++ b/Chapter3_MarkerlessAR/src/main.cpp
@@ -15,11 +15,7 @@
 #include "ARPipeline.hpp"
 #include "DebugHelpers.hpp"
 
-////////////////////////////////////////////////////////////////////
-// Standard includes:
-#include <opencv2/opencv.hpp>
-#include <gl/gl.h>
-#include <gl/glu.h>
+#include <iostream>
 
 /**
  * Processes a recorded video or live view from web-camera and allows you to adjust homography refinement and