diff --git a/apps/codecs.c b/apps/codecs.c
index 0a3dde64be..ab7809760c 100644
--- a/apps/codecs.c
+++ b/apps/codecs.c
@@ -52,7 +52,7 @@
 #include "splash.h"
 #include "general.h"
 
-#define LOGF_ENABLE
+/*#define LOGF_ENABLE*/
 #include "logf.h"
 
 #ifdef SIMULATOR
diff --git a/apps/tagcache.c b/apps/tagcache.c
index 14d88bbfb8..79c96ff186 100644
--- a/apps/tagcache.c
+++ b/apps/tagcache.c
@@ -55,7 +55,7 @@
  * 
  */
 
-/* #define LOGF_ENABLE */
+/*#define LOGF_ENABLE*/
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/apps/tagtree.c b/apps/tagtree.c
index 3e2fc75617..4b67b73ca6 100644
--- a/apps/tagtree.c
+++ b/apps/tagtree.c
@@ -24,7 +24,7 @@
  * support the tag cache interface.
  */
 
-/* #define LOGF_ENABLE */
+/*#define LOGF_ENABLE*/
 
 #include <stdio.h>
 #include <string.h>
diff --git a/apps/usb_keymaps.c b/apps/usb_keymaps.c
index ecb40794da..61e6f64d6b 100644
--- a/apps/usb_keymaps.c
+++ b/apps/usb_keymaps.c
@@ -25,7 +25,7 @@
 #include "lang.h"
 #include "misc.h"
 #include "usbstack/usb_hid.h"
-//#define LOGF_ENABLE
+/*#define LOGF_ENABLE*/
 #include "logf.h"
 
 #define MODIFIER(modifier, key) ((key) | (modifier << 8))
diff --git a/firmware/drivers/audio/ak4537.c b/firmware/drivers/audio/ak4537.c
index 83a040e177..034fd4f313 100644
--- a/firmware/drivers/audio/ak4537.c
+++ b/firmware/drivers/audio/ak4537.c
@@ -22,7 +22,7 @@
 #include "system.h"
 #include "string.h"
 
-// #define LOGF_ENABLE
+/*#define LOGF_ENABLE*/
 #include "logf.h"
 
 #include "pcm_sampr.h"
diff --git a/firmware/drivers/audio/wm8978.c b/firmware/drivers/audio/wm8978.c
index da444be1bf..eb2e28aa69 100644
--- a/firmware/drivers/audio/wm8978.c
+++ b/firmware/drivers/audio/wm8978.c
@@ -25,7 +25,7 @@
 #include "audiohw.h"
 #include "wmcodec.h"
 #include "audio.h"
-//#define LOGF_ENABLE
+/*#define LOGF_ENABLE*/
 #include "logf.h"
 
 /* TODO: Define/refine an API for special hardware steps outside the
diff --git a/firmware/drivers/m66591.c b/firmware/drivers/m66591.c
index 1197485cd2..d86106988a 100644
--- a/firmware/drivers/m66591.c
+++ b/firmware/drivers/m66591.c
@@ -19,7 +19,7 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-//#define LOGF_ENABLE
+/*#define LOGF_ENABLE*/
 
 #include "system.h"
 #include "config.h"
diff --git a/firmware/drivers/synaptics-mep.c b/firmware/drivers/synaptics-mep.c
index f4b5a99aa7..a18f9e7fd6 100644
--- a/firmware/drivers/synaptics-mep.c
+++ b/firmware/drivers/synaptics-mep.c
@@ -26,7 +26,7 @@
 #include "kernel.h"
 #include "button-target.h"
 
