Include what you need yourself, and not more.

23 files changed, 44 insertions, 142 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/common/bucketfactory.cpp b/searchcore/src/vespa/searchcore/proton/common/bucketfactory.cpp
index bdf35a09038..f5acc578792 100644
--- a/searchcore/src/vespa/searchcore/proton/common/bucketfactory.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/bucketfactory.cpp
@@ -1,11 +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.common.bucketfactory");
-
 #include "bucketfactory.h"
-#include <persistence/spi/types.h>
 
 using document::BucketId;
 using document::DocumentId;
@@ -29,5 +24,4 @@ BucketFactory::getBucket(const DocumentId &docId)
     return Bucket(getBucketId(docId), PartitionId(0));
 }
 
-
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/common/commit_time_tracker.cpp b/searchcore/src/vespa/searchcore/proton/common/commit_time_tracker.cpp
index 6acd99d5285..fa14ed4ce53 100644
--- a/searchcore/src/vespa/searchcore/proton/common/commit_time_tracker.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/commit_time_tracker.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 "commit_time_tracker.h"
 
 namespace proton {
@@ -29,8 +29,6 @@ CommitTimeTracker::needCommit() const
     return true;
 }
 
-
-
 void
 CommitTimeTracker::setVisibilityDelay(fastos::TimeStamp visibilityDelay)
 {
diff --git a/searchcore/src/vespa/searchcore/proton/common/dbdocumentid.cpp b/searchcore/src/vespa/searchcore/proton/common/dbdocumentid.cpp
index ae9911289db..4cf8eafcf41 100644
--- a/searchcore/src/vespa/searchcore/proton/common/dbdocumentid.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/dbdocumentid.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.common.dbdocumentid");
 
 #include "dbdocumentid.h"
 
diff --git a/searchcore/src/vespa/searchcore/proton/common/document_type_inspector.cpp b/searchcore/src/vespa/searchcore/proton/common/document_type_inspector.cpp
index 0cf2e97fdfb..7e86cae6946 100644
--- a/searchcore/src/vespa/searchcore/proton/common/document_type_inspector.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/document_type_inspector.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.common.document_type_inspector");
-
 #include "document_type_inspector.h"
 
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/common/eventlogger.cpp b/searchcore/src/vespa/searchcore/proton/common/eventlogger.cpp
index 49938ccf2bf..63ee323d078 100644
--- a/searchcore/src/vespa/searchcore/proton/common/eventlogger.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/eventlogger.cpp
@@ -1,14 +1,15 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".proton.common.eventlogger");
 
 #include "eventlogger.h"
 #include <vespa/searchlib/util/logutil.h>
 #include <vespa/vespalib/util/stringfmt.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP(".proton.common.eventlogger");
+
 using search::util::LogUtil;
 using vespalib::JSONStringer;
