Include what you need.

12 files changed, 18 insertions, 15 deletions

diff --git a/storage/src/tests/distributor/bucketdatabasetest.cpp b/storage/src/tests/distributor/bucketdatabasetest.cpp
index ecfdc127fc2..c269389dd04 100644
--- a/storage/src/tests/distributor/bucketdatabasetest.cpp
+++ b/storage/src/tests/distributor/bucketdatabasetest.cpp
@@ -2,9 +2,9 @@
 #include "bucketdatabasetest.h"
 #include <vespa/storageframework/defaultimplementation/clock/realclock.h>
 #include <iomanip>
+#include <algorithm>
 
-namespace storage {
-namespace distributor {
+namespace storage::distributor {
 
 using document::BucketId;
 
@@ -544,4 +544,3 @@ BucketDatabaseTest::testChildCount()
 }
 
 }
-} // storage
diff --git a/storage/src/tests/distributor/simplemaintenancescannertest.cpp b/storage/src/tests/distributor/simplemaintenancescannertest.cpp
index 6846774872e..17f25e4532a 100644
--- a/storage/src/tests/distributor/simplemaintenancescannertest.cpp
+++ b/storage/src/tests/distributor/simplemaintenancescannertest.cpp
@@ -6,10 +6,9 @@
 #include <vespa/storage/bucketdb/mapbucketdatabase.h>
 #include <tests/distributor/maintenancemocks.h>
 #include <vespa/vespalib/text/stringtokenizer.h>
+#include <algorithm>
 
-namespace storage {
-
-namespace distributor {
+namespace storage::distributor {
 
 using document::BucketId;
 typedef MaintenancePriority Priority;
@@ -211,4 +210,3 @@ SimpleMaintenanceScannerTest::perNodeMaintenanceStatsAreTracked()
 }
 
 }
-}
diff --git a/storage/src/tests/persistence/splitbitdetectortest.cpp b/storage/src/tests/persistence/splitbitdetectortest.cpp
index a4c6425f290..60f76c2df60 100644
--- a/storage/src/tests/persistence/splitbitdetectortest.cpp
+++ b/storage/src/tests/persistence/splitbitdetectortest.cpp
@@ -7,6 +7,7 @@
 #include <vespa/persistence/dummyimpl/dummypersistence.h>
 #include <vespa/document/base/testdocman.h>
 #include <vespa/document/bucket/bucketidfactory.h>
