Add override in documentapi.

52 files changed, 129 insertions, 283 deletions

diff --git a/documentapi/src/tests/create-test.sh b/documentapi/src/tests/create-test.sh
index 5debc5f635a..d6abda48bd1 100755
--- a/documentapi/src/tests/create-test.sh
+++ b/documentapi/src/tests/create-test.sh
@@ -23,11 +23,10 @@ gen_project_file() {
 
 gen_source() {
     echo "generating '$1' ..."
-    echo "#include <vespa/log/log.h>"                   > $1
-    echo "LOG_SETUP(\"${test}_test\");"          >> $1
+    echo "#include <vespa/vespalib/testkit/testapp.h>" > $1
     echo ""                                      >> $1
-    echo "#include <vespa/fastos/fastos.h>"            >> $1
-    echo "#include <vespa/vespalib/testkit/testapp.h>" >> $1
+    echo "#include <vespa/log/log.h>"            >> $1
+    echo "LOG_SETUP(\"${test}_test\");"          >> $1
     echo ""                                      >> $1
     echo "//using namespace documentapi;"        >> $1
     echo ""                                      >> $1
diff --git a/documentapi/src/tests/messages/messages50app.cpp b/documentapi/src/tests/messages/messages50app.cpp
index 64532d4fd14..77cfdf3a39d 100644
--- a/documentapi/src/tests/messages/messages50app.cpp
+++ b/documentapi/src/tests/messages/messages50app.cpp
@@ -1,7 +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 <vespa/log/log.h>
-LOG_SETUP("messages50");
 
 #include "messages50test.h"
 
diff --git a/documentapi/src/tests/messages/messages51app.cpp b/documentapi/src/tests/messages/messages51app.cpp
index 6d68774f679..04bfaf7d0f2 100644
--- a/documentapi/src/tests/messages/messages51app.cpp
+++ b/documentapi/src/tests/messages/messages51app.cpp
@@ -1,7 +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 <vespa/log/log.h>
-LOG_SETUP("messages51");
 
 #include "messages51test.h"
 
diff --git a/documentapi/src/tests/messages/messages51test.cpp b/documentapi/src/tests/messages/messages51test.cpp
index 06a6becc45b..db147a99f0e 100644
--- a/documentapi/src/tests/messages/messages51test.cpp
+++ b/documentapi/src/tests/messages/messages51test.cpp
@@ -1,15 +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(".test");
 
 #include "messages51test.h"
-#include <vespa/document/datatype/datatype.h>
-#include <vespa/document/fieldvalue/document.h>
-#include <vespa/document/repo/documenttyperepo.h>
-#include <vespa/document/update/fieldpathupdates.h>
 #include <vespa/documentapi/documentapi.h>
-#include <vespa/vdslib/container/writabledocumentlist.h>
+#include <vespa/document/update/fieldpathupdates.h>
 
 using document::DataType;
 using document::DocumentTypeRepo;
diff --git a/documentapi/src/tests/messages/messages52app.cpp b/documentapi/src/tests/messages/messages52app.cpp
index 15fb603524b..e6bab09ea33 100644
--- a/documentapi/src/tests/messages/messages52app.cpp
+++ b/documentapi/src/tests/messages/messages52app.cpp
@@ -1,7 +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 <vespa/log/log.h>
-LOG_SETUP("messages52");
 
 #include "messages52test.h"
 
diff --git a/documentapi/src/tests/messages/messages52test.cpp b/documentapi/src/tests/messages/messages52test.cpp
index f3625150511..9339d23ee86 100644
--- a/documentapi/src/tests/messages/messages52test.cpp
+++ b/documentapi/src/tests/messages/messages52test.cpp
@@ -1,14 +1,10 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // @author Vegard Sjonfjell
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".test");
+
 
 #include "messages52test.h"
-#include <vespa/document/fieldvalue/document.h>
-#include <vespa/document/repo/documenttyperepo.h>
-#include <vespa/document/update/fieldpathupdates.h>
 #include <vespa/documentapi/documentapi.h>
+#include <vespa/document/update/fieldpathupdates.h>
 
 using document::DocumentTypeRepo;
 
diff --git a/documentapi/src/tests/priority/priority.cpp b/documentapi/src/tests/priority/priority.cpp
index d2d7a744380..e85d7248d17 100644
--- a/documentapi/src/tests/priority/priority.cpp
+++ b/documentapi/src/tests/priority/priority.cpp
@@ -1,11 +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("priority_test");
 
-#include <fstream>
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/documentapi/messagebus/priority.h>
+#include <fstream>
 
 using namespace documentapi;
 
diff --git a/documentapi/src/vespa/documentapi/documentapi.h b/documentapi/src/vespa/documentapi/documentapi.h
index e1b9b5e4b03..b6bc410e5f0 100644
--- a/documentapi/src/vespa/documentapi/documentapi.h
+++ b/documentapi/src/vespa/documentapi/documentapi.h
@@ -28,8 +28,6 @@
 #include <vespa/documentapi/messagebus/messages/queryresultmessage.h>
 #include <vespa/documentapi/messagebus/messages/documentignoredreply.h>
 
-
 namespace documentapi {
 
 }
-
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.cpp
index 615eb45cbb1..4df05b4f3de 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.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 "statbucketmessage.h"
+#include "statbucketreply.h"
 #include <vespa/documentapi/messagebus/documentprotocol.h>
-#include <vespa/documentapi/messagebus/messages/statbucketmessage.h>
-#include <vespa/documentapi/messagebus/messages/statbucketreply.h>
 
 namespace documentapi {
 
@@ -10,17 +9,13 @@ StatBucketMessage::StatBucketMessage() :
     DocumentMessage(),
     _bucket(),
     _documentSelection()
-{
-    // empty
-}
+{}
 
 StatBucketMessage::StatBucketMessage(document::BucketId bucket, const string& documentSelection) :
     DocumentMessage(),
     _bucket(bucket),
     _documentSelection(documentSelection)
-{
-    // empty
-}
+{}
 
 DocumentReply::UP
 StatBucketMessage::doCreateReply() const
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.h
index 818aaa6a9f1..1a04cd8a298 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.h
@@ -1,8 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
+#include "documentmessage.h"
 #include <vespa/document/bucket/bucketid.h>
-#include <vespa/documentapi/messagebus/messages/documentmessage.h>
 
 namespace documentapi {
 
@@ -12,8 +12,7 @@ private:
     string        _documentSelection;
 
 protected:
-    // Implements DocumentMessage.
-    DocumentReply::UP doCreateReply() const;
+    DocumentReply::UP doCreateReply() const override;
 
 public:
     /**
@@ -57,17 +56,10 @@ public:
      */
     void setDocumentSelection(const string &value) { _documentSelection = value; };
 
-    // Overrides DocumentMessage.
-    bool hasSequenceId() const;
-
-    // Overrides DocumentMessage.
-    uint64_t getSequenceId() const;
-
-    // Implements DocumentMessage.
-    uint32_t getType() const;
-
-    string toString() const { return "statbucketmessage"; }
+    bool hasSequenceId() const override;
+    uint64_t getSequenceId() const override;
+    uint32_t getType() const override;
+    string toString() const override { return "statbucketmessage"; }
 };
 
 }
-
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketreply.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketreply.cpp
index 13e58830139..d8bbb95966c 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketreply.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketreply.cpp
@@ -1,7 +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 "statbucketreply.h"
 #include <vespa/documentapi/messagebus/documentprotocol.h>
-#include <vespa/documentapi/messagebus/messages/statbucketreply.h>
 
 namespace documentapi {
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketreply.h b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketreply.h
index 551b455a9c2..10ff871fc77 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketreply.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketreply.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.
 #pragma once
 
-#include <vespa/documentapi/messagebus/messages/documentreply.h>
+#include "documentreply.h"
 
 namespace documentapi {
 
@@ -11,12 +11,9 @@ private:
 
 public:
     StatBucketReply();
-
     void setResults(const string& results) { _results = results; }
-
     const string& getResults() const { return _results; }
-
-    string toString() const { return "statbucketreply"; }
+    string toString() const override { return "statbucketreply"; }
 };
 
 }
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentmessage.cpp
index 7f226f94bbc..bba9924b071 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentmessage.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentmessage.cpp
@@ -1,9 +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/vespalib/util/exceptions.h>
+#include "updatedocumentmessage.h"
+#include "updatedocumentreply.h"
 #include <vespa/documentapi/messagebus/documentprotocol.h>
-#include <vespa/documentapi/messagebus/messages/updatedocumentmessage.h>
-#include <vespa/documentapi/messagebus/messages/updatedocumentreply.h>
+#include <vespa/vespalib/util/exceptions.h>
 
 namespace documentapi {
 
@@ -12,9 +11,7 @@ UpdateDocumentMessage::UpdateDocumentMessage() :
     _documentUpdate(),
     _oldTime(0),
     _newTime(0)
-{
-    // empty
-}
+{}
 
 UpdateDocumentMessage::UpdateDocumentMessage(document::DocumentUpdate::SP documentUpdate) :
     TestAndSetMessage(),
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentmessage.h
index d924c514d60..18c6db639d2 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentmessage.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentmessage.h
@@ -1,8 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
+#include "testandsetmessage.h"
 #include <vespa/document/update/documentupdate.h>
-#include <vespa/documentapi/messagebus/messages/testandsetmessage.h>
 
 namespace documentapi {
 
@@ -13,8 +13,7 @@ private:
     uint64_t                                    _newTime;
 
 protected:
-    // Implements DocumentMessage.
-    DocumentReply::UP doCreateReply() const;
+    DocumentReply::UP doCreateReply() const override;
 
 public:
     /**
@@ -84,17 +83,10 @@ public:
      */
     void setNewTimestamp(uint64_t time) { _newTime = time; }
 
-    // Overrides DocumentMessage.
-    bool hasSequenceId() const;
-
-    // Overrides DocumentMessage.
-    uint64_t getSequenceId() const;
-
-    // Implements DocumentMessage.
-    uint32_t getType() const;
-
-    string toString() const { return "updatedocumentmessage"; }
+    bool hasSequenceId() const override;
+    uint64_t getSequenceId() const override;
+    uint32_t getType() const override;
+    string toString() const override { return "updatedocumentmessage"; }
 };
 
 }
-
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentreply.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentreply.cpp
index a38ecdb7539..c727ed5cf63 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentreply.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentreply.cpp
@@ -1,15 +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 "updatedocumentreply.h"
 #include <vespa/documentapi/messagebus/documentprotocol.h>
-#include <vespa/documentapi/messagebus/messages/updatedocumentreply.h>
 
 namespace documentapi {
 
 UpdateDocumentReply::UpdateDocumentReply() :
     WriteDocumentReply(DocumentProtocol::REPLY_UPDATEDOCUMENT),
     _found(true)
-{
-    // empty
-}
+{}
 
 }
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentreply.h b/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentreply.h
index 918aebb0ea3..8b760f9f5af 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentreply.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentreply.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.
 #pragma once
 
-#include <vespa/documentapi/messagebus/messages/writedocumentreply.h>
+#include "writedocumentreply.h"
 
 namespace documentapi {
 
@@ -43,7 +43,7 @@ public:
      */
     bool getWasFound() const { return _found; }
 
-    string toString() const { return "updatedocumentreply"; }
+    string toString() const override { return "updatedocumentreply"; }
 };
 
 }
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
index 9287d8f62aa..784fb494c3c 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
@@ -1,6 +1,5 @@
 // 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/document/bucket/bucketid.h>
