diff --git a/debug.h b/debug.h
index d54bc271ad07a80c7e8312aa62acac4944adcdac..b20e68504882a87ce219fdefa463705ae040f263 100644
--- a/debug.h
+++ b/debug.h
@@ -31,7 +31,7 @@
 
 /* Work well for valgrind - don't clear environment, be nicer with signals
  * etc. Don't use this normally, it might cause problems */
-#define DEBUG_VALGRIND
+/* #define DEBUG_VALGRIND */
 
 /* Define this to compile in trace debugging printf()s. 
  * You'll need to run programs with "-v" to turn this on.
@@ -39,7 +39,7 @@
  * Caution: Don't use this in an unfriendly environment (ie unfirewalled),
  * since the printing may not sanitise strings etc. This will add a reasonable
  * amount to your executable size. */
-#define DEBUG_TRACE
+/*#define DEBUG_TRACE */
 
 /* All functions writing to the cleartext payload buffer call
  * CHECKCLEARTOWRITE() before writing. This is only really useful if you're
@@ -69,7 +69,7 @@
 
 /* To debug with GDB it is easier to run with no forking of child processes.
    You will need to pass "-F" as well. */
-#define DEBUG_NOFORK
+/* #define DEBUG_NOFORK */
 
 
 /* For testing as non-root on shadowed systems, include the crypt of a password