SERVER-13256 Scope iostream more narrowly

63 files changed, 76 insertions, 17 deletions

diff --git a/src/mongo/bson/optime.h b/src/mongo/bson/optime.h
index 099520b6c41..8871f7c4488 100644
--- a/src/mongo/bson/optime.h
+++ b/src/mongo/bson/optime.h
@@ -28,7 +28,6 @@
 #pragma once
 
 #include <boost/thread/condition.hpp>
-#include <iostream>
 #include <sstream>
 
 #include "mongo/util/assert_util.h"
diff --git a/src/mongo/bson/util/builder.h b/src/mongo/bson/util/builder.h
index ae310740511..3833e6747db 100644
--- a/src/mongo/bson/util/builder.h
+++ b/src/mongo/bson/util/builder.h
@@ -30,7 +30,6 @@
 #pragma once
 
 #include <cfloat>
-#include <iostream>
 #include <sstream>
 #include <stdio.h>
 #include <string>
diff --git a/src/mongo/client/gridfs.cpp b/src/mongo/client/gridfs.cpp
index ad7bf9dfe0a..126480e2abf 100644
--- a/src/mongo/client/gridfs.cpp
+++ b/src/mongo/client/gridfs.cpp
@@ -38,6 +38,7 @@
 #include <boost/smart_ptr.hpp>
 #include <fcntl.h>
 #include <fstream>
+#include <iostream>
 #include <utility>
 
 #if defined(_WIN32)
diff --git a/src/mongo/db/commands/server_status_internal.cpp b/src/mongo/db/commands/server_status_internal.cpp
index 24f8e36dafa..731379a37d6 100644
--- a/src/mongo/db/commands/server_status_internal.cpp
+++ b/src/mongo/db/commands/server_status_internal.cpp
@@ -30,6 +30,8 @@
 
 #include "mongo/db/commands/server_status_internal.h"
 
+#include <iostream>
+
 #include "mongo/db/commands/server_status_metric.h"
 #include "mongo/util/mongoutils/str.h"
 
diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp
index 4ff52a281fa..b6f14fbdd90 100644
--- a/src/mongo/db/db.cpp
+++ b/src/mongo/db/db.cpp
@@ -35,6 +35,7 @@
 #include <boost/thread/thread.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <fstream>
+#include <iostream>
 #include <limits>
 #include <signal.h>
 #include <string>
diff --git a/src/mongo/db/geo/hash.cpp b/src/mongo/db/geo/hash.cpp
index 6daf1e2744b..53d56f84fa5 100644
--- a/src/mongo/db/geo/hash.cpp
+++ b/src/mongo/db/geo/hash.cpp
@@ -33,6 +33,7 @@
 #include "mongo/util/mongoutils/str.h"
 
 #include <algorithm> // for max()
+#include <iostream>
 
 // So we can get at the str namespace.
 using namespace mongoutils;
diff --git a/src/mongo/db/geo/hash.h b/src/mongo/db/geo/hash.h
index 20a64f89b14..ef64f014793 100644
--- a/src/mongo/db/geo/hash.h
+++ b/src/mongo/db/geo/hash.h
@@ -33,7 +33,6 @@
 #include "mongo/pch.h"
 #undef MONGO_PCH_WHITELISTED
 #include "mongo/db/jsobj.h"
