Avoid including iostream in header files.

7 files changed, 7 insertions, 9 deletions

diff --git a/storage/src/vespa/storage/common/storagelinkqueued.h b/storage/src/vespa/storage/common/storagelinkqueued.h
index cec29d1b3b5..982cf66e3cb 100644
--- a/storage/src/vespa/storage/common/storagelinkqueued.h
+++ b/storage/src/vespa/storage/common/storagelinkqueued.h
@@ -16,7 +16,7 @@
 
 #include <vespa/vespalib/util/document_runnable.h>
 #include <deque>
-#include <iostream>
+#include <sstream>
 #include <memory>
 #include <list>
 #include <limits>
diff --git a/storage/src/vespa/storage/common/vectorprinter.h b/storage/src/vespa/storage/common/vectorprinter.h
index 46e71a14d09..3120ed198ea 100644
--- a/storage/src/vespa/storage/common/vectorprinter.h
+++ b/storage/src/vespa/storage/common/vectorprinter.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include <vector>
-#include <iostream>
+#include <ostream>
 
 namespace storage {
 
diff --git a/storage/src/vespa/storage/distributor/latency_statistics_provider.cpp b/storage/src/vespa/storage/distributor/latency_statistics_provider.cpp
index ef0807da030..7207c4745fc 100644
--- a/storage/src/vespa/storage/distributor/latency_statistics_provider.cpp
+++ b/storage/src/vespa/storage/distributor/latency_statistics_provider.cpp
@@ -1,6 +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/storage/distributor/latency_statistics_provider.h>
+#include <ostream>
 
 namespace storage {
 namespace distributor {
@@ -18,9 +19,7 @@ operator<<(std::ostream& os, const OperationStats& op)
 std::ostream&
 operator<<(std::ostream& os, const NodeStats& stats)
 {
-    os << "NodeStats("
-       << "puts=" << stats.puts
-       << ')';
+    os << "NodeStats(puts=" << stats.puts << ')';
     return os;
 }
 
diff --git a/storage/src/vespa/storage/distributor/latency_statistics_provider.h b/storage/src/vespa/storage/distributor/latency_statistics_provider.h
index 32f217e5ce3..ecc0e16bdb1 100644
--- a/storage/src/vespa/storage/distributor/latency_statistics_provider.h
+++ b/storage/src/vespa/storage/distributor/latency_statistics_provider.h
@@ -3,7 +3,7 @@
 
 #include <chrono>
 #include <unordered_map>
-#include <iostream>
+#include <iosfwd>
 #include <stdint.h>
 
 namespace storage {
diff --git a/storage/src/vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.cpp b/storage/src/vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.cpp
index 5cef9767714..e10151b9ba5 100644
--- a/storage/src/vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.cpp
+++ b/storage/src/vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.cpp
@@ -1,7 +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/storage/distributor/maintenance/node_maintenance_stats_tracker.h>
+#include <ostream>
 
 namespace storage {
 namespace distributor {
diff --git a/storage/src/vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.h b/storage/src/vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.h
index 5e1177a5ca6..477118ae821 100644
--- a/storage/src/vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.h
+++ b/storage/src/vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include <unordered_map>
-#include <iostream>
+#include <iosfwd>
 #include <stdint.h>
 
 namespace storage {
diff --git a/storage/src/vespa/storage/distributor/min_replica_provider.h b/storage/src/vespa/storage/distributor/min_replica_provider.h
index 64adea622ed..be6f874a98c 100644
--- a/storage/src/vespa/storage/distributor/min_replica_provider.h
+++ b/storage/src/vespa/storage/distributor/min_replica_provider.h
@@ -1,7 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <iostream>
 #include <stdint.h>
 #include <unordered_map>