20 files changed, 20 insertions, 16 deletions
diff --git a/src/mongo/s/balance.cpp b/src/mongo/s/balance.cpp
index a97636ae958..2814aad9c8e 100644
--- a/src/mongo/s/balance.cpp
+++ b/src/mongo/s/balance.cpp
@@ -22,6 +22,7 @@
 #include "../db/cmdline.h"
 
 #include "../client/distlock.h"
+#include "mongo/client/dbclientcursor.h"
 
 #include "balance.h"
 #include "server.h"
diff --git a/src/mongo/s/balance.h b/src/mongo/s/balance.h
index 562ba80970e..e2a723734dc 100644
--- a/src/mongo/s/balance.h
+++ b/src/mongo/s/balance.h
@@ -20,7 +20,6 @@
 
 #include "../pch.h"
 #include "../util/background.h"
-#include "../client/dbclient.h"
 #include "balancer_policy.h"
 
 namespace mongo {
diff --git a/src/mongo/s/balancer_policy.cpp b/src/mongo/s/balancer_policy.cpp
index 03defa5678a..bde49da8ecb 100644
--- a/src/mongo/s/balancer_policy.cpp
+++ b/src/mongo/s/balancer_policy.cpp
@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-#include "../client/dbclient.h"
 #include "../util/stringutils.h"
 #include "../util/unittest.h"
 
diff --git a/src/mongo/s/chunk.cpp b/src/mongo/s/chunk.cpp
index c68630be64d..21ef0cc44b6 100644
--- a/src/mongo/s/chunk.cpp
+++ b/src/mongo/s/chunk.cpp
@@ -23,6 +23,7 @@
 #include "../db/queryutil.h"
 #include "../util/unittest.h"
 #include "../util/timer.h"
+#include "mongo/client/dbclientcursor.h"
 
 #include "chunk.h"
 #include "config.h"
diff --git a/src/mongo/s/chunk.h b/src/mongo/s/chunk.h
index 122c42f8825..0cfdb135f9e 100644
--- a/src/mongo/s/chunk.h
+++ b/src/mongo/s/chunk.h
@@ -21,7 +21,6 @@
 #include "../pch.h"
 
 #include "../bson/util/atomic_int.h"
-#include "../client/dbclient.h"
 #include "../client/distlock.h"
 
 #include "shardkey.h"
diff --git a/src/mongo/s/commands_admin.cpp b/src/mongo/s/commands_admin.cpp
index 5d191a98b45..72205648bdb 100644
--- a/src/mongo/s/commands_admin.cpp
+++ b/src/mongo/s/commands_admin.cpp
@@ -34,6 +34,7 @@
 #include "../util/timer.h"
 
 #include "../client/connpool.h"
+#include "mongo/client/dbclientcursor.h"
 
 #include "../db/dbmessage.h"
 #include "../db/commands.h"
diff --git a/src/mongo/s/config.cpp b/src/mongo/s/config.cpp
index f062a9d4f3d..71fdafa03b7 100644
--- a/src/mongo/s/config.cpp
+++ b/src/mongo/s/config.cpp
@@ -22,9 +22,11 @@
 #include "../util/unittest.h"
 #include "../client/connpool.h"
 #include "../client/model.h"
+#include "mongo/client/dbclientcursor.h"
 #include "../db/pdfile.h"
 #include "../db/cmdline.h"
 
+
 #include "chunk.h"
 #include "config.h"
 #include "grid.h"
diff --git a/src/mongo/s/config.h b/src/mongo/s/config.h
index 39c99a756a5..5808b623df0 100644
--- a/src/mongo/s/config.h
+++ b/src/mongo/s/config.h
@@ -24,7 +24,6 @@
 #pragma once
 
 #include "../db/namespace.h"
-#include "../client/dbclient.h"
 #include "../client/model.h"
 
 #include "chunk.h"
diff --git a/src/mongo/s/config_migrate.cpp b/src/mongo/s/config_migrate.cpp
index b95d0ae4bda..45376a1bb69 100644
--- a/src/mongo/s/config_migrate.cpp
+++ b/src/mongo/s/config_migrate.cpp
@@ -21,6 +21,7 @@
 #include "../util/unittest.h"
 #include "../client/connpool.h"
 #include "../client/model.h"
+#include "mongo/client/dbclientcursor.h"
 #include "../db/pdfile.h"
 #include "../db/cmdline.h"
 
diff --git a/src/mongo/s/cursors.h b/src/mongo/s/cursors.h
index ee27421983d..ec2fd026136 100644
--- a/src/mongo/s/cursors.h
+++ b/src/mongo/s/cursors.h
@@ -22,7 +22,6 @@
 
 #include "../db/jsobj.h"
 #include "../db/dbmessage.h"
-#include "../client/dbclient.h"
 #include "../client/parallel.h"
 
 #include "request.h"
diff --git a/src/mongo/s/d_chunk_manager.h b/src/mongo/s/d_chunk_manager.h
index fd5974e4953..807537cc0a5 100644
--- a/src/mongo/s/d_chunk_manager.h
+++ b/src/mongo/s/d_chunk_manager.h
@@ -26,7 +26,7 @@
 namespace mongo {
 
     class ClientCursor;
-
+    class DBClientCursorInterface;
     /**
      * Controls the boundaries of all the chunks for a given collection that live in this shard.
      *
diff --git a/src/mongo/s/d_migrate.cpp b/src/mongo/s/d_migrate.cpp
index af7b4dd7272..a8ad29255e7 100644
--- a/src/mongo/s/d_migrate.cpp
+++ b/src/mongo/s/d_migrate.cpp
@@ -38,6 +38,7 @@
 
 #include "../client/connpool.h"
 #include "../client/distlock.h"
+#include "mongo/client/dbclientcursor.h"
 
 #include "../util/queue.h"
 #include "../util/unittest.h"
diff --git a/src/mongo/s/d_split.cpp b/src/mongo/s/d_split.cpp
index 11b7b42e8e9..b682f56f61a 100644
--- a/src/mongo/s/d_split.cpp
+++ b/src/mongo/s/d_split.cpp
@@ -26,6 +26,7 @@
 #include "../db/instance.h"
 #include "../db/queryoptimizer.h"
 #include "../db/clientcursor.h"
+#include "mongo/client/dbclientcursor.h"
 
 #include "../client/connpool.h"
 #include "../client/distlock.h"
diff --git a/src/mongo/s/grid.cpp b/src/mongo/s/grid.cpp
index 7731104e9f7..0a910ed8a47 100644
--- a/src/mongo/s/grid.cpp
+++ b/src/mongo/s/grid.cpp
@@ -23,6 +23,7 @@
 #include "../util/stringutils.h"
 #include "../util/unittest.h"
 #include "../db/namespacestring.h"
+#include "mongo/db/json.h"
 
 #include "grid.h"
 #include "shard.h"
diff --git a/src/mongo/s/s_only.cpp b/src/mongo/s/s_only.cpp
index 85fc9c18e8b..25cb102dfa6 100644
--- a/src/mongo/s/s_only.cpp
+++ b/src/mongo/s/s_only.cpp
@@ -18,7 +18,6 @@
 #include "pch.h"
 #include "request.h"
 #include "client.h"
-#include "../client/dbclient.h"
 #include "../db/dbhelpers.h"
 #include "../db/matcher.h"
 #include "../db/commands.h"
diff --git a/src/mongo/s/shard.cpp b/src/mongo/s/shard.cpp
index e40bb8de41b..c5203a7f1c6 100644
--- a/src/mongo/s/shard.cpp
+++ b/src/mongo/s/shard.cpp
@@ -22,6 +22,7 @@
 #include "request.h"
 #include "client.h"
 #include "../db/commands.h"
+#include "mongo/client/dbclientcursor.h"
 #include <set>
 
 namespace mongo {
diff --git a/src/mongo/s/shardkey.cpp b/src/mongo/s/shardkey.cpp
index f926bba314b..ff6bafa0cad 100644
--- a/src/mongo/s/shardkey.cpp
+++ b/src/mongo/s/shardkey.cpp
@@ -19,6 +19,7 @@
 #include "pch.h"
 #include "chunk.h"
 #include "../db/jsobj.h"
+#include "mongo/db/json.h"
 #include "../util/unittest.h"
 #include "../util/timer.h"
 
diff --git a/src/mongo/s/shardkey.h b/src/mongo/s/shardkey.h
index ed426e31f05..02f6b5b18d3 100644
--- a/src/mongo/s/shardkey.h
+++ b/src/mongo/s/shardkey.h
@@ -18,8 +18,6 @@
 
 #pragma once
 
-#include "../client/dbclient.h"
-
 namespace mongo {
 
     class Chunk;
diff --git a/src/mongo/s/strategy_shard.cpp b/src/mongo/s/strategy_shard.cpp
index 10b99e339e9..38e1e0f37bd 100644
--- a/src/mongo/s/strategy_shard.cpp
+++ b/src/mongo/s/strategy_shard.cpp
@@ -20,6 +20,7 @@
 
 #include "mongo/bson/util/builder.h"
 #include "mongo/client/connpool.h"
+#include "mongo/client/dbclientcursor.h"
 #include "mongo/db/commands.h"
 #include "mongo/db/index.h"
 #include "mongo/s/client.h"
diff --git a/src/mongo/s/util.h b/src/mongo/s/util.h
index 2f0354a96da..c814daa0ce9 100644
--- a/src/mongo/s/util.h
+++ b/src/mongo/s/util.h
@@ -18,10 +18,9 @@
 
 #pragma once
 
-#include "../pch.h"
-#include "../client/dbclient.h"
-#include "../db/jsobj.h"
-
+#include "mongo/pch.h"
+#include "mongo/db/jsobj.h"
+#include "mongo/util/mongoutils/str.h"
 /**
    some generic sharding utils that can be used in mongod or mongos
  */
@@ -105,7 +104,7 @@ namespace mongo {
                 _combined = 0;
                 break;
             default:
-                massert( 13657 , str::stream() << "unknown type for ShardChunkVersion: " << elem , 0 );
+                massert( 13657 , mongoutils::str::stream() << "unknown type for ShardChunkVersion: " << elem , 0 );
             }
             return *this;
         }
@@ -123,7 +122,7 @@ namespace mongo {
     public:
         StaleConfigException( const string& ns , const string& raw , int code, ShardChunkVersion received, ShardChunkVersion wanted, bool justConnection = false )
             : AssertionException(
-                    str::stream() << raw << " ( ns : " << ns <<
+                    mongoutils::str::stream() << raw << " ( ns : " << ns <<
                                              ", received : " << received.toString() <<
                                              ", wanted : " << wanted.toString() <<
                                              ", " << ( code == SendStaleConfigCode ? "send" : "recv" ) << " )",
@@ -137,7 +136,7 @@ namespace mongo {
         // Preferred if we're rebuilding this from a thrown exception
         StaleConfigException( const string& raw , int code, const BSONObj& error, bool justConnection = false )
             : AssertionException(
-                    str::stream() << raw << " ( ns : " << error["ns"].String() << // Note, this will fail if we don't have a ns
+                    mongoutils::str::stream() << raw << " ( ns : " << error["ns"].String() << // Note, this will fail if we don't have a ns
                                              ", received : " << ShardChunkVersion( error["vReceived"] ).toString() <<
                                              ", wanted : " << ShardChunkVersion( error["vWanted"] ).toString() <<
                                              ", " << ( code == SendStaleConfigCode ? "send" : "recv" ) << " )",
@@ -210,6 +209,7 @@ namespace mongo {
     };
 
     class ShardConnection;
+    class DBClientBase;
     class VersionManager {
     public:
         VersionManager(){};