Revert "Balder/enforce override 2"

2 files changed, 10 insertions, 5 deletions

diff --git a/slobrok/src/tests/startsome/rpc_info.cpp b/slobrok/src/tests/startsome/rpc_info.cpp
index be5418ff1a8..76b578d4f88 100644
--- a/slobrok/src/tests/startsome/rpc_info.cpp
+++ b/slobrok/src/tests/startsome/rpc_info.cpp
@@ -1,7 +1,8 @@
 // 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_info");
 #include <vespa/fnet/frt/frt.h>
-#include <vespa/fastos/app.h>
 
 class RPCInfo : public FastOS_Application
 {
diff --git a/slobrok/src/tests/startsome/tstdst.cpp b/slobrok/src/tests/startsome/tstdst.cpp
index 7d3fcef8695..e2f6ae070b3 100644
--- a/slobrok/src/tests/startsome/tstdst.cpp
+++ b/slobrok/src/tests/startsome/tstdst.cpp
@@ -1,11 +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("testrpcserver");
 
 #include <vespa/vespalib/util/host_name.h>
+#include <vespa/fnet/fnet.h>
 #include <vespa/fnet/frt/frt.h>
-#include <vespa/fastos/app.h>
 
-#include <vespa/log/log.h>
-LOG_SETUP("testrpcserver");
+#include <vector>
+#include <string>
+#include <sstream>
 
 class FNET_Transport;
 class FNET_Scheduler;