diff --git a/MavLinkCom/common_utils/Utils.hpp b/MavLinkCom/common_utils/Utils.hpp
index b21d5c0b35..36aaff4567 100644
--- a/MavLinkCom/common_utils/Utils.hpp
+++ b/MavLinkCom/common_utils/Utils.hpp
@@ -153,8 +153,8 @@ class Utils
     static T limitAbsValue(T val, T min_value, T max_value)
     {
         T val_abs = std::abs(val);
-        T val_limited = std::max(val_abs, min_value);
-        val_limited = std::min(val_limited, max_value);
+        T val_limited = (std::max)(val_abs, min_value);
+        val_limited = (std::min)(val_limited, max_value);
         return sign(val) * val_limited;
     }
 
@@ -162,7 +162,7 @@ class Utils
     template <typename T>
     static T clip(T val, T min_value, T max_value)
     {
-        return std::max(min_value, std::min(val, max_value));
+        return (std::max)(min_value, (std::min)(val, max_value));
     }
 
     template <typename Range>