diff --git a/include/boost/asio/detail/bind_handler.hpp b/include/boost/asio/detail/bind_handler.hpp
index 25ab9e1b..fb5aab0f 100644
--- a/include/boost/asio/detail/bind_handler.hpp
+++ b/include/boost/asio/detail/bind_handler.hpp
@@ -69,7 +69,7 @@ template <typename Function, typename Handler, typename Arg1>
 inline void asio_handler_invoke(const Function& function,
     binder1<Handler, Arg1>* this_handler)
 {
-  asio_handler_invoke_helpers::invoke(
+  boost_asio_handler_invoke_helpers::invoke(
       function, &this_handler->handler_);
 }
 
@@ -127,7 +127,7 @@ template <typename Function, typename Handler, typename Arg1, typename Arg2>
 inline void asio_handler_invoke(const Function& function,
     binder2<Handler, Arg1, Arg2>* this_handler)
 {
-  asio_handler_invoke_helpers::invoke(
+  boost_asio_handler_invoke_helpers::invoke(
       function, &this_handler->handler_);
 }
 
@@ -189,7 +189,7 @@ template <typename Function, typename Handler, typename Arg1, typename Arg2,
 inline void asio_handler_invoke(const Function& function,
     binder3<Handler, Arg1, Arg2, Arg3>* this_handler)
 {
-  asio_handler_invoke_helpers::invoke(
+  boost_asio_handler_invoke_helpers::invoke(
       function, &this_handler->handler_);
 }
 
@@ -256,7 +256,7 @@ template <typename Function, typename Handler, typename Arg1, typename Arg2,
 inline void asio_handler_invoke(const Function& function,
     binder4<Handler, Arg1, Arg2, Arg3, Arg4>* this_handler)
 {
-  asio_handler_invoke_helpers::invoke(
+  boost_asio_handler_invoke_helpers::invoke(
       function, &this_handler->handler_);
 }
 
@@ -328,7 +328,7 @@ template <typename Function, typename Handler, typename Arg1, typename Arg2,
 inline void asio_handler_invoke(const Function& function,
     binder5<Handler, Arg1, Arg2, Arg3, Arg4, Arg5>* this_handler)
 {
-  asio_handler_invoke_helpers::invoke(
+  boost_asio_handler_invoke_helpers::invoke(
       function, &this_handler->handler_);
 }
 
diff --git a/include/boost/asio/detail/handler_invoke_helpers.hpp b/include/boost/asio/detail/handler_invoke_helpers.hpp
index cfcf8e98..ea02d3f3 100644
--- a/include/boost/asio/detail/handler_invoke_helpers.hpp
+++ b/include/boost/asio/detail/handler_invoke_helpers.hpp
@@ -24,9 +24,9 @@
 #include <boost/asio/handler_invoke_hook.hpp>
 
 // Calls to asio_handler_invoke must be made from a namespace that does not
-// contain overloads of this function. The asio_handler_invoke_helpers
+// contain overloads of this function. The boost_asio_handler_invoke_helpers
 // namespace is defined here for that purpose.
-namespace asio_handler_invoke_helpers {
+namespace boost_asio_handler_invoke_helpers {
 
 template <typename Function, typename Context>
 inline void invoke(const Function& function, Context* context)
@@ -40,7 +40,7 @@ inline void invoke(const Function& function, Context* context)
 #endif
 }
 
-} // namespace asio_handler_invoke_helpers
+} // namespace boost_asio_handler_invoke_helpers
 
 #include <boost/asio/detail/pop_options.hpp>
 
diff --git a/include/boost/asio/detail/handler_queue.hpp b/include/boost/asio/detail/handler_queue.hpp
index a84bf5ad..ad1c695d 100644
--- a/include/boost/asio/detail/handler_queue.hpp
+++ b/include/boost/asio/detail/handler_queue.hpp
@@ -189,7 +189,7 @@ private:
       ptr.reset();
 
       // Make the upcall.
-      asio_handler_invoke_helpers::invoke(handler, &handler);
+      boost_asio_handler_invoke_helpers::invoke(handler, &handler);
     }
 
     static void do_destroy(handler* base)
diff --git a/include/boost/asio/detail/strand_service.hpp b/include/boost/asio/detail/strand_service.hpp
index ed3d96fd..79a481fd 100644
--- a/include/boost/asio/detail/strand_service.hpp
+++ b/include/boost/asio/detail/strand_service.hpp
@@ -336,7 +336,7 @@ public:
       call_stack<strand_impl>::context ctx(impl.get());
 
       // Make the upcall.
-      asio_handler_invoke_helpers::invoke(handler, &handler);
+      boost_asio_handler_invoke_helpers::invoke(handler, &handler);
     }
 
     static void do_destroy(handler_base* base)
@@ -413,7 +413,7 @@ public:
   {
     if (call_stack<strand_impl>::contains(impl.get()))
     {
-      asio_handler_invoke_helpers::invoke(handler, &handler);
+      boost_asio_handler_invoke_helpers::invoke(handler, &handler);
     }
     else
     {
diff --git a/include/boost/asio/detail/task_io_service.hpp b/include/boost/asio/detail/task_io_service.hpp
index 6da9e0dc..7175c8ef 100644
--- a/include/boost/asio/detail/task_io_service.hpp
+++ b/include/boost/asio/detail/task_io_service.hpp
@@ -162,7 +162,7 @@ public:
   void dispatch(Handler handler)
   {
     if (call_stack<task_io_service>::contains(this))
-      asio_handler_invoke_helpers::invoke(handler, &handler);
+      boost_asio_handler_invoke_helpers::invoke(handler, &handler);
     else
       post(handler);
   }
diff --git a/include/boost/asio/detail/win_iocp_io_service.hpp b/include/boost/asio/detail/win_iocp_io_service.hpp
index b0e84498..83d3c114 100644
--- a/include/boost/asio/detail/win_iocp_io_service.hpp
+++ b/include/boost/asio/detail/win_iocp_io_service.hpp
@@ -260,7 +260,7 @@ public:
   void dispatch(Handler handler)
   {
     if (call_stack<win_iocp_io_service>::contains(this))
-      asio_handler_invoke_helpers::invoke(handler, &handler);
+      boost_asio_handler_invoke_helpers::invoke(handler, &handler);
     else
       post(handler);
   }
@@ -627,7 +627,7 @@ private:
       ptr.reset();
 
       // Make the upcall.
-      asio_handler_invoke_helpers::invoke(handler, &handler);
+      boost_asio_handler_invoke_helpers::invoke(handler, &handler);
     }
 
     static void destroy_impl(operation* op)
diff --git a/include/boost/asio/detail/win_iocp_socket_service.hpp b/include/boost/asio/detail/win_iocp_socket_service.hpp
index d7bdd608..a6ec9041 100644
--- a/include/boost/asio/detail/win_iocp_socket_service.hpp
+++ b/include/boost/asio/detail/win_iocp_socket_service.hpp
@@ -765,7 +765,7 @@ public:
       ptr.reset();
 
       // Call the handler.
-      asio_handler_invoke_helpers::invoke(
+      boost_asio_handler_invoke_helpers::invoke(
           detail::bind_handler(handler, ec, bytes_transferred), &handler);
     }
 
@@ -958,7 +958,7 @@ public:
       ptr.reset();
 
       // Call the handler.
-      asio_handler_invoke_helpers::invoke(
+      boost_asio_handler_invoke_helpers::invoke(
           detail::bind_handler(handler, ec, bytes_transferred), &handler);
     }
 
@@ -1170,7 +1170,7 @@ public:
       ptr.reset();
 
       // Call the handler.
-      asio_handler_invoke_helpers::invoke(
+      boost_asio_handler_invoke_helpers::invoke(
           detail::bind_handler(handler, ec, bytes_transferred), &handler);
     }
 
@@ -1390,7 +1390,7 @@ public:
       ptr.reset();
 
       // Call the handler.
-      asio_handler_invoke_helpers::invoke(
+      boost_asio_handler_invoke_helpers::invoke(
           detail::bind_handler(handler, ec, bytes_transferred), &handler);
     }
 
@@ -1704,7 +1704,7 @@ public:
       // Call the handler.
       boost::system::error_code ec(last_error,
           boost::asio::error::get_system_category());
-      asio_handler_invoke_helpers::invoke(
+      boost_asio_handler_invoke_helpers::invoke(
           detail::bind_handler(handler, ec), &handler);
     }
 
diff --git a/include/boost/asio/detail/wrapped_handler.hpp b/include/boost/asio/detail/wrapped_handler.hpp
index 99271b4f..ecd24839 100644
--- a/include/boost/asio/detail/wrapped_handler.hpp
+++ b/include/boost/asio/detail/wrapped_handler.hpp
@@ -182,7 +182,7 @@ template <typename Function, typename Handler, typename Context>
 inline void asio_handler_invoke(const Function& function,
     rewrapped_handler<Handler, Context>* this_handler)
 {
-  asio_handler_invoke_helpers::invoke(
+  boost_asio_handler_invoke_helpers::invoke(
       function, &this_handler->context_);
 }
 
diff --git a/include/boost/asio/impl/read.ipp b/include/boost/asio/impl/read.ipp
index 6134b9c8..a8c1bb46 100644
--- a/include/boost/asio/impl/read.ipp
+++ b/include/boost/asio/impl/read.ipp
@@ -186,7 +186,7 @@ namespace detail
       read_handler<AsyncReadStream, MutableBufferSequence,
         CompletionCondition, ReadHandler>* this_handler)
   {
-    asio_handler_invoke_helpers::invoke(
+    boost_asio_handler_invoke_helpers::invoke(
         function, &this_handler->handler_);
   }
 } // namespace detail
@@ -282,7 +282,7 @@ namespace detail
       read_streambuf_handler<AsyncReadStream, Allocator,
         CompletionCondition, ReadHandler>* this_handler)
   {
-    asio_handler_invoke_helpers::invoke(
+    boost_asio_handler_invoke_helpers::invoke(
         function, &this_handler->handler_);
   }
 } // namespace detail
diff --git a/include/boost/asio/impl/read_until.ipp b/include/boost/asio/impl/read_until.ipp
index 821b80e8..dcca7b63 100644
--- a/include/boost/asio/impl/read_until.ipp
+++ b/include/boost/asio/impl/read_until.ipp
@@ -358,7 +358,7 @@ namespace detail
       read_until_delim_handler<AsyncReadStream,
         Allocator, ReadHandler>* this_handler)
   {
-    asio_handler_invoke_helpers::invoke(
+    boost_asio_handler_invoke_helpers::invoke(
         function, &this_handler->handler_);
   }
 } // namespace detail
@@ -515,7 +515,7 @@ namespace detail
       read_until_delim_string_handler<AsyncReadStream,
         Allocator, ReadHandler>* this_handler)
   {
-    asio_handler_invoke_helpers::invoke(
+    boost_asio_handler_invoke_helpers::invoke(
         function, &this_handler->handler_);
   }
 } // namespace detail
