diff --git a/Kbuild b/Kbuild
index 5cc09cf540ff..170ac855da0e 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1818,12 +1818,9 @@ cppflags-y += -DCONFIG_HL_SUPPORT \
             -DHIF_SDIO \
             -DCONFIG_DISABLE_CDC_MAX_PERF_WAR=0 \
             -DCONFIG_ATH_PROCFS_DIAG_SUPPORT \
-            -DFEATURE_HL_GROUP_CREDIT_FLOW_CONTROL \
             -DHIF_MBOX_SLEEP_WAR \
             -DDEBUG_HL_LOGGING \
             -DQCA_BAD_PEER_TX_FLOW_CL \
-            -DCONFIG_TX_DESC_HI_PRIO_RESERVE \
-            -DCONFIG_PER_VDEV_TX_DESC_POOL \
             -DCONFIG_SDIO \
             -DFEATURE_WLAN_FORCE_SAP_SCC
 
@@ -1858,6 +1855,9 @@ cppflags-$(CONFIG_FEATURE_HL_GROUP_CREDIT_FLOW_CONTROL) += -DFEATURE_HL_GROUP_CR
 cppflags-$(CONFIG_FEATURE_HL_DBS_GROUP_CREDIT_SHARING) += -DFEATURE_HL_DBS_GROUP_CREDIT_SHARING
 cppflags-$(CONFIG_CREDIT_REP_THROUGH_CREDIT_UPDATE) += -DCONFIG_CREDIT_REP_THROUGH_CREDIT_UPDATE
 
+cppflags-$(CONFIG_TX_DESC_HI_PRIO_RESERVE) += -DCONFIG_TX_DESC_HI_PRIO_RESERVE
+cppflags-$(CONFIG_PER_VDEV_TX_DESC_POOL) += -DCONFIG_PER_VDEV_TX_DESC_POOL
+
 #Enable FW logs through ini
 cppflags-y += -DCONFIG_FW_LOGS_BASED_ON_INI
 
diff --git a/configs/default_defconfig b/configs/default_defconfig
index 837082ce047b..fc7119cf3735 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -382,6 +382,9 @@ endif
 #Enable SDIO specific APIS
 ifeq ($(CONFIG_ROME_IF),sdio)
 	CONFIG_HIF_SDIO := y
+	CONFIG_TX_DESC_HI_PRIO_RESERVE := y
+	CONFIG_PER_VDEV_TX_DESC_POOL := y
+	CONFIG_FEATURE_HL_GROUP_CREDIT_FLOW_CONTROL := y
 endif
 
 ifeq ($(CONFIG_ROME_IF),snoc)