diff --git a/src/doomdef.h b/src/doomdef.h
index 5318ee3e7..be24fefda 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -103,6 +103,14 @@ extern "C" {
 
 //#define NOMD5
 
+// If you don't disable ALL debug first, you get ALL debug enabled
+#if !defined (NDEBUG)
+#define PACKETDROP
+#define PARANOIA
+#define RANGECHECK
+#define ZDEBUG
+#endif
+
 // Uncheck this to compile debugging code
 //#define RANGECHECK
 //#ifndef PARANOIA
diff --git a/src/z_zone.h b/src/z_zone.h
index d45fde9b3..5132c0d55 100644
--- a/src/z_zone.h
+++ b/src/z_zone.h
@@ -15,6 +15,7 @@
 #define __Z_ZONE__
 
 #include <stdio.h>
+#include "doomdef.h"
 #include "doomtype.h"
 
 #ifdef __cplusplus