diff --git a/example/asymmetric/chaining.cpp b/example/asymmetric/chaining.cpp
index 314aead..4a4dd99 100644
--- a/example/asymmetric/chaining.cpp
+++ b/example/asymmetric/chaining.cpp
@@ -4,6 +4,8 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <iostream>
 #include <iomanip>
 #include <string>
@@ -11,7 +13,6 @@
 #include <sstream>
 
 #include <boost/bind.hpp>
-#include <boost/coroutine/all.hpp>
 #include <boost/foreach.hpp>
 
 typedef boost::coroutines::asymmetric_coroutine<std::string> coro_t;
diff --git a/example/asymmetric/echo.cpp b/example/asymmetric/echo.cpp
index 9f1e2cb..ba3e82e 100644
--- a/example/asymmetric/echo.cpp
+++ b/example/asymmetric/echo.cpp
@@ -4,11 +4,12 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstdlib>
 #include <iostream>
 
 #include <boost/bind.hpp>
-#include <boost/coroutine/all.hpp>
 
 typedef boost::coroutines::asymmetric_coroutine< void >::pull_type pull_coro_t;
 typedef boost::coroutines::asymmetric_coroutine< void >::push_type push_coro_t;
diff --git a/example/asymmetric/exception.cpp b/example/asymmetric/exception.cpp
index 3cd53af..5a8ac6a 100644
--- a/example/asymmetric/exception.cpp
+++ b/example/asymmetric/exception.cpp
@@ -4,13 +4,14 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstdlib>
 #include <iostream>
 #include <stdexcept>
 #include <string>
 
 #include <boost/bind.hpp>
-#include <boost/coroutine/all.hpp>
 #include <boost/throw_exception.hpp>
 
 typedef boost::coroutines::asymmetric_coroutine< int >::pull_type pull_coro_t;
diff --git a/example/asymmetric/fibonacci.cpp b/example/asymmetric/fibonacci.cpp
index dc5a76e..bba8cc4 100644
--- a/example/asymmetric/fibonacci.cpp
+++ b/example/asymmetric/fibonacci.cpp
@@ -4,11 +4,12 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstdlib>
 #include <iostream>
 
 #include <boost/range.hpp>
