diff --git a/.github/scripts/levelization/results/ordering.txt b/.github/scripts/levelization/results/ordering.txt
index fd0ce7c924..494fbc25e3 100644
--- a/.github/scripts/levelization/results/ordering.txt
+++ b/.github/scripts/levelization/results/ordering.txt
@@ -135,11 +135,11 @@ test.ledger > xrpl.json
 test.ledger > xrpl.ledger
 test.ledger > xrpl.protocol
 test.nodestore > test.jtx
+test.nodestore > test.unit_test
 test.nodestore > xrpl.basics
 test.nodestore > xrpl.config
 test.nodestore > xrpld.core
 test.nodestore > xrpl.nodestore
-test.nodestore > xrpl.protocol
 test.nodestore > xrpl.rdb
 test.overlay > test.jtx
 test.overlay > test.unit_test
diff --git a/src/test/core/JobQueue_test.cpp b/src/test/core/JobQueue_test.cpp
index 2f262282dc..47c0995cde 100644
--- a/src/test/core/JobQueue_test.cpp
+++ b/src/test/core/JobQueue_test.cpp
@@ -25,7 +25,6 @@
 #include <chrono>
 #include <condition_variable>
 #include <cstdint>
-#include <functional>
 #include <limits>
 #include <map>
 #include <memory>
@@ -473,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());
@@ -660,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/test/nodestore/DatabaseConfig_test.cpp b/src/test/nodestore/DatabaseConfig_test.cpp
index 71168461b3..5c9b2cf0d6 100644
--- a/src/test/nodestore/DatabaseConfig_test.cpp
+++ b/src/test/nodestore/DatabaseConfig_test.cpp
@@ -6,6 +6,7 @@
 #include <xrpld/core/Config.h>
 
 #include <xrpl/basics/Blob.h>
+#include <xrpl/basics/ByteUtilities.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/basics/random.h>
 #include <xrpl/beast/unit_test/suite.h>
@@ -22,7 +23,6 @@
 #include <xrpl/nodestore/NodeObject.h>
 #include <xrpl/nodestore/Types.h>
 #include <xrpl/nodestore/detail/DatabaseRotatingImp.h>
-#include <xrpl/protocol/SystemParameters.h>
 #include <xrpl/rdb/DatabaseCon.h>
 
 #include <cstddef>