#include "mlx5_autoconf.h"
 #include "mlx5_mr.h"
 #include "mlx5_flow.h"
+#include "mlx5_flow_os.h"
 #include "rte_pmd_mlx5.h"
 
 /* Device parameter to enable RX completion queue compression. */
                        for (j = 0; j < MLX5_COUNTERS_PER_POOL; ++j)
                                if (pool->actions[j].dr_action)
                                        claim_zero
-                                               (mlx5_glue->destroy_flow_action
-                                                 (pool->actions[j].dr_action));
+                                           (mlx5_flow_os_destroy_flow_action
+                                             (pool->actions[j].dr_action));
                        mlx5_free(pool);
                }
                mlx5_free(sh->aso_age_mng->pools);
 
                                if (cnt->action)
                                        claim_zero
-                                        (mlx5_glue->destroy_flow_action
+                                        (mlx5_flow_os_destroy_flow_action
                                          (cnt->action));
                                if (fallback && MLX5_POOL_GET_CNT
                                    (pool, j)->dcs_when_free)
 
        struct mlx5_priv *priv = dev->data->dev_private;
 
        if (cache_resource->verbs_action)
-               claim_zero(mlx5_glue->destroy_flow_action
+               claim_zero(mlx5_flow_os_destroy_flow_action
                                (cache_resource->verbs_action));
        if (cache_resource->ft_type == MLX5DV_FLOW_TABLE_TYPE_FDB) {
                if (cache_resource->default_miss)
-                       claim_zero(mlx5_glue->destroy_flow_action
+                       claim_zero(mlx5_flow_os_destroy_flow_action
                          (cache_resource->default_miss));
        }
        if (cache_resource->normal_path_tbl)
 
        MLX5_ASSERT(cache_resource->action);
        if (cache_resource->action)
-               claim_zero(mlx5_glue->destroy_flow_action
+               claim_zero(mlx5_flow_os_destroy_flow_action
                                        (cache_resource->action));
        for (; i < cache_resource->num_of_dest; i++)
                flow_dv_sample_sub_actions_release(dev,