diff --git a/asio/include/Makefile.am b/asio/include/Makefile.am
index cb5e3d8..078bc20 100644
--- a/asio/include/Makefile.am
+++ b/asio/include/Makefile.am
@@ -443,7 +443,6 @@
 	asio/ts/netfwd.hpp \
 	asio/ts/net.hpp \
 	asio/ts/socket.hpp \
-	asio/ts/thread_pool.hpp \
 	asio/ts/timer.hpp \
 	asio/unyield.hpp \
 	asio/use_future.hpp \
diff --git a/asio/include/asio/ts/buffer.hpp b/asio/include/asio/ts/buffer.hpp
index f68ced9..258449d 100644
--- a/asio/include/asio/ts/buffer.hpp
+++ b/asio/include/asio/ts/buffer.hpp
@@ -16,7 +16,6 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include "asio/buffer.hpp"
-#include "asio/streambuf.hpp"
 #include "asio/completion_condition.hpp"
 #include "asio/read.hpp"
 #include "asio/write.hpp"
diff --git a/asio/include/asio/ts/internet.hpp b/asio/include/asio/ts/internet.hpp
index 752a38b..cbd0725 100644
--- a/asio/include/asio/ts/internet.hpp
+++ b/asio/include/asio/ts/internet.hpp
@@ -29,6 +29,8 @@
 #include "asio/ip/basic_resolver_iterator.hpp"
 #include "asio/ip/basic_resolver.hpp"
 #include "asio/ip/host_name.hpp"
+#include "asio/ip/network_v4.hpp"
+#include "asio/ip/network_v6.hpp"
 #include "asio/ip/tcp.hpp"
 #include "asio/ip/udp.hpp"
 #include "asio/ip/v6_only.hpp"
diff --git a/asio/include/asio/ts/thread_pool.hpp b/asio/include/asio/ts/thread_pool.hpp
deleted file mode 100644
index 6d2839d..0000000
--- a/asio/include/asio/ts/thread_pool.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// ts/thread_pool.hpp
-// ~~~~~~~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2015 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef ASIO_TS_THREAD_POOL_HPP
-#define ASIO_TS_THREAD_POOL_HPP
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma once
-#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
-
-#include "asio/thread_pool.hpp"
-
-#endif // ASIO_TS_THREAD_POOL_HPP
diff --git a/asio/src/examples/cpp14/executors/actor.cpp b/asio/src/examples/cpp14/executors/actor.cpp
index d66d7b0..26d2fb4 100644
--- a/asio/src/examples/cpp14/executors/actor.cpp
+++ b/asio/src/examples/cpp14/executors/actor.cpp
@@ -208,7 +208,7 @@
 
 //------------------------------------------------------------------------------
 
-#include <asio/ts/thread_pool.hpp>
+#include <asio/thread_pool.hpp>
 #include <iostream>
 
 using asio::thread_pool;
diff --git a/asio/src/examples/cpp14/executors/async_1.cpp b/asio/src/examples/cpp14/executors/async_1.cpp
index 40046fd..d282b74 100644
--- a/asio/src/examples/cpp14/executors/async_1.cpp
+++ b/asio/src/examples/cpp14/executors/async_1.cpp
@@ -1,5 +1,5 @@
 #include <asio/ts/executor.hpp>
-#include <asio/ts/thread_pool.hpp>
+#include <asio/thread_pool.hpp>
 #include <iostream>
 #include <string>
 
diff --git a/asio/src/examples/cpp14/executors/async_2.cpp b/asio/src/examples/cpp14/executors/async_2.cpp
index 396faae..b39156d 100644
--- a/asio/src/examples/cpp14/executors/async_2.cpp
+++ b/asio/src/examples/cpp14/executors/async_2.cpp
@@ -1,5 +1,5 @@
 #include <asio/ts/executor.hpp>
-#include <asio/ts/thread_pool.hpp>
+#include <asio/thread_pool.hpp>
 #include <iostream>
 #include <string>
 
diff --git a/asio/src/examples/cpp14/executors/bank_account_1.cpp b/asio/src/examples/cpp14/executors/bank_account_1.cpp
index 4e52fae..f85a185 100644
--- a/asio/src/examples/cpp14/executors/bank_account_1.cpp
+++ b/asio/src/examples/cpp14/executors/bank_account_1.cpp
@@ -1,5 +1,5 @@
 #include <asio/ts/executor.hpp>
-#include <asio/ts/thread_pool.hpp>
+#include <asio/thread_pool.hpp>
 #include <iostream>
 
 using asio::post;
diff --git a/asio/src/examples/cpp14/executors/bank_account_2.cpp b/asio/src/examples/cpp14/executors/bank_account_2.cpp
index 5cde164..5233e77 100644
--- a/asio/src/examples/cpp14/executors/bank_account_2.cpp
+++ b/asio/src/examples/cpp14/executors/bank_account_2.cpp
@@ -1,5 +1,5 @@
 #include <asio/ts/executor.hpp>
-#include <asio/ts/thread_pool.hpp>
+#include <asio/thread_pool.hpp>
 #include <iostream>
 
 using asio::post;
diff --git a/asio/src/examples/cpp14/executors/fork_join.cpp b/asio/src/examples/cpp14/executors/fork_join.cpp
index 6fec34f..22fa6ed 100644
--- a/asio/src/examples/cpp14/executors/fork_join.cpp
+++ b/asio/src/examples/cpp14/executors/fork_join.cpp
@@ -1,5 +1,5 @@
 #include <asio/ts/executor.hpp>
-#include <asio/ts/thread_pool.hpp>
+#include <asio/thread_pool.hpp>
 #include <condition_variable>
 #include <memory>
 #include <mutex>
diff --git a/asio/src/examples/cpp14/executors/pipeline.cpp b/asio/src/examples/cpp14/executors/pipeline.cpp
index 12c2bef..c66e283 100644
--- a/asio/src/examples/cpp14/executors/pipeline.cpp
+++ b/asio/src/examples/cpp14/executors/pipeline.cpp
@@ -242,7 +242,7 @@
 
 //------------------------------------------------------------------------------
 
-#include <asio/ts/thread_pool.hpp>
+#include <asio/thread_pool.hpp>
 #include <iostream>
 #include <string>