From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 20 Jan 2014 11:27:12 +0000 (+0000)
Subject: [DMUSIC]
X-Git-Tag: ReactOS-0.3.16~152
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=b27cb871ec4dba7490dc1872172bd4a64a0be538

[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
---

diff --git a/reactos/dll/directx/wine/dmusic/buffer.c b/reactos/dll/directx/wine/dmusic/buffer.c
index c609c7f8a63..da78b82d9fa 100644
--- a/reactos/dll/directx/wine/dmusic/buffer.c
+++ b/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)
diff --git a/reactos/dll/directx/wine/dmusic/collection.c b/reactos/dll/directx/wine/dmusic/collection.c
index e0596ab9330..330f3d55e3b 100644
--- a/reactos/dll/directx/wine/dmusic/collection.c
+++ b/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)
diff --git a/reactos/dll/directx/wine/dmusic/dmusic.c b/reactos/dll/directx/wine/dmusic/dmusic.c
index f9f866e2fdc..6991c20d49a 100644
--- a/reactos/dll/directx/wine/dmusic/dmusic.c
+++ b/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);
diff --git a/reactos/dll/directx/wine/dmusic/dmusic_main.c b/reactos/dll/directx/wine/dmusic/dmusic_main.c
index cae3a572871..655713cf3a5 100644
--- a/reactos/dll/directx/wine/dmusic/dmusic_main.c
+++ b/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;
diff --git a/reactos/dll/directx/wine/dmusic/dmusic_private.h b/reactos/dll/directx/wine/dmusic/dmusic_private.h
index 5692084d6fa..78b1adf5959 100644
--- a/reactos/dll/directx/wine/dmusic/dmusic_private.h
+++ b/reactos/dll/directx/wine/dmusic/dmusic_private.h
@@ -24,23 +24,26 @@
 
 #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 <wine/list.h>
-#include <wine/unicode.h>
-#include <winreg.h>
+#include <windef.h>
+#include <winbase.h>
 #include <objbase.h>
-
 #include <dmusici.h>
-#include <dmusicf.h>
 #include <dmusics.h>
 
+#include <wine/debug.h>
+#include <wine/list.h>
+#include <wine/unicode.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+
 /*****************************************************************************
  * Interfaces
  */
diff --git a/reactos/dll/directx/wine/dmusic/port.c b/reactos/dll/directx/wine/dmusic/port.c
index 755019c4658..18a9d52d7f4 100644
--- a/reactos/dll/directx/wine/dmusic/port.c
+++ b/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)