diff --git a/reactos/base/services/audiosrv/audiosrv.h b/reactos/base/services/audiosrv/audiosrv.h
index 9cfcee1b0f3..4c64f319b68 100644
--- a/reactos/base/services/audiosrv/audiosrv.h
+++ b/reactos/base/services/audiosrv/audiosrv.h
@@ -7,16 +7,10 @@
  */
 
 #include <stdarg.h>
+
 #include <windef.h>
 #include <winbase.h>
-#include <winreg.h>
-#include <winuser.h>
-#include <mmsystem.h>
-#include <assert.h>
-#include <setupapi.h>
-#include <ksmedia.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <malloc.h>
 #include <dbt.h>
 #include <audiosrv/audiosrv.h>
 
diff --git a/reactos/base/services/audiosrv/debug.c b/reactos/base/services/audiosrv/debug.c
index bdb34a190fc..df821afb51e 100644
--- a/reactos/base/services/audiosrv/debug.c
+++ b/reactos/base/services/audiosrv/debug.c
@@ -2,6 +2,8 @@
 
 #include "audiosrv.h"
 
+#include <stdio.h>
+
 void logmsg(char* string, ...)
 {
     va_list args;
diff --git a/reactos/base/services/audiosrv/pnp.c b/reactos/base/services/audiosrv/pnp.c
index e85da65117e..8ab76fbf9da 100644
--- a/reactos/base/services/audiosrv/pnp.c
+++ b/reactos/base/services/audiosrv/pnp.c
@@ -8,8 +8,13 @@
 
 #include "audiosrv.h"
 
-static HDEVNOTIFY device_notification_handle = NULL;
+#include <winreg.h>
+#include <winuser.h>
+#include <mmsystem.h>
+#include <setupapi.h>
+#include <ksmedia.h>
 
+static HDEVNOTIFY device_notification_handle = NULL;
 
 /*
     Finds all devices within the KSCATEGORY_AUDIO category and puts them
diff --git a/reactos/base/services/audiosrv/pnp_list_lock.c b/reactos/base/services/audiosrv/pnp_list_lock.c
index 1ac7e6545e2..43b604c0383 100644
--- a/reactos/base/services/audiosrv/pnp_list_lock.c
+++ b/reactos/base/services/audiosrv/pnp_list_lock.c
@@ -8,6 +8,8 @@
 
 #include "audiosrv.h"
 
+#include <assert.h>
+
 static HANDLE audio_device_list_lock = NULL;
 
 BOOL