diff --git a/Kbuild b/Kbuild
index b4e573c7d48d..f24817b00a72 100644
--- a/Kbuild
+++ b/Kbuild
@@ -485,6 +485,9 @@ CONFIG_WLAN_FEATURE_P2P_DEBUG := y
 CONFIG_WLAN_NUD_TRACKING := y
 
 CONFIG_WIFI_POS_CONVERGED := y
+ifneq ($(CONFIG_WIFI_POS_CONVERGED), y)
+CONFIG_WIFI_POS_LEGACY := y
+endif
 
 CONFIG_CP_STATS := y
 
@@ -1968,16 +1971,8 @@ ccflags-$(CONFIG_WLAN_SPECTRAL_ENABLE) += -DWLAN_SPECTRAL_ENABLE
 ccflags-$(CONFIG_WMI_CMD_STRINGS) += -DWMI_CMD_STRINGS
 
 ccflags-$(CONFIG_WLAN_DISABLE_EXPORT_SYMBOL) += -DWLAN_DISABLE_EXPORT_SYMBOL
-
-############ WIFI POS ##############
-ifeq ($(CONFIG_WIFI_POS_CONVERGED), y)
-ccflags-y += -DWIFI_POS_CONVERGED
-else
-ccflags-y += -DFEATURE_OEM_DATA_SUPPORT
-endif
-####################################
-
-
+ccflags-$(CONFIG_WIFI_POS_CONVERGED) += -DWIFI_POS_CONVERGED
+ccflags-$(CONFIG_WIFI_POS_LEGACY) += -DFEATURE_OEM_DATA_SUPPORT
 ccflags-$(CONFIG_FEATURE_HTC_CREDIT_HISTORY) += -DFEATURE_HTC_CREDIT_HISTORY
 ccflags-$(CONFIG_WLAN_FEATURE_P2P_DEBUG) += -DWLAN_FEATURE_P2P_DEBUG