diff --git a/src/ripple/beast/container/detail/aged_ordered_container.h b/src/ripple/beast/container/detail/aged_ordered_container.h
index 23534a26bb3..879886c3275 100644
--- a/src/ripple/beast/container/detail/aged_ordered_container.h
+++ b/src/ripple/beast/container/detail/aged_ordered_container.h
@@ -148,16 +148,19 @@ class aged_ordered_container
     class pair_value_compare
         : public beast::detail::empty_base_optimization<Compare>
 #ifdef _LIBCPP_VERSION
+#if _LIBCPP_VERSION >= 15006
+        ,
+          public std::__binary_function<value_type, value_type, bool>
+#else
         ,
           public std::binary_function<value_type, value_type, bool>
+#endif
 #endif
     {
     public:
-#ifndef _LIBCPP_VERSION
         using first_argument = value_type;
         using second_argument = value_type;
         using result_type = bool;
-#endif
 
         bool
         operator()(value_type const& lhs, value_type const& rhs) const
@@ -188,16 +191,19 @@ class aged_ordered_container
     class KeyValueCompare
         : public beast::detail::empty_base_optimization<Compare>
 #ifdef _LIBCPP_VERSION
+#if _LIBCPP_VERSION >= 15006
+        ,
+          public std::__binary_function<Key, element, bool>
+#else
         ,
           public std::binary_function<Key, element, bool>
+#endif
 #endif
     {
     public:
-#ifndef _LIBCPP_VERSION
         using first_argument = Key;
         using second_argument = element;
         using result_type = bool;
-#endif
 
         KeyValueCompare() = default;
 
diff --git a/src/ripple/beast/container/detail/aged_unordered_container.h b/src/ripple/beast/container/detail/aged_unordered_container.h
index 920e6196bb9..79ef90094b7 100644
--- a/src/ripple/beast/container/detail/aged_unordered_container.h
+++ b/src/ripple/beast/container/detail/aged_unordered_container.h
@@ -150,15 +150,18 @@ class aged_unordered_container
     // VFALCO TODO hoist to remove template argument dependencies
     class ValueHash : private beast::detail::empty_base_optimization<Hash>
 #ifdef _LIBCPP_VERSION
+#if _LIBCPP_VERSION >= 15006
+        ,
+                      public std::__unary_function<element, std::size_t>
+#else
         ,
                       public std::unary_function<element, std::size_t>
+#endif
 #endif
     {
     public:
-#ifndef _LIBCPP_VERSION
         using argument_type = element;
         using result_type = size_t;
-#endif
 
         ValueHash()
         {
@@ -193,16 +196,19 @@ class aged_unordered_container
     class KeyValueEqual
         : private beast::detail::empty_base_optimization<KeyEqual>
 #ifdef _LIBCPP_VERSION
+#if _LIBCPP_VERSION >= 15006
+        ,
+          public std::__binary_function<Key, element, bool>
+#else
         ,
           public std::binary_function<Key, element, bool>
+#endif
 #endif
     {
     public:
-#ifndef _LIBCPP_VERSION
         using first_argument_type = Key;
         using second_argument_type = element;
         using result_type = bool;
-#endif
 
         KeyValueEqual()
         {
diff --git a/src/ripple/peerfinder/impl/Bootcache.h b/src/ripple/peerfinder/impl/Bootcache.h
index eb6455879c0..b48f248ae40 100644
--- a/src/ripple/peerfinder/impl/Bootcache.h
+++ b/src/ripple/peerfinder/impl/Bootcache.h
@@ -91,17 +91,10 @@ class Bootcache
     using value_type = map_type::value_type;
 
     struct Transform
-#ifdef _LIBCPP_VERSION
-        : std::unary_function<
-              map_type::right_map::const_iterator::value_type const&,
-              beast::IP::Endpoint const&>
-#endif
     {
-#ifndef _LIBCPP_VERSION
         using first_argument_type =
             map_type::right_map::const_iterator::value_type const&;
         using result_type = beast::IP::Endpoint const&;
-#endif
 
         explicit Transform() = default;
 
diff --git a/src/ripple/peerfinder/impl/Livecache.h b/src/ripple/peerfinder/impl/Livecache.h
index 12e2373faaf..8ecd68e845e 100644
--- a/src/ripple/peerfinder/impl/Livecache.h
+++ b/src/ripple/peerfinder/impl/Livecache.h
@@ -69,14 +69,9 @@ class LivecacheBase
     public:
         // Iterator transformation to extract the endpoint from Element
         struct Transform
-#ifdef _LIBCPP_VERSION
-            : public std::unary_function<Element, Endpoint>
-#endif
         {
-#ifndef _LIBCPP_VERSION
             using first_argument = Element;
             using result_type = Endpoint;
-#endif
 
             explicit Transform() = default;
 
@@ -239,15 +234,9 @@ class Livecache : protected detail::LivecacheBase
 
         template <bool IsConst>
         struct Transform
-#ifdef _LIBCPP_VERSION
-            : public std::
-                  unary_function<typename lists_type::value_type, Hop<IsConst>>
-#endif
         {
-#ifndef _LIBCPP_VERSION
             using first_argument = typename lists_type::value_type;
             using result_type = Hop<IsConst>;
-#endif
 
             explicit Transform() = default;
 
diff --git a/src/ripple/shamap/impl/SHAMapInnerNode.cpp b/src/ripple/shamap/impl/SHAMapInnerNode.cpp
index 6ea6f47eb37..43b39405415 100644
--- a/src/ripple/shamap/impl/SHAMapInnerNode.cpp
+++ b/src/ripple/shamap/impl/SHAMapInnerNode.cpp
@@ -431,6 +431,7 @@ SHAMapInnerNode::invariants(bool is_root) const
         }
     }
 
+    (void)count;
     if (!is_root)
     {
         assert(hash_.isNonZero());