diff --git a/examples/device/cdc_msc_hid/src/tusb_config.h b/examples/device/cdc_msc_hid/src/tusb_config.h
index 197b75cf..8981077d 100644
--- a/examples/device/cdc_msc_hid/src/tusb_config.h
+++ b/examples/device/cdc_msc_hid/src/tusb_config.h
@@ -46,7 +46,9 @@
 #endif
 
 #define CFG_TUSB_OS                 OPT_OS_NONE
-#define CFG_TUSB_DEBUG              1
+
+// CFG_TUSB_DEBUG is defined by compiler in DEBUG build
+// #define CFG_TUSB_DEBUG           0
 
 /* USB DMA on some MCUs can only access a specific SRAM region with restriction on alignment.
  * Tinyusb use follows macros to declare transferring memory so that they can be put
diff --git a/examples/device/cdc_msc_hid_freertos/src/tusb_config.h b/examples/device/cdc_msc_hid_freertos/src/tusb_config.h
index 79269581..dfa8be62 100644
--- a/examples/device/cdc_msc_hid_freertos/src/tusb_config.h
+++ b/examples/device/cdc_msc_hid_freertos/src/tusb_config.h
@@ -46,7 +46,9 @@
 #endif
 
 #define CFG_TUSB_OS                 OPT_OS_FREERTOS
-#define CFG_TUSB_DEBUG              1
+
+// CFG_TUSB_DEBUG is defined by compiler in DEBUG build
+// #define CFG_TUSB_DEBUG           0
 
 /* USB DMA on some MCUs can only access a specific SRAM region with restriction on alignment.
  * Tinyusb use follows macros to declare transferring memory so that they can be put
diff --git a/examples/device/hid_generic_inout/src/tusb_config.h b/examples/device/hid_generic_inout/src/tusb_config.h
index 195b6098..acd23f95 100644
--- a/examples/device/hid_generic_inout/src/tusb_config.h
+++ b/examples/device/hid_generic_inout/src/tusb_config.h
@@ -46,7 +46,9 @@
 #endif
 
 #define CFG_TUSB_OS                 OPT_OS_NONE
-#define CFG_TUSB_DEBUG              1
+
+// CFG_TUSB_DEBUG is defined by compiler in DEBUG build
+// #define CFG_TUSB_DEBUG           0
 
 /* USB DMA on some MCUs can only access a specific SRAM region with restriction on alignment.
  * Tinyusb use follows macros to declare transferring memory so that they can be put
diff --git a/examples/device/msc_dual_lun/src/tusb_config.h b/examples/device/msc_dual_lun/src/tusb_config.h
index f299b409..fe30fbf2 100644
--- a/examples/device/msc_dual_lun/src/tusb_config.h
+++ b/examples/device/msc_dual_lun/src/tusb_config.h
@@ -46,7 +46,9 @@
 #endif
 
 #define CFG_TUSB_OS                 OPT_OS_NONE
-#define CFG_TUSB_DEBUG              1
+
+// CFG_TUSB_DEBUG is defined by compiler in DEBUG build
+// #define CFG_TUSB_DEBUG           0
 
 /* USB DMA on some MCUs can only access a specific SRAM region with restriction on alignment.
  * Tinyusb use follows macros to declare transferring memory so that they can be put
diff --git a/examples/host/cdc_msc_hid/src/tusb_config.h b/examples/host/cdc_msc_hid/src/tusb_config.h
index 7484d075..144efa51 100644
--- a/examples/host/cdc_msc_hid/src/tusb_config.h
+++ b/examples/host/cdc_msc_hid/src/tusb_config.h
@@ -46,9 +46,11 @@
 #define CFG_TUSB_RHPORT0_MODE       OPT_MODE_HOST
 #endif
 
-#define CFG_TUSB_DEBUG              1
 #define CFG_TUSB_OS                 OPT_OS_NONE
 
+// CFG_TUSB_DEBUG is defined by compiler in DEBUG build
+// #define CFG_TUSB_DEBUG           0
+
 /* USB DMA on some MCUs can only access a specific SRAM region with restriction on alignment.
  * Tinyusb use follows macros to declare transferring memory so that they can be put
  * into those specific section.
diff --git a/examples/make.mk b/examples/make.mk
index d972c1fe..444b2231 100644
--- a/examples/make.mk
+++ b/examples/make.mk
@@ -62,7 +62,7 @@ CFLAGS += \
 
 # Debugging/Optimization
 ifeq ($(DEBUG), 1)
-  CFLAGS += -O0 -ggdb
+  CFLAGS += -O0 -ggdb -DCFG_TUSB_DEBUG=1
 else
   CFLAGS += -flto -Os
 endif
diff --git a/src/common/tusb_verify.h b/src/common/tusb_verify.h
index a7fb28f4..eecc95cc 100644
--- a/src/common/tusb_verify.h
+++ b/src/common/tusb_verify.h
@@ -46,7 +46,6 @@
  extern "C" {
 #endif
 
-
 //--------------------------------------------------------------------+
 // TU_VERIFY Helper
 //--------------------------------------------------------------------+