diff --git a/drivers/multimedia/bdasup/precomp.h b/drivers/multimedia/bdasup/precomp.h
index 45a603ddecd..be258b38783 100644
--- a/drivers/multimedia/bdasup/precomp.h
+++ b/drivers/multimedia/bdasup/precomp.h
@@ -10,7 +10,7 @@
 #include <bdamedia.h>
 #include <bdasup.h>
 
-#define YDEBUG
+// #define NDEBUG
 #include <debug.h>
 
 
diff --git a/drivers/wdm/audio/filters/kmixer/filter.c b/drivers/wdm/audio/filters/kmixer/filter.c
index 5d84eb2c2d0..f2112b758b1 100644
--- a/drivers/wdm/audio/filters/kmixer/filter.c
+++ b/drivers/wdm/audio/filters/kmixer/filter.c
@@ -10,7 +10,7 @@
 
 #include <swenum.h>
 
-#define YDEBUG
+// #define NDEBUG
 #include <debug.h>
 
 NTSTATUS
@@ -199,4 +199,3 @@ KMixAllocateDeviceHeader(
                                     CreateItem);
     return Status;
 }
-
diff --git a/drivers/wdm/audio/filters/kmixer/kmixer.c b/drivers/wdm/audio/filters/kmixer/kmixer.c
index 978e46565cd..b9ae6e68af9 100644
--- a/drivers/wdm/audio/filters/kmixer/kmixer.c
+++ b/drivers/wdm/audio/filters/kmixer/kmixer.c
@@ -8,7 +8,7 @@
 
 #include "kmixer.h"
 
-#define YDEBUG
+// #define NDEBUG
 #include <debug.h>
 
 NTSTATUS
