diff --git a/Kbuild b/Kbuild
index 3bb2cff7f3a7..ff79014ded10 100644
--- a/Kbuild
+++ b/Kbuild
@@ -2012,14 +2012,13 @@ ifeq ($(CONFIG_FEATURE_UNIT_TEST_SUSPEND), 1)
 	CDEFINES += -DWLAN_SUSPEND_RESUME_TEST
 endif
 
-ifeq ($(CONFIG_SLUB_DEBUG_ON),y)
-CDEFINES += -DTIMER_MANAGER
-CDEFINES += -DMEMORY_DEBUG
-CDEFINES += -DCONFIG_HALT_KMEMLEAK
-endif
-
 ifdef CONFIG_LEAK_DETECTION
-	CDEFINES += -DCONFIG_LEAK_DETECTION
+CDEFINES += \
+	-DCONFIG_HALT_KMEMLEAK \
+	-DCONFIG_LEAK_DETECTION \
+	-DMEMORY_DEBUG \
+	-DNBUF_MEMORY_DEBUG \
+	-DTIMER_MANAGER
 endif
 
 ifeq ($(HAVE_CFG80211),1)