build: Isolate the gtest headers per directory

Compile each directory under src/tests/libxrpl into its own object library, xrpl_tests.<dir>, and add their object files to the single xrpl_tests binary. Each directory's headers are exposed only through its own target, under the canonical path <tests/libxrpl/<dir>/...>, so a test that needs another directory's headers has to link that directory's target. The dependencies between test directories are now declared in one place, the way the libxrpl modules declare theirs, instead of every test seeing every header through a catch-all include directory. The shared helpers stay available to all, and the xrpld tests follow the same spelling. The binary takes the object files as sources rather than linking the object libraries, so every dependency appears once on its link line, which the Apple linker requires. The isolate_headers() call this replaces pointed at a directory that never existed, so it had been a no-op since the gtests were introduced. Making it work surfaced one cycle: the shared TestServiceRegistry reached into the shamap tests for TestNodeFamily, which three directories use, so that class moves to helpers/TestNodeFamily.h. Header verification now runs per directory and skips directories without headers. Headers under src/tests get their own clang-format include category next to src/test, and the codegen templates emit the canonical path for the generated protocol tests. Tidying the touched consensus tests also surfaced two missing consts in Consensus.h and an optional access in ApplyContext.h that the file's other accessors already annotate, so those are fixed here as well.
2026-10-26 13:37:45 +00:00 · 2026-10-23 12:08:40 -04:00
199 changed files with 462 additions and 362 deletions
@@ -51,6 +51,8 @@ IncludeBlocks: Regroup
 IncludeCategories:
  - Regex: "^<(test)/"
    Priority: 1
+  - Regex: "^<(tests)/"
+    Priority: 1
  - Regex: "^<(xrpld)/"
    Priority: 2
  - Regex: "^<(xrpl)/"
@@ -14,6 +14,9 @@ endfunction()
 function(xrpl_add_benchmark name)
 endfunction()

+function(xrpl_add_test_dir name)
+endfunction()
+
 macro(exclude_from_default target_)
 endmacro()

@@ -16,7 +16,7 @@

 #include <gtest/gtest.h>

-#include <protocol_autogen/TestHelpers.h>
+#include <tests/libxrpl/protocol_autogen/TestHelpers.h>

 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol_autogen/ledger_entries/${name}.h>
@@ -15,7 +15,7 @@

 #include <gtest/gtest.h>

-#include <protocol_autogen/TestHelpers.h>
+#include <tests/libxrpl/protocol_autogen/TestHelpers.h>

 #include <xrpl/protocol/SecretKey.h>
 #include <xrpl/protocol/Seed.h>
@@ -29,6 +29,19 @@
 #
 # verify_target_headers(target headers_dir)
 function(verify_target_headers target headers_dir)
+    # .ipp files are compiled through the header or translation unit that
+    # includes them, not on their own.
+    file(
+        GLOB_RECURSE headers
+        CONFIGURE_DEPENDS
+        "${headers_dir}/*.h"
+        "${headers_dir}/*.hpp"
+    )
+    # A directory without headers has nothing to verify, and an object library
+    # without sources is an error.
+    if(NOT headers)
+        return()
+    endif()
    set(verify ${target}.verify)
    if(NOT TARGET ${verify})
        add_library(${verify} OBJECT EXCLUDE_FROM_ALL)
@@ -54,18 +67,11 @@ function(verify_target_headers target headers_dir)
        )
        add_dependencies(verify-headers ${verify})
    endif()
-    _verify_add_headers(${verify} "${headers_dir}")
+    _verify_add_headers(${verify} "${headers}")
 endfunction()

-# Add every .h/.hpp under dir to target as a directly-compiled C++ translation
-# unit. .ipp files are inline-implementation fragments included by their owning
-# header (often after a class declaration), so they are not self-contained on
-# their own and are verified transitively when that header is verified.
-function(_verify_add_headers target dir)
-    file(GLOB_RECURSE headers CONFIGURE_DEPENDS "${dir}/*.h" "${dir}/*.hpp")
-    if(NOT headers)
-        return()
-    endif()
+# Add the given headers to target as directly-compiled C++ translation units.
+function(_verify_add_headers target headers)
    # `-xc++` forces the header to be compiled as a C++ translation unit; a lone
    # `.h` is otherwise treated as a header to precompile. `#pragma once` is
    # harmless (and warns) when the header is the main file, so silence it.