-#define LOGF_ENABLE
+/*#define LOGF_ENABLE*/
 #include "logf.h"
 
 /* Driver for the Synaptics Touchpad based on the "Synaptics Modular Embedded
diff --git a/firmware/drivers/tuner/lv24020lp.c b/firmware/drivers/tuner/lv24020lp.c
index ab37ab8124..d70eef8eea 100644
--- a/firmware/drivers/tuner/lv24020lp.c
+++ b/firmware/drivers/tuner/lv24020lp.c
@@ -52,7 +52,7 @@ static int fd_log = -1;
 #define TUNER_LOG(s...)     fdprintf(fd_log, s)
 
 #elif defined(SANYO_TUNER_LOGF)
-#define LOGF_ENABLE
+/*#define LOGF_ENABLE*/
 #include "logf.h"
 
 #define TUNER_LOG_OPEN()
diff --git a/firmware/target/arm/as3525/usb-drv-as3525.c b/firmware/target/arm/as3525/usb-drv-as3525.c
index 8a1abea74f..4c178972ab 100644
--- a/firmware/target/arm/as3525/usb-drv-as3525.c
+++ b/firmware/target/arm/as3525/usb-drv-as3525.c
@@ -27,7 +27,7 @@
 #include "as3514.h"
 #include <stdbool.h>
 #include "panic.h"
-//#define LOGF_ENABLE
+/*#define LOGF_ENABLE*/
 #include "logf.h"
 
 
diff --git a/firmware/target/arm/olympus/mrobe-100/button-mr100.c b/firmware/target/arm/olympus/mrobe-100/button-mr100.c
index e7979a4174..4a17f4d07e 100644
--- a/firmware/target/arm/olympus/mrobe-100/button-mr100.c
+++ b/firmware/target/arm/olympus/mrobe-100/button-mr100.c
@@ -31,7 +31,7 @@ static bool remote_hold = false;
 static bool headphones_status = true;
 #endif
 
-#define LOGF_ENABLE
+/*#define LOGF_ENABLE*/
 #include "logf.h"
 
 static int int_btn = BUTTON_NONE;
diff --git a/firmware/target/arm/philips/hdd1630/button-hdd1630.c b/firmware/target/arm/philips/hdd1630/button-hdd1630.c
index d45944ef10..ab06c0cf1a 100644
--- a/firmware/target/arm/philips/hdd1630/button-hdd1630.c
+++ b/firmware/target/arm/philips/hdd1630/button-hdd1630.c
@@ -24,7 +24,7 @@
 #include "backlight.h"
 #include "synaptics-mep.h"
 
-#define LOGF_ENABLE
+/*#define LOGF_ENABLE*/
 #include "logf.h"
 
 static int int_btn = BUTTON_NONE;
diff --git a/firmware/target/arm/philips/sa9200/button-sa9200.c b/firmware/target/arm/philips/sa9200/button-sa9200.c
index 0be77c66c9..9fab3d4068 100644
--- a/firmware/target/arm/philips/sa9200/button-sa9200.c
+++ b/firmware/target/arm/philips/sa9200/button-sa9200.c
@@ -24,7 +24,7 @@
 #include "backlight.h"
 #include "synaptics-mep.h"
 
-#define LOGF_ENABLE
+/*#define LOGF_ENABLE*/
 #include "logf.h"
 
 static int int_btn = BUTTON_NONE;
diff --git a/firmware/target/arm/samsung/akcodec-yh82x_yh92x.c b/firmware/target/arm/samsung/akcodec-yh82x_yh92x.c
index 3eb6fae695..55442e8837 100644
--- a/firmware/target/arm/samsung/akcodec-yh82x_yh92x.c
+++ b/firmware/target/arm/samsung/akcodec-yh82x_yh92x.c
@@ -25,7 +25,7 @@
 #include "i2s.h"
 #include "akcodec.h"
 
-// #define LOGF_ENABLE
+/*#define LOGF_ENABLE*/
 #include "logf.h"
 
 #define I2C_AUDIO_ADDRESS 0x10
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/usb-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/usb-mr500.c
index 06a501179d..09e55107c9 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/usb-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/usb-mr500.c
@@ -18,7 +18,7 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-#define LOGF_ENABLE
+/*#define LOGF_ENABLE*/
 
 #include "config.h"
 #include "logf.h"
