diff --git a/reactos/dll/win32/avifil32/avifile_private.h b/reactos/dll/win32/avifil32/avifile_private.h
index c1ee945707c..605866edd8e 100644
--- a/reactos/dll/win32/avifil32/avifile_private.h
+++ b/reactos/dll/win32/avifil32/avifile_private.h
@@ -33,14 +33,14 @@
 #include <wingdi.h>
 #include <vfw.h>
 
-#include <wine/unicode.h>
-
 #include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(avifile);
+#include <wine/unicode.h>
 
 #include "extrachunk.h"
 #include "resource.h"
 
+WINE_DEFAULT_DEBUG_CHANNEL(avifile);
+
 #ifndef MAX_AVISTREAMS
 #define MAX_AVISTREAMS 8
 #endif
@@ -71,4 +71,4 @@ extern PAVIFILE  AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStr
 
 extern LPCWSTR  AVIFILE_BasenameW(LPCWSTR szFileName) DECLSPEC_HIDDEN;
 
-#endif
+#endif /* __AVIFILE_PRIVATE_H */
diff --git a/reactos/dll/win32/avifil32/editstream.c b/reactos/dll/win32/avifil32/editstream.c
index 023a4d41bc7..7ae56fed1d1 100644
--- a/reactos/dll/win32/avifil32/editstream.c
+++ b/reactos/dll/win32/avifil32/editstream.c
@@ -18,8 +18,6 @@
 
 #include "avifile_private.h"
 
-#include <initguid.h>
-
 /***********************************************************************/
 
 /* internal interface to get access to table of stream in an editable stream */
diff --git a/reactos/dll/win32/avifil32/extrachunk.h b/reactos/dll/win32/avifil32/extrachunk.h
index 53c943c2a19..f8b966c07d6 100644
--- a/reactos/dll/win32/avifil32/extrachunk.h
+++ b/reactos/dll/win32/avifil32/extrachunk.h
@@ -19,14 +19,6 @@
 #ifndef __WINE_EXTRACHUNK_H
 #define __WINE_EXTRACHUNK_H
 
-#define WIN32_NO_STATUS
-
-#include <stdarg.h>
-
-#include <windef.h>
-//#include "winbase.h"
-#include <mmsystem.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -54,4 +46,4 @@ HRESULT FindChunkAndKeepExtras(LPEXTRACHUNKS extra,HMMIO hmmio,
 }
 #endif
 
-#endif
+#endif /* __WINE_EXTRACHUNK_H */
diff --git a/reactos/dll/win32/avifil32/guid.c b/reactos/dll/win32/avifil32/guid.c
index af5aba76959..575fdf86e41 100644
--- a/reactos/dll/win32/avifil32/guid.c
+++ b/reactos/dll/win32/avifil32/guid.c
@@ -12,6 +12,10 @@
 #include <initguid.h>
 #include <vfw.h>
 
+/* editstream.c */
+DEFINE_AVIGUID(IID_IEditStreamInternal, 0x0002000A,0,0);
+
+/* avifile_private.h */
 DEFINE_AVIGUID(CLSID_ICMStream, 0x00020001, 0, 0);
 DEFINE_AVIGUID(CLSID_WAVFile,   0x00020003, 0, 0);
 DEFINE_AVIGUID(CLSID_ACMStream, 0x0002000F, 0, 0);