Minor fixes

Signed-off-by: Tony Najjar <[email protected]>

nav2_behavior_tree/CMakeLists.txt

@@ -176,6 +176,9 @@ list(APPEND plugin_libs nav2_navigate_through_poses_action_bt_node)
 add_library(nav2_remove_passed_goals_action_bt_node SHARED plugins/action/remove_passed_goals_action.cpp)
 list(APPEND plugin_libs nav2_remove_passed_goals_action_bt_node)
 
+add_library(nav2_remove_in_collision_goals_action_bt_node SHARED plugins/action/remove_in_collision_goals_action.cpp)
+list(APPEND plugin_libs nav2_remove_in_collision_goals_action_bt_node)
+
 add_library(nav2_get_pose_from_path_action_bt_node SHARED plugins/action/get_pose_from_path_action.cpp)
 list(APPEND plugin_libs nav2_get_pose_from_path_action_bt_node)
 

nav2_behavior_tree/include/nav2_behavior_tree/plugins/action/remove_in_collision_goals_action.hpp

@@ -61,8 +61,8 @@ class RemoveInCollisionGoals : public BT::ActionNodeBase
 
   rclcpp::Node::SharedPtr node_;
   rclcpp::Client<nav2_msgs::srv::GetCost>::SharedPtr get_cost_client_;
-  std::string costmap_cost_service_;
   bool initialized_;
+  std::string costmap_cost_service_;
   bool use_footprint_;
   double cost_threshold_;
   std::chrono::milliseconds server_timeout_;

nav2_behavior_tree/plugins/action/remove_in_collision_goals_action.cpp

@@ -92,7 +92,7 @@ inline BT::NodeStatus RemoveInCollisionGoals::tick()
 
 }   // namespace nav2_behavior_tree
 
-#include "behaviortree_cpp_v3/bt_factory.h"
+#include "behaviortree_cpp/bt_factory.h"
 BT_REGISTER_NODES(factory)
 {
   factory.registerNodeType<nav2_behavior_tree::RemoveInCollisionGoals>("RemoveInCollisionGoals");