+
 #include "visitor.h"
 
 namespace documentapi {
@@ -19,9 +18,7 @@ CreateVisitorMessage::CreateVisitorMessage() :
     _version(42),
     _ordering(document::OrderingSpecification::ASCENDING),
     _maxBucketsPerVisitor(1)
-{
-    // empty
-}
+{}
 
 CreateVisitorMessage::CreateVisitorMessage(const string& libraryName,
                                            const string& instanceId,
@@ -44,9 +41,7 @@ CreateVisitorMessage::CreateVisitorMessage(const string& libraryName,
     _version(42),
     _ordering(document::OrderingSpecification::ASCENDING),
     _maxBucketsPerVisitor(1)
-{
-    // empty
-}
+{}
 
 DocumentReply::UP
 CreateVisitorMessage::doCreateReply() const
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/wrongdistributionreply.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/wrongdistributionreply.cpp
index b9c5ee824c3..bcf478cb05d 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/wrongdistributionreply.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/wrongdistributionreply.cpp
@@ -1,22 +1,18 @@
 // 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 "wrongdistributionreply.h"
 #include <vespa/documentapi/messagebus/documentprotocol.h>
-#include <vespa/documentapi/messagebus/messages/wrongdistributionreply.h>
 
 namespace documentapi {
 
 WrongDistributionReply::WrongDistributionReply() :
     DocumentReply(DocumentProtocol::REPLY_WRONGDISTRIBUTION),
     _systemState()
-{
-    // empty
-}
+{}
 
 WrongDistributionReply::WrongDistributionReply(const string &systemState) :
     DocumentReply(DocumentProtocol::REPLY_WRONGDISTRIBUTION),
     _systemState(systemState)
-{
-    // empty
-}
+{}
 
 }
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/wrongdistributionreply.h b/documentapi/src/vespa/documentapi/messagebus/messages/wrongdistributionreply.h
index d70ab641fba..486638ce89c 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/wrongdistributionreply.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/wrongdistributionreply.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.
 #pragma once
 
-#include <vespa/documentapi/messagebus/messages/documentreply.h>
+#include "documentreply.h"
 
 namespace documentapi {
 
@@ -14,15 +14,10 @@ public:
     typedef std::shared_ptr<WrongDistributionReply> SP;
 
     WrongDistributionReply();
-
     WrongDistributionReply(const string &systemState);
-
     const string &getSystemState() const { return _systemState; };
-
     void setSystemState(const string &state) { _systemState = state; };
-
-    string toString() const { return "wrongdistributionreply"; }
+    string toString() const override { return "wrongdistributionreply"; }
 };
 
 }
-
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.cpp
index 24bdb9b9bbc..dd18afb63b9 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.cpp
@@ -1,17 +1,14 @@
 // 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 "errorpolicy.h"
 #include <vespa/documentapi/messagebus/documentprotocol.h>
 #include <vespa/messagebus/emptyreply.h>
-#include <vespa/messagebus/routing/routingcontext.h>
-#include "errorpolicy.h"
 
 namespace documentapi {
 
 ErrorPolicy::ErrorPolicy(const string &msg) :
     _msg(msg)
-{
-    // empty
-}
+{}
 
 void
 ErrorPolicy::select(mbus::RoutingContext &ctx)
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.h
index fddccb1e3d9..39a95320021 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.h
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.h
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
+#include <vespa/documentapi/common.h>
 #include <vespa/messagebus/routing/iroutingpolicy.h>
 
 namespace documentapi {
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/loadbalancer.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/loadbalancer.cpp
index 1be17d29ac7..cb2f3efa051 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/loadbalancer.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/loadbalancer.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/documentapi/messagebus/policies/loadbalancer.h>
+
+#include "loadbalancer.h"
 
 namespace documentapi {
 
@@ -8,8 +8,9 @@ LoadBalancer::LoadBalancer(const string& cluster, const string& session)
     : _cluster(cluster),
       _session(session),
       _position(0)
-{
-};
+{}
+
+LoadBalancer::~LoadBalancer() {}
 
 uint32_t
 LoadBalancer::getIndex(const string& name) const
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/loadbalancer.h b/documentapi/src/vespa/documentapi/messagebus/policies/loadbalancer.h
index b94f7599623..7deae242ec4 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/loadbalancer.h
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/loadbalancer.h
@@ -1,8 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <vespa/slobrok/imirrorapi.h>
 #include <vespa/documentapi/common.h>
+#include <vespa/slobrok/imirrorapi.h>
 
 namespace documentapi {
 
@@ -25,6 +25,7 @@ public:
     double _position;
 
     LoadBalancer(const string& cluster, const string& session);
+    ~LoadBalancer();
 
     const std::vector<NodeInfo>& getNodeInfo() const { return _nodeInfo; }
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.cpp
index c1cad546cd6..25c7671990c 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.cpp
@@ -1,12 +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 "roundrobinpolicy.h"
 #include <vespa/documentapi/messagebus/documentprotocol.h>
 #include <vespa/messagebus/emptyreply.h>
-#include <vespa/messagebus/errorcode.h>
-#include <vespa/messagebus/routing/route.h>
-#include <vespa/messagebus/routing/routingcontext.h>
 #include <vespa/messagebus/routing/verbatimdirective.h>
-#include "roundrobinpolicy.h"
 
 namespace documentapi {
 
@@ -14,21 +11,14 @@ RoundRobinPolicy::CacheEntry::CacheEntry() :
     _offset(0),
     _generation(),
     _recipients()
-{
-    // empty
-}
+{}
 
 RoundRobinPolicy::RoundRobinPolicy(const string &) :
     _lock(),
     _cache()
-{
-    // empty
-}
+{}
 
-RoundRobinPolicy::~RoundRobinPolicy()
-{
-    // empty
-}
+RoundRobinPolicy::~RoundRobinPolicy() {}
 
 void
 RoundRobinPolicy::select(mbus::RoutingContext &ctx)
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.h
index a14c2afdbc7..379d5a63c83 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.h
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.h
@@ -1,11 +1,11 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
+#include <vespa/documentapi/common.h>
 #include <vespa/messagebus/routing/hop.h>
 #include <vespa/messagebus/routing/iroutingpolicy.h>
-#include <string>
-#include <vector>
 #include <vespa/vespalib/util/sync.h>
+#include <map>
 
 namespace documentapi {
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/searchcolumnpolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/searchcolumnpolicy.cpp
index 84cbe33f701..2a9f4d9c7f9 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/searchcolumnpolicy.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/searchcolumnpolicy.cpp
@@ -1,23 +1,18 @@
 // 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(".searchcolumnpolicy");
 
-#include <vespa/document/base/documentid.h>
+#include "searchcolumnpolicy.h"
 #include <vespa/documentapi/messagebus/documentprotocol.h>
 #include <vespa/documentapi/messagebus/messages/getdocumentmessage.h>
 #include <vespa/documentapi/messagebus/messages/putdocumentmessage.h>
 #include <vespa/documentapi/messagebus/messages/removedocumentmessage.h>
-#include <vespa/documentapi/messagebus/policies/searchcolumnpolicy.h>
 #include <vespa/documentapi/messagebus/messages/updatedocumentmessage.h>
 #include <vespa/documentapi/messagebus/messages/batchdocumentupdatemessage.h>
 #include <vespa/documentapi/messagebus/messages/multioperationmessage.h>
-#include <vespa/messagebus/error.h>
-#include <vespa/messagebus/errorcode.h>
 #include <vespa/messagebus/emptyreply.h>
 #include <vespa/vdslib/state/clusterstate.h>
-#include <vespa/vdslib/bucketdistribution.h>
 #include <vespa/vespalib/util/hashmap.h>
+#include <vespa/log/log.h>
+LOG_SETUP(".searchcolumnpolicy");
 
 namespace documentapi {
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/searchcolumnpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/searchcolumnpolicy.h
index 2b7e03dc014..5e9a1e3f0e9 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/searchcolumnpolicy.h
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/searchcolumnpolicy.h
@@ -1,10 +1,12 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <vespa/document/bucket/bucketidfactory.h>
+#include <vespa/documentapi/common.h>
 #include <vespa/messagebus/routing/iroutingpolicy.h>
 #include <vespa/vdslib/bucketdistribution.h>
+#include <vespa/document/bucket/bucketidfactory.h>
 #include <vespa/vespalib/util/sync.h>
+#include <map>
 
 namespace documentapi {
 
@@ -41,20 +43,10 @@ public:
      * @param param The maximum number of allowed bad columns.
      */
     SearchColumnPolicy(const string &param);
+    ~SearchColumnPolicy();
 
-    /**
-     * Destructor.
-     *
-     * Frees all allocated resources.
-     */
-    virtual ~SearchColumnPolicy();
-
-    // Inherit doc from IRoutingPolicy.
-    virtual void select(mbus::RoutingContext &context);
-
-    // Inherit doc from IRoutingPolicy.
-    virtual void merge(mbus::RoutingContext &context);
+    void select(mbus::RoutingContext &context) override;
+    void merge(mbus::RoutingContext &context) override;
 };
 
 }
-
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/searchrowpolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/searchrowpolicy.cpp
index a438668a2f4..3f332c2fff5 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/searchrowpolicy.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/searchrowpolicy.cpp
@@ -1,12 +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>
-#include <vespa/messagebus/errorcode.h>
-#include <vespa/messagebus/routing/routingcontext.h>
-#include <vespa/vespalib/util/stringfmt.h>
+
+#include "searchrowpolicy.h"
 #include <vespa/documentapi/messagebus/documentprotocol.h>
-#include <vespa/documentapi/messagebus/policies/searchrowpolicy.h>
 
+#include <vespa/log/log.h>
 LOG_SETUP(".searchrowpolicy");
 
 namespace documentapi {
@@ -26,10 +23,7 @@ SearchRowPolicy::SearchRowPolicy(const string &param) :
     }
 }
 
-SearchRowPolicy::~SearchRowPolicy()
-{
-    // empty
-}
+SearchRowPolicy::~SearchRowPolicy() {}
 
 void
 SearchRowPolicy::select(mbus::RoutingContext &context)
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/searchrowpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/searchrowpolicy.h
index 520ca74f3db..c4b960c4dea 100644
--- a/documentapi/src/vespa/documentapi/messagebus/policies/searchrowpolicy.h
+++ b/documentapi/src/vespa/documentapi/messagebus/policies/searchrowpolicy.h
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
+#include <vespa/documentapi/common.h>
 #include <vespa/messagebus/routing/iroutingpolicy.h>
 
 namespace documentapi {
@@ -18,23 +19,12 @@ public:
      * @param param The number of minimum non-OOS replies that this policy requires.
      */
     SearchRowPolicy(const string &param);
+    ~SearchRowPolicy();
 
-    /**
-     * Destructor.
-     *
-     * Frees all allocated resources.
-     */
-    virtual ~SearchRowPolicy();
-
-    // Inherit doc from IRoutingPolicy.
-    virtual void select(mbus::RoutingContext &context);
-
-    // Inherit doc from IRoutingPolicy.
-    virtual void merge(mbus::RoutingContext &context);
-
+    void select(mbus::RoutingContext &context) override;
+    void merge(mbus::RoutingContext &context) override;
 private:
     uint32_t _minOk; // Hide OUT_OF_SERVICE as long as this number of replies are something else.
 };
 
 }
-
diff --git a/documentapi/src/vespa/documentapi/messagebus/replymerger.cpp b/documentapi/src/vespa/documentapi/messagebus/replymerger.cpp
index fe6a58c1427..30cc674f5c3 100644
--- a/documentapi/src/vespa/documentapi/messagebus/replymerger.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/replymerger.cpp
@@ -1,14 +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 <cassert>
-#include <vespa/messagebus/reply.h>
-#include <vespa/messagebus/emptyreply.h>
-#include <vespa/documentapi/messagebus/replymerger.h>
-#include <vespa/documentapi/messagebus/documentprotocol.h>
+#include "replymerger.h"
+#include "documentprotocol.h"
 #include <vespa/documentapi/messagebus/messages/removedocumentreply.h>
 #include <vespa/documentapi/messagebus/messages/updatedocumentreply.h>
 #include <vespa/documentapi/messagebus/messages/getdocumentreply.h>
+#include <vespa/messagebus/emptyreply.h>
 
 namespace documentapi {
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/replymerger.h b/documentapi/src/vespa/documentapi/messagebus/replymerger.h
index 47076dd7b7e..350e80903df 100644
--- a/documentapi/src/vespa/documentapi/messagebus/replymerger.h
+++ b/documentapi/src/vespa/documentapi/messagebus/replymerger.h
@@ -1,8 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <utility>
-#include <memory>
+
 #include <vespa/messagebus/reply.h>
 
 namespace documentapi {
@@ -50,5 +49,3 @@ public:
 };
 
 } // documentapi
-
-
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories41.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories41.cpp
index 76caac68e46..ad8339d6cb1 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories41.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories41.cpp
@@ -1,5 +1,5 @@
 // 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 "routablefactories41.h"
 #include <vespa/document/document.h>
 #include <vespa/documentapi/documentapi.h>
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories41.h b/documentapi/src/vespa/documentapi/messagebus/routablefactories41.h
index 283d295dc82..93b149525da 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories41.h
+++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories41.h
@@ -1,13 +1,13 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <vespa/document/base/documentid.h>
-#include <vespa/document/util/bytebuffer.h>
 #include <vespa/documentapi/messagebus/messages/feedmessage.h>
 #include <vespa/documentapi/messagebus/messages/feedreply.h>
 #include <vespa/messagebus/routable.h>
 #include <vespa/messagebus/blob.h>
 #include <vespa/messagebus/blobref.h>
+#include <vespa/document/base/documentid.h>
+#include <vespa/document/util/bytebuffer.h>
 #include <vespa/vespalib/util/growablebytebuffer.h>
 
 namespace documentapi {
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories42.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories42.cpp
index 37d208c1f0c..464ad99686e 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories42.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories42.cpp
@@ -1,5 +1,5 @@
 // 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 "routablefactories42.h"
 #include <vespa/document/document.h>
 #include <vespa/documentapi/documentapi.h>
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories42.h b/documentapi/src/vespa/documentapi/messagebus/routablefactories42.h
index 3bf3daadb5e..c0f0974885f 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories42.h
+++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories42.h
@@ -2,14 +2,6 @@
 #pragma once
 
 #include "routablefactories41.h"
-#include <vespa/document/base/documentid.h>
-#include <vespa/document/util/bytebuffer.h>
-#include <vespa/documentapi/messagebus/messages/feedmessage.h>
-#include <vespa/documentapi/messagebus/messages/feedreply.h>
-#include <vespa/messagebus/blob.h>
-#include <vespa/messagebus/blobref.h>
-#include <vespa/messagebus/routable.h>
-#include <vespa/vespalib/util/growablebytebuffer.h>
 
 namespace document { class DocumentTypeRepo; }
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp
index c1b518f0cfa..b620611695e 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp
@@ -1,10 +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 "routablefactories50.h"
+#include <vespa/documentapi/documentapi.h>
 #include <vespa/documentapi/loadtypes/loadtypeset.h>
-#include <vespa/document/document.h>
 #include <vespa/vespalib/objects/nbostream.h>
-#include <memory>
 
 using vespalib::nbostream;
 using std::make_unique;
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h
index c715792f263..a9caccbc338 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h
+++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h
@@ -2,16 +2,13 @@
 #pragma once
 
 #include "routablefactories42.h"
-#include <vespa/document/base/documentid.h>
-#include <vespa/document/util/bytebuffer.h>
-#include <vespa/documentapi/messagebus/messages/feedmessage.h>
-#include <vespa/documentapi/messagebus/messages/feedreply.h>
-#include <vespa/messagebus/routable.h>
-#include <vespa/messagebus/blob.h>
-#include <vespa/messagebus/blobref.h>
-#include <vespa/vespalib/util/growablebytebuffer.h>
-#include <vespa/documentapi/documentapi.h>
 #include "iroutablefactory.h"
+#include <vespa/documentapi/messagebus/messages/putdocumentmessage.h>
+#include <vespa/documentapi/messagebus/messages/removedocumentmessage.h>
+#include <vespa/documentapi/messagebus/messages/updatedocumentmessage.h>
+#include <vespa/document/repo/documenttyperepo.h>
+
+
 
 namespace document { class DocumentTypeRepo; }
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories51.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories51.cpp
index 35c4b5bd2d5..89ce4081e5d 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories51.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories51.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 "routablefactories51.h"
-#include <vespa/document/document.h>
 #include <vespa/documentapi/documentapi.h>
 #include <vespa/documentapi/loadtypes/loadtypeset.h>
+#include <vespa/document/document.h>
 #include <vespa/vespalib/objects/nbostream.h>
 
 using vespalib::nbostream;
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories51.h b/documentapi/src/vespa/documentapi/messagebus/routablefactories51.h
index 429c86e5049..fafa84db8fa 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories51.h
+++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories51.h
@@ -2,14 +2,6 @@
 #pragma once
 
 #include "routablefactories50.h"
-#include <vespa/document/base/documentid.h>
-#include <vespa/document/util/bytebuffer.h>
-#include <vespa/documentapi/messagebus/messages/feedmessage.h>
-#include <vespa/documentapi/messagebus/messages/feedreply.h>
-#include <vespa/messagebus/routable.h>
-#include <vespa/messagebus/blob.h>
-#include <vespa/messagebus/blobref.h>
-#include <vespa/vespalib/util/growablebytebuffer.h>
 
 namespace document { class DocumentTypeRepo; }
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories52.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories52.cpp
index f9224147453..6751a0cc5b8 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories52.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories52.cpp
@@ -1,11 +1,9 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // @author Vegard Sjonfjell
-#include <vespa/fastos/fastos.h>
+
 #include "routablefactories52.h"
-#include <vespa/document/document.h>
 #include <vespa/documentapi/documentapi.h>
 #include <vespa/vespalib/objects/nbostream.h>
-#include <memory>
 
 using vespalib::nbostream;
 using std::make_shared;
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories52.h b/documentapi/src/vespa/documentapi/messagebus/routablefactories52.h
index 3d9303cdf09..fecbb1e1d2b 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories52.h
+++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories52.h
@@ -3,14 +3,6 @@
 #pragma once
 
 #include "routablefactories51.h"
-#include <vespa/document/base/documentid.h>
-#include <vespa/document/util/bytebuffer.h>
-#include <vespa/documentapi/messagebus/messages/feedmessage.h>
-#include <vespa/documentapi/messagebus/messages/feedreply.h>
-#include <vespa/messagebus/routable.h>
-#include <vespa/messagebus/blob.h>
-#include <vespa/messagebus/blobref.h>
-#include <vespa/vespalib/util/growablebytebuffer.h>
 #include <vespa/documentapi/messagebus/messages/testandsetmessage.h>
 
 namespace document { class DocumentTypeRepo; }
diff --git a/documentapi/src/vespa/documentapi/messagebus/routingpolicyfactories.cpp b/documentapi/src/vespa/documentapi/messagebus/routingpolicyfactories.cpp
index 902bf006622..53c36671d57 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routingpolicyfactories.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/routingpolicyfactories.cpp
@@ -1,5 +1,5 @@
 // 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 "routingpolicyfactories.h"
 #include <vespa/documentapi/messagebus/policies/andpolicy.h>
 #include <vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.h>
 #include <vespa/documentapi/messagebus/policies/errorpolicy.h>
@@ -13,7 +13,6 @@
 #include <vespa/documentapi/messagebus/policies/contentpolicy.h>
 #include <vespa/documentapi/messagebus/policies/messagetypepolicy.h>
 #include <vespa/documentapi/messagebus/policies/loadbalancerpolicy.h>
-#include "routingpolicyfactories.h"
 
 using namespace documentapi;
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/routingpolicyfactories.h b/documentapi/src/vespa/documentapi/messagebus/routingpolicyfactories.h
index a41ae155170..1214e3aa91f 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routingpolicyfactories.h
+++ b/documentapi/src/vespa/documentapi/messagebus/routingpolicyfactories.h
@@ -1,8 +1,9 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <vespa/documentapi/messagebus/systemstate/systemstate.h>
 #include "iroutingpolicyfactory.h"
+#include <vespa/documentapi/messagebus/systemstate/systemstate.h>
+#include <vespa/document/repo/documenttyperepo.h>
 
 namespace documentapi {
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/routingpolicyrepository.cpp b/documentapi/src/vespa/documentapi/messagebus/routingpolicyrepository.cpp
index a3d00c2e96d..47c46fbfe3a 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routingpolicyrepository.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/routingpolicyrepository.cpp
@@ -1,10 +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(".routingpolicyrepository");
 
 #include "routingpolicyrepository.h"
 
+#include <vespa/log/log.h>
+LOG_SETUP(".routingpolicyrepository");
+
 namespace documentapi {
 
 RoutingPolicyRepository::RoutingPolicyRepository() :
diff --git a/documentapi/src/vespa/documentapi/messagebus/routingpolicyrepository.h b/documentapi/src/vespa/documentapi/messagebus/routingpolicyrepository.h
index c0dab2d710b..501c73e1938 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routingpolicyrepository.h
+++ b/documentapi/src/vespa/documentapi/messagebus/routingpolicyrepository.h
@@ -1,10 +1,9 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <map>
-#include <string>
-#include <vespa/vespalib/util/sync.h>
 #include "iroutingpolicyfactory.h"
+#include <vespa/vespalib/util/sync.h>
+#include <map>
 
 namespace documentapi {
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/systemstate/nodestate.cpp b/documentapi/src/vespa/documentapi/messagebus/systemstate/nodestate.cpp
index a0ae6a9c364..e29c85ee13a 100644
--- a/documentapi/src/vespa/documentapi/messagebus/systemstate/nodestate.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/systemstate/nodestate.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/log/log.h>
-LOG_SETUP(".nodestate");
 
-#include <sstream>
 #include "nodestate.h"
 #include "urlencoder.h"
 
+#include <vespa/log/log.h>
+LOG_SETUP(".nodestate");
+
 using namespace documentapi;
 
 NodeState::NodeState() :
diff --git a/documentapi/src/vespa/documentapi/messagebus/systemstate/nodestate.h b/documentapi/src/vespa/documentapi/messagebus/systemstate/nodestate.h
index b80b1482efc..ee540ff95a7 100644
--- a/documentapi/src/vespa/documentapi/messagebus/systemstate/nodestate.h
+++ b/documentapi/src/vespa/documentapi/messagebus/systemstate/nodestate.h
@@ -1,9 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <map>
 #include <vespa/documentapi/common.h>
-
+#include <map>
 
 namespace documentapi {
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/systemstate/systemstate.cpp b/documentapi/src/vespa/documentapi/messagebus/systemstate/systemstate.cpp
index 3177a9f6a98..627a760b324 100644
--- a/documentapi/src/vespa/documentapi/messagebus/systemstate/systemstate.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/systemstate/systemstate.cpp
@@ -1,16 +1,16 @@
 // 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(".systemstate");
 
+#include "systemstate.h"
+#include <vespa/vespalib/util/stringfmt.h>
 #include <boost/spirit/include/classic_core.hpp>
 #include <boost/spirit/include/classic_parse_tree.hpp>
 #include <boost/spirit/include/classic_tree_to_xml.hpp>
 #include <boost/spirit/include/classic_chset.hpp>
 #include <boost/spirit/include/classic_escape_char.hpp>
 #include <boost/spirit/include/classic_grammar_def.hpp>
-#include <vespa/vespalib/util/stringfmt.h>
-#include "systemstate.h"
+
+#include <vespa/log/log.h>
+LOG_SETUP(".systemstate");
 
 using namespace documentapi;
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/systemstate/systemstate.h b/documentapi/src/vespa/documentapi/messagebus/systemstate/systemstate.h
index 8254dc29c30..1d958c42b2d 100644
--- a/documentapi/src/vespa/documentapi/messagebus/systemstate/systemstate.h
+++ b/documentapi/src/vespa/documentapi/messagebus/systemstate/systemstate.h
@@ -1,9 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <string>
-#include <vespa/vespalib/util/sync.h>
 #include "nodestate.h"
+#include <vespa/vespalib/util/sync.h>
 
 namespace documentapi {
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/systemstate/systemstatehandle.cpp b/documentapi/src/vespa/documentapi/messagebus/systemstate/systemstatehandle.cpp
index 9049e889691..6d3d9a19568 100644
--- a/documentapi/src/vespa/documentapi/messagebus/systemstate/systemstatehandle.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/systemstate/systemstatehandle.cpp
@@ -1,36 +1,32 @@
 // 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 "systemstatehandle.h"
 
 using namespace documentapi;
 
 SystemStateHandover::SystemStateHandover(SystemState *state, vespalib::LockGuard &guard) :
     _state(state),
-    _guard(guard) {
-    // empty
-}
+    _guard(guard)
+{}
 
 SystemStateHandle::SystemStateHandle(SystemState &state) :
     _state(&state),
-    _guard(state._lock) {
-    // empty
-}
+    _guard(state._lock)
+{}
 
 SystemStateHandle::SystemStateHandle(SystemStateHandle &rhs) :
     _state(rhs._state),
-    _guard(rhs._guard) {
+    _guard(rhs._guard)
+{
     rhs._state = NULL;
 }
 
 SystemStateHandle::SystemStateHandle(const SystemStateHandover &rhs) :
     _state(rhs._state),
-    _guard(rhs._guard) {
-    // empty
-}
+    _guard(rhs._guard)
+{}
 
-SystemStateHandle::~SystemStateHandle() {
-    // empty
-}
+SystemStateHandle::~SystemStateHandle() {}
 
 SystemStateHandle::operator
 SystemStateHandover() {
diff --git a/documentapi/src/vespa/documentapi/messagebus/systemstate/systemstatehandle.h b/documentapi/src/vespa/documentapi/messagebus/systemstate/systemstatehandle.h
index 6be94dcc04a..7c82624fa15 100644
--- a/documentapi/src/vespa/documentapi/messagebus/systemstate/systemstatehandle.h
+++ b/documentapi/src/vespa/documentapi/messagebus/systemstate/systemstatehandle.h
@@ -1,8 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <vespa/vespalib/util/sync.h>
 #include "systemstate.h"
+#include <vespa/vespalib/util/sync.h>
 
 namespace documentapi {
 
@@ -75,4 +75,3 @@ public:
 };
 
 }
-
diff --git a/documentapi/src/vespa/documentapi/messagebus/systemstate/urlencoder.cpp b/documentapi/src/vespa/documentapi/messagebus/systemstate/urlencoder.cpp
index 85bacbdb8db..c9bd1943005 100644
--- a/documentapi/src/vespa/documentapi/messagebus/systemstate/urlencoder.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/systemstate/urlencoder.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 "urlencoder.h"
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/stllike/asciistream.h>
-#include "urlencoder.h"
 
 using namespace documentapi;