diff --git a/common/Makefile.am b/common/Makefile.am
index 15466c9a..0af033a3 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -20,8 +20,6 @@ AM_CPPFLAGS = \
 
 if XRDP_DEBUG
 AM_CPPFLAGS += -DXRDP_DEBUG
-else
-AM_CPPFLAGS += -DXRDP_NODEBUG
 endif
 
 AM_CFLAGS = $(OPENSSL_CFLAGS)
diff --git a/common/log.h b/common/log.h
index d6a5b8f2..d1552ccb 100644
--- a/common/log.h
+++ b/common/log.h
@@ -22,7 +22,6 @@
 #include <pthread.h>
 
 #include "arch.h"
-#include "defines.h"
 
 /* logging buffer size */
 #define LOG_BUFFER_SIZE      1024
@@ -58,7 +57,7 @@ enum logReturns
 /* enable threading */
 /*#define LOG_ENABLE_THREAD*/
 
-#ifdef DEBUG
+#ifdef XRDP_DEBUG
 #define LOG_DBG(args...) log_message(LOG_LEVEL_DEBUG, args);
 #else
 #define LOG_DBG(args...)
diff --git a/common/pixman-region.c b/common/pixman-region.c
index b1949950..2d199de8 100644
--- a/common/pixman-region.c
+++ b/common/pixman-region.c
@@ -79,7 +79,7 @@
 #define GOOD_RECT(rect) ((rect)->x1 < (rect)->x2 && (rect)->y1 < (rect)->y2)
 #define BAD_RECT(rect) ((rect)->x1 > (rect)->x2 || (rect)->y1 > (rect)->y2)
 
-#ifdef DEBUG
+#ifdef XRDP_DEBUG
 
 #define GOOD(reg)                                                       \
     do                                                                  \
diff --git a/libxrdp/Makefile.am b/libxrdp/Makefile.am
index 0452c1da..3812de9c 100644
--- a/libxrdp/Makefile.am
+++ b/libxrdp/Makefile.am
@@ -14,8 +14,6 @@ LIBXRDP_EXTRA_LIBS =
 
 if XRDP_DEBUG
 AM_CPPFLAGS += -DXRDP_DEBUG
-else
-AM_CPPFLAGS += -DXRDP_NODEBUG
 endif
 
 if XRDP_NEUTRINORDP
diff --git a/mc/Makefile.am b/mc/Makefile.am
index eebef8c3..2171a180 100644
--- a/mc/Makefile.am
+++ b/mc/Makefile.am
@@ -7,8 +7,6 @@ AM_CPPFLAGS = \
 
 if XRDP_DEBUG
 AM_CPPFLAGS += -DXRDP_DEBUG
-else
-AM_CPPFLAGS += -DXRDP_NODEBUG
 endif
 
 module_LTLIBRARIES = \
diff --git a/neutrinordp/Makefile.am b/neutrinordp/Makefile.am
index fb5bf030..e15dacc6 100644
--- a/neutrinordp/Makefile.am
+++ b/neutrinordp/Makefile.am
@@ -8,8 +8,6 @@ AM_CPPFLAGS = \
 
 if XRDP_DEBUG
 AM_CPPFLAGS += -DXRDP_DEBUG
-else
-AM_CPPFLAGS += -DXRDP_NODEBUG
 endif
 
 module_LTLIBRARIES = \
diff --git a/rdp/Makefile.am b/rdp/Makefile.am
index 30368156..6b649aab 100644
--- a/rdp/Makefile.am
+++ b/rdp/Makefile.am
@@ -7,8 +7,6 @@ AM_CPPFLAGS = \
 
 if XRDP_DEBUG
 AM_CPPFLAGS += -DXRDP_DEBUG
-else
-AM_CPPFLAGS += -DXRDP_NODEBUG
 endif
 
 module_LTLIBRARIES = \
diff --git a/sesman/Makefile.am b/sesman/Makefile.am
index 0cf419da..207890ac 100644
--- a/sesman/Makefile.am
+++ b/sesman/Makefile.am
@@ -11,8 +11,6 @@ AM_CPPFLAGS = \
 
 if XRDP_DEBUG
 AM_CPPFLAGS += -DXRDP_DEBUG
-else
-AM_CPPFLAGS += -DXRDP_NODEBUG
 endif
 
 if SESMAN_NOPAM
diff --git a/sesman/chansrv/Makefile.am b/sesman/chansrv/Makefile.am
index d89b96fb..05ca50f5 100644
--- a/sesman/chansrv/Makefile.am
+++ b/sesman/chansrv/Makefile.am
@@ -13,8 +13,6 @@ AM_CPPFLAGS = \
 
 if XRDP_DEBUG
 AM_CPPFLAGS += -DXRDP_DEBUG
-else
-AM_CPPFLAGS += -DXRDP_NODEBUG
 endif
 
 CHANSRV_EXTRA_LIBS =
diff --git a/sesman/libscp/Makefile.am b/sesman/libscp/Makefile.am
index ea4bdd42..fc382b43 100644
--- a/sesman/libscp/Makefile.am
+++ b/sesman/libscp/Makefile.am
@@ -7,8 +7,6 @@ AM_CPPFLAGS = \
 
 if XRDP_DEBUG
 AM_CPPFLAGS += -DXRDP_DEBUG
-else
-AM_CPPFLAGS += -DXRDP_NODEBUG
 endif
 
 module_LTLIBRARIES = \
diff --git a/sesman/tools/Makefile.am b/sesman/tools/Makefile.am
index 7f27f8b1..9d6d6f9e 100644
--- a/sesman/tools/Makefile.am
+++ b/sesman/tools/Makefile.am
@@ -9,8 +9,6 @@ AM_CPPFLAGS = \
 
 if XRDP_DEBUG
 AM_CPPFLAGS += -DXRDP_DEBUG
-else
-AM_CPPFLAGS += -DXRDP_NODEBUG
 endif
 
 AM_CFLAGS = $(X_CFLAGS)
diff --git a/vnc/Makefile.am b/vnc/Makefile.am
index fc0f8385..80e486c3 100644
--- a/vnc/Makefile.am
+++ b/vnc/Makefile.am
@@ -7,8 +7,6 @@ AM_CPPFLAGS = \
 
 if XRDP_DEBUG
 AM_CPPFLAGS += -DXRDP_DEBUG
-else
-AM_CPPFLAGS += -DXRDP_NODEBUG
 endif
 
 module_LTLIBRARIES = \
diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am
index f39610a0..3765f203 100644
--- a/xrdp/Makefile.am
+++ b/xrdp/Makefile.am
@@ -17,8 +17,6 @@ XRDP_EXTRA_LIBS =
 
 if XRDP_DEBUG
 AM_CPPFLAGS += -DXRDP_DEBUG
-else
-AM_CPPFLAGS += -DXRDP_NODEBUG
 endif
 
 if XRDP_RFXCODEC
diff --git a/xup/Makefile.am b/xup/Makefile.am
index 2a4fa0df..76fc016a 100644
--- a/xup/Makefile.am
+++ b/xup/Makefile.am
@@ -7,8 +7,6 @@ AM_CPPFLAGS = \
 
 if XRDP_DEBUG
 AM_CPPFLAGS += -DXRDP_DEBUG
-else
-AM_CPPFLAGS += -DXRDP_NODEBUG
 endif
 
 module_LTLIBRARIES = \