diff --git a/libtorrent/include/libtorrent/peer_id.hpp b/libtorrent/include/libtorrent/peer_id.hpp
index 13d857f99..a546c6e08 100755
--- a/libtorrent/include/libtorrent/peer_id.hpp
+++ b/libtorrent/include/libtorrent/peer_id.hpp
@@ -38,6 +38,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <cctype>
 #include <algorithm>
 #include <string>
+#include <cstring>
 
 #include "libtorrent/config.hpp"
 #include "libtorrent/assert.hpp"
diff --git a/libtorrent/src/entry.cpp b/libtorrent/src/entry.cpp
index 88800713c..8219ecc06 100755
--- a/libtorrent/src/entry.cpp
+++ b/libtorrent/src/entry.cpp
@@ -33,6 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/pch.hpp"
 
 #include <algorithm>
+#include <iostream>
 #include <iomanip>
 #include "libtorrent/entry.hpp"
 #include "libtorrent/config.hpp"
diff --git a/libtorrent/src/lsd.cpp b/libtorrent/src/lsd.cpp
index 091f8f686..6e1dcb7b3 100644
--- a/libtorrent/src/lsd.cpp
+++ b/libtorrent/src/lsd.cpp
@@ -183,7 +183,7 @@ void lsd::on_announce(udp::endpoint const& from, char* buffer
 
 void lsd::close()
 {
-	m_broadcast_timer.cancel();
 	m_socket.close();
+	m_broadcast_timer.cancel();
 }
 
diff --git a/libtorrent/src/session_impl.cpp b/libtorrent/src/session_impl.cpp
index 3132b80c9..c41079fdc 100755
--- a/libtorrent/src/session_impl.cpp
+++ b/libtorrent/src/session_impl.cpp
@@ -2317,8 +2317,6 @@ namespace detail
 	void session_impl::stop_lsd()
 	{
 		mutex_t::scoped_lock l(m_mutex);
-		if (m_lsd.get())
-			m_lsd->close();
 		m_lsd = 0;
 	}