diff --git a/reactos/dll/win32/kernel32/file/bintype.c b/reactos/dll/win32/kernel32/file/bintype.c
index bc8f2ed35d4..e59a1c48c26 100644
--- a/reactos/dll/win32/kernel32/file/bintype.c
+++ b/reactos/dll/win32/kernel32/file/bintype.c
@@ -17,7 +17,7 @@
 #include <debug.h>
 
 #if DBG
-static ULONG gDebugChannel = kernel32file;
+DEBUG_CHANNEL(kernel32file);
 #endif
 
 /* FUNCTIONS ****************************************************************/
diff --git a/reactos/dll/win32/kernel32/file/copy.c b/reactos/dll/win32/kernel32/file/copy.c
index 786c8f79b0c..a55fbff84cd 100644
--- a/reactos/dll/win32/kernel32/file/copy.c
+++ b/reactos/dll/win32/kernel32/file/copy.c
@@ -17,7 +17,7 @@
 #include <debug.h>
 
 #if DBG
-static ULONG gDebugChannel = kernel32file;
+DEBUG_CHANNEL(kernel32file);
 #endif
 
 /* FUNCTIONS ****************************************************************/
diff --git a/reactos/dll/win32/kernel32/file/create.c b/reactos/dll/win32/kernel32/file/create.c
index 8b487c3de92..8da66358bd6 100644
--- a/reactos/dll/win32/kernel32/file/create.c
+++ b/reactos/dll/win32/kernel32/file/create.c
@@ -19,7 +19,7 @@
 #include <debug.h>
 
 #if DBG
-static ULONG gDebugChannel = kernel32file;
+DEBUG_CHANNEL(kernel32file);
 #endif
 
 #define SYMLINK_FLAG_RELATIVE   1
diff --git a/reactos/dll/win32/kernel32/file/curdir.c b/reactos/dll/win32/kernel32/file/curdir.c
index d58059d9539..8c74fbe11a1 100644
--- a/reactos/dll/win32/kernel32/file/curdir.c
+++ b/reactos/dll/win32/kernel32/file/curdir.c
@@ -21,7 +21,7 @@
 #include <debug.h>
 
 #if DBG
-static ULONG gDebugChannel = kernel32file;
+DEBUG_CHANNEL(kernel32file);
 #endif
 
 /* GLOBAL VARIABLES **********************************************************/
diff --git a/reactos/dll/win32/kernel32/file/delete.c b/reactos/dll/win32/kernel32/file/delete.c
index 333851655c8..78f62c11622 100644
--- a/reactos/dll/win32/kernel32/file/delete.c
+++ b/reactos/dll/win32/kernel32/file/delete.c
@@ -14,7 +14,7 @@
 #include <k32.h>
 #define NDEBUG
 #include <reactos/debug.h>
-static ULONG gDebugChannel = kernel32file;
+DEBUG_CHANNEL(kernel32file);
 
 /* FUNCTIONS ****************************************************************/
 
diff --git a/reactos/dll/win32/kernel32/file/dir.c b/reactos/dll/win32/kernel32/file/dir.c
index 5d352b172b0..c1de9c0b987 100644
--- a/reactos/dll/win32/kernel32/file/dir.c
+++ b/reactos/dll/win32/kernel32/file/dir.c
@@ -18,7 +18,7 @@
 #include <k32.h>
 #define NDEBUG
 #include <debug.h>
-static ULONG gDebugChannel = kernel32file;
+DEBUG_CHANNEL(kernel32file);
 
 UNICODE_STRING DllDirectory = {0, 0, NULL};
 
diff --git a/reactos/dll/win32/kernel32/file/dosdev.c b/reactos/dll/win32/kernel32/file/dosdev.c
index 0ac01917680..1e15166bb64 100644
--- a/reactos/dll/win32/kernel32/file/dosdev.c
+++ b/reactos/dll/win32/kernel32/file/dosdev.c
@@ -14,7 +14,7 @@
 #include <k32.h>
 #define NDEBUG
 #include <debug.h>
-static ULONG gDebugChannel = kernel32file;
+DEBUG_CHANNEL(kernel32file);
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/dll/win32/kernel32/file/file.c b/reactos/dll/win32/kernel32/file/file.c
index 7210147a031..24e4e47ba45 100644
--- a/reactos/dll/win32/kernel32/file/file.c
+++ b/reactos/dll/win32/kernel32/file/file.c
@@ -15,7 +15,7 @@
 #include <k32.h>
 #define NDEBUG
 #include <debug.h>
-static ULONG gDebugChannel = kernel32file;
+DEBUG_CHANNEL(kernel32file);
 
 /* GLOBALS ******************************************************************/
 
