From 61be4fc8357c3784a22d0bba9e1107a77a2c9216 Mon Sep 17 00:00:00 2001
From: Eliot Horowitz <eliot@10gen.com>
Date: Tue, 21 Jun 2011 01:56:49 -0400
Subject: [PATCH] some include cleaning

---
 db/oplog.h            | 2 +-
 db/repl/rs_config.cpp | 1 +
 s/commands_public.cpp | 1 -
 s/d_migrate.cpp       | 3 +--
 s/d_split.cpp         | 4 ++--
 s/d_state.cpp         | 3 +--
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/db/oplog.h b/db/oplog.h
index 06345b19d08..f87a1c85e04 100644
--- a/db/oplog.h
+++ b/db/oplog.h
@@ -26,7 +26,7 @@
 #include "pdfile.h"
 #include "db.h"
 #include "dbhelpers.h"
-#include "query.h"
+#include "clientcursor.h"
 #include "../client/dbclient.h"
 #include "../util/optime.h"
 #include "../util/timer.h"
diff --git a/db/repl/rs_config.cpp b/db/repl/rs_config.cpp
index 273445da55a..b4a6967930a 100644
--- a/db/repl/rs_config.cpp
+++ b/db/repl/rs_config.cpp
@@ -24,6 +24,7 @@
 #include "../dbhelpers.h"
 #include "connections.h"
 #include "../oplog.h"
+#include "../instance.h"
 
 using namespace bson;
 
diff --git a/s/commands_public.cpp b/s/commands_public.cpp
index 76cf678608c..22760f51d28 100644
--- a/s/commands_public.cpp
+++ b/s/commands_public.cpp
@@ -23,7 +23,6 @@
 #include "../client/connpool.h"
 #include "../client/parallel.h"
 #include "../db/commands.h"
-#include "../db/query.h"
 #include "../db/queryutil.h"
 #include "../scripting/engine.h"
 
diff --git a/s/d_migrate.cpp b/s/d_migrate.cpp
index c6a9118a71b..3d689b420f4 100644
--- a/s/d_migrate.cpp
+++ b/s/d_migrate.cpp
@@ -29,13 +29,12 @@
 
 #include "../db/commands.h"
 #include "../db/jsobj.h"
-#include "../db/dbmessage.h"
-#include "../db/query.h"
 #include "../db/cmdline.h"
 #include "../db/queryoptimizer.h"
 #include "../db/btree.h"
 #include "../db/repl_block.h"
 #include "../db/dur.h"
+#include "../db/clientcursor.h"
 
 #include "../client/connpool.h"
 #include "../client/distlock.h"
diff --git a/s/d_split.cpp b/s/d_split.cpp
index d68238dc995..28ee9fa3109 100644
--- a/s/d_split.cpp
+++ b/s/d_split.cpp
@@ -22,10 +22,10 @@
 
 #include "../db/btree.h"
 #include "../db/commands.h"
-#include "../db/dbmessage.h"
 #include "../db/jsobj.h"
-#include "../db/query.h"
+#include "../db/instance.h"
 #include "../db/queryoptimizer.h"
+#include "../db/clientcursor.h"
 
 #include "../client/connpool.h"
 #include "../client/distlock.h"
diff --git a/s/d_state.cpp b/s/d_state.cpp
index 8d3408b945b..49c2ac54b93 100644
--- a/s/d_state.cpp
+++ b/s/d_state.cpp
@@ -28,8 +28,7 @@
 
 #include "../db/commands.h"
 #include "../db/jsobj.h"
-#include "../db/dbmessage.h"
-#include "../db/query.h"
+#include "../db/db.h"
 
 #include "../client/connpool.h"