diff --git a/rmw_connextdds_common/include/rmw_connextdds/dds_api_rtime.hpp b/rmw_connextdds_common/include/rmw_connextdds/dds_api_rtime.hpp
index bf89b236..d73b15af 100644
--- a/rmw_connextdds_common/include/rmw_connextdds/dds_api_rtime.hpp
+++ b/rmw_connextdds_common/include/rmw_connextdds/dds_api_rtime.hpp
@@ -15,7 +15,7 @@
 #ifndef RMW_CONNEXTDDS__DDS_API_RTIME_HPP_
 #define RMW_CONNEXTDDS__DDS_API_RTIME_HPP_
 
-#include "rti_me_c.h"  // NOLINT(build/include)
+#include "rti_me_c.h"  // NOLINT(build/include_subdir)
 #include "disc_dpde/disc_dpde_discovery_plugin.h"
 #include "wh_sm/wh_sm_history.h"
 #include "rh_sm/rh_sm_history.h"
diff --git a/rmw_connextdds_common/src/rtime/dds_api_rtime.cpp b/rmw_connextdds_common/src/rtime/dds_api_rtime.cpp
index bac3ab0d..729acd42 100644
--- a/rmw_connextdds_common/src/rtime/dds_api_rtime.cpp
+++ b/rmw_connextdds_common/src/rtime/dds_api_rtime.cpp
@@ -923,7 +923,7 @@ rmw_connextdds_get_qos_policies(
   size_t max_samples = RMW_CONNEXT_LIMIT_SAMPLES_MAX;
 
   if (DDS_LENGTH_UNLIMITED != history->depth &&
-    (size_t)history->depth > max_samples)
+    static_cast<size_t>(history->depth) > max_samples)
   {
     max_samples = history->depth;
   }