@@ -897,7 +897,7 @@ Consensus<Adaptor>::gotTxSet(NetClock::time_point const& now, TxSetT const& txSe

    now_ = now;

-    auto id = txSet.id();
+    auto const id = txSet.id();

    // If we've already processed this transaction set since requesting
    // it from the network, there is nothing to do now
@@ -1624,7 +1624,7 @@ Consensus<Adaptor>::updateOurPositions(std::unique_ptr<std::stringstream> const&

    if (ourNewSet)
    {
-        auto newID = ourNewSet->id();
+        auto const newID = ourNewSet->id();

        result_->txns = std::move(*ourNewSet);

@@ -144,6 +144,7 @@ public:
        XRPL_ASSERT(
            view_.has_value(),
            "xrpl::ApplyContext::getApplyViewContext : view_ emplaced in constructor");
+        // NOLINTNEXTLINE(bugprone-unchecked-optional-access) view_ emplaced in constructor
        return {.view = *view_, .tx = tx};
    }

@@ -1,6 +1,7 @@
 #pragma once

 #include <test/jtx/PeerStub.h>
+#include <tests/libxrpl/shamap/DeepChain.h>

 #include <xrpld/app/ledger/ConsensusTransSetSF.h>
 #include <xrpld/overlay/Peer.h>
@@ -14,8 +15,6 @@
 #include <xrpl/shamap/SHAMapNodeID.h>
 #include <xrpl/shamap/SHAMapTreeNode.h>

-#include <tests/libxrpl/shamap/DeepChain.h>
-
 #include <xrpl.pb.h>

 #include <atomic>
@@ -3,3 +3,20 @@
 This directory contains unit tests for the project. The difference from existing `src/test` folder
 is that we switch to 3rd party testing framework (`gtest`). We intend to gradually move existing tests
 from our own framework to `gtest` and such tests will be moved to this new folder.
+
+## Layout
+
+`libxrpl/` has one directory per libxrpl module, and two that are not modules: `helpers/` for test
+infrastructure shared by all of them, and `csf/` for the consensus simulation framework. Each
+directory is compiled into its own object library, and all of them are linked into the single
+`xrpl_tests` binary. `xrpld/` has one directory per server subsystem, all compiled into the
+`xrpld_tests` binary.
+
+A test includes a header from the test tree under its canonical path, `<tests/libxrpl/<dir>/...>` or
+`<tests/xrpld/<dir>/...>`, the same way libxrpl's private headers are included. Under `libxrpl/` the
+headers of a directory are only visible to that directory and to the directories that link its
+target, so a test that needs another directory's headers has to declare that dependency in
+`libxrpl/CMakeLists.txt`. The `helpers/` directory is the exception: every directory can include it
+without declaring anything. Under `xrpld/` the directories cannot be isolated the same way, because
+the server headers are not a library and the whole `src` tree is on the include path, so there the
+canonical path is a convention only.
@@ -5,23 +5,74 @@ include(verify_headers)
 # Test requirements.
 find_package(GTest REQUIRED)

-# Single combined gtest binary built from the shared test helpers and all test
-# modules below.
-add_executable(
-    xrpl_tests
-    main.cpp
-    helpers/Account.cpp
-    helpers/TestSink.cpp
-    helpers/TxTest.cpp
-)
+# A single gtest binary, xrpl_tests, built from one object library per source
+# directory below. Each directory's headers are reachable only through its own
+# target, as <tests/libxrpl/<dir>/...>, so a test that needs another directory's
+# headers has to link that directory's target: the dependencies between test
+# directories are declared in this file and nowhere else, the same way the
+# libxrpl modules declare theirs. The shared `helpers` directory is available
+# to every other directory without declaring it.
+#
+# The object libraries link their dependencies only to compile against them.
+# Their object files go into the binary as sources, so the binary links each
+# library exactly once; linking the object libraries themselves would repeat
+# every dependency on the link line, which the Apple linker rejects.
+add_executable(xrpl_tests main.cpp)
 patch_nix_binary(xrpl_tests)
 set_target_properties(
    xrpl_tests
    PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
 )
-# Lets test sources include the shared helpers as <helpers/...>.
-target_include_directories(xrpl_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(xrpl_tests PRIVATE GTest::gtest GTest::gmock xrpl.libxrpl)
+if(rust)
+    target_link_libraries(xrpl_tests PRIVATE rs_hello_world_cxxbridge)
+endif()
+
+# Compiles ${CMAKE_CURRENT_SOURCE_DIR}/${name} into the object library
+# xrpl_tests.${name}, exposes its headers under their canonical path, verifies
+# them against that target, and adds the objects to xrpl_tests.
+function(xrpl_add_test_dir name)
+    set(target xrpl_tests.${name})
+    file(
+        GLOB_RECURSE sources
+        CONFIGURE_DEPENDS
+        "${CMAKE_CURRENT_SOURCE_DIR}/${name}/*.cpp"
+    )
+    if(NOT rust)
+        # Tests of the Rust interop include generated cxxbridge headers, which
+        # do not exist without the crates, so keep them out of the build tree
+        # entirely. They are named `Rust<something>.cpp`.
+        list(FILTER sources EXCLUDE REGEX "/Rust[^/]*\\.cpp$")
+    endif()
+    add_library(${target} OBJECT ${sources})
+    target_link_libraries(
+        ${target}
+        PRIVATE GTest::gtest GTest::gmock xrpl.libxrpl
+    )
+    if(NOT name STREQUAL "helpers")
+        target_link_libraries(${target} PRIVATE xrpl_tests.helpers)
+    endif()
+    isolate_headers(
+        ${target}
+        "${CMAKE_SOURCE_DIR}/src"
+        "${CMAKE_CURRENT_SOURCE_DIR}/${name}"
+        PUBLIC
+    )
+    # The test headers are not built with add_module, so verify them against
+    # their own target's compile environment.
+    if(verify_headers)
+        verify_target_headers(${target} "${CMAKE_CURRENT_SOURCE_DIR}/${name}")
+    endif()
+    target_sources(xrpl_tests PRIVATE $<TARGET_OBJECTS:${target}>)
+endfunction()
+
+# The shared helpers first, since every other directory links them.
+xrpl_add_test_dir(helpers)
+
+# The CSF (Consensus Simulation Framework), used by the consensus tests. The
+# consensus engine itself lives in libxrpl, so no xrpld sources or include paths
+# are needed here.
+xrpl_add_test_dir(csf)

 # One source subdirectory per module. Network unit tests are currently not
 # supported on Windows.
@@ -44,49 +95,14 @@ set(test_modules
 if(NOT WIN32)
    list(APPEND test_modules net)
 endif()
-if(rust)
-    target_link_libraries(xrpl_tests PRIVATE rs_hello_world_cxxbridge)
-endif()
-
 foreach(module IN LISTS test_modules)
-    # Append the module's sources (${module}/*.cpp and ${module}.cpp, if any).
-    file(
-        GLOB_RECURSE sources
-        CONFIGURE_DEPENDS
-        "${CMAKE_CURRENT_SOURCE_DIR}/${module}/*.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/${module}.cpp"
-    )
-    if(NOT rust)
-        # Tests of the Rust interop include generated cxxbridge headers, which
-        # do not exist without the crates, so keep them out of the build tree
-        # entirely. They are named `Rust<something>.cpp`.
-        list(FILTER sources EXCLUDE REGEX "/Rust[^/]*\\.cpp$")
-    endif()
-    target_sources(xrpl_tests PRIVATE ${sources})
-
-    # Expose the module's private headers under their canonical include path.
-    isolate_headers(
-        xrpl_tests
-        "${CMAKE_SOURCE_DIR}"
-        "${CMAKE_SOURCE_DIR}/tests/${module}"
-        PRIVATE
-    )
+    xrpl_add_test_dir(${module})
 endforeach()

-# The consensus tests use the CSF (Consensus Simulation Framework) helpers, so
-# compile the CSF sources into the test binary. The consensus engine itself now
-# lives in libxrpl, so no xrpld sources or include paths are needed here.
-file(
-    GLOB_RECURSE csf_sources
-    CONFIGURE_DEPENDS
-    "${CMAKE_CURRENT_SOURCE_DIR}/csf/*.cpp"
-)
-target_sources(xrpl_tests PRIVATE ${csf_sources})
-
-# The test helpers and per-module test headers are not built with add_module,
-# so verify them against the test binary's own compile environment.
-if(verify_headers)
-    verify_target_headers(xrpl_tests "${CMAKE_CURRENT_SOURCE_DIR}")
+# Dependencies between test directories, beyond the shared helpers.
+target_link_libraries(xrpl_tests.consensus PRIVATE xrpl_tests.csf)
+if(rust)
+    target_link_libraries(xrpl_tests.basics PRIVATE rs_hello_world_cxxbridge)
 endif()

 gtest_discover_tests(xrpl_tests DISCOVERY_TIMEOUT 60)
@@ -1,3 +1,5 @@
+#include <tests/libxrpl/helpers/TestSink.h>
+
 #include <xrpl/basics/TaggedCache.h>
 #include <xrpl/basics/TaggedCache.ipp>  // IWYU pragma: keep
 #include <xrpl/basics/chrono.h>
@@ -5,7 +7,6 @@
 #include <xrpl/protocol/Protocol.h>

 #include <gtest/gtest.h>
-#include <helpers/TestSink.h>

 #include <string>

@@ -1,5 +1,7 @@
 #include <xrpl/basics/TaggedCache.h>

+#include <tests/libxrpl/helpers/TestSink.h>
+
 #include <xrpl/basics/IntrusivePointer.h>
 #include <xrpl/basics/IntrusiveRefCounts.h>
 #include <xrpl/basics/TaggedCache.ipp>  // IWYU pragma: keep
@@ -8,7 +10,6 @@
 #include <xrpl/protocol/Protocol.h>

 #include <gtest/gtest.h>
-#include <helpers/TestSink.h>

 #include <chrono>
 #include <memory>
@@ -1,11 +1,12 @@
+#include <tests/libxrpl/csf/Peer.h>
+#include <tests/libxrpl/csf/PeerGroup.h>
+#include <tests/libxrpl/csf/Sim.h>
+#include <tests/libxrpl/csf/SimTime.h>
+#include <tests/libxrpl/csf/TrustGraph.h>
+#include <tests/libxrpl/csf/collectors.h>
+
 #include <xrpl/consensus/ConsensusParms.h>

-#include <csf/Peer.h>
-#include <csf/PeerGroup.h>
-#include <csf/Sim.h>
-#include <csf/SimTime.h>
-#include <csf/TrustGraph.h>
-#include <csf/collectors.h>
 #include <gtest/gtest.h>

 #include <chrono>
@@ -1,5 +1,17 @@
 #include <xrpl/consensus/Consensus.h>

+#include <tests/libxrpl/csf/Peer.h>
+#include <tests/libxrpl/csf/PeerGroup.h>
+#include <tests/libxrpl/csf/Sim.h>
+#include <tests/libxrpl/csf/SimTime.h>
+#include <tests/libxrpl/csf/Tx.h>
+#include <tests/libxrpl/csf/Validation.h>
+#include <tests/libxrpl/csf/collectors.h>
+#include <tests/libxrpl/csf/events.h>
+#include <tests/libxrpl/csf/random.h>
+#include <tests/libxrpl/csf/submitters.h>
+#include <tests/libxrpl/helpers/TestSink.h>
+
 #include <xrpl/basics/UnorderedContainers.h>
 #include <xrpl/basics/chrono.h>
 #include <xrpl/beast/utility/Journal.h>
@@ -8,18 +20,7 @@
 #include <xrpl/consensus/DisputedTx.h>
 #include <xrpl/ledger/LedgerTiming.h>

-#include <csf/Peer.h>
-#include <csf/PeerGroup.h>
-#include <csf/Sim.h>
-#include <csf/SimTime.h>
-#include <csf/Tx.h>
-#include <csf/Validation.h>
-#include <csf/collectors.h>
-#include <csf/events.h>
-#include <csf/random.h>
-#include <csf/submitters.h>
 #include <gtest/gtest.h>
-#include <helpers/TestSink.h>

 #include <chrono>
 #include <cstddef>
@@ -1,9 +1,10 @@
-#include <csf/PeerGroup.h>
-#include <csf/Sim.h>
-#include <csf/collectors.h>
-#include <csf/random.h>
-#include <csf/submitters.h>
-#include <csf/timers.h>
+#include <tests/libxrpl/csf/PeerGroup.h>
+#include <tests/libxrpl/csf/Sim.h>
+#include <tests/libxrpl/csf/collectors.h>
+#include <tests/libxrpl/csf/random.h>
+#include <tests/libxrpl/csf/submitters.h>
+#include <tests/libxrpl/csf/timers.h>
+
 #include <gtest/gtest.h>

 #include <algorithm>
@@ -1,6 +1,7 @@
 #include <xrpl/consensus/LedgerTrie.h>

-#include <csf/ledgers.h>
+#include <tests/libxrpl/csf/ledgers.h>
+
 #include <gtest/gtest.h>

 #include <cstdint>
@@ -1,11 +1,12 @@
+#include <tests/libxrpl/csf/PeerGroup.h>
+#include <tests/libxrpl/csf/Sim.h>
+#include <tests/libxrpl/csf/collectors.h>
+#include <tests/libxrpl/csf/random.h>
+#include <tests/libxrpl/csf/submitters.h>
+#include <tests/libxrpl/csf/timers.h>
+
 #include <xrpl/consensus/ConsensusParms.h>

-#include <csf/PeerGroup.h>
-#include <csf/Sim.h>
-#include <csf/collectors.h>
-#include <csf/random.h>
-#include <csf/submitters.h>
-#include <csf/timers.h>
 #include <gtest/gtest.h>

 #include <chrono>
@@ -1,5 +1,9 @@
 #include <xrpl/consensus/Validations.h>

+#include <tests/libxrpl/csf/Validation.h>
+#include <tests/libxrpl/csf/ledgers.h>
+#include <tests/libxrpl/helpers/TestSink.h>
+
 #include <xrpl/basics/UnorderedContainers.h>
 #include <xrpl/basics/chrono.h>
 #include <xrpl/basics/tagged_integer.h>
@@ -7,10 +11,7 @@
 #include <xrpl/beast/clock/manual_clock.h>
 #include <xrpl/beast/utility/Journal.h>

-#include <csf/Validation.h>
-#include <csf/ledgers.h>
 #include <gtest/gtest.h>
-#include <helpers/TestSink.h>

 #include <chrono>
 #include <cstddef>
@@ -1,6 +1,7 @@
-#include <csf/BasicNetwork.h>
+#include <tests/libxrpl/csf/BasicNetwork.h>
+
+#include <tests/libxrpl/csf/Scheduler.h>

-#include <csf/Scheduler.h>
 #include <gtest/gtest.h>

 #include <set>
@@ -1,7 +1,7 @@
 #pragma once

-#include <csf/Digraph.h>
-#include <csf/Scheduler.h>
+#include <tests/libxrpl/csf/Digraph.h>
+#include <tests/libxrpl/csf/Scheduler.h>

 #include <cassert>

@@ -1,11 +1,11 @@
 #pragma once

-#include <csf/Proposal.h>
-#include <csf/SimTime.h>
-#include <csf/Tx.h>
-#include <csf/Validation.h>
-#include <csf/events.h>
-#include <csf/ledgers.h>
+#include <tests/libxrpl/csf/Proposal.h>
+#include <tests/libxrpl/csf/SimTime.h>
+#include <tests/libxrpl/csf/Tx.h>
+#include <tests/libxrpl/csf/Validation.h>
+#include <tests/libxrpl/csf/events.h>
+#include <tests/libxrpl/csf/ledgers.h>

 #include <memory>
 #include <vector>
@@ -1,4 +1,4 @@
-#include <csf/Digraph.h>
+#include <tests/libxrpl/csf/Digraph.h>

 #include <gtest/gtest.h>

@@ -1,4 +1,4 @@
-#include <csf/Histogram.h>
+#include <tests/libxrpl/csf/Histogram.h>

 #include <gtest/gtest.h>

@@ -1,5 +1,16 @@
 #pragma once

+#include <tests/libxrpl/csf/BasicNetwork.h>
+#include <tests/libxrpl/csf/CollectorRef.h>
+#include <tests/libxrpl/csf/Proposal.h>
+#include <tests/libxrpl/csf/Scheduler.h>
+#include <tests/libxrpl/csf/SimTime.h>
+#include <tests/libxrpl/csf/TrustGraph.h>
+#include <tests/libxrpl/csf/Tx.h>
+#include <tests/libxrpl/csf/Validation.h>
+#include <tests/libxrpl/csf/events.h>
+#include <tests/libxrpl/csf/ledgers.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/UnorderedContainers.h>
 #include <xrpl/basics/chrono.h>
@@ -16,17 +27,6 @@
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>

-#include <csf/BasicNetwork.h>
-#include <csf/CollectorRef.h>
-#include <csf/Proposal.h>
-#include <csf/Scheduler.h>
-#include <csf/SimTime.h>
-#include <csf/TrustGraph.h>
-#include <csf/Tx.h>
-#include <csf/Validation.h>
-#include <csf/events.h>
-#include <csf/ledgers.h>
-
 #include <algorithm>
 #include <chrono>
 #include <cmath>
@@ -1,9 +1,9 @@
 #pragma once

-#include <csf/Peer.h>
-#include <csf/SimTime.h>
-#include <csf/Validation.h>
-#include <csf/random.h>
+#include <tests/libxrpl/csf/Peer.h>
+#include <tests/libxrpl/csf/SimTime.h>
+#include <tests/libxrpl/csf/Validation.h>
+#include <tests/libxrpl/csf/random.h>

 #include <algorithm>
 #include <cassert>
@@ -1,10 +1,10 @@
 #pragma once

-#include <xrpl/consensus/ConsensusProposal.h>
+#include <tests/libxrpl/csf/Tx.h>
+#include <tests/libxrpl/csf/Validation.h>
+#include <tests/libxrpl/csf/ledgers.h>

-#include <csf/Tx.h>
-#include <csf/Validation.h>
-#include <csf/ledgers.h>
+#include <xrpl/consensus/ConsensusProposal.h>

 namespace xrpl::test::csf {
 /**
@@ -1,4 +1,4 @@
-#include <csf/Scheduler.h>
+#include <tests/libxrpl/csf/Scheduler.h>

 #include <gtest/gtest.h>

@@ -1,15 +1,15 @@
 #pragma once

-#include <xrpl/beast/utility/Journal.h>
+#include <tests/libxrpl/csf/BasicNetwork.h>
+#include <tests/libxrpl/csf/CollectorRef.h>
+#include <tests/libxrpl/csf/Peer.h>
+#include <tests/libxrpl/csf/PeerGroup.h>
+#include <tests/libxrpl/csf/Scheduler.h>
+#include <tests/libxrpl/csf/SimTime.h>
+#include <tests/libxrpl/csf/TrustGraph.h>
+#include <tests/libxrpl/csf/ledgers.h>

-#include <csf/BasicNetwork.h>
-#include <csf/CollectorRef.h>
-#include <csf/Peer.h>
-#include <csf/PeerGroup.h>
-#include <csf/Scheduler.h>
-#include <csf/SimTime.h>
-#include <csf/TrustGraph.h>
-#include <csf/ledgers.h>
+#include <xrpl/beast/utility/Journal.h>

 #include <cstddef>
 #include <cstdint>
@@ -1,8 +1,8 @@
 #pragma once

-#include <boost/container/flat_set.hpp>
+#include <tests/libxrpl/csf/Digraph.h>

-#include <csf/Digraph.h>
+#include <boost/container/flat_set.hpp>

 #include <algorithm>
 #include <set>
@@ -1,10 +1,10 @@
 #pragma once

+#include <tests/libxrpl/csf/ledgers.h>
+
 #include <xrpl/basics/chrono.h>
 #include <xrpl/basics/tagged_integer.h>

-#include <csf/ledgers.h>
-
 #include <cstdint>
 #include <optional>
 #include <tuple>
@@ -1,12 +1,12 @@
 #pragma once

-#include <xrpl/basics/UnorderedContainers.h>
+#include <tests/libxrpl/csf/Histogram.h>
+#include <tests/libxrpl/csf/SimTime.h>
+#include <tests/libxrpl/csf/Tx.h>
+#include <tests/libxrpl/csf/Validation.h>
+#include <tests/libxrpl/csf/events.h>

-#include <csf/Histogram.h>
-#include <csf/SimTime.h>
-#include <csf/Tx.h>
-#include <csf/Validation.h>
-#include <csf/events.h>
+#include <xrpl/basics/UnorderedContainers.h>

 #include <algorithm>
 #include <cassert>
@@ -1,8 +1,8 @@
 #pragma once

-#include <csf/Tx.h>
-#include <csf/Validation.h>
-#include <csf/ledgers.h>
+#include <tests/libxrpl/csf/Tx.h>
+#include <tests/libxrpl/csf/Validation.h>
+#include <tests/libxrpl/csf/ledgers.h>

 namespace xrpl::test::csf {

@@ -1,7 +1,7 @@
-#include <csf/Sim.h>
+#include <tests/libxrpl/csf/Sim.h>

-#include <csf/PeerGroup.h>
-#include <csf/SimTime.h>
+#include <tests/libxrpl/csf/PeerGroup.h>
+#include <tests/libxrpl/csf/SimTime.h>

 #include <algorithm>
 #include <cstddef>
@@ -1,11 +1,11 @@
-#include <csf/ledgers.h>
+#include <tests/libxrpl/csf/ledgers.h>
+
+#include <tests/libxrpl/csf/Tx.h>

 #include <xrpl/basics/chrono.h>
 #include <xrpl/json/json_value.h>
 #include <xrpl/ledger/LedgerTiming.h>

-#include <csf/Tx.h>
-
 #include <algorithm>
 #include <chrono>
 #include <cstddef>
@@ -1,5 +1,7 @@
 #pragma once

+#include <tests/libxrpl/csf/Tx.h>
+
 #include <xrpl/basics/chrono.h>
 #include <xrpl/basics/tagged_integer.h>
 #include <xrpl/json/json_value.h>
@@ -7,8 +9,6 @@

 #include <boost/bimap/bimap.hpp>

-#include <csf/Tx.h>
-
 #include <cassert>
 #include <cstddef>
 #include <cstdint>
@@ -1,8 +1,8 @@
 #pragma once

-#include <csf/Scheduler.h>
-#include <csf/SimTime.h>
-#include <csf/Tx.h>
+#include <tests/libxrpl/csf/Scheduler.h>
+#include <tests/libxrpl/csf/SimTime.h>
+#include <tests/libxrpl/csf/Tx.h>

 #include <cstddef>
 #include <cstdint>
@@ -1,7 +1,7 @@
 #pragma once

-#include <csf/Scheduler.h>
-#include <csf/SimTime.h>
+#include <tests/libxrpl/csf/Scheduler.h>
+#include <tests/libxrpl/csf/SimTime.h>

 #include <chrono>
 #include <iostream>
@@ -1,4 +1,4 @@
-#include <helpers/Account.h>
+#include <tests/libxrpl/helpers/Account.h>

 #include <xrpl/protocol/KeyType.h>
 #include <xrpl/protocol/PublicKey.h>
@@ -1,5 +1,7 @@
 #pragma once

+#include <tests/libxrpl/helpers/Account.h>
+
 #include <xrpl/basics/Number.h>
 #include <xrpl/beast/utility/instrumentation.h>
 #include <xrpl/protocol/Asset.h>
@@ -7,8 +9,6 @@
 #include <xrpl/protocol/STAmount.h>
 #include <xrpl/protocol/UintTypes.h>

-#include <helpers/Account.h>
-
 #include <string>
 #include <string_view>
 #include <type_traits>
@@ -1,5 +1,8 @@
 #pragma once

+#include <tests/libxrpl/helpers/TestNodeFamily.h>
+#include <tests/libxrpl/helpers/TestSink.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/basics/chrono.h>
@@ -12,9 +15,6 @@

 #include <boost/asio/io_context.hpp>

-#include <helpers/TestSink.h>
-#include <shamap/common.h>
-
 #include <cstdint>
 #include <memory>
 #include <optional>
@@ -1,4 +1,4 @@
-#include <helpers/TestSink.h>
+#include <tests/libxrpl/helpers/TestSink.h>

 #include <xrpl/beast/utility/Journal.h>

@@ -1,4 +1,7 @@
-#include <helpers/TxTest.h>
+#include <tests/libxrpl/helpers/TxTest.h>
+
+#include <tests/libxrpl/helpers/Account.h>
+#include <tests/libxrpl/helpers/IOU.h>

 #include <xrpl/basics/base_uint.h>
 #include <xrpl/basics/chrono.h>
@@ -22,9 +25,6 @@
 #include <xrpl/protocol_autogen/transactions/Payment.h>
 #include <xrpl/tx/apply.h>

-#include <helpers/Account.h>
-#include <helpers/IOU.h>
-
 #include <cstdint>
 #include <memory>
 #include <optional>
@@ -1,5 +1,9 @@
 #pragma once

+#include <tests/libxrpl/helpers/Account.h>
+#include <tests/libxrpl/helpers/IOU.h>
+#include <tests/libxrpl/helpers/TestServiceRegistry.h>
+
 #include <xrpl/basics/Number.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/basics/chrono.h>
@@ -23,10 +27,6 @@
 #include <xrpl/protocol_autogen/ledger_entries/AccountRoot.h>
 #include <xrpl/tx/applySteps.h>

-#include <helpers/Account.h>
-#include <helpers/IOU.h>
-#include <helpers/TestServiceRegistry.h>
-
 #include <cmath>
 #include <concepts>
 #include <cstdint>
@@ -1,12 +1,13 @@
 #include <xrpl/ledger/entries/AMMEntry.h>

+#include <tests/libxrpl/helpers/IOU.h>
+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Asset.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Issue.h>

 #include <gtest/gtest.h>
-#include <helpers/IOU.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,10 +1,11 @@
 #include <xrpl/ledger/entries/AccountRootEntry.h>

+#include <tests/libxrpl/helpers/Account.h>
+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>

 #include <gtest/gtest.h>
-#include <helpers/Account.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,9 +1,10 @@
 #include <xrpl/ledger/entries/AmendmentsEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,10 +1,11 @@
 #include <xrpl/ledger/entries/CheckEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/SeqProxy.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,11 +1,12 @@
 #include <xrpl/ledger/entries/CredentialEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/basics/Slice.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Keylet.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 #include <string>

@@ -1,9 +1,10 @@
 #include <xrpl/ledger/entries/DIDEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,10 +1,11 @@
 #include <xrpl/ledger/entries/DelegateEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Keylet.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,12 +1,13 @@
 #include <xrpl/ledger/entries/DepositPreauthEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/basics/Slice.h>
 #include <xrpl/protocol/AccountID.h>
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Keylet.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 #include <set>
 #include <string>
@@ -1,10 +1,11 @@
 #include <xrpl/ledger/entries/DirectoryNodeEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Keylet.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 #include <cstdint>

@@ -1,5 +1,8 @@
 #pragma once

+#include <tests/libxrpl/helpers/Account.h>
+#include <tests/libxrpl/helpers/TxTest.h>
+
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ApplyViewImpl.h>
@@ -8,8 +11,6 @@
 #include <xrpl/protocol/LedgerHeader.h>

 #include <gtest/gtest.h>
-#include <helpers/Account.h>
-#include <helpers/TxTest.h>

 #include <string>

@@ -1,10 +1,11 @@
 #include <xrpl/ledger/entries/EscrowEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/SeqProxy.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,3 +1,5 @@
+#include <tests/libxrpl/helpers/TestNodeFamily.h>
+
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/basics/chrono.h>
 #include <xrpl/beast/hash/uhash.h>
@@ -13,7 +15,6 @@
 #include <xrpl/protocol/XRPAmount.h>

 #include <gtest/gtest.h>
-#include <shamap/common.h>

 #include <cstdint>
 #include <memory>
@@ -1,9 +1,10 @@
 #include <xrpl/ledger/entries/FeeSettingsEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,9 +1,10 @@
 #include <xrpl/ledger/entries/LedgerHashesEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,10 +1,11 @@
 #include <xrpl/ledger/entries/LoanBrokerEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/SeqProxy.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,11 +1,12 @@
 #include <xrpl/ledger/entries/LoanEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Keylet.h>
 #include <xrpl/protocol/SeqProxy.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,10 +1,11 @@
 #include <xrpl/ledger/entries/MPTokenEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/UintTypes.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,10 +1,11 @@
 #include <xrpl/ledger/entries/MPTokenIssuanceEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/UintTypes.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 #include <cstdint>

@@ -1,10 +1,11 @@
 #include <xrpl/ledger/entries/NFTokenOfferEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/SeqProxy.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,10 +1,11 @@
 #include <xrpl/ledger/entries/NFTokenPageEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Keylet.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,9 +1,10 @@
 #include <xrpl/ledger/entries/NegativeUNLEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,10 +1,11 @@
 #include <xrpl/ledger/entries/OfferEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/SeqProxy.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,9 +1,10 @@
 #include <xrpl/ledger/entries/OracleEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 #include <cstdint>

@@ -1,11 +1,12 @@
 #include <xrpl/ledger/entries/PayChannelEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Keylet.h>
 #include <xrpl/protocol/SeqProxy.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,10 +1,11 @@
 #include <xrpl/ledger/entries/PermissionedDomainEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/SeqProxy.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,12 +1,13 @@
 #include <xrpl/ledger/entries/RippleStateEntry.h>

+#include <tests/libxrpl/helpers/IOU.h>
+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Keylet.h>
 #include <xrpl/protocol/UintTypes.h>

 #include <gtest/gtest.h>
-#include <helpers/IOU.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,5 +1,8 @@
 #include <xrpl/ledger/entries/SLEBase.h>

+#include <tests/libxrpl/helpers/Account.h>
+#include <tests/libxrpl/helpers/TxTest.h>
+
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/ApplyView.h>
 #include <xrpl/ledger/ApplyViewImpl.h>
@@ -44,8 +47,6 @@
 #include <xrpl/protocol_autogen/transactions/AccountSet.h>

 #include <gtest/gtest.h>
-#include <helpers/Account.h>
-#include <helpers/TxTest.h>

 #include <stdexcept>
 #include <tuple>
@@ -1,9 +1,10 @@
 #include <xrpl/ledger/entries/SignerListEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,10 +1,11 @@
 #include <xrpl/ledger/entries/SponsorshipEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/Keylet.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,10 +1,11 @@
 #include <xrpl/ledger/entries/TicketEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/SeqProxy.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,10 +1,11 @@
 #include <xrpl/ledger/entries/VaultEntry.h>

+#include <tests/libxrpl/ledger/EntryTestHelpers.h>
+
 #include <xrpl/protocol/Indexes.h>
 #include <xrpl/protocol/SeqProxy.h>

 #include <gtest/gtest.h>
-#include <ledger/EntryTestHelpers.h>

 namespace xrpl::test {

@@ -1,5 +1,7 @@
 #include <xrpl/net/HTTPClient.h>

+#include <tests/libxrpl/helpers/TestSink.h>
+
 #include <xrpl/basics/Log.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/beast/utility/instrumentation.h>
@@ -16,7 +18,6 @@
 #include <boost/beast/http.hpp>       // IWYU pragma: keep

 #include <gtest/gtest.h>
-#include <helpers/TestSink.h>

 #include <chrono>
 #include <exception>
@@ -1,5 +1,8 @@
 #include <xrpl/nodestore/Backend.h>

+#include <tests/libxrpl/helpers/TestSink.h>
+#include <tests/libxrpl/nodestore/TestBase.h>
+
 #include <xrpl/basics/ByteUtilities.h>
 #include <xrpl/basics/FileUtilities.h>
 #include <xrpl/beast/utility/Journal.h>
@@ -11,8 +14,6 @@
 #include <xrpl/nodestore/Types.h>

 #include <gtest/gtest.h>
-#include <helpers/TestSink.h>
-#include <nodestore/TestBase.h>

 #include <algorithm>
 #include <atomic>
@@ -1,9 +1,10 @@
+#include <tests/libxrpl/nodestore/TestBase.h>
+
 #include <xrpl/nodestore/NodeObject.h>
 #include <xrpl/nodestore/detail/DecodedBlob.h>
 #include <xrpl/nodestore/detail/EncodedBlob.h>

 #include <gtest/gtest.h>
-#include <nodestore/TestBase.h>

 #include <cstddef>
 #include <memory>
@@ -1,5 +1,8 @@
 #include <xrpl/nodestore/Database.h>

+#include <tests/libxrpl/helpers/TestSink.h>
+#include <tests/libxrpl/nodestore/TestBase.h>
+
 #include <xrpl/basics/ByteUtilities.h>
 #include <xrpl/basics/FileUtilities.h>
 #include <xrpl/beast/utility/Journal.h>
@@ -11,8 +14,6 @@
 #include <xrpl/protocol/SystemParameters.h>

 #include <gtest/gtest.h>
-#include <helpers/TestSink.h>
-#include <nodestore/TestBase.h>

 #include <algorithm>
 #include <memory>
@@ -1,3 +1,7 @@
+#include <tests/libxrpl/helpers/CaptureSink.h>
+#include <tests/libxrpl/helpers/TestSink.h>
+#include <tests/libxrpl/nodestore/TestBase.h>
+
 #include <xrpl/basics/ByteUtilities.h>
 #include <xrpl/basics/FileUtilities.h>
 #include <xrpl/beast/utility/Journal.h>
@@ -6,9 +10,6 @@
 #include <xrpl/nodestore/Manager.h>

 #include <gtest/gtest.h>
-#include <helpers/CaptureSink.h>
-#include <helpers/TestSink.h>
-#include <nodestore/TestBase.h>

 #include <array>
 #include <cstddef>
@@ -1,5 +1,7 @@
 #include <xrpl/peerfinder/detail/Livecache.h>

+#include <tests/libxrpl/helpers/TestSink.h>
+
 #include <xrpl/basics/chrono.h>
 #include <xrpl/basics/random.h>
 #include <xrpl/beast/net/IPAddressV4.h>
@@ -19,7 +21,6 @@
 #include <boost/lexical_cast.hpp>

 #include <gtest/gtest.h>
-#include <helpers/TestSink.h>

 #include <algorithm>
 #include <array>
@@ -1,3 +1,5 @@
+#include <tests/libxrpl/helpers/TestSink.h>
+
 #include <xrpl/basics/chrono.h>
 #include <xrpl/beast/net/IPEndpoint.h>
 #include <xrpl/beast/utility/Journal.h>
@@ -24,7 +26,6 @@

 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-#include <helpers/TestSink.h>

 #include <algorithm>
 #include <chrono>
@@ -1,3 +1,6 @@
+#include <tests/libxrpl/helpers/Account.h>
+#include <tests/libxrpl/protocol/VaultTestHelpers.h>
+
 #include <xrpl/basics/Number.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/ledger/helpers/LendingHelpers.h>
@@ -15,8 +18,6 @@
 #include <xrpl/protocol/UintTypes.h>

 #include <gtest/gtest.h>
-#include <helpers/Account.h>
-#include <protocol/VaultTestHelpers.h>

 #include <cstdint>
 #include <memory>
@@ -1,3 +1,6 @@
+#include <tests/libxrpl/helpers/Account.h>
+#include <tests/libxrpl/protocol/VaultTestHelpers.h>
+
 #include <xrpl/basics/Number.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/protocol/Asset.h>
@@ -15,8 +18,6 @@
 #include <xrpl/tx/transactors/lending/LoanManage.h>

 #include <gtest/gtest.h>
-#include <helpers/Account.h>
-#include <protocol/VaultTestHelpers.h>

 #include <algorithm>
 #include <cstdint>
@@ -1,3 +1,6 @@
+#include <tests/libxrpl/helpers/Account.h>
+#include <tests/libxrpl/protocol/VaultTestHelpers.h>
+
 #include <xrpl/basics/Number.h>
 #include <xrpl/beast/utility/Journal.h>
 #include <xrpl/ledger/helpers/VaultHelpers.h>
@@ -14,8 +17,6 @@
 #include <xrpl/protocol/UintTypes.h>

 #include <gtest/gtest.h>
-#include <helpers/Account.h>
-#include <protocol/VaultTestHelpers.h>

 #include <cstdint>
 #include <memory>
@@ -1,3 +1,6 @@
+#include <tests/libxrpl/helpers/Account.h>
+#include <tests/libxrpl/protocol/VaultTestHelpers.h>
+
 #include <xrpl/basics/Number.h>
 #include <xrpl/basics/base_uint.h>
 #include <xrpl/beast/hash/uhash.h>
@@ -19,8 +22,6 @@
 #include <xrpl/protocol/UintTypes.h>

 #include <gtest/gtest.h>
-#include <helpers/Account.h>
-#include <protocol/VaultTestHelpers.h>

 #include <cstdint>
 #include <memory>
@@ -3,7 +3,7 @@

 #include <gtest/gtest.h>

-#include <protocol_autogen/TestHelpers.h>
+#include <tests/libxrpl/protocol_autogen/TestHelpers.h>

 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol_autogen/ledger_entries/AMM.h>
@@ -3,7 +3,7 @@

 #include <gtest/gtest.h>

-#include <protocol_autogen/TestHelpers.h>
+#include <tests/libxrpl/protocol_autogen/TestHelpers.h>

 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol_autogen/ledger_entries/AccountRoot.h>
@@ -3,7 +3,7 @@

 #include <gtest/gtest.h>

-#include <protocol_autogen/TestHelpers.h>
+#include <tests/libxrpl/protocol_autogen/TestHelpers.h>

 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol_autogen/ledger_entries/Amendments.h>
@@ -3,7 +3,7 @@

 #include <gtest/gtest.h>

-#include <protocol_autogen/TestHelpers.h>
+#include <tests/libxrpl/protocol_autogen/TestHelpers.h>

 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol_autogen/ledger_entries/Check.h>
@@ -3,7 +3,7 @@

 #include <gtest/gtest.h>

-#include <protocol_autogen/TestHelpers.h>
+#include <tests/libxrpl/protocol_autogen/TestHelpers.h>

 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol_autogen/ledger_entries/Credential.h>
@@ -3,7 +3,7 @@

 #include <gtest/gtest.h>

-#include <protocol_autogen/TestHelpers.h>
+#include <tests/libxrpl/protocol_autogen/TestHelpers.h>

 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol_autogen/ledger_entries/DID.h>
@@ -3,7 +3,7 @@

 #include <gtest/gtest.h>

-#include <protocol_autogen/TestHelpers.h>
+#include <tests/libxrpl/protocol_autogen/TestHelpers.h>

 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol_autogen/ledger_entries/Delegate.h>
@@ -3,7 +3,7 @@

 #include <gtest/gtest.h>

-#include <protocol_autogen/TestHelpers.h>
+#include <tests/libxrpl/protocol_autogen/TestHelpers.h>

 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol_autogen/ledger_entries/DepositPreauth.h>
@@ -3,7 +3,7 @@

 #include <gtest/gtest.h>

-#include <protocol_autogen/TestHelpers.h>
+#include <tests/libxrpl/protocol_autogen/TestHelpers.h>

 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol_autogen/ledger_entries/DirectoryNode.h>
@@ -3,7 +3,7 @@

 #include <gtest/gtest.h>

-#include <protocol_autogen/TestHelpers.h>
+#include <tests/libxrpl/protocol_autogen/TestHelpers.h>

 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol_autogen/ledger_entries/Escrow.h>
@@ -3,7 +3,7 @@

 #include <gtest/gtest.h>

-#include <protocol_autogen/TestHelpers.h>
+#include <tests/libxrpl/protocol_autogen/TestHelpers.h>

 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol_autogen/ledger_entries/FeeSettings.h>
@@ -3,7 +3,7 @@

 #include <gtest/gtest.h>

-#include <protocol_autogen/TestHelpers.h>
+#include <tests/libxrpl/protocol_autogen/TestHelpers.h>

 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol_autogen/ledger_entries/LedgerHashes.h>
@@ -3,7 +3,7 @@

 #include <gtest/gtest.h>

-#include <protocol_autogen/TestHelpers.h>
+#include <tests/libxrpl/protocol_autogen/TestHelpers.h>

 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol_autogen/ledger_entries/LoanBroker.h>
@@ -3,7 +3,7 @@

 #include <gtest/gtest.h>

-#include <protocol_autogen/TestHelpers.h>
+#include <tests/libxrpl/protocol_autogen/TestHelpers.h>

 #include <xrpl/protocol/STLedgerEntry.h>
 #include <xrpl/protocol_autogen/ledger_entries/Loan.h>