18 files changed, 28 insertions, 30 deletions
diff --git a/site_scons/site_tools/jsheader.py b/site_scons/site_tools/jsheader.py
index c271948599b..d3d5570d70f 100644
--- a/site_scons/site_tools/jsheader.py
+++ b/site_scons/site_tools/jsheader.py
@@ -6,7 +6,7 @@ def jsToH(target, source, env):
 
     outFile = str( target[0] )
 
-    h =  ['#include "bson/stringdata.h"'
+    h =  ['#include "mongo/base/string_data.h"'
         ,'namespace mongo {'
         ,'struct JSFile{ const char* name; const StringData& source; };'
         ,'namespace JSFiles{'
diff --git a/src/mongo/bson/stringdata.h b/src/mongo/base/string_data.h
index d390e57807a..b431d986e91 100644
--- a/src/mongo/bson/stringdata.h
+++ b/src/mongo/base/string_data.h
@@ -1,5 +1,3 @@
-// stringdata.h
-
 /*    Copyright 2010 10gen Inc.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/mongo/bson/bson_builder_base.h b/src/mongo/bson/bson_builder_base.h
index dda30084b0c..780dcbf20e0 100644
--- a/src/mongo/bson/bson_builder_base.h
+++ b/src/mongo/bson/bson_builder_base.h
@@ -15,7 +15,7 @@
 
 #pragma once
 
-#include "mongo/bson/stringdata.h"
+#include "mongo/base/string_data.h"
 #include "mongo/bson/util/builder.h"
 
 namespace mongo {
diff --git a/src/mongo/bson/bsonobj.h b/src/mongo/bson/bsonobj.h
index 3d39500e2bf..d268abe3871 100644
--- a/src/mongo/bson/bsonobj.h
+++ b/src/mongo/bson/bsonobj.h
@@ -25,7 +25,7 @@
 #include <vector>
 
 #include "mongo/bson/bsonelement.h"
-#include "mongo/bson/stringdata.h"
+#include "mongo/base/string_data.h"
 #include "mongo/bson/util/atomic_int.h"
 #include "mongo/bson/util/builder.h"
 
diff --git a/src/mongo/bson/util/builder.h b/src/mongo/bson/util/builder.h
index b8027e561a2..9d941734d63 100644
--- a/src/mongo/bson/util/builder.h
+++ b/src/mongo/bson/util/builder.h
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include "mongo/bson/inline_decls.h"
-#include "mongo/bson/stringdata.h"
+#include "mongo/base/string_data.h"
 
 namespace mongo {
     /* Accessing unaligned doubles on ARM generates an alignment trap and aborts with SIGBUS on Linux.
diff --git a/src/mongo/client/examples/mongoperf.vcxproj b/src/mongo/client/examples/mongoperf.vcxproj
index af985882663..e3323decd2e 100755
--- a/src/mongo/client/examples/mongoperf.vcxproj
+++ b/src/mongo/client/examples/mongoperf.vcxproj
@@ -201,7 +201,7 @@
     <ClInclude Include="..\..\bson\inline_decls.h" />
     <ClInclude Include="..\..\bson\oid.h" />
     <ClInclude Include="..\..\bson\ordering.h" />
-    <ClInclude Include="..\..\bson\stringdata.h" />
+    <ClInclude Include="..\..\base\string_data.h" />
     <ClInclude Include="..\..\util\debug_util.h" />
     <ClInclude Include="..\..\util\logfile.h" />
     <ClInclude Include="..\..\util\mmap.h" />
@@ -213,4 +213,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/mongo/client/examples/mongoperf.vcxproj.filters b/src/mongo/client/examples/mongoperf.vcxproj.filters
index a56a6de0dcb..af3dc74f7dc 100755
--- a/src/mongo/client/examples/mongoperf.vcxproj.filters
+++ b/src/mongo/client/examples/mongoperf.vcxproj.filters
@@ -121,7 +121,7 @@
     <ClInclude Include="..\..\util\logfile.h">
       <Filter>includes</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\bson\stringdata.h">
+    <ClInclude Include="..\..\base\string_data.h">
       <Filter>includes</Filter>
     </ClInclude>
     <ClInclude Include="..\..\bson\oid.h">
@@ -149,4 +149,4 @@
       <Filter>shared files</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/mongo/db/d_concurrency.h b/src/mongo/db/d_concurrency.h
index b4588145088..43d874d3d0a 100644
--- a/src/mongo/db/d_concurrency.h
+++ b/src/mongo/db/d_concurrency.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "mongo/bson/stringdata.h"
+#include "mongo/base/string_data.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/lockstat.h"
 #include "mongo/util/concurrency/mutex.h"
diff --git a/src/mongo/db/jsobj.h b/src/mongo/db/jsobj.h
index 12fc8fad25d..b108caaf314 100644
--- a/src/mongo/db/jsobj.h
+++ b/src/mongo/db/jsobj.h
@@ -40,6 +40,6 @@
 #include "../bson/bsonobjiterator.h"
 #include "../bson/bson-inl.h"
 #include "../bson/ordering.h"
-#include "../bson/stringdata.h"
+#include "mongo/base/string_data.h"
 #include "../bson/bson_db.h"
 
diff --git a/src/mongo/db/mongod.vcxproj b/src/mongo/db/mongod.vcxproj
index c0c0b76ddd4..6ee781e922f 100755
--- a/src/mongo/db/mongod.vcxproj
+++ b/src/mongo/db/mongod.vcxproj
@@ -1403,7 +1403,7 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClInclude Include="..\bson\bson.h" />
     <ClInclude Include="..\bson\bson_db.h" />
     <ClInclude Include="..\bson\inline_decls.h" />
-    <ClInclude Include="..\bson\stringdata.h" />
+    <ClInclude Include="..\base\string_data.h" />
     <ClInclude Include="..\bson\util\atomic_int.h" />
     <ClInclude Include="..\bson\util\builder.h" />
     <ClInclude Include="..\bson\util\misc.h" />
@@ -1573,4 +1573,4 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/mongo/db/mongod.vcxproj.filters b/src/mongo/db/mongod.vcxproj.filters
index 7b0f5f6a98e..92bc4444fc2 100755
--- a/src/mongo/db/mongod.vcxproj.filters
+++ b/src/mongo/db/mongod.vcxproj.filters
@@ -1251,8 +1251,8 @@
     <ClInclude Include="..\util\mongoutils\str.h">
       <Filter>util\mongoutils</Filter>
     </ClInclude>
-    <ClInclude Include="..\bson\stringdata.h">
-      <Filter>bson</Filter>
+    <ClInclude Include="..\base\string_data.h">
+      <Filter>base</Filter>
     </ClInclude>
     <ClInclude Include="..\util\stacktrace.h">
       <Filter>util\Header Files</Filter>
@@ -1923,4 +1923,4 @@
       <Filter>db\Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/mongo/dbtests/test.vcxproj b/src/mongo/dbtests/test.vcxproj
index 2143515d1e0..c03130b6fb2 100644
--- a/src/mongo/dbtests/test.vcxproj
+++ b/src/mongo/dbtests/test.vcxproj
@@ -500,7 +500,7 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
     <ClInclude Include="..\bson\inline_decls.h" />
     <ClInclude Include="..\bson\oid.h" />
     <ClInclude Include="..\bson\ordering.h" />
-    <ClInclude Include="..\bson\stringdata.h" />
+    <ClInclude Include="..\base\string_data.h" />
     <ClInclude Include="..\bson\util\atomic_int.h" />
     <ClInclude Include="..\bson\util\builder.h" />
     <ClInclude Include="..\bson\util\misc.h" />
@@ -1478,4 +1478,4 @@ cscript //Nologo ..\shell\createCPPfromJavaScriptFiles.js "$(ProjectDir).."
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/mongo/dbtests/test.vcxproj.filters b/src/mongo/dbtests/test.vcxproj.filters
index 97ef951a4cd..0d048cba0b3 100755
--- a/src/mongo/dbtests/test.vcxproj.filters
+++ b/src/mongo/dbtests/test.vcxproj.filters
@@ -202,8 +202,8 @@
     <ClInclude Include="..\bson\ordering.h">
       <Filter>bson</Filter>
     </ClInclude>
-    <ClInclude Include="..\bson\stringdata.h">
-      <Filter>bson</Filter>
+    <ClInclude Include="..\base\string_data.h">
+      <Filter>base</Filter>
     </ClInclude>
     <ClInclude Include="..\..\third_party\snappy\config.h">
       <Filter>third_party\snappy</Filter>
@@ -1651,4 +1651,4 @@
       <Filter>dbtests</Filter>
     </None>
   </ItemGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/mongo/shell/createCPPfromJavaScriptFiles.js b/src/mongo/shell/createCPPfromJavaScriptFiles.js
index ee581202bf3..ecb6be2fb68 100644
--- a/src/mongo/shell/createCPPfromJavaScriptFiles.js
+++ b/src/mongo/shell/createCPPfromJavaScriptFiles.js
@@ -53,7 +53,7 @@ function jsToH( fso, outputFileNameString, inputFileNameStringArray ) {
     }
     displayString += '] );'
     WScript.Echo( displayString );
-    var h = ['#include "bson/stringdata.h"'
+    var h = ['#include "mongo/base/string_data.h"'
          , 'namespace mongo {'
          , 'struct JSFile{ const char* name; const StringData& source; };'
          , 'namespace JSFiles{'
diff --git a/src/mongo/shell/mongo.vcxproj b/src/mongo/shell/mongo.vcxproj
index 7b8cc230f4e..a90f4b87ba5 100755
--- a/src/mongo/shell/mongo.vcxproj
+++ b/src/mongo/shell/mongo.vcxproj
@@ -1145,7 +1145,7 @@ cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."</Command>
     <ClInclude Include="..\bson\inline_decls.h" />
     <ClInclude Include="..\bson\oid.h" />
     <ClInclude Include="..\bson\ordering.h" />
-    <ClInclude Include="..\bson\stringdata.h" />
+    <ClInclude Include="..\base\string_data.h" />
     <ClInclude Include="..\bson\util\atomic_int.h" />
     <ClInclude Include="..\bson\util\builder.h" />
     <ClInclude Include="..\bson\util\misc.h" />
@@ -1276,4 +1276,4 @@ cscript //Nologo createCPPfromJavaScriptFiles.js "$(ProjectDir).."</Command>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/mongo/shell/mongo.vcxproj.filters b/src/mongo/shell/mongo.vcxproj.filters
index 1662f5ef098..bac3058c850 100644
--- a/src/mongo/shell/mongo.vcxproj.filters
+++ b/src/mongo/shell/mongo.vcxproj.filters
@@ -727,8 +727,8 @@
     <ClInclude Include="..\util\mongoutils\str.h">
       <Filter>util\mongoutils</Filter>
     </ClInclude>
-    <ClInclude Include="..\bson\stringdata.h">
-      <Filter>bson</Filter>
+    <ClInclude Include="..\base\string_data.h">
+      <Filter>base</Filter>
     </ClInclude>
     <ClInclude Include="..\client\syncclusterconnection.h">
       <Filter>client</Filter>
@@ -1313,4 +1313,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/mongo/util/alignedbuilder.h b/src/mongo/util/alignedbuilder.h
index d55378cf2b9..7f8ac53f319 100644
--- a/src/mongo/util/alignedbuilder.h
+++ b/src/mongo/util/alignedbuilder.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "../bson/stringdata.h"
+#include "mongo/base/string_data.h"
 
 namespace mongo {
 
diff --git a/src/mongo/util/version.h b/src/mongo/util/version.h
index fcccc1494ab..a1cd68fcdef 100644
--- a/src/mongo/util/version.h
+++ b/src/mongo/util/version.h
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "mongo/bson/stringdata.h"
+#include "mongo/base/string_data.h"
 
 namespace mongo {
     struct BSONArray;