diff --git a/mozilla/layout/generic/nsHTMLParts.h b/mozilla/layout/generic/nsHTMLParts.h
index 451018cf816..3dca074b5d0 100644
--- a/mozilla/layout/generic/nsHTMLParts.h
+++ b/mozilla/layout/generic/nsHTMLParts.h
@@ -324,7 +324,8 @@ extern nsresult NS_NewFieldSetFrame(nsIFrame** aResult);
 extern nsresult NS_NewFileControlFrame(nsIFrame** aResult);
 extern nsresult NS_NewLabelFrame(nsIFrame** aResult);
 extern nsresult NS_NewLegendFrame(nsIFrame** aResult);
-extern nsresult NS_NewTextControlFrame(nsIFrame** aResult);
+extern nsresult NS_NewNativeTextControlFrame(nsIFrame** aNewFrame);
+extern nsresult NS_NewGfxTextControlFrame(nsIFrame** aNewFrame);
 extern nsresult NS_NewRadioControlFrame(nsIFrame** aResult);
 extern nsresult NS_NewSelectControlFrame(nsIFrame** aResult);
 extern nsresult NS_NewListControlFrame(nsIFrame** aResult);
diff --git a/mozilla/layout/html/base/src/Makefile.in b/mozilla/layout/html/base/src/Makefile.in
index 45a23501cdf..757dfcceac2 100644
--- a/mozilla/layout/html/base/src/Makefile.in
+++ b/mozilla/layout/html/base/src/Makefile.in
@@ -91,3 +91,4 @@ include $(topsrcdir)/config/rules.mk
 
 install::
 	$(INSTALL) $(srcdir)/broken-image.gif $(DIST)/bin/res/html
+  $(INSTALL) $(srcdir)/empty_doc.html $(DIST)/bin/res/html
diff --git a/mozilla/layout/html/base/src/makefile.win b/mozilla/layout/html/base/src/makefile.win
index 425d42e81bf..dbb9c8ed995 100644
--- a/mozilla/layout/html/base/src/makefile.win
+++ b/mozilla/layout/html/base/src/makefile.win
@@ -129,6 +129,7 @@ libs:: $(LIBRARY)
 
 install::
 	$(MAKE_INSTALL) broken-image.gif $(DIST)\bin\res\html
+  $(MAKE_INSTALL) empty_doc.html $(DIST)\bin\res\html
 
 clobber::
 	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
diff --git a/mozilla/layout/html/base/src/nsHTMLParts.h b/mozilla/layout/html/base/src/nsHTMLParts.h
index 451018cf816..3dca074b5d0 100644
--- a/mozilla/layout/html/base/src/nsHTMLParts.h
+++ b/mozilla/layout/html/base/src/nsHTMLParts.h
@@ -324,7 +324,8 @@ extern nsresult NS_NewFieldSetFrame(nsIFrame** aResult);
 extern nsresult NS_NewFileControlFrame(nsIFrame** aResult);
 extern nsresult NS_NewLabelFrame(nsIFrame** aResult);
 extern nsresult NS_NewLegendFrame(nsIFrame** aResult);
-extern nsresult NS_NewTextControlFrame(nsIFrame** aResult);
+extern nsresult NS_NewNativeTextControlFrame(nsIFrame** aNewFrame);
+extern nsresult NS_NewGfxTextControlFrame(nsIFrame** aNewFrame);
 extern nsresult NS_NewRadioControlFrame(nsIFrame** aResult);
 extern nsresult NS_NewSelectControlFrame(nsIFrame** aResult);
 extern nsresult NS_NewListControlFrame(nsIFrame** aResult);