diff --git a/simulation/libsimulator b/simulation/libsimulator
index ff7d375f6..fa1e83614 160000
--- a/simulation/libsimulator
+++ b/simulation/libsimulator
@@ -1 +1 @@
-Subproject commit ff7d375f6d49f8eea5f6123a36d70011ce310aee
+Subproject commit fa1e83614ca96b4802a4c6cea9488a93111be86d
diff --git a/src/kademlia/dht_storage.cpp b/src/kademlia/dht_storage.cpp
index de8f2c414..90e16c764 100644
--- a/src/kademlia/dht_storage.cpp
+++ b/src/kademlia/dht_storage.cpp
@@ -32,11 +32,15 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "libtorrent/kademlia/dht_storage.hpp"
 
+#include "libtorrent/aux_/disable_warnings_push.hpp"
+
 #include <utility>
 #include <boost/bind.hpp>
 #include <boost/function/function1.hpp>
 #include <boost/tuple/tuple.hpp>
 
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
+
 #include <algorithm>
 #include <map>
 #include <set>