From 968531905601cf330cf29ee765f1efbe1328c21c Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Wed, 24 May 2017 17:07:09 +0200
Subject: Include what you need yourself, and not more.

---
 .../proton/feedoperation/compact_lid_space_operation.cpp         | 4 ----
 .../searchcore/proton/feedoperation/createbucketoperation.cpp    | 4 +---
 .../searchcore/proton/feedoperation/deletebucketoperation.cpp    | 4 +---
 .../vespa/searchcore/proton/feedoperation/documentoperation.cpp  | 4 ++--
 .../src/vespa/searchcore/proton/feedoperation/feedoperation.cpp  | 3 ---
 .../searchcore/proton/feedoperation/joinbucketsoperation.cpp     | 4 +---
 .../vespa/searchcore/proton/feedoperation/lidvectorcontext.cpp   | 6 +++---
 .../src/vespa/searchcore/proton/feedoperation/moveoperation.cpp  | 2 +-
 .../vespa/searchcore/proton/feedoperation/newconfigoperation.cpp | 3 ---
 .../src/vespa/searchcore/proton/feedoperation/noopoperation.cpp  | 3 ---
 .../proton/feedoperation/pruneremoveddocumentsoperation.cpp      | 6 +++---
 .../src/vespa/searchcore/proton/feedoperation/putoperation.cpp   | 2 +-
 .../searchcore/proton/feedoperation/removedocumentsoperation.cpp | 3 ---
 .../vespa/searchcore/proton/feedoperation/removeoperation.cpp    | 3 ---
 .../searchcore/proton/feedoperation/splitbucketoperation.cpp     | 4 +---
 .../searchcore/proton/feedoperation/spoolerreplayoperation.cpp   | 4 ----
 .../vespa/searchcore/proton/feedoperation/updateoperation.cpp    | 2 +-
 .../searchcore/proton/feedoperation/wipehistoryoperation.cpp     | 3 ---
 .../vespa/searchcore/proton/flushengine/cachedflushtarget.cpp    | 3 ---
 .../searchcore/proton/flushengine/flush_engine_explorer.cpp      | 3 ---
 .../searchcore/proton/flushengine/flush_target_candidates.cpp    | 3 ---
 .../src/vespa/searchcore/proton/flushengine/flushtargetproxy.cpp | 3 ---
 searchcore/src/vespa/searchcore/proton/flushengine/flushtask.cpp | 5 +----
 .../proton/flushengine/prepare_restart_flush_strategy.cpp        | 6 +++---
 .../proton/flushengine/shrink_lid_space_flush_target.cpp         | 3 ---
 .../vespa/searchcore/proton/flushengine/threadedflushtarget.cpp  | 5 +----
 searchcore/src/vespa/searchcore/proton/flushengine/tls_stats.h   | 8 ++++----
 .../vespa/searchcore/proton/flushengine/tls_stats_factory.cpp    | 1 -
 .../src/vespa/searchcore/proton/flushengine/tls_stats_factory.h  | 8 ++++----
 .../src/vespa/searchcore/proton/index/diskindexwrapper.cpp       | 3 ---
 .../vespa/searchcore/proton/index/index_manager_initializer.cpp  | 9 ++++-----
 searchcore/src/vespa/searchcore/proton/index/indexmanager.cpp    | 3 ---
 .../src/vespa/searchcore/proton/index/memoryindexwrapper.cpp     | 3 ---
 .../src/vespa/searchcore/proton/initializer/initializer_task.cpp | 7 +------
 .../src/vespa/searchcore/proton/matchengine/matchengine.cpp      | 1 -
 .../searchcore/proton/persistenceengine/i_document_retriever.cpp | 3 +--
 36 files changed, 34 insertions(+), 107 deletions(-)

(limited to 'searchcore')

diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/compact_lid_space_operation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/compact_lid_space_operation.cpp
index 047813d8a05..e4211fe14cc 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/compact_lid_space_operation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/compact_lid_space_operation.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.feedoperation.compact_lid_space_operation");
-
 #include "compact_lid_space_operation.h"
 #include <vespa/vespalib/util/stringfmt.h>
 
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/createbucketoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/createbucketoperation.cpp
index d761677542e..cb696c97bac 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/createbucketoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/createbucketoperation.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 <vespa/log/log.h>
-LOG_SETUP(".proton.feedoperation.createbucketoperation");
 
 #include "createbucketoperation.h"
 #include <vespa/vespalib/util/stringfmt.h>
+#include <cassert>
 
 using document::BucketId;
 using document::DocumentTypeRepo;
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/deletebucketoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/deletebucketoperation.cpp
index 964f2e44702..5fa5132d41d 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/deletebucketoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/deletebucketoperation.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 <vespa/log/log.h>
-LOG_SETUP(".proton.feedoperation.deletebucketoperation");
 
 #include "deletebucketoperation.h"
 #include <vespa/vespalib/util/stringfmt.h>