+#include <algorithm>
 
 
 namespace storage {
diff --git a/storage/src/vespa/storage/bucketdb/bucketinfo.cpp b/storage/src/vespa/storage/bucketdb/bucketinfo.cpp
index ba39b7062c0..bbc59de410a 100644
--- a/storage/src/vespa/storage/bucketdb/bucketinfo.cpp
+++ b/storage/src/vespa/storage/bucketdb/bucketinfo.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 "bucketinfo.h"
 #include <vespa/storage/storageutil/utils.h>
+#include <algorithm>
 
 namespace storage {
 
diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/mergelimiter.cpp b/storage/src/vespa/storage/distributor/operations/idealstate/mergelimiter.cpp
index e7d4d32e0e4..13931c73e3c 100644
--- a/storage/src/vespa/storage/distributor/operations/idealstate/mergelimiter.cpp
+++ b/storage/src/vespa/storage/distributor/operations/idealstate/mergelimiter.cpp
@@ -1,7 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/storage/distributor/operations/idealstate/mergelimiter.h>
+#include "mergelimiter.h"
 #include <cassert>
+#include <algorithm>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".distributor.operations.merge.limiter");
diff --git a/storage/src/vespa/storage/distributor/operationtargetresolverimpl.h b/storage/src/vespa/storage/distributor/operationtargetresolverimpl.h
index eb13fe3ac8d..2f4a3e0117a 100644
--- a/storage/src/vespa/storage/distributor/operationtargetresolverimpl.h
+++ b/storage/src/vespa/storage/distributor/operationtargetresolverimpl.h
@@ -5,9 +5,9 @@
 #include "operationtargetresolver.h"
 #include <vespa/storage/bucketdb/bucketdatabase.h>
 #include <vespa/vdslib/distribution/idealnodecalculator.h>
+#include <algorithm>
 
-namespace storage {
-namespace distributor {
+namespace storage::distributor {
 
 struct BucketInstance : public vespalib::AsciiPrintable {
     document::BucketId _bucket;
@@ -106,5 +106,4 @@ public:
     }
 };
 
-} // distributor
-} // storage
+}
diff --git a/storage/src/vespa/storage/frameworkimpl/memory/memorystatusviewer.cpp b/storage/src/vespa/storage/frameworkimpl/memory/memorystatusviewer.cpp
index 4143082623f..dd07a61f27b 100644
--- a/storage/src/vespa/storage/frameworkimpl/memory/memorystatusviewer.cpp
+++ b/storage/src/vespa/storage/frameworkimpl/memory/memorystatusviewer.cpp
@@ -6,7 +6,7 @@
 #include <vespa/storage/storageutil/piechart.h>
 #include <vespa/metrics/metricmanager.h>
 #include <vespa/storageapi/messageapi/storagemessage.h>
-#include <sstream>
+#include <algorithm>
 
 #include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".memory.status.viewer");
diff --git a/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.cpp b/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.cpp
index 24cf7059ff7..7735204c92b 100644
--- a/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.cpp
@@ -3,6 +3,7 @@
 #include "modifiedbucketchecker.h"
 #include "filestormanager.h"
 #include <vespa/config/common/exceptions.h>
+#include <algorithm>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".persistence.filestor.modifiedbucketchecker");
diff --git a/storage/src/vespa/storage/persistence/mergehandler.cpp b/storage/src/vespa/storage/persistence/mergehandler.cpp
index d84dc59bf95..37fc36c820a 100644
--- a/storage/src/vespa/storage/persistence/mergehandler.cpp
+++ b/storage/src/vespa/storage/persistence/mergehandler.cpp
@@ -8,8 +8,9 @@
 #include <vespa/storage/common/bucketoperationlogger.h>
 #include <vespa/vespalib/objects/nbostream.h>
 #include <vespa/vespalib/util/exceptions.h>
-#include <vespa/log/log.h>
+#include <algorithm>
 
+#include <vespa/log/log.h>
 LOG_SETUP(".persistence.mergehandler");
 
 namespace storage {
diff --git a/storage/src/vespa/storage/persistence/persistencethread.cpp b/storage/src/vespa/storage/persistence/persistencethread.cpp
index 7dc717cabed..fa8231d5353 100644
--- a/storage/src/vespa/storage/persistence/persistencethread.cpp
+++ b/storage/src/vespa/storage/persistence/persistencethread.cpp
@@ -11,6 +11,7 @@
 #include <vespa/document/fieldset/fieldsetrepo.h>
 #include <vespa/vespalib/stllike/hash_map.hpp>
 #include <vespa/vespalib/util/exceptions.h>
+#include <algorithm>
 
 #include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".persistence.thread");
diff --git a/storage/src/vespa/storage/storageserver/mergethrottler.cpp b/storage/src/vespa/storage/storageserver/mergethrottler.cpp
index 85eb71f419e..d9a14fc7bb0 100644
--- a/storage/src/vespa/storage/storageserver/mergethrottler.cpp
+++ b/storage/src/vespa/storage/storageserver/mergethrottler.cpp
@@ -7,9 +7,9 @@
 #include <vespa/config/common/exceptions.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/vespalib/util/stringfmt.h>
+#include <algorithm>
 
 #include <vespa/log/log.h>
-
 LOG_SETUP(".mergethrottler");
 
 namespace storage {
diff --git a/storage/src/vespa/storage/tools/generatedistributionbits.cpp b/storage/src/vespa/storage/tools/generatedistributionbits.cpp
index 7939f261a5c..73f11b39e67 100644
--- a/storage/src/vespa/storage/tools/generatedistributionbits.cpp
+++ b/storage/src/vespa/storage/tools/generatedistributionbits.cpp
@@ -8,6 +8,7 @@
 #include <vespa/vespalib/util/stringfmt.h>
 #include <iomanip>
 #include <iostream>
+#include <algorithm>
 #include <vespa/config-stor-distribution.h>
 
 namespace storage {