diff --git a/os_if/linux/cp_stats/inc/wlan_cfg80211_mc_cp_stats.h b/os_if/linux/cp_stats/inc/wlan_cfg80211_mc_cp_stats.h
index bcc1b5f211..9b44112c80 100644
--- a/os_if/linux/cp_stats/inc/wlan_cfg80211_mc_cp_stats.h
+++ b/os_if/linux/cp_stats/inc/wlan_cfg80211_mc_cp_stats.h
@@ -105,6 +105,37 @@ void wlan_cfg80211_mc_cp_stats_free_stats_event(struct stats_event *info);
 struct stats_event *
 wlan_cfg80211_mc_cp_stats_get_peer_rssi(struct wlan_objmgr_vdev *vdev,
 					uint8_t *macaddress, int *errno);
+#else
+static inline int wlan_cfg80211_mc_cp_stats_get_tx_power(
+				struct wlan_objmgr_vdev *vdev,
+				int *dbm)
+{
+	return 0;
+}
 
+static inline int wlan_cfg80211_mc_cp_stats_get_wakelock_stats(
+				struct wlan_objmgr_psoc *psoc,
+				struct wiphy *wiphy)
+{
+	return 0;
+}
+
+static inline struct stats_event *
+wlan_cfg80211_mc_cp_stats_get_peer_rssi(struct wlan_objmgr_vdev *vdev,
+					uint8_t *macaddress, int *errno)
+{
+	return NULL;
+}
+
+static inline void wlan_cfg80211_mc_cp_stats_free_stats_event(
+			struct stats_event *info)
+{}
+
+static inline struct stats_event *
+wlan_cfg80211_mc_cp_stats_get_station_stats(struct wlan_objmgr_vdev *vdev,
+					    int *errno)
+{
+	return NULL;
+}
 #endif /* QCA_SUPPORT_CP_STATS */
 #endif /* __WLAN_CFG80211_MC_CP_STATS_H__ */
