From 3951377d95998d6ddaac8e18d551e988475d5f3a Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Tue, 21 Apr 2015 01:16:28 +0000
Subject: [PATCH] fix include paths for warning push and pop headers

---
 include/libtorrent/address.hpp                      | 4 ++--
 include/libtorrent/alert.hpp                        | 4 ++--
 include/libtorrent/alert_manager.hpp                | 4 ++--
 include/libtorrent/aux_/session_impl.hpp            | 4 ++--
 include/libtorrent/aux_/session_interface.hpp       | 4 ++--
 include/libtorrent/bandwidth_manager.hpp            | 4 ++--
 include/libtorrent/bandwidth_queue_entry.hpp        | 4 ++--
 include/libtorrent/bdecode.hpp                      | 4 ++--
 include/libtorrent/bencode.hpp                      | 4 ++--
 include/libtorrent/block_cache.hpp                  | 4 ++--
 include/libtorrent/bloom_filter.hpp                 | 4 ++--
 include/libtorrent/broadcast_socket.hpp             | 4 ++--
 include/libtorrent/bt_peer_connection.hpp           | 4 ++--
 include/libtorrent/create_torrent.hpp               | 4 ++--
 include/libtorrent/disk_buffer_pool.hpp             | 4 ++--
 include/libtorrent/disk_io_job.hpp                  | 4 ++--
 include/libtorrent/disk_io_thread.hpp               | 4 ++--
 include/libtorrent/disk_job_pool.hpp                | 4 ++--
 include/libtorrent/entry.hpp                        | 4 ++--
 include/libtorrent/enum_net.hpp                     | 4 ++--
 include/libtorrent/extensions.hpp                   | 4 ++--
 include/libtorrent/extensions/lt_trackers.hpp       | 4 ++--
 include/libtorrent/extensions/metadata_transfer.hpp | 4 ++--
 include/libtorrent/extensions/smart_ban.hpp         | 4 ++--
 include/libtorrent/extensions/ut_metadata.hpp       | 4 ++--
 include/libtorrent/extensions/ut_pex.hpp            | 4 ++--
 include/libtorrent/file.hpp                         | 4 ++--
 include/libtorrent/file_storage.hpp                 | 4 ++--
 include/libtorrent/hex.hpp                          | 4 ++--
 include/libtorrent/http_connection.hpp              | 4 ++--
 include/libtorrent/http_parser.hpp                  | 4 ++--
 include/libtorrent/http_seed_connection.hpp         | 4 ++--
 include/libtorrent/http_stream.hpp                  | 4 ++--
 include/libtorrent/http_tracker_connection.hpp      | 4 ++--
 include/libtorrent/i2p_stream.hpp                   | 4 ++--
 include/libtorrent/identify_client.hpp              | 4 ++--
 include/libtorrent/io_service.hpp                   | 4 ++--
 include/libtorrent/io_service_fwd.hpp               | 4 ++--
 include/libtorrent/ip_filter.hpp                    | 4 ++--
 include/libtorrent/kademlia/find_data.hpp           | 4 ++--
 include/libtorrent/kademlia/observer.hpp            | 4 ++--
 include/libtorrent/kademlia/routing_table.hpp       | 4 ++--
 include/libtorrent/kademlia/rpc_manager.hpp         | 4 ++--
 include/libtorrent/lsd.hpp                          | 4 ++++
 include/libtorrent/natpmp.hpp                       | 4 ++--
 include/libtorrent/parse_url.hpp                    | 4 ++--
 include/libtorrent/part_file.hpp                    | 4 ++--
 include/libtorrent/peer_class.hpp                   | 4 ++--
 include/libtorrent/peer_connection.hpp              | 4 ++--
 include/libtorrent/performance_counters.hpp         | 4 ++--
 include/libtorrent/piece_picker.hpp                 | 4 ++--
 include/libtorrent/proxy_base.hpp                   | 4 ++--
 include/libtorrent/resolve_links.hpp                | 4 ++--
 include/libtorrent/resolver.hpp                     | 4 ++--
 include/libtorrent/session.hpp                      | 4 ++--
 include/libtorrent/socket.hpp                       | 4 ++--
 include/libtorrent/socks5_stream.hpp                | 4 ++--
 include/libtorrent/ssl_stream.hpp                   | 4 ++--
 include/libtorrent/storage.hpp                      | 4 ++--
 include/libtorrent/thread.hpp                       | 4 ++--
 include/libtorrent/torrent.hpp                      | 4 ++--
 include/libtorrent/torrent_handle.hpp               | 4 ++--
 include/libtorrent/torrent_info.hpp                 | 4 ++--
 include/libtorrent/torrent_peer_allocator.hpp       | 4 ++--
 include/libtorrent/tracker_manager.hpp              | 4 ++--
 include/libtorrent/udp_tracker_connection.hpp       | 4 ++--
 include/libtorrent/web_connection_base.hpp          | 4 ++--
 include/libtorrent/web_peer_connection.hpp          | 4 ++--
 include/libtorrent/xml_parse.hpp                    | 4 ++--
 src/asio.cpp                                        | 4 ++--
 src/close_reason.cpp                                | 4 ++--
 src/crc32c.cpp                                      | 4 ++--
 src/entry.cpp                                       | 4 ++--
 src/escape_string.cpp                               | 4 ++--
 src/identify_client.cpp                             | 4 ++--
 src/kademlia/node.cpp                               | 4 ++--
 src/lt_trackers.cpp                                 | 4 ++--
 src/metadata_transfer.cpp                           | 4 ++--
 src/peer_connection.cpp                             | 4 ++--
 src/peer_list.cpp                                   | 4 ++--
 src/piece_picker.cpp                                | 4 ++--
 src/random.cpp                                      | 4 ++--
 src/session_impl.cpp                                | 4 ++--
 src/smart_ban.cpp                                   | 4 ++--
 src/storage.cpp                                     | 4 ++--
 src/string_util.cpp                                 | 4 ++--
 src/torrent.cpp                                     | 4 ++--
 src/torrent_handle.cpp                              | 4 ++--
 src/torrent_info.cpp                                | 4 ++--
 src/tracker_manager.cpp                             | 4 ++--
 src/udp_tracker_connection.cpp                      | 4 ++--
 src/ut_metadata.cpp                                 | 4 ++--
 src/ut_pex.cpp                                      | 4 ++--
 93 files changed, 188 insertions(+), 184 deletions(-)

diff --git a/include/libtorrent/address.hpp b/include/libtorrent/address.hpp
index a68c1ff84..339319b7f 100644
--- a/include/libtorrent/address.hpp
+++ b/include/libtorrent/address.hpp
@@ -36,7 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/version.hpp>
 #include "libtorrent/config.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #ifdef __OBJC__
 #define Protocol Protocol_
