diff --git a/dom/base/nsImageLoadingContent.cpp b/dom/base/nsImageLoadingContent.cpp
index 23b1fd791c1f1..73731c4dee5b6 100644
--- a/dom/base/nsImageLoadingContent.cpp
+++ b/dom/base/nsImageLoadingContent.cpp
@@ -13,8 +13,6 @@
 #include "nsImageLoadingContent.h"
 #include "nsError.h"
 #include "nsIContent.h"
-#include "mozilla/dom/BindContext.h"
-#include "mozilla/dom/Document.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsServiceManagerUtils.h"
 #include "nsContentList.h"
@@ -26,7 +24,6 @@
 #include "nsThreadUtils.h"
 #include "nsNetUtil.h"
 #include "nsImageFrame.h"
-#include "nsSVGImageFrame.h"
 
 #include "nsIChannel.h"
 #include "nsIStreamListener.h"
@@ -36,7 +33,6 @@
 #include "nsContentUtils.h"
 #include "nsLayoutUtils.h"
 #include "nsIContentPolicy.h"
-#include "SVGObserverUtils.h"
 
 #include "mozAutoDocUpdate.h"
 #include "mozilla/AsyncEventDispatcher.h"
@@ -44,14 +40,18 @@
 #include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/EventStateManager.h"
 #include "mozilla/EventStates.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/PresShell.h"
+#include "mozilla/StaticPrefs_image.h"
+#include "mozilla/SVGImageFrame.h"
+#include "mozilla/SVGObserverUtils.h"
+#include "mozilla/dom/BindContext.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/HTMLImageElement.h"
 #include "mozilla/dom/ImageTracker.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/net/UrlClassifierFeatureFactory.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/PresShell.h"
-#include "mozilla/StaticPrefs_image.h"
 
 #ifdef LoadImage
 // Undefine LoadImage to prevent naming conflict with Windows.
