diff --git a/src/beast/beast/win32_workaround.h b/src/beast/beast/win32_workaround.h
new file mode 100644
index 000000000..173942905
--- /dev/null
+++ b/src/beast/beast/win32_workaround.h
@@ -0,0 +1,45 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2015, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_WINDOWS_H_INCLUDED
+#define BEAST_WINDOWS_H_INCLUDED
+
+#ifdef _MSC_VER
+#pragma push_macro("NOMINMAX")
+#pragma push_macro("UNICODE")
+#pragma push_macro("STRICT")
+# ifndef NOMINMAX
+#  define NOMINMAX
+# endif
+# ifndef UNICODE
+#  define UNICODE
+# endif
+# ifndef STRICT
+#  define STRICT
+# endif
+# ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+# endif
+# include <Windows.h>
+#pragma pop_macro("STRICT")
+#pragma pop_macro("UNICODE")
+#pragma pop_macro("NOMINMAX")
+
+#endif
+#endif
diff --git a/src/ripple/rpc/Yield.h b/src/ripple/rpc/Yield.h
index cf61d276d..cc50fcedc 100644
--- a/src/ripple/rpc/Yield.h
+++ b/src/ripple/rpc/Yield.h
@@ -21,6 +21,7 @@
 #define RIPPLE_RPC_YIELD_H_INCLUDED
 
 #include <ripple/json/Output.h>
+#include <beast/win32_workaround.h>
 #include <boost/coroutine/all.hpp>
 #include <functional>