diff --git a/CMakeLists.txt b/CMakeLists.txt
index c84b79c..21c992a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,6 @@ find_package(rclcpp REQUIRED)
 find_package(image_transport REQUIRED)
 find_package(cv_bridge REQUIRED)
 find_package(std_msgs REQUIRED)
-find_package(cv_bridge REQUIRED)
 find_package(camera_info_manager REQUIRED)
 # find_package(roslint REQUIRED)
 find_package(builtin_interfaces REQUIRED)
@@ -50,23 +49,23 @@ target_link_libraries(cv_camera_node ${Boost_LIBRARIES} cv_camera)
 
 ## Specify libraries to link a library or executable target against
 ament_target_dependencies(cv_camera
-        "rclcpp"
-        "sensor_msgs"
-        "image_transport"
-        "cv_bridge"
-        "camera_info_manager"
-        "std_msgs"
-        "OpenCV"
+        rclcpp
+        sensor_msgs
+        image_transport
+        cv_bridge
+        camera_info_manager
+        std_msgs
+        OpenCV
 )
 
 ament_target_dependencies(cv_camera_node
-        "rclcpp"
-        "sensor_msgs"
-        "std_msgs"
-        "OpenCV"
-        "camera_info_manager"
-        "image_transport"
-        "cv_bridge"
+        rclcpp
+        sensor_msgs
+        std_msgs
+        OpenCV
+        camera_info_manager
+        image_transport
+        cv_bridge
 )
 
 #############
diff --git a/include/cv_camera/capture.h b/include/cv_camera/capture.h
index 9488a38..f5c34bf 100644
--- a/include/cv_camera/capture.h
+++ b/include/cv_camera/capture.h
@@ -7,12 +7,27 @@
 #include <string>
 
 #include <rclcpp/rclcpp.hpp>
-#include <cv_bridge/cv_bridge.h>
-#include <image_transport/image_transport.h>
 #include <sensor_msgs/msg/camera_info.hpp>
 #include <sensor_msgs/image_encodings.hpp>
 #include <opencv2/highgui/highgui.hpp>
+
+#if __has_include(<cv_bridge/cv_bridge.hpp>)
+#include <cv_bridge/cv_bridge.hpp>
+#else
+#include <cv_bridge/cv_bridge.h>
+#endif
+
+#if __has_include(<image_transport/image_transport.hpp>)
+#include <image_transport/image_transport.hpp>
+#else
+#include <image_transport/image_transport.h>
+#endif
+
+#if __has_include(<camera_info_manager/camera_info_manager.hpp>)
+#include <camera_info_manager/camera_info_manager.hpp>
+#else
 #include <camera_info_manager/camera_info_manager.h>
+#endif
 
 /**
  * @brief namespace of this package