diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj
index 1887c76056..3a215b3d3c 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj
+++ b/Builds/VisualStudio2012/RippleD.vcxproj
@@ -394,6 +394,7 @@
     </ClCompile>
     <ClCompile Include="..\..\modules\ripple_json\ripple_json.cpp" />
     <ClCompile Include="..\..\modules\ripple_leveldb\ripple_leveldb.cpp" />
+    <ClCompile Include="..\..\modules\ripple_mdb\ripple_mdb.c" />
     <ClCompile Include="..\..\modules\ripple_net\basics\ripple_HTTPRequest.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1427,6 +1428,7 @@
     <ClInclude Include="..\..\modules\ripple_json\json\json_writer.h" />
     <ClInclude Include="..\..\modules\ripple_json\ripple_json.h" />
     <ClInclude Include="..\..\modules\ripple_leveldb\ripple_leveldb.h" />
+    <ClInclude Include="..\..\modules\ripple_mdb\ripple_mdb.h" />
     <ClInclude Include="..\..\modules\ripple_net\basics\ripple_HTTPRequest.h" />
     <ClInclude Include="..\..\modules\ripple_net\basics\ripple_HttpsClient.h" />
     <ClInclude Include="..\..\modules\ripple_net\basics\ripple_RPCServer.h" />
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters
index 3cb46b0943..8593b01165 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters
@@ -148,6 +148,9 @@
     <Filter Include="[1] Ripple\ripple_app\node">
       <UniqueIdentifier>{bd48a825-192f-4d5e-9230-661fdd65f9b6}</UniqueIdentifier>
     </Filter>
+    <Filter Include="[1] Ripple\ripple_mdb">
+      <UniqueIdentifier>{6a769530-8edf-4836-afc8-8836fe315603}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Subtrees\sqlite\sqlite3.c">
@@ -864,6 +867,9 @@
     <ClCompile Include="..\..\modules\ripple_app\node\ripple_NullBackendFactory.cpp">
       <Filter>[1] Ripple\ripple_app\node</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_mdb\ripple_mdb.c">
+      <Filter>[1] Ripple\ripple_mdb</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Subtrees\sqlite\sqlite3.h">
@@ -1614,6 +1620,9 @@
     <ClInclude Include="..\..\modules\ripple_app\node\ripple_NullBackendFactory.h">
       <Filter>[1] Ripple\ripple_app\node</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_mdb\ripple_mdb.h">
+      <Filter>[1] Ripple\ripple_mdb</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\src\cpp\ripple\ripple.proto" />
diff --git a/modules/ripple_app/node/ripple_MdbBackendFactory.cpp b/modules/ripple_app/node/ripple_MdbBackendFactory.cpp
index 7c7ff578db..7c2b701e46 100644
--- a/modules/ripple_app/node/ripple_MdbBackendFactory.cpp
+++ b/modules/ripple_app/node/ripple_MdbBackendFactory.cpp
@@ -4,6 +4,8 @@
 */
 //==============================================================================
 
+#if RIPPLE_MDB_AVAILABLE
+
 class MdbBackendFactory::Backend : public NodeStore::Backend
 {
 public:
@@ -129,5 +131,4 @@ NodeStore::Backend* MdbBackendFactory::createInstance (StringPairArray const& ke
     return new MdbBackendFactory::Backend (keyValues);
 }
 
-//------------------------------------------------------------------------------
-
+#endif
diff --git a/modules/ripple_mdb/ripple_mdb.c b/modules/ripple_mdb/ripple_mdb.c
index 1a31ef3052..53d03f11fa 100644
--- a/modules/ripple_mdb/ripple_mdb.c
+++ b/modules/ripple_mdb/ripple_mdb.c
@@ -10,8 +10,6 @@
 
 #include "ripple_mdb.h"
 
-#include "beast/modules/beast_core/system/beast_TargetPlatform.h"
-
 #if RIPPLE_MDB_AVAILABLE
 
 #include "mdb/libraries/liblmdb/mdb.c"
diff --git a/modules/ripple_mdb/ripple_mdb.h b/modules/ripple_mdb/ripple_mdb.h
index 44c3aafd2a..03efbc4eb7 100644
--- a/modules/ripple_mdb/ripple_mdb.h
+++ b/modules/ripple_mdb/ripple_mdb.h
@@ -7,6 +7,8 @@
 #ifndef RIPPLE_MDB_H_INCLUDED
 #define RIPPLE_MDB_H_INCLUDED
 
+#include "beast/modules/beast_core/system/beast_TargetPlatform.h"
+
 #if ! BEAST_WIN32
 #define RIPPLE_MDB_AVAILABLE 1