diff --git a/CASA-auth-token/client/library/mechanisms/krb5/internal.h b/CASA-auth-token/client/library/mechanisms/krb5/internal.h
index 7646275b..f2f1b8ec 100644
--- a/CASA-auth-token/client/library/mechanisms/krb5/internal.h
+++ b/CASA-auth-token/client/library/mechanisms/krb5/internal.h
@@ -44,6 +44,8 @@
 //===[ Global externals ]==================================================
 
 extern int  KrbMechDebugLevel;
+extern char *pKrbMechDebugLogFilePath;
+
 
 //===[ External prototypes ]===============================================
 
diff --git a/CASA-auth-token/client/library/mechanisms/krb5/linux/platform.h b/CASA-auth-token/client/library/mechanisms/krb5/linux/platform.h
index e8490077..30640e0d 100644
--- a/CASA-auth-token/client/library/mechanisms/krb5/linux/platform.h
+++ b/CASA-auth-token/client/library/mechanisms/krb5/linux/platform.h
@@ -61,7 +61,7 @@ char printBuff[256];                                     \
    }                                                     \
 }*/
 #define DbgTrace(LEVEL, X, Y) {                                                        \
-   if (LEVEL == 0 || DebugLevel >= LEVEL)                                              \
+   if (LEVEL == 0 || KrbMechDebugLevel >= LEVEL)                                              \
    {                                                                                   \
       openlog("CASA_Krb5Mech", LOG_CONS | LOG_NOWAIT | LOG_ODELAY, LOG_USER);          \
       syslog(LOG_USER | LOG_INFO, X, Y);                                               \
diff --git a/CASA-auth-token/client/library/mechanisms/krb5/windows/platform.h b/CASA-auth-token/client/library/mechanisms/krb5/windows/platform.h
index 1395068a..7f0255a7 100644
--- a/CASA-auth-token/client/library/mechanisms/krb5/windows/platform.h
+++ b/CASA-auth-token/client/library/mechanisms/krb5/windows/platform.h
@@ -52,7 +52,6 @@
 //      printf("Krb5Mech %s", printBuff);                  \
 //   }                                                     \
 //}
-extern char  *pKrbMechDebugLogFilePath;
 #define DbgTrace(LEVEL, X, Y) {                                  \
 char formatBuff[128];                                            \
 char printBuff[256];                                             \
diff --git a/CASA-auth-token/client/library/mechanisms/pwd/internal.h b/CASA-auth-token/client/library/mechanisms/pwd/internal.h
index f38973b7..847650f9 100644
--- a/CASA-auth-token/client/library/mechanisms/pwd/internal.h
+++ b/CASA-auth-token/client/library/mechanisms/pwd/internal.h
@@ -46,6 +46,8 @@
 //===[ Global externals ]==================================================
 
 extern int  PwdMechDebugLevel;
+extern char *pPwdMechDebugLogFilePath;
+
 
 //===[ External prototypes ]===============================================
 
diff --git a/CASA-auth-token/client/library/mechanisms/pwd/linux/platform.h b/CASA-auth-token/client/library/mechanisms/pwd/linux/platform.h
index f0fdeabb..df916de0 100644
--- a/CASA-auth-token/client/library/mechanisms/pwd/linux/platform.h
+++ b/CASA-auth-token/client/library/mechanisms/pwd/linux/platform.h
@@ -59,7 +59,7 @@ char printBuff[256];                                     \
    }                                                     \
 }*/
 #define DbgTrace(LEVEL, X, Y) {                                                        \
-   if (LEVEL == 0 || DebugLevel >= LEVEL)                                              \
+   if (LEVEL == 0 || PwdMechDebugLevel >= LEVEL)                                              \
    {                                                                                   \
       openlog("CASA_PwMech", LOG_CONS | LOG_NOWAIT | LOG_ODELAY, LOG_USER);            \
       syslog(LOG_USER | LOG_INFO, X, Y);                                               \
diff --git a/CASA-auth-token/client/library/mechanisms/pwd/windows/platform.h b/CASA-auth-token/client/library/mechanisms/pwd/windows/platform.h
index 107c2012..98ea3a12 100644
--- a/CASA-auth-token/client/library/mechanisms/pwd/windows/platform.h
+++ b/CASA-auth-token/client/library/mechanisms/pwd/windows/platform.h
@@ -50,7 +50,6 @@
 //      printf("PwdMech %s", printBuff);                   \
 //   }                                                     \
 //}
-extern char  *pPwdMechDebugLogFilePath;
 #define DbgTrace(LEVEL, X, Y) {                                  \
 char formatBuff[128];                                            \
 char printBuff[256];                                             \