8 files changed, 41 insertions, 30 deletions
diff --git a/fnet/src/examples/frt/rpc/echo_client.cpp b/fnet/src/examples/frt/rpc/echo_client.cpp
index b5fabb32363..b5c93090566 100644
--- a/fnet/src/examples/frt/rpc/echo_client.cpp
+++ b/fnet/src/examples/frt/rpc/echo_client.cpp
@@ -1,13 +1,15 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
+
+#include <vespa/fnet/frt/frt.h>
+#include <vespa/fastos/app.h>
+
 #include <vespa/log/log.h>
 LOG_SETUP("echo_client");
-#include <vespa/fnet/frt/frt.h>
 
 class EchoClient : public FastOS_Application
 {
 public:
-    virtual int Main() override;
+    int Main() override;
 };
 
 int
diff --git a/fnet/src/examples/frt/rpc/rpc_callback_client.cpp b/fnet/src/examples/frt/rpc/rpc_callback_client.cpp
index 3dd936f7fea..b40085e3db6 100644
--- a/fnet/src/examples/frt/rpc/rpc_callback_client.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_callback_client.cpp
@@ -1,9 +1,10 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP("rpc_callback_client");
+
 #include <vespa/fnet/frt/frt.h>
+#include <vespa/fastos/app.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP("rpc_callback_client");
 
 struct RPC : public FRT_Invokable
 {
@@ -34,7 +35,7 @@ RPC::Init(FRT_Supervisor *s)
 class MyApp : public FastOS_Application
 {
 public:
-    virtual int Main() override;
+    int Main() override;
 };
 
 int
diff --git a/fnet/src/examples/frt/rpc/rpc_callback_server.cpp b/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
index 419b1266d23..1e0a595fe80 100644
--- a/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_callback_server.cpp
@@ -1,9 +1,10 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP("rpc_callback_server");
+
 #include <vespa/fnet/frt/frt.h>
+#include <vespa/fastos/app.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP("rpc_callback_server");
 
 struct RPC : public FRT_Invokable
 {
@@ -40,7 +41,7 @@ RPC::Init(FRT_Supervisor *s)
 class MyApp : public FastOS_Application
 {
 public:
-    virtual int Main() override;
+    int Main() override;
 };
 
 int
diff --git a/fnet/src/examples/frt/rpc/rpc_client.cpp b/fnet/src/examples/frt/rpc/rpc_client.cpp
index f5e5a9fe1e2..0b5be4a5510 100644
--- a/fnet/src/examples/frt/rpc/rpc_client.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_client.cpp
@@ -1,14 +1,15 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP("rpc_client");
+
 #include <vespa/fnet/frt/frt.h>
+#include <vespa/fastos/app.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP("rpc_client");
 
 class RPCClient : public FastOS_Application
 {
 public:
-    virtual int Main() override;
+    int Main() override;
 };
 
 int
diff --git a/fnet/src/examples/frt/rpc/rpc_info.cpp b/fnet/src/examples/frt/rpc/rpc_info.cpp
index 5b7aebd6bdd..841bc9228f7 100644
--- a/fnet/src/examples/frt/rpc/rpc_info.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_info.cpp
@@ -1,8 +1,10 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
+
+#include <vespa/fnet/frt/frt.h>
+#include <vespa/fastos/app.h>
+
 #include <vespa/log/log.h>
 LOG_SETUP("rpc_info");
-#include <vespa/fnet/frt/frt.h>
 
 class RPCInfo : public FastOS_Application
 {
@@ -64,7 +66,7 @@ public:
         printf("\n");
     }
 
-    virtual int Main() override;
+    int Main() override;
 };
 
 
diff --git a/fnet/src/examples/frt/rpc/rpc_invoke.cpp b/fnet/src/examples/frt/rpc/rpc_invoke.cpp
index 0f64ef9b539..d5ade794a73 100644
--- a/fnet/src/examples/frt/rpc/rpc_invoke.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_invoke.cpp
@@ -1,8 +1,10 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
+
+#include <vespa/fnet/frt/frt.h>
+#include <vespa/fastos/app.h>
+
 #include <vespa/log/log.h>
 LOG_SETUP("rpc_invoke");
-#include <vespa/fnet/frt/frt.h>
 
 class RPCClient : public FastOS_Application
 {
@@ -43,7 +45,7 @@ private:
     int run();
 
 public:
-    virtual int Main() override;
+    int Main() override;
 };
 
 int
diff --git a/fnet/src/examples/frt/rpc/rpc_proxy.cpp b/fnet/src/examples/frt/rpc/rpc_proxy.cpp
index 6c805d6a173..9527b0df6b6 100644
--- a/fnet/src/examples/frt/rpc/rpc_proxy.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_proxy.cpp
@@ -1,9 +1,10 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP("rpc_proxy");
+
 #include <vespa/fnet/frt/frt.h>
+#include <vespa/fastos/app.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP("rpc_proxy");
 //-----------------------------------------------------------------------------
 
 struct Session
@@ -68,7 +69,7 @@ private:
 
 public:
     ReqDone(RPCProxy &proxy) : _proxy(proxy) {}
-    virtual void RequestDone(FRT_RPCRequest *req) override;
+    void RequestDone(FRT_RPCRequest *req) override;
 };
 
 void
@@ -209,7 +210,7 @@ RPCProxy::HOOK_Fini(FRT_RPCRequest *req)
 class App : public FastOS_Application
 {
 public:
-    virtual int Main() override;
+    int Main() override;
 };
 
 int
diff --git a/fnet/src/examples/frt/rpc/rpc_server.cpp b/fnet/src/examples/frt/rpc/rpc_server.cpp
index 823d3c893b1..b05fe15f663 100644
--- a/fnet/src/examples/frt/rpc/rpc_server.cpp
+++ b/fnet/src/examples/frt/rpc/rpc_server.cpp
@@ -1,9 +1,10 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP("rpc_server");
+
 #include <vespa/fnet/frt/frt.h>
+#include <vespa/fastos/app.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP("rpc_server");
 
 class RPCServer : public FRT_Invokable
 {
@@ -107,7 +108,7 @@ private:
 
 public:
     App() : _server() {}
-    virtual int Main() override;
+    int Main() override;
 };
 
 int