diff --git a/src/beast/include/beast/core/detail/type_traits.hpp b/src/beast/include/beast/core/detail/type_traits.hpp
index e375b976d8..f6e49791bc 100644
--- a/src/beast/include/beast/core/detail/type_traits.hpp
+++ b/src/beast/include/beast/core/detail/type_traits.hpp
@@ -9,6 +9,7 @@
 #define BEAST_DETAIL_TYPE_TRAITS_HPP
 
 #include <beast/core/error.hpp>
+#include <boost/asio/basic_streambuf.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/io_service.hpp>
 #include <iterator>
@@ -16,31 +17,6 @@
 #include <type_traits>
 #include <string>
 
-// A few workarounds to keep things working
-
-namespace boost {
-namespace asio {
-
-// for has_get_io_service
-class io_service;
-
-// for is_dynamic_buffer
-template<class Allocator>
-class basic_streambuf;
-
-namespace detail {
-
-// for is_buffer_sequence
-template<class Buffer, class Buffers>
-class consuming_buffers;
-
-} // detail
-
-} // asio
-} // boost
-
-//------------------------------------------------------------------------------
-
 namespace beast {
 namespace detail {
 
diff --git a/src/beast/include/beast/core/impl/buffer_cat.ipp b/src/beast/include/beast/core/impl/buffer_cat.ipp
index f0f9d45eaf..91856fb1dc 100644
--- a/src/beast/include/beast/core/impl/buffer_cat.ipp
+++ b/src/beast/include/beast/core/impl/buffer_cat.ipp
@@ -30,10 +30,10 @@ class buffer_cat_view<Bn...>::const_iterator
             "BufferSequence requirements not met");
 #endif
 
-    std::size_t n_;
+    std::size_t n_{};
     std::tuple<Bn...> const* bn_;
     std::array<char, detail::max_sizeof<
-        typename Bn::const_iterator...>()> buf_;
+        typename Bn::const_iterator...>()> buf_{};
 
     friend class buffer_cat_view<Bn...>;
 
diff --git a/src/beast/include/beast/core/type_traits.hpp b/src/beast/include/beast/core/type_traits.hpp
index 2624ee6680..9e8da60061 100644
--- a/src/beast/include/beast/core/type_traits.hpp
+++ b/src/beast/include/beast/core/type_traits.hpp
@@ -154,6 +154,7 @@ struct is_dynamic_buffer<T, detail::void_t<decltype(
 {
 };
 
+#if BOOST_VERSION < 106600
 // Special case for Boost.Asio which doesn't adhere to
 // net-ts but still provides a read_size_helper so things work
 template<class Allocator>
@@ -163,6 +164,9 @@ struct is_dynamic_buffer<
 };
 #endif
 
+
+#endif
+
 //------------------------------------------------------------------------------
 //
 // Handler concepts
diff --git a/src/beast/include/beast/websocket/detail/frame.hpp b/src/beast/include/beast/websocket/detail/frame.hpp
index 512f817a79..02f5d87e76 100644
--- a/src/beast/include/beast/websocket/detail/frame.hpp
+++ b/src/beast/include/beast/websocket/detail/frame.hpp
@@ -264,7 +264,7 @@ read(close_reason& cr,
     }
     consuming_buffers<Buffers> cb(bs);
     {
-        std::uint8_t b[2];
+        std::uint8_t b[2] = {0, 0};
         buffer_copy(buffer(b), cb);
         cr.code = big_uint16_to_native(&b[0]);
         cb.consume(2);
diff --git a/src/nudb/include/nudb/verify.hpp b/src/nudb/include/nudb/verify.hpp
index 23b12604d5..4069a65f04 100644
--- a/src/nudb/include/nudb/verify.hpp
+++ b/src/nudb/include/nudb/verify.hpp
@@ -28,7 +28,7 @@ struct verify_info
         @li @b 0 Normal algorithm
         @li @b 1 Fast algorith
     */
-    int algorithm;                      // 0 = normal, 1 = fast
+    int algorithm{};                      // 0 = normal, 1 = fast
 
     /// The path to the data file
     path_type dat_path;
diff --git a/src/ripple/app/main/Application.h b/src/ripple/app/main/Application.h
index 6074b7a130..c68f186778 100644
--- a/src/ripple/app/main/Application.h
+++ b/src/ripple/app/main/Application.h
@@ -26,11 +26,10 @@
 #include <ripple/core/Config.h>
 #include <ripple/protocol/Protocol.h>
 #include <ripple/beast/utility/PropertyStream.h>
+#include <boost/asio/io_service.hpp>
 #include <memory>
 #include <mutex>
 
-namespace boost { namespace asio { class io_service; } }
-
 namespace ripple {
 
 namespace unl { class Manager; }
diff --git a/src/ripple/app/misc/NetworkOPs.h b/src/ripple/app/misc/NetworkOPs.h
index dd86629937..2531748345 100644
--- a/src/ripple/app/misc/NetworkOPs.h
+++ b/src/ripple/app/misc/NetworkOPs.h
@@ -27,6 +27,7 @@
 #include <ripple/ledger/ReadView.h>
 #include <ripple/net/InfoSub.h>
 #include <ripple/protocol/STValidation.h>
+#include <boost/asio/io_service.hpp>
 #include <memory>
 #include <deque>
 #include <tuple>
diff --git a/src/ripple/basics/RangeSet.h b/src/ripple/basics/RangeSet.h
index 71bb879952..13f58c94ad 100644
--- a/src/ripple/basics/RangeSet.h
+++ b/src/ripple/basics/RangeSet.h
@@ -143,7 +143,9 @@ save(Archive& ar,
     ripple::ClosedInterval<T> const& ci,
     const unsigned int version)
 {
-    ar << ci.lower() << ci.upper();
+    auto l = ci.lower();
+    auto u = ci.upper();
+    ar << l << u;
 }
 
 template <class Archive, class T>
@@ -168,7 +170,8 @@ template <class Archive, class T>
 void
 save(Archive& ar, ripple::RangeSet<T> const& rs, const unsigned int version)
 {
-    ar << rs.iterative_size();
+    auto s = rs.iterative_size();
+    ar << s;
     for (auto const& r : rs)
         ar << r;
 }
diff --git a/src/ripple/nodestore/impl/Shard.cpp b/src/ripple/nodestore/impl/Shard.cpp
index 0c09ea9307..30beb1a72b 100644
--- a/src/ripple/nodestore/impl/Shard.cpp
+++ b/src/ripple/nodestore/impl/Shard.cpp
@@ -23,6 +23,8 @@
 #include <ripple/nodestore/impl/DatabaseShardImp.h>
 #include <ripple/nodestore/Manager.h>
 
+#include <fstream>
+
 namespace ripple {
 namespace NodeStore {
 
diff --git a/src/test/app/TxQ_test.cpp b/src/test/app/TxQ_test.cpp
index 115a9e9b2f..1d8035f557 100644
--- a/src/test/app/TxQ_test.cpp
+++ b/src/test/app/TxQ_test.cpp
@@ -1092,8 +1092,6 @@ public:
 
         auto alice = Account("alice");
 
-        auto queued = ter(terQUEUED);
-
         BEAST_EXPECT(env.current()->fees().base == 10);
 
         checkMetrics(env, 0, boost::none, 0, 1, 256);
@@ -1133,7 +1131,6 @@ public:
                     {"maximum_txn_in_ledger", "5"} }));
 
         auto alice = Account("alice");
-        auto queued = ter(terQUEUED);
 
         checkMetrics(env, 0, boost::none, 0, 2, 256);