diff --git a/Builds/VisualStudio2013/Common.props b/Builds/VisualStudio2013/Common.props
index e39132ab4..853bf2adb 100644
--- a/Builds/VisualStudio2013/Common.props
+++ b/Builds/VisualStudio2013/Common.props
@@ -14,7 +14,7 @@
       <PreprocessorDefinitions>_VARIADIC_MAX=10;_WIN32_WINNT=0x0600;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>$(RepoDir)\src\protobuf\src;$(RepoDir)\src\protobuf\vsprojects;$(RepoDir)\src\leveldb;$(RepoDir)\src\leveldb\include;$(RepoDir)\build\proto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(RepoDir)\src\protobuf\src;$(RepoDir)\src\protobuf\vsprojects;$(RepoDir)\src\leveldb;$(RepoDir)\src\leveldb\include;$(RepoDir)\src\snappy\snappy;$(RepoDir)\src\snappy\config;$(RepoDir)\build\proto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <ExceptionHandling>Async</ExceptionHandling>
       <DisableSpecificWarnings>4018;4244</DisableSpecificWarnings>
diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj
index 2d9a28618..cf04a6d45 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj
+++ b/Builds/VisualStudio2013/RippleD.vcxproj
@@ -1766,6 +1766,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\src\protobuf_core.cpp" />
+    <ClCompile Include="..\..\src\snappy\snappy.unity.cpp" />
     <ClCompile Include="..\..\src\websocket\src\base64\base64.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -2463,7 +2464,6 @@
       <FunctionLevelLinking>false</FunctionLevelLinking>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <OpenMPSupport>false</OpenMPSupport>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters
index 163640f6f..c1dbd1d5c 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters
@@ -28,9 +28,6 @@
     <Filter Include="[0] Libraries\protobuf">
       <UniqueIdentifier>{1f093002-9955-4915-a17b-398d55c9fc76}</UniqueIdentifier>
     </Filter>
-    <Filter Include="[0] Libraries\websocket">
-      <UniqueIdentifier>{6967f835-a1b0-47e3-9bd9-6fc8bd0f3df7}</UniqueIdentifier>
-    </Filter>
     <Filter Include="[3] doc">
       <UniqueIdentifier>{c69b07a2-44e5-4b06-99a9-81f5d137ea15}</UniqueIdentifier>
     </Filter>
@@ -334,6 +331,12 @@
     <Filter Include="[1] Ripple\proto">
       <UniqueIdentifier>{ae6e40a1-a2ff-4a9e-b510-92192b96db44}</UniqueIdentifier>
     </Filter>
+    <Filter Include="[0] Libraries\snappy">
+      <UniqueIdentifier>{3ea8d3ab-136d-4ae1-bc76-24d8f318e539}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="[1] Ripple\websocket">
+      <UniqueIdentifier>{6967f835-a1b0-47e3-9bd9-6fc8bd0f3df7}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\ripple_basics\containers\RangeSet.cpp">
@@ -424,43 +427,43 @@
       <Filter>[2] Old Ripple\ripple_websocket\autosocket</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\websocket\src\base64\base64.cpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\websocket\src\md5\md5.c">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\websocket\src\messages\data.cpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\websocket\src\processors\hybi_header.cpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\websocket\src\processors\hybi_util.cpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\websocket\src\rng\blank_rng.cpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\websocket\src\rng\boost_rng.cpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\websocket\src\sha1\sha1.cpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\websocket\src\sha1\shacmp.cpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\websocket\src\sha1\shatest.cpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\websocket\src\sha1\sha.cpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\websocket\src\network_utilities.cpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\websocket\src\uri.cpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\leveldb\db\builder.cc">
       <Filter>[0] Libraries\leveldb\db</Filter>
@@ -1734,6 +1737,9 @@
     <ClCompile Include="..\..\src\ripple\proto\ripple.pb.cc">
       <Filter>[1] Ripple\proto</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\snappy\snappy.unity.cpp">
+      <Filter>[0] Libraries\snappy</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\ripple_basics\containers\RangeSet.h">
@@ -1836,97 +1842,97 @@
       <Filter>[2] Old Ripple\ripple_websocket\autosocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\base64\base64.h">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\http\constants.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\http\parser.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\logger\logger.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\md5\md5.h">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\md5\md5.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\messages\control.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\messages\data.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\processors\hybi.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\processors\hybi_header.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\processors\hybi_legacy.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\processors\hybi_util.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\processors\processor.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\rng\blank_rng.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\rng\boost_rng.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\roles\client.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\roles\server.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\sha1\sha1.h">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\sockets\autotls.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\sockets\plain.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\sockets\socket_base.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\sockets\tls.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\utf8_validator\utf8_validator.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\common.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\connection.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\endpoint.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\network_utilities.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\shared_const_buffer.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\uri.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\websocket_frame.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\websocketpp.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\leveldb\db\builder.h">
       <Filter>[0] Libraries\leveldb\db</Filter>
