diff --git a/src/ros_parsers/ros2_parser.cpp b/src/ros_parsers/ros2_parser.cpp
index 9236163c..043b6a96 100644
--- a/src/ros_parsers/ros2_parser.cpp
+++ b/src/ros_parsers/ros2_parser.cpp
@@ -8,8 +8,14 @@
 
 #include <rosidl_typesupport_cpp/identifier.hpp>
 #include <rosidl_typesupport_introspection_cpp/identifier.hpp>
-#include <PlotJuggler/fmt/core.h>
 
+#if __has_include(<PlotJuggler/fmt/core.h>)
+# include <PlotJuggler/fmt/core.h>
+#endif
+
+#if __has_include(<PlotJuggler/contrib/fmt/core.h>)
+# include <PlotJuggler/contrib/fmt/core.h>
+#endif
 
 bool TypeHasHeader(const rosidl_message_type_support_t* type_support)
 {
@@ -135,4 +141,4 @@ std::shared_ptr<PJ::MessageParser> CreateParserROS2(const PJ::ParserFactories& f
                                                     PJ::PlotDataMapRef& data)
 {
   return factories.at("ros2msg")->createParser(topic_name, type_name, CreateSchema(type_name), data);
-}
\ No newline at end of file
+}