diff --git a/doc/v2/register_ptr_to_python.html b/doc/v2/register_ptr_to_python.html
index 67e765ad..68a0737e 100644
--- a/doc/v2/register_ptr_to_python.html
+++ b/doc/v2/register_ptr_to_python.html
@@ -33,7 +33,7 @@
 <hr>
 <h2><a name="introduction"></a>Introduction</h2>
 <p>
-  <code>&lt;boost/python/converter/register_ptr_to_python.hpp&gt;</code>
+  <code>&lt;boost/python/register_ptr_to_python.hpp&gt;</code>
   supplies <code>register_ptr_to_python</code>, a function template
   which registers a conversion for smart pointers to Python.  The
   resulting Python object holds a copy of the converted smart pointer,
@@ -48,8 +48,8 @@
   <code>smart_ptr&lt;X&gt;&amp;</code> (non-const reference), the embedded C++
   object must be held by <code>smart_ptr&lt;X&gt;</code>, and that when wrapped
   objects are created by calling the constructor from Python, how they are held
-  is determined by the <code>HeldType</code> parameter to class_&lt;...&gt;
-  instances.  
+  is determined by the <code>HeldType</code> parameter to
+  <code>class_&lt;...&gt;</code> instances.  
 </p>
   
 <h2><a name="functions"></a>Functions</h2>
diff --git a/include/boost/python.hpp b/include/boost/python.hpp
index 5df41117..62480b70 100644
--- a/include/boost/python.hpp
+++ b/include/boost/python.hpp
@@ -43,13 +43,14 @@
 # include <boost/python/object.hpp>
 # include <boost/python/object_protocol.hpp>
 # include <boost/python/object_protocol_core.hpp>
-# include <boost/python/operators.hpp>
 # include <boost/python/opaque_pointer_converter.hpp>
+# include <boost/python/operators.hpp>
 # include <boost/python/other.hpp>
 # include <boost/python/overloads.hpp>
 # include <boost/python/pointee.hpp>
 # include <boost/python/ptr.hpp>
 # include <boost/python/reference_existing_object.hpp>
+# include <boost/python/register_ptr_to_python.hpp>
 # include <boost/python/return_internal_reference.hpp>
 # include <boost/python/return_opaque_pointer.hpp>
 # include <boost/python/return_value_policy.hpp>
@@ -63,6 +64,5 @@
 # include <boost/python/tuple.hpp>
 # include <boost/python/type_id.hpp>
 # include <boost/python/with_custodian_and_ward.hpp>
-# include <boost/python/converter/register_ptr_to_python.hpp>
 
 #endif // PYTHON_DWA2002810_HPP
diff --git a/include/boost/python/converter/register_ptr_to_python.hpp b/include/boost/python/register_ptr_to_python.hpp
similarity index 100%
rename from include/boost/python/converter/register_ptr_to_python.hpp
rename to include/boost/python/register_ptr_to_python.hpp