diff --git a/base/bits.hpp b/base/bits.hpp
index 374b70683e..b026193b33 100644
--- a/base/bits.hpp
+++ b/base/bits.hpp
@@ -1,8 +1,6 @@
 #pragma once
 #include "assert.hpp"
 
-#include "assert.hpp"
-
 #include "../std/type_traits.hpp"
 #include "../std/stdint.hpp"
 
diff --git a/coding/hex.hpp b/coding/hex.hpp
index 251079cfa1..d766d4c126 100644
--- a/coding/hex.hpp
+++ b/coding/hex.hpp
@@ -3,8 +3,7 @@
 #include "../base/base.hpp"
 
 #include "../std/string.hpp"
-
-#include <boost/type_traits/is_integral.hpp>
+#include "../std/type_traits.hpp"
 
 
 namespace impl
@@ -40,7 +39,7 @@ inline string ToHex(ContainerT const & container)
 template <typename IntT>
 inline string NumToHex(IntT n)
 {
-  STATIC_ASSERT(boost::is_integral<IntT>::value);
+  STATIC_ASSERT(is_integral<IntT>::value);
 
   uint8_t buf[sizeof(n)];