diff --git a/src/test/core/JobQueue_test.cpp b/src/test/core/JobQueue_test.cpp
index 4ef521c5e8..47c0995cde 100644
--- a/src/test/core/JobQueue_test.cpp
+++ b/src/test/core/JobQueue_test.cpp
@@ -21,20 +21,16 @@
 #include <xrpl/core/PerfLog.h>
 #include <xrpl/json/json_value.h>
 
-#include <algorithm>
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
 #include <cstdint>
-#include <functional>
 #include <limits>
 #include <map>
 #include <memory>
 #include <mutex>
-#include <numeric>
 #include <optional>
 #include <string>
-#include <thread>
 #include <utility>
 #include <vector>
 
@@ -476,7 +472,7 @@ class JobQueue_test : public beast::unit_test::Suite
     {
         testcase("Saturation gauge creation");
 
-        GaugeFixture fixture(1);
+        GaugeFixture const fixture(1);
 
         // JtLedgerReq has limit 3, so it is not special and must be gauged.
         BEAST_EXPECT(!JobTypes::instance().get(JtLedgerReq).special());
@@ -663,7 +659,7 @@ class JobQueue_test : public beast::unit_test::Suite
     {
         testcase("Saturation gauge coverage");
 
-        GaugeFixture fixture(1);
+        GaugeFixture const fixture(1);
         fixture.collector->runHooks();
 
         // Sanity-check the fixture against the job-type table itself, so the
diff --git a/src/tests/libxrpl/telemetry/MetricsRegistry.cpp b/src/tests/libxrpl/telemetry/MetricsRegistry.cpp
index 275273e737..e0f7c700ec 100644
--- a/src/tests/libxrpl/telemetry/MetricsRegistry.cpp
+++ b/src/tests/libxrpl/telemetry/MetricsRegistry.cpp
@@ -56,6 +56,7 @@
 
 #include <gtest/gtest.h>
 
+#include <algorithm>
 #include <array>
 #include <cstddef>
 #include <set>
@@ -209,12 +210,9 @@ constexpr std::array kFoldToOtherHandlers = {
 consteval bool
 allPassThroughUnchanged()
 {
-    for (auto const name : kPassThroughHandlers)
-    {
-        if (MetricsRegistry::sanitiseHandler(name) != name)
-            return false;
-    }
-    return true;
+    return std::ranges::all_of(kPassThroughHandlers, [](auto const name) {
+        return MetricsRegistry::sanitiseHandler(name) == name;
+    });
 }
 
 /**
@@ -223,12 +221,9 @@ allPassThroughUnchanged()
 consteval bool
 allFoldToOther()
 {
-    for (auto const name : kFoldToOtherHandlers)
-    {
-        if (MetricsRegistry::sanitiseHandler(name) != MetricsRegistry::kHandlerOther)
-            return false;
-    }
-    return true;
+    return std::ranges::all_of(kFoldToOtherHandlers, [](auto const name) {
+        return MetricsRegistry::sanitiseHandler(name) == MetricsRegistry::kHandlerOther;
+    });
 }
 
 // Compile-time guarantees. Duplicated at runtime below so a failure names
diff --git a/src/tests/libxrpl/telemetry/SyncStateSignals.cpp b/src/tests/libxrpl/telemetry/SyncStateSignals.cpp
index 713ac9f132..b0c2f3abd2 100644
--- a/src/tests/libxrpl/telemetry/SyncStateSignals.cpp
+++ b/src/tests/libxrpl/telemetry/SyncStateSignals.cpp
@@ -26,7 +26,6 @@
 #include <gtest/gtest.h>
 
 #include <chrono>
-#include <cstdint>
 
 using namespace xrpl;
 using namespace std::chrono_literals;
diff --git a/src/xrpld/app/main/LoadManager.cpp b/src/xrpld/app/main/LoadManager.cpp
index 2859bb5b8b..5abc54e032 100644
--- a/src/xrpld/app/main/LoadManager.cpp
+++ b/src/xrpld/app/main/LoadManager.cpp
@@ -13,7 +13,6 @@
 
 #include <atomic>
 #include <chrono>
-#include <cstdint>
 #include <exception>
 #include <memory>
 #include <mutex>
diff --git a/src/xrpld/telemetry/MetricsRegistry.h b/src/xrpld/telemetry/MetricsRegistry.h
index accfc02040..491fc14998 100644
--- a/src/xrpld/telemetry/MetricsRegistry.h
+++ b/src/xrpld/telemetry/MetricsRegistry.h
@@ -150,7 +150,6 @@
 #include <atomic>
 #include <cstdint>
 #include <memory>
-#include <ranges>
 #include <string>
 #include <string_view>