--- a/media/gmp-clearkey/0.1/AnnexB.cpp
+++ b/media/gmp-clearkey/0.1/AnnexB.cpp
@@ -10,17 +10,17 @@
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 #include "AnnexB.h"
-#include "Endian.h"
+#include "BigEndian.h"
 
 #include <cstring>
 
 using mozilla::BigEndian;
 
 static const uint8_t kAnnexBDelimiter[] = { 0, 0, 0, 1 };
 
 /* static */ void

rename from media/gmp-clearkey/0.1/Endian.h
rename to media/gmp-clearkey/0.1/BigEndian.h
--- a/media/gmp-clearkey/0.1/Endian.h
+++ b/media/gmp-clearkey/0.1/BigEndian.h
@@ -9,18 +9,18 @@
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
-#ifndef __Endian_h__
-#define __Endian_h__
+#ifndef __BigEndian_h__
+#define __BigEndian_h__
 
 #include <stdint.h>
 
 namespace mozilla {
 
 class BigEndian {
 public:
 
@@ -60,9 +60,9 @@ public:
     p[5] = uint8_t(aValue >> 16) & 0xff;
     p[6] = uint8_t(aValue >> 8) & 0xff;
     p[7] = uint8_t(aValue) & 0xff;
   }
 };
 
 } // namespace mozilla
 
-#endif // __Endian_h__
+#endif // __BigEndian_h__

--- a/media/gmp-clearkey/0.1/ClearKeySession.cpp
+++ b/media/gmp-clearkey/0.1/ClearKeySession.cpp
@@ -9,23 +9,23 @@
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
+#include "BigEndian.h"
 #include "ClearKeyDecryptionManager.h"
 #include "ClearKeySession.h"
 #include "ClearKeyUtils.h"
 #include "ClearKeyStorage.h"
 #include "gmp-task-utils.h"
 #include "gmp-api/gmp-decryption.h"
-#include "Endian.h"
 #include <assert.h>
 #include <string.h>
 
 using namespace mozilla;
 
 ClearKeySession::ClearKeySession(const std::string& aSessionId,
                                  GMPDecryptorCallback* aCallback,
                                  GMPSessionType aSessionType)

--- a/media/gmp-clearkey/0.1/ClearKeyUtils.cpp
+++ b/media/gmp-clearkey/0.1/ClearKeyUtils.cpp
@@ -20,17 +20,17 @@
 #include <stdint.h>
 #include <vector>
 
 #include "ClearKeyUtils.h"
 #include "ClearKeyBase64.h"
 #include "ArrayUtils.h"
 #include <assert.h>
 #include <memory.h>
-#include "Endian.h"
+#include "BigEndian.h"
 #include "openaes/oaes_lib.h"
 
 using namespace std;
 
 #define FOURCC(a,b,c,d) ((a << 24) + (b << 16) + (c << 8) + d)
 
 // System ID identifying the cenc v2 pssh box format; specified at:
 // https://dvcs.w3.org/hg/html-media/raw-file/tip/encrypted-media/cenc-format.html

--- a/media/gmp-clearkey/0.1/VideoDecoder.cpp
+++ b/media/gmp-clearkey/0.1/VideoDecoder.cpp
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
 #include <cstdint>
 #include <limits>
 
 #include "AnnexB.h"
+#include "BigEndian.h"
 #include "ClearKeyDecryptionManager.h"
 #include "ClearKeyUtils.h"
 #include "gmp-task-utils.h"
-#include "Endian.h"
 #include "VideoDecoder.h"
 
 using namespace wmf;
 
 VideoDecoder::VideoDecoder(GMPVideoHost *aHostAPI)
   : mHostAPI(aHostAPI)
   , mCallback(nullptr)
   , mWorkerThread(nullptr)