diff --git a/Kbuild b/Kbuild
index 09e2b35abc7e..0d67578564fc 100755
--- a/Kbuild
+++ b/Kbuild
@@ -1623,9 +1623,7 @@ ifeq ($(CONFIG_REMOVE_PKT_LOG), n)
 INCS +=		$(PKTLOG_INC)
 endif
 
-ifeq ($(BUILD_DIAG_VERSION), y)
 INCS +=		$(HOST_DIAG_LOG_INC)
-endif
 
 INCS +=		$(DISA_INC)
 INCS +=		$(ACTION_OUI_INC)
diff --git a/configs/genoa.common b/configs/genoa.common
index a7d46cf6e191..1bfe0a73d36f 100644
--- a/configs/genoa.common
+++ b/configs/genoa.common
@@ -60,7 +60,7 @@ endif
 # Debug specific features
 CONFIG_WLAN_LOGGING_BUFFERS_DYNAMICALLY := y
 BUILD_DEBUG_VERSION := y
-BUILD_DIAG_VERSION := y
+BUILD_DIAG_VERSION := n
 
 CONFIG_REMOVE_PKT_LOG := n
 CONFIG_FEATURE_HTC_CREDIT_HISTORY := y
diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c
index 8bc04d92ed47..01081f97bd29 100644
--- a/core/hdd/src/wlan_hdd_tx_rx.c
+++ b/core/hdd/src/wlan_hdd_tx_rx.c
@@ -422,6 +422,7 @@ uint32_t hdd_txrx_get_tx_ack_count(struct hdd_adapter *adapter)
 				    adapter->session_id);
 }
 
+#ifdef FEATURE_WLAN_DIAG_SUPPORT
 /**
  * qdf_event_eapol_log() - send event to wlan diag
  * @skb: skb ptr
@@ -463,7 +464,7 @@ void hdd_event_eapol_log(struct sk_buff *skb, enum qdf_proto_dir dir)
 
 	WLAN_HOST_DIAG_EVENT_REPORT(&wlan_diag_event, EVENT_WLAN_EAPOL);
 }
-
+#endif /* FEATURE_WLAN_DIAG_SUPPORT */
 
 /**
  * wlan_hdd_classify_pkt() - classify packet
diff --git a/core/mac/src/pe/lim/lim_utils.h b/core/mac/src/pe/lim/lim_utils.h
index 1f15143c54ca..be26eaec9ab3 100644
--- a/core/mac/src/pe/lim/lim_utils.h
+++ b/core/mac/src/pe/lim/lim_utils.h
@@ -708,9 +708,11 @@ void lim_diag_mgmt_rx_event_report(tpAniSirGlobal mac_ctx, void *mgmt_hdr,
 static inline void lim_diag_event_report(tpAniSirGlobal pMac, uint16_t
 		eventType, tpPESession pSessionEntry, uint16_t status,
 		uint16_t reasonCode) {}
+static inline
 void lim_diag_mgmt_tx_event_report(tpAniSirGlobal mac_ctx, void *mgmt_hdr,
 		tpPESession session, uint16_t result_code,
 		uint16_t reason_code) {}
+static inline
 void lim_diag_mgmt_rx_event_report(tpAniSirGlobal mac_ctx, void *mgmt_hdr,
 		tpPESession session, uint16_t result_code,
 		uint16_t reason_code) {}
diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h
index 0baf10bc519a..c61111e37833 100644
--- a/core/sme/inc/csr_internal.h
+++ b/core/sme/inc/csr_internal.h
@@ -200,7 +200,6 @@ enum csr_roam_stats_classtypes {
 	eCsrMaxStats
 };
 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT
 enum csr_diagwlan_status_eventsubtype {
 	eCSR_WLAN_STATUS_CONNECT = 0,
 	eCSR_WLAN_STATUS_DISCONNECT
@@ -216,11 +215,8 @@ enum csr_diagwlan_status_eventreason {
 	eCSR_REASON_ROAM_SYNCH_IND,
 	eCSR_REASON_ROAM_SYNCH_CNF,
 	eCSR_REASON_ROAM_HO_FAIL,
-
 };
 
-#endif /* FEATURE_WLAN_DIAG_SUPPORT */
-
 struct csr_channel {
 	uint8_t numChannels;
 	uint8_t channelList[WNI_CFG_VALID_CHANNEL_LIST_LEN];
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 012079d63baf..483215c025d3 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -7330,7 +7330,6 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx,
 	tSirMacAddr bcast_mac = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 	QDF_STATUS status;
 	host_log_ibss_pkt_type *ibss_log;
-	uint32_t bi;
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
 	tSirSmeHTProfile *src_profile = NULL;
 	tCsrRoamHTProfile *dst_profile = NULL;
@@ -7404,6 +7403,7 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx,
 	WLAN_HOST_DIAG_LOG_ALLOC(ibss_log,
 		host_log_ibss_pkt_type, LOG_WLAN_IBSS_C);
 	if (ibss_log) {
+		uint32_t bi;
 		if (CSR_INVALID_SCANRESULT_HANDLE ==
 				cmd->u.roamCmd.hBSSList) {
 			/*
@@ -7431,6 +7431,7 @@ static void csr_roam_process_start_bss_success(tpAniSirGlobal mac_ctx,
 		WLAN_HOST_DIAG_LOG_REPORT(ibss_log);
 	}
 #endif
+	ibss_log = NULL;
 	/*
 	 * Only set context for non-WDS_STA. We don't even need it for
 	 * WDS_AP. But since the encryption.
@@ -8135,6 +8136,7 @@ static bool csr_roam_process_results(tpAniSirGlobal mac_ctx, tSmeCmd *cmd,
 			WLAN_HOST_DIAG_LOG_REPORT(ibss_log);
 		}
 #endif
+		ibss_log = NULL;
 		start_bss_rsp = (tSirSmeStartBssRsp *)context;
 		qdf_mem_set(&roam_info, sizeof(roam_info), 0);
 		roam_status = eCSR_ROAM_IBSS_IND;
diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c
index a2ad3a05a9ef..170d16d93a90 100644
--- a/core/sme/src/csr/csr_api_scan.c
+++ b/core/sme/src/csr/csr_api_scan.c
@@ -770,6 +770,7 @@ void csr_clear_votes_for_country_info(tpAniSirGlobal pMac)
 		    sizeof(struct csr_votes11d) * CSR_MAX_NUM_COUNTRY_CODE, 0);
 }
 
+#ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
 /* caller allocated memory for pNumChn and pChnPowerInfo */
 /* As input, *pNumChn has the size of the array of pChnPowerInfo */
 /* Upon return, *pNumChn has the number of channels assigned. */
@@ -796,10 +797,8 @@ static void csr_get_channel_power_info(tpAniSirGlobal pMac, tDblLinkList *list,
 		entry = csr_ll_next(list, entry, LL_ACCESS_LOCK);
 	}
 	*num_ch = chn_idx;
-
 }
 
-#ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
 static void csr_diag_apply_country_info(tpAniSirGlobal mac_ctx)
 {
 	host_log_802_11d_pkt_type *p11dLog;