Add non-unity build targets:

The SConstruct is modified to provide a new family of targets, ending with
the suffix ".nounity", which compile individual translation units instead of
some of the unity translation units ("classic" builds). Two modules updated
for this treatment are ripple/basics/ and ripple/protocol/, with plans to
update more in the future. A consequence is longer build times in some cases.
A benefit of classic builds is that missing includes can be identified
through compiler errors.

Builds/VisualStudio2013/RippleD.vcxproj

@@ -2137,6 +2137,9 @@
     <ClCompile Include="..\..\src\ripple\basics\impl\ResolverAsio.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\src\ripple\basics\impl\strHex.cpp">
+      <ExcludedFromBuild>True</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\src\ripple\basics\impl\StringUtilities.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
@@ -2698,9 +2701,6 @@
     <ClCompile Include="..\..\src\ripple\protocol\impl\STPathSet.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\protocol\impl\strHex.cpp">
-      <ExcludedFromBuild>True</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\src\ripple\protocol\impl\STTx.cpp">
       <ExcludedFromBuild>True</ExcludedFromBuild>
     </ClCompile>

Builds/VisualStudio2013/RippleD.vcxproj.filters

@@ -3075,6 +3075,9 @@
     <ClCompile Include="..\..\src\ripple\basics\impl\ResolverAsio.cpp">
       <Filter>ripple\basics\impl</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\ripple\basics\impl\strHex.cpp">
+      <Filter>ripple\basics\impl</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\ripple\basics\impl\StringUtilities.cpp">
       <Filter>ripple\basics\impl</Filter>
     </ClCompile>
@@ -3765,9 +3768,6 @@
     <ClCompile Include="..\..\src\ripple\protocol\impl\STPathSet.cpp">
       <Filter>ripple\protocol\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple\protocol\impl\strHex.cpp">
-      <Filter>ripple\protocol\impl</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\ripple\protocol\impl\STTx.cpp">
       <Filter>ripple\protocol\impl</Filter>
     </ClCompile>

SConstruct

@@ -507,6 +507,8 @@ else:
         default_toolchain = 'clang'
     else:
         raise ValueError("Don't understand toolchains in " + str(toolchains))
+
+default_tu_style = 'unity'
 default_variant = 'release'
 default_target = None
 
@@ -533,141 +535,168 @@ class ObjectBuilder(object):
             if kwds:
                 env = env.Clone()
                 env.Prepend(**kwds)
-            path = UNITY_BUILD_DIRECTORY + filename
-            o = env.Object(Beast.variantFile(path, self.variant_dirs))
+            o = env.Object(Beast.variantFile(filename, self.variant_dirs))
             self.objects.append(o)
 
+def list_sources(base, suffixes):
+    def _iter(base):
+        for parent, dirs, files in os.walk(base):
+            files = [f for f in files if not f[0] == '.']
+            dirs[:] = [d for d in dirs if not d[0] == '.']
+            for path in files:
+                path = os.path.join(parent, path)
+                r = os.path.splitext(path)
+                if r[1] in suffixes:
+                    yield os.path.normpath(path)
+    return list(_iter(base))
 
 # Declare the targets
 aliases = collections.defaultdict(list)
 msvc_configs = []
-for toolchain in all_toolchains:
-    for variant in variants:
-        # Configure this variant's construction environment
-        env = base.Clone()
-        config_env(toolchain, variant, env)
-        variant_name = '%s.%s' % (toolchain, variant)
-        variant_dir = os.path.join(build_dir, variant_name)
-        variant_dirs = {
-            os.path.join(variant_dir, 'src') :
-                'src',
-            os.path.join(variant_dir, 'proto') :
-                os.path.join (build_dir, 'proto'),
-            }
-        for dest, source in variant_dirs.iteritems():
-            env.VariantDir(dest, source, duplicate=0)
 
