Index: bookkeeper-4.2.1/hedwig-client/src/main/cpp/lib/channel.cpp
===================================================================
--- hedwig-client/src/main/cpp/lib/channel.cpp
+++ hedwig-client/src/main/cpp/lib/channel.cpp
@@ -702,7 +702,7 @@ void AsioSSLDuplexChannel::sslChannelCon
 void AsioSSLDuplexChannel::startHandShake(const OperationCallbackPtr& callback) {
   ssl_socket->async_handshake(boost::asio::ssl::stream_base::client,
                               boost::bind(&AsioSSLDuplexChannel::handleHandshake,
-                                          boost::shared_dynamic_cast<AsioSSLDuplexChannel>(shared_from_this()),
+                                          boost::dynamic_pointer_cast<AsioSSLDuplexChannel>(shared_from_this()),
                                           callback, boost::asio::placeholders::error));
 }
 
@@ -749,7 +749,7 @@ void AsioSSLDuplexChannel::readMsgBody(b
 // boost asio doesn't provide time out mechanism to shutdown ssl
 void AsioSSLDuplexChannel::sslShutdown() {
   ssl_socket->async_shutdown(boost::bind(&AsioSSLDuplexChannel::handleSSLShutdown,
-                                         boost::shared_dynamic_cast<AsioSSLDuplexChannel>(shared_from_this()),
+                                         boost::dynamic_pointer_cast<AsioSSLDuplexChannel>(shared_from_this()),
                                          boost::asio::placeholders::error));
 }
 
Index: bookkeeper-4.2.1/hedwig-client/src/main/cpp/lib/data.h
===================================================================
--- hedwig-client/src/main/cpp/lib/data.h
+++ hedwig-client/src/main/cpp/lib/data.h
@@ -33,7 +33,7 @@
 
 #include "util.h"
 #include <boost/shared_ptr.hpp>
-#include <boost/thread/mutex.hpp>
+#include <boost/thread/thread.hpp>	// needed for boost::thread and boost::mutex
 
 namespace Hedwig {
   /**