--- a/dom/media/webrtc/MediaEngineSource.cpp
+++ b/dom/media/webrtc/MediaEngineSource.cpp
@@ -4,24 +4,27 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "MediaEngineSource.h"
 
 #include "mozilla/dom/MediaTrackSettingsBinding.h"
 
 namespace mozilla {
 
+using dom::MediaSourceEnum;
+using dom::MediaTrackSettings;
+
 // These need a definition somewhere because template
 // code is allowed to take their address, and they aren't
 // guaranteed to have one without this.
 const unsigned int MediaEngineSource::kMaxDeviceNameLength;
 const unsigned int MediaEngineSource::kMaxUniqueIdLength;
 
 /* static */ bool
-MediaEngineSource::IsVideo(dom::MediaSourceEnum aSource)
+MediaEngineSource::IsVideo(MediaSourceEnum aSource)
 {
   switch (aSource) {
     case MediaSourceEnum::Camera:
     case MediaSourceEnum::Screen:
     case MediaSourceEnum::Application:
     case MediaSourceEnum::Window:
     case MediaSourceEnum::Browser:
       return true;
@@ -59,17 +62,17 @@ MediaEngineSource::Shutdown()
 
 nsresult
 MediaEngineSource::TakePhoto(MediaEnginePhotoCallback* aCallback)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
 void
-MediaEngineSource::GetSettings(dom::MediaTrackSettings& aOutSettings) const
+MediaEngineSource::GetSettings(MediaTrackSettings& aOutSettings) const
 {
-  dom::MediaTrackSettings empty;
+  MediaTrackSettings empty;
   aOutSettings = empty;
 }
 
 MediaEngineSource::~MediaEngineSource() = default;
 
 } // namespace mozilla

--- a/dom/media/webrtc/MediaTrackConstraints.cpp
+++ b/dom/media/webrtc/MediaTrackConstraints.cpp
@@ -5,19 +5,19 @@
 
 #include "MediaTrackConstraints.h"
 
 #include <limits>
 #include <algorithm>
 #include <iterator>
 
 #include "MediaEngineSource.h"
-#include "MediaManager.h"
 #include "nsIScriptError.h"
 #include "mozilla/dom/MediaStreamTrackBinding.h"
+#include "mozilla/MediaManager.h"
 
 namespace mozilla {
 
 using dom::ConstrainBooleanParameters;
 using dom::OwningLongOrConstrainLongRange;
 
 template<class ValueType>
 template<class ConstrainRange>