-        object_builder = ObjectBuilder(env, variant_dirs)
-        object_builder.add_source_files(
-            'app.cpp',
-            'app1.cpp',
-            'app2.cpp',
-            'app3.cpp',
-            'app4.cpp',
-            'app5.cpp',
-            'app6.cpp',
-            'app7.cpp',
-            'app8.cpp',
-            'app9.cpp',
-            'basics.cpp',
-            'beast.cpp',
-            'core.cpp',
-            'crypto.cpp',
-            'json.cpp',
-            'net.cpp',
-            'overlay.cpp',
-            'peerfinder.cpp',
-            'protobuf.cpp',
-            'protocol.cpp',
-            'ripple.proto.cpp',
-            'resource.cpp',
-            'rpcx.cpp',
-            'server.cpp',
-            'validators.cpp',
-            'websocket.cpp',
-        )
+for tu_style in ['classic', 'unity']:
+    for toolchain in all_toolchains:
+        for variant in variants:
+            # Configure this variant's construction environment
+            env = base.Clone()
+            config_env(toolchain, variant, env)
+            variant_name = '%s.%s' % (toolchain, variant)
+            if tu_style == 'classic':
+                variant_name += '.nounity'
+            variant_dir = os.path.join(build_dir, variant_name)
+            variant_dirs = {
+                os.path.join(variant_dir, 'src') :
+                    'src',
+                os.path.join(variant_dir, 'proto') :
+                    os.path.join (build_dir, 'proto'),
+                }
+            for dest, source in variant_dirs.iteritems():
+                env.VariantDir(dest, source, duplicate=0)
 
-        object_builder.add_source_files(
-            'beastc.c',
-            CCFLAGS = ([] if toolchain == 'msvc' else ['-Wno-array-bounds']))
+            object_builder = ObjectBuilder(env, variant_dirs)
 
-        object_builder.add_source_files(
-            'nodestore.cpp',
-            CPPPATH=[
-                'src/leveldb/include',
-                #'src/hyperleveldb/include', # hyper
-                'src/rocksdb2/include',
-            ]
-        )
+            if tu_style == 'classic':
+                object_builder.add_source_files(
+                    *list_sources('src/ripple/basics', '.cpp'))
+                object_builder.add_source_files(
+                    *list_sources('src/ripple/protocol', '.cpp'))
+            else:
+                object_builder.add_source_files(
+                    'src/ripple/unity/basics.cpp',
+                    'src/ripple/unity/protocol.cpp',
+                )
 
