Tidy up some source filenames:

* Add .unity suffix to mark unity sources
* Fix some relative include paths

src/beast/Builds/VisualStudio2013/beast.vcxproj

@@ -35,7 +35,7 @@
     <None Include="..\..\beast\http\impl\http-parser\README.md" />
     <None Include="..\..\CodingStyle.md" />
     <None Include="..\..\Doxyfile" />
-    <None Include="..\..\modules\beast_core\beast_core.mm">
+    <None Include="..\..\modules\beast_core\beast_core.unity.mm">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -379,7 +379,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\beast\asio\Asio.cpp" />
+    <ClCompile Include="..\..\beast\asio\Asio.unity.cpp" />
     <ClCompile Include="..\..\beast\asio\impl\IPAddressConversion.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -410,8 +410,8 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\beast\boost\Boost.cpp" />
-    <ClCompile Include="..\..\beast\chrono\Chrono.cpp" />
+    <ClCompile Include="..\..\beast\boost\Boost.unity.cpp" />
+    <ClCompile Include="..\..\beast\chrono\Chrono.unity.cpp" />
     <ClCompile Include="..\..\beast\chrono\impl\chrono_io.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -436,7 +436,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\beast\container\Container.cpp" />
+    <ClCompile Include="..\..\beast\container\Container.unity.cpp" />
     <ClCompile Include="..\..\beast\container\impl\spookyv2.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -467,7 +467,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\beast\crypto\Crypto.cpp" />
+    <ClCompile Include="..\..\beast\crypto\Crypto.unity.cpp" />
     <ClCompile Include="..\..\beast\crypto\impl\MurmurHash.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -516,14 +516,14 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\beast\cxx14\cxx14.cpp" />
+    <ClCompile Include="..\..\beast\cxx14\cxx14.unity.cpp" />
     <ClCompile Include="..\..\beast\cxx14\tests\integer_sequence.test.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\beast\http\HTTP.cpp" />
+    <ClCompile Include="..\..\beast\http\HTTP.unity.cpp" />
     <ClCompile Include="..\..\beast\http\impl\raw_parser.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -620,7 +620,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\beast\insight\Insight.cpp" />
+    <ClCompile Include="..\..\beast\insight\Insight.unity.cpp" />
     <ClCompile Include="..\..\beast\net\impl\DynamicBuffer.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -645,14 +645,14 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\beast\net\Net.cpp" />
+    <ClCompile Include="..\..\beast\net\Net.unity.cpp" />
     <ClCompile Include="..\..\beast\net\tests\IPEndpoint.test.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\beast\streams\streams.cpp" />
+    <ClCompile Include="..\..\beast\streams\streams.unity.cpp" />
     <ClCompile Include="..\..\beast\streams\tests\basic_abstract_ostream.test.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -671,7 +671,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\beast\strings\Strings.cpp" />
+    <ClCompile Include="..\..\beast\strings\Strings.unity.cpp" />
     <ClCompile Include="..\..\beast\threads\impl\RecursiveMutex.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -714,7 +714,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\beast\threads\Threads.cpp" />
+    <ClCompile Include="..\..\beast\threads\Threads.unity.cpp" />
     <ClCompile Include="..\..\beast\unit_test\tests\main.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -775,7 +775,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\beast\utility\Utility.cpp" />
+    <ClCompile Include="..\..\beast\utility\Utility.unity.cpp" />
     <ClCompile Include="..\..\modules\beast_asio\basics\PeerRole.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -788,7 +788,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\beast_asio.cpp" />
+    <ClCompile Include="..\..\modules\beast_asio\beast_asio.unity.cpp" />
     <ClCompile Include="..\..\modules\beast_asio\http\HTTPClientType.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -909,7 +909,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\beast_core.cpp" />
+    <ClCompile Include="..\..\modules\beast_core\beast_core.unity.cpp" />
     <ClCompile Include="..\..\modules\beast_core\diagnostic\FatalError.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1132,7 +1132,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_sqdb\beast_sqdb.cpp" />
+    <ClCompile Include="..\..\modules\beast_sqdb\beast_sqdb.unity.cpp" />
     <ClCompile Include="..\..\modules\beast_sqdb\source\blob.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -1205,7 +1205,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_sqlite\beast_sqlite.c" />
+    <ClCompile Include="..\..\modules\beast_sqlite\beast_sqlite.unity.c" />
     <ClCompile Include="..\..\modules\beast_sqlite\sqlite\sqlite3.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

