diff --git a/src/test/protocol/Issue_test.cpp b/src/test/protocol/Issue_test.cpp
index 9876226db0..a6a1fdd341 100644
--- a/src/test/protocol/Issue_test.cpp
+++ b/src/test/protocol/Issue_test.cpp
@@ -1,7 +1,6 @@
 #include <xrpl/basics/UnorderedContainers.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/unit_test/suite.h>
-#include <xrpl/json/json_errors.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Book.h>
diff --git a/src/test/protocol/STIssue_test.cpp b/src/test/protocol/STIssue_test.cpp
index 4972146d61..6692ecee7f 100644
--- a/src/test/protocol/STIssue_test.cpp
+++ b/src/test/protocol/STIssue_test.cpp
@@ -2,15 +2,23 @@
 #include <test/jtx/Account.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/amount.h>  // IWYU pragma: keep
+#include <test/jtx/envconfig.h>
+
+#include <xrpld/core/Config.h>
 
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/unit_test/suite.h>
+#include <xrpl/json/json_value.h>
+#include <xrpl/json/to_string.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Issue.h>
 #include <xrpl/protocol/SField.h>
 #include <xrpl/protocol/STIssue.h>
 #include <xrpl/protocol/Serializer.h>
 #include <xrpl/protocol/UintTypes.h>
+#include <xrpl/protocol/jss.h>
+
+#include <memory>
 
 namespace xrpl::test {
 
diff --git a/src/test/rpc/AccountObjects_test.cpp b/src/test/rpc/AccountObjects_test.cpp
index 887fcc71f6..9595b4a1a6 100644
--- a/src/test/rpc/AccountObjects_test.cpp
+++ b/src/test/rpc/AccountObjects_test.cpp
@@ -23,6 +23,7 @@
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Feature.h>
 #include <xrpl/protocol/SField.h>
+#include <xrpl/protocol/Seed.h>
 #include <xrpl/protocol/TxFlags.h>
 #include <xrpl/protocol/jss.h>
 #include <xrpl/protocol/nft.h>
@@ -1361,7 +1362,7 @@ public:
 
         Account const alice{"alice"};
         Account const bob{"bob"};
-        auto const EUR = bob["EUR"];
+        auto const eur = bob["EUR"];
         env.fund(XRP(10000), alice, bob);
         env.close();
 
@@ -1382,7 +1383,7 @@ public:
         {
             json::Value params;
             params[jss::secret] = toBase58(generateSeed("alice"));
-            params[jss::tx_json] = offer(alice, EUR(1), XRP(2));
+            params[jss::tx_json] = offer(alice, eur(1), XRP(2));
             auto const res = env.rpc("json", "submit", to_string(params))[jss::result];
             BEAST_EXPECT(res[jss::status].asString() == "success");
             seqs.push_back(env.seq(alice));
@@ -1410,11 +1411,11 @@ public:
         {
             json::Value params;
             params[jss::secret] = toBase58(generateSeed("alice"));
-            json::Value tx_json;
-            tx_json[jss::TransactionType] = jss::NFTokenMint;
-            tx_json[jss::Account] = to_string(alice.id());
-            tx_json["NFTokenTaxon"] = 1;
-            params[jss::tx_json] = tx_json;
+            json::Value txJson;
+            txJson[jss::TransactionType] = jss::NFTokenMint;
+            txJson[jss::Account] = to_string(alice.id());
+            txJson["NFTokenTaxon"] = 1;
+            params[jss::tx_json] = txJson;
             auto const res = env.rpc("json", "submit", to_string(params))[jss::result];
             BEAST_EXPECT(res[jss::status].asString() == "success");
         }