diff --git a/hif/configs/ap_hif.config b/hif/configs/ap_hif.config
index ac35e75eaba1..f49aee983671 100644
--- a/hif/configs/ap_hif.config
+++ b/hif/configs/ap_hif.config
@@ -1 +1,3 @@
 EXTRA_CFLAGS += -DQCA_NAPI_DEF_SCALE_BIN_SHIFT=1
+EXTRA_CFLAGS += -DHIF_MAX_GROUP=12
+EXTRA_CFLAGS += -DHTC_MSG_NACK_SUSPEND=7
diff --git a/hif/inc/hif.h b/hif/inc/hif.h
index 225a93245c4e..79fd31716b44 100644
--- a/hif/inc/hif.h
+++ b/hif/inc/hif.h
@@ -114,9 +114,7 @@ struct CE_state;
 #define CE_COUNT_MAX 12
 #define HIF_MAX_GRP_IRQ 16
 
-#ifdef CONFIG_WIN
-#define HIF_MAX_GROUP 12
-#else
+#ifndef HIF_MAX_GROUP
 #define HIF_MAX_GROUP 8
 #endif
 
diff --git a/hif/src/ce/ce_main.c b/hif/src/ce/ce_main.c
index 56e2255d5fea..94ee18568c3a 100644
--- a/hif/src/ce/ce_main.c
+++ b/hif/src/ce/ce_main.c
@@ -1279,7 +1279,7 @@ void free_mem_ce_debug_hist_data(struct hif_softc *scn, uint32_t ce_id)
 }
 #endif /* HIF_CE_DEBUG_DATA_BUF */
 
-#if defined(CONFIG_MCL)
+#ifndef HIF_CE_DEBUG_DATA_DYNAMIC_BUF
 #if defined(HIF_CONFIG_SLUB_DEBUG_ON) || defined(HIF_CE_DEBUG_DATA_BUF)
 struct hif_ce_desc_event hif_ce_desc_history[CE_COUNT_MAX][HIF_CE_HISTORY_MAX];
 
@@ -1336,7 +1336,7 @@ alloc_mem_ce_debug_history(struct hif_softc *scn, unsigned int CE_id,
 static inline void
 free_mem_ce_debug_history(struct hif_softc *scn, unsigned int CE_id) { }
 #endif /* (HIF_CONFIG_SLUB_DEBUG_ON) || (HIF_CE_DEBUG_DATA_BUF) */
-#elif defined(CONFIG_WIN)
+#else
 #if defined(HIF_CE_DEBUG_DATA_BUF)
 
 static QDF_STATUS
@@ -1385,7 +1385,7 @@ alloc_mem_ce_debug_history(struct hif_softc *scn, unsigned int CE_id,
 static inline void
 free_mem_ce_debug_history(struct hif_softc *scn, unsigned int CE_id) { }
 #endif /* HIF_CE_DEBUG_DATA_BUF */
-#endif /* CONFIG_MCL */
+#endif /* HIF_CE_DEBUG_DATA_DYNAMIC_BUF */
 
 #if defined(HIF_CONFIG_SLUB_DEBUG_ON) || defined(HIF_CE_DEBUG_DATA_BUF)
 /**
diff --git a/htc/htc_recv.c b/htc/htc_recv.c
index ce09ee0296ea..2d6047da83ef 100644
--- a/htc/htc_recv.c
+++ b/htc/htc_recv.c
@@ -229,10 +229,6 @@ _failed:
 }
 #endif
 
-#ifdef CONFIG_WIN
-#define HTC_MSG_NACK_SUSPEND 7
-#endif
-
 QDF_STATUS htc_rx_completion_handler(void *Context, qdf_nbuf_t netbuf,
 				   uint8_t pipeID)
 {