[WDMAUD.DRV]

* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61827

reactos/dll/win32/wdmaud.drv/mixer.c

@@ -9,6 +9,9 @@
 
 #include "wdmaud.h"
 
+#include <samplerate.h>
+#include <float_cast.h>
+
 #define NDEBUG
 #include <debug.h>
 

reactos/dll/win32/wdmaud.drv/mmixer.c

@@ -9,6 +9,10 @@
 
 #include "wdmaud.h"
 
+#include <winreg.h>
+#include <setupapi.h>
+#include <mmixer.h>
+
 #define NDEBUG
 #include <debug.h>
 

reactos/dll/win32/wdmaud.drv/wdmaud.h

@@ -1,20 +1,19 @@
-#ifndef WDMAUD_H__
-#define WDMAUD_H__
+#ifndef __WDMAUD_H__
+#define __WDMAUD_H__
 
-#include <devioctl.h>
 #include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #include <windef.h>
-#include <winbase.h>
 #include <winuser.h>
-#include <winreg.h>
-#include <setupapi.h>
 #include <mmddk.h>
 #include <mmebuddy.h>
 #include <ksmedia.h>
-#include <samplerate.h>
-#include <float_cast.h>
 #include <interface.h>
-#include <mmixer.h>
+#include <devioctl.h>
 
 BOOL
 WdmAudInitUserModeMixer(VOID);
@@ -238,4 +237,4 @@ WINAPI
 MixerEventThreadRoutine(
     LPVOID Parameter);
 
-#endif
+#endif /* __WDMAUD_H__ */