diff --git a/.clang-format b/.clang-format
index 55978c495d1..db81deec004 100644
--- a/.clang-format
+++ b/.clang-format
@@ -258,7 +258,6 @@ ForEachMacros:
   - SEQ_ALL_BEGIN
   - SEQ_ITERATOR_FOREACH
   - SURFACE_QUAD_ITER_BEGIN
-  - foreach
   - ED_screen_areas_iter
   - SLOT_PROBING_BEGIN
   - SET_SLOT_PROBING_BEGIN
diff --git a/intern/cycles/scene/volume.cpp b/intern/cycles/scene/volume.cpp
index 71d8f0504b3..1c735c15265 100644
--- a/intern/cycles/scene/volume.cpp
+++ b/intern/cycles/scene/volume.cpp
@@ -606,7 +606,7 @@ static void merge_scalar_grids_for_velocity(const Scene *scene, Volume *volume)
   vecgrid->tree().topologyUnion(vel_z_grid->tree());
 
   MergeScalarGrids op(&vel_x_grid->tree(), &vel_y_grid->tree(), &vel_z_grid->tree());
-  openvdb::tools::foreach (vecgrid->beginValueOn(), op, true, false);
+  openvdb::tools::foreach(vecgrid->beginValueOn(), op, true, false);
 
   /* Assume all grids have the same transformation. */
   const openvdb::math::Transform::Ptr transform = openvdb::ConstPtrCast<openvdb::math::Transform>(
diff --git a/source/blender/geometry/intern/mesh_to_volume.cc b/source/blender/geometry/intern/mesh_to_volume.cc
index a339a520c05..34e143114e4 100644
--- a/source/blender/geometry/intern/mesh_to_volume.cc
+++ b/source/blender/geometry/intern/mesh_to_volume.cc
@@ -140,10 +140,10 @@ static openvdb::FloatGrid::Ptr mesh_to_density_grid_impl(
   openvdb::tools::sdfToFogVolume(*new_grid);
 
   if (density != 1.0f) {
-    openvdb::tools::foreach (new_grid->beginValueOn(),
-                             [&](const openvdb::FloatGrid::ValueOnIter &iter) {
-                               iter.modifyValue([&](float &value) { value *= density; });
-                             });
+    openvdb::tools::foreach(new_grid->beginValueOn(),
+                            [&](const openvdb::FloatGrid::ValueOnIter &iter) {
+                              iter.modifyValue([&](float &value) { value *= density; });
+                            });
   }
   return new_grid;
 }
diff --git a/source/blender/geometry/intern/points_to_volume.cc b/source/blender/geometry/intern/points_to_volume.cc
index 75df3392064..326bdfce334 100644
--- a/source/blender/geometry/intern/points_to_volume.cc
+++ b/source/blender/geometry/intern/points_to_volume.cc
@@ -101,10 +101,10 @@ bke::VolumeGridData *fog_volume_grid_add_from_points(Volume *volume,
   openvdb::tools::sdfToFogVolume(*new_grid);
 
   /* Take the desired density into account. */
-  openvdb::tools::foreach (new_grid->beginValueOn(),
-                           [&](const openvdb::FloatGrid::ValueOnIter &iter) {
-                             iter.modifyValue([&](float &value) { value *= density; });
-                           });
+  openvdb::tools::foreach(new_grid->beginValueOn(),
+                          [&](const openvdb::FloatGrid::ValueOnIter &iter) {
+                            iter.modifyValue([&](float &value) { value *= density; });
+                          });
 
   return BKE_volume_grid_add_vdb(*volume, name, std::move(new_grid));
 }
diff --git a/source/blender/modifiers/intern/MOD_volume_displace.cc b/source/blender/modifiers/intern/MOD_volume_displace.cc
index 518f9a2a6e8..f2abdc964ca 100644
--- a/source/blender/modifiers/intern/MOD_volume_displace.cc
+++ b/source/blender/modifiers/intern/MOD_volume_displace.cc
@@ -224,11 +224,11 @@ struct DisplaceGridOp {
 
     /* Run the operator. This is multi-threaded. It is important that the operator is not shared
      * between the threads, because it contains a non-thread-safe accessor for the old grid. */
-    openvdb::tools::foreach (temp_grid->beginValueOn(),
-                             displace_op,
-                             true,
-                             /* Disable sharing of the operator. */
-                             false);
+    openvdb::tools::foreach(temp_grid->beginValueOn(),
+                            displace_op,
+                            true,
+                            /* Disable sharing of the operator. */
+                            false);
 
     /* It is likely that we produced too many active cells. Those are removed here, to avoid
      * slowing down subsequent operations. */