diff --git a/reactos/dll/win32/kernel32/file/find.c b/reactos/dll/win32/kernel32/file/find.c
index e2d476c10b3..967d94c3df5 100644
--- a/reactos/dll/win32/kernel32/file/find.c
+++ b/reactos/dll/win32/kernel32/file/find.c
@@ -14,7 +14,7 @@
 #include <k32.h>
 #define NDEBUG
 #include <debug.h>
-static ULONG gDebugChannel = kernel32file;
+DEBUG_CHANNEL(kernel32file);
 
 /* TYPES ********************************************************************/
 
diff --git a/reactos/dll/win32/kernel32/file/hardlink.c b/reactos/dll/win32/kernel32/file/hardlink.c
index 5e8e91f50b9..004d5b8735b 100644
--- a/reactos/dll/win32/kernel32/file/hardlink.c
+++ b/reactos/dll/win32/kernel32/file/hardlink.c
@@ -14,7 +14,7 @@
 #include <k32.h>
 #define NDEBUG
 #include <debug.h>
-static ULONG gDebugChannel = kernel32file;
+DEBUG_CHANNEL(kernel32file);
 
 /* FUNCTIONS ****************************************************************/
 
diff --git a/reactos/dll/win32/kernel32/file/lock.c b/reactos/dll/win32/kernel32/file/lock.c
index 6cb386025d1..a18425ad174 100644
--- a/reactos/dll/win32/kernel32/file/lock.c
+++ b/reactos/dll/win32/kernel32/file/lock.c
@@ -16,7 +16,7 @@
 #include <k32.h>
 #define NDEBUG
 #include <debug.h>
-static ULONG gDebugChannel = kernel32file;
+DEBUG_CHANNEL(kernel32file);
 
 /* FUNCTIONS ****************************************************************/
 
diff --git a/reactos/dll/win32/kernel32/file/mailslot.c b/reactos/dll/win32/kernel32/file/mailslot.c
index cbc7900b3eb..6dceaf9e2a0 100644
--- a/reactos/dll/win32/kernel32/file/mailslot.c
+++ b/reactos/dll/win32/kernel32/file/mailslot.c
@@ -13,7 +13,7 @@
 #include <k32.h>
 #define NDEBUG
 #include <debug.h>
-static ULONG gDebugChannel = kernel32file;
+DEBUG_CHANNEL(kernel32file);
 
 /* FUNCTIONS ****************************************************************/
 
diff --git a/reactos/dll/win32/kernel32/file/move.c b/reactos/dll/win32/kernel32/file/move.c
index cdf53527fbd..846d78cb976 100644
--- a/reactos/dll/win32/kernel32/file/move.c
+++ b/reactos/dll/win32/kernel32/file/move.c
@@ -19,7 +19,7 @@
 #include <malloc.h>
 #define NDEBUG
 #include <debug.h>
-static ULONG gDebugChannel = kernel32file;
+DEBUG_CHANNEL(kernel32file);
 
 /* GLOBALS *****************************************************************/
 
diff --git a/reactos/dll/win32/kernel32/file/npipe.c b/reactos/dll/win32/kernel32/file/npipe.c
index 3896e9b2b38..629b69b678f 100644
--- a/reactos/dll/win32/kernel32/file/npipe.c
+++ b/reactos/dll/win32/kernel32/file/npipe.c
@@ -12,7 +12,7 @@
 #include <k32.h>
 #define NDEBUG
 #include <debug.h>
-static ULONG gDebugChannel = kernel32file;
+DEBUG_CHANNEL(kernel32file);
 
 //#define USING_PROPER_NPFS_WAIT_SEMANTICS
 
diff --git a/reactos/dll/win32/kernel32/file/pipe.c b/reactos/dll/win32/kernel32/file/pipe.c
index a48150d5156..21f709d08b5 100644
--- a/reactos/dll/win32/kernel32/file/pipe.c
+++ b/reactos/dll/win32/kernel32/file/pipe.c
@@ -13,7 +13,7 @@
 #include <k32.h>
 #define NDEBUG
 #include <debug.h>
-static ULONG gDebugChannel = kernel32file;
+DEBUG_CHANNEL(kernel32file);
 
 /* GLOBALS ******************************************************************/
 
diff --git a/reactos/dll/win32/kernel32/file/rw.c b/reactos/dll/win32/kernel32/file/rw.c
index dc89e4da8bc..13e15da3463 100644
--- a/reactos/dll/win32/kernel32/file/rw.c
+++ b/reactos/dll/win32/kernel32/file/rw.c
@@ -14,7 +14,7 @@
 #include <k32.h>
 #define NDEBUG
 #include <debug.h>
-static ULONG gDebugChannel = kernel32file;
+DEBUG_CHANNEL(kernel32file);
 
 /* FUNCTIONS ****************************************************************/
 
