888 files changed, 102 insertions, 114 deletions

diff --git a/.gitignore b/.gitignore
index 2081a90d52f..922d1d9afc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -123,10 +123,10 @@ debian/mongodb
 .DS_Store
 
 #third party
-third_party/js-1.7/jsautocfg.h
-third_party/js-1.7/jsautokw.h
-third_party/js-1.7/jskwgen
-third_party/js-1.7/jscpucfg
+src/third_party/js-1.7/jsautocfg.h
+src/third_party/js-1.7/jsautokw.h
+src/third_party/js-1.7/jskwgen
+src/third_party/js-1.7/jscpucfg
 
 # QtCreator
 *.config
diff --git a/SConstruct b/SConstruct
index 4cb535cf36d..ce558f6cf6f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -34,7 +34,7 @@ def findSettingsSetup():
 
 def getThirdPartyShortNames():
     lst = []
-    for x in os.listdir( "third_party" ):
+    for x in os.listdir( "src/third_party" ):
         if not x.endswith( ".py" ) or x.find( "#" ) >= 0:
             continue
          
@@ -261,7 +261,8 @@ if has_option( "cpppath" ):
     env["CPPPATH"] = [get_option( "cpppath" )]
 
 env.Append( CPPDEFINES=[ "_SCONS" , "MONGO_EXPOSE_MACROS" ] )
-env.Append( CPPPATH=[ "." ] )
+env.Append( CPPPATH=[ "./src/mongo" ] )
+env.Append( CPPPATH=[ "./src/" ] )
 
 if has_option( "safeshell" ):
     env.Append( CPPDEFINES=[ "MONGO_SAFE_SHELL" ] )
@@ -336,7 +337,7 @@ class InstallSetup:
         self.headers = True
         self.bannerDir = "distsrc/client/"
         self.headerRoot = ""
-        self.clientTestsDir = "client/examples/"
+        self.clientTestsDir = "src/mongo/client/examples/"
         
 installSetup = InstallSetup()
 if distBuild:
@@ -349,119 +350,119 @@ if has_option( "full" ):
 
 # ------    SOURCE FILE SETUP -----------
 
-commonFiles = Split( "pch.cpp buildinfo.cpp db/indexkey.cpp db/jsobj.cpp bson/oid.cpp db/json.cpp db/lasterror.cpp db/nonce.cpp db/queryutil.cpp db/querypattern.cpp db/projection.cpp shell/mongo.cpp" )
-commonFiles += [ "util/background.cpp" , "util/intrusive_counter.cpp",
-                 "util/util.cpp" , "util/file_allocator.cpp" ,
-                 "util/assert_util.cpp" , "util/log.cpp" , "util/ramlog.cpp" , "util/md5main.cpp" , "util/base64.cpp", "util/concurrency/vars.cpp", "util/concurrency/task.cpp", "util/debug_util.cpp",
-                 "util/concurrency/thread_pool.cpp", "util/password.cpp", "util/version.cpp", "util/signal_handlers.cpp",  
-                 "util/histogram.cpp", "util/concurrency/spin_lock.cpp", "util/text.cpp" , "util/stringutils.cpp" ,
-                 "util/concurrency/synchronization.cpp" ]
-commonFiles += [ "util/net/sock.cpp" , "util/net/httpclient.cpp" , "util/net/message.cpp" , "util/net/message_port.cpp" , "util/net/listen.cpp" ]
-commonFiles += Glob( "util/*.c" ) 
-commonFiles += Split( "client/connpool.cpp client/dbclient.cpp client/dbclient_rs.cpp client/dbclientcursor.cpp client/model.cpp client/syncclusterconnection.cpp client/distlock.cpp s/shardconnection.cpp" )
+commonFiles = [ "src/mongo/pch.cpp" , "src/mongo/buildinfo.cpp" , "src/mongo/db/indexkey.cpp" , "src/mongo/db/jsobj.cpp" , "src/mongo/bson/oid.cpp" , "src/mongo/db/json.cpp" , "src/mongo/db/lasterror.cpp" , "src/mongo/db/nonce.cpp" , "src/mongo/db/queryutil.cpp" , "src/mongo/db/querypattern.cpp" , "src/mongo/db/projection.cpp" , "src/mongo/shell/mongo.cpp" ]
+commonFiles += [ "src/mongo/util/background.cpp" , "src/mongo/util/intrusive_counter.cpp",
+                 "src/mongo/util/util.cpp" , "src/mongo/util/file_allocator.cpp" ,
+                 "src/mongo/util/assert_util.cpp" , "src/mongo/util/log.cpp" , "src/mongo/util/ramlog.cpp" , "src/mongo/util/md5main.cpp" , "src/mongo/util/base64.cpp", "src/mongo/util/concurrency/vars.cpp", "src/mongo/util/concurrency/task.cpp", "src/mongo/util/debug_util.cpp",
+                 "src/mongo/util/concurrency/thread_pool.cpp", "src/mongo/util/password.cpp", "src/mongo/util/version.cpp", "src/mongo/util/signal_handlers.cpp",  
+                 "src/mongo/util/histogram.cpp", "src/mongo/util/concurrency/spin_lock.cpp", "src/mongo/util/text.cpp" , "src/mongo/util/stringutils.cpp" ,
+                 "src/mongo/util/concurrency/synchronization.cpp" ]
+commonFiles += [ "src/mongo/util/net/sock.cpp" , "src/mongo/util/net/httpclient.cpp" , "src/mongo/util/net/message.cpp" , "src/mongo/util/net/message_port.cpp" , "src/mongo/util/net/listen.cpp" ]
+commonFiles += Glob( "src/mongo/util/*.c" ) 
+commonFiles += [ "src/mongo/client/connpool.cpp" , "src/mongo/client/dbclient.cpp" , "src/mongo/client/dbclient_rs.cpp" , "src/mongo/client/dbclientcursor.cpp" , "src/mongo/client/model.cpp" , "src/mongo/client/syncclusterconnection.cpp" , "src/mongo/client/distlock.cpp" , "src/mongo/s/shardconnection.cpp" ] 
 
 #mmap stuff
 
-coreDbFiles = [ "db/commands.cpp" ]
-coreServerFiles = [ "util/net/message_server_port.cpp" , 
-                    "client/parallel.cpp" , "db/common.cpp", 
-                    "util/net/miniwebserver.cpp" , "db/dbwebserver.cpp" , 
-                    "db/matcher.cpp" , "db/dbcommands_generic.cpp" , "db/commands/cloud.cpp", "db/dbmessage.cpp" ]
+coreDbFiles = [ "src/mongo/db/commands.cpp" ]
+coreServerFiles = [ "src/mongo/util/net/message_server_port.cpp" , 
+                    "src/mongo/client/parallel.cpp" , "src/mongo/db/common.cpp", 
+                    "src/mongo/util/net/miniwebserver.cpp" , "src/mongo/db/dbwebserver.cpp" , 
+                    "src/mongo/db/matcher.cpp" , "src/mongo/db/dbcommands_generic.cpp" , "src/mongo/db/commands/cloud.cpp", "src/mongo/db/dbmessage.cpp" ]
 
-mmapFiles = [ "util/mmap.cpp" ]
+mmapFiles = [ "src/mongo/util/mmap.cpp" ]
 
 if has_option( "mm" ):
-    mmapFiles += [ "util/mmap_mm.cpp" ]
+    mmapFiles += [ "src/mongo/util/mmap_mm.cpp" ]
 elif os.sys.platform == "win32":
-    mmapFiles += [ "util/mmap_win.cpp" ]
+    mmapFiles += [ "src/mongo/util/mmap_win.cpp" ]
 else:
-    mmapFiles += [ "util/mmap_posix.cpp" ]
+    mmapFiles += [ "src/mongo/util/mmap_posix.cpp" ]
 
 #coreServerFiles += mmapFiles
 
 # handle processinfo*
-processInfoFiles = [ "util/processinfo.cpp" ]
+processInfoFiles = [ "src/mongo/util/processinfo.cpp" ]
 
-if os.path.exists( "util/processinfo_" + os.sys.platform + ".cpp" ):
-    processInfoFiles += [ "util/processinfo_" + os.sys.platform + ".cpp" ]
+if os.path.exists( "src/mongo/util/processinfo_" + os.sys.platform + ".cpp" ):
+    processInfoFiles += [ "src/mongo/util/processinfo_" + os.sys.platform + ".cpp" ]
 elif os.sys.platform == "linux3":
-    processInfoFiles += [ "util/processinfo_linux2.cpp" ]
+    processInfoFiles += [ "src/mongo/util/processinfo_linux2.cpp" ]
 else:
-    processInfoFiles += [ "util/processinfo_none.cpp" ]
+    processInfoFiles += [ "src/mongo/util/processinfo_none.cpp" ]
 
 coreServerFiles += processInfoFiles
 
 # handle systeminfo*
 systemInfoFiles = [ ]
-if os.path.exists( "util/systeminfo_" + os.sys.platform + ".cpp" ):
-    systemInfoFiles += [ "util/systeminfo_" + os.sys.platform + ".cpp" ]
+if os.path.exists( "src/mongo/util/systeminfo_" + os.sys.platform + ".cpp" ):
+    systemInfoFiles += [ "src/mongo/util/systeminfo_" + os.sys.platform + ".cpp" ]
 elif os.sys.platform == "linux3":
-    systemInfoFiles += [ "util/systeminfo_linux2.cpp" ]
+    systemInfoFiles += [ "src/mongo/util/systeminfo_linux2.cpp" ]
 else:
-    systemInfoFiles += [ "util/systeminfo_none.cpp" ]
+    systemInfoFiles += [ "src/mongo/util/systeminfo_none.cpp" ]
 
 coreServerFiles += systemInfoFiles
 
 
 if has_option( "asio" ):
-    coreServerFiles += [ "util/net/message_server_asio.cpp" ]
+    coreServerFiles += [ "src/mongo/util/net/message_server_asio.cpp" ]
 
 # mongod files - also files used in tools. present in dbtests, but not in mongos and not in client libs.
-serverOnlyFiles = Split( "db/curop.cpp db/d_globals.cpp db/pagefault.cpp util/compress.cpp db/d_concurrency.cpp db/key.cpp db/btreebuilder.cpp util/logfile.cpp util/alignedbuilder.cpp db/mongommf.cpp db/dur.cpp db/durop.cpp db/dur_writetodatafiles.cpp db/dur_preplogbuffer.cpp db/dur_commitjob.cpp db/dur_recover.cpp db/dur_journal.cpp db/introspect.cpp db/btree.cpp db/clientcursor.cpp db/tests.cpp db/repl.cpp db/repl/rs.cpp db/repl/consensus.cpp db/repl/rs_initiate.cpp db/repl/replset_commands.cpp db/repl/manager.cpp db/repl/health.cpp db/repl/heartbeat.cpp db/repl/rs_config.cpp db/repl/rs_rollback.cpp db/repl/rs_sync.cpp db/repl/rs_initialsync.cpp db/oplog.cpp db/repl_block.cpp db/btreecursor.cpp db/cloner.cpp db/namespace.cpp db/cap.cpp db/matcher_covered.cpp db/dbeval.cpp db/restapi.cpp db/dbhelpers.cpp db/instance.cpp db/client.cpp db/database.cpp db/pdfile.cpp db/record.cpp db/cursor.cpp db/security.cpp db/queryoptimizer.cpp db/queryoptimizercursor.cpp db/extsort.cpp db/cmdline.cpp" )
+serverOnlyFiles = [ "src/mongo/db/curop.cpp" , "src/mongo/db/d_globals.cpp" , "src/mongo/db/pagefault.cpp" , "src/mongo/util/compress.cpp" , "src/mongo/db/d_concurrency.cpp" , "src/mongo/db/key.cpp" , "src/mongo/db/btreebuilder.cpp" , "src/mongo/util/logfile.cpp" , "src/mongo/util/alignedbuilder.cpp" , "src/mongo/db/mongommf.cpp" , "src/mongo/db/dur.cpp" , "src/mongo/db/durop.cpp" , "src/mongo/db/dur_writetodatafiles.cpp" , "src/mongo/db/dur_preplogbuffer.cpp" , "src/mongo/db/dur_commitjob.cpp" , "src/mongo/db/dur_recover.cpp" , "src/mongo/db/dur_journal.cpp" , "src/mongo/db/introspect.cpp" , "src/mongo/db/btree.cpp" , "src/mongo/db/clientcursor.cpp" , "src/mongo/db/tests.cpp" , "src/mongo/db/repl.cpp" , "src/mongo/db/repl/rs.cpp" , "src/mongo/db/repl/consensus.cpp" , "src/mongo/db/repl/rs_initiate.cpp" , "src/mongo/db/repl/replset_commands.cpp" , "src/mongo/db/repl/manager.cpp" , "src/mongo/db/repl/health.cpp" , "src/mongo/db/repl/heartbeat.cpp" , "src/mongo/db/repl/rs_config.cpp" , "src/mongo/db/repl/rs_rollback.cpp" , "src/mongo/db/repl/rs_sync.cpp" , "src/mongo/db/repl/rs_initialsync.cpp" , "src/mongo/db/oplog.cpp" , "src/mongo/db/repl_block.cpp" , "src/mongo/db/btreecursor.cpp" , "src/mongo/db/cloner.cpp" , "src/mongo/db/namespace.cpp" , "src/mongo/db/cap.cpp" , "src/mongo/db/matcher_covered.cpp" , "src/mongo/db/dbeval.cpp" , "src/mongo/db/restapi.cpp" , "src/mongo/db/dbhelpers.cpp" , "src/mongo/db/instance.cpp" , "src/mongo/db/client.cpp" , "src/mongo/db/database.cpp" , "src/mongo/db/pdfile.cpp" , "src/mongo/db/record.cpp" , "src/mongo/db/cursor.cpp" , "src/mongo/db/security.cpp" , "src/mongo/db/queryoptimizer.cpp" , "src/mongo/db/queryoptimizercursor.cpp" , "src/mongo/db/extsort.cpp" , "src/mongo/db/cmdline.cpp" ]
 
-serverOnlyFiles += [ "db/index.cpp" , "db/scanandorder.cpp" ] + Glob( "db/geo/*.cpp" ) + Glob( "db/ops/*.cpp" )
+serverOnlyFiles += [ "src/mongo/db/index.cpp" , "src/mongo/db/scanandorder.cpp" ] + Glob( "src/mongo/db/geo/*.cpp" ) + Glob( "src/mongo/db/ops/*.cpp" )
 
-serverOnlyFiles += [ "db/dbcommands.cpp" , "db/dbcommands_admin.cpp" ]
+serverOnlyFiles += [ "src/mongo/db/dbcommands.cpp" , "src/mongo/db/dbcommands_admin.cpp" ]
 
 # most commands are only for mongod
 serverOnlyFiles += [
-    "db/commands/distinct.cpp",
-    "db/commands/find_and_modify.cpp",
-    "db/commands/group.cpp",
-    "db/commands/mr.cpp",
-    "db/commands/pipeline_command.cpp",
-    "db/commands/document_source_cursor.cpp" ]
-#    "db/commands/isself.cpp",
-#serverOnlyFiles += [ "db/commands/%s.cpp" % x for x in ["distinct","find_and_modify","group","mr"] ]
+    "src/mongo/db/commands/distinct.cpp",
+    "src/mongo/db/commands/find_and_modify.cpp",
+    "src/mongo/db/commands/group.cpp",
+    "src/mongo/db/commands/mr.cpp",
+    "src/mongo/db/commands/pipeline_command.cpp",
+    "src/mongo/db/commands/document_source_cursor.cpp" ]
+#    "src/mongo/db/commands/isself.cpp",
+#serverOnlyFiles += [ "src/mongo/db/commands/%s.cpp" % x for x in ["distinct","find_and_modify","group","mr"] ]
 
-serverOnlyFiles += [ "db/driverHelpers.cpp" ]
+serverOnlyFiles += [ "src/mongo/db/driverHelpers.cpp" ]
 
 serverOnlyFiles += mmapFiles
 
 # but the pipeline command works everywhere
-coreServerFiles += [ "db/commands/pipeline.cpp" ]
-coreServerFiles += Glob("db/pipeline/*.cpp")
+coreServerFiles += [ "src/mongo/db/commands/pipeline.cpp" ]
+coreServerFiles += Glob("src/mongo/db/pipeline/*.cpp")
 
-serverOnlyFiles += [ "db/stats/snapshots.cpp" ]
-############coreServerFiles += "db/stats/snapshots.cpp"
-coreServerFiles += [ "db/stats/counters.cpp", "db/stats/service_stats.cpp", "db/stats/top.cpp" ]
-#coreServerFiles += Glob( "db/stats/*.cpp" )
-coreServerFiles += [ "db/commands/isself.cpp", "db/security_common.cpp", "db/security_commands.cpp" ]
+serverOnlyFiles += [ "src/mongo/db/stats/snapshots.cpp" ]
+############coreServerFiles += "src/mongo/db/stats/snapshots.cpp"
+coreServerFiles += [ "src/mongo/db/stats/counters.cpp", "src/mongo/db/stats/service_stats.cpp", "src/mongo/db/stats/top.cpp" ]
+#coreServerFiles += Glob( "src/mongo/db/stats/*.cpp" )
+coreServerFiles += [ "src/mongo/db/commands/isself.cpp", "src/mongo/db/security_common.cpp", "src/mongo/db/security_commands.cpp" ]
 
-scriptingFiles = [ "scripting/engine.cpp" , "scripting/utils.cpp" , "scripting/bench.cpp" ]
+scriptingFiles = [ "src/mongo/scripting/engine.cpp" , "src/mongo/scripting/utils.cpp" , "src/mongo/scripting/bench.cpp" ]
 
 if usesm:
-    scriptingFiles += [ "scripting/engine_spidermonkey.cpp" ]
+    scriptingFiles += [ "src/mongo/scripting/engine_spidermonkey.cpp" ]
 elif usev8:
-    scriptingFiles += [ Glob( "scripting/*v8*.cpp" ) ]
+    scriptingFiles += [ Glob( "src/mongo/scripting/*v8*.cpp" ) ]
 else:
-    scriptingFiles += [ "scripting/engine_none.cpp" ]
+    scriptingFiles += [ "src/mongo/scripting/engine_none.cpp" ]
 
-coreShardFiles = [ "s/config.cpp" , "s/grid.cpp" , "s/chunk.cpp" , "s/shard.cpp" , "s/shardkey.cpp" ]
-shardServerFiles = coreShardFiles + Glob( "s/strategy*.cpp" ) + [ "s/commands_admin.cpp" , "s/commands_public.cpp" , "s/request.cpp" , "s/client.cpp" , "s/cursors.cpp" ,  "s/server.cpp" , "s/config_migrate.cpp" , "s/s_only.cpp" , "s/stats.cpp" , "s/balance.cpp" , "s/balancer_policy.cpp" , "db/cmdline.cpp" , "s/writeback_listener.cpp" , "s/shard_version.cpp", "s/mr_shard.cpp", "s/security.cpp" ]
-serverOnlyFiles += coreShardFiles + [ "s/d_logic.cpp" , "s/d_writeback.cpp" , "s/d_migrate.cpp" , "s/d_state.cpp" , "s/d_split.cpp" , "client/distlock_test.cpp" , "s/d_chunk_manager.cpp", "s/default_version.cpp" ]
+coreShardFiles = [ "src/mongo/s/config.cpp" , "src/mongo/s/grid.cpp" , "src/mongo/s/chunk.cpp" , "src/mongo/s/shard.cpp" , "src/mongo/s/shardkey.cpp" ]
+shardServerFiles = coreShardFiles + Glob( "src/mongo/s/strategy*.cpp" ) + [ "src/mongo/s/commands_admin.cpp" , "src/mongo/s/commands_public.cpp" , "src/mongo/s/request.cpp" , "src/mongo/s/client.cpp" , "src/mongo/s/cursors.cpp" ,  "src/mongo/s/server.cpp" , "src/mongo/s/config_migrate.cpp" , "src/mongo/s/s_only.cpp" , "src/mongo/s/stats.cpp" , "src/mongo/s/balance.cpp" , "src/mongo/s/balancer_policy.cpp" , "src/mongo/db/cmdline.cpp" , "src/mongo/s/writeback_listener.cpp" , "src/mongo/s/shard_version.cpp", "src/mongo/s/mr_shard.cpp", "src/mongo/s/security.cpp" ]
+serverOnlyFiles += coreShardFiles + [ "src/mongo/s/d_logic.cpp" , "src/mongo/s/d_writeback.cpp" , "src/mongo/s/d_migrate.cpp" , "src/mongo/s/d_state.cpp" , "src/mongo/s/d_split.cpp" , "src/mongo/client/distlock_test.cpp" , "src/mongo/s/d_chunk_manager.cpp", "src/mongo/s/default_version.cpp" ]
 
-serverOnlyFiles += [ "db/module.cpp" ] + Glob( "db/modules/*.cpp" )
+serverOnlyFiles += [ "src/mongo/db/module.cpp" ] + Glob( "src/mongo/db/modules/*.cpp" )
 
 modules = []
 moduleNames = []
 
-for x in os.listdir( "db/modules/" ):
+for x in os.listdir( "src/mongo/db/modules/" ):
     if x.find( "." ) >= 0:
         continue
     print( "adding module: " + x )
     moduleNames.append( x )
-    modRoot = "db/modules/" + x + "/"
+    modRoot = "src/mongo/db/modules/" + x + "/"
 
     modBuildFile = modRoot + "build.py"
     myModule = None
@@ -475,7 +476,7 @@ for x in os.listdir( "db/modules/" ):
         serverOnlyFiles += Glob( modRoot + "src/*.cpp" )
 
 
-allClientFiles = commonFiles + coreDbFiles + [ "client/clientOnly.cpp" , "client/gridfs.cpp" ];
+allClientFiles = commonFiles + coreDbFiles + [ "src/mongo/client/clientOnly.cpp" , "src/mongo/client/gridfs.cpp" ];
 
 # ---- other build setup -----
 
@@ -790,9 +791,9 @@ if nix:
             Exit(1)
         env['Gch'] = env.Gch( [ "pch.h" ] )[0]
         env['GchSh'] = env.GchSh( [ "pch.h" ] )[0]
-    elif os.path.exists('pch.h.gch'):
+    elif os.path.exists( "src/mongo/pch.h.gch" ):
         print( "removing precompiled headers" )
-        os.unlink('pch.h.gch') # gcc uses the file if it exists
+        os.unlink( "src/mongo/pch.h.gch" ) # gcc uses the file if it exists
 
 if usev8:
     env.Prepend( CPPPATH=["../v8/include/"] )
@@ -822,8 +823,8 @@ if not windows:
 moduleFiles = {}
 for shortName in getThirdPartyShortNames():    
 
-    path = "third_party/%s.py" % shortName
-    myModule = imp.load_module( "third_party_%s" % shortName , open( path , "r" ) , path , ( ".py" , "r" , imp.PY_SOURCE ) )
+    path = "src/third_party/%s.py" % shortName
+    myModule = imp.load_module( "src/third_party_%s" % shortName , open( path , "r" ) , path , ( ".py" , "r" , imp.PY_SOURCE ) )
     fileLists = { "commonFiles" : commonFiles , "serverOnlyFiles" : serverOnlyFiles , "scriptingFiles" : scriptingFiles, "moduleFiles" : moduleFiles }
     
     options_topass["windows"] = windows
@@ -874,7 +875,7 @@ def setupBuildInfoFile( outFile ):
     out.write( contents )
     out.close()
 
-setupBuildInfoFile( "buildinfo.cpp" )
+setupBuildInfoFile( "src/mongo/buildinfo.cpp" )
 
 def bigLibString( myenv ):
     s = str( myenv["LIBS"] )
@@ -1122,23 +1123,23 @@ def checkErrorCodes():
 checkErrorCodes()
 
 # main db target
-mongodOnlyFiles = [ "db/db.cpp", "db/compact.cpp" ]
+mongodOnlyFiles = [ "src/mongo/db/db.cpp", "src/mongo/db/compact.cpp" ]
 if windows:
-    mongodOnlyFiles.append( "util/ntservice.cpp" ) 
+    mongodOnlyFiles.append( "src/mongo/util/ntservice.cpp" ) 
 mongod = env.Program( "mongod" , commonFiles + coreDbFiles + coreServerFiles + serverOnlyFiles + mongodOnlyFiles )
 Default( mongod )
 
 # tools
-allToolFiles = commonFiles + coreDbFiles + coreServerFiles + serverOnlyFiles + [ "client/gridfs.cpp", "tools/tool.cpp" , "tools/stat_util.cpp" ]
+allToolFiles = commonFiles + coreDbFiles + coreServerFiles + serverOnlyFiles + [ "src/mongo/client/gridfs.cpp", "src/mongo/tools/tool.cpp" , "src/mongo/tools/stat_util.cpp" ]
 normalTools = [ "dump" , "restore" , "export" , "import" , "files" , "stat" , "top" , "oplog" ]
 env.Alias( "tools" , [ add_exe( "mongo" + x ) for x in normalTools ] )
 for x in normalTools:
-    env.Program( "mongo" + x , allToolFiles + [ "tools/" + x + ".cpp" ] )
+    env.Program( "mongo" + x , allToolFiles + [ "src/mongo/tools/" + x + ".cpp" ] )
 
 #some special tools
-env.Program( "bsondump" , allToolFiles + [ "tools/bsondump.cpp" ] )
-env.Program( "mongobridge" , allToolFiles + [ "tools/bridge.cpp" ] )
-env.Program( "mongoperf" , allToolFiles + [ "client/examples/mongoperf.cpp" ] )
+env.Program( "bsondump" , allToolFiles + [ "src/mongo/tools/bsondump.cpp" ] )
+env.Program( "mongobridge" , allToolFiles + [ "src/mongo/tools/bridge.cpp" ] )
+env.Program( "mongoperf" , allToolFiles + [ "src/mongo/client/examples/mongoperf.cpp" ] )
 
 # mongos
 mongos = env.Program( "mongos" , commonFiles + coreDbFiles + coreServerFiles + shardServerFiles )
@@ -1148,7 +1149,7 @@ clientLib = env.Library( "mongoclient" , allClientFiles )
 clientLibName = str( clientLib[0] )
 if has_option( "sharedclient" ):
     sharedClientLibName = str( env.SharedLibrary( "mongoclient" , allClientFiles )[0] )
-env.Library( "mongotestfiles" , commonFiles + coreDbFiles + coreServerFiles + serverOnlyFiles + ["client/gridfs.cpp"])
+env.Library( "mongotestfiles" , commonFiles + coreDbFiles + coreServerFiles + serverOnlyFiles + ["src/mongo/client/gridfs.cpp"])
 env.Library( "mongoshellfiles" , allClientFiles + coreServerFiles )
 
 clientEnv = env.Clone();
@@ -1161,20 +1162,20 @@ l = clientEnv[ "LIBS" ]
 clientTests = []
 
 # examples
-clientTests += [ clientEnv.Program( "firstExample" , [ "client/examples/first.cpp" ] ) ]
-clientTests += [ clientEnv.Program( "rsExample" , [ "client/examples/rs.cpp" ] ) ]
-clientTests += [ clientEnv.Program( "secondExample" , [ "client/examples/second.cpp" ] ) ]
-clientTests += [ clientEnv.Program( "whereExample" , [ "client/examples/whereExample.cpp" ] ) ]
-clientTests += [ clientEnv.Program( "authTest" , [ "client/examples/authTest.cpp" ] ) ]
-clientTests += [ clientEnv.Program( "httpClientTest" , [ "client/examples/httpClientTest.cpp" ] ) ]
-clientTests += [ clientEnv.Program( "bsondemo" , [ "bson/bsondemo/bsondemo.cpp" ] ) ]
+clientTests += [ clientEnv.Program( "firstExample" , [ "src/mongo/client/examples/first.cpp" ] ) ]
+clientTests += [ clientEnv.Program( "rsExample" , [ "src/mongo/client/examples/rs.cpp" ] ) ]
+clientTests += [ clientEnv.Program( "secondExample" , [ "src/mongo/client/examples/second.cpp" ] ) ]
+clientTests += [ clientEnv.Program( "whereExample" , [ "src/mongo/client/examples/whereExample.cpp" ] ) ]
+clientTests += [ clientEnv.Program( "authTest" , [ "src/mongo/client/examples/authTest.cpp" ] ) ]
+clientTests += [ clientEnv.Program( "httpClientTest" , [ "src/mongo/client/examples/httpClientTest.cpp" ] ) ]
+clientTests += [ clientEnv.Program( "bsondemo" , [ "src/mongo/bson/bsondemo/bsondemo.cpp" ] ) ]
 
 # dbtests test binary
-test = testEnv.Program( "test" , Glob( "dbtests/*.cpp" ) )
+test = testEnv.Program( "test" , Glob( "src/mongo/dbtests/*.cpp" ) )
 if windows:
     testEnv.Alias( "test" , "test.exe" )
-perftest = testEnv.Program( "perftest", [ "dbtests/framework.cpp" , "dbtests/perf/perftest.cpp" ] )
-clientTests += [ clientEnv.Program( "clientTest" , [ "client/examples/clientTest.cpp" ] ) ]
+perftest = testEnv.Program( "perftest", [ "src/mongo/dbtests/framework.cpp" , "src/mongo/dbtests/perf/perftest.cpp" ] )
+clientTests += [ clientEnv.Program( "clientTest" , [ "src/mongo/client/examples/clientTest.cpp" ] ) ]
 
 # --- sniffer ---
 mongosniff_built = False
@@ -1191,14 +1192,14 @@ if darwin or clientEnv["_HAVEPCAP"]:
     sniffEnv.Prepend( LIBPATH=["."] )
     sniffEnv.Prepend( LIBS=[ "mongotestfiles" ] )
 
-    sniffEnv.Program( "mongosniff" , "tools/sniffer.cpp" )
+    sniffEnv.Program( "mongosniff" , "src/mongo/tools/sniffer.cpp" )
 
 # --- shell ---
 
 # note, if you add a file here, you need to add it in scripting/engine.cpp and shell/msvc/createCPPfromJavaScriptFiles.js as well
-env.JSHeader( "shell/mongo.cpp"  , Glob( "shell/utils*.js" ) + [ "shell/db.js","shell/mongo.js","shell/mr.js","shell/query.js","shell/collection.js"] )
+env.JSHeader( "src/mongo/shell/mongo.cpp"  , Glob( "src/mongo/shell/utils*.js" ) + [ "src/mongo/shell/db.js","src/mongo/shell/mongo.js","src/mongo/shell/mr.js","src/mongo/shell/query.js","src/mongo/shell/collection.js"] )
 
-env.JSHeader( "shell/mongo-server.cpp"  , [ "shell/servers.js"] )
+env.JSHeader( "src/mongo/shell/mongo-server.cpp"  , [ "src/mongo/shell/servers.js"] )
 
 shellEnv = env.Clone();
 
@@ -1215,9 +1216,9 @@ elif not onlyServer:
     if windows:
         shellEnv.Append( LIBS=["winmm.lib"] )
 
-    coreShellFiles = [ "shell/dbshell.cpp" , "shell/shell_utils.cpp" , "shell/mongo-server.cpp" ]
+    coreShellFiles = [ "src/mongo/shell/dbshell.cpp" , "src/mongo/shell/shell_utils.cpp" , "src/mongo/shell/mongo-server.cpp" ]
 
-    coreShellFiles.append( "third_party/linenoise/linenoise.cpp" )
+    coreShellFiles.append( "src/third_party/linenoise/linenoise.cpp" )
 
     shellEnv.Prepend( LIBPATH=[ "." ] )
         
@@ -1424,7 +1425,7 @@ def getSystemInstallName():
     return n
 
 def getCodeVersion():
-    fullSource = open( "util/version.cpp" , "r" ).read()
+    fullSource = open( "src/mongo/util/version.cpp" , "r" ).read()
     allMatches = re.findall( r"versionString.. = \"(.*?)\"" , fullSource );
     if len(allMatches) != 1:
         print( "can't find version # in code" )
