diff --git a/nav2_bt_navigator/include/nav2_bt_navigator/bt_navigator.hpp b/nav2_bt_navigator/include/nav2_bt_navigator/bt_navigator.hpp
index 5c87558a2ed..9023f829af8 100644
--- a/nav2_bt_navigator/include/nav2_bt_navigator/bt_navigator.hpp
+++ b/nav2_bt_navigator/include/nav2_bt_navigator/bt_navigator.hpp
@@ -28,6 +28,7 @@
 #include "rclcpp_action/rclcpp_action.hpp"
 #include "tf2_ros/transform_listener.h"
 #include "tf2_ros/create_timer_ros.h"
+#include "tf2_ros/buffer.h"
 
 namespace nav2_bt_navigator
 {
diff --git a/tools/underlay.repos b/tools/underlay.repos
index 73d6b1f1e28..ffd885c0a30 100644
--- a/tools/underlay.repos
+++ b/tools/underlay.repos
@@ -9,7 +9,7 @@ repositories:
     version: ros2
   ros-simulation/gazebo_ros_pkgs:
     type: git
-    url: https://github.com/ros-simulation/gazebo_ros_pkgs.git
+    url: https://github.com/stevemacenski/gazebo_ros_pkgs.git
     version: ros2
   ros-perception/image_common:
     type: git