--- a/dom/media/gtest/mp4_demuxer/TestInterval.cpp
+++ b/dom/media/gtest/mp4_demuxer/TestInterval.cpp
@@ -1,15 +1,15 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* 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/. */
 
 #include "gtest/gtest.h"
-#include "mp4_demuxer/Interval.h"
+#include "Interval.h"
 
 using namespace mp4_demuxer;
 using namespace mozilla;
 
 TEST(Interval, Length)
 {
   Interval<int> i(15, 25);
   EXPECT_EQ(10, i.Length());

--- a/dom/media/gtest/mp4_demuxer/TestParser.cpp
+++ b/dom/media/gtest/mp4_demuxer/TestParser.cpp
@@ -3,19 +3,19 @@
  * 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 "gtest/gtest.h"
 #include "MediaData.h"
 #include "MediaPrefs.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Preferences.h"
-#include "mp4_demuxer/BufferStream.h"
-#include "mp4_demuxer/MP4Metadata.h"
-#include "mp4_demuxer/MoofParser.h"
+#include "BufferStream.h"
+#include "MP4Metadata.h"
+#include "MoofParser.h"
 
 using namespace mozilla;
 using namespace mp4_demuxer;
 
 static const uint32_t E = mp4_demuxer::MP4Metadata::NumberTracksError();
 
 class TestStream : public Stream
 {

--- a/dom/media/mediasource/ContainerParser.cpp
+++ b/dom/media/mediasource/ContainerParser.cpp
@@ -5,25 +5,25 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ContainerParser.h"
 
 #include "WebMBufferedParser.h"
 #include "mozilla/EndianUtils.h"
 #include "mozilla/IntegerPrintfMacros.h"
 #include "mozilla/ErrorResult.h"
-#include "mp4_demuxer/MoofParser.h"
+#include "MoofParser.h"
 #include "mozilla/Logging.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/Result.h"
 #include "MediaData.h"
 #ifdef MOZ_FMP4
-#include "mp4_demuxer/AtomType.h"
+#include "AtomType.h"
 #include "BufferReader.h"
-#include "mp4_demuxer/Stream.h"
+#include "Stream.h"
 #endif
 #include "nsAutoPtr.h"
 #include "SourceBufferResource.h"
 #include <algorithm>
 
 extern mozilla::LogModule* GetMediaSourceSamplesLog();
 
 #define STRINGIFY(x) #x

--- a/dom/media/mp4/Box.cpp
+++ b/dom/media/mp4/Box.cpp
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* 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/. */
 
-#include "mp4_demuxer/Box.h"
-#include "mp4_demuxer/Stream.h"
+#include "Box.h"
+#include "Stream.h"
 #include "mozilla/EndianUtils.h"
 #include "mozilla/Unused.h"
 #include <algorithm>
 
 using namespace mozilla;
 
 namespace mp4_demuxer {
 

--- a/dom/media/mp4/Box.h
+++ b/dom/media/mp4/Box.h
@@ -6,17 +6,17 @@
 
 #ifndef BOX_H_
 #define BOX_H_
 
 #include <stdint.h>
 #include "nsTArray.h"
 #include "MediaResource.h"
 #include "mozilla/EndianUtils.h"
-#include "mp4_demuxer/AtomType.h"
+#include "AtomType.h"
 #include "BufferReader.h"
 
 using namespace mozilla;
 
 namespace mp4_demuxer {
 
 class Stream;
 

--- a/dom/media/mp4/BufferStream.cpp
+++ b/dom/media/mp4/BufferStream.cpp
@@ -1,13 +1,13 @@
 /* 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/. */
 
-#include "mp4_demuxer/BufferStream.h"
+#include "BufferStream.h"
 #include "MediaData.h"
 #include "MediaResource.h"
 #include <algorithm>
 
 using namespace mozilla;
 
 namespace mp4_demuxer {
 

--- a/dom/media/mp4/BufferStream.h
+++ b/dom/media/mp4/BufferStream.h
@@ -1,16 +1,16 @@
 /* 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/. */
 
 #ifndef BUFFER_STREAM_H_
 #define BUFFER_STREAM_H_
 
-#include "mp4_demuxer/Stream.h"
+#include "Stream.h"
 #include "nsTArray.h"
 #include "MediaResource.h"
 
 namespace mozilla {
 class MediaByteBuffer;
 }
 
 namespace mp4_demuxer {

--- a/dom/media/mp4/DecoderData.cpp
+++ b/dom/media/mp4/DecoderData.cpp
@@ -1,16 +1,16 @@
 /* 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/. */
 
 #include "Adts.h"
 #include "AnnexB.h"
 #include "BufferReader.h"
-#include "mp4_demuxer/DecoderData.h"
+#include "DecoderData.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/EndianUtils.h"
 #include "VideoUtils.h"
 
 // OpusDecoder header is really needed only by MP4 in rust
 #include "OpusDecoder.h"
 #include "mp4parse.h"
 

--- a/dom/media/mp4/Index.cpp
+++ b/dom/media/mp4/Index.cpp
@@ -1,17 +1,17 @@
 /* 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/. */
 
 #include "BufferReader.h"
-#include "mp4_demuxer/Index.h"
-#include "mp4_demuxer/Interval.h"
-#include "mp4_demuxer/MP4Metadata.h"
-#include "mp4_demuxer/SinfParser.h"
+#include "Index.h"
+#include "Interval.h"
+#include "MP4Metadata.h"
+#include "SinfParser.h"
 #include "nsAutoPtr.h"
 #include "mozilla/RefPtr.h"
 
 #include <algorithm>
 #include <limits>
 
 using namespace mozilla;
 using namespace mozilla::media;

--- a/dom/media/mp4/Index.h
+++ b/dom/media/mp4/Index.h
@@ -3,19 +3,19 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef INDEX_H_
 #define INDEX_H_
 
 #include "MediaData.h"
 #include "MediaResource.h"
 #include "TimeUnits.h"
-#include "mp4_demuxer/MoofParser.h"
-#include "mp4_demuxer/Interval.h"
-#include "mp4_demuxer/Stream.h"
+#include "MoofParser.h"
+#include "Interval.h"
+#include "Stream.h"
 #include "nsISupportsImpl.h"
 
 template<class T> class nsAutoPtr;
 
 namespace mp4_demuxer
 {
 
 class Index;

--- a/dom/media/mp4/MP4Demuxer.cpp
+++ b/dom/media/mp4/MP4Demuxer.cpp
@@ -10,21 +10,21 @@
 
 #include "MP4Demuxer.h"
 
 #include "MediaPrefs.h"
 // Used for telemetry
 #include "mozilla/Telemetry.h"
 #include "AnnexB.h"
 #include "H264.h"
-#include "mp4_demuxer/MoofParser.h"
-#include "mp4_demuxer/MP4Metadata.h"
-#include "mp4_demuxer/ResourceStream.h"
-#include "mp4_demuxer/BufferStream.h"
-#include "mp4_demuxer/Index.h"
+#include "MoofParser.h"
+#include "MP4Metadata.h"
+#include "ResourceStream.h"
+#include "BufferStream.h"
+#include "Index.h"
 #include "nsAutoPtr.h"
 #include "nsPrintfCString.h"
 
 extern mozilla::LazyLogModule gMediaDemuxerLog;
 mozilla::LogModule* GetDemuxerLog()
 {
   return gMediaDemuxerLog;
 }

--- a/dom/media/mp4/MP4Metadata.cpp
+++ b/dom/media/mp4/MP4Metadata.cpp
@@ -5,19 +5,19 @@
 #include "mozilla/Assertions.h"
 #include "mozilla/CheckedInt.h"
 #include "mozilla/EndianUtils.h"
 #include "mozilla/Logging.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/UniquePtr.h"
 #include "VideoUtils.h"
-#include "mp4_demuxer/MoofParser.h"
-#include "mp4_demuxer/MP4Metadata.h"
-#include "mp4_demuxer/Stream.h"
+#include "MoofParser.h"
+#include "MP4Metadata.h"
+#include "Stream.h"
 #include "MediaPrefs.h"
 #include "mp4parse.h"
 
 #include <limits>
 #include <stdint.h>
 #include <vector>
 
 using mozilla::media::TimeUnit;

--- a/dom/media/mp4/MP4Metadata.h
+++ b/dom/media/mp4/MP4Metadata.h
@@ -2,18 +2,18 @@
  * 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 MP4METADATA_H_
 #define MP4METADATA_H_
 
 #include "mozilla/TypeTraits.h"
 #include "mozilla/UniquePtr.h"
-#include "mp4_demuxer/DecoderData.h"
-#include "mp4_demuxer/Index.h"
+#include "DecoderData.h"
+#include "Index.h"
 #include "MediaData.h"
 #include "MediaInfo.h"
 #include "MediaResult.h"
 #include "Stream.h"
 #include "mp4parse.h"
 
 namespace mp4_demuxer {
 

--- a/dom/media/mp4/MoofParser.cpp
+++ b/dom/media/mp4/MoofParser.cpp
@@ -1,15 +1,15 @@
 /* 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/. */
 
-#include "mp4_demuxer/MoofParser.h"
-#include "mp4_demuxer/Box.h"
-#include "mp4_demuxer/SinfParser.h"
+#include "MoofParser.h"
+#include "Box.h"
+#include "SinfParser.h"
 #include <limits>
 #include "Intervals.h"
 
 #include "mozilla/CheckedInt.h"
 #include "mozilla/Logging.h"
 
 #if defined(MOZ_FMP4)
 extern mozilla::LogModule* GetDemuxerLog();

--- a/dom/media/mp4/MoofParser.h
+++ b/dom/media/mp4/MoofParser.h
@@ -1,21 +1,21 @@
 /* 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/. */
 
 #ifndef MOOF_PARSER_H_
 #define MOOF_PARSER_H_
 
 #include "mozilla/ResultExtensions.h"
-#include "mp4_demuxer/Atom.h"
-#include "mp4_demuxer/AtomType.h"
-#include "mp4_demuxer/SinfParser.h"
-#include "mp4_demuxer/Stream.h"
-#include "mp4_demuxer/Interval.h"
+#include "Atom.h"
+#include "AtomType.h"
+#include "SinfParser.h"
+#include "Stream.h"
+#include "Interval.h"
 #include "MediaResource.h"
 
 namespace mp4_demuxer {
 typedef int64_t Microseconds;
 
 class Box;
 class BoxContext;
 class BoxReader;

--- a/dom/media/mp4/ResourceStream.cpp
+++ b/dom/media/mp4/ResourceStream.cpp
@@ -1,15 +1,15 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* 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/. */
 
-#include "mp4_demuxer/ResourceStream.h"
+#include "ResourceStream.h"
 
 namespace mp4_demuxer {
 
 ResourceStream::ResourceStream(mozilla::MediaResource* aResource)
   : mResource(aResource)
   , mPinCount(0)
 {
   MOZ_ASSERT(aResource);

--- a/dom/media/mp4/ResourceStream.h
+++ b/dom/media/mp4/ResourceStream.h
@@ -1,17 +1,17 @@
 /* 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/. */
 
 #ifndef RESOURCESTREAM_H_
 #define RESOURCESTREAM_H_
 
 #include "MediaResource.h"
-#include "mp4_demuxer/Stream.h"
+#include "Stream.h"
 #include "mozilla/RefPtr.h"
 
 namespace mp4_demuxer
 {
 
 class ResourceStream : public Stream
 {
 public:

--- a/dom/media/mp4/SinfParser.cpp
+++ b/dom/media/mp4/SinfParser.cpp
@@ -1,17 +1,17 @@
 /* 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/. */
 
 #include "mozilla/Unused.h"
-#include "mp4_demuxer/SinfParser.h"
-#include "mp4_demuxer/AtomType.h"
-#include "mp4_demuxer/Box.h"
-#include "mp4_demuxer/Stream.h"
+#include "SinfParser.h"
+#include "AtomType.h"
+#include "Box.h"
+#include "Stream.h"
 
 namespace mp4_demuxer {
 
 Sinf::Sinf(Box& aBox)
   : mDefaultIVSize(0)
   , mDefaultEncryptionType()
 {
   SinfParser parser(aBox);

--- a/dom/media/mp4/SinfParser.h
+++ b/dom/media/mp4/SinfParser.h
@@ -2,18 +2,18 @@
  * 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 SINF_PARSER_H_
 #define SINF_PARSER_H_
 
 #include "mozilla/ResultExtensions.h"
-#include "mp4_demuxer/Atom.h"
-#include "mp4_demuxer/AtomType.h"
+#include "Atom.h"
+#include "AtomType.h"
 
 namespace mp4_demuxer {
 
 class Box;
 
 class Sinf : public Atom
 {
 public:

--- a/dom/media/mp4/moz.build
+++ b/dom/media/mp4/moz.build
@@ -1,28 +1,25 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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 += [
-    'MP4Decoder.h',
-    'MP4Demuxer.h',
-]
-
-EXPORTS.mp4_demuxer += [
     'Atom.h',
     'AtomType.h',
     'Box.h',
     'BufferStream.h',
     'DecoderData.h',
     'Index.h',
     'Interval.h',
     'MoofParser.h',
+    'MP4Decoder.h',
+    'MP4Demuxer.h',
     'MP4Metadata.h',
     'ResourceStream.h',
     'SinfParser.h',
     'Stream.h',
 ]
 
 UNIFIED_SOURCES += [
     'Box.cpp',

--- a/dom/media/platforms/agnostic/bytestreams/H264.h
+++ b/dom/media/platforms/agnostic/bytestreams/H264.h
@@ -1,16 +1,16 @@
 /* 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/. */
 
 #ifndef MP4_DEMUXER_H264_H_
 #define MP4_DEMUXER_H264_H_
 
-#include "mp4_demuxer/DecoderData.h"
+#include "DecoderData.h"
 
 namespace mp4_demuxer {
 
 // Spec 7.4.2.1
 #define MAX_SPS_COUNT 32
 #define MAX_PPS_COUNT 256
 
 // NAL unit types