diff --git a/example/condition.cpp b/example/condition.cpp
index 2cde1c02..d7665ac3 100644
--- a/example/condition.cpp
+++ b/example/condition.cpp
@@ -8,7 +8,7 @@
 #include <vector>
 #include <boost/utility.hpp>
 #include <boost/thread/condition_variable.hpp>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include "../test/remove_error_code_unused_warning.hpp"
 
 class bounded_buffer : private boost::noncopyable
diff --git a/example/monitor.cpp b/example/monitor.cpp
index d8855d27..5c9a7421 100644
--- a/example/monitor.cpp
+++ b/example/monitor.cpp
@@ -9,7 +9,7 @@
 #include <boost/thread/condition_variable.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/recursive_mutex.hpp>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 
 namespace {
 const int ITERS = 100;
diff --git a/example/perf_shared_mutex.cpp b/example/perf_shared_mutex.cpp
index 4450e4a7..7d8b979f 100644
--- a/example/perf_shared_mutex.cpp
+++ b/example/perf_shared_mutex.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 #include <boost/thread/lock_types.hpp>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <boost/chrono/chrono_io.hpp>
 
 #include <boost/thread/shared_mutex.hpp>
diff --git a/example/shared_monitor.cpp b/example/shared_monitor.cpp
index e8378270..d1996588 100644
--- a/example/shared_monitor.cpp
+++ b/example/shared_monitor.cpp
@@ -7,7 +7,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/thread/lock_algorithms.hpp>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #if defined BOOST_THREAD_DONT_USE_CHRONO
 #include <boost/chrono/chrono_io.hpp>
 #endif
diff --git a/example/shared_mutex.cpp b/example/shared_mutex.cpp
index 13246d96..c0ef7a52 100644
--- a/example/shared_mutex.cpp
+++ b/example/shared_mutex.cpp
@@ -11,7 +11,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/thread/lock_algorithms.hpp>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <vector>
 
 #if defined BOOST_THREAD_USES_CHRONO
diff --git a/example/starvephil.cpp b/example/starvephil.cpp
index 37752980..467d0b3c 100644
--- a/example/starvephil.cpp
+++ b/example/starvephil.cpp
@@ -8,7 +8,7 @@
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <boost/thread/xtime.hpp>
 #include <iostream>
 #include <time.h>
diff --git a/example/tennis.cpp b/example/tennis.cpp
index 93e5a46a..b67f7c59 100644
--- a/example/tennis.cpp
+++ b/example/tennis.cpp
@@ -6,7 +6,7 @@
 
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <boost/thread/xtime.hpp>
 #include <iostream>
 
diff --git a/example/thread.cpp b/example/thread.cpp
index 02dc4ac4..d6bc6f23 100644
--- a/example/thread.cpp
+++ b/example/thread.cpp
@@ -6,7 +6,7 @@
 
 #define BOOST_THREAD_VERSION 2
 
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <boost/thread/xtime.hpp>
 #include <iostream>
 
diff --git a/example/thread_guard.cpp b/example/thread_guard.cpp
index 0e83b6c8..b396802d 100644
--- a/example/thread_guard.cpp
+++ b/example/thread_guard.cpp
@@ -7,7 +7,7 @@
 
 #include <iostream>
 #include <string>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <boost/thread/thread_guard.hpp>
 
 void do_something(int& i)
diff --git a/example/xtime.cpp b/example/xtime.cpp
index 58d741ca..a873085b 100644
--- a/example/xtime.cpp
+++ b/example/xtime.cpp
@@ -6,7 +6,7 @@
 
 #define BOOST_THREAD_VERSION 2
 
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 #include <boost/thread/xtime.hpp>
 
 int main()
diff --git a/include/boost/thread/scoped_thread.hpp b/include/boost/thread/scoped_thread.hpp
index 370c1177..faf4039c 100644
--- a/include/boost/thread/scoped_thread.hpp
+++ b/include/boost/thread/scoped_thread.hpp
@@ -13,7 +13,7 @@
 #include <boost/thread/detail/delete.hpp>
 #include <boost/thread/detail/move.hpp>
 #include <boost/thread/thread_functors.hpp>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 
 #include <boost/config/abi_prefix.hpp>
 
diff --git a/include/boost/thread/thread_functors.hpp b/include/boost/thread/thread_functors.hpp
index 9aa583d8..f7bd816b 100644
--- a/include/boost/thread/thread_functors.hpp
+++ b/include/boost/thread/thread_functors.hpp
@@ -12,7 +12,7 @@
 #include <boost/thread/detail/config.hpp>
 #include <boost/thread/detail/delete.hpp>
 #include <boost/thread/detail/move.hpp>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 
 #include <boost/config/abi_prefix.hpp>