15 files changed, 19 insertions, 14 deletions
diff --git a/src/mongo/dbtests/btreetests.cpp b/src/mongo/dbtests/btreetests.cpp
index efa42b1d5c1..aff1e80ee5b 100644
--- a/src/mongo/dbtests/btreetests.cpp
+++ b/src/mongo/dbtests/btreetests.cpp
@@ -21,6 +21,7 @@
 
 #include "../db/db.h"
 #include "../db/btree.h"
+#include "mongo/db/json.h"
 
 #include "dbtests.h"
 
diff --git a/src/mongo/dbtests/chunktests.cpp b/src/mongo/dbtests/chunktests.cpp
index 822046a6a15..080a80fe237 100644
--- a/src/mongo/dbtests/chunktests.cpp
+++ b/src/mongo/dbtests/chunktests.cpp
@@ -19,6 +19,7 @@
 #include "pch.h"
 
 #include "../s/chunk.h"
+#include "mongo/db/json.h"
 
 #include "dbtests.h"
 
diff --git a/src/mongo/dbtests/clienttests.cpp b/src/mongo/dbtests/clienttests.cpp
index a64894b43c1..1b60ef7d429 100644
--- a/src/mongo/dbtests/clienttests.cpp
+++ b/src/mongo/dbtests/clienttests.cpp
@@ -17,9 +17,9 @@
 // client.cpp
 
 #include "pch.h"
-#include "../client/dbclient.h"
 #include "dbtests.h"
 #include "../db/concurrency.h"
+#include "mongo/client/dbclientcursor.h"
 
 namespace ClientTests {
 
diff --git a/src/mongo/dbtests/commandtests.cpp b/src/mongo/dbtests/commandtests.cpp
index fa6204d25fd..31f39f8b45f 100644
--- a/src/mongo/dbtests/commandtests.cpp
+++ b/src/mongo/dbtests/commandtests.cpp
@@ -15,7 +15,6 @@
  */
 
 #include "pch.h"
-#include "../client/dbclient.h"
 #include "dbtests.h"
 #include "../db/concurrency.h"
 
diff --git a/src/mongo/dbtests/counttests.cpp b/src/mongo/dbtests/counttests.cpp
index 92c886868c9..dcd2b808178 100644
--- a/src/mongo/dbtests/counttests.cpp
+++ b/src/mongo/dbtests/counttests.cpp
@@ -20,6 +20,7 @@
 
 #include "../db/cursor.h"
 #include "../db/pdfile.h"
+#include "mongo/db/json.h"
 
 #include "dbtests.h"
 
diff --git a/src/mongo/dbtests/jsobjtests.cpp b/src/mongo/dbtests/jsobjtests.cpp
index a39c749fd53..e295a2e54d0 100644
--- a/src/mongo/dbtests/jsobjtests.cpp
+++ b/src/mongo/dbtests/jsobjtests.cpp
@@ -1251,7 +1251,7 @@ namespace JsobjTests {
                 return BSON( "a" << BSON( "$size" << 4 ) );
             }
             BSONObj actual() {
-                return BSON( "a" << mongo::SIZE << 4 );
+                return BSON( "a" << mongo::BSIZE << 4 );
             }
         };
 
diff --git a/src/mongo/dbtests/jstests.cpp b/src/mongo/dbtests/jstests.cpp
index dd728132216..b1f974d9feb 100644
--- a/src/mongo/dbtests/jstests.cpp
+++ b/src/mongo/dbtests/jstests.cpp
@@ -19,6 +19,7 @@
 
 #include "pch.h"
 #include "../db/instance.h"
+#include "mongo/db/json.h"
 
 #include "../pch.h"
 #include "../scripting/engine.h"
diff --git a/src/mongo/dbtests/macrotests.cpp b/src/mongo/dbtests/macrotests.cpp
index 27515296830..901de923300 100644
--- a/src/mongo/dbtests/macrotests.cpp
+++ b/src/mongo/dbtests/macrotests.cpp
@@ -16,7 +16,7 @@
 
 #undef MONGO_EXPOSE_MACROS
 
-#include "../client/dbclient.h"
+#include "mongo/client/dbclient.h"
 
 #ifdef malloc
 # error malloc defined 0
@@ -26,19 +26,13 @@
 # error verify defined 1
 #endif
 
-#include "../client/parallel.h" //uses verify
-
-#ifdef verify
-# error verify defined 2
-#endif
-
-#include "../client/redef_macros.h"
+#include "mongo/client/redef_macros.h"
 
 #ifndef verify
 # error verify not defined 3
 #endif
 
-#include "../client/undef_macros.h"
+#include "mongo/client/undef_macros.h"
 
 #ifdef verify
 # error verify defined 3
