Revert "SERVER-14995 Move operation id, lockState and client fields to OperationContext."

This reverts commit 4ea38c308da292f43e29d32b1b53b7324db0bafe.

2 files changed, 1 insertions, 5 deletions

diff --git a/src/mongo/db/query/find.cpp b/src/mongo/db/query/find.cpp
index eb2b62f8d4a..c1938e51852 100644
--- a/src/mongo/db/query/find.cpp
+++ b/src/mongo/db/query/find.cpp
@@ -37,10 +37,8 @@
 #include "mongo/client/dbclientinterface.h"
 #include "mongo/db/catalog/collection.h"
 #include "mongo/db/catalog/database_holder.h"
-#include "mongo/db/client.h"
 #include "mongo/db/clientcursor.h"
 #include "mongo/db/commands.h"
-#include "mongo/db/curop.h"
 #include "mongo/db/db_raii.h"
 #include "mongo/db/exec/filter.h"
 #include "mongo/db/exec/working_set_common.h"
diff --git a/src/mongo/db/query/find.h b/src/mongo/db/query/find.h
index 650a6f0e4fd..876070a5fdc 100644
--- a/src/mongo/db/query/find.h
+++ b/src/mongo/db/query/find.h
@@ -31,15 +31,13 @@
 #include <string>
 
 #include "mongo/db/clientcursor.h"
+#include "mongo/db/curop.h"
 #include "mongo/db/dbmessage.h"
-#include "mongo/db/operation_context.h"
 #include "mongo/db/query/canonical_query.h"
 #include "mongo/util/net/message.h"
 
 namespace mongo {
 
-    class CurOp;
-    class NamespaceString;
     class OperationContext;
 
     class ScopedRecoveryUnitSwapper {