Misc fixes and improvements.

diff --git a/include/debugdefs.h b/include/debugdefs.h
index e390062..78c8599 100644
--- a/include/debugdefs.h
+++ b/include/debugdefs.h
@@ -167,7 +167,7 @@
 
 #define DEBUG_CHANNEL_COUNT 156
 
-char debug_msg_enabled[DEBUG_CHANNEL_COUNT][DEBUG_CLASS_COUNT] = {
+char __debug_msg_enabled[DEBUG_CHANNEL_COUNT][DEBUG_CLASS_COUNT] = {
 {1, 1, 0, 0},
 {1, 1, 0, 0},
 {1, 1, 0, 0},