diff --git a/include/boost/histogram/detail/axis_visitor.hpp b/include/boost/histogram/detail/axis_visitor.hpp
index ee63562b..c2879dff 100644
--- a/include/boost/histogram/detail/axis_visitor.hpp
+++ b/include/boost/histogram/detail/axis_visitor.hpp
@@ -16,10 +16,10 @@
 #include <boost/histogram/interval.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/contains.hpp>
-#include <boost/type_traits.hpp>
 #include <boost/variant/get.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/variant.hpp>
+#include <type_traits>
 
 namespace boost {
 namespace histogram {
diff --git a/include/boost/histogram/storage/array_storage.hpp b/include/boost/histogram/storage/array_storage.hpp
index 7422e779..6d9abdef 100644
--- a/include/boost/histogram/storage/array_storage.hpp
+++ b/include/boost/histogram/storage/array_storage.hpp
@@ -9,7 +9,7 @@
 
 #include <algorithm>
 #include <boost/histogram/detail/meta.hpp>
-#include <boost/type_traits.hpp>
+#include <type_traits>
 #include <cstddef>
 #include <memory>
 
diff --git a/src/python/axis.cpp b/src/python/axis.cpp
index c0ebc010..4c83b3ac 100644
--- a/src/python/axis.cpp
+++ b/src/python/axis.cpp
@@ -145,7 +145,7 @@ template <typename T> python::str axis_get_label(const T& t) {
 
 #ifdef HAVE_NUMPY
 template <typename Axis> python::object axis_array_interface(const Axis& axis) {
-  using T = typename decay<decltype(axis[0].lower())>::type;
+  using T = typename std::decay<decltype(axis[0].lower())>::type;
   python::dict d;
   auto shape = python::make_tuple(axis.size()+1);
   d["shape"] = shape;
diff --git a/src/python/utility.hpp b/src/python/utility.hpp
index 72bd3630..f96cf740 100644
--- a/src/python/utility.hpp
+++ b/src/python/utility.hpp
@@ -8,7 +8,7 @@
 #define _BOOST_HISTOGRAM_PYTHON_UTILITY_HPP_
 
 #include <boost/python/str.hpp>
-#include <boost/type_traits.hpp>
+#include <type_traits>
 #include <stdexcept>
 
 namespace boost {
@@ -16,14 +16,12 @@ namespace python {
 template <typename T>
 str dtype_typestr() {
     str s;
-    if (is_unsigned<T>::value)
-        s = "|u";
-    else if (is_signed<T>::value)
-        s = "|i";
-    else if (is_floating_point<T>::value)
+    if (std::is_floating_point<T>::value)
         s = "|f";
+    else if (std::is_integral<T>::value)
+        s = std::is_unsigned<T>::value ? "|u" : "|i";
     else
-        throw std::invalid_argument("T must be an arithmetic type");
+        throw std::invalid_argument("T must be a builtin arithmetic type");
     s += str(sizeof(T));
     return s;
 }