Reduce fastos.h dependency.

79 files changed, 196 insertions, 526 deletions

diff --git a/searchcore/src/apps/proton/downpersistence.cpp b/searchcore/src/apps/proton/downpersistence.cpp
index 3509d59d635..b7872286246 100644
--- a/searchcore/src/apps/proton/downpersistence.cpp
+++ b/searchcore/src/apps/proton/downpersistence.cpp
@@ -1,16 +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 "downpersistence.h"
+
 #include <vespa/persistence/spi/persistenceprovider.h>
 #include <vespa/searchlib/util/statefile.h>
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/document/update/documentupdate.h>
-#include "downpersistence.h"
-#include <vespa/log/log.h>
-LOG_SETUP(".downpersistence");
-
-namespace storage {
 
-namespace spi {
+namespace storage::spi {
 
 namespace {
 
@@ -18,18 +14,15 @@ Result errorResult(Result::FATAL_ERROR, "Node is down");
 
 }
 
-
 DownPersistence::DownPersistence(const vespalib::string &downReason)
     : _downReason(downReason)
 {
 }
 
-
 DownPersistence::~DownPersistence()
 {
 }
 
-
 Result
 DownPersistence::initialize()
 {
@@ -63,7 +56,6 @@ DownPersistence:: setActiveState(const Bucket&, BucketInfo::ActiveState)
     return errorResult;
 }
 
-
 BucketInfoResult
 DownPersistence:: getBucketInfo(const Bucket&) const
 {
@@ -77,7 +69,6 @@ DownPersistence::put(const Bucket&, Timestamp, const Document::SP&, Context&)
     return errorResult;
 }
 
-
 RemoveResult
 DownPersistence:: remove(const Bucket&, Timestamp,
                          const DocumentId&, Context&)
@@ -86,7 +77,6 @@ DownPersistence:: remove(const Bucket&, Timestamp,
                         errorResult.getErrorMessage());
 }
 
-
 RemoveResult
 DownPersistence::removeIfFound(const Bucket&, Timestamp,
                                const DocumentId&, Context&)
@@ -95,14 +85,12 @@ DownPersistence::removeIfFound(const Bucket&, Timestamp,
                         errorResult.getErrorMessage());
 }
 
-
 Result
 DownPersistence::removeEntry(const Bucket&, Timestamp, Context&)
 {
     return errorResult;
 }
 
-
 UpdateResult DownPersistence::update(const Bucket&, Timestamp,
                                      const DocumentUpdate::SP&, Context&)
 {
@@ -110,7 +98,6 @@ UpdateResult DownPersistence::update(const Bucket&, Timestamp,
                         errorResult.getErrorMessage());
 }
 
-
 Result
 DownPersistence::flush(const Bucket&, Context&)
 {
@@ -195,5 +182,3 @@ DownPersistence::move(const Bucket&, PartitionId, Context&)
 }
 
 }
-
-}
diff --git a/searchcore/src/apps/proton/downpersistence.h b/searchcore/src/apps/proton/downpersistence.h
index 4eeb301e617..27083a07d6b 100644
--- a/searchcore/src/apps/proton/downpersistence.h
+++ b/searchcore/src/apps/proton/downpersistence.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
 
