diff --git a/dom/animation/KeyframeEffect.cpp b/dom/animation/KeyframeEffect.cpp
index dcfd495041e3..2c9482815300 100644
--- a/dom/animation/KeyframeEffect.cpp
+++ b/dom/animation/KeyframeEffect.cpp
@@ -11,6 +11,7 @@
 // For UnrestrictedDoubleOrKeyframeAnimationOptions;
 #include "mozilla/dom/KeyframeEffectBinding.h"
 #include "mozilla/dom/MutationObservers.h"
+#include "mozilla/layers/AnimationInfo.h"
 #include "mozilla/AnimationUtils.h"
 #include "mozilla/AutoRestore.h"
 #include "mozilla/ComputedStyleInlines.h"
@@ -25,7 +26,6 @@
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPrefs_gfx.h"
 #include "mozilla/StaticPrefs_layers.h"
-#include "Layers.h"              // For Layer
 #include "nsComputedDOMStyle.h"  // nsComputedDOMStyle::GetComputedStyle
 #include "nsContentUtils.h"
 #include "nsCSSPropertyIDSet.h"
diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
index 8a4ffd15a537..be227dd0473d 100644
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
@@ -22,7 +22,6 @@
 #include "HTMLSplitOnSpacesTokenizer.h"
 #include "ImageOps.h"
 #include "InProcessBrowserChildMessageManager.h"
-#include "Layers.h"
 #include "MainThreadUtils.h"
 #include "PLDHashTable.h"
 #include "ReferrerInfo.h"
diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
index 85cd2dcd7fad..8c20c7463fca 100644
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -80,11 +80,10 @@
 #  include <gdk/gdk.h>
 #  if defined(MOZ_X11)
 #    include <gdk/gdkx.h>
+#    include "X11UndefineNone.h"
 #  endif
 #endif
 
-#include "Layers.h"
-
 #include "mozilla/dom/AudioDeviceInfo.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/BrowserChild.h"
@@ -101,7 +100,7 @@
 #include "nsPrintfCString.h"
 #include "nsViewportInfo.h"
 #include "nsIFormControl.h"
-//#include "nsWidgetsCID.h"
+// #include "nsWidgetsCID.h"
 #include "nsDisplayList.h"
 #include "nsROCSSPrimitiveValue.h"
 #include "nsIBaseWindow.h"
diff --git a/dom/base/nsFrameLoader.cpp b/dom/base/nsFrameLoader.cpp
index 24854ef6dae1..5282b03b7ce9 100644
--- a/dom/base/nsFrameLoader.cpp
+++ b/dom/base/nsFrameLoader.cpp
@@ -69,8 +69,6 @@
 #include "nsIDOMChromeWindow.h"
 #include "InProcessBrowserChildMessageManager.h"
 
-#include "Layers.h"
-
 #include "ContentParent.h"
 #include "BrowserParent.h"
 #include "mozilla/AsyncEventDispatcher.h"
diff --git a/dom/base/nsGlobalWindowOuter.cpp b/dom/base/nsGlobalWindowOuter.cpp
index 6cfca28a0c1c..8b88461efe2b 100644
--- a/dom/base/nsGlobalWindowOuter.cpp
+++ b/dom/base/nsGlobalWindowOuter.cpp
@@ -213,7 +213,6 @@
 #include "mozilla/dom/VREventObserver.h"
 
 #include "nsRefreshDriver.h"
-#include "Layers.h"
 
 #include "mozilla/extensions/WebExtensionPolicy.h"
 
@@ -5465,9 +5464,9 @@ void nsGlobalWindowOuter::ResizeByOuter(int32_t aWidthDif, int32_t aHeightDif,
   CheckForDPIChange();
 }
 
