diff --git a/build/non-unified-compat b/build/non-unified-compat
index c6bef13505fa..13c9041c776e 100644
--- a/build/non-unified-compat
+++ b/build/non-unified-compat
@@ -40,5 +40,6 @@ dom/media/benchmark/
 dom/media/bridge/
 dom/media/doctor/
 dom/media/eme/
+dom/media/encoder/
 dom/quota/
 dom/simpledb/
diff --git a/dom/media/encoder/Muxer.h b/dom/media/encoder/Muxer.h
index 333a04e9aaef..ae1a2bb348cb 100644
--- a/dom/media/encoder/Muxer.h
+++ b/dom/media/encoder/Muxer.h
@@ -11,6 +11,8 @@
 namespace mozilla {
 
 class ContainerWriter;
+class EncodedFrame;
+class TrackMetadataBase;
 
 // Generic Muxer class that helps pace the output from track encoders to the
 // ContainerWriter, so time never appears to go backwards.
diff --git a/dom/media/encoder/TrackEncoder.cpp b/dom/media/encoder/TrackEncoder.cpp
index 26083360b642..bf02ba61c4ba 100644
--- a/dom/media/encoder/TrackEncoder.cpp
+++ b/dom/media/encoder/TrackEncoder.cpp
@@ -6,6 +6,7 @@
 #include "TrackEncoder.h"
 
 #include "AudioChannelFormat.h"
+#include "DriftCompensation.h"
 #include "GeckoProfiler.h"
 #include "MediaTrackGraph.h"
 #include "MediaTrackListener.h"
@@ -13,6 +14,7 @@
 #include "mozilla/Logging.h"
 #include "VideoUtils.h"
 #include "mozilla/Logging.h"
+#include "mozilla/Telemetry.h"
 
 namespace mozilla {
 
diff --git a/dom/media/encoder/VP8TrackEncoder.cpp b/dom/media/encoder/VP8TrackEncoder.cpp
index c60891cb8849..6e169e781bba 100644
--- a/dom/media/encoder/VP8TrackEncoder.cpp
+++ b/dom/media/encoder/VP8TrackEncoder.cpp
@@ -5,6 +5,7 @@
 
 #include "VP8TrackEncoder.h"
 
+#include "DriftCompensation.h"
 #include "GeckoProfiler.h"
 #include "ImageToI420.h"
 #include "mozilla/gfx/2D.h"