@@ -53,7 +53,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/asio/ip/address.hpp>
 #endif
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #ifdef __OBJC__ 
 #undef Protocol
diff --git a/include/libtorrent/alert.hpp b/include/libtorrent/alert.hpp
index fc0802873..361056d83 100644
--- a/include/libtorrent/alert.hpp
+++ b/include/libtorrent/alert.hpp
@@ -38,7 +38,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <vector>
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/preprocessor/repetition/enum_params_with_a_default.hpp>
 #include <boost/preprocessor/repetition/enum.hpp>
@@ -46,7 +46,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/preprocessor/repetition/enum_shifted_params.hpp>
 #include <boost/preprocessor/repetition/enum_shifted_binary_params.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 // OVERVIEW
 //
diff --git a/include/libtorrent/alert_manager.hpp b/include/libtorrent/alert_manager.hpp
index da91a85d2..d6c0522c6 100644
--- a/include/libtorrent/alert_manager.hpp
+++ b/include/libtorrent/alert_manager.hpp
@@ -39,7 +39,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/heterogeneous_queue.hpp"
 #include "libtorrent/stack_allocator.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #ifndef TORRENT_NO_DEPRECATE
 #include <boost/function/function1.hpp>
@@ -50,7 +50,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <list>
 #include <utility> // for std::forward
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 // used for emplace_alert() variadic template emulation for c++98
 #define TORRENT_ALERT_MANAGER_MAX_ARITY 7
diff --git a/include/libtorrent/aux_/session_impl.hpp b/include/libtorrent/aux_/session_impl.hpp
index d920c5319..5f1c9a76a 100644
--- a/include/libtorrent/aux_/session_impl.hpp
+++ b/include/libtorrent/aux_/session_impl.hpp
@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/torrent_peer_allocator.hpp"
 #include "libtorrent/performance_counters.hpp" // for counters
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <algorithm>
 #include <vector>
@@ -58,7 +58,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/asio/ssl/context.hpp>
 #endif
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/session.hpp" // for user_load_function_t
 #include "libtorrent/ip_voter.hpp"
diff --git a/include/libtorrent/aux_/session_interface.hpp b/include/libtorrent/aux_/session_interface.hpp
index 311163458..456c96565 100644
--- a/include/libtorrent/aux_/session_interface.hpp
+++ b/include/libtorrent/aux_/session_interface.hpp
@@ -36,7 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/config.hpp"
 #include "libtorrent/peer_id.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/weak_ptr.hpp>
 #include <boost/function.hpp>
@@ -49,7 +49,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/asio/ssl/context.hpp>
 #endif
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/address.hpp"
 #include "libtorrent/io_service.hpp"
diff --git a/include/libtorrent/bandwidth_manager.hpp b/include/libtorrent/bandwidth_manager.hpp
index 55c5e5fe1..0834d81ee 100644
--- a/include/libtorrent/bandwidth_manager.hpp
+++ b/include/libtorrent/bandwidth_manager.hpp
@@ -33,11 +33,11 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_BANDWIDTH_MANAGER_HPP_INCLUDED
 #define TORRENT_BANDWIDTH_MANAGER_HPP_INCLUDED
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/shared_ptr.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #ifdef TORRENT_VERBOSE_BANDWIDTH_LIMIT
 #include <fstream>
diff --git a/include/libtorrent/bandwidth_queue_entry.hpp b/include/libtorrent/bandwidth_queue_entry.hpp
index a51d7ef41..8e6717da7 100644
--- a/include/libtorrent/bandwidth_queue_entry.hpp
+++ b/include/libtorrent/bandwidth_queue_entry.hpp
@@ -33,11 +33,11 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_BANDWIDTH_QUEUE_ENTRY_HPP_INCLUDED
 #define TORRENT_BANDWIDTH_QUEUE_ENTRY_HPP_INCLUDED
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/shared_ptr.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/bandwidth_limit.hpp"
 #include "libtorrent/bandwidth_socket.hpp"
diff --git a/include/libtorrent/bdecode.hpp b/include/libtorrent/bdecode.hpp
index e6410f6a9..b2536b4e8 100644
--- a/include/libtorrent/bdecode.hpp
+++ b/include/libtorrent/bdecode.hpp
@@ -30,14 +30,14 @@ POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/cstdint.hpp>
 #include <boost/system/error_code.hpp>
 #include <vector>
 #include <string>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/assert.hpp"
 
diff --git a/include/libtorrent/bencode.hpp b/include/libtorrent/bencode.hpp
index 6264e2fef..fb7138b8f 100644
--- a/include/libtorrent/bencode.hpp
+++ b/include/libtorrent/bencode.hpp
@@ -76,11 +76,11 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <exception>
 #include <iterator> // for distance
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/static_assert.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/entry.hpp"
 #include "libtorrent/config.hpp"
diff --git a/include/libtorrent/block_cache.hpp b/include/libtorrent/block_cache.hpp
index 1f62142e4..f26b56382 100644
--- a/include/libtorrent/block_cache.hpp
+++ b/include/libtorrent/block_cache.hpp
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_BLOCK_CACHE
 #define TORRENT_BLOCK_CACHE
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/unordered_set.hpp>
 #include <boost/cstdint.hpp>
@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <list>
 #include <vector>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/time.hpp"
 #include "libtorrent/error_code.hpp"
