diff --git a/external/oxen-libquic b/external/oxen-libquic
index 0fdbb2c8a..7a24ed3d0 160000
--- a/external/oxen-libquic
+++ b/external/oxen-libquic
@@ -1 +1 @@
-Subproject commit 0fdbb2c8ad20a729979465cf3c4f625c9c88fe04
+Subproject commit 7a24ed3d085202f0b2381f149670b602bb3515fc
diff --git a/llarp/CMakeLists.txt b/llarp/CMakeLists.txt
index a6e2e59f1..cc96712d2 100644
--- a/llarp/CMakeLists.txt
+++ b/llarp/CMakeLists.txt
@@ -333,7 +333,7 @@ add_library(lokinet-base INTERFACE)
 target_include_directories(lokinet-base
   INTERFACE ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/include
 )
-target_link_libraries(lokinet-base INTERFACE oxen::logging lokinet-cryptography)
+target_link_libraries(lokinet-base INTERFACE quic lokinet-cryptography)
 
 if(WITH_PEERSTATS)
   target_compile_definitions(lokinet-base INTERFACE -DLOKINET_PEERSTATS_BACKEND)
diff --git a/llarp/link/i_link_manager.hpp b/llarp/link/i_link_manager.hpp
index 3e9d07456..7ee546290 100644
--- a/llarp/link/i_link_manager.hpp
+++ b/llarp/link/i_link_manager.hpp
@@ -1,6 +1,8 @@
 #pragma once
 
+#include "endpoint.hpp"
 #include "server.hpp"
+
 #include <llarp/util/types.hpp>
 #include <llarp/peerstats/peer_db.hpp>
 
@@ -20,7 +22,7 @@ namespace llarp
   {
     virtual ~ILinkManager() = default;
 
-    virtual llarp::link::Endpoint*
+    virtual link::Endpoint*
     GetCompatibleLink(const RouterContact& rc) const = 0;
 
     virtual IOutboundSessionMaker*
@@ -38,7 +40,7 @@ namespace llarp
 
     /// return true if we have a connection to the remote and it is not a relay,
     /// else return false
-    bool
+    virtual bool
     HaveClientConnection(const RouterID& remote) const = 0;
 
     virtual void
diff --git a/llarp/link/link_manager.hpp b/llarp/link/link_manager.hpp
index 939cab70e..5334f3fde 100644
--- a/llarp/link/link_manager.hpp
+++ b/llarp/link/link_manager.hpp
@@ -23,7 +23,7 @@ namespace llarp
 
     ~LinkManager() override = default;
 
-    llarp::link::Endpoint*
+    link::Endpoint*
     GetCompatibleLink(const RouterContact& rc) const override;
 
     IOutboundSessionMaker*
@@ -40,7 +40,7 @@ namespace llarp
     HaveConnection(const RouterID& remote) const override;
 
     bool
-    HaveClientConnection(const RouterID& remote) const
+    HaveClientConnection(const RouterID& remote) const override;
 
     void
     DeregisterPeer(RouterID remote) override;
@@ -141,7 +141,7 @@ namespace llarp
     // Network's destructor, so we need to be able to destroy it before this class.
     std::unique_ptr<oxen::quic::Network> quic { std::make_unique<oxen::quic::Network>() };
 
-    std::vector<Endpoint> endpoints;
+    std::vector<link::Endpoint> endpoints;
 
     //TODO: initialize creds
     std::shared_ptr<oxen::quic::GNUTLSCreds> tls_creds;