--- a/dom/media/gmp/ChromiumCDMAdapter.cpp
+++ b/dom/media/gmp/ChromiumCDMAdapter.cpp
@@ -4,17 +4,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ChromiumCDMAdapter.h"
 #include "content_decryption_module.h"
 #include "content_decryption_module_ext.h"
 #include "VideoUtils.h"
 #include "gmp-api/gmp-entrypoints.h"
 #include "gmp-api/gmp-video-codec.h"
-#include "gmp-api/gmp-platform.h"
 #include "WidevineUtils.h"
 #include "GMPLog.h"
 #include "mozilla/Move.h"
 
 #ifdef XP_WIN
 #include "WinUtils.h"
 #include "nsWindowsDllInterceptor.h"
 #include <windows.h>

--- a/dom/media/gmp/widevine-adapter/WidevineFileIO.cpp
+++ b/dom/media/gmp/widevine-adapter/WidevineFileIO.cpp
@@ -1,12 +1,14 @@
 #include "WidevineFileIO.h"
 #include "GMPLog.h"
 #include "WidevineUtils.h"
 
+#include "gmp-api/gmp-platform.h"
+
 using namespace cdm;
 
 // Declared in ChromiumCDMAdapter.cpp.
 extern const GMPPlatformAPI* sPlatform;
 
 namespace mozilla {
 
 void

--- a/dom/media/gmp/widevine-adapter/WidevineUtils.cpp
+++ b/dom/media/gmp/widevine-adapter/WidevineUtils.cpp
@@ -7,31 +7,16 @@
 #include "GMPLog.h"
 #include "gmp-api/gmp-errors.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <inttypes.h>
 
 namespace mozilla {
 
-GMPErr
-ToGMPErr(cdm::Status aStatus)
-{
-  switch (aStatus) {
-    case cdm::kSuccess: return GMPNoErr;
-    case cdm::kNeedMoreData: return GMPGenericErr;
-    case cdm::kNoKey: return GMPNoKeyErr;
-    case cdm::kInitializationError: return GMPGenericErr;
-    case cdm::kDecryptError: return GMPCryptoErr;
-    case cdm::kDecodeError: return GMPDecodeErr;
-    case cdm::kDeferredInitialization: return GMPGenericErr;
-    default: return GMPGenericErr;
-  }
-}
-
 WidevineBuffer::WidevineBuffer(size_t aSize)
 {
   GMP_LOG("WidevineBuffer(size=%zu) created", aSize);
   mBuffer.SetLength(aSize);
 }
 
 WidevineBuffer::~WidevineBuffer()
 {

--- a/dom/media/gmp/widevine-adapter/WidevineUtils.h
+++ b/dom/media/gmp/widevine-adapter/WidevineUtils.h
@@ -3,17 +3,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/. */
 
 #ifndef WidevineUtils_h_
 #define WidevineUtils_h_
 
 #include "stddef.h"
 #include "content_decryption_module.h"
-#include "gmp-api/gmp-platform.h"
 #include "nsISupportsImpl.h"
 #include "nsTArray.h"
 #include "mozilla/Logging.h"
 
 namespace mozilla {
 
 #define ENSURE_TRUE(condition, rv)                                             \
   {                                                                            \
@@ -26,19 +25,16 @@ namespace mozilla {
 #define ENSURE_GMP_SUCCESS(err, rv)                                            \
   {                                                                            \
     if (GMP_FAILED(err)) {                                                     \
       GMP_LOG("ENSURE_GMP_SUCCESS FAILED %s:%d", __FILE__, __LINE__);          \
       return rv;                                                               \
     }                                                                          \
   }
 
-GMPErr
-ToGMPErr(cdm::Status aStatus);
-
 namespace gmp {
 class CDMShmemBuffer;
 }
 class WidevineBuffer;
 
 // Base class for our cdm::Buffer implementations, so we can tell at runtime
 // whether the buffer is a Shmem or non-Shmem buffer.
 class CDMBuffer : public cdm::Buffer