diff --git a/src/DynamicModel.cc b/src/DynamicModel.cc
index 398c22e76952755957694c033ab0ce5ea1613e72..8063761df8a24e0f20aab2141b30f87bb7782723 100644
--- a/src/DynamicModel.cc
+++ b/src/DynamicModel.cc
@@ -1762,7 +1762,7 @@ DynamicModel::getUndiffLHSForPac(const string& aux_model_name,
 
   for (auto eqn : nontrend_eqnums)
     {
-      auto i = distance(eqnumber.begin(), ranges::find(eqnumber, eqn));
+      auto i = ranges::distance(eqnumber.begin(), ranges::find(eqnumber, eqn));
 
       if (eqnumber[i] != eqn)
         {
@@ -4365,7 +4365,7 @@ DynamicModel::OccbinRegimeTracker::addRegime(const vector<string>& constraints_b
   vector<bool> new_regime_template(constraints.size(), false);
   for (const auto& c : constraints_bind)
     {
-      int i = distance(constraints.begin(), ranges::find(constraints, c));
+      int i = ranges::distance(constraints.begin(), ranges::find(constraints, c));
       new_regime_template[i] = true;
     }
   set<vector<bool>> new_regimes {new_regime_template};
@@ -4375,7 +4375,7 @@ DynamicModel::OccbinRegimeTracker::addRegime(const vector<string>& constraints_b
                          back_inserter(constraints_not_mentioned));
   for (const auto& c : constraints_not_mentioned)
     {
-      int i = distance(constraints.begin(), ranges::find(constraints, c));
+      int i = ranges::distance(constraints.begin(), ranges::find(constraints, c));
       auto new_regimes_copy = new_regimes;
       for (const auto& r : new_regimes_copy)
         {
diff --git a/src/ExprNode.cc b/src/ExprNode.cc
index 6dc9587bc53dfd233375fd70ec7f235ca7ef7cf9..7842a15a4cda73816df9e8daa4b2a7013747e651 100644
--- a/src/ExprNode.cc
+++ b/src/ExprNode.cc
@@ -429,7 +429,7 @@ ExprNode::fillErrorCorrectionRow(int eqn, const vector<int>& nontarget_lhs,
                 exit(EXIT_FAILURE);
               }
             int colidx = static_cast<int>(
-                distance(nontarget_lhs.begin(), ranges::find(nontarget_lhs, orig_vid)));
+                ranges::distance(nontarget_lhs.begin(), ranges::find(nontarget_lhs, orig_vid)));
             if (A0.contains({eqn, colidx}))
               {
                 cerr << "ExprNode::fillErrorCorrection: Error filling A0 matrix: "
@@ -442,7 +442,7 @@ ExprNode::fillErrorCorrectionRow(int eqn, const vector<int>& nontarget_lhs,
           {
             // This is a target, so fill A0star
             int colidx = static_cast<int>(
-                distance(target_lhs.begin(), ranges::find(target_lhs, orig_vid)));
+                ranges::distance(target_lhs.begin(), ranges::find(target_lhs, orig_vid)));
             expr_t e = datatree.AddTimes(datatree.AddVariable(speed_of_adjustment_param),
                                          datatree.AddPossiblyNegativeConstant(-constant));
             if (param_id)
diff --git a/src/SubModel.cc b/src/SubModel.cc
index d26d733132abc031a883246d7da9b9f831276ea9..b10ac66ab65b1d58141e4cc6eefc6c496c475de7 100644
--- a/src/SubModel.cc
+++ b/src/SubModel.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2018-2024 Dynare Team
+ * Copyright © 2018-2025 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -70,12 +70,12 @@ TrendComponentModelTable::setVals(map<string, vector<int>> eqnums_arg,
       vector<int> eqnumsv = getEqNums(name);
       for (int nontrend_it : getNonTargetEqNums(name))
         nontarget_lhs_vec.push_back(
-            lhsv.at(distance(eqnumsv.begin(), ranges::find(eqnumsv, nontrend_it))));
+            lhsv.at(ranges::distance(eqnumsv.begin(), ranges::find(eqnumsv, nontrend_it))));
       nontarget_lhs[name] = nontarget_lhs_vec;
 
       for (int trend_it : getTargetEqNums(name))
         target_lhs_vec.push_back(
-            lhsv.at(distance(eqnumsv.begin(), ranges::find(eqnumsv, trend_it))));
+            lhsv.at(ranges::distance(eqnumsv.begin(), ranges::find(eqnumsv, trend_it))));
       target_lhs[name] = target_lhs_vec;
     }
 }
@@ -320,7 +320,7 @@ TrendComponentModelTable::writeOutput(const string& basename, ostream& output) c
       vector<string> eqtags_vec = eqtags.at(name);
       output << "M_.trend_component." << name << ".target_eqn = [";
       for (const auto& it : target_eqtags_vec)
-        output << distance(eqtags_vec.begin(), ranges::find(eqtags_vec, it)) + 1 << " ";
+        output << ranges::distance(eqtags_vec.begin(), ranges::find(eqtags_vec, it)) + 1 << " ";
       output << "];" << endl;
 
       vector<int> target_lhs_vec = getTargetLhs(name);
@@ -333,8 +333,8 @@ TrendComponentModelTable::writeOutput(const string& basename, ostream& output) c
       for (const auto& [key, expr] : AR.at(name))
         {
           auto [eqn, lag, lhs_symb_id] = key;
-          int colidx = static_cast<int>(
-              distance(nontarget_lhs_vec.begin(), ranges::find(nontarget_lhs_vec, lhs_symb_id)));
+          int colidx = static_cast<int>(ranges::distance(
+              nontarget_lhs_vec.begin(), ranges::find(nontarget_lhs_vec, lhs_symb_id)));
           ar_ec_output << "    AR(" << eqn + 1 << ", " << colidx + 1 << ", " << lag << ") = ";
           expr->writeOutput(ar_ec_output, ExprNodeOutputType::matlabDynamicModel);
           ar_ec_output << ";" << endl;
@@ -483,7 +483,8 @@ VarModelTable::writeOutput(const string& basename, ostream& output) const
       for (const auto& [key, expr] : AR.at(name))
         {
           auto [eqn, lag, lhs_symb_id] = key;
-          int colidx = static_cast<int>(distance(lhs.begin(), ranges::find(lhs, lhs_symb_id)));
+          int colidx
+              = static_cast<int>(ranges::distance(lhs.begin(), ranges::find(lhs, lhs_symb_id)));
           ar_output << "    ar(" << eqn + 1 << "," << colidx + 1 << "," << lag << ") = ";
           expr->writeOutput(ar_output, ExprNodeOutputType::matlabDynamicModel);
           ar_output << ";" << endl;
@@ -492,7 +493,8 @@ VarModelTable::writeOutput(const string& basename, ostream& output) const
       for (const auto& [key, expr] : A0.at(name))
         {
           auto [eqn, lhs_symb_id] = key;
-          int colidx = static_cast<int>(distance(lhs.begin(), ranges::find(lhs, lhs_symb_id)));
+          int colidx
+              = static_cast<int>(ranges::distance(lhs.begin(), ranges::find(lhs, lhs_symb_id)));
           if (eqn != colidx)
             {
               ar_output << "        a0(" << eqn + 1 << "," << colidx + 1 << ") = ";