diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj
index c4a014ad2b..b27e56c2d5 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj
+++ b/Builds/VisualStudio2013/RippleD.vcxproj
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
     <ClCompile>
       <PreprocessorDefinitions>_WIN32_WINNT=0x6000;DEBUG;WIN32_CONSOLE;_CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;_DEBUG;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeTypeInfo>True</RuntimeTypeInfo>
       <BufferSecurityCheck>True</BufferSecurityCheck>
@@ -88,7 +88,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
     <ClCompile>
       <PreprocessorDefinitions>_WIN32_WINNT=0x6000;NDEBUG;WIN32_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\leveldb\port;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\protobuf\src;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExceptionHandling>Async</ExceptionHandling>
       <RuntimeTypeInfo>True</RuntimeTypeInfo>
       <CallingConvention>Cdecl</CallingConvention>
@@ -3763,6 +3763,8 @@
     <ClCompile Include="..\..\src\ripple\unity\common.cpp">
     </ClCompile>
     <ClCompile Include="..\..\src\ripple\unity\core.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\src\leveldb\include;..\..\src\ripple\rocksdb\rocksdb\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\leveldb\include;..\..\src\ripple\rocksdb\rocksdb\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\unity\core.h">
     </ClInclude>
@@ -3775,6 +3777,8 @@
     <ClInclude Include="..\..\src\ripple\unity\http.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\unity\hyperleveldb.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\src\hyperleveldb;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\hyperleveldb;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\unity\hyperleveldb.h">
     </ClInclude>
@@ -3783,6 +3787,8 @@
     <ClInclude Include="..\..\src\ripple\unity\json.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\unity\leveldb.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\leveldb;..\..\src\leveldb\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\unity\leveldb.h">
     </ClInclude>
@@ -3809,6 +3815,8 @@
     <ClCompile Include="..\..\src\ripple\unity\ripple.proto.cpp">
     </ClCompile>
     <ClCompile Include="..\..\src\ripple\unity\rocksdb.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\src\ripple\rocksdb\rocksdb;..\..\src\ripple\rocksdb\rocksdb\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\ripple\rocksdb\rocksdb;..\..\src\ripple\rocksdb\rocksdb\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClInclude Include="..\..\src\ripple\unity\rocksdb.h">
     </ClInclude>
@@ -3821,6 +3829,8 @@
     <ClInclude Include="..\..\src\ripple\unity\sitefiles.h">
     </ClInclude>
     <ClCompile Include="..\..\src\ripple\unity\snappy.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug|x64'">..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release|x64'">..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <ClCompile Include="..\..\src\ripple\unity\sslutil.cpp">
     </ClCompile>
diff --git a/SConstruct b/SConstruct
index dcad6e32c2..6864e09192 100644
--- a/SConstruct
+++ b/SConstruct
@@ -61,7 +61,7 @@ import Beast
 def parse_time(t):
     return time.strptime(t, '%a %b %d %H:%M:%S %Z %Y')
 
-CHECK_PLATFORMS = 'Darwin', 'Debian', 'Ubuntu'
+CHECK_PLATFORMS = 'Debian', 'Ubuntu'
 CHECK_COMMAND = 'openssl version -a'
 CHECK_LINE = 'built on: '
 BUILD_TIME = 'Mon Apr  7 20:33:19 UTC 2014'
@@ -444,24 +444,12 @@ config_base(base)
 base.Append(CPPPATH=[
     'src',
     os.path.join('src', 'beast'),
-    os.path.join('src', 'snappy', 'snappy'),
-    os.path.join('src', 'snappy', 'config'),
     os.path.join(build_dir, 'proto'),
     ])
-base.Append(CPPPATH=[
-    os.path.join('src', 'leveldb'),
-    os.path.join('src', 'leveldb', 'port'),
-    os.path.join('src', 'leveldb', 'include'),
-    ])
 if Beast.system.windows:
     base.Append(CPPPATH=[
         os.path.join('src', 'protobuf', 'src'),
         ])
-else:
-    base.Append(CPPPATH=[
-        os.path.join('src', 'rocksdb'),
-        os.path.join('src', 'rocksdb', 'include'),
-        ])
 
 # Configure the toolchains, variants, default toolchain, and default target
 variants = ['debug', 'release']
