Some cleanup of headers and whitespace

Try to impose current kernel style guide rules for include files on a
subset of files: include what you use, start include paths from "mongo/",
group and sort includes alphabetically.  Changed tabs to spaces in a few
places, fixed alignment where tabs had throw it off.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/mongo/db/json.h b/src/mongo/db/json.h
index 68dae042574..19502f0d7b6 100644
--- a/src/mongo/db/json.h
+++ b/src/mongo/db/json.h
@@ -18,8 +18,9 @@
 
 #pragma once
 
-#include "../pch.h"
-#include "jsobj.h"
+#include <string>
+
+#include "mongo/bson/bsonobj.h"
 
 namespace mongo {
 
@@ -33,7 +34,7 @@ namespace mongo {
      \throws MsgAssertionException if parsing fails.  The message included with
      this assertion includes a rough indication of where parsing failed.
     */
-    BSONObj fromjson(const string &str);
+    BSONObj fromjson(const std::string &str);
 
     /** len will be size of JSON object in text chars. */
     BSONObj fromjson(const char *str, int* len=NULL);