Misc cleanup of includes and code health

2 files changed, 3 insertions, 2 deletions

diff --git a/configd/src/apps/sentinel/cmdq.cpp b/configd/src/apps/sentinel/cmdq.cpp
index 8fa3726c7f6..489ae97228f 100644
--- a/configd/src/apps/sentinel/cmdq.cpp
+++ b/configd/src/apps/sentinel/cmdq.cpp
@@ -1,7 +1,7 @@
 // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "cmdq.h"
-#include <vespa/fnet/frt/frt.h>
+#include <vespa/fnet/frt/rpcrequest.h>
 
 namespace config::sentinel {
 
diff --git a/configd/src/apps/sentinel/rpchooks.cpp b/configd/src/apps/sentinel/rpchooks.cpp
index 99bcd404402..aef58b8a1dc 100644
--- a/configd/src/apps/sentinel/rpchooks.cpp
+++ b/configd/src/apps/sentinel/rpchooks.cpp
@@ -2,7 +2,8 @@
 
 #include "rpchooks.h"
 #include "cmdq.h"
-#include <vespa/fnet/frt/frt.h>
+#include <vespa/fnet/frt/supervisor.h>
+#include <vespa/fnet/frt/rpcrequest.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".rpchooks");