diff --git a/.github/workflows/industrial_ci_action.yaml b/.github/workflows/industrial_ci_action.yaml
index 64a86c52..d37722ca 100644
--- a/.github/workflows/industrial_ci_action.yaml
+++ b/.github/workflows/industrial_ci_action.yaml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         env:
-          - {ROS_DISTRO: humble, ROS_REPO: main}
+          - {ROS_DISTRO: iron, ROS_REPO: main}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
diff --git a/robot_calibration/include/robot_calibration/finders/checkerboard_finder.hpp b/robot_calibration/include/robot_calibration/finders/checkerboard_finder.hpp
index fd63413b..884decce 100644
--- a/robot_calibration/include/robot_calibration/finders/checkerboard_finder.hpp
+++ b/robot_calibration/include/robot_calibration/finders/checkerboard_finder.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 Michael Ferguson
+ * Copyright (C) 2018-2024 Michael Ferguson
  * Copyright (C) 2015 Fetch Robotics Inc.
  * Copyright (C) 2013-2014 Unbounded Robotics Inc.
  *
@@ -27,7 +27,7 @@
 #include <robot_calibration_msgs/msg/calibration_data.hpp>
 
 #include <opencv2/calib3d/calib3d.hpp>
-#include <cv_bridge/cv_bridge.h>
+#include <cv_bridge/cv_bridge.hpp>
 
 namespace robot_calibration
 {
diff --git a/robot_calibration/include/robot_calibration/finders/plane_finder.hpp b/robot_calibration/include/robot_calibration/finders/plane_finder.hpp
index ea275b15..f56dbfa4 100644
--- a/robot_calibration/include/robot_calibration/finders/plane_finder.hpp
+++ b/robot_calibration/include/robot_calibration/finders/plane_finder.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Michael Ferguson
+ * Copyright (C) 2022-2024 Michael Ferguson
  * Copyright (C) 2014-2017 Fetch Robotics Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-#ifndef ROBOT_CALIBRATION_CAPTURE_PLANE_FINDER_H
-#define ROBOT_CALIBRATION_CAPTURE_PLANE_FINDER_H
+#ifndef ROBOT_CALIBRATION_CAPTURE_PLANE_FINDER_HPP
+#define ROBOT_CALIBRATION_CAPTURE_PLANE_FINDER_HPP
 
 #include <rclcpp/rclcpp.hpp>
 #include <robot_calibration/finders/feature_finder.hpp>
 #include <robot_calibration/util/depth_camera_info.hpp>
 #include <robot_calibration/util/eigen_geometry.hpp>
 #include <robot_calibration_msgs/msg/calibration_data.hpp>
-#include <cv_bridge/cv_bridge.h>
+#include <cv_bridge/cv_bridge.hpp>
 
 namespace robot_calibration
 {
@@ -110,4 +110,4 @@ class PlaneFinder : public FeatureFinder
 
 }  // namespace robot_calibration
 
-#endif  // ROBOT_CALIBRATION_CAPTURE_PLANE_FINDER_H
+#endif  // ROBOT_CALIBRATION_CAPTURE_PLANE_FINDER_HPP