-        if 'gcc' in toolchain:
-            no_uninitialized_warning = {'CCFLAGS': ['-Wno-maybe-uninitialized']}
-        else:
-            no_uninitialized_warning = {}
-
-        object_builder.add_source_files(
-            'leveldb.cpp',
-            CPPPATH=[
-                'src/leveldb/',
-                'src/leveldb/include',
-                'src/snappy/snappy',
-                'src/snappy/config',
-            ],
-            **no_uninitialized_warning
-        )
-
-        object_builder.add_source_files(
-            'hyperleveldb.cpp',
-            CPPPATH=[
-                'src/hyperleveldb',
-                'src/snappy/snappy',
-                'src/snappy/config',
-            ],
-            **no_uninitialized_warning
-        )
-
-        object_builder.add_source_files(
-            'rocksdb.cpp',
-            CPPPATH=[
-                'src/rocksdb2',
-                'src/rocksdb2/include',
-                'src/snappy/snappy',
-                'src/snappy/config',
-            ],
-            **no_uninitialized_warning
-        )
-
-        object_builder.add_source_files(
-            'snappy.cpp',
-            CCFLAGS=([] if toolchain == 'msvc' else ['-Wno-unused-function']),
-            CPPPATH=[
-                'src/snappy/snappy',
-                'src/snappy/config',
-            ]
-        )
-
-        if toolchain == "clang" and Beast.system.osx:
-            object_builder.add_source_files('beastobjc.mm')
-
-        target = env.Program(
-            target=os.path.join(variant_dir, 'rippled'),
-            source=object_builder.objects
+            object_builder.add_source_files(
+                'src/ripple/unity/app.cpp',
+                'src/ripple/unity/app1.cpp',
+                'src/ripple/unity/app2.cpp',
+                'src/ripple/unity/app3.cpp',
+                'src/ripple/unity/app4.cpp',
+                'src/ripple/unity/app5.cpp',
+                'src/ripple/unity/app6.cpp',
+                'src/ripple/unity/app7.cpp',
+                'src/ripple/unity/app8.cpp',
+                'src/ripple/unity/app9.cpp',
+                'src/ripple/unity/beast.cpp',
+                'src/ripple/unity/core.cpp',
+                'src/ripple/unity/crypto.cpp',
+                'src/ripple/unity/json.cpp',
+                'src/ripple/unity/net.cpp',
+                'src/ripple/unity/overlay.cpp',
+                'src/ripple/unity/peerfinder.cpp',
+                'src/ripple/unity/protobuf.cpp',
+                'src/ripple/unity/ripple.proto.cpp',
+                'src/ripple/unity/resource.cpp',
+                'src/ripple/unity/rpcx.cpp',
+                'src/ripple/unity/server.cpp',
+                'src/ripple/unity/validators.cpp',
+                'src/ripple/unity/websocket.cpp'
             )
 
-        if toolchain == default_toolchain and variant == default_variant:
-            default_target = target
-            install_target = env.Install (build_dir, source=default_target)
-            env.Alias ('install', install_target)
-            env.Default (install_target)
-            aliases['all'].extend(install_target)
-        if toolchain == 'msvc':
-            config = env.VSProjectConfig(variant, 'x64', target, env)
-            msvc_configs.append(config)
-        if toolchain in toolchains:
-            aliases['all'].extend(target)
-            aliases[variant].extend(target)
-            aliases[toolchain].extend(target)
-            env.Alias(variant_name, target)
+            object_builder.add_source_files(
+                'src/ripple/unity/beastc.c',
+                CCFLAGS = ([] if toolchain == 'msvc' else ['-Wno-array-bounds']))
+
+            object_builder.add_source_files(
+                'src/ripple/unity/nodestore.cpp',
+                CPPPATH=[
+                    'src/leveldb/include',
+                    #'src/hyperleveldb/include', # hyper
+                    'src/rocksdb2/include',
+                ]
+            )
+
+            if 'gcc' in toolchain:
+                no_uninitialized_warning = {'CCFLAGS': ['-Wno-maybe-uninitialized']}
+            else:
+                no_uninitialized_warning = {}
+
+            object_builder.add_source_files(
+                'src/ripple/unity/leveldb.cpp',
+                CPPPATH=[
+                    'src/leveldb/',
+                    'src/leveldb/include',
+                    'src/snappy/snappy',
+                    'src/snappy/config',
+                ],
+                **no_uninitialized_warning
+            )
+
+            object_builder.add_source_files(
+                'src/ripple/unity/hyperleveldb.cpp',
+                CPPPATH=[
+                    'src/hyperleveldb',
+                    'src/snappy/snappy',
+                    'src/snappy/config',
+                ],
+                **no_uninitialized_warning
+            )
+
+            object_builder.add_source_files(
+                'src/ripple/unity/rocksdb.cpp',
+                CPPPATH=[
+                    'src/rocksdb2',
+                    'src/rocksdb2/include',
+                    'src/snappy/snappy',
+                    'src/snappy/config',
+                ],
+                **no_uninitialized_warning
+            )
+
+            object_builder.add_source_files(
+                'src/ripple/unity/snappy.cpp',
+                CCFLAGS=([] if toolchain == 'msvc' else ['-Wno-unused-function']),
+                CPPPATH=[
+                    'src/snappy/snappy',
+                    'src/snappy/config',
+                ]
+            )
+
+            if toolchain == "clang" and Beast.system.osx:
+                object_builder.add_source_files('src/ripple/unity/beastobjc.mm')
+
+            target = env.Program(
+                target=os.path.join(variant_dir, 'rippled'),
+                source=object_builder.objects
+                )
+
+            if tu_style == default_tu_style:
+                if toolchain == default_toolchain and (
+                    variant == default_variant):
+                    default_target = target
+                    install_target = env.Install (build_dir, source=default_target)
+                    env.Alias ('install', install_target)
+                    env.Default (install_target)
+                    aliases['all'].extend(install_target)
+                if toolchain == 'msvc':
+                    config = env.VSProjectConfig(variant, 'x64', target, env)
+                    msvc_configs.append(config)
+                if toolchain in toolchains:
+                    aliases['all'].extend(target)
+                    aliases[toolchain].extend(target)
+            if toolchain in toolchains:
+                aliases[variant].extend(target)
+                env.Alias(variant_name, target)
 
 for key, value in aliases.iteritems():
     env.Alias(key, value)
@@ -700,7 +729,6 @@ def do_count(target, source, env):
                         if r[0].endswith('.test'):
                             yield os.path.normpath(path)
         return list(_iter(base))
-
     testfiles = list_testfiles(os.path.join('src', 'ripple'), env.get('CPPSUFFIXES'))
     lines = 0
     for f in testfiles:

src/ripple/basics/StringUtilities.h

@@ -25,6 +25,7 @@
 #include <ripple/basics/strHex.h>
 #include <boost/format.hpp>
 #include <beast/module/core/text/StringPairArray.h>
+#include <sstream>
 #include <string>
 
 namespace ripple {

src/ripple/basics/Sustain.h

@@ -20,6 +20,8 @@
 #ifndef RIPPLE_BASICS_SUSTAIN_H_INCLUDED
 #define RIPPLE_BASICS_SUSTAIN_H_INCLUDED
 
+#include <string>
+
 namespace ripple {
 
 // "Sustain" is a system for a buddy process that monitors the main process

src/ripple/basics/Time.h

@@ -20,6 +20,8 @@
 #ifndef RIPPLE_BASICS_TIME_H_INCLUDED
 #define RIPPLE_BASICS_TIME_H_INCLUDED
 
+#include <boost/date_time/posix_time/posix_time.hpp>
+
 namespace ripple {
 
 // VFALCO TODO Roll this into some utilities header

src/ripple/basics/impl/CheckLibraryVersionsImpl.h

@@ -21,6 +21,8 @@
 #define RIPPLE_BASICS_CHECKLIBRARYVERSIONS_IMPL_H_INCLUDED
 
 #include <ripple/basics/CheckLibraryVersions.h>
+#include <boost/version.hpp>
+#include <openssl/opensslv.h>
 
 namespace ripple {
 namespace version {

src/ripple/basics/impl/Log.cpp

@@ -21,6 +21,7 @@
 #include <boost/algorithm/string.hpp>
 // VFALCO TODO Use std::chrono
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <cassert>
 #include <fstream>
 
 namespace ripple {
@@ -203,7 +204,7 @@ Logs::fromSeverity (beast::Journal::Severity level)
     case Journal::kError:   return lsERROR;
 
     default:
-        bassertfalse;
+        assert(false);
     case Journal::kFatal:
         break;
     }
@@ -223,7 +224,7 @@ Logs::toSeverity (LogSeverity level)
     case lsWARNING: return Journal::kWarning;
     case lsERROR:   return Journal::kError;
     default:
-        bassertfalse;
+        assert(false);
     case lsFATAL:
         break;
     }
@@ -313,7 +314,7 @@ Logs::format (std::string& output, std::string const& message,
     case beast::Journal::kWarning:  output += "WRN "; break;
     case beast::Journal::kError:    output += "ERR "; break;
     default:
-        bassertfalse;
+        assert(false);
     case beast::Journal::kFatal:    output += "FTL "; break;
     }
 

src/ripple/basics/impl/StringUtilities.cpp

@@ -18,14 +18,15 @@
 //==============================================================================
 
 #include <ripple/basics/StringUtilities.h>
+#include <ripple/basics/ToString.h>
 #include <beast/module/core/text/LexicalCast.h>
 #include <beast/unit_test/suite.h>
+#include <boost/algorithm/string.hpp>
 #include <boost/asio/ip/address.hpp>
 #include <boost/regex.hpp>
+#include <algorithm>
 #include <cstdarg>
 
-#include <ripple/basics/ToString.h>
-
 namespace ripple {
 
 // NIKB NOTE: This function is only used by strUnHex (std::string const& strSrc)

src/ripple/basics/impl/Sustain.cpp

@@ -17,14 +17,17 @@
 */
 //==============================================================================
 
+#include <ripple/basics/Sustain.h>
 #include <ripple/basics/ThreadName.h>
-
+#include <boost/format.hpp>
+    
 // For Sustain Linux variants
 // VFALCO TODO Rewrite Sustain to use beast::Process
 #ifdef __linux__
 #include <sys/types.h>
 #include <sys/prctl.h>
 #include <sys/wait.h>
+#include <unistd.h>
 #endif
 #ifdef __FreeBSD__
 #include <sys/types.h>

src/ripple/basics/impl/Time.cpp

@@ -17,6 +17,8 @@
 */
 //==============================================================================
 
+#include <ripple/basics/Time.h>
+
 namespace ripple {
 
 // VFALCO TODO Tidy this up into a RippleTime object

src/ripple/basics/impl/UptimeTimer.cpp

@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <ripple/basics/UptimeTimer.h>
+#include <beast/threads/Thread.h>
 
 #include <atomic>
 

src/ripple/basics/impl/strHex.cpp

@@ -17,6 +17,8 @@
 */
 //==============================================================================
 
+#include <algorithm>
+    
 namespace ripple {
 
 char charHex (int iDigit)

src/ripple/basics/strHex.h

@@ -25,6 +25,8 @@
 #ifndef RIPPLE_BASICS_STRHEX_H_INCLUDED
 #define RIPPLE_BASICS_STRHEX_H_INCLUDED
 
+#include <string>
+    
 namespace ripple {
 
 /** Converts an integer to the corresponding hex digit

src/ripple/basics/tests/StringUtilities.test.cpp

@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <ripple/basics/StringUtilities.h>
+#include <ripple/basics/ToString.h>
 #include <beast/unit_test/suite.h>
 
 namespace ripple {

src/ripple/protocol/STAccount.h

@@ -20,7 +20,9 @@
 #ifndef RIPPLE_PROTOCOL_STACCOUNT_H_INCLUDED
 #define RIPPLE_PROTOCOL_STACCOUNT_H_INCLUDED
 
+#include <ripple/protocol/RippleAddress.h>
 #include <ripple/protocol/STBlob.h>
+#include <string>
 
 namespace ripple {
 

src/ripple/protocol/STPathSet.h

@@ -20,6 +20,10 @@
 #ifndef RIPPLE_PROTOCOL_STPATHELEMENT_H_INCLUDED
 #define RIPPLE_PROTOCOL_STPATHELEMENT_H_INCLUDED
 
+#include <ripple/json/json_value.h>
+#include <ripple/protocol/SField.h>
+#include <ripple/protocol/STBase.h>
+#include <ripple/protocol/UintTypes.h>
 #include <cstddef>
 
 namespace ripple {

src/ripple/protocol/SystemParameters.h

@@ -21,10 +21,11 @@
 #define RIPPLE_CORE_SYSTEMPARAMETERS_H_INCLUDED
 
 #include <cstdint>
+#include <string>
 
 namespace ripple {
 
-/** Various protocol and system specific constant globals. */
+// Various protocol and system specific constant globals.
 
 /* The name of the system. */
 static inline

src/ripple/protocol/impl/STLedgerEntry.cpp

@@ -17,8 +17,12 @@
 */
 //==============================================================================
 
+#include <ripple/basics/Log.h>
+#include <ripple/json/to_string.h>
 #include <ripple/protocol/Indexes.h>
+#include <ripple/protocol/STAccount.h>
 #include <ripple/protocol/STLedgerEntry.h>
+#include <boost/format.hpp>
 
 namespace ripple {
 

src/ripple/protocol/impl/STParsedJSON.cpp

@@ -20,8 +20,19 @@
 #include <ripple/basics/StringUtilities.h>
 #include <ripple/protocol/STInteger.h>
 #include <ripple/protocol/ErrorCodes.h>
+#include <ripple/protocol/LedgerFormats.h>
+#include <ripple/protocol/STAccount.h>
+#include <ripple/protocol/STAmount.h>
+#include <ripple/protocol/STArray.h>
+#include <ripple/protocol/STBitString.h>
+#include <ripple/protocol/STBlob.h>
+#include <ripple/protocol/STVector256.h>
+#include <ripple/protocol/STParsedJSON.h>
+#include <ripple/protocol/STPathSet.h>
+#include <ripple/protocol/TxFormats.h>
 #include <beast/module/core/text/LexicalCast.h>
 #include <cassert>
+#include <beast/cxx14/memory.h> // <memory>
 
 namespace ripple {
 

src/ripple/protocol/impl/STPathSet.cpp

@@ -18,6 +18,10 @@
 //==============================================================================
 
 #include <ripple/protocol/STPathSet.h>
+#include <ripple/protocol/JsonFields.h>
+#include <ripple/basics/Log.h>
+#include <ripple/basics/strHex.h>
+#include <ripple/basics/StringUtilities.h>
 
 namespace ripple {
 

src/ripple/protocol/impl/STTx.cpp

@@ -17,13 +17,18 @@
 */
 //==============================================================================
 
-#include <ripple/core/Config.h>
+#include <ripple/basics/Log.h>
 #include <ripple/protocol/HashPrefix.h>
 #include <ripple/protocol/Protocol.h>
+#include <ripple/protocol/STAccount.h>
+#include <ripple/protocol/STArray.h>
 #include <ripple/protocol/STTx.h>
 #include <ripple/protocol/STParsedJSON.h>
 #include <ripple/protocol/TxFlags.h>
+#include <ripple/basics/StringUtilities.h>
+#include <ripple/json/to_string.h>
 #include <beast/unit_test/suite.h>
+#include <boost/format.hpp>
 
 namespace ripple {
 

src/ripple/protocol/impl/STValidation.cpp

@@ -19,6 +19,8 @@
 
 #include <ripple/protocol/STValidation.h>
 #include <ripple/protocol/HashPrefix.h>
+#include <ripple/json/to_string.h>
+#include <ripple/basics/Log.h>
 
 namespace ripple {
 

src/ripple/protocol/impl/UintTypes.cpp

@@ -17,6 +17,7 @@
 */
 //==============================================================================
 
+#include <ripple/protocol/Serializer.h>
 #include <ripple/protocol/SystemParameters.h>
 #include <ripple/protocol/RippleAddress.h>
 #include <ripple/protocol/UintTypes.h>

src/ripple/protocol/tests/BuildInfo.test.cpp

@@ -18,6 +18,7 @@
 //==============================================================================
 
 #include <ripple/protocol/BuildInfo.h>
+#include <beast/module/core/diagnostic/SemanticVersion.h>
 #include <beast/unit_test/suite.h>
 
 namespace ripple {

src/ripple/protocol/tests/RippleAddress.test.cpp

@@ -19,6 +19,8 @@
 
 #include <ripple/protocol/RippleAddress.h>
 #include <ripple/protocol/RipplePublicKey.h>
+#include <ripple/protocol/Serializer.h>
+#include <ripple/basics/StringUtilities.h>
 #include <beast/unit_test/suite.h>
 
 namespace ripple {

src/ripple/protocol/tests/STObject.test.cpp

@@ -17,11 +17,14 @@
 */
 //==============================================================================
 
+#include <ripple/basics/Log.h>
 #include <ripple/protocol/STBase.h>
 #include <ripple/protocol/STAccount.h>
 #include <ripple/protocol/STArray.h>
 #include <ripple/protocol/STObject.h>
 #include <ripple/protocol/STParsedJSON.h>
+#include <ripple/json/json_reader.h>
+#include <ripple/json/to_string.h>
 #include <beast/unit_test/suite.h>
 #include <beast/cxx14/memory.h> // <memory>
 

src/ripple/protocol/tests/STTx.test.cpp

@@ -18,6 +18,8 @@
 //==============================================================================
 
 #include <ripple/protocol/STTx.h>
+#include <ripple/protocol/STParsedJSON.h>
+#include <ripple/json/to_string.h>
 #include <beast/unit_test/suite.h>
 
 namespace ripple {

src/ripple/unity/basics.cpp

@@ -27,15 +27,16 @@
 #include <ripple/basics/impl/CheckLibraryVersions.cpp>
 #include <ripple/basics/impl/CountedObject.cpp>
 #include <ripple/basics/impl/Log.cpp>
-#include <ripple/basics/impl/StringUtilities.cpp>
+#include <ripple/basics/impl/make_SSLContext.cpp>
 #include <ripple/basics/impl/RangeSet.cpp>
+#include <ripple/basics/impl/ResolverAsio.cpp>
+#include <ripple/basics/impl/strHex.cpp>
+#include <ripple/basics/impl/StringUtilities.cpp>
 #include <ripple/basics/impl/Sustain.cpp>
 #include <ripple/basics/impl/TestSuite.test.cpp>
 #include <ripple/basics/impl/ThreadName.cpp>
 #include <ripple/basics/impl/Time.cpp>
 #include <ripple/basics/impl/UptimeTimer.cpp>
-#include <ripple/basics/impl/make_SSLContext.cpp>
-#include <ripple/basics/impl/ResolverAsio.cpp>
 
 #include <ripple/basics/tests/CheckLibraryVersions.test.cpp>
 #include <ripple/basics/tests/KeyCache.test.cpp>

src/ripple/unity/protocol.cpp

@@ -33,7 +33,6 @@
 #include <ripple/protocol/impl/Serializer.cpp>
 #include <ripple/protocol/impl/SField.cpp>
 #include <ripple/protocol/impl/SOTemplate.cpp>
-#include <ripple/protocol/impl/strHex.cpp>
 #include <ripple/protocol/impl/TER.cpp>
 #include <ripple/protocol/impl/TxFormats.cpp>
 #include <ripple/protocol/impl/UintTypes.cpp>