diff --git a/layout/svg/base/src/nsSVGOuterSVGFrame.cpp b/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
index 6e0e125b27c6..f436a3c4bd2b 100644
--- a/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
+++ b/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
@@ -40,8 +40,6 @@
 #include "nsIDOMSVGSVGElement.h"
 #include "nsSVGSVGElement.h"
 #include "nsSVGTextFrame.h"
-#include "nsIServiceManager.h"
-#include "nsIViewManager.h"
 #include "nsSVGRect.h"
 #include "nsDisplayList.h"
 #include "nsStubMutationObserver.h"
@@ -507,19 +505,8 @@ nsSVGOuterSVGFrame::GetType() const
 nsresult
 nsSVGOuterSVGFrame::InvalidateRect(nsRect aRect)
 {
-  // just ignore invalidates if painting is suppressed by the shell
-  PRBool suppressed = PR_FALSE;
-  GetPresContext()->PresShell()->IsPaintingSuppressed(&suppressed);
-  if (suppressed)
-    return NS_OK;
-  
-  nsIView* view = GetClosestView();
-  NS_ENSURE_TRUE(view, NS_ERROR_FAILURE);
-
-  nsIViewManager* vm = view->GetViewManager();
-
   aRect.ScaleRoundOut(GetPresContext()->AppUnitsPerDevPixel());
-  vm->UpdateView(view, aRect, NS_VMREFRESH_NO_SYNC);
+  Invalidate(aRect);
 
   return NS_OK;
 }
diff --git a/layout/svg/base/src/nsSVGPathGeometryFrame.cpp b/layout/svg/base/src/nsSVGPathGeometryFrame.cpp
index 6bbc2992c804..397ac5bf105d 100644
--- a/layout/svg/base/src/nsSVGPathGeometryFrame.cpp
+++ b/layout/svg/base/src/nsSVGPathGeometryFrame.cpp
@@ -37,25 +37,13 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsSVGPathGeometryFrame.h"
-#include "nsIDOMSVGDocument.h"
-#include "nsIDOMElement.h"
-#include "nsIDocument.h"
-#include "nsISVGValueUtils.h"
 #include "nsSVGContainerFrame.h"
 #include "nsReadableUtils.h"
 #include "nsUnicharUtils.h"
 #include "nsGkAtoms.h"
-#include "nsCRT.h"
-#include "prdtoa.h"
 #include "nsSVGMarkerFrame.h"
-#include "nsIViewManager.h"
 #include "nsSVGMatrix.h"
-#include "nsSVGClipPathFrame.h"
-#include "nsIViewManager.h"
 #include "nsSVGUtils.h"
-#include "nsSVGFilterFrame.h"
-#include "nsSVGMaskFrame.h"
-#include "nsINameSpaceManager.h"
 #include "nsSVGGraphicElement.h"
 #include "nsSVGOuterSVGFrame.h"
 #include "nsSVGRect.h"