diff --git a/include/polarssl/debug.h b/include/polarssl/debug.h
index 406cfa8be..2dd89a227 100644
--- a/include/polarssl/debug.h
+++ b/include/polarssl/debug.h
@@ -57,10 +57,7 @@
 
 
 #define SSL_DEBUG_MSG( level, args )                    \
-    do {                                                \
-        if( level <= debug_threshold )                  \
-            debug_print_msg_free( ssl, level, __FILE__, __LINE__, debug_fmt args ); \
-    } while( 0 )
+    debug_print_msg_free( ssl, level, __FILE__, __LINE__, debug_fmt args );
 
 #define SSL_DEBUG_RET( level, text, ret )                \
     debug_print_ret( ssl, level, __FILE__, __LINE__, text, ret );
@@ -150,8 +147,6 @@ void debug_print_crt( const ssl_context *ssl, int level,
                       const char *text, const x509_crt *crt );
 #endif
 
-extern int debug_threshold;
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/library/debug.c b/library/debug.c
index 0aa90e1b2..9adcf07be 100644
--- a/library/debug.c
+++ b/library/debug.c
@@ -55,7 +55,7 @@
 #define DEBUG_BUF_SIZE  512
 
 static int debug_log_mode = POLARSSL_DEBUG_DFL_MODE;
-int debug_threshold = 0;
+static int debug_threshold = 0;
 
 void debug_set_log_mode( int log_mode )
 {