diff --git a/mediafoundation/webmmfvp8dec/dllentry.cc b/mediafoundation/webmmfvp8dec/dllentry.cc
index 00a24db..f5c9345 100644
--- a/mediafoundation/webmmfvp8dec/dllentry.cc
+++ b/mediafoundation/webmmfvp8dec/dllentry.cc
@@ -6,13 +6,15 @@
 // in the file PATENTS.  All contributing project authors may
 // be found in the AUTHORS file in the root of the source tree.
 
+#include <comdef.h>
+#include <mfapi.h>
+#include <uuids.h>
+
+#include <cassert>
+
 #include "cfactory.h"
 #include "comreg.h"
 #include "webmtypes.h"
-#include <mfapi.h>
-#include <cassert>
-#include <comdef.h>
-#include <uuids.h>
 
 HMODULE g_hModule;
 static ULONG s_cLock;
diff --git a/mediafoundation/webmmfvp8dec/webmmfvp8dec.cc b/mediafoundation/webmmfvp8dec/webmmfvp8dec.cc
index 828ab6b..5a83b5d 100644
--- a/mediafoundation/webmmfvp8dec/webmmfvp8dec.cc
+++ b/mediafoundation/webmmfvp8dec/webmmfvp8dec.cc
@@ -7,17 +7,14 @@
 // be found in the AUTHORS file in the root of the source tree.
 
 #pragma warning(disable : 4505)  // unreferenced local function removed
-#include "clockable.h"
-#include <mfidl.h>
-#include "vpx/vpx_decoder.h"
-#include "vpx/vp8dx.h"
+
 #include "webmmfvp8dec.h"
-#include "webmtypes.h"
-#include <mfapi.h>
-#include <mferror.h>
+
 #include <comdef.h>
+
 #include <cassert>
 #include <new>
+
 #ifdef _DEBUG
 #include "odbgstream.h"
 #include "iidstr.h"
diff --git a/mediafoundation/webmmfvp8dec/webmmfvp8dec.h b/mediafoundation/webmmfvp8dec/webmmfvp8dec.h
index 2dfea55..f9ee817 100644
--- a/mediafoundation/webmmfvp8dec/webmmfvp8dec.h
+++ b/mediafoundation/webmmfvp8dec/webmmfvp8dec.h
@@ -9,8 +9,18 @@
 #ifndef WEBMDSHOW_MEDIAFOUNDATION_WEBMMFVP8DEC_WEBMMFVP8DEC_H_
 #define WEBMDSHOW_MEDIAFOUNDATION_WEBMMFVP8DEC_WEBMMFVP8DEC_H_
 
+#include <mfapi.h>
+#include <mferror.h>
+#include <mfidl.h>
+
 #include <list>
 
+#include "vpx/vpx_decoder.h"
+#include "vpx/vp8dx.h"
+
+#include "clockable.h"
+#include "webmtypes.h"
+
 namespace WebmMfVp8DecLib {
 
 class WebmMfVp8Dec : public IMFTransform,