--- a/dom/media/platforms/agnostic/gmp/moz.build
+++ b/dom/media/platforms/agnostic/gmp/moz.build
@@ -2,21 +2,19 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
 EXPORTS += [
     'GMPDecoderModule.h',
     'GMPVideoDecoder.h',
-    'MediaDataDecoderProxy.h',
 ]
 
 UNIFIED_SOURCES += [
     'GMPDecoderModule.cpp',
     'GMPVideoDecoder.cpp',
-    'MediaDataDecoderProxy.cpp',
 ]
 
 # GMPVideoEncodedFrameImpl.h needs IPC
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/dom/media/platforms/moz.build
+++ b/dom/media/platforms/moz.build
@@ -9,29 +9,32 @@ EXPORTS += [
     'agnostic/OpusDecoder.h',
     'agnostic/TheoraDecoder.h',
     'agnostic/VorbisDecoder.h',
     'agnostic/VPXDecoder.h',
     'DurationMap.h',
     'MediaTelemetryConstants.h',
     'PDMFactory.h',
     'PlatformDecoderModule.h',
-    'wrappers/H264Converter.h'
+    'wrappers/H264Converter.h',
+    'wrappers/MediaDataDecoderProxy.h'
+
 ]
 
 UNIFIED_SOURCES += [
     'agnostic/AgnosticDecoderModule.cpp',
     'agnostic/BlankDecoderModule.cpp',
     'agnostic/OpusDecoder.cpp',
     'agnostic/TheoraDecoder.cpp',
     'agnostic/VorbisDecoder.cpp',
     'agnostic/VPXDecoder.cpp',
     'agnostic/WAVDecoder.cpp',
     'PDMFactory.cpp',
-    'wrappers/H264Converter.cpp'
+    'wrappers/H264Converter.cpp',
+    'wrappers/MediaDataDecoderProxy.cpp'
 ]
 
 DIRS += [
     'agnostic/eme',
     'agnostic/gmp',
     'omx'
 ]
 

rename from dom/media/platforms/agnostic/gmp/MediaDataDecoderProxy.cpp
rename to dom/media/platforms/wrappers/MediaDataDecoderProxy.cpp

rename from dom/media/platforms/agnostic/gmp/MediaDataDecoderProxy.h
rename to dom/media/platforms/wrappers/MediaDataDecoderProxy.h