-#include <iostream>
 
 namespace mongo {
 
diff --git a/src/mongo/db/index/btree_key_generator_test.cpp b/src/mongo/db/index/btree_key_generator_test.cpp
index feee253a8e8..2ca6f3442a8 100644
--- a/src/mongo/db/index/btree_key_generator_test.cpp
+++ b/src/mongo/db/index/btree_key_generator_test.cpp
@@ -28,6 +28,8 @@
 
 #include "mongo/db/index/btree_key_generator.h"
 
+#include <iostream>
+
 #include "mongo/db/json.h"
 #include "mongo/unittest/unittest.h"
 
diff --git a/src/mongo/db/initialize_server_global_state.cpp b/src/mongo/db/initialize_server_global_state.cpp
index 2dd113c62bc..3b7716ceb83 100644
--- a/src/mongo/db/initialize_server_global_state.cpp
+++ b/src/mongo/db/initialize_server_global_state.cpp
@@ -36,6 +36,7 @@
 #include "mongo/db/initialize_server_global_state.h"
 
 #include <boost/filesystem/operations.hpp>
+#include <iostream>
 #include <memory>
 #include <signal.h>
 
diff --git a/src/mongo/db/mongod_options.cpp b/src/mongo/db/mongod_options.cpp
index a779db2ac57..f4c8d0a3921 100644
--- a/src/mongo/db/mongod_options.cpp
+++ b/src/mongo/db/mongod_options.cpp
@@ -31,6 +31,7 @@
 #include "mongo/db/mongod_options.h"
 
 #include <boost/filesystem.hpp>
+#include <iostream>
 #include <string>
 #include <vector>
 
diff --git a/src/mongo/db/mongod_options_init.cpp b/src/mongo/db/mongod_options_init.cpp
index df6468a226b..e8cfa3ef1a0 100644
--- a/src/mongo/db/mongod_options_init.cpp
+++ b/src/mongo/db/mongod_options_init.cpp
@@ -28,6 +28,8 @@
 
 #include "mongo/db/mongod_options.h"
 
+#include <iostream>
+
 #include "mongo/util/options_parser/startup_option_init.h"
 #include "mongo/util/options_parser/startup_options.h"
 #include "mongo/util/quick_exit.h"
diff --git a/src/mongo/db/query/expression_index.cpp b/src/mongo/db/query/expression_index.cpp
index eb6301dfb57..13cd25e07b0 100644
--- a/src/mongo/db/query/expression_index.cpp
+++ b/src/mongo/db/query/expression_index.cpp
@@ -28,6 +28,8 @@
 
 #include "mongo/db/query/expression_index.h"
 
+#include <iostream>
+
 #include "third_party/s2/s2regioncoverer.h"
 
 #include "mongo/db/geo/geoconstants.h"
diff --git a/src/mongo/db/query/query_planner_text_test.cpp b/src/mongo/db/query/query_planner_text_test.cpp
index 13381e5165e..422163fb72a 100644
--- a/src/mongo/db/query/query_planner_text_test.cpp
+++ b/src/mongo/db/query/query_planner_text_test.cpp
@@ -32,7 +32,8 @@
 
 #include "mongo/db/query/query_planner_test_lib.h"
 
-#include <ostream>
+#include <iostream>
+
 #include "mongo/db/jsobj.h"
 #include "mongo/db/json.h"
 #include "mongo/db/matcher/expression_parser.h"
diff --git a/src/mongo/db/repl/master_slave.cpp b/src/mongo/db/repl/master_slave.cpp
index 2f165e38558..742817cc1e4 100644
--- a/src/mongo/db/repl/master_slave.cpp
+++ b/src/mongo/db/repl/master_slave.cpp
@@ -42,6 +42,7 @@
 
 #include "mongo/db/repl/master_slave.h"
 
+#include <iostream>
 #include <pcrecpp.h>
 #include <boost/thread/thread.hpp>
 
diff --git a/src/mongo/db/repl/repl_coordinator_impl_test.cpp b/src/mongo/db/repl/repl_coordinator_impl_test.cpp
index 8080b606460..ae56e42c10f 100644
--- a/src/mongo/db/repl/repl_coordinator_impl_test.cpp
+++ b/src/mongo/db/repl/repl_coordinator_impl_test.cpp
@@ -32,6 +32,7 @@
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/thread.hpp>
+#include <iostream>
 #include <memory>
 #include <set>
 #include <vector>
diff --git a/src/mongo/db/repl/topology_coordinator_impl_test.cpp b/src/mongo/db/repl/topology_coordinator_impl_test.cpp
index 8039d1db219..435773e6977 100644
--- a/src/mongo/db/repl/topology_coordinator_impl_test.cpp
+++ b/src/mongo/db/repl/topology_coordinator_impl_test.cpp
@@ -28,6 +28,8 @@
 
 #include "mongo/platform/basic.h"
 
+#include <iostream>
+
 #include "mongo/db/repl/heartbeat_response_action.h"
 #include "mongo/db/repl/member_heartbeat_data.h"
 #include "mongo/db/repl/repl_set_heartbeat_args.h"
diff --git a/src/mongo/db/server_options_helpers.cpp b/src/mongo/db/server_options_helpers.cpp
index 93862e62539..d13f74b03f3 100644
--- a/src/mongo/db/server_options_helpers.cpp
+++ b/src/mongo/db/server_options_helpers.cpp
@@ -37,6 +37,7 @@
 #include <syslog.h>
 #endif
 #include <ios>
+#include <iostream>
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/operations.hpp>
 
diff --git a/src/mongo/db/storage/mmap_v1/dur_commitjob.cpp b/src/mongo/db/storage/mmap_v1/dur_commitjob.cpp
index 5ce845e4556..b063c71a3b1 100644
--- a/src/mongo/db/storage/mmap_v1/dur_commitjob.cpp
+++ b/src/mongo/db/storage/mmap_v1/dur_commitjob.cpp
@@ -37,6 +37,8 @@
 
 #include "mongo/db/storage/mmap_v1/dur_commitjob.h"
 
+#include <iostream>
+
 #include "mongo/db/client.h"
 #include "mongo/db/storage/mmap_v1/dur_stats.h"
 #include "mongo/db/storage_options.h"
diff --git a/src/mongo/db/storage/mmap_v1/dur_recover.cpp b/src/mongo/db/storage/mmap_v1/dur_recover.cpp
index fc5ec70be6c..3abf0b6684f 100644
--- a/src/mongo/db/storage/mmap_v1/dur_recover.cpp
+++ b/src/mongo/db/storage/mmap_v1/dur_recover.cpp
@@ -37,6 +37,7 @@
 #include <boost/filesystem/operations.hpp>
 #include <fcntl.h>
 #include <iomanip>
+#include <iostream>
 #include <sys/stat.h>
 
 #include "mongo/db/curop.h"
diff --git a/src/mongo/db/storage/mmap_v1/extent.h b/src/mongo/db/storage/mmap_v1/extent.h
index b78c10d942c..e8ede6fe559 100644
--- a/src/mongo/db/storage/mmap_v1/extent.h
+++ b/src/mongo/db/storage/mmap_v1/extent.h
@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include <iosfwd>
 #include <string>
 #include <vector>
 
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_options_init.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_options_init.cpp
index 962763fe584..2c087891bd2 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_options_init.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_options_init.cpp
@@ -29,8 +29,10 @@
  */
 
 #include "mongo/util/options_parser/startup_option_init.h"
-#include "mongo/util/options_parser/startup_options.h"
 
+#include <iostream>
+
+#include "mongo/util/options_parser/startup_options.h"
 #include "mongo/db/storage/wiredtiger/wiredtiger_global_options.h"
 
 namespace mongo {
diff --git a/src/mongo/dbtests/basictests.cpp b/src/mongo/dbtests/basictests.cpp
index 0072a78e785..dd5dbe40f10 100644
--- a/src/mongo/dbtests/basictests.cpp
+++ b/src/mongo/dbtests/basictests.cpp
@@ -31,6 +31,8 @@
 
 #include "mongo/platform/basic.h"
 
+#include <iostream>
+
 #include "mongo/db/operation_context_impl.h"
 #include "mongo/dbtests/dbtests.h"
 #include "mongo/util/base64.h"
diff --git a/src/mongo/dbtests/directclienttests.cpp b/src/mongo/dbtests/directclienttests.cpp
index 24b92269a55..5c12d77fce0 100644
--- a/src/mongo/dbtests/directclienttests.cpp
+++ b/src/mongo/dbtests/directclienttests.cpp
@@ -34,6 +34,8 @@
 #include "mongo/pch.h"
 #undef MONGO_PCH_WHITELISTED
 
+#include <iostream>
+
 #include "mongo/db/db.h"
 #include "mongo/db/dbdirectclient.h"
 #include "mongo/db/json.h"
diff --git a/src/mongo/dbtests/framework_options.cpp b/src/mongo/dbtests/framework_options.cpp
index 75b0f18a24c..6a78ef0a5fa 100644
--- a/src/mongo/dbtests/framework_options.cpp
+++ b/src/mongo/dbtests/framework_options.cpp
@@ -31,6 +31,7 @@
 #include "mongo/dbtests/framework_options.h"
 
 #include <boost/filesystem/operations.hpp>
+#include <iostream>
 
 #include "mongo/base/status.h"
 #include "mongo/bson/util/builder.h"
diff --git a/src/mongo/dbtests/framework_options_init.cpp b/src/mongo/dbtests/framework_options_init.cpp
index 930c2050ded..d8d20e63445 100644
--- a/src/mongo/dbtests/framework_options_init.cpp
+++ b/src/mongo/dbtests/framework_options_init.cpp
@@ -28,6 +28,8 @@
 
 #include "mongo/dbtests/framework_options.h"
 
+#include <iostream>
+
 #include "mongo/util/options_parser/startup_option_init.h"
 #include "mongo/util/options_parser/startup_options.h"
 #include "mongo/util/quick_exit.h"
diff --git a/src/mongo/dbtests/jsobjtests.cpp b/src/mongo/dbtests/jsobjtests.cpp
index 2ca91a882de..eb441f45d72 100644
--- a/src/mongo/dbtests/jsobjtests.cpp
+++ b/src/mongo/dbtests/jsobjtests.cpp
@@ -36,6 +36,8 @@
 #include "mongo/pch.h"
 #undef MONGO_PCH_WHITELISTED
 
+#include <iostream>
+
 #include "mongo/bson/util/builder.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/json.h"
diff --git a/src/mongo/dbtests/jstests.cpp b/src/mongo/dbtests/jstests.cpp
index e9d1a345639..06b4c7f23d4 100644
--- a/src/mongo/dbtests/jstests.cpp
+++ b/src/mongo/dbtests/jstests.cpp
@@ -33,6 +33,7 @@
 
 #include "mongo/platform/basic.h"
 
+#include <iostream>
 #include <limits>
 
 #include "mongo/base/parse_number.h"
diff --git a/src/mongo/dbtests/matchertests.cpp b/src/mongo/dbtests/matchertests.cpp
index 534bf5845b2..043f5f7688e 100644
--- a/src/mongo/dbtests/matchertests.cpp
+++ b/src/mongo/dbtests/matchertests.cpp
@@ -29,6 +29,8 @@
  *    then also delete it in the license file.
  */
 
+#include <iostream>
+
 #include "mongo/db/json.h"
 #include "mongo/db/matcher/matcher.h"
 #include "mongo/db/operation_context_impl.h"
diff --git a/src/mongo/dbtests/mmaptests.cpp b/src/mongo/dbtests/mmaptests.cpp
index 8548b9817bc..acf31062877 100644
--- a/src/mongo/dbtests/mmaptests.cpp
+++ b/src/mongo/dbtests/mmaptests.cpp
@@ -31,6 +31,7 @@
 #include "mongo/platform/basic.h"
 
 #include <boost/filesystem/operations.hpp>
+#include <iostream>
 
 #include "mongo/db/concurrency/lock_state.h"
 #include "mongo/db/global_environment_experiment.h"
diff --git a/src/mongo/dbtests/perftests.cpp b/src/mongo/dbtests/perftests.cpp
index f8ada7b6a6c..2c4fb8d64e5 100644
--- a/src/mongo/dbtests/perftests.cpp
+++ b/src/mongo/dbtests/perftests.cpp
@@ -42,6 +42,7 @@
 #include <boost/thread/thread.hpp>
 #include <boost/version.hpp>
 #include <iomanip>
+#include <iostream>
 #include <fstream>
 
 #include "mongo/db/db.h"
diff --git a/src/mongo/dbtests/plan_ranking.cpp b/src/mongo/dbtests/plan_ranking.cpp
index 0680d1c4889..c10ba98d2dd 100644
--- a/src/mongo/dbtests/plan_ranking.cpp
+++ b/src/mongo/dbtests/plan_ranking.cpp
@@ -30,6 +30,8 @@
  * This file tests db/query/plan_ranker.cpp and db/query/multi_plan_runner.cpp.
  */
 
+#include <iostream>
+
 #include "mongo/client/dbclientcursor.h"
 #include "mongo/db/catalog/collection.h"
 #include "mongo/db/catalog/database.h"
diff --git a/src/mongo/dbtests/querytests.cpp b/src/mongo/dbtests/querytests.cpp
index 657a0b03b52..dfbb8970acb 100644
--- a/src/mongo/dbtests/querytests.cpp
+++ b/src/mongo/dbtests/querytests.cpp
@@ -30,6 +30,8 @@
 
 #include "mongo/platform/basic.h"
 
+#include <iostream>
+
 #include "mongo/client/dbclientcursor.h"
 #include "mongo/db/clientcursor.h"
 #include "mongo/db/dbdirectclient.h"
diff --git a/src/mongo/dbtests/threadedtests.cpp b/src/mongo/dbtests/threadedtests.cpp
index a3f746f2ca5..b952dd41f11 100644
--- a/src/mongo/dbtests/threadedtests.cpp
+++ b/src/mongo/dbtests/threadedtests.cpp
@@ -35,6 +35,7 @@
 
 #include <boost/thread.hpp>
 #include <boost/version.hpp>
+#include <iostream>
 
 #include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/concurrency/lock_state.h"
diff --git a/src/mongo/dbtests/updatetests.cpp b/src/mongo/dbtests/updatetests.cpp
index 2b7ede0607b..04968f6be05 100644
--- a/src/mongo/dbtests/updatetests.cpp
+++ b/src/mongo/dbtests/updatetests.cpp
@@ -34,6 +34,8 @@
 #include "mongo/pch.h"
 #undef MONGO_PCH_WHITELISTED
 
+#include <iostream>
+
 #include "mongo/bson/mutable/mutable_bson_test_utils.h"
 #include "mongo/client/dbclientcursor.h"
 #include "mongo/db/db.h"
diff --git a/src/mongo/logger/console_appender.h b/src/mongo/logger/console_appender.h
index 36696ce878c..bf5072cdea8 100644
--- a/src/mongo/logger/console_appender.h
+++ b/src/mongo/logger/console_appender.h
@@ -28,7 +28,6 @@
 #pragma once
 
 #include <boost/scoped_ptr.hpp>
-#include <iostream>
 
 #include "mongo/base/disallow_copying.h"
 #include "mongo/base/status.h"
diff --git a/src/mongo/logger/logstream_builder.h b/src/mongo/logger/logstream_builder.h
index 33360ad9a5b..5bc4ebea990 100644
--- a/src/mongo/logger/logstream_builder.h
+++ b/src/mongo/logger/logstream_builder.h
@@ -28,7 +28,6 @@
 #pragma once
 
 #include <boost/scoped_ptr.hpp>
-#include <iostream>
 #include <sstream>
 #include <string>
 
diff --git a/src/mongo/logger/rotatable_file_writer.h b/src/mongo/logger/rotatable_file_writer.h
index b68288250ea..59440b38ff8 100644
--- a/src/mongo/logger/rotatable_file_writer.h
+++ b/src/mongo/logger/rotatable_file_writer.h
@@ -29,7 +29,6 @@
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/thread/mutex.hpp>
-#include <iostream>
 #include <string>
 
 #include "mongo/base/disallow_copying.h"
diff --git a/src/mongo/pch.h b/src/mongo/pch.h
index d97142717a0..4a721cbf47d 100644
--- a/src/mongo/pch.h
+++ b/src/mongo/pch.h
@@ -43,7 +43,6 @@
 
 #include <cstring>
 #include <ctime>
-#include <iostream>
 #include <map>
 #include <memory>
 #include <set>
diff --git a/src/mongo/s/chunk.cpp b/src/mongo/s/chunk.cpp
index 3bee62dc9f7..db7c591a805 100644
--- a/src/mongo/s/chunk.cpp
+++ b/src/mongo/s/chunk.cpp
@@ -34,6 +34,8 @@
 
 #include "mongo/s/chunk.h"
 
+#include <iostream>
+
 #include "mongo/base/owned_pointer_map.h"
 #include "mongo/client/connpool.h"
 #include "mongo/client/dbclientcursor.h"
diff --git a/src/mongo/s/mongos_options.cpp b/src/mongo/s/mongos_options.cpp
index ebbda7bee61..f2cb244009d 100644
--- a/src/mongo/s/mongos_options.cpp
+++ b/src/mongo/s/mongos_options.cpp
@@ -32,6 +32,7 @@
 
 #include "mongo/s/mongos_options.h"
 
+#include <iostream>
 #include <string>
 #include <vector>
 
diff --git a/src/mongo/s/server.cpp b/src/mongo/s/server.cpp
index 117bb112571..8070e430177 100644
--- a/src/mongo/s/server.cpp
+++ b/src/mongo/s/server.cpp
@@ -35,6 +35,7 @@
 #include "mongo/s/server.h"
 
 #include <boost/thread/thread.hpp>
+#include <iostream>
 
 #include "mongo/base/init.h"
 #include "mongo/base/initializer.h"
diff --git a/src/mongo/scripting/engine_v8-3.25.cpp b/src/mongo/scripting/engine_v8-3.25.cpp
index 42c2724d0ce..f7bf9379c59 100644
--- a/src/mongo/scripting/engine_v8-3.25.cpp
+++ b/src/mongo/scripting/engine_v8-3.25.cpp
@@ -33,6 +33,8 @@
 
 #include "mongo/scripting/engine_v8-3.25.h"
 
+#include <iostream>
+
 #include "mongo/base/init.h"
 #include "mongo/db/global_environment_experiment.h"
 #include "mongo/db/operation_context.h"
diff --git a/src/mongo/scripting/engine_v8.cpp b/src/mongo/scripting/engine_v8.cpp
index 589085628ab..a5a61342e2d 100644
--- a/src/mongo/scripting/engine_v8.cpp
+++ b/src/mongo/scripting/engine_v8.cpp
@@ -33,6 +33,8 @@
 
 #include "mongo/scripting/engine_v8.h"
 
+#include <iostream>
+
 #include "mongo/base/init.h"
 #include "mongo/db/global_environment_experiment.h"
 #include "mongo/db/operation_context.h"
diff --git a/src/mongo/scripting/v8-3.25_utils.h b/src/mongo/scripting/v8-3.25_utils.h
index 42e2b60f4b4..291b82485be 100644
--- a/src/mongo/scripting/v8-3.25_utils.h
+++ b/src/mongo/scripting/v8-3.25_utils.h
@@ -31,7 +31,6 @@
 
 #include <cstdio>
 #include <cstdlib>
-#include <iostream>
 #include <string>
 #include <v8.h>
 
diff --git a/src/mongo/scripting/v8_utils.h b/src/mongo/scripting/v8_utils.h
index 89ec2095387..ce36b26bd63 100644
--- a/src/mongo/scripting/v8_utils.h
+++ b/src/mongo/scripting/v8_utils.h
@@ -31,7 +31,6 @@
 
 #include <cstdio>
 #include <cstdlib>
-#include <iostream>
 #include <string>
 #include <v8.h>
 
diff --git a/src/mongo/shell/bench.cpp b/src/mongo/shell/bench.cpp
index 3e9eb87f3ee..bd55346d6cf 100644
--- a/src/mongo/shell/bench.cpp
+++ b/src/mongo/shell/bench.cpp
@@ -37,6 +37,7 @@
 #include <pcrecpp.h>
 
 #include <boost/thread/thread.hpp>
+#include <iostream>
 
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/operation_context_noop.h"
diff --git a/src/mongo/shell/dbshell.cpp b/src/mongo/shell/dbshell.cpp
index a1b89e5dfe7..3e6195ff78a 100644
--- a/src/mongo/shell/dbshell.cpp
+++ b/src/mongo/shell/dbshell.cpp
@@ -33,6 +33,7 @@
 
 #include <boost/filesystem/operations.hpp>
 #include <fstream>
+#include <iostream>
 #include <pcrecpp.h>
 #include <signal.h>
 #include <stdio.h>
diff --git a/src/mongo/shell/shell_options.cpp b/src/mongo/shell/shell_options.cpp
index 2d1f5ae3cba..a1faa1051ce 100644
--- a/src/mongo/shell/shell_options.cpp
+++ b/src/mongo/shell/shell_options.cpp
@@ -30,6 +30,8 @@
 
 #include <boost/filesystem/operations.hpp>
 
+#include <iostream>
+
 #include "mongo/base/status.h"
 #include "mongo/bson/util/builder.h"
 #include "mongo/client/sasl_client_authenticate.h"
diff --git a/src/mongo/shell/shell_options_init.cpp b/src/mongo/shell/shell_options_init.cpp
index 685f88fe6bc..a19268e9f1a 100644
--- a/src/mongo/shell/shell_options_init.cpp
+++ b/src/mongo/shell/shell_options_init.cpp
@@ -28,6 +28,8 @@
 
 #include "mongo/shell/shell_options.h"
 
+#include <iostream>
+
 #include "mongo/util/options_parser/startup_option_init.h"
 #include "mongo/util/options_parser/startup_options.h"
 #include "mongo/util/quick_exit.h"
diff --git a/src/mongo/tools/bridge.cpp b/src/mongo/tools/bridge.cpp
index 6e136e135b4..ecec37ff187 100644
--- a/src/mongo/tools/bridge.cpp
+++ b/src/mongo/tools/bridge.cpp
@@ -34,6 +34,7 @@
 #undef MONGO_PCH_WHITELISTED
 
 #include <boost/thread.hpp>
+#include <iostream>
 #include <signal.h>
 
 #include "mongo/base/initializer.h"
diff --git a/src/mongo/tools/mongobridge_options.cpp b/src/mongo/tools/mongobridge_options.cpp
index 3275f135f25..b9222b324ec 100644
--- a/src/mongo/tools/mongobridge_options.cpp
+++ b/src/mongo/tools/mongobridge_options.cpp
@@ -28,6 +28,8 @@
 
 #include "mongo/tools/mongobridge_options.h"
 
+#include <iostream>
+
 #include "mongo/base/status.h"
 #include "mongo/util/options_parser/startup_options.h"
 
diff --git a/src/mongo/tools/mongobridge_options_init.cpp b/src/mongo/tools/mongobridge_options_init.cpp
index 9ef513c934d..6244235dad1 100644
--- a/src/mongo/tools/mongobridge_options_init.cpp
+++ b/src/mongo/tools/mongobridge_options_init.cpp
@@ -28,6 +28,8 @@
 
 #include "mongo/tools/mongobridge_options.h"
 
+#include <iostream>
+
 #include "mongo/util/options_parser/startup_option_init.h"
 #include "mongo/util/options_parser/startup_options.h"
 #include "mongo/util/quick_exit.h"
diff --git a/src/mongo/util/assert_util.h b/src/mongo/util/assert_util.h
index 1c9ea2008cc..7bd5d3c2aab 100644
--- a/src/mongo/util/assert_util.h
+++ b/src/mongo/util/assert_util.h
@@ -29,7 +29,6 @@
 
 #pragma once
 
-#include <iostream>
 #include <typeinfo>
 #include <string>
 
diff --git a/src/mongo/util/concurrency/task.cpp b/src/mongo/util/concurrency/task.cpp
index 6f78bee1b16..8c33c5b7bfe 100644
--- a/src/mongo/util/concurrency/task.cpp
+++ b/src/mongo/util/concurrency/task.cpp
@@ -35,6 +35,7 @@
 #undef MONGO_PCH_WHITELISTED
 
 #include <boost/thread/condition.hpp>
+#include <iostream>
 
 #include "mongo/util/concurrency/task.h"
 
diff --git a/src/mongo/util/debugger.cpp b/src/mongo/util/debugger.cpp
index 69935a40695..388cfda51e7 100644
--- a/src/mongo/util/debugger.cpp
+++ b/src/mongo/util/debugger.cpp
@@ -31,6 +31,8 @@
 
 #include "mongo/util/debugger.h"
 
+#include <iostream>
+
 #include "mongo/db/server_options.h"
 
 #ifndef _WIN32
diff --git a/src/mongo/util/file_allocator_bench.cpp b/src/mongo/util/file_allocator_bench.cpp
index b41de678338..4043a55f206 100644
--- a/src/mongo/util/file_allocator_bench.cpp
+++ b/src/mongo/util/file_allocator_bench.cpp
@@ -35,6 +35,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <fstream>
+#include <iostream>
 #include <numeric>
 #include <string>
 
diff --git a/src/mongo/util/net/ssl_manager.cpp b/src/mongo/util/net/ssl_manager.cpp
index b82375dde42..8526d9b323e 100644
--- a/src/mongo/util/net/ssl_manager.cpp
+++ b/src/mongo/util/net/ssl_manager.cpp
@@ -34,7 +34,7 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/thread/recursive_mutex.hpp>
 #include <boost/thread/tss.hpp>
-#include <ostream>
+#include <iostream>
 #include <sstream>
 #include <string>
 #include <vector>
diff --git a/src/mongo/util/options_parser/option_description.h b/src/mongo/util/options_parser/option_description.h
index d68ab6c724b..5bfe83c3a30 100644
--- a/src/mongo/util/options_parser/option_description.h
+++ b/src/mongo/util/options_parser/option_description.h
@@ -28,7 +28,6 @@
 #pragma once
 
 #include <boost/shared_ptr.hpp>
-#include <iostream>
 #include <vector>
 
 #include "mongo/base/status.h"
diff --git a/src/mongo/util/options_parser/option_section.cpp b/src/mongo/util/options_parser/option_section.cpp
index 1d9611e742d..04cf223eac1 100644
--- a/src/mongo/util/options_parser/option_section.cpp
+++ b/src/mongo/util/options_parser/option_section.cpp
@@ -28,6 +28,7 @@
 #include "mongo/util/options_parser/option_section.h"
 
 #include <algorithm>
+#include <iostream>
 #include <sstream>
 
 #include "mongo/bson/util/builder.h"
diff --git a/src/mongo/util/options_parser/option_section.h b/src/mongo/util/options_parser/option_section.h
index e03fd8831e1..572e2b60e0d 100644
--- a/src/mongo/util/options_parser/option_section.h
+++ b/src/mongo/util/options_parser/option_section.h
@@ -30,7 +30,6 @@
 
 #include <boost/program_options.hpp>
 #include <boost/shared_ptr.hpp>
-#include <iostream>
 #include <list>
 
 #include "mongo/base/status.h"
diff --git a/src/mongo/util/options_parser/options_parser_init.cpp b/src/mongo/util/options_parser/options_parser_init.cpp
index cc8756add58..e703d3bdd49 100644
--- a/src/mongo/util/options_parser/options_parser_init.cpp
+++ b/src/mongo/util/options_parser/options_parser_init.cpp
@@ -28,6 +28,8 @@
 
 #include "mongo/util/options_parser/startup_options.h"
 
+#include <iostream>
+
 #include "mongo/util/exit_code.h"
 #include "mongo/util/options_parser/option_description.h"
 #include "mongo/util/options_parser/option_section.h"
diff --git a/src/mongo/util/stacktrace.h b/src/mongo/util/stacktrace.h
index 40fa666fdaf..9fc307f8cac 100644
--- a/src/mongo/util/stacktrace.h
+++ b/src/mongo/util/stacktrace.h
@@ -31,8 +31,6 @@
 
 #pragma once
 
-#include <iostream>
-
 #include "mongo/logger/log_severity.h"
 #include "mongo/logger/logger.h"
 #include "mongo/logger/logstream_builder.h"
diff --git a/src/mongo/util/text.cpp b/src/mongo/util/text.cpp
index 1a11222613d..18f789b14bf 100644
--- a/src/mongo/util/text.cpp
+++ b/src/mongo/util/text.cpp
@@ -32,6 +32,7 @@
 #include <boost/integer_traits.hpp>
 #include <boost/smart_ptr/scoped_array.hpp>
 #include <errno.h>
+#include <iostream>
 #include <sstream>
 
 #ifdef _WIN32