From 310e250fd3936a4a959bb7e2387642c11d4e23e8 Mon Sep 17 00:00:00 2001
From: dwight <dwight@10gen.com>
Date: Sun, 2 Oct 2011 13:38:29 -0400
Subject: [PATCH] cleaning. we want to use pch.h as little as possible (zero
 eventually) this a small step that way

---
 db/client.h              | 1 +
 db/client_common.h       | 5 +++--
 db/clientcursor.cpp      | 1 +
 db/commands.h            | 7 ++++---
 db/commands/distinct.cpp | 1 +
 db/compact.cpp           | 1 +
 db/dbcommands_admin.cpp  | 1 +
 db/geo/2d.cpp            | 1 +
 db/geo/haystack.cpp      | 1 +
 s/d_split.cpp            | 1 +
 10 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/db/client.h b/db/client.h
index 7aace82b443..235f97ce694 100644
--- a/db/client.h
+++ b/db/client.h
@@ -31,6 +31,7 @@
 #include "stats/top.h"
 #include "../util/concurrency/threadlocal.h"
 #include "../db/client_common.h"
+#include "../util/net/message_port.h"
 
 namespace mongo {
 
diff --git a/db/client_common.h b/db/client_common.h
index 46335d2af19..60955b932e6 100644
--- a/db/client_common.h
+++ b/db/client_common.h
@@ -18,8 +18,9 @@
 
 #pragma once
 
-#include "../pch.h"
-#include "security.h"
+//#include "../pch.h"
+//#include "security.h"
+#include "../util/net/hostandport.h"
 
 namespace mongo {
     
diff --git a/db/clientcursor.cpp b/db/clientcursor.cpp
index e803afd459c..0452cdb0473 100644
--- a/db/clientcursor.cpp
+++ b/db/clientcursor.cpp
@@ -30,6 +30,7 @@
 #include "commands.h"
 #include "repl_block.h"
 #include "../util/processinfo.h"
+#include "../util/timer.h"
 
 namespace mongo {
 
diff --git a/db/commands.h b/db/commands.h
index cf8fd0bf3ac..00b8f72d45e 100644
--- a/db/commands.h
+++ b/db/commands.h
@@ -17,16 +17,17 @@
 
 #pragma once
 
-#include "../pch.h"
+//#include "../pch.h"
 #include "jsobj.h"
-#include "../util/timer.h"
-#include "../client/dbclient.h"
+//#include "../util/timer.h"
+//#include "../client/dbclient.h"
 
 namespace mongo {
 
     class BSONObj;
     class BSONObjBuilder;
     class Client;
+    class Timer;
 
     /** mongodb "commands" (sent via db.$cmd.findOne(...))
         subclass to make a command.  define a singleton object for it.
diff --git a/db/commands/distinct.cpp b/db/commands/distinct.cpp
index 48f44050e49..4ca8c4065bf 100644
--- a/db/commands/distinct.cpp
+++ b/db/commands/distinct.cpp
@@ -20,6 +20,7 @@
 #include "../instance.h"
 #include "../queryoptimizer.h"
 #include "../clientcursor.h"
+#include "../util/timer.h"
 
 namespace mongo {
 
diff --git a/db/compact.cpp b/db/compact.cpp
index c6e5f77ee0e..a0010e9df99 100644
--- a/db/compact.cpp
+++ b/db/compact.cpp
@@ -29,6 +29,7 @@
 #include "extsort.h"
 #include "compact.h"
 #include "../util/concurrency/task.h"
+#include "../util/timer.h"
 
 namespace mongo {
 
diff --git a/db/dbcommands_admin.cpp b/db/dbcommands_admin.cpp
index 566027fc594..facffbf6e11 100644
--- a/db/dbcommands_admin.cpp
+++ b/db/dbcommands_admin.cpp
@@ -35,6 +35,7 @@
 #include "../util/alignedbuilder.h"
 #include "../util/paths.h"
 #include "../scripting/engine.h"
+#include "../util/timer.h"
 
 namespace mongo {
 
diff --git a/db/geo/2d.cpp b/db/geo/2d.cpp
index 78d5b867040..d7cd789f894 100644
--- a/db/geo/2d.cpp
+++ b/db/geo/2d.cpp
@@ -27,6 +27,7 @@
 #include "../curop-inl.h"
 #include "../matcher.h"
 #include "core.h"
+#include "../../util/timer.h"
 
 // Note: we use indexinterface herein to talk to the btree code. In the future it would be nice to 
 //       be able to use the V1 key class (see key.h) instead of toBson() which has some cost.
diff --git a/db/geo/haystack.cpp b/db/geo/haystack.cpp
index a5dd478f625..104665087f6 100644
--- a/db/geo/haystack.cpp
+++ b/db/geo/haystack.cpp
@@ -27,6 +27,7 @@
 #include "../curop-inl.h"
 #include "../matcher.h"
 #include "core.h"
+#include "../../util/timer.h"
 
 #define GEOQUADDEBUG(x)
 //#define GEOQUADDEBUG(x) cout << x << endl
diff --git a/s/d_split.cpp b/s/d_split.cpp
index cef6188a2bb..932ea6292c6 100644
--- a/s/d_split.cpp
+++ b/s/d_split.cpp
@@ -29,6 +29,7 @@
 
 #include "../client/connpool.h"
 #include "../client/distlock.h"
+#include "../util/timer.h"
 
 #include "chunk.h" // for static genID only
 #include "config.h"