diff --git a/src/rpc/Errors.cpp b/src/rpc/Errors.cpp
index 633a8b83..aa0be8fd 100644
--- a/src/rpc/Errors.cpp
+++ b/src/rpc/Errors.cpp
@@ -30,9 +30,11 @@
 #include <cstdint>
 #include <iterator>
 #include <optional>
+#include <ostream>
 #include <stdexcept>
 #include <string>
 #include <string_view>
+#include <type_traits>
 #include <variant>
 
 using namespace std;
@@ -48,19 +50,21 @@ operator<<(std::ostream& stream, Status const& status)
                 stream << "Code: " << static_cast<std::underlying_type_t<RippledError>>(err);
                 if (!status.error.empty())
                     stream << ", Error: " << status.error;
-                if (!status.message.empty())
+                if (!status.message.empty()) {
                     stream << ", Message: " << status.message;
-                else
+                } else {
                     stream << ", Message: " << ripple::RPC::get_error_info(err).message;
+                }
             },
             [&stream, &status](ClioError err) {
                 stream << "Code: " << static_cast<std::underlying_type_t<ClioError>>(err);
                 if (!status.error.empty())
                     stream << ", Error: " << status.error;
-                if (!status.message.empty())
+                if (!status.message.empty()) {
                     stream << ", Message: " << status.message;
-                else
+                } else {
                     stream << ", Message: " << getErrorInfo(err).message;
+                }
             }
         },
         status.code
diff --git a/tests/unit/rpc/ErrorTests.cpp b/tests/unit/rpc/ErrorTests.cpp
index a3645d32..3b265f0d 100644
--- a/tests/unit/rpc/ErrorTests.cpp
+++ b/tests/unit/rpc/ErrorTests.cpp
@@ -26,6 +26,7 @@
 #include <gtest/gtest.h>
 
 #include <cstdint>
+#include <sstream>
 #include <string>
 #include <string_view>
 
@@ -199,14 +200,14 @@ struct StatusStreamTestBundle {
 
 struct RPCErrorsStatusStreamTest : public ::testing::TestWithParam<StatusStreamTestBundle> {
 protected:
-    std::ostringstream oss;
+    std::ostringstream oss_;
 };
 
 TEST_P(RPCErrorsStatusStreamTest, StatusStreamOperator)
 {
     auto const param = GetParam();
-    oss << param.status;
-    EXPECT_EQ(oss.str(), param.expectedOutput);
+    oss_ << param.status;
+    EXPECT_EQ(oss_.str(), param.expectedOutput);
 }
 
 INSTANTIATE_TEST_SUITE_P(