Misc cleanup of includes and code health

3 files changed, 11 insertions, 1 deletions

diff --git a/logd/src/logd/rpc_forwarder.cpp b/logd/src/logd/rpc_forwarder.cpp
index ffc43bce0bb..90adf7c0b66 100644
--- a/logd/src/logd/rpc_forwarder.cpp
+++ b/logd/src/logd/rpc_forwarder.cpp
@@ -7,6 +7,10 @@
 #include <vespa/log/exceptions.h>
 #include <vespa/vespalib/util/buffer.h>
 #include <vespa/vespalib/util/stringfmt.h>
+#include <vespa/fnet/frt/rpcrequest.h>
+#include <vespa/fnet/frt/supervisor.h>
+
+
 
 #include <vespa/log/log.h>
 LOG_SETUP(".logd.rpc_forwarder");
diff --git a/logd/src/logd/rpc_forwarder.h b/logd/src/logd/rpc_forwarder.h
index 37729db088f..fbc3ecbc09a 100644
--- a/logd/src/logd/rpc_forwarder.h
+++ b/logd/src/logd/rpc_forwarder.h
@@ -5,10 +5,12 @@
 #include "forwarder.h"
 #include "proto_converter.h"
 #include <vespa/log/log_message.h>
-#include <vespa/fnet/frt/frt.h>
+#include <vespa/fnet/frt/target.h>
 #include <memory>
 #include <vector>
 
+class FRT_Supervisor;
+
 namespace logdemon {
 
 struct Metrics;
diff --git a/logd/src/tests/rpc_forwarder/rpc_forwarder_test.cpp b/logd/src/tests/rpc_forwarder/rpc_forwarder_test.cpp
index d39a9ade0a8..370ca7f458e 100644
--- a/logd/src/tests/rpc_forwarder/rpc_forwarder_test.cpp
+++ b/logd/src/tests/rpc_forwarder/rpc_forwarder_test.cpp
@@ -5,6 +5,10 @@
 #include <logd/rpc_forwarder.h>
 #include <vespa/vespalib/gtest/gtest.h>
 #include <vespa/vespalib/metrics/dummy_metrics_manager.h>
+#include <vespa/fnet/frt/supervisor.h>
+#include <vespa/fnet/frt/rpcrequest.h>
+
+
 
 using namespace logdemon;
 using vespalib::metrics::DummyMetricsManager;