From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 23 Dec 2013 14:44:50 +0000 (+0000)
Subject: [AVIFIL32]
X-Git-Tag: ReactOS-0.3.16~488
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=90c20950e88e245a86c4950c857634fcac6e46a0

[AVIFIL32]
* Move some inclusions to the main header.
* Extract the resource related definitions into resource.h and include it in both the main header and the resource file.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header/resource file.
CORE-7716

svn path=/trunk/; revision=61347
---

diff --git a/reactos/dll/win32/avifil32/acmstream.c b/reactos/dll/win32/avifil32/acmstream.c
index 260ed5a47e1..e77b4f98fa0 100644
--- a/reactos/dll/win32/avifil32/acmstream.c
+++ b/reactos/dll/win32/avifil32/acmstream.c
@@ -16,27 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <assert.h>
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
-//#include "winerror.h"
-//#include "mmsystem.h"
-#include <vfw.h>
-//#include "msacm.h"
-
-//#include "avifile_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(avifile);
+#include "avifile_private.h"
 
 /***********************************************************************/
 
diff --git a/reactos/dll/win32/avifil32/api.c b/reactos/dll/win32/avifil32/api.c
index 6fdf0957fcd..c5c4dcf3cd6 100644
--- a/reactos/dll/win32/avifil32/api.c
+++ b/reactos/dll/win32/avifil32/api.c
@@ -17,35 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winnls.h"
-#include <wingdi.h>
-//#include "winuser.h"
-#include <winreg.h>
-//#include "winerror.h"
-
-//#include "ole2.h"
-//#include "shellapi.h"
-//#include "shlobj.h"
-#include <vfw.h>
-//#include "msacm.h"
-
 #include "avifile_private.h"
 
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(avifile);
-
+#include <winreg.h>
 
 /***********************************************************************
  * for AVIBuildFilterW -- uses fixed size table
diff --git a/reactos/dll/win32/avifil32/avifile.c b/reactos/dll/win32/avifil32/avifile.c
index 62de035ae2c..28766e97062 100644
--- a/reactos/dll/win32/avifil32/avifile.c
+++ b/reactos/dll/win32/avifil32/avifile.c
@@ -30,30 +30,7 @@
  *    When index is missing it works, but index seems to be okay.
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-#include <assert.h>
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "winerror.h"
-//#include "mmsystem.h"
-#include <vfw.h>
-
 #include "avifile_private.h"
-#include "extrachunk.h"
-
-#include <wine/unicode.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(avifile);
 
 #ifndef IDX_PER_BLOCK
 #define IDX_PER_BLOCK 2730
diff --git a/reactos/dll/win32/avifil32/avifile_private.h b/reactos/dll/win32/avifil32/avifile_private.h
index 5aa629b0b60..0c44b4b6353 100644
--- a/reactos/dll/win32/avifil32/avifile_private.h
+++ b/reactos/dll/win32/avifil32/avifile_private.h
@@ -19,8 +19,29 @@
 #ifndef __AVIFILE_PRIVATE_H
 #define __AVIFILE_PRIVATE_H
 
-//#include "windef.h"
-//#include "winuser.h"
+#include <assert.h>
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+
+#include <initguid.h>
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <vfw.h>
+
+#include <wine/unicode.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(avifile);
+
+#include "extrachunk.h"
+#include "resource.h"
 
 #ifndef MAX_AVISTREAMS
 #define MAX_AVISTREAMS 8
@@ -36,22 +57,6 @@
                          (lp)->biClrUsed * sizeof(RGBQUAD))
 #endif
 
-#define IDD_SAVEOPTIONS      0x0100
-#define IDC_INTERLEAVE       0x0110
-#define IDC_INTERLEAVEEVERY  0x0111
-#define IDC_STREAM           0x0112
-#define IDC_OPTIONS          0x0113
-#define IDC_FORMATTEXT       0x0114
-
-#define IDS_WAVESTREAMFORMAT 0x0100
-#define IDS_WAVEFILETYPE     0x0101
-#define IDS_ALLMULTIMEDIA    0x0184
-#define IDS_ALLFILES         0x0185
-#define IDS_VIDEO            0x0189
-#define IDS_AUDIO            0x0190
-#define IDS_AVIFILETYPE      0x0192
-#define IDS_UNCOMPRESSED     0x0193
-
 DEFINE_AVIGUID(CLSID_ICMStream, 0x00020001, 0, 0);
 DEFINE_AVIGUID(CLSID_WAVFile,   0x00020003, 0, 0);
 DEFINE_AVIGUID(CLSID_ACMStream, 0x0002000F, 0, 0);
diff --git a/reactos/dll/win32/avifil32/editstream.c b/reactos/dll/win32/avifil32/editstream.c
index 0f8ef2f7aad..7ae56fed1d1 100644
--- a/reactos/dll/win32/avifil32/editstream.c
+++ b/reactos/dll/win32/avifil32/editstream.c
@@ -16,28 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <assert.h>
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <wingdi.h>
-//#include "winerror.h"
-//#include "mmsystem.h"
-#include <vfw.h>
-
 #include "avifile_private.h"
-//#include "extrachunk.h"
-
-#include <wine/debug.h>
-#include <initguid.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(avifile);
 
 /***********************************************************************/
 
