diff --git a/Kbuild b/Kbuild
index b079091647af..8706e1b3a02c 100644
--- a/Kbuild
+++ b/Kbuild
@@ -542,7 +542,6 @@ MAC_LIM_OBJS := $(MAC_SRC_DIR)/pe/lim/lim_aid_mgmt.o \
 		$(MAC_SRC_DIR)/pe/lim/lim_admit_control.o \
 		$(MAC_SRC_DIR)/pe/lim/lim_api.o \
 		$(MAC_SRC_DIR)/pe/lim/lim_assoc_utils.o \
-		$(MAC_SRC_DIR)/pe/lim/lim_debug.o \
 		$(MAC_SRC_DIR)/pe/lim/lim_ft.o \
 		$(MAC_SRC_DIR)/pe/lim/lim_ibss_peer_mgmt.o \
 		$(MAC_SRC_DIR)/pe/lim/lim_link_monitoring_algo.o \
diff --git a/core/mac/src/dph/dph_hash_table.c b/core/mac/src/dph/dph_hash_table.c
index ae22dd7973fb..0c1a861f2299 100644
--- a/core/mac/src/dph/dph_hash_table.c
+++ b/core/mac/src/dph/dph_hash_table.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -41,8 +41,7 @@
 #include "cfg_api.h"
 #include "sch_api.h"
 #include "dph_global.h"
-#include "lim_debug.h"
-
+#include "lim_api.h"
 #include "wma_if.h"
 
 /* --------------------------------------------------------------------- */
diff --git a/core/mac/src/pe/include/lim_api.h b/core/mac/src/pe/include/lim_api.h
index a9b99760f8f6..50ad15ebc9b3 100644
--- a/core/mac/src/pe/include/lim_api.h
+++ b/core/mac/src/pe/include/lim_api.h
@@ -379,5 +379,7 @@ QDF_STATUS lim_update_ext_cap_ie(tpAniSirGlobal mac_ctx,
 			  LIM_HE_MU_BEAMFORMER_BIT_POS)
 #endif
 
+void lim_log(tpAniSirGlobal pMac, uint32_t loglevel,
+		const char *pString, ...);
 /************************************************************/
 #endif /* __LIM_API_H */
diff --git a/core/mac/src/pe/include/lim_ft.h b/core/mac/src/pe/include/lim_ft.h
index 35a1ce406a67..8f72a4eb7c10 100644
--- a/core/mac/src/pe/include/lim_ft.h
+++ b/core/mac/src/pe/include/lim_ft.h
@@ -37,7 +37,6 @@
 #include <cds_api.h>
 #include <lim_global.h>
 #include <ani_global.h>
-#include <lim_debug.h>
 #include <lim_ser_des_utils.h>
 
 /*-------------------------------------------------------------------------
diff --git a/core/mac/src/pe/lim/lim_admit_control.c b/core/mac/src/pe/lim/lim_admit_control.c
index 2910d98cad68..6bda4b472a42 100644
--- a/core/mac/src/pe/lim/lim_admit_control.c
+++ b/core/mac/src/pe/lim/lim_admit_control.c
@@ -36,7 +36,6 @@
  * --------------------------------------------------------------------
  *
  */
-#include "lim_debug.h"
 #include "sys_def.h"
 #include "lim_api.h"
 #include "cfg_api.h"             /* wlan_cfg_get_int() */
diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index 6afca6f642fb..a0cdcfac75e3 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -2485,3 +2485,14 @@ QDF_STATUS lim_update_ext_cap_ie(tpAniSirGlobal mac_ctx,
 	return QDF_STATUS_SUCCESS;
 }
 