diff --git a/src/mongo/dbtests/perf/perftest.cpp b/src/mongo/dbtests/perf/perftest.cpp
index 10e6727f602..03e62bba084 100644
--- a/src/mongo/dbtests/perf/perftest.cpp
+++ b/src/mongo/dbtests/perf/perftest.cpp
@@ -19,11 +19,12 @@
 
 #include "pch.h"
 
-#include "../../client/dbclient.h"
 #include "../../db/instance.h"
 #include "../../db/ops/query.h"
 #include "../../db/queryoptimizer.h"
 #include "../../util/file_allocator.h"
+#include "mongo/db/json.h"
+#include "mongo/client/dbclientcursor.h"
 
 #include "../framework.h"
 #include <boost/date_time/posix_time/posix_time.hpp>
diff --git a/src/mongo/dbtests/queryoptimizercursortests.cpp b/src/mongo/dbtests/queryoptimizercursortests.cpp
index 55c539bb2ed..dcdc657b9c0 100644
--- a/src/mongo/dbtests/queryoptimizercursortests.cpp
+++ b/src/mongo/dbtests/queryoptimizercursortests.cpp
@@ -23,6 +23,8 @@
 #include "../db/queryoptimizer.h"
 #include "../db/instance.h"
 #include "../db/ops/delete.h"
+#include "mongo/db/json.h"
+#include "mongo/client/dbclientcursor.h"
 #include "dbtests.h"
 
 namespace mongo {
diff --git a/src/mongo/dbtests/queryoptimizertests.cpp b/src/mongo/dbtests/queryoptimizertests.cpp
index 8e836bac79b..f6b065ec37a 100644
--- a/src/mongo/dbtests/queryoptimizertests.cpp
+++ b/src/mongo/dbtests/queryoptimizertests.cpp
@@ -23,6 +23,7 @@
 #include "../db/ops/count.h"
 #include "../db/ops/query.h"
 #include "../db/ops/delete.h"
+#include "mongo/db/json.h"
 #include "dbtests.h"
 
 
diff --git a/src/mongo/dbtests/querytests.cpp b/src/mongo/dbtests/querytests.cpp
index 533d960f9b4..5882511a25e 100644
--- a/src/mongo/dbtests/querytests.cpp
+++ b/src/mongo/dbtests/querytests.cpp
@@ -23,6 +23,7 @@
 
 #include "../db/dbhelpers.h"
 #include "../db/clientcursor.h"
+#include "mongo/client/dbclientcursor.h"
 
 #include "../db/instance.h"
 #include "../db/json.h"
@@ -656,7 +657,7 @@ namespace QueryTests {
             const char *ns = "unittests.querytests.Size";
             client().insert( ns, fromjson( "{a:[1,2,3]}" ) );
             client().ensureIndex( ns, BSON( "a" << 1 ) );
-            ASSERT( client().query( ns, QUERY( "a" << mongo::SIZE << 3 ).hint( BSON( "a" << 1 ) ) )->more() );
+            ASSERT( client().query( ns, QUERY( "a" << mongo::BSIZE << 3 ).hint( BSON( "a" << 1 ) ) )->more() );
         }
     };
 
diff --git a/src/mongo/dbtests/queryutiltests.cpp b/src/mongo/dbtests/queryutiltests.cpp
index 60eb292630e..ea28f9d0ddc 100644
--- a/src/mongo/dbtests/queryutiltests.cpp
+++ b/src/mongo/dbtests/queryutiltests.cpp
@@ -22,6 +22,7 @@
 #include "../db/querypattern.h"
 #include "../db/instance.h"
 #include "../db/pdfile.h"
+#include "mongo/db/json.h"
 #include "dbtests.h"
 
 namespace QueryUtilTests {
diff --git a/src/mongo/dbtests/removetests.cpp b/src/mongo/dbtests/removetests.cpp
index b46681c1fb8..f86b21c8255 100644
--- a/src/mongo/dbtests/removetests.cpp
+++ b/src/mongo/dbtests/removetests.cpp
@@ -18,6 +18,7 @@
  */
 
 #include "../db/dbhelpers.h"
+#include "mongo/client/dbclientcursor.h"
 
 #include "dbtests.h"
 
diff --git a/src/mongo/dbtests/updatetests.cpp b/src/mongo/dbtests/updatetests.cpp
index 64c1ae19f4b..47480f207d1 100644
--- a/src/mongo/dbtests/updatetests.cpp
+++ b/src/mongo/dbtests/updatetests.cpp
@@ -19,6 +19,7 @@
 
 #include "pch.h"
 #include "../db/ops/query.h"
+#include "mongo/client/dbclientcursor.h"
 
 #include "../db/db.h"
 #include "../db/instance.h"