diff --git a/reactos/ntoskrnl/include/internal/cm.h b/reactos/ntoskrnl/include/internal/cm.h
index c70e9c064ae..619455b6fac 100644
--- a/reactos/ntoskrnl/include/internal/cm.h
+++ b/reactos/ntoskrnl/include/internal/cm.h
@@ -33,7 +33,7 @@
     if (x & CmpTraceLevel) DbgPrint(__VA_ARGS__)
 #endif
 #else
-#define CMTRACE(x, ...) DPRINT(__VA_ARGS__)
+#define CMTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__)
 #endif
 
 //
diff --git a/reactos/ntoskrnl/include/internal/dbgk.h b/reactos/ntoskrnl/include/internal/dbgk.h
index 457fcf0e5bf..d1e8f814c2a 100644
--- a/reactos/ntoskrnl/include/internal/dbgk.h
+++ b/reactos/ntoskrnl/include/internal/dbgk.h
@@ -43,7 +43,7 @@
     }
 #endif
 #else
-#define DBGKTRACE(x, ...) DPRINT(__VA_ARGS__)
+#define DBGKTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__)
 #endif
 
 VOID
diff --git a/reactos/ntoskrnl/include/internal/fsrtl.h b/reactos/ntoskrnl/include/internal/fsrtl.h
index b0777de94cc..16bb399a893 100644
--- a/reactos/ntoskrnl/include/internal/fsrtl.h
+++ b/reactos/ntoskrnl/include/internal/fsrtl.h
@@ -36,7 +36,7 @@
     if (x & FsRtlpTraceLevel) DbgPrint(__VA_ARGS__)
 #endif
 #else
-#define FSTRACE(x, ...) DPRINT(__VA_ARGS__)
+#define FSTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__)
 #endif
 
 //
diff --git a/reactos/ntoskrnl/include/internal/hdl.h b/reactos/ntoskrnl/include/internal/hdl.h
index d93b520fa3c..349a9070f7b 100644
--- a/reactos/ntoskrnl/include/internal/hdl.h
+++ b/reactos/ntoskrnl/include/internal/hdl.h
@@ -30,7 +30,7 @@
     if (x & HdlpTraceLevel) DbgPrint(__VA_ARGS__)
 #endif
 #else
-#define HDLTRACE(x, ...) DPRINT(__VA_ARGS__)
+#define HDLTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__)
 #endif
 
 //
diff --git a/reactos/ntoskrnl/include/internal/io.h b/reactos/ntoskrnl/include/internal/io.h
index 2649e3ed564..cbcf466b00c 100644
--- a/reactos/ntoskrnl/include/internal/io.h
+++ b/reactos/ntoskrnl/include/internal/io.h
@@ -10,7 +10,7 @@
 //
 // Define this if you want debugging support
 //
-#define _IO_DEBUG_                                      0x00
+#define _IO_DEBUG_                                      0x01
 
 //
 // These define the Debug Masks Supported
@@ -43,7 +43,7 @@
     }
 #endif
 #else
-#define IOTRACE(x, ...) DPRINT(__VA_ARGS__)
+#define IOTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__)
 #endif
 
 //
diff --git a/reactos/ntoskrnl/include/internal/lpc.h b/reactos/ntoskrnl/include/internal/lpc.h
index ad5ecba6699..34392c4c185 100644
--- a/reactos/ntoskrnl/include/internal/lpc.h
+++ b/reactos/ntoskrnl/include/internal/lpc.h
@@ -46,7 +46,7 @@
     }
 #endif
 #else
-#define LPCTRACE(x, ...) DPRINT(__VA_ARGS__)
+#define LPCTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__)
 #endif
 
 //
diff --git a/reactos/ntoskrnl/include/internal/po.h b/reactos/ntoskrnl/include/internal/po.h
index 903812fb6ce..dcc4d0dbcbb 100644
--- a/reactos/ntoskrnl/include/internal/po.h
+++ b/reactos/ntoskrnl/include/internal/po.h
@@ -30,7 +30,7 @@
     if (x & PopTraceLevel) DbgPrint(__VA_ARGS__)
 #endif
 #else
-#define POTRACE(x, ...) DPRINT(__VA_ARGS__)
+#define POTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__)
 #endif
 
 typedef struct _PO_HIBER_PERF
diff --git a/reactos/ntoskrnl/include/internal/ps.h b/reactos/ntoskrnl/include/internal/ps.h
index bf18cf818b3..af02c4557f9 100644
--- a/reactos/ntoskrnl/include/internal/ps.h
+++ b/reactos/ntoskrnl/include/internal/ps.h
@@ -54,7 +54,7 @@
             __LINE__,                                       \
             OBJECT_TO_OBJECT_HEADER(x)->PointerCount)
 #else
-#define PSTRACE(x, ...) DPRINT(__VA_ARGS__)
+#define PSTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__)
 #define PSREFTRACE(x)
 #endif
 
diff --git a/reactos/ntoskrnl/include/internal/vdm.h b/reactos/ntoskrnl/include/internal/vdm.h
index 5934fc535ef..5ff64e1a055 100644
--- a/reactos/ntoskrnl/include/internal/vdm.h
+++ b/reactos/ntoskrnl/include/internal/vdm.h
@@ -27,7 +27,7 @@
     if (x & VdmpTraceLevel) DbgPrint(__VA_ARGS__)
 #endif
 #else
-#define VMTRACE(x, ...) DPRINT(__VA_ARGS__)
+#define VMTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__)
 #endif
 
 //