diff --git a/reactos/dll/win32/avifil32/extrachunk.c b/reactos/dll/win32/avifil32/extrachunk.c
index 2511eadb8b8..776b81de95b 100644
--- a/reactos/dll/win32/avifil32/extrachunk.c
+++ b/reactos/dll/win32/avifil32/extrachunk.c
@@ -16,21 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <assert.h>
-
-#include "extrachunk.h"
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
-#include <vfw.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(avifile);
+#include "avifile_private.h"
 
 /* reads a chunk out of the extrachunk-structure */
 HRESULT ReadExtraChunk(const EXTRACHUNKS *extra,FOURCC ckid,LPVOID lpData,LPLONG size)
diff --git a/reactos/dll/win32/avifil32/factory.c b/reactos/dll/win32/avifil32/factory.c
index ca5edc351d9..e99359868c3 100644
--- a/reactos/dll/win32/avifil32/factory.c
+++ b/reactos/dll/win32/avifil32/factory.c
@@ -16,29 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
-//#include "winerror.h"
-#include <ole2.h>
-#include <rpcproxy.h>
-
-#include <initguid.h>
-#include <vfw.h>
 #include "avifile_private.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(avifile);
+#include <rpcproxy.h>
 
 HMODULE AVIFILE_hModule   = NULL;
 
diff --git a/reactos/dll/win32/avifil32/getframe.c b/reactos/dll/win32/avifil32/getframe.c
index c69958e8511..8dac825e404 100644
--- a/reactos/dll/win32/avifil32/getframe.c
+++ b/reactos/dll/win32/avifil32/getframe.c
@@ -16,24 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
-#include <vfw.h>
-
 #include "avifile_private.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(avifile);
-
 #ifndef DIBPTR
 #define DIBPTR(lp)      ((LPBYTE)(lp) + (lp)->biSize + \
                          (lp)->biClrUsed * sizeof(RGBQUAD))
diff --git a/reactos/dll/win32/avifil32/icmstream.c b/reactos/dll/win32/avifil32/icmstream.c
index 872d1282161..bb4155b0582 100644
--- a/reactos/dll/win32/avifil32/icmstream.c
+++ b/reactos/dll/win32/avifil32/icmstream.c
@@ -16,27 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <assert.h>
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
-//#include "winerror.h"
-//#include "mmsystem.h"
-#include <vfw.h>
-
 #include "avifile_private.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(avifile);
-
 #define MAX_FRAMESIZE       (16 * 1024 * 1024)
 #define MAX_FRAMESIZE_DIFF  512
 
diff --git a/reactos/dll/win32/avifil32/lang/avifile_Bg.rc b/reactos/dll/win32/avifil32/lang/avifile_Bg.rc
index b6b6e766fe6..34fd9c1b0aa 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_Bg.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_Bg.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_Cs.rc b/reactos/dll/win32/avifil32/lang/avifile_Cs.rc
index 9778eee8b43..e5019b539ec 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_Cs.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_Cs.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_Da.rc b/reactos/dll/win32/avifil32/lang/avifile_Da.rc
index 61673dda8f5..48b7c037ed7 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_Da.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_Da.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_De.rc b/reactos/dll/win32/avifil32/lang/avifile_De.rc
index 5ca4a937ca1..490cf94a162 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_De.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_De.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_En.rc b/reactos/dll/win32/avifil32/lang/avifile_En.rc
index ad676d6e825..876d2c2191b 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_En.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_En.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_Es.rc b/reactos/dll/win32/avifil32/lang/avifile_Es.rc
index 423526c1284..6e7ce903bd6 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_Es.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_Es.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_Fr.rc b/reactos/dll/win32/avifil32/lang/avifile_Fr.rc
index 56c885d3ee2..f5a693ca286 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_Fr.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_Fr.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_He.rc b/reactos/dll/win32/avifil32/lang/avifile_He.rc
index 2351ae4d800..cf42dead43d 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_He.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_He.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_Hu.rc b/reactos/dll/win32/avifil32/lang/avifile_Hu.rc
index 9f8a2b4772d..f96454536e2 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_Hu.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_Hu.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_It.rc b/reactos/dll/win32/avifil32/lang/avifile_It.rc
index 24770c17537..5db2b2518f3 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_It.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_It.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_Ja.rc b/reactos/dll/win32/avifil32/lang/avifile_Ja.rc
index 02ca94a42ee..1531d30932e 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_Ja.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_Ja.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_Ko.rc b/reactos/dll/win32/avifil32/lang/avifile_Ko.rc
index f0a027939b2..d321acfb26d 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_Ko.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_Ko.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_Lt.rc b/reactos/dll/win32/avifil32/lang/avifile_Lt.rc
index 623ea9b3965..cb7cabcc242 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_Lt.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_Lt.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_Nl.rc b/reactos/dll/win32/avifil32/lang/avifile_Nl.rc
index bef79eb92f6..a4d280b2db8 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_Nl.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_Nl.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_No.rc b/reactos/dll/win32/avifil32/lang/avifile_No.rc
index 3a8e2652c3f..80024c94b05 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_No.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_No.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_Pl.rc b/reactos/dll/win32/avifil32/lang/avifile_Pl.rc
index 99b5a79f1f1..023e3949a0f 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_Pl.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_Pl.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_Pt.rc b/reactos/dll/win32/avifil32/lang/avifile_Pt.rc
index ee84dd98c19..2537d411f38 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_Pt.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_Pt.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_Ro.rc b/reactos/dll/win32/avifil32/lang/avifile_Ro.rc
index 2784ce8194e..80e21de8486 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_Ro.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_Ro.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_Ru.rc b/reactos/dll/win32/avifil32/lang/avifile_Ru.rc
index 796a239bec5..1040706b2de 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_Ru.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_Ru.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_Si.rc b/reactos/dll/win32/avifil32/lang/avifile_Si.rc
index 88ce35bcc15..0360f5e36ae 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_Si.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_Si.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_Sv.rc b/reactos/dll/win32/avifil32/lang/avifile_Sv.rc
index 51059779ae4..8470dd06f17 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_Sv.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_Sv.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_Tr.rc b/reactos/dll/win32/avifil32/lang/avifile_Tr.rc
index 852685a56be..09ecd87da99 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_Tr.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_Tr.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_Uk.rc b/reactos/dll/win32/avifil32/lang/avifile_Uk.rc
index 5a5712d8d58..3d4e9ae0ffd 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_Uk.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_Uk.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/lang/avifile_Zh.rc b/reactos/dll/win32/avifil32/lang/avifile_Zh.rc
index 7affafee8ab..6a33e2c2021 100644
--- a/reactos/dll/win32/avifil32/lang/avifile_Zh.rc
+++ b/reactos/dll/win32/avifil32/lang/avifile_Zh.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "avifile_private.h"
-
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
 STRINGTABLE
