diff --git a/viogpu/common/bitops.cpp b/viogpu/common/bitops.cpp
index c770691c8..52546b358 100755
--- a/viogpu/common/bitops.cpp
+++ b/viogpu/common/bitops.cpp
@@ -1,7 +1,7 @@
 #include "bitops.h"
 #include "viogpu.h"
 
-#if !DBG
+#if defined(EVENT_TRACING)
 #include "bitops.tmh"
 #endif
 
diff --git a/viogpu/common/viogpu_idr.cpp b/viogpu/common/viogpu_idr.cpp
index cec6d7748..1268e6eb6 100755
--- a/viogpu/common/viogpu_idr.cpp
+++ b/viogpu/common/viogpu_idr.cpp
@@ -29,7 +29,7 @@
 
 #include "viogpu.h"
 #include "baseobj.h"
-#if !DBG
+#if defined(EVENT_TRACING)
 #include "viogpu_idr.tmh"
 #endif
 
diff --git a/viogpu/common/viogpu_pci.cpp b/viogpu/common/viogpu_pci.cpp
index 539152c36..2b9ff5369 100755
--- a/viogpu/common/viogpu_pci.cpp
+++ b/viogpu/common/viogpu_pci.cpp
@@ -24,7 +24,7 @@
  **********************************************************************/
 #include "viogpu.h"
 #include "..\viogpudo\viogpudo.h"
-#if !DBG
+#if defined(EVENT_TRACING)
 #include "viogpu_pci.tmh"
 #endif
 
diff --git a/viogpu/common/viogpu_queue.cpp b/viogpu/common/viogpu_queue.cpp
index d6526cab6..7d2b11527 100755
--- a/viogpu/common/viogpu_queue.cpp
+++ b/viogpu/common/viogpu_queue.cpp
@@ -29,7 +29,7 @@
 
 #include "viogpu_queue.h"
 #include "baseobj.h"
-#if !DBG
+#if defined(EVENT_TRACING)
 #include "viogpu_queue.tmh"
 #endif
 
diff --git a/viogpu/viogpudo/driver.cpp b/viogpu/viogpudo/driver.cpp
index ced2431f5..d67369b97 100755
--- a/viogpu/viogpudo/driver.cpp
+++ b/viogpu/viogpudo/driver.cpp
@@ -32,7 +32,7 @@
 #include "helper.h"
 #include "baseobj.h"
 
-#if !DBG
+#if defined(EVENT_TRACING)
 #include "driver.tmh"
 #endif
 
diff --git a/viogpu/viogpudo/trace.h b/viogpu/viogpudo/trace.h
index 6772eda6b..82bd7283f 100755
--- a/viogpu/viogpudo/trace.h
+++ b/viogpu/viogpudo/trace.h
@@ -2,6 +2,7 @@
 #include "kdebugprint.h"
 
 //#define DBG 1
+#define EVENT_TRACING 1
 
 #ifndef TRACE_LEVEL_INFORMATION
 #define TRACE_LEVEL_NONE        0   // Tracing is not on
@@ -31,6 +32,7 @@
 #define VioGpuDbgBreak()\
     if (KD_DEBUGGER_ENABLED && !KD_DEBUGGER_NOT_PRESENT && bBreakAlways) DbgBreakPoint();
 
+#undef EVENT_TRACING // DBG build excludes WPP
 #define WPP_INIT_TRACING(driver, regpath)  InitializeDebugPrints(driver, regpath);
 #define WPP_CLEANUP(driver)
 #else
@@ -65,4 +67,12 @@
 // end_wpp
 //
 
+#ifndef EVENT_TRACING
+
+#define WPP_INIT_TRACING(driver, regpath)
+#define WPP_CLEANUP(driver)
+#define DbgPrint
+
+#endif
+
 #endif
diff --git a/viogpu/viogpudo/viogpudo.cpp b/viogpu/viogpudo/viogpudo.cpp
index 1d0fd9ee3..8ba3e42c2 100755
--- a/viogpu/viogpudo/viogpudo.cpp
+++ b/viogpu/viogpudo/viogpudo.cpp
@@ -35,7 +35,7 @@
 #include "viogpum.h"
 #include "edid.h"
 
-#if !DBG
+#if defined(EVENT_TRACING)
 #include "viogpudo.tmh"
 #endif
 
@@ -3419,6 +3419,8 @@ BOOLEAN VioGpuAdapter::CreateCursor(_In_ CONST DXGKARG_SETPOINTERSHAPE* pSetPoin
     UINT resid, format, size;
     VioGpuObj* obj;
     PAGED_CODE();
+    (void)pSetPointerShape; // unused
+    (void)pCurrentMode; // unused
     DbgPrint(TRACE_LEVEL_INFORMATION, ("---> %s - %d: (%d x %d - %d) (%d + %d)\n", __FUNCTION__, m_Id,
         pSetPointerShape->Width, pSetPointerShape->Height, pSetPointerShape->Pitch, pSetPointerShape->XHot, pSetPointerShape->YHot));