misc cleanup from Baldersheim

* include file cleanup
* only do LOG_SETUP as needed
* remove "virtual" where "override" is specified also
* some minor reformatting and indentation changes

43 files changed, 153 insertions, 338 deletions

diff --git a/configd/src/tests/messages/messages.cpp b/configd/src/tests/messages/messages.cpp
index 46fa229ff29..a8b2e37af36 100644
--- a/configd/src/tests/messages/messages.cpp
+++ b/configd/src/tests/messages/messages.cpp
@@ -1,8 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/log/log.h>
-#include <vespa/vespalib/testkit/testapp.h>
 
-LOG_SETUP("messages_test");
+#include <vespa/vespalib/testkit/testapp.h>
 
 class MessagesTest : public vespalib::TestApp
 {
diff --git a/fastlib/src/vespa/fastlib/io/fileinputstream.h b/fastlib/src/vespa/fastlib/io/fileinputstream.h
index 08806f1d19d..045fc61500f 100644
--- a/fastlib/src/vespa/fastlib/io/fileinputstream.h
+++ b/fastlib/src/vespa/fastlib/io/fileinputstream.h
@@ -1,39 +1,10 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
-*******************************************************************************
-*
-* @author          Stein Hardy Danielsen
-* @date            Creation date: 2000-10-07
-* @version         $Id$
-*
-* @file
-*
-* FileInputStream class
-*
-* Copyright (c)  : 1997-2000 Fast Search & Transfer ASA
-*                  ALL RIGHTS RESERVED
-*
-******************************************************************************/
-#pragma once
-
-#include <vespa/fastlib/io/inputstream.h>
-
 
+#pragma once
 
+#include "inputstream.h"
+#include <vespa/fastos/file.h>
 
-/**
-********************************************************************************
-*
-* FileInputStream class
-* @author          Stein Hardy Danielsen
-* @date            Creation date: 2000-10-07
-* @version         $Id$
-*
-*
-* Copyright (c)  : 1997-2000 Fast Search & Transfer ASA
-*                  ALL RIGHTS RESERVED
-*
-******************************************************************************/
 class Fast_FileInputStream  : public Fast_InputStream
 {
 private:
@@ -48,21 +19,16 @@ private:
     /** File opened ok flag */
     bool  _fileOpenedOk;
 
-
   public:
-
-    /** Constructor */
     Fast_FileInputStream(const char *fileName);
-
-    /** Destructor */
-    virtual ~Fast_FileInputStream(void);
+    ~Fast_FileInputStream();
 
     // Implementation of Fast_InputStream interface
 
-    virtual ssize_t Read(void *targetBuffer, size_t bufferSize);
-    virtual bool Close();
-    virtual ssize_t Available();
-    virtual ssize_t Skip(size_t);
+    ssize_t Read(void *targetBuffer, size_t bufferSize) override;
+    bool Close() override;
+    ssize_t Available() override;
+    ssize_t Skip(size_t) override;
 };
 
 
diff --git a/fastlib/src/vespa/fastlib/io/inputstream.h b/fastlib/src/vespa/fastlib/io/inputstream.h
index 22f65eb95c3..d7b443d28ee 100644
--- a/fastlib/src/vespa/fastlib/io/inputstream.h
+++ b/fastlib/src/vespa/fastlib/io/inputstream.h
@@ -6,11 +6,10 @@
 class Fast_InputStream
 {
   public:
-
     virtual ~Fast_InputStream() { }
 
-    virtual ssize_t Available(void) = 0;
-    virtual bool    Close(void) = 0;
+    virtual ssize_t Available() = 0;
+    virtual bool    Close() = 0;
     virtual ssize_t Read(void *targetBuffer, size_t bufferSize) = 0;
     virtual ssize_t Skip(size_t skipNBytes) = 0;
 };
diff --git a/fastlib/src/vespa/fastlib/net/tests/httpheaderparsertest.cpp b/fastlib/src/vespa/fastlib/net/tests/httpheaderparsertest.cpp
index 6c355b78aa1..5c8f8d4d8f2 100644
--- a/fastlib/src/vespa/fastlib/net/tests/httpheaderparsertest.cpp
+++ b/fastlib/src/vespa/fastlib/net/tests/httpheaderparsertest.cpp
@@ -1,17 +1,13 @@
 // 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/fastos/app.h>
 #include <vespa/fastlib/net/httpheaderparser.h>
 #include <vespa/fastlib/io/fileinputstream.h>
 #include <vespa/fastlib/io/bufferedinputstream.h>
 
-
-
-
 class HeaderReaderApp : public FastOS_Application
 {
   public:
-
-    int Main(void) override
+    int Main() override
     {
       if (_argc != 2)
       {
diff --git a/fastlib/src/vespa/fastlib/text/tests/latintokenizertest.h b/fastlib/src/vespa/fastlib/text/tests/latintokenizertest.h
index 36477f6b010..082ab62a75e 100644
--- a/fastlib/src/vespa/fastlib/text/tests/latintokenizertest.h
+++ b/fastlib/src/vespa/fastlib/text/tests/latintokenizertest.h
@@ -4,7 +4,7 @@
 #include <vespa/fastlib/testsuite/test.h>
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/vespalib/util/stringfmt.h>
-#include "../latintokenizer.h"
+#include <vespa/fastlib/text/latintokenizer.h>
 
 class Mapel_Pucntuation {
 private:
@@ -142,10 +142,9 @@ private:
   void TestTypeparamObservers();
 
 public:
-  LatinTokenizerTest();
-  virtual ~LatinTokenizerTest();
-
-  virtual void Run() override;
+    LatinTokenizerTest();
+    ~LatinTokenizerTest();
+    void Run() override;
 };
 
 
@@ -459,7 +458,7 @@ void LatinTokenizerTest::Run()
 class LatinTokenizerTestApp : public FastOS_Application
 {
 public:
-  virtual int Main() override;
+    int Main() override;
 };
 
 
diff --git a/fastlib/src/vespa/fastlib/text/tests/unicodeutiltest.cpp b/fastlib/src/vespa/fastlib/text/tests/unicodeutiltest.cpp
index b3bb709def9..98860410eef 100644
--- a/fastlib/src/vespa/fastlib/text/tests/unicodeutiltest.cpp
+++ b/fastlib/src/vespa/fastlib/text/tests/unicodeutiltest.cpp
@@ -1,5 +1,4 @@
 // 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 "unicodeutiltest.h"
 
 int UnicodeUtilTestApp::Main()
diff --git a/fastlib/src/vespa/fastlib/text/tests/unicodeutiltest.h b/fastlib/src/vespa/fastlib/text/tests/unicodeutiltest.h
index 28f1323384f..a18728c51a9 100644
--- a/fastlib/src/vespa/fastlib/text/tests/unicodeutiltest.h
+++ b/fastlib/src/vespa/fastlib/text/tests/unicodeutiltest.h
@@ -1,7 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/fastlib/testsuite/test.h>
-
-#include "../unicodeutil.h"
+#include <vespa/fastlib/text/unicodeutil.h>
+#include <vespa/fastos/app.h>
 
 class UnicodeUtilTest : public Test
 {
@@ -40,15 +40,15 @@ class UnicodeUtilTest : public Test
   }
 
 public:
-  virtual void Run() override {
-    // do the tests
-    _test(GetUTF8Char_WrongInput());
-    _test(IsTerminalPunctuationChar());
-  }
+    void Run() override {
+        // do the tests
+        _test(GetUTF8Char_WrongInput());
+        _test(IsTerminalPunctuationChar());
+    }
 };
 
 class UnicodeUtilTestApp : public FastOS_Application
 {
 public:
-  virtual int Main() override;
+    int Main() override;
 };
diff --git a/fastlib/src/vespa/fastlib/text/tests/wordfolderstest.h b/fastlib/src/vespa/fastlib/text/tests/wordfolderstest.h
index 3c18be1d552..c4eb6867dbd 100644
--- a/fastlib/src/vespa/fastlib/text/tests/wordfolderstest.h
+++ b/fastlib/src/vespa/fastlib/text/tests/wordfolderstest.h
@@ -1,9 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <memory>
 #include <vespa/fastlib/testsuite/test.h>
-
-#include "../wordfolder.h"
-#include "../normwordfolder.h"
+#include <vespa/fastlib/text/normwordfolder.h>
 
 class WordFoldersTest : public Test
 {
@@ -115,17 +112,18 @@ class WordFoldersTest : public Test
 
 
 public:
-  virtual void Run() override {
-    // do the tests
-    _test(NormalizeWordFolderConstruction());
-    _test(TokenizeAnnotatedBuffer());
-    _test(TokenizeAnnotatedUCS4Buffer());
-    _test(AccentRemovalTest());
-  }
+
+    void Run() override {
+        // do the tests
+        _test(NormalizeWordFolderConstruction());
+        _test(TokenizeAnnotatedBuffer());
+        _test(TokenizeAnnotatedUCS4Buffer());
+        _test(AccentRemovalTest());
+    }
 };
 
 class WordFoldersTestApp : public FastOS_Application
 {
 public:
-  virtual int Main() override;
+    int Main() override;
 };
diff --git a/fastlib/src/vespa/fastlib/util/tests/bagtest.h b/fastlib/src/vespa/fastlib/util/tests/bagtest.h
index 7ca33f318f0..597317bf38e 100644
--- a/fastlib/src/vespa/fastlib/util/tests/bagtest.h
+++ b/fastlib/src/vespa/fastlib/util/tests/bagtest.h
@@ -1,10 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <iostream>
-
 #include <vespa/fastlib/util/bag.h>
-
 #include <vespa/fastlib/testsuite/test.h>
+#include <iostream>
 
 /**
 
@@ -527,37 +525,30 @@ public:
     delete[] _array;
   }
 
-
-
-  virtual void Run() override {
-    RunTest(&BagTester::IterPtrInitTest);
-    RunTest(&BagTester::IterRefInitTest);
-    RunTest(&BagTester::IterPtrStartTest);
-    RunTest(&BagTester::IterRefStartTest);
-    RunTest(&BagTester::IterStartOverTest);
-    RunTest(&BagTester::IterPPOperTest);
-    RunTest(&BagTester::GrowTest);
-    RunTest(&BagTester::AssignTest);
-    RunTest(&BagTester::CopyConstTest);
-    RunTest(&BagTester::EqualTest);
-    RunTest(&BagTester::DeleteEnumTest);
-    RunTest(&BagTester::RemoveTest);
-    RunTest(&BagTester::HasElementTest);
-    RunTest(&BagTester::RemoveAllElementsTest);
-    RunTest(&BagTester::GetBlocksizeTest);
-    RunTest(&BagTester::SetBlocksizeTest);
-    RunTest(&BagTester::NumberOfElementsTest);
-  }
-
-
+    void Run() override {
+        RunTest(&BagTester::IterPtrInitTest);
+        RunTest(&BagTester::IterRefInitTest);
+        RunTest(&BagTester::IterPtrStartTest);
+        RunTest(&BagTester::IterRefStartTest);
+        RunTest(&BagTester::IterStartOverTest);
+        RunTest(&BagTester::IterPPOperTest);
+        RunTest(&BagTester::GrowTest);
+        RunTest(&BagTester::AssignTest);
+        RunTest(&BagTester::CopyConstTest);
+        RunTest(&BagTester::EqualTest);
+        RunTest(&BagTester::DeleteEnumTest);
+        RunTest(&BagTester::RemoveTest);
+        RunTest(&BagTester::HasElementTest);
+        RunTest(&BagTester::RemoveAllElementsTest);
+        RunTest(&BagTester::GetBlocksizeTest);
+        RunTest(&BagTester::SetBlocksizeTest);
+        RunTest(&BagTester::NumberOfElementsTest);
+    }
 
 };
 
 class BagTest : public FastOS_Application
 {
 public:
-
-  virtual int Main() override;
+    int Main() override;
 };
-
-
diff --git a/fastlib/src/vespa/fastlib/util/tests/base64test.cpp b/fastlib/src/vespa/fastlib/util/tests/base64test.cpp
index 970f87831b1..92cc2fee719 100644
--- a/fastlib/src/vespa/fastlib/util/tests/base64test.cpp
+++ b/fastlib/src/vespa/fastlib/util/tests/base64test.cpp
@@ -1,14 +1,12 @@
 // 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 <stdio.h>
-#include <assert.h>
-#include <memory>
+#include <vespa/fastos/app.h>
+#include <vespa/fastos/file.h>
 #include <vespa/vespalib/stllike/string.h>
-#include "../base64.h"
+#include <vespa/fastlib/util/base64.h>
 
 class Base64Test : public FastOS_Application {
 public:
-  virtual int Main() override;
+    int Main() override;
 };
 
 int
diff --git a/filedistribution/src/tests/filedownloader/testfiledownloader.cpp b/filedistribution/src/tests/filedownloader/testfiledownloader.cpp
index 56a664ea7e1..9bf96abc1eb 100644
--- a/filedistribution/src/tests/filedownloader/testfiledownloader.cpp
+++ b/filedistribution/src/tests/filedownloader/testfiledownloader.cpp
@@ -2,7 +2,6 @@
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MAIN
 
-#include <vespa/fastos/fastos.h>
 #include <vespa/filedistribution/distributor/filedownloader.h>
 #include <vespa/filedistribution/distributor/filedistributortrackerimpl.h>
 
@@ -12,12 +11,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 
-#include <libtorrent/session.hpp>
-#include <libtorrent/tracker_manager.hpp>
-#include <libtorrent/torrent.hpp>
-
 #include <vespa/filedistribution/manager/createtorrent.h>
-#include <vespa/filedistribution/model/filedistributionmodel.h>
 #include <vespa/filedistribution/common/componentsdeleter.h>
 
 namespace fs = boost::filesystem;
@@ -47,16 +41,16 @@ createDownloader(ComponentsDeleter& deleter,
 } //anonymous namespace
 
 class MockFileDistributionModel : public FileDistributionModel {
-    virtual FileDBModel& getFileDBModel() override {
+    FileDBModel& getFileDBModel() override {
         abort();
     }
 
-    virtual std::set<std::string> getFilesToDownload() override {
+    std::set<std::string> getFilesToDownload() override {
         return std::set<std::string>();
     }
 
-    virtual PeerEntries getPeers(const std::string&, size_t) override {
-        PeerEntries peers(2);
+    PeerEntries getPeers(const std::string& , size_t) override {
+         PeerEntries peers(2);
         peers[0].ip = localHost;
         peers[0].port = uploaderPort;
 
@@ -66,9 +60,9 @@ class MockFileDistributionModel : public FileDistributionModel {
         return peers;
     }
 
-    virtual void addPeer(const std::string&) override {}
-    virtual void removePeer(const std::string&) override {}
-    virtual void peerFinished(const std::string&) override {}
+    void addPeer(const std::string&) override {}
+    void removePeer(const std::string&) override {}
+    void peerFinished(const std::string&) override {}
 };
 
 
diff --git a/filedistribution/src/tests/rpc/mockfileprovider.h b/filedistribution/src/tests/rpc/mockfileprovider.h
index 33177d939c1..fd66acfb0fc 100644
--- a/filedistribution/src/tests/rpc/mockfileprovider.h
+++ b/filedistribution/src/tests/rpc/mockfileprovider.h
@@ -32,7 +32,6 @@ public:
         downloadCompleted()(fileReference, "downloaded/path/" + fileReference);
     }
 
-    //Overrides
     DownloadCompletedSignal& downloadCompleted() override {
         return _downloadCompleted;
     }
diff --git a/filedistribution/src/tests/scheduler/test-scheduler.cpp b/filedistribution/src/tests/scheduler/test-scheduler.cpp
index 5be60569449..1ce5cbb9bc2 100644
--- a/filedistribution/src/tests/scheduler/test-scheduler.cpp
+++ b/filedistribution/src/tests/scheduler/test-scheduler.cpp
@@ -1,7 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MAIN
-#include <vespa/fastos/fastos.h>
+
 #include <boost/test/unit_test.hpp>
 
 #include <vespa/filedistribution/distributor/scheduler.h>
@@ -9,7 +9,6 @@
 #include <iostream>
 
 #include <boost/thread/barrier.hpp>
-#include <thread>
 
 using filedistribution::Scheduler;
 using namespace std::literals;
diff --git a/filedistribution/src/tests/zkfacade/test-zkfacade.cpp b/filedistribution/src/tests/zkfacade/test-zkfacade.cpp
index 46db660d452..51a3f0b40e3 100644
--- a/filedistribution/src/tests/zkfacade/test-zkfacade.cpp
+++ b/filedistribution/src/tests/zkfacade/test-zkfacade.cpp
@@ -2,14 +2,10 @@
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE zkfacade test
-#include <vespa/fastos/fastos.h>
-#include <boost/test/unit_test.hpp>
 
+#include <boost/test/unit_test.hpp>
 #include <iostream>
-
 #include <boost/thread/barrier.hpp>
-#include <boost/checked_delete.hpp>
-
 #include <vespa/filedistribution/common/componentsdeleter.h>
 #include <vespa/filedistribution/model/zkfacade.h>
 
diff --git a/filedistribution/src/vespa/filedistribution/distributor/filedistributortrackerimpl.cpp b/filedistribution/src/vespa/filedistribution/distributor/filedistributortrackerimpl.cpp
index 1db2f7c6e49..9906074afc5 100644
--- a/filedistribution/src/vespa/filedistribution/distributor/filedistributortrackerimpl.cpp
+++ b/filedistribution/src/vespa/filedistribution/distributor/filedistributortrackerimpl.cpp
@@ -1,13 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "filedistributortrackerimpl.h"
-#include <cmath>
-#include <libtorrent/tracker_manager.hpp>
-#include <libtorrent/torrent.hpp>
-#include <vespa/filedistribution/model/filedistributionmodel.h>
-#include <vespa/filedistribution/model/zkfacade.h>
 #include "filedownloader.h"
-#include "hostname.h"
+#include <vespa/filedistribution/model/zkfacade.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".filedistributiontrackerimpl");
diff --git a/filedistribution/src/vespa/filedistribution/model/filedistributionmodelimpl.cpp b/filedistribution/src/vespa/filedistribution/model/filedistributionmodelimpl.cpp
index 0288f3082f8..3b4d043a30b 100644
--- a/filedistribution/src/vespa/filedistribution/model/filedistributionmodelimpl.cpp
+++ b/filedistribution/src/vespa/filedistribution/model/filedistributionmodelimpl.cpp
@@ -1,22 +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 "filedistributionmodel.h"
-
-#include <vector>
-#include <set>
-#include <string>
-#include <cstdlib>
 
+#include "filedistributionmodel.h"
+#include "zkfiledbmodel.h"
+#include "deployedfilestodownload.h"
+#include "filedistributionmodelimpl.h"
 #include <boost/filesystem.hpp>
 #include <zookeeper/zookeeper.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".filedistributionmodel");
 
-#include "zkfiledbmodel.h"
-#include "deployedfilestodownload.h"
-#include "filedistributionmodelimpl.h"
-
 namespace fs = boost::filesystem;
 
 using filedistribution::ZKFileDBModel;
diff --git a/filedistribution/src/vespa/filedistribution/model/filedistributionmodelimpl.h b/filedistribution/src/vespa/filedistribution/model/filedistributionmodelimpl.h
index e132ec8b230..4b2b14ea21f 100644
--- a/filedistribution/src/vespa/filedistribution/model/filedistributionmodelimpl.h
+++ b/filedistribution/src/vespa/filedistribution/model/filedistributionmodelimpl.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include "filedistributionmodel.h"
-#include <vespa/filedistribution/model/config-filereferences.h>
+#include "config-filereferences.h"
 #include "zkfacade.h"
 #include "zkfiledbmodel.h"
 #include <vespa/config/config.h>
diff --git a/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp b/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp
index 75defdc3881..19ebdb253a3 100644
--- a/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp
+++ b/jrt_test/src/jrt-test/simpleserver/simpleserver.cpp
@@ -1,9 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/log/log.h>
-LOG_SETUP("simpleserver");
-#include <vespa/fastos/fastos.h>
-#include <vespa/fnet/frt/frt.h>
 
+#include <vespa/fnet/frt/frt.h>
+#include <vespa/fastos/app.h>
 
 class Server : public FRT_Invokable
 {
diff --git a/jrt_test/src/tests/echo/echo-client.cpp b/jrt_test/src/tests/echo/echo-client.cpp
index 2d72cdc937b..14faac3ca9e 100644
--- a/jrt_test/src/tests/echo/echo-client.cpp
+++ b/jrt_test/src/tests/echo/echo-client.cpp
@@ -1,8 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/log/log.h>
-LOG_SETUP("echo_client");
-#include <vespa/fastos/fastos.h>
+
 #include <vespa/fnet/frt/frt.h>
+#include <vespa/fastos/app.h>
 
 class EchoClient : public FastOS_Application
 {
diff --git a/jrt_test/src/tests/mandatory-methods/extract-reflection.cpp b/jrt_test/src/tests/mandatory-methods/extract-reflection.cpp
index 98584e9a284..9857ea073c2 100644
--- a/jrt_test/src/tests/mandatory-methods/extract-reflection.cpp
+++ b/jrt_test/src/tests/mandatory-methods/extract-reflection.cpp
@@ -1,6 +1,6 @@
 // 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/fastos/app.h>
 #include <vespa/fnet/frt/frt.h>
 
 class RPCInfo : public FastOS_Application
diff --git a/jrt_test/src/tests/mockup-invoke/mockup-server.cpp b/jrt_test/src/tests/mockup-invoke/mockup-server.cpp
index 46a1e2bc11a..41624eaf108 100644
--- a/jrt_test/src/tests/mockup-invoke/mockup-server.cpp
+++ b/jrt_test/src/tests/mockup-invoke/mockup-server.cpp
@@ -1,9 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/log/log.h>
-LOG_SETUP("mockup_server");
-#include <vespa/fastos/fastos.h>
-#include <vespa/fnet/frt/frt.h>
 
+#include <vespa/fnet/frt/frt.h>
+#include <vespa/fastos/app.h>
 
 class MockupServer : public FRT_Invokable
 {
diff --git a/jrt_test/src/tests/rpc-error/test-errors.cpp b/jrt_test/src/tests/rpc-error/test-errors.cpp
index 07ff7425f9a..184e733da82 100644
--- a/jrt_test/src/tests/rpc-error/test-errors.cpp
+++ b/jrt_test/src/tests/rpc-error/test-errors.cpp
@@ -2,7 +2,6 @@
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/fnet/frt/frt.h>
 
-
 class TestErrors : public vespalib::TestApp
 {
 private:
diff --git a/juniper/src/test/SrcTestSuite.cpp b/juniper/src/test/SrcTestSuite.cpp
index f73e4c8fc3a..4a648e6af19 100644
--- a/juniper/src/test/SrcTestSuite.cpp
+++ b/juniper/src/test/SrcTestSuite.cpp
@@ -1,29 +1,12 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
- * Implementation of the test suite application SrcTestSuite.
- *
- * @file SrcTestSuite.cpp
- *
- * @author Knut Omang
- *
- * @date Created 21 Feb 2003
- *
- * $Id$
- *
- * <pre>
- *              Copyright (c) : 2003 Fast Search & Transfer ASA
- *                              ALL RIGHTS RESERVED
- * </pre>
- ****************************************************************************/
-#include <vespa/fastos/fastos.h>
-#include <vespa/vespalib/testkit/testapp.h>
-#include <vespa/fastlib/testsuite/suite.h>
+
 #include "testenv.h"
 #include "mcandTest.h"
 #include "queryparserTest.h"
 #include "matchobjectTest.h"
 #include "auxTest.h"
-
+#include <vespa/vespalib/testkit/testapp.h>
+#include <vespa/fastlib/testsuite/suite.h>
 /**
  * The SrcTestSuite class runs all the unit tests for the src module.
  *
@@ -53,7 +36,7 @@ SrcTestSuite::SrcTestSuite() :
  */
 class SrcTestSuiteApp : public vespalib::TestApp {
 public:
-    virtual int Main() override;
+    int Main() override;
 };
 
 int SrcTestSuiteApp::Main() {
diff --git a/juniper/src/test/auxTest.cpp b/juniper/src/test/auxTest.cpp
index 2dc3457e6c3..349792ed723 100644
--- a/juniper/src/test/auxTest.cpp
+++ b/juniper/src/test/auxTest.cpp
@@ -1,9 +1,9 @@
 // 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("");
 
 #include "auxTest.h"
+#include <vespa/fastos/file.h>
+#include <vespa/log/log.h>
+LOG_SETUP(".auxtest");
 
 // Using separator definitions only from here:
 
@@ -560,7 +560,7 @@ void AuxTest::test_summary(Matcher& m, const char* content, size_t content_len,
 class DefProps : public IJuniperProperties
 {
 public:
-    virtual const char* GetProperty(const char*, const char* def) override {
+    const char* GetProperty(const char*, const char* def) override {
         return def;
     }
 };
@@ -626,12 +626,12 @@ public:
     TokenChecker(Token* output) : _out(output), i(0)
     {  }
 
-    virtual void handle_token(Token& token) override {
+    void handle_token(Token& token) override {
         _out[i] = token;
         i++;
     }
 
-    virtual void handle_end(Token&) override {}
+    void handle_end(Token&) override {}
 };
 
 
@@ -670,13 +670,13 @@ private:
     std::vector<std::string> _tokens;
 public:
     TokenProcessor(const std::string & text) : _text(text), _tokens() {}
-    virtual void handle_token(Token & t) override {
+    void handle_token(Token & t) override {
         _tokens.push_back(std::string(_text.c_str() + t.bytepos, t.bytelen));
         //LOG(info, "handle_token(%s): bytepos(%d), wordpos(%d), bytelen(%d), curlen(%d)",
             //_tokens.back().c_str(),
             //(int)t.bytepos, (int)t.wordpos, t.bytelen, t.curlen);
     }
-    virtual void handle_end(Token & t) override {
+    void handle_end(Token & t) override {
         _tokens.push_back(std::string(_text.c_str() + t.bytepos, t.bytelen));
         //LOG(info, "handle_end(%s): bytepos(%d), wordpos(%d), bytelen(%d), curlen(%d)",
             //_tokens.back().c_str(),
diff --git a/juniper/src/test/auxTest.h b/juniper/src/test/auxTest.h
index 218dcaab6d0..a98adc732f4 100644
--- a/juniper/src/test/auxTest.h
+++ b/juniper/src/test/auxTest.h
@@ -7,7 +7,6 @@
 #include <vespa/fastlib/testsuite/test.h>
 #include "testenv.h"
 
-
 class AuxTest : public Test
 {
 private:
@@ -25,14 +24,14 @@ public:
     void Run(MethodContainer::iterator &itr);
     void Run(const char* method);
     void Run(int argc, char* argv[]);
-    virtual void Run() override;
+    void Run() override;
 protected:
     /**
      * Since we are running within Emacs, the default behavior of
      * print_progress which includes backspace does not work.
      * We'll use a single '.' instead.
      */
-    virtual void print_progress() override { *m_osptr << '.' << std::flush; }
+    void print_progress() override { *m_osptr << '.' << std::flush; }
 private:
     // tests:
     void TestPropertyMap();
diff --git a/juniper/src/test/auxTestApp.cpp b/juniper/src/test/auxTestApp.cpp
index 3f43c706d35..a9475998aa4 100644
--- a/juniper/src/test/auxTestApp.cpp
+++ b/juniper/src/test/auxTestApp.cpp
@@ -1,12 +1,11 @@
 // 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/vespalib/testkit/testapp.h>
 #include "auxTest.h"
+#include <vespa/vespalib/testkit/testapp.h>
 
 class AuxTestApp : public vespalib::TestApp
 {
 public:
-    virtual int Main() override;
+    int Main() override;
 };
 
 
diff --git a/juniper/src/test/fakerewriter.h b/juniper/src/test/fakerewriter.h
index 0a0554f76fc..cf78fd28255 100644
--- a/juniper/src/test/fakerewriter.h
+++ b/juniper/src/test/fakerewriter.h
@@ -8,10 +8,10 @@ class FakeRewriter: public juniper::IRewriter
 {
 public:
     FakeRewriter() : _name() {}
-    virtual const char* Name() const override;
-    virtual juniper::RewriteHandle* Rewrite(uint32_t langid, const char* term) override;
-    virtual juniper::RewriteHandle* Rewrite(uint32_t langid, const char* term, size_t length) override;
-    virtual const char* NextTerm(juniper::RewriteHandle* exp, size_t& length) override;
+    const char* Name() const override;
+    juniper::RewriteHandle* Rewrite(uint32_t langid, const char* term) override;
+    juniper::RewriteHandle* Rewrite(uint32_t langid, const char* term, size_t length) override;
+    const char* NextTerm(juniper::RewriteHandle* exp, size_t& length) override;
 private:
     std::string _name;
 };
diff --git a/juniper/src/test/matchobjectTest.h b/juniper/src/test/matchobjectTest.h
index 9e0828cfa77..0f4a1ace55b 100644
--- a/juniper/src/test/matchobjectTest.h
+++ b/juniper/src/test/matchobjectTest.h
@@ -17,9 +17,9 @@
  ***************************************************************************/
 #pragma once
 
-#include <map>
-#include <vespa/fastlib/testsuite/test.h>
 #include "testenv.h"
+#include <vespa/fastlib/testsuite/test.h>
+#include <map>
 
 /**
  * The MatchObjectTest class holds
@@ -98,8 +98,7 @@ protected:
      * print_progress which includes backspace does not work.
      * We'll use a single '.' instead.
      */
-    virtual void print_progress() override { *m_osptr << '.' << std::flush; }
-
+    void print_progress() override { *m_osptr << '.' << std::flush; }
 public:
 
     MatchObjectTest() : Test("MatchObject"), test_methods_() { init(); }
@@ -109,7 +108,7 @@ public:
      *                         main entry points
      *************************************************************************/
     void Run(MethodContainer::iterator &itr);
-    virtual void Run() override;
+    void Run() override;
     void Run(const char *method);
     void Run(int argc, char* argv[]);
 };
diff --git a/juniper/src/test/matchobjectTestApp.cpp b/juniper/src/test/matchobjectTestApp.cpp
index 065af199589..f755c3e932a 100644
--- a/juniper/src/test/matchobjectTestApp.cpp
+++ b/juniper/src/test/matchobjectTestApp.cpp
@@ -1,25 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
- * Definition and implementation of the application for running unit tests
- * for the MatchObject class in isolation.
- *
- * @file matchobjectTestApp.cpp
- *
- * @author Knut Omang
- *
- * @date Created 21 Feb 2003
- *
- * $Id$
- *
- * <pre>
- *              Copyright (c) : 2003 Fast Search & Transfer ASA
- *                              ALL RIGHTS RESERVED
- * </pre>
- ****************************************************************************/
-#include <vespa/fastos/fastos.h>
-#include <vespa/vespalib/testkit/testapp.h>
+
 #include "matchobjectTest.h"
 #include "testenv.h"
+#include <vespa/vespalib/testkit/testapp.h>
 
 /**
  * The MatchObjectTestApp class is the main routine for running the unit
@@ -29,7 +12,7 @@
  */
 class MatchObjectTestApp : public vespalib::TestApp {
 public:
-    virtual int Main() override {
+    int Main() override {
         juniper::TestEnv te(this, TEST_PATH("../rpclient/testclient.rc").c_str());
         MatchObjectTest test;
         test.SetStream(&std::cout);
diff --git a/juniper/src/test/mcandTest.cpp b/juniper/src/test/mcandTest.cpp
index b185707c1be..7f7d7d42100 100644
--- a/juniper/src/test/mcandTest.cpp
+++ b/juniper/src/test/mcandTest.cpp
@@ -16,11 +16,11 @@
  *                              ALL RIGHTS RESERVED
  * </pre>
  ***************************************************************************/
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP("");
+
 #include "mcandTest.h"
-#include "testenv.h"
+
+#include <vespa/log/log.h>
+LOG_SETUP(".mcandtest");
 
 // Comment out cerr below to ignore unimplemented tests
 #define NOTEST(name) \
@@ -405,13 +405,13 @@ struct MyTokenProcessor : public ITokenProcessor
     Matcher &_m;
     std::vector<size_t> _cands;
     MyTokenProcessor(Matcher &m) : _m(m), _cands() {}
-    virtual void handle_token(Token &token) override {
+    void handle_token(Token &token) override {
         _m.handle_token(token);
         const match_sequence *ms = _m.GetWorkSet();
         _cands.push_back(ms[0].size());
         LOG(info, "match_sequence[0].size(%zu)", _cands.back());
     }
-    virtual void handle_end(Token &token) override {
+    void handle_end(Token &token) override {
         _m.handle_end(token);
     }
 };
diff --git a/juniper/src/test/mcandTest.h b/juniper/src/test/mcandTest.h
index 754c18ee9dd..3fc32ee9f5d 100644
--- a/juniper/src/test/mcandTest.h
+++ b/juniper/src/test/mcandTest.h
@@ -196,7 +196,7 @@ protected:
      * print_progress which includes backspace does not work.
      * We'll use a single '.' instead.
      */
-    virtual void print_progress() override { *m_osptr << '.' << std::flush; }
+    void print_progress() override { *m_osptr << '.' << std::flush; }
 
 public:
 
@@ -207,7 +207,7 @@ public:
      *                         main entry points
      *************************************************************************/
     void Run(MethodContainer::iterator &itr);
-    virtual void Run() override;
+    void Run() override;
     void Run(const char *method);
     void Run(int argc, char* argv[]);
 };
diff --git a/juniper/src/test/mcandTestApp.cpp b/juniper/src/test/mcandTestApp.cpp
index 8a93c14cfc9..cb33e503bb5 100644
--- a/juniper/src/test/mcandTestApp.cpp
+++ b/juniper/src/test/mcandTestApp.cpp
@@ -1,25 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
- * Definition and implementation of the application for running unit tests
- * for the MatchCandidate class in isolation.
- *
- * @file mcandTestApp.cpp
- *
- * @author Knut Omang
- *
- * @date Created 27 Feb 2003
- *
- * $Id$
- *
- * <pre>
- *              Copyright (c) : 2003 Fast Search & Transfer ASA
- *                              ALL RIGHTS RESERVED
- * </pre>
- ****************************************************************************/
-#include <vespa/fastos/fastos.h>
-#include <vespa/vespalib/testkit/testapp.h>
+
 #include "mcandTest.h"
-#include "testenv.h"
+#include <vespa/vespalib/testkit/testapp.h>
 
 /**
  * The MatchCandidateTestApp class is the main routine for running the unit
@@ -29,7 +11,7 @@
  */
 class MatchCandidateTestApp : public vespalib::TestApp {
 public:
-    virtual int Main() override {
+    int Main() override {
         juniper::TestEnv te(this, TEST_PATH("../rpclient/testclient.rc").c_str());
         MatchCandidateTest test;
         test.SetStream(&std::cout);
diff --git a/juniper/src/test/queryparserTest.h b/juniper/src/test/queryparserTest.h
index b4f464f7592..d868fca659e 100644
--- a/juniper/src/test/queryparserTest.h
+++ b/juniper/src/test/queryparserTest.h
@@ -17,11 +17,11 @@
  ***************************************************************************/
 #pragma once
 
-#include <map>
-#include <vespa/fastlib/testsuite/test.h>
 #include "testenv.h"
 #include <vespa/juniper/queryparser.h>
 #include <vespa/juniper/rewriter.h>
+#include <vespa/fastlib/testsuite/test.h>
+#include <map>
 
 /**
  * The QueryParserTest class holds
@@ -97,7 +97,7 @@ protected:
      * print_progress which includes backspace does not work.
      * We'll use a single '.' instead.
      */
-    virtual void print_progress() override { *m_osptr << '.' << std::flush; }
+    void print_progress() override { *m_osptr << '.' << std::flush; }
 
 public:
 
@@ -108,7 +108,7 @@ public:
      *                         main entry points
      *************************************************************************/
     void Run(MethodContainer::iterator &itr);
-    virtual void Run() override;
+    void Run() override;
     void Run(const char *method);
     void Run(int argc, char* argv[]);
 };
diff --git a/juniper/src/test/queryparserTestApp.cpp b/juniper/src/test/queryparserTestApp.cpp
index 3559b0177b6..7b3151a2314 100644
--- a/juniper/src/test/queryparserTestApp.cpp
+++ b/juniper/src/test/queryparserTestApp.cpp
@@ -1,25 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-/**
- * Definition and implementation of the application for running unit tests
- * for the QueryParser class in isolation.
- *
- * @file queryparserTestApp.cpp
- *
- * @author Knut Omang
- *
- * @date Created 24 Feb 2003
- *
- * $Id$
- *
- * <pre>
- *              Copyright (c) : 2003 Fast Search & Transfer ASA
- *                              ALL RIGHTS RESERVED
- * </pre>
- ****************************************************************************/
-#include <vespa/fastos/fastos.h>
-#include <vespa/vespalib/testkit/testapp.h>
+
 #include "queryparserTest.h"
 #include "testenv.h"
+#include <vespa/vespalib/testkit/testapp.h>
 
 /**
  * The QueryParserTestApp class is the main routine for running the unit
@@ -29,7 +12,7 @@
  */
 class QueryParserTestApp : public vespalib::TestApp {
 public:
-    virtual int Main() override {
+    int Main() override {
         juniper::TestEnv te(this, TEST_PATH("../rpclient/testclient.rc").c_str());
         QueryParserTest test;
         test.SetStream(&std::cout);
diff --git a/juniper/src/test/testenv.h b/juniper/src/test/testenv.h
index 88d250767fc..cc126f3f3a5 100644
--- a/juniper/src/test/testenv.h
+++ b/juniper/src/test/testenv.h
@@ -20,6 +20,7 @@
 #include <vespa/juniper/mcand.h>
 #include <vespa/juniper/propreader.h>
 #include <vespa/juniper/specialtokenregistry.h>
+#include <vespa/fastos/app.h>
 
 namespace juniper
 {
@@ -55,9 +56,9 @@ private:
     std::map<std::string, std::string> _map;
 public:
     PropertyMap();
-    virtual ~PropertyMap();
+    ~PropertyMap();
     PropertyMap &set(const char *name, const char *value);
-    virtual const char* GetProperty(const char* name, const char* def = NULL) override;
+    const char* GetProperty(const char* name, const char* def = NULL) override;
 };
 
 
diff --git a/slobrok/src/apps/check_slobrok/check_slobrok.cpp b/slobrok/src/apps/check_slobrok/check_slobrok.cpp
index 8e2a91c100d..9d588eab39f 100644
--- a/slobrok/src/apps/check_slobrok/check_slobrok.cpp
+++ b/slobrok/src/apps/check_slobrok/check_slobrok.cpp
@@ -1,14 +1,12 @@
 // 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("check_slobrok");
 
 #include <vespa/fnet/frt/frt.h>
-
+#include <vespa/fastos/app.h>
 #include <string>
 #include <sstream>
 
+#include <vespa/log/log.h>
+LOG_SETUP("check_slobrok");
 
 class Slobrok_Checker : public FastOS_Application
 {
@@ -25,10 +23,9 @@ public:
     int usage();
     void initRPC(const char *spec);
     void finiRPC();
-    virtual int Main() override;
+    int Main() override;
 };
 
-
 Slobrok_Checker::~Slobrok_Checker()
 {
     LOG_ASSERT(_supervisor == NULL);
diff --git a/slobrok/src/apps/sbcmd/sbcmd.cpp b/slobrok/src/apps/sbcmd/sbcmd.cpp
index 60a3dfc779b..a96c4609137 100644
--- a/slobrok/src/apps/sbcmd/sbcmd.cpp
+++ b/slobrok/src/apps/sbcmd/sbcmd.cpp
@@ -1,14 +1,12 @@
 // 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("sb-cmd");
 
 #include <vespa/fnet/frt/frt.h>
-
+#include <vespa/fastos/app.h>
 #include <string>
 #include <sstream>
 
+#include <vespa/log/log.h>
+LOG_SETUP("sb-cmd");
 
 class Slobrok_CMD : public FastOS_Application
 {
@@ -25,17 +23,15 @@ public:
     int usage();
     void initRPC(const char *spec);
     void finiRPC();
-    virtual int Main() override;
+    int Main() override;
 };
 
-
 Slobrok_CMD::~Slobrok_CMD()
 {
     LOG_ASSERT(_supervisor == NULL);
     LOG_ASSERT(_target == NULL);
 }
 
-
 int
 Slobrok_CMD::usage()
 {
diff --git a/slobrok/src/tests/mirrorapi/match_test.cpp b/slobrok/src/tests/mirrorapi/match_test.cpp
index d9ebcfd6f29..94900daa202 100644
--- a/slobrok/src/tests/mirrorapi/match_test.cpp
+++ b/slobrok/src/tests/mirrorapi/match_test.cpp
@@ -4,12 +4,11 @@
 
 class MatchTester : public slobrok::api::IMirrorAPI
 {
-    virtual SpecList lookup(const std::string &) const override {
+    SpecList lookup(const std::string &) const override {
         return SpecList();
     }
-    virtual uint32_t updates() const override { return 0; }
-
-    virtual bool ready() const override { return true; }
+    uint32_t updates() const override { return 0; }
+    bool ready() const override { return true; }
 
     const std::string name;
 
diff --git a/slobrok/src/tests/oldapi/mirror.h b/slobrok/src/tests/oldapi/mirror.h
index 1f0db564cae..b83392dec5e 100644
--- a/slobrok/src/tests/oldapi/mirror.h
+++ b/slobrok/src/tests/oldapi/mirror.h
@@ -1,6 +1,5 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#ifndef Old_MIRROR_H
-#define Old_MIRROR_H
+#pragma once
 
 #include <vespa/fnet/frt/frt.h>
 #include <vespa/vespalib/util/gencnt.h>
@@ -86,10 +85,7 @@ public:
      **/
     ~MirrorOld();
 
-    // Inherit doc from IMirrorOld.
     SpecList lookup(const std::string & pattern) const override;
-
-    // Inherit doc from IMirrorOld.
     uint32_t updates() const override { return _updates.getAsInt(); }
 
     /**
@@ -110,10 +106,7 @@ private:
     MirrorOld(const MirrorOld &);
     MirrorOld &operator=(const MirrorOld &);
 
-    /** from FNET_Task, polls slobrok **/
     void PerformTask() override;
-
-    /** from FRT_IRequestWait **/
     void RequestDone(FRT_RPCRequest *req) override;
 
     FRT_Supervisor          &_orb;
@@ -131,5 +124,3 @@ private:
 
 } // namespace api
 } // namespace slobrok
-
-#endif
diff --git a/slobrok/src/tests/startsome/rpc_info.cpp b/slobrok/src/tests/startsome/rpc_info.cpp
index 76b578d4f88..be5418ff1a8 100644
--- a/slobrok/src/tests/startsome/rpc_info.cpp
+++ b/slobrok/src/tests/startsome/rpc_info.cpp
@@ -1,8 +1,7 @@
 // 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 e2f6ae070b3..7d3fcef8695 100644
--- a/slobrok/src/tests/startsome/tstdst.cpp
+++ b/slobrok/src/tests/startsome/tstdst.cpp
@@ -1,15 +1,11 @@
 // 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 <vector>
-#include <string>
-#include <sstream>
+#include <vespa/log/log.h>
+LOG_SETUP("testrpcserver");
 
 class FNET_Transport;
 class FNET_Scheduler;
diff --git a/vespalog/src/logger/llreader.h b/vespalog/src/logger/llreader.h
index 27b39d23df7..70b28d3996a 100644
--- a/vespalog/src/logger/llreader.h
+++ b/vespalog/src/logger/llreader.h
@@ -1,9 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <stdexcept>
 
-#include <vespa/log/log.h>
-#include <vespa/log/log-target.h>
 #include <vespa/log/llparser.h>
+#include <stdexcept>
 
 namespace ns_log {
 
@@ -18,7 +16,6 @@ public:
     const char *what() const throw() override { return _string; }
 };
 
-
 class InputBuf
 {
 private:
diff --git a/vespalog/src/test/threads/testthreads.cpp b/vespalog/src/test/threads/testthreads.cpp
index 515fa10c11f..a708777f350 100644
--- a/vespalog/src/test/threads/testthreads.cpp
+++ b/vespalog/src/test/threads/testthreads.cpp
@@ -1,8 +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/fastos/app.h>
+#include <vespa/fastos/time.h>
 #include <vespa/log/log.h>
 #include <iostream>
-#include <string>
 
 using std::string;
 
@@ -15,7 +15,7 @@ class FileThread : public FastOS_Runnable
     string _file;
 public:
     FileThread(string file) : _done(false), _file(file) {}
-    virtual void Run(FastOS_ThreadInterface *thread, void *arg) override;
+    void Run(FastOS_ThreadInterface *thread, void *arg) override;
     void stop() {_done = true; }
 };
 
@@ -25,13 +25,10 @@ class LoggerThread : public FastOS_Runnable
 public:
     bool _useLogBuffer;
     LoggerThread() : _done(false), _useLogBuffer(false) {}
-    virtual void Run(FastOS_ThreadInterface *thread, void *arg) override;
+    void Run(FastOS_ThreadInterface *thread, void *arg) override;
     void stop() {_done = true; }
 };
 
-
-
-
 void
 FileThread::Run(FastOS_ThreadInterface *, void *)
 {