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 @@
-
+
true
true
true
@@ -379,7 +379,7 @@
true
true
-
+
true
true
@@ -410,8 +410,8 @@
true
true
-
-
+
+
true
true
@@ -436,7 +436,7 @@
true
true
-
+
true
true
@@ -467,7 +467,7 @@
true
true
-
+
true
true
@@ -516,14 +516,14 @@
true
true
-
+
true
true
true
true
-
+
true
true
@@ -620,7 +620,7 @@
true
true
-
+
true
true
@@ -645,14 +645,14 @@
true
true
-
+
true
true
true
true
-
+
true
true
@@ -671,7 +671,7 @@
true
true
-
+
true
true
@@ -714,7 +714,7 @@
true
true
-
+
true
true
@@ -775,7 +775,7 @@
true
true
-
+
true
true
@@ -788,7 +788,7 @@
true
true
-
+
true
true
@@ -909,7 +909,7 @@
true
true
-
+
true
true
@@ -1132,7 +1132,7 @@
true
true
-
+
true
true
@@ -1205,7 +1205,7 @@
true
true
-
+
true
true
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 @@
beast\http\impl\http-parser
-
- beast_core
-
beast\crypto\impl\sha2
@@ -71,6 +68,9 @@
beast\asio
+
+ beast_core
+
@@ -1296,15 +1296,9 @@
beast_core\diagnostic
-
- beast_sqlite
-
beast_sqlite\sqlite
-
- beast_sqdb
-
beast_sqdb\source
@@ -1416,24 +1410,12 @@
beast_asio\http
-
- beast_core
-
-
- beast_asio
-
beast_core\time
beast_core\diagnostic
-
- beast\net
-
-
- beast\utility
-
beast\utility\impl
@@ -1452,18 +1434,12 @@
beast\http\impl\http-parser\contrib
-
- beast\http
-
beast\strings\impl
beast\strings\impl
-
- beast\strings
-
beast\http\impl
@@ -1479,9 +1455,6 @@
beast\crypto\impl\sha2
-
- beast\crypto
-
beast\crypto\impl
@@ -1512,9 +1485,6 @@
beast\threads\impl
-
- beast\threads
-
beast\threads\impl
@@ -1527,24 +1497,15 @@
beast\threads\impl
-
- beast\boost
-
beast\utility\impl
-
- beast\asio
-
beast\asio\impl
beast\crypto\impl
-
- beast\insight
-
beast\insight\impl
@@ -1578,18 +1539,9 @@
beast\net\impl
-
- beast\chrono
-
-
- beast\container
-
beast\container\tests
-
- beast\cxx14
-
beast\cxx14\tests
@@ -1647,9 +1599,6 @@
beast\streams\tests
-
- beast\streams
-
beast\threads\tests
@@ -1671,6 +1620,57 @@
beast\utility\tests
+
+ beast\asio
+
+
+ beast\boost
+
+
+ beast\chrono
+
+
+ beast\container
+
+
+ beast\crypto
+
+
+ beast\cxx14
+
+
+ beast\http
+
+
+ beast\insight
+
+
+ beast\net
+
+
+ beast\streams
+
+
+ beast\strings
+
+
+ beast\threads
+
+
+ beast\utility
+
+
+ beast_core
+
+
+ beast_asio
+
+
+ beast_sqdb
+
+
+ beast_sqlite
+
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