diff --git a/dll/directx/dsound_new/precomp.h b/dll/directx/dsound_new/precomp.h
index 1df6e7abf4a..c527d844e87 100644
--- a/dll/directx/dsound_new/precomp.h
+++ b/dll/directx/dsound_new/precomp.h
@@ -15,8 +15,6 @@
 #include <dsconf.h>
 #include <vfwmsgs.h>
 #include <setupapi.h>
-#define YDEBUG
-#include <debug.h>
 #include <ks.h>
 #include <ksmedia.h>
 #include <limits.h>
@@ -24,6 +22,8 @@
 
 #include "resource.h"
 
+// #define NDEBUG
+#include <debug.h>
 
 /* factory method */
 typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject);
@@ -35,7 +35,6 @@ typedef struct
     LPFNCREATEINSTANCE lpfnCI;
 } INTERFACE_TABLE;
 
-
 typedef struct tagFILTERINFO
 {
     SP_DEVINFO_DATA DeviceData;
@@ -74,7 +73,6 @@ IClassFactory_fnConstructor(
     PLONG pcRefDll,
     REFIID riidInst);
 
-
 /* devicelist.c */
 
 HRESULT
@@ -107,7 +105,6 @@ NewDirectSound(
     REFIID riid,
     LPVOID* ppvObject);
 
-
 /* misc.c */
 
 VOID
@@ -136,7 +133,6 @@ CreateCompatiblePin(
     OUT LPWAVEFORMATEX WaveFormatOut,
     OUT PHANDLE hPin);
 
-
 DWORD
 SyncOverlappedDeviceIoControl(
     IN  HANDLE Handle,
@@ -153,7 +149,6 @@ PrimaryDirectSoundBuffer_Write(
     LPVOID Buffer,
     DWORD  BufferSize);
 
-
 DWORD
 OpenPin(
     HANDLE hFilter,
@@ -229,6 +224,7 @@ NewSecondarySoundBuffer(
     LPDIRECTSOUNDBUFFER8 PrimaryBuffer);
 
 /* property.c */
+
 HRESULT
 CALLBACK
 NewKsPropertySet(
@@ -245,8 +241,8 @@ NewDirectSoundCapture(
     REFIID riid,
     LPVOID* ppvObject);
 
-
 /* capturebuffer.c */
+
 HRESULT
 NewDirectSoundCaptureBuffer(
     LPDIRECTSOUNDCAPTUREBUFFER8 *OutBuffer,
@@ -254,6 +250,7 @@ NewDirectSoundCaptureBuffer(
     LPCDSCBUFFERDESC lpcDSBufferDesc);
 
 /* notify.c */
+
 VOID
 DoNotifyPositionEvents(
     LPDIRECTSOUNDNOTIFY iface,
diff --git a/drivers/wdm/audio/hdaudbus/hdaudbus.h b/drivers/wdm/audio/hdaudbus/hdaudbus.h
index 5c4c4ab8aa4..89d216c1b76 100644
--- a/drivers/wdm/audio/hdaudbus/hdaudbus.h
+++ b/drivers/wdm/audio/hdaudbus/hdaudbus.h
@@ -1,19 +1,19 @@
 #pragma once
 
-#define YDEBUG
 #include <ntddk.h>
-#include <debug.h>
 #include <initguid.h>
 #include <hdaudio.h>
 #include <stdio.h>
 #include <ntstrsafe.h>
 
-#define TAG_HDA 'bADH'
-
-
-// include Haiku headers
+// Include Haiku headers
 #include "driver.h"
 
+// #define NDEBUG
+#include <debug.h>
+
+#define TAG_HDA 'bADH'
+
 #define MAKE_RATE(base, multiply, divide) \
 	((base == 44100 ? FORMAT_44_1_BASE_RATE : 0) \
 		| ((multiply - 1) << FORMAT_MULTIPLY_RATE_SHIFT) \
@@ -29,7 +29,6 @@
 
 #define ALIGN(size, align)	(((size) + align - 1) & ~(align - 1))
 
-
 typedef struct {
 	ULONG response;
 	ULONG flags;
@@ -61,7 +60,6 @@ typedef struct
 
 }HDA_CODEC_ENTRY, *PHDA_CODEC_ENTRY;
 
-
 typedef struct
 {
 	BOOLEAN IsFDO;
@@ -92,7 +90,6 @@ typedef struct
 	PDEVICE_OBJECT FDO;
 }HDA_PDO_DEVICE_EXTENSION, *PHDA_PDO_DEVICE_EXTENSION;
 
-
 typedef struct {
 	ULONG device : 16;
 	ULONG vendor : 16;
@@ -107,7 +104,6 @@ typedef struct {
 	ULONG _reserved2 : 8;
 }CODEC_RESPONSE, *PCODEC_RESPONSE;
 
-
 PVOID
 AllocateItem(
     IN POOL_TYPE PoolType,
@@ -118,6 +114,7 @@ FreeItem(
     IN PVOID Item);
 
 /* fdo.cpp */
+
 KSERVICE_ROUTINE HDA_InterruptService;
 IO_DPC_ROUTINE HDA_DpcForIsr;