diff --git a/Kbuild b/Kbuild
index ac31affdb2a4..f8f2e9af635a 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1168,8 +1168,7 @@ CDEFINES +=	-DWLAN_DEBUG \
 		-DSME_TRACE_RECORD \
 		-DHDD_TRACE_RECORD \
 		-DPE_DEBUG_LOGW \
-		-DPE_DEBUG_LOGE \
-		-DDEBUG
+		-DPE_DEBUG_LOGE
 endif
 
 ifeq ($(CONFIG_SLUB_DEBUG_ON),y)
diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c
index a5fbb0222b62..6eb34d64391a 100644
--- a/core/bmi/src/ol_fw.c
+++ b/core/bmi/src/ol_fw.c
@@ -527,7 +527,7 @@ void ramdump_work_handler(void *data)
 	}
 	tgt_info = hif_get_target_info_handle(ramdump_scn);
 	target_type = tgt_info->target_type;
-#ifdef DEBUG
+#ifdef WLAN_DEBUG
 	ret = hif_check_soc_status(ramdump_scn);
 	if (ret)
 		goto out_fail;
diff --git a/core/hdd/inc/qc_sap_ioctl.h b/core/hdd/inc/qc_sap_ioctl.h
index 60e61e42bb01..70467c2a913e 100644
--- a/core/hdd/inc/qc_sap_ioctl.h
+++ b/core/hdd/inc/qc_sap_ioctl.h
@@ -169,7 +169,7 @@ typedef struct {
 #define QCSAP_IOCTL_GET_INI_CFG         (SIOCIWFIRSTPRIV + 25)
 #define QCSAP_IOCTL_SET_INI_CFG         (SIOCIWFIRSTPRIV + 26)
 #define QCSAP_IOCTL_SET_TWO_INT_GET_NONE (SIOCIWFIRSTPRIV + 28)
-#ifdef DEBUG
+#ifdef WLAN_DEBUG
 #define QCSAP_IOCTL_SET_FW_CRASH_INJECT 1
 #endif
 #define QCSAP_IOCTL_DUMP_DP_TRACE_LEVEL 2
diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c
index f44e2ce58c3a..7b37910d138b 100644
--- a/core/hdd/src/wlan_hdd_hostapd.c
+++ b/core/hdd/src/wlan_hdd_hostapd.c
@@ -68,7 +68,7 @@
 #include "pld_common.h"
 
 #include "wma.h"
-#ifdef DEBUG
+#ifdef WLAN_DEBUG
 #include "wma_api.h"
 #endif
 #include "wlan_hdd_trace.h"
@@ -2339,7 +2339,7 @@ static int __iw_softap_set_two_ints_getnone(struct net_device *dev,
 		goto out;
 
 	switch (sub_cmd) {
-#ifdef DEBUG
+#ifdef WLAN_DEBUG
 	case QCSAP_IOCTL_SET_FW_CRASH_INJECT:
 		hdd_err("WE_SET_FW_CRASH_INJECT: %d %d",
 		       value[1], value[2]);
@@ -5480,7 +5480,7 @@ static const struct iw_priv_args hostapd_private_args[] = {
 	}
 	,
 	/* handlers for sub-ioctl */
-#ifdef DEBUG
+#ifdef WLAN_DEBUG
 	{
 		QCSAP_IOCTL_SET_FW_CRASH_INJECT,
 		IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2,
diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index 7629c204152b..f4af8b1e7619 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -433,7 +433,7 @@ static const hdd_freq_chan_map_t freq_chan_map[] = {
 /* Private ioctls and their sub-ioctls */
 #define WLAN_PRIV_SET_TWO_INT_GET_NONE   (SIOCIWFIRSTPRIV + 28)
 #define WE_SET_SMPS_PARAM    1
-#ifdef DEBUG
+#ifdef WLAN_DEBUG
 #define WE_SET_FW_CRASH_INJECT    2
 #endif
 #define WE_DUMP_DP_TRACE_LEVEL    3
@@ -9824,7 +9824,7 @@ static int __iw_set_two_ints_getnone(struct net_device *dev,
 					      | value[2],
 					  VDEV_CMD);
 		break;
-#ifdef DEBUG
+#ifdef WLAN_DEBUG
 	case WE_SET_FW_CRASH_INJECT:
 		hdd_err("WE_SET_FW_CRASH_INJECT: %d %d",
 		       value[1], value[2]);
@@ -11093,7 +11093,7 @@ static const struct iw_priv_args we_private_args[] = {
 	 IW_PRIV_TYPE_BYTE | sizeof(struct dot11p_channel_sched),
 	 0, "set_dot11p" }
 	,
-#ifdef DEBUG
+#ifdef WLAN_DEBUG
 	{WE_SET_FW_CRASH_INJECT,
 	 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2,
 	 0, "crash_inject"}
diff --git a/core/utils/fwlog/dbglog_host.c b/core/utils/fwlog/dbglog_host.c
index c4c52b8760e0..07441d4c5009 100644
--- a/core/utils/fwlog/dbglog_host.c
+++ b/core/utils/fwlog/dbglog_host.c
@@ -53,7 +53,7 @@
 #include <a_debug.h>
 #define FWLOG_DEBUG   ATH_DEBUG_MAKE_MODULE_MASK(0)
 
-#if defined(DEBUG)
+#ifdef WLAN_DEBUG
 
 static int get_version;
 static int gprint_limiter;
diff --git a/uapi/linux/a_debug.h b/uapi/linux/a_debug.h
index 62931060cf08..3a5fd4c2204c 100644
--- a/uapi/linux/a_debug.h
+++ b/uapi/linux/a_debug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -147,7 +147,7 @@ typedef struct _ATH_DEBUG_MODULE_DBG_INFO {
 #define GET_ATH_MODULE_DEBUG_VAR_MASK(s) _XGET_ATH_MODULE_NAME_DEBUG_(s).CurrentMask
 #define _XGET_ATH_MODULE_NAME_DEBUG_(s) debug_ ## s
 
-#ifdef DEBUG
+#ifdef WLAN_DEBUG
 
 /* for source files that will instantiate the debug variables */
 #define ATH_DEBUG_INSTANTIATE_MODULE_VAR(s,name,moddesc,initmask,count,descriptions) \
diff --git a/uapi/linux/debug_linux.h b/uapi/linux/debug_linux.h
index 57c3590efba4..428c90b057f5 100644
--- a/uapi/linux/debug_linux.h
+++ b/uapi/linux/debug_linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -31,7 +31,7 @@
 /* macro to remove parens */
 #define ATH_PRINTX_ARG(arg ...) arg
 
-#ifdef DEBUG
+#ifdef WLAN_DEBUG
 /* NOTE: the AR_DEBUG_PRINTF macro is defined here to handle special handling of variable arg macros
  * which may be compiler dependent. */
 #define AR_DEBUG_PRINTF(mask, args) do {	\
diff --git a/uapi/linux/osapi_linux.h b/uapi/linux/osapi_linux.h
index 77de5272aac2..4e61a5e21f9e 100644
--- a/uapi/linux/osapi_linux.h
+++ b/uapi/linux/osapi_linux.h
@@ -133,7 +133,7 @@ typedef struct timer_list A_TIMER;
 	 })
 #endif /* wait_event_interruptible_timeout */
 
-#ifdef DEBUG
+#ifdef WLAN_DEBUG
 #ifdef A_SIMOS_DEVHOST
 extern unsigned int panic_on_assert;
 #define A_ASSERT(expr)	\