diff --git a/src/rpc/common/Validators.cpp b/src/rpc/common/Validators.cpp
index 4eb4ab86..ff17db26 100644
--- a/src/rpc/common/Validators.cpp
+++ b/src/rpc/common/Validators.cpp
@@ -36,8 +36,6 @@
 #include <charconv>
 #include <cstdint>
 #include <ctime>
-#include <iomanip>
-#include <sstream>
 #include <stdexcept>
 #include <string>
 #include <string_view>
diff --git a/src/rpc/handlers/LedgerIndex.cpp b/src/rpc/handlers/LedgerIndex.cpp
index b306ab08..8cd5ff31 100644
--- a/src/rpc/handlers/LedgerIndex.cpp
+++ b/src/rpc/handlers/LedgerIndex.cpp
@@ -27,13 +27,13 @@
 #include <boost/json/conversion.hpp>
 #include <boost/json/object.hpp>
 #include <boost/json/value.hpp>
+#include <xrpl/basics/chrono.h>
 #include <xrpl/basics/strHex.h>
 #include <xrpl/protocol/jss.h>
 
 #include <algorithm>
 #include <cstdint>
 #include <ranges>
-#include <sstream>
 #include <string>
 
 namespace rpc {
diff --git a/src/util/TimeUtils.cpp b/src/util/TimeUtils.cpp
index b2e7b547..6d8d9e40 100644
--- a/src/util/TimeUtils.cpp
+++ b/src/util/TimeUtils.cpp
@@ -19,13 +19,19 @@
 
 #include "util/TimeUtils.hpp"
 
+#include <time.h>
 #include <xrpl/basics/chrono.h>
 
+#include <chrono>
+#include <ctime>
+#include <optional>
+#include <string>
+
 namespace util {
 [[nodiscard]] std::optional<std::chrono::system_clock::time_point>
 SystemTpFromUTCStr(std::string const& dateStr, std::string const& format)
 {
-    std::tm timeStruct;
+    std::tm timeStruct{};
     auto const ret = strptime(dateStr.c_str(), format.c_str(), &timeStruct);
     if (ret == nullptr) {
         return std::nullopt;
diff --git a/tests/unit/etl/LoadBalancerTests.cpp b/tests/unit/etl/LoadBalancerTests.cpp
index c160523f..deef42e7 100644
--- a/tests/unit/etl/LoadBalancerTests.cpp
+++ b/tests/unit/etl/LoadBalancerTests.cpp
@@ -48,7 +48,6 @@
 #include <optional>
 #include <stdexcept>
 #include <string>
-#include <string_view>
 #include <utility>
 #include <vector>
 
diff --git a/tests/unit/rpc/ForwardingProxyTests.cpp b/tests/unit/rpc/ForwardingProxyTests.cpp
index c0b4f637..05a71030 100644
--- a/tests/unit/rpc/ForwardingProxyTests.cpp
+++ b/tests/unit/rpc/ForwardingProxyTests.cpp
@@ -31,7 +31,6 @@
 #include <boost/json/parse.hpp>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include <xrpl/protocol/ErrorCodes.h>
 
 #include <memory>
 #include <optional>
diff --git a/tests/unit/rpc/handlers/LedgerIndexTests.cpp b/tests/unit/rpc/handlers/LedgerIndexTests.cpp
index 96a3f20a..5a0b8961 100644
--- a/tests/unit/rpc/handlers/LedgerIndexTests.cpp
+++ b/tests/unit/rpc/handlers/LedgerIndexTests.cpp
@@ -29,6 +29,7 @@
 #include <boost/json/value.hpp>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
+#include <stdlib.h>
 
 #include <cstdint>
 #include <string>
diff --git a/tests/unit/util/TimeUtilsTests.cpp b/tests/unit/util/TimeUtilsTests.cpp
index 64df3f1d..11f9c87a 100644
--- a/tests/unit/util/TimeUtilsTests.cpp
+++ b/tests/unit/util/TimeUtilsTests.cpp
@@ -20,13 +20,17 @@
 #include "util/TimeUtils.hpp"
 
 #include <gtest/gtest.h>
+#include <xrpl/basics/chrono.h>
+
+#include <chrono>
+#include <ctime>
 
 TEST(TimeUtilTests, SystemTpFromUTCStrSuccess)
 {
     auto const tp = util::SystemTpFromUTCStr("2024-01-01T10:50:40Z", "%Y-%m-%dT%H:%M:%SZ");
     ASSERT_TRUE(tp.has_value());
     auto const time = std::chrono::system_clock::to_time_t(tp.value());
-    std::tm timeStruct;
+    std::tm timeStruct{};
     gmtime_r(&time, &timeStruct);
     EXPECT_EQ(timeStruct.tm_year + 1900, 2024);
     EXPECT_EQ(timeStruct.tm_mon, 0);