diff --git a/include/boost/python/manage_new_object.hpp b/include/boost/python/manage_new_object.hpp
index 9c0912ab..2df448c8 100644
--- a/include/boost/python/manage_new_object.hpp
+++ b/include/boost/python/manage_new_object.hpp
@@ -6,7 +6,7 @@
 #ifndef MANAGE_NEW_OBJECT_DWA200222_HPP
 # define MANAGE_NEW_OBJECT_DWA200222_HPP
 # include <boost/python/detail/indirect_traits.hpp>
-# include <boost/mpl/select_type.hpp>
+# include <boost/mpl/select_if.hpp>
 # include <boost/python/to_python_indirect.hpp>
 # include <boost/type_traits/composite_traits.hpp>
 
@@ -29,7 +29,7 @@ struct manage_new_object
     template <class T>
     struct apply
     {
-        typedef typename mpl::select_type<
+        typedef typename mpl::select_if_c<
             boost::is_pointer<T>::value
             , to_python_indirect<T, detail::make_owning_holder>
             , detail::manage_new_object_requires_a_pointer_return_type<T>
diff --git a/include/boost/python/object/inheritance.hpp b/include/boost/python/object/inheritance.hpp
index ceeac8f9..eb7cecb2 100644
--- a/include/boost/python/object/inheritance.hpp
+++ b/include/boost/python/object/inheritance.hpp
@@ -78,7 +78,7 @@ struct non_polymorphic_id_generator
 template <class T>
 struct dynamic_id_generator
 {
-    typedef typename mpl::select_type<
+    typedef typename mpl::select_if_c<
         is_polymorphic<T>::value
         , polymorphic_id_generator<T>
         , non_polymorphic_id_generator<T> >::type type;
@@ -131,7 +131,7 @@ struct cast_generator
             is_base_and_derived<Target,Source>::value
             ));
 
-    typedef typename mpl::select_type<
+    typedef typename mpl::select_if_c<
         is_upcast
 # if defined(__MWERKS__) && __MWERKS__ <= 0x2406
         // grab a few more implicit_cast cases for CodeWarrior