diff --git a/wmail/src/common.c b/wmail/src/common.c
index a4f1736..8887cb2 100644
--- a/wmail/src/common.c
+++ b/wmail/src/common.c
@@ -42,7 +42,7 @@
 
 #include "common.h"
 
-#if defined(DEBUG) || defined(DEBUG2) || defined(_DEBUG)
+#ifdef DEBUG
 void TRACE( const char *fmt, ... )
 {
     va_list args;
diff --git a/wmail/src/common.h b/wmail/src/common.h
index 06d38f5..0ef35fe 100644
--- a/wmail/src/common.h
+++ b/wmail/src/common.h
@@ -76,7 +76,7 @@ void ABORT( const char *fmt, ... );
 void WARNING( const char *fmt, ... );
 char *MakePathName( const char *dir, const char *file );
 
-#if defined(DEBUG) || defined(DEBUG2) || defined(_DEBUG)
+#ifdef DEBUG
 
 void TRACE( const char *fmt, ... );
 #define ASSERT( EXPR ) ((void)(EXPR ? 0 : ABORT( "%s(%i): Assertion failed: \"%s\"\n", __FILE__, __LINE__, #EXPR )))