diff --git a/qdf/inc/qdf_trace.h b/qdf/inc/qdf_trace.h
index f2adc2c5c5..f8bcb8d789 100644
--- a/qdf/inc/qdf_trace.h
+++ b/qdf/inc/qdf_trace.h
@@ -574,7 +574,7 @@ void qdf_trace_dump_all(void *p_mac, uint8_t code, uint8_t session,
 static inline
 QDF_STATUS qdf_trace_spin_lock_init(void)
 {
-	return QDF_STATUS_E_INVAL;
+	return QDF_STATUS_SUCCESS;
 }
 #endif
 #endif
diff --git a/qdf/linux/src/i_qdf_trace.h b/qdf/linux/src/i_qdf_trace.h
index 2da0f2464a..b0b6fced73 100644
--- a/qdf/linux/src/i_qdf_trace.h
+++ b/qdf/linux/src/i_qdf_trace.h
@@ -63,9 +63,9 @@
 #define QDF_VTRACE qdf_vtrace_msg
 #define QDF_TRACE_HEX_DUMP qdf_trace_hex_dump
 #else
-#define QDF_TRACE(arg ...)
-#define QDF_VTRACE(arg ...)
-#define QDF_TRACE_HEX_DUMP(arg ...)
+#define QDF_TRACE(arg ...) __qdf_trace_dummy(arg)
+#define QDF_VTRACE(arg ...) __qdf_vtrace_dummy(arg)
+#define QDF_TRACE_HEX_DUMP(arg ...) __qdf_trace_hexdump_dummy(arg)
 #endif
 
 #if defined(WLAN_DEBUG) || defined(DEBUG) || defined(QDF_TRACE_PRINT_ENABLE)
@@ -108,6 +108,16 @@
 
 static inline void __qdf_trace_noop(QDF_MODULE_ID module,
 				    const char *format, ...) { }
+static inline void __qdf_trace_dummy(QDF_MODULE_ID module,
+				     QDF_TRACE_LEVEL level,
+				     const char *format, ...) { }
+static inline void __qdf_vtrace_dummy(QDF_MODULE_ID module,
+				      QDF_TRACE_LEVEL level,
+				      const char *str_format, va_list val) { }
+static inline void __qdf_trace_hexdump_dummy(QDF_MODULE_ID module,
+					     QDF_TRACE_LEVEL level,
+					     void *data, int buf_len) { }
+
 
 #ifdef WLAN_LOG_FATAL
 #define QDF_TRACE_FATAL(params...) \
diff --git a/umac/cp_stats/dispatcher/inc/wlan_cp_stats_mc_ucfg_api.h b/umac/cp_stats/dispatcher/inc/wlan_cp_stats_mc_ucfg_api.h
index 200eef9a29..909c626245 100644
--- a/umac/cp_stats/dispatcher/inc/wlan_cp_stats_mc_ucfg_api.h
+++ b/umac/cp_stats/dispatcher/inc/wlan_cp_stats_mc_ucfg_api.h
@@ -228,5 +228,56 @@ void static inline ucfg_mc_cp_stats_register_pmo_handler(void) { };
 #endif /* WLAN_POWER_MANAGEMENT_OFFLOAD */
 #else
 void static inline ucfg_mc_cp_stats_register_pmo_handler(void) { };
+static inline QDF_STATUS ucfg_mc_cp_stats_send_stats_request(
+				struct wlan_objmgr_vdev *vdev,
+				enum stats_req_type type,
+				struct request_info *info)
+{
+	return QDF_STATUS_SUCCESS;
+}
+
+static inline QDF_STATUS ucfg_mc_cp_stats_set_rate_flags(
+				struct wlan_objmgr_vdev *vdev,
+				enum tx_rate_info flags)
+{
+	return QDF_STATUS_SUCCESS;
+}
+
+static inline QDF_STATUS ucfg_mc_cp_stats_get_psoc_wake_lock_stats(
+						struct wlan_objmgr_psoc *psoc,
+						struct wake_lock_stats *stats)
+{
+	return QDF_STATUS_SUCCESS;
+}
+
+static inline QDF_STATUS ucfg_mc_cp_stats_inc_wake_lock_stats_by_protocol(
+					struct wlan_objmgr_psoc *psoc,
+					uint8_t vdev_id,
+					enum qdf_proto_subtype protocol)
+{
+	return QDF_STATUS_SUCCESS;
+}
+
+static inline QDF_STATUS ucfg_mc_cp_stats_inc_wake_lock_stats(
+				struct wlan_objmgr_psoc *psoc,
+				uint8_t vdev_id,
+				uint32_t reason)
+{
+	return QDF_STATUS_SUCCESS;
+}
+
+static inline QDF_STATUS ucfg_mc_cp_stats_inc_wake_lock_stats_by_dst_addr(
+					struct wlan_objmgr_psoc *psoc,
+					uint8_t vdev_id, uint8_t *dest_mac)
+{
+	return QDF_STATUS_SUCCESS;
+}
+
+static inline QDF_STATUS ucfg_mc_cp_stats_get_vdev_wake_lock_stats(
+						struct wlan_objmgr_vdev *vdev,
+						struct wake_lock_stats *stats)
+{
+	return QDF_STATUS_SUCCESS;
+}
 #endif /* QCA_SUPPORT_CP_STATS */
 #endif /* __WLAN_CP_STATS_MC_UCFG_API_H__ */
diff --git a/umac/regulatory/core/src/reg_opclass.h b/umac/regulatory/core/src/reg_opclass.h
index d2c832374a..28ea0f6386 100644
--- a/umac/regulatory/core/src/reg_opclass.h
+++ b/umac/regulatory/core/src/reg_opclass.h
@@ -196,9 +196,9 @@ reg_freq_to_chan_op_class(struct wlan_objmgr_pdev *pdev,
 
 #endif
 
-uint16_t reg_get_op_class_width(struct wlan_objmgr_pdev *pdev,
-				uint8_t op_class,
-				bool global_tbl_lookup)
+static inline uint16_t reg_get_op_class_width(struct wlan_objmgr_pdev *pdev,
+					      uint8_t op_class,
+					      bool global_tbl_lookup)
 {
 	return 0;
 }
diff --git a/utils/fwlog/dbglog_host.c b/utils/fwlog/dbglog_host.c
index 1f5c60bfa5..6a6d30ffd8 100644
--- a/utils/fwlog/dbglog_host.c
+++ b/utils/fwlog/dbglog_host.c
@@ -54,12 +54,10 @@
 #include <a_debug.h>
 #define FWLOG_DEBUG   ATH_DEBUG_MAKE_MODULE_MASK(0)
 
-#ifdef WLAN_DEBUG
-
 static int get_version;
 static int gprint_limiter;
 static bool tgt_assert_enable;
-
+#ifdef WLAN_DEBUG
 static ATH_DEBUG_MASK_DESCRIPTION g_fwlog_debug_description[] = {
 	{FWLOG_DEBUG, "fwlog"},
 };
diff --git a/utils/logging/inc/wlan_roam_debug.h b/utils/logging/inc/wlan_roam_debug.h
index e49c139842..9b66b843d7 100644
--- a/utils/logging/inc/wlan_roam_debug.h
+++ b/utils/logging/inc/wlan_roam_debug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -161,6 +161,14 @@ wlan_roam_debug_log(uint8_t vdev_id, uint8_t op,
 static inline void wlan_roam_debug_dump_table(void)
 {
 }
+
+static inline void wlan_roam_debug_init(void)
+{
+}
+
+static inline void wlan_roam_debug_deinit(void)
+{
+}
 #endif /* FEATURE_ROAM_DEBUG */
 
 #endif /* _WLAN_ROAM_DEBUG_H_ */