diff --git a/Jamfile b/Jamfile
index 50607c867..04c7da969 100644
--- a/Jamfile
+++ b/Jamfile
@@ -224,6 +224,7 @@ rule linking ( properties * )
 
 	result += <define>BOOST_ALL_NO_LIB
 		<define>BOOST_MULTI_INDEX_DISABLE_SERIALIZATION
+		<define>BOOST_SYSTEM_NO_DEPRECATED
 		;
 
 	return $(result) ;
diff --git a/include/libtorrent/error.hpp b/include/libtorrent/error.hpp
index 3217bb073..42240a60d 100644
--- a/include/libtorrent/error.hpp
+++ b/include/libtorrent/error.hpp
@@ -35,12 +35,14 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "libtorrent/config.hpp"
 
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 #if defined TORRENT_WINDOWS || defined TORRENT_CYGWIN
 // asio assumes that the windows error codes are defined already
 #include <winsock2.h>
 #endif
 
 #include <boost/asio/error.hpp>
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent
 {