diff --git a/modules/beast_asio/sockets/beast_Socket.h b/modules/beast_asio/sockets/beast_Socket.h
index 43925bf52..2767ce08b 100644
--- a/modules/beast_asio/sockets/beast_Socket.h
+++ b/modules/beast_asio/sockets/beast_Socket.h
@@ -104,7 +104,7 @@ public:
     {
         void* const object = native_object_raw ();
         if (object == nullptr)
-            throw std::bad_cast ("null pointer");
+            Throw (std::bad_cast (), __FILE__, __LINE__);
         return *static_cast <Object*> (object);
     }
 
diff --git a/modules/beast_asio/sockets/beast_SocketWrapper.h b/modules/beast_asio/sockets/beast_SocketWrapper.h
index b8ec2c843..72da7f5ff 100644
--- a/modules/beast_asio/sockets/beast_SocketWrapper.h
+++ b/modules/beast_asio/sockets/beast_SocketWrapper.h
@@ -247,7 +247,7 @@ private:
 
     template <typename MutableBufferSequence, typename ReadHandler>
     BOOST_ASIO_INITFN_RESULT_TYPE(ReadHandler, void (boost::system::error_code, std::size_t))
-    async_read_some (MutableBufferSequence const&, BOOST_ASIO_MOVE_ARG(ReadHandler),
+    async_read_some (MutableBufferSequence const&, BOOST_ASIO_MOVE_ARG(ReadHandler) handler,
         boost::false_type)
     {
 #if BOOST_ASIO_HAS_FUTURE_RETURNS
@@ -259,7 +259,7 @@ private:
         get_io_service ().post (boost::bind (handler, ec, 0));
         return init.result.get();
 #else
-        system::error_code ec;
+        boost::system::error_code ec;
         ec = pure_virtual (ec);
         get_io_service ().post (boost::bind (handler, ec, 0));
 #endif
@@ -284,7 +284,7 @@ private:
 
     template <typename ConstBufferSequence, typename WriteHandler>
     BOOST_ASIO_INITFN_RESULT_TYPE(WriteHandler, void (boost::system::error_code, std::size_t))
-    async_write_some (ConstBufferSequence const&, BOOST_ASIO_MOVE_ARG(WriteHandler),
+    async_write_some (ConstBufferSequence const&, BOOST_ASIO_MOVE_ARG(WriteHandler) handler,
         boost::false_type)
     {
 #if BOOST_ASIO_HAS_FUTURE_RETURNS
@@ -296,7 +296,7 @@ private:
         get_io_service ().post (boost::bind (handler, ec, 0));
         return init.result.get();
 #else
-        system::error_code ec;
+        boost::system::error_code ec;
         ec = pure_virtual (ec);
         get_io_service ().post (boost::bind (handler, ec, 0));
 #endif
@@ -359,7 +359,7 @@ private:
         get_io_service ().post (boost::bind (handler, ec));
         return init.result.get();
 #else
-        system::error_code ec;
+        boost::system::error_code ec;
         ec = pure_virtual (ec);
         get_io_service ().post (boost::bind (handler, ec));
 #endif
@@ -425,7 +425,7 @@ private:
         get_io_service ().post (boost::bind (handler, ec, 0));
         return init.result.get();
 #else
-        system::error_code ec;
+        boost::system::error_code ec;
         ec = pure_virtual (ec);
         get_io_service ().post (boost::bind (handler, ec, 0));
 #endif
@@ -482,7 +482,7 @@ private:
         get_io_service ().post (boost::bind (handler, ec));
         return init.result.get();
 #else
-        system::error_code ec;
+        boost::system::error_code ec;
         ec = pure_virtual (ec);
         get_io_service ().post (boost::bind (handler, ec));
 #endif
diff --git a/modules/beast_asio/system/beast_BoostIncludes.h b/modules/beast_asio/system/beast_BoostIncludes.h
index 98b970672..b3de32c52 100644
--- a/modules/beast_asio/system/beast_BoostIncludes.h
+++ b/modules/beast_asio/system/beast_BoostIncludes.h
@@ -40,6 +40,7 @@
 
 #include <boost/asio.hpp>
 #include <boost/asio/ssl.hpp>
+#include <boost/bind.hpp>
 #include <boost/foreach.hpp>
 #include <boost/type_traits.hpp>