diff --git a/mozilla/layout/forms/nsGfxRadioControlFrame.cpp b/mozilla/layout/forms/nsGfxRadioControlFrame.cpp
index e6436f38b90..4a0ccd007b3 100644
--- a/mozilla/layout/forms/nsGfxRadioControlFrame.cpp
+++ b/mozilla/layout/forms/nsGfxRadioControlFrame.cpp
@@ -86,7 +86,7 @@ nsGfxRadioControlFrame::ReResolveStyleContext(nsIPresContext* aPresContext,
 										  &mRadioButtonFaceStyle);
 
   if ((mRadioButtonFaceStyle && oldRadioButtonFaceStyle.get()) && (mRadioButtonFaceStyle != oldRadioButtonFaceStyle.get())) {
-    Inherited::CaptureStyleChangeFor(this, oldRadioButtonFaceStyle, mRadioButtonFaceStyle, 
+    nsRadioControlFrame::CaptureStyleChangeFor(this, oldRadioButtonFaceStyle, mRadioButtonFaceStyle, 
                               aParentChange, aChangeList, aLocalChange);
   }
 
diff --git a/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp
index e6436f38b90..4a0ccd007b3 100644
--- a/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsGfxRadioControlFrame.cpp
@@ -86,7 +86,7 @@ nsGfxRadioControlFrame::ReResolveStyleContext(nsIPresContext* aPresContext,
 										  &mRadioButtonFaceStyle);
 
   if ((mRadioButtonFaceStyle && oldRadioButtonFaceStyle.get()) && (mRadioButtonFaceStyle != oldRadioButtonFaceStyle.get())) {
-    Inherited::CaptureStyleChangeFor(this, oldRadioButtonFaceStyle, mRadioButtonFaceStyle, 
+    nsRadioControlFrame::CaptureStyleChangeFor(this, oldRadioButtonFaceStyle, mRadioButtonFaceStyle, 
                               aParentChange, aChangeList, aLocalChange);
   }
 
diff --git a/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp b/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp
index 291213013e1..482a5797958 100644
--- a/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsGfxTextControlFrame.cpp
@@ -429,7 +429,7 @@ nsGfxTextControlFrame::AttributeChanged(nsIPresContext* aPresContext,
   // Allow the base class to handle common attributes supported
   // by all form elements... 
   else {
-    result = Inherited::AttributeChanged(aPresContext, aChild, aAttribute, aHint);
+    result =  nsFormControlFrame::AttributeChanged(aPresContext, aChild, aAttribute, aHint);
   }
 
 // DUMMY
diff --git a/mozilla/layout/html/forms/src/nsNativeFormControlFrame.cpp b/mozilla/layout/html/forms/src/nsNativeFormControlFrame.cpp
index 0f910939b6d..978b544aa65 100644
--- a/mozilla/layout/html/forms/src/nsNativeFormControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsNativeFormControlFrame.cpp
@@ -77,7 +77,7 @@ nsNativeFormControlFrame::Reflow(nsIPresContext&          aPresContext,
   }
 
 	if (! requiresWidget) {
-		return Inherited::Reflow(aPresContext, aDesiredSize, aReflowState, aStatus);
+		return nsFormControlFrame::Reflow(aPresContext, aDesiredSize, aReflowState, aStatus);
 	}
 
   // add ourself as an nsIFormControlFrame