diff --git a/Kbuild b/Kbuild
index b6a1dc7b4fd8..efa15e3eaea1 100644
--- a/Kbuild
+++ b/Kbuild
@@ -249,6 +249,21 @@ CONFIG_ADRASTEA_SHADOW_REGISTERS := y
 endif
 endif
 
+# NOTE: CONFIG_64BIT_PADDR requires CONFIG_HELIUMPLUS
+ifeq ($(CONFIG_HELIUMPLUS), y)
+CONFIG_AR900B := y
+
+ifeq ($(CONFIG_64BIT_PADDR), y)
+CONFIG_HTT_PADDR64 := y
+endif
+
+ifeq ($(CONFIG_SLUB_DEBUG_ON), y)
+CONFIG_OL_RX_INDICATION_RECORD := y
+CONFIG_TSOSEG_DEBUG := y
+endif
+
+endif #CONFIG_HELIUMPLUS
+
 # As per target team, build is done as follows:
 # Defconfig : build with default flags
 # Slub      : defconfig  + CONFIG_SLUB_DEBUG=y +
@@ -2293,22 +2308,11 @@ ccflags-$(CONFIG_WLAN_RX_FULL_REORDER_OL) += -DWLAN_FEATURE_RX_FULL_REORDER_OL
 ccflags-$(CONFIG_ATH_PROCFS_DIAG_SUPPORT) += -DCONFIG_ATH_PROCFS_DIAG_SUPPORT
 ccflags-$(CONFIG_11AC_TXCOMPACT) += -DATH_11AC_TXCOMPACT
 
-# NOTE: CONFIG_64BIT_PADDR requires CONFIG_HELIUMPLUS
-ifeq ($(CONFIG_HELIUMPLUS), y)
-
-ccflags-y += -DHELIUMPLUS
-ccflags-y += -DAR900B
-
-ifeq ($(CONFIG_64BIT_PADDR), y)
-ccflags-y += -DHTT_PADDR64
-endif
-
-ifeq ($(CONFIG_SLUB_DEBUG_ON), y)
-ccflags-y += -DOL_RX_INDICATION_RECORD
-ccflags-y += -DTSOSEG_DEBUG
-endif
-
-endif #CONFIG_HELIUMPLUS
+ccflags-$(CONFIG_HELIUMPLUS) += -DHELIUMPLUS
+ccflags-$(CONFIG_AR900B) += -DAR900B
+ccflags-$(CONFIG_HTT_PADDR64) += -DHTT_PADDR64
+ccflags-$(CONFIG_OL_RX_INDICATION_RECORD) += -DOL_RX_INDICATION_RECORD
+ccflags-$(CONFIG_TSOSEG_DEBUG) += -DTSOSEG_DEBUG
 
 ccflags-$(CONFIG_ENABLE_DEBUG_ADDRESS_MARKING) += -DENABLE_DEBUG_ADDRESS_MARKING
 ccflags-$(CONFIG_FEATURE_TSO) += -DFEATURE_TSO