@@ -689,7 +689,7 @@ namespace detail
       read_until_expr_handler<AsyncReadStream,
         Allocator, ReadHandler>* this_handler)
   {
-    asio_handler_invoke_helpers::invoke(
+    boost_asio_handler_invoke_helpers::invoke(
         function, &this_handler->handler_);
   }
 } // namespace detail
diff --git a/include/boost/asio/impl/write.ipp b/include/boost/asio/impl/write.ipp
index 8073bfdd..5df05d56 100644
--- a/include/boost/asio/impl/write.ipp
+++ b/include/boost/asio/impl/write.ipp
@@ -172,7 +172,7 @@ namespace detail
       write_handler<AsyncWriteStream, ConstBufferSequence,
         CompletionCondition, WriteHandler>* this_handler)
   {
-    asio_handler_invoke_helpers::invoke(
+    boost_asio_handler_invoke_helpers::invoke(
         function, &this_handler->handler_);
   }
 } // namespace detail
@@ -250,7 +250,7 @@ namespace detail
       write_streambuf_handler<AsyncWriteStream,
         Allocator, WriteHandler>* this_handler)
   {
-    asio_handler_invoke_helpers::invoke(
+    boost_asio_handler_invoke_helpers::invoke(
         function, &this_handler->handler_);
   }
 } // namespace detail