diff --git a/include/libtorrent/alert_types.hpp b/include/libtorrent/alert_types.hpp
index 2265e51e6..8d277b9e8 100644
--- a/include/libtorrent/alert_types.hpp
+++ b/include/libtorrent/alert_types.hpp
@@ -41,6 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/identify_client.hpp"
 #include "libtorrent/socket_io.hpp"
 #include "libtorrent/address.hpp"
+#include "libtorrent/escape_string.hpp" // to_hex
 
 namespace libtorrent
 {
diff --git a/include/libtorrent/piece_picker.hpp b/include/libtorrent/piece_picker.hpp
index fb1ce9ceb..3caeaf61e 100644
--- a/include/libtorrent/piece_picker.hpp
+++ b/include/libtorrent/piece_picker.hpp
@@ -42,6 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #include <boost/static_assert.hpp>
+#include <boost/cstdint.hpp>
 
 #ifdef _MSC_VER
 #pragma warning(pop)
diff --git a/include/libtorrent/ptime.hpp b/include/libtorrent/ptime.hpp
index 7b75ef100..0f50a61e8 100644
--- a/include/libtorrent/ptime.hpp
+++ b/include/libtorrent/ptime.hpp
@@ -38,6 +38,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #if defined TORRENT_USE_BOOST_DATE_TIME
 
+#include <boost/assert.hpp>
 #include <boost/date_time/posix_time/ptime.hpp>
 #include <boost/date_time/posix_time/posix_time_duration.hpp>
 
diff --git a/include/libtorrent/tracker_manager.hpp b/include/libtorrent/tracker_manager.hpp
index 3adbb5562..6ed8102e7 100644
--- a/include/libtorrent/tracker_manager.hpp
+++ b/include/libtorrent/tracker_manager.hpp
@@ -61,6 +61,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/deadline_timer.hpp"
 #include "libtorrent/connection_queue.hpp"
 #include "libtorrent/intrusive_ptr_base.hpp"
+#include "libtorrent/size_type.hpp"
 
 namespace libtorrent
 {
diff --git a/src/file.cpp b/src/file.cpp
index fbfa611e8..b44f22f2c 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -40,6 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/escape_string.hpp" // for string conversion
 
 #include <boost/scoped_ptr.hpp>
+#include <boost/static_assert.hpp>
 
 #ifdef TORRENT_WINDOWS
 // windows part
@@ -81,7 +82,6 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #endif
 
-#include <boost/static_assert.hpp>
 // make sure the _FILE_OFFSET_BITS define worked
 // on this platform. It's supposed to make file
 // related functions support 64-bit offsets.
diff --git a/src/smart_ban.cpp b/src/smart_ban.cpp
index bb336e3b8..811789745 100644
--- a/src/smart_ban.cpp
+++ b/src/smart_ban.cpp
@@ -56,6 +56,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/disk_io_thread.hpp"
 #include "libtorrent/aux_/session_impl.hpp"
 #include "libtorrent/peer_connection.hpp"
+#include "libtorrent/peer_info.hpp"
 
 namespace libtorrent {
 
diff --git a/src/torrent_info.cpp b/src/torrent_info.cpp
index e8e8991c8..ab42cbdae 100644
--- a/src/torrent_info.cpp
+++ b/src/torrent_info.cpp
@@ -48,6 +48,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #include <boost/bind.hpp>
+#include <boost/assert.hpp>
 #include <boost/date_time/posix_time/ptime.hpp>
 #include <boost/date_time/posix_time/posix_time_duration.hpp>
 #include <boost/date_time/time_clock.hpp>