14 files changed, 21 insertions, 3 deletions
diff --git a/src/mongo/bson/bson_validate_test.cpp b/src/mongo/bson/bson_validate_test.cpp
index 2ea252ac92a..3826865943b 100644
--- a/src/mongo/bson/bson_validate_test.cpp
+++ b/src/mongo/bson/bson_validate_test.cpp
@@ -27,6 +27,8 @@
 
 #define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kDefault
 
+#include <boost/scoped_array.hpp>
+
 #include "mongo/base/data_view.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/unittest/unittest.h"
@@ -37,6 +39,7 @@
 namespace {
 
     using namespace mongo;
+    using boost::scoped_array;
 
     void appendInvalidStringElement(const char* fieldName, BufBuilder* bb) {
         // like a BSONObj string, but without a NUL terminator.
diff --git a/src/mongo/client/cyrus_sasl_client_session.h b/src/mongo/client/cyrus_sasl_client_session.h
index 53d225d31bd..7574dcf6ff8 100644
--- a/src/mongo/client/cyrus_sasl_client_session.h
+++ b/src/mongo/client/cyrus_sasl_client_session.h
@@ -25,6 +25,8 @@
  *    then also delete it in the license file.
  */
 
+#include <boost/scoped_array.hpp>
+
 #include "mongo/client/export_macros.h"
 #include "mongo/client/sasl_client_session.h"
 
diff --git a/src/mongo/db/pipeline/document.cpp b/src/mongo/db/pipeline/document.cpp
index 07ef3123c53..12315636b4d 100644
--- a/src/mongo/db/pipeline/document.cpp
+++ b/src/mongo/db/pipeline/document.cpp
@@ -34,6 +34,7 @@
 #include "mongo/db/pipeline/document.h"
 
 #include <boost/functional/hash.hpp>
+#include <boost/scoped_array.hpp>
 
 #include "mongo/db/jsobj.h"
 #include "mongo/db/pipeline/field_path.h"
diff --git a/src/mongo/db/pipeline/value.cpp b/src/mongo/db/pipeline/value.cpp
index 82b15d3e038..22fb3d90fd0 100644
--- a/src/mongo/db/pipeline/value.cpp
+++ b/src/mongo/db/pipeline/value.cpp
@@ -34,6 +34,7 @@
 #include "mongo/db/pipeline/value.h"
 
 #include <boost/functional/hash.hpp>
+#include <boost/scoped_array.hpp>
 
 #include "mongo/db/jsobj.h"
 #include "mongo/db/pipeline/document.h"
diff --git a/src/mongo/db/storage/mmap_v1/durop.cpp b/src/mongo/db/storage/mmap_v1/durop.cpp
index 29192362e91..18c441393f8 100644
--- a/src/mongo/db/storage/mmap_v1/durop.cpp
+++ b/src/mongo/db/storage/mmap_v1/durop.cpp
@@ -49,6 +49,8 @@ using namespace mongoutils;
 
 namespace mongo {
 
+    using boost::scoped_array;
+
     namespace dur {
 
         /** read a durop from journal file referenced by br.
diff --git a/src/mongo/pch.h b/src/mongo/pch.h
index 03a308369c2..a94d351e5d4 100644
--- a/src/mongo/pch.h
+++ b/src/mongo/pch.h
@@ -50,7 +50,6 @@
 #include <vector>
 
 #define BOOST_FILESYSTEM_VERSION 3
-#include <boost/scoped_array.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
@@ -60,7 +59,6 @@
 namespace mongo {
 
     using namespace std;
-    using boost::scoped_array;
     using boost::scoped_ptr;
     using boost::shared_ptr;
 }
diff --git a/src/mongo/scripting/engine.cpp b/src/mongo/scripting/engine.cpp
index b4f432034e8..4d4be1407a2 100644
--- a/src/mongo/scripting/engine.cpp
+++ b/src/mongo/scripting/engine.cpp
@@ -35,6 +35,7 @@
 
 #include <cctype>
 #include <boost/filesystem/operations.hpp>
+#include <boost/scoped_array.hpp>
 
 #include "mongo/client/dbclientcursor.h"
 #include "mongo/client/dbclientinterface.h"
diff --git a/src/mongo/scripting/v8-3.25_db.cpp b/src/mongo/scripting/v8-3.25_db.cpp
index 3b9f22a3e41..fc7f7ae6ac8 100644
--- a/src/mongo/scripting/v8-3.25_db.cpp
+++ b/src/mongo/scripting/v8-3.25_db.cpp
@@ -46,6 +46,7 @@
 #include "mongo/util/text.h"
 
 using namespace std;
+using boost::scoped_array;
 
 namespace mongo {
 
diff --git a/src/mongo/scripting/v8_db.cpp b/src/mongo/scripting/v8_db.cpp
index e16b16b7e80..1346e4b8313 100644
--- a/src/mongo/scripting/v8_db.cpp
+++ b/src/mongo/scripting/v8_db.cpp
@@ -48,6 +48,7 @@
 #include "mongo/util/text.h"
 
 using namespace std;
+using boost::scoped_array;
 
 namespace mongo {
 
diff --git a/src/mongo/shell/shell_utils_launcher.cpp b/src/mongo/shell/shell_utils_launcher.cpp
index e9877e6f434..fde3da7b9eb 100644
--- a/src/mongo/shell/shell_utils_launcher.cpp
+++ b/src/mongo/shell/shell_utils_launcher.cpp
@@ -33,6 +33,7 @@
 
 #include "mongo/shell/shell_utils_launcher.h"
 
+#include <boost/scoped_array.hpp>
 #include <boost/thread/thread.hpp>
 #include <iostream>
 #include <map>
@@ -62,6 +63,8 @@
 
 namespace mongo {
 
+    using boost::scoped_array;
+
     extern bool dbexitCalled;
 
 #ifdef _WIN32
diff --git a/src/mongo/util/base64.h b/src/mongo/util/base64.h
index 9a41e4947b8..cfbea3fad20 100644
--- a/src/mongo/util/base64.h
+++ b/src/mongo/util/base64.h
@@ -29,6 +29,8 @@
 
 #pragma once
 
+#include <boost/scoped_array.hpp>
+
 #include "mongo/util/assert_util.h"
 
 namespace mongo {
diff --git a/src/mongo/util/net/listen.cpp b/src/mongo/util/net/listen.cpp
index 1a018749aad..fa0c97ead1a 100644
--- a/src/mongo/util/net/listen.cpp
+++ b/src/mongo/util/net/listen.cpp
@@ -34,6 +34,8 @@
 
 #include "mongo/util/net/listen.h"
 
+#include <boost/scoped_array.hpp>
+
 #include "mongo/db/server_options.h"
 #include "mongo/base/owned_pointer_vector.h"
 #include "mongo/util/exit.h"
diff --git a/src/mongo/util/processinfo_win32.cpp b/src/mongo/util/processinfo_win32.cpp
index edc711e42b4..2cc68e7c808 100644
--- a/src/mongo/util/processinfo_win32.cpp
+++ b/src/mongo/util/processinfo_win32.cpp
@@ -34,6 +34,7 @@
 #include "mongo/pch.h"
 #undef MONGO_PCH_WHITELISTED
 
+#include <boost/scoped_array.hpp>
 #include <iostream>
 #include <psapi.h>
 
@@ -41,6 +42,7 @@
 #include "mongo/util/log.h"
 
 using namespace std;
+using boost::scoped_array;
 
 namespace mongo {
 
diff --git a/src/mongo/util/text_startuptest.cpp b/src/mongo/util/text_startuptest.cpp
index a6fd6da4cc8..3fc9398f4ea 100644
--- a/src/mongo/util/text_startuptest.cpp
+++ b/src/mongo/util/text_startuptest.cpp
@@ -34,7 +34,6 @@
 
 #include "mongo/util/startup_test.h"
 #include "mongo/util/mongoutils/str.h"
-#include <boost/smart_ptr/scoped_array.hpp>
 
 namespace mongo {
     struct TextUnitTest : public StartupTest {