diff --git a/include/boost/python/converter/body.hpp b/include/boost/python/converter/body.hpp
index c8d932a0..72653ee0 100644
--- a/include/boost/python/converter/body.hpp
+++ b/include/boost/python/converter/body.hpp
@@ -5,20 +5,19 @@
 // to its suitability for any purpose.
 #ifndef BODY_DWA2001127_HPP
 # define BODY_DWA2001127_HPP
-# include <boost/config.hpp>
+# include <boost/python/detail/config.hpp>
 # include <boost/python/converter/type_id.hpp>
-# include <boost/python/export.hpp>
 
 namespace boost { namespace python { namespace converter { 
 
-struct BOOST_PYTHON_EXPORT handle;
+struct BOOST_PYTHON_DECL handle;
 
 namespace registry
 {
   class entry;
 }
 
-struct BOOST_PYTHON_EXPORT body
+struct BOOST_PYTHON_DECL body
 {
  public:
     body(type_id_t key);
diff --git a/include/boost/python/converter/handle.hpp b/include/boost/python/converter/handle.hpp
index 16a50b38..03671634 100644
--- a/include/boost/python/converter/handle.hpp
+++ b/include/boost/python/converter/handle.hpp
@@ -5,19 +5,18 @@
 // to its suitability for any purpose.
 #ifndef HANDLE_DWA20011130_HPP
 # define HANDLE_DWA20011130_HPP
-# include <boost/python/export.hpp>
+# include <boost/python/detail/config.hpp>
 # include <boost/utility.hpp>
 # include <boost/python/detail/wrap_python.hpp>
-# include <boost/python/export.hpp>
 
 namespace boost { namespace python { namespace converter { 
 
-struct BOOST_PYTHON_EXPORT body;
+struct BOOST_PYTHON_DECL body;
 
 // The common base class for unwrap_ and wrap_ handle objects. They
 // share a common base so that handles can be linked into a chain
 // within a function wrapper which is managed by a single object.
-struct BOOST_PYTHON_EXPORT handle : boost::noncopyable
+struct BOOST_PYTHON_DECL handle : boost::noncopyable
 {
  public: // member functions
 
diff --git a/include/boost/python/converter/type_id.hpp b/include/boost/python/converter/type_id.hpp
index ddc04266..c383c352 100644
--- a/include/boost/python/converter/type_id.hpp
+++ b/include/boost/python/converter/type_id.hpp
@@ -5,12 +5,11 @@
 //  to its suitability for any purpose.
 #ifndef TYPE_ID_DWA20011127_HPP
 # define TYPE_ID_DWA20011127_HPP
-# include <boost/config.hpp>
-# include <boost/python/export.hpp>
+# include <boost/python/detail/config.hpp>
+# include <boost/python/detail/config.hpp>
 # include <boost/mpl/select_type.hpp>
 # include <boost/type_traits/cv_traits.hpp>
 # include <boost/type_traits/composite_traits.hpp>
-# include <boost/python/export.hpp>
 # include <boost/operators.hpp>
 # include <typeinfo>
 # include <iosfwd>
@@ -48,7 +47,7 @@ typedef std::type_info const* base_id_t;
 
     bool operator<(type_id_t const& rhs) const;
     bool operator==(type_id_t const& rhs) const;
-    friend BOOST_PYTHON_EXPORT std::ostream& operator<<(std::ostream&, type_id_t const&);
+    friend BOOST_PYTHON_DECL std::ostream& operator<<(std::ostream&, type_id_t const&);
     
  private:
     decoration m_decoration;
@@ -188,12 +187,12 @@ type_id_t type_id(detail::dummy<T>* = 0)
 }
 # endif 
 
-struct BOOST_PYTHON_EXPORT type_id_before
+struct BOOST_PYTHON_DECL type_id_before
 {
     bool operator()(type_id_t const& x, type_id_t const& y) const;
 };
 
-BOOST_PYTHON_EXPORT std::ostream& operator<<(std::ostream&, type_id_t const&);
+BOOST_PYTHON_DECL std::ostream& operator<<(std::ostream&, type_id_t const&);
 
 }}} // namespace boost::python::converter
 
diff --git a/include/boost/python/converter/wrap.hpp b/include/boost/python/converter/wrap.hpp
index 91c9de86..e26cf0f6 100644
--- a/include/boost/python/converter/wrap.hpp
+++ b/include/boost/python/converter/wrap.hpp
@@ -9,13 +9,13 @@
 # include <boost/python/converter/handle.hpp>
 # include <boost/python/converter/body.hpp>
 # include <boost/python/converter/wrapper.hpp>
-# include <boost/python/export.hpp>
+# include <boost/python/detail/config.hpp>
 # include <boost/python/converter/source_holder.hpp>
 # include <cassert>
 
 namespace boost { namespace python { namespace converter { 
 
-struct BOOST_PYTHON_EXPORT wrapper_base;
+struct BOOST_PYTHON_DECL wrapper_base;
 
 template <class T> struct wrapper;
 
diff --git a/include/boost/python/converter/wrapper.hpp b/include/boost/python/converter/wrapper.hpp
index ada5e8cb..49c32186 100644
--- a/include/boost/python/converter/wrapper.hpp
+++ b/include/boost/python/converter/wrapper.hpp
@@ -5,13 +5,12 @@
 // to its suitability for any purpose.
 #ifndef WRAPPER_DWA2001127_HPP
 # define WRAPPER_DWA2001127_HPP
-# include <boost/config.hpp>
+# include <boost/python/detail/config.hpp>
 # include <boost/python/detail/wrap_python.hpp>
 # include <boost/python/converter/body.hpp>
 # include <boost/python/converter/type_id.hpp>
 # include <boost/python/converter/wrap.hpp>
 # include <boost/python/converter/source_holder.hpp>
-# include <boost/python/export.hpp>
 
 namespace boost { namespace python { namespace converter { 
 
@@ -19,7 +18,7 @@ struct source_holder_base;
 struct wrap_base;
 template <class T> struct wrap_more_;
 
-struct BOOST_PYTHON_EXPORT wrapper_base : body
+struct BOOST_PYTHON_DECL wrapper_base : body
 {
  public:
     wrapper_base(type_id_t); // registers
diff --git a/include/boost/python/object/class.hpp b/include/boost/python/object/class.hpp
index 548d4053..35085e5f 100644
--- a/include/boost/python/object/class.hpp
+++ b/include/boost/python/object/class.hpp
@@ -7,7 +7,7 @@
 # define CLASS_DWA20011214_HPP
 
 # include <boost/python/detail/wrap_python.hpp>
-# include <boost/python/export.hpp>
+# include <boost/python/detail/config.hpp>
 # include <boost/utility.hpp>
 # include <boost/python/converter/type_id.hpp>
 # include <boost/iterator_adaptors.hpp>
@@ -17,7 +17,7 @@ namespace boost { namespace python { namespace object {
 template <class T> struct holder;
 
 // Base class for all holders
-struct BOOST_PYTHON_EXPORT holder_base : noncopyable
+struct BOOST_PYTHON_DECL holder_base : noncopyable
 {
  public:
     holder_base(converter::type_id_t id);
@@ -68,7 +68,7 @@ struct instance
     holder_base* objects;
 };
 
-BOOST_PYTHON_EXPORT holder_base* find_holder_impl(PyObject*, converter::type_id_t);
+BOOST_PYTHON_DECL holder_base* find_holder_impl(PyObject*, converter::type_id_t);
 
 template <class T>
 holder<T>* find_holder(PyObject* p, T* = 0)
@@ -76,8 +76,8 @@ holder<T>* find_holder(PyObject* p, T* = 0)
     return static_cast<holder<T>*>(find_holder_impl(p, converter::type_id<T>()));
 }
 
-BOOST_PYTHON_EXPORT PyTypeObject* class_metatype();
-BOOST_PYTHON_EXPORT PyTypeObject* class_type();
+BOOST_PYTHON_DECL PyTypeObject* class_metatype();
+BOOST_PYTHON_DECL PyTypeObject* class_type();
 
 //
 // implementation
diff --git a/include/boost/python/object/function.hpp b/include/boost/python/object/function.hpp
index f550e8dc..a0257676 100644
--- a/include/boost/python/object/function.hpp
+++ b/include/boost/python/object/function.hpp
@@ -7,7 +7,7 @@
 # define FUNCTION_DWA20011214_HPP
 
 # include <boost/python/detail/wrap_python.hpp>
-# include <boost/python/export.hpp>
+# include <boost/python/detail/config.hpp>
 # include <boost/function.hpp>
 
 namespace boost { namespace python { namespace object { 
@@ -15,7 +15,7 @@ namespace boost { namespace python { namespace object {
 // We use boost::function to avoid generating lots of virtual tables
 typedef boost::function2<PyObject*, PyObject*, PyObject*> py_function;
 
-struct BOOST_PYTHON_EXPORT function : PyObject
+struct BOOST_PYTHON_DECL function : PyObject
 {
     function(py_function);
     ~function();
@@ -25,7 +25,7 @@ struct BOOST_PYTHON_EXPORT function : PyObject
     py_function m_fn;
 };
 
-extern BOOST_PYTHON_EXPORT PyTypeObject function_type;
+extern BOOST_PYTHON_DECL PyTypeObject function_type;
 
 //
 // implementations