diff --git a/Builds/VisualStudio2015/RippleD.vcxproj b/Builds/VisualStudio2015/RippleD.vcxproj
index 33456f4e4..cf92adb29 100644
--- a/Builds/VisualStudio2015/RippleD.vcxproj
+++ b/Builds/VisualStudio2015/RippleD.vcxproj
@@ -1830,8 +1830,6 @@
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\beast\nudb\detail\stream.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\beast\nudb\detail\varint.h">
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple\beast\nudb\file.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\beast\nudb\identity.h">
@@ -1856,10 +1854,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\beast\nudb\test\beast_nudb_varint_test.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\ripple\beast\nudb\test\beast_nudb_verify_test.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -2456,6 +2450,8 @@
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\nodestore\impl\Tuning.h">
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\nodestore\impl\varint.h">
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\nodestore\Manager.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\nodestore\NodeObject.h">
@@ -2496,6 +2492,12 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
+    <ClCompile Include="..\..\src\ripple\nodestore\tests\varint_test.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
     <ClInclude Include="..\..\src\ripple\nodestore\Types.h">
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\overlay\Cluster.h">
diff --git a/Builds/VisualStudio2015/RippleD.vcxproj.filters b/Builds/VisualStudio2015/RippleD.vcxproj.filters
index 14daa4a93..d396b2b02 100644
--- a/Builds/VisualStudio2015/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2015/RippleD.vcxproj.filters
@@ -2385,9 +2385,6 @@
     <ClInclude Include="..\..\src\ripple\beast\nudb\detail\stream.h">
       <Filter>ripple\beast\nudb\detail</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\beast\nudb\detail\varint.h">
-      <Filter>ripple\beast\nudb\detail</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple\beast\nudb\file.h">
       <Filter>ripple\beast\nudb</Filter>
     </ClInclude>
@@ -2415,9 +2412,6 @@
     <ClCompile Include="..\..\src\ripple\beast\nudb\test\beast_nudb_store_test.cpp">
       <Filter>ripple\beast\nudb\test</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\beast\nudb\test\beast_nudb_varint_test.cpp">
-      <Filter>ripple\beast\nudb\test</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\ripple\beast\nudb\test\beast_nudb_verify_test.cpp">
       <Filter>ripple\beast\nudb\test</Filter>
     </ClCompile>
@@ -2961,6 +2955,9 @@
     <ClInclude Include="..\..\src\ripple\nodestore\impl\Tuning.h">
       <Filter>ripple\nodestore\impl</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\nodestore\impl\varint.h">
+      <Filter>ripple\nodestore\impl</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\ripple\nodestore\Manager.h">
       <Filter>ripple\nodestore</Filter>
     </ClInclude>
@@ -2991,6 +2988,9 @@
     <ClCompile Include="..\..\src\ripple\nodestore\tests\Timing.test.cpp">
       <Filter>ripple\nodestore\tests</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\ripple\nodestore\tests\varint_test.cpp">
+      <Filter>ripple\nodestore\tests</Filter>
+    </ClCompile>
     <ClInclude Include="..\..\src\ripple\nodestore\Types.h">
       <Filter>ripple\nodestore</Filter>
     </ClInclude>
diff --git a/src/ripple/beast/unity/beast_nudb_unity.cpp b/src/ripple/beast/unity/beast_nudb_unity.cpp
index a636470f7..e3e1b2fec 100644
--- a/src/ripple/beast/unity/beast_nudb_unity.cpp
+++ b/src/ripple/beast/unity/beast_nudb_unity.cpp
@@ -20,5 +20,4 @@
 #include <ripple/beast/nudb/test/beast_nudb_callgrind_test.cpp>
 #include <ripple/beast/nudb/test/beast_nudb_recover_test.cpp>
 #include <ripple/beast/nudb/test/beast_nudb_store_test.cpp>
-#include <ripple/beast/nudb/test/beast_nudb_varint_test.cpp>
 #include <ripple/beast/nudb/test/beast_nudb_verify_test.cpp>
diff --git a/src/ripple/nodestore/backend/NuDBFactory.cpp b/src/ripple/nodestore/backend/NuDBFactory.cpp
index 5a2425ca8..b63d4f721 100644
--- a/src/ripple/nodestore/backend/NuDBFactory.cpp
+++ b/src/ripple/nodestore/backend/NuDBFactory.cpp
@@ -26,7 +26,6 @@
 #include <ripple/nodestore/impl/DecodedBlob.h>
 #include <ripple/nodestore/impl/EncodedBlob.h>
 #include <ripple/beast/nudb.h>
