From 4508c59cd30d02862e59e47139c241c270830809 Mon Sep 17 00:00:00 2001
From: Jeff Becker <jeff@lokinet.io>
Date: Mon, 9 Jan 2023 12:47:41 -0500
Subject: [PATCH] redo includes to be consistent

---
 llarp/config/config.cpp                       |  6 ++--
 llarp/config/config.hpp                       |  6 ++--
 llarp/constants/version.cpp.in                |  4 +--
 llarp/crypto/constants.hpp                    |  2 +-
 llarp/dns/rr.cpp                              |  2 +-
 llarp/exit/session.hpp                        |  2 +-
 llarp/handlers/exit.cpp                       |  2 +-
 llarp/layers/endpoint/kitchen_sink.cpp        |  0
 llarp/layers/flow/kitchen_sink.cpp            |  0
 llarp/messages/relay_commit.hpp               |  2 +-
 llarp/path/pathbuilder.cpp                    |  4 +--
 llarp/path/pathset.hpp                        |  2 +-
 llarp/path/transit_hop.cpp                    |  4 ++-
 llarp/path/transit_hop.hpp                    |  4 +--
 llarp/quic/tunnel.cpp                         |  6 ++--
 llarp/router/route_poker.cpp                  |  4 +--
 llarp/service/convotag.cpp                    |  2 +-
 llarp/service/endpoint.cpp                    | 21 +++++++-------
 llarp/service/endpoint.hpp                    | 29 ++++++++++---------
 llarp/service/intro.cpp                       |  2 +-
 llarp/service/outbound_context.cpp            |  9 +++---
 llarp/tooling/router_hive.hpp                 |  4 +--
 llarp/vpn/win32.cpp                           |  2 +-
 pybind/llarp/context.cpp                      |  3 +-
 test/CMakeLists.txt                           |  4 ---
 test/check_main.cpp                           |  4 +--
 test/config/test_llarp_config_definition.cpp  |  2 +-
 test/config/test_llarp_config_ini.cpp         |  2 +-
 test/config/test_llarp_config_output.cpp      |  2 +-
 test/crypto/test_llarp_crypto.cpp             |  2 +-
 test/crypto/test_llarp_crypto_types.cpp       |  4 +--
 test/crypto/test_llarp_key_manager.cpp        | 11 +++----
 test/dns/test_llarp_dns_dns.cpp               | 14 ++++-----
 test/llarp_test.hpp                           |  2 +-
 test/net/test_ip_address.cpp                  |  2 +-
 test/net/test_llarp_net.cpp                   |  8 ++---
 test/net/test_sock_addr.cpp                   |  6 ++--
 test/nodedb/test_nodedb.cpp                   |  6 ++--
 test/path/test_path.cpp                       |  2 +-
 test/peerstats/test_peer_db.cpp               | 10 +++----
 test/peerstats/test_peer_types.cpp            |  2 +-
 test/router/test_llarp_router_version.cpp     |  4 +--
 .../test_llarp_routing_obtainexitmessage.cpp  |  9 +++---
 .../test_llarp_routing_transfer_traffic.cpp   |  2 +-
 test/service/test_llarp_service_address.cpp   |  2 +-
 test/service/test_llarp_service_identity.cpp  | 16 +++++-----
 test/service/test_llarp_service_name.cpp      |  4 +--
 test/test_llarp_encrypted_frame.cpp           | 15 ++++------
 test/test_llarp_router_contact.cpp            |  8 ++---
 test/test_util.cpp                            |  2 +-
 test/test_util.hpp                            |  5 ++--
 test/util/meta/test_llarp_util_memfn.cpp      |  2 +-
 test/util/test_llarp_util_aligned.cpp         |  2 +-
 test/util/test_llarp_util_bencode.cpp         |  4 +--
 test/util/test_llarp_util_bits.cpp            |  2 +-
 .../util/test_llarp_util_decaying_hashset.cpp |  4 +--
 test/util/test_llarp_util_log_level.cpp       |  4 +--
 test/util/test_llarp_util_str.cpp             |  2 +-
 test/util/thread/test_llarp_util_queue.cpp    |  6 ++--
 .../thread/test_llarp_util_queue_manager.cpp  |  2 +-
 60 files changed, 148 insertions(+), 152 deletions(-)
 create mode 100644 llarp/layers/endpoint/kitchen_sink.cpp
 create mode 100644 llarp/layers/flow/kitchen_sink.cpp

diff --git a/llarp/config/config.cpp b/llarp/config/config.cpp
index 98a5f1571..eda628dda 100644
--- a/llarp/config/config.cpp
+++ b/llarp/config/config.cpp
@@ -1,8 +1,7 @@
-#include <chrono>
 #include "config.hpp"
-
-#include "config/definition.hpp"
+#include "definition.hpp"
 #include "ini.hpp"
+
 #include <llarp/constants/files.hpp>
 #include <llarp/constants/platform.hpp>
 #include <llarp/constants/version.hpp>
@@ -18,6 +17,7 @@
 
 #include <llarp/service/name.hpp>
 
+#include <chrono>
 #include <cstdlib>
 #include <ios>
 #include <iostream>