@@ -524,7 +524,7 @@ void nsImageLoadingContent::MaybeForceSyncDecoding(
     bool aPrepareNextRequest, nsIFrame* aFrame /* = nullptr */) {
   nsIFrame* frame = aFrame ? aFrame : GetOurPrimaryFrame();
   nsImageFrame* imageFrame = do_QueryFrame(frame);
-  nsSVGImageFrame* svgImageFrame = do_QueryFrame(frame);
+  SVGImageFrame* svgImageFrame = do_QueryFrame(frame);
   if (!imageFrame && !svgImageFrame) {
     return;
   }
diff --git a/dom/canvas/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp
index 5c5e53198535b..d9372b1e6a3c6 100644
--- a/dom/canvas/CanvasRenderingContext2D.cpp
+++ b/dom/canvas/CanvasRenderingContext2D.cpp
@@ -9,16 +9,16 @@
 #include "nsXULElement.h"
 
 #include "nsMathUtils.h"
-#include "SVGImageContext.h"
 
 #include "nsContentUtils.h"
 
 #include "mozilla/PresShell.h"
 #include "mozilla/PresShellInlines.h"
+#include "mozilla/SVGImageContext.h"
+#include "mozilla/SVGObserverUtils.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/HTMLCanvasElement.h"
 #include "mozilla/dom/GeneratePlaceholderCanvasData.h"
-#include "SVGObserverUtils.h"
 #include "nsPresContext.h"
 
 #include "nsIInterfaceRequestorUtils.h"
diff --git a/dom/canvas/CanvasRenderingContext2D.h b/dom/canvas/CanvasRenderingContext2D.h
index 2f7776e440257..544f585a40b13 100644
--- a/dom/canvas/CanvasRenderingContext2D.h
+++ b/dom/canvas/CanvasRenderingContext2D.h
@@ -5,29 +5,29 @@
 #ifndef CanvasRenderingContext2D_h
 #define CanvasRenderingContext2D_h
 
-#include "mozilla/Attributes.h"
 #include <vector>
-#include "nsICanvasRenderingContextInternal.h"
-#include "mozilla/RefPtr.h"
-#include "nsColor.h"
-#include "mozilla/dom/HTMLCanvasElement.h"
-#include "mozilla/dom/HTMLVideoElement.h"
-#include "mozilla/ErrorResult.h"
 #include "mozilla/dom/BasicRenderingContext2D.h"
 #include "mozilla/dom/CanvasGradient.h"
-#include "mozilla/dom/CanvasRenderingContext2DBinding.h"
 #include "mozilla/dom/CanvasPattern.h"
+#include "mozilla/dom/CanvasRenderingContext2DBinding.h"
+#include "mozilla/dom/HTMLCanvasElement.h"
+#include "mozilla/dom/HTMLVideoElement.h"
 #include "mozilla/gfx/Rect.h"
 #include "mozilla/gfx/2D.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/EnumeratedArray.h"
+#include "mozilla/ErrorResult.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/RefPtr.h"
+#include "mozilla/SVGObserverUtils.h"
 #include "mozilla/UniquePtr.h"
-#include "gfx2DGlue.h"
-#include "nsLayoutUtils.h"
-#include "mozilla/EnumeratedArray.h"
 #include "FilterSupport.h"
-#include "SVGObserverUtils.h"
+#include "gfx2DGlue.h"
 #include "Layers.h"
+#include "nsICanvasRenderingContextInternal.h"
 #include "nsBidi.h"
+#include "nsColor.h"
+#include "nsLayoutUtils.h"
 
 class gfxFontGroup;
 class nsGlobalWindowInner;
diff --git a/dom/canvas/WebGLContext.cpp b/dom/canvas/WebGLContext.cpp
index 16674492d7893..a2b42adc32dca 100644
--- a/dom/canvas/WebGLContext.cpp
+++ b/dom/canvas/WebGLContext.cpp
@@ -39,6 +39,7 @@
 #include "mozilla/ScopeExit.h"
 #include "mozilla/Services.h"
 #include "mozilla/StaticPrefs_webgl.h"
+#include "mozilla/SVGObserverUtils.h"
 #include "mozilla/Telemetry.h"
 #include "nsContentUtils.h"
 #include "nsDisplayList.h"
@@ -48,7 +49,6 @@
 #include "nsIWidget.h"
 #include "nsServiceManagerUtils.h"
 #include "SharedSurfaceGL.h"
-#include "SVGObserverUtils.h"
 #include "prenv.h"
 #include "ScopedGLHelpers.h"
 #include "VRManagerChild.h"
diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp
index 69cccfd080725..309844f20224a 100644
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -41,7 +41,6 @@
 #include "MediaStreamWindowCapturer.h"
 #include "MediaTrack.h"
 #include "MediaTrackList.h"
-#include "SVGObserverUtils.h"
 #include "TimeRanges.h"
 #include "VideoFrameContainer.h"
 #include "VideoOutput.h"
@@ -59,6 +58,7 @@
 #include "mozilla/PresShell.h"
 #include "mozilla/Sprintf.h"
 #include "mozilla/StaticPrefs_media.h"
+#include "mozilla/SVGObserverUtils.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/dom/AudioTrack.h"
 #include "mozilla/dom/AudioTrackList.h"
diff --git a/dom/svg/SVGForeignObjectElement.h b/dom/svg/SVGForeignObjectElement.h
index 1e9d1428e6e8f..b5c37b3894ed9 100644
--- a/dom/svg/SVGForeignObjectElement.h
+++ b/dom/svg/SVGForeignObjectElement.h
@@ -14,13 +14,13 @@
 nsresult NS_NewSVGForeignObjectElement(
     nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
 
-class nsSVGForeignObjectFrame;
-
 namespace mozilla {
+class SVGForeignObjectFrame;
+
 namespace dom {
 
 class SVGForeignObjectElement final : public SVGGraphicsElement {
-  friend class ::nsSVGForeignObjectFrame;
+  friend class mozilla::SVGForeignObjectFrame;
 
  protected:
   friend nsresult(::NS_NewSVGForeignObjectElement(
diff --git a/dom/svg/SVGGeometryProperty.h b/dom/svg/SVGGeometryProperty.h
index 4cbd1627fd65a..9a84473ff0e97 100644
--- a/dom/svg/SVGGeometryProperty.h
+++ b/dom/svg/SVGGeometryProperty.h
@@ -7,13 +7,13 @@
 #ifndef mozilla_dom_SVGGeometryProperty_SVGGeometryProperty_h
 #define mozilla_dom_SVGGeometryProperty_SVGGeometryProperty_h
 
+#include "mozilla/SVGImageFrame.h"
 #include "mozilla/dom/SVGElement.h"
 #include "ComputedStyle.h"
 #include "SVGAnimatedLength.h"
 #include "nsComputedDOMStyle.h"
 #include "nsGkAtoms.h"
 #include "nsIFrame.h"
-#include "nsSVGImageFrame.h"
 #include <type_traits>
 
 namespace mozilla {
@@ -126,7 +126,7 @@ float ResolveImpl(ComputedStyle const& aStyle, SVGElement* aElement,
     // specified in:
     // https://svgwg.org/svg2-draft/embedded.html#ImageElement
 
-    nsSVGImageFrame* imgf = do_QueryFrame(aElement->GetPrimaryFrame());
+    SVGImageFrame* imgf = do_QueryFrame(aElement->GetPrimaryFrame());
     MOZ_ASSERT(imgf);
 
     using Other = typename Tag::CounterPart;
diff --git a/dom/svg/SVGImageElement.cpp b/dom/svg/SVGImageElement.cpp
index b63a3f1ac1d8c..2536f283586e2 100644
--- a/dom/svg/SVGImageElement.cpp
+++ b/dom/svg/SVGImageElement.cpp
@@ -265,7 +265,7 @@ bool SVGImageElement::GetGeometryBounds(
 
 already_AddRefed<Path> SVGImageElement::BuildPath(PathBuilder* aBuilder) {
   // To get bound, the faster method GetGeometryBounds() should already return
-  // success. For render and hittest, nsSVGImageFrame should have its own
+  // success. For render and hittest, SVGImageFrame should have its own
   // implementation that doesn't need to build path for an image.
   MOZ_ASSERT_UNREACHABLE(
       "There is no reason to call BuildPath for SVGImageElement");
diff --git a/dom/svg/SVGImageElement.h b/dom/svg/SVGImageElement.h
index e9506a2b8b624..9b8d383ba932c 100644
--- a/dom/svg/SVGImageElement.h
+++ b/dom/svg/SVGImageElement.h
@@ -16,9 +16,9 @@
 nsresult NS_NewSVGImageElement(
     nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
 
-class nsSVGImageFrame;
-
 namespace mozilla {
+class SVGImageFrame;
+
 namespace dom {
 class DOMSVGAnimatedPreserveAspectRatio;
 
@@ -26,7 +26,7 @@ typedef SVGGeometryElement SVGImageElementBase;
 
 class SVGImageElement : public SVGImageElementBase,
                         public nsImageLoadingContent {
-  friend class ::nsSVGImageFrame;
+  friend class mozilla::SVGImageFrame;
 
  protected:
   explicit SVGImageElement(
diff --git a/dom/svg/SVGUseElement.cpp b/dom/svg/SVGUseElement.cpp
index 9c2cc7fd06dbb..dfc06428b5a74 100644
--- a/dom/svg/SVGUseElement.cpp
+++ b/dom/svg/SVGUseElement.cpp
@@ -8,17 +8,17 @@
 
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/ErrorResult.h"
+#include "mozilla/SVGObserverUtils.h"
+#include "mozilla/SVGUseFrame.h"
+#include "mozilla/URLExtraData.h"
+#include "mozilla/dom/Document.h"
+#include "mozilla/dom/Element.h"
 #include "mozilla/dom/SVGLengthBinding.h"
+#include "mozilla/dom/SVGSVGElement.h"
 #include "mozilla/dom/SVGUseElementBinding.h"
 #include "nsGkAtoms.h"
-#include "mozilla/dom/SVGSVGElement.h"
-#include "mozilla/dom/Document.h"
-#include "mozilla/dom/Element.h"
 #include "nsContentUtils.h"
 #include "nsIURI.h"
-#include "mozilla/URLExtraData.h"
-#include "SVGObserverUtils.h"
-#include "nsSVGUseFrame.h"
 
 NS_IMPL_NS_NEW_SVG_ELEMENT(Use)
 
@@ -527,7 +527,7 @@ SVGElement::StringAttributesInfo SVGUseElement::GetStringInfo() {
                               ArrayLength(sStringInfo));
 }
 
-nsSVGUseFrame* SVGUseElement::GetFrame() const {
+SVGUseFrame* SVGUseElement::GetFrame() const {
   nsIFrame* frame = GetPrimaryFrame();
   // We might be a plain nsSVGContainerFrame if we didn't pass the conditional
   // processing checks.
@@ -535,7 +535,7 @@ nsSVGUseFrame* SVGUseElement::GetFrame() const {
     MOZ_ASSERT_IF(frame, frame->Type() == LayoutFrameType::None);
     return nullptr;
   }
-  return static_cast<nsSVGUseFrame*>(frame);
+  return static_cast<SVGUseFrame*>(frame);
 }
 
 //----------------------------------------------------------------------
diff --git a/dom/svg/SVGUseElement.h b/dom/svg/SVGUseElement.h
index 3aede8b30d416..fbdcd4616818f 100644
--- a/dom/svg/SVGUseElement.h
+++ b/dom/svg/SVGUseElement.h
@@ -18,7 +18,6 @@
 #include "nsTArray.h"
 
 class nsIContent;
-class nsSVGUseFrame;
 
 nsresult NS_NewSVGSVGElement(
     nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
@@ -27,6 +26,7 @@ nsresult NS_NewSVGUseElement(
     nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
 
 namespace mozilla {
+class SVGUseFrame;
 struct URLExtraData;
 
 namespace dom {
@@ -35,7 +35,7 @@ typedef SVGGraphicsElement SVGUseElementBase;
 
 class SVGUseElement final : public SVGUseElementBase,
                             public nsStubMutationObserver {
-  friend class ::nsSVGUseFrame;
+  friend class mozilla::SVGUseFrame;
 
  protected:
   friend nsresult(::NS_NewSVGUseElement(
@@ -88,7 +88,7 @@ class SVGUseElement final : public SVGUseElementBase,
   // referenced element.
   void UpdateShadowTree();
 
-  // Shared code between AfterSetAttr and nsSVGUseFrame::AttributeChanged.
+  // Shared code between AfterSetAttr and SVGUseFrame::AttributeChanged.
   //
   // This is needed because SMIL doesn't go through AfterSetAttr unfortunately.
   void ProcessAttributeChange(int32_t aNamespaceID, nsAtom* aAttribute);
@@ -137,7 +137,7 @@ class SVGUseElement final : public SVGUseElementBase,
     SVGUseElement* mOwningUseElement;
   };
 
-  nsSVGUseFrame* GetFrame() const;
+  SVGUseFrame* GetFrame() const;
 
   virtual LengthAttributesInfo GetLengthInfo() override;
   virtual StringAttributesInfo GetStringInfo() override;
diff --git a/dom/svg/SVGViewportElement.h b/dom/svg/SVGViewportElement.h
index fb57943c166a9..e41bf64bae4cf 100644
--- a/dom/svg/SVGViewportElement.h
+++ b/dom/svg/SVGViewportElement.h
@@ -8,15 +8,15 @@
 #define mozilla_dom_SVGViewportElement_h
 
 #include "mozilla/Attributes.h"
-#include "mozilla/dom/FromParser.h"
+#include "mozilla/SVGImageContext.h"
 #include "mozilla/UniquePtr.h"
+#include "mozilla/dom/FromParser.h"
 #include "nsIContentInlines.h"
 #include "SVGAnimatedEnumeration.h"
 #include "SVGAnimatedLength.h"
 #include "SVGAnimatedPreserveAspectRatio.h"
 #include "SVGAnimatedViewBox.h"
 #include "SVGGraphicsElement.h"
-#include "SVGImageContext.h"
 #include "nsISVGPoint.h"
 #include "SVGPreserveAspectRatio.h"
 
diff --git a/image/SurfaceCache.h b/image/SurfaceCache.h
index d10b12e8b85fc..7ac9f19961f70 100644
--- a/image/SurfaceCache.h
+++ b/image/SurfaceCache.h
@@ -11,18 +11,18 @@
 #ifndef mozilla_image_SurfaceCache_h
 #define mozilla_image_SurfaceCache_h
 
-#include "mozilla/Maybe.h"  // for Maybe
-#include "mozilla/NotNull.h"
-#include "mozilla/MemoryReporting.h"  // for MallocSizeOf
 #include "mozilla/HashFunctions.h"    // for HashGeneric and AddToHash
+#include "mozilla/Maybe.h"            // for Maybe
+#include "mozilla/MemoryReporting.h"  // for MallocSizeOf
+#include "mozilla/NotNull.h"
+#include "mozilla/SVGImageContext.h"  // for SVGImageContext
+#include "mozilla/gfx/2D.h"           // for SourceSurface
+#include "mozilla/gfx/Point.h"        // for mozilla::gfx::IntSize
 #include "gfx2DGlue.h"
-#include "gfxPoint.h"           // for gfxSize
-#include "nsCOMPtr.h"           // for already_AddRefed
-#include "mozilla/gfx/Point.h"  // for mozilla::gfx::IntSize
-#include "mozilla/gfx/2D.h"     // for SourceSurface
+#include "gfxPoint.h"  // for gfxSize
+#include "nsCOMPtr.h"  // for already_AddRefed
 #include "PlaybackType.h"
 #include "SurfaceFlags.h"
-#include "SVGImageContext.h"  // for SVGImageContext
 
 namespace mozilla {
 namespace image {
diff --git a/image/test/mochitest/test_svg_animatedGIF.html b/image/test/mochitest/test_svg_animatedGIF.html
index 7009e352f0890..04077676b71ef 100644
--- a/image/test/mochitest/test_svg_animatedGIF.html
+++ b/image/test/mochitest/test_svg_animatedGIF.html
@@ -35,7 +35,7 @@
 <pre id="test">
 <script type="text/javascript">
 
-/** Test for Bug 666446 nsSVGImageFrame/RasterImage**/
+/** Test for Bug 666446 SVGImageFrame/RasterImage**/
 
 const FAILURE_TIMEOUT = 120000; // Fail early after 120 seconds (2 minutes)
 
diff --git a/layout/base/nsLayoutUtils.h b/layout/base/nsLayoutUtils.h
index a40cedb2634b2..46c7d61988b45 100644
--- a/layout/base/nsLayoutUtils.h
+++ b/layout/base/nsLayoutUtils.h
@@ -12,27 +12,27 @@
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/LookAndFeel.h"
 #include "mozilla/Maybe.h"
+#include "mozilla/ReflowOutput.h"
 #include "mozilla/RelativeTo.h"
 #include "mozilla/StaticPrefs_nglayout.h"
+#include "mozilla/SVGImageContext.h"
+#include "mozilla/ToString.h"
 #include "mozilla/TypedEnumBits.h"
 #include "mozilla/UniquePtr.h"
-#include "nsBoundingMetrics.h"
 #include "mozilla/layout/FrameChildList.h"
 #include "mozilla/layers/ScrollableLayerGuid.h"
-#include "nsThreadUtils.h"
+#include "mozilla/gfx/2D.h"
+#include "gfx2DGlue.h"
+#include "gfxPoint.h"
+#include "nsBoundingMetrics.h"
 #include "nsCSSPropertyIDSet.h"
+#include "nsClassHashtable.h"
 #include "nsGkAtoms.h"
-#include "mozilla/gfx/2D.h"
-#include "Units.h"
-#include "mozilla/ToString.h"
-#include "mozilla/ReflowOutput.h"
+#include "nsThreadUtils.h"
 #include "ImageContainer.h"  // for layers::Image
-#include "gfx2DGlue.h"
-#include "SVGImageContext.h"
+#include "Units.h"
 #include <limits>
 #include <algorithm>
-#include "gfxPoint.h"
-#include "nsClassHashtable.h"
 // If you're thinking of adding a new include here, please try hard to not.
 // This header file gets included just about everywhere and adding headers here
 // can dramatically increase avoidable build activity. Try instead:
@@ -2695,9 +2695,9 @@ class nsLayoutUtils {
    * otherwise.
    */
   enum class SubtractDynamicToolbar { No, Yes };
-  static bool GetContentViewerSize(nsPresContext* aPresContext,
-                                   LayoutDeviceIntSize& aOutSize,
-                                   SubtractDynamicToolbar = SubtractDynamicToolbar::Yes);
+  static bool GetContentViewerSize(
+      nsPresContext* aPresContext, LayoutDeviceIntSize& aOutSize,
+      SubtractDynamicToolbar = SubtractDynamicToolbar::Yes);
 
  private:
   static bool UpdateCompositionBoundsForRCDRSF(
diff --git a/layout/generic/FrameClasses.py b/layout/generic/FrameClasses.py
index a4a08d436944c..a794a5c3765ab 100644
--- a/layout/generic/FrameClasses.py
+++ b/layout/generic/FrameClasses.py
@@ -107,10 +107,11 @@
     Frame("SVGFELeafFrame", "SVGFELeaf", LEAF),
     Frame("SVGFEUnstyledLeafFrame", "SVGFEUnstyledLeaf", LEAF),
     Frame("nsSVGFilterFrame", "SVGFilter", NOT_LEAF),
-    Frame("nsSVGForeignObjectFrame", "SVGForeignObject", NOT_LEAF),
+    Frame("SVGForeignObjectFrame", "SVGForeignObject", NOT_LEAF),
     Frame("nsSVGGenericContainerFrame", "SVGGenericContainer", NOT_LEAF),
+    Frame("SVGGeometryFrame", "SVGGeometry", LEAF),
     Frame("nsSVGGFrame", "SVGG", NOT_LEAF),
-    Frame("nsSVGImageFrame", "SVGImage", LEAF),
+    Frame("SVGImageFrame", "SVGImage", LEAF),
     Frame("nsSVGInnerSVGFrame", "SVGInnerSVG", NOT_LEAF),
     Frame("nsSVGLinearGradientFrame", "SVGLinearGradient", NOT_LEAF),
     Frame("nsSVGMarkerFrame", "SVGMarker", NOT_LEAF),
@@ -118,7 +119,6 @@
     Frame("nsSVGMaskFrame", "SVGMask", NOT_LEAF),
     Frame("nsSVGOuterSVGFrame", "SVGOuterSVG", NOT_LEAF),
     Frame("nsSVGOuterSVGAnonChildFrame", "SVGOuterSVGAnonChild", NOT_LEAF),
-    Frame("SVGGeometryFrame", "SVGGeometry", LEAF),
     Frame("nsSVGPatternFrame", "SVGPattern", NOT_LEAF),
     Frame("nsSVGRadialGradientFrame", "SVGRadialGradient", NOT_LEAF),
     Frame("nsSVGStopFrame", "SVGStop", LEAF),
@@ -127,7 +127,7 @@
     Frame("SVGTextFrame", "SVGText", NOT_LEAF),
     # Not a leaf, though it always has a ShadowRoot, so in practice light DOM
     # children never render.
-    Frame("nsSVGUseFrame", "SVGUse", NOT_LEAF),
+    Frame("SVGUseFrame", "SVGUse", NOT_LEAF),
     Frame("SVGViewFrame", "SVGView", LEAF),
     Frame("nsTableCellFrame", "TableCell", NOT_LEAF),
     Frame("nsTableColFrame", "TableCol", LEAF),
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index 9eb05be78bc33..8cf8f6a793b1f 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -1033,8 +1033,8 @@ class nsIFrame : public nsQueryFrame {
    *
    *   - nsSVGInnerSVGFrame
    *   - SVGGeometryFrame (used for <path>, <circle>, etc.)
-   *   - nsSVGImageFrame
-   *   - nsSVGForeignObjectFrame
+   *   - SVGImageFrame
+   *   - SVGForeignObjectFrame
    *
    * For these frames the frame rect contains the frame's element's userspace
    * bounds including fill, stroke and markers, but converted to app units
diff --git a/layout/svg/nsSVGForeignObjectFrame.cpp b/layout/svg/SVGForeignObjectFrame.cpp
similarity index 88%
rename from layout/svg/nsSVGForeignObjectFrame.cpp
rename to layout/svg/SVGForeignObjectFrame.cpp
index ed3d8510c8e52..9f3260f2e1bd9 100644
--- a/layout/svg/nsSVGForeignObjectFrame.cpp
+++ b/layout/svg/SVGForeignObjectFrame.cpp
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Main header first:
-#include "nsSVGForeignObjectFrame.h"
+#include "SVGForeignObjectFrame.h"
 
 // Keep others in (case-insensitive) order:
 #include "ImgDrawResult.h"
@@ -25,7 +25,6 @@
 #include "nsSVGOuterSVGFrame.h"
 #include "nsSVGUtils.h"
 
-using namespace mozilla;
 using namespace mozilla::dom;
 using namespace mozilla::image;
 namespace SVGT = SVGGeometryProperty::Tags;
@@ -33,16 +32,18 @@ namespace SVGT = SVGGeometryProperty::Tags;
 //----------------------------------------------------------------------
 // Implementation
 
-nsContainerFrame* NS_NewSVGForeignObjectFrame(PresShell* aPresShell,
-                                              ComputedStyle* aStyle) {
+nsContainerFrame* NS_NewSVGForeignObjectFrame(mozilla::PresShell* aPresShell,
+                                              mozilla::ComputedStyle* aStyle) {
   return new (aPresShell)
-      nsSVGForeignObjectFrame(aStyle, aPresShell->GetPresContext());
+      mozilla::SVGForeignObjectFrame(aStyle, aPresShell->GetPresContext());
 }
 
-NS_IMPL_FRAMEARENA_HELPERS(nsSVGForeignObjectFrame)
+namespace mozilla {
 
-nsSVGForeignObjectFrame::nsSVGForeignObjectFrame(ComputedStyle* aStyle,
-                                                 nsPresContext* aPresContext)
+NS_IMPL_FRAMEARENA_HELPERS(SVGForeignObjectFrame)
+
+SVGForeignObjectFrame::SVGForeignObjectFrame(ComputedStyle* aStyle,
+                                             nsPresContext* aPresContext)
     : nsContainerFrame(aStyle, aPresContext, kClassID), mInReflow(false) {
   AddStateBits(NS_FRAME_REFLOW_ROOT | NS_FRAME_MAY_BE_TRANSFORMED |
                NS_FRAME_SVG_LAYOUT);
@@ -51,13 +52,13 @@ nsSVGForeignObjectFrame::nsSVGForeignObjectFrame(ComputedStyle* aStyle,
 //----------------------------------------------------------------------
 // nsIFrame methods
 
-NS_QUERYFRAME_HEAD(nsSVGForeignObjectFrame)
+NS_QUERYFRAME_HEAD(SVGForeignObjectFrame)
   NS_QUERYFRAME_ENTRY(nsSVGDisplayableFrame)
 NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame)
 
-void nsSVGForeignObjectFrame::Init(nsIContent* aContent,
-                                   nsContainerFrame* aParent,
-                                   nsIFrame* aPrevInFlow) {
+void SVGForeignObjectFrame::Init(nsIContent* aContent,
+                                 nsContainerFrame* aParent,
+                                 nsIFrame* aPrevInFlow) {
   NS_ASSERTION(aContent->IsSVGElement(nsGkAtoms::foreignObject),
                "Content is not an SVG foreignObject!");
 
@@ -70,8 +71,8 @@ void nsSVGForeignObjectFrame::Init(nsIContent* aContent,
   }
 }
 
-void nsSVGForeignObjectFrame::DestroyFrom(nsIFrame* aDestructRoot,
-                                          PostDestroyData& aPostDestroyData) {
+void SVGForeignObjectFrame::DestroyFrom(nsIFrame* aDestructRoot,
+                                        PostDestroyData& aPostDestroyData) {
   // Only unregister if we registered in the first place:
   if (!(mState & NS_FRAME_IS_NONDISPLAY)) {
     nsSVGUtils::GetOuterSVGFrame(this)->UnregisterForeignObject(this);
@@ -79,9 +80,9 @@ void nsSVGForeignObjectFrame::DestroyFrom(nsIFrame* aDestructRoot,
   nsContainerFrame::DestroyFrom(aDestructRoot, aPostDestroyData);
 }
 
-nsresult nsSVGForeignObjectFrame::AttributeChanged(int32_t aNameSpaceID,
-                                                   nsAtom* aAttribute,
-                                                   int32_t aModType) {
+nsresult SVGForeignObjectFrame::AttributeChanged(int32_t aNameSpaceID,
+                                                 nsAtom* aAttribute,
+                                                 int32_t aModType) {
   if (aNameSpaceID == kNameSpaceID_None) {
     if (aAttribute == nsGkAtoms::transform) {
       // We don't invalidate for transform changes (the layers code does that).
@@ -100,7 +101,7 @@ nsresult nsSVGForeignObjectFrame::AttributeChanged(int32_t aNameSpaceID,
   return NS_OK;
 }
 
-void nsSVGForeignObjectFrame::DidSetComputedStyle(
+void SVGForeignObjectFrame::DidSetComputedStyle(
     ComputedStyle* aOldComputedStyle) {
   nsContainerFrame::DidSetComputedStyle(aOldComputedStyle);
 
@@ -114,10 +115,10 @@ void nsSVGForeignObjectFrame::DidSetComputedStyle(
   }
 }
 
-void nsSVGForeignObjectFrame::Reflow(nsPresContext* aPresContext,
-                                     ReflowOutput& aDesiredSize,
-                                     const ReflowInput& aReflowInput,
-                                     nsReflowStatus& aStatus) {
+void SVGForeignObjectFrame::Reflow(nsPresContext* aPresContext,
+                                   ReflowOutput& aDesiredSize,
+                                   const ReflowInput& aReflowInput,
+                                   nsReflowStatus& aStatus) {
   MOZ_ASSERT(aStatus.IsEmpty(), "Caller should pass a fresh reflow status!");
   MOZ_ASSERT(!(GetStateBits() & NS_FRAME_IS_NONDISPLAY),
              "Should not have been called");
@@ -148,8 +149,8 @@ void nsSVGForeignObjectFrame::Reflow(nsPresContext* aPresContext,
   aDesiredSize.SetOverflowAreasToDesiredBounds();
 }
 
-void nsSVGForeignObjectFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
-                                               const nsDisplayListSet& aLists) {
+void SVGForeignObjectFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
+                                             const nsDisplayListSet& aLists) {
   if (!static_cast<const SVGElement*>(GetContent())->HasValidDimensions()) {
     return;
   }
@@ -162,7 +163,7 @@ void nsSVGForeignObjectFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
                                                            &newList);
 }
 
-bool nsSVGForeignObjectFrame::IsSVGTransformed(
+bool SVGForeignObjectFrame::IsSVGTransformed(
     Matrix* aOwnTransform, Matrix* aFromParentTransform) const {
   bool foundTransform = false;
 
@@ -188,10 +189,10 @@ bool nsSVGForeignObjectFrame::IsSVGTransformed(
   return foundTransform;
 }
 
-void nsSVGForeignObjectFrame::PaintSVG(gfxContext& aContext,
-                                       const gfxMatrix& aTransform,
-                                       imgDrawingParams& aImgParams,
-                                       const nsIntRect* aDirtyRect) {
+void SVGForeignObjectFrame::PaintSVG(gfxContext& aContext,
+                                     const gfxMatrix& aTransform,
+                                     imgDrawingParams& aImgParams,
+                                     const nsIntRect* aDirtyRect) {
   NS_ASSERTION(
       !NS_SVGDisplayListPaintingEnabled() || (mState & NS_FRAME_IS_NONDISPLAY),
       "If display lists are enabled, only painting of non-display "
@@ -281,7 +282,7 @@ void nsSVGForeignObjectFrame::PaintSVG(gfxContext& aContext,
   aContext.Restore();
 }
 
-nsIFrame* nsSVGForeignObjectFrame::GetFrameForPoint(const gfxPoint& aPoint) {
+nsIFrame* SVGForeignObjectFrame::GetFrameForPoint(const gfxPoint& aPoint) {
   NS_ASSERTION(!NS_SVGDisplayListHitTestingEnabled() ||
                    (mState & NS_FRAME_IS_NONDISPLAY),
                "If display lists are enabled, only hit-testing of a "
@@ -314,7 +315,7 @@ nsIFrame* nsSVGForeignObjectFrame::GetFrameForPoint(const gfxPoint& aPoint) {
   return nsLayoutUtils::GetFrameForPoint(RelativeTo{kid}, point);
 }
 
-void nsSVGForeignObjectFrame::ReflowSVG() {
+void SVGForeignObjectFrame::ReflowSVG() {
   NS_ASSERTION(nsSVGUtils::OuterSVGIsCallingReflowSVG(this),
                "This call is probably a wasteful mistake");
 
@@ -373,7 +374,7 @@ void nsSVGForeignObjectFrame::ReflowSVG() {
                   NS_FRAME_HAS_DIRTY_CHILDREN);
 }
 
-void nsSVGForeignObjectFrame::NotifySVGChanged(uint32_t aFlags) {
+void SVGForeignObjectFrame::NotifySVGChanged(uint32_t aFlags) {
   MOZ_ASSERT(aFlags & (TRANSFORM_CHANGED | COORD_CONTEXT_CHANGED),
              "Invalidation logic may need adjusting");
 
@@ -439,7 +440,7 @@ void nsSVGForeignObjectFrame::NotifySVGChanged(uint32_t aFlags) {
   }
 }
 
-SVGBBox nsSVGForeignObjectFrame::GetBBoxContribution(
+SVGBBox SVGForeignObjectFrame::GetBBoxContribution(
     const Matrix& aToBBoxUserspace, uint32_t aFlags) {
   SVGForeignObjectElement* content =
       static_cast<SVGForeignObjectElement*>(GetContent());
@@ -460,7 +461,7 @@ SVGBBox nsSVGForeignObjectFrame::GetBBoxContribution(
 
 //----------------------------------------------------------------------
 
-gfxMatrix nsSVGForeignObjectFrame::GetCanvasTM() {
+gfxMatrix SVGForeignObjectFrame::GetCanvasTM() {
   if (!mCanvasTM) {
     NS_ASSERTION(GetParent(), "null parent");
 
@@ -479,7 +480,7 @@ gfxMatrix nsSVGForeignObjectFrame::GetCanvasTM() {
 //----------------------------------------------------------------------
 // Implementation helpers
 
-void nsSVGForeignObjectFrame::RequestReflow(IntrinsicDirty aType) {
+void SVGForeignObjectFrame::RequestReflow(IntrinsicDirty aType) {
   if (GetStateBits() & NS_FRAME_FIRST_REFLOW)
     // If we haven't had a ReflowSVG() yet, nothing to do.
     return;
@@ -492,7 +493,7 @@ void nsSVGForeignObjectFrame::RequestReflow(IntrinsicDirty aType) {
   PresShell()->FrameNeedsReflow(kid, aType, NS_FRAME_IS_DIRTY);
 }
 
-void nsSVGForeignObjectFrame::DoReflow() {
+void SVGForeignObjectFrame::DoReflow() {
   MarkInReflow();
   // Skip reflow if we're zero-sized, unless this is our first reflow.
   if (IsDisabled() && !(GetStateBits() & NS_FRAME_FIRST_REFLOW)) {
@@ -539,7 +540,7 @@ void nsSVGForeignObjectFrame::DoReflow() {
   mInReflow = false;
 }
 
-nsRect nsSVGForeignObjectFrame::GetInvalidRegion() {
+nsRect SVGForeignObjectFrame::GetInvalidRegion() {
   MOZ_ASSERT(!NS_SVGDisplayListPaintingEnabled(),
              "Only called by nsDisplayOuterSVG code");
 
@@ -554,8 +555,10 @@ nsRect nsSVGForeignObjectFrame::GetInvalidRegion() {
   return nsRect();
 }
 
-void nsSVGForeignObjectFrame::AppendDirectlyOwnedAnonBoxes(
+void SVGForeignObjectFrame::AppendDirectlyOwnedAnonBoxes(
     nsTArray<OwnedAnonBox>& aResult) {
   MOZ_ASSERT(PrincipalChildList().FirstChild(), "Must have our anon box");
   aResult.AppendElement(OwnedAnonBox(PrincipalChildList().FirstChild()));
 }
+
+}  // namespace mozilla
diff --git a/layout/svg/nsSVGForeignObjectFrame.h b/layout/svg/SVGForeignObjectFrame.h
similarity index 83%
rename from layout/svg/nsSVGForeignObjectFrame.h
rename to layout/svg/SVGForeignObjectFrame.h
index b15ae8f365d0f..172b86a7fbee4 100644
--- a/layout/svg/nsSVGForeignObjectFrame.h
+++ b/layout/svg/SVGForeignObjectFrame.h
@@ -17,18 +17,23 @@
 
 class gfxContext;
 
-class nsSVGForeignObjectFrame final : public nsContainerFrame,
-                                      public nsSVGDisplayableFrame {
-  friend nsContainerFrame* NS_NewSVGForeignObjectFrame(
+nsContainerFrame* NS_NewSVGForeignObjectFrame(mozilla::PresShell* aPresShell,
+                                              mozilla::ComputedStyle* aStyle);
+
+namespace mozilla {
+
+class SVGForeignObjectFrame final : public nsContainerFrame,
+                                    public nsSVGDisplayableFrame {
+  friend nsContainerFrame* ::NS_NewSVGForeignObjectFrame(
       mozilla::PresShell* aPresShell, ComputedStyle* aStyle);
 
  protected:
-  explicit nsSVGForeignObjectFrame(ComputedStyle* aStyle,
-                                   nsPresContext* aPresContext);
+  explicit SVGForeignObjectFrame(ComputedStyle* aStyle,
+                                 nsPresContext* aPresContext);
 
  public:
   NS_DECL_QUERYFRAME
-  NS_DECL_FRAMEARENA_HELPERS(nsSVGForeignObjectFrame)
+  NS_DECL_FRAMEARENA_HELPERS(SVGForeignObjectFrame)
 
   // nsIFrame:
   virtual void Init(nsIContent* aContent, nsContainerFrame* aParent,
@@ -89,14 +94,16 @@ class nsSVGForeignObjectFrame final : public nsContainerFrame,
  protected:
   // implementation helpers:
   void DoReflow();
-  void RequestReflow(mozilla::IntrinsicDirty aType);
+  void RequestReflow(IntrinsicDirty aType);
 
   // If width or height is less than or equal to zero we must disable rendering
   bool IsDisabled() const { return mRect.width <= 0 || mRect.height <= 0; }
 
-  mozilla::UniquePtr<gfxMatrix> mCanvasTM;
+  UniquePtr<gfxMatrix> mCanvasTM;
 
   bool mInReflow;
 };
 
+}  // namespace mozilla
+
 #endif
diff --git a/layout/svg/nsSVGImageFrame.cpp b/layout/svg/SVGImageFrame.cpp
similarity index 91%
rename from layout/svg/nsSVGImageFrame.cpp
rename to layout/svg/SVGImageFrame.cpp
index 43ebb4e3999c5..4611a98c12552 100644
--- a/layout/svg/nsSVGImageFrame.cpp
+++ b/layout/svg/SVGImageFrame.cpp
@@ -4,7 +4,7 @@
  * 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 "nsSVGImageFrame.h"
+#include "SVGImageFrame.h"
 
 // Keep in (case-insensitive) order:
 #include "gfxContext.h"
@@ -29,26 +29,48 @@
 #include "nsIReflowCallback.h"
 #include "mozilla/Unused.h"
 
-using namespace mozilla;
 using namespace mozilla::dom;
 using namespace mozilla::gfx;
 using namespace mozilla::image;
 using namespace mozilla::dom::SVGPreserveAspectRatio_Binding;
 namespace SVGT = SVGGeometryProperty::Tags;
 
+namespace mozilla {
+
+class SVGImageListener final : public imgINotificationObserver {
+ public:
+  explicit SVGImageListener(SVGImageFrame* aFrame);
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_IMGINOTIFICATIONOBSERVER
+
+  void SetFrame(SVGImageFrame* frame) { mFrame = frame; }
+
+ private:
+  ~SVGImageListener() = default;
+
+  SVGImageFrame* mFrame;
+};
+
 // ---------------------------------------------------------------------
 // nsQueryFrame methods
-NS_QUERYFRAME_HEAD(nsSVGImageFrame)
-  NS_QUERYFRAME_ENTRY(nsSVGImageFrame)
+NS_QUERYFRAME_HEAD(SVGImageFrame)
+  NS_QUERYFRAME_ENTRY(SVGImageFrame)
 NS_QUERYFRAME_TAIL_INHERITING(SVGGeometryFrame)
 
-nsIFrame* NS_NewSVGImageFrame(PresShell* aPresShell, ComputedStyle* aStyle) {
-  return new (aPresShell) nsSVGImageFrame(aStyle, aPresShell->GetPresContext());
+}  // namespace mozilla
+
+nsIFrame* NS_NewSVGImageFrame(mozilla::PresShell* aPresShell,
+                              mozilla::ComputedStyle* aStyle) {
+  return new (aPresShell)
+      mozilla::SVGImageFrame(aStyle, aPresShell->GetPresContext());
 }
 
-NS_IMPL_FRAMEARENA_HELPERS(nsSVGImageFrame)
+namespace mozilla {
+
+NS_IMPL_FRAMEARENA_HELPERS(SVGImageFrame)
 
-nsSVGImageFrame::~nsSVGImageFrame() {
+SVGImageFrame::~SVGImageFrame() {
   // set the frame to null so we don't send messages to a dead object.
   if (mListener) {
     nsCOMPtr<nsIImageLoadingContent> imageLoader =
@@ -56,13 +78,13 @@ nsSVGImageFrame::~nsSVGImageFrame() {
     if (imageLoader) {
       imageLoader->RemoveNativeObserver(mListener);
     }
-    reinterpret_cast<nsSVGImageListener*>(mListener.get())->SetFrame(nullptr);
+    reinterpret_cast<SVGImageListener*>(mListener.get())->SetFrame(nullptr);
   }
   mListener = nullptr;
 }
 
-void nsSVGImageFrame::Init(nsIContent* aContent, nsContainerFrame* aParent,
-                           nsIFrame* aPrevInFlow) {
+void SVGImageFrame::Init(nsIContent* aContent, nsContainerFrame* aParent,
+                         nsIFrame* aPrevInFlow) {
   NS_ASSERTION(aContent->IsSVGElement(nsGkAtoms::image),
                "Content is not an SVG image!");
 
@@ -80,7 +102,7 @@ void nsSVGImageFrame::Init(nsIContent* aContent, nsContainerFrame* aParent,
     IncApproximateVisibleCount();
   }
 
-  mListener = new nsSVGImageListener(this);
+  mListener = new SVGImageListener(this);
   nsCOMPtr<nsIImageLoadingContent> imageLoader =
       do_QueryInterface(GetContent());
   if (!imageLoader) {
@@ -95,8 +117,8 @@ void nsSVGImageFrame::Init(nsIContent* aContent, nsContainerFrame* aParent,
 }
 
 /* virtual */
-void nsSVGImageFrame::DestroyFrom(nsIFrame* aDestructRoot,
-                                  PostDestroyData& aPostDestroyData) {
+void SVGImageFrame::DestroyFrom(nsIFrame* aDestructRoot,
+                                PostDestroyData& aPostDestroyData) {
   if (GetStateBits() & NS_FRAME_IS_NONDISPLAY) {
     DecApproximateVisibleCount();
   }
@@ -117,7 +139,7 @@ void nsSVGImageFrame::DestroyFrom(nsIFrame* aDestructRoot,
 }
 
 /* virtual */
-void nsSVGImageFrame::DidSetComputedStyle(ComputedStyle* aOldStyle) {
+void SVGImageFrame::DidSetComputedStyle(ComputedStyle* aOldStyle) {
   SVGGeometryFrame::DidSetComputedStyle(aOldStyle);
 
   if (!mImageContainer || !aOldStyle) {
@@ -137,9 +159,8 @@ void nsSVGImageFrame::DidSetComputedStyle(ComputedStyle* aOldStyle) {
 //----------------------------------------------------------------------
 // nsIFrame methods:
 
-nsresult nsSVGImageFrame::AttributeChanged(int32_t aNameSpaceID,
-                                           nsAtom* aAttribute,
-                                           int32_t aModType) {
+nsresult SVGImageFrame::AttributeChanged(int32_t aNameSpaceID,
+                                         nsAtom* aAttribute, int32_t aModType) {
   if (aNameSpaceID == kNameSpaceID_None) {
     if (aAttribute == nsGkAtoms::preserveAspectRatio) {
       // We don't paint the content of the image using display lists, therefore
@@ -174,7 +195,7 @@ nsresult nsSVGImageFrame::AttributeChanged(int32_t aNameSpaceID,
   return SVGGeometryFrame::AttributeChanged(aNameSpaceID, aAttribute, aModType);
 }
 
-void nsSVGImageFrame::OnVisibilityChange(
+void SVGImageFrame::OnVisibilityChange(
     Visibility aNewVisibility, const Maybe<OnNonvisible>& aNonvisibleAction) {
   nsCOMPtr<nsIImageLoadingContent> imageLoader =
       do_QueryInterface(GetContent());
@@ -188,8 +209,8 @@ void nsSVGImageFrame::OnVisibilityChange(
   SVGGeometryFrame::OnVisibilityChange(aNewVisibility, aNonvisibleAction);
 }
 
-gfx::Matrix nsSVGImageFrame::GetRasterImageTransform(int32_t aNativeWidth,
-                                                     int32_t aNativeHeight) {
+gfx::Matrix SVGImageFrame::GetRasterImageTransform(int32_t aNativeWidth,
+                                                   int32_t aNativeHeight) {
   float x, y, width, height;
   SVGImageElement* element = static_cast<SVGImageElement*>(GetContent());
   SVGGeometryProperty::ResolveAll<SVGT::X, SVGT::Y, SVGT::Width, SVGT::Height>(
@@ -202,7 +223,7 @@ gfx::Matrix nsSVGImageFrame::GetRasterImageTransform(int32_t aNativeWidth,
   return viewBoxTM * gfx::Matrix::Translation(x, y);
 }
 
-gfx::Matrix nsSVGImageFrame::GetVectorImageTransform() {
+gfx::Matrix SVGImageFrame::GetVectorImageTransform() {
   float x, y;
   SVGImageElement* element = static_cast<SVGImageElement*>(GetContent());
   SVGGeometryProperty::ResolveAll<SVGT::X, SVGT::Y>(element, &x, &y);
@@ -214,7 +235,7 @@ gfx::Matrix nsSVGImageFrame::GetVectorImageTransform() {
   return gfx::Matrix::Translation(x, y);
 }
 
-bool nsSVGImageFrame::GetIntrinsicImageDimensions(
+bool SVGImageFrame::GetIntrinsicImageDimensions(
     mozilla::gfx::Size& aSize, mozilla::AspectRatio& aAspectRatio) const {
   if (!mImageContainer) {
     return false;
@@ -239,8 +260,8 @@ bool nsSVGImageFrame::GetIntrinsicImageDimensions(
   return true;
 }
 
-bool nsSVGImageFrame::TransformContextForPainting(gfxContext* aGfxContext,
-                                                  const gfxMatrix& aTransform) {
+bool SVGImageFrame::TransformContextForPainting(gfxContext* aGfxContext,
+                                                const gfxMatrix& aTransform) {
   gfx::Matrix imageTransform;
   if (mImageContainer->GetType() == imgIContainer::TYPE_VECTOR) {
     imageTransform = GetVectorImageTransform() * ToMatrix(aTransform);
@@ -272,10 +293,9 @@ bool nsSVGImageFrame::TransformContextForPainting(gfxContext* aGfxContext,
 
 //----------------------------------------------------------------------
 // nsSVGDisplayableFrame methods:
-void nsSVGImageFrame::PaintSVG(gfxContext& aContext,
-                               const gfxMatrix& aTransform,
-                               imgDrawingParams& aImgParams,
-                               const nsIntRect* aDirtyRect) {
+void SVGImageFrame::PaintSVG(gfxContext& aContext, const gfxMatrix& aTransform,
+                             imgDrawingParams& aImgParams,
+                             const nsIntRect* aDirtyRect) {
   if (!StyleVisibility()->IsVisible()) {
     return;
   }
@@ -403,7 +423,7 @@ void nsSVGImageFrame::PaintSVG(gfxContext& aContext,
   }
 }
 
-bool nsSVGImageFrame::CreateWebRenderCommands(
+bool SVGImageFrame::CreateWebRenderCommands(
     mozilla::wr::DisplayListBuilder& aBuilder,
     mozilla::wr::IpcResourceUpdateQueue& aResources,
     const mozilla::layers::StackingContextHelper& aSc,
@@ -630,7 +650,7 @@ bool nsSVGImageFrame::CreateWebRenderCommands(
   return true;
 }
 
-nsIFrame* nsSVGImageFrame::GetFrameForPoint(const gfxPoint& aPoint) {
+nsIFrame* SVGImageFrame::GetFrameForPoint(const gfxPoint& aPoint) {
   if (!(GetStateBits() & NS_STATE_SVG_CLIPPATH_CHILD) && !GetHitTestFlags()) {
     return nullptr;
   }
@@ -679,7 +699,7 @@ nsIFrame* nsSVGImageFrame::GetFrameForPoint(const gfxPoint& aPoint) {
 // Lie about our fill/stroke so that covered region and hit detection work
 // properly
 
-void nsSVGImageFrame::ReflowSVG() {
+void SVGImageFrame::ReflowSVG() {
   NS_ASSERTION(nsSVGUtils::OuterSVGIsCallingReflowSVG(this),
                "This call is probably a wasteful mistake");
 
@@ -729,7 +749,7 @@ void nsSVGImageFrame::ReflowSVG() {
   }
 }
 
-bool nsSVGImageFrame::ReflowFinished() {
+bool SVGImageFrame::ReflowFinished() {
   mReflowCallbackPosted = false;
 
   // XXX(seth): We don't need this. The purpose of updating visibility
@@ -746,11 +766,9 @@ bool nsSVGImageFrame::ReflowFinished() {
   return false;
 }
 
-void nsSVGImageFrame::ReflowCallbackCanceled() {
-  mReflowCallbackPosted = false;
-}
+void SVGImageFrame::ReflowCallbackCanceled() { mReflowCallbackPosted = false; }
 
-uint16_t nsSVGImageFrame::GetHitTestFlags() {
+uint16_t SVGImageFrame::GetHitTestFlags() {
   uint16_t flags = 0;
 
   switch (StyleUI()->mPointerEvents) {
@@ -788,15 +806,14 @@ uint16_t nsSVGImageFrame::GetHitTestFlags() {
 }
 
 //----------------------------------------------------------------------
-// nsSVGImageListener implementation
+// SVGImageListener implementation
 
-NS_IMPL_ISUPPORTS(nsSVGImageListener, imgINotificationObserver)
+NS_IMPL_ISUPPORTS(SVGImageListener, imgINotificationObserver)
 
-nsSVGImageListener::nsSVGImageListener(nsSVGImageFrame* aFrame)
-    : mFrame(aFrame) {}
+SVGImageListener::SVGImageListener(SVGImageFrame* aFrame) : mFrame(aFrame) {}
 
-void nsSVGImageListener::Notify(imgIRequest* aRequest, int32_t aType,
-                                const nsIntRect* aData) {
+void SVGImageListener::Notify(imgIRequest* aRequest, int32_t aType,
+                              const nsIntRect* aData) {
   if (!mFrame) {
     return;
   }
@@ -835,3 +852,5 @@ void nsSVGImageListener::Notify(imgIRequest* aRequest, int32_t aType,
     nsSVGUtils::ScheduleReflowSVG(mFrame);
   }
 }
+
+}  // namespace mozilla
diff --git a/layout/svg/nsSVGImageFrame.h b/layout/svg/SVGImageFrame.h
similarity index 67%
rename from layout/svg/nsSVGImageFrame.h
rename to layout/svg/SVGImageFrame.h
index 2dc98bca85d44..586f76c2a077e 100644
--- a/layout/svg/nsSVGImageFrame.h
+++ b/layout/svg/SVGImageFrame.h
@@ -24,53 +24,39 @@
 #include "nsIReflowCallback.h"
 #include "mozilla/Unused.h"
 
-class nsSVGImageFrame;
-
 namespace mozilla {
 class PresShell;
 }  // namespace mozilla
 
-class nsSVGImageListener final : public imgINotificationObserver {
- public:
-  explicit nsSVGImageListener(nsSVGImageFrame* aFrame);
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGINOTIFICATIONOBSERVER
-
-  void SetFrame(nsSVGImageFrame* frame) { mFrame = frame; }
-
- private:
-  ~nsSVGImageListener() = default;
+nsIFrame* NS_NewSVGImageFrame(mozilla::PresShell* aPresShell,
+                              mozilla::ComputedStyle* aStyle);
 
-  nsSVGImageFrame* mFrame;
-};
+namespace mozilla {
 
-class nsSVGImageFrame final : public mozilla::SVGGeometryFrame,
-                              public nsIReflowCallback {
-  friend nsIFrame* NS_NewSVGImageFrame(mozilla::PresShell* aPresShell,
-                                       ComputedStyle* aStyle);
+class SVGImageFrame final : public SVGGeometryFrame, public nsIReflowCallback {
+  friend nsIFrame* ::NS_NewSVGImageFrame(mozilla::PresShell* aPresShell,
+                                         ComputedStyle* aStyle);
 
   virtual bool CreateWebRenderCommands(
-      mozilla::wr::DisplayListBuilder& aBuilder,
-      mozilla::wr::IpcResourceUpdateQueue& aResources,
-      const mozilla::layers::StackingContextHelper& aSc,
-      mozilla::layers::RenderRootStateManager* aManager,
-      nsDisplayListBuilder* aDisplayListBuilder,
-      mozilla::DisplaySVGGeometry* aItem, bool aDryRun) override;
+      wr::DisplayListBuilder& aBuilder, wr::IpcResourceUpdateQueue& aResources,
+      const layers::StackingContextHelper& aSc,
+      layers::RenderRootStateManager* aManager,
+      nsDisplayListBuilder* aDisplayListBuilder, DisplaySVGGeometry* aItem,
+      bool aDryRun) override;
 
  protected:
-  explicit nsSVGImageFrame(ComputedStyle* aStyle, nsPresContext* aPresContext)
+  explicit SVGImageFrame(ComputedStyle* aStyle, nsPresContext* aPresContext)
       : SVGGeometryFrame(aStyle, aPresContext, kClassID),
         mReflowCallbackPosted(false),
         mForceSyncDecoding(false) {
     EnableVisibilityTracking();
   }
 
-  virtual ~nsSVGImageFrame();
+  virtual ~SVGImageFrame();
 
  public:
   NS_DECL_QUERYFRAME
-  NS_DECL_FRAMEARENA_HELPERS(nsSVGImageFrame)
+  NS_DECL_FRAMEARENA_HELPERS(SVGImageFrame)
 
   // nsSVGDisplayableFrame interface:
   virtual void PaintSVG(gfxContext& aContext, const gfxMatrix& aTransform,
@@ -96,8 +82,8 @@ class nsSVGImageFrame final : public mozilla::SVGGeometryFrame,
                            PostDestroyData& aPostDestroyData) override;
   void DidSetComputedStyle(ComputedStyle* aOldStyle) final;
 
-  bool GetIntrinsicImageDimensions(mozilla::gfx::Size& aSize,
-                                   mozilla::AspectRatio& aAspectRatio) const;
+  bool GetIntrinsicImageDimensions(gfx::Size& aSize,
+                                   AspectRatio& aAspectRatio) const;
 
 #ifdef DEBUG_FRAME_DUMP
   virtual nsresult GetFrameName(nsAString& aResult) const override {
@@ -113,9 +99,9 @@ class nsSVGImageFrame final : public mozilla::SVGGeometryFrame,
   void SetForceSyncDecoding(bool aForce) { mForceSyncDecoding = aForce; }
 
  private:
-  mozilla::gfx::Matrix GetRasterImageTransform(int32_t aNativeWidth,
-                                               int32_t aNativeHeight);
-  mozilla::gfx::Matrix GetVectorImageTransform();
+  gfx::Matrix GetRasterImageTransform(int32_t aNativeWidth,
+                                      int32_t aNativeHeight);
+  gfx::Matrix GetVectorImageTransform();
   bool TransformContextForPainting(gfxContext* aGfxContext,
                                    const gfxMatrix& aTransform);
 
@@ -126,7 +112,9 @@ class nsSVGImageFrame final : public mozilla::SVGGeometryFrame,
   bool mReflowCallbackPosted;
   bool mForceSyncDecoding;
 
-  friend class nsSVGImageListener;
+  friend class SVGImageListener;
 };
 
+}  // namespace mozilla
+
 #endif  // __NS_SVGIMAGEFRAME_H__
diff --git a/layout/svg/nsSVGUseFrame.cpp b/layout/svg/SVGUseFrame.cpp
similarity index 84%
rename from layout/svg/nsSVGUseFrame.cpp
rename to layout/svg/SVGUseFrame.cpp
index cffc67d2061e1..05a10e417dd81 100644
--- a/layout/svg/nsSVGUseFrame.cpp
+++ b/layout/svg/SVGUseFrame.cpp
@@ -4,30 +4,31 @@
  * 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 "nsSVGUseFrame.h"
+#include "SVGUseFrame.h"
 
 #include "mozilla/PresShell.h"
+#include "mozilla/SVGObserverUtils.h"
 #include "mozilla/dom/MutationEvent.h"
 #include "mozilla/dom/SVGUseElement.h"
-#include "SVGObserverUtils.h"
 
-using namespace mozilla;
 using namespace mozilla::dom;
 
 //----------------------------------------------------------------------
 // Implementation
 
 nsIFrame* NS_NewSVGUseFrame(PresShell* aPresShell, ComputedStyle* aStyle) {
-  return new (aPresShell) nsSVGUseFrame(aStyle, aPresShell->GetPresContext());
+  return new (aPresShell) SVGUseFrame(aStyle, aPresShell->GetPresContext());
 }
 
-NS_IMPL_FRAMEARENA_HELPERS(nsSVGUseFrame)
+NS_IMPL_FRAMEARENA_HELPERS(SVGUseFrame)
+
+namespace mozilla {
 
 //----------------------------------------------------------------------
 // nsIFrame methods:
 
-void nsSVGUseFrame::Init(nsIContent* aContent, nsContainerFrame* aParent,
-                         nsIFrame* aPrevInFlow) {
+void SVGUseFrame::Init(nsIContent* aContent, nsContainerFrame* aParent,
+                       nsIFrame* aPrevInFlow) {
   NS_ASSERTION(aContent->IsSVGElement(nsGkAtoms::use),
                "Content is not an SVG use!");
 
@@ -37,8 +38,8 @@ void nsSVGUseFrame::Init(nsIContent* aContent, nsContainerFrame* aParent,
   nsSVGGFrame::Init(aContent, aParent, aPrevInFlow);
 }
 
-nsresult nsSVGUseFrame::AttributeChanged(int32_t aNamespaceID,
-                                         nsAtom* aAttribute, int32_t aModType) {
+nsresult SVGUseFrame::AttributeChanged(int32_t aNamespaceID, nsAtom* aAttribute,
+                                       int32_t aModType) {
   // Currently our SMIL implementation does not modify the DOM attributes. Once
   // we implement the SVG 2 SMIL behaviour this can be removed
   // SVGUseElement::AfterSetAttr's implementation will be sufficient.
@@ -50,7 +51,7 @@ nsresult nsSVGUseFrame::AttributeChanged(int32_t aNamespaceID,
   return nsSVGGFrame::AttributeChanged(aNamespaceID, aAttribute, aModType);
 }
 
-void nsSVGUseFrame::PositionAttributeChanged() {
+void SVGUseFrame::PositionAttributeChanged() {
   // make sure our cached transform matrix gets (lazily) updated
   mCanvasTM = nullptr;
   nsLayoutUtils::PostRestyleEvent(GetContent()->AsElement(), RestyleHint{0},
@@ -59,8 +60,8 @@ void nsSVGUseFrame::PositionAttributeChanged() {
   nsSVGUtils::NotifyChildrenOfSVGChange(this, TRANSFORM_CHANGED);
 }
 
-void nsSVGUseFrame::DimensionAttributeChanged(bool aHadValidDimensions,
-                                              bool aAttributeIsUsed) {
+void SVGUseFrame::DimensionAttributeChanged(bool aHadValidDimensions,
+                                            bool aAttributeIsUsed) {
   bool invalidate = aAttributeIsUsed;
   if (mHasValidDimensions != aHadValidDimensions) {
     mHasValidDimensions = !mHasValidDimensions;
@@ -74,7 +75,7 @@ void nsSVGUseFrame::DimensionAttributeChanged(bool aHadValidDimensions,
   }
 }
 
-void nsSVGUseFrame::HrefChanged() {
+void SVGUseFrame::HrefChanged() {
   nsLayoutUtils::PostRestyleEvent(GetContent()->AsElement(), RestyleHint{0},
                                   nsChangeHint_InvalidateRenderingObservers);
   nsSVGUtils::ScheduleReflowSVG(this);
@@ -83,7 +84,7 @@ void nsSVGUseFrame::HrefChanged() {
 //----------------------------------------------------------------------
 // nsSVGDisplayableFrame methods
 
-void nsSVGUseFrame::ReflowSVG() {
+void SVGUseFrame::ReflowSVG() {
   // We only handle x/y offset here, since any width/height that is in force is
   // handled by the nsSVGOuterSVGFrame for the anonymous <svg> that will be
   // created for that purpose.
@@ -103,7 +104,7 @@ void nsSVGUseFrame::ReflowSVG() {
   nsSVGGFrame::ReflowSVG();
 }
 
-void nsSVGUseFrame::NotifySVGChanged(uint32_t aFlags) {
+void SVGUseFrame::NotifySVGChanged(uint32_t aFlags) {
   if (aFlags & COORD_CONTEXT_CHANGED && !(aFlags & TRANSFORM_CHANGED)) {
     // Coordinate context changes affect mCanvasTM if we have a
     // percentage 'x' or 'y'
@@ -127,3 +128,5 @@ void nsSVGUseFrame::NotifySVGChanged(uint32_t aFlags) {
 
   nsSVGGFrame::NotifySVGChanged(aFlags);
 }
+
+}  // namespace mozilla
diff --git a/layout/svg/nsSVGUseFrame.h b/layout/svg/SVGUseFrame.h
similarity index 77%
rename from layout/svg/nsSVGUseFrame.h
rename to layout/svg/SVGUseFrame.h
index ac4c3c7ba7b0b..8f9f8bfc627e7 100644
--- a/layout/svg/nsSVGUseFrame.h
+++ b/layout/svg/SVGUseFrame.h
@@ -14,17 +14,22 @@ namespace mozilla {
 class PresShell;
 }  // namespace mozilla
 
-class nsSVGUseFrame final : public nsSVGGFrame {
-  friend nsIFrame* NS_NewSVGUseFrame(mozilla::PresShell* aPresShell,
-                                     ComputedStyle* aStyle);
+nsIFrame* NS_NewSVGUseFrame(mozilla::PresShell* aPresShell,
+                            mozilla::ComputedStyle* aStyle);
+
+namespace mozilla {
+
+class SVGUseFrame final : public nsSVGGFrame {
+  friend nsIFrame* ::NS_NewSVGUseFrame(mozilla::PresShell* aPresShell,
+                                       ComputedStyle* aStyle);
 
  protected:
-  explicit nsSVGUseFrame(ComputedStyle* aStyle, nsPresContext* aPresContext)
+  explicit SVGUseFrame(ComputedStyle* aStyle, nsPresContext* aPresContext)
       : nsSVGGFrame(aStyle, aPresContext, kClassID),
         mHasValidDimensions(true) {}
 
  public:
-  NS_DECL_FRAMEARENA_HELPERS(nsSVGUseFrame)
+  NS_DECL_FRAMEARENA_HELPERS(SVGUseFrame)
 
   // nsIFrame interface:
   void Init(nsIContent* aContent, nsContainerFrame* aParent,
@@ -57,4 +62,6 @@ class nsSVGUseFrame final : public nsSVGGFrame {
   bool mHasValidDimensions;
 };
 
+}  // namespace mozilla
+
 #endif  // __NS_SVGUSEFRAME_H__
diff --git a/layout/svg/moz.build b/layout/svg/moz.build
index e5da1dd380ffa..69a84412ca75a 100644
--- a/layout/svg/moz.build
+++ b/layout/svg/moz.build
@@ -19,19 +19,19 @@ EXPORTS += [
     'nsFilterInstance.h',
     'nsSVGDisplayableFrame.h',
     'nsSVGFilterInstance.h',
-    'nsSVGForeignObjectFrame.h',
-    'nsSVGImageFrame.h',
     'nsSVGIntegrationUtils.h',
-    'nsSVGUseFrame.h',
     'nsSVGUtils.h',
-    'SVGImageContext.h',
-    'SVGObserverUtils.h',
 ]
 
 EXPORTS.mozilla += [
     'SVGContextPaint.h',
+    'SVGForeignObjectFrame.h',
     'SVGGeometryFrame.h',
-    'SVGTextFrame.h'
+    'SVGImageContext.h',
+    'SVGImageFrame.h',
+    'SVGObserverUtils.h',
+    'SVGTextFrame.h',
+    'SVGUseFrame.h'
 ]
 
 UNIFIED_SOURCES += [
@@ -43,11 +43,9 @@ UNIFIED_SOURCES += [
     'nsSVGContainerFrame.cpp',
     'nsSVGFilterFrame.cpp',
     'nsSVGFilterInstance.cpp',
-    'nsSVGForeignObjectFrame.cpp',
     'nsSVGGenericContainerFrame.cpp',
     'nsSVGGFrame.cpp',
     'nsSVGGradientFrame.cpp',
-    'nsSVGImageFrame.cpp',
     'nsSVGInnerSVGFrame.cpp',
     'nsSVGIntegrationUtils.cpp',
     'nsSVGMarkerFrame.cpp',
@@ -57,7 +55,6 @@ UNIFIED_SOURCES += [
     'nsSVGStopFrame.cpp',
     'nsSVGSwitchFrame.cpp',
     'nsSVGSymbolFrame.cpp',
-    'nsSVGUseFrame.cpp',
     'nsSVGUtils.cpp',
     'nsSVGViewportFrame.cpp',
     'SVGContextPaint.cpp',
@@ -65,10 +62,13 @@ UNIFIED_SOURCES += [
     'SVGFEImageFrame.cpp',
     'SVGFELeafFrame.cpp',
     'SVGFEUnstyledLeafFrame.cpp',
+    'SVGForeignObjectFrame.cpp',
     'SVGGeometryFrame.cpp',
     'SVGImageContext.cpp',
+    'SVGImageFrame.cpp',
     'SVGObserverUtils.cpp',
     'SVGTextFrame.cpp',
+    'SVGUseFrame.cpp',
     'SVGViewFrame.cpp',
 ]
 
diff --git a/layout/svg/nsSVGOuterSVGFrame.cpp b/layout/svg/nsSVGOuterSVGFrame.cpp
index 34582c3b95265..4c22c7768e149 100644
--- a/layout/svg/nsSVGOuterSVGFrame.cpp
+++ b/layout/svg/nsSVGOuterSVGFrame.cpp
@@ -10,16 +10,16 @@
 // Keep others in (case-insensitive) order:
 #include "gfxContext.h"
 #include "nsDisplayList.h"
-#include "mozilla/PresShell.h"
-#include "mozilla/dom/Document.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIObjectLoadingContent.h"
+#include "nsSubDocumentFrame.h"
 #include "nsSVGIntegrationUtils.h"
-#include "nsSVGForeignObjectFrame.h"
+#include "mozilla/PresShell.h"
+#include "mozilla/SVGForeignObjectFrame.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/SVGSVGElement.h"
 #include "mozilla/dom/SVGViewElement.h"
-#include "nsSubDocumentFrame.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -29,29 +29,28 @@ using namespace mozilla::image;
 //----------------------------------------------------------------------
 // Implementation helpers
 
-void nsSVGOuterSVGFrame::RegisterForeignObject(
-    nsSVGForeignObjectFrame* aFrame) {
+void nsSVGOuterSVGFrame::RegisterForeignObject(SVGForeignObjectFrame* aFrame) {
   NS_ASSERTION(aFrame, "Who on earth is calling us?!");
 
   if (!mForeignObjectHash) {
     mForeignObjectHash =
-        MakeUnique<nsTHashtable<nsPtrHashKey<nsSVGForeignObjectFrame>>>();
+        MakeUnique<nsTHashtable<nsPtrHashKey<SVGForeignObjectFrame>>>();
   }
 
   NS_ASSERTION(!mForeignObjectHash->GetEntry(aFrame),
-               "nsSVGForeignObjectFrame already registered!");
+               "SVGForeignObjectFrame already registered!");
 
   mForeignObjectHash->PutEntry(aFrame);
 
   NS_ASSERTION(mForeignObjectHash->GetEntry(aFrame),
-               "Failed to register nsSVGForeignObjectFrame!");
+               "Failed to register SVGForeignObjectFrame!");
 }
 
 void nsSVGOuterSVGFrame::UnregisterForeignObject(
-    nsSVGForeignObjectFrame* aFrame) {
+    SVGForeignObjectFrame* aFrame) {
   NS_ASSERTION(aFrame, "Who on earth is calling us?!");
   NS_ASSERTION(mForeignObjectHash && mForeignObjectHash->GetEntry(aFrame),
-               "nsSVGForeignObjectFrame not in registry!");
+               "SVGForeignObjectFrame not in registry!");
   return mForeignObjectHash->RemoveEntry(aFrame);
 }
 
diff --git a/layout/svg/nsSVGOuterSVGFrame.h b/layout/svg/nsSVGOuterSVGFrame.h
index b4b3c7158803e..bfcd381e0a464 100644
--- a/layout/svg/nsSVGOuterSVGFrame.h
+++ b/layout/svg/nsSVGOuterSVGFrame.h
@@ -14,9 +14,9 @@
 #include "nsRegion.h"
 
 class gfxContext;
-class nsSVGForeignObjectFrame;
 
 namespace mozilla {
+class SVGForeignObjectFrame;
 class PresShell;
 }  // namespace mozilla
 
@@ -116,7 +116,7 @@ class nsSVGOuterSVGFrame final : public nsSVGDisplayContainerFrame,
   // nsSVGContainerFrame methods:
   virtual gfxMatrix GetCanvasTM() override;
 
-  /* Methods to allow descendant nsSVGForeignObjectFrame frames to register and
+  /* Methods to allow descendant SVGForeignObjectFrame frames to register and
    * unregister themselves with their nearest nsSVGOuterSVGFrame ancestor. This
    * is temporary until display list based invalidation is impleented for SVG.
    * Maintaining a list of our foreignObject descendants allows us to search
@@ -125,8 +125,8 @@ class nsSVGOuterSVGFrame final : public nsSVGDisplayContainerFrame,
    * does not slow down SVG in general (only foreignObjects, until bug 614732 is
    * fixed).
    */
-  void RegisterForeignObject(nsSVGForeignObjectFrame* aFrame);
-  void UnregisterForeignObject(nsSVGForeignObjectFrame* aFrame);
+  void RegisterForeignObject(mozilla::SVGForeignObjectFrame* aFrame);
+  void UnregisterForeignObject(mozilla::SVGForeignObjectFrame* aFrame);
 
   virtual bool HasChildrenOnlyTransform(Matrix* aTransform) const override {
     // Our anonymous wrapper child must claim our children-only transforms as
@@ -179,10 +179,10 @@ class nsSVGOuterSVGFrame final : public nsSVGDisplayContainerFrame,
 
   // This is temporary until display list based invalidation is implemented for
   // SVG.
-  // A hash-set containing our nsSVGForeignObjectFrame descendants. Note we use
+  // A hash-set containing our SVGForeignObjectFrame descendants. Note we use
   // a hash-set to avoid the O(N^2) behavior we'd get tearing down an SVG frame
   // subtree if we were to use a list (see bug 381285 comment 20).
-  mozilla::UniquePtr<nsTHashtable<nsPtrHashKey<nsSVGForeignObjectFrame>>>
+  mozilla::UniquePtr<nsTHashtable<nsPtrHashKey<mozilla::SVGForeignObjectFrame>>>
       mForeignObjectHash;
 
   nsRegion mInvalidRegion;
diff --git a/layout/svg/nsSVGUtils.cpp b/layout/svg/nsSVGUtils.cpp
index 26d20d1ec8a2e..19decb070b598 100644
--- a/layout/svg/nsSVGUtils.cpp
+++ b/layout/svg/nsSVGUtils.cpp
@@ -32,22 +32,22 @@
 #include "SVGAnimatedLength.h"
 #include "nsSVGClipPathFrame.h"
 #include "nsSVGContainerFrame.h"
-#include "SVGContentUtils.h"
 #include "nsSVGDisplayableFrame.h"
 #include "nsSVGFilterPaintCallback.h"
-#include "nsSVGForeignObjectFrame.h"
-#include "SVGGeometryFrame.h"
 #include "nsSVGInnerSVGFrame.h"
 #include "nsSVGIntegrationUtils.h"
 #include "nsSVGMaskFrame.h"
-#include "SVGObserverUtils.h"
 #include "nsSVGOuterSVGFrame.h"
 #include "nsSVGPaintServerFrame.h"
-#include "SVGTextFrame.h"
 #include "nsTextFrame.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/StaticPrefs_svg.h"
+#include "mozilla/SVGContentUtils.h"
 #include "mozilla/SVGContextPaint.h"
+#include "mozilla/SVGForeignObjectFrame.h"
+#include "mozilla/SVGGeometryFrame.h"
+#include "mozilla/SVGObserverUtils.h"
+#include "mozilla/SVGTextFrame.h"
 #include "mozilla/Unused.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/gfx/PatternHelpers.h"
@@ -352,7 +352,7 @@ gfxMatrix nsSVGUtils::GetCanvasTM(nsIFrame* aFrame) {
 
   LayoutFrameType type = aFrame->Type();
   if (type == LayoutFrameType::SVGForeignObject) {
-    return static_cast<nsSVGForeignObjectFrame*>(aFrame)->GetCanvasTM();
+    return static_cast<SVGForeignObjectFrame*>(aFrame)->GetCanvasTM();
   }
   if (type == LayoutFrameType::SVGOuterSVG) {
     return GetCSSPxToDevPxMatrix(aFrame);
diff --git a/layout/svg/nsSVGUtils.h b/layout/svg/nsSVGUtils.h
index 962254ca38321..d8396dc09e4c8 100644
--- a/layout/svg/nsSVGUtils.h
+++ b/layout/svg/nsSVGUtils.h
@@ -199,8 +199,8 @@ class nsSVGUtils {
    * Another reason that we don't currently want to call
    * PresShell::FrameNeedsReflow is because passing eRestyle to it to get it to
    * mark descendants dirty would cause it to descend through
-   * nsSVGForeignObjectFrame frames to mark their children dirty, but we want to
-   * handle nsSVGForeignObjectFrame specially. It would also do unnecessary work
+   * SVGForeignObjectFrame frames to mark their children dirty, but we want to
+   * handle SVGForeignObjectFrame specially. It would also do unnecessary work
    * descending into NS_FRAME_IS_NONDISPLAY frames.
    */
   static void ScheduleReflowSVG(nsIFrame* aFrame);
diff --git a/layout/xul/nsImageBoxFrame.cpp b/layout/xul/nsImageBoxFrame.cpp
index 7600402f56bb4..c92fb1b0628f1 100644
--- a/layout/xul/nsImageBoxFrame.cpp
+++ b/layout/xul/nsImageBoxFrame.cpp
@@ -47,7 +47,7 @@
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/PresShell.h"
-#include "SVGImageContext.h"
+#include "mozilla/SVGImageContext.h"
 #include "Units.h"
 #include "mozilla/layers/RenderRootStateManager.h"
 #include "mozilla/layers/WebRenderLayerManager.h"
diff --git a/widget/cocoa/nsCocoaUtils.mm b/widget/cocoa/nsCocoaUtils.mm
index 77a246827cc8b..2b57cbf3bc00b 100644
--- a/widget/cocoa/nsCocoaUtils.mm
+++ b/widget/cocoa/nsCocoaUtils.mm
@@ -27,16 +27,16 @@
 #include "nsMenuUtilsX.h"
 #include "nsToolkit.h"
 #include "nsCRT.h"
-#include "SVGImageContext.h"
 #include "mozilla/ClearOnShutdown.h"
-#include "mozilla/dom/Promise.h"
-#include "mozilla/gfx/2D.h"
 #include "mozilla/Logging.h"
 #include "mozilla/MiscEvents.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/TextEvents.h"
 #include "mozilla/StaticMutex.h"
 #include "mozilla/StaticPrefs_media.h"
+#include "mozilla/SVGImageContext.h"
+#include "mozilla/dom/Promise.h"
+#include "mozilla/gfx/2D.h"
 
 using namespace mozilla;
 using namespace mozilla::widget;
diff --git a/widget/nsBaseDragService.cpp b/widget/nsBaseDragService.cpp
index 127e3ae0a1b87..9f09b2b49eb61 100644
--- a/widget/nsBaseDragService.cpp
+++ b/widget/nsBaseDragService.cpp
@@ -14,7 +14,6 @@
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIFrame.h"
 #include "nsFrameLoaderOwner.h"
-#include "mozilla/dom/Document.h"
 #include "nsIContent.h"
 #include "nsViewManager.h"
 #include "nsINode.h"
@@ -27,23 +26,24 @@
 #include "nsRegion.h"
 #include "nsXULPopupManager.h"
 #include "nsMenuPopupFrame.h"
-#include "SVGImageContext.h"
 #ifdef MOZ_XUL
 #  include "nsTreeBodyFrame.h"
 #endif
 #include "mozilla/MouseEvents.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/SVGImageContext.h"
+#include "mozilla/Unused.h"
+#include "mozilla/ViewportUtils.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/DataTransferItemList.h"
 #include "mozilla/dom/DataTransfer.h"
+#include "mozilla/dom/Document.h"
 #include "mozilla/dom/DocumentInlines.h"
 #include "mozilla/dom/DragEvent.h"
 #include "mozilla/dom/MouseEventBinding.h"
 #include "mozilla/dom/Selection.h"
 #include "mozilla/gfx/2D.h"
-#include "mozilla/Unused.h"
-#include "mozilla/ViewportUtils.h"
 #include "nsFrameLoader.h"
 #include "BrowserParent.h"
 #include "nsIMutableArray.h"