From 4ccc380a7be624b322a7ab9c5a909421d08f533b Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Tue, 22 Apr 2014 14:48:48 -0700
Subject: [PATCH] Tidy up some source filenames: * Add .unity suffix to mark
 unity sources * Fix some relative include paths

---
 Builds/VisualStudio2013/beast.vcxproj         |  36 +++---
 Builds/VisualStudio2013/beast.vcxproj.filters | 108 +++++++++---------
 Doxyfile                                      |   2 +-
 beast/asio/{Asio.cpp => Asio.unity.cpp}       |   0
 beast/boost/{Boost.cpp => Boost.unity.cpp}    |   0
 beast/chrono/{Chrono.cpp => Chrono.unity.cpp} |   0
 .../{Container.cpp => Container.unity.cpp}    |   0
 beast/crypto/{Crypto.cpp => Crypto.unity.cpp} |   0
 beast/crypto/tests/BinaryEncoding.cpp         |   2 +-
 beast/cxx14/{cxx14.cpp => cxx14.unity.cpp}    |   0
 beast/http/{HTTP.cpp => HTTP.unity.cpp}       |   0
 .../{Insight.cpp => Insight.unity.cpp}        |   0
 beast/net/{Net.cpp => Net.unity.cpp}          |   0
 .../{streams.cpp => streams.unity.cpp}        |   0
 .../{Strings.cpp => Strings.unity.cpp}        |   0
 .../{Threads.cpp => Threads.unity.cpp}        |   0
 .../{Utility.cpp => Utility.unity.cpp}        |   0
 modules/README.md                             |   0
 .../{beast_asio.cpp => beast_asio.unity.cpp}  |   0
 .../{beast_core.cpp => beast_core.unity.cpp}  |   0
 .../{beast_core.mm => beast_core.unity.mm}    |   2 +-
 .../{beast_sqdb.cpp => beast_sqdb.unity.cpp}  |   0
 .../{beast_sqlite.c => beast_sqlite.unity.c}  |   0
 23 files changed, 75 insertions(+), 75 deletions(-)
 rename beast/asio/{Asio.cpp => Asio.unity.cpp} (100%)
 rename beast/boost/{Boost.cpp => Boost.unity.cpp} (100%)
 rename beast/chrono/{Chrono.cpp => Chrono.unity.cpp} (100%)
 rename beast/container/{Container.cpp => Container.unity.cpp} (100%)
 rename beast/crypto/{Crypto.cpp => Crypto.unity.cpp} (100%)
 rename beast/cxx14/{cxx14.cpp => cxx14.unity.cpp} (100%)
 rename beast/http/{HTTP.cpp => HTTP.unity.cpp} (100%)
 rename beast/insight/{Insight.cpp => Insight.unity.cpp} (100%)
 rename beast/net/{Net.cpp => Net.unity.cpp} (100%)
 rename beast/streams/{streams.cpp => streams.unity.cpp} (100%)
 rename beast/strings/{Strings.cpp => Strings.unity.cpp} (100%)
 rename beast/threads/{Threads.cpp => Threads.unity.cpp} (100%)
 rename beast/utility/{Utility.cpp => Utility.unity.cpp} (100%)
 create mode 100644 modules/README.md
 rename modules/beast_asio/{beast_asio.cpp => beast_asio.unity.cpp} (100%)
 rename modules/beast_core/{beast_core.cpp => beast_core.unity.cpp} (100%)
 rename modules/beast_core/{beast_core.mm => beast_core.unity.mm} (96%)
 rename modules/beast_sqdb/{beast_sqdb.cpp => beast_sqdb.unity.cpp} (100%)
 rename modules/beast_sqlite/{beast_sqlite.c => beast_sqlite.unity.c} (100%)

