diff --git a/Kbuild b/Kbuild
index a2a7769..54250dc 100644
--- a/Kbuild
+++ b/Kbuild
@@ -418,6 +418,8 @@
 
 CONFIG_CP_STATS := y
 
+CONFIG_FEATURE_WLAN_WAPI := y
+
 ifeq ($(CONFIG_HELIUMPLUS), y)
 ifneq ($(CONFIG_FORCE_ALLOC_FROM_DMA_ZONE), y)
 CONFIG_ENABLE_DEBUG_ADDRESS_MARKING := y
@@ -1843,7 +1845,6 @@
 		-Wall\
 		-Werror\
 		-D__linux__ \
-		-DFEATURE_WLAN_WAPI \
 		-DSOFTAP_CHANNEL_RANGE \
 		-DWLAN_AP_STA_CONCURRENCY \
 		-DFEATURE_WLAN_SCAN_PNO \
@@ -1857,7 +1858,6 @@
 		-DFEATURE_WLAN_LPHB \
 		-DQCA_SUPPORT_TX_THROTTLE \
 		-DWMI_INTERFACE_EVENT_LOGGING \
-		-DATH_SUPPORT_WAPI \
 		-DWLAN_FEATURE_LINK_LAYER_STATS \
 		-DFEATURE_WLAN_EXTSCAN \
 		-DCONFIG_160MHZ_SUPPORT \
@@ -1875,6 +1875,9 @@
 		-DWLAN_SPECTRAL_ENABLE \
 		-DWMI_CMD_STRINGS
 
+ccflags-$(CONFIG_FEATURE_WLAN_WAPI) += -DFEATURE_WLAN_WAPI
+ccflags-$(CONFIG_FEATURE_WLAN_WAPI) += -DATH_SUPPORT_WAPI
+
 ifeq ($(CONFIG_WLAN_DISABLE_EXPORT_SYMBOL), y)
 CDEFINES += -DWLAN_DISABLE_EXPORT_SYMBOL
 endif