diff --git a/include/libtorrent/aux_/session_impl.hpp b/include/libtorrent/aux_/session_impl.hpp
index d21e2aef0..fe6626a8b 100644
--- a/include/libtorrent/aux_/session_impl.hpp
+++ b/include/libtorrent/aux_/session_impl.hpp
@@ -53,7 +53,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/filesystem/path.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/recursive_mutex.hpp>
-#include <boost/thread/condition_variable.hpp>
+#include <boost/thread/condition.hpp>
 
 #ifdef _MSC_VER
 #pragma warning(pop)
@@ -329,7 +329,7 @@ namespace libtorrent
 
 //		private:
 
-			void session_impl::dht_state_callback(boost::condition_variable_any& c
+			void dht_state_callback(boost::condition& c
 				, entry& e, bool& done) const;
 			void on_lsd_peer(tcp::endpoint peer, sha1_hash const& ih);
 
diff --git a/src/session_impl.cpp b/src/session_impl.cpp
index 5346eea20..b55996337 100644
--- a/src/session_impl.cpp
+++ b/src/session_impl.cpp
@@ -2331,11 +2331,11 @@ namespace aux {
 			m_dht_settings.service_port = m_listen_interface.port();
 	}
 
-	void session_impl::dht_state_callback(boost::condition_variable_any& c
+	void session_impl::dht_state_callback(boost::condition& c
 		, entry& e, bool& done) const
 	{
-		if (m_dht) e = m_dht->state();
 		mutex_t::scoped_lock l(m_mutex);
+		if (m_dht) e = m_dht->state();
 		done = true;
 		l.unlock();
 		c.notify_all();
@@ -2343,7 +2343,7 @@ namespace aux {
 
 	entry session_impl::dht_state() const
 	{
-		boost::condition_variable_any cond;
+		boost::condition cond;
 		mutex_t::scoped_lock l(m_mutex);
 		if (!m_dht) return entry();
 		entry e;