diff --git a/bosdyn_api_msgs/CMakeLists.txt b/bosdyn_api_msgs/CMakeLists.txt
index 7b1024ba..0e3b61a3 100644
--- a/bosdyn_api_msgs/CMakeLists.txt
+++ b/bosdyn_api_msgs/CMakeLists.txt
@@ -10,8 +10,8 @@ find_package(ament_cmake REQUIRED)
 find_package(geometry_msgs REQUIRED)
 find_package(proto2ros REQUIRED)
 
-find_package(bosdyn REQUIRED PATHS /opt/spot-cpp-sdk)
 find_package(bosdyn_cmake_module REQUIRED)
+find_package(bosdyn REQUIRED)  # always after bosdyn_cmake_module
 
 fetch_spot_sdk(spotsdk)
 set(${PROJECT_NAME}_PROTO_DIR "${spotsdk_SOURCE_DIR}/protos")
@@ -29,6 +29,10 @@ proto2ros_vendor_package(${PROJECT_NAME}
   ROS_DEPENDENCIES geometry_msgs
 )
 
-ament_export_dependencies(geometry_msgs)
+ament_export_dependencies(
+  bosdyn_cmake_module
+  geometry_msgs
+  bosdyn
+)
 
-ament_package(CONFIG_EXTRAS bosdyn_api_msgs-extras.cmake)
+ament_package()
diff --git a/bosdyn_api_msgs/package.xml b/bosdyn_api_msgs/package.xml
index dce66231..93eba5a4 100644
--- a/bosdyn_api_msgs/package.xml
+++ b/bosdyn_api_msgs/package.xml
@@ -12,9 +12,10 @@ Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved.
 
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>ament_cmake_python</buildtool_depend>
-  <buildtool_depend>bosdyn_cmake_module</buildtool_depend>
   <buildtool_depend>rosidl_default_generators</buildtool_depend>
 
+  <depend>bosdyn_cmake_module</depend>
+
   <depend>bosdyn-spot-cpp</depend>
   <depend>geometry_msgs</depend>
   <depend>proto2ros</depend>
diff --git a/bosdyn_auto_return_api_msgs/CMakeLists.txt b/bosdyn_auto_return_api_msgs/CMakeLists.txt
index d4b6ae4d..4d3a5b0f 100644
--- a/bosdyn_auto_return_api_msgs/CMakeLists.txt
+++ b/bosdyn_auto_return_api_msgs/CMakeLists.txt
@@ -10,8 +10,8 @@ find_package(ament_cmake REQUIRED)
 find_package(proto2ros REQUIRED)
 find_package(bosdyn_api_msgs REQUIRED)
 
-find_package(bosdyn REQUIRED PATHS /opt/spot-cpp-sdk)
 find_package(bosdyn_cmake_module REQUIRED)
+find_package(bosdyn REQUIRED)  # always after bosdyn_cmake_module
 
 fetch_spot_sdk(spotsdk)
 set(${PROJECT_NAME}_PROTO_DIR "${spotsdk_SOURCE_DIR}/protos")
@@ -27,6 +27,10 @@ proto2ros_vendor_package(${PROJECT_NAME}
   ROS_DEPENDENCIES bosdyn_api_msgs
 )
 
-ament_export_dependencies(bosdyn_api_msgs)
+ament_export_dependencies(
+  bosdyn_api_msgs
+  bosdyn_cmake_module
+  bosdyn
+)
 
-ament_package(CONFIG_EXTRAS bosdyn_auto_return_api_msgs-extras.cmake)
+ament_package()
diff --git a/bosdyn_auto_return_api_msgs/bosdyn_auto_return_api_msgs-extras.cmake b/bosdyn_auto_return_api_msgs/bosdyn_auto_return_api_msgs-extras.cmake
deleted file mode 100644
index 031aa52e..00000000
--- a/bosdyn_auto_return_api_msgs/bosdyn_auto_return_api_msgs-extras.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (c) 2024 Boston Dynamics AI Institute LLC. All rights reserved.
-
-find_package(bosdyn REQUIRED PATHS /opt/spot-cpp-sdk)
diff --git a/bosdyn_auto_return_api_msgs/package.xml b/bosdyn_auto_return_api_msgs/package.xml
index 0c7a07cd..479c2e6a 100644
--- a/bosdyn_auto_return_api_msgs/package.xml
+++ b/bosdyn_auto_return_api_msgs/package.xml
@@ -9,9 +9,10 @@
 
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>ament_cmake_python</buildtool_depend>
-  <buildtool_depend>bosdyn_cmake_module</buildtool_depend>
   <buildtool_depend>rosidl_default_generators</buildtool_depend>
 
