From c3e753c20be1b6e5d2cddb6333fc8959d5b699ce Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Mon, 9 Jun 2014 13:28:01 +0200
Subject: [PATCH] dmband: Move struct definitions to the .c files that uses
 them.

---
 dlls/dmband/band.c           |  9 ++++++++
 dlls/dmband/bandtrack.c      | 11 +++++++++-
 dlls/dmband/dmband_private.h | 40 ------------------------------------
 3 files changed, 19 insertions(+), 41 deletions(-)

diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c
index 97e7c300cd2..0ab7df74028 100644
--- a/dlls/dmband/band.c
+++ b/dlls/dmband/band.c
@@ -26,6 +26,15 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile);
 /*****************************************************************************
  * IDirectMusicBandImpl implementation
  */
+typedef struct IDirectMusicBandImpl {
+    IDirectMusicBand IDirectMusicBand_iface;
+    const IDirectMusicObjectVtbl *ObjectVtbl;
+    const IPersistStreamVtbl *PersistStreamVtbl;
+    LONG ref;
+    DMUS_OBJECTDESC *pDesc;
+    struct list Instruments;
+} IDirectMusicBandImpl;
+
 static inline IDirectMusicBandImpl *impl_from_IDirectMusicBand(IDirectMusicBand *iface)
 {
     return CONTAINING_RECORD(iface, IDirectMusicBandImpl, IDirectMusicBand_iface);
diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c
index 459c15886fd..14e368ded46 100644
--- a/dlls/dmband/bandtrack.c
+++ b/dlls/dmband/bandtrack.c
@@ -25,7 +25,16 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile);
 /*****************************************************************************
  * IDirectMusicBandTrack implementation
  */
-/* IDirectMusicBandTrack IUnknown part: */
+typedef struct IDirectMusicBandTrack {
+    const IUnknownVtbl *UnknownVtbl;
+    const IDirectMusicTrack8Vtbl *TrackVtbl;
+    const IPersistStreamVtbl *PersistStreamVtbl;
+    LONG ref;
+    DMUS_OBJECTDESC *pDesc;
+    DMUS_IO_BAND_TRACK_HEADER header;
+    struct list Bands;
+} IDirectMusicBandTrack;
+
 static HRESULT WINAPI IDirectMusicBandTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
 	ICOM_THIS_MULTI(IDirectMusicBandTrack, UnknownVtbl, iface);
 	TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h
index 6be6ae803a5..4c8fa0b2b19 100644
--- a/dlls/dmband/dmband_private.h
+++ b/dlls/dmband/dmband_private.h
@@ -42,13 +42,6 @@
 #include "dmusicf.h"
 #include "dmusics.h"
 
-/*****************************************************************************
- * Interfaces
- */
-typedef struct IDirectMusicBandImpl IDirectMusicBandImpl;
-	
-typedef struct IDirectMusicBandTrack IDirectMusicBandTrack;
-	
 /*****************************************************************************
  * ClassFactory
  */
@@ -82,39 +75,6 @@ typedef struct _DMUS_PRIVATE_BAND {
 } DMUS_PRIVATE_BAND, *LPDMUS_PRIVATE_BAND;
 
 
-/*****************************************************************************
- * IDirectMusicBandImpl implementation structure
- */
-struct IDirectMusicBandImpl {
-  IDirectMusicBand IDirectMusicBand_iface;
-  const IDirectMusicObjectVtbl *ObjectVtbl;
-  const IPersistStreamVtbl *PersistStreamVtbl;
-  LONG           ref;
-
-  /* IDirectMusicBandImpl fields */
-  LPDMUS_OBJECTDESC pDesc;
-  /* data */
-  struct list Instruments;
-};
-
-/*****************************************************************************
- * IDirectMusicBandTrack implementation structure
- */
-struct IDirectMusicBandTrack {
-  /* IUnknown fields */
-  const IUnknownVtbl *UnknownVtbl;
-  const IDirectMusicTrack8Vtbl *TrackVtbl;
-  const IPersistStreamVtbl *PersistStreamVtbl;
-  LONG           ref;
-
-  /* IDirectMusicBandTrack fields */
-  LPDMUS_OBJECTDESC pDesc;
-  DMUS_IO_BAND_TRACK_HEADER header;
-	
-  /* data */
-  struct list Bands;
-};
-
 /**********************************************************************
  * Dll lifetime tracking declaration for dmband.dll
  */