[v3,4/4] event/cnxk: restructure for cn10k datapath

diff --git a/drivers/crypto/cnxk/cn10k_cryptodev_event_dp.h b/drivers/crypto/cnxk/cn10k_cryptodev_event_dp.h
new file mode 100644
index 0000000000..a4be9f2890
--- /dev/null
+++ b/drivers/crypto/cnxk/cn10k_cryptodev_event_dp.h
@@ -0,0 +1,13 @@ 
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2022 Marvell.
+ */
+
+#ifndef _CN10K_CRYPTODEV_EVENT_DP_H_
+#define _CN10K_CRYPTODEV_EVENT_DP_H_
+
+__rte_internal
+uintptr_t cn10k_cpt_crypto_adapter_dequeue(uintptr_t get_work1);
+__rte_internal
+uintptr_t cn10k_cpt_crypto_adapter_vector_dequeue(uintptr_t get_work1);
+
+#endif /* _CN10K_CRYPTODEV_EVENT_DP_H_ */
diff --git a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c
index ef0a4ea05a..06b42c215d 100644
--- a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c
+++ b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c
@@ -18,6 +18,8 @@ 

 #include "cn10k_cryptodev.h"
 #include "cn10k_cryptodev_ops.h"
+#include "cn10k_cryptodev_event_dp.h"
+#include "cn10k_eventdev.h"
 #include "cn10k_ipsec.h"
 #include "cn10k_ipsec_la_ops.h"
 #include "cnxk_ae.h"
diff --git a/drivers/crypto/cnxk/cn10k_cryptodev_ops.h b/drivers/crypto/cnxk/cn10k_cryptodev_ops.h
index 43a1314138..befbfcdfad 100644
--- a/drivers/crypto/cnxk/cn10k_cryptodev_ops.h
+++ b/drivers/crypto/cnxk/cn10k_cryptodev_ops.h
@@ -22,9 +22,5 @@  uint16_t __rte_hot cn10k_cpt_sg_ver1_crypto_adapter_enqueue(void *ws, struct rte
 __rte_internal
 uint16_t __rte_hot cn10k_cpt_sg_ver2_crypto_adapter_enqueue(void *ws, struct rte_event ev[],
 		uint16_t nb_events);
-__rte_internal
-uintptr_t cn10k_cpt_crypto_adapter_dequeue(uintptr_t get_work1);
-__rte_internal
-uintptr_t cn10k_cpt_crypto_adapter_vector_dequeue(uintptr_t get_work1);

 #endif /* _CN10K_CRYPTODEV_OPS_H_ */
diff --git a/drivers/event/cnxk/cn10k_eventdev.c b/drivers/event/cnxk/cn10k_eventdev.c
index 30c922b5fc..2921d51a1a 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -2,7 +2,10 @@ 
  * Copyright(C) 2021 Marvell.
  */

+#include "cn10k_tx_worker.h"
 #include "cn10k_worker.h"
+#include "cn10k_ethdev.h"
+#include "cn10k_cryptodev_ops.h"
 #include "cnxk_eventdev.h"
 #include "cnxk_worker.h"

diff --git a/drivers/event/cnxk/cn10k_eventdev.h b/drivers/event/cnxk/cn10k_eventdev.h
new file mode 100644
index 0000000000..5fb6f0a6f2
--- /dev/null
+++ b/drivers/event/cnxk/cn10k_eventdev.h
@@ -0,0 +1,28 @@ 
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2022 Marvell.
+ */
+
+#ifndef __CN10K_EVENTDEV_H__
+#define __CN10K_EVENTDEV_H__
+
+struct cn10k_sso_hws {
+	uint64_t base;
+	uint64_t gw_rdata;
+	void *lookup_mem;
+	uint32_t gw_wdata;
+	uint8_t swtag_req;
+	uint8_t hws_id;
+	/* PTP timestamp */
+	struct cnxk_timesync_info **tstamp;
+	uint64_t meta_aura;
+	/* Add Work Fastpath data */
+	uint64_t xaq_lmt __rte_cache_aligned;
+	uint64_t *fc_mem;
+	uintptr_t grp_base;
+	/* Tx Fastpath data */
+	uintptr_t lmt_base __rte_cache_aligned;
+	uint64_t lso_tun_fmt;
+	uint8_t tx_adptr_data[];
+} __rte_cache_aligned;
+
+#endif /* __CN10K_EVENTDEV_H__ */
diff --git a/drivers/event/cnxk/cn10k_tx_worker.h b/drivers/event/cnxk/cn10k_tx_worker.h
new file mode 100644
index 0000000000..c18786a14c
--- /dev/null
+++ b/drivers/event/cnxk/cn10k_tx_worker.h
@@ -0,0 +1,254 @@ 
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2022 Marvell.
+ */
+
+#ifndef __CN10K_TX_WORKER_H__
+#define __CN10K_TX_WORKER_H__
+
+#include "cn10k_tx.h"
+#include "cn10k_eventdev.h"
+#include "cnxk_eventdev_dp.h"
+#include <rte_event_eth_tx_adapter.h>
+
+/* CN10K Tx event fastpath */
+
+static __rte_always_inline struct cn10k_eth_txq *
+cn10k_sso_hws_xtract_meta(struct rte_mbuf *m, const uint64_t *txq_data)
+{
+	return (struct cn10k_eth_txq
+			*)(txq_data[(txq_data[m->port] >> 48) +
+				    rte_event_eth_tx_adapter_txq_get(m)] &
+			   (BIT_ULL(48) - 1));
+}
+
+static __rte_always_inline void
+cn10k_sso_txq_fc_wait(const struct cn10k_eth_txq *txq)
+{
+	while ((uint64_t)txq->nb_sqb_bufs_adj <=
+	       __atomic_load_n(txq->fc_mem, __ATOMIC_RELAXED))
+		;
+}
+
+static __rte_always_inline int32_t
+cn10k_sso_sq_depth(const struct cn10k_eth_txq *txq)
+{
+	return (txq->nb_sqb_bufs_adj -
+		__atomic_load_n((int16_t *)txq->fc_mem, __ATOMIC_RELAXED))
+	       << txq->sqes_per_sqb_log2;
+}
+
+static __rte_always_inline uint16_t
+cn10k_sso_tx_one(struct cn10k_sso_hws *ws, struct rte_mbuf *m, uint64_t *cmd,
+		 uint16_t lmt_id, uintptr_t lmt_addr, uint8_t sched_type,
+		 const uint64_t *txq_data, const uint32_t flags)
+{
+	uint8_t lnum = 0, loff = 0, shft = 0;
+	uint16_t ref_cnt = m->refcnt;
+	struct cn10k_eth_txq *txq;
+	uintptr_t laddr;
+	uint16_t segdw;
+	uintptr_t pa;
+	bool sec;
+
+	txq = cn10k_sso_hws_xtract_meta(m, txq_data);
+	if (cn10k_sso_sq_depth(txq) <= 0)
+		return 0;
+
+	if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F && txq->tx_compl.ena)
+		handle_tx_completion_pkts(txq, 1, 1);
+
+	cn10k_nix_tx_skeleton(txq, cmd, flags, 0);
+	/* Perform header writes before barrier
+	 * for TSO
+	 */
+	if (flags & NIX_TX_OFFLOAD_TSO_F)
+		cn10k_nix_xmit_prepare_tso(m, flags);
+
+	cn10k_nix_xmit_prepare(txq, m, cmd, flags, txq->lso_tun_fmt, &sec,
+			       txq->mark_flag, txq->mark_fmt);
+
+	laddr = lmt_addr;
+	/* Prepare CPT instruction and get nixtx addr if
+	 * it is for CPT on same lmtline.
+	 */
+	if (flags & NIX_TX_OFFLOAD_SECURITY_F && sec)
+		cn10k_nix_prep_sec(m, cmd, &laddr, lmt_addr, &lnum, &loff,
+				   &shft, txq->sa_base, flags);
+
+	/* Move NIX desc to LMT/NIXTX area */
+	cn10k_nix_xmit_mv_lmt_base(laddr, cmd, flags);
+
+	if (flags & NIX_TX_MULTI_SEG_F)
+		segdw = cn10k_nix_prepare_mseg(txq, m, (uint64_t *)laddr, flags);
+	else
+		segdw = cn10k_nix_tx_ext_subs(flags) + 2;
+
+	cn10k_nix_xmit_prepare_tstamp(txq, laddr, m->ol_flags, segdw, flags);
+	if (flags & NIX_TX_OFFLOAD_SECURITY_F && sec)
+		pa = txq->cpt_io_addr | 3 << 4;
+	else
+		pa = txq->io_addr | ((segdw - 1) << 4);
+
+	if (!CNXK_TAG_IS_HEAD(ws->gw_rdata) && !sched_type)
+		ws->gw_rdata = roc_sso_hws_head_wait(ws->base);
+
+	cn10k_sso_txq_fc_wait(txq);
+	if (flags & NIX_TX_OFFLOAD_SECURITY_F && sec)
+		cn10k_nix_sec_fc_wait_one(txq);
+
+	roc_lmt_submit_steorl(lmt_id, pa);
+
+	if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) {
+		if (ref_cnt > 1)
+			rte_io_wmb();
+	}
+	return 1;
+}
+
+static __rte_always_inline uint16_t
+cn10k_sso_vwqe_split_tx(struct cn10k_sso_hws *ws, struct rte_mbuf **mbufs,
+			uint16_t nb_mbufs, uint64_t *cmd,
+			const uint64_t *txq_data, const uint32_t flags)
+{
+	uint16_t count = 0, port, queue, ret = 0, last_idx = 0;
+	struct cn10k_eth_txq *txq;
+	int32_t space;
+	int i;
+
+	port = mbufs[0]->port;
+	queue = rte_event_eth_tx_adapter_txq_get(mbufs[0]);
+	for (i = 0; i < nb_mbufs; i++) {
+		if (port != mbufs[i]->port ||
+		    queue != rte_event_eth_tx_adapter_txq_get(mbufs[i])) {
+			if (count) {
+				txq = (struct cn10k_eth_txq
+					       *)(txq_data[(txq_data[port] >>
+							    48) +
+							   queue] &
+						  (BIT_ULL(48) - 1));
+				/* Transmit based on queue depth */
+				space = cn10k_sso_sq_depth(txq);
+				if (space < count)
+					goto done;
+				cn10k_nix_xmit_pkts_vector(
+					txq, (uint64_t *)ws, &mbufs[last_idx],
+					count, cmd, flags | NIX_TX_VWQE_F);
+				ret += count;
+				count = 0;
+			}
+			port = mbufs[i]->port;
+			queue = rte_event_eth_tx_adapter_txq_get(mbufs[i]);
+			last_idx = i;
+		}
+		count++;
+	}
+	if (count) {
+		txq = (struct cn10k_eth_txq
+			       *)(txq_data[(txq_data[port] >> 48) + queue] &
+				  (BIT_ULL(48) - 1));
+		/* Transmit based on queue depth */
+		space = cn10k_sso_sq_depth(txq);
+		if (space < count)
+			goto done;
+		cn10k_nix_xmit_pkts_vector(txq, (uint64_t *)ws,
+					   &mbufs[last_idx], count, cmd,
+					   flags | NIX_TX_VWQE_F);
+		ret += count;
+	}
+done:
+	return ret;
+}
+
+static __rte_always_inline uint16_t
+cn10k_sso_hws_event_tx(struct cn10k_sso_hws *ws, struct rte_event *ev,
+		       uint64_t *cmd, const uint64_t *txq_data,
+		       const uint32_t flags)
+{
+	struct cn10k_eth_txq *txq;
+	struct rte_mbuf *m;
+	uintptr_t lmt_addr;
+	uint16_t lmt_id;
+
+	lmt_addr = ws->lmt_base;
+	ROC_LMT_BASE_ID_GET(lmt_addr, lmt_id);
+
+	if (ev->event_type & RTE_EVENT_TYPE_VECTOR) {
+		struct rte_mbuf **mbufs = ev->vec->mbufs;
+		uint64_t meta = *(uint64_t *)ev->vec;
+		uint16_t offset, nb_pkts, left;
+		int32_t space;
+
+		nb_pkts = meta & 0xFFFF;
+		offset = (meta >> 16) & 0xFFF;
+		if (meta & BIT(31)) {
+			txq = (struct cn10k_eth_txq
+				       *)(txq_data[(txq_data[meta >> 32] >>
+						    48) +
+						   (meta >> 48)] &
+					  (BIT_ULL(48) - 1));
+
+			/* Transmit based on queue depth */
+			space = cn10k_sso_sq_depth(txq);
+			if (space <= 0)
+				return 0;
+			nb_pkts = nb_pkts < space ? nb_pkts : (uint16_t)space;
+			cn10k_nix_xmit_pkts_vector(txq, (uint64_t *)ws,
+						   mbufs + offset, nb_pkts, cmd,
+						   flags | NIX_TX_VWQE_F);
+		} else {
+			nb_pkts = cn10k_sso_vwqe_split_tx(ws, mbufs + offset,
+							  nb_pkts, cmd,
+							  txq_data, flags);
+		}
+		left = (meta & 0xFFFF) - nb_pkts;
+
+		if (!left) {
+			rte_mempool_put(rte_mempool_from_obj(ev->vec), ev->vec);
+		} else {
+			*(uint64_t *)ev->vec =
+				(meta & ~0xFFFFFFFUL) |
+				(((uint32_t)nb_pkts + offset) << 16) | left;
+		}
+		rte_prefetch0(ws);
+		return !left;
+	}
+
+	m = ev->mbuf;
+	return cn10k_sso_tx_one(ws, m, cmd, lmt_id, lmt_addr, ev->sched_type,
+				txq_data, flags);
+}
+
+#define T(name, sz, flags)                                                     \
+	uint16_t __rte_hot cn10k_sso_hws_tx_adptr_enq_##name(                  \
+		void *port, struct rte_event ev[], uint16_t nb_events);        \
+	uint16_t __rte_hot cn10k_sso_hws_tx_adptr_enq_seg_##name(              \
+		void *port, struct rte_event ev[], uint16_t nb_events);
+
+NIX_TX_FASTPATH_MODES
+#undef T
+
+#define SSO_TX(fn, sz, flags)                                                  \
+	uint16_t __rte_hot fn(void *port, struct rte_event ev[],               \
+			      uint16_t nb_events)                              \
+	{                                                                      \
+		struct cn10k_sso_hws *ws = port;                               \
+		uint64_t cmd[sz];                                              \
+		RTE_SET_USED(nb_events);                                       \
+		return cn10k_sso_hws_event_tx(                                 \
+			ws, &ev[0], cmd, (const uint64_t *)ws->tx_adptr_data,  \
+			flags);                                                \
+	}
+
+#define SSO_TX_SEG(fn, sz, flags)                                              \
+	uint16_t __rte_hot fn(void *port, struct rte_event ev[],               \
+			      uint16_t nb_events)                              \
+	{                                                                      \
+		uint64_t cmd[(sz) + CNXK_NIX_TX_MSEG_SG_DWORDS - 2];           \
+		struct cn10k_sso_hws *ws = port;                               \
+		RTE_SET_USED(nb_events);                                       \
+		return cn10k_sso_hws_event_tx(                                 \
+			ws, &ev[0], cmd, (const uint64_t *)ws->tx_adptr_data,  \
+			(flags) | NIX_TX_MULTI_SEG_F);                         \
+	}
+
+#endif
diff --git a/drivers/event/cnxk/cn10k_worker.c b/drivers/event/cnxk/cn10k_worker.c
index 4581c41233..562d2fca13 100644
--- a/drivers/event/cnxk/cn10k_worker.c
+++ b/drivers/event/cnxk/cn10k_worker.c
@@ -6,6 +6,77 @@ 
 #include "cnxk_eventdev.h"
 #include "cnxk_worker.h"

