diff --git a/core/kernel_init.c b/core/kernel_init.c
index 36cda0c80f..ddf59c3c49 100644
--- a/core/kernel_init.c
+++ b/core/kernel_init.c
@@ -31,7 +31,6 @@
 #include <auto_init.h>
 #endif
 
-#define ENABLE_DEBUG
 #include <debug.h>
 
 volatile tcb_t *sched_threads[MAXTHREADS];
diff --git a/core/msg.c b/core/msg.c
index 52e6e1dc30..9ccdd59f24 100644
--- a/core/msg.c
+++ b/core/msg.c
@@ -24,8 +24,6 @@
 #include <cib.h>
 
 #include "flags.h"
-
-//#define ENABLE_DEBUG
 #include "debug.h"
 
 static int _msg_receive(msg_t *m, int block);
diff --git a/core/mutex.c b/core/mutex.c
index 57bc368246..28ca7b1796 100644
--- a/core/mutex.c
+++ b/core/mutex.c
@@ -23,7 +23,6 @@
 #include "sched.h"
 #include <irq.h>
 
-//#define ENABLE_DEBUG
 #include <debug.h>
 
 int mutex_init(struct mutex_t *mutex)
diff --git a/core/oneway_malloc.c b/core/oneway_malloc.c
index 881c11eed3..ba6aea655c 100644
--- a/core/oneway_malloc.c
+++ b/core/oneway_malloc.c
@@ -20,7 +20,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#define ENABLE_DEBUG
 #include <debug.h>
 
 extern void *sbrk(int incr);
diff --git a/core/queue.c b/core/queue.c
index 1090dd8a06..28178f6137 100644
--- a/core/queue.c
+++ b/core/queue.c
@@ -19,7 +19,6 @@
 
 #include "queue.h"
 
-//#define ENABLE_DEBUG 0
 #include "debug.h"
 
 void queue_remove(queue_node_t *root, queue_node_t *node)
diff --git a/core/sched.c b/core/sched.c
index 239c16c68a..50013c835a 100644
--- a/core/sched.c
+++ b/core/sched.c
@@ -21,7 +21,6 @@
 #include <clist.h>
 #include <bitarithm.h>
 
-//#define ENABLE_DEBUG
 #include <debug.h>
 
 volatile int num_tasks = 0;
diff --git a/core/thread.c b/core/thread.c
index 25fa743045..67fc411c91 100644
--- a/core/thread.c
+++ b/core/thread.c
@@ -20,7 +20,6 @@
 #include "thread.h"
 #include "kernel.h"
 
-//#define ENABLE_DEBUG
 #include "debug.h"
 #include "kernel_intern.h"
 #include "bitarithm.h"
diff --git a/cpu/arm_common/iap.c b/cpu/arm_common/iap.c
index d6740c1b63..31523ca0fb 100644
--- a/cpu/arm_common/iap.c
+++ b/cpu/arm_common/iap.c
@@ -9,7 +9,6 @@
 #include <iap.h>
 #include <lpc2387.h>
 
-//#define ENABLE_DEBUG
 #include <debug.h>
 
 /* pointer to reserved flash rom section for configuration data */
diff --git a/cpu/lpc2387/mci/lpc2387-mci.c b/cpu/lpc2387/mci/lpc2387-mci.c
index 0644abf29c..4de443488a 100644
--- a/cpu/lpc2387/mci/lpc2387-mci.c
+++ b/cpu/lpc2387/mci/lpc2387-mci.c
@@ -18,7 +18,6 @@
 #include "hwtimer.h"
 #include "diskio.h"
 
-//#define ENABLE_DEBUG
 #include "debug.h"
 
 extern unsigned long hwtimer_now(void);
diff --git a/drivers/cc110x_ng/cc110x.c b/drivers/cc110x_ng/cc110x.c
index 36ba9db60b..96df447b45 100644
--- a/drivers/cc110x_ng/cc110x.c
+++ b/drivers/cc110x_ng/cc110x.c
@@ -25,7 +25,6 @@
 #include <hwtimer.h>
 #include <config.h>
 
-//#define ENABLE_DEBUG    (1)
 #include <debug.h>
 
 /* some externals */
diff --git a/drivers/cc2420/cc2420.c b/drivers/cc2420/cc2420.c
index 0e877b7439..558ad24244 100644
--- a/drivers/cc2420/cc2420.c
+++ b/drivers/cc2420/cc2420.c
@@ -12,7 +12,6 @@
 #include <cc2420_arch.h>
 #include <hwtimer.h>
 
-//#define ENABLE_DEBUG
 #include <debug.h>
 
 static uint16_t radio_channel;
diff --git a/drivers/sht11/sht11.c b/drivers/sht11/sht11.c
index 26f8437200..d68e068f9c 100644
--- a/drivers/sht11/sht11.c
+++ b/drivers/sht11/sht11.c
@@ -46,7 +46,6 @@ and the mailinglist (subscription via web site)
 #include <sht11-board.h>
 #include <bitarithm.h>
 
-//#define ENABLE_DEBUG   (1)
 #include <debug.h>
 
 float sht11_temperature_offset;
diff --git a/sys/auto_init/auto_init.c b/sys/auto_init/auto_init.c
index 0136bcd94d..e577aac280 100644
--- a/sys/auto_init/auto_init.c
+++ b/sys/auto_init/auto_init.c
@@ -22,7 +22,6 @@
 #include <auto_init.h>
 #include "vtimer.h"
 
-#define ENABLE_DEBUG
 #include <debug.h>
 
 extern int main(void);
diff --git a/sys/chardev_thread.c b/sys/chardev_thread.c
index 50546e5370..cf4abfe14d 100644
--- a/sys/chardev_thread.c
+++ b/sys/chardev_thread.c
@@ -25,7 +25,6 @@
 #include <irq.h>
 #include <posix_io.h>
 
-//#define ENABLE_DEBUG
 #include <debug.h>
 
 static int min(int a, int b)
diff --git a/sys/transceiver/transceiver.c b/sys/transceiver/transceiver.c
index 37237b2381..134f9007b3 100644
--- a/sys/transceiver/transceiver.c
+++ b/sys/transceiver/transceiver.c
@@ -51,7 +51,6 @@
 #endif
 #endif
 
-//#define ENABLE_DEBUG (1)
 #include <debug.h>
 
 /*------------------------------------------------------------------------------------*/
diff --git a/sys/vtimer/vtimer.c b/sys/vtimer/vtimer.c
index fcbf2d6428..9c6e6e3c92 100644
--- a/sys/vtimer/vtimer.c
+++ b/sys/vtimer/vtimer.c
@@ -13,7 +13,6 @@
 
 #include <vtimer.h>
 
-//#define ENABLE_DEBUG
 #include <debug.h>