diff --git a/tl_expected/include/tl_expected/expected.hpp b/tl_expected/include/tl_expected/expected.hpp
index ae90975..2af2e7a 100644
--- a/tl_expected/include/tl_expected/expected.hpp
+++ b/tl_expected/include/tl_expected/expected.hpp
@@ -13,6 +13,12 @@
 // <http://creativecommons.org/publicdomain/zero/1.0/>.
 ///
 
+#warning "tl_expected/expected.hpp is deprecated. Use <tl/expected.hpp> from libexpected-dev, or <rcpputils/tl_expected/expected.hpp> if the system header is not available."
+// If the system header is available, redirect to it.
+// Otherwise, fall back to the vendored version
+#if __has_include(<tl/expected.hpp>)
+#include <tl/expected.hpp>
+#else
 #ifndef TL_EXPECTED_HPP
 #define TL_EXPECTED_HPP
 
@@ -2480,4 +2486,6 @@ void swap(expected<T, E> &lhs,
 }
 } // namespace tl
 
-#endif
+#endif // TL_EXPECTED_HPP
+
+#endif // !defined(USE_VENDORED_TL_EXPECTED) && __has_include(<tl/expected.hpp>)
diff --git a/tl_expected/package.xml b/tl_expected/package.xml
index e50c708..fd4a91d 100644
--- a/tl_expected/package.xml
+++ b/tl_expected/package.xml
@@ -16,6 +16,8 @@
 
   <buildtool_depend>ament_cmake</buildtool_depend>
 
+  <build_export_depend>libexpected-dev</build_export_depend>
+
   <export>
     <build_type>ament_cmake</build_type>
   </export>