+#include <cassert>
 
 using document::BucketId;
 using document::DocumentTypeRepo;
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.cpp
index f4ff9255547..b9df5160f14 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.cpp
@@ -1,8 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
+
 #include "documentoperation.h"
-#include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/document/base/documentid.h>
+#include <cassert>
 
 using document::BucketId;
 using document::DocumentId;
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/feedoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/feedoperation.cpp
index 789d3ec97ee..cee360323af 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/feedoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/feedoperation.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.feedoperation.feedoperation");
 
 #include "feedoperation.h"
 
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/joinbucketsoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/joinbucketsoperation.cpp
index afd96720baf..8e51c4e5e94 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/joinbucketsoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/joinbucketsoperation.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 <vespa/log/log.h>
-LOG_SETUP(".proton.feedoperation.joinbucketsoperation");
 
 #include "joinbucketsoperation.h"
 #include <vespa/vespalib/util/stringfmt.h>
+#include <cassert>
 
 using document::BucketId;
 using document::DocumentTypeRepo;
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/lidvectorcontext.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/lidvectorcontext.cpp
index 387b41bc010..b8b32f31105 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/lidvectorcontext.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/lidvectorcontext.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.feedoperation.lidvectorcontext");
 
 #include "lidvectorcontext.h"
 #include <vespa/searchlib/common/bitvector.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP(".proton.feedoperation.lidvectorcontext");
+
 using search::BitVector;
 
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/moveoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/moveoperation.cpp
index 59c8b2dda33..2a369cb821b 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/moveoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/moveoperation.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 "moveoperation.h"
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/document/fieldvalue/document.h>
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/newconfigoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/newconfigoperation.cpp
index 2044fdea43f..33e25786651 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/newconfigoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/newconfigoperation.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.feedoperation.newconfigoperation");
 
 #include "newconfigoperation.h"
 #include <vespa/vespalib/util/stringfmt.h>
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/noopoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/noopoperation.cpp
index 0ea7977f2bc..1330fd6eda9 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/noopoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/noopoperation.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.feedoperation.noopoperation");
 
 #include "noopoperation.h"
 #include <vespa/vespalib/util/stringfmt.h>
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/pruneremoveddocumentsoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/pruneremoveddocumentsoperation.cpp
index b257fb14d57..aa56daddeb2 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/pruneremoveddocumentsoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/pruneremoveddocumentsoperation.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.feedoperation.pruneremoveddocumentsoperation");
 
 #include "pruneremoveddocumentsoperation.h"
 #include <vespa/vespalib/util/stringfmt.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP(".proton.feedoperation.pruneremoveddocumentsoperation");
+
 using document::DocumentTypeRepo;
 using search::DocumentIdT;
 using storage::spi::Timestamp;
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/putoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/putoperation.cpp
index 701efc368ad..41fd2b1482b 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/putoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/putoperation.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 "putoperation.h"
 #include <vespa/document/fieldvalue/document.h>
 
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/removedocumentsoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/removedocumentsoperation.cpp
index 247a8dfc803..e11677db6fe 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/removedocumentsoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/removedocumentsoperation.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.feedoperation.removedocumentsoperation");
 
 #include "removedocumentsoperation.h"
 
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/removeoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/removeoperation.cpp
index 58d802716b0..446362dbbab 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/removeoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/removeoperation.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.feedoperation.removeoperation");
 
 #include "removeoperation.h"
 
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/splitbucketoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/splitbucketoperation.cpp
index 3fbf0e93fdf..a188ae866e6 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/splitbucketoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/splitbucketoperation.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 <vespa/log/log.h>
-LOG_SETUP(".proton.feedoperation.splitbucketoperation");
 
 #include "splitbucketoperation.h"
 #include <vespa/vespalib/util/stringfmt.h>
+#include <cassert>
 
 using document::BucketId;
 using document::DocumentTypeRepo;
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/spoolerreplayoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/spoolerreplayoperation.cpp
index 9413e5c0dbc..10de16cadfd 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/spoolerreplayoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/spoolerreplayoperation.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.feedoperation.spoolerreplayoperation");
 
 #include "spoolerreplayoperation.h"
 #include <vespa/vespalib/util/stringfmt.h>
