5 files changed, 8 insertions, 17 deletions
diff --git a/src/mongo/db/geo/geometry_container.cpp b/src/mongo/db/geo/geometry_container.cpp
index bea64bf8f0f..5b4ade3d062 100644
--- a/src/mongo/db/geo/geometry_container.cpp
+++ b/src/mongo/db/geo/geometry_container.cpp
@@ -31,7 +31,7 @@
 
 #include "mongo/db/geo/geoconstants.h"
 #include "mongo/db/geo/geoparser.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 #include "mongo/util/transitional_tools_do_not_use/vector_spooling.h"
 
 namespace mongo {
diff --git a/src/mongo/db/geo/geoparser.cpp b/src/mongo/db/geo/geoparser.cpp
index c5a723805b2..db9e68a0c25 100644
--- a/src/mongo/db/geo/geoparser.cpp
+++ b/src/mongo/db/geo/geoparser.cpp
@@ -41,17 +41,14 @@
 #include "mongo/db/jsobj.h"
 #include "mongo/stdx/memory.h"
 #include "mongo/util/log.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 #include "mongo/util/transitional_tools_do_not_use/vector_spooling.h"
 #include "third_party/s2/s2polygonbuilder.h"
 
-#define BAD_VALUE(error) Status(ErrorCodes::BadValue, ::mongoutils::str::stream() << error)
+#define BAD_VALUE(error) Status(ErrorCodes::BadValue, str::stream() << error)
 
 namespace mongo {
 
-using std::unique_ptr;
-using std::stringstream;
-
 namespace dps = ::mongo::dotted_path_support;
 
 // This field must be present, and...
@@ -116,7 +113,7 @@ static Status coordToPoint(double lng, double lat, S2Point* out) {
     S2LatLng ll = S2LatLng::FromDegrees(lat, lng).Normalized();
     // This shouldn't happen since we should only have valid lng/lats.
     if (!ll.is_valid()) {
-        stringstream ss;
+        std::stringstream ss;
         ss << "coords invalid after normalization, lng = " << lng << " lat = " << lat << endl;
         uasserted(17125, ss.str());
     }
@@ -325,7 +322,7 @@ static Status parseBigSimplePolygonCoordinates(const BSONElement& elem, BigSimpl
         return BAD_VALUE("Loop must have at least 3 different vertices: " << elem.toString(false));
     }
 
-    unique_ptr<S2Loop> loop(new S2Loop(exteriorVertices));
+    std::unique_ptr<S2Loop> loop(new S2Loop(exteriorVertices));
     // Check whether this loop is valid.
     if (!loop->IsValid(&err)) {
         return BAD_VALUE("Loop is not valid: " << elem.toString(false) << " " << err);
diff --git a/src/mongo/db/geo/hash.cpp b/src/mongo/db/geo/hash.cpp
index eb1b3d24631..f74a403f77b 100644
--- a/src/mongo/db/geo/hash.cpp
+++ b/src/mongo/db/geo/hash.cpp
@@ -32,14 +32,11 @@
 #include "mongo/db/field_parser.h"
 #include "mongo/db/geo/shapes.h"
 #include "mongo/db/jsobj.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 
 #include <algorithm>  // for max()
 #include <iostream>
 
-// So we can get at the str namespace.
-using namespace mongoutils;
-
 namespace mongo {
 
 using std::stringstream;
diff --git a/src/mongo/db/geo/hash_test.cpp b/src/mongo/db/geo/hash_test.cpp
index 4081cc97aea..1681803083f 100644
--- a/src/mongo/db/geo/hash_test.cpp
+++ b/src/mongo/db/geo/hash_test.cpp
@@ -43,7 +43,7 @@
 #include "mongo/platform/random.h"
 #include "mongo/unittest/unittest.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 
 namespace {
 
diff --git a/src/mongo/db/geo/shapes.cpp b/src/mongo/db/geo/shapes.cpp
index 9dfd3170116..d0a062c5e2c 100644
--- a/src/mongo/db/geo/shapes.cpp
+++ b/src/mongo/db/geo/shapes.cpp
@@ -29,13 +29,10 @@
 
 #include "mongo/db/geo/shapes.h"
 #include "mongo/db/jsobj.h"
-#include "mongo/util/mongoutils/str.h"
+#include "mongo/util/str.h"
 
 using std::abs;
 
-// So we can get at the str namespace.
-using namespace mongoutils;
-
 namespace mongo {
 
 ////////////// Point