diff --git a/include/xrpl/telemetry/SpanNames.h b/include/xrpl/telemetry/SpanNames.h
index 0fde9a18c1..76f13c8851 100644
--- a/include/xrpl/telemetry/SpanNames.h
+++ b/include/xrpl/telemetry/SpanNames.h
@@ -24,8 +24,7 @@
 #include <cstddef>
 #include <string_view>
 
-namespace xrpl {
-namespace telemetry {
+namespace xrpl::telemetry {
 
 // ===== Compile-time string utility =========================================
 
@@ -110,5 +109,4 @@ inline constexpr auto error = makeStr("error");
 inline constexpr auto followsFrom = makeStr("follows_from");
 }  // namespace attr_val
 
-}  // namespace telemetry
-}  // namespace xrpl
+}  // namespace xrpl::telemetry
diff --git a/src/xrpld/app/main/GRPCServer.cpp b/src/xrpld/app/main/GRPCServer.cpp
index 7e5ee166a9..eeb4797b19 100644
--- a/src/xrpld/app/main/GRPCServer.cpp
+++ b/src/xrpld/app/main/GRPCServer.cpp
@@ -50,6 +50,7 @@
 #include <sstream>
 #include <stdexcept>
 #include <string>
+#include <string_view>
 #include <utility>
 #include <vector>
 
diff --git a/src/xrpld/app/main/GrpcSpanNames.h b/src/xrpld/app/main/GrpcSpanNames.h
index bea632fdfc..869d5628aa 100644
--- a/src/xrpld/app/main/GrpcSpanNames.h
+++ b/src/xrpld/app/main/GrpcSpanNames.h
@@ -20,9 +20,7 @@
 
 #include <xrpl/telemetry/SpanNames.h>
 
-namespace xrpl {
-namespace telemetry {
-namespace grpc_span {
+namespace xrpl::telemetry::grpc_span {
 
 // ===== Span prefixes =======================================================
 
@@ -59,6 +57,4 @@ inline constexpr auto resourceExhausted = makeStr("resource_exhausted");
 inline constexpr auto failedPrecondition = makeStr("failed_precondition");
 }  // namespace val
 
-}  // namespace grpc_span
-}  // namespace telemetry
-}  // namespace xrpl
+}  // namespace xrpl::telemetry::grpc_span
diff --git a/src/xrpld/rpc/detail/RPCHandler.cpp b/src/xrpld/rpc/detail/RPCHandler.cpp
index ff1a8a1054..dea2343f6c 100644
--- a/src/xrpld/rpc/detail/RPCHandler.cpp
+++ b/src/xrpld/rpc/detail/RPCHandler.cpp
@@ -17,8 +17,6 @@
 #include <xrpl/protocol/ErrorCodes.h>
 #include <xrpl/protocol/jss.h>
 #include <xrpl/resource/Fees.h>
-#include <xrpl/server/InfoSub.h>
-#include <xrpl/server/NetworkOPs.h>
 #include <xrpl/telemetry/SpanGuard.h>
 
 #include <atomic>
@@ -26,6 +24,7 @@
 #include <cstdint>
 #include <exception>
 #include <string>
+#include <string_view>
 
 namespace xrpl {
 using namespace telemetry;
@@ -212,10 +211,19 @@ doCommand(RPC::JsonContext& context, Json::Value& result)
     Handler const* handler = nullptr;
     if (auto error = fillHandler(context, handler))
     {
-        std::string const cmdName = context.params.isMember(jss::command)
-            ? context.params[jss::command].asString()
-            : context.params.isMember(jss::method) ? context.params[jss::method].asString()
-                                                   : "unknown";
+        std::string cmdName;
+        if (context.params.isMember(jss::command))
+        {
+            cmdName = context.params[jss::command].asString();
+        }
+        else if (context.params.isMember(jss::method))
+        {
+            cmdName = context.params[jss::method].asString();
+        }
+        else
+        {
+            cmdName = "unknown";
+        }
         auto span = SpanGuard::span(
             TraceCategory::Rpc, rpc_span::prefix::command, rpc_span::val::unknownCommand);
         span.setAttribute(rpc_span::attr::command, cmdName.c_str());
diff --git a/src/xrpld/rpc/detail/RpcSpanNames.h b/src/xrpld/rpc/detail/RpcSpanNames.h
index a8139f851a..8e88f09717 100644
--- a/src/xrpld/rpc/detail/RpcSpanNames.h
+++ b/src/xrpld/rpc/detail/RpcSpanNames.h
@@ -111,9 +111,7 @@
 
 #include <xrpl/telemetry/SpanNames.h>
 
-namespace xrpl {
-namespace telemetry {
-namespace rpc_span {
+namespace xrpl::telemetry::rpc_span {
 
 // ===== Span prefixes =======================================================
 
@@ -160,6 +158,4 @@ inline constexpr auto user = makeStr("user");
 inline constexpr auto unknownCommand = makeStr("unknown");
 }  // namespace val
 
-}  // namespace rpc_span
-}  // namespace telemetry
-}  // namespace xrpl
+}  // namespace xrpl::telemetry::rpc_span
diff --git a/src/xrpld/rpc/detail/ServerHandler.cpp b/src/xrpld/rpc/detail/ServerHandler.cpp
index 9c9b34ec6e..85454e4a29 100644
--- a/src/xrpld/rpc/detail/ServerHandler.cpp
+++ b/src/xrpld/rpc/detail/ServerHandler.cpp
@@ -8,7 +8,7 @@
 #include <xrpld/rpc/detail/RpcSpanNames.h>
 #include <xrpld/rpc/detail/Tuning.h>
 #include <xrpld/rpc/detail/WSInfoSub.h>
-#include <xrpld/rpc/json_body.h>
+#include <xrpld/rpc/json_body.h>  // IWYU pragma: keep
 
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/base64.h>