diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdfb396..483ff12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ find_package(Qt5Core)
 OPTION(dcc_build_tests "Enable unit tests." OFF)
 #SET(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR})
 ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS -D__UNIX__ -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS)
-IF(CMAKE_BUILD_TOOL MATCHES "(msdev|devenv|nmake)")
+IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS -D__UNIX__ -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX)
     ADD_DEFINITIONS(/W4)
 ELSE()
diff --git a/src/BasicBlock.cpp b/src/BasicBlock.cpp
index df03cd2..0fd29f8 100644
--- a/src/BasicBlock.cpp
+++ b/src/BasicBlock.cpp
@@ -10,7 +10,7 @@
 #include <string>
 #include <boost/range/rbegin.hpp>
 #include <boost/range/rend.hpp>
-#include <boost/range/adaptors.hpp>
+
 using namespace std;
 using namespace boost;
 
diff --git a/src/RegisterNode.cpp b/src/RegisterNode.cpp
index fc5e4bb..56857d9 100644
--- a/src/RegisterNode.cpp
+++ b/src/RegisterNode.cpp
@@ -10,8 +10,8 @@
 #include <sstream>
 #include <iostream>
 #include <cassert>
+#include <boost/range/adaptor/filtered.hpp>
 #include <boost/range.hpp>
-#include <boost/range/adaptors.hpp>
 //#include <boost/range/algorithm.hpp>
 //#include <boost/assign.hpp>
 
diff --git a/src/ast.cpp b/src/ast.cpp
index 5c83a03..4513022 100644
--- a/src/ast.cpp
+++ b/src/ast.cpp
@@ -14,7 +14,7 @@
 
 #include <QtCore/QTextStream>
 #include <boost/range.hpp>
-#include <boost/range/adaptors.hpp>
+#include <boost/range/adaptor/filtered.hpp>
 #include <boost/range/algorithm.hpp>
 #include <boost/assign.hpp>
 #include <stdint.h>
diff --git a/src/backend.cpp b/src/backend.cpp
index 5781ce5..30cffe7 100644
--- a/src/backend.cpp
+++ b/src/backend.cpp
@@ -17,7 +17,7 @@
 #include <cassert>
 #include <string>
 #include <boost/range.hpp>
-#include <boost/range/adaptors.hpp>
+#include <boost/range/adaptor/filtered.hpp>
 #include <boost/range/algorithm.hpp>
 
 #include <fstream>
diff --git a/src/dataflow.cpp b/src/dataflow.cpp
index 11ae413..c6634a1 100644
--- a/src/dataflow.cpp
+++ b/src/dataflow.cpp
@@ -10,7 +10,8 @@
 #include "msvc_fixes.h"
 
 #include <boost/range.hpp>
-#include <boost/range/adaptors.hpp>
+#include <boost/range/adaptor/filtered.hpp>
+#include <boost/range/adaptor/reversed.hpp>
 #include <boost/range/algorithm.hpp>
 #include <boost/assign.hpp>
 #include <stdint.h>
diff --git a/src/graph.cpp b/src/graph.cpp
index d358306..b053990 100644
--- a/src/graph.cpp
+++ b/src/graph.cpp
@@ -11,7 +11,6 @@
 
 #include <boost/range/rbegin.hpp>
 #include <boost/range/rend.hpp>
-#include <boost/range/adaptors.hpp>
 #include <string.h>
 
 using namespace std;