diff --git a/reactos/dll/win32/kernel32/file/volume.c b/reactos/dll/win32/kernel32/file/volume.c
index 2af3e8ed03d..0e336661a6b 100644
--- a/reactos/dll/win32/kernel32/file/volume.c
+++ b/reactos/dll/win32/kernel32/file/volume.c
@@ -22,7 +22,7 @@
 #include <k32.h>
 #define NDEBUG
 #include <debug.h>
-static ULONG gDebugChannel = kernel32file;
+DEBUG_CHANNEL(kernel32file);
 
 #define MAX_DOS_DRIVES 26
 
diff --git a/reactos/dll/win32/kernel32/include/kernel32.h b/reactos/dll/win32/kernel32/include/kernel32.h
index 55b1338786c..fae3e844009 100755
--- a/reactos/dll/win32/kernel32/include/kernel32.h
+++ b/reactos/dll/win32/kernel32/include/kernel32.h
@@ -9,6 +9,13 @@
 #define resource                203
 #define kernel32session         204
 
+
+#if DBG
+#define DEBUG_CHANNEL(ch) static ULONG gDebugChannel = ch;
+#else
+#define DEBUG_CHANNEL(ch)
+#endif
+
 #define TRACE(fmt, ...)         TRACE__(gDebugChannel, fmt, ##__VA_ARGS__)
 #define WARN(fmt, ...)          WARN__(gDebugChannel, fmt, ##__VA_ARGS__)
 #define FIXME(fmt, ...)         WARN__(gDebugChannel, fmt,## __VA_ARGS__)
diff --git a/reactos/dll/win32/kernel32/misc/actctx.c b/reactos/dll/win32/kernel32/misc/actctx.c
index 2cf99fef463..516dcb5d9c8 100644
--- a/reactos/dll/win32/kernel32/misc/actctx.c
+++ b/reactos/dll/win32/kernel32/misc/actctx.c
@@ -15,7 +15,7 @@
 #include <k32.h>
 #define NDEBUG
 #include <debug.h>
-static ULONG gDebugChannel = actctx;
+DEBUG_CHANNEL(actctx);
 
 #define ACTCTX_FAKE_HANDLE ((HANDLE) 0xf00baa)
 
diff --git a/reactos/dll/win32/kernel32/misc/format_msg.c b/reactos/dll/win32/kernel32/misc/format_msg.c
index 122cac57f6e..35b3c017274 100644
--- a/reactos/dll/win32/kernel32/misc/format_msg.c
+++ b/reactos/dll/win32/kernel32/misc/format_msg.c
@@ -22,7 +22,7 @@
 #include <k32.h>
 #define NDEBUG
 #include <debug.h>
-static ULONG gDebugChannel = resource;
+DEBUG_CHANNEL(resource);
 
 struct format_args
 {
diff --git a/reactos/dll/win32/kernel32/misc/lcformat.c b/reactos/dll/win32/kernel32/misc/lcformat.c
index 132452bb845..dbddcd7179d 100644
--- a/reactos/dll/win32/kernel32/misc/lcformat.c
+++ b/reactos/dll/win32/kernel32/misc/lcformat.c
@@ -32,7 +32,7 @@
 #include <k32.h>
 #define NDEBUG
 #include <debug.h>
-static ULONG gDebugChannel = resource;
+DEBUG_CHANNEL(resource);
 
 #define DATE_DATEVARSONLY 0x0100  /* only date stuff: yMdg */
 #define TIME_TIMEVARSONLY 0x0200  /* only time stuff: hHmst */
diff --git a/reactos/dll/win32/kernel32/misc/version.c b/reactos/dll/win32/kernel32/misc/version.c
index bb9288e930f..86eb50d5052 100644
--- a/reactos/dll/win32/kernel32/misc/version.c
+++ b/reactos/dll/win32/kernel32/misc/version.c
@@ -11,7 +11,7 @@
 #include <reactos/buildno.h>
 #define NDEBUG
 #include <debug.h>
-static ULONG gDebugChannel = kernel32ver;
+DEBUG_CHANNEL(kernel32ver);
 
 #define UNICODIZE1(x) L##x
 #define UNICODIZE(x) UNICODIZE1(x)
diff --git a/reactos/dll/win32/kernel32/process/session.c b/reactos/dll/win32/kernel32/process/session.c
index 3c61ebec7a6..7e9dcd148d7 100644
--- a/reactos/dll/win32/kernel32/process/session.c
+++ b/reactos/dll/win32/kernel32/process/session.c
@@ -11,7 +11,7 @@
 #include <k32.h>
 #define NDEBUG
 #include <debug.h>
-//static ULONG gDebugChannel = kernel32session; not actually used
+//DEBUG_CHANNEL(kernel32session); not actually used
 
 DWORD ActiveConsoleSessionId = 0;