diff --git a/include/boost/python/detail/type_traits.hpp b/include/boost/python/detail/type_traits.hpp
index 381132ee..fda54c80 100644
--- a/include/boost/python/detail/type_traits.hpp
+++ b/include/boost/python/detail/type_traits.hpp
@@ -7,8 +7,8 @@
 # define BOOST_PYTHON_DETAIL_TYPE_TRAITS_HPP
 
 
-#if __cplusplus < 201103L && (!defined(BOOST_MSVC) || BOOST_MSVC<=1600)
-#define BOOST_PYTHON_USE_BOOST_TYPES
+#include <boost/config.hpp>
+#ifdef BOOST_NO_CXX11_HDR_TYPE_TRAITS
 # include <boost/type_traits/transform_traits.hpp>
 # include <boost/type_traits/same_traits.hpp>
 # include <boost/type_traits/cv_traits.hpp>
@@ -35,7 +35,7 @@
 
 namespace boost { namespace python { namespace detail {
 
-#if defined(BOOST_PYTHON_USE_BOOST_TYPES)
+#ifdef BOOST_NO_CXX11_HDR_TYPE_TRAITS
     using boost::alignment_of;
     using boost::add_const;
     using boost::add_cv;
@@ -99,8 +99,8 @@ namespace boost { namespace python { namespace detail {
     using std::remove_cv;
     using std::remove_const;
 
-    using true_ = std::integral_constant<bool, true>;
-    using false_ = std::integral_constant<bool, false>;
+    typedef std::integral_constant<bool, true> true_;
+    typedef std::integral_constant<bool, false> false_;
 #endif
     using boost::is_base_and_derived;
     using boost::type_with_alignment;