diff --git a/content/media/nsBuiltinDecoderReader.cpp b/content/media/nsBuiltinDecoderReader.cpp
index 7a54fadf21b7..e370b270e03c 100644
--- a/content/media/nsBuiltinDecoderReader.cpp
+++ b/content/media/nsBuiltinDecoderReader.cpp
@@ -37,9 +37,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsISeekableStream.h"
-#include "nsClassHashtable.h"
-#include "nsTArray.h"
 #include "nsBuiltinDecoder.h"
 #include "nsBuiltinDecoderReader.h"
 #include "nsBuiltinDecoderStateMachine.h"
diff --git a/content/media/nsBuiltinDecoderReader.h b/content/media/nsBuiltinDecoderReader.h
index c9d9d9a447d5..48d961062dd6 100644
--- a/content/media/nsBuiltinDecoderReader.h
+++ b/content/media/nsBuiltinDecoderReader.h
@@ -40,16 +40,10 @@
 #define nsBuiltinDecoderReader_h_
 
 #include <nsDeque.h>
-#include "Layers.h"
 #include "ImageLayers.h"
-#include "nsClassHashtable.h"
-#include "mozilla/TimeStamp.h"
 #include "nsSize.h"
-#include "nsRect.h"
 #include "mozilla/ReentrantMonitor.h"
 
-class nsBuiltinDecoderStateMachine;
-
 // Stores info relevant to presenting media frames.
 class nsVideoInfo {
 public:
diff --git a/content/media/nsMediaDecoder.cpp b/content/media/nsMediaDecoder.cpp
index 5dca2be2d661..cdc5f2ba4206 100644
--- a/content/media/nsMediaDecoder.cpp
+++ b/content/media/nsMediaDecoder.cpp
@@ -39,20 +39,8 @@
 #include "nsMediaDecoder.h"
 #include "MediaResource.h"
 
-#include "prlog.h"
-#include "prmem.h"
-#include "nsIFrame.h"
-#include "nsIDocument.h"
-#include "nsThreadUtils.h"
-#include "nsIDOMHTMLMediaElement.h"
-#include "nsNetUtil.h"
 #include "nsHTMLMediaElement.h"
-#include "gfxContext.h"
-#include "nsPresContext.h"
 #include "nsDOMError.h"
-#include "nsDisplayList.h"
-#include "nsSVGEffects.h"
-#include "VideoUtils.h"
 
 using namespace mozilla;
 
diff --git a/content/media/nsMediaDecoder.h b/content/media/nsMediaDecoder.h
index 3bbc290c8f24..8418d35c7ee7 100644
--- a/content/media/nsMediaDecoder.h
+++ b/content/media/nsMediaDecoder.h
@@ -38,22 +38,16 @@
 #if !defined(nsMediaDecoder_h_)
 #define nsMediaDecoder_h_
 
-#include "mozilla/XPCOM.h"
-
-#include "nsIPrincipal.h"
-#include "nsSize.h"
-#include "prlog.h"
-#include "gfxContext.h"
-#include "gfxRect.h"
-#include "nsITimer.h"
 #include "ImageLayers.h"
 #include "mozilla/ReentrantMonitor.h"
-#include "nsIMemoryReporter.h"
 #include "VideoFrameContainer.h"
 
 class nsHTMLMediaElement;
 class nsIStreamListener;
 class nsTimeRanges;
+class nsIMemoryReporter;
+class nsIPrincipal;
+class nsITimer;
 
 namespace mozilla {
 class MediaResource;
diff --git a/content/media/wave/nsWaveReader.cpp b/content/media/wave/nsWaveReader.cpp
index 4c6efaa28855..37c6d825c2a0 100644
--- a/content/media/wave/nsWaveReader.cpp
+++ b/content/media/wave/nsWaveReader.cpp
@@ -36,7 +36,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #include "nsError.h"
-#include "nsBuiltinDecoderStateMachine.h"
 #include "nsBuiltinDecoder.h"
 #include "MediaResource.h"
 #include "nsWaveReader.h"
diff --git a/content/media/wave/nsWaveReader.h b/content/media/wave/nsWaveReader.h
index 94230ab0a8ad..86ad1a4817c6 100644
--- a/content/media/wave/nsWaveReader.h
+++ b/content/media/wave/nsWaveReader.h
@@ -40,7 +40,8 @@
 
 #include "nsBuiltinDecoderReader.h"
 
-class nsMediaDecoder;
+class nsBuiltinDecoder;
+class nsTimeRanges;
 
 class nsWaveReader : public nsBuiltinDecoderReader
 {
diff --git a/content/media/webm/nsWebMReader.cpp b/content/media/webm/nsWebMReader.cpp
index fd06053bac1b..0cad368e184c 100644
--- a/content/media/webm/nsWebMReader.cpp
+++ b/content/media/webm/nsWebMReader.cpp
@@ -41,10 +41,15 @@
 #include "nsBuiltinDecoder.h"
 #include "MediaResource.h"
 #include "nsWebMReader.h"
+#include "nsWebMBufferedParser.h"
 #include "VideoUtils.h"
 #include "nsTimeRanges.h"
 #include "mozilla/Preferences.h"
 
+#define VPX_DONT_DEFINE_STDINT_TYPES
+#include "vpx/vp8dx.h"
+#include "vpx/vpx_decoder.h"
+
 using namespace mozilla;
 using namespace mozilla::layers;
 
diff --git a/content/media/webm/nsWebMReader.h b/content/media/webm/nsWebMReader.h
index 565d8ae05b94..661a2ea029f9 100644
--- a/content/media/webm/nsWebMReader.h
+++ b/content/media/webm/nsWebMReader.h
@@ -43,13 +43,11 @@
 
 #include "nsDeque.h"
 #include "nsBuiltinDecoderReader.h"
-#include "nsWebMBufferedParser.h"
 #include "nsAutoRef.h"
 #include "nestegg/nestegg.h"
 
 #define VPX_DONT_DEFINE_STDINT_TYPES
-#include "vpx/vpx_decoder.h"
-#include "vpx/vp8dx.h"
+#include "vpx/vpx_codec.h"
 
 #ifdef MOZ_TREMOR
 #include "tremor/ivorbiscodec.h"
@@ -57,7 +55,7 @@
 #include "vorbis/codec.h"
 #endif
 
-class nsMediaDecoder;
+class nsWebMBufferedState;
 
 // Holds a nestegg_packet, and its file offset. This is needed so we
 // know the offset in the file we've played up to, in order to calculate