+/* SSO Operations */
+
+static __rte_always_inline uint8_t
+cn10k_sso_hws_new_event(struct cn10k_sso_hws *ws, const struct rte_event *ev)
+{
+	const uint32_t tag = (uint32_t)ev->event;
+	const uint8_t new_tt = ev->sched_type;
+	const uint64_t event_ptr = ev->u64;
+	const uint16_t grp = ev->queue_id;
+
+	rte_atomic_thread_fence(__ATOMIC_ACQ_REL);
+	if (ws->xaq_lmt <= *ws->fc_mem)
+		return 0;
+
+	cnxk_sso_hws_add_work(event_ptr, tag, new_tt, ws->grp_base + (grp << 12));
+	return 1;
+}
+
+static __rte_always_inline void
+cn10k_sso_hws_fwd_swtag(struct cn10k_sso_hws *ws, const struct rte_event *ev)
+{
+	const uint32_t tag = (uint32_t)ev->event;
+	const uint8_t new_tt = ev->sched_type;
+	const uint8_t cur_tt = CNXK_TT_FROM_TAG(ws->gw_rdata);
+
+	/* CNXK model
+	 * cur_tt/new_tt     SSO_TT_ORDERED SSO_TT_ATOMIC SSO_TT_UNTAGGED
+	 *
+	 * SSO_TT_ORDERED        norm           norm             untag
+	 * SSO_TT_ATOMIC         norm           norm		   untag
+	 * SSO_TT_UNTAGGED       norm           norm             NOOP
+	 */
+
+	if (new_tt == SSO_TT_UNTAGGED) {
+		if (cur_tt != SSO_TT_UNTAGGED)
+			cnxk_sso_hws_swtag_untag(ws->base + SSOW_LF_GWS_OP_SWTAG_UNTAG);
+	} else {
+		cnxk_sso_hws_swtag_norm(tag, new_tt, ws->base + SSOW_LF_GWS_OP_SWTAG_NORM);
+	}
+	ws->swtag_req = 1;
+}
+
+static __rte_always_inline void
+cn10k_sso_hws_fwd_group(struct cn10k_sso_hws *ws, const struct rte_event *ev,
+			const uint16_t grp)
+{
+	const uint32_t tag = (uint32_t)ev->event;
+	const uint8_t new_tt = ev->sched_type;
+
+	plt_write64(ev->u64, ws->base + SSOW_LF_GWS_OP_UPD_WQP_GRP1);
+	cnxk_sso_hws_swtag_desched(tag, new_tt, grp, ws->base + SSOW_LF_GWS_OP_SWTAG_DESCHED);
+}
+
+static __rte_always_inline void
+cn10k_sso_hws_forward_event(struct cn10k_sso_hws *ws,
+			    const struct rte_event *ev)
+{
+	const uint8_t grp = ev->queue_id;
+
+	/* Group hasn't changed, Use SWTAG to forward the event */
+	if (CNXK_GRP_FROM_TAG(ws->gw_rdata) == grp)
+		cn10k_sso_hws_fwd_swtag(ws, ev);
+	else
+		/*
+		 * Group has been changed for group based work pipelining,
+		 * Use deschedule/add_work operation to transfer the event to
+		 * new group/core
+		 */
+		cn10k_sso_hws_fwd_group(ws, ev, grp);
+}
+
 uint16_t __rte_hot
 cn10k_sso_hws_enq(void *port, const struct rte_event *ev)
 {
diff --git a/drivers/event/cnxk/cn10k_worker.h b/drivers/event/cnxk/cn10k_worker.h
index 332a2e27c2..2bea1f6ca6 100644
--- a/drivers/event/cnxk/cn10k_worker.h
+++ b/drivers/event/cnxk/cn10k_worker.h
@@ -5,91 +5,13 @@ 
 #ifndef __CN10K_WORKER_H__
 #define __CN10K_WORKER_H__

-#include <rte_vect.h>
-
-#include "cn10k_cryptodev_ops.h"
-#include "cnxk_ethdev.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#include "cn10k_ethdev.h"
+#include <rte_eventdev.h>
+#include "cn10k_cryptodev_event_dp.h"
 #include "cn10k_rx.h"
-#include "cn10k_tx.h"
-
-/* SSO Operations */
-
-static __rte_always_inline uint8_t
-cn10k_sso_hws_new_event(struct cn10k_sso_hws *ws, const struct rte_event *ev)
-{
-	const uint32_t tag = (uint32_t)ev->event;
-	const uint8_t new_tt = ev->sched_type;
-	const uint64_t event_ptr = ev->u64;
-	const uint16_t grp = ev->queue_id;
-
-	rte_atomic_thread_fence(__ATOMIC_ACQ_REL);
-	if (ws->xaq_lmt <= *ws->fc_mem)
-		return 0;
-
-	cnxk_sso_hws_add_work(event_ptr, tag, new_tt,
-			      ws->grp_base + (grp << 12));
-	return 1;
-}
-
-static __rte_always_inline void
-cn10k_sso_hws_fwd_swtag(struct cn10k_sso_hws *ws, const struct rte_event *ev)
-{
-	const uint32_t tag = (uint32_t)ev->event;
-	const uint8_t new_tt = ev->sched_type;
-	const uint8_t cur_tt = CNXK_TT_FROM_TAG(ws->gw_rdata);
-
-	/* CNXK model
-	 * cur_tt/new_tt     SSO_TT_ORDERED SSO_TT_ATOMIC SSO_TT_UNTAGGED
-	 *
-	 * SSO_TT_ORDERED        norm           norm             untag
-	 * SSO_TT_ATOMIC         norm           norm		   untag
-	 * SSO_TT_UNTAGGED       norm           norm             NOOP
-	 */
-
-	if (new_tt == SSO_TT_UNTAGGED) {
-		if (cur_tt != SSO_TT_UNTAGGED)
-			cnxk_sso_hws_swtag_untag(ws->base +
-						 SSOW_LF_GWS_OP_SWTAG_UNTAG);
-	} else {
-		cnxk_sso_hws_swtag_norm(tag, new_tt,
-					ws->base + SSOW_LF_GWS_OP_SWTAG_NORM);
-	}
-	ws->swtag_req = 1;
-}
-
-static __rte_always_inline void
-cn10k_sso_hws_fwd_group(struct cn10k_sso_hws *ws, const struct rte_event *ev,
-			const uint16_t grp)
-{
-	const uint32_t tag = (uint32_t)ev->event;
-	const uint8_t new_tt = ev->sched_type;
-
-	plt_write64(ev->u64, ws->base + SSOW_LF_GWS_OP_UPD_WQP_GRP1);
-	cnxk_sso_hws_swtag_desched(tag, new_tt, grp,
-				   ws->base + SSOW_LF_GWS_OP_SWTAG_DESCHED);
-}
+#include "cnxk_worker.h"
+#include "cn10k_eventdev.h"

-static __rte_always_inline void
-cn10k_sso_hws_forward_event(struct cn10k_sso_hws *ws,
-			    const struct rte_event *ev)
-{
-	const uint8_t grp = ev->queue_id;
-
-	/* Group hasn't changed, Use SWTAG to forward the event */
-	if (CNXK_GRP_FROM_TAG(ws->gw_rdata) == grp)
-		cn10k_sso_hws_fwd_swtag(ws, ev);
-	else
-		/*
-		 * Group has been changed for group based work pipelining,
-		 * Use deschedule/add_work operation to transfer the event to
-		 * new group/core
-		 */
-		cn10k_sso_hws_fwd_group(ws, ev, grp);
-}
+/* CN10K Rx event fastpath */

 static __rte_always_inline void
 cn10k_wqe_to_mbuf(uint64_t wqe, const uint64_t __mbuf, uint8_t port_id,
@@ -517,243 +439,4 @@  NIX_RX_FASTPATH_MODES
 		return fn(port, ev, timeout_ticks);                            \
 	}

-static __rte_always_inline struct cn10k_eth_txq *
-cn10k_sso_hws_xtract_meta(struct rte_mbuf *m, const uint64_t *txq_data)
-{
-	return (struct cn10k_eth_txq
-			*)(txq_data[(txq_data[m->port] >> 48) +
-				    rte_event_eth_tx_adapter_txq_get(m)] &
-			   (BIT_ULL(48) - 1));
-}
-
-static __rte_always_inline void
-cn10k_sso_txq_fc_wait(const struct cn10k_eth_txq *txq)
-{
-	while ((uint64_t)txq->nb_sqb_bufs_adj <=
-	       __atomic_load_n(txq->fc_mem, __ATOMIC_RELAXED))
-		;
-}
-
-static __rte_always_inline int32_t
-cn10k_sso_sq_depth(const struct cn10k_eth_txq *txq)
-{
-	return (txq->nb_sqb_bufs_adj -
-		__atomic_load_n((int16_t *)txq->fc_mem, __ATOMIC_RELAXED))
-	       << txq->sqes_per_sqb_log2;
-}
-
-static __rte_always_inline uint16_t
-cn10k_sso_tx_one(struct cn10k_sso_hws *ws, struct rte_mbuf *m, uint64_t *cmd,
-		 uint16_t lmt_id, uintptr_t lmt_addr, uint8_t sched_type,
-		 const uint64_t *txq_data, const uint32_t flags)
-{
-	uint8_t lnum = 0, loff = 0, shft = 0;
-	uint16_t ref_cnt = m->refcnt;
-	struct cn10k_eth_txq *txq;
-	uintptr_t laddr;
-	uint16_t segdw;
-	uintptr_t pa;
-	bool sec;
-
-	txq = cn10k_sso_hws_xtract_meta(m, txq_data);
-	if (cn10k_sso_sq_depth(txq) <= 0)
-		return 0;
-
-	if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F && txq->tx_compl.ena)
-		handle_tx_completion_pkts(txq, 1, 1);
-
-	cn10k_nix_tx_skeleton(txq, cmd, flags, 0);
-	/* Perform header writes before barrier
-	 * for TSO
-	 */
-	if (flags & NIX_TX_OFFLOAD_TSO_F)
-		cn10k_nix_xmit_prepare_tso(m, flags);
-
-	cn10k_nix_xmit_prepare(txq, m, cmd, flags, txq->lso_tun_fmt, &sec,
-			       txq->mark_flag, txq->mark_fmt);
-
-	laddr = lmt_addr;
-	/* Prepare CPT instruction and get nixtx addr if
-	 * it is for CPT on same lmtline.
-	 */
-	if (flags & NIX_TX_OFFLOAD_SECURITY_F && sec)
-		cn10k_nix_prep_sec(m, cmd, &laddr, lmt_addr, &lnum, &loff,
-				   &shft, txq->sa_base, flags);
-
-	/* Move NIX desc to LMT/NIXTX area */
-	cn10k_nix_xmit_mv_lmt_base(laddr, cmd, flags);
-
-	if (flags & NIX_TX_MULTI_SEG_F)
-		segdw = cn10k_nix_prepare_mseg(txq, m, (uint64_t *)laddr, flags);
-	else
-		segdw = cn10k_nix_tx_ext_subs(flags) + 2;
-
-	cn10k_nix_xmit_prepare_tstamp(txq, laddr, m->ol_flags, segdw, flags);
-	if (flags & NIX_TX_OFFLOAD_SECURITY_F && sec)
-		pa = txq->cpt_io_addr | 3 << 4;
-	else
-		pa = txq->io_addr | ((segdw - 1) << 4);
-
-	if (!CNXK_TAG_IS_HEAD(ws->gw_rdata) && !sched_type)
-		ws->gw_rdata = roc_sso_hws_head_wait(ws->base);
-
-	cn10k_sso_txq_fc_wait(txq);
-	if (flags & NIX_TX_OFFLOAD_SECURITY_F && sec)
-		cn10k_nix_sec_fc_wait_one(txq);
-
-	roc_lmt_submit_steorl(lmt_id, pa);
-
-	if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) {
-		if (ref_cnt > 1)
-			rte_io_wmb();
-	}
-	return 1;
-}
-
-static __rte_always_inline uint16_t
-cn10k_sso_vwqe_split_tx(struct cn10k_sso_hws *ws, struct rte_mbuf **mbufs,
-			uint16_t nb_mbufs, uint64_t *cmd,
-			const uint64_t *txq_data, const uint32_t flags)
-{
-	uint16_t count = 0, port, queue, ret = 0, last_idx = 0;
-	struct cn10k_eth_txq *txq;
-	int32_t space;
-	int i;
-
-	port = mbufs[0]->port;
-	queue = rte_event_eth_tx_adapter_txq_get(mbufs[0]);
-	for (i = 0; i < nb_mbufs; i++) {
-		if (port != mbufs[i]->port ||
-		    queue != rte_event_eth_tx_adapter_txq_get(mbufs[i])) {
-			if (count) {
-				txq = (struct cn10k_eth_txq
-					       *)(txq_data[(txq_data[port] >>
-							    48) +
-							   queue] &
-						  (BIT_ULL(48) - 1));
-				/* Transmit based on queue depth */
-				space = cn10k_sso_sq_depth(txq);
-				if (space < count)
-					goto done;
-				cn10k_nix_xmit_pkts_vector(
-					txq, (uint64_t *)ws, &mbufs[last_idx],
-					count, cmd, flags | NIX_TX_VWQE_F);
-				ret += count;
-				count = 0;
-			}
-			port = mbufs[i]->port;
-			queue = rte_event_eth_tx_adapter_txq_get(mbufs[i]);
-			last_idx = i;
-		}
-		count++;
-	}
-	if (count) {
-		txq = (struct cn10k_eth_txq
-			       *)(txq_data[(txq_data[port] >> 48) + queue] &
-				  (BIT_ULL(48) - 1));
-		/* Transmit based on queue depth */
-		space = cn10k_sso_sq_depth(txq);
-		if (space < count)
-			goto done;
-		cn10k_nix_xmit_pkts_vector(txq, (uint64_t *)ws,
-					   &mbufs[last_idx], count, cmd,
-					   flags | NIX_TX_VWQE_F);
-		ret += count;
-	}
-done:
-	return ret;
-}
-
-static __rte_always_inline uint16_t
-cn10k_sso_hws_event_tx(struct cn10k_sso_hws *ws, struct rte_event *ev,
-		       uint64_t *cmd, const uint64_t *txq_data,
-		       const uint32_t flags)
-{
-	struct cn10k_eth_txq *txq;
-	struct rte_mbuf *m;
-	uintptr_t lmt_addr;
-	uint16_t lmt_id;
-
-	lmt_addr = ws->lmt_base;
-	ROC_LMT_BASE_ID_GET(lmt_addr, lmt_id);
-
-	if (ev->event_type & RTE_EVENT_TYPE_VECTOR) {
-		struct rte_mbuf **mbufs = ev->vec->mbufs;
-		uint64_t meta = *(uint64_t *)ev->vec;
-		uint16_t offset, nb_pkts, left;
-		int32_t space;
-
-		nb_pkts = meta & 0xFFFF;
-		offset = (meta >> 16) & 0xFFF;
-		if (meta & BIT(31)) {
-			txq = (struct cn10k_eth_txq
-				       *)(txq_data[(txq_data[meta >> 32] >>
-						    48) +
-						   (meta >> 48)] &
-					  (BIT_ULL(48) - 1));
-
-			/* Transmit based on queue depth */
-			space = cn10k_sso_sq_depth(txq);
-			if (space <= 0)
-				return 0;
-			nb_pkts = nb_pkts < space ? nb_pkts : (uint16_t)space;
-			cn10k_nix_xmit_pkts_vector(txq, (uint64_t *)ws,
-						   mbufs + offset, nb_pkts, cmd,
-						   flags | NIX_TX_VWQE_F);
-		} else {
-			nb_pkts = cn10k_sso_vwqe_split_tx(ws, mbufs + offset,
-							  nb_pkts, cmd,
-							  txq_data, flags);
-		}
-		left = (meta & 0xFFFF) - nb_pkts;
-
-		if (!left) {
-			rte_mempool_put(rte_mempool_from_obj(ev->vec), ev->vec);
-		} else {
-			*(uint64_t *)ev->vec =
-				(meta & ~0xFFFFFFFUL) |
-				(((uint32_t)nb_pkts + offset) << 16) | left;
-		}
-		rte_prefetch0(ws);
-		return !left;
-	}
-
-	m = ev->mbuf;
-	return cn10k_sso_tx_one(ws, m, cmd, lmt_id, lmt_addr, ev->sched_type,
-				txq_data, flags);
-}
-
-#define T(name, sz, flags)                                                     \
-	uint16_t __rte_hot cn10k_sso_hws_tx_adptr_enq_##name(                  \
-		void *port, struct rte_event ev[], uint16_t nb_events);        \
-	uint16_t __rte_hot cn10k_sso_hws_tx_adptr_enq_seg_##name(              \
-		void *port, struct rte_event ev[], uint16_t nb_events);
-
-NIX_TX_FASTPATH_MODES
-#undef T
-
-#define SSO_TX(fn, sz, flags)                                                  \
-	uint16_t __rte_hot fn(void *port, struct rte_event ev[],               \
-			      uint16_t nb_events)                              \
-	{                                                                      \
-		struct cn10k_sso_hws *ws = port;                               \
-		uint64_t cmd[sz];                                              \
-		RTE_SET_USED(nb_events);                                       \
-		return cn10k_sso_hws_event_tx(                                 \
-			ws, &ev[0], cmd, (const uint64_t *)ws->tx_adptr_data,  \
-			flags);                                                \
-	}
-
-#define SSO_TX_SEG(fn, sz, flags)                                              \
-	uint16_t __rte_hot fn(void *port, struct rte_event ev[],               \
-			      uint16_t nb_events)                              \
-	{                                                                      \
-		uint64_t cmd[(sz) + CNXK_NIX_TX_MSEG_SG_DWORDS - 2];           \
-		struct cn10k_sso_hws *ws = port;                               \
-		RTE_SET_USED(nb_events);                                       \
-		return cn10k_sso_hws_event_tx(                                 \
-			ws, &ev[0], cmd, (const uint64_t *)ws->tx_adptr_data,  \
-			(flags) | NIX_TX_MULTI_SEG_F);                         \
-	}
-
 #endif
