Misc cleanup of includes and code health

8 files changed, 18 insertions, 15 deletions

diff --git a/config/src/apps/vespa-get-config/getconfig.cpp b/config/src/apps/vespa-get-config/getconfig.cpp
index dc12d2bbf0e..a5e400bd354 100644
--- a/config/src/apps/vespa-get-config/getconfig.cpp
+++ b/config/src/apps/vespa-get-config/getconfig.cpp
@@ -1,13 +1,13 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fnet/frt/frt.h>
+#include <vespa/fnet/frt/supervisor.h>
+#include <vespa/fnet/frt/target.h>
 #include <vespa/config/config.h>
 #include <vespa/config/frt/frtconfigrequestfactory.h>
 #include <vespa/config/frt/frtconnection.h>
 #include <vespa/config/common/payload_converter.h>
 #include <vespa/fastos/app.h>
 
-
 #include <string>
 #include <sstream>
 #include <fstream>
@@ -28,7 +28,7 @@ private:
 
 public:
     GetConfig() : _server(), _target(nullptr) {}
-    virtual ~GetConfig();
+    ~GetConfig() override;
     int usage();
     void initRPC(const char *spec);
     void finiRPC();
diff --git a/config/src/apps/vespa-ping-configproxy/pingproxy.cpp b/config/src/apps/vespa-ping-configproxy/pingproxy.cpp
index 208f9312ada..a47fd25f9af 100644
--- a/config/src/apps/vespa-ping-configproxy/pingproxy.cpp
+++ b/config/src/apps/vespa-ping-configproxy/pingproxy.cpp
@@ -1,6 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fnet/frt/frt.h>
+#include <vespa/fnet/frt/supervisor.h>
+#include <vespa/fnet/frt/target.h>
+#include <vespa/fnet/frt/rpcrequest.h>
 #include <vespa/fastos/app.h>
 
 #include <sstream>
@@ -15,12 +17,11 @@ private:
     std::unique_ptr<fnet::frt::StandaloneFRT> _server;
     FRT_Target     *_target;
 
-    PingProxy(const PingProxy &);
-    PingProxy &operator=(const PingProxy &);
-
 public:
+    PingProxy(const PingProxy &) = delete;
+    PingProxy &operator=(const PingProxy &) = delete;
     PingProxy() : _server(), _target(nullptr) {}
-    virtual ~PingProxy();
+    ~PingProxy() override ;
     int usage();
     void initRPC(const char *spec);
     void finiRPC();
diff --git a/config/src/tests/failover/failover.cpp b/config/src/tests/failover/failover.cpp
index 99b6967c929..2e039081716 100644
--- a/config/src/tests/failover/failover.cpp
+++ b/config/src/tests/failover/failover.cpp
@@ -5,7 +5,9 @@
 #include <vespa/config/frt/protocol.h>
 #include <vespa/config/config.h>
 #include <vespa/config/common/configcontext.h>
-#include <vespa/fnet/frt/frt.h>
+#include <vespa/fnet/frt/supervisor.h>
+#include <vespa/fnet/frt/rpcrequest.h>
+
 #include "config-my.h"
 #include <vespa/vespalib/data/slime/slime.h>
 #include <vespa/vespalib/data/simple_buffer.h>
diff --git a/config/src/tests/file_acquirer/file_acquirer_test.cpp b/config/src/tests/file_acquirer/file_acquirer_test.cpp
index 33bb8f47e09..da4bd71b82b 100644
--- a/config/src/tests/file_acquirer/file_acquirer_test.cpp
+++ b/config/src/tests/file_acquirer/file_acquirer_test.cpp
@@ -1,7 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/config/file_acquirer/file_acquirer.h>
-#include <vespa/fnet/frt/frt.h>
+#include <vespa/fnet/frt/supervisor.h>
+#include <vespa/fnet/frt/rpcrequest.h>
 #include <vespa/vespalib/util/stringfmt.h>
 
 using namespace config;
diff --git a/config/src/tests/frt/frt.cpp b/config/src/tests/frt/frt.cpp
index 85b9789821d..0d70605fa62 100644
--- a/config/src/tests/frt/frt.cpp
+++ b/config/src/tests/frt/frt.cpp
@@ -11,9 +11,8 @@
 #include <vespa/vespalib/data/slime/slime.h>
 #include <vespa/vespalib/data/slime/json_format.h>
 #include <vespa/vespalib/data/simple_buffer.h>
-#include <vespa/fnet/fnet.h>
-#include <vespa/fnet/frt/frt.h>
 #include <vespa/fnet/frt/error.h>
+#include <vespa/fnet/frt/supervisor.h>
 #include <vespa/config/frt/protocol.h>
 #include <lz4.h>
 #include "config-my.h"
diff --git a/config/src/vespa/config/frt/frtconfigresponsev3.cpp b/config/src/vespa/config/frt/frtconfigresponsev3.cpp
index 9635b4c811c..80cdf88a79a 100644
--- a/config/src/vespa/config/frt/frtconfigresponsev3.cpp
+++ b/config/src/vespa/config/frt/frtconfigresponsev3.cpp
@@ -1,7 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include "frtconfigresponsev3.h"
 #include "compressioninfo.h"
-#include <vespa/fnet/frt/frt.h>
+#include <vespa/fnet/frt/values.h>
 #include <vespa/vespalib/data/simple_buffer.h>
 
 #include <vespa/log/log.h>
diff --git a/config/src/vespa/config/frt/slimeconfigrequest.cpp b/config/src/vespa/config/frt/slimeconfigrequest.cpp
index 696789f74c1..8a6706974f6 100644
--- a/config/src/vespa/config/frt/slimeconfigrequest.cpp
+++ b/config/src/vespa/config/frt/slimeconfigrequest.cpp
@@ -1,12 +1,12 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include "slimeconfigrequest.h"
 #include "connection.h"
-#include <vespa/fnet/frt/frt.h>
 #include <vespa/config/common/configkey.h>
 #include <vespa/config/common/configstate.h>
 #include <vespa/config/common/configdefinition.h>
 #include <vespa/config/common/trace.h>
 #include <vespa/config/common/vespa_version.h>
+#include <vespa/fnet/frt/rpcrequest.h>
 #include <vespa/vespalib/data/simple_buffer.h>
 
 
diff --git a/config/src/vespa/config/frt/slimeconfigresponse.cpp b/config/src/vespa/config/frt/slimeconfigresponse.cpp
index 181ab58b184..155515d2ed6 100644
--- a/config/src/vespa/config/frt/slimeconfigresponse.cpp
+++ b/config/src/vespa/config/frt/slimeconfigresponse.cpp
@@ -1,7 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include "slimeconfigresponse.h"
 #include <vespa/config/common/misc.h>
-#include <vespa/fnet/frt/frt.h>
+#include <vespa/fnet/frt/values.h>
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/log/log.h>
 LOG_SETUP(".config.frt.slimeconfigresponse");