@@ -530,10 +518,8 @@ for toolchain in toolchains:
         objects.append(addSource('src/ripple/unity/beast.cpp', env, variant_dirs))
         objects.append(addSource('src/ripple/unity/beastc.c', env, variant_dirs))
         objects.append(addSource('src/ripple/unity/common.cpp', env, variant_dirs))
-        objects.append(addSource('src/ripple/unity/core.cpp', env, variant_dirs))
         objects.append(addSource('src/ripple/unity/data.cpp', env, variant_dirs))
         objects.append(addSource('src/ripple/unity/http.cpp', env, variant_dirs))
-        objects.append(addSource('src/ripple/unity/hyperleveldb.cpp', env, variant_dirs))
         objects.append(addSource('src/ripple/unity/json.cpp', env, variant_dirs))
         objects.append(addSource('src/ripple/unity/net.cpp', env, variant_dirs))
         objects.append(addSource('src/ripple/unity/overlay.cpp', env, variant_dirs))
@@ -544,15 +530,42 @@ for toolchain in toolchains:
         objects.append(addSource('src/ripple/unity/ripple.proto.cpp', env, variant_dirs))
         objects.append(addSource('src/ripple/unity/radmap.cpp', env, variant_dirs))
         objects.append(addSource('src/ripple/unity/resource.cpp', env, variant_dirs))
-        objects.append(addSource('src/ripple/unity/rocksdb.cpp', env, variant_dirs))
         objects.append(addSource('src/ripple/unity/sitefiles.cpp', env, variant_dirs))
-        objects.append(addSource('src/ripple/unity/snappy.cpp', env, variant_dirs))
         objects.append(addSource('src/ripple/unity/sslutil.cpp', env, variant_dirs))
         objects.append(addSource('src/ripple/unity/testoverlay.cpp', env, variant_dirs))
         objects.append(addSource('src/ripple/unity/types.cpp', env, variant_dirs))
         objects.append(addSource('src/ripple/unity/validators.cpp', env, variant_dirs))
 
-        objects.append(addSource('src/ripple/unity/leveldb.cpp', env, variant_dirs))
+        objects.append(addSource('src/ripple/unity/core.cpp', env, variant_dirs, [
+            'src/leveldb/include',
+            #'src/hyperleveldb/include', # hyper 
+            'src/ripple/rocksdb/rocksdb/include',
+            ]))
+
+        objects.append(addSource('src/ripple/unity/leveldb.cpp', env, variant_dirs, [
+            'src/leveldb/',
+            'src/leveldb/include',
+            'src/snappy/snappy',
+            'src/snappy/config',
+            ]))
+
+        objects.append(addSource('src/ripple/unity/hyperleveldb.cpp', env, variant_dirs, [
+            'src/hyperleveldb',
+            'src/snappy/snappy',
+            'src/snappy/config',
+            ]))
+
+        objects.append(addSource('src/ripple/unity/rocksdb.cpp', env, variant_dirs, [
+            'src/ripple/rocksdb/rocksdb',
+            'src/ripple/rocksdb/rocksdb/include',
+            'src/snappy/snappy',
+            'src/snappy/config',
+            ]))
+
+        objects.append(addSource('src/ripple/unity/snappy.cpp', env, variant_dirs, [
+            'src/snappy/snappy',
+            'src/snappy/config',
+            ]))
 
         if Beast.system.osx:
             objects.append(addSource('src/ripple/unity/beastobjc.mm', env, variant_dirs))
diff --git a/src/ripple/unity/beastobjc.mm b/src/ripple/unity/beastobjc.mm
index 4209c7d827..6bebb8cf34 100644
--- a/src/ripple/unity/beastobjc.mm
+++ b/src/ripple/unity/beastobjc.mm
@@ -24,4 +24,5 @@
 #undef BEAST_COMPILE_OBJECTIVE_CPP
 #define BEAST_COMPILE_OBJECTIVE_CPP 0
 
-#include "beast.unity.cpp"
+#include <ripple/unity/beast.cpp>
+