diff --git a/reactos/dll/win32/msvfw32/drawdib.c b/reactos/dll/win32/msvfw32/drawdib.c
index 6acec39bd2a..cc22b4444ef 100644
--- a/reactos/dll/win32/msvfw32/drawdib.c
+++ b/reactos/dll/win32/msvfw32/drawdib.c
@@ -20,21 +20,7 @@
  * Handle palettes
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-//#include "winuser.h"
-#include <vfw.h>
-
-#include <wine/debug.h>
+#include "msvideo_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msvideo);
 
diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Da.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Da.rc
index 185528593b8..a5eb41d343a 100644
--- a/reactos/dll/win32/msvfw32/lang/msvfw32_Da.rc
+++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Da.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "msvideo_private.h"
-
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 ICM_CHOOSE_COMPRESSOR DIALOG  36, 24, 187, 95
diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_De.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_De.rc
index ce99f640479..54b915ffc31 100644
--- a/reactos/dll/win32/msvfw32/lang/msvfw32_De.rc
+++ b/reactos/dll/win32/msvfw32/lang/msvfw32_De.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "msvideo_private.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_En.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_En.rc
index 7668a7f0b06..e1ed5c35c37 100644
--- a/reactos/dll/win32/msvfw32/lang/msvfw32_En.rc
+++ b/reactos/dll/win32/msvfw32/lang/msvfw32_En.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "msvideo_private.h"
-
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 ICM_CHOOSE_COMPRESSOR DIALOG  36, 24, 187, 95
diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Es.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Es.rc
index e763a5263dd..813463d8c2b 100644
--- a/reactos/dll/win32/msvfw32/lang/msvfw32_Es.rc
+++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Es.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "msvideo_private.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Fr.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Fr.rc
index 5fa94a707c4..28b2841dc90 100644
--- a/reactos/dll/win32/msvfw32/lang/msvfw32_Fr.rc
+++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Fr.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "msvideo_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_He.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_He.rc
index 41694638f30..0394c0e0888 100644
--- a/reactos/dll/win32/msvfw32/lang/msvfw32_He.rc
+++ b/reactos/dll/win32/msvfw32/lang/msvfw32_He.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "msvideo_private.h"
-
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
 ICM_CHOOSE_COMPRESSOR DIALOG  36, 24, 187, 95
diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Hu.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Hu.rc
index 70bf4d97006..7038ed0d514 100644
--- a/reactos/dll/win32/msvfw32/lang/msvfw32_Hu.rc
+++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Hu.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "msvideo_private.h"
-
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 ICM_CHOOSE_COMPRESSOR DIALOG  36, 24, 187, 95
diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_It.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_It.rc
index 8d8656135b1..67481e5b68c 100644
--- a/reactos/dll/win32/msvfw32/lang/msvfw32_It.rc
+++ b/reactos/dll/win32/msvfw32/lang/msvfw32_It.rc
@@ -16,9 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "msvideo_private.h"
-
-/*UTF-8*/
+/* UTF-8 */
 #pragma code_page(65001)
 
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Ko.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Ko.rc
index 04227491b3a..aaf0ae67689 100644
--- a/reactos/dll/win32/msvfw32/lang/msvfw32_Ko.rc
+++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Ko.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "msvideo_private.h"
-
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 ICM_CHOOSE_COMPRESSOR DIALOG  36, 24, 187, 95
diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Lt.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Lt.rc
index 1518d467966..2db5576097d 100644
--- a/reactos/dll/win32/msvfw32/lang/msvfw32_Lt.rc
+++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Lt.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "msvideo_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Nl.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Nl.rc
index bdd6a48f05a..e0372596c50 100644
--- a/reactos/dll/win32/msvfw32/lang/msvfw32_Nl.rc
+++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Nl.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "msvideo_private.h"
-
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 ICM_CHOOSE_COMPRESSOR DIALOG  36, 24, 187, 95
diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_No.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_No.rc
index 7905b7a3f8a..4dcc1416937 100644
--- a/reactos/dll/win32/msvfw32/lang/msvfw32_No.rc
+++ b/reactos/dll/win32/msvfw32/lang/msvfw32_No.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "msvideo_private.h"
-
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 ICM_CHOOSE_COMPRESSOR DIALOG  36, 24, 187, 95
diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Pl.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Pl.rc
index 642c853fd1c..0a3675e054c 100644
--- a/reactos/dll/win32/msvfw32/lang/msvfw32_Pl.rc
+++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Pl.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "msvideo_private.h"
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 ICM_CHOOSE_COMPRESSOR DIALOG  36, 24, 207, 95
diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Pt.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Pt.rc
index b12b516e09f..e6b4f9b3022 100644
--- a/reactos/dll/win32/msvfw32/lang/msvfw32_Pt.rc
+++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Pt.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "msvideo_private.h"
-
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 ICM_CHOOSE_COMPRESSOR DIALOG  36, 24, 187, 95
diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Ro.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Ro.rc
index 77302d67cdc..2f6e5934e18 100644
--- a/reactos/dll/win32/msvfw32/lang/msvfw32_Ro.rc
+++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Ro.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "msvideo_private.h"
-
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc
index fd3d4096087..24c6624ca48 100644
--- a/reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc
+++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Ru.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "msvideo_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Si.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Si.rc
index 6ea6aa4be0b..2cd211d3efe 100644
--- a/reactos/dll/win32/msvfw32/lang/msvfw32_Si.rc
+++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Si.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "msvideo_private.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Sv.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Sv.rc
index 6d28bb1ff05..c329279ec88 100644
--- a/reactos/dll/win32/msvfw32/lang/msvfw32_Sv.rc
+++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Sv.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "msvideo_private.h"
-
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 ICM_CHOOSE_COMPRESSOR DIALOG  36, 24, 187, 95
diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Tr.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Tr.rc
index b02d144c0ad..1d06aebace2 100644
--- a/reactos/dll/win32/msvfw32/lang/msvfw32_Tr.rc
+++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Tr.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "msvideo_private.h"
-
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 ICM_CHOOSE_COMPRESSOR DIALOG  36, 24, 187, 95
diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Uk.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Uk.rc
index 5c26a82a00b..38828690d06 100644
--- a/reactos/dll/win32/msvfw32/lang/msvfw32_Uk.rc
+++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Uk.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "msvideo_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/dll/win32/msvfw32/lang/msvfw32_Zh.rc b/reactos/dll/win32/msvfw32/lang/msvfw32_Zh.rc
index ad960d132b0..92ba6362ea1 100644
--- a/reactos/dll/win32/msvfw32/lang/msvfw32_Zh.rc
+++ b/reactos/dll/win32/msvfw32/lang/msvfw32_Zh.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "msvideo_private.h"
-
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/dll/win32/msvfw32/mciwnd.c b/reactos/dll/win32/msvfw32/mciwnd.c
index b221e8a855c..6138afb09bf 100644
--- a/reactos/dll/win32/msvfw32/mciwnd.c
+++ b/reactos/dll/win32/msvfw32/mciwnd.c
@@ -21,23 +21,12 @@
  * Add support for MCIWNDF_RECORD.
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include "msvideo_private.h"
 
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winnls.h"
-#include <wingdi.h>
-//#include "winuser.h"
 #include <winternl.h>
