diff --git a/Kbuild b/Kbuild
index 3cd28ca..972ef3f 100644
--- a/Kbuild
+++ b/Kbuild
@@ -482,13 +482,9 @@
 
 EXTRA_CFLAGS += $(INCS)
 
-CDEFINES :=	-DANI_PRODUCT_TYPE_CLIENT=1 \
-		-DANI_BUS_TYPE_PLATFORM=1 \
+CDEFINES :=	-DANI_BUS_TYPE_PLATFORM=1 \
 		-DANI_LITTLE_BYTE_ENDIAN \
 		-DANI_LITTLE_BIT_ENDIAN \
-		-DWLAN_STA=1 \
-		-DAP=2 \
-		-DWNI_POLARIS_FW_PRODUCT=1 \
 		-DQC_WLAN_CHIPSET_PRIMA \
 		-DINTEGRATION_READY \
 		-DVOSS_ENABLED \
@@ -496,20 +492,14 @@
 		-DGEN6_ONWARDS \
 		-DANI_COMPILER_TYPE_GCC \
 		-DANI_OS_TYPE_ANDROID=6 \
-		-DADVANCED=3 \
-		-DWNI_POLARIS_FW_PACKAGE=9 \
 		-DANI_LOGDUMP \
 		-DWLAN_PERF \
-		-DUSE_LOCKED_QUEUE \
 		-DPTT_SOCK_SVC_ENABLE \
 		-DFEATURE_WLAN_UAPSD_FW_TRG_FRAMES \
-		-DWLAN_SOFTAP_FEATURE \
 		-Wall\
 		-D__linux__ \
 		-DMSM_PLATFORM \
-		-DFEATURE_WLAN_INTEGRATED_SOC \
 		-DHAL_SELF_STA_PER_BSS=1 \
-		-DANI_MANF_DIAG \
 		-DWLAN_FEATURE_VOWIFI_11R \
 		-DWLAN_FEATURE_NEIGHBOR_ROAMING \
 		-DWLAN_FEATURE_NEIGHBOR_ROAMING_DEBUG \