diff --git a/CMakeLists.txt b/CMakeLists.txt
index b77c682..320c7ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,6 +50,7 @@ CMDEF_ADD_LIBRARY(
 )
 
 TARGET_LINK_LIBRARIES(${ASYNC_FUNCTION_EXECUTION_TARGET_NAME}-shared PUBLIC
+    aeron::aeron_client_wrapper
     aeron::aeron
     aeron::aeron_client_shared
     aeron::aeron_driver
diff --git a/include/bringauto/async_function_execution/clients/AeronClient.hpp b/include/bringauto/async_function_execution/clients/AeronClient.hpp
index 0988130..e6865c4 100644
--- a/include/bringauto/async_function_execution/clients/AeronClient.hpp
+++ b/include/bringauto/async_function_execution/clients/AeronClient.hpp
@@ -4,10 +4,10 @@
 #include <bringauto/async_function_execution/Constants.hpp>
 #include <bringauto/async_function_execution/TimeoutIdleStrategy.hpp>
 
-#include <Aeron.h>
-#include <FragmentAssembler.h>
+#include <wrapper/Aeron.h>
+#include <wrapper/FragmentAssembler.h>
 #include <ranges>
-#include <concurrent/BackOffIdleStrategy.h>
+#include <wrapper/concurrent/BackOffIdleStrategy.h>