diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj
index 2285d716f3..9895bf2f42 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj
+++ b/Builds/VisualStudio2013/RippleD.vcxproj
@@ -946,7 +946,7 @@
     </ClInclude>
     <ClInclude Include="..\..\src\beast\beast\nudb\file.h">
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\nudb\identity_codec.h">
+    <ClInclude Include="..\..\src\beast\beast\nudb\identity.h">
     </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\nudb\nudb.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters
index 0631a09b51..b7df54a882 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters
@@ -1554,7 +1554,7 @@
     <ClInclude Include="..\..\src\beast\beast\nudb\file.h">
       <Filter>beast\nudb</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\beast\beast\nudb\identity_codec.h">
+    <ClInclude Include="..\..\src\beast\beast\nudb\identity.h">
       <Filter>beast\nudb</Filter>
     </ClInclude>
     <ClCompile Include="..\..\src\beast\beast\nudb\nudb.cpp">
diff --git a/src/beast/beast/nudb/api.h b/src/beast/beast/nudb/api.h
index 65ad74919e..4891b364f5 100644
--- a/src/beast/beast/nudb/api.h
+++ b/src/beast/beast/nudb/api.h
@@ -21,6 +21,7 @@
 #define BEAST_NUDB_API_H_INCLUDED
 
 #include <beast/nudb/create.h>
+#include <beast/nudb/identity.h>
 #include <beast/nudb/store.h>
 #include <beast/nudb/recover.h>
 #include <beast/nudb/verify.h>
@@ -34,7 +35,7 @@ namespace nudb {
 //
 template <
     class Hasher,
-    class Codec,
+    class Codec = identity,
     class File = native_file,
     std::size_t BufferSize = 16 * 1024 * 1024
 >
diff --git a/src/beast/beast/nudb/identity_codec.h b/src/beast/beast/nudb/identity.h
similarity index 97%
rename from src/beast/beast/nudb/identity_codec.h
rename to src/beast/beast/nudb/identity.h
index 0846e3002c..18b3dcad8e 100644
--- a/src/beast/beast/nudb/identity_codec.h
+++ b/src/beast/beast/nudb/identity.h
@@ -26,12 +26,12 @@ namespace beast {
 namespace nudb {
 
 /** Codec which maps input directly to output. */
-class identity_codec
+class identity
 {
 public:
     template <class... Args>
     explicit
-    identity_codec(Args&&... args)
+    identity(Args&&... args)
     {
     }
 
diff --git a/src/beast/beast/nudb/store.h b/src/beast/beast/nudb/store.h
index 49b4abbb14..e06c00828a 100644
--- a/src/beast/beast/nudb/store.h
+++ b/src/beast/beast/nudb/store.h
@@ -372,7 +372,7 @@ store<Hasher, Codec, File>::open (
     key_file_header kh;
     read (df, dh);
     read (kf, kh);
-    verify<Codec> (dh);
+    verify (dh);
     verify<Hasher> (kh);
     verify<Hasher> (dh, kh);
     auto s = std::make_unique<state>(
diff --git a/src/beast/beast/nudb/tests/common.h b/src/beast/beast/nudb/tests/common.h
index 82c6e51432..4f7e456f2c 100644
--- a/src/beast/beast/nudb/tests/common.h
+++ b/src/beast/beast/nudb/tests/common.h
@@ -21,7 +21,7 @@
 #define BEAST_NUDB_TESTS_COMMON_H_INCLUDED
 
 #include <beast/nudb.h>
-#include <beast/nudb/identity_codec.h>
+#include <beast/nudb/identity.h>
 #include <beast/nudb/tests/fail_file.h>
 #include <beast/hash/xxhasher.h>
 #include <beast/random/xor_shift_engine.h>
@@ -37,7 +37,7 @@ using key_type = std::size_t;
 
 // xxhasher is fast and produces good results
 using test_api_base =
-    nudb::api<xxhasher, identity_codec, native_file>;
+    nudb::api<xxhasher, identity, native_file>;
 
 struct test_api : test_api_base
 {
diff --git a/src/beast/beast/nudb/visit.h b/src/beast/beast/nudb/visit.h
index d0167b5fdc..9243101f66 100644
--- a/src/beast/beast/nudb/visit.h
+++ b/src/beast/beast/nudb/visit.h
@@ -56,7 +56,7 @@ visit(
     df.open (file_mode::scan, path);
     dat_file_header dh;
     read (df, dh);
-    verify<Codec> (dh);
+    verify (dh);
     Codec codec;
     // Iterate Data File
     bulk_reader<File> r(
diff --git a/src/beast/beast/nudb/win32_file.h b/src/beast/beast/nudb/win32_file.h
index ca6a21a931..467f9abf66 100644
--- a/src/beast/beast/nudb/win32_file.h
+++ b/src/beast/beast/nudb/win32_file.h
@@ -42,6 +42,9 @@
 # ifndef STRICT
 #  define STRICT
 # endif
+# ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+# endif
 # include <Windows.h>
 # undef NOMINMAX
 # undef UNICODE
diff --git a/src/ripple/nodestore/backend/NuDBFactory.cpp b/src/ripple/nodestore/backend/NuDBFactory.cpp
index 3d7c071177..e6272b2b43 100644
--- a/src/ripple/nodestore/backend/NuDBFactory.cpp
+++ b/src/ripple/nodestore/backend/NuDBFactory.cpp
@@ -26,7 +26,6 @@
 #include <ripple/nodestore/impl/EncodedBlob.h>
 #include <beast/nudb.h>
 #include <beast/nudb/detail/varint.h>
-#include <beast/nudb/identity_codec.h>
 #include <beast/nudb/visit.h>
 #include <beast/hash/xxhasher.h>
 #include <boost/filesystem.hpp>