[DMUSIC]

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

svn path=/trunk/; revision=61719

reactos/dll/directx/wine/dmusic/buffer.c

@@ -20,6 +20,7 @@
  */
 
 #include "dmusic_private.h"
+
 #include <dmksctrl.h>
 
 static inline IDirectMusicBufferImpl *impl_from_IDirectMusicBuffer(IDirectMusicBuffer *iface)

reactos/dll/directx/wine/dmusic/collection.c

@@ -20,6 +20,8 @@
 
 #include "dmusic_private.h"
 
+#include <dmusicf.h>
+
 WINE_DECLARE_DEBUG_CHANNEL(dmfile);
 
 static inline IDirectMusicCollectionImpl *impl_from_IDirectMusicCollection(IDirectMusicCollection *iface)

reactos/dll/directx/wine/dmusic/dmusic.c

@@ -21,6 +21,8 @@
 
 #include "dmusic_private.h"
 
+#include <winreg.h>
+
 static inline IDirectMusic8Impl *impl_from_IDirectMusic8(IDirectMusic8 *iface)
 {
     return CONTAINING_RECORD(iface, IDirectMusic8Impl, IDirectMusic8_iface);

reactos/dll/directx/wine/dmusic/dmusic_main.c

@@ -18,8 +18,9 @@
  */
 
 #include "dmusic_private.h"
+
 #include <stdio.h>
-#include "rpcproxy.h"
+#include <rpcproxy.h>
 
 static HINSTANCE instance;
 LONG DMUSIC_refCount = 0;

reactos/dll/directx/wine/dmusic/dmusic_private.h

@@ -24,22 +24,25 @@
 
 #include <config.h>
 
-#define COBJMACROS
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
-#include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+#define COBJMACROS
 
+#include <windef.h>
+#include <winbase.h>
+#include <objbase.h>
+#include <dmusici.h>
+#include <dmusics.h>
+
+#include <wine/debug.h>
 #include <wine/list.h>
 #include <wine/unicode.h>
-#include <winreg.h>
-#include <objbase.h>
 
-#include <dmusici.h>
-#include <dmusicf.h>
-#include <dmusics.h>
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
 
 /*****************************************************************************
  * Interfaces

reactos/dll/directx/wine/dmusic/port.c

@@ -20,6 +20,7 @@
  */
 
 #include "dmusic_private.h"
+
 #include <assert.h>
 
 static inline IDirectMusicDownloadedInstrumentImpl* impl_from_IDirectMusicDownloadedInstrument(IDirectMusicDownloadedInstrument *iface)