diff --git a/Jamfile b/Jamfile
index 184f3bc48..c7991f8ad 100755
--- a/Jamfile
+++ b/Jamfile
@@ -338,6 +338,7 @@ ZLIB_SOURCES =
 
 local usage-requirements = 
 	<include>./include
+	<include>./include/libtorrent
 	<zlib>shipped:<include>./zlib
 	<variant>release:<define>NDEBUG
 	<define>_FILE_OFFSET_BITS=64
diff --git a/include/libtorrent/socket.hpp b/include/libtorrent/socket.hpp
index 0bca27da5..d041024bb 100755
--- a/include/libtorrent/socket.hpp
+++ b/include/libtorrent/socket.hpp
@@ -45,6 +45,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #define Protocol Protocol_
 #endif
 
+#include <boost/version.hpp>
+
 #if BOOST_VERSION < 103500
 #include <asio/ip/tcp.hpp>
 #include <asio/ip/udp.hpp>
diff --git a/include/libtorrent/time.hpp b/include/libtorrent/time.hpp
index 87d9340b8..e74247ebb 100644
--- a/include/libtorrent/time.hpp
+++ b/include/libtorrent/time.hpp
@@ -34,6 +34,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #define TORRENT_TIME_HPP_INCLUDED
 
 #include <ctime>
+#include <boost/version.hpp>
 
 #ifndef _WIN32
 #include <unistd.h>
@@ -156,7 +157,7 @@ namespace libtorrent
 }
 
 // asio time_traits
-#if BOOST_VERSION < 103500
+#if BOOST_VERSION >= 103500
 namespace boost { 
 #endif
 namespace asio
@@ -179,7 +180,7 @@ namespace asio
 		{ return boost::posix_time::microseconds(libtorrent::total_microseconds(d)); }
 	};
 }
-#if BOOST_VERSION < 103500
+#if BOOST_VERSION >= 103500
 }
 #endif
 
diff --git a/src/broadcast_socket.cpp b/src/broadcast_socket.cpp
index 2a087ef79..cfb1a9f1a 100644
--- a/src/broadcast_socket.cpp
+++ b/src/broadcast_socket.cpp
@@ -30,6 +30,8 @@ POSSIBILITY OF SUCH DAMAGE.
 
 */
 
+#include <boost/version.hpp>
+
 #if BOOST_VERSION < 103500
 #include <asio/ip/host_name.hpp>
 #include <asio/ip/multicast.hpp>
diff --git a/src/mapped_storage.cpp b/src/mapped_storage.cpp
index f0c4d1b8b..7b8637064 100644
--- a/src/mapped_storage.cpp
+++ b/src/mapped_storage.cpp
@@ -64,7 +64,9 @@ namespace libtorrent
 {
 	namespace fs = boost::filesystem;
 #if BOOST_VERSION >= 103500
-	using boost::system::error_code;
+	typedef boost::system::error_code ec_t;
+#else
+	typedef error_code ec_t;
 #endif
 
 	struct mapped_file_pool
@@ -85,7 +87,7 @@ namespace libtorrent
 #ifndef NDEBUG
 				if (file_size > 0)
 				{
-					error_code ec;
+					ec_t ec;
 					fs::file_status st = fs::status(path, ec);
 					TORRENT_ASSERT(!fs::exists(st));
 				}
@@ -207,7 +209,7 @@ namespace libtorrent
 #if BOOST_VERSION < 103500
 			fs::system_error_type ec;
 #else
-			error_code ec;
+			ec_t ec;
 #endif
 			fs::file_status st = fs::status(p, ec);