diff --git a/data/skeletons/location.cc b/data/skeletons/location.cc
index 8a330b92d..78af3698d 100644
--- a/data/skeletons/location.cc
+++ b/data/skeletons/location.cc
@@ -113,7 +113,7 @@ m4_define([b4_location_define],
     /// Compute max (min, lhs+rhs).
     static int add_ (int lhs, int rhs, int min)
     {
-      return std::max (min, lhs + rhs);
+      return lhs + rhs < min ? min : lhs + rhs;
     }
   };
 
@@ -345,7 +345,6 @@ m4_ifdef([b4_location_file], [[
 
 ]b4_cpp_guard_open([b4_location_path])[
 
-# include <algorithm> // std::max
 # include <iostream>
 # include <string>