+using vespalib::make_string;
 
 namespace {
 
@@ -16,10 +17,7 @@ using search::SerialNum;
 using vespalib::string;
 
 void
-doTransactionLogReplayStart(const string &domainName,
-                            SerialNum first,
-                            SerialNum last,
-                            const string &eventName)
+doTransactionLogReplayStart(const string &domainName, SerialNum first, SerialNum last, const string &eventName)
 {
     JSONStringer jstr;
     jstr.beginObject();
@@ -34,9 +32,7 @@ doTransactionLogReplayStart(const string &domainName,
 }
 
 void
-doTransactionLogReplayComplete(const string &domainName,
-                               int64_t elapsedTimeMs,
-                               const string &eventName)
+doTransactionLogReplayComplete(const string &domainName, int64_t elapsedTimeMs, const string &eventName)
 {
     JSONStringer jstr;
     jstr.beginObject();
@@ -51,22 +47,14 @@ doTransactionLogReplayComplete(const string &domainName,
 namespace proton {
 
 void
-EventLogger::transactionLogReplayStart(const string &domainName,
-                                       SerialNum first,
-                                       SerialNum last)
+EventLogger::transactionLogReplayStart(const string &domainName, SerialNum first, SerialNum last)
 {
-    doTransactionLogReplayStart(domainName,
-                                first,
-                                last,
-                                "transactionlog.replay.start");
+    doTransactionLogReplayStart(domainName, first, last, "transactionlog.replay.start");
 }
 
 void
-EventLogger::transactionLogReplayProgress(const string &domainName,
-                                          float progress,
-                                          SerialNum first,
-                                          SerialNum last,
-                                          SerialNum current)
+EventLogger::transactionLogReplayProgress(const string &domainName, float progress,
+                                          SerialNum first, SerialNum last, SerialNum current)
 {
     JSONStringer jstr;
     jstr.beginObject();
@@ -85,9 +73,7 @@ EventLogger::transactionLogReplayProgress(const string &domainName,
 void
 EventLogger::transactionLogReplayComplete(const string &domainName, int64_t elapsedTimeMs)
 {
-    doTransactionLogReplayComplete(domainName,
-                                   elapsedTimeMs,
-                                   "transactionlog.replay.complete");
+    doTransactionLogReplayComplete(domainName, elapsedTimeMs, "transactionlog.replay.complete");
 }
 
 void
@@ -101,12 +87,8 @@ EventLogger::flushInit(const string &name)
 }
 
 void
-EventLogger::flushStart(const string &name,
-                        int64_t beforeMemory,
-                        int64_t afterMemory,
-                        int64_t toFreeMemory,
-                        SerialNum unflushed,
-                        SerialNum current)
+EventLogger::flushStart(const string &name, int64_t beforeMemory, int64_t afterMemory,
+                        int64_t toFreeMemory, SerialNum unflushed, SerialNum current)
 {
     JSONStringer jstr;
     jstr.beginObject();
@@ -127,10 +109,8 @@ EventLogger::flushStart(const string &name,
 }
 
 void
-EventLogger::flushComplete(const string &name,
-                           int64_t elapsedTimeMs,
-                           const string &outputPath,
-                           size_t outputPathElems)
+EventLogger::flushComplete(const string &name, int64_t elapsedTimeMs,
+                           const string &outputPath, size_t outputPathElems)
 {
     JSONStringer jstr;
     jstr.beginObject();
@@ -283,7 +263,7 @@ loadComponentStart(const vespalib::string &subDbName, const vespalib::string &co
     jstr.beginObject();
     jstr.appendKey("documentsubdb").appendString(subDbName);
     jstr.endObject();
-    EV_STATE(vespalib::make_string("load.%s.start", componentName.c_str()).c_str(), jstr.toString().c_str());
+    EV_STATE(make_string("load.%s.start", componentName.c_str()).c_str(), jstr.toString().c_str());
 }
 
 void
@@ -294,7 +274,7 @@ loadComponentComplete(const vespalib::string &subDbName, const vespalib::string
     jstr.appendKey("documentsubdb").appendString(subDbName);
     jstr.appendKey("time.elapsed.ms").appendInt64(elapsedTimeMs);
     jstr.endObject();
-    EV_STATE(vespalib::make_string("load.%s.complete", componentName.c_str()).c_str(), jstr.toString().c_str());
+    EV_STATE(make_string("load.%s.complete", componentName.c_str()).c_str(), jstr.toString().c_str());
 }
 
 }
diff --git a/searchcore/src/vespa/searchcore/proton/common/feedtoken.cpp b/searchcore/src/vespa/searchcore/proton/common/feedtoken.cpp
index e1867776a5e..2e701d20c62 100644
--- a/searchcore/src/vespa/searchcore/proton/common/feedtoken.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/feedtoken.cpp
@@ -1,13 +1,9 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".proton.common.feedtoken");
 
 #include "feedtoken.h"
 #include <vespa/vespalib/util/atomic.h>
 #include <vespa/searchcore/proton/metrics/feed_metrics.h>
 
-
 namespace proton {
 
 FeedToken::FeedToken(ITransport &transport, mbus::Reply::UP reply) :
diff --git a/searchcore/src/vespa/searchcore/proton/common/selectpruner.cpp b/searchcore/src/vespa/searchcore/proton/common/selectpruner.cpp
index fe6a89b0a40..c166dfbe634 100644
--- a/searchcore/src/vespa/searchcore/proton/common/selectpruner.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/selectpruner.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.common.selectpruner");
 
 #include "selectpruner.h"
 #include <vespa/document/base/exceptions.h>
@@ -16,7 +13,6 @@ LOG_SETUP(".proton.common.selectpruner");
 #include <vespa/document/select/constant.h>
 #include <vespa/searchlib/attribute/iattributemanager.h>
 
-
 using document::select::And;
 using document::select::Compare;
 using document::select::Constant;
@@ -49,8 +45,7 @@ using document::Field;
 using document::FieldNotFoundException;
 using search::AttributeGuard;
 
-namespace proton
-{
+namespace proton {
 
 SelectPrunerBase::SelectPrunerBase(const vespalib::string &docType,
                                    const search::IAttributeManager *amgr,
diff --git a/searchcore/src/vespa/searchcore/proton/common/state_reporter_utils.cpp b/searchcore/src/vespa/searchcore/proton/common/state_reporter_utils.cpp
index 01f202fe1f4..a35eec12cbb 100644
--- a/searchcore/src/vespa/searchcore/proton/common/state_reporter_utils.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/state_reporter_utils.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.common.state_reporter_utils");
 
 #include "state_reporter_utils.h"
 #include <vespa/vespalib/data/slime/cursor.h>
@@ -28,4 +25,3 @@ StateReporterUtils::convertToSlime(const StatusReport &statusReport,
 }
 
 } // namespace proton
-
diff --git a/searchcore/src/vespa/searchcore/proton/create-class-cpp.sh b/searchcore/src/vespa/searchcore/proton/create-class-cpp.sh
index 1b0b2440c45..4b2d8284aa7 100755
--- a/searchcore/src/vespa/searchcore/proton/create-class-cpp.sh
+++ b/searchcore/src/vespa/searchcore/proton/create-class-cpp.sh
@@ -5,9 +5,6 @@ dir=`dirname $0`
 . "$dir/create-base.sh"
 
 cat <<EOF
-#include <vespa/log/log.h>
-LOG_SETUP(".$name");
-#include <vespa/fastos/fastos.h>
 #include "$name.h"
 
 $ns_open
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/fieldcacherepo.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/fieldcacherepo.cpp
index a38bee61480..d14ab4633c6 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/fieldcacherepo.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/fieldcacherepo.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 "fieldcacherepo.h"
+
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.docsummary.fieldcacherepo");
-#include "fieldcacherepo.h"
 
 using namespace document;
 using namespace search::docsummary;
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.cpp
index 0c332edba6a..59108a92727 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.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.docsummary.summarycompacttarget");
 
 #include "summarycompacttarget.h"
-#include <vespa/searchlib/util/dirtraverse.h>
 
 using search::IDocumentStore;
 using search::SerialNum;
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.cpp
index 319750b9473..f4587ef7287 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.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.docsummary.summaryflushtarget");
 
 #include "summaryflushtarget.h"
-#include <vespa/searchlib/util/dirtraverse.h>
 
 using search::IDocumentStore;
 using search::SerialNum;
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.h b/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.h
index 38fb0df3d52..238428e3084 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.h
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.h
@@ -6,7 +6,6 @@
 
 namespace proton {
 
-
 /**
  * This class implements the IFlushTarget interface to proxy a summary manager.
  */
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/document_meta_store_explorer.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/document_meta_store_explorer.cpp
index bcd9302cde6..1d91e1e812a 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/document_meta_store_explorer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/document_meta_store_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.documentmetastore.document_meta_store_explorer");
 #include "document_meta_store_explorer.h"
-
 #include <vespa/vespalib/data/slime/cursor.h>
 
 using vespalib::slime::Cursor;
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/document_meta_store_initializer_result.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/document_meta_store_initializer_result.cpp
index 20381e51412..5dc3308436d 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/document_meta_store_initializer_result.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/document_meta_store_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_meta_store_initializer_result.h"
 
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreflushtarget.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreflushtarget.cpp
index 881604491ae..41f038d0e93 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreflushtarget.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreflushtarget.cpp
@@ -1,25 +1,22 @@
 // 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.documentmetastore.documentmetastoreflushtarget");
 
-#include <vespa/searchcore/proton/attribute/attributedisklayout.h>
 #include "documentmetastoreflushtarget.h"
+#include "documentmetastore.h"
+#include <vespa/searchcore/proton/attribute/attributedisklayout.h>
+#include <vespa/searchcore/proton/server/itlssyncer.h>
+#include <vespa/searchcore/proton/attribute/attribute_directory.h>
 #include <vespa/searchlib/attribute/attributefilesavetarget.h>
 #include <vespa/searchlib/attribute/attributememorysavetarget.h>
 #include <vespa/searchlib/attribute/attributesaver.h>
 #include <vespa/searchlib/util/dirtraverse.h>
+#include <vespa/searchlib/common/serialnumfileheadercontext.h>
 #include <vespa/searchlib/util/filekit.h>
 #include <vespa/vespalib/io/fileutil.h>
-#include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/util/closuretask.h>
-#include <vespa/searchcore/proton/common/hw_info.h>
 #include <fstream>
-#include <vespa/searchlib/common/serialnumfileheadercontext.h>
-#include <vespa/searchcore/proton/server/itlssyncer.h>
-#include <vespa/searchcore/proton/attribute/attributedisklayout.h>
-#include <vespa/searchcore/proton/attribute/attribute_directory.h>
-#include "documentmetastore.h"
+
+#include <vespa/log/log.h>
+LOG_SETUP(".proton.documentmetastore.documentmetastoreflushtarget");
 
 using namespace search;
 using namespace vespalib;
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/ilidreusedelayer.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/ilidreusedelayer.h
index 598744978da..307eb43ab12 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/ilidreusedelayer.h
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/ilidreusedelayer.h
@@ -2,11 +2,9 @@
 
 #pragma once
 
-namespace proton
-{
-
-namespace documentmetastore
-{
+#include <cstdint>
+#include <vector>
+namespace proton::documentmetastore {
 
 /**
  * Interface used to delay reuse of lids until references to the lids have
@@ -39,5 +37,3 @@ public:
 };
 
 }
-
-}
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_gid_key_comparator.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_gid_key_comparator.cpp
index 55f8f3f7cbe..642fc1b1154 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_gid_key_comparator.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_gid_key_comparator.cpp
@@ -1,13 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".proton.documentmetastore.lid_gid_key_comparator");
-
 #include "lid_gid_key_comparator.h"
 
-namespace proton {
-namespace documentmetastore {
+namespace proton::documentmetastore {
 
 const search::IDocumentMetaStore::DocId
 LidGidKeyComparator::FIND_DOC_ID = std::numeric_limits<DocId>::max();
@@ -31,4 +26,3 @@ LidGidKeyComparator::LidGidKeyComparator(const RawDocumentMetaData &metaData,
 }
 
 }
-}
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_reuse_delayer_config.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_reuse_delayer_config.cpp
index 84c579ba4e6..7a618d34250 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_reuse_delayer_config.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_reuse_delayer_config.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 "lid_reuse_delayer_config.h"
 #include <vespa/searchcore/proton/server/documentdbconfig.h>
 
-namespace proton
-{
-
-namespace documentmetastore
-{
-
+namespace proton::documentmetastore {
 
 LidReuseDelayerConfig::LidReuseDelayerConfig()
     : _visibilityDelay(0),
@@ -29,4 +23,3 @@ LidReuseDelayerConfig::LidReuseDelayerConfig(const DocumentDBConfig &
 
 } // namespace proton::documentmetastore
 
-} // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_reuse_delayer_config.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_reuse_delayer_config.h
index 18d2f55541c..975b5c268e9 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_reuse_delayer_config.h
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_reuse_delayer_config.h
@@ -2,13 +2,12 @@
 
 #pragma once
 
-namespace proton
-{
+#include <vespa/fastos/timestamp.h>
+namespace proton {
 
 class DocumentDBConfig;
 
-namespace documentmetastore
-{
+namespace documentmetastore {
 
 /*
  * Class representing configuration for lid reuse delayer.
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/lidreusedelayer.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/lidreusedelayer.cpp
index 02dcdc2fb03..06578107ee6 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/lidreusedelayer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/lidreusedelayer.cpp
@@ -1,18 +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.documentmetastore.lidreusedelayer");
+#include "lidreusedelayer.h"
+#include "i_store.h"
 #include <vespa/searchcorespi/index/ithreadingservice.h>
 #include <vespa/vespalib/util/closuretask.h>
-#include "i_store.h"
-#include "lidreusedelayer.h"
 
-namespace proton
-{
-
-namespace documentmetastore
-{
+namespace proton::documentmetastore {
 
 using searchcorespi::index::IThreadingService;
 using vespalib::makeClosure;
@@ -106,4 +99,3 @@ LidReuseDelayer::getReuseLids()
 
 }
 
-}
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/lidstatevector.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/lidstatevector.cpp
index 7dc46504d18..8b7a677accd 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/lidstatevector.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/lidstatevector.cpp
@@ -1,12 +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(".proton.documentmetastore.lidstatevector");
 #include "lidstatevector.h"
 
-namespace proton
-{
+namespace proton {
 
 using vespalib::GenerationHolder;
 
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flushcontext.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/flushcontext.cpp
index 1624bc3b51c..f5ccfc7e0cb 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/flushcontext.cpp
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/flushcontext.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(".proton.flushengine.flushcontext");
 
 #include "flushcontext.h"
 
+#include <vespa/log/log.h>
+LOG_SETUP(".proton.flushengine.flushcontext");
+
 namespace proton {
 
 FlushContext::FlushContext(