@@ -72,7 +72,6 @@ KMix_AddDevice(
     /* initialize device extension */
     RtlZeroMemory(DeviceExtension, sizeof(KMIXER_DEVICE_EXT));
 
-
     Status = KMixAllocateDeviceHeader(DeviceExtension);
     if (!NT_SUCCESS(Status))
     {
@@ -98,7 +97,6 @@ cleanup:
     return Status;
 }
 
-
 NTSTATUS
 NTAPI
 DriverEntry(
diff --git a/drivers/wdm/audio/legacy/stream/stream.h b/drivers/wdm/audio/legacy/stream/stream.h
index 5994d91be56..09054368ea0 100644
--- a/drivers/wdm/audio/legacy/stream/stream.h
+++ b/drivers/wdm/audio/legacy/stream/stream.h
@@ -1,7 +1,8 @@
 #pragma once
 
 #include <strmini.h>
-#define YDEBUG
+
+// #define NDEBUG
 #include <debug.h>
 
 #define STREAMDEBUG_LEVEL DebugLevelMaximum
diff --git a/sdk/lib/drivers/sound/mmixer/controls.c b/sdk/lib/drivers/sound/mmixer/controls.c
index 3b5a8036b25..a7521bf4dd3 100644
--- a/sdk/lib/drivers/sound/mmixer/controls.c
+++ b/sdk/lib/drivers/sound/mmixer/controls.c
@@ -8,7 +8,7 @@
 
 #include "precomp.h"
 
-#define YDEBUG
+// #define NDEBUG
 #include <debug.h>
 
 const GUID KSNODETYPE_DESKTOP_MICROPHONE = {0xDFF21BE2, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}};
@@ -56,7 +56,6 @@ MMixerAddMixerControl(
         return MM_STATUS_NO_MEMORY;
     }
 
-
     /* initialize mixer control */
     MixerControl->hDevice = hMixer;
     MixerControl->NodeID = NodeIndex;
@@ -263,7 +262,6 @@ MMixerCreateDestinationLine(
     DestinationLine->Line.dwUser = 0;
     DestinationLine->Line.fdwLine = MIXERLINE_LINEF_ACTIVE;
 
-
     if (LineName)
     {
         MixerContext->Copy(DestinationLine->Line.szShortName, LineName, (min(MIXER_SHORT_NAME_CHARS, wcslen(LineName)+1)) * sizeof(WCHAR));
@@ -564,7 +562,6 @@ MMixerGetChannelCountEnhanced(
     Request.Property.Flags = KSPROPERTY_TYPE_BASICSUPPORT | KSPROPERTY_TYPE_TOPOLOGY;
     Request.Property.Id = KSPROPERTY_AUDIO_VOLUMELEVEL;
 
-
     /* get description */
     Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSP_NODE), (PVOID)&Description, sizeof(KSPROPERTY_DESCRIPTION), &BytesReturned);
     if (Status == MM_STATUS_SUCCESS)
@@ -772,7 +769,6 @@ MMixerGetComponentAndTargetType(
     Request.Property.Set = KSPROPSETID_Pin;
     Request.Property.Id = KSPROPERTY_PIN_CATEGORY;
 
-
     /* get pin category */
     Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSP_PIN), &Guid, sizeof(GUID), &BytesReturned);
     if (Status != MM_STATUS_SUCCESS)
@@ -1163,7 +1159,6 @@ MMixerAddMixerSourceLines(
     return MM_STATUS_SUCCESS;
 }
 
-
 MIXER_STATUS
 MMixerAddMixerControlsToDestinationLine(
     IN PMIXER_CONTEXT MixerContext,
@@ -1623,7 +1618,6 @@ MMixerInitializeFilter(
         }
     }
 
-
     /* now get the bridge pin which is at the end of node path
      * For sink pins (wave out) search down stream
      * For source pins (wave in) search up stream
@@ -1829,7 +1823,6 @@ MMixerSetupFilter(
     return Status;
 }
 
-
 MIXER_STATUS
 MMixerAddEvent(
     IN PMIXER_CONTEXT MixerContext,
diff --git a/sdk/lib/drivers/sound/mmixer/filter.c b/sdk/lib/drivers/sound/mmixer/filter.c
index a41bcee7bb7..19033c831ad 100644
--- a/sdk/lib/drivers/sound/mmixer/filter.c
+++ b/sdk/lib/drivers/sound/mmixer/filter.c
@@ -8,7 +8,7 @@
 
 #include "precomp.h"
 
-#define YDEBUG
+// #define NDEBUG
 #include <debug.h>
 
 ULONG
diff --git a/sdk/lib/drivers/sound/mmixer/midi.c b/sdk/lib/drivers/sound/mmixer/midi.c
index 969f252773a..acca89ca5ad 100644
--- a/sdk/lib/drivers/sound/mmixer/midi.c
+++ b/sdk/lib/drivers/sound/mmixer/midi.c
@@ -8,7 +8,7 @@
 
 #include "precomp.h"
 
-#define YDEBUG
+// #define NDEBUG
 #include <debug.h>
 
 MIXER_STATUS
diff --git a/sdk/lib/drivers/sound/mmixer/mixer.c b/sdk/lib/drivers/sound/mmixer/mixer.c
index 3b8d900bef6..4b98ed53ae3 100644
--- a/sdk/lib/drivers/sound/mmixer/mixer.c
+++ b/sdk/lib/drivers/sound/mmixer/mixer.c
@@ -8,7 +8,7 @@
 
 #include "precomp.h"
 
-#define YDEBUG
+// #define NDEBUG
 #include <debug.h>
 
 ULONG
@@ -106,7 +106,6 @@ MMixerOpen(
     /* add the event */
     Status = MMixerAddEvent(MixerContext, MixerInfo, MixerEventContext, MixerEventRoutine);
 
-
     /* store result */
     *MixerHandle = (HANDLE)MixerInfo;
     return MM_STATUS_SUCCESS;
@@ -687,7 +686,6 @@ MMixerPrintMixers(
     DPRINT1("WaveOutCount %lu\n", MixerList->WaveOutListCount);
     DPRINT1("MixerCount %p\n", MixerList->MixerListCount);
 
-
     for(Index = 0; Index < MixerList->MixerListCount; Index++)
     {
         /* get mixer info */
diff --git a/sdk/lib/drivers/sound/mmixer/sup.c b/sdk/lib/drivers/sound/mmixer/sup.c
index 4fa8c080309..cfd5ab8b0b1 100644
--- a/sdk/lib/drivers/sound/mmixer/sup.c
+++ b/sdk/lib/drivers/sound/mmixer/sup.c
@@ -8,7 +8,7 @@
 
 #include "precomp.h"
 
-#define YDEBUG
+// #define NDEBUG
 #include <debug.h>
 
 const GUID KSNODETYPE_SUM = {0xDA441A60L, 0xC556, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}};
@@ -36,7 +36,6 @@ const GUID KSDATAFORMAT_TYPE_MUSIC = {0xE725D360L, 0x62CC, 0x11CF, {0xA5, 0xD6,
 const GUID KSDATAFORMAT_SUBTYPE_MIDI = {0x1D262760L, 0xE957, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}};
 const GUID KSDATAFORMAT_SPECIFIER_NONE = {0x0F6417D6L, 0xC318, 0x11D0, {0xA4, 0x3F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}};
 
-
 MIXER_STATUS
 MMixerVerifyContext(
     IN PMIXER_CONTEXT MixerContext)
@@ -125,7 +124,6 @@ MMixerFreeMixerInfo(
     MixerContext->Free((PVOID)MixerInfo);
 }
 
-
 LPMIXER_DATA
 MMixerGetMixerDataByDeviceHandle(
     IN PMIXER_CONTEXT MixerContext,
@@ -156,7 +154,6 @@ MMixerGetMixerDataByDeviceHandle(
     return NULL;
 }
 
-
 LPMIXER_INFO
 MMixerGetMixerInfoByIndex(
     IN PMIXER_CONTEXT MixerContext,
diff --git a/sdk/lib/drivers/sound/mmixer/topology.c b/sdk/lib/drivers/sound/mmixer/topology.c
index 136dc61dee1..29b1237436b 100644
--- a/sdk/lib/drivers/sound/mmixer/topology.c
+++ b/sdk/lib/drivers/sound/mmixer/topology.c
@@ -8,7 +8,7 @@
 
 #include "precomp.h"
 
-#define YDEBUG
+// #define NDEBUG
 #include <debug.h>
 
 VOID
@@ -37,11 +37,8 @@ MMixerPrintTopology(
             Topology->TopologyNodes[Index].NodeConnectedFromCount, Topology->TopologyNodes[Index].NodeConnectedToCount, Topology->TopologyNodes[Index].Visited,
             Topology->TopologyNodes[Index].PinConnectedFromCount, Topology->TopologyNodes[Index].PinConnectedToCount);
     }
-
-
 }
 
-
 MIXER_STATUS
 MMixerAllocateTopology(
     IN PMIXER_CONTEXT MixerContext,
@@ -708,7 +705,6 @@ MMixerGetNodeIndexFromGuid(
     return MAXULONG;
 }
 
-
 VOID
 MMixerGetAllUpOrDownstreamPinsFromNodeIndex(
     IN PMIXER_CONTEXT MixerContext,
@@ -848,7 +844,6 @@ MMixerGetAllUpOrDownstreamPinsFromPinIndex(
         TopologyPinsCount = Pin->PinConnectedToCount;
     }
 
-
     /* reset visited status */
     MMixerResetTopologyVisitStatus(Topology);
 
@@ -906,7 +901,6 @@ MMixerGetAllUpOrDownstreamNodesFromPinIndex(
         TopologyNodesCount = Pin->NodesConnectedToCount;
     }
 
-
     /* reset visited status */
     MMixerResetTopologyVisitStatus(Topology);
 
@@ -924,7 +918,6 @@ MMixerGetAllUpOrDownstreamNodesFromPinIndex(
     }
 }
 
-
 VOID
 MMixerGetNextNodesFromPinIndex(
     IN PMIXER_CONTEXT MixerContext,
@@ -1248,7 +1241,6 @@ MMixerIsTopologyNodeReserved(
     *bReserved = Topology->TopologyNodes[NodeIndex].Reserved;
 }
 
-
 MIXER_STATUS
 MMixerCreateTopology(
     IN PMIXER_CONTEXT MixerContext,
diff --git a/sdk/lib/drivers/sound/mmixer/wave.c b/sdk/lib/drivers/sound/mmixer/wave.c
index 6326e3227d7..e049ca485bd 100644
--- a/sdk/lib/drivers/sound/mmixer/wave.c
+++ b/sdk/lib/drivers/sound/mmixer/wave.c
@@ -8,7 +8,7 @@
 
 #include "precomp.h"
 
-#define YDEBUG
+// #define NDEBUG
 #include <debug.h>
 
 const GUID KSPROPSETID_Connection               = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}};
@@ -111,9 +111,6 @@ MMixerGetWaveInfoByIndexAndType(
     return MM_STATUS_INVALID_PARAMETER;
 }
 
-
-
-
 VOID
 MMixerInitializeDataFormat(
     IN PKSDATAFORMAT_WAVEFORMATEX DataFormat,
@@ -137,7 +134,6 @@ MMixerInitializeDataFormat(
     DataFormat->DataFormat.SampleSize = 4;
 }
 
-
 MIXER_STATUS
 MMixerGetAudioPinDataRanges(
     IN PMIXER_CONTEXT MixerContext,
@@ -307,7 +303,6 @@ MMixerCheckFormat(
                 /* check if pin supports the sample rate in 16-Bit Mono */
                 Result |= TestRange[Index].Bit16Mono;
 
-
                 if (DataRangeAudio->MaximumChannels > 1)
                 {
                     /* check if pin supports the sample rate in 16-Bit Stereo */
@@ -317,7 +312,6 @@ MMixerCheckFormat(
         }
     }
 
-
     if (bInput)
         WaveInfo->u.InCaps.dwFormats = Result;
     else