diff --git a/dom/media/platforms/android/RemoteDataDecoder.cpp b/dom/media/platforms/android/RemoteDataDecoder.cpp
index e85a733d2a3b..53454d8dc876 100644
--- a/dom/media/platforms/android/RemoteDataDecoder.cpp
+++ b/dom/media/platforms/android/RemoteDataDecoder.cpp
@@ -2,13 +2,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "RemoteDataDecoder.h"
+
 #include "AndroidBridge.h"
 #include "AndroidDecoderModule.h"
-#include "JavaCallbacksSupport.h"
-#include "SimpleMap.h"
+#include "EMEDecoderModule.h"
 #include "GLImages.h"
+#include "JavaCallbacksSupport.h"
 #include "MediaData.h"
 #include "MediaInfo.h"
+#include "SimpleMap.h"
 #include "VideoUtils.h"
 #include "VPXDecoder.h"
 
@@ -285,7 +288,7 @@ class RemoteVideoDecoder : public RemoteDataDecoder {
     }
 
     if (ok && (size > 0 || presentationTimeUs >= 0)) {
-      RefPtr<layers::Image> img = new SurfaceTextureImage(
+      RefPtr<layers::Image> img = new layers::SurfaceTextureImage(
           mSurfaceHandle, inputInfo.mImageSize, false /* NOT continuous */,
           gl::OriginPos::BottomLeft, mConfig.HasAlpha());
 
@@ -856,3 +859,4 @@ void RemoteDataDecoder::Error(const MediaResult& aError) {
 }
 
 }  // namespace mozilla
+#undef LOG