-void nsGlobalWindowOuter::SizeToContentOuter(CallerType aCallerType,
-                                             const SizeToContentConstraints& aConstraints,
-                                             ErrorResult& aError) {
+void nsGlobalWindowOuter::SizeToContentOuter(
+    CallerType aCallerType, const SizeToContentConstraints& aConstraints,
+    ErrorResult& aError) {
   if (!mDocShell) {
     return;
   }
@@ -5489,7 +5488,8 @@ void nsGlobalWindowOuter::SizeToContentOuter(CallerType aCallerType,
     return aError.Throw(NS_ERROR_FAILURE);
   }
 
-  auto contentSize = cv->GetContentSize(aConstraints.mMaxWidth, aConstraints.mMaxHeight, aConstraints.mPrefWidth);
+  auto contentSize = cv->GetContentSize(
+      aConstraints.mMaxWidth, aConstraints.mMaxHeight, aConstraints.mPrefWidth);
   if (!contentSize) {
     return aError.Throw(NS_ERROR_FAILURE);
   }
diff --git a/dom/canvas/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp
index 16551e03e699..c56355fc25a8 100644
--- a/dom/canvas/CanvasRenderingContext2D.cpp
+++ b/dom/canvas/CanvasRenderingContext2D.cpp
@@ -56,7 +56,6 @@
 
 #include "nsFrameLoader.h"
 #include "nsBidiPresUtils.h"
-#include "Layers.h"
 #include "LayerUserData.h"
 #include "CanvasUtils.h"
 #include "nsIMemoryReporter.h"
diff --git a/dom/canvas/ClientWebGLContext.cpp b/dom/canvas/ClientWebGLContext.cpp
index c76d186afe63..41139989f59c 100644
--- a/dom/canvas/ClientWebGLContext.cpp
+++ b/dom/canvas/ClientWebGLContext.cpp
@@ -8,7 +8,6 @@
 #include <bitset>
 
 #include "ClientWebGLExtensions.h"
-#include "Layers.h"
 #include "gfxCrashReporterUtils.h"
 #include "HostWebGLContext.h"
 #include "js/PropertyAndElement.h"  // JS_DefineElement
diff --git a/dom/canvas/WebGLContext.cpp b/dom/canvas/WebGLContext.cpp
index 0476b7ca0475..991eec338aac 100644
--- a/dom/canvas/WebGLContext.cpp
+++ b/dom/canvas/WebGLContext.cpp
@@ -25,7 +25,6 @@
 #include "GLScreenBuffer.h"
 #include "ImageContainer.h"
 #include "ImageEncoder.h"
-#include "Layers.h"
 #include "LayerUserData.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/Document.h"
@@ -2002,7 +2001,7 @@ static std::vector<std::string> ExplodeName(const std::string& str) {
 
 //-
 
-//#define DUMP_MakeLinkResult
+// #define DUMP_MakeLinkResult
 
 webgl::LinkActiveInfo GetLinkActiveInfo(
     gl::GLContext& gl, const GLuint prog, const bool webgl2,
diff --git a/dom/events/EventDispatcher.cpp b/dom/events/EventDispatcher.cpp
index b02fa204a909..ca2ef06c8cc4 100644
--- a/dom/events/EventDispatcher.cpp
+++ b/dom/events/EventDispatcher.cpp
@@ -24,7 +24,6 @@
 #include "DeviceMotionEvent.h"
 #include "DragEvent.h"
 #include "KeyboardEvent.h"
-#include "Layers.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/ContentEvents.h"
 #include "mozilla/dom/CloseEvent.h"
diff --git a/dom/html/HTMLCanvasElement.cpp b/dom/html/HTMLCanvasElement.cpp
index 2bcd2d6d6230..d6840087067f 100644
--- a/dom/html/HTMLCanvasElement.cpp
+++ b/dom/html/HTMLCanvasElement.cpp
@@ -9,7 +9,6 @@
 #include "ImageEncoder.h"
 #include "jsapi.h"
 #include "jsfriendapi.h"
-#include "Layers.h"
 #include "MediaTrackGraph.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Base64.h"
diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp
index 22d6c24146e4..6ef180224928 100644
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -29,7 +29,6 @@
 #endif
 #include "HTMLMediaElement.h"
 #include "ImageContainer.h"
-#include "Layers.h"
 #include "MP4Decoder.h"
 #include "MediaContainerType.h"
 #include "MediaError.h"
diff --git a/dom/ipc/BrowserChild.cpp b/dom/ipc/BrowserChild.cpp
index 2ef9ae69b577..652ce29b6f35 100644
--- a/dom/ipc/BrowserChild.cpp
+++ b/dom/ipc/BrowserChild.cpp
@@ -18,7 +18,6 @@
 #include "ContentChild.h"
 #include "DocumentInlines.h"
 #include "EventStateManager.h"
-#include "Layers.h"
 #include "MMPrinter.h"
 #include "PermissionMessageUtils.h"
 #include "PuppetWidget.h"
diff --git a/dom/media/DOMMediaStream.cpp b/dom/media/DOMMediaStream.cpp
index 597043bcc1f7..9f5e1b7ef24a 100644
--- a/dom/media/DOMMediaStream.cpp
+++ b/dom/media/DOMMediaStream.cpp
@@ -8,7 +8,6 @@
 #include "AudioCaptureTrack.h"
 #include "AudioChannelAgent.h"
 #include "AudioStreamTrack.h"
-#include "Layers.h"
 #include "MediaTrackGraph.h"
 #include "MediaTrackGraphImpl.h"
 #include "MediaTrackListener.h"
diff --git a/dom/media/MediaDecoder.cpp b/dom/media/MediaDecoder.cpp
index 29e1b8d8d724..b9bef859c871 100644
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -10,7 +10,6 @@
 #include "DOMMediaStream.h"
 #include "DecoderBenchmark.h"
 #include "ImageContainer.h"
-#include "Layers.h"
 #include "MediaDecoderStateMachineBase.h"
 #include "MediaFormatReader.h"
 #include "MediaResource.h"
diff --git a/dom/media/VideoSegment.cpp b/dom/media/VideoSegment.cpp
index 0be6459abd15..c34a5fd553b6 100644
--- a/dom/media/VideoSegment.cpp
+++ b/dom/media/VideoSegment.cpp
@@ -7,7 +7,6 @@
 
 #include "gfx2DGlue.h"
 #include "ImageContainer.h"
-#include "Layers.h"
 #include "VideoUtils.h"
 #include "mozilla/UniquePtr.h"
 
diff --git a/dom/media/mediacapabilities/MediaCapabilities.cpp b/dom/media/mediacapabilities/MediaCapabilities.cpp
index 22fc5e9a595e..79ddb2aa53a2 100644
--- a/dom/media/mediacapabilities/MediaCapabilities.cpp
+++ b/dom/media/mediacapabilities/MediaCapabilities.cpp
@@ -14,7 +14,6 @@
 #include "Benchmark.h"
 #include "DecoderBenchmark.h"
 #include "DecoderTraits.h"
-#include "Layers.h"
 #include "MediaInfo.h"
 #include "MediaRecorder.h"
 #include "PDMFactory.h"
diff --git a/dom/media/platforms/wmf/WMFVideoMFTManager.cpp b/dom/media/platforms/wmf/WMFVideoMFTManager.cpp
index b4f89e84e521..abac569ca761 100644
--- a/dom/media/platforms/wmf/WMFVideoMFTManager.cpp
+++ b/dom/media/platforms/wmf/WMFVideoMFTManager.cpp
@@ -13,7 +13,6 @@
 #include "GMPUtils.h"  // For SplitAt. TODO: Move SplitAt to a central place.
 #include "IMFYCbCrImage.h"
 #include "ImageContainer.h"
-#include "Layers.h"
 #include "MediaInfo.h"
 #include "MediaTelemetryConstants.h"
 #include "VideoUtils.h"
diff --git a/dom/media/webrtc/MediaEngineFake.cpp b/dom/media/webrtc/MediaEngineFake.cpp
index 6922ca3cc742..0769afa83d5c 100644
--- a/dom/media/webrtc/MediaEngineFake.cpp
+++ b/dom/media/webrtc/MediaEngineFake.cpp
@@ -8,7 +8,6 @@
 #include "DOMMediaStream.h"
 #include "ImageContainer.h"
 #include "ImageTypes.h"
-#include "Layers.h"
 #include "MediaEnginePrefs.h"
 #include "MediaEngineSource.h"
 #include "MediaTrackGraph.h"
diff --git a/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp b/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp
index 16d4735cc8ef..52c9e3deea20 100644
--- a/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp
+++ b/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp
@@ -6,7 +6,6 @@
 #include "MediaEngineRemoteVideoSource.h"
 
 #include "CamerasChild.h"
-#include "Layers.h"
 #include "MediaManager.h"
 #include "MediaTrackConstraints.h"
 #include "mozilla/dom/MediaTrackSettingsBinding.h"
diff --git a/dom/media/webrtc/libwebrtcglue/WebrtcMediaDataDecoderCodec.cpp b/dom/media/webrtc/libwebrtcglue/WebrtcMediaDataDecoderCodec.cpp
index 9d6180260cd9..0070a4778ef1 100644
--- a/dom/media/webrtc/libwebrtcglue/WebrtcMediaDataDecoderCodec.cpp
+++ b/dom/media/webrtc/libwebrtcglue/WebrtcMediaDataDecoderCodec.cpp
@@ -5,7 +5,6 @@
 #include "WebrtcMediaDataDecoderCodec.h"
 
 #include "ImageContainer.h"
-#include "Layers.h"
 #include "MediaDataDecoderProxy.h"
 #include "PDMFactory.h"
 #include "VideoUtils.h"
diff --git a/dom/media/webrtc/transportbridge/MediaPipeline.cpp b/dom/media/webrtc/transportbridge/MediaPipeline.cpp
index f7f31c6f53f8..6fc4c92e9406 100644
--- a/dom/media/webrtc/transportbridge/MediaPipeline.cpp
+++ b/dom/media/webrtc/transportbridge/MediaPipeline.cpp
@@ -16,7 +16,6 @@
 #include "DOMMediaStream.h"
 #include "ImageContainer.h"
 #include "ImageTypes.h"
-#include "Layers.h"
 #include "MediaEngine.h"
 #include "MediaSegment.h"
 #include "MediaTrackGraphImpl.h"
diff --git a/gfx/layers/AnimationInfo.cpp b/gfx/layers/AnimationInfo.cpp
index 9be953594989..2f3c4e6f1ded 100644
--- a/gfx/layers/AnimationInfo.cpp
+++ b/gfx/layers/AnimationInfo.cpp
@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "AnimationInfo.h"
-#include "Layers.h"
 #include "mozilla/LayerAnimationInfo.h"
 #include "mozilla/layers/WebRenderLayerManager.h"
 #include "mozilla/layers/AnimationHelper.h"
diff --git a/gfx/layers/Layers.cpp b/gfx/layers/Layers.cpp
deleted file mode 100644
index 33c2a165010d..000000000000
--- a/gfx/layers/Layers.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* 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 "Layers.h"
-
-#include <inttypes.h>          // for PRIu64
-#include <stdio.h>             // for stderr
-#include <algorithm>           // for max, min
-#include <list>                // for list
-#include <set>                 // for set
-#include <string>              // for char_traits, string, basic_string
-#include <type_traits>         // for remove_reference<>::type
-#include "CompositableHost.h"  // for CompositableHost
-#include "LayerUserData.h"     // for LayerUserData
-#include "TreeTraversal.h"  // for ForwardIterator, ForEachNode, DepthFirstSearch, TraversalFlag, TraversalFl...
-#include "UnitTransforms.h"  // for ViewAs, PixelCastJustification, PixelCastJustification::RenderTargetIsPare...
-#include "apz/src/AsyncPanZoomController.h"  // for AsyncPanZoomController
-#include "gfx2DGlue.h"              // for ThebesMatrix, ToPoint, ThebesRect
-#include "gfxEnv.h"                 // for gfxEnv
-#include "gfxMatrix.h"              // for gfxMatrix
-#include "gfxUtils.h"               // for gfxUtils, gfxUtils::sDumpPaintFile
-#include "mozilla/ArrayIterator.h"  // for ArrayIterator
-#include "mozilla/DebugOnly.h"      // for DebugOnly
-#include "mozilla/Logging.h"  // for LogLevel, LogLevel::Debug, MOZ_LOG_TEST
-#include "mozilla/ProfilerMarkers.h"  // for profiler_thread_is_being_profiled_for_markers, PROFILER_MARKER_TEXT
-#include "mozilla/ScrollPositionUpdate.h"  // for ScrollPositionUpdate
-#include "mozilla/Telemetry.h"             // for AccumulateTimeDelta
-#include "mozilla/TelemetryHistogramEnums.h"  // for KEYPRESS_PRESENT_LATENCY, SCROLL_PRESENT_LATENCY
-#include "mozilla/ToString.h"  // for ToString
-#include "mozilla/gfx/2D.h"  // for SourceSurface, DrawTarget, DataSourceSurface
-#include "mozilla/gfx/BasePoint3D.h"  // for BasePoint3D<>::(anonymous union)::(anonymous), BasePoint3D<>::(anonymous)
-#include "mozilla/gfx/BaseRect.h"  // for operator<<, BaseRect (ptr only)
-#include "mozilla/gfx/BaseSize.h"  // for operator<<, BaseSize<>::(anonymous union)::(anonymous), BaseSize<>::(anony...
-#include "mozilla/gfx/Matrix.h"  // for Matrix4x4, Matrix, Matrix4x4Typed<>::(anonymous union)::(anonymous), Matri...
-#include "mozilla/gfx/MatrixFwd.h"              // for Float
-#include "mozilla/gfx/Polygon.h"                // for Polygon, PolygonTyped
-#include "mozilla/layers/BSPTree.h"             // for LayerPolygon, BSPTree
-#include "mozilla/layers/CompositableClient.h"  // for CompositableClient
-#include "mozilla/layers/Compositor.h"          // for Compositor
-#include "mozilla/layers/LayersMessages.h"  // for SpecificLayerAttributes, CompositorAnimations (ptr only), ContainerLayerAt...
-#include "mozilla/layers/LayersTypes.h"  // for EventRegions, operator<<, CompositionPayload, CSSTransformMatrix, MOZ_LAYE...
-#include "nsBaseHashtable.h"  // for nsBaseHashtable<>::Iterator, nsBaseHashtable<>::LookupResult
-#include "nsISupportsUtils.h"  // for NS_ADDREF, NS_RELEASE
-#include "nsPrintfCString.h"   // for nsPrintfCString
-#include "nsRegionFwd.h"       // for IntRegion
-#include "nsString.h"          // for nsTSubstring
-
-// Undo the damage done by mozzconf.h
-#undef compress
-#include "mozilla/Compression.h"
-
-namespace mozilla {
-namespace layers {
-
-typedef ScrollableLayerGuid::ViewID ViewID;
-
-using namespace mozilla::gfx;
-using namespace mozilla::Compression;
-
-}  // namespace layers
-}  // namespace mozilla
diff --git a/gfx/layers/Layers.h b/gfx/layers/Layers.h
deleted file mode 100644
index 230a43639d61..000000000000
--- a/gfx/layers/Layers.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* 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 GFX_LAYERS_H
-#define GFX_LAYERS_H
-
-#include <cstdint>        // for uint32_t, uint64_t, int32_t, uint8_t
-#include <cstring>        // for memcpy, size_t
-#include <iosfwd>         // for stringstream
-#include <new>            // for operator new
-#include <unordered_set>  // for unordered_set
-#include <utility>        // for forward, move
-#include "FrameMetrics.h"  // for ScrollMetadata, FrameMetrics::ViewID, FrameMetrics
-#include "Units.h"  // for LayerIntRegion, ParentLayerIntRect, LayerIntSize, Lay...
-#include "gfxPoint.h"           // for gfxPoint
-#include "gfxRect.h"            // for gfxRect
-#include "mozilla/Maybe.h"      // for Maybe, Nothing (ptr only)
-#include "mozilla/Poison.h"     // for CorruptionCanary
-#include "mozilla/RefPtr.h"     // for RefPtr, operator!=
-#include "mozilla/TimeStamp.h"  // for TimeStamp
-#include "mozilla/UniquePtr.h"  // for UniquePtr, MakeUnique
-#include "mozilla/gfx/BasePoint.h"  // for BasePoint<>::(anonymous union)::(anonymous), BasePoin...
-#include "mozilla/gfx/BaseSize.h"  // for BaseSize
-#include "mozilla/gfx/Matrix.h"    // for Matrix4x4, Matrix, Matrix4x4Typed
-#include "mozilla/gfx/Point.h"     // for Point, PointTyped
-#include "mozilla/gfx/Polygon.h"   // for Polygon
-#include "mozilla/gfx/Rect.h"      // for IntRectTyped, IntRect
-#include "mozilla/gfx/Types.h"  // for CompositionOp, DeviceColor, SamplingFilter, SideBits
-#include "mozilla/gfx/UserData.h"  // for UserData, UserDataKey (ptr only)
-#include "mozilla/layers/AnimationInfo.h"  // for AnimationInfo
-#include "mozilla/layers/LayerAttributes.h"  // for SimpleLayerAttributes, ScrollbarData (ptr only)
-#include "mozilla/layers/ScrollableLayerGuid.h"  // for ScrollableLayerGuid, ScrollableLayerGuid::ViewID
-#include "mozilla/layers/BSPTree.h"
-#include "nsISupports.h"    // for NS_INLINE_DECL_REFCOUNTING
-#include "nsPoint.h"        // for nsIntPoint
-#include "nsRect.h"         // for nsIntRect
-#include "nsRegion.h"       // for nsIntRegion
-#include "nsStringFlags.h"  // for operator&
-#include "nsStringFwd.h"    // for nsCString, nsACString
-#include "nsTArray.h"  // for nsTArray, nsTArray_Impl, nsTArray_Impl<>::value_type
-
-// XXX These includes could be avoided by moving function implementations to the
-// cpp file
-#include "gfx2DGlue.h"           // for ThebesPoint
-#include "mozilla/Assertions.h"  // for AssertionConditionType, MOZ_ASSERT, MOZ_A...
-#include "mozilla/DebugOnly.h"  // for DebugOnly
-#include "mozilla/layers/LayersTypes.h"  // for MOZ_LAYERS_LOG_IF_SHADOWABLE, LayersId, EventRegionsO...
-#include "nsDebug.h"  // for NS_ASSERTION, NS_WARNING
-
-namespace mozilla {
-
-namespace gfx {
-class DataSourceSurface;
-class DrawTarget;
-class Path;
-}  // namespace gfx
-
-namespace layers {
-
-class Animation;
-class AsyncPanZoomController;
-class CompositorAnimations;
-class SpecificLayerAttributes;
-class Compositor;
-class TransformData;
-struct PropertyAnimationGroup;
-
-}  // namespace layers
-}  // namespace mozilla
-
-#endif /* GFX_LAYERS_H */
diff --git a/gfx/layers/PersistentBufferProvider.cpp b/gfx/layers/PersistentBufferProvider.cpp
index 15437426bcdb..8771ffa56c18 100644
--- a/gfx/layers/PersistentBufferProvider.cpp
+++ b/gfx/layers/PersistentBufferProvider.cpp
@@ -6,7 +6,6 @@
 
 #include "PersistentBufferProvider.h"
 
-#include "Layers.h"
 #include "mozilla/layers/TextureClient.h"
 #include "mozilla/layers/TextureForwarder.h"
 #include "mozilla/gfx/gfxVars.h"
diff --git a/gfx/layers/apz/src/APZCTreeManager.cpp b/gfx/layers/apz/src/APZCTreeManager.cpp
index d0c1f3a58ffd..d9cd3d3fd46a 100644
--- a/gfx/layers/apz/src/APZCTreeManager.cpp
+++ b/gfx/layers/apz/src/APZCTreeManager.cpp
@@ -14,7 +14,6 @@
 #include "HitTestingTreeNode.h"     // for HitTestingTreeNode
 #include "InputBlockState.h"        // for InputBlockState
 #include "InputData.h"              // for InputData, etc
-#include "Layers.h"                 // for Layer, etc
 #include "WRHitTester.h"            // for WRHitTester
 #include "mozilla/RecursiveMutex.h"
 #include "mozilla/dom/MouseEventBinding.h"  // for MouseEvent constants
diff --git a/gfx/layers/apz/src/AsyncPanZoomController.h b/gfx/layers/apz/src/AsyncPanZoomController.h
index 212ac1fcfa27..84b1a1c1e492 100644
--- a/gfx/layers/apz/src/AsyncPanZoomController.h
+++ b/gfx/layers/apz/src/AsyncPanZoomController.h
@@ -8,6 +8,7 @@
 #define mozilla_layers_AsyncPanZoomController_h
 
 #include "mozilla/layers/GeckoContentController.h"
+#include "mozilla/layers/LayerAttributes.h"
 #include "mozilla/layers/RepaintRequest.h"
 #include "mozilla/layers/SampleTime.h"
 #include "mozilla/layers/ZoomConstraints.h"
@@ -26,7 +27,6 @@
 #include "FlingAccelerator.h"
 #include "InputQueue.h"
 #include "APZUtils.h"
-#include "Layers.h"  // for Layer::ScrollDirection
 #include "LayersTypes.h"
 #include "mozilla/gfx/Matrix.h"
 #include "nsRegion.h"
diff --git a/gfx/layers/apz/src/GenericFlingAnimation.h b/gfx/layers/apz/src/GenericFlingAnimation.h
index 1b601b980d37..82f981ae0a7c 100644
--- a/gfx/layers/apz/src/GenericFlingAnimation.h
+++ b/gfx/layers/apz/src/GenericFlingAnimation.h
@@ -11,7 +11,6 @@
 #include "AsyncPanZoomAnimation.h"
 #include "AsyncPanZoomController.h"
 #include "FrameMetrics.h"
-#include "Layers.h"
 #include "Units.h"
 #include "OverscrollHandoffState.h"
 #include "mozilla/Assertions.h"
diff --git a/gfx/layers/apz/src/HitTestingTreeNode.h b/gfx/layers/apz/src/HitTestingTreeNode.h
index c770a28c7803..a2339784c848 100644
--- a/gfx/layers/apz/src/HitTestingTreeNode.h
+++ b/gfx/layers/apz/src/HitTestingTreeNode.h
@@ -7,9 +7,9 @@
 #ifndef mozilla_layers_HitTestingTreeNode_h
 #define mozilla_layers_HitTestingTreeNode_h
 
-#include "Layers.h"
 #include "mozilla/gfx/CompositorHitTestInfo.h"
 #include "mozilla/gfx/Matrix.h"                  // for Matrix4x4
+#include "mozilla/layers/LayerAttributes.h"      // for ScrollbarData
 #include "mozilla/layers/LayersTypes.h"          // for EventRegions
 #include "mozilla/layers/ScrollableLayerGuid.h"  // for ScrollableLayerGuid
 #include "mozilla/Maybe.h"                       // for Maybe
diff --git a/gfx/layers/apz/test/gtest/APZTestCommon.h b/gfx/layers/apz/test/gtest/APZTestCommon.h
index 77020d79d9b2..3c5d83281ea4 100644
--- a/gfx/layers/apz/test/gtest/APZTestCommon.h
+++ b/gfx/layers/apz/test/gtest/APZTestCommon.h
@@ -28,7 +28,6 @@
 #include "apz/src/HitTestingTreeNode.h"
 #include "base/task.h"
 #include "gfxPlatform.h"
-#include "Layers.h"
 #include "TestLayers.h"
 #include "TestWRScrollData.h"
 #include "UnitTransforms.h"
diff --git a/gfx/layers/apz/util/APZCCallbackHelper.cpp b/gfx/layers/apz/util/APZCCallbackHelper.cpp
index 0e6fc02d871d..38dcf697d2ef 100644
--- a/gfx/layers/apz/util/APZCCallbackHelper.cpp
+++ b/gfx/layers/apz/util/APZCCallbackHelper.cpp
@@ -36,7 +36,6 @@
 #include "nsRefreshDriver.h"
 #include "nsString.h"
 #include "nsView.h"
-#include "Layers.h"
 
 static mozilla::LazyLogModule sApzHlpLog("apz.helper");
 #define APZCCH_LOG(...) MOZ_LOG(sApzHlpLog, LogLevel::Debug, (__VA_ARGS__))
diff --git a/gfx/layers/client/TextureClient.cpp b/gfx/layers/client/TextureClient.cpp
index dc325cc57147..5ebffe39ca89 100644
--- a/gfx/layers/client/TextureClient.cpp
+++ b/gfx/layers/client/TextureClient.cpp
@@ -11,7 +11,6 @@
 #include "BufferTexture.h"
 #include "IPDLActor.h"
 #include "ImageContainer.h"  // for PlanarYCbCrData, etc
-#include "Layers.h"          // for Layer, etc
 #include "MainThreadUtils.h"
 #include "gfx2DGlue.h"
 #include "gfxPlatform.h"  // for gfxPlatform
diff --git a/gfx/layers/composite/CompositableHost.cpp b/gfx/layers/composite/CompositableHost.cpp
index 5c0d092ae4a0..a64f55d7162b 100644
--- a/gfx/layers/composite/CompositableHost.cpp
+++ b/gfx/layers/composite/CompositableHost.cpp
@@ -9,7 +9,6 @@
 #include <utility>    // for pair
 #include "Effects.h"  // for EffectMask, Effect, etc
 #include "gfxUtils.h"
-#include "Layers.h"
 #include "mozilla/gfx/gfxVars.h"
 #include "mozilla/layers/LayersSurfaces.h"  // for SurfaceDescriptor
 #include "mozilla/layers/TextureHost.h"     // for TextureHost, etc
diff --git a/gfx/layers/d3d11/CompositorD3D11.cpp b/gfx/layers/d3d11/CompositorD3D11.cpp
index 2a3c4915f213..662fc4713274 100644
--- a/gfx/layers/d3d11/CompositorD3D11.cpp
+++ b/gfx/layers/d3d11/CompositorD3D11.cpp
@@ -10,7 +10,6 @@
 
 #include "gfxWindowsPlatform.h"
 #include "nsIWidget.h"
-#include "Layers.h"
 #include "mozilla/gfx/D3D11Checks.h"
 #include "mozilla/gfx/DeviceManagerDx.h"
 #include "mozilla/gfx/GPUParent.h"
diff --git a/gfx/layers/d3d11/DeviceAttachmentsD3D11.cpp b/gfx/layers/d3d11/DeviceAttachmentsD3D11.cpp
index 3f6903375336..3a80e30cc494 100644
--- a/gfx/layers/d3d11/DeviceAttachmentsD3D11.cpp
+++ b/gfx/layers/d3d11/DeviceAttachmentsD3D11.cpp
@@ -6,9 +6,9 @@
 
 #include "DeviceAttachmentsD3D11.h"
 #include "mozilla/Telemetry.h"
+#include "mozilla/gfx/Logging.h"
 #include "mozilla/layers/Compositor.h"
 #include "CompositorD3D11Shaders.h"
-#include "Layers.h"
 #include "ShaderDefinitionsD3D11.h"
 
 namespace mozilla {
diff --git a/gfx/layers/ipc/ImageBridgeChild.cpp b/gfx/layers/ipc/ImageBridgeChild.cpp
index 84febd033cfb..fc6b2cdebb85 100644
--- a/gfx/layers/ipc/ImageBridgeChild.cpp
+++ b/gfx/layers/ipc/ImageBridgeChild.cpp
@@ -10,7 +10,6 @@
 
 #include "ImageBridgeParent.h"  // for ImageBridgeParent
 #include "ImageContainer.h"     // for ImageContainer
-#include "Layers.h"             // for Layer, etc
 #include "SynchronousTask.h"
 #include "mozilla/Assertions.h"        // for MOZ_ASSERT, etc
 #include "mozilla/Monitor.h"           // for Monitor, MonitorAutoLock
diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build
index 457d95ec875a..5c8f5e6bb86d 100755
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -20,7 +20,6 @@ EXPORTS += [
     "ImageContainer.h",
     "ImageTypes.h",
     "IMFYCbCrImage.h",
-    "Layers.h",
     "LayersTypes.h",
     "LayerUserData.h",
     "opengl/OGLShaderConfig.h",
@@ -396,7 +395,6 @@ UNIFIED_SOURCES += [
     "ipc/UiCompositorControllerParent.cpp",
     "ipc/VideoBridgeChild.cpp",
     "ipc/VideoBridgeParent.cpp",
-    "Layers.cpp",
     "LayersTypes.cpp",
     "MemoryPressureObserver.cpp",
     "opengl/CompositingRenderTargetOGL.cpp",
diff --git a/gfx/layers/opengl/OGLShaderProgram.cpp b/gfx/layers/opengl/OGLShaderProgram.cpp
index 4edfb456e1c5..a5efa07f48b9 100644
--- a/gfx/layers/opengl/OGLShaderProgram.cpp
+++ b/gfx/layers/opengl/OGLShaderProgram.cpp
@@ -11,7 +11,6 @@
 #include <sstream>  // for std::ostringstream
 
 #include "GLContext.h"
-#include "Layers.h"
 #include "gfxEnv.h"
 #include "gfxRect.h"  // for gfxRect
 #include "gfxUtils.h"
diff --git a/gfx/layers/wr/WebRenderBridgeParent.cpp b/gfx/layers/wr/WebRenderBridgeParent.cpp
index f3022e1c8ed7..51fca529739f 100644
--- a/gfx/layers/wr/WebRenderBridgeParent.cpp
+++ b/gfx/layers/wr/WebRenderBridgeParent.cpp
@@ -14,7 +14,6 @@
 #include "GLContext.h"
 #include "GLContextProvider.h"
 #include "GLLibraryLoader.h"
-#include "Layers.h"
 #include "nsExceptionHandler.h"
 #include "mozilla/Range.h"
 #include "mozilla/EnumeratedRange.h"
diff --git a/gfx/layers/wr/WebRenderCommandBuilder.cpp b/gfx/layers/wr/WebRenderCommandBuilder.cpp
index 1b35ea395ee6..b267fa1fc2fd 100644
--- a/gfx/layers/wr/WebRenderCommandBuilder.cpp
+++ b/gfx/layers/wr/WebRenderCommandBuilder.cpp
@@ -6,7 +6,6 @@
 
 #include "WebRenderCommandBuilder.h"
 
-#include "Layers.h"
 #include "mozilla/AutoRestore.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/EffectCompositor.h"
diff --git a/gfx/layers/wr/WebRenderLayerManager.cpp b/gfx/layers/wr/WebRenderLayerManager.cpp
index eb9875035b6d..f9f66ff747df 100644
--- a/gfx/layers/wr/WebRenderLayerManager.cpp
+++ b/gfx/layers/wr/WebRenderLayerManager.cpp
@@ -6,8 +6,6 @@
 
 #include "WebRenderLayerManager.h"
 
-#include "Layers.h"
-
 #include "GeckoProfiler.h"
 #include "mozilla/StaticPrefs_apz.h"
 #include "mozilla/StaticPrefs_layers.h"
diff --git a/gfx/layers/wr/WebRenderScrollData.cpp b/gfx/layers/wr/WebRenderScrollData.cpp
index 661fef32fff6..91ff074461b0 100644
--- a/gfx/layers/wr/WebRenderScrollData.cpp
+++ b/gfx/layers/wr/WebRenderScrollData.cpp
@@ -8,7 +8,6 @@
 
 #include <ostream>
 
-#include "Layers.h"
 #include "mozilla/layers/LayersMessageUtils.h"
 #include "mozilla/layers/WebRenderLayerManager.h"
 #include "mozilla/ToString.h"
diff --git a/gfx/tests/gtest/TestLayers.h b/gfx/tests/gtest/TestLayers.h
index bcf7049b9ed5..b895b7e3f9a8 100644
--- a/gfx/tests/gtest/TestLayers.h
+++ b/gfx/tests/gtest/TestLayers.h
@@ -6,7 +6,6 @@
 #ifndef GFX_TEST_LAYERS_H
 #define GFX_TEST_LAYERS_H
 
-#include "Layers.h"
 #include "nsTArray.h"
 #include "mozilla/layers/ISurfaceAllocator.h"
 
diff --git a/image/Image.cpp b/image/Image.cpp
index e03a6397aeb0..d9a4fe7b44bb 100644
--- a/image/Image.cpp
+++ b/image/Image.cpp
@@ -6,7 +6,6 @@
 #include "Image.h"
 
 #include "imgRequest.h"
-#include "Layers.h"  // for LayerManager
 #include "WebRenderImageProvider.h"
 #include "nsIObserverService.h"
 #include "nsRefreshDriver.h"
diff --git a/image/RasterImage.cpp b/image/RasterImage.cpp
index ceeb5df454c2..7f59da5aaa37 100644
--- a/image/RasterImage.cpp
+++ b/image/RasterImage.cpp
@@ -19,7 +19,6 @@
 #include "IDecodingTask.h"
 #include "ImageLogging.h"
 #include "ImageRegion.h"
-#include "Layers.h"
 #include "LookupResult.h"
 #include "OrientedImage.h"
 #include "SourceBuffer.h"
diff --git a/layout/base/AccessibleCaretEventHub.cpp b/layout/base/AccessibleCaretEventHub.cpp
index b22f852e79a1..45887d17166d 100644
--- a/layout/base/AccessibleCaretEventHub.cpp
+++ b/layout/base/AccessibleCaretEventHub.cpp
@@ -8,7 +8,6 @@
 
 #include "AccessibleCaretLogger.h"
 #include "AccessibleCaretManager.h"
-#include "Layers.h"
 
 #include "mozilla/AutoRestore.h"
 #include "mozilla/PresShell.h"
diff --git a/layout/base/DisplayPortUtils.cpp b/layout/base/DisplayPortUtils.cpp
index 035fcc52d7bd..2d38323edab3 100644
--- a/layout/base/DisplayPortUtils.cpp
+++ b/layout/base/DisplayPortUtils.cpp
@@ -7,7 +7,6 @@
 #include "DisplayPortUtils.h"
 
 #include "FrameMetrics.h"
-#include "Layers.h"
 #include "mozilla/dom/BrowserChild.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/gfx/Point.h"
diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp
index c44121d07c86..e2f7204beb14 100644
--- a/layout/base/PresShell.cpp
+++ b/layout/base/PresShell.cpp
@@ -162,7 +162,6 @@
 
 #include "mozilla/layers/CompositorBridgeChild.h"
 #include "gfxPlatform.h"
-#include "Layers.h"
 #include "mozilla/css/ImageLoader.h"
 #include "mozilla/dom/DocumentTimeline.h"
 #include "mozilla/dom/ScriptSettings.h"
diff --git a/layout/base/RestyleManager.cpp b/layout/base/RestyleManager.cpp
index 6a81fbaf0b1f..beb810495c97 100644
--- a/layout/base/RestyleManager.cpp
+++ b/layout/base/RestyleManager.cpp
@@ -35,7 +35,6 @@
 #include "mozilla/dom/ElementInlines.h"
 #include "mozilla/dom/HTMLBodyElement.h"
 
-#include "Layers.h"
 #include "ScrollSnap.h"
 #include "nsAnimationManager.h"
 #include "nsBlockFrame.h"
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index cf41cb86d0f8..a698d914fb2f 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -25,7 +25,6 @@
 #include "ImageRegion.h"
 #include "imgIContainer.h"
 #include "imgIRequest.h"
-#include "Layers.h"
 #include "LayoutLogging.h"
 #include "MobileViewportManager.h"
 #include "mozilla/AccessibleCaretEventHub.h"
diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index fec56ea90201..8a81b72e27ba 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -68,7 +68,6 @@
 #include "mozilla/dom/FontFaceSet.h"
 #include "mozilla/StaticPresData.h"
 #include "nsRefreshDriver.h"
-#include "Layers.h"
 #include "LayerUserData.h"
 #include "mozilla/dom/NotifyPaintEvent.h"
 #include "nsFontCache.h"
diff --git a/layout/base/nsRefreshDriver.cpp b/layout/base/nsRefreshDriver.cpp
index 6a45fcb20472..5e10d5e7edda 100644
--- a/layout/base/nsRefreshDriver.cpp
+++ b/layout/base/nsRefreshDriver.cpp
@@ -72,7 +72,6 @@
 #include "mozilla/layers/WebRenderLayerManager.h"
 #include "mozilla/RestyleManager.h"
 #include "mozilla/TaskController.h"
-#include "Layers.h"
 #include "imgIContainer.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "nsDocShell.h"
diff --git a/layout/forms/nsButtonFrameRenderer.cpp b/layout/forms/nsButtonFrameRenderer.cpp
index 6f23eb0ba79e..74c2d3f02518 100644
--- a/layout/forms/nsButtonFrameRenderer.cpp
+++ b/layout/forms/nsButtonFrameRenderer.cpp
@@ -16,7 +16,6 @@
 #include "nsITheme.h"
 #include "nsIFrame.h"
 #include "mozilla/dom/Element.h"
-#include "Layers.h"
 
 #include "gfxUtils.h"
 #include "mozilla/layers/RenderRootStateManager.h"
diff --git a/layout/generic/nsCanvasFrame.cpp b/layout/generic/nsCanvasFrame.cpp
index dbb28bf22d52..3efa65050ba0 100644
--- a/layout/generic/nsCanvasFrame.cpp
+++ b/layout/generic/nsCanvasFrame.cpp
@@ -10,7 +10,6 @@
 
 #include "gfxContext.h"
 #include "gfxUtils.h"
-#include "Layers.h"
 #include "nsContainerFrame.h"
 #include "nsContentCreatorFunctions.h"
 #include "nsCSSRendering.h"
diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index 6d9595de9f82..0016be70f462 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -11,7 +11,6 @@
 #include "nsIXULRuntime.h"
 #include "base/compiler_specific.h"
 #include "DisplayItemClip.h"
-#include "Layers.h"
 #include "nsCOMPtr.h"
 #include "nsIContentViewer.h"
 #include "nsPresContext.h"
diff --git a/layout/generic/nsHTMLCanvasFrame.cpp b/layout/generic/nsHTMLCanvasFrame.cpp
index 141a67c00c17..3c03e82bb95a 100644
--- a/layout/generic/nsHTMLCanvasFrame.cpp
+++ b/layout/generic/nsHTMLCanvasFrame.cpp
@@ -20,7 +20,6 @@
 #include "nsDisplayList.h"
 #include "nsLayoutUtils.h"
 #include "nsStyleUtil.h"
-#include "Layers.h"
 #include "ActiveLayerTracker.h"
 
 #include <algorithm>
diff --git a/layout/generic/nsSubDocumentFrame.cpp b/layout/generic/nsSubDocumentFrame.cpp
index 5ebe2aab907d..62420280f4c4 100644
--- a/layout/generic/nsSubDocumentFrame.cpp
+++ b/layout/generic/nsSubDocumentFrame.cpp
@@ -46,7 +46,6 @@
 #include "RetainedDisplayListBuilder.h"
 #include "nsObjectLoadingContent.h"
 
-#include "Layers.h"
 #include "mozilla/layers/WebRenderUserData.h"
 #include "mozilla/layers/WebRenderScrollData.h"
 #include "mozilla/layers/RenderRootStateManager.h"
diff --git a/layout/painting/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp
index 529ce3b0033e..51c588f1f6dc 100644
--- a/layout/painting/nsDisplayList.cpp
+++ b/layout/painting/nsDisplayList.cpp
@@ -55,7 +55,6 @@
 #include "mozilla/MathAlgorithms.h"
 
 #include "imgIContainer.h"
-#include "Layers.h"
 #include "nsBoxFrame.h"
 #include "nsImageFrame.h"
 #include "nsSubDocumentFrame.h"
diff --git a/layout/style/nsTransitionManager.cpp b/layout/style/nsTransitionManager.cpp
index 74daf8ea1845..95f1a5056cbd 100644
--- a/layout/style/nsTransitionManager.cpp
+++ b/layout/style/nsTransitionManager.cpp
@@ -21,7 +21,6 @@
 #include "mozilla/dom/DocumentTimeline.h"
 #include "mozilla/dom/Element.h"
 #include "nsIFrame.h"
-#include "Layers.h"
 #include "nsCSSProps.h"
 #include "nsCSSPseudoElements.h"
 #include "nsDisplayList.h"
diff --git a/layout/svg/SVGIntegrationUtils.cpp b/layout/svg/SVGIntegrationUtils.cpp
index 4f3f835fec23..2ba9b9966e47 100644
--- a/layout/svg/SVGIntegrationUtils.cpp
+++ b/layout/svg/SVGIntegrationUtils.cpp
@@ -10,7 +10,6 @@
 // Keep others in (case-insensitive) order:
 #include "gfxDrawable.h"
 
-#include "Layers.h"
 #include "nsCSSAnonBoxes.h"
 #include "nsCSSRendering.h"
 #include "nsDisplayList.h"
diff --git a/toolkit/components/browser/nsWebBrowser.cpp b/toolkit/components/browser/nsWebBrowser.cpp
index 6a2a462dcd5f..ec4b22ca061a 100644
--- a/toolkit/components/browser/nsWebBrowser.cpp
+++ b/toolkit/components/browser/nsWebBrowser.cpp
@@ -26,7 +26,6 @@
 #include "nsIURI.h"
 #include "nsIWebBrowserPersist.h"
 #include "nsFocusManager.h"
-#include "Layers.h"
 #include "nsILoadContext.h"
 #include "nsComponentManagerUtils.h"
 #include "nsDocShell.h"
diff --git a/view/nsViewManager.cpp b/view/nsViewManager.cpp
index ab91a8575ee5..58132bcee5e1 100644
--- a/view/nsViewManager.cpp
+++ b/view/nsViewManager.cpp
@@ -22,7 +22,6 @@
 #include "nsRefreshDriver.h"
 #include "nsContentUtils.h"  // for nsAutoScriptBlocker
 #include "nsLayoutUtils.h"
-#include "Layers.h"
 #include "gfxPlatform.h"
 #include "WindowRenderer.h"
 
diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
index 379eec306086..5c13c5894bf8 100644
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -30,7 +30,6 @@
 #include "JavaBuiltins.h"
 #include "JavaExceptions.h"
 #include "KeyEvent.h"
-#include "Layers.h"
 #include "MotionEvent.h"
 #include "ScopedGLHelpers.h"
 #include "ScreenHelperAndroid.h"
diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
index 556d364e081f..4fba4976602f 100644
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -63,7 +63,6 @@
 #include "gfxQuartzSurface.h"
 #include "gfxUtils.h"
 #include "nsRegion.h"
-#include "Layers.h"
 #include "GfxTexturesReporter.h"
 #include "GLTextureImage.h"
 #include "GLContextProvider.h"
diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
index de82a1ec09f2..fbc7ea7233b6 100644
--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -25,7 +25,6 @@
 #include "gtkdrawing.h"
 #include "imgIContainer.h"
 #include "InputData.h"
-#include "Layers.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Components.h"
diff --git a/widget/headless/HeadlessWidget.cpp b/widget/headless/HeadlessWidget.cpp
index 340cb723bd4d..1beca01cf884 100644
--- a/widget/headless/HeadlessWidget.cpp
+++ b/widget/headless/HeadlessWidget.cpp
@@ -5,7 +5,6 @@
 #include "HeadlessWidget.h"
 #include "ErrorList.h"
 #include "HeadlessCompositorWidget.h"
-#include "Layers.h"
 #include "BasicEvents.h"
 #include "MouseEvents.h"
 #include "mozilla/gfx/gfxVars.h"
diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
index 994c772fb453..23007199e3d6 100644
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -128,7 +128,6 @@
 #include "nsWindowGfx.h"
 #include "gfxWindowsPlatform.h"
 #include "gfxDWriteFonts.h"
-#include "Layers.h"
 #include "nsPrintfCString.h"
 #include "mozilla/Preferences.h"
 #include "SystemTimeConverter.h"