+void lim_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...)
+{
+#ifdef WLAN_DEBUG
+	va_list marker;
+
+	va_start(marker, pString);
+	log_debug(pMac, SIR_LIM_MODULE_ID, loglevel, pString, marker);
+	va_end(marker);
+#endif
+}
+
diff --git a/core/mac/src/pe/lim/lim_debug.h b/core/mac/src/pe/lim/lim_debug.h
deleted file mode 100644
index e0ab7f6251f1..000000000000
--- a/core/mac/src/pe/lim/lim_debug.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2011-2012, 2014-2015 The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * This file was originally distributed by Qualcomm Atheros, Inc.
- * under proprietary terms before Copyright ownership was assigned
- * to the Linux Foundation.
- */
-
-/*
- * This file lim_debug.h contains log function called by LIM module.
- *
- * Author:      Chandra Modumudi
- * Date:        02/11/02
- * History:-
- * Date         Modified by    Modification Information
- * --------------------------------------------------------------------
- *
- */
-
-#ifndef __LIM_DEBUG_H__
-#define __LIM_DEBUG_H__
-
-#include "utils_api.h"
-#include "sir_debug.h"
-
-#if !defined(__printf)
-#define __printf(a, b)
-#endif
-
-void __printf(3, 4) lim_log(tpAniSirGlobal pMac, uint32_t loglevel,
-			    const char *pString, ...);
-
-/* define this to show more message in the LIM during TDLS development */
-#define LIM_DEBUG_TDLS
-
-#ifdef LIM_DEBUG_TDLS
-#define LIM_LOG_TDLS(x0) x0
-#else
-#define LIM_LOG_TDLS(x0)
-#endif
-
-#endif
diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c
index 202b2531c01b..b3fabc368f77 100644
--- a/core/mac/src/pe/lim/lim_process_tdls.c
+++ b/core/mac/src/pe/lim/lim_process_tdls.c
@@ -170,8 +170,6 @@ enum tdls_peer_capability {
 		CLEAR_BIT(peer_bitmap[1], ((aid) - (sizeof(uint32_t) << 3)));\
 	} while (0);
 
-#ifdef LIM_DEBUG_TDLS
-
 #ifdef FEATURE_WLAN_TDLS
 #define WNI_CFG_TDLS_LINK_SETUP_RSP_TIMEOUT         (800)
 #define WNI_CFG_TDLS_LINK_SETUP_CNF_TIMEOUT         (200)
@@ -201,7 +199,7 @@ static const uint8_t *lim_trace_tdls_action_string(uint8_t tdlsActionCode)
 	}
 	return (const uint8_t *)"UNKNOWN";
 }
-#endif
+
 /*
  * initialize TDLS setup list and related data structures.
  */
diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c
index e507cfceb431..ff483eb60126 100644
--- a/core/mac/src/pe/lim/lim_session.c
+++ b/core/mac/src/pe/lim/lim_session.c
@@ -39,7 +39,6 @@
    Include Files
    ------------------------------------------------------------------------*/
 #include "ani_global.h"
-#include "lim_debug.h"
 #include "lim_ft_defs.h"
 #include "lim_ft.h"
 #include "lim_session.h"
diff --git a/core/mac/src/pe/lim/lim_session_utils.c b/core/mac/src/pe/lim/lim_session_utils.c
index fb9aab1443e2..6571da74e7f9 100644
--- a/core/mac/src/pe/lim/lim_session_utils.c
+++ b/core/mac/src/pe/lim/lim_session_utils.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -36,7 +36,6 @@
    Include Files
    ------------------------------------------------------------------------*/
 #include "ani_global.h"
-#include "lim_debug.h"
 #include "lim_ft_defs.h"
 #include "lim_session.h"
 #include "lim_session_utils.h"
diff --git a/core/mac/src/pe/lim/lim_types.h b/core/mac/src/pe/lim/lim_types.h
index d7b46af575a2..8f83c5d4979d 100644
--- a/core/mac/src/pe/lim/lim_types.h
+++ b/core/mac/src/pe/lim/lim_types.h
@@ -45,7 +45,6 @@
 #include "utils_api.h"
 
 #include "lim_api.h"
-#include "lim_debug.h"
 #include "lim_trace.h"
 #include "lim_send_sme_rsp_messages.h"
 #include "sys_global.h"