diff --git a/drivers/event/cnxk/cnxk_eventdev.c b/drivers/event/cnxk/cnxk_eventdev.c
index d7819a9298..11bcd792ba 100644
--- a/drivers/event/cnxk/cnxk_eventdev.c
+++ b/drivers/event/cnxk/cnxk_eventdev.c
@@ -5,6 +5,7 @@ 
 #include "roc_npa.h"

 #include "cnxk_eventdev.h"
+#include "cnxk_eventdev_dp.h"

 void
 cnxk_sso_info_get(struct cnxk_sso_evdev *dev,
diff --git a/drivers/event/cnxk/cnxk_eventdev.h b/drivers/event/cnxk/cnxk_eventdev.h
index a3b4fef9d0..d93fdcda25 100644
--- a/drivers/event/cnxk/cnxk_eventdev.h
+++ b/drivers/event/cnxk/cnxk_eventdev.h
@@ -19,7 +19,7 @@ 

 #include <eventdev_pmd_pci.h>

-#include "hw/sso.h"
+#include "cnxk_eventdev_dp.h"

 #include "roc_platform.h"
 #include "roc_sso.h"
@@ -36,28 +36,6 @@ 
 #define USEC2NSEC(__us)		((__us)*1E3)
 #define NSEC2TICK(__ns, __freq) (((__ns) * (__freq)) / 1E9)

-#define CNXK_SSO_MAX_HWGRP     (RTE_EVENT_MAX_QUEUES_PER_DEV + 1)
-#define CNXK_SSO_FC_NAME       "cnxk_evdev_xaq_fc"
-#define CNXK_SSO_MZ_NAME       "cnxk_evdev_mz"
-#define CNXK_SSO_XAQ_CACHE_CNT (0x7)
-#define CNXK_SSO_XAQ_SLACK     (8)
-#define CNXK_SSO_WQE_SG_PTR    (9)
-#define CNXK_SSO_WQE_LAYR_PTR  (5)
-#define CNXK_SSO_PRIORITY_CNT  (0x8)
-#define CNXK_SSO_WEIGHT_MAX    (0x3f)
-#define CNXK_SSO_WEIGHT_MIN    (0x3)
-#define CNXK_SSO_WEIGHT_CNT    (CNXK_SSO_WEIGHT_MAX - CNXK_SSO_WEIGHT_MIN + 1)
-#define CNXK_SSO_AFFINITY_CNT  (0x10)
-
-#define CNXK_TT_FROM_TAG(x)	    (((x) >> 32) & SSO_TT_EMPTY)
-#define CNXK_TT_FROM_EVENT(x)	    (((x) >> 38) & SSO_TT_EMPTY)
-#define CNXK_EVENT_TYPE_FROM_TAG(x) (((x) >> 28) & 0xf)
-#define CNXK_SUB_EVENT_FROM_TAG(x)  (((x) >> 20) & 0xff)
-#define CNXK_CLR_SUB_EVENT(x)	    (~(0xffull << 20) & x)
-#define CNXK_GRP_FROM_TAG(x)	    (((x) >> 36) & 0x3ff)
-#define CNXK_SWTAG_PEND(x)	    (BIT_ULL(62) & x)
-#define CNXK_TAG_IS_HEAD(x)	    (BIT_ULL(35) & x)
-
 #define CN9K_SSOW_GET_BASE_ADDR(_GW) ((_GW)-SSOW_LF_GWS_OP_GET_WORK0)

 #define CN10K_GW_MODE_NONE     0
@@ -136,26 +114,6 @@  struct cnxk_sso_evdev {
 	uint8_t is_ca_internal_port;
 } __rte_cache_aligned;

-struct cn10k_sso_hws {
-	uint64_t base;
-	uint64_t gw_rdata;
-	void *lookup_mem;
-	uint32_t gw_wdata;
-	uint8_t swtag_req;
-	uint8_t hws_id;
-	/* PTP timestamp */
-	struct cnxk_timesync_info **tstamp;
-	uint64_t meta_aura;
-	/* Add Work Fastpath data */
-	uint64_t xaq_lmt __rte_cache_aligned;
-	uint64_t *fc_mem;
-	uintptr_t grp_base;
-	/* Tx Fastpath data */
-	uintptr_t lmt_base __rte_cache_aligned;
-	uint64_t lso_tun_fmt;
-	uint8_t tx_adptr_data[];
-} __rte_cache_aligned;
-
 /* Event port a.k.a GWS */
 struct cn9k_sso_hws {
 	uint64_t base;
diff --git a/drivers/event/cnxk/cnxk_eventdev_dp.h b/drivers/event/cnxk/cnxk_eventdev_dp.h
new file mode 100644
index 0000000000..d011c8ca64
--- /dev/null
+++ b/drivers/event/cnxk/cnxk_eventdev_dp.h
@@ -0,0 +1,33 @@ 
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2022 Marvell.
+ */
+
+#ifndef __CNXK_EVENTDEV_DP_H__
+#define __CNXK_EVENTDEV_DP_H__
+
+#include "hw/sso.h"
+
+#define CNXK_SSO_MAX_HWGRP     (RTE_EVENT_MAX_QUEUES_PER_DEV + 1)
+#define CNXK_SSO_FC_NAME       "cnxk_evdev_xaq_fc"
+#define CNXK_SSO_MZ_NAME       "cnxk_evdev_mz"
+#define CNXK_SSO_XAQ_CACHE_CNT (0x7)
+#define CNXK_SSO_XAQ_SLACK     (8)
+#define CNXK_SSO_WQE_SG_PTR    (9)
+#define CNXK_SSO_WQE_LAYR_PTR  (5)
+#define CNXK_SSO_PRIORITY_CNT  (0x8)
+#define CNXK_SSO_WEIGHT_MAX    (0x3f)
+#define CNXK_SSO_WEIGHT_MIN    (0x3)
+#define CNXK_SSO_WEIGHT_CNT    (CNXK_SSO_WEIGHT_MAX - CNXK_SSO_WEIGHT_MIN + 1)
+#define CNXK_SSO_AFFINITY_CNT  (0x10)
+
+
+#define CNXK_TT_FROM_TAG(x)	    (((x) >> 32) & SSO_TT_EMPTY)
+#define CNXK_TT_FROM_EVENT(x)	    (((x) >> 38) & SSO_TT_EMPTY)
+#define CNXK_EVENT_TYPE_FROM_TAG(x) (((x) >> 28) & 0xf)
+#define CNXK_SUB_EVENT_FROM_TAG(x)  (((x) >> 20) & 0xff)
+#define CNXK_CLR_SUB_EVENT(x)	    (~(0xffull << 20) & x)
+#define CNXK_GRP_FROM_TAG(x)	    (((x) >> 36) & 0x3ff)
+#define CNXK_SWTAG_PEND(x)	    (BIT_ULL(62) & x)
+#define CNXK_TAG_IS_HEAD(x)	    (BIT_ULL(35) & x)
+
+#endif /* __CNXK_EVENTDEV_DP_H__ */
diff --git a/drivers/event/cnxk/cnxk_eventdev_selftest.c b/drivers/event/cnxk/cnxk_eventdev_selftest.c
index 3aa6f081a7..577c99bacb 100644
--- a/drivers/event/cnxk/cnxk_eventdev_selftest.c
+++ b/drivers/event/cnxk/cnxk_eventdev_selftest.c
@@ -19,6 +19,7 @@ 
 #include <rte_test.h>

 #include "cnxk_eventdev.h"
+#include "cnxk_eventdev_dp.h"

 #define NUM_PACKETS (1024)
 #define MAX_EVENTS  (1024)
diff --git a/drivers/event/cnxk/cnxk_eventdev_stats.c b/drivers/event/cnxk/cnxk_eventdev_stats.c
index 715ca9cd8f..a8a87a06e4 100644
--- a/drivers/event/cnxk/cnxk_eventdev_stats.c
+++ b/drivers/event/cnxk/cnxk_eventdev_stats.c
@@ -3,6 +3,7 @@ 
  */

 #include "cnxk_eventdev.h"
+#include "cnxk_eventdev_dp.h"

 struct cnxk_sso_xstats_name {
 	const char name[RTE_EVENT_DEV_XSTATS_NAME_SIZE];
diff --git a/drivers/event/cnxk/cnxk_worker.h b/drivers/event/cnxk/cnxk_worker.h
index 0756e223f7..22d90afba2 100644
--- a/drivers/event/cnxk/cnxk_worker.h
+++ b/drivers/event/cnxk/cnxk_worker.h
@@ -11,7 +11,8 @@ 
 #include "roc_io_generic.h"
 #endif

-#include "cnxk_eventdev.h"
+#include "cnxk_eventdev_dp.h"
+#include "hw/ssow.h"

 /* SSO Operations */

diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15.c b/drivers/event/cnxk/deq/cn10k/deq_0_15.c
index 4da801c9b2..b715c22b8f 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_0_15.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ(cn10k_sso_hws_deq_##name, flags)                                \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_burst.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_burst.c
index 4f0ce44f85..33820eb711 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_burst_##name,                      \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca.c
index 7b9cec09db..7d27c5a082 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_CA(cn10k_sso_hws_deq_ca_##name, flags)                         \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_burst.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_burst.c
index 55cb3a47e3..56fd16c404 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_burst_##name,                   \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_seg.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_seg.c
index 1d427ea19f..e01b2a38bc 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_CA_SEG(cn10k_sso_hws_deq_ca_seg_##name, flags)                 \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_seg_burst.c
index a4ceb2cbc9..509da881d4 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_seg_burst_##name,               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo.c
index 3cd179933f..9851bd51b8 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_CA(cn10k_sso_hws_deq_tmo_ca_##name, flags)                 \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_burst.c
index 6433093e5c..f286902297 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_burst_##name,               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_seg.c
index 42fc7fd2f3..d1252c7984 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)         \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_seg_burst.c
index 94a5522e77..0769b89f76 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_seg_burst_##name,           \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_dual.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_dual.c
index a6bdf73a32..50252c79ca 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_dual.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_dual.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DUAL_DEQ(cn10k_sso_hws_dual_deq_##name, flags)                     \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_seg.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_seg.c
index 87d708adf0..4c2b60972a 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags)                       \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_seg_burst.c
index c3c5793240..cf3a44a7be 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_SEG_BURST(cn10k_sso_hws_deq_seg_burst_##name,              \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo.c
index 84e39deefc..a92c3e23ed 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags)                       \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_burst.c
index c19da1b97b..d8547c15ac 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_burst_##name,                  \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg.c
index 595b2d06ec..8acbf3f4d6 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags)               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg_burst.c
index 9af8d6e128..3d0beb378a 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                                             \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_seg_burst_##name,                                  \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127.c b/drivers/event/cnxk/deq/cn10k/deq_112_127.c
index 9d6a0d53a7..0ce82d195e 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_112_127.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ(cn10k_sso_hws_deq_##name, flags)                               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_burst.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_burst.c
index b959e2d9e1..313530dd5d 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_burst_##name,                      \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca.c
index d31cfdfd5e..7d200af3ae 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_CA(cn10k_sso_hws_deq_ca_##name, flags)                         \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_burst.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_burst.c
index 333ef3f8a9..ff09b0c2f7 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_burst_##name,                   \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_seg.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_seg.c
index f3a26618bf..3250f627cf 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_CA_SEG(cn10k_sso_hws_deq_ca_seg_##name, flags)                 \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_seg_burst.c
index f16fd04393..e74a77ae8c 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_seg_burst_##name,               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo.c
index eeac9e34af..8474c2dcbe 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_CA(cn10k_sso_hws_deq_tmo_ca_##name, flags)                 \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_burst.c
index 73fa822782..b5ce875657 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_burst_##name,               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_seg.c
index a5746fa649..1552cbbb15 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)         \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_seg_burst.c
index 032265533f..88b89f1927 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_seg_burst_##name,           \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_dual.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_dual.c
index 68f82747c1..8a51f357f3 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_dual.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_dual.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DUAL_DEQ(cn10k_sso_hws_dual_deq_##name, flags)                     \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_seg.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_seg.c
index 398e5a3e1c..07823f065f 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags)                       \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_seg_burst.c
index fc04345f7e..48b3cd8a85 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_SEG_BURST(cn10k_sso_hws_deq_seg_burst_##name,              \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo.c
index 071ec8f621..7c3022f69f 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags)                       \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_burst.c
index b476eff143..1e224137b1 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_burst_##name,                  \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg.c
index 42e6eb3a7f..b42a87e8c5 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags)               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg_burst.c
index e1080e2e82..dc3e7e9e69 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_seg_burst_##name,              \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31.c b/drivers/event/cnxk/deq/cn10k/deq_16_31.c
index 27c2952758..ff09a106ea 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_16_31.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ(cn10k_sso_hws_deq_##name, flags)                               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_burst.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_burst.c
index f3a41992b5..4b270ca51f 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_burst_##name,                      \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca.c
index 93e33f5b5c..7ad43889bc 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_CA(cn10k_sso_hws_deq_ca_##name, flags)                         \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_burst.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_burst.c
index b829aa0fc8..55e815c282 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_burst_##name,                   \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_seg.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_seg.c
index a7e96d41b3..435f5dbe43 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_CA_SEG(cn10k_sso_hws_deq_ca_seg_##name, flags)                 \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_seg_burst.c
index ab9acd4637..0a3cad73e7 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_seg_burst_##name,               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo.c
index 312fbc6334..dede5836e2 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_CA(cn10k_sso_hws_deq_tmo_ca_##name, flags)                 \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_burst.c
index 1f5b96cbb6..15fa9b0fba 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_burst_##name,               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_seg.c
index fb0b6cf696..dd045da34f 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)         \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_seg_burst.c
index 4d13be7a11..3b1ebacc5f 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_seg_burst_##name,           \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_dual.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_dual.c
index 669ff42a98..f5dfd67901 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_dual.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_dual.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DUAL_DEQ(cn10k_sso_hws_dual_deq_##name, flags)                     \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_seg.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_seg.c
index 019afcbcc7..ec86587bdf 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags)                       \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_seg_burst.c
index 0c3a14b413..20051682de 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_SEG_BURST(cn10k_sso_hws_deq_seg_burst_##name,              \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo.c
index f76f0d85e7..dc3a52bb7f 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags)                       \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_burst.c
index b2c1411d34..a3c52d0075 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_burst_##name,                  \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg.c
index 1bcf8526bb..0d1b713206 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags)               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg_burst.c
index d68cc46d67..2a1cd255b1 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_seg_burst_##name,              \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47.c b/drivers/event/cnxk/deq/cn10k/deq_32_47.c
index 817edb648d..3bcd49a68f 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_32_47.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ(cn10k_sso_hws_deq_##name, flags)                               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_burst.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_burst.c
index 362fb67040..e20f60c372 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_burst_##name,                      \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca.c
index 875e442796..c130c511b6 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_CA(cn10k_sso_hws_deq_ca_##name, flags)                         \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_burst.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_burst.c
index 9410e48642..ed511c5459 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_burst_##name,                   \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_seg.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_seg.c
index d45fe712b0..6b6305e7fd 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_CA_SEG(cn10k_sso_hws_deq_ca_seg_##name, flags)                 \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_seg_burst.c
index c0439536aa..42cdcab4f8 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_seg_burst_##name,               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo.c
index da010b0021..afabd8987a 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_CA(cn10k_sso_hws_deq_tmo_ca_##name, flags)                 \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_burst.c
index 5da95b21c7..d3ef670afa 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_burst_##name,               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_seg.c
index 65af91363f..1dfda1408b 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)         \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_seg_burst.c
index cff7e40fda..3ac31df9a6 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_seg_burst_##name,           \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_dual.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_dual.c
index 235fceb609..dc98e18d9a 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_dual.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_dual.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DUAL_DEQ(cn10k_sso_hws_dual_deq_##name, flags)                     \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_seg.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_seg.c
index 73771753da..154107219e 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags)                       \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_seg_burst.c
index df0a69dc7a..8bd9464636 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_SEG_BURST(cn10k_sso_hws_deq_seg_burst_##name,              \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo.c
index 3d05fb3005..37f2985fb3 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags)                       \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_burst.c
index f5a6ce587a..9711381cf1 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_burst_##name,                  \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg.c
index 1afb09b708..6ee76356d5 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags)               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg_burst.c
index b6e568bba3..4f7a4580df 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_seg_burst_##name,              \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63.c b/drivers/event/cnxk/deq/cn10k/deq_48_63.c
index ecb36b4f56..3f20dea608 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_48_63.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ(cn10k_sso_hws_deq_##name, flags)                               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_burst.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_burst.c
index 5d83ef8ae2..b2f8661a07 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_burst_##name,                      \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca.c
index e5783d18bd..e96a046900 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_CA(cn10k_sso_hws_deq_ca_##name, flags)                         \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_burst.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_burst.c
index e4355853cc..c3762e5002 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_burst_##name,                   \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_seg.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_seg.c
index 269ead74cb..1e3a56b02b 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_CA_SEG(cn10k_sso_hws_deq_ca_seg_##name, flags)                 \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_seg_burst.c
index b64625425a..3811cba348 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_seg_burst_##name,               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo.c
index b7f8f67738..0306746304 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_CA(cn10k_sso_hws_deq_tmo_ca_##name, flags)                 \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_burst.c
index 9a9cff9e14..42bf8a1dde 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_burst_##name,               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_seg.c
index fffcad0c38..791e129711 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)         \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_seg_burst.c
index 347dabd042..ca1c127b68 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_seg_burst_##name,           \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_dual.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_dual.c
index 3f6e10e816..9bdac3e284 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_dual.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_dual.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DUAL_DEQ(cn10k_sso_hws_dual_deq_##name, flags)                     \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_seg.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_seg.c
index e3078d2816..019ff941c6 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags)                       \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_seg_burst.c
index d262937a99..e408d55b0b 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_SEG_BURST(cn10k_sso_hws_deq_seg_burst_##name,              \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo.c
index 59d5cf190d..73ba2dd7ff 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags)                       \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_burst.c
index ed9e6b70b7..734925e40d 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_burst_##name,                  \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg.c
index 40c679ace6..b112e09846 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags)               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg_burst.c
index 8c2f6bb171..8a85a33317 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_seg_burst_##name,              \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79.c b/drivers/event/cnxk/deq/cn10k/deq_64_79.c
index 6c3aa83c66..e13fdc3456 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_64_79.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ(cn10k_sso_hws_deq_##name, flags)                               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_burst.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_burst.c
index ea553303fb..225c2c325a 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_burst_##name,                      \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca.c
index b201b8a642..e1def2b058 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_CA(cn10k_sso_hws_deq_ca_##name, flags)                         \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_burst.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_burst.c
index b8e9bdbbd6..59ab7fc960 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_burst_##name,                   \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_seg.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_seg.c
index f3bccc222f..5bed2e4a94 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_CA_SEG(cn10k_sso_hws_deq_ca_seg_##name, flags)                 \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_seg_burst.c
index 0057d6e891..05b4b39595 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_seg_burst_##name,               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo.c
index 216c54c515..d962e7f146 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_CA(cn10k_sso_hws_deq_tmo_ca_##name, flags)                 \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_burst.c
index e17cf532a3..905b6afd8c 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_burst_##name,               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_seg.c
index d9186112c0..1f8e58f82c 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)         \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_seg_burst.c
index 4272ff2a59..a639f56874 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_seg_burst_##name,           \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_dual.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_dual.c
index 843aaa19ca..bbe38f9163 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_dual.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_dual.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DUAL_DEQ(cn10k_sso_hws_dual_deq_##name, flags)                     \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_seg.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_seg.c
index 78ed7e2468..610bff2f1b 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags)                       \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_seg_burst.c
index d5613699bb..2dd3cce7e2 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_SEG_BURST(cn10k_sso_hws_deq_seg_burst_##name,              \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo.c
index 3d54bc4f1e..f57700b740 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags)                       \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_burst.c
index 2cfa40f4c9..9388d36620 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_burst_##name,                  \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg.c
index f385acf5db..7d0eeb7bb9 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags)               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg_burst.c
index d093cdf027..03b6898f5d 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_seg_burst_##name,              \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95.c b/drivers/event/cnxk/deq/cn10k/deq_80_95.c
index d41d10b470..6f678aa8f1 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_80_95.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ(cn10k_sso_hws_deq_##name, flags)                               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_burst.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_burst.c
index 541770db63..49ad628924 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_burst_##name,                      \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca.c
index 85253c20cd..1d32173aaf 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_CA(cn10k_sso_hws_deq_ca_##name, flags)                         \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_burst.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_burst.c
index d624789f44..0e5b20e391 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_burst_##name,                   \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_seg.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_seg.c
index b9cd213bf0..6d30b31241 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_CA_SEG(cn10k_sso_hws_deq_ca_seg_##name, flags)                 \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_seg_burst.c
index ac152703a5..b87de757b3 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_seg_burst_##name,               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo.c
index 16b16e6a63..48f03d87c6 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_CA(cn10k_sso_hws_deq_tmo_ca_##name, flags)                 \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_burst.c
index df284b78f9..0e1cecfc43 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_burst_##name,               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_seg.c
index c890c504c1..5ee30c3247 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)         \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_seg_burst.c
index 6af6918dbe..f7d15bda9e 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_seg_burst_##name,           \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_dual.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_dual.c
index 00e32a3aa6..b9676a9f07 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_dual.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_dual.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DUAL_DEQ(cn10k_sso_hws_dual_deq_##name, flags)                     \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_seg.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_seg.c
index 8a4549a5d9..9ea971438d 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags)                       \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_seg_burst.c
index 4f8a2fd846..549808ac8e 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_SEG_BURST(cn10k_sso_hws_deq_seg_burst_##name,              \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo.c
index cc0f53f786..499dbe54de 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags)                       \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_burst.c
index dff2aa84d2..f385950b06 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_burst_##name,                  \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg.c
index da6a596a6a..379eb7bf8c 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags)               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg_burst.c
index cf09f3e600..8e43cae326 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_seg_burst_##name,              \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111.c b/drivers/event/cnxk/deq/cn10k/deq_96_111.c
index a7a3f8302c..dc45350973 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_96_111.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ(cn10k_sso_hws_deq_##name, flags)                               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_burst.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_burst.c
index 5eb2ca77b0..c14d4da750 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_burst_##name,                      \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca.c
index 0e97b764dc..43ad267203 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_CA(cn10k_sso_hws_deq_ca_##name, flags)                         \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_burst.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_burst.c
index f23317bbd4..a74d1a1386 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_burst_##name,                   \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_seg.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_seg.c
index be3178c5b5..8dd8e30acd 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_CA_SEG(cn10k_sso_hws_deq_ca_seg_##name, flags)                 \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_seg_burst.c
index b0e2a106e0..d6f2d8fe44 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_seg_burst_##name,               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo.c
index 60d0a5ac59..08bc4ebcc5 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_CA(cn10k_sso_hws_deq_tmo_ca_##name, flags)                 \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_burst.c
index 5f9479dd52..b23bc42842 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_burst_##name,               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_seg.c
index 769e784718..040f9c2bfb 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)         \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_seg_burst.c
index 53ec7c0a41..dcd7ce4dea 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_seg_burst_##name,           \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_dual.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_dual.c
index c262a92ac4..4fb603a91b 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_dual.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_dual.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DUAL_DEQ(cn10k_sso_hws_dual_deq_##name, flags)                     \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_seg.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_seg.c
index a54fb2f72b..c10fbb5f46 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags)                       \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_seg_burst.c
index 013abbad1e..5d8febc64e 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_SEG_BURST(cn10k_sso_hws_deq_seg_burst_##name,              \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo.c
index 39d19f4381..37f4f0cc74 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags)                       \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_burst.c
index 4cc80dd4c9..84760d1e00 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_burst_##name,                  \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg.c
index a689042470..8fe43b44d0 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags)               \
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg_burst.c
index a3aba85cd3..1a440456f3 100644
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg_burst.c
+++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg_burst.c
@@ -3,8 +3,10 @@ 
  */

 #include "cn10k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define R(name, flags)                                                         \
 	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_seg_burst_##name,              \
diff --git a/drivers/event/cnxk/tx/cn10k/tx_0_15.c b/drivers/event/cnxk/tx/cn10k/tx_0_15.c
index bae3a62eac..4e5322ba6d 100644
--- a/drivers/event/cnxk/tx/cn10k/tx_0_15.c
+++ b/drivers/event/cnxk/tx/cn10k/tx_0_15.c
@@ -2,7 +2,11 @@ 
  * Copyright(C) 2022 Marvell.
  */

-#include "cn10k_worker.h"
+#include "cn10k_tx_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define T(name, sz, flags) SSO_TX(cn10k_sso_hws_tx_adptr_enq_##name, sz, flags)

diff --git a/drivers/event/cnxk/tx/cn10k/tx_0_15_seg.c b/drivers/event/cnxk/tx/cn10k/tx_0_15_seg.c
index 0ffd0e50f7..912c64d819 100644
--- a/drivers/event/cnxk/tx/cn10k/tx_0_15_seg.c
+++ b/drivers/event/cnxk/tx/cn10k/tx_0_15_seg.c
@@ -2,7 +2,11 @@ 
  * Copyright(C) 2022 Marvell.
  */

-#include "cn10k_worker.h"
+#include "cn10k_tx_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define T(name, sz, flags)                                                     \
 	SSO_TX_SEG(cn10k_sso_hws_tx_adptr_enq_seg_##name, sz, flags)
diff --git a/drivers/event/cnxk/tx/cn10k/tx_112_127.c b/drivers/event/cnxk/tx/cn10k/tx_112_127.c
index 02c9ab1ae1..4ba0b7f802 100644
--- a/drivers/event/cnxk/tx/cn10k/tx_112_127.c
+++ b/drivers/event/cnxk/tx/cn10k/tx_112_127.c
@@ -2,7 +2,11 @@ 
  * Copyright(C) 2022 Marvell.
  */

-#include "cn10k_worker.h"
+#include "cn10k_tx_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define T(name, sz, flags) SSO_TX(cn10k_sso_hws_tx_adptr_enq_##name, sz, flags)

diff --git a/drivers/event/cnxk/tx/cn10k/tx_112_127_seg.c b/drivers/event/cnxk/tx/cn10k/tx_112_127_seg.c
index b0abd8b328..6be641113e 100644
--- a/drivers/event/cnxk/tx/cn10k/tx_112_127_seg.c
+++ b/drivers/event/cnxk/tx/cn10k/tx_112_127_seg.c
@@ -2,7 +2,11 @@ 
  * Copyright(C) 2022 Marvell.
  */

-#include "cn10k_worker.h"
+#include "cn10k_tx_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define T(name, sz, flags)                                                     \
 	SSO_TX_SEG(cn10k_sso_hws_tx_adptr_enq_seg_##name, sz, flags)
diff --git a/drivers/event/cnxk/tx/cn10k/tx_16_31.c b/drivers/event/cnxk/tx/cn10k/tx_16_31.c
index cd6b1b56f8..673d2d9d22 100644
--- a/drivers/event/cnxk/tx/cn10k/tx_16_31.c
+++ b/drivers/event/cnxk/tx/cn10k/tx_16_31.c
@@ -2,7 +2,11 @@ 
  * Copyright(C) 2022 Marvell.
  */

-#include "cn10k_worker.h"
+#include "cn10k_tx_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define T(name, sz, flags) SSO_TX(cn10k_sso_hws_tx_adptr_enq_##name, sz, flags)

diff --git a/drivers/event/cnxk/tx/cn10k/tx_16_31_seg.c b/drivers/event/cnxk/tx/cn10k/tx_16_31_seg.c
index 52cbe5932f..b7512e2eb1 100644
--- a/drivers/event/cnxk/tx/cn10k/tx_16_31_seg.c
+++ b/drivers/event/cnxk/tx/cn10k/tx_16_31_seg.c
@@ -2,7 +2,11 @@ 
  * Copyright(C) 2022 Marvell.
  */

-#include "cn10k_worker.h"
+#include "cn10k_tx_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define T(name, sz, flags)                                                     \
 	SSO_TX_SEG(cn10k_sso_hws_tx_adptr_enq_seg_##name, sz, flags)
diff --git a/drivers/event/cnxk/tx/cn10k/tx_32_47.c b/drivers/event/cnxk/tx/cn10k/tx_32_47.c
index 5dd3aad0f3..25a92c114e 100644
--- a/drivers/event/cnxk/tx/cn10k/tx_32_47.c
+++ b/drivers/event/cnxk/tx/cn10k/tx_32_47.c
@@ -2,7 +2,11 @@ 
  * Copyright(C) 2022 Marvell.
  */

-#include "cn10k_worker.h"
+#include "cn10k_tx_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define T(name, sz, flags) SSO_TX(cn10k_sso_hws_tx_adptr_enq_##name, sz, flags)

diff --git a/drivers/event/cnxk/tx/cn10k/tx_32_47_seg.c b/drivers/event/cnxk/tx/cn10k/tx_32_47_seg.c
index a8e73445ff..495c335183 100644
--- a/drivers/event/cnxk/tx/cn10k/tx_32_47_seg.c
+++ b/drivers/event/cnxk/tx/cn10k/tx_32_47_seg.c
@@ -2,7 +2,11 @@ 
  * Copyright(C) 2022 Marvell.
  */

-#include "cn10k_worker.h"
+#include "cn10k_tx_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define T(name, sz, flags)                                                     \
 	SSO_TX_SEG(cn10k_sso_hws_tx_adptr_enq_seg_##name, sz, flags)
diff --git a/drivers/event/cnxk/tx/cn10k/tx_48_63.c b/drivers/event/cnxk/tx/cn10k/tx_48_63.c
index 8cd5c663d7..e2762e87d8 100644
--- a/drivers/event/cnxk/tx/cn10k/tx_48_63.c
+++ b/drivers/event/cnxk/tx/cn10k/tx_48_63.c
@@ -2,7 +2,11 @@ 
  * Copyright(C) 2022 Marvell.
  */

-#include "cn10k_worker.h"
+#include "cn10k_tx_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define T(name, sz, flags) SSO_TX(cn10k_sso_hws_tx_adptr_enq_##name, sz, flags)

diff --git a/drivers/event/cnxk/tx/cn10k/tx_48_63_seg.c b/drivers/event/cnxk/tx/cn10k/tx_48_63_seg.c
index 71efca9478..c3d898fcae 100644
--- a/drivers/event/cnxk/tx/cn10k/tx_48_63_seg.c
+++ b/drivers/event/cnxk/tx/cn10k/tx_48_63_seg.c
@@ -2,7 +2,11 @@ 
  * Copyright(C) 2022 Marvell.
  */

-#include "cn10k_worker.h"
+#include "cn10k_tx_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define T(name, sz, flags)                                                     \
 	SSO_TX_SEG(cn10k_sso_hws_tx_adptr_enq_seg_##name, sz, flags)
diff --git a/drivers/event/cnxk/tx/cn10k/tx_64_79.c b/drivers/event/cnxk/tx/cn10k/tx_64_79.c
index 36aea254e5..d9b7f2167f 100644
--- a/drivers/event/cnxk/tx/cn10k/tx_64_79.c
+++ b/drivers/event/cnxk/tx/cn10k/tx_64_79.c
@@ -2,7 +2,11 @@ 
  * Copyright(C) 2022 Marvell.
  */

-#include "cn10k_worker.h"
+#include "cn10k_tx_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define T(name, sz, flags) SSO_TX(cn10k_sso_hws_tx_adptr_enq_##name, sz, flags)

diff --git a/drivers/event/cnxk/tx/cn10k/tx_64_79_seg.c b/drivers/event/cnxk/tx/cn10k/tx_64_79_seg.c
index 918f9b6d3b..3a28e0eee7 100644
--- a/drivers/event/cnxk/tx/cn10k/tx_64_79_seg.c
+++ b/drivers/event/cnxk/tx/cn10k/tx_64_79_seg.c
@@ -2,7 +2,11 @@ 
  * Copyright(C) 2022 Marvell.
  */

-#include "cn10k_worker.h"
+#include "cn10k_tx_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define T(name, sz, flags)                                                     \
 	SSO_TX_SEG(cn10k_sso_hws_tx_adptr_enq_seg_##name, sz, flags)
diff --git a/drivers/event/cnxk/tx/cn10k/tx_80_95.c b/drivers/event/cnxk/tx/cn10k/tx_80_95.c
index e400c1546e..a95b00d270 100644
--- a/drivers/event/cnxk/tx/cn10k/tx_80_95.c
+++ b/drivers/event/cnxk/tx/cn10k/tx_80_95.c
@@ -2,7 +2,11 @@ 
  * Copyright(C) 2022 Marvell.
  */

-#include "cn10k_worker.h"
+#include "cn10k_tx_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define T(name, sz, flags) SSO_TX(cn10k_sso_hws_tx_adptr_enq_##name, sz, flags)

diff --git a/drivers/event/cnxk/tx/cn10k/tx_80_95_seg.c b/drivers/event/cnxk/tx/cn10k/tx_80_95_seg.c
index 21a76b59fb..f0264ee701 100644
--- a/drivers/event/cnxk/tx/cn10k/tx_80_95_seg.c
+++ b/drivers/event/cnxk/tx/cn10k/tx_80_95_seg.c
@@ -2,7 +2,11 @@ 
  * Copyright(C) 2022 Marvell.
  */

-#include "cn10k_worker.h"
+#include "cn10k_tx_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define T(name, sz, flags)                                                     \
 	SSO_TX_SEG(cn10k_sso_hws_tx_adptr_enq_seg_##name, sz, flags)
diff --git a/drivers/event/cnxk/tx/cn10k/tx_96_111.c b/drivers/event/cnxk/tx/cn10k/tx_96_111.c
index 6679b9aa28..519ec1623f 100644
--- a/drivers/event/cnxk/tx/cn10k/tx_96_111.c
+++ b/drivers/event/cnxk/tx/cn10k/tx_96_111.c
@@ -2,7 +2,11 @@ 
  * Copyright(C) 2022 Marvell.
  */

-#include "cn10k_worker.h"
+#include "cn10k_tx_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define T(name, sz, flags) SSO_TX(cn10k_sso_hws_tx_adptr_enq_##name, sz, flags)

diff --git a/drivers/event/cnxk/tx/cn10k/tx_96_111_seg.c b/drivers/event/cnxk/tx/cn10k/tx_96_111_seg.c
index 9430a92fc3..1e6383fdf7 100644
--- a/drivers/event/cnxk/tx/cn10k/tx_96_111_seg.c
+++ b/drivers/event/cnxk/tx/cn10k/tx_96_111_seg.c
@@ -2,7 +2,11 @@ 
  * Copyright(C) 2022 Marvell.
  */

-#include "cn10k_worker.h"
+#include "cn10k_tx_worker.h"
+
+#ifdef _ROC_API_H_
+#error "roc_api.h is included"
+#endif

 #define T(name, sz, flags)                                                     \
 	SSO_TX_SEG(cn10k_sso_hws_tx_adptr_enq_seg_##name, sz, flags)