src/beast/Builds/VisualStudio2013/beast.vcxproj.filters

@@ -55,9 +55,6 @@
     <None Include="..\..\beast\http\impl\http-parser\README.md">
       <Filter>beast\http\impl\http-parser</Filter>
     </None>
-    <None Include="..\..\modules\beast_core\beast_core.mm">
-      <Filter>beast_core</Filter>
-    </None>
     <None Include="..\..\beast\crypto\impl\sha2\README">
       <Filter>beast\crypto\impl\sha2</Filter>
     </None>
@@ -71,6 +68,9 @@
       <Filter>beast\asio</Filter>
     </None>
     <None Include="..\..\SConstruct" />
+    <None Include="..\..\modules\beast_core\beast_core.unity.mm">
+      <Filter>beast_core</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="beast_core">
@@ -1296,15 +1296,9 @@
     <ClCompile Include="..\..\modules\beast_core\diagnostic\UnitTestUtilities.cpp">
       <Filter>beast_core\diagnostic</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_sqlite\beast_sqlite.c">
-      <Filter>beast_sqlite</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\modules\beast_sqlite\sqlite\sqlite3.c">
       <Filter>beast_sqlite\sqlite</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_sqdb\beast_sqdb.cpp">
-      <Filter>beast_sqdb</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\modules\beast_sqdb\source\blob.cpp">
       <Filter>beast_sqdb\source</Filter>
     </ClCompile>
@@ -1416,24 +1410,12 @@
     <ClCompile Include="..\..\modules\beast_asio\http\HTTPParser.cpp">
       <Filter>beast_asio\http</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\beast_core\beast_core.cpp">
-      <Filter>beast_core</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\beast_asio\beast_asio.cpp">
-      <Filter>beast_asio</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\modules\beast_core\time\AtExitHook.cpp">
       <Filter>beast_core\time</Filter>
     </ClCompile>
     <ClCompile Include="..\..\modules\beast_core\diagnostic\FatalError.cpp">
       <Filter>beast_core\diagnostic</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\beast\net\Net.cpp">
-      <Filter>beast\net</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\beast\utility\Utility.cpp">
-      <Filter>beast\utility</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\beast\utility\impl\Journal.cpp">
       <Filter>beast\utility\impl</Filter>
     </ClCompile>
@@ -1452,18 +1434,12 @@
     <ClCompile Include="..\..\beast\http\impl\http-parser\contrib\url_parser.c">
       <Filter>beast\http\impl\http-parser\contrib</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\beast\http\HTTP.cpp">
-      <Filter>beast\http</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\beast\strings\impl\CharacterFunctions.cpp">
       <Filter>beast\strings\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\beast\strings\impl\String.cpp">
       <Filter>beast\strings\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\beast\strings\Strings.cpp">
-      <Filter>beast\strings</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\beast\http\impl\URL.cpp">
       <Filter>beast\http\impl</Filter>
     </ClCompile>
@@ -1479,9 +1455,6 @@
     <ClCompile Include="..\..\beast\crypto\impl\sha2\sha2speed.c">
       <Filter>beast\crypto\impl\sha2</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\beast\crypto\Crypto.cpp">
-      <Filter>beast\crypto</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\beast\crypto\impl\Sha256.cpp">
       <Filter>beast\crypto\impl</Filter>
     </ClCompile>
@@ -1512,9 +1485,6 @@
     <ClCompile Include="..\..\beast\threads\impl\WaitableEvent.cpp">
       <Filter>beast\threads\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\beast\threads\Threads.cpp">
-      <Filter>beast\threads</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\beast\threads\impl\Thread.cpp">
       <Filter>beast\threads\impl</Filter>
     </ClCompile>
@@ -1527,24 +1497,15 @@
     <ClCompile Include="..\..\beast\threads\impl\Stoppable.cpp">
       <Filter>beast\threads\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\beast\boost\Boost.cpp">
-      <Filter>beast\boost</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\beast\utility\impl\PropertyStream.cpp">
       <Filter>beast\utility\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\beast\asio\Asio.cpp">
-      <Filter>beast\asio</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\beast\asio\impl\IPAddressConversion.cpp">
       <Filter>beast\asio\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\beast\crypto\impl\MurmurHash.cpp">
       <Filter>beast\crypto\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\beast\insight\Insight.cpp">
