diff --git a/mozilla/base/src/nsUnicharInputStream.cpp b/mozilla/base/src/nsUnicharInputStream.cpp
index dd0ee543b10..2efaffb3de3 100644
--- a/mozilla/base/src/nsUnicharInputStream.cpp
+++ b/mozilla/base/src/nsUnicharInputStream.cpp
@@ -125,6 +125,8 @@ NS_NewStringUnicharInputStream(nsIUnicharInputStream** aInstancePtrResult,
  * changing it right now into a module private visibility because there are
  * better and more xpcom-like ways to get a Converter.
  */
+
+nsresult NS_NewB2UConverter(nsIUnicodeDecoder** aInstancePtrResult, nsISupports* aOuter, nsString* aCharSet);
 nsresult
 NS_NewB2UConverter(nsIUnicodeDecoder** aInstancePtrResult,
                    nsISupports* aOuter,
diff --git a/mozilla/editor/base/nsContextLoader.cpp b/mozilla/editor/base/nsContextLoader.cpp
index ea958bf1510..ee686a05404 100644
--- a/mozilla/editor/base/nsContextLoader.cpp
+++ b/mozilla/editor/base/nsContextLoader.cpp
@@ -41,6 +41,7 @@ private:
 
 
 
+nsresult NS_MakeEditorLoader(nsIContextLoader **aResult);
 nsresult NS_MakeEditorLoader(nsIContextLoader **aResult)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
diff --git a/mozilla/layout/forms/nsTextControlFrame.cpp b/mozilla/layout/forms/nsTextControlFrame.cpp
index e60e7c75444..b677328492f 100644
--- a/mozilla/layout/forms/nsTextControlFrame.cpp
+++ b/mozilla/layout/forms/nsTextControlFrame.cpp
@@ -66,6 +66,7 @@ static NS_DEFINE_IID(kIDOMHTMLInputElementIID, NS_IDOMHTMLINPUTELEMENT_IID);
 static NS_DEFINE_IID(kLookAndFeelCID,  NS_LOOKANDFEEL_CID);
 static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID);
 
+nsresult NS_NewTextControlFrame(nsIFrame*& aResult);
 nsresult
 NS_NewTextControlFrame(nsIFrame*& aResult)
 {
diff --git a/mozilla/layout/html/forms/src/nsTextControlFrame.cpp b/mozilla/layout/html/forms/src/nsTextControlFrame.cpp
index e60e7c75444..b677328492f 100644
--- a/mozilla/layout/html/forms/src/nsTextControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsTextControlFrame.cpp
@@ -66,6 +66,7 @@ static NS_DEFINE_IID(kIDOMHTMLInputElementIID, NS_IDOMHTMLINPUTELEMENT_IID);
 static NS_DEFINE_IID(kLookAndFeelCID,  NS_LOOKANDFEEL_CID);
 static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID);
 
+nsresult NS_NewTextControlFrame(nsIFrame*& aResult);
 nsresult
 NS_NewTextControlFrame(nsIFrame*& aResult)
 {
diff --git a/mozilla/xpcom/io/nsUnicharInputStream.cpp b/mozilla/xpcom/io/nsUnicharInputStream.cpp
index dd0ee543b10..2efaffb3de3 100644
--- a/mozilla/xpcom/io/nsUnicharInputStream.cpp
+++ b/mozilla/xpcom/io/nsUnicharInputStream.cpp
@@ -125,6 +125,8 @@ NS_NewStringUnicharInputStream(nsIUnicharInputStream** aInstancePtrResult,
  * changing it right now into a module private visibility because there are
  * better and more xpcom-like ways to get a Converter.
  */
+
+nsresult NS_NewB2UConverter(nsIUnicodeDecoder** aInstancePtrResult, nsISupports* aOuter, nsString* aCharSet);
 nsresult
 NS_NewB2UConverter(nsIUnicodeDecoder** aInstancePtrResult,
                    nsISupports* aOuter,