diff --git a/include/libtorrent/bloom_filter.hpp b/include/libtorrent/bloom_filter.hpp
index b471e717d..615f2532c 100644
--- a/include/libtorrent/bloom_filter.hpp
+++ b/include/libtorrent/bloom_filter.hpp
@@ -36,12 +36,12 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/peer_id.hpp" // for sha1_hash
 #include "libtorrent/config.hpp" // for sha1_hash
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/cstdint.hpp>
 #include <math.h> // for log()
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent
 {
diff --git a/include/libtorrent/broadcast_socket.hpp b/include/libtorrent/broadcast_socket.hpp
index 4dbf6789a..f2f3623c4 100644
--- a/include/libtorrent/broadcast_socket.hpp
+++ b/include/libtorrent/broadcast_socket.hpp
@@ -39,13 +39,13 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/address.hpp"
 #include "libtorrent/error_code.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/shared_ptr.hpp>
 #include <boost/function/function3.hpp>
 #include <list>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent
 {
diff --git a/include/libtorrent/bt_peer_connection.hpp b/include/libtorrent/bt_peer_connection.hpp
index 934599988..17be5332d 100644
--- a/include/libtorrent/bt_peer_connection.hpp
+++ b/include/libtorrent/bt_peer_connection.hpp
@@ -41,7 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "libtorrent/debug.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/smart_ptr.hpp>
 #include <boost/noncopyable.hpp>
@@ -49,7 +49,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/optional.hpp>
 #include <boost/cstdint.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/buffer.hpp"
 #include "libtorrent/peer_connection.hpp"
diff --git a/include/libtorrent/create_torrent.hpp b/include/libtorrent/create_torrent.hpp
index fa91300ea..d854b3585 100644
--- a/include/libtorrent/create_torrent.hpp
+++ b/include/libtorrent/create_torrent.hpp
@@ -43,7 +43,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/allocator.hpp"
 #include "libtorrent/file.hpp" // for combine_path etc.
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <vector>
 #include <string>
@@ -52,7 +52,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/scoped_ptr.hpp>
 #include <boost/config.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 // OVERVIEW
 //
diff --git a/include/libtorrent/disk_buffer_pool.hpp b/include/libtorrent/disk_buffer_pool.hpp
index 7c4c8ae23..35cbdf03e 100644
--- a/include/libtorrent/disk_buffer_pool.hpp
+++ b/include/libtorrent/disk_buffer_pool.hpp
@@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "libtorrent/config.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
@@ -51,7 +51,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <set>
 #endif
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/thread.hpp"
 #include "libtorrent/io_service_fwd.hpp"
diff --git a/include/libtorrent/disk_io_job.hpp b/include/libtorrent/disk_io_job.hpp
index c7759f4fb..e7bfddbde 100644
--- a/include/libtorrent/disk_io_job.hpp
+++ b/include/libtorrent/disk_io_job.hpp
@@ -38,14 +38,14 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/tailqueue.hpp"
 #include "libtorrent/peer_id.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <string>
 #include <boost/function/function1.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent
 {
diff --git a/include/libtorrent/disk_io_thread.hpp b/include/libtorrent/disk_io_thread.hpp
index 5cd82caf8..6e37ab6c1 100644
--- a/include/libtorrent/disk_io_thread.hpp
+++ b/include/libtorrent/disk_io_thread.hpp
@@ -47,7 +47,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/aux_/session_settings.hpp"
 #include "libtorrent/thread.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/function/function0.hpp>
 #include <boost/noncopyable.hpp>
@@ -60,7 +60,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #endif
 #include <boost/atomic.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent
 {
diff --git a/include/libtorrent/disk_job_pool.hpp b/include/libtorrent/disk_job_pool.hpp
index 9e8329cea..e4488cde8 100644
--- a/include/libtorrent/disk_job_pool.hpp
+++ b/include/libtorrent/disk_job_pool.hpp
@@ -36,11 +36,11 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/config.hpp"
 #include "libtorrent/thread.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/pool/object_pool.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent
 {
diff --git a/include/libtorrent/entry.hpp b/include/libtorrent/entry.hpp
index d1f4392dc..94a155d94 100644
--- a/include/libtorrent/entry.hpp
+++ b/include/libtorrent/entry.hpp
@@ -60,7 +60,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "libtorrent/config.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <map>
 #include <list>
@@ -72,7 +72,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <iosfwd>
 #endif
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/assert.hpp"
 #include "libtorrent/error_code.hpp"
diff --git a/include/libtorrent/enum_net.hpp b/include/libtorrent/enum_net.hpp
index 79e580933..b37eac44f 100644
--- a/include/libtorrent/enum_net.hpp
+++ b/include/libtorrent/enum_net.hpp
@@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "libtorrent/config.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <vector>
 #include <boost/asio/ip/tcp.hpp>
@@ -44,7 +44,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <sys/socket.h> // for SO_BINDTODEVICE
 #endif
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/io_service_fwd.hpp"
 #include "libtorrent/address.hpp"
diff --git a/include/libtorrent/extensions.hpp b/include/libtorrent/extensions.hpp
index c3e16b865..d5aa9c25b 100644
--- a/include/libtorrent/extensions.hpp
+++ b/include/libtorrent/extensions.hpp
@@ -165,11 +165,11 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef TORRENT_DISABLE_EXTENSIONS
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/weak_ptr.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include <vector>
 #include "libtorrent/config.hpp"
diff --git a/include/libtorrent/extensions/lt_trackers.hpp b/include/libtorrent/extensions/lt_trackers.hpp
index 05ccb276b..f3f949fa9 100644
--- a/include/libtorrent/extensions/lt_trackers.hpp
+++ b/include/libtorrent/extensions/lt_trackers.hpp
@@ -35,12 +35,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef TORRENT_DISABLE_EXTENSIONS
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/shared_ptr.hpp>
 #include "libtorrent/config.hpp"
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent
 {
diff --git a/include/libtorrent/extensions/metadata_transfer.hpp b/include/libtorrent/extensions/metadata_transfer.hpp
index 7a7dc9409..f108280a4 100644
--- a/include/libtorrent/extensions/metadata_transfer.hpp
+++ b/include/libtorrent/extensions/metadata_transfer.hpp
@@ -37,11 +37,11 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "libtorrent/config.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/shared_ptr.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #ifndef TORRENT_NO_DEPRECATE
 
diff --git a/include/libtorrent/extensions/smart_ban.hpp b/include/libtorrent/extensions/smart_ban.hpp
index e249ba1d0..895b60d32 100644
--- a/include/libtorrent/extensions/smart_ban.hpp
+++ b/include/libtorrent/extensions/smart_ban.hpp
@@ -35,12 +35,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef TORRENT_DISABLE_EXTENSIONS
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/shared_ptr.hpp>
 #include "libtorrent/config.hpp"
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent
 {
diff --git a/include/libtorrent/extensions/ut_metadata.hpp b/include/libtorrent/extensions/ut_metadata.hpp
index c367ffe88..ddf21b383 100644
--- a/include/libtorrent/extensions/ut_metadata.hpp
+++ b/include/libtorrent/extensions/ut_metadata.hpp
@@ -35,12 +35,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef TORRENT_DISABLE_EXTENSIONS
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/shared_ptr.hpp>
 #include "libtorrent/config.hpp"
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent
 {
diff --git a/include/libtorrent/extensions/ut_pex.hpp b/include/libtorrent/extensions/ut_pex.hpp
index 55c127b44..1b23261a9 100644
--- a/include/libtorrent/extensions/ut_pex.hpp
+++ b/include/libtorrent/extensions/ut_pex.hpp
@@ -35,12 +35,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef TORRENT_DISABLE_EXTENSIONS
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/shared_ptr.hpp>
 #include "libtorrent/config.hpp"
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent
 {
diff --git a/include/libtorrent/file.hpp b/include/libtorrent/file.hpp
index 5153a193f..8d9678d36 100644
--- a/include/libtorrent/file.hpp
+++ b/include/libtorrent/file.hpp
@@ -38,7 +38,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "libtorrent/config.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/noncopyable.hpp>
 #include <boost/smart_ptr.hpp>
@@ -74,7 +74,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #endif
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/error_code.hpp"
 #include "libtorrent/assert.hpp"
diff --git a/include/libtorrent/file_storage.hpp b/include/libtorrent/file_storage.hpp
index ed8c52c45..44ea3d579 100644
--- a/include/libtorrent/file_storage.hpp
+++ b/include/libtorrent/file_storage.hpp
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_FILE_STORAGE_HPP_INCLUDED
 #define TORRENT_FILE_STORAGE_HPP_INCLUDED
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <string>
 #include <vector>
@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/cstdint.hpp>
 #include <boost/unordered_set.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/assert.hpp"
 #include "libtorrent/peer_request.hpp"
diff --git a/include/libtorrent/hex.hpp b/include/libtorrent/hex.hpp
index 81b289b37..b3ab5adb8 100644
--- a/include/libtorrent/hex.hpp
+++ b/include/libtorrent/hex.hpp
@@ -36,13 +36,13 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/config.hpp"
 #include "libtorrent/error_code.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <string>
 #include <boost/limits.hpp>
 #include <boost/array.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent
 {
diff --git a/include/libtorrent/http_connection.hpp b/include/libtorrent/http_connection.hpp
index e43c75cb7..befce79ba 100644
--- a/include/libtorrent/http_connection.hpp
+++ b/include/libtorrent/http_connection.hpp
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_HTTP_CONNECTION
 #define TORRENT_HTTP_CONNECTION
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/function/function1.hpp>
 #include <boost/function/function2.hpp>
@@ -49,7 +49,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/asio/ssl/context.hpp>
 #endif
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/socket.hpp"
 #include "libtorrent/error_code.hpp"
diff --git a/include/libtorrent/http_parser.hpp b/include/libtorrent/http_parser.hpp
index bbf5dbe7e..df4b90e88 100644
--- a/include/libtorrent/http_parser.hpp
+++ b/include/libtorrent/http_parser.hpp
@@ -38,12 +38,12 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <utility>
 #include <vector>
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/cstdint.hpp>
 #include <boost/tuple/tuple.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/config.hpp"
 #include "libtorrent/buffer.hpp"
diff --git a/include/libtorrent/http_seed_connection.hpp b/include/libtorrent/http_seed_connection.hpp
index db3c2eecb..b5c9c0556 100644
--- a/include/libtorrent/http_seed_connection.hpp
+++ b/include/libtorrent/http_seed_connection.hpp
@@ -40,7 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "libtorrent/debug.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/smart_ptr.hpp>
 #include <boost/weak_ptr.hpp>
@@ -49,7 +49,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/optional.hpp>
 #include <boost/cstdint.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/config.hpp"
 #include "libtorrent/web_connection_base.hpp"
diff --git a/include/libtorrent/http_stream.hpp b/include/libtorrent/http_stream.hpp
index cf98671fc..6ef0a1d68 100644
--- a/include/libtorrent/http_stream.hpp
+++ b/include/libtorrent/http_stream.hpp
@@ -33,13 +33,13 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_HTTP_STREAM_HPP_INCLUDED
 #define TORRENT_HTTP_STREAM_HPP_INCLUDED
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/function/function1.hpp>
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/proxy_base.hpp"
 #include "libtorrent/string_util.hpp"
diff --git a/include/libtorrent/http_tracker_connection.hpp b/include/libtorrent/http_tracker_connection.hpp
index bdccbc02e..cb5da1332 100644
--- a/include/libtorrent/http_tracker_connection.hpp
+++ b/include/libtorrent/http_tracker_connection.hpp
@@ -36,11 +36,11 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <vector>
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/shared_ptr.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/config.hpp"
 #include "libtorrent/lazy_entry.hpp"
diff --git a/include/libtorrent/i2p_stream.hpp b/include/libtorrent/i2p_stream.hpp
index df4450b3a..445d4518f 100644
--- a/include/libtorrent/i2p_stream.hpp
+++ b/include/libtorrent/i2p_stream.hpp
@@ -37,7 +37,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #if TORRENT_USE_I2P
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <list>
 #include <string>
@@ -47,7 +47,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/proxy_base.hpp"
 #include "libtorrent/session_settings.hpp"
diff --git a/include/libtorrent/identify_client.hpp b/include/libtorrent/identify_client.hpp
index 150e72d7a..babdf10d0 100644
--- a/include/libtorrent/identify_client.hpp
+++ b/include/libtorrent/identify_client.hpp
@@ -33,11 +33,11 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_IDENTIFY_CLIENT_HPP_INCLUDED
 #define TORRENT_IDENTIFY_CLIENT_HPP_INCLUDED
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/optional.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/peer_id.hpp"
 #include "libtorrent/fingerprint.hpp"
diff --git a/include/libtorrent/io_service.hpp b/include/libtorrent/io_service.hpp
index 2c4fa8b28..b97c16532 100644
--- a/include/libtorrent/io_service.hpp
+++ b/include/libtorrent/io_service.hpp
@@ -37,7 +37,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #define Protocol Protocol_
 #endif
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/version.hpp>
 
@@ -52,7 +52,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/asio/io_service.hpp>
 #endif
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #ifdef __OBJC__ 
 #undef Protocol
diff --git a/include/libtorrent/io_service_fwd.hpp b/include/libtorrent/io_service_fwd.hpp
index f9326801a..162285cfb 100644
--- a/include/libtorrent/io_service_fwd.hpp
+++ b/include/libtorrent/io_service_fwd.hpp
@@ -37,11 +37,11 @@ POSSIBILITY OF SUCH DAMAGE.
 #define Protocol Protocol_
 #endif
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/version.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #ifdef __OBJC__ 
 #undef Protocol
diff --git a/include/libtorrent/ip_filter.hpp b/include/libtorrent/ip_filter.hpp
index 6602e6c47..ce454737b 100644
--- a/include/libtorrent/ip_filter.hpp
+++ b/include/libtorrent/ip_filter.hpp
@@ -36,14 +36,14 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <set>
 #include <vector>
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/limits.hpp>
 #include <boost/utility.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/tuple/tuple.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/config.hpp"
 #include "libtorrent/address.hpp"
diff --git a/include/libtorrent/kademlia/find_data.hpp b/include/libtorrent/kademlia/find_data.hpp
index d25347145..c31b328f0 100644
--- a/include/libtorrent/kademlia/find_data.hpp
+++ b/include/libtorrent/kademlia/find_data.hpp
@@ -40,7 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <libtorrent/kademlia/observer.hpp>
 #include <libtorrent/kademlia/msg.hpp>
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <vector>
 #include <map>
@@ -49,7 +49,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/function/function1.hpp>
 #include <boost/function/function2.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent { namespace dht
 {
diff --git a/include/libtorrent/kademlia/observer.hpp b/include/libtorrent/kademlia/observer.hpp
index 2e9b6c403..ef711fd3b 100644
--- a/include/libtorrent/kademlia/observer.hpp
+++ b/include/libtorrent/kademlia/observer.hpp
@@ -36,14 +36,14 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <libtorrent/time.hpp>
 #include <libtorrent/address.hpp>
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/pool/pool.hpp>
 #include <boost/detail/atomic_count.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/cstdint.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent {
 namespace dht {
diff --git a/include/libtorrent/kademlia/routing_table.hpp b/include/libtorrent/kademlia/routing_table.hpp
index f320dfe0b..d09c0e9eb 100644
--- a/include/libtorrent/kademlia/routing_table.hpp
+++ b/include/libtorrent/kademlia/routing_table.hpp
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef ROUTING_TABLE_HPP
 #define ROUTING_TABLE_HPP
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <vector>
 #include <set>
@@ -45,7 +45,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/noncopyable.hpp>
 #include <boost/unordered_set.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include <libtorrent/kademlia/logging.hpp>
 #include <libtorrent/kademlia/node_id.hpp>
diff --git a/include/libtorrent/kademlia/rpc_manager.hpp b/include/libtorrent/kademlia/rpc_manager.hpp
index 494bc59d0..895b19976 100644
--- a/include/libtorrent/kademlia/rpc_manager.hpp
+++ b/include/libtorrent/kademlia/rpc_manager.hpp
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef RPC_MANAGER_HPP
 #define RPC_MANAGER_HPP
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <vector>
 #include <deque>
@@ -48,7 +48,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <multimap>
 #endif
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include <libtorrent/socket.hpp>
 #include <libtorrent/entry.hpp>
diff --git a/include/libtorrent/lsd.hpp b/include/libtorrent/lsd.hpp
index 427f6b28e..e209482e9 100644
--- a/include/libtorrent/lsd.hpp
+++ b/include/libtorrent/lsd.hpp
@@ -38,6 +38,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/broadcast_socket.hpp"
 #include "libtorrent/deadline_timer.hpp"
 
+#include "libtorrent/aux_/disable_warnings_push.hpp"
+
 #include <boost/function/function2.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
@@ -47,6 +49,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/function/function1.hpp>
 #endif
 
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
+
 namespace libtorrent
 {
 
diff --git a/include/libtorrent/natpmp.hpp b/include/libtorrent/natpmp.hpp
index edaaba247..bf0d0addf 100644
--- a/include/libtorrent/natpmp.hpp
+++ b/include/libtorrent/natpmp.hpp
@@ -40,13 +40,13 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/error_code.hpp"
 #include "libtorrent/deadline_timer.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/function/function1.hpp>
 #include <boost/function/function4.hpp>
 #include <boost/enable_shared_from_this.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent
 {
diff --git a/include/libtorrent/parse_url.hpp b/include/libtorrent/parse_url.hpp
index bdca5a962..50ac9800b 100644
--- a/include/libtorrent/parse_url.hpp
+++ b/include/libtorrent/parse_url.hpp
@@ -33,11 +33,11 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_PARSE_URL_HPP_INCLUDED
 #define TORRENT_PARSE_URL_HPP_INCLUDED
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/tuple/tuple.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include <string>
 #include "libtorrent/config.hpp"
diff --git a/include/libtorrent/part_file.hpp b/include/libtorrent/part_file.hpp
index e6a0f2f93..db8c74e0c 100644
--- a/include/libtorrent/part_file.hpp
+++ b/include/libtorrent/part_file.hpp
@@ -30,14 +30,14 @@ POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <string>
 #include <vector>
 #include <boost/unordered_map.hpp>
 #include <boost/cstdint.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/config.hpp"
 #include "libtorrent/file.hpp"
diff --git a/include/libtorrent/peer_class.hpp b/include/libtorrent/peer_class.hpp
index 648587c56..10db5ee10 100644
--- a/include/libtorrent/peer_class.hpp
+++ b/include/libtorrent/peer_class.hpp
@@ -36,14 +36,14 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/bandwidth_limit.hpp"
 #include "libtorrent/assert.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <vector>
 #include <string>
 #include <boost/smart_ptr.hpp>
 #include <boost/cstdint.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent
 {
diff --git a/include/libtorrent/peer_connection.hpp b/include/libtorrent/peer_connection.hpp
index cc44a58fe..464771571 100644
--- a/include/libtorrent/peer_connection.hpp
+++ b/include/libtorrent/peer_connection.hpp
@@ -39,7 +39,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/debug.hpp"
 #endif
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <ctime>
 #include <algorithm>
@@ -55,7 +55,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/pool/pool.hpp>
 #include <boost/aligned_storage.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/buffer.hpp"
 #include "libtorrent/peer_id.hpp"
diff --git a/include/libtorrent/performance_counters.hpp b/include/libtorrent/performance_counters.hpp
index d1b36fb54..346550596 100644
--- a/include/libtorrent/performance_counters.hpp
+++ b/include/libtorrent/performance_counters.hpp
@@ -33,12 +33,12 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_PERFORMANCE_COUNTERS_HPP_INCLUDED
 #define TORRENT_PERFORMANCE_COUNTERS_HPP_INCLUDED
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/cstdint.hpp>
 #include <boost/atomic.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/config.hpp"
 
diff --git a/include/libtorrent/piece_picker.hpp b/include/libtorrent/piece_picker.hpp
index d6747090a..214ffb13b 100644
--- a/include/libtorrent/piece_picker.hpp
+++ b/include/libtorrent/piece_picker.hpp
@@ -40,7 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "libtorrent/config.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <algorithm>
 #include <vector>
@@ -59,7 +59,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <set>
 #endif
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/peer_id.hpp"
 #include "libtorrent/assert.hpp"
diff --git a/include/libtorrent/proxy_base.hpp b/include/libtorrent/proxy_base.hpp
index fc8b2c144..547222795 100644
--- a/include/libtorrent/proxy_base.hpp
+++ b/include/libtorrent/proxy_base.hpp
@@ -39,9 +39,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/address.hpp"
 #include "libtorrent/error_code.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 #include <boost/function/function1.hpp>
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent {
 
diff --git a/include/libtorrent/resolve_links.hpp b/include/libtorrent/resolve_links.hpp
index c3dd7e370..27fafdd45 100644
--- a/include/libtorrent/resolve_links.hpp
+++ b/include/libtorrent/resolve_links.hpp
@@ -33,14 +33,14 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_RESOLVE_LINKS_HPP
 #define TORRENT_RESOLVE_LINKS_HPP
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/shared_ptr.hpp>
 #include <boost/unordered_map.hpp>
 #include <vector>
 #include <utility>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/export.hpp"
 
diff --git a/include/libtorrent/resolver.hpp b/include/libtorrent/resolver.hpp
index 690039c5d..b36d02af2 100644
--- a/include/libtorrent/resolver.hpp
+++ b/include/libtorrent/resolver.hpp
@@ -33,14 +33,14 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_RESOLVER_HPP_INCLUDE
 #define TORRENT_RESOLVER_HPP_INCLUDE
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/function.hpp>
 #include <boost/unordered_map.hpp>
 #include <vector>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/error_code.hpp"
 #include "libtorrent/io_service.hpp"
diff --git a/include/libtorrent/session.hpp b/include/libtorrent/session.hpp
index 513835dc5..50fa6f5a1 100644
--- a/include/libtorrent/session.hpp
+++ b/include/libtorrent/session.hpp
@@ -36,14 +36,14 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <algorithm>
 #include <vector>
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/limits.hpp>
 #ifdef _MSC_VER
 #	include <eh.h>
 #endif
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/config.hpp"
 #include "libtorrent/torrent_handle.hpp"
diff --git a/include/libtorrent/socket.hpp b/include/libtorrent/socket.hpp
index e1e7a3193..3a51b186d 100644
--- a/include/libtorrent/socket.hpp
+++ b/include/libtorrent/socket.hpp
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_SOCKET_HPP_INCLUDED
 #define TORRENT_SOCKET_HPP_INCLUDED
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 // if building as Objective C++, asio's template
 // parameters Protocol has to be renamed to avoid
@@ -66,7 +66,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #undef Protocol
 #endif
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent
 {
diff --git a/include/libtorrent/socks5_stream.hpp b/include/libtorrent/socks5_stream.hpp
index 0d051344f..b8bb6b737 100644
--- a/include/libtorrent/socks5_stream.hpp
+++ b/include/libtorrent/socks5_stream.hpp
@@ -33,12 +33,12 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_SOCKS5_STREAM_HPP_INCLUDED
 #define TORRENT_SOCKS5_STREAM_HPP_INCLUDED
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/proxy_base.hpp"
 #include "libtorrent/assert.hpp"
diff --git a/include/libtorrent/ssl_stream.hpp b/include/libtorrent/ssl_stream.hpp
index 9eaa25327..d8651b16b 100644
--- a/include/libtorrent/ssl_stream.hpp
+++ b/include/libtorrent/ssl_stream.hpp
@@ -39,7 +39,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/error_code.hpp"
 #include "libtorrent/io_service.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/function/function1.hpp>
 #include <boost/bind.hpp>
@@ -52,7 +52,7 @@ POSSIBILITY OF SUCH DAMAGE.
 // this name in every single scope
 #undef set_key
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent {
 
diff --git a/include/libtorrent/storage.hpp b/include/libtorrent/storage.hpp
index 10dd61600..efb0a6ce1 100644
--- a/include/libtorrent/storage.hpp
+++ b/include/libtorrent/storage.hpp
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_STORAGE_HPP_INCLUDE
 #define TORRENT_STORAGE_HPP_INCLUDE
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <vector>
 #include <sys/types.h>
@@ -46,7 +46,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/unordered_set.hpp>
 #include <boost/atomic.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/piece_picker.hpp"
 #include "libtorrent/peer_request.hpp"
diff --git a/include/libtorrent/thread.hpp b/include/libtorrent/thread.hpp
index d5927afaa..d5814a126 100644
--- a/include/libtorrent/thread.hpp
+++ b/include/libtorrent/thread.hpp
@@ -37,7 +37,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/assert.hpp"
 #include "libtorrent/time.hpp"
 
-#include "aux_/disable_warnings_push.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
@@ -55,7 +55,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/asio/detail/event.hpp>
 #include <boost/cstdint.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent
 {
diff --git a/include/libtorrent/torrent.hpp b/include/libtorrent/torrent.hpp
index 1c7a98a0a..d37020b2b 100644
--- a/include/libtorrent/torrent.hpp
+++ b/include/libtorrent/torrent.hpp
@@ -39,7 +39,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <list>
 #include <deque>
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/limits.hpp>
 #include <boost/tuple/tuple.hpp>
@@ -48,7 +48,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/shared_ptr.hpp>
 #include <boost/version.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/torrent_handle.hpp"
 #include "libtorrent/entry.hpp"
diff --git a/include/libtorrent/torrent_handle.hpp b/include/libtorrent/torrent_handle.hpp
index 7700d844e..86008753f 100644
--- a/include/libtorrent/torrent_handle.hpp
+++ b/include/libtorrent/torrent_handle.hpp
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_TORRENT_HANDLE_HPP_INCLUDED
 #define TORRENT_TORRENT_HANDLE_HPP_INCLUDED
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <vector>
 #include <set>
@@ -44,7 +44,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/weak_ptr.hpp>
 #include <boost/cstdint.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/peer_id.hpp"
 #include "libtorrent/piece_picker.hpp"
diff --git a/include/libtorrent/torrent_info.hpp b/include/libtorrent/torrent_info.hpp
index 55777fc71..e5d0551de 100644
--- a/include/libtorrent/torrent_info.hpp
+++ b/include/libtorrent/torrent_info.hpp
@@ -36,12 +36,12 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 #include <vector>
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/optional.hpp>
 #include <boost/shared_array.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/config.hpp"
 #include "libtorrent/entry.hpp"
diff --git a/include/libtorrent/torrent_peer_allocator.hpp b/include/libtorrent/torrent_peer_allocator.hpp
index c03c0fa86..642086fc6 100644
--- a/include/libtorrent/torrent_peer_allocator.hpp
+++ b/include/libtorrent/torrent_peer_allocator.hpp
@@ -36,11 +36,11 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/config.hpp"
 #include "libtorrent/torrent_peer.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/pool/pool.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent
 {
diff --git a/include/libtorrent/tracker_manager.hpp b/include/libtorrent/tracker_manager.hpp
index 201449eab..68de1badf 100644
--- a/include/libtorrent/tracker_manager.hpp
+++ b/include/libtorrent/tracker_manager.hpp
@@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "libtorrent/config.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <vector>
 #include <string>
@@ -54,7 +54,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/asio/ssl/context.hpp>
 #endif
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/socket.hpp"
 #include "libtorrent/address.hpp"
diff --git a/include/libtorrent/udp_tracker_connection.hpp b/include/libtorrent/udp_tracker_connection.hpp
index d984cd0e5..94b5a6af5 100644
--- a/include/libtorrent/udp_tracker_connection.hpp
+++ b/include/libtorrent/udp_tracker_connection.hpp
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_UDP_TRACKER_CONNECTION_HPP_INCLUDED
 #define TORRENT_UDP_TRACKER_CONNECTION_HPP_INCLUDED
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <vector>
 #include <string>
@@ -43,7 +43,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/shared_ptr.hpp>
 #include <boost/cstdint.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/udp_socket.hpp"
 #include "libtorrent/entry.hpp"
diff --git a/include/libtorrent/web_connection_base.hpp b/include/libtorrent/web_connection_base.hpp
index 4b237aad3..9288ace55 100644
--- a/include/libtorrent/web_connection_base.hpp
+++ b/include/libtorrent/web_connection_base.hpp
@@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "libtorrent/debug.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <ctime>
 #include <algorithm>
@@ -50,7 +50,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/optional.hpp>
 #include <boost/cstdint.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/buffer.hpp"
 #include "libtorrent/peer_connection.hpp"
diff --git a/include/libtorrent/web_peer_connection.hpp b/include/libtorrent/web_peer_connection.hpp
index 2089a9076..3a53b33d4 100644
--- a/include/libtorrent/web_peer_connection.hpp
+++ b/include/libtorrent/web_peer_connection.hpp
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_WEB_PEER_CONNECTION_HPP_INCLUDED
 #define TORRENT_WEB_PEER_CONNECTION_HPP_INCLUDED
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <ctime>
 #include <algorithm>
@@ -48,7 +48,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/optional.hpp>
 #include <boost/cstdint.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/config.hpp"
 #include "libtorrent/web_connection_base.hpp"
diff --git a/include/libtorrent/xml_parse.hpp b/include/libtorrent/xml_parse.hpp
index 49d921e5c..b75b561c0 100644
--- a/include/libtorrent/xml_parse.hpp
+++ b/include/libtorrent/xml_parse.hpp
@@ -33,14 +33,14 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_XML_PARSE_HPP
 #define TORRENT_XML_PARSE_HPP
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <cctype>
 #include <cstring>
 
 #include <boost/function.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/config.hpp"
 #include "libtorrent/assert.hpp"
diff --git a/src/asio.cpp b/src/asio.cpp
index a639f1a3e..97ea1b5e8 100644
--- a/src/asio.cpp
+++ b/src/asio.cpp
@@ -18,7 +18,7 @@
 #define BOOST_ASIO_DECL BOOST_SYMBOL_EXPORT
 #endif
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #if BOOST_VERSION >= 104500
 #include <boost/asio/impl/src.hpp>
@@ -26,5 +26,5 @@
 #include <boost/asio/impl/src.cpp>
 #endif
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
diff --git a/src/close_reason.cpp b/src/close_reason.cpp
index 6d5be88ca..83ee92759 100644
--- a/src/close_reason.cpp
+++ b/src/close_reason.cpp
@@ -35,12 +35,12 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/assert.hpp"
 #include "libtorrent/error_code.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/system/error_code.hpp>
 #include <boost/asio/error.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent
 {
diff --git a/src/crc32c.cpp b/src/crc32c.cpp
index a9233d146..f5d6604e4 100644
--- a/src/crc32c.cpp
+++ b/src/crc32c.cpp
@@ -33,11 +33,11 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/crc32c.hpp"
 #include "libtorrent/cpuid.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/crc.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent
 {
diff --git a/src/entry.cpp b/src/entry.cpp
index 69130fc58..816ac0a57 100644
--- a/src/entry.cpp
+++ b/src/entry.cpp
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "libtorrent/config.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #if TORRENT_USE_IOSTREAM
 #include <iostream>
@@ -40,7 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <algorithm>
 #include <boost/bind.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/entry.hpp"
 #ifndef TORRENT_NO_DEPRECATE
diff --git a/src/escape_string.cpp b/src/escape_string.cpp
index 19ec3fb8c..0e6216024 100644
--- a/src/escape_string.cpp
+++ b/src/escape_string.cpp
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "libtorrent/config.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <string>
 #include <cctype>
@@ -56,7 +56,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <locale.h>
 #endif 
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/assert.hpp"
 #include "libtorrent/parse_url.hpp"
diff --git a/src/identify_client.cpp b/src/identify_client.cpp
index 81750f5be..4f64b32da 100644
--- a/src/identify_client.cpp
+++ b/src/identify_client.cpp
@@ -34,11 +34,11 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <algorithm>
 #include <stdio.h>
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/optional.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/identify_client.hpp"
 #include "libtorrent/fingerprint.hpp"
diff --git a/src/kademlia/node.cpp b/src/kademlia/node.cpp
index c1b7f9ac4..e845ef047 100644
--- a/src/kademlia/node.cpp
+++ b/src/kademlia/node.cpp
@@ -30,13 +30,13 @@ POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <utility>
 #include <boost/bind.hpp>
 #include <boost/function/function1.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/io.hpp"
 #include "libtorrent/bencode.hpp"
diff --git a/src/lt_trackers.cpp b/src/lt_trackers.cpp
index b0f27e254..751015a92 100644
--- a/src/lt_trackers.cpp
+++ b/src/lt_trackers.cpp
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef TORRENT_DISABLE_EXTENSIONS
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/shared_ptr.hpp>
 #include <boost/bind.hpp>
@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <numeric>
 #include <cstdio>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/peer_connection.hpp"
 #include "libtorrent/bt_peer_connection.hpp"
diff --git a/src/metadata_transfer.cpp b/src/metadata_transfer.cpp
index c5b8cc356..f7726a50b 100644
--- a/src/metadata_transfer.cpp
+++ b/src/metadata_transfer.cpp
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_NO_DEPRECATE
 #ifndef TORRENT_DISABLE_EXTENSIONS
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/shared_ptr.hpp>
 #include <boost/bind.hpp>
@@ -43,7 +43,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <numeric>
 #include <algorithm> // count
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/peer_connection.hpp"
 #include "libtorrent/bt_peer_connection.hpp"
diff --git a/src/peer_connection.cpp b/src/peer_connection.cpp
index 0051810ab..fec804677 100644
--- a/src/peer_connection.cpp
+++ b/src/peer_connection.cpp
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <vector>
 #include <boost/limits.hpp>
@@ -45,7 +45,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <openssl/rand.h>
 #endif
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #ifndef TORRENT_DISABLE_LOGGING
 #include <stdarg.h> // for va_start, va_end
diff --git a/src/peer_list.cpp b/src/peer_list.cpp
index 2d69948c8..688662690 100644
--- a/src/peer_list.cpp
+++ b/src/peer_list.cpp
@@ -30,12 +30,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/bind.hpp>
 #include <boost/utility.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/peer_connection.hpp"
 #include "libtorrent/web_peer_connection.hpp"
diff --git a/src/piece_picker.cpp b/src/piece_picker.cpp
index c0214f411..7e42340ed 100644
--- a/src/piece_picker.cpp
+++ b/src/piece_picker.cpp
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <vector>
 #include <cmath>
@@ -41,7 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/bind.hpp>
 #include <boost/tuple/tuple.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/piece_picker.hpp"
 #include "libtorrent/bitfield.hpp"
diff --git a/src/random.cpp b/src/random.cpp
index a46a76f50..ba17c3048 100644
--- a/src/random.cpp
+++ b/src/random.cpp
@@ -34,13 +34,13 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/random.hpp"
 #include "libtorrent/assert.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/random/random_device.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <boost/random/uniform_int_distribution.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #if !TORRENT_THREADSAFE_STATIC
 #include "libtorrent/thread.hpp"
diff --git a/src/session_impl.cpp b/src/session_impl.cpp
index 78cd545ef..efe41905a 100644
--- a/src/session_impl.cpp
+++ b/src/session_impl.cpp
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <ctime>
 #include <algorithm>
@@ -58,7 +58,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <valgrind/memcheck.h>
 #endif
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/peer_id.hpp"
 #include "libtorrent/torrent_info.hpp"
diff --git a/src/smart_ban.cpp b/src/smart_ban.cpp
index f4fa4a6ef..93efbb1a7 100644
--- a/src/smart_ban.cpp
+++ b/src/smart_ban.cpp
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef TORRENT_DISABLE_EXTENSIONS
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
@@ -43,7 +43,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <numeric>
 #include <cstdio>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/hasher.hpp"
 #include "libtorrent/torrent.hpp"
diff --git a/src/storage.cpp b/src/storage.cpp
index 49567485c..6235edec9 100644
--- a/src/storage.cpp
+++ b/src/storage.cpp
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <ctime>
 #include <algorithm>
@@ -64,7 +64,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <sys/mount.h>
 #endif
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/config.hpp"
 #include "libtorrent/storage.hpp"
diff --git a/src/string_util.cpp b/src/string_util.cpp
index ce300c624..5d7c031f6 100644
--- a/src/string_util.cpp
+++ b/src/string_util.cpp
@@ -36,14 +36,14 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/error_code.hpp"
 #include "libtorrent/parse_url.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/tuple/tuple.hpp>
 
 #include <cstdlib> // for malloc
 #include <cstring> // for memmov/strcpy/strlen
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 namespace libtorrent
 {
diff --git a/src/torrent.cpp b/src/torrent.cpp
index c77fbfe79..5051b3384 100644
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "libtorrent/config.hpp"
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <ctime>
 #include <algorithm>
@@ -53,7 +53,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #endif // BOOST_VERSION
 #endif // TORRENT_USE_OPENSSL
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/torrent_handle.hpp"
 #include "libtorrent/session.hpp"
diff --git a/src/torrent_handle.cpp b/src/torrent_handle.cpp
index f46ca9f50..ba2eb9a9e 100644
--- a/src/torrent_handle.cpp
+++ b/src/torrent_handle.cpp
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <ctime>
 #include <iterator>
@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/optional.hpp>
 #include <boost/bind.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/peer_id.hpp"
 #include "libtorrent/bt_peer_connection.hpp"
diff --git a/src/torrent_info.cpp b/src/torrent_info.cpp
index 4a8a71ea1..6d047e277 100644
--- a/src/torrent_info.cpp
+++ b/src/torrent_info.cpp
@@ -50,7 +50,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/lazy_entry.hpp"
 #endif
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/bind.hpp>
 #include <boost/assert.hpp>
@@ -66,7 +66,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <iomanip>
 #endif
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #if TORRENT_USE_I2P
 #include "libtorrent/parse_url.hpp"
diff --git a/src/tracker_manager.cpp b/src/tracker_manager.cpp
index 07df98b3b..31b6b8aad 100644
--- a/src/tracker_manager.cpp
+++ b/src/tracker_manager.cpp
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <vector>
 #include <cctype>
@@ -38,7 +38,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/bind.hpp>
 #include <boost/make_shared.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/tracker_manager.hpp"
 #include "libtorrent/http_tracker_connection.hpp"
diff --git a/src/udp_tracker_connection.cpp b/src/udp_tracker_connection.cpp
index eb9f4aac3..9ac85c034 100644
--- a/src/udp_tracker_connection.cpp
+++ b/src/udp_tracker_connection.cpp
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <vector>
 #include <cctype>
@@ -38,7 +38,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <boost/bind.hpp>
 #include <boost/tuple/tuple.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/tracker_manager.hpp"
 #include "libtorrent/parse_url.hpp"
diff --git a/src/ut_metadata.cpp b/src/ut_metadata.cpp
index 120074181..91a808eb3 100644
--- a/src/ut_metadata.cpp
+++ b/src/ut_metadata.cpp
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef TORRENT_DISABLE_EXTENSIONS
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/shared_ptr.hpp>
 #include <boost/bind.hpp>
@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <numeric>
 #include <cstdio>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/peer_connection.hpp"
 #include "libtorrent/bt_peer_connection.hpp"
diff --git a/src/ut_pex.cpp b/src/ut_pex.cpp
index 5000da3d3..8ac29742e 100644
--- a/src/ut_pex.cpp
+++ b/src/ut_pex.cpp
@@ -32,11 +32,11 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef TORRENT_DISABLE_EXTENSIONS
 
-#include "aux_/disable_warnings_push.hpp"
+#include "libtorrent/aux_/disable_warnings_push.hpp"
 
 #include <boost/shared_ptr.hpp>
 
-#include "aux_/disable_warnings_pop.hpp"
+#include "libtorrent/aux_/disable_warnings_pop.hpp"
 
 #include "libtorrent/peer_connection.hpp"
 #include "libtorrent/bt_peer_connection.hpp"