Imported Upstream version 2.6.11upstream/2.6.11

1 files changed, 7 insertions, 8 deletions

diff --git a/src/mongo/client/clientAndShell.cpp b/src/mongo/client/clientAndShell.cpp
index 92f12e40055..317965de927 100644
--- a/src/mongo/client/clientAndShell.cpp
+++ b/src/mongo/client/clientAndShell.cpp
@@ -15,18 +15,17 @@
  *    limitations under the License.
  */
 
-#include "pch.h"
+#include "mongo/pch.h"
+
+#include "mongo/client/clientOnly-private.h"
+#include "mongo/db/client_basic.h"
+#include "mongo/db/server_options.h"
+#include "mongo/s/shard.h"
 #include "mongo/util/assert_util.h"
-#include "../db/cmdline.h"
-#include "../db/client_basic.h"
-#include "../s/shard.h"
-#include "../util/timer.h"
-#include "clientOnly-private.h"
+#include "mongo/util/timer.h"
 
 namespace mongo {
 
-    CmdLine cmdLine;
-
     const char * curNs = "in client mode";
 
     bool dbexitCalled = false;