diff --git a/reactos/dll/win32/avifil32/resource.h b/reactos/dll/win32/avifil32/resource.h
new file mode 100644
index 00000000000..0a4db097cb2
--- /dev/null
+++ b/reactos/dll/win32/avifil32/resource.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#define IDD_SAVEOPTIONS      0x0100
+#define IDC_INTERLEAVE       0x0110
+#define IDC_INTERLEAVEEVERY  0x0111
+#define IDC_STREAM           0x0112
+#define IDC_OPTIONS          0x0113
+#define IDC_FORMATTEXT       0x0114
+
+#define IDS_WAVESTREAMFORMAT 0x0100
+#define IDS_WAVEFILETYPE     0x0101
+#define IDS_ALLMULTIMEDIA    0x0184
+#define IDS_ALLFILES         0x0185
+#define IDS_VIDEO            0x0189
+#define IDS_AUDIO            0x0190
+#define IDS_AVIFILETYPE      0x0192
+#define IDS_UNCOMPRESSED     0x0193
diff --git a/reactos/dll/win32/avifil32/rsrc.rc b/reactos/dll/win32/avifil32/rsrc.rc
index 6188c36f457..a4c4a5af3b6 100644
--- a/reactos/dll/win32/avifil32/rsrc.rc
+++ b/reactos/dll/win32/avifil32/rsrc.rc
@@ -21,7 +21,7 @@
 #include <windef.h>
 #include <winuser.h>
 
-//#include "avifile_private.h"
+#include "resource.h"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
@@ -36,8 +36,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #define WINE_FILEVERSION_STR "4.03.1998"
 #define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
-#include "wine/wine_common_ver.rc"
-//#include "avifile_private.h"
+#include <wine/wine_common_ver.rc>
 
 /* UTF-8 */
 #pragma code_page(65001)
diff --git a/reactos/dll/win32/avifil32/tmpfile.c b/reactos/dll/win32/avifil32/tmpfile.c
index babfbeb06a7..c1ffdd66318 100644
--- a/reactos/dll/win32/avifil32/tmpfile.c
+++ b/reactos/dll/win32/avifil32/tmpfile.c
@@ -16,25 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
-//#include "winerror.h"
-#include <vfw.h>
-
-//#include "avifile_private.h"
-//#include "extrachunk.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(avifile);
+#include "avifile_private.h"
 
 /***********************************************************************/
 
diff --git a/reactos/dll/win32/avifil32/wavfile.c b/reactos/dll/win32/avifil32/wavfile.c
index 53da121fa91..42637e3af88 100644
--- a/reactos/dll/win32/avifil32/wavfile.c
+++ b/reactos/dll/win32/avifil32/wavfile.c
@@ -16,30 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <assert.h>
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "winerror.h"
-//#include "mmsystem.h"
-#include <vfw.h>
-//#include "msacm.h"
-
 #include "avifile_private.h"
-#include "extrachunk.h"
-
-#include <wine/unicode.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(avifile);
 
 /***********************************************************************/