diff --git a/dp/inc/cdp_txrx_flow_ctrl_legacy.h b/dp/inc/cdp_txrx_flow_ctrl_legacy.h
index c1d7b5e009..89a0aad0a4 100644
--- a/dp/inc/cdp_txrx_flow_ctrl_legacy.h
+++ b/dp/inc/cdp_txrx_flow_ctrl_legacy.h
@@ -108,8 +108,23 @@ ol_txrx_ll_set_tx_pause_q_depth(uint8_t vdev_id, int pause_q_depth);
 
 void ol_txrx_vdev_flush(ol_txrx_vdev_handle data_vdev);
 
+#ifdef CONFIG_ICNSS
+static inline void ol_txrx_vdev_pause(ol_txrx_vdev_handle vdev, uint32_t reason)
+{
+	return;
+}
+#else
 void ol_txrx_vdev_pause(ol_txrx_vdev_handle vdev, uint32_t reason);
+#endif
 
+#ifdef CONFIG_ICNSS
+static inline void ol_txrx_vdev_unpause(ol_txrx_vdev_handle data_vdev,
+					uint32_t reason)
+{
+	return;
+}
+#else
 void ol_txrx_vdev_unpause(ol_txrx_vdev_handle data_vdev, uint32_t reason);
+#endif
 
 #endif /* _CDP_TXRX_FC_LEG_H_ */
diff --git a/dp/inc/cdp_txrx_ipa.h b/dp/inc/cdp_txrx_ipa.h
index a2d6265909..67f2478f40 100644
--- a/dp/inc/cdp_txrx_ipa.h
+++ b/dp/inc/cdp_txrx_ipa.h
@@ -31,7 +31,6 @@
 #ifndef _CDP_TXRX_IPA_H_
 #define _CDP_TXRX_IPA_H_
 
-#ifdef IPA_OFFLOAD
 
 /**
  * ol_txrx_ipa_resources - Resources needed for IPA
@@ -56,6 +55,8 @@ struct ol_txrx_ipa_resources {
 	void *rx2_proc_done_idx_vaddr;
 };
 
+#ifdef IPA_OFFLOAD
+
 void
 ol_txrx_ipa_uc_get_resource(ol_txrx_pdev_handle pdev,
 		 struct ol_txrx_ipa_resources *ipa_res);
diff --git a/hif/inc/hif.h b/hif/inc/hif.h
index 9642e22336..a2be7deba8 100644
--- a/hif/inc/hif.h
+++ b/hif/inc/hif.h
@@ -417,7 +417,14 @@ uint32_t hif_hia_item_address(uint32_t target_type, uint32_t item_offset);
 void hif_set_target_sleep(struct hif_opaque_softc *scn, bool sleep_ok,
 		     bool wait_for_it);
 int hif_check_fw_reg(struct hif_opaque_softc *scn);
+#ifdef CONFIG_ICNSS
+static inline int hif_check_soc_status(struct hif_opaque_softc *scn)
+{
+	return 0;
+}
+#else
 int hif_check_soc_status(struct hif_opaque_softc *scn);
+#endif
 void hif_get_hw_info(struct hif_opaque_softc *scn, u32 *version, u32 *revision,
 		     const char **target_name);
 void hif_disable_isr(struct hif_opaque_softc *scn);
@@ -501,7 +508,14 @@ void hif_process_runtime_resume_success(struct hif_opaque_softc *);
 #endif
 
 int hif_dump_registers(struct hif_opaque_softc *scn);
+#ifdef CONFIG_ICNSS
+static inline int ol_copy_ramdump(struct hif_opaque_softc *scn)
+{
+	return 0;
+}
+#else
 int ol_copy_ramdump(struct hif_opaque_softc *scn);
+#endif
 void hif_crash_shutdown(struct hif_opaque_softc *hif_ctx);
 void hif_get_hw_info(struct hif_opaque_softc *scn, u32 *version, u32 *revision,
 		     const char **target_name);
diff --git a/hif/src/ce/ce_bmi.c b/hif/src/ce/ce_bmi.c
index 88515e4fd9..b4b1b968ae 100644
--- a/hif/src/ce/ce_bmi.c
+++ b/hif/src/ce/ce_bmi.c
@@ -42,8 +42,6 @@
 #include "qdf_trace.h"
 #ifdef CONFIG_CNSS
 #include <net/cnss.h>
-#else
-#include "cnss_stub.h"
 #endif
 #include "epping_main.h"
 #include "hif_debug.h"
diff --git a/hif/src/snoc/if_snoc.c b/hif/src/snoc/if_snoc.c
index 09efe7aaaa..a850462c9e 100644
--- a/hif/src/snoc/if_snoc.c
+++ b/hif/src/snoc/if_snoc.c
@@ -285,22 +285,3 @@ void hif_snoc_irq_disable(struct hif_softc *scn, int ce_id)
 	ce_clear_irq_group_status(scn, 1<<ce_id);
 	ce_disable_irq_in_individual_register(scn, ce_id);
 }
-
-/**
- * hif_enable_power_management(): enable power management
- * @hif_ctx: hif context
- *
- */
-void hif_enable_power_management(void *hif_ctx)
-{
-}
-
-/**
- * hif_disable_power_management(): disable power management
- * @hif_ctx: hif context
- *
- * Dummy place holder implementation for SNOC
- */
-void hif_disable_power_management(void *hif_ctx)
-{
-}