Include what you need.

13 files changed, 21 insertions, 25 deletions

diff --git a/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp b/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp
index 707b37eb3de..86f120aa403 100644
--- a/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp
+++ b/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp
@@ -5,8 +5,7 @@
 #include <vespa/searchcorespi/index/diskindexcleaner.h>
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/fastos/file.h>
-#include <string>
-#include <vector>
+#include <algorithm>
 
 #include <vespa/log/log.h>
 LOG_SETUP("diskindexcleaner_test");
diff --git a/searchcore/src/vespa/searchcore/fdispatch/search/search_path.h b/searchcore/src/vespa/searchcore/fdispatch/search/search_path.h
index 5984827459f..847fb525b95 100644
--- a/searchcore/src/vespa/searchcore/fdispatch/search/search_path.h
+++ b/searchcore/src/vespa/searchcore/fdispatch/search/search_path.h
@@ -5,6 +5,7 @@
 #include <vespa/vespalib/stllike/string.h>
 #include <set>
 #include <vector>
+#include <limits>
 
 namespace vespalib {
     class asciistream;
diff --git a/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.cpp b/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.cpp
index 73eefe620c2..06aca3381f7 100644
--- a/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.cpp
@@ -2,6 +2,7 @@
 
 #include "bucketdb.h"
 #include <cassert>
+#include <algorithm>
 
 using document::GlobalId;
 using storage::spi::BucketChecksum;
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 3b0ff6d5616..0dae1818e02 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,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "lid_gid_key_comparator.h"
+#include <limits>
 
 namespace proton::documentmetastore {
 
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flush_all_strategy.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/flush_all_strategy.cpp
index 39c0c2bd0e0..914b301b7e2 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/flush_all_strategy.cpp
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/flush_all_strategy.cpp
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "flush_all_strategy.h"
+#include <algorithm>
 
 using search::SerialNum;
 using searchcorespi::IFlushTarget;
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 2fd2b74eaa2..e9df78dbf4f 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
@@ -4,6 +4,7 @@
 #include "flush_target_candidates.h"
 #include "tls_stats_map.h"
 #include <sstream>
+#include <algorithm>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.flushengine.prepare_restart_flush_strategy");
diff --git a/searchcore/src/vespa/searchcore/proton/matching/handlerecorder.cpp b/searchcore/src/vespa/searchcore/proton/matching/handlerecorder.cpp
index 69da8d5bfed..3573c7ec7b8 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/handlerecorder.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/handlerecorder.cpp
@@ -3,12 +3,11 @@
 #include "handlerecorder.h"
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <cassert>
-
+#include <algorithm>
 
 using search::fef::TermFieldHandle;
 
-namespace proton {
-namespace matching {
+namespace proton::matching {
 
 #ifdef __PIC__
     #define TLS_LINKAGE __attribute__((visibility("hidden"), tls_model("initial-exec")))
@@ -79,5 +78,4 @@ void HandleRecorder::registerHandle(TermFieldHandle handle)
     }
 }
 
-}  // namespace matching
-}  // namespace proton
+}
diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/document_iterator.cpp b/searchcore/src/vespa/searchcore/proton/persistenceengine/document_iterator.cpp
index 8260c0209a9..0ef3b0e2aab 100644
--- a/searchcore/src/vespa/searchcore/proton/persistenceengine/document_iterator.cpp
+++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/document_iterator.cpp
@@ -5,6 +5,7 @@
 #include <vespa/document/select/node.h>
 #include <vespa/vespalib/objects/nbostream.h>
 #include <vespa/vespalib/stllike/hash_map.h>
+#include <algorithm>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.persistenceengine.document_iterator");
diff --git a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp
index 28fee79005a..cc399727460 100644
--- a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp
@@ -2,6 +2,7 @@
 
 #include "bootstrapconfigmanager.h"
 #include "bootstrapconfig.h"
+#include <vespa/searchlib/common/tunefileinfo.hpp>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.server.bootstrapconfigmanager");
@@ -14,8 +15,7 @@ using vespa::config::search::core::ProtonConfig;
 using cloud::config::filedistribution::FiledistributorrpcConfig;
 using document::DocumenttypesConfig;
 
-namespace proton
-{
+namespace proton {
 
 BootstrapConfigManager::BootstrapConfigManager(const vespalib::string & configId)
     : _pendingConfigSnapshot(),
diff --git a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp
index 17b41295a89..2bd2cb1eda1 100644
--- a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp
@@ -14,6 +14,7 @@
 #include <vespa/config/helper/configgetter.hpp>
 #include <fstream>
 #include <sstream>
+#include <fcntl.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.server.fileconfigmanager");
@@ -60,15 +61,11 @@ fsyncFile(const vespalib::string &fileName)
     FastOS_File f;
     f.OpenReadWrite(fileName.c_str());
     if (!f.IsOpened()) {
-        LOG(error,
-            "Could not open file '%s' for fsync",
-            fileName.c_str());
+        LOG(error, "Could not open file '%s' for fsync", fileName.c_str());
         return;
     }
     if (!f.Sync()) {
-        LOG(error,
-            "Could not fsync file '%s'",
-            fileName.c_str());
+        LOG(error, "Could not fsync file '%s'", fileName.c_str());
     }
     f.Close();
 }
diff --git a/searchcore/src/vespa/searchcore/proton/server/frozenbuckets.cpp b/searchcore/src/vespa/searchcore/proton/server/frozenbuckets.cpp
index ada3dd92656..c021d786216 100644
--- a/searchcore/src/vespa/searchcore/proton/server/frozenbuckets.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/frozenbuckets.cpp
@@ -4,14 +4,14 @@
 #include "ibucketfreezelistener.h"
 #include <vespa/searchcorespi/index/i_thread_service.h>
 #include <vespa/vespalib/util/closuretask.h>
+#include <algorithm>
 
 using document::BucketId;
 using vespalib::makeClosure;
 using vespalib::makeTask;
 using vespalib::MonitorGuard;
 
-namespace proton
-{
+namespace proton {
 
 FrozenBucketsMap::FrozenBucketsMap() :
     _lock(),
diff --git a/searchcore/src/vespa/searchcore/proton/server/memoryflush.cpp b/searchcore/src/vespa/searchcore/proton/server/memoryflush.cpp
index 4dd44a7b2e2..2d56c7e37e9 100644
--- a/searchcore/src/vespa/searchcore/proton/server/memoryflush.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/memoryflush.cpp
@@ -4,6 +4,7 @@
 #include <vespa/searchcore/proton/flushengine/tls_stats_map.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/vespalib/stllike/hash_set.h>
+#include <algorithm>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.server.memoryflush");
diff --git a/searchcore/src/vespa/searchcore/proton/test/bucketdocuments.h b/searchcore/src/vespa/searchcore/proton/test/bucketdocuments.h
index 021d0f631d4..ce27cc7673b 100644
--- a/searchcore/src/vespa/searchcore/proton/test/bucketdocuments.h
+++ b/searchcore/src/vespa/searchcore/proton/test/bucketdocuments.h
@@ -3,10 +3,9 @@
 
 #include "document.h"
 #include <cassert>
+#include <algorithm>
 
-namespace proton {
-
-namespace test {
+namespace proton::test {
 
 /**
  * Collection of documents contained in the same bucket.
@@ -40,8 +39,4 @@ public:
     }
 };
 
-
-} // namespace test
-
-} // namespace proton
-
+}