@@ -1518,7 +1519,7 @@ env.Alias( "core" , [ add_exe( "mongo" ) , add_exe( "mongod" ) , add_exe( "mongo
 
 #headers
 if installSetup.headers:
-    for id in [ "", "util/", "util/net/", "util/mongoutils/", "util/concurrency/", "db/" , "db/stats/" , "db/repl/" , "db/ops/" , "client/" , "bson/", "bson/util/" , "s/" , "scripting/" ]:
+    for id in [ "src/mongo/" , "src/mongo/util/", "src/mongo/util/net/", "src/mongo/util/mongoutils/", "src/mongo/util/concurrency/", "src/mongo/db/" , "src/mongo/db/stats/" , "src/mongo/db/repl/" , "src/mongo/db/ops/" , "src/mongo/client/" , "src/mongo/bson/", "src/mongo/bson/util/" , "src/mongo/s/" , "src/mongo/scripting/" ]:
         env.Install( installDir + "/" + installSetup.headerRoot + "/mongo/" + id , Glob( id + "*.h" ) )
         env.Install( installDir + "/" + installSetup.headerRoot + "/mongo/" + id , Glob( id + "*.hpp" ) )
 
diff --git a/speed.js b/speed.js
deleted file mode 100755
index c5aa3a36964..00000000000
--- a/speed.js
+++ /dev/null
@@ -1,13 +0,0 @@
-t = db.fooo;

-t.drop();

-x = { str:'aaaabbbbcc' }

-s = new Date();

-for( var i = 0; i < 100000; i++ ) { 

-    x.i = i;

-    t.insert(x);

-}

-print( (new Date())-s );

-t.ensureIndex({x:1});

-t.ensureIndex({str:1});

-print( (new Date())-s );

-

diff --git a/bson/README b/src/mongo/bson/README
index 01ed654bcd2..01ed654bcd2 100644
--- a/bson/README
+++ b/src/mongo/bson/README
diff --git a/bson/bson-inl.h b/src/mongo/bson/bson-inl.h
index 9e8b3654802..9e8b3654802 100644
--- a/bson/bson-inl.h
+++ b/src/mongo/bson/bson-inl.h
diff --git a/bson/bson.h b/src/mongo/bson/bson.h
index 9515adfd829..9515adfd829 100644
--- a/bson/bson.h
+++ b/src/mongo/bson/bson.h
diff --git a/bson/bson_db.h b/src/mongo/bson/bson_db.h
index 3f597bde3e1..3f597bde3e1 100644
--- a/bson/bson_db.h
+++ b/src/mongo/bson/bson_db.h
diff --git a/bson/bsondemo/bsondemo.cpp b/src/mongo/bson/bsondemo/bsondemo.cpp
index b53a7b39baa..b53a7b39baa 100644
--- a/bson/bsondemo/bsondemo.cpp
+++ b/src/mongo/bson/bsondemo/bsondemo.cpp
diff --git a/bson/bsondemo/bsondemo.vcproj b/src/mongo/bson/bsondemo/bsondemo.vcproj
index 8432cebfd87..8432cebfd87 100644
--- a/bson/bsondemo/bsondemo.vcproj
+++ b/src/mongo/bson/bsondemo/bsondemo.vcproj
diff --git a/bson/bsondemo/bsondemo.vcxproj b/src/mongo/bson/bsondemo/bsondemo.vcxproj
index 2ad53894d7d..2ad53894d7d 100644
--- a/bson/bsondemo/bsondemo.vcxproj
+++ b/src/mongo/bson/bsondemo/bsondemo.vcxproj
diff --git a/bson/bsondemo/bsondemo.vcxproj.filters b/src/mongo/bson/bsondemo/bsondemo.vcxproj.filters
index 35f14d5193b..35f14d5193b 100644
--- a/bson/bsondemo/bsondemo.vcxproj.filters
+++ b/src/mongo/bson/bsondemo/bsondemo.vcxproj.filters
diff --git a/bson/bsonelement.h b/src/mongo/bson/bsonelement.h
index 57cc2ae5775..57cc2ae5775 100644
--- a/bson/bsonelement.h
+++ b/src/mongo/bson/bsonelement.h
diff --git a/bson/bsonmisc.h b/src/mongo/bson/bsonmisc.h
index 8a379396d17..8a379396d17 100644
--- a/bson/bsonmisc.h
+++ b/src/mongo/bson/bsonmisc.h
diff --git a/bson/bsonobj.h b/src/mongo/bson/bsonobj.h
index e8ce462403b..e8ce462403b 100644
--- a/bson/bsonobj.h
+++ b/src/mongo/bson/bsonobj.h
diff --git a/bson/bsonobjbuilder.h b/src/mongo/bson/bsonobjbuilder.h
index 1fdbcba18a6..1fdbcba18a6 100644
--- a/bson/bsonobjbuilder.h
+++ b/src/mongo/bson/bsonobjbuilder.h
diff --git a/bson/bsonobjiterator.h b/src/mongo/bson/bsonobjiterator.h
index 39ae24d9b86..39ae24d9b86 100644
--- a/bson/bsonobjiterator.h
+++ b/src/mongo/bson/bsonobjiterator.h
diff --git a/bson/bsontypes.h b/src/mongo/bson/bsontypes.h
index 9d95e8e9ad4..9d95e8e9ad4 100644
--- a/bson/bsontypes.h
+++ b/src/mongo/bson/bsontypes.h
diff --git a/bson/inline_decls.h b/src/mongo/bson/inline_decls.h
index 30da9b4560d..30da9b4560d 100644
--- a/bson/inline_decls.h
+++ b/src/mongo/bson/inline_decls.h
diff --git a/bson/oid.cpp b/src/mongo/bson/oid.cpp
index 3aee14a3585..3aee14a3585 100644
--- a/bson/oid.cpp
+++ b/src/mongo/bson/oid.cpp
diff --git a/bson/oid.h b/src/mongo/bson/oid.h
index e5963a0e81d..e5963a0e81d 100644
--- a/bson/oid.h
+++ b/src/mongo/bson/oid.h
diff --git a/bson/ordering.h b/src/mongo/bson/ordering.h
index bca3296f340..bca3296f340 100644
--- a/bson/ordering.h
+++ b/src/mongo/bson/ordering.h
diff --git a/bson/stringdata.h b/src/mongo/bson/stringdata.h
index 1fb4e7d25d3..1fb4e7d25d3 100644
--- a/bson/stringdata.h
+++ b/src/mongo/bson/stringdata.h
diff --git a/bson/util/atomic_int.h b/src/mongo/bson/util/atomic_int.h
index e85a023c3bc..e85a023c3bc 100644
--- a/bson/util/atomic_int.h
+++ b/src/mongo/bson/util/atomic_int.h
diff --git a/bson/util/builder.h b/src/mongo/bson/util/builder.h
index f189f58b27e..f189f58b27e 100644
--- a/bson/util/builder.h
+++ b/src/mongo/bson/util/builder.h
diff --git a/bson/util/misc.h b/src/mongo/bson/util/misc.h
index b547c981bdf..b547c981bdf 100644
--- a/bson/util/misc.h
+++ b/src/mongo/bson/util/misc.h
diff --git a/client/clientOnly.cpp b/src/mongo/client/clientOnly.cpp
index 161f0a82a81..161f0a82a81 100644
--- a/client/clientOnly.cpp
+++ b/src/mongo/client/clientOnly.cpp
diff --git a/client/connpool.cpp b/src/mongo/client/connpool.cpp
index 5089471f521..5089471f521 100644
--- a/client/connpool.cpp
+++ b/src/mongo/client/connpool.cpp
diff --git a/client/connpool.h b/src/mongo/client/connpool.h
index 8733abb1f90..8733abb1f90 100644
--- a/client/connpool.h
+++ b/src/mongo/client/connpool.h
diff --git a/client/constants.h b/src/mongo/client/constants.h
index 54f3fd216f2..54f3fd216f2 100644
--- a/client/constants.h
+++ b/src/mongo/client/constants.h
diff --git a/client/dbclient.cpp b/src/mongo/client/dbclient.cpp
index b38a85d4253..b38a85d4253 100644
--- a/client/dbclient.cpp
+++ b/src/mongo/client/dbclient.cpp
diff --git a/client/dbclient.h b/src/mongo/client/dbclient.h
index 76c1358f752..76c1358f752 100644
--- a/client/dbclient.h
+++ b/src/mongo/client/dbclient.h
diff --git a/client/dbclient_rs.cpp b/src/mongo/client/dbclient_rs.cpp
index 2d9e0fbabba..2d9e0fbabba 100644
--- a/client/dbclient_rs.cpp
+++ b/src/mongo/client/dbclient_rs.cpp
diff --git a/client/dbclient_rs.h b/src/mongo/client/dbclient_rs.h
index 0edcea42716..0edcea42716 100644
--- a/client/dbclient_rs.h
+++ b/src/mongo/client/dbclient_rs.h
diff --git a/client/dbclientcursor.cpp b/src/mongo/client/dbclientcursor.cpp
index 79510b766d8..79510b766d8 100644
--- a/client/dbclientcursor.cpp
+++ b/src/mongo/client/dbclientcursor.cpp
diff --git a/client/dbclientcursor.h b/src/mongo/client/dbclientcursor.h
index 31bf1bb1d5e..31bf1bb1d5e 100644
--- a/client/dbclientcursor.h
+++ b/src/mongo/client/dbclientcursor.h
diff --git a/client/dbclientmockcursor.h b/src/mongo/client/dbclientmockcursor.h
index 8d85ff5ad2e..8d85ff5ad2e 100644
--- a/client/dbclientmockcursor.h
+++ b/src/mongo/client/dbclientmockcursor.h
diff --git a/client/distlock.cpp b/src/mongo/client/distlock.cpp
index 595fc38197c..595fc38197c 100644
--- a/client/distlock.cpp
+++ b/src/mongo/client/distlock.cpp
diff --git a/client/distlock.h b/src/mongo/client/distlock.h
index 106a5d00001..106a5d00001 100644
--- a/client/distlock.h
+++ b/src/mongo/client/distlock.h
diff --git a/client/distlock_test.cpp b/src/mongo/client/distlock_test.cpp
index a46caa44c11..a46caa44c11 100644
--- a/client/distlock_test.cpp
+++ b/src/mongo/client/distlock_test.cpp
diff --git a/client/examples/authTest.cpp b/src/mongo/client/examples/authTest.cpp
index 71cdd390cff..71cdd390cff 100644
--- a/client/examples/authTest.cpp
+++ b/src/mongo/client/examples/authTest.cpp
diff --git a/client/examples/clientTest.cpp b/src/mongo/client/examples/clientTest.cpp
index aaea6bd1bdf..aaea6bd1bdf 100644
--- a/client/examples/clientTest.cpp
+++ b/src/mongo/client/examples/clientTest.cpp
diff --git a/client/examples/first.cpp b/src/mongo/client/examples/first.cpp
index ab5efb325f5..ab5efb325f5 100644
--- a/client/examples/first.cpp
+++ b/src/mongo/client/examples/first.cpp
diff --git a/client/examples/httpClientTest.cpp b/src/mongo/client/examples/httpClientTest.cpp
index 4055d4492d5..4055d4492d5 100644
--- a/client/examples/httpClientTest.cpp
+++ b/src/mongo/client/examples/httpClientTest.cpp
diff --git a/client/examples/insert_demo.cpp b/src/mongo/client/examples/insert_demo.cpp
index 14ac79ee1a0..14ac79ee1a0 100644
--- a/client/examples/insert_demo.cpp
+++ b/src/mongo/client/examples/insert_demo.cpp
diff --git a/client/examples/mongoperf.cpp b/src/mongo/client/examples/mongoperf.cpp
index 68ebd6b10f2..68ebd6b10f2 100644
--- a/client/examples/mongoperf.cpp
+++ b/src/mongo/client/examples/mongoperf.cpp
diff --git a/client/examples/mongoperf.vcxproj b/src/mongo/client/examples/mongoperf.vcxproj
index 89168370733..89168370733 100755
--- a/client/examples/mongoperf.vcxproj
+++ b/src/mongo/client/examples/mongoperf.vcxproj
diff --git a/client/examples/mongoperf.vcxproj.filters b/src/mongo/client/examples/mongoperf.vcxproj.filters
index ab12575af08..ab12575af08 100755
--- a/client/examples/mongoperf.vcxproj.filters
+++ b/src/mongo/client/examples/mongoperf.vcxproj.filters
diff --git a/client/examples/rs.cpp b/src/mongo/client/examples/rs.cpp
index 3307d87b56b..3307d87b56b 100644
--- a/client/examples/rs.cpp
+++ b/src/mongo/client/examples/rs.cpp
diff --git a/client/examples/second.cpp b/src/mongo/client/examples/second.cpp
index 6cc2111580f..6cc2111580f 100644
--- a/client/examples/second.cpp
+++ b/src/mongo/client/examples/second.cpp
diff --git a/client/examples/simple_client_demo.vcxproj b/src/mongo/client/examples/simple_client_demo.vcxproj
index 358513f307a..358513f307a 100755
--- a/client/examples/simple_client_demo.vcxproj
+++ b/src/mongo/client/examples/simple_client_demo.vcxproj
diff --git a/client/examples/simple_client_demo.vcxproj.filters b/src/mongo/client/examples/simple_client_demo.vcxproj.filters
index 8aa5a1a96c5..8aa5a1a96c5 100755
--- a/client/examples/simple_client_demo.vcxproj.filters
+++ b/src/mongo/client/examples/simple_client_demo.vcxproj.filters
diff --git a/client/examples/tail.cpp b/src/mongo/client/examples/tail.cpp
index 90e62d279c1..90e62d279c1 100644
--- a/client/examples/tail.cpp
+++ b/src/mongo/client/examples/tail.cpp
diff --git a/client/examples/tutorial.cpp b/src/mongo/client/examples/tutorial.cpp
index aa5ad02b55d..aa5ad02b55d 100644
--- a/client/examples/tutorial.cpp
+++ b/src/mongo/client/examples/tutorial.cpp
diff --git a/client/examples/whereExample.cpp b/src/mongo/client/examples/whereExample.cpp
index 12b68d7add3..12b68d7add3 100644
--- a/client/examples/whereExample.cpp
+++ b/src/mongo/client/examples/whereExample.cpp
diff --git a/client/gridfs.cpp b/src/mongo/client/gridfs.cpp
index 449cb4067d2..449cb4067d2 100644
--- a/client/gridfs.cpp
+++ b/src/mongo/client/gridfs.cpp
diff --git a/client/gridfs.h b/src/mongo/client/gridfs.h
index 5a19aa142ca..5a19aa142ca 100644
--- a/client/gridfs.h
+++ b/src/mongo/client/gridfs.h
diff --git a/client/model.cpp b/src/mongo/client/model.cpp
index bd10a3c5528..bd10a3c5528 100644
--- a/client/model.cpp
+++ b/src/mongo/client/model.cpp
diff --git a/client/model.h b/src/mongo/client/model.h
index 7dd31434f49..7dd31434f49 100644
--- a/client/model.h
+++ b/src/mongo/client/model.h
diff --git a/client/mongo_client_lib.cpp b/src/mongo/client/mongo_client_lib.cpp
index 58e3f6c6c35..58e3f6c6c35 100644
--- a/client/mongo_client_lib.cpp
+++ b/src/mongo/client/mongo_client_lib.cpp
diff --git a/client/parallel.cpp b/src/mongo/client/parallel.cpp
index 5324de52c84..5324de52c84 100644
--- a/client/parallel.cpp
+++ b/src/mongo/client/parallel.cpp
diff --git a/client/parallel.h b/src/mongo/client/parallel.h
index 1cbbd9a1cb5..1cbbd9a1cb5 100644
--- a/client/parallel.h
+++ b/src/mongo/client/parallel.h
diff --git a/client/redef_macros.h b/src/mongo/client/redef_macros.h
index 897912dba2b..897912dba2b 100644
--- a/client/redef_macros.h
+++ b/src/mongo/client/redef_macros.h
diff --git a/client/simple_client_demo.cpp b/src/mongo/client/simple_client_demo.cpp
index f4278dd4e54..f4278dd4e54 100644
--- a/client/simple_client_demo.cpp
+++ b/src/mongo/client/simple_client_demo.cpp
diff --git a/client/syncclusterconnection.cpp b/src/mongo/client/syncclusterconnection.cpp
index 601cdcbd758..601cdcbd758 100644
--- a/client/syncclusterconnection.cpp
+++ b/src/mongo/client/syncclusterconnection.cpp
diff --git a/client/syncclusterconnection.h b/src/mongo/client/syncclusterconnection.h
index d2374ddaa45..d2374ddaa45 100644
--- a/client/syncclusterconnection.h
+++ b/src/mongo/client/syncclusterconnection.h
diff --git a/client/undef_macros.h b/src/mongo/client/undef_macros.h
index 30ece615747..30ece615747 100644
--- a/client/undef_macros.h
+++ b/src/mongo/client/undef_macros.h
diff --git a/db/background.h b/src/mongo/db/background.h
index ea424c97107..ea424c97107 100644
--- a/db/background.h
+++ b/src/mongo/db/background.h
diff --git a/db/btree.cpp b/src/mongo/db/btree.cpp
index 5c55fad33c3..5c55fad33c3 100644
--- a/db/btree.cpp
+++ b/src/mongo/db/btree.cpp
diff --git a/db/btree.h b/src/mongo/db/btree.h
index 85e5172d163..85e5172d163 100644
--- a/db/btree.h
+++ b/src/mongo/db/btree.h
diff --git a/db/btreebuilder.cpp b/src/mongo/db/btreebuilder.cpp
index 0ec587a1958..0ec587a1958 100644
--- a/db/btreebuilder.cpp
+++ b/src/mongo/db/btreebuilder.cpp
diff --git a/db/btreebuilder.h b/src/mongo/db/btreebuilder.h
index 6de55d89299..6de55d89299 100644
--- a/db/btreebuilder.h
+++ b/src/mongo/db/btreebuilder.h
diff --git a/db/btreecursor.cpp b/src/mongo/db/btreecursor.cpp
index 7ddd4874ef6..7ddd4874ef6 100644
--- a/db/btreecursor.cpp
+++ b/src/mongo/db/btreecursor.cpp
diff --git a/db/cap.cpp b/src/mongo/db/cap.cpp
index a8be2383115..a8be2383115 100644
--- a/db/cap.cpp
+++ b/src/mongo/db/cap.cpp
diff --git a/db/client.cpp b/src/mongo/db/client.cpp
index 92b78d87ee5..92b78d87ee5 100644
--- a/db/client.cpp
+++ b/src/mongo/db/client.cpp
diff --git a/db/client.h b/src/mongo/db/client.h
index 6aa8bc00f02..6aa8bc00f02 100644
--- a/db/client.h
+++ b/src/mongo/db/client.h
diff --git a/db/client_common.h b/src/mongo/db/client_common.h
index eb70105ef99..eb70105ef99 100644
--- a/db/client_common.h
+++ b/src/mongo/db/client_common.h
diff --git a/db/clientcursor.cpp b/src/mongo/db/clientcursor.cpp
index dc04ec38f63..dc04ec38f63 100644
--- a/db/clientcursor.cpp
+++ b/src/mongo/db/clientcursor.cpp
diff --git a/db/clientcursor.h b/src/mongo/db/clientcursor.h
index e570820f62c..e570820f62c 100644
--- a/db/clientcursor.h
+++ b/src/mongo/db/clientcursor.h
diff --git a/db/cloner.cpp b/src/mongo/db/cloner.cpp
index e35ae95052d..e35ae95052d 100644
--- a/db/cloner.cpp
+++ b/src/mongo/db/cloner.cpp
diff --git a/db/cloner.h b/src/mongo/db/cloner.h
index 130fea0fac1..130fea0fac1 100644
--- a/db/cloner.h
+++ b/src/mongo/db/cloner.h
diff --git a/db/cmdline.cpp b/src/mongo/db/cmdline.cpp
index a9b0d7097ca..a9b0d7097ca 100644
--- a/db/cmdline.cpp
+++ b/src/mongo/db/cmdline.cpp
diff --git a/db/cmdline.h b/src/mongo/db/cmdline.h
index 5fe6ceb1005..5fe6ceb1005 100644
--- a/db/cmdline.h
+++ b/src/mongo/db/cmdline.h
diff --git a/db/collection.h b/src/mongo/db/collection.h
index 998b2f0beac..998b2f0beac 100644
--- a/db/collection.h
+++ b/src/mongo/db/collection.h
diff --git a/db/commands.cpp b/src/mongo/db/commands.cpp
index cbe9ffc6861..cbe9ffc6861 100755
--- a/db/commands.cpp
+++ b/src/mongo/db/commands.cpp
diff --git a/db/commands.h b/src/mongo/db/commands.h
index 85cdd38d7a4..85cdd38d7a4 100644
--- a/db/commands.h
+++ b/src/mongo/db/commands.h
diff --git a/db/commands/aggregate.js b/src/mongo/db/commands/aggregate.js
index 7741e3121ff..7741e3121ff 100755
--- a/db/commands/aggregate.js
+++ b/src/mongo/db/commands/aggregate.js
diff --git a/db/commands/cloud.cpp b/src/mongo/db/commands/cloud.cpp
index 8f9d9d2e4b5..8f9d9d2e4b5 100644
--- a/db/commands/cloud.cpp
+++ b/src/mongo/db/commands/cloud.cpp
diff --git a/db/commands/distinct.cpp b/src/mongo/db/commands/distinct.cpp
index 1926e6abddb..1926e6abddb 100644
--- a/db/commands/distinct.cpp
+++ b/src/mongo/db/commands/distinct.cpp
diff --git a/db/commands/document_source_cursor.cpp b/src/mongo/db/commands/document_source_cursor.cpp
index 49bb9f19d9e..49bb9f19d9e 100755
--- a/db/commands/document_source_cursor.cpp
+++ b/src/mongo/db/commands/document_source_cursor.cpp
diff --git a/db/commands/find_and_modify.cpp b/src/mongo/db/commands/find_and_modify.cpp
index 0cf766fcf87..0cf766fcf87 100644
--- a/db/commands/find_and_modify.cpp
+++ b/src/mongo/db/commands/find_and_modify.cpp
diff --git a/db/commands/group.cpp b/src/mongo/db/commands/group.cpp
index 69fee587a47..69fee587a47 100644
--- a/db/commands/group.cpp
+++ b/src/mongo/db/commands/group.cpp
diff --git a/db/commands/isself.cpp b/src/mongo/db/commands/isself.cpp
index ebf6d5bceec..ebf6d5bceec 100644
--- a/db/commands/isself.cpp
+++ b/src/mongo/db/commands/isself.cpp
diff --git a/db/commands/mr.cpp b/src/mongo/db/commands/mr.cpp
index add76c39c47..add76c39c47 100644
--- a/db/commands/mr.cpp
+++ b/src/mongo/db/commands/mr.cpp
diff --git a/db/commands/mr.h b/src/mongo/db/commands/mr.h
index 592769d82da..592769d82da 100644
--- a/db/commands/mr.h
+++ b/src/mongo/db/commands/mr.h
diff --git a/db/commands/pipeline.cpp b/src/mongo/db/commands/pipeline.cpp
index 4ad5e342aed..4ad5e342aed 100755
--- a/db/commands/pipeline.cpp
+++ b/src/mongo/db/commands/pipeline.cpp
diff --git a/db/commands/pipeline.h b/src/mongo/db/commands/pipeline.h
index ef9cc6afe51..ef9cc6afe51 100755
--- a/db/commands/pipeline.h
+++ b/src/mongo/db/commands/pipeline.h
diff --git a/db/commands/pipeline_command.cpp b/src/mongo/db/commands/pipeline_command.cpp
index 9863e14556c..9863e14556c 100755
--- a/db/commands/pipeline_command.cpp
+++ b/src/mongo/db/commands/pipeline_command.cpp
diff --git a/db/common.cpp b/src/mongo/db/common.cpp
index cd073f8b059..cd073f8b059 100644
--- a/db/common.cpp
+++ b/src/mongo/db/common.cpp
diff --git a/db/compact.cpp b/src/mongo/db/compact.cpp
index 32931b6c5fd..32931b6c5fd 100644
--- a/db/compact.cpp
+++ b/src/mongo/db/compact.cpp
diff --git a/db/compact.h b/src/mongo/db/compact.h
index 7bf49c8e1b8..7bf49c8e1b8 100644
--- a/db/compact.h
+++ b/src/mongo/db/compact.h
diff --git a/db/concurrency.h b/src/mongo/db/concurrency.h
index 33bc0caac77..33bc0caac77 100644
--- a/db/concurrency.h
+++ b/src/mongo/db/concurrency.h
diff --git a/db/curop-inl.h b/src/mongo/db/curop-inl.h
index 7dd678b185d..7dd678b185d 100644
--- a/db/curop-inl.h
+++ b/src/mongo/db/curop-inl.h
diff --git a/db/curop.cpp b/src/mongo/db/curop.cpp
index 3cc452b46cc..3cc452b46cc 100644
--- a/db/curop.cpp
+++ b/src/mongo/db/curop.cpp
diff --git a/db/curop.h b/src/mongo/db/curop.h
index 192404d8796..192404d8796 100644
--- a/db/curop.h
+++ b/src/mongo/db/curop.h
diff --git a/db/cursor.cpp b/src/mongo/db/cursor.cpp
index ac7afc1532b..ac7afc1532b 100644
--- a/db/cursor.cpp
+++ b/src/mongo/db/cursor.cpp
diff --git a/db/cursor.h b/src/mongo/db/cursor.h
index 8e9e922733d..8e9e922733d 100644
--- a/db/cursor.h
+++ b/src/mongo/db/cursor.h
diff --git a/db/d_concurrency.cpp b/src/mongo/db/d_concurrency.cpp
index e3ad974cbfc..e3ad974cbfc 100755
--- a/db/d_concurrency.cpp
+++ b/src/mongo/db/d_concurrency.cpp
diff --git a/db/d_concurrency.h b/src/mongo/db/d_concurrency.h
index ba2f64f5126..ba2f64f5126 100644
--- a/db/d_concurrency.h
+++ b/src/mongo/db/d_concurrency.h
diff --git a/db/d_globals.cpp b/src/mongo/db/d_globals.cpp
index 7e0fd9e8cb0..7e0fd9e8cb0 100644
--- a/db/d_globals.cpp
+++ b/src/mongo/db/d_globals.cpp
diff --git a/db/d_globals.h b/src/mongo/db/d_globals.h
index 7c95d463cc3..7c95d463cc3 100644
--- a/db/d_globals.h
+++ b/src/mongo/db/d_globals.h
diff --git a/db/database.cpp b/src/mongo/db/database.cpp
index 2d55fd35626..2d55fd35626 100644
--- a/db/database.cpp
+++ b/src/mongo/db/database.cpp
diff --git a/db/database.h b/src/mongo/db/database.h
index a7867e20e8c..a7867e20e8c 100644
--- a/db/database.h
+++ b/src/mongo/db/database.h
diff --git a/db/databaseholder.h b/src/mongo/db/databaseholder.h
index 7c878c4ed63..7c878c4ed63 100644
--- a/db/databaseholder.h
+++ b/src/mongo/db/databaseholder.h
diff --git a/db/db.cpp b/src/mongo/db/db.cpp
index af03b447976..af03b447976 100644
--- a/db/db.cpp
+++ b/src/mongo/db/db.cpp
diff --git a/db/db.h b/src/mongo/db/db.h
index 6a31a06f77c..6a31a06f77c 100644
--- a/db/db.h
+++ b/src/mongo/db/db.h
diff --git a/db/db.rc b/src/mongo/db/db.rc
index b589458cf73..b589458cf73 100755
--- a/db/db.rc
+++ b/src/mongo/db/db.rc
diff --git a/db/db.vcxproj b/src/mongo/db/db.vcxproj
index 8963f0af580..8963f0af580 100755
--- a/db/db.vcxproj
+++ b/src/mongo/db/db.vcxproj
diff --git a/db/db.vcxproj.filters b/src/mongo/db/db.vcxproj.filters
index a39df0dc796..a39df0dc796 100755
--- a/db/db.vcxproj.filters
+++ b/src/mongo/db/db.vcxproj.filters
diff --git a/db/db_10.sln b/src/mongo/db/db_10.sln
index c1d83f3901a..c1d83f3901a 100755
--- a/db/db_10.sln
+++ b/src/mongo/db/db_10.sln
diff --git a/db/dbcommands.cpp b/src/mongo/db/dbcommands.cpp
index 570c897fae4..570c897fae4 100644
--- a/db/dbcommands.cpp
+++ b/src/mongo/db/dbcommands.cpp
diff --git a/db/dbcommands_admin.cpp b/src/mongo/db/dbcommands_admin.cpp
index ffcc3f261fe..ffcc3f261fe 100644
--- a/db/dbcommands_admin.cpp
+++ b/src/mongo/db/dbcommands_admin.cpp
diff --git a/db/dbcommands_generic.cpp b/src/mongo/db/dbcommands_generic.cpp
index cfd833aa72d..cfd833aa72d 100644
--- a/db/dbcommands_generic.cpp
+++ b/src/mongo/db/dbcommands_generic.cpp
diff --git a/db/dbeval.cpp b/src/mongo/db/dbeval.cpp
index 9e77d8c8097..9e77d8c8097 100644
--- a/db/dbeval.cpp
+++ b/src/mongo/db/dbeval.cpp
diff --git a/db/dbhelpers.cpp b/src/mongo/db/dbhelpers.cpp
index 39540c9ce89..39540c9ce89 100644
--- a/db/dbhelpers.cpp
+++ b/src/mongo/db/dbhelpers.cpp
diff --git a/db/dbhelpers.h b/src/mongo/db/dbhelpers.h
index 99d401fa1f8..99d401fa1f8 100644
--- a/db/dbhelpers.h
+++ b/src/mongo/db/dbhelpers.h
diff --git a/db/dbmessage.cpp b/src/mongo/db/dbmessage.cpp
index c86b5a05240..c86b5a05240 100644
--- a/db/dbmessage.cpp
+++ b/src/mongo/db/dbmessage.cpp
diff --git a/db/dbmessage.h b/src/mongo/db/dbmessage.h
index a789bff849c..a789bff849c 100644
--- a/db/dbmessage.h
+++ b/src/mongo/db/dbmessage.h
diff --git a/db/dbwebserver.cpp b/src/mongo/db/dbwebserver.cpp
index eb19ba3be6c..eb19ba3be6c 100644
--- a/db/dbwebserver.cpp
+++ b/src/mongo/db/dbwebserver.cpp
diff --git a/db/dbwebserver.h b/src/mongo/db/dbwebserver.h
index bdbcba2c07d..bdbcba2c07d 100644
--- a/db/dbwebserver.h
+++ b/src/mongo/db/dbwebserver.h
diff --git a/db/diskloc.h b/src/mongo/db/diskloc.h
index 5295df3e260..5295df3e260 100644
--- a/db/diskloc.h
+++ b/src/mongo/db/diskloc.h
diff --git a/db/driverHelpers.cpp b/src/mongo/db/driverHelpers.cpp
index 12aa01886c4..12aa01886c4 100644
--- a/db/driverHelpers.cpp
+++ b/src/mongo/db/driverHelpers.cpp
diff --git a/db/dur.cpp b/src/mongo/db/dur.cpp
index 822fa5232c0..822fa5232c0 100644
--- a/db/dur.cpp
+++ b/src/mongo/db/dur.cpp
diff --git a/db/dur.h b/src/mongo/db/dur.h
index f06ff500195..f06ff500195 100644
--- a/db/dur.h
+++ b/src/mongo/db/dur.h
diff --git a/db/dur_commitjob.cpp b/src/mongo/db/dur_commitjob.cpp
index 5a9e9cb5679..5a9e9cb5679 100644
--- a/db/dur_commitjob.cpp
+++ b/src/mongo/db/dur_commitjob.cpp
diff --git a/db/dur_commitjob.h b/src/mongo/db/dur_commitjob.h
index bfc5e3c268f..bfc5e3c268f 100644
--- a/db/dur_commitjob.h
+++ b/src/mongo/db/dur_commitjob.h
diff --git a/db/dur_journal.cpp b/src/mongo/db/dur_journal.cpp
index 6a6609f55ee..6a6609f55ee 100644
--- a/db/dur_journal.cpp
+++ b/src/mongo/db/dur_journal.cpp
diff --git a/db/dur_journal.h b/src/mongo/db/dur_journal.h
index 664f63942e0..664f63942e0 100644
--- a/db/dur_journal.h
+++ b/src/mongo/db/dur_journal.h
diff --git a/db/dur_journalformat.h b/src/mongo/db/dur_journalformat.h
index 10ed8487b71..10ed8487b71 100644
--- a/db/dur_journalformat.h
+++ b/src/mongo/db/dur_journalformat.h
diff --git a/db/dur_journalimpl.h b/src/mongo/db/dur_journalimpl.h
index 8aad70b0e5c..8aad70b0e5c 100644
--- a/db/dur_journalimpl.h
+++ b/src/mongo/db/dur_journalimpl.h
diff --git a/db/dur_preplogbuffer.cpp b/src/mongo/db/dur_preplogbuffer.cpp
index 10b63c0e549..10b63c0e549 100644
--- a/db/dur_preplogbuffer.cpp
+++ b/src/mongo/db/dur_preplogbuffer.cpp
diff --git a/db/dur_recover.cpp b/src/mongo/db/dur_recover.cpp
index a0a8843572c..a0a8843572c 100644
--- a/db/dur_recover.cpp
+++ b/src/mongo/db/dur_recover.cpp
diff --git a/db/dur_recover.h b/src/mongo/db/dur_recover.h
index 955e730ea05..955e730ea05 100644
--- a/db/dur_recover.h
+++ b/src/mongo/db/dur_recover.h
diff --git a/db/dur_stats.h b/src/mongo/db/dur_stats.h
index 50a26d1f215..50a26d1f215 100644
--- a/db/dur_stats.h
+++ b/src/mongo/db/dur_stats.h
diff --git a/db/dur_writetodatafiles.cpp b/src/mongo/db/dur_writetodatafiles.cpp
index d77b0482c20..d77b0482c20 100644
--- a/db/dur_writetodatafiles.cpp
+++ b/src/mongo/db/dur_writetodatafiles.cpp
diff --git a/db/durop.cpp b/src/mongo/db/durop.cpp
index 80ee5043410..80ee5043410 100644
--- a/db/durop.cpp
+++ b/src/mongo/db/durop.cpp
diff --git a/db/durop.h b/src/mongo/db/durop.h
index 9ab1bfcbede..9ab1bfcbede 100644
--- a/db/durop.h
+++ b/src/mongo/db/durop.h
diff --git a/db/extsort.cpp b/src/mongo/db/extsort.cpp
index 06a9756cc0a..06a9756cc0a 100644
--- a/db/extsort.cpp
+++ b/src/mongo/db/extsort.cpp
diff --git a/db/extsort.h b/src/mongo/db/extsort.h
index 15a6d441849..15a6d441849 100644
--- a/db/extsort.h
+++ b/src/mongo/db/extsort.h
diff --git a/db/filever.h b/src/mongo/db/filever.h
index e89a8243dcf..e89a8243dcf 100644
--- a/db/filever.h
+++ b/src/mongo/db/filever.h
diff --git a/db/flushtest.cpp b/src/mongo/db/flushtest.cpp
index 2009d922950..2009d922950 100644
--- a/db/flushtest.cpp
+++ b/src/mongo/db/flushtest.cpp
diff --git a/db/geo/2d.cpp b/src/mongo/db/geo/2d.cpp
index f05ce4315b2..f05ce4315b2 100644
--- a/db/geo/2d.cpp
+++ b/src/mongo/db/geo/2d.cpp
diff --git a/db/geo/core.h b/src/mongo/db/geo/core.h
index c49131e0162..c49131e0162 100644
--- a/db/geo/core.h
+++ b/src/mongo/db/geo/core.h
diff --git a/db/geo/haystack.cpp b/src/mongo/db/geo/haystack.cpp
index 104665087f6..104665087f6 100644
--- a/db/geo/haystack.cpp
+++ b/src/mongo/db/geo/haystack.cpp
diff --git a/db/globals.h b/src/mongo/db/globals.h
index 093bec76a0e..093bec76a0e 100644
--- a/db/globals.h
+++ b/src/mongo/db/globals.h
diff --git a/db/helpers/dblogger.h b/src/mongo/db/helpers/dblogger.h
index 4d6ee6d78c4..4d6ee6d78c4 100644
--- a/db/helpers/dblogger.h
+++ b/src/mongo/db/helpers/dblogger.h
diff --git a/db/index.cpp b/src/mongo/db/index.cpp
index 5eaeab551df..5eaeab551df 100644
--- a/db/index.cpp
+++ b/src/mongo/db/index.cpp
diff --git a/db/index.h b/src/mongo/db/index.h
index d297f8a4ca1..d297f8a4ca1 100644
--- a/db/index.h
+++ b/src/mongo/db/index.h
diff --git a/db/indexkey.cpp b/src/mongo/db/indexkey.cpp
index 18dfcb079b9..18dfcb079b9 100644
--- a/db/indexkey.cpp
+++ b/src/mongo/db/indexkey.cpp
diff --git a/db/indexkey.h b/src/mongo/db/indexkey.h
index 12cd755e8a0..12cd755e8a0 100644
--- a/db/indexkey.h
+++ b/src/mongo/db/indexkey.h
diff --git a/db/instance.cpp b/src/mongo/db/instance.cpp
index c8f8c6ea85b..c8f8c6ea85b 100644
--- a/db/instance.cpp
+++ b/src/mongo/db/instance.cpp
diff --git a/db/instance.h b/src/mongo/db/instance.h
index 9dde729997d..9dde729997d 100644
--- a/db/instance.h
+++ b/src/mongo/db/instance.h
diff --git a/db/introspect.cpp b/src/mongo/db/introspect.cpp
index 7e1d19ce2f3..7e1d19ce2f3 100644
--- a/db/introspect.cpp
+++ b/src/mongo/db/introspect.cpp
diff --git a/db/introspect.h b/src/mongo/db/introspect.h
index 209eeacab7c..209eeacab7c 100644
--- a/db/introspect.h
+++ b/src/mongo/db/introspect.h
diff --git a/db/javatest.cpp b/src/mongo/db/javatest.cpp
index 22f2bdf8d3c..22f2bdf8d3c 100644
--- a/db/javatest.cpp
+++ b/src/mongo/db/javatest.cpp
diff --git a/db/jsobj.cpp b/src/mongo/db/jsobj.cpp
index 1e850982396..1e850982396 100644
--- a/db/jsobj.cpp
+++ b/src/mongo/db/jsobj.cpp
diff --git a/db/jsobj.h b/src/mongo/db/jsobj.h
index ae039529fbf..ae039529fbf 100644
--- a/db/jsobj.h
+++ b/src/mongo/db/jsobj.h
diff --git a/db/jsobjmanipulator.h b/src/mongo/db/jsobjmanipulator.h
index 860e575940e..860e575940e 100644
--- a/db/jsobjmanipulator.h
+++ b/src/mongo/db/jsobjmanipulator.h
diff --git a/db/json.cpp b/src/mongo/db/json.cpp
index 73457a2bfbb..73457a2bfbb 100644
--- a/db/json.cpp
+++ b/src/mongo/db/json.cpp
diff --git a/db/json.h b/src/mongo/db/json.h
index 68dae042574..68dae042574 100644
--- a/db/json.h
+++ b/src/mongo/db/json.h
diff --git a/db/key.cpp b/src/mongo/db/key.cpp
index 47449986d21..47449986d21 100644
--- a/db/key.cpp
+++ b/src/mongo/db/key.cpp
diff --git a/db/key.h b/src/mongo/db/key.h
index 9284cdc7422..9284cdc7422 100644
--- a/db/key.h
+++ b/src/mongo/db/key.h
diff --git a/db/lasterror.cpp b/src/mongo/db/lasterror.cpp
index 4ed4dfb0571..4ed4dfb0571 100644
--- a/db/lasterror.cpp
+++ b/src/mongo/db/lasterror.cpp
diff --git a/db/lasterror.h b/src/mongo/db/lasterror.h
index 86250e496a8..86250e496a8 100644
--- a/db/lasterror.h
+++ b/src/mongo/db/lasterror.h
diff --git a/db/matcher.cpp b/src/mongo/db/matcher.cpp
index 2631845a757..2631845a757 100755
--- a/db/matcher.cpp
+++ b/src/mongo/db/matcher.cpp
diff --git a/db/matcher.h b/src/mongo/db/matcher.h
index b6994a79229..b6994a79229 100644
--- a/db/matcher.h
+++ b/src/mongo/db/matcher.h
diff --git a/db/matcher_covered.cpp b/src/mongo/db/matcher_covered.cpp
index c6c89d03007..c6c89d03007 100644
--- a/db/matcher_covered.cpp
+++ b/src/mongo/db/matcher_covered.cpp
diff --git a/db/minilex.h b/src/mongo/db/minilex.h
index 677514aa47c..677514aa47c 100644
--- a/db/minilex.h
+++ b/src/mongo/db/minilex.h
diff --git a/db/module.cpp b/src/mongo/db/module.cpp
index 4269c5e99a0..4269c5e99a0 100644
--- a/db/module.cpp
+++ b/src/mongo/db/module.cpp
diff --git a/db/module.h b/src/mongo/db/module.h
index 71f276e0585..71f276e0585 100644
--- a/db/module.h
+++ b/src/mongo/db/module.h
diff --git a/db/modules/mms.cpp b/src/mongo/db/modules/mms.cpp
index 418a553f283..418a553f283 100644
--- a/db/modules/mms.cpp
+++ b/src/mongo/db/modules/mms.cpp
diff --git a/db/mongo.ico b/src/mongo/db/mongo.ico
index 5258b6e0446..5258b6e0446 100755
--- a/db/mongo.ico
+++ b/src/mongo/db/mongo.ico
diff --git a/db/mongommf.cpp b/src/mongo/db/mongommf.cpp
index af2e822404e..af2e822404e 100644
--- a/db/mongommf.cpp
+++ b/src/mongo/db/mongommf.cpp
diff --git a/db/mongommf.h b/src/mongo/db/mongommf.h
index 62a6cdfd3fd..62a6cdfd3fd 100644
--- a/db/mongommf.h
+++ b/src/mongo/db/mongommf.h
diff --git a/db/mongomutex.h b/src/mongo/db/mongomutex.h
index 08b091cae9c..08b091cae9c 100644
--- a/db/mongomutex.h
+++ b/src/mongo/db/mongomutex.h
diff --git a/db/namespace-inl.h b/src/mongo/db/namespace-inl.h
index a621a229546..a621a229546 100644
--- a/db/namespace-inl.h
+++ b/src/mongo/db/namespace-inl.h
diff --git a/db/namespace.cpp b/src/mongo/db/namespace.cpp
index af8b5694248..af8b5694248 100644
--- a/db/namespace.cpp
+++ b/src/mongo/db/namespace.cpp
diff --git a/db/namespace.h b/src/mongo/db/namespace.h
index 9ceb6a6f4e9..9ceb6a6f4e9 100644
--- a/db/namespace.h
+++ b/src/mongo/db/namespace.h
diff --git a/db/namespacestring.h b/src/mongo/db/namespacestring.h
index d982c5fff75..d982c5fff75 100644
--- a/db/namespacestring.h
+++ b/src/mongo/db/namespacestring.h
diff --git a/db/nonce.cpp b/src/mongo/db/nonce.cpp
index 379e88f116d..379e88f116d 100644
--- a/db/nonce.cpp
+++ b/src/mongo/db/nonce.cpp
diff --git a/db/nonce.h b/src/mongo/db/nonce.h
index d6a147ab1c0..d6a147ab1c0 100644
--- a/db/nonce.h
+++ b/src/mongo/db/nonce.h
diff --git a/db/oplog.cpp b/src/mongo/db/oplog.cpp
index 342f362a28f..342f362a28f 100644
--- a/db/oplog.cpp
+++ b/src/mongo/db/oplog.cpp
diff --git a/db/oplog.h b/src/mongo/db/oplog.h
index 6c1644fe3ab..6c1644fe3ab 100644
--- a/db/oplog.h
+++ b/src/mongo/db/oplog.h
diff --git a/db/oplogreader.h b/src/mongo/db/oplogreader.h
index 6efd1469c01..6efd1469c01 100644
--- a/db/oplogreader.h
+++ b/src/mongo/db/oplogreader.h
diff --git a/db/ops/count.cpp b/src/mongo/db/ops/count.cpp
index 3c183596b9d..3c183596b9d 100644
--- a/db/ops/count.cpp
+++ b/src/mongo/db/ops/count.cpp
diff --git a/db/ops/count.h b/src/mongo/db/ops/count.h
index 807741e1253..807741e1253 100644
--- a/db/ops/count.h
+++ b/src/mongo/db/ops/count.h
diff --git a/db/ops/delete.cpp b/src/mongo/db/ops/delete.cpp
index e33611c151e..e33611c151e 100644
--- a/db/ops/delete.cpp
+++ b/src/mongo/db/ops/delete.cpp
diff --git a/db/ops/delete.h b/src/mongo/db/ops/delete.h
index a74b7a664bc..a74b7a664bc 100644
--- a/db/ops/delete.h
+++ b/src/mongo/db/ops/delete.h
diff --git a/db/ops/query.cpp b/src/mongo/db/ops/query.cpp
index 15e3ed9053f..15e3ed9053f 100644
--- a/db/ops/query.cpp
+++ b/src/mongo/db/ops/query.cpp
diff --git a/db/ops/query.h b/src/mongo/db/ops/query.h
index 3324b75fe16..3324b75fe16 100644
--- a/db/ops/query.h
+++ b/src/mongo/db/ops/query.h
diff --git a/db/ops/update.cpp b/src/mongo/db/ops/update.cpp
index 2abc6987218..2abc6987218 100644
--- a/db/ops/update.cpp
+++ b/src/mongo/db/ops/update.cpp
diff --git a/db/ops/update.h b/src/mongo/db/ops/update.h
index 9446db06d36..9446db06d36 100644
--- a/db/ops/update.h
+++ b/src/mongo/db/ops/update.h
diff --git a/db/pagefault.cpp b/src/mongo/db/pagefault.cpp
index 4b9b1b23e02..4b9b1b23e02 100644
--- a/db/pagefault.cpp
+++ b/src/mongo/db/pagefault.cpp
diff --git a/db/pagefault.h b/src/mongo/db/pagefault.h
index 8bbf4ecab52..8bbf4ecab52 100644
--- a/db/pagefault.h
+++ b/src/mongo/db/pagefault.h
diff --git a/db/pcre.txt b/src/mongo/db/pcre.txt
index 3e21047eabc..3e21047eabc 100644
--- a/db/pcre.txt
+++ b/src/mongo/db/pcre.txt
diff --git a/db/pdfile.cpp b/src/mongo/db/pdfile.cpp
index 069eeadec37..069eeadec37 100644
--- a/db/pdfile.cpp
+++ b/src/mongo/db/pdfile.cpp
diff --git a/db/pdfile.h b/src/mongo/db/pdfile.h
index cd6062b1a48..cd6062b1a48 100644
--- a/db/pdfile.h
+++ b/src/mongo/db/pdfile.h
diff --git a/db/pipeline/accumulator.cpp b/src/mongo/db/pipeline/accumulator.cpp
index 9ef8aa39470..9ef8aa39470 100755
--- a/db/pipeline/accumulator.cpp
+++ b/src/mongo/db/pipeline/accumulator.cpp
diff --git a/db/pipeline/accumulator.h b/src/mongo/db/pipeline/accumulator.h
index a75b2c9abaa..a75b2c9abaa 100755
--- a/db/pipeline/accumulator.h
+++ b/src/mongo/db/pipeline/accumulator.h
diff --git a/db/pipeline/accumulator_add_to_set.cpp b/src/mongo/db/pipeline/accumulator_add_to_set.cpp
index 94df0293de4..94df0293de4 100755
--- a/db/pipeline/accumulator_add_to_set.cpp
+++ b/src/mongo/db/pipeline/accumulator_add_to_set.cpp
diff --git a/db/pipeline/accumulator_avg.cpp b/src/mongo/db/pipeline/accumulator_avg.cpp
index 9f18b1820c8..9f18b1820c8 100755
--- a/db/pipeline/accumulator_avg.cpp
+++ b/src/mongo/db/pipeline/accumulator_avg.cpp
diff --git a/db/pipeline/accumulator_first.cpp b/src/mongo/db/pipeline/accumulator_first.cpp
index c947aa83996..c947aa83996 100755
--- a/db/pipeline/accumulator_first.cpp
+++ b/src/mongo/db/pipeline/accumulator_first.cpp
diff --git a/db/pipeline/accumulator_last.cpp b/src/mongo/db/pipeline/accumulator_last.cpp
index c134fc83159..c134fc83159 100755
--- a/db/pipeline/accumulator_last.cpp
+++ b/src/mongo/db/pipeline/accumulator_last.cpp
diff --git a/db/pipeline/accumulator_min_max.cpp b/src/mongo/db/pipeline/accumulator_min_max.cpp
index 6f078187b44..6f078187b44 100755
--- a/db/pipeline/accumulator_min_max.cpp
+++ b/src/mongo/db/pipeline/accumulator_min_max.cpp
diff --git a/db/pipeline/accumulator_push.cpp b/src/mongo/db/pipeline/accumulator_push.cpp
index 2640bc4ecfd..2640bc4ecfd 100755
--- a/db/pipeline/accumulator_push.cpp
+++ b/src/mongo/db/pipeline/accumulator_push.cpp
diff --git a/db/pipeline/accumulator_single_value.cpp b/src/mongo/db/pipeline/accumulator_single_value.cpp
index bfec80387d3..bfec80387d3 100755
--- a/db/pipeline/accumulator_single_value.cpp
+++ b/src/mongo/db/pipeline/accumulator_single_value.cpp
diff --git a/db/pipeline/accumulator_sum.cpp b/src/mongo/db/pipeline/accumulator_sum.cpp
index e6526ac254a..e6526ac254a 100755
--- a/db/pipeline/accumulator_sum.cpp
+++ b/src/mongo/db/pipeline/accumulator_sum.cpp
diff --git a/db/pipeline/builder.cpp b/src/mongo/db/pipeline/builder.cpp
index cbde3705656..cbde3705656 100755
--- a/db/pipeline/builder.cpp
+++ b/src/mongo/db/pipeline/builder.cpp
diff --git a/db/pipeline/builder.h b/src/mongo/db/pipeline/builder.h
index bdf71cd784c..bdf71cd784c 100755
--- a/db/pipeline/builder.h
+++ b/src/mongo/db/pipeline/builder.h
diff --git a/db/pipeline/doc_mem_monitor.cpp b/src/mongo/db/pipeline/doc_mem_monitor.cpp
index ffbe9c88854..ffbe9c88854 100755
--- a/db/pipeline/doc_mem_monitor.cpp
+++ b/src/mongo/db/pipeline/doc_mem_monitor.cpp
diff --git a/db/pipeline/doc_mem_monitor.h b/src/mongo/db/pipeline/doc_mem_monitor.h
index e368acc906a..e368acc906a 100755
--- a/db/pipeline/doc_mem_monitor.h
+++ b/src/mongo/db/pipeline/doc_mem_monitor.h
diff --git a/db/pipeline/document.cpp b/src/mongo/db/pipeline/document.cpp
index a49c7e303c1..a49c7e303c1 100755
--- a/db/pipeline/document.cpp
+++ b/src/mongo/db/pipeline/document.cpp
diff --git a/db/pipeline/document.h b/src/mongo/db/pipeline/document.h
index f11a825151e..f11a825151e 100755
--- a/db/pipeline/document.h
+++ b/src/mongo/db/pipeline/document.h
diff --git a/db/pipeline/document_source.cpp b/src/mongo/db/pipeline/document_source.cpp
index 813852e35c6..813852e35c6 100755
--- a/db/pipeline/document_source.cpp
+++ b/src/mongo/db/pipeline/document_source.cpp
diff --git a/db/pipeline/document_source.h b/src/mongo/db/pipeline/document_source.h
index 8d5f0f70847..8d5f0f70847 100755
--- a/db/pipeline/document_source.h
+++ b/src/mongo/db/pipeline/document_source.h
diff --git a/db/pipeline/document_source_bson_array.cpp b/src/mongo/db/pipeline/document_source_bson_array.cpp
index 5d187b03ef9..5d187b03ef9 100755
--- a/db/pipeline/document_source_bson_array.cpp
+++ b/src/mongo/db/pipeline/document_source_bson_array.cpp
diff --git a/db/pipeline/document_source_command_futures.cpp b/src/mongo/db/pipeline/document_source_command_futures.cpp
index 61a257cf16f..61a257cf16f 100755
--- a/db/pipeline/document_source_command_futures.cpp
+++ b/src/mongo/db/pipeline/document_source_command_futures.cpp
diff --git a/db/pipeline/document_source_filter.cpp b/src/mongo/db/pipeline/document_source_filter.cpp
index 66e57ba2e93..66e57ba2e93 100755
--- a/db/pipeline/document_source_filter.cpp
+++ b/src/mongo/db/pipeline/document_source_filter.cpp
diff --git a/db/pipeline/document_source_filter_base.cpp b/src/mongo/db/pipeline/document_source_filter_base.cpp
index dbda34b7151..dbda34b7151 100755
--- a/db/pipeline/document_source_filter_base.cpp
+++ b/src/mongo/db/pipeline/document_source_filter_base.cpp
diff --git a/db/pipeline/document_source_group.cpp b/src/mongo/db/pipeline/document_source_group.cpp
index 244561589da..244561589da 100755
--- a/db/pipeline/document_source_group.cpp
+++ b/src/mongo/db/pipeline/document_source_group.cpp
diff --git a/db/pipeline/document_source_limit.cpp b/src/mongo/db/pipeline/document_source_limit.cpp
index a73d4da2005..a73d4da2005 100644
--- a/db/pipeline/document_source_limit.cpp
+++ b/src/mongo/db/pipeline/document_source_limit.cpp
diff --git a/db/pipeline/document_source_match.cpp b/src/mongo/db/pipeline/document_source_match.cpp
index bedac3ef717..bedac3ef717 100755
--- a/db/pipeline/document_source_match.cpp
+++ b/src/mongo/db/pipeline/document_source_match.cpp
diff --git a/db/pipeline/document_source_out.cpp b/src/mongo/db/pipeline/document_source_out.cpp
index 5a30342d25c..5a30342d25c 100755
--- a/db/pipeline/document_source_out.cpp
+++ b/src/mongo/db/pipeline/document_source_out.cpp
diff --git a/db/pipeline/document_source_project.cpp b/src/mongo/db/pipeline/document_source_project.cpp
index bb7a0b5a6d9..bb7a0b5a6d9 100755
--- a/db/pipeline/document_source_project.cpp
+++ b/src/mongo/db/pipeline/document_source_project.cpp
diff --git a/db/pipeline/document_source_skip.cpp b/src/mongo/db/pipeline/document_source_skip.cpp
index 74bf2360ce9..74bf2360ce9 100644
--- a/db/pipeline/document_source_skip.cpp
+++ b/src/mongo/db/pipeline/document_source_skip.cpp
diff --git a/db/pipeline/document_source_sort.cpp b/src/mongo/db/pipeline/document_source_sort.cpp
index bf4739af7d1..bf4739af7d1 100755
--- a/db/pipeline/document_source_sort.cpp
+++ b/src/mongo/db/pipeline/document_source_sort.cpp
diff --git a/db/pipeline/document_source_unwind.cpp b/src/mongo/db/pipeline/document_source_unwind.cpp
index bb231451113..bb231451113 100755
--- a/db/pipeline/document_source_unwind.cpp
+++ b/src/mongo/db/pipeline/document_source_unwind.cpp
diff --git a/db/pipeline/expression.cpp b/src/mongo/db/pipeline/expression.cpp
index b3caefcf899..b3caefcf899 100755
--- a/db/pipeline/expression.cpp
+++ b/src/mongo/db/pipeline/expression.cpp
diff --git a/db/pipeline/expression.h b/src/mongo/db/pipeline/expression.h
index c49e385a3c7..c49e385a3c7 100755
--- a/db/pipeline/expression.h
+++ b/src/mongo/db/pipeline/expression.h
diff --git a/db/pipeline/expression_context.cpp b/src/mongo/db/pipeline/expression_context.cpp
index 4835dcfa5a9..4835dcfa5a9 100755
--- a/db/pipeline/expression_context.cpp
+++ b/src/mongo/db/pipeline/expression_context.cpp
diff --git a/db/pipeline/expression_context.h b/src/mongo/db/pipeline/expression_context.h
index 0277039c80b..0277039c80b 100755
--- a/db/pipeline/expression_context.h
+++ b/src/mongo/db/pipeline/expression_context.h
diff --git a/db/pipeline/field_path.cpp b/src/mongo/db/pipeline/field_path.cpp
index 96e1fc92f83..96e1fc92f83 100755
--- a/db/pipeline/field_path.cpp
+++ b/src/mongo/db/pipeline/field_path.cpp
diff --git a/db/pipeline/field_path.h b/src/mongo/db/pipeline/field_path.h
index 810c5d0c7ea..810c5d0c7ea 100755
--- a/db/pipeline/field_path.h
+++ b/src/mongo/db/pipeline/field_path.h
diff --git a/db/pipeline/value.cpp b/src/mongo/db/pipeline/value.cpp
index b83dec359cf..b83dec359cf 100755
--- a/db/pipeline/value.cpp
+++ b/src/mongo/db/pipeline/value.cpp
diff --git a/db/pipeline/value.h b/src/mongo/db/pipeline/value.h
index 8bd1bcbbbfd..8bd1bcbbbfd 100755
--- a/db/pipeline/value.h
+++ b/src/mongo/db/pipeline/value.h
diff --git a/db/projection.cpp b/src/mongo/db/projection.cpp
index d07e56527af..d07e56527af 100644
--- a/db/projection.cpp
+++ b/src/mongo/db/projection.cpp
diff --git a/db/projection.h b/src/mongo/db/projection.h
index b5e0a0c4289..b5e0a0c4289 100644
--- a/db/projection.h
+++ b/src/mongo/db/projection.h
diff --git a/db/queryoptimizer.cpp b/src/mongo/db/queryoptimizer.cpp
index 9d9040d51e2..9d9040d51e2 100644
--- a/db/queryoptimizer.cpp
+++ b/src/mongo/db/queryoptimizer.cpp
diff --git a/db/queryoptimizer.h b/src/mongo/db/queryoptimizer.h
index 297c6fe9505..297c6fe9505 100644
--- a/db/queryoptimizer.h
+++ b/src/mongo/db/queryoptimizer.h
diff --git a/db/queryoptimizercursor.cpp b/src/mongo/db/queryoptimizercursor.cpp
index 07f8df12815..07f8df12815 100644
--- a/db/queryoptimizercursor.cpp
+++ b/src/mongo/db/queryoptimizercursor.cpp
diff --git a/db/queryoptimizercursor.h b/src/mongo/db/queryoptimizercursor.h
index ee5a1663370..ee5a1663370 100644
--- a/db/queryoptimizercursor.h
+++ b/src/mongo/db/queryoptimizercursor.h
diff --git a/db/querypattern.cpp b/src/mongo/db/querypattern.cpp
index e20e2b6a6ae..e20e2b6a6ae 100644
--- a/db/querypattern.cpp
+++ b/src/mongo/db/querypattern.cpp
diff --git a/db/querypattern.h b/src/mongo/db/querypattern.h
index 000c301a0de..000c301a0de 100644
--- a/db/querypattern.h
+++ b/src/mongo/db/querypattern.h
diff --git a/db/queryutil-inl.h b/src/mongo/db/queryutil-inl.h
index 08d3b1fac52..08d3b1fac52 100644
--- a/db/queryutil-inl.h
+++ b/src/mongo/db/queryutil-inl.h
diff --git a/db/queryutil.cpp b/src/mongo/db/queryutil.cpp
index e6748c4bc2e..e6748c4bc2e 100644
--- a/db/queryutil.cpp
+++ b/src/mongo/db/queryutil.cpp
diff --git a/db/queryutil.h b/src/mongo/db/queryutil.h
index aefef27cc8b..aefef27cc8b 100644
--- a/db/queryutil.h
+++ b/src/mongo/db/queryutil.h
diff --git a/db/record.cpp b/src/mongo/db/record.cpp
index 17987002efc..17987002efc 100644
--- a/db/record.cpp
+++ b/src/mongo/db/record.cpp
diff --git a/db/repl.cpp b/src/mongo/db/repl.cpp
index 25ecb6b455f..25ecb6b455f 100644
--- a/db/repl.cpp
+++ b/src/mongo/db/repl.cpp
diff --git a/db/repl.h b/src/mongo/db/repl.h
index 83242d0a4ce..83242d0a4ce 100644
--- a/db/repl.h
+++ b/src/mongo/db/repl.h
diff --git a/db/repl/connections.h b/src/mongo/db/repl/connections.h
index 3e08f80b047..3e08f80b047 100644
--- a/db/repl/connections.h
+++ b/src/mongo/db/repl/connections.h
diff --git a/db/repl/consensus.cpp b/src/mongo/db/repl/consensus.cpp
index 3995373f5ef..3995373f5ef 100644
--- a/db/repl/consensus.cpp
+++ b/src/mongo/db/repl/consensus.cpp
diff --git a/db/repl/health.cpp b/src/mongo/db/repl/health.cpp
index 0b7ed87eac3..0b7ed87eac3 100644
--- a/db/repl/health.cpp
+++ b/src/mongo/db/repl/health.cpp
diff --git a/db/repl/health.h b/src/mongo/db/repl/health.h
index 55cca93a27e..55cca93a27e 100644
--- a/db/repl/health.h
+++ b/src/mongo/db/repl/health.h
diff --git a/db/repl/heartbeat.cpp b/src/mongo/db/repl/heartbeat.cpp
index 331812af85a..331812af85a 100644
--- a/db/repl/heartbeat.cpp
+++ b/src/mongo/db/repl/heartbeat.cpp
diff --git a/db/repl/manager.cpp b/src/mongo/db/repl/manager.cpp
index 91648a1b506..91648a1b506 100644
--- a/db/repl/manager.cpp
+++ b/src/mongo/db/repl/manager.cpp
diff --git a/db/repl/multicmd.h b/src/mongo/db/repl/multicmd.h
index 2d70c551f64..2d70c551f64 100644
--- a/db/repl/multicmd.h
+++ b/src/mongo/db/repl/multicmd.h
diff --git a/db/repl/replset_commands.cpp b/src/mongo/db/repl/replset_commands.cpp
index 84f16e53466..84f16e53466 100644
--- a/db/repl/replset_commands.cpp
+++ b/src/mongo/db/repl/replset_commands.cpp
diff --git a/db/repl/rs.cpp b/src/mongo/db/repl/rs.cpp
index fff5d72bcc0..fff5d72bcc0 100644
--- a/db/repl/rs.cpp
+++ b/src/mongo/db/repl/rs.cpp
diff --git a/db/repl/rs.h b/src/mongo/db/repl/rs.h
index 8e43204be3b..8e43204be3b 100644
--- a/db/repl/rs.h
+++ b/src/mongo/db/repl/rs.h
diff --git a/db/repl/rs_config.cpp b/src/mongo/db/repl/rs_config.cpp
index 22137773aec..22137773aec 100644
--- a/db/repl/rs_config.cpp
+++ b/src/mongo/db/repl/rs_config.cpp
diff --git a/db/repl/rs_config.h b/src/mongo/db/repl/rs_config.h
index cfe2e86a568..cfe2e86a568 100644
--- a/db/repl/rs_config.h
+++ b/src/mongo/db/repl/rs_config.h
diff --git a/db/repl/rs_exception.h b/src/mongo/db/repl/rs_exception.h
index fc372fc241c..fc372fc241c 100644
--- a/db/repl/rs_exception.h
+++ b/src/mongo/db/repl/rs_exception.h
diff --git a/db/repl/rs_initialsync.cpp b/src/mongo/db/repl/rs_initialsync.cpp
index b67c0d71b83..b67c0d71b83 100644
--- a/db/repl/rs_initialsync.cpp
+++ b/src/mongo/db/repl/rs_initialsync.cpp
diff --git a/db/repl/rs_initiate.cpp b/src/mongo/db/repl/rs_initiate.cpp
index 77bc6c03938..77bc6c03938 100644
--- a/db/repl/rs_initiate.cpp
+++ b/src/mongo/db/repl/rs_initiate.cpp
diff --git a/db/repl/rs_member.h b/src/mongo/db/repl/rs_member.h
index 24e593392b6..24e593392b6 100644
--- a/db/repl/rs_member.h
+++ b/src/mongo/db/repl/rs_member.h
diff --git a/db/repl/rs_optime.h b/src/mongo/db/repl/rs_optime.h
index f0ca56927ad..f0ca56927ad 100644
--- a/db/repl/rs_optime.h
+++ b/src/mongo/db/repl/rs_optime.h
diff --git a/db/repl/rs_rollback.cpp b/src/mongo/db/repl/rs_rollback.cpp
index 10727c59669..10727c59669 100644
--- a/db/repl/rs_rollback.cpp
+++ b/src/mongo/db/repl/rs_rollback.cpp
diff --git a/db/repl/rs_sync.cpp b/src/mongo/db/repl/rs_sync.cpp
index 8bac981d951..8bac981d951 100644
--- a/db/repl/rs_sync.cpp
+++ b/src/mongo/db/repl/rs_sync.cpp
diff --git a/db/repl/test.html b/src/mongo/db/repl/test.html
index 295ad2ef0e0..295ad2ef0e0 100644
--- a/db/repl/test.html
+++ b/src/mongo/db/repl/test.html
diff --git a/db/repl/testing.js b/src/mongo/db/repl/testing.js
index d741cf3a644..d741cf3a644 100644
--- a/db/repl/testing.js
+++ b/src/mongo/db/repl/testing.js
diff --git a/db/repl_block.cpp b/src/mongo/db/repl_block.cpp
index 1776225505c..1776225505c 100644
--- a/db/repl_block.cpp
+++ b/src/mongo/db/repl_block.cpp
diff --git a/db/repl_block.h b/src/mongo/db/repl_block.h
index bb74deea10f..bb74deea10f 100644
--- a/db/repl_block.h
+++ b/src/mongo/db/repl_block.h
diff --git a/db/replutil.h b/src/mongo/db/replutil.h
index 6f4dbb875d2..6f4dbb875d2 100644
--- a/db/replutil.h
+++ b/src/mongo/db/replutil.h
diff --git a/db/resource.h b/src/mongo/db/resource.h
index 9ba1ed26a0c..9ba1ed26a0c 100644
--- a/db/resource.h
+++ b/src/mongo/db/resource.h
diff --git a/db/restapi.cpp b/src/mongo/db/restapi.cpp
index 370051354a2..370051354a2 100644
--- a/db/restapi.cpp
+++ b/src/mongo/db/restapi.cpp
diff --git a/db/restapi.h b/src/mongo/db/restapi.h
index e5ac52083fe..e5ac52083fe 100644
--- a/db/restapi.h
+++ b/src/mongo/db/restapi.h
diff --git a/db/scanandorder.cpp b/src/mongo/db/scanandorder.cpp
index b5e282a5866..b5e282a5866 100644
--- a/db/scanandorder.cpp
+++ b/src/mongo/db/scanandorder.cpp
diff --git a/db/scanandorder.h b/src/mongo/db/scanandorder.h
index 33e76f61f67..33e76f61f67 100644
--- a/db/scanandorder.h
+++ b/src/mongo/db/scanandorder.h
diff --git a/db/security.cpp b/src/mongo/db/security.cpp
index c9b9bb40326..c9b9bb40326 100644
--- a/db/security.cpp
+++ b/src/mongo/db/security.cpp
diff --git a/db/security.h b/src/mongo/db/security.h
index f193f305def..f193f305def 100755
--- a/db/security.h
+++ b/src/mongo/db/security.h
diff --git a/db/security_commands.cpp b/src/mongo/db/security_commands.cpp
index 33dbd597c83..33dbd597c83 100644
--- a/db/security_commands.cpp
+++ b/src/mongo/db/security_commands.cpp
diff --git a/db/security_common.cpp b/src/mongo/db/security_common.cpp
index a480919c27e..a480919c27e 100644
--- a/db/security_common.cpp
+++ b/src/mongo/db/security_common.cpp
diff --git a/db/security_common.h b/src/mongo/db/security_common.h
index 6615c6e573e..6615c6e573e 100644
--- a/db/security_common.h
+++ b/src/mongo/db/security_common.h
diff --git a/db/stats/counters.cpp b/src/mongo/db/stats/counters.cpp
index 889e8a86c4c..889e8a86c4c 100644
--- a/db/stats/counters.cpp
+++ b/src/mongo/db/stats/counters.cpp
diff --git a/db/stats/counters.h b/src/mongo/db/stats/counters.h
index 0cb29aa49aa..0cb29aa49aa 100644
--- a/db/stats/counters.h
+++ b/src/mongo/db/stats/counters.h
diff --git a/db/stats/fine_clock.h b/src/mongo/db/stats/fine_clock.h
index 02600e718c4..02600e718c4 100644
--- a/db/stats/fine_clock.h
+++ b/src/mongo/db/stats/fine_clock.h
diff --git a/db/stats/service_stats.cpp b/src/mongo/db/stats/service_stats.cpp
index d69147fe969..d69147fe969 100644
--- a/db/stats/service_stats.cpp
+++ b/src/mongo/db/stats/service_stats.cpp
diff --git a/db/stats/service_stats.h b/src/mongo/db/stats/service_stats.h
index 5b0e75fdcb9..5b0e75fdcb9 100644
--- a/db/stats/service_stats.h
+++ b/src/mongo/db/stats/service_stats.h
diff --git a/db/stats/snapshots.cpp b/src/mongo/db/stats/snapshots.cpp
index 900cc4ff1ad..900cc4ff1ad 100644
--- a/db/stats/snapshots.cpp
+++ b/src/mongo/db/stats/snapshots.cpp
diff --git a/db/stats/snapshots.h b/src/mongo/db/stats/snapshots.h
index d9b8e5eb901..d9b8e5eb901 100644
--- a/db/stats/snapshots.h
+++ b/src/mongo/db/stats/snapshots.h
diff --git a/db/stats/top.cpp b/src/mongo/db/stats/top.cpp
index f5b6ee42f1c..f5b6ee42f1c 100644
--- a/db/stats/top.cpp
+++ b/src/mongo/db/stats/top.cpp
diff --git a/db/stats/top.h b/src/mongo/db/stats/top.h
index 9645ed1a3a6..9645ed1a3a6 100644
--- a/db/stats/top.h
+++ b/src/mongo/db/stats/top.h
diff --git a/db/taskqueue.h b/src/mongo/db/taskqueue.h
index 005bd986f11..005bd986f11 100644
--- a/db/taskqueue.h
+++ b/src/mongo/db/taskqueue.h
diff --git a/db/tests.cpp b/src/mongo/db/tests.cpp
index 00f299e1bb6..00f299e1bb6 100644
--- a/db/tests.cpp
+++ b/src/mongo/db/tests.cpp
diff --git a/dbtests/background_job_test.cpp b/src/mongo/dbtests/background_job_test.cpp
index f2bf7d86244..f2bf7d86244 100644
--- a/dbtests/background_job_test.cpp
+++ b/src/mongo/dbtests/background_job_test.cpp
diff --git a/dbtests/balancer_policy_tests.cpp b/src/mongo/dbtests/balancer_policy_tests.cpp
index 6f7c4a5dcd3..6f7c4a5dcd3 100644
--- a/dbtests/balancer_policy_tests.cpp
+++ b/src/mongo/dbtests/balancer_policy_tests.cpp
diff --git a/dbtests/basictests.cpp b/src/mongo/dbtests/basictests.cpp
index 46a7dbc22bd..46a7dbc22bd 100644
--- a/dbtests/basictests.cpp
+++ b/src/mongo/dbtests/basictests.cpp
diff --git a/dbtests/btreetests.cpp b/src/mongo/dbtests/btreetests.cpp
index efa42b1d5c1..efa42b1d5c1 100644
--- a/dbtests/btreetests.cpp
+++ b/src/mongo/dbtests/btreetests.cpp
diff --git a/dbtests/btreetests.inl b/src/mongo/dbtests/btreetests.inl
index 824313e6a54..824313e6a54 100644
--- a/dbtests/btreetests.inl
+++ b/src/mongo/dbtests/btreetests.inl
diff --git a/dbtests/clienttests.cpp b/src/mongo/dbtests/clienttests.cpp
index a64894b43c1..a64894b43c1 100644
--- a/dbtests/clienttests.cpp
+++ b/src/mongo/dbtests/clienttests.cpp
diff --git a/dbtests/commandtests.cpp b/src/mongo/dbtests/commandtests.cpp
index fa6204d25fd..fa6204d25fd 100644
--- a/dbtests/commandtests.cpp
+++ b/src/mongo/dbtests/commandtests.cpp
diff --git a/dbtests/counttests.cpp b/src/mongo/dbtests/counttests.cpp
index 0d2575f14e3..0d2575f14e3 100644
--- a/dbtests/counttests.cpp
+++ b/src/mongo/dbtests/counttests.cpp
diff --git a/dbtests/cursortests.cpp b/src/mongo/dbtests/cursortests.cpp
index a7b52aada12..a7b52aada12 100644
--- a/dbtests/cursortests.cpp
+++ b/src/mongo/dbtests/cursortests.cpp
diff --git a/dbtests/d_chunk_manager_tests.cpp b/src/mongo/dbtests/d_chunk_manager_tests.cpp
index 2bcc90faf7a..2bcc90faf7a 100644
--- a/dbtests/d_chunk_manager_tests.cpp
+++ b/src/mongo/dbtests/d_chunk_manager_tests.cpp
diff --git a/dbtests/dbtests.cpp b/src/mongo/dbtests/dbtests.cpp
index fde0f669c98..fde0f669c98 100644
--- a/dbtests/dbtests.cpp
+++ b/src/mongo/dbtests/dbtests.cpp
diff --git a/dbtests/dbtests.h b/src/mongo/dbtests/dbtests.h
index dbaeea1d180..dbaeea1d180 100644
--- a/dbtests/dbtests.h
+++ b/src/mongo/dbtests/dbtests.h
diff --git a/dbtests/directclienttests.cpp b/src/mongo/dbtests/directclienttests.cpp
index 860eb7e7e5c..860eb7e7e5c 100644
--- a/dbtests/directclienttests.cpp
+++ b/src/mongo/dbtests/directclienttests.cpp
diff --git a/dbtests/framework.cpp b/src/mongo/dbtests/framework.cpp
index 95ed8b33668..95ed8b33668 100644
--- a/dbtests/framework.cpp
+++ b/src/mongo/dbtests/framework.cpp
diff --git a/dbtests/framework.h b/src/mongo/dbtests/framework.h
index adf610a05eb..adf610a05eb 100644
--- a/dbtests/framework.h
+++ b/src/mongo/dbtests/framework.h
diff --git a/dbtests/histogram_test.cpp b/src/mongo/dbtests/histogram_test.cpp
index e9cbb5bdf25..e9cbb5bdf25 100644
--- a/dbtests/histogram_test.cpp
+++ b/src/mongo/dbtests/histogram_test.cpp
diff --git a/dbtests/jsobjtests.cpp b/src/mongo/dbtests/jsobjtests.cpp
index 709c013f6d8..709c013f6d8 100644
--- a/dbtests/jsobjtests.cpp
+++ b/src/mongo/dbtests/jsobjtests.cpp
diff --git a/dbtests/jsontests.cpp b/src/mongo/dbtests/jsontests.cpp
index 36c204a1011..36c204a1011 100644
--- a/dbtests/jsontests.cpp
+++ b/src/mongo/dbtests/jsontests.cpp
diff --git a/dbtests/jstests.cpp b/src/mongo/dbtests/jstests.cpp
index 9782eedaacb..9782eedaacb 100644
--- a/dbtests/jstests.cpp
+++ b/src/mongo/dbtests/jstests.cpp
diff --git a/dbtests/macrotests.cpp b/src/mongo/dbtests/macrotests.cpp
index f547c851677..f547c851677 100644
--- a/dbtests/macrotests.cpp
+++ b/src/mongo/dbtests/macrotests.cpp
diff --git a/dbtests/matchertests.cpp b/src/mongo/dbtests/matchertests.cpp
index 380b8b802d4..380b8b802d4 100644
--- a/dbtests/matchertests.cpp
+++ b/src/mongo/dbtests/matchertests.cpp
diff --git a/dbtests/mmaptests.cpp b/src/mongo/dbtests/mmaptests.cpp
index 7fb6eee98fc..7fb6eee98fc 100644
--- a/dbtests/mmaptests.cpp
+++ b/src/mongo/dbtests/mmaptests.cpp
diff --git a/dbtests/namespacetests.cpp b/src/mongo/dbtests/namespacetests.cpp
index 792baf2ccfa..792baf2ccfa 100644
--- a/dbtests/namespacetests.cpp
+++ b/src/mongo/dbtests/namespacetests.cpp
diff --git a/dbtests/pdfiletests.cpp b/src/mongo/dbtests/pdfiletests.cpp
index e07ccb42aa6..e07ccb42aa6 100644
--- a/dbtests/pdfiletests.cpp
+++ b/src/mongo/dbtests/pdfiletests.cpp
diff --git a/dbtests/perf/btreeperf.cpp b/src/mongo/dbtests/perf/btreeperf.cpp
index 7d68d8f5cc7..7d68d8f5cc7 100644
--- a/dbtests/perf/btreeperf.cpp
+++ b/src/mongo/dbtests/perf/btreeperf.cpp
diff --git a/dbtests/perf/perftest.cpp b/src/mongo/dbtests/perf/perftest.cpp
index b6219f7f5d9..b6219f7f5d9 100644
--- a/dbtests/perf/perftest.cpp
+++ b/src/mongo/dbtests/perf/perftest.cpp
diff --git a/dbtests/perftests.cpp b/src/mongo/dbtests/perftests.cpp
index 284e3991f15..284e3991f15 100644
--- a/dbtests/perftests.cpp
+++ b/src/mongo/dbtests/perftests.cpp
diff --git a/dbtests/queryoptimizercursortests.cpp b/src/mongo/dbtests/queryoptimizercursortests.cpp
index 2d5590db3b7..2d5590db3b7 100644
--- a/dbtests/queryoptimizercursortests.cpp
+++ b/src/mongo/dbtests/queryoptimizercursortests.cpp
diff --git a/dbtests/queryoptimizertests.cpp b/src/mongo/dbtests/queryoptimizertests.cpp
index 8da13578b45..8da13578b45 100644
--- a/dbtests/queryoptimizertests.cpp
+++ b/src/mongo/dbtests/queryoptimizertests.cpp
diff --git a/dbtests/querytests.cpp b/src/mongo/dbtests/querytests.cpp
index 9416ae20723..9416ae20723 100644
--- a/dbtests/querytests.cpp
+++ b/src/mongo/dbtests/querytests.cpp
diff --git a/dbtests/queryutiltests.cpp b/src/mongo/dbtests/queryutiltests.cpp
index e825b4f8a9b..e825b4f8a9b 100644
--- a/dbtests/queryutiltests.cpp
+++ b/src/mongo/dbtests/queryutiltests.cpp
diff --git a/dbtests/replsettests.cpp b/src/mongo/dbtests/replsettests.cpp
index c1fca3b1ad6..c1fca3b1ad6 100644
--- a/dbtests/replsettests.cpp
+++ b/src/mongo/dbtests/replsettests.cpp
diff --git a/dbtests/repltests.cpp b/src/mongo/dbtests/repltests.cpp
index 86288ad9426..86288ad9426 100644
--- a/dbtests/repltests.cpp
+++ b/src/mongo/dbtests/repltests.cpp
diff --git a/dbtests/sharding.cpp b/src/mongo/dbtests/sharding.cpp
index 19edd5537ab..19edd5537ab 100644
--- a/dbtests/sharding.cpp
+++ b/src/mongo/dbtests/sharding.cpp
diff --git a/dbtests/socktests.cpp b/src/mongo/dbtests/socktests.cpp
index 176db8c8e95..176db8c8e95 100644
--- a/dbtests/socktests.cpp
+++ b/src/mongo/dbtests/socktests.cpp
diff --git a/dbtests/spin_lock_test.cpp b/src/mongo/dbtests/spin_lock_test.cpp
index ed1f1ae1ca5..ed1f1ae1ca5 100644
--- a/dbtests/spin_lock_test.cpp
+++ b/src/mongo/dbtests/spin_lock_test.cpp
diff --git a/dbtests/test.sln b/src/mongo/dbtests/test.sln
index 3a1b741c716..3a1b741c716 100755
--- a/dbtests/test.sln
+++ b/src/mongo/dbtests/test.sln
diff --git a/dbtests/test.vcxproj b/src/mongo/dbtests/test.vcxproj
index c5d1aad61e9..c5d1aad61e9 100644
--- a/dbtests/test.vcxproj
+++ b/src/mongo/dbtests/test.vcxproj
diff --git a/dbtests/test.vcxproj.filters b/src/mongo/dbtests/test.vcxproj.filters
index a692d0ca692..a692d0ca692 100755
--- a/dbtests/test.vcxproj.filters
+++ b/src/mongo/dbtests/test.vcxproj.filters
diff --git a/dbtests/threadedtests.cpp b/src/mongo/dbtests/threadedtests.cpp
index 1304a276b7d..1304a276b7d 100644
--- a/dbtests/threadedtests.cpp
+++ b/src/mongo/dbtests/threadedtests.cpp
diff --git a/dbtests/updatetests.cpp b/src/mongo/dbtests/updatetests.cpp
index c912bf437d0..c912bf437d0 100644
--- a/dbtests/updatetests.cpp
+++ b/src/mongo/dbtests/updatetests.cpp
diff --git a/pch.cpp b/src/mongo/pch.cpp
index afa19a5be6b..afa19a5be6b 100644
--- a/pch.cpp
+++ b/src/mongo/pch.cpp
diff --git a/pch.h b/src/mongo/pch.h
index 162ff48cc69..162ff48cc69 100644
--- a/pch.h
+++ b/src/mongo/pch.h
diff --git a/s/balance.cpp b/src/mongo/s/balance.cpp
index e1c4b65ca0b..e1c4b65ca0b 100644
--- a/s/balance.cpp
+++ b/src/mongo/s/balance.cpp
diff --git a/s/balance.h b/src/mongo/s/balance.h
index 687599610db..687599610db 100644
--- a/s/balance.h
+++ b/src/mongo/s/balance.h
diff --git a/s/balancer_policy.cpp b/src/mongo/s/balancer_policy.cpp
index 03defa5678a..03defa5678a 100644
--- a/s/balancer_policy.cpp
+++ b/src/mongo/s/balancer_policy.cpp
diff --git a/s/balancer_policy.h b/src/mongo/s/balancer_policy.h
index cef5aa64afc..cef5aa64afc 100644
--- a/s/balancer_policy.h
+++ b/src/mongo/s/balancer_policy.h
diff --git a/s/chunk.cpp b/src/mongo/s/chunk.cpp
index e0e7edee9bd..e0e7edee9bd 100644
--- a/s/chunk.cpp
+++ b/src/mongo/s/chunk.cpp
diff --git a/s/chunk.h b/src/mongo/s/chunk.h
index 0f323514a76..0f323514a76 100644
--- a/s/chunk.h
+++ b/src/mongo/s/chunk.h
diff --git a/s/client.cpp b/src/mongo/s/client.cpp
index 36063347d85..36063347d85 100644
--- a/s/client.cpp
+++ b/src/mongo/s/client.cpp
diff --git a/s/client.h b/src/mongo/s/client.h
index 1237f66b88a..1237f66b88a 100644
--- a/s/client.h
+++ b/src/mongo/s/client.h
diff --git a/s/commands_admin.cpp b/src/mongo/s/commands_admin.cpp
index cbe306f47a8..cbe306f47a8 100644
--- a/s/commands_admin.cpp
+++ b/src/mongo/s/commands_admin.cpp
diff --git a/s/commands_public.cpp b/src/mongo/s/commands_public.cpp
index 375c4f6feec..375c4f6feec 100644
--- a/s/commands_public.cpp
+++ b/src/mongo/s/commands_public.cpp
diff --git a/s/config.cpp b/src/mongo/s/config.cpp
index b4923b56a1f..b4923b56a1f 100644
--- a/s/config.cpp
+++ b/src/mongo/s/config.cpp
diff --git a/s/config.h b/src/mongo/s/config.h
index 650371c4fa8..650371c4fa8 100644
--- a/s/config.h
+++ b/src/mongo/s/config.h
diff --git a/s/config_migrate.cpp b/src/mongo/s/config_migrate.cpp
index fff023cfb5b..fff023cfb5b 100644
--- a/s/config_migrate.cpp
+++ b/src/mongo/s/config_migrate.cpp
diff --git a/s/cursors.cpp b/src/mongo/s/cursors.cpp
index 241c2cfdb8d..241c2cfdb8d 100644
--- a/s/cursors.cpp
+++ b/src/mongo/s/cursors.cpp
diff --git a/s/cursors.h b/src/mongo/s/cursors.h
index 862f3731031..862f3731031 100644
--- a/s/cursors.h
+++ b/src/mongo/s/cursors.h
diff --git a/s/d_chunk_manager.cpp b/src/mongo/s/d_chunk_manager.cpp
index 82a06f61f2c..82a06f61f2c 100644
--- a/s/d_chunk_manager.cpp
+++ b/src/mongo/s/d_chunk_manager.cpp
diff --git a/s/d_chunk_manager.h b/src/mongo/s/d_chunk_manager.h
index fd5974e4953..fd5974e4953 100644
--- a/s/d_chunk_manager.h
+++ b/src/mongo/s/d_chunk_manager.h
diff --git a/s/d_logic.cpp b/src/mongo/s/d_logic.cpp
index 7350856e91a..7350856e91a 100644
--- a/s/d_logic.cpp
+++ b/src/mongo/s/d_logic.cpp
diff --git a/s/d_logic.h b/src/mongo/s/d_logic.h
index 6cbdfadf6af..6cbdfadf6af 100644
--- a/s/d_logic.h
+++ b/src/mongo/s/d_logic.h
diff --git a/s/d_migrate.cpp b/src/mongo/s/d_migrate.cpp
index 5e62661ec7e..5e62661ec7e 100644
--- a/s/d_migrate.cpp
+++ b/src/mongo/s/d_migrate.cpp
diff --git a/s/d_split.cpp b/src/mongo/s/d_split.cpp
index d0ba7b44c10..d0ba7b44c10 100644
--- a/s/d_split.cpp
+++ b/src/mongo/s/d_split.cpp
diff --git a/s/d_state.cpp b/src/mongo/s/d_state.cpp
index 39d84b6ff88..39d84b6ff88 100644
--- a/s/d_state.cpp
+++ b/src/mongo/s/d_state.cpp
diff --git a/s/d_writeback.cpp b/src/mongo/s/d_writeback.cpp
index 01c0c14ac0a..01c0c14ac0a 100644
--- a/s/d_writeback.cpp
+++ b/src/mongo/s/d_writeback.cpp
diff --git a/s/d_writeback.h b/src/mongo/s/d_writeback.h
index d3f36a14aca..d3f36a14aca 100644
--- a/s/d_writeback.h
+++ b/src/mongo/s/d_writeback.h
diff --git a/s/dbgrid.vcxproj b/src/mongo/s/dbgrid.vcxproj
index 93edc46211e..93edc46211e 100644
--- a/s/dbgrid.vcxproj
+++ b/src/mongo/s/dbgrid.vcxproj
diff --git a/s/dbgrid.vcxproj.filters b/src/mongo/s/dbgrid.vcxproj.filters
index 02b6e9972e9..02b6e9972e9 100755
--- a/s/dbgrid.vcxproj.filters
+++ b/src/mongo/s/dbgrid.vcxproj.filters
diff --git a/s/default_version.cpp b/src/mongo/s/default_version.cpp
index 82368672a2e..82368672a2e 100644
--- a/s/default_version.cpp
+++ b/src/mongo/s/default_version.cpp
diff --git a/s/grid.cpp b/src/mongo/s/grid.cpp
index 9d9c2e4555e..9d9c2e4555e 100644
--- a/s/grid.cpp
+++ b/src/mongo/s/grid.cpp
diff --git a/s/grid.h b/src/mongo/s/grid.h
index 9731ada518b..9731ada518b 100644
--- a/s/grid.h
+++ b/src/mongo/s/grid.h
diff --git a/s/mr_shard.cpp b/src/mongo/s/mr_shard.cpp
index 5bb83afedae..5bb83afedae 100644
--- a/s/mr_shard.cpp
+++ b/src/mongo/s/mr_shard.cpp
diff --git a/s/mr_shard.h b/src/mongo/s/mr_shard.h
index 7f96b54587f..7f96b54587f 100644
--- a/s/mr_shard.h
+++ b/src/mongo/s/mr_shard.h
diff --git a/s/request.cpp b/src/mongo/s/request.cpp
index 96cce96685d..96cce96685d 100644
--- a/s/request.cpp
+++ b/src/mongo/s/request.cpp
diff --git a/s/request.h b/src/mongo/s/request.h
index f41ae6f6a5d..f41ae6f6a5d 100644
--- a/s/request.h
+++ b/src/mongo/s/request.h
diff --git a/s/s_only.cpp b/src/mongo/s/s_only.cpp
index 05e652db57e..05e652db57e 100644
--- a/s/s_only.cpp
+++ b/src/mongo/s/s_only.cpp
diff --git a/s/security.cpp b/src/mongo/s/security.cpp
index a88c36b1d20..a88c36b1d20 100644
--- a/s/security.cpp
+++ b/src/mongo/s/security.cpp
diff --git a/s/server.cpp b/src/mongo/s/server.cpp
index 63b3c368ab6..63b3c368ab6 100644
--- a/s/server.cpp
+++ b/src/mongo/s/server.cpp
diff --git a/s/server.h b/src/mongo/s/server.h
index 18e91e266fd..18e91e266fd 100644
--- a/s/server.h
+++ b/src/mongo/s/server.h
diff --git a/s/shard.cpp b/src/mongo/s/shard.cpp
index 81b41c7fcbc..81b41c7fcbc 100644
--- a/s/shard.cpp
+++ b/src/mongo/s/shard.cpp
diff --git a/s/shard.h b/src/mongo/s/shard.h
index 6b52c58a932..6b52c58a932 100644
--- a/s/shard.h
+++ b/src/mongo/s/shard.h
diff --git a/s/shard_version.cpp b/src/mongo/s/shard_version.cpp
index a80b339d858..a80b339d858 100644
--- a/s/shard_version.cpp
+++ b/src/mongo/s/shard_version.cpp
diff --git a/s/shard_version.h b/src/mongo/s/shard_version.h
index 98cacf67af2..98cacf67af2 100644
--- a/s/shard_version.h
+++ b/src/mongo/s/shard_version.h
diff --git a/s/shardconnection.cpp b/src/mongo/s/shardconnection.cpp
index 5db8a67b736..5db8a67b736 100644
--- a/s/shardconnection.cpp
+++ b/src/mongo/s/shardconnection.cpp
diff --git a/s/shardkey.cpp b/src/mongo/s/shardkey.cpp
index 365435ef5ea..365435ef5ea 100644
--- a/s/shardkey.cpp
+++ b/src/mongo/s/shardkey.cpp
diff --git a/s/shardkey.h b/src/mongo/s/shardkey.h
index 976cff09591..976cff09591 100644
--- a/s/shardkey.h
+++ b/src/mongo/s/shardkey.h
diff --git a/s/stats.cpp b/src/mongo/s/stats.cpp
index 460ada3ccd6..460ada3ccd6 100644
--- a/s/stats.cpp
+++ b/src/mongo/s/stats.cpp
diff --git a/s/stats.h b/src/mongo/s/stats.h
index a7cc784e981..a7cc784e981 100644
--- a/s/stats.h
+++ b/src/mongo/s/stats.h
diff --git a/s/strategy.cpp b/src/mongo/s/strategy.cpp
index 6f02c4183b1..6f02c4183b1 100644
--- a/s/strategy.cpp
+++ b/src/mongo/s/strategy.cpp
diff --git a/s/strategy.h b/src/mongo/s/strategy.h
index 25c9b97630e..25c9b97630e 100644
--- a/s/strategy.h
+++ b/src/mongo/s/strategy.h
diff --git a/s/strategy_shard.cpp b/src/mongo/s/strategy_shard.cpp
index 3f4c105204a..3f4c105204a 100644
--- a/s/strategy_shard.cpp
+++ b/src/mongo/s/strategy_shard.cpp
diff --git a/s/strategy_single.cpp b/src/mongo/s/strategy_single.cpp
index d3cd958b6b1..d3cd958b6b1 100644
--- a/s/strategy_single.cpp
+++ b/src/mongo/s/strategy_single.cpp
diff --git a/s/util.h b/src/mongo/s/util.h
index cce2131ca55..cce2131ca55 100644
--- a/s/util.h
+++ b/src/mongo/s/util.h
diff --git a/s/writeback_listener.cpp b/src/mongo/s/writeback_listener.cpp
index ebdefb05785..ebdefb05785 100644
--- a/s/writeback_listener.cpp
+++ b/src/mongo/s/writeback_listener.cpp
diff --git a/s/writeback_listener.h b/src/mongo/s/writeback_listener.h
index 1ef33dab1ec..1ef33dab1ec 100644
--- a/s/writeback_listener.h
+++ b/src/mongo/s/writeback_listener.h
diff --git a/scripting/bench.cpp b/src/mongo/scripting/bench.cpp
index 01291b1e1f0..01291b1e1f0 100644
--- a/scripting/bench.cpp
+++ b/src/mongo/scripting/bench.cpp
diff --git a/scripting/engine.cpp b/src/mongo/scripting/engine.cpp
index 13fe681ebe5..13fe681ebe5 100644
--- a/scripting/engine.cpp
+++ b/src/mongo/scripting/engine.cpp
diff --git a/scripting/engine.h b/src/mongo/scripting/engine.h
index f4b39740001..f4b39740001 100644
--- a/scripting/engine.h
+++ b/src/mongo/scripting/engine.h
diff --git a/scripting/engine_java.cpp b/src/mongo/scripting/engine_java.cpp
index 57388166e98..57388166e98 100644
--- a/scripting/engine_java.cpp
+++ b/src/mongo/scripting/engine_java.cpp
diff --git a/scripting/engine_java.h b/src/mongo/scripting/engine_java.h
index b8245ba6f22..b8245ba6f22 100644
--- a/scripting/engine_java.h
+++ b/src/mongo/scripting/engine_java.h
diff --git a/scripting/engine_none.cpp b/src/mongo/scripting/engine_none.cpp
index d13dbecc06e..d13dbecc06e 100644
--- a/scripting/engine_none.cpp
+++ b/src/mongo/scripting/engine_none.cpp
diff --git a/scripting/engine_spidermonkey.cpp b/src/mongo/scripting/engine_spidermonkey.cpp
index 70b89cddbb5..70b89cddbb5 100644
--- a/scripting/engine_spidermonkey.cpp
+++ b/src/mongo/scripting/engine_spidermonkey.cpp
diff --git a/scripting/engine_spidermonkey.h b/src/mongo/scripting/engine_spidermonkey.h
index 9fd430d853d..9fd430d853d 100644
--- a/scripting/engine_spidermonkey.h
+++ b/src/mongo/scripting/engine_spidermonkey.h
diff --git a/scripting/engine_v8.cpp b/src/mongo/scripting/engine_v8.cpp
index 53539c2f75c..53539c2f75c 100644
--- a/scripting/engine_v8.cpp
+++ b/src/mongo/scripting/engine_v8.cpp
diff --git a/scripting/engine_v8.h b/src/mongo/scripting/engine_v8.h
index 48a9858c63b..48a9858c63b 100644
--- a/scripting/engine_v8.h
+++ b/src/mongo/scripting/engine_v8.h
diff --git a/scripting/sm_db.cpp b/src/mongo/scripting/sm_db.cpp
index ea8780fa7c0..ea8780fa7c0 100644
--- a/scripting/sm_db.cpp
+++ b/src/mongo/scripting/sm_db.cpp
diff --git a/scripting/utils.cpp b/src/mongo/scripting/utils.cpp
index 612b173fdf8..612b173fdf8 100644
--- a/scripting/utils.cpp
+++ b/src/mongo/scripting/utils.cpp
diff --git a/scripting/v8_db.cpp b/src/mongo/scripting/v8_db.cpp
index de419b368d9..de419b368d9 100644
--- a/scripting/v8_db.cpp
+++ b/src/mongo/scripting/v8_db.cpp
diff --git a/scripting/v8_db.h b/src/mongo/scripting/v8_db.h
index 68946e0ed06..68946e0ed06 100644
--- a/scripting/v8_db.h
+++ b/src/mongo/scripting/v8_db.h
diff --git a/scripting/v8_utils.cpp b/src/mongo/scripting/v8_utils.cpp
index 9e7e8072220..9e7e8072220 100644
--- a/scripting/v8_utils.cpp
+++ b/src/mongo/scripting/v8_utils.cpp
diff --git a/scripting/v8_utils.h b/src/mongo/scripting/v8_utils.h
index ca5d317885f..ca5d317885f 100644
--- a/scripting/v8_utils.h
+++ b/src/mongo/scripting/v8_utils.h
diff --git a/scripting/v8_wrapper.cpp b/src/mongo/scripting/v8_wrapper.cpp
index 7c28a39cceb..7c28a39cceb 100644
--- a/scripting/v8_wrapper.cpp
+++ b/src/mongo/scripting/v8_wrapper.cpp
diff --git a/scripting/v8_wrapper.h b/src/mongo/scripting/v8_wrapper.h
index 22f14e6ae94..22f14e6ae94 100644
--- a/scripting/v8_wrapper.h
+++ b/src/mongo/scripting/v8_wrapper.h
diff --git a/server.h b/src/mongo/server.h
index d9a711ef780..d9a711ef780 100644
--- a/server.h
+++ b/src/mongo/server.h
diff --git a/shell/collection.js b/src/mongo/shell/collection.js
index df3fa516f86..df3fa516f86 100644
--- a/shell/collection.js
+++ b/src/mongo/shell/collection.js
diff --git a/shell/db.js b/src/mongo/shell/db.js
index 6414e0351e7..6414e0351e7 100644
--- a/shell/db.js
+++ b/src/mongo/shell/db.js
diff --git a/shell/dbshell.cpp b/src/mongo/shell/dbshell.cpp
index 998301d1ee6..998301d1ee6 100644
--- a/shell/dbshell.cpp
+++ b/src/mongo/shell/dbshell.cpp
diff --git a/shell/mongo.js b/src/mongo/shell/mongo.js
index 5e18f38fb63..5e18f38fb63 100644
--- a/shell/mongo.js
+++ b/src/mongo/shell/mongo.js
diff --git a/shell/mr.js b/src/mongo/shell/mr.js
index 7b0814dd557..7b0814dd557 100644
--- a/shell/mr.js
+++ b/src/mongo/shell/mr.js
diff --git a/shell/msvc/createCPPfromJavaScriptFiles.js b/src/mongo/shell/msvc/createCPPfromJavaScriptFiles.js
index ff6f2a54b12..ff6f2a54b12 100644
--- a/shell/msvc/createCPPfromJavaScriptFiles.js
+++ b/src/mongo/shell/msvc/createCPPfromJavaScriptFiles.js
diff --git a/shell/msvc/mongo.ico b/src/mongo/shell/msvc/mongo.ico
index 1eba9ed5131..1eba9ed5131 100755
--- a/shell/msvc/mongo.ico
+++ b/src/mongo/shell/msvc/mongo.ico
diff --git a/shell/msvc/mongo.sln b/src/mongo/shell/msvc/mongo.sln
index 01c9e1e6e40..01c9e1e6e40 100644
--- a/shell/msvc/mongo.sln
+++ b/src/mongo/shell/msvc/mongo.sln
diff --git a/shell/msvc/mongo.vcxproj b/src/mongo/shell/msvc/mongo.vcxproj
index 968215d5b8d..968215d5b8d 100644
--- a/shell/msvc/mongo.vcxproj
+++ b/src/mongo/shell/msvc/mongo.vcxproj
diff --git a/shell/msvc/mongo.vcxproj.filters b/src/mongo/shell/msvc/mongo.vcxproj.filters
index dcf9bcd7550..dcf9bcd7550 100644
--- a/shell/msvc/mongo.vcxproj.filters
+++ b/src/mongo/shell/msvc/mongo.vcxproj.filters
diff --git a/shell/query.js b/src/mongo/shell/query.js
index 51b9fd8e6a1..51b9fd8e6a1 100644
--- a/shell/query.js
+++ b/src/mongo/shell/query.js
diff --git a/shell/servers.js b/src/mongo/shell/servers.js
index 6b12918db2e..6b12918db2e 100755
--- a/shell/servers.js
+++ b/src/mongo/shell/servers.js
diff --git a/shell/shell_utils.cpp b/src/mongo/shell/shell_utils.cpp
index f3283ab0ca1..f3283ab0ca1 100644
--- a/shell/shell_utils.cpp
+++ b/src/mongo/shell/shell_utils.cpp
diff --git a/shell/utils.h b/src/mongo/shell/utils.h
index 433fe7b7d25..433fe7b7d25 100644
--- a/shell/utils.h
+++ b/src/mongo/shell/utils.h
diff --git a/shell/utils.js b/src/mongo/shell/utils.js
index adc763e3893..adc763e3893 100644
--- a/shell/utils.js
+++ b/src/mongo/shell/utils.js
diff --git a/shell/utils_sh.js b/src/mongo/shell/utils_sh.js
index 5c7fbafa75d..5c7fbafa75d 100644
--- a/shell/utils_sh.js
+++ b/src/mongo/shell/utils_sh.js
diff --git a/targetver.h b/src/mongo/targetver.h
index eb1b69bceba..eb1b69bceba 100644
--- a/targetver.h
+++ b/src/mongo/targetver.h
diff --git a/tools/bridge.cpp b/src/mongo/tools/bridge.cpp
index 341a1dae687..341a1dae687 100644
--- a/tools/bridge.cpp
+++ b/src/mongo/tools/bridge.cpp
diff --git a/tools/bsondump.cpp b/src/mongo/tools/bsondump.cpp
index 3825c071cd6..3825c071cd6 100644
--- a/tools/bsondump.cpp
+++ b/src/mongo/tools/bsondump.cpp
diff --git a/tools/dump.cpp b/src/mongo/tools/dump.cpp
index b6e0d2912e5..b6e0d2912e5 100644
--- a/tools/dump.cpp
+++ b/src/mongo/tools/dump.cpp
diff --git a/tools/export.cpp b/src/mongo/tools/export.cpp
index 0d9f0225da0..0d9f0225da0 100644
--- a/tools/export.cpp
+++ b/src/mongo/tools/export.cpp
diff --git a/tools/files.cpp b/src/mongo/tools/files.cpp
index 06660361485..06660361485 100644
--- a/tools/files.cpp
+++ b/src/mongo/tools/files.cpp
diff --git a/tools/import.cpp b/src/mongo/tools/import.cpp
index 24741ed46ad..24741ed46ad 100644
--- a/tools/import.cpp
+++ b/src/mongo/tools/import.cpp
diff --git a/tools/oplog.cpp b/src/mongo/tools/oplog.cpp
index 1c09f37064f..1c09f37064f 100644
--- a/tools/oplog.cpp
+++ b/src/mongo/tools/oplog.cpp
diff --git a/tools/restore.cpp b/src/mongo/tools/restore.cpp
index 85e91ce6485..85e91ce6485 100644
--- a/tools/restore.cpp
+++ b/src/mongo/tools/restore.cpp
diff --git a/tools/sniffer.cpp b/src/mongo/tools/sniffer.cpp
index aeab808cfed..aeab808cfed 100644
--- a/tools/sniffer.cpp
+++ b/src/mongo/tools/sniffer.cpp
diff --git a/tools/stat.cpp b/src/mongo/tools/stat.cpp
index f5c506308e2..f5c506308e2 100644
--- a/tools/stat.cpp
+++ b/src/mongo/tools/stat.cpp
diff --git a/tools/stat_util.cpp b/src/mongo/tools/stat_util.cpp
index 38f780e8734..38f780e8734 100644
--- a/tools/stat_util.cpp
+++ b/src/mongo/tools/stat_util.cpp
diff --git a/tools/stat_util.h b/src/mongo/tools/stat_util.h
index 4990e91624c..4990e91624c 100644
--- a/tools/stat_util.h
+++ b/src/mongo/tools/stat_util.h
diff --git a/tools/tool.cpp b/src/mongo/tools/tool.cpp
index dc08625a545..dc08625a545 100644
--- a/tools/tool.cpp
+++ b/src/mongo/tools/tool.cpp
diff --git a/tools/tool.h b/src/mongo/tools/tool.h
index e40109362c5..e40109362c5 100644
--- a/tools/tool.h
+++ b/src/mongo/tools/tool.h
diff --git a/tools/top.cpp b/src/mongo/tools/top.cpp
index 6479bb2bd7a..6479bb2bd7a 100644
--- a/tools/top.cpp
+++ b/src/mongo/tools/top.cpp
diff --git a/util/admin_access.h b/src/mongo/util/admin_access.h
index bb882b2b4c5..bb882b2b4c5 100644
--- a/util/admin_access.h
+++ b/src/mongo/util/admin_access.h
diff --git a/util/alignedbuilder.cpp b/src/mongo/util/alignedbuilder.cpp
index b2e0461b733..b2e0461b733 100644
--- a/util/alignedbuilder.cpp
+++ b/src/mongo/util/alignedbuilder.cpp
diff --git a/util/alignedbuilder.h b/src/mongo/util/alignedbuilder.h
index 1d246a9d78e..1d246a9d78e 100644
--- a/util/alignedbuilder.h
+++ b/src/mongo/util/alignedbuilder.h
diff --git a/util/allocator.h b/src/mongo/util/allocator.h
index a642e7cab56..a642e7cab56 100644
--- a/util/allocator.h
+++ b/src/mongo/util/allocator.h
diff --git a/util/array.h b/src/mongo/util/array.h
index 12822252fd7..12822252fd7 100644
--- a/util/array.h
+++ b/src/mongo/util/array.h
diff --git a/util/assert_util.cpp b/src/mongo/util/assert_util.cpp
index 2199cb1ce11..2199cb1ce11 100644
--- a/util/assert_util.cpp
+++ b/src/mongo/util/assert_util.cpp
diff --git a/util/assert_util.h b/src/mongo/util/assert_util.h
index 2e6b2a9732a..2e6b2a9732a 100644
--- a/util/assert_util.h
+++ b/src/mongo/util/assert_util.h
diff --git a/util/background.cpp b/src/mongo/util/background.cpp
index ef3ee9426b9..ef3ee9426b9 100644
--- a/util/background.cpp
+++ b/src/mongo/util/background.cpp
diff --git a/util/background.h b/src/mongo/util/background.h
index 496a1f44f88..496a1f44f88 100644
--- a/util/background.h
+++ b/src/mongo/util/background.h
diff --git a/util/base64.cpp b/src/mongo/util/base64.cpp
index aff06e26126..aff06e26126 100644
--- a/util/base64.cpp
+++ b/src/mongo/util/base64.cpp
diff --git a/util/base64.h b/src/mongo/util/base64.h
index 505b5d78cca..505b5d78cca 100644
--- a/util/base64.h
+++ b/src/mongo/util/base64.h
diff --git a/util/bson_util.h b/src/mongo/util/bson_util.h
index 973e31f1af1..973e31f1af1 100644
--- a/util/bson_util.h
+++ b/src/mongo/util/bson_util.h
diff --git a/util/bufreader.h b/src/mongo/util/bufreader.h
index 53f0ba744e2..53f0ba744e2 100644
--- a/util/bufreader.h
+++ b/src/mongo/util/bufreader.h
diff --git a/util/checksum.h b/src/mongo/util/checksum.h
index 009ab56fbeb..009ab56fbeb 100644
--- a/util/checksum.h
+++ b/src/mongo/util/checksum.h
diff --git a/util/compress.cpp b/src/mongo/util/compress.cpp
index bcde488b88b..bcde488b88b 100644
--- a/util/compress.cpp
+++ b/src/mongo/util/compress.cpp
diff --git a/util/compress.h b/src/mongo/util/compress.h
index 5bc5a3392bb..5bc5a3392bb 100644
--- a/util/compress.h
+++ b/src/mongo/util/compress.h
diff --git a/util/concurrency/README b/src/mongo/util/concurrency/README
index 1a19264f4b6..1a19264f4b6 100644
--- a/util/concurrency/README
+++ b/src/mongo/util/concurrency/README
diff --git a/util/concurrency/list.h b/src/mongo/util/concurrency/list.h
index 61bdd55f46f..61bdd55f46f 100644
--- a/util/concurrency/list.h
+++ b/src/mongo/util/concurrency/list.h
diff --git a/util/concurrency/msg.h b/src/mongo/util/concurrency/msg.h
index 0b9a7c5048c..0b9a7c5048c 100644
--- a/util/concurrency/msg.h
+++ b/src/mongo/util/concurrency/msg.h
diff --git a/util/concurrency/mutex.h b/src/mongo/util/concurrency/mutex.h
index 429f280b1cb..429f280b1cb 100644
--- a/util/concurrency/mutex.h
+++ b/src/mongo/util/concurrency/mutex.h
diff --git a/util/concurrency/mutexdebugger.h b/src/mongo/util/concurrency/mutexdebugger.h
index 7dc57f29e98..7dc57f29e98 100644
--- a/util/concurrency/mutexdebugger.h
+++ b/src/mongo/util/concurrency/mutexdebugger.h
diff --git a/util/concurrency/mvar.h b/src/mongo/util/concurrency/mvar.h
index bc1855a85cc..bc1855a85cc 100644
--- a/util/concurrency/mvar.h
+++ b/src/mongo/util/concurrency/mvar.h
diff --git a/util/concurrency/race.h b/src/mongo/util/concurrency/race.h
index 837ae23ac13..837ae23ac13 100644
--- a/util/concurrency/race.h
+++ b/src/mongo/util/concurrency/race.h
diff --git a/util/concurrency/rwlock.h b/src/mongo/util/concurrency/rwlock.h
index 3dbfc35ed6e..3dbfc35ed6e 100644
--- a/util/concurrency/rwlock.h
+++ b/src/mongo/util/concurrency/rwlock.h
diff --git a/util/concurrency/rwlockimpl.h b/src/mongo/util/concurrency/rwlockimpl.h
index 4e07231447b..4e07231447b 100644
--- a/util/concurrency/rwlockimpl.h
+++ b/src/mongo/util/concurrency/rwlockimpl.h
diff --git a/util/concurrency/shared_mutex_win.hpp b/src/mongo/util/concurrency/shared_mutex_win.hpp
index e850fc6bab4..e850fc6bab4 100644
--- a/util/concurrency/shared_mutex_win.hpp
+++ b/src/mongo/util/concurrency/shared_mutex_win.hpp
diff --git a/util/concurrency/spin_lock.cpp b/src/mongo/util/concurrency/spin_lock.cpp
index cbf517b2746..cbf517b2746 100644
--- a/util/concurrency/spin_lock.cpp
+++ b/src/mongo/util/concurrency/spin_lock.cpp
diff --git a/util/concurrency/spin_lock.h b/src/mongo/util/concurrency/spin_lock.h
index d90de51afac..d90de51afac 100644
--- a/util/concurrency/spin_lock.h
+++ b/src/mongo/util/concurrency/spin_lock.h
diff --git a/util/concurrency/synchronization.cpp b/src/mongo/util/concurrency/synchronization.cpp
index 4186745dc16..4186745dc16 100644
--- a/util/concurrency/synchronization.cpp
+++ b/src/mongo/util/concurrency/synchronization.cpp
diff --git a/util/concurrency/synchronization.h b/src/mongo/util/concurrency/synchronization.h
index f9a40cc3ab9..f9a40cc3ab9 100644
--- a/util/concurrency/synchronization.h
+++ b/src/mongo/util/concurrency/synchronization.h
diff --git a/util/concurrency/task.cpp b/src/mongo/util/concurrency/task.cpp
index 0b6ab166f19..0b6ab166f19 100644
--- a/util/concurrency/task.cpp
+++ b/src/mongo/util/concurrency/task.cpp
diff --git a/util/concurrency/task.h b/src/mongo/util/concurrency/task.h
index d7b45eeef24..d7b45eeef24 100644
--- a/util/concurrency/task.h
+++ b/src/mongo/util/concurrency/task.h
diff --git a/util/concurrency/thread_pool.cpp b/src/mongo/util/concurrency/thread_pool.cpp
index 1c258847cb5..1c258847cb5 100644
--- a/util/concurrency/thread_pool.cpp
+++ b/src/mongo/util/concurrency/thread_pool.cpp
diff --git a/util/concurrency/thread_pool.h b/src/mongo/util/concurrency/thread_pool.h
index b348ed1d01b..b348ed1d01b 100644
--- a/util/concurrency/thread_pool.h
+++ b/src/mongo/util/concurrency/thread_pool.h
diff --git a/util/concurrency/threadlocal.h b/src/mongo/util/concurrency/threadlocal.h
index 57a4f799dfa..57a4f799dfa 100644
--- a/util/concurrency/threadlocal.h
+++ b/src/mongo/util/concurrency/threadlocal.h
diff --git a/util/concurrency/value.h b/src/mongo/util/concurrency/value.h
index fdd0d9bbb42..fdd0d9bbb42 100644
--- a/util/concurrency/value.h
+++ b/src/mongo/util/concurrency/value.h
diff --git a/util/concurrency/vars.cpp b/src/mongo/util/concurrency/vars.cpp
index 0b2fc960c04..0b2fc960c04 100644
--- a/util/concurrency/vars.cpp
+++ b/src/mongo/util/concurrency/vars.cpp
diff --git a/util/debug_util.cpp b/src/mongo/util/debug_util.cpp
index 8ba6534ef7c..8ba6534ef7c 100644
--- a/util/debug_util.cpp
+++ b/src/mongo/util/debug_util.cpp
diff --git a/util/debug_util.h b/src/mongo/util/debug_util.h
index abed8d94924..abed8d94924 100644
--- a/util/debug_util.h
+++ b/src/mongo/util/debug_util.h
diff --git a/util/embedded_builder.h b/src/mongo/util/embedded_builder.h
index abf518e2583..abf518e2583 100644
--- a/util/embedded_builder.h
+++ b/src/mongo/util/embedded_builder.h
diff --git a/util/file.h b/src/mongo/util/file.h
index 368e6927b43..368e6927b43 100644
--- a/util/file.h
+++ b/src/mongo/util/file.h
diff --git a/util/file_allocator.cpp b/src/mongo/util/file_allocator.cpp
index b0572f971bd..b0572f971bd 100644
--- a/util/file_allocator.cpp
+++ b/src/mongo/util/file_allocator.cpp
diff --git a/util/file_allocator.h b/src/mongo/util/file_allocator.h
index 7c3cacb2888..7c3cacb2888 100644
--- a/util/file_allocator.h
+++ b/src/mongo/util/file_allocator.h
diff --git a/util/goodies.h b/src/mongo/util/goodies.h
index 9398b5c3f1d..9398b5c3f1d 100644
--- a/util/goodies.h
+++ b/src/mongo/util/goodies.h
diff --git a/util/hashtab.h b/src/mongo/util/hashtab.h
index f1a33068e07..f1a33068e07 100644
--- a/util/hashtab.h
+++ b/src/mongo/util/hashtab.h
diff --git a/util/heapcheck.h b/src/mongo/util/heapcheck.h
index 95da9538db5..95da9538db5 100644
--- a/util/heapcheck.h
+++ b/src/mongo/util/heapcheck.h
diff --git a/util/hex.h b/src/mongo/util/hex.h
index 8cf30f2d9d3..8cf30f2d9d3 100644
--- a/util/hex.h
+++ b/src/mongo/util/hex.h
diff --git a/util/histogram.cpp b/src/mongo/util/histogram.cpp
index 17a85059d58..17a85059d58 100644
--- a/util/histogram.cpp
+++ b/src/mongo/util/histogram.cpp
diff --git a/util/histogram.h b/src/mongo/util/histogram.h
index 40ec5628dda..40ec5628dda 100644
--- a/util/histogram.h
+++ b/src/mongo/util/histogram.h
diff --git a/util/intrusive_counter.cpp b/src/mongo/util/intrusive_counter.cpp
index fc01f40b41a..fc01f40b41a 100755
--- a/util/intrusive_counter.cpp
+++ b/src/mongo/util/intrusive_counter.cpp
diff --git a/util/intrusive_counter.h b/src/mongo/util/intrusive_counter.h
index bcebb6288cf..bcebb6288cf 100755
--- a/util/intrusive_counter.h
+++ b/src/mongo/util/intrusive_counter.h
diff --git a/util/log.cpp b/src/mongo/util/log.cpp
index aa249597b57..aa249597b57 100644
--- a/util/log.cpp
+++ b/src/mongo/util/log.cpp
diff --git a/util/log.h b/src/mongo/util/log.h
index a393d4d29a5..a393d4d29a5 100644
--- a/util/log.h
+++ b/src/mongo/util/log.h
diff --git a/util/logfile.cpp b/src/mongo/util/logfile.cpp
index 7c362be08d1..7c362be08d1 100644
--- a/util/logfile.cpp
+++ b/src/mongo/util/logfile.cpp
diff --git a/util/logfile.h b/src/mongo/util/logfile.h
index e41ecc2f6ec..e41ecc2f6ec 100644
--- a/util/logfile.h
+++ b/src/mongo/util/logfile.h
diff --git a/util/lruishmap.h b/src/mongo/util/lruishmap.h
index ba91bf6f0f6..ba91bf6f0f6 100644
--- a/util/lruishmap.h
+++ b/src/mongo/util/lruishmap.h
diff --git a/util/md5.c b/src/mongo/util/md5.c
index c35d96c5ef5..c35d96c5ef5 100644
--- a/util/md5.c
+++ b/src/mongo/util/md5.c
diff --git a/util/md5.h b/src/mongo/util/md5.h
index a3f3b6db0e2..a3f3b6db0e2 100644
--- a/util/md5.h
+++ b/src/mongo/util/md5.h
diff --git a/util/md5.hpp b/src/mongo/util/md5.hpp
index dc061719747..dc061719747 100644
--- a/util/md5.hpp
+++ b/src/mongo/util/md5.hpp
diff --git a/util/md5main.cpp b/src/mongo/util/md5main.cpp
index 9995fee8fa7..9995fee8fa7 100644
--- a/util/md5main.cpp
+++ b/src/mongo/util/md5main.cpp
diff --git a/util/mmap.cpp b/src/mongo/util/mmap.cpp
index 1eb0242e657..1eb0242e657 100755
--- a/util/mmap.cpp
+++ b/src/mongo/util/mmap.cpp
diff --git a/util/mmap.h b/src/mongo/util/mmap.h
index 2d4454bbc7f..2d4454bbc7f 100644
--- a/util/mmap.h
+++ b/src/mongo/util/mmap.h
diff --git a/util/mmap_mm.cpp b/src/mongo/util/mmap_mm.cpp
index ec2400e02d3..ec2400e02d3 100644
--- a/util/mmap_mm.cpp
+++ b/src/mongo/util/mmap_mm.cpp
diff --git a/util/mmap_posix.cpp b/src/mongo/util/mmap_posix.cpp
index 8097ef1b370..8097ef1b370 100644
--- a/util/mmap_posix.cpp
+++ b/src/mongo/util/mmap_posix.cpp
diff --git a/util/mmap_win.cpp b/src/mongo/util/mmap_win.cpp
index 26115d096c1..26115d096c1 100644
--- a/util/mmap_win.cpp
+++ b/src/mongo/util/mmap_win.cpp
diff --git a/util/mongoutils/README b/src/mongo/util/mongoutils/README
index f61277c7409..f61277c7409 100755
--- a/util/mongoutils/README
+++ b/src/mongo/util/mongoutils/README
diff --git a/util/mongoutils/checksum.h b/src/mongo/util/mongoutils/checksum.h
index ea3d05131ce..ea3d05131ce 100644
--- a/util/mongoutils/checksum.h
+++ b/src/mongo/util/mongoutils/checksum.h
diff --git a/util/mongoutils/hash.h b/src/mongo/util/mongoutils/hash.h
index 49f30b3242a..49f30b3242a 100644
--- a/util/mongoutils/hash.h
+++ b/src/mongo/util/mongoutils/hash.h
diff --git a/util/mongoutils/html.h b/src/mongo/util/mongoutils/html.h
index f79e6ca514f..f79e6ca514f 100644
--- a/util/mongoutils/html.h
+++ b/src/mongo/util/mongoutils/html.h
diff --git a/util/mongoutils/mongoutils.vcxproj b/src/mongo/util/mongoutils/mongoutils.vcxproj
index f6ec0935ca9..f6ec0935ca9 100755
--- a/util/mongoutils/mongoutils.vcxproj
+++ b/src/mongo/util/mongoutils/mongoutils.vcxproj
diff --git a/util/mongoutils/mongoutils.vcxproj.filters b/src/mongo/util/mongoutils/mongoutils.vcxproj.filters
index 84ecbffede0..84ecbffede0 100755
--- a/util/mongoutils/mongoutils.vcxproj.filters
+++ b/src/mongo/util/mongoutils/mongoutils.vcxproj.filters
diff --git a/util/mongoutils/str.h b/src/mongo/util/mongoutils/str.h
index 97b121b0068..97b121b0068 100644
--- a/util/mongoutils/str.h
+++ b/src/mongo/util/mongoutils/str.h
diff --git a/util/mongoutils/test.cpp b/src/mongo/util/mongoutils/test.cpp
index 45268c5ca49..45268c5ca49 100644
--- a/util/mongoutils/test.cpp
+++ b/src/mongo/util/mongoutils/test.cpp
diff --git a/util/moveablebuffer.h b/src/mongo/util/moveablebuffer.h
index e01f2d8d9a4..e01f2d8d9a4 100644
--- a/util/moveablebuffer.h
+++ b/src/mongo/util/moveablebuffer.h
diff --git a/util/net/hostandport.h b/src/mongo/util/net/hostandport.h
index 3f4a64b79a9..3f4a64b79a9 100644
--- a/util/net/hostandport.h
+++ b/src/mongo/util/net/hostandport.h
diff --git a/util/net/httpclient.cpp b/src/mongo/util/net/httpclient.cpp
index 16eaa0ae80a..16eaa0ae80a 100644
--- a/util/net/httpclient.cpp
+++ b/src/mongo/util/net/httpclient.cpp
diff --git a/util/net/httpclient.h b/src/mongo/util/net/httpclient.h
index 126969f4f70..126969f4f70 100644
--- a/util/net/httpclient.h
+++ b/src/mongo/util/net/httpclient.h
diff --git a/util/net/listen.cpp b/src/mongo/util/net/listen.cpp
index ec3e4fa0ee8..ec3e4fa0ee8 100644
--- a/util/net/listen.cpp
+++ b/src/mongo/util/net/listen.cpp
diff --git a/util/net/listen.h b/src/mongo/util/net/listen.h
index ca90e835b97..ca90e835b97 100644
--- a/util/net/listen.h
+++ b/src/mongo/util/net/listen.h
diff --git a/util/net/message.cpp b/src/mongo/util/net/message.cpp
index a84e5c48c5c..a84e5c48c5c 100644
--- a/util/net/message.cpp
+++ b/src/mongo/util/net/message.cpp
diff --git a/util/net/message.h b/src/mongo/util/net/message.h
index 14b0241f21d..14b0241f21d 100644
--- a/util/net/message.h
+++ b/src/mongo/util/net/message.h
diff --git a/util/net/message_port.cpp b/src/mongo/util/net/message_port.cpp
index c342ed3c8b7..c342ed3c8b7 100644
--- a/util/net/message_port.cpp
+++ b/src/mongo/util/net/message_port.cpp
diff --git a/util/net/message_port.h b/src/mongo/util/net/message_port.h
index 5d404d84f8a..5d404d84f8a 100644
--- a/util/net/message_port.h
+++ b/src/mongo/util/net/message_port.h
diff --git a/util/net/message_server.h b/src/mongo/util/net/message_server.h
index ae77b97bb0f..ae77b97bb0f 100644
--- a/util/net/message_server.h
+++ b/src/mongo/util/net/message_server.h
diff --git a/util/net/message_server_asio.cpp b/src/mongo/util/net/message_server_asio.cpp
index 0c6a7d925da..0c6a7d925da 100644
--- a/util/net/message_server_asio.cpp
+++ b/src/mongo/util/net/message_server_asio.cpp
diff --git a/util/net/message_server_port.cpp b/src/mongo/util/net/message_server_port.cpp
index 7e6a731529b..7e6a731529b 100644
--- a/util/net/message_server_port.cpp
+++ b/src/mongo/util/net/message_server_port.cpp
diff --git a/util/net/miniwebserver.cpp b/src/mongo/util/net/miniwebserver.cpp
index f0b58569d22..f0b58569d22 100644
--- a/util/net/miniwebserver.cpp
+++ b/src/mongo/util/net/miniwebserver.cpp
diff --git a/util/net/miniwebserver.h b/src/mongo/util/net/miniwebserver.h
index 1fb6b3f2e65..1fb6b3f2e65 100644
--- a/util/net/miniwebserver.h
+++ b/src/mongo/util/net/miniwebserver.h
diff --git a/util/net/sock.cpp b/src/mongo/util/net/sock.cpp
index bd08e6c64b9..bd08e6c64b9 100644
--- a/util/net/sock.cpp
+++ b/src/mongo/util/net/sock.cpp
diff --git a/util/net/sock.h b/src/mongo/util/net/sock.h
index 2053768cbd5..2053768cbd5 100644
--- a/util/net/sock.h
+++ b/src/mongo/util/net/sock.h
diff --git a/util/ntservice.cpp b/src/mongo/util/ntservice.cpp
index 93cfd4a2de0..93cfd4a2de0 100644
--- a/util/ntservice.cpp
+++ b/src/mongo/util/ntservice.cpp
diff --git a/util/ntservice.h b/src/mongo/util/ntservice.h
index 2570dfa9bef..2570dfa9bef 100644
--- a/util/ntservice.h
+++ b/src/mongo/util/ntservice.h
diff --git a/util/optime.h b/src/mongo/util/optime.h
index 031ad960d20..031ad960d20 100644
--- a/util/optime.h
+++ b/src/mongo/util/optime.h
diff --git a/util/password.cpp b/src/mongo/util/password.cpp
index 18164c3aa0a..18164c3aa0a 100644
--- a/util/password.cpp
+++ b/src/mongo/util/password.cpp
diff --git a/util/password.h b/src/mongo/util/password.h
index 519f712ee7e..519f712ee7e 100644
--- a/util/password.h
+++ b/src/mongo/util/password.h
diff --git a/util/paths.h b/src/mongo/util/paths.h
index bb82df0c730..bb82df0c730 100644
--- a/util/paths.h
+++ b/src/mongo/util/paths.h
diff --git a/util/processinfo.cpp b/src/mongo/util/processinfo.cpp
index 082d42b3bc0..082d42b3bc0 100644
--- a/util/processinfo.cpp
+++ b/src/mongo/util/processinfo.cpp
diff --git a/util/processinfo.h b/src/mongo/util/processinfo.h
index 5272831eb74..5272831eb74 100644
--- a/util/processinfo.h
+++ b/src/mongo/util/processinfo.h
diff --git a/util/processinfo_darwin.cpp b/src/mongo/util/processinfo_darwin.cpp
index 9f73cbffd4f..9f73cbffd4f 100644
--- a/util/processinfo_darwin.cpp
+++ b/src/mongo/util/processinfo_darwin.cpp
diff --git a/util/processinfo_linux2.cpp b/src/mongo/util/processinfo_linux2.cpp
index 3eaccafd030..3eaccafd030 100644
--- a/util/processinfo_linux2.cpp
+++ b/src/mongo/util/processinfo_linux2.cpp
diff --git a/util/processinfo_none.cpp b/src/mongo/util/processinfo_none.cpp
index 7d1e84d377c..7d1e84d377c 100644
--- a/util/processinfo_none.cpp
+++ b/src/mongo/util/processinfo_none.cpp
diff --git a/util/processinfo_win32.cpp b/src/mongo/util/processinfo_win32.cpp
index 87d92db7e18..87d92db7e18 100644
--- a/util/processinfo_win32.cpp
+++ b/src/mongo/util/processinfo_win32.cpp
diff --git a/util/queue.h b/src/mongo/util/queue.h
index 4223bd6c256..4223bd6c256 100644
--- a/util/queue.h
+++ b/src/mongo/util/queue.h
diff --git a/util/ramlog.cpp b/src/mongo/util/ramlog.cpp
index d7a839a3fff..d7a839a3fff 100644
--- a/util/ramlog.cpp
+++ b/src/mongo/util/ramlog.cpp
diff --git a/util/ramlog.h b/src/mongo/util/ramlog.h
index d3d5c8fbb4e..d3d5c8fbb4e 100644
--- a/util/ramlog.h
+++ b/src/mongo/util/ramlog.h
diff --git a/util/scopeguard.h b/src/mongo/util/scopeguard.h
index b87a4b51871..b87a4b51871 100644
--- a/util/scopeguard.h
+++ b/src/mongo/util/scopeguard.h
diff --git a/util/signal_handlers.cpp b/src/mongo/util/signal_handlers.cpp
index 0e9ec7a9b15..0e9ec7a9b15 100644
--- a/util/signal_handlers.cpp
+++ b/src/mongo/util/signal_handlers.cpp
diff --git a/util/signal_handlers.h b/src/mongo/util/signal_handlers.h
index 9d3a735a723..9d3a735a723 100644
--- a/util/signal_handlers.h
+++ b/src/mongo/util/signal_handlers.h
diff --git a/util/string_writer.h b/src/mongo/util/string_writer.h
index e83881bf6f6..e83881bf6f6 100755
--- a/util/string_writer.h
+++ b/src/mongo/util/string_writer.h
diff --git a/util/stringutils.cpp b/src/mongo/util/stringutils.cpp
index 229f57bb3cb..229f57bb3cb 100644
--- a/util/stringutils.cpp
+++ b/src/mongo/util/stringutils.cpp
diff --git a/util/stringutils.h b/src/mongo/util/stringutils.h
index 93598aa520b..93598aa520b 100644
--- a/util/stringutils.h
+++ b/src/mongo/util/stringutils.h
diff --git a/util/systeminfo.h b/src/mongo/util/systeminfo.h
index be4404ff785..be4404ff785 100755
--- a/util/systeminfo.h
+++ b/src/mongo/util/systeminfo.h
diff --git a/util/systeminfo_linux2.cpp b/src/mongo/util/systeminfo_linux2.cpp
index c1b7c861768..c1b7c861768 100755
--- a/util/systeminfo_linux2.cpp
+++ b/src/mongo/util/systeminfo_linux2.cpp
diff --git a/util/systeminfo_none.cpp b/src/mongo/util/systeminfo_none.cpp
index d22ce17f6b9..d22ce17f6b9 100755
--- a/util/systeminfo_none.cpp
+++ b/src/mongo/util/systeminfo_none.cpp
diff --git a/util/systeminfo_win32.cpp b/src/mongo/util/systeminfo_win32.cpp
index 19c182878ee..19c182878ee 100755
--- a/util/systeminfo_win32.cpp
+++ b/src/mongo/util/systeminfo_win32.cpp
diff --git a/util/text.cpp b/src/mongo/util/text.cpp
index 51a2556afdc..51a2556afdc 100644
--- a/util/text.cpp
+++ b/src/mongo/util/text.cpp
diff --git a/util/text.h b/src/mongo/util/text.h
index bf25c86fd39..bf25c86fd39 100644
--- a/util/text.h
+++ b/src/mongo/util/text.h
diff --git a/util/time_support.h b/src/mongo/util/time_support.h
index 18181eb805a..18181eb805a 100644
--- a/util/time_support.h
+++ b/src/mongo/util/time_support.h
diff --git a/util/timer.h b/src/mongo/util/timer.h
index 224651ac224..224651ac224 100644
--- a/util/timer.h
+++ b/src/mongo/util/timer.h
diff --git a/util/unittest.h b/src/mongo/util/unittest.h
index 94be444363f..94be444363f 100644
--- a/util/unittest.h
+++ b/src/mongo/util/unittest.h
diff --git a/util/util.cpp b/src/mongo/util/util.cpp
index 356c640f449..356c640f449 100644
--- a/util/util.cpp
+++ b/src/mongo/util/util.cpp
diff --git a/util/version.cpp b/src/mongo/util/version.cpp
index 1e4bc457f91..1e4bc457f91 100644
--- a/util/version.cpp
+++ b/src/mongo/util/version.cpp
diff --git a/util/version.h b/src/mongo/util/version.h
index 64f8b140fd5..64f8b140fd5 100644
--- a/util/version.h
+++ b/src/mongo/util/version.h
diff --git a/util/winutil.h b/src/mongo/util/winutil.h
index b69b69a630d..b69b69a630d 100644
--- a/util/winutil.h
+++ b/src/mongo/util/winutil.h
diff --git a/third_party/README b/src/third_party/README
index 57f702d0b97..57f702d0b97 100644
--- a/third_party/README
+++ b/src/third_party/README
diff --git a/third_party/js-1.7/Makefile.in b/src/third_party/js-1.7/Makefile.in
index 08bb674fc7f..08bb674fc7f 100644
--- a/third_party/js-1.7/Makefile.in
+++ b/src/third_party/js-1.7/Makefile.in
diff --git a/third_party/js-1.7/Makefile.ref b/src/third_party/js-1.7/Makefile.ref
index 587ab86ce28..587ab86ce28 100644
--- a/third_party/js-1.7/Makefile.ref
+++ b/src/third_party/js-1.7/Makefile.ref
diff --git a/third_party/js-1.7/README.html b/src/third_party/js-1.7/README.html
index b2942e3858b..b2942e3858b 100644
--- a/third_party/js-1.7/README.html
+++ b/src/third_party/js-1.7/README.html
diff --git a/third_party/js-1.7/SpiderMonkey.rsp b/src/third_party/js-1.7/SpiderMonkey.rsp
index 8025c6cd627..8025c6cd627 100644
--- a/third_party/js-1.7/SpiderMonkey.rsp
+++ b/src/third_party/js-1.7/SpiderMonkey.rsp
diff --git a/third_party/js-1.7/Y.js b/src/third_party/js-1.7/Y.js
index e92a65a5df9..e92a65a5df9 100644
--- a/third_party/js-1.7/Y.js
+++ b/src/third_party/js-1.7/Y.js
diff --git a/third_party/js-1.7/config.mk b/src/third_party/js-1.7/config.mk
index f622d30a81b..f622d30a81b 100644
--- a/third_party/js-1.7/config.mk
+++ b/src/third_party/js-1.7/config.mk
diff --git a/third_party/js-1.7/config/AIX4.1.mk b/src/third_party/js-1.7/config/AIX4.1.mk
index 09c7cb94cf3..09c7cb94cf3 100644
--- a/third_party/js-1.7/config/AIX4.1.mk
+++ b/src/third_party/js-1.7/config/AIX4.1.mk
diff --git a/third_party/js-1.7/config/AIX4.2.mk b/src/third_party/js-1.7/config/AIX4.2.mk
index 1e3f1f183d1..1e3f1f183d1 100644
--- a/third_party/js-1.7/config/AIX4.2.mk
+++ b/src/third_party/js-1.7/config/AIX4.2.mk
diff --git a/third_party/js-1.7/config/AIX4.3.mk b/src/third_party/js-1.7/config/AIX4.3.mk
index df05d8c9256..df05d8c9256 100644
--- a/third_party/js-1.7/config/AIX4.3.mk
+++ b/src/third_party/js-1.7/config/AIX4.3.mk
diff --git a/third_party/js-1.7/config/CVS/Entries b/src/third_party/js-1.7/config/CVS/Entries
index 01df8fbee54..01df8fbee54 100644
--- a/third_party/js-1.7/config/CVS/Entries
+++ b/src/third_party/js-1.7/config/CVS/Entries
diff --git a/third_party/js-1.7/config/CVS/Repository b/src/third_party/js-1.7/config/CVS/Repository
index d0ce95c588f..d0ce95c588f 100644
--- a/third_party/js-1.7/config/CVS/Repository
+++ b/src/third_party/js-1.7/config/CVS/Repository
diff --git a/third_party/js-1.7/config/CVS/Root b/src/third_party/js-1.7/config/CVS/Root
index cdb6f4a0739..cdb6f4a0739 100644
--- a/third_party/js-1.7/config/CVS/Root
+++ b/src/third_party/js-1.7/config/CVS/Root
diff --git a/third_party/js-1.7/config/CVS/Tag b/src/third_party/js-1.7/config/CVS/Tag
index 2a8b15898d7..2a8b15898d7 100644
--- a/third_party/js-1.7/config/CVS/Tag
+++ b/src/third_party/js-1.7/config/CVS/Tag
diff --git a/third_party/js-1.7/config/Darwin.mk b/src/third_party/js-1.7/config/Darwin.mk
index 23b503e376f..23b503e376f 100644
--- a/third_party/js-1.7/config/Darwin.mk
+++ b/src/third_party/js-1.7/config/Darwin.mk
diff --git a/third_party/js-1.7/config/Darwin1.3.mk b/src/third_party/js-1.7/config/Darwin1.3.mk
index 05d3767a0d2..05d3767a0d2 100755
--- a/third_party/js-1.7/config/Darwin1.3.mk
+++ b/src/third_party/js-1.7/config/Darwin1.3.mk
diff --git a/third_party/js-1.7/config/Darwin1.4.mk b/src/third_party/js-1.7/config/Darwin1.4.mk
index f7b6af8ec0a..f7b6af8ec0a 100755
--- a/third_party/js-1.7/config/Darwin1.4.mk
+++ b/src/third_party/js-1.7/config/Darwin1.4.mk
diff --git a/third_party/js-1.7/config/Darwin5.2.mk b/src/third_party/js-1.7/config/Darwin5.2.mk
index 9b9b6ff0977..9b9b6ff0977 100755
--- a/third_party/js-1.7/config/Darwin5.2.mk
+++ b/src/third_party/js-1.7/config/Darwin5.2.mk
diff --git a/third_party/js-1.7/config/Darwin5.3.mk b/src/third_party/js-1.7/config/Darwin5.3.mk
index 9b9b6ff0977..9b9b6ff0977 100644
--- a/third_party/js-1.7/config/Darwin5.3.mk
+++ b/src/third_party/js-1.7/config/Darwin5.3.mk
diff --git a/third_party/js-1.7/config/HP-UXB.10.10.mk b/src/third_party/js-1.7/config/HP-UXB.10.10.mk
index 8cd9d20671b..8cd9d20671b 100644
--- a/third_party/js-1.7/config/HP-UXB.10.10.mk
+++ b/src/third_party/js-1.7/config/HP-UXB.10.10.mk
diff --git a/third_party/js-1.7/config/HP-UXB.10.20.mk b/src/third_party/js-1.7/config/HP-UXB.10.20.mk
index 8cd9d20671b..8cd9d20671b 100644
--- a/third_party/js-1.7/config/HP-UXB.10.20.mk
+++ b/src/third_party/js-1.7/config/HP-UXB.10.20.mk
diff --git a/third_party/js-1.7/config/HP-UXB.11.00.mk b/src/third_party/js-1.7/config/HP-UXB.11.00.mk
index 239188d6011..239188d6011 100644
--- a/third_party/js-1.7/config/HP-UXB.11.00.mk
+++ b/src/third_party/js-1.7/config/HP-UXB.11.00.mk
diff --git a/third_party/js-1.7/config/IRIX.mk b/src/third_party/js-1.7/config/IRIX.mk
index 88b162f2271..88b162f2271 100644
--- a/third_party/js-1.7/config/IRIX.mk
+++ b/src/third_party/js-1.7/config/IRIX.mk
diff --git a/third_party/js-1.7/config/IRIX5.3.mk b/src/third_party/js-1.7/config/IRIX5.3.mk
index f38cc94874b..f38cc94874b 100644
--- a/third_party/js-1.7/config/IRIX5.3.mk
+++ b/src/third_party/js-1.7/config/IRIX5.3.mk
diff --git a/third_party/js-1.7/config/IRIX6.1.mk b/src/third_party/js-1.7/config/IRIX6.1.mk
index 354f1d119d9..354f1d119d9 100644
--- a/third_party/js-1.7/config/IRIX6.1.mk
+++ b/src/third_party/js-1.7/config/IRIX6.1.mk
diff --git a/third_party/js-1.7/config/IRIX6.2.mk b/src/third_party/js-1.7/config/IRIX6.2.mk
index 354f1d119d9..354f1d119d9 100644
--- a/third_party/js-1.7/config/IRIX6.2.mk
+++ b/src/third_party/js-1.7/config/IRIX6.2.mk
diff --git a/third_party/js-1.7/config/IRIX6.3.mk b/src/third_party/js-1.7/config/IRIX6.3.mk
index 354f1d119d9..354f1d119d9 100644
--- a/third_party/js-1.7/config/IRIX6.3.mk
+++ b/src/third_party/js-1.7/config/IRIX6.3.mk
diff --git a/third_party/js-1.7/config/IRIX6.5.mk b/src/third_party/js-1.7/config/IRIX6.5.mk
index 354f1d119d9..354f1d119d9 100644
--- a/third_party/js-1.7/config/IRIX6.5.mk
+++ b/src/third_party/js-1.7/config/IRIX6.5.mk
diff --git a/third_party/js-1.7/config/Linux_All.mk b/src/third_party/js-1.7/config/Linux_All.mk
index 0c43df4b922..0c43df4b922 100644
--- a/third_party/js-1.7/config/Linux_All.mk
+++ b/src/third_party/js-1.7/config/Linux_All.mk
diff --git a/third_party/js-1.7/config/Mac_OS10.0.mk b/src/third_party/js-1.7/config/Mac_OS10.0.mk
index 74ba151e3b5..74ba151e3b5 100755
--- a/third_party/js-1.7/config/Mac_OS10.0.mk
+++ b/src/third_party/js-1.7/config/Mac_OS10.0.mk
diff --git a/third_party/js-1.7/config/OSF1V4.0.mk b/src/third_party/js-1.7/config/OSF1V4.0.mk
index 337ca745926..337ca745926 100644
--- a/third_party/js-1.7/config/OSF1V4.0.mk
+++ b/src/third_party/js-1.7/config/OSF1V4.0.mk
diff --git a/third_party/js-1.7/config/OSF1V5.0.mk b/src/third_party/js-1.7/config/OSF1V5.0.mk
index b65738c4e43..b65738c4e43 100644
--- a/third_party/js-1.7/config/OSF1V5.0.mk
+++ b/src/third_party/js-1.7/config/OSF1V5.0.mk
diff --git a/third_party/js-1.7/config/SunOS4.1.4.mk b/src/third_party/js-1.7/config/SunOS4.1.4.mk
index 62f4815b462..62f4815b462 100644
--- a/third_party/js-1.7/config/SunOS4.1.4.mk
+++ b/src/third_party/js-1.7/config/SunOS4.1.4.mk
diff --git a/third_party/js-1.7/config/SunOS5.3.mk b/src/third_party/js-1.7/config/SunOS5.3.mk
index bd615dee404..bd615dee404 100644
--- a/third_party/js-1.7/config/SunOS5.3.mk
+++ b/src/third_party/js-1.7/config/SunOS5.3.mk
diff --git a/third_party/js-1.7/config/SunOS5.4.mk b/src/third_party/js-1.7/config/SunOS5.4.mk
index de019247a2d..de019247a2d 100644
--- a/third_party/js-1.7/config/SunOS5.4.mk
+++ b/src/third_party/js-1.7/config/SunOS5.4.mk
diff --git a/third_party/js-1.7/config/SunOS5.5.1.mk b/src/third_party/js-1.7/config/SunOS5.5.1.mk
index 648f72ffa0d..648f72ffa0d 100644
--- a/third_party/js-1.7/config/SunOS5.5.1.mk
+++ b/src/third_party/js-1.7/config/SunOS5.5.1.mk
diff --git a/third_party/js-1.7/config/SunOS5.5.mk b/src/third_party/js-1.7/config/SunOS5.5.mk
index e26b3a3e0ec..e26b3a3e0ec 100644
--- a/third_party/js-1.7/config/SunOS5.5.mk
+++ b/src/third_party/js-1.7/config/SunOS5.5.mk
diff --git a/third_party/js-1.7/config/SunOS5.6.mk b/src/third_party/js-1.7/config/SunOS5.6.mk
index efe11528435..efe11528435 100644
--- a/third_party/js-1.7/config/SunOS5.6.mk
+++ b/src/third_party/js-1.7/config/SunOS5.6.mk
diff --git a/third_party/js-1.7/config/SunOS5.7.mk b/src/third_party/js-1.7/config/SunOS5.7.mk
index 2cb02f29590..2cb02f29590 100644
--- a/third_party/js-1.7/config/SunOS5.7.mk
+++ b/src/third_party/js-1.7/config/SunOS5.7.mk
diff --git a/third_party/js-1.7/config/SunOS5.8.mk b/src/third_party/js-1.7/config/SunOS5.8.mk
index dd8a32d47b1..dd8a32d47b1 100644
--- a/third_party/js-1.7/config/SunOS5.8.mk
+++ b/src/third_party/js-1.7/config/SunOS5.8.mk
diff --git a/third_party/js-1.7/config/SunOS5.9.mk b/src/third_party/js-1.7/config/SunOS5.9.mk
index b01ec9c26fc..b01ec9c26fc 100644
--- a/third_party/js-1.7/config/SunOS5.9.mk
+++ b/src/third_party/js-1.7/config/SunOS5.9.mk
diff --git a/third_party/js-1.7/config/WINNT4.0.mk b/src/third_party/js-1.7/config/WINNT4.0.mk
index 15a5a6fd2d0..15a5a6fd2d0 100644
--- a/third_party/js-1.7/config/WINNT4.0.mk
+++ b/src/third_party/js-1.7/config/WINNT4.0.mk
diff --git a/third_party/js-1.7/config/WINNT5.0.mk b/src/third_party/js-1.7/config/WINNT5.0.mk
index 2b796a4f193..2b796a4f193 100644
--- a/third_party/js-1.7/config/WINNT5.0.mk
+++ b/src/third_party/js-1.7/config/WINNT5.0.mk
diff --git a/third_party/js-1.7/config/WINNT5.1.mk b/src/third_party/js-1.7/config/WINNT5.1.mk
index 2b796a4f193..2b796a4f193 100644
--- a/third_party/js-1.7/config/WINNT5.1.mk
+++ b/src/third_party/js-1.7/config/WINNT5.1.mk
diff --git a/third_party/js-1.7/config/WINNT5.2.mk b/src/third_party/js-1.7/config/WINNT5.2.mk
index 2b796a4f193..2b796a4f193 100644
--- a/third_party/js-1.7/config/WINNT5.2.mk
+++ b/src/third_party/js-1.7/config/WINNT5.2.mk
diff --git a/third_party/js-1.7/config/dgux.mk b/src/third_party/js-1.7/config/dgux.mk
index 3b5967e3d1f..3b5967e3d1f 100644
--- a/third_party/js-1.7/config/dgux.mk
+++ b/src/third_party/js-1.7/config/dgux.mk
diff --git a/third_party/js-1.7/fdlibm/.cvsignore b/src/third_party/js-1.7/fdlibm/.cvsignore
index bb5cc66ee00..bb5cc66ee00 100644
--- a/third_party/js-1.7/fdlibm/.cvsignore
+++ b/src/third_party/js-1.7/fdlibm/.cvsignore
diff --git a/third_party/js-1.7/fdlibm/CVS/Entries b/src/third_party/js-1.7/fdlibm/CVS/Entries
index 4c586387298..4c586387298 100644
--- a/third_party/js-1.7/fdlibm/CVS/Entries
+++ b/src/third_party/js-1.7/fdlibm/CVS/Entries
diff --git a/third_party/js-1.7/fdlibm/CVS/Repository b/src/third_party/js-1.7/fdlibm/CVS/Repository
index 88fbd658913..88fbd658913 100644
--- a/third_party/js-1.7/fdlibm/CVS/Repository
+++ b/src/third_party/js-1.7/fdlibm/CVS/Repository
diff --git a/third_party/js-1.7/fdlibm/CVS/Root b/src/third_party/js-1.7/fdlibm/CVS/Root
index cdb6f4a0739..cdb6f4a0739 100644
--- a/third_party/js-1.7/fdlibm/CVS/Root
+++ b/src/third_party/js-1.7/fdlibm/CVS/Root
diff --git a/third_party/js-1.7/fdlibm/CVS/Tag b/src/third_party/js-1.7/fdlibm/CVS/Tag
index 2a8b15898d7..2a8b15898d7 100644
--- a/third_party/js-1.7/fdlibm/CVS/Tag
+++ b/src/third_party/js-1.7/fdlibm/CVS/Tag
diff --git a/third_party/js-1.7/fdlibm/Makefile.in b/src/third_party/js-1.7/fdlibm/Makefile.in
index fdec7b7e8e6..fdec7b7e8e6 100644
--- a/third_party/js-1.7/fdlibm/Makefile.in
+++ b/src/third_party/js-1.7/fdlibm/Makefile.in
diff --git a/third_party/js-1.7/fdlibm/Makefile.ref b/src/third_party/js-1.7/fdlibm/Makefile.ref
index de378025c70..de378025c70 100644
--- a/third_party/js-1.7/fdlibm/Makefile.ref
+++ b/src/third_party/js-1.7/fdlibm/Makefile.ref
diff --git a/third_party/js-1.7/fdlibm/e_acos.c b/src/third_party/js-1.7/fdlibm/e_acos.c
index a07c1eebc77..a07c1eebc77 100644
--- a/third_party/js-1.7/fdlibm/e_acos.c
+++ b/src/third_party/js-1.7/fdlibm/e_acos.c
diff --git a/third_party/js-1.7/fdlibm/e_acosh.c b/src/third_party/js-1.7/fdlibm/e_acosh.c
index 725cceefb42..725cceefb42 100644
--- a/third_party/js-1.7/fdlibm/e_acosh.c
+++ b/src/third_party/js-1.7/fdlibm/e_acosh.c
diff --git a/third_party/js-1.7/fdlibm/e_asin.c b/src/third_party/js-1.7/fdlibm/e_asin.c
index 624c4d2ce61..624c4d2ce61 100644
--- a/third_party/js-1.7/fdlibm/e_asin.c
+++ b/src/third_party/js-1.7/fdlibm/e_asin.c
diff --git a/third_party/js-1.7/fdlibm/e_atan2.c b/src/third_party/js-1.7/fdlibm/e_atan2.c
index 9c9a2c01f33..9c9a2c01f33 100644
--- a/third_party/js-1.7/fdlibm/e_atan2.c
+++ b/src/third_party/js-1.7/fdlibm/e_atan2.c
diff --git a/third_party/js-1.7/fdlibm/e_atanh.c b/src/third_party/js-1.7/fdlibm/e_atanh.c
index dc4a90c8e03..dc4a90c8e03 100644
--- a/third_party/js-1.7/fdlibm/e_atanh.c
+++ b/src/third_party/js-1.7/fdlibm/e_atanh.c
diff --git a/third_party/js-1.7/fdlibm/e_cosh.c b/src/third_party/js-1.7/fdlibm/e_cosh.c
index 4f8d4f7697d..4f8d4f7697d 100644
--- a/third_party/js-1.7/fdlibm/e_cosh.c
+++ b/src/third_party/js-1.7/fdlibm/e_cosh.c
diff --git a/third_party/js-1.7/fdlibm/e_exp.c b/src/third_party/js-1.7/fdlibm/e_exp.c
index ad9cec12419..ad9cec12419 100644
--- a/third_party/js-1.7/fdlibm/e_exp.c
+++ b/src/third_party/js-1.7/fdlibm/e_exp.c
diff --git a/third_party/js-1.7/fdlibm/e_fmod.c b/src/third_party/js-1.7/fdlibm/e_fmod.c
index 7b5ce780f38..7b5ce780f38 100644
--- a/third_party/js-1.7/fdlibm/e_fmod.c
+++ b/src/third_party/js-1.7/fdlibm/e_fmod.c
diff --git a/third_party/js-1.7/fdlibm/e_gamma.c b/src/third_party/js-1.7/fdlibm/e_gamma.c
index a34faa32cf6..a34faa32cf6 100644
--- a/third_party/js-1.7/fdlibm/e_gamma.c
+++ b/src/third_party/js-1.7/fdlibm/e_gamma.c
diff --git a/third_party/js-1.7/fdlibm/e_gamma_r.c b/src/third_party/js-1.7/fdlibm/e_gamma_r.c
index f10e32e361e..f10e32e361e 100644
--- a/third_party/js-1.7/fdlibm/e_gamma_r.c
+++ b/src/third_party/js-1.7/fdlibm/e_gamma_r.c
diff --git a/third_party/js-1.7/fdlibm/e_hypot.c b/src/third_party/js-1.7/fdlibm/e_hypot.c
index 3900230878e..3900230878e 100644
--- a/third_party/js-1.7/fdlibm/e_hypot.c
+++ b/src/third_party/js-1.7/fdlibm/e_hypot.c
diff --git a/third_party/js-1.7/fdlibm/e_j0.c b/src/third_party/js-1.7/fdlibm/e_j0.c
index 078e096415c..078e096415c 100644
--- a/third_party/js-1.7/fdlibm/e_j0.c
+++ b/src/third_party/js-1.7/fdlibm/e_j0.c
diff --git a/third_party/js-1.7/fdlibm/e_j1.c b/src/third_party/js-1.7/fdlibm/e_j1.c
index 8982ac86a38..8982ac86a38 100644
--- a/third_party/js-1.7/fdlibm/e_j1.c
+++ b/src/third_party/js-1.7/fdlibm/e_j1.c
diff --git a/third_party/js-1.7/fdlibm/e_jn.c b/src/third_party/js-1.7/fdlibm/e_jn.c
index 2b61b44399d..2b61b44399d 100644
--- a/third_party/js-1.7/fdlibm/e_jn.c
+++ b/src/third_party/js-1.7/fdlibm/e_jn.c
diff --git a/third_party/js-1.7/fdlibm/e_lgamma.c b/src/third_party/js-1.7/fdlibm/e_lgamma.c
index beb3bd93219..beb3bd93219 100644
--- a/third_party/js-1.7/fdlibm/e_lgamma.c
+++ b/src/third_party/js-1.7/fdlibm/e_lgamma.c
diff --git a/third_party/js-1.7/fdlibm/e_lgamma_r.c b/src/third_party/js-1.7/fdlibm/e_lgamma_r.c
index df92e7a26c9..df92e7a26c9 100644
--- a/third_party/js-1.7/fdlibm/e_lgamma_r.c
+++ b/src/third_party/js-1.7/fdlibm/e_lgamma_r.c
diff --git a/third_party/js-1.7/fdlibm/e_log.c b/src/third_party/js-1.7/fdlibm/e_log.c
index 8645d6efdcc..8645d6efdcc 100644
--- a/third_party/js-1.7/fdlibm/e_log.c
+++ b/src/third_party/js-1.7/fdlibm/e_log.c
diff --git a/third_party/js-1.7/fdlibm/e_log10.c b/src/third_party/js-1.7/fdlibm/e_log10.c
index 5f88f4b4cfe..5f88f4b4cfe 100644
--- a/third_party/js-1.7/fdlibm/e_log10.c
+++ b/src/third_party/js-1.7/fdlibm/e_log10.c
diff --git a/third_party/js-1.7/fdlibm/e_pow.c b/src/third_party/js-1.7/fdlibm/e_pow.c
index 18c8d069507..18c8d069507 100644
--- a/third_party/js-1.7/fdlibm/e_pow.c
+++ b/src/third_party/js-1.7/fdlibm/e_pow.c
diff --git a/third_party/js-1.7/fdlibm/e_rem_pio2.c b/src/third_party/js-1.7/fdlibm/e_rem_pio2.c
index c9d26187510..c9d26187510 100644
--- a/third_party/js-1.7/fdlibm/e_rem_pio2.c
+++ b/src/third_party/js-1.7/fdlibm/e_rem_pio2.c
diff --git a/third_party/js-1.7/fdlibm/e_remainder.c b/src/third_party/js-1.7/fdlibm/e_remainder.c
index de40f0c2a5e..de40f0c2a5e 100644
--- a/third_party/js-1.7/fdlibm/e_remainder.c
+++ b/src/third_party/js-1.7/fdlibm/e_remainder.c
diff --git a/third_party/js-1.7/fdlibm/e_scalb.c b/src/third_party/js-1.7/fdlibm/e_scalb.c
index 621704ea048..621704ea048 100644
--- a/third_party/js-1.7/fdlibm/e_scalb.c
+++ b/src/third_party/js-1.7/fdlibm/e_scalb.c
diff --git a/third_party/js-1.7/fdlibm/e_sinh.c b/src/third_party/js-1.7/fdlibm/e_sinh.c
index 98ab9b5a32f..98ab9b5a32f 100644
--- a/third_party/js-1.7/fdlibm/e_sinh.c
+++ b/src/third_party/js-1.7/fdlibm/e_sinh.c
diff --git a/third_party/js-1.7/fdlibm/e_sqrt.c b/src/third_party/js-1.7/fdlibm/e_sqrt.c
index 91802839b08..91802839b08 100644
--- a/third_party/js-1.7/fdlibm/e_sqrt.c
+++ b/src/third_party/js-1.7/fdlibm/e_sqrt.c
diff --git a/third_party/js-1.7/fdlibm/fdlibm.h b/src/third_party/js-1.7/fdlibm/fdlibm.h
index e623be56e45..e623be56e45 100644
--- a/third_party/js-1.7/fdlibm/fdlibm.h
+++ b/src/third_party/js-1.7/fdlibm/fdlibm.h
diff --git a/third_party/js-1.7/fdlibm/fdlibm.mak b/src/third_party/js-1.7/fdlibm/fdlibm.mak
index 436c1c45058..436c1c45058 100644
--- a/third_party/js-1.7/fdlibm/fdlibm.mak
+++ b/src/third_party/js-1.7/fdlibm/fdlibm.mak
diff --git a/third_party/js-1.7/fdlibm/fdlibm.mdp b/src/third_party/js-1.7/fdlibm/fdlibm.mdp
index 5904c494072..5904c494072 100644
--- a/third_party/js-1.7/fdlibm/fdlibm.mdp
+++ b/src/third_party/js-1.7/fdlibm/fdlibm.mdp
diff --git a/third_party/js-1.7/fdlibm/k_cos.c b/src/third_party/js-1.7/fdlibm/k_cos.c
index 1d18c803433..1d18c803433 100644
--- a/third_party/js-1.7/fdlibm/k_cos.c
+++ b/src/third_party/js-1.7/fdlibm/k_cos.c
diff --git a/third_party/js-1.7/fdlibm/k_rem_pio2.c b/src/third_party/js-1.7/fdlibm/k_rem_pio2.c
index d261e190af4..d261e190af4 100644
--- a/third_party/js-1.7/fdlibm/k_rem_pio2.c
+++ b/src/third_party/js-1.7/fdlibm/k_rem_pio2.c
diff --git a/third_party/js-1.7/fdlibm/k_sin.c b/src/third_party/js-1.7/fdlibm/k_sin.c
index d2bdabd6da3..d2bdabd6da3 100644
--- a/third_party/js-1.7/fdlibm/k_sin.c
+++ b/src/third_party/js-1.7/fdlibm/k_sin.c
diff --git a/third_party/js-1.7/fdlibm/k_standard.c b/src/third_party/js-1.7/fdlibm/k_standard.c
index 720109c9d6a..720109c9d6a 100644
--- a/third_party/js-1.7/fdlibm/k_standard.c
+++ b/src/third_party/js-1.7/fdlibm/k_standard.c
diff --git a/third_party/js-1.7/fdlibm/k_tan.c b/src/third_party/js-1.7/fdlibm/k_tan.c
index 1e7681b8883..1e7681b8883 100644
--- a/third_party/js-1.7/fdlibm/k_tan.c
+++ b/src/third_party/js-1.7/fdlibm/k_tan.c
diff --git a/third_party/js-1.7/fdlibm/s_asinh.c b/src/third_party/js-1.7/fdlibm/s_asinh.c
index fdf70a91cf0..fdf70a91cf0 100644
--- a/third_party/js-1.7/fdlibm/s_asinh.c
+++ b/src/third_party/js-1.7/fdlibm/s_asinh.c
diff --git a/third_party/js-1.7/fdlibm/s_atan.c b/src/third_party/js-1.7/fdlibm/s_atan.c
index 99a00c68646..99a00c68646 100644
--- a/third_party/js-1.7/fdlibm/s_atan.c
+++ b/src/third_party/js-1.7/fdlibm/s_atan.c
diff --git a/third_party/js-1.7/fdlibm/s_cbrt.c b/src/third_party/js-1.7/fdlibm/s_cbrt.c
index 4aed19b1bb1..4aed19b1bb1 100644
--- a/third_party/js-1.7/fdlibm/s_cbrt.c
+++ b/src/third_party/js-1.7/fdlibm/s_cbrt.c
diff --git a/third_party/js-1.7/fdlibm/s_ceil.c b/src/third_party/js-1.7/fdlibm/s_ceil.c
index 826bcac6c4a..826bcac6c4a 100644
--- a/third_party/js-1.7/fdlibm/s_ceil.c
+++ b/src/third_party/js-1.7/fdlibm/s_ceil.c
diff --git a/third_party/js-1.7/fdlibm/s_copysign.c b/src/third_party/js-1.7/fdlibm/s_copysign.c
index 8869a1233b9..8869a1233b9 100644
--- a/third_party/js-1.7/fdlibm/s_copysign.c
+++ b/src/third_party/js-1.7/fdlibm/s_copysign.c
diff --git a/third_party/js-1.7/fdlibm/s_cos.c b/src/third_party/js-1.7/fdlibm/s_cos.c
index 3fb0a6b15a1..3fb0a6b15a1 100644
--- a/third_party/js-1.7/fdlibm/s_cos.c
+++ b/src/third_party/js-1.7/fdlibm/s_cos.c
diff --git a/third_party/js-1.7/fdlibm/s_erf.c b/src/third_party/js-1.7/fdlibm/s_erf.c
index 6eae8de3b10..6eae8de3b10 100644
--- a/third_party/js-1.7/fdlibm/s_erf.c
+++ b/src/third_party/js-1.7/fdlibm/s_erf.c
diff --git a/third_party/js-1.7/fdlibm/s_expm1.c b/src/third_party/js-1.7/fdlibm/s_expm1.c
index 578d2e144ae..578d2e144ae 100644
--- a/third_party/js-1.7/fdlibm/s_expm1.c
+++ b/src/third_party/js-1.7/fdlibm/s_expm1.c
diff --git a/third_party/js-1.7/fdlibm/s_fabs.c b/src/third_party/js-1.7/fdlibm/s_fabs.c
index 6b029da1013..6b029da1013 100644
--- a/third_party/js-1.7/fdlibm/s_fabs.c
+++ b/src/third_party/js-1.7/fdlibm/s_fabs.c
diff --git a/third_party/js-1.7/fdlibm/s_finite.c b/src/third_party/js-1.7/fdlibm/s_finite.c
index 4a0a4d3c603..4a0a4d3c603 100644
--- a/third_party/js-1.7/fdlibm/s_finite.c
+++ b/src/third_party/js-1.7/fdlibm/s_finite.c
diff --git a/third_party/js-1.7/fdlibm/s_floor.c b/src/third_party/js-1.7/fdlibm/s_floor.c
index 6c23495f0e0..6c23495f0e0 100644
--- a/third_party/js-1.7/fdlibm/s_floor.c
+++ b/src/third_party/js-1.7/fdlibm/s_floor.c
diff --git a/third_party/js-1.7/fdlibm/s_frexp.c b/src/third_party/js-1.7/fdlibm/s_frexp.c
index bec2ecebc6d..bec2ecebc6d 100644
--- a/third_party/js-1.7/fdlibm/s_frexp.c
+++ b/src/third_party/js-1.7/fdlibm/s_frexp.c
diff --git a/third_party/js-1.7/fdlibm/s_ilogb.c b/src/third_party/js-1.7/fdlibm/s_ilogb.c
index f769781a62f..f769781a62f 100644
--- a/third_party/js-1.7/fdlibm/s_ilogb.c
+++ b/src/third_party/js-1.7/fdlibm/s_ilogb.c
diff --git a/third_party/js-1.7/fdlibm/s_isnan.c b/src/third_party/js-1.7/fdlibm/s_isnan.c
index 52f8759c793..52f8759c793 100644
--- a/third_party/js-1.7/fdlibm/s_isnan.c
+++ b/src/third_party/js-1.7/fdlibm/s_isnan.c
diff --git a/third_party/js-1.7/fdlibm/s_ldexp.c b/src/third_party/js-1.7/fdlibm/s_ldexp.c
index 9475520d480..9475520d480 100644
--- a/third_party/js-1.7/fdlibm/s_ldexp.c
+++ b/src/third_party/js-1.7/fdlibm/s_ldexp.c
diff --git a/third_party/js-1.7/fdlibm/s_lib_version.c b/src/third_party/js-1.7/fdlibm/s_lib_version.c
index 2ccf67d51c8..2ccf67d51c8 100644
--- a/third_party/js-1.7/fdlibm/s_lib_version.c
+++ b/src/third_party/js-1.7/fdlibm/s_lib_version.c
diff --git a/third_party/js-1.7/fdlibm/s_log1p.c b/src/third_party/js-1.7/fdlibm/s_log1p.c
index 1840156b1cd..1840156b1cd 100644
--- a/third_party/js-1.7/fdlibm/s_log1p.c
+++ b/src/third_party/js-1.7/fdlibm/s_log1p.c
diff --git a/third_party/js-1.7/fdlibm/s_logb.c b/src/third_party/js-1.7/fdlibm/s_logb.c
index f885c4dc389..f885c4dc389 100644
--- a/third_party/js-1.7/fdlibm/s_logb.c
+++ b/src/third_party/js-1.7/fdlibm/s_logb.c
diff --git a/third_party/js-1.7/fdlibm/s_matherr.c b/src/third_party/js-1.7/fdlibm/s_matherr.c
index cd99ca88f3c..cd99ca88f3c 100644
--- a/third_party/js-1.7/fdlibm/s_matherr.c
+++ b/src/third_party/js-1.7/fdlibm/s_matherr.c
diff --git a/third_party/js-1.7/fdlibm/s_modf.c b/src/third_party/js-1.7/fdlibm/s_modf.c
index 3b182bd3bbf..3b182bd3bbf 100644
--- a/third_party/js-1.7/fdlibm/s_modf.c
+++ b/src/third_party/js-1.7/fdlibm/s_modf.c
diff --git a/third_party/js-1.7/fdlibm/s_nextafter.c b/src/third_party/js-1.7/fdlibm/s_nextafter.c
index f71c5c8359a..f71c5c8359a 100644
--- a/third_party/js-1.7/fdlibm/s_nextafter.c
+++ b/src/third_party/js-1.7/fdlibm/s_nextafter.c
diff --git a/third_party/js-1.7/fdlibm/s_rint.c b/src/third_party/js-1.7/fdlibm/s_rint.c
index 3c4fab6d9d9..3c4fab6d9d9 100644
--- a/third_party/js-1.7/fdlibm/s_rint.c
+++ b/src/third_party/js-1.7/fdlibm/s_rint.c
diff --git a/third_party/js-1.7/fdlibm/s_scalbn.c b/src/third_party/js-1.7/fdlibm/s_scalbn.c
index 3deeaa3057e..3deeaa3057e 100644
--- a/third_party/js-1.7/fdlibm/s_scalbn.c
+++ b/src/third_party/js-1.7/fdlibm/s_scalbn.c
diff --git a/third_party/js-1.7/fdlibm/s_signgam.c b/src/third_party/js-1.7/fdlibm/s_signgam.c
index 4eb8ce72f8c..4eb8ce72f8c 100644
--- a/third_party/js-1.7/fdlibm/s_signgam.c
+++ b/src/third_party/js-1.7/fdlibm/s_signgam.c
diff --git a/third_party/js-1.7/fdlibm/s_significand.c b/src/third_party/js-1.7/fdlibm/s_significand.c
index 2e1c0b28fb1..2e1c0b28fb1 100644
--- a/third_party/js-1.7/fdlibm/s_significand.c
+++ b/src/third_party/js-1.7/fdlibm/s_significand.c
diff --git a/third_party/js-1.7/fdlibm/s_sin.c b/src/third_party/js-1.7/fdlibm/s_sin.c
index 8bbc5c62d92..8bbc5c62d92 100644
--- a/third_party/js-1.7/fdlibm/s_sin.c
+++ b/src/third_party/js-1.7/fdlibm/s_sin.c
diff --git a/third_party/js-1.7/fdlibm/s_tan.c b/src/third_party/js-1.7/fdlibm/s_tan.c
index ded36c1d7c1..ded36c1d7c1 100644
--- a/third_party/js-1.7/fdlibm/s_tan.c
+++ b/src/third_party/js-1.7/fdlibm/s_tan.c
diff --git a/third_party/js-1.7/fdlibm/s_tanh.c b/src/third_party/js-1.7/fdlibm/s_tanh.c
index aa6809f8518..aa6809f8518 100644
--- a/third_party/js-1.7/fdlibm/s_tanh.c
+++ b/src/third_party/js-1.7/fdlibm/s_tanh.c
diff --git a/third_party/js-1.7/fdlibm/w_acos.c b/src/third_party/js-1.7/fdlibm/w_acos.c
index 872c81d2081..872c81d2081 100644
--- a/third_party/js-1.7/fdlibm/w_acos.c
+++ b/src/third_party/js-1.7/fdlibm/w_acos.c
diff --git a/third_party/js-1.7/fdlibm/w_acosh.c b/src/third_party/js-1.7/fdlibm/w_acosh.c
index 745d402eabc..745d402eabc 100644
--- a/third_party/js-1.7/fdlibm/w_acosh.c
+++ b/src/third_party/js-1.7/fdlibm/w_acosh.c
diff --git a/third_party/js-1.7/fdlibm/w_asin.c b/src/third_party/js-1.7/fdlibm/w_asin.c
index 18aaefde9ba..18aaefde9ba 100644
--- a/third_party/js-1.7/fdlibm/w_asin.c
+++ b/src/third_party/js-1.7/fdlibm/w_asin.c
diff --git a/third_party/js-1.7/fdlibm/w_atan2.c b/src/third_party/js-1.7/fdlibm/w_atan2.c
index 8cfa4bbbde4..8cfa4bbbde4 100644
--- a/third_party/js-1.7/fdlibm/w_atan2.c
+++ b/src/third_party/js-1.7/fdlibm/w_atan2.c
diff --git a/third_party/js-1.7/fdlibm/w_atanh.c b/src/third_party/js-1.7/fdlibm/w_atanh.c
index 6ba52d1e26f..6ba52d1e26f 100644
--- a/third_party/js-1.7/fdlibm/w_atanh.c
+++ b/src/third_party/js-1.7/fdlibm/w_atanh.c
diff --git a/third_party/js-1.7/fdlibm/w_cosh.c b/src/third_party/js-1.7/fdlibm/w_cosh.c
index 146449e0206..146449e0206 100644
--- a/third_party/js-1.7/fdlibm/w_cosh.c
+++ b/src/third_party/js-1.7/fdlibm/w_cosh.c
diff --git a/third_party/js-1.7/fdlibm/w_exp.c b/src/third_party/js-1.7/fdlibm/w_exp.c
index f5dea0b0111..f5dea0b0111 100644
--- a/third_party/js-1.7/fdlibm/w_exp.c
+++ b/src/third_party/js-1.7/fdlibm/w_exp.c
diff --git a/third_party/js-1.7/fdlibm/w_fmod.c b/src/third_party/js-1.7/fdlibm/w_fmod.c
index 76862096d63..76862096d63 100644
--- a/third_party/js-1.7/fdlibm/w_fmod.c
+++ b/src/third_party/js-1.7/fdlibm/w_fmod.c
diff --git a/third_party/js-1.7/fdlibm/w_gamma.c b/src/third_party/js-1.7/fdlibm/w_gamma.c
index 9eb8e429c45..9eb8e429c45 100644
--- a/third_party/js-1.7/fdlibm/w_gamma.c
+++ b/src/third_party/js-1.7/fdlibm/w_gamma.c
diff --git a/third_party/js-1.7/fdlibm/w_gamma_r.c b/src/third_party/js-1.7/fdlibm/w_gamma_r.c
index 2669b4f5964..2669b4f5964 100644
--- a/third_party/js-1.7/fdlibm/w_gamma_r.c
+++ b/src/third_party/js-1.7/fdlibm/w_gamma_r.c
diff --git a/third_party/js-1.7/fdlibm/w_hypot.c b/src/third_party/js-1.7/fdlibm/w_hypot.c
index bfaac66c028..bfaac66c028 100644
--- a/third_party/js-1.7/fdlibm/w_hypot.c
+++ b/src/third_party/js-1.7/fdlibm/w_hypot.c
diff --git a/third_party/js-1.7/fdlibm/w_j0.c b/src/third_party/js-1.7/fdlibm/w_j0.c
index 5e676ff6028..5e676ff6028 100644
--- a/third_party/js-1.7/fdlibm/w_j0.c
+++ b/src/third_party/js-1.7/fdlibm/w_j0.c
diff --git a/third_party/js-1.7/fdlibm/w_j1.c b/src/third_party/js-1.7/fdlibm/w_j1.c
index 86a506bc289..86a506bc289 100644
--- a/third_party/js-1.7/fdlibm/w_j1.c
+++ b/src/third_party/js-1.7/fdlibm/w_j1.c
diff --git a/third_party/js-1.7/fdlibm/w_jn.c b/src/third_party/js-1.7/fdlibm/w_jn.c
index 6926b0da87a..6926b0da87a 100644
--- a/third_party/js-1.7/fdlibm/w_jn.c
+++ b/src/third_party/js-1.7/fdlibm/w_jn.c
diff --git a/third_party/js-1.7/fdlibm/w_lgamma.c b/src/third_party/js-1.7/fdlibm/w_lgamma.c
index f7576e89213..f7576e89213 100644
--- a/third_party/js-1.7/fdlibm/w_lgamma.c
+++ b/src/third_party/js-1.7/fdlibm/w_lgamma.c
diff --git a/third_party/js-1.7/fdlibm/w_lgamma_r.c b/src/third_party/js-1.7/fdlibm/w_lgamma_r.c
index ba2ad5933d5..ba2ad5933d5 100644
--- a/third_party/js-1.7/fdlibm/w_lgamma_r.c
+++ b/src/third_party/js-1.7/fdlibm/w_lgamma_r.c
diff --git a/third_party/js-1.7/fdlibm/w_log.c b/src/third_party/js-1.7/fdlibm/w_log.c
index 7e358fcf117..7e358fcf117 100644
--- a/third_party/js-1.7/fdlibm/w_log.c
+++ b/src/third_party/js-1.7/fdlibm/w_log.c
diff --git a/third_party/js-1.7/fdlibm/w_log10.c b/src/third_party/js-1.7/fdlibm/w_log10.c
index 6b298b236f6..6b298b236f6 100644
--- a/third_party/js-1.7/fdlibm/w_log10.c
+++ b/src/third_party/js-1.7/fdlibm/w_log10.c
diff --git a/third_party/js-1.7/fdlibm/w_pow.c b/src/third_party/js-1.7/fdlibm/w_pow.c
index 3d2c15ad305..3d2c15ad305 100644
--- a/third_party/js-1.7/fdlibm/w_pow.c
+++ b/src/third_party/js-1.7/fdlibm/w_pow.c
diff --git a/third_party/js-1.7/fdlibm/w_remainder.c b/src/third_party/js-1.7/fdlibm/w_remainder.c
index 25d1ba171fa..25d1ba171fa 100644
--- a/third_party/js-1.7/fdlibm/w_remainder.c
+++ b/src/third_party/js-1.7/fdlibm/w_remainder.c
diff --git a/third_party/js-1.7/fdlibm/w_scalb.c b/src/third_party/js-1.7/fdlibm/w_scalb.c
index 35c16a50014..35c16a50014 100644
--- a/third_party/js-1.7/fdlibm/w_scalb.c
+++ b/src/third_party/js-1.7/fdlibm/w_scalb.c
diff --git a/third_party/js-1.7/fdlibm/w_sinh.c b/src/third_party/js-1.7/fdlibm/w_sinh.c
index 8b04ecb7fe9..8b04ecb7fe9 100644
--- a/third_party/js-1.7/fdlibm/w_sinh.c
+++ b/src/third_party/js-1.7/fdlibm/w_sinh.c
diff --git a/third_party/js-1.7/fdlibm/w_sqrt.c b/src/third_party/js-1.7/fdlibm/w_sqrt.c
index 462d776f8ef..462d776f8ef 100644
--- a/third_party/js-1.7/fdlibm/w_sqrt.c
+++ b/src/third_party/js-1.7/fdlibm/w_sqrt.c
diff --git a/third_party/js-1.7/js.c b/src/third_party/js-1.7/js.c
index fb4332f5c9a..fb4332f5c9a 100644
--- a/third_party/js-1.7/js.c
+++ b/src/third_party/js-1.7/js.c
diff --git a/third_party/js-1.7/js.mak b/src/third_party/js-1.7/js.mak
index f0f32b88277..f0f32b88277 100644
--- a/third_party/js-1.7/js.mak
+++ b/src/third_party/js-1.7/js.mak
diff --git a/third_party/js-1.7/js.mdp b/src/third_party/js-1.7/js.mdp
index 8da64fb6b61..8da64fb6b61 100644
--- a/third_party/js-1.7/js.mdp
+++ b/src/third_party/js-1.7/js.mdp
diff --git a/third_party/js-1.7/js.msg b/src/third_party/js-1.7/js.msg
index 2686af0356d..2686af0356d 100644
--- a/third_party/js-1.7/js.msg
+++ b/src/third_party/js-1.7/js.msg
diff --git a/third_party/js-1.7/js.pkg b/src/third_party/js-1.7/js.pkg
index 93185a92fe0..93185a92fe0 100644
--- a/third_party/js-1.7/js.pkg
+++ b/src/third_party/js-1.7/js.pkg
diff --git a/third_party/js-1.7/js3240.rc b/src/third_party/js-1.7/js3240.rc
index 1a9f62c00a4..1a9f62c00a4 100644
--- a/third_party/js-1.7/js3240.rc
+++ b/src/third_party/js-1.7/js3240.rc
diff --git a/third_party/js-1.7/jsOS240.def b/src/third_party/js-1.7/jsOS240.def
index 8f27d649791..8f27d649791 100644
--- a/third_party/js-1.7/jsOS240.def
+++ b/src/third_party/js-1.7/jsOS240.def
diff --git a/third_party/js-1.7/jsapi.c b/src/third_party/js-1.7/jsapi.c
index f03fa364f0a..f03fa364f0a 100644
--- a/third_party/js-1.7/jsapi.c
+++ b/src/third_party/js-1.7/jsapi.c
diff --git a/third_party/js-1.7/jsapi.h b/src/third_party/js-1.7/jsapi.h
index 464f19ffc3a..464f19ffc3a 100644
--- a/third_party/js-1.7/jsapi.h
+++ b/src/third_party/js-1.7/jsapi.h
diff --git a/third_party/js-1.7/jsarena.c b/src/third_party/js-1.7/jsarena.c
index ef6ccd19a90..ef6ccd19a90 100644
--- a/third_party/js-1.7/jsarena.c
+++ b/src/third_party/js-1.7/jsarena.c
diff --git a/third_party/js-1.7/jsarena.h b/src/third_party/js-1.7/jsarena.h
index 8be15d0871f..8be15d0871f 100644
--- a/third_party/js-1.7/jsarena.h
+++ b/src/third_party/js-1.7/jsarena.h
diff --git a/third_party/js-1.7/jsarray.c b/src/third_party/js-1.7/jsarray.c
index 532a1be389e..532a1be389e 100644
--- a/third_party/js-1.7/jsarray.c
+++ b/src/third_party/js-1.7/jsarray.c
diff --git a/third_party/js-1.7/jsarray.h b/src/third_party/js-1.7/jsarray.h
index a89561b4ca3..a89561b4ca3 100644
--- a/third_party/js-1.7/jsarray.h
+++ b/src/third_party/js-1.7/jsarray.h
diff --git a/third_party/js-1.7/jsatom.c b/src/third_party/js-1.7/jsatom.c
index 02ee250676f..02ee250676f 100644
--- a/third_party/js-1.7/jsatom.c
+++ b/src/third_party/js-1.7/jsatom.c
diff --git a/third_party/js-1.7/jsatom.h b/src/third_party/js-1.7/jsatom.h
index 4fb3d8d5188..4fb3d8d5188 100644
--- a/third_party/js-1.7/jsatom.h
+++ b/src/third_party/js-1.7/jsatom.h
diff --git a/third_party/js-1.7/jsbit.h b/src/third_party/js-1.7/jsbit.h
index 87bb0476a72..87bb0476a72 100644
--- a/third_party/js-1.7/jsbit.h
+++ b/src/third_party/js-1.7/jsbit.h
diff --git a/third_party/js-1.7/jsbool.c b/src/third_party/js-1.7/jsbool.c
index 543b4f3f60e..543b4f3f60e 100644
--- a/third_party/js-1.7/jsbool.c
+++ b/src/third_party/js-1.7/jsbool.c
diff --git a/third_party/js-1.7/jsbool.h b/src/third_party/js-1.7/jsbool.h
index 8dbd21813fc..8dbd21813fc 100644
--- a/third_party/js-1.7/jsbool.h
+++ b/src/third_party/js-1.7/jsbool.h
diff --git a/third_party/js-1.7/jsclist.h b/src/third_party/js-1.7/jsclist.h
index 604ec0ec956..604ec0ec956 100644
--- a/third_party/js-1.7/jsclist.h
+++ b/src/third_party/js-1.7/jsclist.h
diff --git a/third_party/js-1.7/jscntxt.c b/src/third_party/js-1.7/jscntxt.c
index 139ad9b8ac5..139ad9b8ac5 100644
--- a/third_party/js-1.7/jscntxt.c
+++ b/src/third_party/js-1.7/jscntxt.c
diff --git a/third_party/js-1.7/jscntxt.h b/src/third_party/js-1.7/jscntxt.h
index 7ca678e50bd..7ca678e50bd 100644
--- a/third_party/js-1.7/jscntxt.h
+++ b/src/third_party/js-1.7/jscntxt.h
diff --git a/third_party/js-1.7/jscompat.h b/src/third_party/js-1.7/jscompat.h
index 80d86056ecd..80d86056ecd 100644
--- a/third_party/js-1.7/jscompat.h
+++ b/src/third_party/js-1.7/jscompat.h
diff --git a/third_party/js-1.7/jsconfig.h b/src/third_party/js-1.7/jsconfig.h
index d61e802986e..d61e802986e 100644
--- a/third_party/js-1.7/jsconfig.h
+++ b/src/third_party/js-1.7/jsconfig.h
diff --git a/third_party/js-1.7/jsconfig.mk b/src/third_party/js-1.7/jsconfig.mk
index a3b88673220..a3b88673220 100644
--- a/third_party/js-1.7/jsconfig.mk
+++ b/src/third_party/js-1.7/jsconfig.mk
diff --git a/third_party/js-1.7/jscpucfg.c b/src/third_party/js-1.7/jscpucfg.c
index daa912188f9..daa912188f9 100644
--- a/third_party/js-1.7/jscpucfg.c
+++ b/src/third_party/js-1.7/jscpucfg.c
diff --git a/third_party/js-1.7/jscpucfg.h b/src/third_party/js-1.7/jscpucfg.h
index 63ef932a690..63ef932a690 100644
--- a/third_party/js-1.7/jscpucfg.h
+++ b/src/third_party/js-1.7/jscpucfg.h
diff --git a/third_party/js-1.7/jsdate.c b/src/third_party/js-1.7/jsdate.c
index 9e6697f0fac..9e6697f0fac 100644
--- a/third_party/js-1.7/jsdate.c
+++ b/src/third_party/js-1.7/jsdate.c
diff --git a/third_party/js-1.7/jsdate.h b/src/third_party/js-1.7/jsdate.h
index 88bd5f586ed..88bd5f586ed 100644
--- a/third_party/js-1.7/jsdate.h
+++ b/src/third_party/js-1.7/jsdate.h
diff --git a/third_party/js-1.7/jsdbgapi.c b/src/third_party/js-1.7/jsdbgapi.c
index 8fa0e684f3a..8fa0e684f3a 100644
--- a/third_party/js-1.7/jsdbgapi.c
+++ b/src/third_party/js-1.7/jsdbgapi.c
diff --git a/third_party/js-1.7/jsdbgapi.h b/src/third_party/js-1.7/jsdbgapi.h
index d2e1f1c69ec..d2e1f1c69ec 100644
--- a/third_party/js-1.7/jsdbgapi.h
+++ b/src/third_party/js-1.7/jsdbgapi.h
diff --git a/third_party/js-1.7/jsdhash.c b/src/third_party/js-1.7/jsdhash.c
index 295883b2fdf..295883b2fdf 100644
--- a/third_party/js-1.7/jsdhash.c
+++ b/src/third_party/js-1.7/jsdhash.c
diff --git a/third_party/js-1.7/jsdhash.h b/src/third_party/js-1.7/jsdhash.h
index 76867e52a61..76867e52a61 100644
--- a/third_party/js-1.7/jsdhash.h
+++ b/src/third_party/js-1.7/jsdhash.h
diff --git a/third_party/js-1.7/jsdtoa.c b/src/third_party/js-1.7/jsdtoa.c
index 5b0b09ff9b4..5b0b09ff9b4 100644
--- a/third_party/js-1.7/jsdtoa.c
+++ b/src/third_party/js-1.7/jsdtoa.c
diff --git a/third_party/js-1.7/jsdtoa.h b/src/third_party/js-1.7/jsdtoa.h
index 409f45454b5..409f45454b5 100644
--- a/third_party/js-1.7/jsdtoa.h
+++ b/src/third_party/js-1.7/jsdtoa.h
diff --git a/third_party/js-1.7/jsemit.c b/src/third_party/js-1.7/jsemit.c
index f8a06beb5fd..f8a06beb5fd 100644
--- a/third_party/js-1.7/jsemit.c
+++ b/src/third_party/js-1.7/jsemit.c
diff --git a/third_party/js-1.7/jsemit.h b/src/third_party/js-1.7/jsemit.h
index 90709c22ae9..90709c22ae9 100644
--- a/third_party/js-1.7/jsemit.h
+++ b/src/third_party/js-1.7/jsemit.h
diff --git a/third_party/js-1.7/jsexn.c b/src/third_party/js-1.7/jsexn.c
index e60f85e4aaa..e60f85e4aaa 100644
--- a/third_party/js-1.7/jsexn.c
+++ b/src/third_party/js-1.7/jsexn.c
diff --git a/third_party/js-1.7/jsexn.h b/src/third_party/js-1.7/jsexn.h
index 58cb984d4c7..58cb984d4c7 100644
--- a/third_party/js-1.7/jsexn.h
+++ b/src/third_party/js-1.7/jsexn.h
diff --git a/third_party/js-1.7/jsfile.c b/src/third_party/js-1.7/jsfile.c
index ed1c4e8b6ea..ed1c4e8b6ea 100644
--- a/third_party/js-1.7/jsfile.c
+++ b/src/third_party/js-1.7/jsfile.c
diff --git a/third_party/js-1.7/jsfile.h b/src/third_party/js-1.7/jsfile.h
index 78707e8b72d..78707e8b72d 100644
--- a/third_party/js-1.7/jsfile.h
+++ b/src/third_party/js-1.7/jsfile.h
diff --git a/third_party/js-1.7/jsfile.msg b/src/third_party/js-1.7/jsfile.msg
index 137b35d8740..137b35d8740 100644
--- a/third_party/js-1.7/jsfile.msg
+++ b/src/third_party/js-1.7/jsfile.msg
diff --git a/third_party/js-1.7/jsfun.c b/src/third_party/js-1.7/jsfun.c
index 2a2df539c8d..2a2df539c8d 100644
--- a/third_party/js-1.7/jsfun.c
+++ b/src/third_party/js-1.7/jsfun.c
diff --git a/third_party/js-1.7/jsfun.h b/src/third_party/js-1.7/jsfun.h
index 8d5c1850a34..8d5c1850a34 100644
--- a/third_party/js-1.7/jsfun.h
+++ b/src/third_party/js-1.7/jsfun.h
diff --git a/third_party/js-1.7/jsgc.c b/src/third_party/js-1.7/jsgc.c
index 7fae096e0e8..7fae096e0e8 100644
--- a/third_party/js-1.7/jsgc.c
+++ b/src/third_party/js-1.7/jsgc.c
diff --git a/third_party/js-1.7/jsgc.h b/src/third_party/js-1.7/jsgc.h
index ec623a1a331..ec623a1a331 100644
--- a/third_party/js-1.7/jsgc.h
+++ b/src/third_party/js-1.7/jsgc.h
diff --git a/third_party/js-1.7/jshash.c b/src/third_party/js-1.7/jshash.c
index 8e25517d5c0..8e25517d5c0 100644
--- a/third_party/js-1.7/jshash.c
+++ b/src/third_party/js-1.7/jshash.c
diff --git a/third_party/js-1.7/jshash.h b/src/third_party/js-1.7/jshash.h
index 2a125e1907d..2a125e1907d 100644
--- a/third_party/js-1.7/jshash.h
+++ b/src/third_party/js-1.7/jshash.h
diff --git a/third_party/js-1.7/jsify.pl b/src/third_party/js-1.7/jsify.pl
index fa7f4f83c49..fa7f4f83c49 100644
--- a/third_party/js-1.7/jsify.pl
+++ b/src/third_party/js-1.7/jsify.pl
diff --git a/third_party/js-1.7/jsinterp.c b/src/third_party/js-1.7/jsinterp.c
index c8c120482fa..c8c120482fa 100644
--- a/third_party/js-1.7/jsinterp.c
+++ b/src/third_party/js-1.7/jsinterp.c
diff --git a/third_party/js-1.7/jsinterp.h b/src/third_party/js-1.7/jsinterp.h
index ab60b3af78a..ab60b3af78a 100644
--- a/third_party/js-1.7/jsinterp.h
+++ b/src/third_party/js-1.7/jsinterp.h
diff --git a/third_party/js-1.7/jsiter.c b/src/third_party/js-1.7/jsiter.c
index 0a4de54214f..0a4de54214f 100644
--- a/third_party/js-1.7/jsiter.c
+++ b/src/third_party/js-1.7/jsiter.c
diff --git a/third_party/js-1.7/jsiter.h b/src/third_party/js-1.7/jsiter.h
index 1a99b6b06f3..1a99b6b06f3 100644
--- a/third_party/js-1.7/jsiter.h
+++ b/src/third_party/js-1.7/jsiter.h
diff --git a/third_party/js-1.7/jskeyword.tbl b/src/third_party/js-1.7/jskeyword.tbl
index 49b9c6c8c61..49b9c6c8c61 100644
--- a/third_party/js-1.7/jskeyword.tbl
+++ b/src/third_party/js-1.7/jskeyword.tbl
diff --git a/third_party/js-1.7/jskwgen.c b/src/third_party/js-1.7/jskwgen.c
index 5ae39bd99db..5ae39bd99db 100644
--- a/third_party/js-1.7/jskwgen.c
+++ b/src/third_party/js-1.7/jskwgen.c
diff --git a/third_party/js-1.7/jslibmath.h b/src/third_party/js-1.7/jslibmath.h
index 3f75f30b464..3f75f30b464 100644
--- a/third_party/js-1.7/jslibmath.h
+++ b/src/third_party/js-1.7/jslibmath.h
diff --git a/third_party/js-1.7/jslock.c b/src/third_party/js-1.7/jslock.c
index 48550099797..48550099797 100644
--- a/third_party/js-1.7/jslock.c
+++ b/src/third_party/js-1.7/jslock.c
diff --git a/third_party/js-1.7/jslock.h b/src/third_party/js-1.7/jslock.h
index f9ed03db553..f9ed03db553 100644
--- a/third_party/js-1.7/jslock.h
+++ b/src/third_party/js-1.7/jslock.h
diff --git a/third_party/js-1.7/jslocko.asm b/src/third_party/js-1.7/jslocko.asm
index 95353ba1a09..95353ba1a09 100644
--- a/third_party/js-1.7/jslocko.asm
+++ b/src/third_party/js-1.7/jslocko.asm
diff --git a/third_party/js-1.7/jslog2.c b/src/third_party/js-1.7/jslog2.c
index 876e5285d26..876e5285d26 100644
--- a/third_party/js-1.7/jslog2.c
+++ b/src/third_party/js-1.7/jslog2.c
diff --git a/third_party/js-1.7/jslong.c b/src/third_party/js-1.7/jslong.c
index 9a4a5b4d789..9a4a5b4d789 100644
--- a/third_party/js-1.7/jslong.c
+++ b/src/third_party/js-1.7/jslong.c
diff --git a/third_party/js-1.7/jslong.h b/src/third_party/js-1.7/jslong.h
index 059cf00bb22..059cf00bb22 100644
--- a/third_party/js-1.7/jslong.h
+++ b/src/third_party/js-1.7/jslong.h
diff --git a/third_party/js-1.7/jsmath.c b/src/third_party/js-1.7/jsmath.c
index 2062916324b..2062916324b 100644
--- a/third_party/js-1.7/jsmath.c
+++ b/src/third_party/js-1.7/jsmath.c
diff --git a/third_party/js-1.7/jsmath.h b/src/third_party/js-1.7/jsmath.h
index 1f60630bca2..1f60630bca2 100644
--- a/third_party/js-1.7/jsmath.h
+++ b/src/third_party/js-1.7/jsmath.h
diff --git a/third_party/js-1.7/jsnum.c b/src/third_party/js-1.7/jsnum.c
index 987619dbde6..987619dbde6 100644
--- a/third_party/js-1.7/jsnum.c
+++ b/src/third_party/js-1.7/jsnum.c
diff --git a/third_party/js-1.7/jsnum.h b/src/third_party/js-1.7/jsnum.h
index cd99501e77f..cd99501e77f 100644
--- a/third_party/js-1.7/jsnum.h
+++ b/src/third_party/js-1.7/jsnum.h
diff --git a/third_party/js-1.7/jsobj.c b/src/third_party/js-1.7/jsobj.c
index b552acafe98..b552acafe98 100644
--- a/third_party/js-1.7/jsobj.c
+++ b/src/third_party/js-1.7/jsobj.c
diff --git a/third_party/js-1.7/jsobj.h b/src/third_party/js-1.7/jsobj.h
index eb3aedb71f9..eb3aedb71f9 100644
--- a/third_party/js-1.7/jsobj.h
+++ b/src/third_party/js-1.7/jsobj.h
diff --git a/third_party/js-1.7/jsopcode.c b/src/third_party/js-1.7/jsopcode.c
index 3dec776cf69..3dec776cf69 100644
--- a/third_party/js-1.7/jsopcode.c
+++ b/src/third_party/js-1.7/jsopcode.c
diff --git a/third_party/js-1.7/jsopcode.h b/src/third_party/js-1.7/jsopcode.h
index 3f7e1de9d5c..3f7e1de9d5c 100644
--- a/third_party/js-1.7/jsopcode.h
+++ b/src/third_party/js-1.7/jsopcode.h
diff --git a/third_party/js-1.7/jsopcode.tbl b/src/third_party/js-1.7/jsopcode.tbl
index 4a4ca89830d..4a4ca89830d 100644
--- a/third_party/js-1.7/jsopcode.tbl
+++ b/src/third_party/js-1.7/jsopcode.tbl
diff --git a/third_party/js-1.7/jsosdep.h b/src/third_party/js-1.7/jsosdep.h
index a26614485ab..a26614485ab 100644
--- a/third_party/js-1.7/jsosdep.h
+++ b/src/third_party/js-1.7/jsosdep.h
diff --git a/third_party/js-1.7/jsotypes.h b/src/third_party/js-1.7/jsotypes.h
index 38d72869cca..38d72869cca 100644
--- a/third_party/js-1.7/jsotypes.h
+++ b/src/third_party/js-1.7/jsotypes.h
diff --git a/third_party/js-1.7/jsparse.c b/src/third_party/js-1.7/jsparse.c
index 132e2ad26b7..132e2ad26b7 100644
--- a/third_party/js-1.7/jsparse.c
+++ b/src/third_party/js-1.7/jsparse.c
diff --git a/third_party/js-1.7/jsparse.h b/src/third_party/js-1.7/jsparse.h
index 7c23927eb32..7c23927eb32 100644
--- a/third_party/js-1.7/jsparse.h
+++ b/src/third_party/js-1.7/jsparse.h
diff --git a/third_party/js-1.7/jsprf.c b/src/third_party/js-1.7/jsprf.c
index 416c16c82c7..416c16c82c7 100644
--- a/third_party/js-1.7/jsprf.c
+++ b/src/third_party/js-1.7/jsprf.c
diff --git a/third_party/js-1.7/jsprf.h b/src/third_party/js-1.7/jsprf.h
index 0eb910f279d..0eb910f279d 100644
--- a/third_party/js-1.7/jsprf.h
+++ b/src/third_party/js-1.7/jsprf.h
diff --git a/third_party/js-1.7/jsproto.tbl b/src/third_party/js-1.7/jsproto.tbl
index 18f2355945c..18f2355945c 100644
--- a/third_party/js-1.7/jsproto.tbl
+++ b/src/third_party/js-1.7/jsproto.tbl
diff --git a/third_party/js-1.7/jsprvtd.h b/src/third_party/js-1.7/jsprvtd.h
index f71b9a508b0..f71b9a508b0 100644
--- a/third_party/js-1.7/jsprvtd.h
+++ b/src/third_party/js-1.7/jsprvtd.h
diff --git a/third_party/js-1.7/jspubtd.h b/src/third_party/js-1.7/jspubtd.h
index 4e8c92a61f0..4e8c92a61f0 100644
--- a/third_party/js-1.7/jspubtd.h
+++ b/src/third_party/js-1.7/jspubtd.h
diff --git a/third_party/js-1.7/jsregexp.c b/src/third_party/js-1.7/jsregexp.c
index 5d2fce48d12..5d2fce48d12 100644
--- a/third_party/js-1.7/jsregexp.c
+++ b/src/third_party/js-1.7/jsregexp.c
diff --git a/third_party/js-1.7/jsregexp.h b/src/third_party/js-1.7/jsregexp.h
index 50789832d09..50789832d09 100644
--- a/third_party/js-1.7/jsregexp.h
+++ b/src/third_party/js-1.7/jsregexp.h
diff --git a/third_party/js-1.7/jsscan.c b/src/third_party/js-1.7/jsscan.c
index f9f7436f956..f9f7436f956 100644
--- a/third_party/js-1.7/jsscan.c
+++ b/src/third_party/js-1.7/jsscan.c
diff --git a/third_party/js-1.7/jsscan.h b/src/third_party/js-1.7/jsscan.h
index 08cb0956028..08cb0956028 100644
--- a/third_party/js-1.7/jsscan.h
+++ b/src/third_party/js-1.7/jsscan.h
diff --git a/third_party/js-1.7/jsscope.c b/src/third_party/js-1.7/jsscope.c
index 49b55a6fbfd..49b55a6fbfd 100644
--- a/third_party/js-1.7/jsscope.c
+++ b/src/third_party/js-1.7/jsscope.c
diff --git a/third_party/js-1.7/jsscope.h b/src/third_party/js-1.7/jsscope.h
index 0565d4d8115..0565d4d8115 100644
--- a/third_party/js-1.7/jsscope.h
+++ b/src/third_party/js-1.7/jsscope.h
diff --git a/third_party/js-1.7/jsscript.c b/src/third_party/js-1.7/jsscript.c
index 73298a4244e..73298a4244e 100644
--- a/third_party/js-1.7/jsscript.c
+++ b/src/third_party/js-1.7/jsscript.c
diff --git a/third_party/js-1.7/jsscript.h b/src/third_party/js-1.7/jsscript.h
index 18ad373d007..18ad373d007 100644
--- a/third_party/js-1.7/jsscript.h
+++ b/src/third_party/js-1.7/jsscript.h
diff --git a/third_party/js-1.7/jsshell.msg b/src/third_party/js-1.7/jsshell.msg
index 4b811ac01da..4b811ac01da 100644
--- a/third_party/js-1.7/jsshell.msg
+++ b/src/third_party/js-1.7/jsshell.msg
diff --git a/third_party/js-1.7/jsstddef.h b/src/third_party/js-1.7/jsstddef.h
index addaa88ff6f..addaa88ff6f 100644
--- a/third_party/js-1.7/jsstddef.h
+++ b/src/third_party/js-1.7/jsstddef.h
diff --git a/third_party/js-1.7/jsstr.c b/src/third_party/js-1.7/jsstr.c
index e38f6525dc7..e38f6525dc7 100644
--- a/third_party/js-1.7/jsstr.c
+++ b/src/third_party/js-1.7/jsstr.c
diff --git a/third_party/js-1.7/jsstr.h b/src/third_party/js-1.7/jsstr.h
index 708c69acbcf..708c69acbcf 100644
--- a/third_party/js-1.7/jsstr.h
+++ b/src/third_party/js-1.7/jsstr.h
diff --git a/third_party/js-1.7/jstypes.h b/src/third_party/js-1.7/jstypes.h
index 8aca929ca73..8aca929ca73 100644
--- a/third_party/js-1.7/jstypes.h
+++ b/src/third_party/js-1.7/jstypes.h
diff --git a/third_party/js-1.7/jsutil.c b/src/third_party/js-1.7/jsutil.c
index 1bb9f939910..1bb9f939910 100644
--- a/third_party/js-1.7/jsutil.c
+++ b/src/third_party/js-1.7/jsutil.c
diff --git a/third_party/js-1.7/jsutil.h b/src/third_party/js-1.7/jsutil.h
index efcb614cb21..efcb614cb21 100644
--- a/third_party/js-1.7/jsutil.h
+++ b/src/third_party/js-1.7/jsutil.h
diff --git a/third_party/js-1.7/jsxdrapi.c b/src/third_party/js-1.7/jsxdrapi.c
index 2855c608e92..2855c608e92 100644
--- a/third_party/js-1.7/jsxdrapi.c
+++ b/src/third_party/js-1.7/jsxdrapi.c
diff --git a/third_party/js-1.7/jsxdrapi.h b/src/third_party/js-1.7/jsxdrapi.h
index 35d9918a302..35d9918a302 100644
--- a/third_party/js-1.7/jsxdrapi.h
+++ b/src/third_party/js-1.7/jsxdrapi.h
diff --git a/third_party/js-1.7/jsxml.c b/src/third_party/js-1.7/jsxml.c
index 1266255ba2f..1266255ba2f 100644
--- a/third_party/js-1.7/jsxml.c
+++ b/src/third_party/js-1.7/jsxml.c
diff --git a/third_party/js-1.7/jsxml.h b/src/third_party/js-1.7/jsxml.h
index 71e591acc57..71e591acc57 100644
--- a/third_party/js-1.7/jsxml.h
+++ b/src/third_party/js-1.7/jsxml.h
diff --git a/third_party/js-1.7/lock_SunOS.s b/src/third_party/js-1.7/lock_SunOS.s
index 7a842d186e0..7a842d186e0 100644
--- a/third_party/js-1.7/lock_SunOS.s
+++ b/src/third_party/js-1.7/lock_SunOS.s
diff --git a/third_party/js-1.7/perfect.js b/src/third_party/js-1.7/perfect.js
index aeca121186b..aeca121186b 100644
--- a/third_party/js-1.7/perfect.js
+++ b/src/third_party/js-1.7/perfect.js
diff --git a/third_party/js-1.7/plify_jsdhash.sed b/src/third_party/js-1.7/plify_jsdhash.sed
index eff4901c5fe..eff4901c5fe 100644
--- a/third_party/js-1.7/plify_jsdhash.sed
+++ b/src/third_party/js-1.7/plify_jsdhash.sed
diff --git a/third_party/js-1.7/prmjtime.c b/src/third_party/js-1.7/prmjtime.c
index 3228af8be89..3228af8be89 100644
--- a/third_party/js-1.7/prmjtime.c
+++ b/src/third_party/js-1.7/prmjtime.c
diff --git a/third_party/js-1.7/prmjtime.h b/src/third_party/js-1.7/prmjtime.h
index b74fe845eb6..b74fe845eb6 100644
--- a/third_party/js-1.7/prmjtime.h
+++ b/src/third_party/js-1.7/prmjtime.h
diff --git a/third_party/js-1.7/resource.h b/src/third_party/js-1.7/resource.h
index 9301810e444..9301810e444 100644
--- a/third_party/js-1.7/resource.h
+++ b/src/third_party/js-1.7/resource.h
diff --git a/third_party/js-1.7/rules.mk b/src/third_party/js-1.7/rules.mk
index 8d484db9a5f..8d484db9a5f 100644
--- a/third_party/js-1.7/rules.mk
+++ b/src/third_party/js-1.7/rules.mk
diff --git a/third_party/js-1.7/win32.order b/src/third_party/js-1.7/win32.order
index cf4e8c41ce5..cf4e8c41ce5 100644
--- a/third_party/js-1.7/win32.order
+++ b/src/third_party/js-1.7/win32.order
diff --git a/third_party/linenoise/Makefile b/src/third_party/linenoise/Makefile
index b335b658524..b335b658524 100644
--- a/third_party/linenoise/Makefile
+++ b/src/third_party/linenoise/Makefile
diff --git a/third_party/linenoise/README.markdown b/src/third_party/linenoise/README.markdown
index 6c693ed0ba1..6c693ed0ba1 100644
--- a/third_party/linenoise/README.markdown
+++ b/src/third_party/linenoise/README.markdown
diff --git a/third_party/linenoise/example.c b/src/third_party/linenoise/example.c
index ea0b515c1fc..ea0b515c1fc 100644
--- a/third_party/linenoise/example.c
+++ b/src/third_party/linenoise/example.c
diff --git a/third_party/linenoise/history.txt b/src/third_party/linenoise/history.txt
index 70858d8e9a1..70858d8e9a1 100644
--- a/third_party/linenoise/history.txt
+++ b/src/third_party/linenoise/history.txt
diff --git a/third_party/linenoise/linenoise.cpp b/src/third_party/linenoise/linenoise.cpp
index 98e48415066..98e48415066 100644
--- a/third_party/linenoise/linenoise.cpp
+++ b/src/third_party/linenoise/linenoise.cpp
diff --git a/third_party/linenoise/linenoise.h b/src/third_party/linenoise/linenoise.h
index fdbbaaab187..fdbbaaab187 100644
--- a/third_party/linenoise/linenoise.h
+++ b/src/third_party/linenoise/linenoise.h
diff --git a/third_party/linenoise/linenoise_win32.cpp b/src/third_party/linenoise/linenoise_win32.cpp
index 0a2c33485b1..0a2c33485b1 100644
--- a/third_party/linenoise/linenoise_win32.cpp
+++ b/src/third_party/linenoise/linenoise_win32.cpp
diff --git a/third_party/pcre-7.4/config-cmake.h.in b/src/third_party/pcre-7.4/config-cmake.h.in
index 27a2d02cb27..27a2d02cb27 100644
--- a/third_party/pcre-7.4/config-cmake.h.in
+++ b/src/third_party/pcre-7.4/config-cmake.h.in
diff --git a/third_party/pcre-7.4/config.h b/src/third_party/pcre-7.4/config.h
index 101d071b211..101d071b211 100644
--- a/third_party/pcre-7.4/config.h
+++ b/src/third_party/pcre-7.4/config.h
diff --git a/third_party/pcre-7.4/config.h.generic b/src/third_party/pcre-7.4/config.h.generic
index b6d7ab8f3b0..b6d7ab8f3b0 100644
--- a/third_party/pcre-7.4/config.h.generic
+++ b/src/third_party/pcre-7.4/config.h.generic
diff --git a/third_party/pcre-7.4/config.h.in b/src/third_party/pcre-7.4/config.h.in
index c4ea3c4b367..c4ea3c4b367 100644
--- a/third_party/pcre-7.4/config.h.in
+++ b/src/third_party/pcre-7.4/config.h.in
diff --git a/third_party/pcre-7.4/dftables.c b/src/third_party/pcre-7.4/dftables.c
index 67bca539fa7..67bca539fa7 100644
--- a/third_party/pcre-7.4/dftables.c
+++ b/src/third_party/pcre-7.4/dftables.c
diff --git a/third_party/pcre-7.4/pcre.h b/src/third_party/pcre-7.4/pcre.h
index 701699b61a8..701699b61a8 100644
--- a/third_party/pcre-7.4/pcre.h
+++ b/src/third_party/pcre-7.4/pcre.h
diff --git a/third_party/pcre-7.4/pcre.h.generic b/src/third_party/pcre-7.4/pcre.h.generic
index 58a83c369a6..58a83c369a6 100644
--- a/third_party/pcre-7.4/pcre.h.generic
+++ b/src/third_party/pcre-7.4/pcre.h.generic
diff --git a/third_party/pcre-7.4/pcre.h.in b/src/third_party/pcre-7.4/pcre.h.in
index 8bebbb47696..8bebbb47696 100644
--- a/third_party/pcre-7.4/pcre.h.in
+++ b/src/third_party/pcre-7.4/pcre.h.in
diff --git a/third_party/pcre-7.4/pcre_chartables.c b/src/third_party/pcre-7.4/pcre_chartables.c
index ae45db0ca35..ae45db0ca35 100644
--- a/third_party/pcre-7.4/pcre_chartables.c
+++ b/src/third_party/pcre-7.4/pcre_chartables.c
diff --git a/third_party/pcre-7.4/pcre_chartables.c.dist b/src/third_party/pcre-7.4/pcre_chartables.c.dist
index ae45db0ca35..ae45db0ca35 100644
--- a/third_party/pcre-7.4/pcre_chartables.c.dist
+++ b/src/third_party/pcre-7.4/pcre_chartables.c.dist
diff --git a/third_party/pcre-7.4/pcre_compile.c b/src/third_party/pcre-7.4/pcre_compile.c
index 3994781a587..3994781a587 100644
--- a/third_party/pcre-7.4/pcre_compile.c
+++ b/src/third_party/pcre-7.4/pcre_compile.c
diff --git a/third_party/pcre-7.4/pcre_config.c b/src/third_party/pcre-7.4/pcre_config.c
index 220ef93cb10..220ef93cb10 100644
--- a/third_party/pcre-7.4/pcre_config.c
+++ b/src/third_party/pcre-7.4/pcre_config.c
diff --git a/third_party/pcre-7.4/pcre_dfa_exec.c b/src/third_party/pcre-7.4/pcre_dfa_exec.c
index e590fbb145f..e590fbb145f 100644
--- a/third_party/pcre-7.4/pcre_dfa_exec.c
+++ b/src/third_party/pcre-7.4/pcre_dfa_exec.c
diff --git a/third_party/pcre-7.4/pcre_exec.c b/src/third_party/pcre-7.4/pcre_exec.c
index 657c142c061..657c142c061 100644
--- a/third_party/pcre-7.4/pcre_exec.c
+++ b/src/third_party/pcre-7.4/pcre_exec.c
diff --git a/third_party/pcre-7.4/pcre_fullinfo.c b/src/third_party/pcre-7.4/pcre_fullinfo.c
index 04e31f69adf..04e31f69adf 100644
--- a/third_party/pcre-7.4/pcre_fullinfo.c
+++ b/src/third_party/pcre-7.4/pcre_fullinfo.c
diff --git a/third_party/pcre-7.4/pcre_get.c b/src/third_party/pcre-7.4/pcre_get.c
index fc283c88e1a..fc283c88e1a 100644
--- a/third_party/pcre-7.4/pcre_get.c
+++ b/src/third_party/pcre-7.4/pcre_get.c
diff --git a/third_party/pcre-7.4/pcre_globals.c b/src/third_party/pcre-7.4/pcre_globals.c
index 4794819148a..4794819148a 100644
--- a/third_party/pcre-7.4/pcre_globals.c
+++ b/src/third_party/pcre-7.4/pcre_globals.c
diff --git a/third_party/pcre-7.4/pcre_info.c b/src/third_party/pcre-7.4/pcre_info.c
index 9bcccbcab37..9bcccbcab37 100644
--- a/third_party/pcre-7.4/pcre_info.c
+++ b/src/third_party/pcre-7.4/pcre_info.c
diff --git a/third_party/pcre-7.4/pcre_internal.h b/src/third_party/pcre-7.4/pcre_internal.h
index 5fbb3443333..5fbb3443333 100644
--- a/third_party/pcre-7.4/pcre_internal.h
+++ b/src/third_party/pcre-7.4/pcre_internal.h
diff --git a/third_party/pcre-7.4/pcre_maketables.c b/src/third_party/pcre-7.4/pcre_maketables.c
index 352bea98e7a..352bea98e7a 100644
--- a/third_party/pcre-7.4/pcre_maketables.c
+++ b/src/third_party/pcre-7.4/pcre_maketables.c
diff --git a/third_party/pcre-7.4/pcre_newline.c b/src/third_party/pcre-7.4/pcre_newline.c
index 1708d939589..1708d939589 100644
--- a/third_party/pcre-7.4/pcre_newline.c
+++ b/src/third_party/pcre-7.4/pcre_newline.c
diff --git a/third_party/pcre-7.4/pcre_ord2utf8.c b/src/third_party/pcre-7.4/pcre_ord2utf8.c
index d3904c655d3..d3904c655d3 100644
--- a/third_party/pcre-7.4/pcre_ord2utf8.c
+++ b/src/third_party/pcre-7.4/pcre_ord2utf8.c
diff --git a/third_party/pcre-7.4/pcre_refcount.c b/src/third_party/pcre-7.4/pcre_refcount.c
index b14103c7b8e..b14103c7b8e 100644
--- a/third_party/pcre-7.4/pcre_refcount.c
+++ b/src/third_party/pcre-7.4/pcre_refcount.c
diff --git a/third_party/pcre-7.4/pcre_scanner.cc b/src/third_party/pcre-7.4/pcre_scanner.cc
index a817a684e21..a817a684e21 100644
--- a/third_party/pcre-7.4/pcre_scanner.cc
+++ b/src/third_party/pcre-7.4/pcre_scanner.cc
diff --git a/third_party/pcre-7.4/pcre_scanner.h b/src/third_party/pcre-7.4/pcre_scanner.h
index 8d2265f8cb2..8d2265f8cb2 100644
--- a/third_party/pcre-7.4/pcre_scanner.h
+++ b/src/third_party/pcre-7.4/pcre_scanner.h
diff --git a/third_party/pcre-7.4/pcre_scanner_unittest.cc b/src/third_party/pcre-7.4/pcre_scanner_unittest.cc
index 284c8ea99e1..284c8ea99e1 100644
--- a/third_party/pcre-7.4/pcre_scanner_unittest.cc
+++ b/src/third_party/pcre-7.4/pcre_scanner_unittest.cc
diff --git a/third_party/pcre-7.4/pcre_stringpiece.cc b/src/third_party/pcre-7.4/pcre_stringpiece.cc
index 67c0f1fc0e5..67c0f1fc0e5 100644
--- a/third_party/pcre-7.4/pcre_stringpiece.cc
+++ b/src/third_party/pcre-7.4/pcre_stringpiece.cc
diff --git a/third_party/pcre-7.4/pcre_stringpiece.h b/src/third_party/pcre-7.4/pcre_stringpiece.h
index 599a3516088..599a3516088 100644
--- a/third_party/pcre-7.4/pcre_stringpiece.h
+++ b/src/third_party/pcre-7.4/pcre_stringpiece.h
diff --git a/third_party/pcre-7.4/pcre_stringpiece.h.in b/src/third_party/pcre-7.4/pcre_stringpiece.h.in
index b017661eb4f..b017661eb4f 100644
--- a/third_party/pcre-7.4/pcre_stringpiece.h.in
+++ b/src/third_party/pcre-7.4/pcre_stringpiece.h.in
diff --git a/third_party/pcre-7.4/pcre_stringpiece_unittest.cc b/src/third_party/pcre-7.4/pcre_stringpiece_unittest.cc
index 1e821ab6e44..1e821ab6e44 100644
--- a/third_party/pcre-7.4/pcre_stringpiece_unittest.cc
+++ b/src/third_party/pcre-7.4/pcre_stringpiece_unittest.cc
diff --git a/third_party/pcre-7.4/pcre_study.c b/src/third_party/pcre-7.4/pcre_study.c
index 1c283848b13..1c283848b13 100644
--- a/third_party/pcre-7.4/pcre_study.c
+++ b/src/third_party/pcre-7.4/pcre_study.c
diff --git a/third_party/pcre-7.4/pcre_tables.c b/src/third_party/pcre-7.4/pcre_tables.c
index 4b14fd1befa..4b14fd1befa 100644
--- a/third_party/pcre-7.4/pcre_tables.c
+++ b/src/third_party/pcre-7.4/pcre_tables.c
diff --git a/third_party/pcre-7.4/pcre_try_flipped.c b/src/third_party/pcre-7.4/pcre_try_flipped.c
index 412902bbbeb..412902bbbeb 100644
--- a/third_party/pcre-7.4/pcre_try_flipped.c
+++ b/src/third_party/pcre-7.4/pcre_try_flipped.c
diff --git a/third_party/pcre-7.4/pcre_ucp_searchfuncs.c b/src/third_party/pcre-7.4/pcre_ucp_searchfuncs.c
index 316163e655a..316163e655a 100644
--- a/third_party/pcre-7.4/pcre_ucp_searchfuncs.c
+++ b/src/third_party/pcre-7.4/pcre_ucp_searchfuncs.c
diff --git a/third_party/pcre-7.4/pcre_valid_utf8.c b/src/third_party/pcre-7.4/pcre_valid_utf8.c
index 189914243dd..189914243dd 100644
--- a/third_party/pcre-7.4/pcre_valid_utf8.c
+++ b/src/third_party/pcre-7.4/pcre_valid_utf8.c
diff --git a/third_party/pcre-7.4/pcre_version.c b/src/third_party/pcre-7.4/pcre_version.c
index c3b9ceebd32..c3b9ceebd32 100644
--- a/third_party/pcre-7.4/pcre_version.c
+++ b/src/third_party/pcre-7.4/pcre_version.c
diff --git a/third_party/pcre-7.4/pcre_xclass.c b/src/third_party/pcre-7.4/pcre_xclass.c
index cdf1af12fde..cdf1af12fde 100644
--- a/third_party/pcre-7.4/pcre_xclass.c
+++ b/src/third_party/pcre-7.4/pcre_xclass.c
diff --git a/third_party/pcre-7.4/pcrecpp.cc b/src/third_party/pcre-7.4/pcrecpp.cc
index ffb7932b00b..ffb7932b00b 100644
--- a/third_party/pcre-7.4/pcrecpp.cc
+++ b/src/third_party/pcre-7.4/pcrecpp.cc
diff --git a/third_party/pcre-7.4/pcrecpp.h b/src/third_party/pcre-7.4/pcrecpp.h
index 5a0d5977db5..5a0d5977db5 100644
--- a/third_party/pcre-7.4/pcrecpp.h
+++ b/src/third_party/pcre-7.4/pcrecpp.h
diff --git a/third_party/pcre-7.4/pcrecpp_internal.h b/src/third_party/pcre-7.4/pcrecpp_internal.h
index 0af9478404c..0af9478404c 100644
--- a/third_party/pcre-7.4/pcrecpp_internal.h
+++ b/src/third_party/pcre-7.4/pcrecpp_internal.h
diff --git a/third_party/pcre-7.4/pcrecpp_unittest.cc b/src/third_party/pcre-7.4/pcrecpp_unittest.cc
index 463a11c4cb5..463a11c4cb5 100644
--- a/third_party/pcre-7.4/pcrecpp_unittest.cc
+++ b/src/third_party/pcre-7.4/pcrecpp_unittest.cc
diff --git a/third_party/pcre-7.4/pcrecpparg.h b/src/third_party/pcre-7.4/pcrecpparg.h
index c5bfae0482d..c5bfae0482d 100644
--- a/third_party/pcre-7.4/pcrecpparg.h
+++ b/src/third_party/pcre-7.4/pcrecpparg.h
diff --git a/third_party/pcre-7.4/pcrecpparg.h.in b/src/third_party/pcre-7.4/pcrecpparg.h.in
index 83cc44b17a5..83cc44b17a5 100644
--- a/third_party/pcre-7.4/pcrecpparg.h.in
+++ b/src/third_party/pcre-7.4/pcrecpparg.h.in
diff --git a/third_party/pcre-7.4/pcredemo.c b/src/third_party/pcre-7.4/pcredemo.c
index 4068e3e04d5..4068e3e04d5 100644
--- a/third_party/pcre-7.4/pcredemo.c
+++ b/src/third_party/pcre-7.4/pcredemo.c
diff --git a/third_party/pcre-7.4/pcregrep.c b/src/third_party/pcre-7.4/pcregrep.c
index b44574e1a4a..b44574e1a4a 100644
--- a/third_party/pcre-7.4/pcregrep.c
+++ b/src/third_party/pcre-7.4/pcregrep.c
diff --git a/third_party/pcre-7.4/pcreposix.c b/src/third_party/pcre-7.4/pcreposix.c
index 24f2109489f..24f2109489f 100644
--- a/third_party/pcre-7.4/pcreposix.c
+++ b/src/third_party/pcre-7.4/pcreposix.c
diff --git a/third_party/pcre-7.4/pcreposix.h b/src/third_party/pcre-7.4/pcreposix.h
index 875e1ff18ba..875e1ff18ba 100644
--- a/third_party/pcre-7.4/pcreposix.h
+++ b/src/third_party/pcre-7.4/pcreposix.h
diff --git a/third_party/pcre-7.4/pcretest.c b/src/third_party/pcre-7.4/pcretest.c
index a222146e5e5..a222146e5e5 100644
--- a/third_party/pcre-7.4/pcretest.c
+++ b/src/third_party/pcre-7.4/pcretest.c
diff --git a/third_party/pcre-7.4/ucp.h b/src/third_party/pcre-7.4/ucp.h
index 3a4179b7693..3a4179b7693 100644
--- a/third_party/pcre-7.4/ucp.h
+++ b/src/third_party/pcre-7.4/ucp.h
diff --git a/third_party/pcre-7.4/ucpinternal.h b/src/third_party/pcre-7.4/ucpinternal.h
index 811a373c887..811a373c887 100644
--- a/third_party/pcre-7.4/ucpinternal.h
+++ b/src/third_party/pcre-7.4/ucpinternal.h
diff --git a/third_party/pcre-7.4/ucptable.h b/src/third_party/pcre-7.4/ucptable.h
index 07eaced8f2d..07eaced8f2d 100644
--- a/third_party/pcre-7.4/ucptable.h
+++ b/src/third_party/pcre-7.4/ucptable.h
diff --git a/third_party/pcre.py b/src/third_party/pcre.py
index fdc761af8d1..f33a71fe726 100644
--- a/third_party/pcre.py
+++ b/src/third_party/pcre.py
@@ -1,9 +1,9 @@
 
 import os
 
-def getFiles():
+root = "src/third_party/pcre-7.4"
 
-    root = "third_party/pcre-7.4"
+def getFiles():
 
     def pcreFilter(x):
         if x.endswith( "dftables.c" ):
@@ -25,7 +25,7 @@ def getFiles():
 def configure( env , fileLists , options ):
     #fileLists = { "serverOnlyFiles" : [] }
 
-    env.Prepend( CPPPATH=["./third_party/pcre-7.4/"] )
+    env.Prepend( CPPPATH=["./" + root + "/"] )
 
     myenv = env.Clone()
     myenv.Append( CPPDEFINES=["HAVE_CONFIG_H"] )
diff --git a/third_party/sm.py b/src/third_party/sm.py
index 9927be88b78..19a4dcbdae0 100644
--- a/third_party/sm.py
+++ b/src/third_party/sm.py
@@ -37,7 +37,7 @@ basicFiles = [ "jsapi.c" ,
                "jsxml.c" ,
                "prmjtime.c" ]
 
-root = "third_party/js-1.7"
+root = "src/third_party/js-1.7"
 
 def r(x):
     return "%s/%s" % ( root , x )
diff --git a/third_party/snappy.py b/src/third_party/snappy.py
index e53ee632bbd..7949bbd555f 100644
--- a/third_party/snappy.py
+++ b/src/third_party/snappy.py
@@ -6,7 +6,7 @@ def configure( env , fileLists , options ):
     if not options["windows"]:
         myenv.Append(CPPFLAGS=" -Wno-sign-compare -Wno-unused-function ") #snappy doesn't compile cleanly
     
-    files = ["third_party/snappy/snappy.cc", "third_party/snappy/snappy-sinksource.cc"]
+    files = ["src/third_party/snappy/snappy.cc", "src/third_party/snappy/snappy-sinksource.cc"]
 
     fileLists["serverOnlyFiles"] += [ myenv.Object(f) for f in files ]
 
diff --git a/third_party/snappy/COPYING b/src/third_party/snappy/COPYING
index 8d6bd9fed4e..8d6bd9fed4e 100755
--- a/third_party/snappy/COPYING
+++ b/src/third_party/snappy/COPYING
diff --git a/third_party/snappy/README b/src/third_party/snappy/README
index df8f0e178e2..df8f0e178e2 100755
--- a/third_party/snappy/README
+++ b/src/third_party/snappy/README
diff --git a/third_party/snappy/config.h b/src/third_party/snappy/config.h
index bfc3b30087f..bfc3b30087f 100755
--- a/third_party/snappy/config.h
+++ b/src/third_party/snappy/config.h
diff --git a/third_party/snappy/snappy-internal.h b/src/third_party/snappy/snappy-internal.h
index a32eda59fb2..a32eda59fb2 100755
--- a/third_party/snappy/snappy-internal.h
+++ b/src/third_party/snappy/snappy-internal.h
diff --git a/third_party/snappy/snappy-sinksource.cc b/src/third_party/snappy/snappy-sinksource.cc
index 1017895f962..1017895f962 100755
--- a/third_party/snappy/snappy-sinksource.cc
+++ b/src/third_party/snappy/snappy-sinksource.cc
diff --git a/third_party/snappy/snappy-sinksource.h b/src/third_party/snappy/snappy-sinksource.h
index 430baeabb0e..430baeabb0e 100755
--- a/third_party/snappy/snappy-sinksource.h
+++ b/src/third_party/snappy/snappy-sinksource.h
diff --git a/third_party/snappy/snappy-stubs-internal.cc b/src/third_party/snappy/snappy-stubs-internal.cc
index 6ed334371f1..6ed334371f1 100755
--- a/third_party/snappy/snappy-stubs-internal.cc
+++ b/src/third_party/snappy/snappy-stubs-internal.cc
diff --git a/third_party/snappy/snappy-stubs-internal.h b/src/third_party/snappy/snappy-stubs-internal.h
index 355a06bc568..355a06bc568 100755
--- a/third_party/snappy/snappy-stubs-internal.h
+++ b/src/third_party/snappy/snappy-stubs-internal.h
diff --git a/third_party/snappy/snappy-stubs-public.h b/src/third_party/snappy/snappy-stubs-public.h
index 074d4638866..074d4638866 100755
--- a/third_party/snappy/snappy-stubs-public.h
+++ b/src/third_party/snappy/snappy-stubs-public.h
diff --git a/third_party/snappy/snappy.cc b/src/third_party/snappy/snappy.cc
index fdc67e886c6..fdc67e886c6 100755
--- a/third_party/snappy/snappy.cc
+++ b/src/third_party/snappy/snappy.cc
diff --git a/third_party/snappy/snappy.h b/src/third_party/snappy/snappy.h
index 8d6ef2294f5..8d6ef2294f5 100755
--- a/third_party/snappy/snappy.h
+++ b/src/third_party/snappy/snappy.h