diff --git a/test/adaptor_test/chained.cpp b/test/adaptor_test/chained.cpp
index 1b756c9..df9de43 100644
--- a/test/adaptor_test/chained.cpp
+++ b/test/adaptor_test/chained.cpp
@@ -19,7 +19,7 @@
 #include <boost/range/adaptor/transformed.hpp>
 #include <boost/range/adaptor/filtered.hpp>
 #include <boost/range/algorithm/copy.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <boost/test/test_tools.hpp>
 #include <boost/test/unit_test.hpp>
@@ -88,6 +88,8 @@ void chained_adaptors_test()
 
     std::set<foo> foos;
 
+    using namespace boost::placeholders;
+
     boost::copy(sep
         | boost::adaptors::transformed(boost::bind(&foo::from_string, _1))
         | boost::adaptors::filtered(boost::bind(&foo::is_valid, _1)),
diff --git a/test/adaptor_test/transformed.cpp b/test/adaptor_test/transformed.cpp
index 10f6a0c..4620a15 100644
--- a/test/adaptor_test/transformed.cpp
+++ b/test/adaptor_test/transformed.cpp
@@ -14,7 +14,7 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/range/algorithm_ext.hpp>
 
 #include <algorithm>
@@ -140,6 +140,7 @@ namespace boost
         void transformed_bind()
         {
             using namespace boost::adaptors;
+            using namespace boost::placeholders;
 
             std::vector<foo_bind> input(5);
             std::vector<int> output;
diff --git a/test/algorithm.cpp b/test/algorithm.cpp
index e945d42..024e404 100644
--- a/test/algorithm.cpp
+++ b/test/algorithm.cpp
@@ -35,9 +35,8 @@
 #endif
 
 #include <boost/assign.hpp>
-#include <boost/config.hpp>    
+#include <boost/config.hpp>
 #include <boost/array.hpp>
-#include <boost/bind.hpp>
 #include <boost/range/numeric.hpp>
 #include <boost/range/algorithm.hpp>
 #include <boost/range/value_type.hpp>
diff --git a/test/algorithm_test/binary_search.cpp b/test/algorithm_test/binary_search.cpp
index 2646c2e..7cf985d 100644
--- a/test/algorithm_test/binary_search.cpp
+++ b/test/algorithm_test/binary_search.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/equal_range.cpp b/test/algorithm_test/equal_range.cpp
index 612f1a4..00b07a6 100644
--- a/test/algorithm_test/equal_range.cpp
+++ b/test/algorithm_test/equal_range.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/generate.cpp b/test/algorithm_test/generate.cpp
index d8fc0e6..907f9fb 100644
--- a/test/algorithm_test/generate.cpp
+++ b/test/algorithm_test/generate.cpp
@@ -14,7 +14,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/heap.cpp b/test/algorithm_test/heap.cpp
index 74b7fa3..9c5b7c6 100644
--- a/test/algorithm_test/heap.cpp
+++ b/test/algorithm_test/heap.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/includes.cpp b/test/algorithm_test/includes.cpp
index 8977532..ce28fac 100644
--- a/test/algorithm_test/includes.cpp
+++ b/test/algorithm_test/includes.cpp
@@ -11,7 +11,6 @@
 #include <boost/test/test_tools.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/inplace_merge.cpp b/test/algorithm_test/inplace_merge.cpp
index 948e95e..3b2082a 100644
--- a/test/algorithm_test/inplace_merge.cpp
+++ b/test/algorithm_test/inplace_merge.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/lower_bound.cpp b/test/algorithm_test/lower_bound.cpp
index 2a120a4..d4b18cf 100644
--- a/test/algorithm_test/lower_bound.cpp
+++ b/test/algorithm_test/lower_bound.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <boost/range/algorithm/lower_bound.hpp>
 #include "../test_driver/range_return_test_driver.hpp"
 #include <algorithm>
diff --git a/test/algorithm_test/max_element.cpp b/test/algorithm_test/max_element.cpp
index d4e87d5..f6092a2 100644
--- a/test/algorithm_test/max_element.cpp
+++ b/test/algorithm_test/max_element.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <boost/range/iterator.hpp>
 #include "../test_driver/range_return_test_driver.hpp"
 #include <algorithm>
diff --git a/test/algorithm_test/merge.cpp b/test/algorithm_test/merge.cpp
index 5038782..b173019 100644
--- a/test/algorithm_test/merge.cpp
+++ b/test/algorithm_test/merge.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/min_element.cpp b/test/algorithm_test/min_element.cpp
index bb92d2c..b545f66 100644
--- a/test/algorithm_test/min_element.cpp
+++ b/test/algorithm_test/min_element.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <boost/range/iterator.hpp>
 #include "../test_driver/range_return_test_driver.hpp"
 #include <algorithm>
diff --git a/test/algorithm_test/nth_element.cpp b/test/algorithm_test/nth_element.cpp
index df241e9..044e663 100644
--- a/test/algorithm_test/nth_element.cpp
+++ b/test/algorithm_test/nth_element.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/partial_sort.cpp b/test/algorithm_test/partial_sort.cpp
index c13f7f1..5fb2686 100644
--- a/test/algorithm_test/partial_sort.cpp
+++ b/test/algorithm_test/partial_sort.cpp
@@ -14,7 +14,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/partition.cpp b/test/algorithm_test/partition.cpp
index 22aefd6..bdc4508 100644
--- a/test/algorithm_test/partition.cpp
+++ b/test/algorithm_test/partition.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include "../test_driver/range_return_test_driver.hpp"
 #include <algorithm>
 #include <functional>
diff --git a/test/algorithm_test/random_shuffle.cpp b/test/algorithm_test/random_shuffle.cpp
index 71915ee..6b3db1e 100644
--- a/test/algorithm_test/random_shuffle.cpp
+++ b/test/algorithm_test/random_shuffle.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include "../test_function/counted_function.hpp"
 #include <algorithm>
 #include <functional>
diff --git a/test/algorithm_test/remove.cpp b/test/algorithm_test/remove.cpp
index 3e4ab16..8312d9f 100644
--- a/test/algorithm_test/remove.cpp
+++ b/test/algorithm_test/remove.cpp
@@ -14,7 +14,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/remove_copy.cpp b/test/algorithm_test/remove_copy.cpp
index b3eb8e2..3065d9e 100644
--- a/test/algorithm_test/remove_copy.cpp
+++ b/test/algorithm_test/remove_copy.cpp
@@ -14,7 +14,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/remove_copy_if.cpp b/test/algorithm_test/remove_copy_if.cpp
index c269c2a..8a5d2ae 100644
--- a/test/algorithm_test/remove_copy_if.cpp
+++ b/test/algorithm_test/remove_copy_if.cpp
@@ -14,7 +14,7 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
@@ -64,6 +64,8 @@ namespace
     template< class Container >
     void test_remove_copy_if_( const Container& c, int to_remove )
     {
+        using namespace boost::placeholders;
+
         test_remove_copy_if_impl(c, boost::bind(std::equal_to<int>(), _1, to_remove));
         test_remove_copy_if_impl(c, boost::bind(std::not_equal_to<int>(), _1, to_remove));
     }
diff --git a/test/algorithm_test/remove_if.cpp b/test/algorithm_test/remove_if.cpp
index 58fc07f..226e74d 100644
--- a/test/algorithm_test/remove_if.cpp
+++ b/test/algorithm_test/remove_if.cpp
@@ -14,7 +14,7 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
@@ -59,6 +59,8 @@ namespace boost
         template< class Container >
         void test_remove_if_( const Container& c, int to_remove )
         {
+            using namespace boost::placeholders;
+
             test_remove_if_impl(c, boost::bind(std::equal_to<int>(), _1, to_remove));
             test_remove_if_impl(c, boost::bind(std::not_equal_to<int>(), _1, to_remove));
         }
diff --git a/test/algorithm_test/replace_copy.cpp b/test/algorithm_test/replace_copy.cpp
index 5629856..7d0ccd5 100644
--- a/test/algorithm_test/replace_copy.cpp
+++ b/test/algorithm_test/replace_copy.cpp
@@ -14,7 +14,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/replace_copy_if.cpp b/test/algorithm_test/replace_copy_if.cpp
index 6873547..af34256 100644
--- a/test/algorithm_test/replace_copy_if.cpp
+++ b/test/algorithm_test/replace_copy_if.cpp
@@ -14,7 +14,7 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
@@ -66,6 +66,8 @@ namespace
     template< class Container >
     void test_replace_copy_if_( const Container& c, int to_replace )
     {
+        using namespace boost::placeholders;
+
         test_replace_copy_if_impl(c, boost::bind(std::equal_to<int>(), _1, to_replace));
         test_replace_copy_if_impl(c, boost::bind(std::not_equal_to<int>(), _1, to_replace));
     }
diff --git a/test/algorithm_test/replace_if.cpp b/test/algorithm_test/replace_if.cpp
index 12d7293..ecd3a74 100644
--- a/test/algorithm_test/replace_if.cpp
+++ b/test/algorithm_test/replace_if.cpp
@@ -14,7 +14,7 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
@@ -29,6 +29,8 @@ namespace boost
         template< class Container, class UnaryPredicate >
         void test_replace_if_impl(Container& cont, UnaryPredicate pred)
         {
+            using namespace boost::placeholders;
+
             const int what = 2;
             const int with_what = 5;
 
diff --git a/test/algorithm_test/reverse.cpp b/test/algorithm_test/reverse.cpp
index 3ad63cb..08ca2c5 100644
--- a/test/algorithm_test/reverse.cpp
+++ b/test/algorithm_test/reverse.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/reverse_copy.cpp b/test/algorithm_test/reverse_copy.cpp
index 92ef485..8edfcda 100644
--- a/test/algorithm_test/reverse_copy.cpp
+++ b/test/algorithm_test/reverse_copy.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/rotate.cpp b/test/algorithm_test/rotate.cpp
index b6b7af2..6b487d7 100644
--- a/test/algorithm_test/rotate.cpp
+++ b/test/algorithm_test/rotate.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/rotate_copy.cpp b/test/algorithm_test/rotate_copy.cpp
index 05aa4d2..7f43fc0 100644
--- a/test/algorithm_test/rotate_copy.cpp
+++ b/test/algorithm_test/rotate_copy.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/set_difference.cpp b/test/algorithm_test/set_difference.cpp
index 84dc62c..303fd58 100644
--- a/test/algorithm_test/set_difference.cpp
+++ b/test/algorithm_test/set_difference.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/set_intersection.cpp b/test/algorithm_test/set_intersection.cpp
index 213bbdf..5e08e05 100644
--- a/test/algorithm_test/set_intersection.cpp
+++ b/test/algorithm_test/set_intersection.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/set_symmetric_difference.cpp b/test/algorithm_test/set_symmetric_difference.cpp
index b792fd8..e52b16e 100644
--- a/test/algorithm_test/set_symmetric_difference.cpp
+++ b/test/algorithm_test/set_symmetric_difference.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/set_union.cpp b/test/algorithm_test/set_union.cpp
index 7f9f10a..6c7208b 100644
--- a/test/algorithm_test/set_union.cpp
+++ b/test/algorithm_test/set_union.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/sort.cpp b/test/algorithm_test/sort.cpp
index c6611f7..33a681a 100644
--- a/test/algorithm_test/sort.cpp
+++ b/test/algorithm_test/sort.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/stable_partition.cpp b/test/algorithm_test/stable_partition.cpp
index b39161f..b5b1538 100644
--- a/test/algorithm_test/stable_partition.cpp
+++ b/test/algorithm_test/stable_partition.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include "../test_driver/range_return_test_driver.hpp"
 #include <algorithm>
 #include <functional>
diff --git a/test/algorithm_test/stable_sort.cpp b/test/algorithm_test/stable_sort.cpp
index 8372bd6..1c33963 100644
--- a/test/algorithm_test/stable_sort.cpp
+++ b/test/algorithm_test/stable_sort.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/swap_ranges.cpp b/test/algorithm_test/swap_ranges.cpp
index a96bfac..02a4444 100644
--- a/test/algorithm_test/swap_ranges.cpp
+++ b/test/algorithm_test/swap_ranges.cpp
@@ -14,7 +14,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/unique.cpp b/test/algorithm_test/unique.cpp
index d8eb784..8d7752a 100644
--- a/test/algorithm_test/unique.cpp
+++ b/test/algorithm_test/unique.cpp
@@ -15,7 +15,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <boost/config.hpp>
 #include "../test_driver/range_overload_test_driver.hpp"
 #include <algorithm>
diff --git a/test/algorithm_test/unique_copy.cpp b/test/algorithm_test/unique_copy.cpp
index 21f107a..cd25162 100644
--- a/test/algorithm_test/unique_copy.cpp
+++ b/test/algorithm_test/unique_copy.cpp
@@ -14,7 +14,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
 #include <functional>
 #include <list>
diff --git a/test/algorithm_test/upper_bound.cpp b/test/algorithm_test/upper_bound.cpp
index daae764..0dff22f 100644
--- a/test/algorithm_test/upper_bound.cpp
+++ b/test/algorithm_test/upper_bound.cpp
@@ -12,7 +12,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/bind.hpp>
 #include "../test_driver/range_return_test_driver.hpp"
 #include <algorithm>
 #include <functional>