-      <Filter>beast\insight</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\beast\insight\impl\Collector.cpp">
       <Filter>beast\insight\impl</Filter>
     </ClCompile>
@@ -1578,18 +1539,9 @@
     <ClCompile Include="..\..\beast\net\impl\IPEndpoint.cpp">
       <Filter>beast\net\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\beast\chrono\Chrono.cpp">
-      <Filter>beast\chrono</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\beast\container\Container.cpp">
-      <Filter>beast\container</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\beast\container\tests\buffer_view.test.cpp">
       <Filter>beast\container\tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\beast\cxx14\cxx14.cpp">
-      <Filter>beast\cxx14</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\beast\cxx14\tests\integer_sequence.test.cpp">
       <Filter>beast\cxx14\tests</Filter>
     </ClCompile>
@@ -1647,9 +1599,6 @@
     <ClCompile Include="..\..\beast\streams\tests\basic_abstract_ostream.test.cpp">
       <Filter>beast\streams\tests</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\beast\streams\streams.cpp">
-      <Filter>beast\streams</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\beast\threads\tests\Atomic.test.cpp">
       <Filter>beast\threads\tests</Filter>
     </ClCompile>
@@ -1671,6 +1620,57 @@
     <ClCompile Include="..\..\beast\utility\tests\Zero.test.cpp">
       <Filter>beast\utility\tests</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\beast\asio\Asio.unity.cpp">
+      <Filter>beast\asio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\boost\Boost.unity.cpp">
+      <Filter>beast\boost</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\chrono\Chrono.unity.cpp">
+      <Filter>beast\chrono</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\container\Container.unity.cpp">
+      <Filter>beast\container</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\crypto\Crypto.unity.cpp">
+      <Filter>beast\crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\cxx14\cxx14.unity.cpp">
+      <Filter>beast\cxx14</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\http\HTTP.unity.cpp">
+      <Filter>beast\http</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\insight\Insight.unity.cpp">
+      <Filter>beast\insight</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\net\Net.unity.cpp">
+      <Filter>beast\net</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\streams\streams.unity.cpp">
+      <Filter>beast\streams</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\strings\Strings.unity.cpp">
+      <Filter>beast\strings</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\threads\Threads.unity.cpp">
+      <Filter>beast\threads</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\beast\utility\Utility.unity.cpp">
+      <Filter>beast\utility</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_core\beast_core.unity.cpp">
+      <Filter>beast_core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_asio\beast_asio.unity.cpp">
+      <Filter>beast_asio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_sqdb\beast_sqdb.unity.cpp">
+      <Filter>beast_sqdb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_sqlite\beast_sqlite.unity.c">
+      <Filter>beast_sqlite</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\TODO.txt">

src/beast/Doxyfile

@@ -102,7 +102,7 @@ INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          =
 RECURSIVE              = YES
 EXCLUDE                = modules/beast_core/beast_core.h \
-                         modules/beast_core/beast_core.cpp \
+                         modules/beast_core/beast_core.unity.cpp \
                          modules/beast_basics/beast_basics.cpp \
                          modules/beast_basics/native \
                          modules/beast_basics/zip/zlib

src/beast/beast/crypto/tests/BinaryEncoding.cpp

@@ -17,7 +17,7 @@
 */
 //==============================================================================
 
-// MODULES: ../../../modules/beast_core/beast_core.cpp ../../strings/Strings.cpp ../../chrono/Chrono.cpp ../../threads/Threads.cpp
+// MODULES: ../../../modules/beast_core/beast_core.beast_core.unity.cpp ../../strings/Strings.cpp ../../chrono/Chrono.cpp ../../threads/Threads.cpp
 #include "../BinaryEncoding.h"
 #include "../UnsignedInteger.h"
 

src/beast/modules/beast_core/beast_core.unity.mm

@@ -21,4 +21,4 @@
 */
 //==============================================================================
 
-#include "beast_core.cpp"
+#include "beast_core.beast_core.unity.cpp"

src/ripple/beast/ripple_beast.unity.cpp

@@ -26,23 +26,23 @@
 #include "../../BeastConfig.h"
 
 // Include this to get all the basic includes included, to prevent errors