-namespace storage {
+#include <vespa/persistence/spi/persistenceprovider.h>
 
-namespace spi {
+namespace storage::spi {
 
 /*
  * Persistence provider that returns error code for all operations
@@ -23,83 +24,34 @@ public:
 
     typedef std::unique_ptr<PersistenceProvider> UP;
 
-    virtual ~DownPersistence();
-
-    virtual Result initialize() override;
-
-    virtual PartitionStateListResult getPartitionStates() const override;
-
-    virtual BucketIdListResult listBuckets(PartitionId) const override;
-
-    virtual Result setClusterState(const ClusterState&) override;
-
-    virtual Result setActiveState(const Bucket&,
-                                  BucketInfo::ActiveState) override;
-
-    virtual BucketInfoResult getBucketInfo(const Bucket&) const override;
-
-    virtual Result put(const Bucket&, Timestamp, const Document::SP&, Context&) override;
-
-    virtual RemoveResult remove(const Bucket&,
-                                Timestamp timestamp,
-                                const DocumentId& id,
-                                Context&) override;
-
-    virtual RemoveResult removeIfFound(const Bucket&,
-                                       Timestamp timestamp,
-                                       const DocumentId& id,
-                                       Context&) override;
-
-    virtual Result removeEntry(const Bucket&, Timestamp, Context&) override;
-
-    virtual UpdateResult update(const Bucket&,
-                                Timestamp timestamp,
-                                const DocumentUpdate::SP& update,
-                                Context&) override;
-
-    virtual Result flush(const Bucket&, Context&) override;
-
-    virtual GetResult get(const Bucket&,
-                          const document::FieldSet& fieldSet,
-                          const DocumentId& id,
-                          Context&) const override;
-
-    virtual CreateIteratorResult createIterator(
-            const Bucket&,
-            const document::FieldSet& fieldSet,
-            const Selection& selection, //TODO: Make AST
-            IncludedVersions versions,
-            Context&) override;
-
-    virtual IterateResult iterate(IteratorId id,
-                                  uint64_t maxByteSize,
-                                  Context&) const override;
-
-    virtual Result destroyIterator(IteratorId id, Context&) override;
-
-    virtual Result createBucket(const Bucket&, Context&) override;
-
-    virtual Result deleteBucket(const Bucket&, Context&) override;
-
-    virtual BucketIdListResult getModifiedBuckets() const override;
-
-    virtual Result maintain(const Bucket&,
-                            MaintenanceLevel level) override;
-
-    virtual Result split(const Bucket& source,
-                         const Bucket& target1,
-                         const Bucket& target2,
-                         Context&) override;
-
-    virtual Result join(const Bucket& source1,
-                        const Bucket& source2,
-                        const Bucket& target,
-                        Context&) override;
-
-    virtual Result move(const Bucket&, PartitionId target, Context&) override;
-
+    ~DownPersistence() override;
+
+    Result initialize() override;
+    PartitionStateListResult getPartitionStates() const override;
+    BucketIdListResult listBuckets(PartitionId) const override;
+    Result setClusterState(const ClusterState&) override;
+    Result setActiveState(const Bucket&, BucketInfo::ActiveState) override;
+    BucketInfoResult getBucketInfo(const Bucket&) const override;
+    Result put(const Bucket&, Timestamp, const DocumentSP&, Context&) override;
+    RemoveResult remove(const Bucket&, Timestamp timestamp, const DocumentId& id, Context&) override;
+    RemoveResult removeIfFound(const Bucket&, Timestamp timestamp, const DocumentId& id, Context&) override;
+    Result removeEntry(const Bucket&, Timestamp, Context&) override;
+    UpdateResult update(const Bucket&, Timestamp timestamp, const DocumentUpdateSP& update, Context&) override;
+    Result flush(const Bucket&, Context&) override;
+    GetResult get(const Bucket&, const document::FieldSet& fieldSet, const DocumentId& id, Context&) const override;
+
+    CreateIteratorResult createIterator(const Bucket&, const document::FieldSet& fieldSet,
+                                        const Selection& selection, IncludedVersions versions, Context&) override;
+
+    IterateResult iterate(IteratorId id, uint64_t maxByteSize, Context&) const override;
+    Result destroyIterator(IteratorId id, Context&) override;
+    Result createBucket(const Bucket&, Context&) override;
+    Result deleteBucket(const Bucket&, Context&) override;
+    BucketIdListResult getModifiedBuckets() const override;
+    Result maintain(const Bucket&, MaintenanceLevel level) override;
+    Result split(const Bucket& source, const Bucket& target1, const Bucket& target2, Context&) override;
+    Result join(const Bucket& source1, const Bucket& source2, const Bucket& target, Context&) override;
+    Result move(const Bucket&, PartitionId target, Context&) override;
 };
 
 }
-
-}
diff --git a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp
index 87c85f99752..5731700a55f 100644
--- a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp
+++ b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.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("verify_ranksetup");
 
 #include <vespa/config-attributes.h>
 #include <vespa/config-imported-fields.h>
@@ -19,6 +16,10 @@ LOG_SETUP("verify_ranksetup");
 #include <vespa/searchlib/features/setup.h>
 #include <vespa/searchlib/fef/fef.h>
 #include <vespa/searchlib/fef/test/plugin/setup.h>
+#include <vespa/fastos/app.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP("verify_ranksetup");
 
 using config::ConfigContext;
 using config::ConfigHandle;
diff --git a/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp b/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp
index d9f6857754f..835c06db3cf 100644
--- a/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp
+++ b/searchcore/src/apps/vespa-gen-testdocs/vespa-gen-testdocs.cpp
@@ -1,17 +1,19 @@
 // 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("vespa-gen-testdocs");
-#include <algorithm>
-#include <string>
+
 #include <vespa/searchlib/util/rand48.h>
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/vespalib/stllike/hash_set.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/fastlib/io/bufferedfile.h>
+#include <vespa/fastos/app.h>
 #include <iostream>
+#include <algorithm>
+#include <string>
 #include <openssl/sha.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP("vespa-gen-testdocs");
+
 typedef vespalib::hash_set<vespalib::string> StringSet;
 typedef vespalib::hash_set<uint32_t> UIntSet;
 typedef std::vector<vespalib::string> StringArray;
diff --git a/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp b/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp
index 2dbd1e9c19b..bfbe27cb26c 100644
--- a/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp
+++ b/searchcore/src/apps/vespa-proton-cmd/vespa-proton-cmd.cpp
@@ -1,18 +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("vespa-proton-cmd");
-#include <vespa/fnet/frt/frt.h>
-#include <algorithm>
-#include <string>
+
 #include <vespa/slobrok/sbmirror.h>
 #include <vespa/config-slobroks.h>
-#include <vespa/vespalib/util/host_name.h>
 #include <vespa/config/common/configsystem.h>
+#include <vespa/fnet/frt/frt.h>
+#include <vespa/vespalib/util/host_name.h>
+#include <vespa/fastos/app.h>
+#include <algorithm>
+#include <string>
 
+#include <vespa/log/log.h>
+LOG_SETUP("vespa-proton-cmd");
 
-namespace pandora {
-namespace rtc_cmd {
+namespace pandora::rtc_cmd {
 
 class App : public FastOS_Application
 {
@@ -405,7 +405,6 @@ App::monitorLoop()
 }
 
 } // namespace pandora::rtc_cmd
-} // namespace pandora
 
 
 int main(int argc, char **argv)
diff --git a/searchcore/src/vespa/searchcore/proton/common/handlermap.hpp b/searchcore/src/vespa/searchcore/proton/common/handlermap.hpp
index e4c8bdd8f84..4d9ce09d77d 100644
--- a/searchcore/src/vespa/searchcore/proton/common/handlermap.hpp
+++ b/searchcore/src/vespa/searchcore/proton/common/handlermap.hpp
@@ -1,13 +1,14 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <vespa/searchcore/proton/common/doctypename.h>
+#include "doctypename.h"
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/vespalib/util/sync.h>
 #include <vespa/vespalib/util/sequence.h>
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/vespalib/stllike/hash_map.h>
 #include <map>
+#include <vector>
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/attribute_metrics.cpp b/searchcore/src/vespa/searchcore/proton/metrics/attribute_metrics.cpp
index e6a03c8df52..a0a63cadbdc 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/attribute_metrics.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/attribute_metrics.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 "attribute_metrics.h"
 
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/feed_metrics.cpp b/searchcore/src/vespa/searchcore/proton/metrics/feed_metrics.cpp
index 9f60951393c..494f54add46 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/feed_metrics.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/feed_metrics.cpp
@@ -1,10 +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/log/log.h>
-LOG_SETUP(".proton.feedengine.feedmetrics");
 #include "feed_metrics.h"
-#include <vespa/vespalib/util/sync.h>
 
 using vespalib::LockGuard;
 
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/job_load_sampler.cpp b/searchcore/src/vespa/searchcore/proton/metrics/job_load_sampler.cpp
index 95fb6a0993d..05a8bf405cc 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/job_load_sampler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/job_load_sampler.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/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".proton.metrics.job_load_sampler");
 #include "job_load_sampler.h"
+#include <cassert>
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_task.cpp b/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_task.cpp
index a96164d506c..7c600d1fe8c 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_task.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/job_tracked_flush_task.cpp
@@ -1,8 +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/log/log.h>
-LOG_SETUP(".proton.metrics.job_tracked_flush_task");
 #include "job_tracked_flush_task.h"
 
 using searchcorespi::FlushTask;
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/job_tracker.cpp b/searchcore/src/vespa/searchcore/proton/metrics/job_tracker.cpp
index 5c7dd5d8749..c6ea2970135 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/job_tracker.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/job_tracker.cpp
@@ -1,14 +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/log/log.h>
-LOG_SETUP(".proton.metrics.job_tracker");
 #include "job_tracker.h"
-#include <vespa/fastos/timestamp.h>
-#include <chrono>
-
-using fastos::TimeStamp;
-using fastos::ClockSystem;
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/legacy_attribute_metrics.cpp b/searchcore/src/vespa/searchcore/proton/metrics/legacy_attribute_metrics.cpp
index 10083daa769..0591770bdef 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/legacy_attribute_metrics.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/legacy_attribute_metrics.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 "legacy_attribute_metrics.h"
 
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/metrics_engine.cpp b/searchcore/src/vespa/searchcore/proton/metrics/metrics_engine.cpp
index 125ffde7530..4586bd51ae2 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/metrics_engine.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/metrics_engine.cpp
@@ -1,12 +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 "metrics_engine.h"
+#include "attribute_metrics_collection.h"
 #include <vespa/metrics/jsonwriter.h>
 #include <vespa/metrics/metricmanager.h>
+
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.server.metricsengine");
-#include "attribute_metrics_collection.h"
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/reference/document_db_reference.cpp b/searchcore/src/vespa/searchcore/proton/reference/document_db_reference.cpp
index b9306a17bfb..3c686c10675 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/document_db_reference.cpp
+++ b/searchcore/src/vespa/searchcore/proton/reference/document_db_reference.cpp
@@ -1,12 +1,11 @@
 // Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/fastos.h>
 #include "document_db_reference.h"
-#include <vespa/searchlib/attribute/attributeguard.h>
-#include <vespa/searchlib/attribute/iattributemanager.h>
 #include "gid_to_lid_mapper_factory.h"
-#include <vespa/searchcore/proton/documentmetastore/documentmetastore.h>
 #include "gid_to_lid_change_registrator.h"
+#include <vespa/searchcore/proton/documentmetastore/documentmetastore.h>
+#include <vespa/searchlib/attribute/attributeguard.h>
+#include <vespa/searchlib/attribute/iattributemanager.h>
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_registry.cpp b/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_registry.cpp
index 80f5d160d8c..16a16323c9f 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_registry.cpp
+++ b/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_registry.cpp
@@ -1,6 +1,5 @@
 // Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/fastos.h>
 #include "document_db_reference_registry.h"
 
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_resolver.cpp b/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_resolver.cpp
index 58cd50fdd46..c60ee3f176c 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_resolver.cpp
+++ b/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_resolver.cpp
@@ -1,20 +1,19 @@
 // Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/fastos.h>
 #include "document_db_reference_resolver.h"
 #include "gid_to_lid_change_listener.h"
 #include "gid_to_lid_change_registrator.h"
 #include "i_document_db_reference.h"
 #include "i_document_db_reference_registry.h"
-#include <vespa/config-imported-fields.h>
-#include <vespa/document/datatype/documenttype.h>
-#include <vespa/document/datatype/referencedatatype.h>
-#include <vespa/document/repo/documenttyperepo.h>
-#include <vespa/searchcommon/attribute/iattributevector.h>
 #include <vespa/searchcore/proton/attribute/imported_attributes_repo.h>
+#include <vespa/searchcommon/attribute/iattributevector.h>
 #include <vespa/searchlib/attribute/iattributemanager.h>
 #include <vespa/searchlib/attribute/imported_attribute_vector.h>
 #include <vespa/searchlib/attribute/reference_attribute.h>
+#include <vespa/config-imported-fields.h>
+#include <vespa/document/datatype/documenttype.h>
+#include <vespa/document/datatype/referencedatatype.h>
+#include <vespa/document/repo/documenttyperepo.h>
 
 using document::DataType;
 using document::DocumentType;
diff --git a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper.cpp b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper.cpp
index 8b5f0fb5515..1a6d58592ff 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper.cpp
+++ b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper.cpp
@@ -1,6 +1,5 @@
 // Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/fastos.h>
 #include "gid_to_lid_mapper.h"
 
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper_factory.cpp b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper_factory.cpp
index 7582b7d304a..f9902589cee 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper_factory.cpp
+++ b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper_factory.cpp
@@ -1,6 +1,5 @@
 // Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/fastos.h>
 #include "gid_to_lid_mapper_factory.h"
 #include "gid_to_lid_mapper.h"
 #include <vespa/searchcore/proton/documentmetastore/documentmetastore.h>
diff --git a/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference_resolver.h b/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference_resolver.h
index 9130f0072a6..2de5928cdf9 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference_resolver.h
+++ b/searchcore/src/vespa/searchcore/proton/reference/i_document_db_reference_resolver.h
@@ -1,6 +1,8 @@
 // Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
+#include <memory>
+
 namespace search { class IAttributeManager; }
 
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/reprocessing/attribute_reprocessing_initializer.cpp b/searchcore/src/vespa/searchcore/proton/reprocessing/attribute_reprocessing_initializer.cpp
index c5c46b7f1af..70251012554 100644
--- a/searchcore/src/vespa/searchcore/proton/reprocessing/attribute_reprocessing_initializer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/reprocessing/attribute_reprocessing_initializer.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 "attribute_reprocessing_initializer.h"
 #include <vespa/searchcore/proton/attribute/attribute_populator.h>
 #include <vespa/searchcore/proton/attribute/document_field_populator.h>
diff --git a/searchcore/src/vespa/searchcore/proton/reprocessing/i_reprocessing_task.h b/searchcore/src/vespa/searchcore/proton/reprocessing/i_reprocessing_task.h
index 5f695fa87f1..5a3b4af1b48 100644
--- a/searchcore/src/vespa/searchcore/proton/reprocessing/i_reprocessing_task.h
+++ b/searchcore/src/vespa/searchcore/proton/reprocessing/i_reprocessing_task.h
@@ -2,6 +2,9 @@
 
 #pragma once
 
+#include <memory>
+#include <vector>
+
 namespace proton {
 
 /**
@@ -23,31 +26,22 @@ public:
         Progress()
             : _progress(0.0),
               _weight(0.0)
-        {
-        }
+        {}
 
         Progress(double progress, double weight)
             : _progress(progress),
               _weight(weight)
-        {
-        }
+        {}
     };
 
-    virtual
-    ~IReprocessingTask()
-    {
-    }
+    virtual ~IReprocessingTask() {}
 
     /**
      * Run reprocessing task.
      */
-    virtual void
-    run() = 0;
+    virtual void run() = 0;
 
-    virtual Progress
-    getProgress() const = 0;
+    virtual Progress getProgress() const = 0;
 };
 
-
 } // namespace proton
-
diff --git a/searchcore/src/vespa/searchcore/proton/reprocessing/reprocess_documents_task.cpp b/searchcore/src/vespa/searchcore/proton/reprocessing/reprocess_documents_task.cpp
index 59b3966454a..62eee35df5f 100644
--- a/searchcore/src/vespa/searchcore/proton/reprocessing/reprocess_documents_task.cpp
+++ b/searchcore/src/vespa/searchcore/proton/reprocessing/reprocess_documents_task.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 "reprocess_documents_task.h"
 #include "attribute_reprocessing_initializer.h"
 #include "document_reprocessing_handler.h"
 #include <vespa/searchcore/proton/common/eventlogger.h>
 
-namespace proton
-{
-
+namespace proton {
 
 ReprocessDocumentsTask::
 ReprocessDocumentsTask(IReprocessingInitializer &initializer,
diff --git a/searchcore/src/vespa/searchcore/proton/reprocessing/reprocessingrunner.cpp b/searchcore/src/vespa/searchcore/proton/reprocessing/reprocessingrunner.cpp
index 4891829bbea..52e39176663 100644
--- a/searchcore/src/vespa/searchcore/proton/reprocessing/reprocessingrunner.cpp
+++ b/searchcore/src/vespa/searchcore/proton/reprocessing/reprocessingrunner.cpp
@@ -1,13 +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 <mutex>
 #include "reprocessingrunner.h"
 #include "i_reprocessing_task.h"
+#include <mutex>
 
-namespace proton
-{
-
+namespace proton {
 
 ReprocessingRunner::ReprocessingRunner()
     : _lock(),
@@ -85,5 +82,4 @@ ReprocessingRunner::getProgress() const
     return weightedProgress / weight;
 }
 
-
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/reprocessing/reprocessingrunner.h b/searchcore/src/vespa/searchcore/proton/reprocessing/reprocessingrunner.h
index e9f4a3f31b7..41bef8815bd 100644
--- a/searchcore/src/vespa/searchcore/proton/reprocessing/reprocessingrunner.h
+++ b/searchcore/src/vespa/searchcore/proton/reprocessing/reprocessingrunner.h
@@ -3,9 +3,10 @@
 #pragma once
 
 #include <mutex>
+#include <memory>
+#include <vector>
 
-namespace proton
-{
+namespace proton {
 
 class IReprocessingTask;
 
@@ -29,22 +30,11 @@ private:
 public:
     ReprocessingRunner();
 
-    void
-    addTasks(const ReprocessingTasks &tasks);
-
-    void
-    run();
-
-    void
-    reset();
-
-    bool
-    empty() const;
-
-    double
-    getProgress() const;
+    void addTasks(const ReprocessingTasks &tasks);
+    void run();
+    void reset();
+    bool empty() const;
+    double getProgress() const;
 };
 
-
 } // namespace proton
-
diff --git a/searchcore/src/vespa/searchcore/proton/server/buckethandler.cpp b/searchcore/src/vespa/searchcore/proton/server/buckethandler.cpp
index d98912ffec1..f51d3df2476 100644
--- a/searchcore/src/vespa/searchcore/proton/server/buckethandler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/buckethandler.cpp
@@ -1,11 +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(".proton.server.buckethandler");
 #include "buckethandler.h"
-#include <vespa/vespalib/util/closuretask.h>
 #include "ibucketstatechangedhandler.h"
+#include <vespa/vespalib/util/closuretask.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP(".proton.server.buckethandler");
 
 using document::BucketId;
 using storage::spi::Bucket;
diff --git a/searchcore/src/vespa/searchcore/proton/server/bucketmovejob.cpp b/searchcore/src/vespa/searchcore/proton/server/bucketmovejob.cpp
index d5da1cd1868..a95079cca0a 100644
--- a/searchcore/src/vespa/searchcore/proton/server/bucketmovejob.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/bucketmovejob.cpp
@@ -1,8 +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/log/log.h>
-LOG_SETUP(".proton.server.bucketmovejob");
 #include "bucketmovejob.h"
 #include "imaintenancejobrunner.h"
 #include "ibucketstatechangednotifier.h"
@@ -11,6 +8,9 @@ LOG_SETUP(".proton.server.bucketmovejob");
 #include "i_disk_mem_usage_notifier.h"
 #include <vespa/searchcore/proton/documentmetastore/i_document_meta_store.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP(".proton.server.bucketmovejob");
+
 using document::BucketId;
 using storage::spi::BucketInfo;
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp b/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp
index bca74b10058..0cc6823f300 100644
--- a/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp
@@ -1,13 +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/log/log.h>
-LOG_SETUP(".proton.server.clusterstatehandler");
 #include "clusterstatehandler.h"
 #include "iclusterstatechangedhandler.h"
 #include <vespa/vespalib/util/closuretask.h>
 #include <algorithm>
 
+#include <vespa/log/log.h>
+LOG_SETUP(".proton.server.clusterstatehandler");
+
 using storage::spi::Bucket;
 using storage::spi::BucketIdListResult;
 using storage::spi::ClusterState;
diff --git a/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp b/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp
index b2ea64f6070..95c005ec46a 100644
--- a/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.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 "combiningfeedview.h"
 #include <vespa/searchcore/proton/documentmetastore/i_document_meta_store.h>
 #include <vespa/searchcore/proton/feedoperation/moveoperation.h>
 #include <vespa/document/fieldvalue/document.h>
+
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.server.combiningfeedview");
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/ddbstate.cpp b/searchcore/src/vespa/searchcore/proton/server/ddbstate.cpp
index 4b14fae358b..7ede0de3971 100644
--- a/searchcore/src/vespa/searchcore/proton/server/ddbstate.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/ddbstate.cpp
@@ -1,11 +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(".proton.server.ddbstate");
-
 #include "ddbstate.h"
-
+#include <cassert>
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/ddbstate.h b/searchcore/src/vespa/searchcore/proton/server/ddbstate.h
index 041e161c920..ace55498fce 100644
--- a/searchcore/src/vespa/searchcore/proton/server/ddbstate.h
+++ b/searchcore/src/vespa/searchcore/proton/server/ddbstate.h
@@ -4,9 +4,9 @@
 #include <vespa/vespalib/stllike/string.h>
 #include <mutex>
 #include <condition_variable>
+#include <vector>
 
-namespace proton
-{
+namespace proton {
 
 /**
  * Track document db main state and validate that state transitions follow
@@ -18,8 +18,7 @@ namespace proton
 class DDBState
 {
 public:
-    enum class State
-    {
+    enum class State {
         CONSTRUCT,
         LOAD,
         REPLAY_TRANSACTION_LOG,
@@ -31,8 +30,7 @@ public:
         DEAD
     };
 
-    enum class ConfigState
-    {
+    enum class ConfigState {
         OK,
         NEED_RESTART
     };
@@ -52,103 +50,53 @@ private:
 
 public:
     DDBState();
-
     ~DDBState();
 
     /**
      * Try to enter LOAD state.  Fail and return false if document db is
      * being shut down.
      */ 
-    bool
-    enterLoadState();
+    bool enterLoadState();
+    bool enterReplayTransactionLogState();
+    bool enterReplaySpoolerState();
+    bool enterRedoReprocessState();
+    bool enterApplyLiveConfigState();
+    bool enterReprocessState();
+    bool enterOnlineState();
+    void enterShutdownState();
+    void enterDeadState();
+    State getState() const { return _state; }
+    static vespalib::string getStateString(State state);
     
-    bool
-    enterReplayTransactionLogState();
-
-    bool
-    enterReplaySpoolerState();
-
-    bool
-    enterRedoReprocessState();
-
-    bool
-    enterApplyLiveConfigState();
-
-    bool
-    enterReprocessState();
-
-    bool
-    enterOnlineState();
-
-    void
-    enterShutdownState();
-
-    void
-    enterDeadState();
-
-    State
-    getState() const
-    {
-        return _state;
-    }
-
-    static vespalib::string
-    getStateString(State state);
-    
-    bool
-    getClosed() const
-    {
+    bool getClosed() const{
         State state(_state);
         return state >= State::SHUTDOWN;
     }
 
-    bool
-    getAllowReconfig() const
-    {
+    bool getAllowReconfig() const {
         State state(_state);
         return state >= State::APPLY_LIVE_CONFIG && state < State::SHUTDOWN;
     }
 
-    bool
-    getAllowPrune() const
-    {
+    bool getAllowPrune() const {
         State state(_state);
         return state == State::ONLINE;
     }
     
-    static bool
-    getDelayedConfig(ConfigState state)
-    {
+    static bool getDelayedConfig(ConfigState state) {
         return state != ConfigState::OK;
     }
     
-    bool
-    getDelayedConfig() const
-    {
+    bool getDelayedConfig() const {
         ConfigState state(_configState);
         return getDelayedConfig(state);
     }
 
-    void
-    clearDelayedConfig();
-
-    ConfigState
-    getConfigState() const
-    {
-        return _configState;
-    }
-
-    static vespalib::string
-    getConfigStateString(ConfigState configState);
-
-    void
-    setConfigState(ConfigState newConfigState);
-
-    void
-    waitForOnlineState();
+    void clearDelayedConfig();
+    ConfigState getConfigState() const { return _configState; }
+    static vespalib::string getConfigStateString(ConfigState configState);
+    void setConfigState(ConfigState newConfigState);
+    void waitForOnlineState();
 };
 
-
-
 } // namespace proton
-
diff --git a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_forwarder.cpp b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_forwarder.cpp
index a6c339076a5..47e6c84f172 100644
--- a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_forwarder.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_forwarder.cpp
@@ -1,13 +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 "disk_mem_usage_forwarder.h"
 #include <vespa/searchlib/common/lambdatask.h>
+#include <cassert>
 
 using search::makeLambdaTask;
 
-namespace proton
-{
+namespace proton {
 
 DiskMemUsageForwarder::DiskMemUsageForwarder(searchcorespi::index::IThreadService &executor)
     : IDiskMemUsageNotifier(),
diff --git a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_forwarder.h b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_forwarder.h
index 28e4d3d0acf..26ce2c69d7c 100644
--- a/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_forwarder.h
+++ b/searchcore/src/vespa/searchcore/proton/server/disk_mem_usage_forwarder.h
@@ -2,12 +2,12 @@
 
 #pragma once
 
-#include <vespa/searchcorespi/index/i_thread_service.h>
 #include "i_disk_mem_usage_notifier.h"
 #include "i_disk_mem_usage_listener.h"
+#include <vespa/searchcorespi/index/i_thread_service.h>
+#include <vector>
 
-namespace proton
-{
+namespace proton {
 
 /**
  * Forwarder for disk/memory usage state changes. Notification is forwarded
@@ -22,10 +22,10 @@ class DiskMemUsageForwarder : public IDiskMemUsageNotifier,
     void forward(DiskMemUsageState state);
 public:
     DiskMemUsageForwarder(searchcorespi::index::IThreadService &executor);
-    virtual ~DiskMemUsageForwarder();
-    virtual void addDiskMemUsageListener(IDiskMemUsageListener *listener) override;
-    virtual void removeDiskMemUsageListener(IDiskMemUsageListener *listener) override;
-    virtual void notifyDiskMemUsage(DiskMemUsageState state) override;
+    ~DiskMemUsageForwarder() override;
+    void addDiskMemUsageListener(IDiskMemUsageListener *listener) override;
+    void removeDiskMemUsageListener(IDiskMemUsageListener *listener) override;
+    void notifyDiskMemUsage(DiskMemUsageState state) override;
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/document_db_maintenance_config.cpp b/searchcore/src/vespa/searchcore/proton/server/document_db_maintenance_config.cpp
index 535289886f6..d64b608a7d9 100644
--- a/searchcore/src/vespa/searchcore/proton/server/document_db_maintenance_config.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/document_db_maintenance_config.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 "document_db_maintenance_config.h"
 
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/server/document_scan_iterator.cpp b/searchcore/src/vespa/searchcore/proton/server/document_scan_iterator.cpp
index d5777d3c723..31dbe5bd6cd 100644
--- a/searchcore/src/vespa/searchcore/proton/server/document_scan_iterator.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/document_scan_iterator.cpp
@@ -1,9 +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/log/log.h>
-LOG_SETUP(".proton.server.document_scan_iterator");
-
 #include "document_scan_iterator.h"
 #include <vespa/searchcore/proton/documentmetastore/i_document_meta_store.h>
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/document_subdb_collection_explorer.cpp b/searchcore/src/vespa/searchcore/proton/server/document_subdb_collection_explorer.cpp
index fffb40d1cdf..5a5f12c6210 100644
--- a/searchcore/src/vespa/searchcore/proton/server/document_subdb_collection_explorer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/document_subdb_collection_explorer.cpp
@@ -1,10 +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/log/log.h>
-LOG_SETUP(".proton.server.document_subdb_collection_explorer");
 #include "document_subdb_collection_explorer.h"
-
 #include "document_subdb_explorer.h"
 
 using vespalib::slime::Inserter;
diff --git a/searchcore/src/vespa/searchcore/proton/server/document_subdb_collection_initializer.cpp b/searchcore/src/vespa/searchcore/proton/server/document_subdb_collection_initializer.cpp
index d370a735a37..86e0554014a 100644
--- a/searchcore/src/vespa/searchcore/proton/server/document_subdb_collection_initializer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/document_subdb_collection_initializer.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 "document_subdb_collection_initializer.h"
 
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/server/document_subdb_explorer.cpp b/searchcore/src/vespa/searchcore/proton/server/document_subdb_explorer.cpp
index 68d51e13f2c..f67902bcb82 100644
--- a/searchcore/src/vespa/searchcore/proton/server/document_subdb_explorer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/document_subdb_explorer.cpp
@@ -1,8 +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/log/log.h>
-LOG_SETUP(".proton.server.document_subdb_explorer");
 #include "document_subdb_explorer.h"
 
 #include <vespa/searchcore/proton/attribute/attribute_manager_explorer.h>
diff --git a/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer_result.cpp b/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer_result.cpp
index 77e71169f09..4cf5047d150 100644
--- a/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer_result.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer_result.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 "document_subdb_initializer_result.h"
 
 using searchcorespi::IIndexManager;
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentbucketmover.cpp b/searchcore/src/vespa/searchcore/proton/server/documentbucketmover.cpp
index 815bfc75a70..e1ca1ece3d5 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentbucketmover.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentbucketmover.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 <vespa/log/log.h>
-LOG_SETUP(".proton.server.documentbucketmover");
 #include "documentbucketmover.h"
 #include "idocumentmovehandler.h"
+#include "maintenancedocumentsubdb.h"
 #include <vespa/searchcore/proton/feedoperation/moveoperation.h>
 #include <vespa/searchcore/proton/documentmetastore/i_document_meta_store.h>
 #include <vespa/searchcore/proton/persistenceengine/i_document_retriever.h>
-#include "maintenancedocumentsubdb.h"
 
 using document::BucketId;
 using document::Document;
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigscout.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigscout.cpp
index 2ebadce7e38..53620c23dbf 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigscout.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigscout.cpp
@@ -1,13 +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 "documentdbconfigscout.h"
 #include <vespa/searchcore/proton/attribute/attributesconfigscout.h>
 
 using vespa::config::search::AttributesConfig;
 
-namespace proton
-{
+namespace proton {
 
 
 DocumentDBConfig::SP
diff --git a/searchcore/src/vespa/searchcore/proton/server/emptysearchview.cpp b/searchcore/src/vespa/searchcore/proton/server/emptysearchview.cpp
index 6c975c5ae35..bde5978ddd8 100644
--- a/searchcore/src/vespa/searchcore/proton/server/emptysearchview.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/emptysearchview.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 "emptysearchview.h"
 #include <vespa/searchlib/engine/docsumreply.h>
 #include <vespa/searchlib/engine/searchreply.h>
+
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.server.emptysearchview");
 
@@ -12,8 +12,7 @@ using search::engine::DocsumRequest;
 using search::engine::SearchReply;
 using search::engine::SearchRequest;
 
-namespace proton
-{
+namespace proton {
 
 EmptySearchView::EmptySearchView()
     : ISearchHandler()
diff --git a/searchcore/src/vespa/searchcore/proton/server/executor_thread_service.cpp b/searchcore/src/vespa/searchcore/proton/server/executor_thread_service.cpp
index 2c7627ea712..fb65b09b309 100644
--- a/searchcore/src/vespa/searchcore/proton/server/executor_thread_service.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/executor_thread_service.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(".proton.server.executor_thread_service");
 
 #include "executor_thread_service.h"
 #include <vespa/vespalib/util/closuretask.h>
diff --git a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp
index 99df6ed8e1b..b04a1047934 100644
--- a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.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(".proton.server.executorthreadingservice");
 
 #include "executorthreadingservice.h"
 #include <vespa/vespalib/util/executor.h>
diff --git a/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb_configurer.cpp b/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb_configurer.cpp
index e755731c0a9..04a7a6d6407 100644
--- a/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb_configurer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb_configurer.cpp
@@ -1,9 +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/log/log.h>
-LOG_SETUP(".proton.server.fast_access_doc_subdb_configurer");
-
 #include "fast_access_doc_subdb_configurer.h"
 #include "i_attribute_writer_factory.h"
 #include <vespa/searchcore/proton/attribute/attribute_writer.h>
diff --git a/searchcore/src/vespa/searchcore/proton/server/flushhandlerproxy.cpp b/searchcore/src/vespa/searchcore/proton/server/flushhandlerproxy.cpp
index 8080140deb3..3dfe5d95e59 100644
--- a/searchcore/src/vespa/searchcore/proton/server/flushhandlerproxy.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/flushhandlerproxy.cpp
@@ -1,10 +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 "flushhandlerproxy.h"
 #include "documentdb.h"
-#include <vespa/log/log.h>
-LOG_SETUP(".proton.server.flushhandlerproxy");
 
 using searchcorespi::IFlushTarget;
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/forcecommitcontext.cpp b/searchcore/src/vespa/searchcore/proton/server/forcecommitcontext.cpp
index d382a76faeb..33d4ccb4ef0 100644
--- a/searchcore/src/vespa/searchcore/proton/server/forcecommitcontext.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/forcecommitcontext.cpp
@@ -1,13 +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 "forcecommitcontext.h"
 #include "forcecommitdonetask.h"
 #include <vespa/searchcore/proton/common/docid_limit.h>
+#include <cassert>
 
-namespace proton
-{
-
+namespace proton {
 
 ForceCommitContext::ForceCommitContext(vespalib::Executor &executor,
                                        IDocumentMetaStore &documentMetaStore)
@@ -18,7 +16,6 @@ ForceCommitContext::ForceCommitContext(vespalib::Executor &executor,
 {
 }
 
-
 ForceCommitContext::~ForceCommitContext()
 {
     if (_docIdLimit != nullptr) {
@@ -30,21 +27,18 @@ ForceCommitContext::~ForceCommitContext()
     }
 }
 
-
 void
 ForceCommitContext::reuseLids(std::vector<uint32_t> &&lids)
 {
     _task->reuseLids(std::move(lids));
 }
 
-
 void
 ForceCommitContext::holdUnblockShrinkLidSpace()
 {
     _task->holdUnblockShrinkLidSpace();
 }
 
-
 void
 ForceCommitContext::registerCommittedDocIdLimit(uint32_t committedDocIdLimit,
                                                 DocIdLimit *docIdLimit)
@@ -53,5 +47,4 @@ ForceCommitContext::registerCommittedDocIdLimit(uint32_t committedDocIdLimit,
     _docIdLimit = docIdLimit;
 }
 
-
 }  // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/forcecommitcontext.h b/searchcore/src/vespa/searchcore/proton/server/forcecommitcontext.h
index ecf50f1402a..65a677627ce 100644
--- a/searchcore/src/vespa/searchcore/proton/server/forcecommitcontext.h
+++ b/searchcore/src/vespa/searchcore/proton/server/forcecommitcontext.h
@@ -3,17 +3,13 @@
 #pragma once
 
 #include <vespa/searchlib/common/idestructorcallback.h>
+#include <memory>
+#include <cstdint>
+#include <vector>
 
-namespace vespalib
-{
-
-class Executor;
-
-}
-
+namespace vespalib { class Executor; }
 
-namespace proton
-{
+namespace proton {
 
 class ForceCommitDoneTask;
 class IDocumentMetaStore;
@@ -30,22 +26,18 @@ class ForceCommitContext : public search::IDestructorCallback
 {
     vespalib::Executor &_executor;
     std::unique_ptr<ForceCommitDoneTask> _task;
-    uint32_t _committedDocIdLimit;
+    uint32_t    _committedDocIdLimit;
     DocIdLimit *_docIdLimit;
 
 public:
     ForceCommitContext(vespalib::Executor &executor,
                        IDocumentMetaStore &documentMetaStore);
 
-    virtual ~ForceCommitContext();
+    ~ForceCommitContext() override;
 
     void reuseLids(std::vector<uint32_t> &&lids);
-
     void holdUnblockShrinkLidSpace();
-
-    void registerCommittedDocIdLimit(uint32_t committedDocIdLimit,
-                                     DocIdLimit *docIdLimit);
+    void registerCommittedDocIdLimit(uint32_t committedDocIdLimit, DocIdLimit *docIdLimit);
 };
 
-
 }  // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/forcecommitdonetask.cpp b/searchcore/src/vespa/searchcore/proton/server/forcecommitdonetask.cpp
index f78eed0164e..d669cd5a2a7 100644
--- a/searchcore/src/vespa/searchcore/proton/server/forcecommitdonetask.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/forcecommitdonetask.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 "forcecommitdonetask.h"
 #include <vespa/searchcore/proton/documentmetastore/i_document_meta_store.h>
 
-namespace proton
-{
-
+namespace proton {
 
 ForceCommitDoneTask::ForceCommitDoneTask(IDocumentMetaStore &documentMetaStore)
     : _lidsToReuse(),
@@ -15,12 +12,10 @@ ForceCommitDoneTask::ForceCommitDoneTask(IDocumentMetaStore &documentMetaStore)
 {
 }
 
-
 ForceCommitDoneTask::~ForceCommitDoneTask()
 {
 }
 
-
 void
 ForceCommitDoneTask::reuseLids(std::vector<uint32_t> &&lids)
 {
@@ -28,7 +23,6 @@ ForceCommitDoneTask::reuseLids(std::vector<uint32_t> &&lids)
     _lidsToReuse = std::move(lids);
 }
 
-
 void
 ForceCommitDoneTask::run()
 {
@@ -44,5 +38,4 @@ ForceCommitDoneTask::run()
     }
 }
 
-
 }  // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/forcecommitdonetask.h b/searchcore/src/vespa/searchcore/proton/server/forcecommitdonetask.h
index 73cb2ee1b47..28190ff68d5 100644
--- a/searchcore/src/vespa/searchcore/proton/server/forcecommitdonetask.h
+++ b/searchcore/src/vespa/searchcore/proton/server/forcecommitdonetask.h
@@ -3,9 +3,9 @@
 #pragma once
 
 #include <vespa/vespalib/util/executor.h>
+#include <vector>
 
-namespace proton
-{
+namespace proton {
 
 class IDocumentMetaStore;
 
@@ -32,7 +32,7 @@ class ForceCommitDoneTask : public vespalib::Executor::Task
 public:
     ForceCommitDoneTask(IDocumentMetaStore &documentMetaStore);
 
-    virtual ~ForceCommitDoneTask();
+    ~ForceCommitDoneTask() override;
 
     void reuseLids(std::vector<uint32_t> &&lids);
 
@@ -40,12 +40,11 @@ public:
         _holdUnblockShrinkLidSpace = true;
     }
 
-    virtual void run() override;
+    void run() override;
 
     bool empty() const {
         return _lidsToReuse.empty() && !_holdUnblockShrinkLidSpace;
     }
 };
 
-
 }  // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/health_adapter.cpp b/searchcore/src/vespa/searchcore/proton/server/health_adapter.cpp
index be5ed968851..8ab35d08d7e 100644
--- a/searchcore/src/vespa/searchcore/proton/server/health_adapter.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/health_adapter.cpp
@@ -1,10 +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(".proton.server.health_adapter");
-#include <vespa/vespalib/util/stringfmt.h>
 #include "health_adapter.h"
+#include <vespa/vespalib/util/stringfmt.h>
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/heart_beat_job.cpp b/searchcore/src/vespa/searchcore/proton/server/heart_beat_job.cpp
index b9dcf94c105..92c417d405b 100644
--- a/searchcore/src/vespa/searchcore/proton/server/heart_beat_job.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/heart_beat_job.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 "heart_beat_job.h"
 
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/server/idocumentdbowner.cpp b/searchcore/src/vespa/searchcore/proton/server/idocumentdbowner.cpp
index 402f4b5643a..0957b74f778 100644
--- a/searchcore/src/vespa/searchcore/proton/server/idocumentdbowner.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/idocumentdbowner.cpp
@@ -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 <vespa/fastos/fastos.h>
 #include "idocumentdbowner.h"
 
-namespace proton
-{
+namespace proton {
 
 IDocumentDBOwner::~IDocumentDBOwner()
 {
diff --git a/searchcore/src/vespa/searchcore/proton/server/ireplayconfig.cpp b/searchcore/src/vespa/searchcore/proton/server/ireplayconfig.cpp
index ef8efcbdea6..c798d56fc3d 100644
--- a/searchcore/src/vespa/searchcore/proton/server/ireplayconfig.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/ireplayconfig.cpp
@@ -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 <vespa/fastos/fastos.h>
 #include "ireplayconfig.h"
 
-namespace proton
-{
+namespace proton {
 
 IReplayConfig::~IReplayConfig()
 {
diff --git a/searchcore/src/vespa/searchcore/proton/server/job_tracked_maintenance_job.cpp b/searchcore/src/vespa/searchcore/proton/server/job_tracked_maintenance_job.cpp
index d8c197b6c87..cc61f34ee79 100644
--- a/searchcore/src/vespa/searchcore/proton/server/job_tracked_maintenance_job.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/job_tracked_maintenance_job.cpp
@@ -1,8 +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/log/log.h>
-LOG_SETUP(".proton.server.job_tracked_maintenance_job");
 #include "job_tracked_maintenance_job.h"
 
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job.cpp b/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job.cpp
index 0ce8cfe9575..bb45103a13f 100644
--- a/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/lid_space_compaction_job.cpp
@@ -1,14 +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/log/log.h>
-LOG_SETUP(".proton.server.lid_space_compaction_job");
-
 #include "lid_space_compaction_job.h"
 #include "ifrozenbuckethandler.h"
-#include <vespa/searchcore/proton/common/eventlogger.h>
 #include "imaintenancejobrunner.h"
 #include "i_disk_mem_usage_notifier.h"
+#include <vespa/searchcore/proton/common/eventlogger.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP(".proton.server.lid_space_compaction_job");
 
 using search::DocumentMetaData;
 using search::LidUsageStats;
diff --git a/searchcore/src/vespa/searchcore/proton/server/maintenance_controller_explorer.cpp b/searchcore/src/vespa/searchcore/proton/server/maintenance_controller_explorer.cpp
index 3bc7ae7603e..cd3a58c791d 100644
--- a/searchcore/src/vespa/searchcore/proton/server/maintenance_controller_explorer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/maintenance_controller_explorer.cpp
@@ -1,10 +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/log/log.h>
-LOG_SETUP(".proton.server.maintenance_controller_explorer");
 #include "maintenance_controller_explorer.h"
-
 #include <vespa/vespalib/data/slime/cursor.h>
 
 using vespalib::slime::Cursor;
diff --git a/searchcore/src/vespa/searchcore/proton/server/minimal_document_retriever.cpp b/searchcore/src/vespa/searchcore/proton/server/minimal_document_retriever.cpp
index 6c8ef4c30d1..3d6fd229c7b 100644
--- a/searchcore/src/vespa/searchcore/proton/server/minimal_document_retriever.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/minimal_document_retriever.cpp
@@ -1,9 +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/log/log.h>
-LOG_SETUP(".minimal_document_retriever");
-
 #include "minimal_document_retriever.h"
 #include <vespa/searchlib/docstore/idocumentstore.h>
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/operationdonecontext.cpp b/searchcore/src/vespa/searchcore/proton/server/operationdonecontext.cpp
index 215f21b66a8..068575ae96c 100644
--- a/searchcore/src/vespa/searchcore/proton/server/operationdonecontext.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/operationdonecontext.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 "operationdonecontext.h"
 #include <vespa/searchcore/proton/common/feedtoken.h>
 
-namespace proton
-{
-
+namespace proton {
 
 OperationDoneContext::OperationDoneContext(std::unique_ptr<FeedToken> token,
                                            const FeedOperation::Type opType,
@@ -17,13 +14,11 @@ OperationDoneContext::OperationDoneContext(std::unique_ptr<FeedToken> token,
 {
 }
 
-
 OperationDoneContext::~OperationDoneContext()
 {
     ack();
 }
 
-
 void
 OperationDoneContext::ack()
 {
@@ -33,12 +28,10 @@ OperationDoneContext::ack()
     }
 }
 
-
 bool
 OperationDoneContext::shouldTrace(uint32_t traceLevel)
 {
     return _token ? _token->shouldTrace(traceLevel) : false;
 }
 
-
 }  // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/persistencehandlerproxy.cpp b/searchcore/src/vespa/searchcore/proton/server/persistencehandlerproxy.cpp
index 07a37a1b299..24f7fd4f19c 100644
--- a/searchcore/src/vespa/searchcore/proton/server/persistencehandlerproxy.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/persistencehandlerproxy.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/fastos/fastos.h>
 #include "persistencehandlerproxy.h"
 #include "documentretriever.h"
-#include <vespa/persistence/spi/result.h>
 #include "documentdb.h"
 #include <vespa/searchcore/proton/feedoperation/createbucketoperation.h>
 #include <vespa/searchcore/proton/feedoperation/deletebucketoperation.h>
@@ -12,8 +10,7 @@
 #include <vespa/searchcore/proton/feedoperation/removeoperation.h>
 #include <vespa/searchcore/proton/feedoperation/splitbucketoperation.h>
 #include <vespa/searchcore/proton/feedoperation/updateoperation.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".proton.server.persistencehandlerproxy");
+#include <vespa/persistence/spi/result.h>
 
 using storage::spi::Bucket;
 using storage::spi::Timestamp;
@@ -29,20 +26,17 @@ PersistenceHandlerProxy::PersistenceHandlerProxy(const DocumentDB::SP &documentD
     _documentDB->retain();
 }
 
-
 PersistenceHandlerProxy::~PersistenceHandlerProxy()
 {
     _documentDB->release();
 }
 
-
 void
 PersistenceHandlerProxy::initialize()
 {
     _documentDB->waitForOnlineState();
 }
 
-
 void
 PersistenceHandlerProxy::handlePut(FeedToken token,
                                    const Bucket &bucket,
@@ -54,7 +48,6 @@ PersistenceHandlerProxy::handlePut(FeedToken token,
     _feedHandler.handleOperation(token, std::move(op));
 }
 
-
 void
 PersistenceHandlerProxy::handleUpdate(FeedToken token,
                                       const Bucket &bucket,
@@ -67,7 +60,6 @@ PersistenceHandlerProxy::handleUpdate(FeedToken token,
     _feedHandler.handleOperation(token, std::move(op));
 }
 
-
 void
 PersistenceHandlerProxy::handleRemove(FeedToken token,
                                       const Bucket &bucket,
@@ -80,14 +72,12 @@ PersistenceHandlerProxy::handleRemove(FeedToken token,
     _feedHandler.handleOperation(token, std::move(op));
 }
 
-
 void
 PersistenceHandlerProxy::handleListBuckets(IBucketIdListResultHandler &resultHandler)
 {
     _bucketHandler.handleListBuckets(resultHandler);
 }
 
-
 void
 PersistenceHandlerProxy::handleSetClusterState(const storage::spi::ClusterState &calc,
                                                IGenericResultHandler &resultHandler)
@@ -95,7 +85,6 @@ PersistenceHandlerProxy::handleSetClusterState(const storage::spi::ClusterState
     _clusterStateHandler.handleSetClusterState(calc, resultHandler);
 }
 
-
 void
 PersistenceHandlerProxy::handleSetActiveState(
         const storage::spi::Bucket &bucket,
@@ -106,7 +95,6 @@ PersistenceHandlerProxy::handleSetActiveState(
                                          newState, resultHandler);
 }
 
-
 void
 PersistenceHandlerProxy::handleGetBucketInfo(const Bucket &bucket,
                                              IBucketInfoResultHandler &resultHandler)
@@ -114,7 +102,6 @@ PersistenceHandlerProxy::handleGetBucketInfo(const Bucket &bucket,
     _bucketHandler.handleGetBucketInfo(bucket, resultHandler);
 }
 
-
 void
 PersistenceHandlerProxy::handleCreateBucket(FeedToken token,
                                             const Bucket &bucket)
@@ -124,7 +111,6 @@ PersistenceHandlerProxy::handleCreateBucket(FeedToken token,
     _feedHandler.handleOperation(token, std::move(op));
 }
 
-
 void
 PersistenceHandlerProxy::handleDeleteBucket(FeedToken token,
                                             const Bucket &bucket)
@@ -134,14 +120,12 @@ PersistenceHandlerProxy::handleDeleteBucket(FeedToken token,
     _feedHandler.handleOperation(token, std::move(op));
 }
 
-
 void
 PersistenceHandlerProxy::handleGetModifiedBuckets(IBucketIdListResultHandler &resultHandler)
 {
     _clusterStateHandler.handleGetModifiedBuckets(resultHandler);
 }
 
-
 void
 PersistenceHandlerProxy::handleSplit(FeedToken token,
                                      const Bucket &source,
@@ -157,7 +141,6 @@ PersistenceHandlerProxy::handleSplit(FeedToken token,
     _feedHandler.handleOperation(token, std::move(op));
 }
 
-
 void
 PersistenceHandlerProxy::handleJoin(FeedToken token,
                                     const Bucket &source1,
@@ -173,7 +156,6 @@ PersistenceHandlerProxy::handleJoin(FeedToken token,
     _feedHandler.handleOperation(token, std::move(op));
 }
 
-
 IPersistenceHandler::RetrieversSP
 PersistenceHandlerProxy::getDocumentRetrievers(storage::spi::ReadConsistency consistency)
 {
@@ -186,7 +168,6 @@ PersistenceHandlerProxy::lockBucket(const storage::spi::Bucket &bucket)
     return _documentDB->lockBucket(bucket.getBucketId().stripUnused());
 }
 
-
 void
 PersistenceHandlerProxy::handleListActiveBuckets(
         IBucketIdListResultHandler &resultHandler)
@@ -194,7 +175,6 @@ PersistenceHandlerProxy::handleListActiveBuckets(
     _bucketHandler.handleListActiveBuckets(resultHandler);
 }
 
-
 void
 PersistenceHandlerProxy::handlePopulateActiveBuckets(
         document::BucketId::List &buckets,
@@ -203,5 +183,4 @@ PersistenceHandlerProxy::handlePopulateActiveBuckets(
     _bucketHandler.handlePopulateActiveBuckets(buckets, resultHandler);
 }
 
-
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/persistenceproviderproxy.cpp b/searchcore/src/vespa/searchcore/proton/server/persistenceproviderproxy.cpp
index 22798376055..a8a9cbfead2 100644
--- a/searchcore/src/vespa/searchcore/proton/server/persistenceproviderproxy.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/persistenceproviderproxy.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 "persistenceproviderproxy.h"
 
 using storage::spi::PersistenceProvider;
diff --git a/searchcore/src/vespa/searchcore/proton/server/prune_session_cache_job.cpp b/searchcore/src/vespa/searchcore/proton/server/prune_session_cache_job.cpp
index 5282d861cb6..7941803086a 100644
--- a/searchcore/src/vespa/searchcore/proton/server/prune_session_cache_job.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/prune_session_cache_job.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 "prune_session_cache_job.h"
 #include <vespa/fastos/timestamp.h>
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.cpp b/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.cpp
index 3d8b5c1363f..d88414c11c2 100644
--- a/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/pruneremoveddocumentsjob.cpp
@@ -1,13 +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/log/log.h>
-LOG_SETUP(".proton.server.pruneremoveddocumentsjob");
 #include "pruneremoveddocumentsjob.h"
-#include <vespa/searchcore/proton/feedoperation/pruneremoveddocumentsoperation.h>
-#include <vespa/searchcore/proton/documentmetastore/i_document_meta_store.h>
 #include "ipruneremoveddocumentshandler.h"
 #include "ifrozenbuckethandler.h"
+#include <vespa/searchcore/proton/feedoperation/pruneremoveddocumentsoperation.h>
+#include <vespa/searchcore/proton/documentmetastore/i_document_meta_store.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP(".proton.server.pruneremoveddocumentsjob");
 
 using document::BucketId;
 using storage::spi::Timestamp;
diff --git a/searchcore/src/vespa/searchcore/proton/server/putdonecontext.cpp b/searchcore/src/vespa/searchcore/proton/server/putdonecontext.cpp
index b157b652f24..4fda9f43881 100644
--- a/searchcore/src/vespa/searchcore/proton/server/putdonecontext.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/putdonecontext.cpp
@@ -1,13 +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 "putdonecontext.h"
 #include <vespa/searchcore/proton/common/feedtoken.h>
 #include <vespa/searchcore/proton/common/docid_limit.h>
 
-namespace proton
-{
-
+namespace proton {
 
 PutDoneContext::PutDoneContext(std::unique_ptr<FeedToken> token,
                                const FeedOperation::Type opType,
@@ -18,7 +15,6 @@ PutDoneContext::PutDoneContext(std::unique_ptr<FeedToken> token,
 {
 }
 
-
 PutDoneContext::~PutDoneContext()
 {
     if (_docIdLimit != nullptr) {
@@ -26,5 +22,4 @@ PutDoneContext::~PutDoneContext()
     }
 }
 
-
 }  // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/reconfig_params.cpp b/searchcore/src/vespa/searchcore/proton/server/reconfig_params.cpp
index 2ec8787a8ba..bccb8fe64ba 100644
--- a/searchcore/src/vespa/searchcore/proton/server/reconfig_params.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/reconfig_params.cpp
@@ -1,8 +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/log/log.h>
-LOG_SETUP(".proton.server.reconfig_params");
 #include "reconfig_params.h"
 
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/server/removedonecontext.cpp b/searchcore/src/vespa/searchcore/proton/server/removedonecontext.cpp
index 5baa903b0d9..367e03d0f41 100644
--- a/searchcore/src/vespa/searchcore/proton/server/removedonecontext.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/removedonecontext.cpp
@@ -1,13 +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 "removedonecontext.h"
 #include "removedonetask.h"
 #include <vespa/searchcore/proton/common/feedtoken.h>
 
-namespace proton
-{
-
+namespace proton {
 
 RemoveDoneContext::RemoveDoneContext(std::unique_ptr<FeedToken> token,
                                      const FeedOperation::Type opType,
@@ -24,7 +21,6 @@ RemoveDoneContext::RemoveDoneContext(std::unique_ptr<FeedToken> token,
     }
 }
 
-
 RemoveDoneContext::~RemoveDoneContext()
 {
     ack();
@@ -34,5 +30,4 @@ RemoveDoneContext::~RemoveDoneContext()
     }
 }
 
-
 }  // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/removedonetask.cpp b/searchcore/src/vespa/searchcore/proton/server/removedonetask.cpp
index 423af443165..bdcc679fc2f 100644
--- a/searchcore/src/vespa/searchcore/proton/server/removedonetask.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/removedonetask.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 "removedonetask.h"
 #include <vespa/searchcore/proton/documentmetastore/i_document_meta_store.h>
 
-namespace proton
-{
-
+namespace proton {
 
 RemoveDoneTask::RemoveDoneTask(IDocumentMetaStore &documentMetaStore,
                                uint32_t lid)
@@ -16,12 +13,10 @@ RemoveDoneTask::RemoveDoneTask(IDocumentMetaStore &documentMetaStore,
 {
 }
 
-
 RemoveDoneTask::~RemoveDoneTask()
 {
 }
 
-
 void
 RemoveDoneTask::run()
 {
@@ -30,5 +25,4 @@ RemoveDoneTask::run()
     }
 }
 
-
 }  // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/resource_usage_explorer.cpp b/searchcore/src/vespa/searchcore/proton/server/resource_usage_explorer.cpp
index 81e607a53a3..dc0213206e2 100644
--- a/searchcore/src/vespa/searchcore/proton/server/resource_usage_explorer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/resource_usage_explorer.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 "resource_usage_explorer.h"
 #include "disk_mem_usage_filter.h"
 #include <vespa/vespalib/data/slime/cursor.h>
diff --git a/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.cpp b/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.cpp
index dec20b1650a..48644a29c04 100644
--- a/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/rpc_hooks.cpp
@@ -1,9 +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/log/log.h>
-LOG_SETUP(".proton.server.rtchooks");
-
 #include "rpc_hooks.h"
 #include "proton.h"
 #include <vespa/messagebus/emptyreply.h>
@@ -11,6 +7,9 @@ LOG_SETUP(".proton.server.rtchooks");
 #include <vespa/vespalib/util/closuretask.h>
 #include <vespa/searchcore/proton/common/statusreport.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP(".proton.server.rtchooks");
+
 using namespace vespalib;
 using document::CompressionConfig;
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/sample_attribute_usage_job.cpp b/searchcore/src/vespa/searchcore/proton/server/sample_attribute_usage_job.cpp
index 5a485a3744d..77aecb1cb5e 100644
--- a/searchcore/src/vespa/searchcore/proton/server/sample_attribute_usage_job.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/sample_attribute_usage_job.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 "sample_attribute_usage_job.h"
 #include <vespa/searchcore/proton/attribute/i_attribute_manager.h>
 #include <vespa/searchcore/proton/attribute/attribute_usage_filter.h>
@@ -15,8 +14,7 @@ SampleAttributeUsageJob(IAttributeManagerSP readyAttributeManager,
                         AttributeUsageFilter &attributeUsageFilter,
                         const vespalib::string &docTypeName,
                         double interval)
-    : IMaintenanceJob("sample_attribute_usage." + docTypeName,
-                      0.0, interval),
+    : IMaintenanceJob("sample_attribute_usage." + docTypeName, 0.0, interval),
       _readyAttributeManager(readyAttributeManager),
       _notReadyAttributeManager(notReadyAttributeManager),
       _attributeUsageFilter(attributeUsageFilter)
@@ -30,13 +28,11 @@ SampleAttributeUsageJob::~SampleAttributeUsageJob()
 bool
 SampleAttributeUsageJob::run()
 {
-    auto context = std::make_shared<AttributeUsageSamplerContext>
-                   (_attributeUsageFilter);
+    auto context = std::make_shared<AttributeUsageSamplerContext> (_attributeUsageFilter);
     _readyAttributeManager->asyncForEachAttribute(
             std::make_shared<AttributeUsageSamplerFunctor>(context, "ready"));
     _notReadyAttributeManager->asyncForEachAttribute(
-            std::make_shared<AttributeUsageSamplerFunctor>(context,
-                                                           "notready"));
+            std::make_shared<AttributeUsageSamplerFunctor>(context, "notready"));
     return true;
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchcontext.cpp b/searchcore/src/vespa/searchcore/proton/server/searchcontext.cpp
index 99770b0af75..cbba7d5c5a8 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchcontext.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/searchcontext.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 "searchcontext.h"
 
 using search::queryeval::Searchable;
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchhandlerproxy.cpp b/searchcore/src/vespa/searchcore/proton/server/searchhandlerproxy.cpp
index a653f479cf4..4eff0fcdfb1 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchhandlerproxy.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/searchhandlerproxy.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.
 
-#include <vespa/fastos/fastos.h>
 #include "searchhandlerproxy.h"
 #include "documentdb.h"
 #include <vespa/searchlib/engine/searchreply.h>
 #include <vespa/searchlib/engine/docsumreply.h>
 
-#include <vespa/log/log.h>
-LOG_SETUP(".proton.server.searchhandlerproxy");
-
 namespace proton {
 
 SearchHandlerProxy::SearchHandlerProxy(const DocumentDB::SP &documentDB)
diff --git a/searchcore/src/vespa/searchcore/proton/server/simpleflush.cpp b/searchcore/src/vespa/searchcore/proton/server/simpleflush.cpp
index 9b71c069cb7..8c2e22acc07 100644
--- a/searchcore/src/vespa/searchcore/proton/server/simpleflush.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/simpleflush.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 "simpleflush.h"
 #include <algorithm>
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/summaryadapter.cpp b/searchcore/src/vespa/searchcore/proton/server/summaryadapter.cpp
index 73a3d64f58d..dad5316e97b 100644
--- a/searchcore/src/vespa/searchcore/proton/server/summaryadapter.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/summaryadapter.cpp
@@ -1,11 +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(".proton.server.summaryadapter");
 
 #include "summaryadapter.h"
 #include <vespa/document/fieldvalue/stringfieldvalue.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP(".proton.server.summaryadapter");
+
 using namespace document;
 
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/server/tlssyncer.cpp b/searchcore/src/vespa/searchcore/proton/server/tlssyncer.cpp
index f17538836bc..89028e5123b 100644
--- a/searchcore/src/vespa/searchcore/proton/server/tlssyncer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/tlssyncer.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 "tlssyncer.h"
 #include "igetserialnum.h"
 #include <vespa/vespalib/util/threadexecutor.h>
@@ -11,8 +10,7 @@
 using search::makeLambdaTask;
 using search::SerialNum;
 
-namespace proton
-{
+namespace proton {
 
 TlsSyncer::TlsSyncer(vespalib::ThreadExecutor &executor,
                      const IGetSerialNum &getSerialNum,
diff --git a/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.cpp
index 463a5fa9704..667cb597782 100644
--- a/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.cpp
@@ -1,20 +1,19 @@
 // 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(".proton.server.transactionlogmanager");
 #include "configstore.h"
 #include "transactionlogmanager.h"
 #include <vespa/searchcore/proton/common/eventlogger.h>
 #include <vespa/vespalib/util/closuretask.h>
 #include <vespa/vespalib/util/exceptions.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP(".proton.server.transactionlogmanager");
+
 using vespalib::IllegalStateException;
 using vespalib::make_string;
 using search::transactionlog::TransLogClient;
 
-namespace proton
-{
+namespace proton {
 
 
 void
diff --git a/searchcore/src/vespa/searchcore/proton/server/updatedonecontext.cpp b/searchcore/src/vespa/searchcore/proton/server/updatedonecontext.cpp
index 82db11aa0f8..964be92a631 100644
--- a/searchcore/src/vespa/searchcore/proton/server/updatedonecontext.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/updatedonecontext.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 "updatedonecontext.h"
 #include <vespa/searchcore/proton/common/feedtoken.h>
 
diff --git a/searchcore/src/vespa/searchcore/proton/summaryengine/summaryengine.cpp b/searchcore/src/vespa/searchcore/proton/summaryengine/summaryengine.cpp
index a41f76fef3c..c8df4166261 100644
--- a/searchcore/src/vespa/searchcore/proton/summaryengine/summaryengine.cpp
+++ b/searchcore/src/vespa/searchcore/proton/summaryengine/summaryengine.cpp
@@ -1,11 +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(".proton.summaryengine.summaryengine");
-
 #include "summaryengine.h"
 #include <vespa/vespalib/util/exceptions.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP(".proton.summaryengine.summaryengine");
+
 using namespace search::engine;
 using namespace proton;
 
diff --git a/searchcore/src/vespa/searchcore/proton/test/buckethandler.cpp b/searchcore/src/vespa/searchcore/proton/test/buckethandler.cpp
index f7b8ce691da..aedc56a83fe 100644
--- a/searchcore/src/vespa/searchcore/proton/test/buckethandler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/test/buckethandler.cpp
@@ -1,15 +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 "buckethandler.h"
+#include <cassert>
 
-
-namespace proton
-{
-
-namespace test
-{
-
+namespace proton::test {
 
 BucketHandler::BucketHandler()
     : IBucketStateChangedNotifier(),
@@ -17,20 +11,17 @@ BucketHandler::BucketHandler()
 {
 }
 
-
 BucketHandler::~BucketHandler()
 {
     assert(_handlers.empty());
 }
 
-
 void
 BucketHandler::addBucketStateChangedHandler(IBucketStateChangedHandler *handler)
 {
     _handlers.insert(handler);
 }
 
-
 void
 BucketHandler::removeBucketStateChangedHandler(IBucketStateChangedHandler *
                                                handler)
@@ -38,7 +29,6 @@ BucketHandler::removeBucketStateChangedHandler(IBucketStateChangedHandler *
     _handlers.erase(handler);
 }
 
-
 void
 BucketHandler::notifyBucketStateChanged(const document::BucketId &bucketId,
                                         storage::spi::BucketInfo::ActiveState
@@ -49,8 +39,4 @@ BucketHandler::notifyBucketStateChanged(const document::BucketId &bucketId,
     }
 }
 
-
-} // namespace test
-
-} // namespace proton
-
+}
diff --git a/searchcore/src/vespa/searchcore/proton/test/clusterstatehandler.cpp b/searchcore/src/vespa/searchcore/proton/test/clusterstatehandler.cpp
index e241e92806a..20f27e15a87 100644
--- a/searchcore/src/vespa/searchcore/proton/test/clusterstatehandler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/test/clusterstatehandler.cpp
@@ -1,15 +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 "clusterstatehandler.h"
+#include <cassert>
 
-
-namespace proton
-{
-
-namespace test
-{
-
+namespace proton::test {
 
 ClusterStateHandler::ClusterStateHandler()
     : IClusterStateChangedNotifier(),
@@ -17,13 +11,11 @@ ClusterStateHandler::ClusterStateHandler()
 {
 }
 
-
 ClusterStateHandler::~ClusterStateHandler()
 {
     assert(_handlers.empty());
 }
 
-
 void
 ClusterStateHandler::
 addClusterStateChangedHandler(IClusterStateChangedHandler *handler)
@@ -31,7 +23,6 @@ addClusterStateChangedHandler(IClusterStateChangedHandler *handler)
     _handlers.insert(handler);
 }
 
-
 void
 ClusterStateHandler::
 removeClusterStateChangedHandler(IClusterStateChangedHandler *handler)
@@ -39,7 +30,6 @@ removeClusterStateChangedHandler(IClusterStateChangedHandler *handler)
     _handlers.erase(handler);
 }
 
-
 void
 ClusterStateHandler::
 notifyClusterStateChanged(const IBucketStateCalculator::SP &newCalc)
@@ -49,8 +39,4 @@ notifyClusterStateChanged(const IBucketStateCalculator::SP &newCalc)
     }
 }
 
-
-} // namespace test
-
-} // namespace proton
-
+}