From 36dc71a158b8516e84cb729f530ad64a6ad4e80e Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Sat, 28 Mar 2020 17:32:23 -0700
Subject: [PATCH] MSVC missing includes

---
 src/bitmask.h    | 1 +
 src/evhelper.cpp | 6 +++++-
 src/utilpvt.h    | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/bitmask.h b/src/bitmask.h
index 1c3436e..01ffd4c 100644
--- a/src/bitmask.h
+++ b/src/bitmask.h
@@ -9,6 +9,7 @@
 #include <ostream>
 #include <stdexcept>
 #include <vector>
+#include <algorithm>
 #include <cstdint>
 
 #include <pvxs/version.h>
diff --git a/src/evhelper.cpp b/src/evhelper.cpp
index 2a3f5ac..0bc7ea6 100644
--- a/src/evhelper.cpp
+++ b/src/evhelper.cpp
@@ -4,13 +4,17 @@
  * in file LICENSE that is included with this distribution.
  */
 
+#include <osiSock.h>
+
 #ifdef _WIN32
-#include <mswsock.h>
+#  include <windows.h>
+#  include <mswsock.h>
 #endif
 
 #include <cstring>
 #include <system_error>
 #include <deque>
+#include <algorithm>
 
 #include <event2/event.h>
 #include <event2/thread.h>
diff --git a/src/utilpvt.h b/src/utilpvt.h
index 795066b..3cc24e4 100644
--- a/src/utilpvt.h
+++ b/src/utilpvt.h
@@ -6,8 +6,11 @@
 #ifndef UTILPVT_H
 #define UTILPVT_H
 
+#include <osiSock.h>
 
 #ifdef _WIN32
+#  define WIN32_LEAN_AND_MEAN
+#  include <windows.h>
 #  include <synchapi.h>
 #else
 #  include <pthread.h>