diff --git a/.clang-format b/.clang-format
index 13c9899c6..8538f3dfe 100644
--- a/.clang-format
+++ b/.clang-format
@@ -105,9 +105,11 @@ ForEachMacros: ['c_list_for_each',
                 'nm_ip_config_iter_ip_route_for_each',
                 'nm_json_array_foreach',
                 'nm_json_object_foreach',
+                'nm_l3_config_data_iter_ip_address_for_each',
                 'nm_l3_config_data_iter_ip4_address_for_each',
-                'nm_l3_config_data_iter_ip4_route_for_each',
                 'nm_l3_config_data_iter_ip6_address_for_each',
+                'nm_l3_config_data_iter_ip_route_for_each',
+                'nm_l3_config_data_iter_ip4_route_for_each',
                 'nm_l3_config_data_iter_ip6_route_for_each',
                 'nm_l3_config_data_iter_obj_for_each',
                 'nm_manager_for_each_active_connection',
diff --git a/src/core/nm-l3-config-data.h b/src/core/nm-l3-config-data.h
index a5116a4a5..c8a47064f 100644
--- a/src/core/nm-l3-config-data.h
+++ b/src/core/nm-l3-config-data.h
@@ -252,6 +252,11 @@ nm_l3_config_data_lookup_routes(const NML3ConfigData *self, int addr_family)
     for (nm_dedup_multi_iter_init((iter), nm_l3_config_data_lookup_objs((self), (type))); \
          nm_platform_dedup_multi_iter_next_obj((iter), (obj), (type));)
 
+#define nm_l3_config_data_iter_ip_address_for_each(iter, self, addr_family, address)          \
+    for (nm_dedup_multi_iter_init((iter),                                                     \
+                                  nm_l3_config_data_lookup_addresses((self), (addr_family))); \
+         nm_platform_dedup_multi_iter_next_ip_address((iter), (address));)
+
 #define nm_l3_config_data_iter_ip4_address_for_each(iter, self, address)                        \
     for (nm_dedup_multi_iter_init((iter), nm_l3_config_data_lookup_addresses((self), AF_INET)); \
          nm_platform_dedup_multi_iter_next_ip4_address((iter), (address));)
@@ -260,6 +265,10 @@ nm_l3_config_data_lookup_routes(const NML3ConfigData *self, int addr_family)
     for (nm_dedup_multi_iter_init((iter), nm_l3_config_data_lookup_addresses((self), AF_INET6)); \
          nm_platform_dedup_multi_iter_next_ip6_address((iter), (address));)
 
+#define nm_l3_config_data_iter_ip_route_for_each(iter, self, addr_family, route)                   \
+    for (nm_dedup_multi_iter_init((iter), nm_l3_config_data_lookup_routes((self), (addr_family))); \
+         nm_platform_dedup_multi_iter_next_ip_route((iter), (route));)
+
 #define nm_l3_config_data_iter_ip4_route_for_each(iter, self, route)                         \
     for (nm_dedup_multi_iter_init((iter), nm_l3_config_data_lookup_routes((self), AF_INET)); \
          nm_platform_dedup_multi_iter_next_ip4_route((iter), (route));)