Tidy up some source filenames:

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

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