+  <depend>bosdyn_cmake_module</depend>
+
   <depend>bosdyn-spot-cpp</depend>
   <depend>bosdyn_api_msgs</depend>
   <depend>proto2ros</depend>
diff --git a/bosdyn_autowalk_api_msgs/CMakeLists.txt b/bosdyn_autowalk_api_msgs/CMakeLists.txt
index 1f5c3fb4..e647d8fc 100644
--- a/bosdyn_autowalk_api_msgs/CMakeLists.txt
+++ b/bosdyn_autowalk_api_msgs/CMakeLists.txt
@@ -14,8 +14,8 @@ find_package(bosdyn_spot_api_msgs REQUIRED)
 find_package(bosdyn_spot_cam_api_msgs REQUIRED)
 find_package(proto2ros REQUIRED)
 
-find_package(bosdyn REQUIRED PATHS /opt/spot-cpp-sdk)
 find_package(bosdyn_cmake_module REQUIRED)
+find_package(bosdyn REQUIRED)  # always after bosdyn_cmake_module
 
 fetch_spot_sdk(spotsdk)
 set(${PROJECT_NAME}_PROTO_DIR "${spotsdk_SOURCE_DIR}/protos")
@@ -38,10 +38,12 @@ proto2ros_vendor_package(${PROJECT_NAME}
 
 ament_export_dependencies(
   bosdyn_api_msgs
+  bosdyn_cmake_module
   bosdyn_graph_nav_api_msgs
   bosdyn_mission_api_msgs
   bosdyn_spot_api_msgs
   bosdyn_spot_cam_api_msgs
+  bosdyn
 )
 
-ament_package(CONFIG_EXTRAS bosdyn_autowalk_api_msgs-extras.cmake)
+ament_package()
diff --git a/bosdyn_autowalk_api_msgs/bosdyn_autowalk_api_msgs-extras.cmake b/bosdyn_autowalk_api_msgs/bosdyn_autowalk_api_msgs-extras.cmake
deleted file mode 100644
index 031aa52e..00000000
--- a/bosdyn_autowalk_api_msgs/bosdyn_autowalk_api_msgs-extras.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (c) 2024 Boston Dynamics AI Institute LLC. All rights reserved.
-
-find_package(bosdyn REQUIRED PATHS /opt/spot-cpp-sdk)
diff --git a/bosdyn_autowalk_api_msgs/package.xml b/bosdyn_autowalk_api_msgs/package.xml
index 42c716f1..a63c8942 100644
--- a/bosdyn_autowalk_api_msgs/package.xml
+++ b/bosdyn_autowalk_api_msgs/package.xml
@@ -9,9 +9,10 @@
 
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>ament_cmake_python</buildtool_depend>
-  <buildtool_depend>bosdyn_cmake_module</buildtool_depend>
   <buildtool_depend>rosidl_default_generators</buildtool_depend>
 
+  <depend>bosdyn_cmake_module</depend>
+
   <depend>bosdyn-spot-cpp</depend>
   <depend>bosdyn_api_msgs</depend>
   <depend>bosdyn_graph_nav_api_msgs</depend>
diff --git a/bosdyn_cmake_module/CMakeLists.txt b/bosdyn_cmake_module/CMakeLists.txt
index 7ae7b88d..a289595e 100644
--- a/bosdyn_cmake_module/CMakeLists.txt
+++ b/bosdyn_cmake_module/CMakeLists.txt
@@ -9,4 +9,15 @@ install(
   DESTINATION share/${PROJECT_NAME}
 )
 
-ament_package(CONFIG_EXTRAS "bosdyn_cmake_module-extras.cmake")
+set(BOSDYN_CMAKE_PREFIX_PATH /opt/spot-cpp-sdk)
+
+find_package(bosdyn REQUIRED PATHS "${BOSDYN_CMAKE_PREFIX_PATH}")
+
+get_target_property(BOSDYN_API_SO_LOCATION bosdyn::bosdyn_api IMPORTED_LOCATION_RELEASE)
+get_filename_component(BOSDYN_LIBRARY_PATH "${BOSDYN_API_SO_LOCATION}" DIRECTORY)
+set(AMENT_CMAKE_ENVIRONMENT_HOOKS_DESC_library_path
+  "prepend-non-duplicate;LD_LIBRARY_PATH;${BOSDYN_LIBRARY_PATH}"
+)
+ament_environment_hooks(cmake/templates/library_path.sh.in)
+
+ament_package(CONFIG_EXTRAS cmake/templates/bosdyn_cmake_module-extras.cmake.in)
diff --git a/bosdyn_cmake_module/bosdyn_cmake_module-extras.cmake b/bosdyn_cmake_module/cmake/templates/bosdyn_cmake_module-extras.cmake.in
similarity index 76%
rename from bosdyn_cmake_module/bosdyn_cmake_module-extras.cmake
rename to bosdyn_cmake_module/cmake/templates/bosdyn_cmake_module-extras.cmake.in
index b1e5d35a..09936ed5 100644
--- a/bosdyn_cmake_module/bosdyn_cmake_module-extras.cmake
+++ b/bosdyn_cmake_module/cmake/templates/bosdyn_cmake_module-extras.cmake.in
@@ -3,4 +3,5 @@
 find_package(Python3 REQUIRED)
 include(FetchContent)
 
+list(APPEND CMAKE_PREFIX_PATH "@BOSDYN_CMAKE_PREFIX_PATH@")
 include("${bosdyn_cmake_module_DIR}/fetch_spot_sdk.cmake")
diff --git a/bosdyn_api_msgs/bosdyn_api_msgs-extras.cmake b/bosdyn_cmake_module/cmake/templates/library_path.sh.in
similarity index 53%
rename from bosdyn_api_msgs/bosdyn_api_msgs-extras.cmake
rename to bosdyn_cmake_module/cmake/templates/library_path.sh.in
index 031aa52e..5e64ee45 100644
--- a/bosdyn_api_msgs/bosdyn_api_msgs-extras.cmake
+++ b/bosdyn_cmake_module/cmake/templates/library_path.sh.in
@@ -1,3 +1,3 @@
 # Copyright (c) 2024 Boston Dynamics AI Institute LLC. All rights reserved.
 
-find_package(bosdyn REQUIRED PATHS /opt/spot-cpp-sdk)
+ament_prepend_unique_value LD_LIBRARY_PATH "@BOSDYN_LIBRARY_PATH@"
diff --git a/bosdyn_graph_nav_api_msgs/CMakeLists.txt b/bosdyn_graph_nav_api_msgs/CMakeLists.txt
index 09706f8b..7af0f5c5 100644
--- a/bosdyn_graph_nav_api_msgs/CMakeLists.txt
+++ b/bosdyn_graph_nav_api_msgs/CMakeLists.txt
@@ -11,8 +11,8 @@ find_package(bosdyn_api_msgs REQUIRED)
 find_package(bosdyn_spot_api_msgs REQUIRED)
 find_package(proto2ros REQUIRED)
 
-find_package(bosdyn REQUIRED PATHS /opt/spot-cpp-sdk)
 find_package(bosdyn_cmake_module REQUIRED)
+find_package(bosdyn REQUIRED)  # always after bosdyn_cmake_module
 
 fetch_spot_sdk(spotsdk)
 set(${PROJECT_NAME}_PROTO_DIR "${spotsdk_SOURCE_DIR}/protos")
@@ -30,7 +30,9 @@ proto2ros_vendor_package(${PROJECT_NAME}
 
 ament_export_dependencies(
   bosdyn_api_msgs
+  bosdyn_cmake_module
   bosdyn_spot_api_msgs
+  bosdyn
 )
 
-ament_package(CONFIG_EXTRAS bosdyn_graph_nav_api_msgs-extras.cmake)
+ament_package()
diff --git a/bosdyn_graph_nav_api_msgs/bosdyn_graph_nav_api_msgs-extras.cmake b/bosdyn_graph_nav_api_msgs/bosdyn_graph_nav_api_msgs-extras.cmake
deleted file mode 100644
index 031aa52e..00000000
--- a/bosdyn_graph_nav_api_msgs/bosdyn_graph_nav_api_msgs-extras.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (c) 2024 Boston Dynamics AI Institute LLC. All rights reserved.
-
-find_package(bosdyn REQUIRED PATHS /opt/spot-cpp-sdk)
diff --git a/bosdyn_graph_nav_api_msgs/package.xml b/bosdyn_graph_nav_api_msgs/package.xml
index d1a68c4d..3e35a140 100644
--- a/bosdyn_graph_nav_api_msgs/package.xml
+++ b/bosdyn_graph_nav_api_msgs/package.xml
@@ -9,9 +9,10 @@
 
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>ament_cmake_python</buildtool_depend>
-  <buildtool_depend>bosdyn_cmake_module</buildtool_depend>
   <buildtool_depend>rosidl_default_generators</buildtool_depend>
 
+  <depend>bosdyn_cmake_module</depend>
+
   <depend>bosdyn-spot-cpp</depend>>
   <depend>bosdyn_api_msgs</depend>
   <depend>bosdyn_spot_api_msgs</depend>
diff --git a/bosdyn_keepalive_api_msgs/CMakeLists.txt b/bosdyn_keepalive_api_msgs/CMakeLists.txt
index 02a05f29..db0071a0 100644
--- a/bosdyn_keepalive_api_msgs/CMakeLists.txt
+++ b/bosdyn_keepalive_api_msgs/CMakeLists.txt
@@ -11,8 +11,8 @@ find_package(bosdyn_api_msgs REQUIRED)
 find_package(bosdyn_auto_return_api_msgs REQUIRED)
 find_package(proto2ros REQUIRED)
 
-find_package(bosdyn REQUIRED PATHS /opt/spot-cpp-sdk)
 find_package(bosdyn_cmake_module REQUIRED)
+find_package(bosdyn REQUIRED)  # always after bosdyn_cmake_module
 
 fetch_spot_sdk(spotsdk)
 set(${PROJECT_NAME}_PROTO_DIR "${spotsdk_SOURCE_DIR}/protos")
@@ -30,7 +30,9 @@ proto2ros_vendor_package(${PROJECT_NAME}
 
 ament_export_dependencies(
   bosdyn_api_msgs
+  bosdyn_cmake_module
   bosdyn_auto_return_api_msgs
+  bosdyn
 )
 
-ament_package(CONFIG_EXTRAS bosdyn_keepalive_api_msgs-extras.cmake)
+ament_package()
diff --git a/bosdyn_keepalive_api_msgs/bosdyn_keepalive_api_msgs-extras.cmake b/bosdyn_keepalive_api_msgs/bosdyn_keepalive_api_msgs-extras.cmake
deleted file mode 100644
index 031aa52e..00000000
--- a/bosdyn_keepalive_api_msgs/bosdyn_keepalive_api_msgs-extras.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (c) 2024 Boston Dynamics AI Institute LLC. All rights reserved.
-
-find_package(bosdyn REQUIRED PATHS /opt/spot-cpp-sdk)
diff --git a/bosdyn_keepalive_api_msgs/package.xml b/bosdyn_keepalive_api_msgs/package.xml
index 83986e42..68c7ec77 100644
--- a/bosdyn_keepalive_api_msgs/package.xml
+++ b/bosdyn_keepalive_api_msgs/package.xml
@@ -9,9 +9,10 @@
 
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>ament_cmake_python</buildtool_depend>
-  <buildtool_depend>bosdyn_cmake_module</buildtool_depend>
   <buildtool_depend>rosidl_default_generators</buildtool_depend>
 
+  <depend>bosdyn_cmake_module</depend>
+
   <depend>bosdyn-spot-cpp</depend>
   <depend>bosdyn_api_msgs</depend>
   <depend>bosdyn_auto_return_api_msgs</depend>
diff --git a/bosdyn_log_status_api_msgs/CMakeLists.txt b/bosdyn_log_status_api_msgs/CMakeLists.txt
index 81c1077b..9afe176c 100644
--- a/bosdyn_log_status_api_msgs/CMakeLists.txt
+++ b/bosdyn_log_status_api_msgs/CMakeLists.txt
@@ -10,8 +10,8 @@ find_package(ament_cmake REQUIRED)
 find_package(bosdyn_api_msgs REQUIRED)
 find_package(proto2ros REQUIRED)
 
-find_package(bosdyn REQUIRED PATHS /opt/spot-cpp-sdk)
 find_package(bosdyn_cmake_module REQUIRED)
+find_package(bosdyn REQUIRED)  # always after bosdyn_cmake_module
 
 fetch_spot_sdk(spotsdk)
 set(${PROJECT_NAME}_PROTO_DIR "${spotsdk_SOURCE_DIR}/protos")
@@ -27,6 +27,10 @@ proto2ros_vendor_package(${PROJECT_NAME}
   ROS_DEPENDENCIES bosdyn_api_msgs
 )
 
-ament_export_dependencies(bosdyn_api_msgs)
+ament_export_dependencies(
+  bosdyn_api_msgs
+  bosdyn_cmake_module
+  bosdyn
+)
 
-ament_package(CONFIG_EXTRAS bosdyn_log_status_api_msgs-extras.cmake)
+ament_package()
diff --git a/bosdyn_log_status_api_msgs/bosdyn_log_status_api_msgs-extras.cmake b/bosdyn_log_status_api_msgs/bosdyn_log_status_api_msgs-extras.cmake
deleted file mode 100644
index 031aa52e..00000000
--- a/bosdyn_log_status_api_msgs/bosdyn_log_status_api_msgs-extras.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (c) 2024 Boston Dynamics AI Institute LLC. All rights reserved.
-
-find_package(bosdyn REQUIRED PATHS /opt/spot-cpp-sdk)
diff --git a/bosdyn_log_status_api_msgs/package.xml b/bosdyn_log_status_api_msgs/package.xml
index 1a4b5ac7..aee6080a 100644
--- a/bosdyn_log_status_api_msgs/package.xml
+++ b/bosdyn_log_status_api_msgs/package.xml
@@ -9,9 +9,10 @@
 
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>ament_cmake_python</buildtool_depend>
-  <buildtool_depend>bosdyn_cmake_module</buildtool_depend>
   <buildtool_depend>rosidl_default_generators</buildtool_depend>
 
+  <depend>bosdyn_cmake_module</depend>
+
   <depend>bosdyn-spot-cpp</depend>
   <depend>bosdyn_api_msgs</depend>
   <depend>proto2ros</depend>
diff --git a/bosdyn_metrics_logging_api_msgs/CMakeLists.txt b/bosdyn_metrics_logging_api_msgs/CMakeLists.txt
index 26b7ff7c..32bc3d29 100644
--- a/bosdyn_metrics_logging_api_msgs/CMakeLists.txt
+++ b/bosdyn_metrics_logging_api_msgs/CMakeLists.txt
@@ -10,8 +10,8 @@ find_package(ament_cmake REQUIRED)
 find_package(bosdyn_api_msgs REQUIRED)
 find_package(proto2ros REQUIRED)
 
-find_package(bosdyn REQUIRED PATHS /opt/spot-cpp-sdk)
 find_package(bosdyn_cmake_module REQUIRED)
+find_package(bosdyn REQUIRED)  # always after bosdyn_cmake_module
 
 fetch_spot_sdk(spotsdk)
 set(${PROJECT_NAME}_PROTO_DIR "${spotsdk_SOURCE_DIR}/protos")
@@ -27,6 +27,10 @@ proto2ros_vendor_package(${PROJECT_NAME}
   ROS_DEPENDENCIES bosdyn_api_msgs
 )
 
-ament_export_dependencies(bosdyn_api_msgs)
+ament_export_dependencies(
+  bosdyn_api_msgs
+  bosdyn_cmake_module
+  bosdyn
+)
 
-ament_package(CONFIG_EXTRAS bosdyn_metrics_logging_api_msgs-extras.cmake)
+ament_package()
diff --git a/bosdyn_metrics_logging_api_msgs/bosdyn_metrics_logging_api_msgs-extras.cmake b/bosdyn_metrics_logging_api_msgs/bosdyn_metrics_logging_api_msgs-extras.cmake
deleted file mode 100644
index 031aa52e..00000000
--- a/bosdyn_metrics_logging_api_msgs/bosdyn_metrics_logging_api_msgs-extras.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (c) 2024 Boston Dynamics AI Institute LLC. All rights reserved.
-
-find_package(bosdyn REQUIRED PATHS /opt/spot-cpp-sdk)
diff --git a/bosdyn_metrics_logging_api_msgs/package.xml b/bosdyn_metrics_logging_api_msgs/package.xml
index e2701d18..1395c8aa 100644
--- a/bosdyn_metrics_logging_api_msgs/package.xml
+++ b/bosdyn_metrics_logging_api_msgs/package.xml
@@ -12,9 +12,10 @@ Copyright (c) 2024 Boston Dynamics AI Institute LLC. All rights reserved.
 
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>ament_cmake_python</buildtool_depend>
-  <buildtool_depend>bosdyn_cmake_module</buildtool_depend>
   <buildtool_depend>rosidl_default_generators</buildtool_depend>
 
+  <depend>bosdyn_cmake_module</depend>
+
   <depend>bosdyn-spot-cpp</depend>
   <depend>bosdyn_api_msgs</depend>
   <depend>proto2ros</depend>
diff --git a/bosdyn_mission_api_msgs/CMakeLists.txt b/bosdyn_mission_api_msgs/CMakeLists.txt
index 7c86f20c..d5b0b188 100644
--- a/bosdyn_mission_api_msgs/CMakeLists.txt
+++ b/bosdyn_mission_api_msgs/CMakeLists.txt
@@ -13,8 +13,8 @@ find_package(bosdyn_spot_api_msgs REQUIRED)
 find_package(bosdyn_spot_cam_api_msgs REQUIRED)
 find_package(proto2ros REQUIRED)
 
-find_package(bosdyn REQUIRED PATHS /opt/spot-cpp-sdk)
 find_package(bosdyn_cmake_module REQUIRED)
+find_package(bosdyn REQUIRED)  # always after bosdyn_cmake_module
 
 fetch_spot_sdk(spotsdk)
 set(${PROJECT_NAME}_PROTO_DIR "${spotsdk_SOURCE_DIR}/protos")
@@ -36,9 +36,11 @@ proto2ros_vendor_package(${PROJECT_NAME}
 
 ament_export_dependencies(
   bosdyn_api_msgs
+  bosdyn_cmake_module
   bosdyn_graph_nav_api_msgs
   bosdyn_spot_api_msgs
   bosdyn_spot_cam_api_msgs
+  bosdyn
 )
 
-ament_package(CONFIG_EXTRAS bosdyn_mission_api_msgs-extras.cmake)
+ament_package()
diff --git a/bosdyn_mission_api_msgs/bosdyn_mission_api_msgs-extras.cmake b/bosdyn_mission_api_msgs/bosdyn_mission_api_msgs-extras.cmake
deleted file mode 100644
index 031aa52e..00000000
--- a/bosdyn_mission_api_msgs/bosdyn_mission_api_msgs-extras.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (c) 2024 Boston Dynamics AI Institute LLC. All rights reserved.
-
-find_package(bosdyn REQUIRED PATHS /opt/spot-cpp-sdk)
diff --git a/bosdyn_mission_api_msgs/package.xml b/bosdyn_mission_api_msgs/package.xml
index d27ac909..15008690 100644
--- a/bosdyn_mission_api_msgs/package.xml
+++ b/bosdyn_mission_api_msgs/package.xml
@@ -9,9 +9,10 @@
 
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>ament_cmake_python</buildtool_depend>
-  <buildtool_depend>bosdyn_cmake_module</buildtool_depend>
   <buildtool_depend>rosidl_default_generators</buildtool_depend>
 
+  <depend>bosdyn_cmake_module</depend>
+
   <depend>bosdyn-spot-cpp</depend>
   <depend>bosdyn_api_msgs</depend>
   <depend>bosdyn_graph_nav_api_msgs</depend>
diff --git a/bosdyn_spot_api_msgs/CMakeLists.txt b/bosdyn_spot_api_msgs/CMakeLists.txt
index 87dc9728..bac22dc1 100644
--- a/bosdyn_spot_api_msgs/CMakeLists.txt
+++ b/bosdyn_spot_api_msgs/CMakeLists.txt
@@ -10,8 +10,8 @@ find_package(ament_cmake REQUIRED)
 find_package(bosdyn_api_msgs REQUIRED)
 find_package(proto2ros REQUIRED)
 
-find_package(bosdyn REQUIRED PATHS /opt/spot-cpp-sdk)
 find_package(bosdyn_cmake_module REQUIRED)
+find_package(bosdyn REQUIRED)  # always after bosdyn_cmake_module
 
 fetch_spot_sdk(spotsdk)
 file(GLOB ${PROJECT_NAME}_PROTOS
@@ -32,6 +32,11 @@ proto2ros_vendor_package(${PROJECT_NAME}
   ROS_DEPENDENCIES bosdyn_api_msgs
 )
 
-ament_export_dependencies(bosdyn_api_msgs)
+ament_export_dependencies(
+  bosdyn_api_msgs
+  bosdyn_cmake_module
+  geometry_msgs
+  bosdyn
+)
 
-ament_package(CONFIG_EXTRAS bosdyn_spot_api_msgs-extras.cmake)
+ament_package()
diff --git a/bosdyn_spot_api_msgs/bosdyn_spot_api_msgs-extras.cmake b/bosdyn_spot_api_msgs/bosdyn_spot_api_msgs-extras.cmake
deleted file mode 100644
index 031aa52e..00000000
--- a/bosdyn_spot_api_msgs/bosdyn_spot_api_msgs-extras.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (c) 2024 Boston Dynamics AI Institute LLC. All rights reserved.
-
-find_package(bosdyn REQUIRED PATHS /opt/spot-cpp-sdk)
diff --git a/bosdyn_spot_api_msgs/package.xml b/bosdyn_spot_api_msgs/package.xml
index 47d86bd1..ebb7621c 100644
--- a/bosdyn_spot_api_msgs/package.xml
+++ b/bosdyn_spot_api_msgs/package.xml
@@ -12,9 +12,10 @@ Copyright (c) 2023 Boston Dynamics AI Institute LLC. All rights reserved.
 
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>ament_cmake_python</buildtool_depend>
-  <buildtool_depend>bosdyn_cmake_module</buildtool_depend>
   <buildtool_depend>rosidl_default_generators</buildtool_depend>
 
+  <depend>bosdyn_cmake_module</depend>
+
   <depend>bosdyn-spot-cpp</depend>
   <depend>bosdyn_api_msgs</depend>
   <depend>proto2ros</depend>
diff --git a/bosdyn_spot_cam_api_msgs/CMakeLists.txt b/bosdyn_spot_cam_api_msgs/CMakeLists.txt
index 94f325d3..4969b910 100644
--- a/bosdyn_spot_cam_api_msgs/CMakeLists.txt
+++ b/bosdyn_spot_cam_api_msgs/CMakeLists.txt
@@ -10,8 +10,8 @@ find_package(ament_cmake REQUIRED)
 find_package(bosdyn_api_msgs REQUIRED)
 find_package(proto2ros REQUIRED)
 
-find_package(bosdyn REQUIRED PATHS /opt/spot-cpp-sdk)
 find_package(bosdyn_cmake_module REQUIRED)
+find_package(bosdyn REQUIRED)  # always after bosdyn_cmake_module
 
 fetch_spot_sdk(spotsdk)
 set(${PROJECT_NAME}_PROTO_DIR "${spotsdk_SOURCE_DIR}/protos")
@@ -25,6 +25,10 @@ proto2ros_vendor_package(${PROJECT_NAME}
   ROS_DEPENDENCIES bosdyn_api_msgs
 )
 
-ament_export_dependencies(bosdyn_api_msgs)
+ament_export_dependencies(
+  bosdyn_api_msgs
+  bosdyn_cmake_module
+  bosdyn
+)
 
-ament_package(CONFIG_EXTRAS bosdyn_spot_cam_api_msgs-extras.cmake)
+ament_package()
diff --git a/bosdyn_spot_cam_api_msgs/bosdyn_spot_cam_api_msgs-extras.cmake b/bosdyn_spot_cam_api_msgs/bosdyn_spot_cam_api_msgs-extras.cmake
deleted file mode 100644
index 031aa52e..00000000
--- a/bosdyn_spot_cam_api_msgs/bosdyn_spot_cam_api_msgs-extras.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (c) 2024 Boston Dynamics AI Institute LLC. All rights reserved.
-
-find_package(bosdyn REQUIRED PATHS /opt/spot-cpp-sdk)
diff --git a/bosdyn_spot_cam_api_msgs/package.xml b/bosdyn_spot_cam_api_msgs/package.xml
index 3b1968e2..3aaa6ebf 100644
--- a/bosdyn_spot_cam_api_msgs/package.xml
+++ b/bosdyn_spot_cam_api_msgs/package.xml
@@ -9,9 +9,10 @@
 
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>ament_cmake_python</buildtool_depend>
-  <buildtool_depend>bosdyn_cmake_module</buildtool_depend>
   <buildtool_depend>rosidl_default_generators</buildtool_depend>
 
+  <depend>bosdyn_cmake_module</depend>
+
   <depend>bosdyn-spot-cpp</depend>
   <depend>bosdyn_api_msgs</depend>
   <depend>proto2ros</depend>