diff --git a/Builds/VisualStudio2013/beast.vcxproj b/Builds/VisualStudio2013/beast.vcxproj
index 9cb743ad..11786b4c 100644
--- a/Builds/VisualStudio2013/beast.vcxproj
+++ b/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>
diff --git a/Builds/VisualStudio2013/beast.vcxproj.filters b/Builds/VisualStudio2013/beast.vcxproj.filters
index 0f9aac35..d58e51fc 100644
--- a/Builds/VisualStudio2013/beast.vcxproj.filters
+++ b/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">
diff --git a/Doxyfile b/Doxyfile
index 869f9dd0..b6e72410 100644
--- a/Doxyfile
+++ b/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
diff --git a/beast/asio/Asio.cpp b/beast/asio/Asio.unity.cpp
similarity index 100%
rename from beast/asio/Asio.cpp
rename to beast/asio/Asio.unity.cpp
diff --git a/beast/boost/Boost.cpp b/beast/boost/Boost.unity.cpp
similarity index 100%
rename from beast/boost/Boost.cpp
rename to beast/boost/Boost.unity.cpp
diff --git a/beast/chrono/Chrono.cpp b/beast/chrono/Chrono.unity.cpp
similarity index 100%
rename from beast/chrono/Chrono.cpp
rename to beast/chrono/Chrono.unity.cpp
diff --git a/beast/container/Container.cpp b/beast/container/Container.unity.cpp
similarity index 100%
rename from beast/container/Container.cpp
rename to beast/container/Container.unity.cpp
diff --git a/beast/crypto/Crypto.cpp b/beast/crypto/Crypto.unity.cpp
similarity index 100%
rename from beast/crypto/Crypto.cpp
rename to beast/crypto/Crypto.unity.cpp
diff --git a/beast/crypto/tests/BinaryEncoding.cpp b/beast/crypto/tests/BinaryEncoding.cpp
index eaf5a710..69e611e7 100644
--- a/beast/crypto/tests/BinaryEncoding.cpp
+++ b/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"
 
diff --git a/beast/cxx14/cxx14.cpp b/beast/cxx14/cxx14.unity.cpp
similarity index 100%
rename from beast/cxx14/cxx14.cpp
rename to beast/cxx14/cxx14.unity.cpp
diff --git a/beast/http/HTTP.cpp b/beast/http/HTTP.unity.cpp
similarity index 100%
rename from beast/http/HTTP.cpp
rename to beast/http/HTTP.unity.cpp
diff --git a/beast/insight/Insight.cpp b/beast/insight/Insight.unity.cpp
similarity index 100%
rename from beast/insight/Insight.cpp
rename to beast/insight/Insight.unity.cpp
diff --git a/beast/net/Net.cpp b/beast/net/Net.unity.cpp
similarity index 100%
rename from beast/net/Net.cpp
rename to beast/net/Net.unity.cpp
diff --git a/beast/streams/streams.cpp b/beast/streams/streams.unity.cpp
similarity index 100%
rename from beast/streams/streams.cpp
rename to beast/streams/streams.unity.cpp
diff --git a/beast/strings/Strings.cpp b/beast/strings/Strings.unity.cpp
similarity index 100%
rename from beast/strings/Strings.cpp
rename to beast/strings/Strings.unity.cpp
diff --git a/beast/threads/Threads.cpp b/beast/threads/Threads.unity.cpp
similarity index 100%
rename from beast/threads/Threads.cpp
rename to beast/threads/Threads.unity.cpp
diff --git a/beast/utility/Utility.cpp b/beast/utility/Utility.unity.cpp
similarity index 100%
rename from beast/utility/Utility.cpp
rename to beast/utility/Utility.unity.cpp
diff --git a/modules/README.md b/modules/README.md
new file mode 100644
index 00000000..e69de29b
diff --git a/modules/beast_asio/beast_asio.cpp b/modules/beast_asio/beast_asio.unity.cpp
similarity index 100%
rename from modules/beast_asio/beast_asio.cpp
rename to modules/beast_asio/beast_asio.unity.cpp
diff --git a/modules/beast_core/beast_core.cpp b/modules/beast_core/beast_core.unity.cpp
similarity index 100%
rename from modules/beast_core/beast_core.cpp
rename to modules/beast_core/beast_core.unity.cpp
diff --git a/modules/beast_core/beast_core.mm b/modules/beast_core/beast_core.unity.mm
similarity index 96%
rename from modules/beast_core/beast_core.mm
rename to modules/beast_core/beast_core.unity.mm
index 2b9492c6..037588b9 100644
--- a/modules/beast_core/beast_core.mm
+++ b/modules/beast_core/beast_core.unity.mm
@@ -21,4 +21,4 @@
 */
 //==============================================================================
 
-#include "beast_core.cpp"
+#include "beast_core.beast_core.unity.cpp"
diff --git a/modules/beast_sqdb/beast_sqdb.cpp b/modules/beast_sqdb/beast_sqdb.unity.cpp
similarity index 100%
rename from modules/beast_sqdb/beast_sqdb.cpp
rename to modules/beast_sqdb/beast_sqdb.unity.cpp
diff --git a/modules/beast_sqlite/beast_sqlite.c b/modules/beast_sqlite/beast_sqlite.unity.c
similarity index 100%
rename from modules/beast_sqlite/beast_sqlite.c
rename to modules/beast_sqlite/beast_sqlite.unity.c