diff --git a/src/apitrace/common/formatter.hpp b/src/apitrace/common/formatter.hpp
index 75a407f..55ed28a 100644
--- a/src/apitrace/common/formatter.hpp
+++ b/src/apitrace/common/formatter.hpp
@@ -153,9 +153,9 @@ public:
     WindowsAttribute(WORD _wAttributes) : wAttributes(_wAttributes) {}
     void apply(std::ostream& os) const {
         DWORD nStdHandleOutput;
-        if (os == std::cout) {
+        if (&os == &std::cout) {
             nStdHandleOutput = STD_OUTPUT_HANDLE;
-        } else if (os == std::cerr) {
+        } else if (&os == &std::cerr) {
             nStdHandleOutput = STD_ERROR_HANDLE;
         } else {
             return;
diff --git a/src/apitrace/common/trace_file_snappy.cpp b/src/apitrace/common/trace_file_snappy.cpp
index 68673c6..41d86ea 100644
--- a/src/apitrace/common/trace_file_snappy.cpp
+++ b/src/apitrace/common/trace_file_snappy.cpp
@@ -54,6 +54,7 @@
 #include <snappy.h>
 
 #include <iostream>
+#include <algorithm>
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/boost/boost/print/interface.hpp b/src/boost/boost/print/interface.hpp
index 87827f9..b461449 100644
--- a/src/boost/boost/print/interface.hpp
+++ b/src/boost/boost/print/interface.hpp
@@ -19,6 +19,7 @@
 #endif
 
 #include <cstring>  // strlen
+#include <algorithm>
 #include <string>
 
 #include <boost/print/detail.hpp>
diff --git a/src/boost/boost/print/printf.hpp b/src/boost/boost/print/printf.hpp
index 8f269cb..2f1334a 100644
--- a/src/boost/boost/print/printf.hpp
+++ b/src/boost/boost/print/printf.hpp
@@ -35,8 +35,10 @@
 namespace boost { namespace print {
 
 #ifdef WIN32
+#if defined(_MSC_VER) && _MSC_VER < 1800
 inline void va_copy(std::va_list &d, std::va_list &s) { d = s; }
 #endif
+#endif
 
 // Generic printf
 
diff --git a/src/regal/RegalPpca.cpp b/src/regal/RegalPpca.cpp
index b55879d..068abc5 100644
--- a/src/regal/RegalPpca.cpp
+++ b/src/regal/RegalPpca.cpp
@@ -38,6 +38,7 @@
 REGAL_GLOBAL_BEGIN
 
 #include <math.h>
+#include <algorithm>
 
 #include "RegalPpca.h"
 #include "RegalContext.h"