diff --git a/.gitignore b/.gitignore
index 86b18f5..9bfdd4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .cproject
 .project
+COLCON_IGNORE
\ No newline at end of file
diff --git a/include/web_video_server/web_video_server.h b/include/web_video_server/web_video_server.h
index 07d6e54..07c26f3 100644
--- a/include/web_video_server/web_video_server.h
+++ b/include/web_video_server/web_video_server.h
@@ -2,7 +2,13 @@
 #define WEB_VIDEO_SERVER_H_
 
 #include <rclcpp/rclcpp.hpp>
-#include <cv_bridge/cv_bridge.hpp>
+
+#if __has_include(<cv_bridge/cv_bridge.hpp>)
+#include <cv_bridge/cv_bridge.hpp>  // For ROS Iron and up.
+#else
+#include <cv_bridge/cv_bridge.h>  // For ROS Humble and below
+#endif
+
 #include <vector>
 #include "web_video_server/image_streamer.h"
 #include "async_web_server_cpp/http_server.hpp"
diff --git a/src/image_streamer.cpp b/src/image_streamer.cpp
index 4427b25..6b5b393 100644
--- a/src/image_streamer.cpp
+++ b/src/image_streamer.cpp
@@ -1,5 +1,9 @@
 #include "web_video_server/image_streamer.h"
-#include <cv_bridge/cv_bridge.hpp>
+#if __has_include(<cv_bridge/cv_bridge.hpp>)
+#include <cv_bridge/cv_bridge.hpp>  // For ROS Iron and up.
+#else
+#include <cv_bridge/cv_bridge.h>  // For ROS Humble and below
+#endif
 #include <iostream>
 
 namespace web_video_server