diff --git a/firmware/target/arm/usb-drv-arc.c b/firmware/target/arm/usb-drv-arc.c
index 3d17cc56c2..41fbe3a7c5 100644
--- a/firmware/target/arm/usb-drv-arc.c
+++ b/firmware/target/arm/usb-drv-arc.c
@@ -30,7 +30,7 @@
 #include "panic.h"
 #include "usb_drv.h"
 
-//#define LOGF_ENABLE
+/*#define LOGF_ENABLE*/
 #include "logf.h"
 
 /* USB device mode registers (Little Endian) */
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c
index bbfffc3264..e609ed96e4 100644
--- a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c
@@ -30,7 +30,7 @@
 #include "storage.h"
 #include "buffer.h"
 #include "string.h"
-//#define LOGF_ENABLE
+/*#define LOGF_ENABLE*/
 #include "logf.h"
 
 //#define USE_DMA
diff --git a/firmware/target/mips/ingenic_jz47xx/usb-jz4740.c b/firmware/target/mips/ingenic_jz47xx/usb-jz4740.c
index 5ba8dd6981..64428ca2d6 100644
--- a/firmware/target/mips/ingenic_jz47xx/usb-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/usb-jz4740.c
@@ -20,7 +20,7 @@
  ****************************************************************************/
 
 #include "config.h"
-//#define LOGF_ENABLE
+/*#define LOGF_ENABLE*/
 #include "logf.h"
 #include "system.h"
 #include "usb_ch9.h"
diff --git a/firmware/usbstack/usb_charging_only.c b/firmware/usbstack/usb_charging_only.c
index 8dd9fdf742..7a8389e620 100644
--- a/firmware/usbstack/usb_charging_only.c
+++ b/firmware/usbstack/usb_charging_only.c
@@ -26,7 +26,7 @@
 #include "usb_charging_only.h"
 #include "usb_class_driver.h"
 
-//#define LOGF_ENABLE
+/*#define LOGF_ENABLE*/
 #include "logf.h"
 
 /* charging_only interface */
diff --git a/firmware/usbstack/usb_core.c b/firmware/usbstack/usb_core.c
index 7d3d14f331..7fd6f52249 100644
--- a/firmware/usbstack/usb_core.c
+++ b/firmware/usbstack/usb_core.c
@@ -22,7 +22,7 @@
 #include "thread.h"
 #include "kernel.h"
 #include "string.h"
-//#define LOGF_ENABLE
+/*#define LOGF_ENABLE*/
 #include "logf.h"
 
 #include "usb.h"
diff --git a/firmware/usbstack/usb_hid.c b/firmware/usbstack/usb_hid.c
index 53dd767c59..6847d0b45d 100644
--- a/firmware/usbstack/usb_hid.c
+++ b/firmware/usbstack/usb_hid.c
@@ -25,7 +25,7 @@
 #include "kernel.h"
 #include "usb_hid.h"
 #include "usb_class_driver.h"
-//#define LOGF_ENABLE
+/*#define LOGF_ENABLE*/
 #include "logf.h"
 
 /* Documents avaiable here: http://www.usb.org/developers/devclass_docs/ */
diff --git a/firmware/usbstack/usb_serial.c b/firmware/usbstack/usb_serial.c
index d36151afd1..a780c5d576 100644
--- a/firmware/usbstack/usb_serial.c
+++ b/firmware/usbstack/usb_serial.c
@@ -25,7 +25,7 @@
 #include "kernel.h"
 #include "usb_serial.h"
 #include "usb_class_driver.h"
-//#define LOGF_ENABLE
+/*#define LOGF_ENABLE*/
 #include "logf.h"
 
 /* serial interface */
diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c
index 88a669b64a..3f3baa383c 100644
--- a/firmware/usbstack/usb_storage.c
+++ b/firmware/usbstack/usb_storage.c
@@ -23,7 +23,7 @@
 #include "usb_core.h"
 #include "usb_drv.h"
 #include "usb_class_driver.h"
-//#define LOGF_ENABLE
+/*#define LOGF_ENABLE*/
 #include "logf.h"
 #include "storage.h"
 #include "hotswap.h"