-#include "../beast/modules/beast_core/beast_core.cpp"
-#include "../beast/modules/beast_asio/beast_asio.cpp"
-#include "../beast/modules/beast_sqdb/beast_sqdb.cpp"
+#include "../../beast/modules/beast_core/beast_core.unity.cpp"
+#include "../../beast/modules/beast_asio/beast_asio.unity.cpp"
+#include "../../beast/modules/beast_sqdb/beast_sqdb.unity.cpp"
 
-#include "../beast/beast/asio/Asio.cpp"
-#include "../beast/beast/boost/Boost.cpp"
-#include "../beast/beast/chrono/Chrono.cpp"
-#include "../beast/beast/container/Container.cpp"
-#include "../beast/beast/crypto/Crypto.cpp"
-#include "../beast/beast/http/HTTP.cpp"
-#include "../beast/beast/insight/Insight.cpp"
-#include "../beast/beast/net/Net.cpp"
-#include "../beast/beast/streams/streams.cpp"
-#include "../beast/beast/strings/Strings.cpp"
-#include "../beast/beast/threads/Threads.cpp"
-#include "../beast/beast/utility/Utility.cpp"
+#include "../../beast/beast/asio/Asio.unity.cpp"
+#include "../../beast/beast/boost/Boost.unity.cpp"
+#include "../../beast/beast/chrono/Chrono.unity.cpp"
+#include "../../beast/beast/container/Container.unity.cpp"
+#include "../../beast/beast/crypto/Crypto.unity.cpp"
+#include "../../beast/beast/http/HTTP.unity.cpp"
+#include "../../beast/beast/insight/Insight.unity.cpp"
+#include "../../beast/beast/net/Net.unity.cpp"
+#include "../../beast/beast/streams/streams.unity.cpp"
+#include "../../beast/beast/strings/Strings.unity.cpp"
+#include "../../beast/beast/threads/Threads.unity.cpp"
+#include "../../beast/beast/utility/Utility.unity.cpp"
 
-#include "../beast/beast/cxx14/cxx14.cpp"
+#include "../../beast/beast/cxx14/cxx14.unity.cpp"
 
-#include "../beast/beast/unit_test/define_print.cpp"
+#include "../../beast/beast/unit_test/define_print.cpp"

src/ripple/beast/ripple_beastc.unity.c

@@ -30,4 +30,4 @@
 #error "Whoops! This file must be compiled with a C compiler!"
 #endif
 
-#include "../beast/modules/beast_sqlite/beast_sqlite.c"
+#include "../../beast/modules/beast_sqlite/beast_sqlite.unity.c"

src/ripple/common/MultiSocket.h

@@ -20,7 +20,7 @@
 #ifndef RIPPLE_COMMON_MULTISOCKET_H_INCLUDED
 #define RIPPLE_COMMON_MULTISOCKET_H_INCLUDED
 