-#include <vfw.h>
 #include <digitalv.h>
 #include <commctrl.h>
 #include <wine/unicode.h>
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(mci);
 
diff --git a/reactos/dll/win32/msvfw32/msvideo_main.c b/reactos/dll/win32/msvfw32/msvideo_main.c
index c45fd31f96a..0b6442003ce 100644
--- a/reactos/dll/win32/msvfw32/msvideo_main.c
+++ b/reactos/dll/win32/msvfw32/msvideo_main.c
@@ -26,24 +26,12 @@
  *      - no thread safety
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <string.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <winnls.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <commdlg.h>
-#include <vfw.h>
 #include "msvideo_private.h"
-#include <wine/debug.h>
+
+#include <winreg.h>
+#include <commdlg.h>
+
+#include "resource.h"
 
 /* Drivers32 settings */
 #define HKLM_DRIVERS32 "Software\\Microsoft\\Windows NT\\CurrentVersion\\Drivers32"
diff --git a/reactos/dll/win32/msvfw32/msvideo_private.h b/reactos/dll/win32/msvfw32/msvideo_private.h
index 4ca97806e44..f06d4f17de6 100644
--- a/reactos/dll/win32/msvfw32/msvideo_private.h
+++ b/reactos/dll/win32/msvfw32/msvideo_private.h
@@ -19,12 +19,22 @@
 #ifndef __WINE_MSVIDEO_PRIVATE_H
 #define __WINE_MSVIDEO_PRIVATE_H
 
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #include <windef.h>
-#include <winuser.h>
+#include <winbase.h>
+#include <winnls.h>
+#include <wingdi.h>
+#include <vfw.h>
+
+#include <wine/debug.h>
 
 #define ICM_CHOOSE_COMPRESSOR 1
 #define IDC_COMP_LIST 880
-#define IDS_FULLFRAMES 901
 
 /* HIC struct (same layout as Win95 one) */
 typedef struct tagWINE_HIC {
@@ -46,17 +56,4 @@ typedef struct tagWINE_HIC {
 
 extern HMODULE MSVFW32_hModule DECLSPEC_HIDDEN;
 
-#define IDC_CONFIGURE 882
-#define IDC_ABOUT 883
-
-#define IDC_QUALITY_SCROLL 884
-#define IDC_QUALITY_TXT 886
-
-#define IDC_KEYFRAME_CHECKBOX 887
-#define IDC_KEYFRAME  888
-#define IDC_KEYFRAME_FRAMES 889
-#define IDC_DATARATE_CHECKBOX 894
-#define IDC_DATARATE  895
-#define IDC_DATARATE_KB 896
-
 #endif  /* __WINE_MSVIDEO_PRIVATE_H */
diff --git a/reactos/dll/win32/msvfw32/resource.h b/reactos/dll/win32/msvfw32/resource.h
new file mode 100644
index 00000000000..2309c61014c
--- /dev/null
+++ b/reactos/dll/win32/msvfw32/resource.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright 1999 Marcus Meissner
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#pragma once
+
+#define IDS_FULLFRAMES 901
+
+#define IDC_CONFIGURE 882
+#define IDC_ABOUT 883
+
+#define IDC_QUALITY_SCROLL 884
+#define IDC_QUALITY_TXT 886
+
+#define IDC_KEYFRAME_CHECKBOX 887
+#define IDC_KEYFRAME  888
+#define IDC_KEYFRAME_FRAMES 889
+#define IDC_DATARATE_CHECKBOX 894
+#define IDC_DATARATE  895
+#define IDC_DATARATE_KB 896
diff --git a/reactos/dll/win32/msvfw32/rsrc.rc b/reactos/dll/win32/msvfw32/rsrc.rc
index 00a16381d5c..a80e8e67aed 100644
--- a/reactos/dll/win32/msvfw32/rsrc.rc
+++ b/reactos/dll/win32/msvfw32/rsrc.rc
@@ -16,9 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include "windef.h"
-//#include "winuser.h"
-//#include "msvideo_private.h"
+#include <windef.h>
+#include <winuser.h>
+
+#include "resource.h"
 
 #ifdef LANGUAGE_DA_DK
     #include "lang/msvfw32_Da.rc"