diff --git a/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.cpp
index 3bbef3e395d..2b6a8cb8ebb 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.cpp
@@ -37,8 +37,6 @@
 #include "nsIFontMetrics.h"
 #include "nsStyleUtil.h"
 
-#include "nsMathMLAtoms.h"
-#include "nsMathMLParts.h"
 #include "nsMathMLmfencedFrame.h"
 
 //
diff --git a/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.cpp
index cd87a091bf0..fa47e9425d7 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.cpp
@@ -37,8 +37,6 @@
 #include "nsIFontMetrics.h"
 #include "nsStyleUtil.h"
 
-#include "nsMathMLAtoms.h"
-#include "nsMathMLParts.h"
 #include "nsMathMLmfracFrame.h"
 
 //
@@ -125,15 +123,16 @@ nsMathMLmfracFrame::Paint(nsIPresContext&      aPresContext,
                           nsFramePaintLayer    aWhichLayer)
 {
   nsresult rv = NS_OK;
-
-  if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) {
-    return rv;
-  }
   
   /////////////
   // paint the numerator and denominator
   rv = nsMathMLContainerFrame::Paint(aPresContext, aRenderingContext, 
                                      aDirtyRect, aWhichLayer);
+
+  if (NS_FRAME_PAINT_LAYER_FOREGROUND != aWhichLayer) {
+    return rv;
+  }
+
   ////////////
   // paint the fraction line
   if (NS_SUCCEEDED(rv) && 0 < mLineThickness) {
diff --git a/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.h b/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.h
index f81cfac3637..db35b74f9ca 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.h
+++ b/mozilla/layout/mathml/base/src/nsMathMLmfracFrame.h
@@ -68,13 +68,7 @@ element. (See Section 3.3.4.)
 
 /*
 TODO:
--  Take care of displaystyle=true|false and inheritered <mstyle> 
-   Before reflow, <mfrac> should change the font-size of the children with scriptlevel<=2
-   How to do it? From the DOM interface?
-   From direct CSS manipulation? In nsCSSStyleRule, there is
-   nsCSSFont*  ourFont;
-    if (NS_OK == aDeclaration->GetData(kCSSFontSID, (nsCSSStruct**)&ourFont)) 
-
+Units...
 - CalcLength(..) in nsCSSStyleRule.cpp is where CSS units are implemented. 
 How to use that for linethickness and, in general, how to factor the use
 of units in the MathML world?
diff --git a/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.cpp
index f1d486ef2a8..21be9efbc50 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLmoverFrame.cpp
@@ -37,8 +37,6 @@
 #include "nsIFontMetrics.h"
 #include "nsStyleUtil.h"
 
-#include "nsMathMLAtoms.h"
-#include "nsMathMLParts.h"
 #include "nsMathMLmoverFrame.h"
 
 //
diff --git a/mozilla/layout/mathml/base/src/nsMathMLmpaddedFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmpaddedFrame.cpp
index 26e02dc4f30..b33edc995a7 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLmpaddedFrame.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLmpaddedFrame.cpp
@@ -37,8 +37,6 @@
 #include "nsIFontMetrics.h"
 #include "nsStyleUtil.h"
 
-#include "nsMathMLAtoms.h"
-#include "nsMathMLParts.h"
 #include "nsMathMLmpaddedFrame.h"
 
 //
diff --git a/mozilla/layout/mathml/base/src/nsMathMLmphantomFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmphantomFrame.cpp
index 85f9d9ef80b..7443bb0c6ec 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLmphantomFrame.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLmphantomFrame.cpp
@@ -37,8 +37,6 @@
 #include "nsIFontMetrics.h"
 #include "nsStyleUtil.h"
 
-#include "nsMathMLAtoms.h"
-#include "nsMathMLParts.h"
 #include "nsMathMLmphantomFrame.h"
 
 //
diff --git a/mozilla/layout/mathml/base/src/nsMathMLmrootFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmrootFrame.cpp
index baa8d4a88e3..9332f61a05c 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLmrootFrame.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLmrootFrame.cpp
@@ -37,8 +37,6 @@
 #include "nsIFontMetrics.h"
 #include "nsStyleUtil.h"
 
-#include "nsMathMLAtoms.h"
-#include "nsMathMLParts.h"
 #include "nsMathMLmrootFrame.h"
 
 //
diff --git a/mozilla/layout/mathml/base/src/nsMathMLmrowFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmrowFrame.cpp
index 5f2c4d47533..d21985f9fa1 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLmrowFrame.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLmrowFrame.cpp
@@ -37,8 +37,6 @@
 #include "nsIFontMetrics.h"
 #include "nsStyleUtil.h"
 
-#include "nsMathMLAtoms.h"
-#include "nsMathMLParts.h"
 #include "nsMathMLmrowFrame.h"
 
 //
diff --git a/mozilla/layout/mathml/base/src/nsMathMLmstyleFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmstyleFrame.cpp
index f6e04b6a3ba..f369dcc121e 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLmstyleFrame.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLmstyleFrame.cpp
@@ -37,8 +37,6 @@
 #include "nsIFontMetrics.h"
 #include "nsStyleUtil.h"
 
-#include "nsMathMLAtoms.h"
-#include "nsMathMLParts.h"
 #include "nsMathMLmstyleFrame.h"
 
 //
diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.cpp
index de1c124e0fc..b9fb0181571 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.cpp
@@ -37,8 +37,6 @@
 #include "nsIFontMetrics.h"
 #include "nsStyleUtil.h"
 
-#include "nsMathMLAtoms.h"
-#include "nsMathMLParts.h"
 #include "nsMathMLmsubFrame.h"
 
 //
diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.cpp
index 2017fc69272..bf1382c4c31 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.cpp
@@ -37,8 +37,6 @@
 #include "nsIFontMetrics.h"
 #include "nsStyleUtil.h"
 
-#include "nsMathMLAtoms.h"
-#include "nsMathMLParts.h"
 #include "nsMathMLmsubsupFrame.h"
 
 //
diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsupFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmsupFrame.cpp
index 3003cb8fa5d..0c5b381a641 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLmsupFrame.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLmsupFrame.cpp
@@ -37,8 +37,6 @@
 #include "nsIFontMetrics.h"
 #include "nsStyleUtil.h"
 
-#include "nsMathMLAtoms.h"
-#include "nsMathMLParts.h"
 #include "nsMathMLmsupFrame.h"
 
 //