-#include "../beast/modules/beast_asio/beast_asio.h"
+#include "../../beast/modules/beast_asio/beast_asio.h"
 
 namespace ripple {
 

src/ripple/common/ResolverAsio.h

@@ -22,7 +22,7 @@
 
 #include <boost/asio/io_service.hpp>
 
-#include "../beast/beast/utility/Journal.h"
+#include "../../beast/beast/utility/Journal.h"
 #include "Resolver.h"
 
 namespace ripple {

src/ripple/common/RippleSSLContext.h

@@ -20,7 +20,7 @@
 #ifndef RIPPLE_COMMON_SSLCONTEXT_H_INCLUDED
 #define RIPPLE_COMMON_SSLCONTEXT_H_INCLUDED
 
-#include "../beast/modules/beast_asio/beast_asio.h"
+#include "../../beast/modules/beast_asio/beast_asio.h"
 
 #include <string>
 

src/ripple/http/ripple_http.h

@@ -22,7 +22,7 @@
 
 // VFALCO NOTE this sucks that we have to include asio in the header
 //             just for HTTPMessage!!
-#include "../beast/modules/beast_asio/beast_asio.h"
+#include "../../beast/modules/beast_asio/beast_asio.h"
 
 # include "api/Port.h"
 # include "api/ScopedStream.h"

src/ripple/http/ripple_http.unity.cpp

@@ -23,7 +23,7 @@
 
 #include "../ripple_net/ripple_net.h"
 
-#include "../beast/modules/beast_core/system/BeforeBoost.h"
+#include "../../beast/modules/beast_core/system/BeforeBoost.h"
 #include <boost/asio.hpp>
 #include <boost/optional.hpp>
 

src/ripple/json/api/JsonPropertyStream.h

@@ -20,7 +20,7 @@
 #ifndef RIPPLE_JSONPROPERTYSTREAM_H_INCLUDED
 #define RIPPLE_JSONPROPERTYSTREAM_H_INCLUDED
 
-#include "../beast/beast/utility/PropertyStream.h"
+#include "../../../beast/beast/utility/PropertyStream.h"
 
 namespace ripple {
 

src/ripple/json/ripple_json.h

@@ -20,10 +20,10 @@
 #ifndef RIPPLE_JSON_H_INCLUDED
 #define RIPPLE_JSON_H_INCLUDED
 
-#include "../beast/beast/Config.h"
+#include "../../beast/beast/Config.h"
 
-#include "../beast/beast/strings/String.h"
-#include "../beast/beast/utility/PropertyStream.h"
+#include "../../beast/beast/strings/String.h"
+#include "../../beast/beast/utility/PropertyStream.h"
 
 #include <deque>
 #include <stack>

src/ripple/peerfinder/api/Manager.h

@@ -26,7 +26,7 @@
 
 #include "../../sitefiles/api/Manager.h"
 
-#include "../../beast/modules/beast_core/files/File.h"
+#include "../../../beast/modules/beast_core/files/File.h"
 
 namespace ripple {
 namespace PeerFinder {

src/ripple/peerfinder/api/Slot.h

@@ -22,7 +22,7 @@
 
 #include "../../types/api/RipplePublicKey.h"
 
-#include "../../beast/beast/net/IPEndpoint.h"
+#include "../../../beast/beast/net/IPEndpoint.h"
 
 #include <boost/optional.hpp>
 

src/ripple/peerfinder/api/Types.h

@@ -22,7 +22,7 @@
 
 #include "Endpoint.h"
 
-#include "../../beast/beast/chrono/abstract_clock.h"
+#include "../../../beast/beast/chrono/abstract_clock.h"
 
 namespace ripple {
 namespace PeerFinder {

src/ripple/peerfinder/ripple_peerfinder.unity.cpp

@@ -31,16 +31,16 @@
 #include <set>
 #include <unordered_set>
 
-#include "../beast/modules/beast_core/system/BeforeBoost.h"
+#include "../../beast/modules/beast_core/system/BeforeBoost.h"
 #include <boost/array.hpp>
 #include <boost/optional.hpp>
 #include <boost/regex.hpp>
 
-#include "../beast/modules/beast_sqdb/beast_sqdb.h"
-#include "../beast/modules/beast_asio/beast_asio.h"
+#include "../../beast/modules/beast_sqdb/beast_sqdb.h"
+#include "../../beast/modules/beast_asio/beast_asio.h"
 
-#include "../beast/beast/boost/ErrorCode.h"
-#include "../beast/beast/chrono/chrono_io.h"
+#include "../../beast/beast/boost/ErrorCode.h"
+#include "../../beast/beast/chrono/chrono_io.h"
 
 #include "impl/iosformat.h" // VFALCO NOTE move to beast
 

src/ripple/resource/api/Gossip.h

@@ -20,7 +20,7 @@
 #ifndef RIPPLE_RESOURCE_GOSSIP_H_INCLUDED
 #define RIPPLE_RESOURCE_GOSSIP_H_INCLUDED
 
-#include "../../beast/beast/net/IPEndpoint.h"
+#include "../../../beast/beast/net/IPEndpoint.h"
 
 namespace ripple {
 namespace Resource {

src/ripple/resource/api/Manager.h

@@ -23,9 +23,9 @@
 #include "Consumer.h"
 #include "Gossip.h"
 
-#include "../../beast/beast/insight/Collector.h"
-#include "../../beast/beast/net/IPEndpoint.h"
-#include "../../beast/beast/utility/Journal.h"
+#include "../../../beast/beast/insight/Collector.h"
+#include "../../../beast/beast/net/IPEndpoint.h"
+#include "../../../beast/beast/utility/Journal.h"
 
 namespace ripple {
 namespace Resource {

src/ripple/resource/impl/Logic.h

@@ -22,7 +22,7 @@
 
 #include "../../common/UnorderedContainers.h"
 
-#include "../../beast/beast/chrono/abstract_clock.h"
+#include "../../../beast/beast/chrono/abstract_clock.h"
 
 namespace ripple {
 namespace Resource {

src/ripple/resource/ripple_resource.unity.cpp

@@ -21,15 +21,15 @@
 
 #include "ripple_resource.h"
 
-#include "../beast/modules/beast_core/system/BeforeBoost.h"
+#include "../../beast/modules/beast_core/system/BeforeBoost.h"
 #include <boost/utility/base_from_member.hpp>
 
 #include "../algorithm/api/DecayingSample.h"
 #include "../common/seconds_clock.h"
 
-#include "../beast/beast/Insight.h"
-#include "../beast/beast/cxx14/memory.h"
-#include "../beast/beast/chrono/chrono_io.h"
+#include "../../beast/beast/Insight.h"
+#include "../../beast/beast/cxx14/memory.h"
+#include "../../beast/beast/chrono/chrono_io.h"
 
 #include "impl/Fees.cpp"
 #  include "impl/Kind.h"

src/ripple/rocksdb/ripple_rocksdb.h

@@ -20,7 +20,7 @@
 #ifndef RIPPLE_ROCKSDB_H_INCLUDED
 #define RIPPLE_ROCKSDB_H_INCLUDED
 
-#include "../beast/beast/Config.h"
+#include "../../beast/beast/Config.h"
 
 #ifndef RIPPLE_ROCKSDB_AVAILABLE
 # if BEAST_WIN32

src/ripple/sitefiles/api/Manager.h

@@ -22,7 +22,7 @@
 
 #include "Listener.h"
 
-#include "../../beast/beast/utility/PropertyStream.h"
+#include "../../../beast/beast/utility/PropertyStream.h"
 
 namespace ripple {
 namespace SiteFiles {

src/ripple/sitefiles/ripple_sitefiles.h

@@ -22,10 +22,10 @@
 
 #include <vector>
 
-#include "../beast/modules/beast_core/system/BeforeBoost.h"
+#include "../../beast/modules/beast_core/system/BeforeBoost.h"
 
-#include "../beast/beast/http/URL.h"
-#include "../beast/beast/Threads.h"
+#include "../../beast/beast/http/URL.h"
+#include "../../beast/beast/Threads.h"
 
 #   include "api/Section.h"
 #  include "api/SiteFile.h"

src/ripple/sitefiles/ripple_sitefiles.unity.cpp

@@ -21,9 +21,9 @@
 
 #include "ripple_sitefiles.h"
 
-#include "../beast/modules/beast_asio/beast_asio.h" // HTTPClientBase
+#include "../../beast/modules/beast_asio/beast_asio.h" // HTTPClientBase
 
-#include "../beast/modules/beast_core/system/BeforeBoost.h"
+#include "../../beast/modules/beast_core/system/BeforeBoost.h"
 #include <boost/regex.hpp>
 
 #include <set>

src/ripple/testoverlay/ripple_testoverlay.h

@@ -20,10 +20,10 @@
 #ifndef RIPPLE_TESTOVERLAY_H_INCLUDED
 #define RIPPLE_TESTOVERLAY_H_INCLUDED
 
-#include "../beast/modules/beast_core/system/BeforeBoost.h"
+#include "../../beast/modules/beast_core/system/BeforeBoost.h"
 #include <boost/unordered_set.hpp>
 
-#include "../beast/modules/beast_core/beast_core.h"
+#include "../../beast/modules/beast_core/beast_core.h"
 
 #include <memory>
 

src/ripple/types/api/CryptoIdentifier.h

@@ -20,8 +20,8 @@
 #ifndef RIPPLE_TYPES_CRYPTOIDENTIFIER_H_INCLUDED
 #define RIPPLE_TYPES_CRYPTOIDENTIFIER_H_INCLUDED
 
-#include "../../beast/beast/ByteOrder.h"
-#include "../../beast/beast/crypto/Sha256.h"
+#include "../../../beast/beast/ByteOrder.h"
+#include "../../../beast/beast/crypto/Sha256.h"
 #include <array>
 
 #include "Base58.h"

src/ripple/types/api/IdentifierStorage.h

@@ -20,8 +20,8 @@
 #ifndef RIPPLE_TYPES_IDENTIFIERSTORAGE_H_INCLUDED
 #define RIPPLE_TYPES_IDENTIFIERSTORAGE_H_INCLUDED
 
-#include "../../beast/beast/crypto/MurmurHash.h"
-#include "../../beast/beast/container/hardened_hash.h"
+#include "../../../beast/beast/crypto/MurmurHash.h"
+#include "../../../beast/beast/container/hardened_hash.h"
 
 #include <array>
 

src/ripple/types/api/RandomNumbers.h

@@ -20,7 +20,7 @@
 #ifndef RIPPLE_TYPES_RANDOMNUMBERS_H
 #define RIPPLE_TYPES_RANDOMNUMBERS_H
 
-#include "../../beast/beast/utility/Journal.h"
+#include "../../../beast/beast/utility/Journal.h"
 
 namespace ripple {
 

src/ripple/types/api/base_uint.h

@@ -29,7 +29,7 @@
 #include "strHex.h"
 #include "ByteOrder.h"
     
-#include "../../beast/beast/container/hardened_hash.h"
+#include "../../../beast/beast/container/hardened_hash.h"
 
 #include <functional>
 

src/ripple/types/ripple_types.h

@@ -22,9 +22,9 @@
 
 #include "../json/ripple_json.h"
 
-#include "../beast/beast/Crypto.h"
+#include "../../beast/beast/Crypto.h"
 
-#include "../beast/modules/beast_core/system/BeforeBoost.h"
+#include "../../beast/modules/beast_core/system/BeforeBoost.h"
 #include <boost/utility/base_from_member.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/unordered_set.hpp>

src/ripple/types/ripple_types.unity.cpp

@@ -20,7 +20,7 @@
 #include "../../BeastConfig.h"
 
 #include "ripple_types.h"
-#include "../ripple/sslutil/ripple_sslutil.h"
+#include "../sslutil/ripple_sslutil.h"
 
 #ifdef BEAST_WIN32
 # include <Winsock2.h> // for ByteOrder.cpp

src/ripple/validators/api/Manager.h

@@ -20,8 +20,8 @@
 #ifndef RIPPLE_VALIDATORS_MANAGER_H_INCLUDED
 #define RIPPLE_VALIDATORS_MANAGER_H_INCLUDED
 
-#include "../../beast/beast/threads/Stoppable.h"
-#include "../../beast/modules/beast_core/files/File.h"
+#include "../../../beast/beast/threads/Stoppable.h"
+#include "../../../beast/modules/beast_core/files/File.h"
 
 namespace ripple {
 namespace Validators {

src/ripple/validators/api/Source.h

@@ -20,8 +20,8 @@
 #ifndef RIPPLE_VALIDATORS_SOURCE_H_INCLUDED
 #define RIPPLE_VALIDATORS_SOURCE_H_INCLUDED
 
-#include "../../beast/beast/smart_ptr/SharedObject.h"
-#include "../../beast/modules/beast_core/time/Time.h"
+#include "../../../beast/beast/smart_ptr/SharedObject.h"
+#include "../../../beast/modules/beast_core/time/Time.h"
 
 namespace ripple {
 namespace Validators {

src/ripple/validators/ripple_validators.h

@@ -20,9 +20,9 @@
 #ifndef RIPPLE_VALIDATORS_H_INCLUDED
 #define RIPPLE_VALIDATORS_H_INCLUDED
 
-#include "../beast/beast/http/URL.h"
+#include "../../beast/beast/http/URL.h"
 
-#include "../ripple/types/ripple_types.h"
+#include "../types/ripple_types.h"
 
 # include "api/Types.h"
 # include "api/Source.h"

src/ripple/validators/ripple_validators.unity.cpp

@@ -21,7 +21,7 @@
 
 #include "ripple_validators.h"
 
-#include "../beast/modules/beast_core/system/BeforeBoost.h"
+#include "../../beast/modules/beast_core/system/BeforeBoost.h"
 #include <boost/regex.hpp>
 #include <boost/unordered_set.hpp>
 #include <boost/multi_index_container.hpp>
@@ -30,9 +30,9 @@
 
 #include <set>
 
-#include "../beast/beast/threads/ScopedWrapperContext.h"
-#include "../beast/modules/beast_asio/beast_asio.h"
-#include "../beast/modules/beast_sqdb/beast_sqdb.h"
+#include "../../beast/beast/threads/ScopedWrapperContext.h"
+#include "../../beast/modules/beast_asio/beast_asio.h"
+#include "../../beast/modules/beast_sqdb/beast_sqdb.h"
 
 #include "../algorithm/api/CycledSet.h"
 #include "../testoverlay/ripple_testoverlay.h" // for unit test