-#include <ripple/beast/nudb/detail/varint.h>
 #include <ripple/beast/nudb/visit.h>
 #include <ripple/beast/hash/xxhasher.h>
 #include <boost/filesystem.hpp>
diff --git a/src/ripple/nodestore/impl/codec.h b/src/ripple/nodestore/impl/codec.h
index 4ae313d05..bbcf9c69e 100644
--- a/src/ripple/nodestore/impl/codec.h
+++ b/src/ripple/nodestore/impl/codec.h
@@ -21,11 +21,11 @@
 #define RIPPLE_NODESTORE_CODEC_H_INCLUDED
 
 #include <ripple/basics/contract.h>
-#include <ripple/nodestore/NodeObject.h>
-#include <ripple/protocol/HashPrefix.h>
 #include <ripple/beast/nudb/common.h>
 #include <ripple/beast/nudb/detail/field.h>
-#include <ripple/beast/nudb/detail/varint.h>
+#include <ripple/nodestore/impl/varint.h>
+#include <ripple/nodestore/NodeObject.h>
+#include <ripple/protocol/HashPrefix.h>
 #include <lz4/lib/lz4.h>
 #include <snappy.h>
 #include <cstddef>
diff --git a/src/ripple/beast/nudb/detail/varint.h b/src/ripple/nodestore/impl/varint.h
similarity index 93%
rename from src/ripple/beast/nudb/detail/varint.h
rename to src/ripple/nodestore/impl/varint.h
index 0bc9c3b70..00fbd2d3c 100644
--- a/src/ripple/beast/nudb/detail/varint.h
+++ b/src/ripple/nodestore/impl/varint.h
@@ -24,11 +24,11 @@
 #include <cstdint>
 #include <type_traits>
 
-namespace beast {
-namespace nudb {
+namespace ripple {
+namespace NodeStore {
 namespace detail {
 
-// base128 varint format is from
+// This is a variant of the base128 varint format from
 // google protocol buffers:
 // https://developers.google.com/protocol-buffers/docs/encoding#varints
 
@@ -127,7 +127,7 @@ write_varint (void* p0, std::size_t v)
 template <class T, std::enable_if_t<
     std::is_same<T, varint>::value>* = nullptr>
 void
-read (istream& is, std::size_t& u)
+read (beast::nudb::detail::istream& is, std::size_t& u)
 {
     auto p0 = is(1);
     auto p1 = p0;
@@ -141,14 +141,14 @@ read (istream& is, std::size_t& u)
 template <class T, std::enable_if_t<
     std::is_same<T, varint>::value>* = nullptr>
 void
-write (ostream& os, std::size_t t)
+write (beast::nudb::detail::ostream& os, std::size_t t)
 {
     write_varint(os.data(
         size_varint(t)), t);
 }
 
 } // detail
-} // nudb
-} // beast
+} // NodeStore
+} // ripple
 
 #endif
diff --git a/src/ripple/beast/nudb/test/beast_nudb_varint_test.cpp b/src/ripple/nodestore/tests/varint_test.cpp
similarity index 91%
rename from src/ripple/beast/nudb/test/beast_nudb_varint_test.cpp
rename to src/ripple/nodestore/tests/varint_test.cpp
index b3b71fac7..f94c73c72 100644
--- a/src/ripple/beast/nudb/test/beast_nudb_varint_test.cpp
+++ b/src/ripple/nodestore/tests/varint_test.cpp
@@ -17,16 +17,16 @@
 */
 //==============================================================================
 
-#include <ripple/beast/nudb/detail/varint.h>
 #include <ripple/beast/unit_test.h>
+#include <ripple/nodestore/impl/varint.h>
 #include <array>
 #include <vector>
 
-namespace beast {
-namespace nudb {
+namespace ripple {
+namespace NodeStore {
 namespace tests {
 
-class varint_test : public unit_test::suite
+class varint_test : public beast::unit_test::suite
 {
 public:
     void
@@ -67,8 +67,8 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(varint,nudb,beast);
+BEAST_DEFINE_TESTSUITE(varint,NodeStore,ripple);
 
 } // test
-} // nudb
-} // beast
+} // NodeStore
+} // ripple
diff --git a/src/ripple/unity/nodestore.cpp b/src/ripple/unity/nodestore.cpp
index 92537d28e..389bbedc9 100644
--- a/src/ripple/unity/nodestore.cpp
+++ b/src/ripple/unity/nodestore.cpp
@@ -39,4 +39,4 @@
 #include <ripple/nodestore/tests/Database.test.cpp>
 #include <ripple/nodestore/tests/import_test.cpp>
 #include <ripple/nodestore/tests/Timing.test.cpp>
-
+#include <ripple/nodestore/tests/varint_test.cpp>