diff --git a/llarp/config/config.hpp b/llarp/config/config.hpp
index 76540f19f..3165f0354 100644
--- a/llarp/config/config.hpp
+++ b/llarp/config/config.hpp
@@ -1,14 +1,15 @@
 #pragma once
+#include "ini.hpp"
+#include "definition.hpp"
 
 #include <chrono>
+
 #include <llarp/bootstrap.hpp>
 #include <llarp/crypto/types.hpp>
 #include <llarp/router_contact.hpp>
 #include <llarp/util/fs.hpp>
 #include <llarp/util/str.hpp>
 #include <llarp/util/logging.hpp>
-#include "ini.hpp"
-#include "definition.hpp"
 #include <llarp/constants/files.hpp>
 #include <llarp/net/ip_address.hpp>
 #include <llarp/net/net_int.hpp>
@@ -16,7 +17,6 @@
 #include <llarp/service/address.hpp>
 #include <llarp/service/auth.hpp>
 #include <llarp/dns/srv_data.hpp>
-
 #include <llarp/router_contact.hpp>
 
 #include <cstdlib>
diff --git a/llarp/constants/version.cpp.in b/llarp/constants/version.cpp.in
index bca06675c..e07223705 100644
--- a/llarp/constants/version.cpp.in
+++ b/llarp/constants/version.cpp.in
@@ -1,5 +1,5 @@
-#include <constants/version.hpp>
-#include <constants/proto.hpp>
+#include <llarp/constants/version.hpp>
+#include <llarp/constants/proto.hpp>
 
 namespace llarp
 {
diff --git a/llarp/crypto/constants.hpp b/llarp/crypto/constants.hpp
index 7f8eef90f..1d039bbc2 100644
--- a/llarp/crypto/constants.hpp
+++ b/llarp/crypto/constants.hpp
@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-#include <libntrup/ntru.h>
+#include <llarp/crypto/ntru/ntru.h>
 
 static constexpr uint32_t PUBKEYSIZE = 32;
 static constexpr uint32_t SECKEYSIZE = 64;
diff --git a/llarp/dns/rr.cpp b/llarp/dns/rr.cpp
index 495656cb2..8851ace30 100644
--- a/llarp/dns/rr.cpp
+++ b/llarp/dns/rr.cpp
@@ -1,6 +1,6 @@
 #include "rr.hpp"
 #include "dns.hpp"
-#include "util/formattable.hpp"
+#include <llarp/util/formattable.hpp>
 #include <llarp/util/mem.hpp>
 #include <llarp/util/logging.hpp>
 
diff --git a/llarp/exit/session.hpp b/llarp/exit/session.hpp
index def9115ac..7191cc104 100644
--- a/llarp/exit/session.hpp
+++ b/llarp/exit/session.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "exit_messages.hpp"
-#include "service/protocol_type.hpp"
+#include <llarp/service/protocol_type.hpp>
 #include <llarp/net/ip_packet.hpp>
 #include <llarp/path/pathbuilder.hpp>
 #include <llarp/routing/transfer_traffic_message.hpp>
diff --git a/llarp/handlers/exit.cpp b/llarp/handlers/exit.cpp
index 64e002e3a..a7840c090 100644
--- a/llarp/handlers/exit.cpp
+++ b/llarp/handlers/exit.cpp
@@ -11,7 +11,7 @@
 #include <llarp/router/i_rc_lookup_handler.hpp>
 
 #include <cassert>
-#include "service/protocol_type.hpp"
+#include <llarp/service/protocol_type.hpp>
 
 namespace llarp
 {
diff --git a/llarp/layers/endpoint/kitchen_sink.cpp b/llarp/layers/endpoint/kitchen_sink.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/llarp/layers/flow/kitchen_sink.cpp b/llarp/layers/flow/kitchen_sink.cpp
new file mode 100644
index 000000000..e69de29bb
diff --git a/llarp/messages/relay_commit.hpp b/llarp/messages/relay_commit.hpp
index b019c1e53..164933917 100644
--- a/llarp/messages/relay_commit.hpp
+++ b/llarp/messages/relay_commit.hpp
@@ -2,7 +2,7 @@
 
 #include <llarp/crypto/encrypted_frame.hpp>
 #include <llarp/crypto/types.hpp>
-#include "link_message.hpp"
+#include <llarp/messages/link_message.hpp>
 #include <llarp/path/path_types.hpp>
 #include <llarp/pow.hpp>
 
diff --git a/llarp/path/pathbuilder.cpp b/llarp/path/pathbuilder.cpp
index abf149024..1710b9d33 100644
--- a/llarp/path/pathbuilder.cpp
+++ b/llarp/path/pathbuilder.cpp
@@ -1,10 +1,10 @@
 #include "pathbuilder.hpp"
+#include "path_context.hpp"
 
 #include <llarp/crypto/crypto.hpp>
 #include <llarp/messages/relay_commit.hpp>
 #include <llarp/nodedb.hpp>
-#include "path_context.hpp"
-#include "util/logging.hpp"
+#include <llarp/util/logging.hpp>
 #include <llarp/profiling.hpp>
 #include <llarp/router/abstractrouter.hpp>
 #include <llarp/router/i_rc_lookup_handler.hpp>
diff --git a/llarp/path/pathset.hpp b/llarp/path/pathset.hpp
index 3e431bf41..f7fe5690e 100644
--- a/llarp/path/pathset.hpp
+++ b/llarp/path/pathset.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "path_types.hpp"
-#include "service/protocol_type.hpp"
+#include <llarp/service/protocol_type.hpp>
 #include <llarp/router_id.hpp>
 #include <llarp/routing/message.hpp>
 #include <llarp/service/intro_set.hpp>
diff --git a/llarp/path/transit_hop.cpp b/llarp/path/transit_hop.cpp
index 4efe3540f..ff912aae0 100644
--- a/llarp/path/transit_hop.cpp
+++ b/llarp/path/transit_hop.cpp
@@ -33,7 +33,9 @@ namespace llarp
     }
 
     TransitHop::TransitHop()
-        : m_UpstreamGather(transit_hop_queue_size), m_DownstreamGather(transit_hop_queue_size)
+        : IHopHandler{}
+        , m_UpstreamGather{transit_hop_queue_size}
+        , m_DownstreamGather{transit_hop_queue_size}
     {
       m_UpstreamGather.enable();
       m_DownstreamGather.enable();
diff --git a/llarp/path/transit_hop.hpp b/llarp/path/transit_hop.hpp
index eb828af9b..fb628929f 100644
--- a/llarp/path/transit_hop.hpp
+++ b/llarp/path/transit_hop.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <llarp/constants/path.hpp>
-#include "ihophandler.hpp"
-#include "path_types.hpp"
+#include <llarp/path/ihophandler.hpp>
+#include <llarp/path/path_types.hpp>
 #include <llarp/routing/handler.hpp>
 #include <llarp/router_id.hpp>
 #include <llarp/util/compare_ptr.hpp>
diff --git a/llarp/quic/tunnel.cpp b/llarp/quic/tunnel.cpp
index 9b09e5e2f..914b963ea 100644
--- a/llarp/quic/tunnel.cpp
+++ b/llarp/quic/tunnel.cpp
@@ -1,7 +1,7 @@
 #include "tunnel.hpp"
-#include "service/convotag.hpp"
-#include "service/endpoint.hpp"
-#include "service/name.hpp"
+#include <llarp/service/convotag.hpp>
+#include <llarp/service/endpoint.hpp>
+#include <llarp/service/name.hpp>
 #include "stream.hpp"
 #include <limits>
 #include <llarp/util/logging.hpp>
diff --git a/llarp/router/route_poker.cpp b/llarp/router/route_poker.cpp
index 3fdc0e4bb..1471ac911 100644
--- a/llarp/router/route_poker.cpp
+++ b/llarp/router/route_poker.cpp
@@ -1,6 +1,6 @@
 #include "route_poker.hpp"
-#include "abstractrouter.hpp"
-#include "net/sock_addr.hpp"
+#include <llarp/router/abstractrouter.hpp>
+#include <llarp/net/sock_addr.hpp>
 #include <llarp/service/context.hpp>
 #include <llarp/dns/platform.hpp>
 #include <unordered_set>
diff --git a/llarp/service/convotag.cpp b/llarp/service/convotag.cpp
index 727751f00..b4b4eec61 100644
--- a/llarp/service/convotag.cpp
+++ b/llarp/service/convotag.cpp
@@ -1,5 +1,5 @@
 #include "convotag.hpp"
-#include "net/ip.hpp"
+#include <llarp/net/ip.hpp>
 
 namespace llarp::service
 {
diff --git a/llarp/service/endpoint.cpp b/llarp/service/endpoint.cpp
index 24839ff4d..7768c8685 100644
--- a/llarp/service/endpoint.cpp
+++ b/llarp/service/endpoint.cpp
@@ -1,7 +1,15 @@
 #include <chrono>
 #include <memory>
 #include "endpoint.hpp"
+#include "endpoint_state.hpp"
+#include "endpoint_util.hpp"
+#include "hidden_service_address_lookup.hpp"
+#include "outbound_context.hpp"
+#include "protocol.hpp"
+#include "info.hpp"
+#include "protocol_type.hpp"
 
+#include <llarp/net/ip.hpp>
 #include <llarp/dht/context.hpp>
 #include <llarp/dht/key.hpp>
 #include <llarp/dht/messages/findintro.hpp>
@@ -16,27 +24,18 @@
 #include <llarp/router/abstractrouter.hpp>
 #include <llarp/routing/dht_message.hpp>
 #include <llarp/routing/path_transfer_message.hpp>
-#include "endpoint_state.hpp"
-#include "endpoint_util.hpp"
-#include "hidden_service_address_lookup.hpp"
-#include "net/ip.hpp"
-#include "outbound_context.hpp"
-#include "protocol.hpp"
-#include "service/info.hpp"
-#include "service/protocol_type.hpp"
+
 #include <llarp/util/str.hpp>
 #include <llarp/util/buffer.hpp>
 #include <llarp/util/meta/memfn.hpp>
 #include <llarp/link/link_manager.hpp>
 #include <llarp/tooling/dht_event.hpp>
+#include <llarp/quic/server.hpp>
 #include <llarp/quic/tunnel.hpp>
 #include <llarp/util/priority_queue.hpp>
 
 #include <optional>
 #include <utility>
-
-#include <llarp/quic/server.hpp>
-#include <llarp/quic/tunnel.hpp>
 #include <uvw.hpp>
 #include <variant>
 
diff --git a/llarp/service/endpoint.hpp b/llarp/service/endpoint.hpp
index dd61c74b9..619f58fdd 100644
--- a/llarp/service/endpoint.hpp
+++ b/llarp/service/endpoint.hpp
@@ -6,24 +6,27 @@
 #include <llarp/net/net.hpp>
 #include <llarp/path/path.hpp>
 #include <llarp/path/pathbuilder.hpp>
-#include "address.hpp"
-#include "handler.hpp"
-#include "identity.hpp"
-#include "pendingbuffer.hpp"
-#include "protocol.hpp"
-#include "sendcontext.hpp"
-#include "service/protocol_type.hpp"
-#include "session.hpp"
-#include "lookup.hpp"
 #include <llarp/util/compare_ptr.hpp>
+
+// --- begin kitchen sink headers ----
+#include <llarp/service/address.hpp>
+#include <llarp/service/handler.hpp>
+#include <llarp/service/identity.hpp>
+#include <llarp/service/pendingbuffer.hpp>
+#include <llarp/service/protocol.hpp>
+#include <llarp/service/sendcontext.hpp>
+#include <llarp/service/protocol_type.hpp>
+#include <llarp/service/session.hpp>
+#include <llarp/service/lookup.hpp>
+#include <llarp/service/endpoint_types.hpp>
+#include <llarp/endpoint_base.hpp>
+#include <llarp/service/auth.hpp>
+// ----- end kitchen sink headers -----
+
 #include <optional>
 #include <unordered_map>
 #include <variant>
 #include <oxenc/variant.h>
-#include "endpoint_types.hpp"
-#include "llarp/endpoint_base.hpp"
-
-#include "auth.hpp"
 
 #include <llarp/vpn/egres_packet_router.hpp>
 #include <llarp/dns/server.hpp>
diff --git a/llarp/service/intro.cpp b/llarp/service/intro.cpp
index 54de28805..026d49dee 100644
--- a/llarp/service/intro.cpp
+++ b/llarp/service/intro.cpp
@@ -1,5 +1,5 @@
 #include "intro.hpp"
-#include "util/time.hpp"
+#include <llarp/util/time.hpp>
 
 namespace llarp
 {
diff --git a/llarp/service/outbound_context.cpp b/llarp/service/outbound_context.cpp
index 3494bceee..28b4a37af 100644
--- a/llarp/service/outbound_context.cpp
+++ b/llarp/service/outbound_context.cpp
@@ -1,16 +1,15 @@
 #include "outbound_context.hpp"
-
-#include <llarp/router/abstractrouter.hpp>
 #include "async_key_exchange.hpp"
 #include "hidden_service_address_lookup.hpp"
 #include "endpoint.hpp"
+#include "endpoint_util.hpp"
+#include "protocol_type.hpp"
+
+#include <llarp/router/abstractrouter.hpp>
 #include <llarp/nodedb.hpp>
 #include <llarp/profiling.hpp>
 #include <llarp/util/meta/memfn.hpp>
 
-#include "endpoint_util.hpp"
-#include "service/protocol_type.hpp"
-
 #include <random>
 #include <algorithm>
 
diff --git a/llarp/tooling/router_hive.hpp b/llarp/tooling/router_hive.hpp
index 31bfdffcf..760205ea6 100644
--- a/llarp/tooling/router_hive.hpp
+++ b/llarp/tooling/router_hive.hpp
@@ -3,8 +3,8 @@
 #include "router_event.hpp"
 
 #include <llarp.hpp>
-#include <config/config.hpp>
-#include <tooling/hive_context.hpp>
+#include <llarp/config/config.hpp>
+#include <llarp/tooling/hive_context.hpp>
 
 #include <vector>
 #include <deque>
diff --git a/llarp/vpn/win32.cpp b/llarp/vpn/win32.cpp
index 1562cef1c..f6f4a452e 100644
--- a/llarp/vpn/win32.cpp
+++ b/llarp/vpn/win32.cpp
@@ -1,4 +1,4 @@
-#include "vpn/win32.hpp"
+#include "win32.hpp"
 #include <llarp/win32/windivert.hpp>
 #include <llarp/win32/wintun.hpp>
 #include <fmt/core.h>
diff --git a/pybind/llarp/context.cpp b/pybind/llarp/context.cpp
index db9fad6f3..9a1cf194b 100644
--- a/pybind/llarp/context.cpp
+++ b/pybind/llarp/context.cpp
@@ -3,7 +3,8 @@
 #include <llarp/tooling/hive_context.hpp>
 #include <llarp/router/router.hpp>
 #include <llarp/handlers/pyhandler.hpp>
-#include "service/protocol_type.hpp"
+#include <llarp/service/protocol_type.hpp>
+
 namespace llarp
 {
   void
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c11104139..e6270599e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -60,8 +60,4 @@ if(WIN32)
     target_link_libraries(testAll PUBLIC ws2_32 iphlpapi shlwapi)
 endif()
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-    target_link_directories(testAll PRIVATE /usr/local/lib)
-endif()
-
 add_custom_target(check COMMAND testAll)
diff --git a/test/check_main.cpp b/test/check_main.cpp
index 87299c833..c98dadd9a 100644
--- a/test/check_main.cpp
+++ b/test/check_main.cpp
@@ -1,8 +1,8 @@
 #define CATCH_CONFIG_RUNNER
 #include <catch2/catch.hpp>
 
-#include <util/logging.hpp>
-#include <util/service_manager.hpp>
+#include <llarp/util/logging.hpp>
+#include <llarp/util/service_manager.hpp>
 
 #ifdef _WIN32
 #include <winsock2.h>
diff --git a/test/config/test_llarp_config_definition.cpp b/test/config/test_llarp_config_definition.cpp
index 80005d58c..29cd9b795 100644
--- a/test/config/test_llarp_config_definition.cpp
+++ b/test/config/test_llarp_config_definition.cpp
@@ -1,4 +1,4 @@
-#include <config/definition.hpp>
+#include <llarp/config/definition.hpp>
 
 #include <catch2/catch.hpp>
 
diff --git a/test/config/test_llarp_config_ini.cpp b/test/config/test_llarp_config_ini.cpp
index 06c187e2c..b876e0d20 100644
--- a/test/config/test_llarp_config_ini.cpp
+++ b/test/config/test_llarp_config_ini.cpp
@@ -1,4 +1,4 @@
-#include <config/ini.hpp>
+#include <llarp/config/ini.hpp>
 
 #include <catch2/catch.hpp>
 
diff --git a/test/config/test_llarp_config_output.cpp b/test/config/test_llarp_config_output.cpp
index 5ba47bf21..3324ef0f6 100644
--- a/test/config/test_llarp_config_output.cpp
+++ b/test/config/test_llarp_config_output.cpp
@@ -1,4 +1,4 @@
-#include <config/definition.hpp>
+#include <llarp/config/definition.hpp>
 
 #include <catch2/catch.hpp>
 
diff --git a/test/crypto/test_llarp_crypto.cpp b/test/crypto/test_llarp_crypto.cpp
index 13105a87e..b78752375 100644
--- a/test/crypto/test_llarp_crypto.cpp
+++ b/test/crypto/test_llarp_crypto.cpp
@@ -1,4 +1,4 @@
-#include <crypto/crypto_libsodium.hpp>
+#include <llarp/crypto/crypto_libsodium.hpp>
 
 #include <iostream>
 
diff --git a/test/crypto/test_llarp_crypto_types.cpp b/test/crypto/test_llarp_crypto_types.cpp
index 8477352f7..359f1911b 100644
--- a/test/crypto/test_llarp_crypto_types.cpp
+++ b/test/crypto/test_llarp_crypto_types.cpp
@@ -1,9 +1,9 @@
-#include <crypto/types.hpp>
+#include <llarp/crypto/types.hpp>
 
 #include <fstream>
 #include <string>
 
-#include <test_util.hpp>
+#include "test_util.hpp"
 #include <catch2/catch.hpp>
 
 extern "C" {
diff --git a/test/crypto/test_llarp_key_manager.cpp b/test/crypto/test_llarp_key_manager.cpp
index e5082bf58..459ed309b 100644
--- a/test/crypto/test_llarp_key_manager.cpp
+++ b/test/crypto/test_llarp_key_manager.cpp
@@ -1,14 +1,15 @@
-#include <config/key_manager.hpp>
+#include "llarp_test.hpp"
+#include "test_util.hpp"
 
-#include <crypto/crypto.hpp>
-#include <crypto/crypto_libsodium.hpp>
-#include <llarp_test.hpp>
+#include <llarp/config/key_manager.hpp>
+
+#include <llarp/crypto/crypto.hpp>
+#include <llarp/crypto/crypto_libsodium.hpp>
 
 #include <functional>
 #include <random>
 
 #include <string>
-#include <test_util.hpp>
 #include <catch2/catch.hpp>
 
 using namespace ::llarp;
diff --git a/test/dns/test_llarp_dns_dns.cpp b/test/dns/test_llarp_dns_dns.cpp
index ff800b4ec..e130dc634 100644
--- a/test/dns/test_llarp_dns_dns.cpp
+++ b/test/dns/test_llarp_dns_dns.cpp
@@ -1,11 +1,11 @@
 #include <catch2/catch.hpp>
-#include <dns/dns.hpp>
-#include <dns/message.hpp>
-#include <dns/name.hpp>
-#include <dns/rr.hpp>
-#include <net/net.hpp>
-#include <net/ip.hpp>
-#include <util/buffer.hpp>
+#include <llarp/dns/dns.hpp>
+#include <llarp/dns/message.hpp>
+#include <llarp/dns/name.hpp>
+#include <llarp/dns/rr.hpp>
+#include <llarp/net/net.hpp>
+#include <llarp/net/ip.hpp>
+#include <llarp/util/buffer.hpp>
 
 #include <algorithm>
 
diff --git a/test/llarp_test.hpp b/test/llarp_test.hpp
index 8199ff569..914c4a224 100644
--- a/test/llarp_test.hpp
+++ b/test/llarp_test.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <crypto/crypto_libsodium.hpp>
+#include <llarp/crypto/crypto_libsodium.hpp>
 #include <catch2/catch.hpp>
 
 namespace llarp::test
diff --git a/test/net/test_ip_address.cpp b/test/net/test_ip_address.cpp
index 1366ebb76..8cbc26b1e 100644
--- a/test/net/test_ip_address.cpp
+++ b/test/net/test_ip_address.cpp
@@ -1,4 +1,4 @@
-#include <net/ip_address.hpp>
+#include <llarp/net/ip_address.hpp>
 
 #include <catch2/catch.hpp>
 
diff --git a/test/net/test_llarp_net.cpp b/test/net/test_llarp_net.cpp
index 0c237a90b..90f2f901c 100644
--- a/test/net/test_llarp_net.cpp
+++ b/test/net/test_llarp_net.cpp
@@ -1,7 +1,7 @@
-#include <net/net_int.hpp>
-#include <net/ip.hpp>
-#include <net/ip_range.hpp>
-#include <net/net.hpp>
+#include <llarp/net/net_int.hpp>
+#include <llarp/net/ip.hpp>
+#include <llarp/net/ip_range.hpp>
+#include <llarp/net/net.hpp>
 #include <oxenc/hex.h>
 
 #include <catch2/catch.hpp>
diff --git a/test/net/test_sock_addr.cpp b/test/net/test_sock_addr.cpp
index 9d13b48a4..c1c175d7e 100644
--- a/test/net/test_sock_addr.cpp
+++ b/test/net/test_sock_addr.cpp
@@ -1,6 +1,6 @@
-#include <util/mem.hpp>
-#include <net/sock_addr.hpp>
-#include <net/net_if.hpp>
+#include <llarp/util/mem.hpp>
+#include <llarp/net/sock_addr.hpp>
+#include <llarp/net/net_if.hpp>
 #include <llarp/util/logging.hpp>
 
 #include <catch2/catch.hpp>
diff --git a/test/nodedb/test_nodedb.cpp b/test/nodedb/test_nodedb.cpp
index 2d23bd27d..9286e345b 100644
--- a/test/nodedb/test_nodedb.cpp
+++ b/test/nodedb/test_nodedb.cpp
@@ -1,8 +1,8 @@
 #include <catch2/catch.hpp>
-#include "config/config.hpp"
 
-#include <router_contact.hpp>
-#include <nodedb.hpp>
+#include <llarp/config/config.hpp>
+#include <llarp/router_contact.hpp>
+#include <llarp/nodedb.hpp>
 
 using llarp_nodedb = llarp::NodeDB;
 
diff --git a/test/path/test_path.cpp b/test/path/test_path.cpp
index d5ad3d56c..d25a1c68e 100644
--- a/test/path/test_path.cpp
+++ b/test/path/test_path.cpp
@@ -1,4 +1,4 @@
-#include <path/path.hpp>
+#include <llarp/path/path.hpp>
 #include <catch2/catch.hpp>
 
 using Path_t   = llarp::path::Path;
diff --git a/test/peerstats/test_peer_db.cpp b/test/peerstats/test_peer_db.cpp
index 52889514c..c3ed14c79 100644
--- a/test/peerstats/test_peer_db.cpp
+++ b/test/peerstats/test_peer_db.cpp
@@ -1,12 +1,12 @@
-#include <peerstats/peer_db.hpp>
+#include <llarp/peerstats/peer_db.hpp>
 #include <test_util.hpp>
 
 #include <numeric>
 #include <catch2/catch.hpp>
-#include "peerstats/types.hpp"
-#include "router_contact.hpp"
-#include "util/logging.hpp"
-#include "util/time.hpp"
+#include <llarp/peerstats/types.hpp>
+#include <llarp/router_contact.hpp>
+#include <llarp/util/logging.hpp>
+#include <llarp/util/time.hpp>
 
 TEST_CASE("Test PeerDb PeerStats memory storage", "[PeerDb]")
 {
diff --git a/test/peerstats/test_peer_types.cpp b/test/peerstats/test_peer_types.cpp
index 46b8bc834..b2c398563 100644
--- a/test/peerstats/test_peer_types.cpp
+++ b/test/peerstats/test_peer_types.cpp
@@ -1,5 +1,5 @@
 #include <numeric>
-#include <peerstats/types.hpp>
+#include <llarp/peerstats/types.hpp>
 #include <test_util.hpp>
 
 #include <catch2/catch.hpp>
diff --git a/test/router/test_llarp_router_version.cpp b/test/router/test_llarp_router_version.cpp
index 260a16198..8f00ef03c 100644
--- a/test/router/test_llarp_router_version.cpp
+++ b/test/router/test_llarp_router_version.cpp
@@ -1,5 +1,5 @@
-#include <router_version.hpp>
-#include "router/router.hpp"
+#include <llarp/router_version.hpp>
+#include <llarp/router/router.hpp>
 
 #include <catch2/catch.hpp>
 
diff --git a/test/routing/test_llarp_routing_obtainexitmessage.cpp b/test/routing/test_llarp_routing_obtainexitmessage.cpp
index fca9842e6..631652072 100644
--- a/test/routing/test_llarp_routing_obtainexitmessage.cpp
+++ b/test/routing/test_llarp_routing_obtainexitmessage.cpp
@@ -1,8 +1,7 @@
-#include <exit/exit_messages.hpp>
-
-#include <crypto/crypto.hpp>
-#include <crypto/crypto_libsodium.hpp>
-#include <llarp_test.hpp>
+#include "llarp_test.hpp"
+#include <llarp/exit/exit_messages.hpp>
+#include <llarp/crypto/crypto.hpp>
+#include <llarp/crypto/crypto_libsodium.hpp>
 
 #include <catch2/catch.hpp>
 
diff --git a/test/routing/test_llarp_routing_transfer_traffic.cpp b/test/routing/test_llarp_routing_transfer_traffic.cpp
index 915aecef0..3f7b44dee 100644
--- a/test/routing/test_llarp_routing_transfer_traffic.cpp
+++ b/test/routing/test_llarp_routing_transfer_traffic.cpp
@@ -1,4 +1,4 @@
-#include <routing/transfer_traffic_message.hpp>
+#include <llarp/routing/transfer_traffic_message.hpp>
 
 #include <catch2/catch.hpp>
 
diff --git a/test/service/test_llarp_service_address.cpp b/test/service/test_llarp_service_address.cpp
index f95e398c9..62c6cd0d7 100644
--- a/test/service/test_llarp_service_address.cpp
+++ b/test/service/test_llarp_service_address.cpp
@@ -1,4 +1,4 @@
-#include <service/address.hpp>
+#include <llarp/service/address.hpp>
 
 #include <catch2/catch.hpp>
 
diff --git a/test/service/test_llarp_service_identity.cpp b/test/service/test_llarp_service_identity.cpp
index 2fe8db9d7..560754280 100644
--- a/test/service/test_llarp_service_identity.cpp
+++ b/test/service/test_llarp_service_identity.cpp
@@ -1,13 +1,13 @@
-#include <crypto/crypto.hpp>
-#include <crypto/crypto_libsodium.hpp>
+#include <llarp/crypto/crypto.hpp>
+#include <llarp/crypto/crypto_libsodium.hpp>
 #include <sodium/crypto_scalarmult_ed25519.h>
-#include <path/path.hpp>
-#include <service/address.hpp>
-#include <service/identity.hpp>
-#include <service/intro_set.hpp>
-#include <util/time.hpp>
+#include <llarp/path/path.hpp>
+#include <llarp/service/address.hpp>
+#include <llarp/service/identity.hpp>
+#include <llarp/service/intro_set.hpp>
+#include <llarp/util/time.hpp>
 
-#include <test_util.hpp>
+#include "test_util.hpp"
 #include <catch2/catch.hpp>
 
 using namespace llarp;
diff --git a/test/service/test_llarp_service_name.cpp b/test/service/test_llarp_service_name.cpp
index 3f9daef61..86f0324f3 100644
--- a/test/service/test_llarp_service_name.cpp
+++ b/test/service/test_llarp_service_name.cpp
@@ -1,6 +1,6 @@
 #include "catch2/catch.hpp"
-#include <crypto/crypto_libsodium.hpp>
-#include <service/name.hpp>
+#include <llarp/crypto/crypto_libsodium.hpp>
+#include <llarp/service/name.hpp>
 #include <oxenc/hex.h>
 
 using namespace std::literals;
diff --git a/test/test_llarp_encrypted_frame.cpp b/test/test_llarp_encrypted_frame.cpp
index a1e850644..6648ba9b1 100644
--- a/test/test_llarp_encrypted_frame.cpp
+++ b/test/test_llarp_encrypted_frame.cpp
@@ -1,12 +1,9 @@
-#include <crypto/encrypted_frame.hpp>
-
-#include <crypto/crypto.hpp>
-#include <crypto/crypto_libsodium.hpp>
-#include <llarp_test.hpp>
-#include <messages/relay_commit.hpp>
-
-#include <test_util.hpp>
-
+#include "llarp_test.hpp"
+#include "test_util.hpp"
+#include <llarp/crypto/encrypted_frame.hpp>
+#include <llarp/crypto/crypto.hpp>
+#include <llarp/crypto/crypto_libsodium.hpp>
+#include <llarp/messages/relay_commit.hpp>
 #include <catch2/catch.hpp>
 
 using namespace ::llarp;
diff --git a/test/test_llarp_router_contact.cpp b/test/test_llarp_router_contact.cpp
index eac96f332..f94e7904b 100644
--- a/test/test_llarp_router_contact.cpp
+++ b/test/test_llarp_router_contact.cpp
@@ -1,9 +1,9 @@
 #include <catch2/catch.hpp>
 
-#include <crypto/crypto.hpp>
-#include <crypto/crypto_libsodium.hpp>
-#include <router_contact.hpp>
-#include <net/net_int.hpp>
+#include <llarp/crypto/crypto.hpp>
+#include <llarp/crypto/crypto_libsodium.hpp>
+#include <llarp/router_contact.hpp>
+#include <llarp/net/net_int.hpp>
 #include <llarp/util/time.hpp>
 
 namespace
diff --git a/test/test_util.cpp b/test/test_util.cpp
index 100af14a9..b73a0e445 100644
--- a/test/test_util.cpp
+++ b/test/test_util.cpp
@@ -1,4 +1,4 @@
-#include <test_util.hpp>
+#include "test_util.hpp"
 
 #include <random>
 
diff --git a/test/test_util.hpp b/test/test_util.hpp
index 4433789ab..36f09a912 100644
--- a/test/test_util.hpp
+++ b/test/test_util.hpp
@@ -1,9 +1,8 @@
 #ifndef TEST_UTIL_HPP
 #define TEST_UTIL_HPP
 
-#include <util/fs.hpp>
-#include <util/types.hpp>
-
+#include <llarp/util/fs.hpp>
+#include <llarp/util/types.hpp>
 #include <bitset>
 #include <vector>
 
diff --git a/test/util/meta/test_llarp_util_memfn.cpp b/test/util/meta/test_llarp_util_memfn.cpp
index 165115570..a75cde7c5 100644
--- a/test/util/meta/test_llarp_util_memfn.cpp
+++ b/test/util/meta/test_llarp_util_memfn.cpp
@@ -1,4 +1,4 @@
-#include <util/meta/memfn.hpp>
+#include <llarp/util/meta/memfn.hpp>
 
 #include <catch2/catch.hpp>
 
diff --git a/test/util/test_llarp_util_aligned.cpp b/test/util/test_llarp_util_aligned.cpp
index 970a676d5..3e6cc0c5a 100644
--- a/test/util/test_llarp_util_aligned.cpp
+++ b/test/util/test_llarp_util_aligned.cpp
@@ -1,6 +1,6 @@
 #include <catch2/catch.hpp>
 
-#include <util/aligned.hpp>
+#include <llarp/util/aligned.hpp>
 
 #include <iostream>
 #include <sstream>
diff --git a/test/util/test_llarp_util_bencode.cpp b/test/util/test_llarp_util_bencode.cpp
index 890ddce30..cff95e7d2 100644
--- a/test/util/test_llarp_util_bencode.cpp
+++ b/test/util/test_llarp_util_bencode.cpp
@@ -1,5 +1,5 @@
-#include <util/bencode.h>
-#include <util/bencode.hpp>
+#include <llarp/util/bencode.h>
+#include <llarp/util/bencode.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/test/util/test_llarp_util_bits.cpp b/test/util/test_llarp_util_bits.cpp
index befa3965f..e24eb33a4 100644
--- a/test/util/test_llarp_util_bits.cpp
+++ b/test/util/test_llarp_util_bits.cpp
@@ -1,5 +1,5 @@
 #include <catch2/catch.hpp>
-#include <util/bits.hpp>
+#include <llarp/util/bits.hpp>
 
 using namespace llarp::bits;
 
diff --git a/test/util/test_llarp_util_decaying_hashset.cpp b/test/util/test_llarp_util_decaying_hashset.cpp
index 28cc9371c..5a9339bd8 100644
--- a/test/util/test_llarp_util_decaying_hashset.cpp
+++ b/test/util/test_llarp_util_decaying_hashset.cpp
@@ -1,5 +1,5 @@
-#include <util/decaying_hashset.hpp>
-#include <router_id.hpp>
+#include <llarp/util/decaying_hashset.hpp>
+#include <llarp/router_id.hpp>
 #include <catch2/catch.hpp>
 
 TEST_CASE("DecayingHashSet test decay static time", "[decaying-hashset]")
diff --git a/test/util/test_llarp_util_log_level.cpp b/test/util/test_llarp_util_log_level.cpp
index 048c6324f..8335e986a 100644
--- a/test/util/test_llarp_util_log_level.cpp
+++ b/test/util/test_llarp_util_log_level.cpp
@@ -1,6 +1,6 @@
 #include <catch2/catch.hpp>
-#include <util/logging.hpp>
-#include <config/config.hpp>
+#include <llarp/util/logging.hpp>
+#include <llarp/config/config.hpp>
 #include <oxen/log/level.hpp>
 
 using TestString = std::string;
diff --git a/test/util/test_llarp_util_str.cpp b/test/util/test_llarp_util_str.cpp
index b53173660..caa324967 100644
--- a/test/util/test_llarp_util_str.cpp
+++ b/test/util/test_llarp_util_str.cpp
@@ -1,4 +1,4 @@
-#include <util/str.hpp>
+#include <llarp/util/str.hpp>
 #include <catch2/catch.hpp>
 
 #include <vector>
diff --git a/test/util/thread/test_llarp_util_queue.cpp b/test/util/thread/test_llarp_util_queue.cpp
index 4410b5ab7..70f71a974 100644
--- a/test/util/thread/test_llarp_util_queue.cpp
+++ b/test/util/thread/test_llarp_util_queue.cpp
@@ -1,6 +1,6 @@
-#include <util/thread/queue.hpp>
-#include <util/thread/threading.hpp>
-#include <util/thread/barrier.hpp>
+#include <llarp/util/thread/queue.hpp>
+#include <llarp/util/thread/threading.hpp>
+#include <llarp/util/thread/barrier.hpp>
 
 #include <array>
 #include <condition_variable>
diff --git a/test/util/thread/test_llarp_util_queue_manager.cpp b/test/util/thread/test_llarp_util_queue_manager.cpp
index 526c6b289..8085a3240 100644
--- a/test/util/thread/test_llarp_util_queue_manager.cpp
+++ b/test/util/thread/test_llarp_util_queue_manager.cpp
@@ -1,4 +1,4 @@
-#include <util/thread/queue_manager.hpp>
+#include <llarp/util/thread/queue_manager.hpp>
 
 #include <optional>
 #include <vector>