8 files changed, 7 insertions, 25 deletions
diff --git a/wmi/inc/wmi_unified_api.h b/wmi/inc/wmi_unified_api.h
index a71c88787a81..aa545493d52e 100644
--- a/wmi/inc/wmi_unified_api.h
+++ b/wmi/inc/wmi_unified_api.h
@@ -34,7 +34,6 @@
 #define _WMI_UNIFIED_API_H_
 
 #include <osdep.h>
-#include "a_types.h"
 #ifdef CONFIG_MCL
 #include "wmi.h"
 #endif
diff --git a/wmi/inc/wmi_unified_non_tlv.h b/wmi/inc/wmi_unified_non_tlv.h
index 892efc881156..3e50b8f207b5 100644
--- a/wmi/inc/wmi_unified_non_tlv.h
+++ b/wmi/inc/wmi_unified_non_tlv.h
@@ -26,7 +26,6 @@
  */
 
 #include <osdep.h>
-#include "a_types.h"
 #include "wmi_unified_param.h"
 #include "legacy/wmi.h"
 #include "legacy/wmi_unified.h"
diff --git a/wmi/inc/wmi_unified_priv.h b/wmi/inc/wmi_unified_priv.h
index 4dba6bd99993..22880dcc1795 100644
--- a/wmi/inc/wmi_unified_priv.h
+++ b/wmi/inc/wmi_unified_priv.h
@@ -32,8 +32,11 @@
 #ifndef _WMI_UNIFIED_PRIV_H_
 #define _WMI_UNIFIED_PRIV_H_
 #include <osdep.h>
-#include "a_types.h"
+#include "wmi_unified_api.h"
 #include "wmi_unified_param.h"
+#ifdef CONFIG_MCL
+#include <wmi_unified.h>
+#endif
 #include "qdf_atomic.h"
 
 #define WMI_UNIFIED_MAX_EVENT 0x100
diff --git a/wmi/inc/wmi_unified_tlv.h b/wmi/inc/wmi_unified_tlv.h
index 5f244e69b4d5..e285728930f8 100644
--- a/wmi/inc/wmi_unified_tlv.h
+++ b/wmi/inc/wmi_unified_tlv.h
@@ -27,7 +27,6 @@
 #ifndef _WMI_UNIFIED_TLV_H_
 #define _WMI_UNIFIED_TLV_H_
 #include <osdep.h>
-#include "a_types.h"
 #include "wmi_unified_param.h"
 #include "wmi.h"
 #include "wmi_unified.h"
diff --git a/wmi/src/wmi_tlv_platform.c b/wmi/src/wmi_tlv_platform.c
index d7858aed6d4f..7e0add1ad798 100644
--- a/wmi/src/wmi_tlv_platform.c
+++ b/wmi/src/wmi_tlv_platform.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2014, 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2014, 2016-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -29,7 +29,6 @@
  * LMAC offload interface functions for WMI TLV Interface
  */
 
-#include "ol_if_athvar.h"
 #include <qdf_mem.h>         /* qdf_mem_malloc,free, etc. */
 #include <osdep.h>
 #include "htc_api.h"
diff --git a/wmi/src/wmi_unified.c b/wmi/src/wmi_unified.c
index e9fc6e926dbb..f91863aab3eb 100644
--- a/wmi/src/wmi_unified.c
+++ b/wmi/src/wmi_unified.c
@@ -28,16 +28,9 @@
 /*
  * Host WMI unified implementation
  */
-#include "athdefs.h"
-#include "osapi_linux.h"
-#include "a_types.h"
-#include "a_debug.h"
-#include "ol_if_athvar.h"
 #include "htc_api.h"
 #include "htc_api.h"
-#include "dbglog_host.h"
 #include "wmi_unified_priv.h"
-#include "wmi_unified_param.h"
 
 #include <linux/debugfs.h>
 
@@ -1063,7 +1056,7 @@ static uint8_t *wmi_id_to_name(uint32_t wmi_command)
 
 
 #ifndef WMI_NON_TLV_SUPPORT
-static inline void wma_log_cmd_id(uint32_t cmd_id, uint32_t tag)
+static inline void wmi_log_cmd_id(uint32_t cmd_id, uint32_t tag)
 {
 	WMI_LOGD("Send WMI command:%s command_id:%d htc_tag:%d",
 		 wmi_id_to_name(cmd_id), cmd_id, tag);
@@ -1184,7 +1177,7 @@ QDF_STATUS wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf,
 
 	SET_HTC_PACKET_NET_BUF_CONTEXT(pkt, buf);
 #ifndef WMI_NON_TLV_SUPPORT
-	wma_log_cmd_id(cmd_id, htc_tag);
+	wmi_log_cmd_id(cmd_id, htc_tag);
 #endif
 
 #ifdef WMI_INTERFACE_EVENT_LOGGING
diff --git a/wmi/src/wmi_unified_api.c b/wmi/src/wmi_unified_api.c
index b14eb90b6422..8dc13e1fa505 100644
--- a/wmi/src/wmi_unified_api.c
+++ b/wmi/src/wmi_unified_api.c
@@ -24,11 +24,6 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-#include "athdefs.h"
-#include "osapi_linux.h"
-#include "a_types.h"
-#include "a_debug.h"
-#include "ol_if_athvar.h"
 #include "wmi_unified_priv.h"
 #include "wmi_unified_param.h"
 
diff --git a/wmi/src/wmi_unified_non_tlv.c b/wmi/src/wmi_unified_non_tlv.c
index 0bc4c1b83f36..2ee8ff02fd43 100644
--- a/wmi/src/wmi_unified_non_tlv.c
+++ b/wmi/src/wmi_unified_non_tlv.c
@@ -25,11 +25,6 @@
  * to the Linux Foundation.
  */
 
-#include "athdefs.h"
-#include "osapi_linux.h"
-#include "a_types.h"
-#include "a_debug.h"
-#include "ol_if_athvar.h"
 #include "wmi_unified_api.h"
 #include "wmi_unified_priv.h"