From 5d6fb77f8596ef40393ca272b77f3c9ca0bb6246 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Tue, 24 Dec 2013 22:56:27 +0000
Subject: [PATCH] [MCIAVI32] * Set the default debugging channel globally
 through the main header. CORE-7716

svn path=/trunk/; revision=61392
---
 reactos/dll/win32/mciavi32/info.c           | 5 -----
 reactos/dll/win32/mciavi32/mciavi.c         | 5 +----
 reactos/dll/win32/mciavi32/mmoutput.c       | 3 ---
 reactos/dll/win32/mciavi32/private_mciavi.h | 5 +++--
 reactos/dll/win32/mciavi32/wnd.c            | 4 ----
 5 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/reactos/dll/win32/mciavi32/info.c b/reactos/dll/win32/mciavi32/info.c
index 7923a68b2b6..5e9ec36c389 100644
--- a/reactos/dll/win32/mciavi32/info.c
+++ b/reactos/dll/win32/mciavi32/info.c
@@ -18,12 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <string.h>
 #include "private_mciavi.h"
-#include <wine/debug.h>
-//#include "wine/unicode.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mciavi);
 
 /**************************************************************************
  * 				MCIAVI_ConvertFrameToTimeFormat	[internal]
diff --git a/reactos/dll/win32/mciavi32/mciavi.c b/reactos/dll/win32/mciavi32/mciavi.c
index 07afa3175fc..3fe4c2dc3e9 100644
--- a/reactos/dll/win32/mciavi32/mciavi.c
+++ b/reactos/dll/win32/mciavi32/mciavi.c
@@ -37,12 +37,9 @@
  *        audio is played... still should be stopped ASAP
  */
 
-//#include <string.h>
 #include "private_mciavi.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(mciavi);
+#include <wine/unicode.h>
 
 static DWORD MCIAVI_mciStop(UINT, DWORD, LPMCI_GENERIC_PARMS);
 
diff --git a/reactos/dll/win32/mciavi32/mmoutput.c b/reactos/dll/win32/mciavi32/mmoutput.c
index c8a63ffe495..3a2d4de8279 100644
--- a/reactos/dll/win32/mciavi32/mmoutput.c
+++ b/reactos/dll/win32/mciavi32/mmoutput.c
@@ -20,9 +20,6 @@
  */
 
 #include "private_mciavi.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mciavi);
 
 static BOOL MCIAVI_GetInfoAudio(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCKINFO *mmckStream)
 {
diff --git a/reactos/dll/win32/mciavi32/private_mciavi.h b/reactos/dll/win32/mciavi32/private_mciavi.h
index fc04be43c04..d262628554f 100644
--- a/reactos/dll/win32/mciavi32/private_mciavi.h
+++ b/reactos/dll/win32/mciavi32/private_mciavi.h
@@ -27,15 +27,16 @@
 
 #include <stdarg.h>
 #include <windef.h>
-//#include "winbase.h"
 #include <wingdi.h>
-//#include "winuser.h"
 #include <mmddk.h>
 #include <digitalv.h>
 #include <vfw.h>
 #include <wownt32.h>
 #include <mciavi.h>
 
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(mciavi);
+
 struct MMIOPos {
     DWORD	dwOffset;
     DWORD	dwSize;
diff --git a/reactos/dll/win32/mciavi32/wnd.c b/reactos/dll/win32/mciavi32/wnd.c
index 3443ece0377..43019ebc9cf 100644
--- a/reactos/dll/win32/mciavi32/wnd.c
+++ b/reactos/dll/win32/mciavi32/wnd.c
@@ -19,11 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <string.h>
 #include "private_mciavi.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mciavi);
 
 static const WCHAR mciaviW[] = {'M','C','I','A','V','I',0};