@@ -31,7 +28,6 @@ SpoolerReplayOperation::SpoolerReplayOperation(Type type,
 void
 SpoolerReplayOperation::serialize(vespalib::nbostream &os) const
 {
-    LOG(debug, "serialize(): %s", toString().c_str());
     os << _spoolerSerialNum;
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.cpp
index e69b64548bc..c5225ca8f20 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.cpp
@@ -1,8 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
 #include "updateoperation.h"
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/document/base/exceptions.h>
+
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.feedoperation.updateoperation");
 
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/wipehistoryoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/wipehistoryoperation.cpp
index 5e4f2046481..8e0dd06cb1b 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/wipehistoryoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/wipehistoryoperation.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.feedoperation.wipehistoryoperation");
 
 #include "wipehistoryoperation.h"
 #include <vespa/vespalib/util/stringfmt.h>
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/cachedflushtarget.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/cachedflushtarget.cpp
index fe10efb816e..81c8a11426a 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/cachedflushtarget.cpp
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/cachedflushtarget.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.flushengine.cachedflushtarget");
 
 #include "cachedflushtarget.h"
 
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flush_engine_explorer.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/flush_engine_explorer.cpp
index 8216c9b1391..a763be5e111 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/flush_engine_explorer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/flush_engine_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.flushengine.flush_engine_explorer");
 #include "flush_engine_explorer.h"
 
 #include <vespa/vespalib/data/slime/cursor.h>
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flush_target_candidates.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/flush_target_candidates.cpp
index e83b0adc3f5..61f025c8e53 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/flush_target_candidates.cpp
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/flush_target_candidates.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.flushengine.flush_target_candidates");
 
 #include "flush_target_candidates.h"
 #include "tls_stats.h"
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flushtargetproxy.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/flushtargetproxy.cpp
index 92133c6d656..cc1e6b06190 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/flushtargetproxy.cpp
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/flushtargetproxy.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.flushengine.flushtargetproxy");
 
 #include "flushtargetproxy.h"
 
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flushtask.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/flushtask.cpp
index 8af59d3079f..b04f2ae6407 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/flushtask.cpp
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/flushtask.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.flushengine.flushtask");
 
 #include "flushtask.h"
 
@@ -14,7 +11,7 @@ FlushTask::FlushTask(uint32_t taskId,
       _engine(engine),
       _context(ctx)
 {
-    LOG_ASSERT(_context.get() != NULL);
+    assert(_context.get() != NULL);
 }
 
 FlushTask::~FlushTask()
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/prepare_restart_flush_strategy.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/prepare_restart_flush_strategy.cpp
index 1bf45bd332e..ed029751271 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/prepare_restart_flush_strategy.cpp
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/prepare_restart_flush_strategy.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 <vespa/log/log.h>
-LOG_SETUP(".proton.flushengine.prepare_restart_flush_strategy");
 
 #include "prepare_restart_flush_strategy.h"
 #include "flush_target_candidates.h"
 #include "tls_stats_map.h"
 
+#include <vespa/log/log.h>
+LOG_SETUP(".proton.flushengine.prepare_restart_flush_strategy");
+
 namespace proton {
 
 using search::SerialNum;
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/shrink_lid_space_flush_target.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/shrink_lid_space_flush_target.cpp
index 2137d6f5c79..1341410a39d 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/shrink_lid_space_flush_target.cpp
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/shrink_lid_space_flush_target.cpp
@@ -1,7 +1,4 @@
 // 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 <vespa/log/log.h>
-LOG_SETUP(".proton.flushengine.shrink_lid_space_flush_target");
 
 #include "shrink_lid_space_flush_target.h"
 #include <vespa/searchlib/common/i_compactable_lid_space.h>
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/threadedflushtarget.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/threadedflushtarget.cpp
index 49d400c95f7..5e2065a599a 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/threadedflushtarget.cpp
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/threadedflushtarget.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 <vespa/log/log.h>
-LOG_SETUP(".proton.flushengine.threadedflushtarget");
 
 #include "threadedflushtarget.h"
-#include <vespa/vespalib/util/executor.h>
 #include <vespa/searchcore/proton/server/igetserialnum.h>
 #include <vespa/searchlib/common/lambdatask.h>
 #include <future>
+#include <cassert>
 
 using searchcorespi::IFlushTarget;
 using searchcorespi::FlushStats;
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats.h b/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats.h
index 07e726d2032..963d805ad2c 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats.h
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats.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 proton {
-namespace flushengine {
+#include <cstdint>
+
+namespace proton::flushengine {
 
 /*
  * Class representing statistics for a transaction log server domain used to
@@ -37,5 +38,4 @@ public:
     uint64_t getLastSerial() const  { return _lastSerial; }
 };
 
-} // namespace proton::flushengine
-} // namespace proton
+}
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats_factory.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats_factory.cpp
index 6819849e959..06fdc46d71b 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats_factory.cpp
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats_factory.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 "tls_stats_factory.h"
 #include "tls_stats_map.h"
 #include <vespa/searchlib/transactionlog/translogserver.h>
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats_factory.h b/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats_factory.h
index d580d58b964..85c20413f42 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats_factory.h
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats_factory.h
@@ -2,10 +2,11 @@
 #pragma once
 
 #include "i_tls_stats_factory.h"
+#include <memory>
 
 namespace search { namespace transactionlog { class TransLogServer; } }
-namespace proton {
-namespace flushengine {
+
+namespace proton::flushengine {
 
 /*
  * Class used to create statistics for a transaction log server over
@@ -21,5 +22,4 @@ public:
     virtual TlsStatsMap create() override;
 };
 
-} // namespace proton::flushengine
-} // namespace proton
+}
diff --git a/searchcore/src/vespa/searchcore/proton/index/diskindexwrapper.cpp b/searchcore/src/vespa/searchcore/proton/index/diskindexwrapper.cpp
index ad78835fa37..e5730b66edb 100644
--- a/searchcore/src/vespa/searchcore/proton/index/diskindexwrapper.cpp
+++ b/searchcore/src/vespa/searchcore/proton/index/diskindexwrapper.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.index.diskindexwrapper");
 
 #include "diskindexwrapper.h"
 #include <vespa/searchcorespi/index/indexreadutilities.h>
diff --git a/searchcore/src/vespa/searchcore/proton/index/index_manager_initializer.cpp b/searchcore/src/vespa/searchcore/proton/index/index_manager_initializer.cpp
index 4f882660855..18578be184b 100644
--- a/searchcore/src/vespa/searchcore/proton/index/index_manager_initializer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/index/index_manager_initializer.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 <vespa/log/log.h>
-LOG_SETUP(".proton.index.indexmanagerinitializer");
 #include "index_manager_initializer.h"
 #include <vespa/vespalib/io/fileutil.h>
 
-namespace proton
-{
+#include <vespa/log/log.h>
+LOG_SETUP(".proton.index.indexmanagerinitializer");
+
+namespace proton {
 
 IndexManagerInitializer::
 IndexManagerInitializer(const vespalib::string &baseDir,
diff --git a/searchcore/src/vespa/searchcore/proton/index/indexmanager.cpp b/searchcore/src/vespa/searchcore/proton/index/indexmanager.cpp
index 5ba6e11331c..288dd1067c6 100644
--- a/searchcore/src/vespa/searchcore/proton/index/indexmanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/index/indexmanager.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.index.indexmanager");
 
 #include "indexmanager.h"
 #include "diskindexwrapper.h"
diff --git a/searchcore/src/vespa/searchcore/proton/index/memoryindexwrapper.cpp b/searchcore/src/vespa/searchcore/proton/index/memoryindexwrapper.cpp
index 73a86c805e2..cb687b80a08 100644
--- a/searchcore/src/vespa/searchcore/proton/index/memoryindexwrapper.cpp
+++ b/searchcore/src/vespa/searchcore/proton/index/memoryindexwrapper.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.index.memoryindexwrapper");
 
 #include "memoryindexwrapper.h"
 #include <vespa/searchlib/common/serialnumfileheadercontext.h>
diff --git a/searchcore/src/vespa/searchcore/proton/initializer/initializer_task.cpp b/searchcore/src/vespa/searchcore/proton/initializer/initializer_task.cpp
index 041b4546e70..09b01180432 100644
--- a/searchcore/src/vespa/searchcore/proton/initializer/initializer_task.cpp
+++ b/searchcore/src/vespa/searchcore/proton/initializer/initializer_task.cpp
@@ -1,11 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/fastos.h>
 #include "initializer_task.h"
 
-namespace proton {
-
-namespace initializer {
+namespace proton::initializer {
 
 InitializerTask::InitializerTask()
     : _state(State::BLOCKED),
@@ -25,7 +22,5 @@ InitializerTask::addDependency(SP dependency)
     _dependencies.emplace_back(std::move(dependency));
 }
 
-
 } // namespace proton::initializer
 
-} // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp
index e9c0cba6069..78fd38ea87a 100644
--- a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.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 "matchengine.h"
 #include <vespa/searchcore/proton/common/state_reporter_utils.h>
 #include <vespa/vespalib/data/slime/cursor.h>
diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/i_document_retriever.cpp b/searchcore/src/vespa/searchcore/proton/persistenceengine/i_document_retriever.cpp
index 81a56f4aac6..a7bc34a2130 100644
--- a/searchcore/src/vespa/searchcore/proton/persistenceengine/i_document_retriever.cpp
+++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/i_document_retriever.cpp
@@ -1,8 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/persistence/spi/read_consistency.h>
-#include <vespa/fastos/fastos.h>
 #include "i_document_retriever.h"
+#include <vespa/persistence/spi/read_consistency.h>
 
 namespace proton {
 
-- 
cgit v1.2.3