@@ -2727,7 +2733,7 @@
       <Filter>[1] Ripple\sitefiles\api</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\websocket\src\sockets\multitls.hpp">
-      <Filter>[0] Libraries\websocket</Filter>
+      <Filter>[1] Ripple\websocket</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\ripple\rocksdb\ripple_rocksdb.h">
       <Filter>[1] Ripple\rocksdb</Filter>
diff --git a/SConstruct b/SConstruct
index cfb1b89ff..83c6185dc 100644
--- a/SConstruct
+++ b/SConstruct
@@ -210,7 +210,9 @@ INCLUDE_PATHS = [
     '.',
     'src/leveldb',
     'src/leveldb/port',
-    'src/leveldb/include'
+    'src/leveldb/include',
+    'src/snappy/snappy',
+    'src/snappy/config',
     ]
 
 # if BOOST_HOME:
@@ -237,6 +239,7 @@ COMPILED_FILES.extend (['src/ripple/beast/ripple_beastc.c'])
 # New-style Ripple unity sources
 #
 COMPILED_FILES.extend([
+    'src/snappy/snappy.unity.cpp',
     'src/ripple/http/ripple_http.cpp',
     'src/ripple/json/ripple_json.cpp',
     'src/ripple/peerfinder/ripple_peerfinder.cpp',
diff --git a/src/ripple/rocksdb/ripple_rocksdb.h b/src/ripple/rocksdb/ripple_rocksdb.h
index 23a39b72d..68fbd9e6a 100644
--- a/src/ripple/rocksdb/ripple_rocksdb.h
+++ b/src/ripple/rocksdb/ripple_rocksdb.h
@@ -35,6 +35,7 @@
 #endif
 
 #if RIPPLE_ROCKSDB_AVAILABLE
+#define SNAPPY
 #include "rocksdb/include/rocksdb/arena.h"
 #include "rocksdb/include/rocksdb/cache.h"
 #include "rocksdb/include/rocksdb/compaction_filter.h"
diff --git a/src/snappy/config/snappy-stubs-public.h b/src/snappy/config/snappy-stubs-public.h
new file mode 100644
index 000000000..83f5e9ff7
--- /dev/null
+++ b/src/snappy/config/snappy-stubs-public.h
@@ -0,0 +1,82 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+// Author: sesse@google.com (Steinar H. Gunderson)
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Various type stubs for the open-source version of Snappy.
+//
+// This file cannot include config.h, as it is included from snappy.h,
+// which is a public header. Instead, snappy-stubs-public.h is generated by
+// from snappy-stubs-public.h.in at configure time.
+
+#ifndef UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
+#define UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
+
+#include <cstdint>
+#include <cstddef>
+
+#ifndef _MSC_VER
+#include <sys/uio.h>
+#endif
+
+#define SNAPPY_MAJOR 1 // @SNAPPY_MAJOR@
+#define SNAPPY_MINOR 0 // @SNAPPY_MINOR@
+#define SNAPPY_PATCHLEVEL 0 // @SNAPPY_PATCHLEVEL@
+#define SNAPPY_VERSION \
+    ((SNAPPY_MAJOR << 16) | (SNAPPY_MINOR << 8) | SNAPPY_PATCHLEVEL)
+
+#include <string>
+
+namespace snappy {
+
+typedef std::int8_t int8;
+typedef std::int16_t int16;
+typedef std::int32_t int32;
+typedef std::int64_t int64;
+typedef std::uint8_t uint8;
+typedef std::uint16_t uint16;
+typedef std::uint32_t uint32;
+typedef std::uint64_t uint64;
+
+typedef std::string string;
+
+#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
+  TypeName(const TypeName&);               \
+  void operator=(const TypeName&)
+
+#ifdef _MSC_VER
+// Windows does not have an iovec type, yet the concept is universally useful.
+// It is simple to define it ourselves, so we put it inside our own namespace.
+struct iovec {
+    void* iov_base;
+    size_t iov_len;
+};
+#endif
+
+}  // namespace snappy
+
+#endif  // UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
\ No newline at end of file
diff --git a/src/snappy/snappy.unity.cpp b/src/snappy/snappy.unity.cpp
new file mode 100644
index 000000000..abb426ea6
--- /dev/null
+++ b/src/snappy/snappy.unity.cpp
@@ -0,0 +1,34 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of rippled: https://github.com/ripple/rippled
+    Copyright (c) 2014 Ripple Labs Inc.
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "../BeastConfig.h"
+
+#ifdef _MSC_VER
+#include <cstddef>
+namespace snappy {
+typedef std::ptrdiff_t ssize_t;
+}
+#endif
+
+#include "snappy/snappy.cc"
+#include "snappy/snappy-sinksource.cc"
+#include "snappy/snappy-stubs-internal.cc"
+
+//#include "./snappy_unittest.cc"
+//#include "./snappy-test.cc"#include "./snappy-c.cc"