-#include <boost/coroutine/all.hpp>
 
 void fibonacci( boost::coroutines::asymmetric_coroutine< int >::push_type & sink)
 {
diff --git a/example/asymmetric/layout.cpp b/example/asymmetric/layout.cpp
index aecd454..bc1924f 100644
--- a/example/asymmetric/layout.cpp
+++ b/example/asymmetric/layout.cpp
@@ -4,6 +4,8 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <iostream>
 #include <iomanip>
 #include <vector>
@@ -12,7 +14,6 @@
 
 #include <boost/assign/list_of.hpp>
 #include <boost/bind.hpp>
-#include <boost/coroutine/all.hpp>
 #include <boost/range.hpp>
 
 struct FinalEOL
diff --git a/example/asymmetric/parallel.cpp b/example/asymmetric/parallel.cpp
index 94d71fd..3502793 100644
--- a/example/asymmetric/parallel.cpp
+++ b/example/asymmetric/parallel.cpp
@@ -4,11 +4,12 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstdlib>
 #include <iostream>
 
 #include <boost/bind.hpp>
-#include <boost/coroutine/all.hpp>
 
 void first( boost::coroutines::asymmetric_coroutine< void >::push_type & sink)
 {
diff --git a/example/asymmetric/power.cpp b/example/asymmetric/power.cpp
index d4bc781..df16d0f 100644
--- a/example/asymmetric/power.cpp
+++ b/example/asymmetric/power.cpp
@@ -4,13 +4,14 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstdlib>
 #include <iostream>
 
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
 #include <boost/range.hpp>
-#include <boost/coroutine/all.hpp>
 
 void power( boost::coroutines::asymmetric_coroutine< int >::push_type & sink, int number, int exponent)
 {
diff --git a/example/asymmetric/same_fringe.cpp b/example/asymmetric/same_fringe.cpp
index 85d63c7..8860ecc 100644
--- a/example/asymmetric/same_fringe.cpp
+++ b/example/asymmetric/same_fringe.cpp
@@ -4,6 +4,8 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstddef>
 #include <cstdlib>
 #include <iostream>
@@ -14,7 +16,6 @@
 #include <boost/bind.hpp>
 #include <boost/range.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/coroutine/all.hpp>
 
 struct node
 {
diff --git a/example/asymmetric/segmented_stack.cpp b/example/asymmetric/segmented_stack.cpp
index 4395198..b8b27ab 100644
--- a/example/asymmetric/segmented_stack.cpp
+++ b/example/asymmetric/segmented_stack.cpp
@@ -4,11 +4,12 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <iostream>
 
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
-#include <boost/coroutine/all.hpp>
 
 int count = 384;
 
diff --git a/example/asymmetric/simple.cpp b/example/asymmetric/simple.cpp
index aae34bc..045bed8 100644
--- a/example/asymmetric/simple.cpp
+++ b/example/asymmetric/simple.cpp
@@ -1,8 +1,9 @@
+#include <boost/coroutine/all.hpp>
+
 #include <cstdlib>
 #include <iostream>
 
 #include <boost/bind.hpp>
-#include <boost/coroutine/all.hpp>
 
 #include "X.h"
 
diff --git a/example/asymmetric/test.cpp b/example/asymmetric/test.cpp
index c0bbd47..c6de170 100644
--- a/example/asymmetric/test.cpp
+++ b/example/asymmetric/test.cpp
@@ -1,6 +1,7 @@
-#include <boost/bind.hpp>
 #include <boost/coroutine/all.hpp>
 
+#include <boost/bind.hpp>
+
 #include "X.h"
 
 typedef boost::coroutines::asymmetric_coroutine< X& >::pull_type pull_coro_t;
diff --git a/example/asymmetric/tree.h b/example/asymmetric/tree.h
index 72aaec5..0a45237 100644
--- a/example/asymmetric/tree.h
+++ b/example/asymmetric/tree.h
@@ -7,12 +7,13 @@
 #ifndef TREE_H
 #define TREE_H
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstddef>
 #include <string>
 
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
-#include <boost/coroutine/all.hpp>
 #include <boost/intrusive_ptr.hpp>
 
 #if defined(_MSC_VER)
diff --git a/example/asymmetric/unwind.cpp b/example/asymmetric/unwind.cpp
index 4c43df4..b8d9d43 100644
--- a/example/asymmetric/unwind.cpp
+++ b/example/asymmetric/unwind.cpp
@@ -4,11 +4,12 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstdlib>
 #include <iostream>
 
 #include <boost/bind.hpp>
-#include <boost/coroutine/all.hpp>
 
 struct X : private boost::noncopyable
 {
diff --git a/example/symmetric/dice_game.cpp b/example/symmetric/dice_game.cpp
index d8e96d6..09eabf5 100644
--- a/example/symmetric/dice_game.cpp
+++ b/example/symmetric/dice_game.cpp
@@ -4,11 +4,12 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstdlib>
 #include <iostream>
 
 #include <boost/bind.hpp>
-#include <boost/coroutine/all.hpp>
 #include <boost/move/move.hpp>
 #include <boost/random/random_device.hpp>
 #include <boost/random/uniform_int_distribution.hpp>
diff --git a/example/symmetric/merge_arrays.cpp b/example/symmetric/merge_arrays.cpp
index d3016a1..d72f2f7 100644
--- a/example/symmetric/merge_arrays.cpp
+++ b/example/symmetric/merge_arrays.cpp
@@ -4,13 +4,14 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstdlib>
 #include <cstddef>
 #include <iostream>
 #include <vector>
 
 #include <boost/bind.hpp>
-#include <boost/coroutine/all.hpp>
 #include <boost/foreach.hpp>
 
 typedef boost::coroutines::symmetric_coroutine< void >  coro_t;
diff --git a/example/symmetric/segmented_stack.cpp b/example/symmetric/segmented_stack.cpp
index 060176a..8f45c60 100644
--- a/example/symmetric/segmented_stack.cpp
+++ b/example/symmetric/segmented_stack.cpp
@@ -4,11 +4,12 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <iostream>
 
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
-#include <boost/coroutine/all.hpp>
 #include <boost/thread.hpp>
 
 int count = 384;
diff --git a/example/symmetric/simple.cpp b/example/symmetric/simple.cpp
index a4ab311..9fbd9ec 100644
--- a/example/symmetric/simple.cpp
+++ b/example/symmetric/simple.cpp
@@ -4,11 +4,12 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstdlib>
 #include <iostream>
 
 #include <boost/bind.hpp>
-#include <boost/coroutine/all.hpp>
 
 typedef boost::coroutines::symmetric_coroutine< void >  coro_t;
 
diff --git a/example/symmetric/unwind.cpp b/example/symmetric/unwind.cpp
index 18042e7..2af574e 100644
--- a/example/symmetric/unwind.cpp
+++ b/example/symmetric/unwind.cpp
@@ -4,11 +4,12 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstdlib>
 #include <iostream>
 
 #include <boost/bind.hpp>
-#include <boost/coroutine/all.hpp>
 
 struct X : private boost::noncopyable
 {
diff --git a/test/test_asymmetric_coroutine.cpp b/test/test_asymmetric_coroutine.cpp
index b44f920..124271a 100644
--- a/test/test_asymmetric_coroutine.cpp
+++ b/test/test_asymmetric_coroutine.cpp
@@ -4,6 +4,8 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/asymmetric_coroutine.hpp>
+
 #include <algorithm>
 #include <iostream>
 #include <sstream>
@@ -23,8 +25,6 @@
 #include <boost/tuple/tuple.hpp>
 #include <boost/utility.hpp>
 
-#include <boost/coroutine/asymmetric_coroutine.hpp>
-
 namespace coro = boost::coroutines;
 
 int value1 = 0;
diff --git a/test/test_symmetric_coroutine.cpp b/test/test_symmetric_coroutine.cpp
index d00e564..55015ce 100644
--- a/test/test_symmetric_coroutine.cpp
+++ b/test/test_symmetric_coroutine.cpp
@@ -4,6 +4,8 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/symmetric_coroutine.hpp>
+
 #include <algorithm>
 #include <iostream>
 #include <sstream>
@@ -24,8 +26,6 @@
 #include <boost/tuple/tuple.hpp>
 #include <boost/utility.hpp>
 
-#include <boost/coroutine/symmetric_coroutine.hpp>
-
 namespace coro = boost::coroutines;
 
 bool value1 = false;