diff --git a/mozilla/gfx/src/nsImageSystemServices.cpp b/mozilla/gfx/src/nsImageSystemServices.cpp
index c2d458e8fd1..205271238bb 100644
--- a/mozilla/gfx/src/nsImageSystemServices.cpp
+++ b/mozilla/gfx/src/nsImageSystemServices.cpp
@@ -58,6 +58,7 @@ ImageSystemServicesImpl::~ImageSystemServicesImpl()
 
 NS_IMPL_ISUPPORTS(ImageSystemServicesImpl, kISystemServicesIID)
 
+static
 void
 timer_callback (nsITimer *aTimer, void *aClosure)
 {
diff --git a/mozilla/htmlparser/src/nsHTMLTokens.cpp b/mozilla/htmlparser/src/nsHTMLTokens.cpp
index 8fd515327ae..25c419292fc 100644
--- a/mozilla/htmlparser/src/nsHTMLTokens.cpp
+++ b/mozilla/htmlparser/src/nsHTMLTokens.cpp
@@ -199,6 +199,7 @@ PRBool CStartToken::IsEmpty(void) {
   return mEmpty;
 }
 
+static
 nsString& GetIdentChars(void) {
   static nsString gIdentChars("-0123456789:ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz");
   return gIdentChars;
@@ -609,6 +610,7 @@ CCommentToken::CCommentToken(const nsString& aName) : CHTMLToken(aName) {
  *  @param   
  *  @return  
  */
+static
 nsresult ConsumeStrictComment(PRUnichar aChar, nsScanner& aScanner,nsString& aString) {
   static    nsAutoString gMinus("-");
   nsresult  result=NS_OK;
@@ -677,6 +679,7 @@ nsresult ConsumeStrictComment(PRUnichar aChar, nsScanner& aScanner,nsString& aSt
  *  @param   
  *  @return  
  */
+static
 nsresult ConsumeComment(PRUnichar aChar, nsScanner& aScanner,nsString& aString) {
   static    nsAutoString gEdibles("!-");
   static    nsAutoString gMinus("-");
@@ -991,6 +994,7 @@ nsresult ConsumeQuotedString(PRUnichar aChar,nsString& aString,nsScanner& aScann
  *  @param   aScanner -- controller of underlying input source
  *  @return  error result
  */
+static
 nsresult ConsumeAttributeValueText(PRUnichar,nsString& aString,nsScanner& aScanner){
   static nsAutoString terminals("\b\t\n\r >");
   nsresult result=aScanner.ReadUntil(aString,terminals,PR_FALSE,PR_FALSE);
diff --git a/mozilla/layout/forms/nsFieldSetFrame.cpp b/mozilla/layout/forms/nsFieldSetFrame.cpp
index 28d1ce169db..9d9ad11a8a0 100644
--- a/mozilla/layout/forms/nsFieldSetFrame.cpp
+++ b/mozilla/layout/forms/nsFieldSetFrame.cpp
@@ -229,6 +229,7 @@ nsFieldSetFrame::Paint(nsIPresContext& aPresContext,
 
 // XXX a hack until the reflow state does this correctly
 // XXX when it gets fixed, leave in the printf statements or add an assertion
+static
 void FieldSetHack(nsHTMLReflowState& aReflowState, char* aMessage, PRBool aUseMax)
 {
   if (aReflowState.computedWidth == 0) {
diff --git a/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp b/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp
index 28d1ce169db..9d9ad11a8a0 100644
--- a/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp
@@ -229,6 +229,7 @@ nsFieldSetFrame::Paint(nsIPresContext& aPresContext,
 
 // XXX a hack until the reflow state does this correctly
 // XXX when it gets fixed, leave in the printf statements or add an assertion
+static
 void FieldSetHack(nsHTMLReflowState& aReflowState, char* aMessage, PRBool aUseMax)
 {
   if (aReflowState.computedWidth == 0) {
diff --git a/mozilla/layout/html/forms/src/nsLabelFrame.cpp b/mozilla/layout/html/forms/src/nsLabelFrame.cpp
index 8fe3f5cdffa..3ed1430bd79 100644
--- a/mozilla/layout/html/forms/src/nsLabelFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsLabelFrame.cpp
@@ -385,6 +385,7 @@ nsLabelFrame::Paint(nsIPresContext& aPresContext,
 
 // XXX a hack until the reflow state does this correctly
 // XXX when it gets fixed, leave in the printf statements or add an assertion
+static
 void LabelHack(nsHTMLReflowState& aReflowState, char* aMessage)
 {
   if (aReflowState.computedWidth == 0) {
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
index 8fd515327ae..25c419292fc 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
@@ -199,6 +199,7 @@ PRBool CStartToken::IsEmpty(void) {
   return mEmpty;
 }
 
+static
 nsString& GetIdentChars(void) {
   static nsString gIdentChars("-0123456789:ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz");
   return gIdentChars;
@@ -609,6 +610,7 @@ CCommentToken::CCommentToken(const nsString& aName) : CHTMLToken(aName) {
  *  @param   
  *  @return  
  */
+static
 nsresult ConsumeStrictComment(PRUnichar aChar, nsScanner& aScanner,nsString& aString) {
   static    nsAutoString gMinus("-");
   nsresult  result=NS_OK;
@@ -677,6 +679,7 @@ nsresult ConsumeStrictComment(PRUnichar aChar, nsScanner& aScanner,nsString& aSt
  *  @param   
  *  @return  
  */
+static
 nsresult ConsumeComment(PRUnichar aChar, nsScanner& aScanner,nsString& aString) {
   static    nsAutoString gEdibles("!-");
   static    nsAutoString gMinus("-");
@@ -991,6 +994,7 @@ nsresult ConsumeQuotedString(PRUnichar aChar,nsString& aString,nsScanner& aScann
  *  @param   aScanner -- controller of underlying input source
  *  @return  error result
  */
+static
 nsresult ConsumeAttributeValueText(PRUnichar,nsString& aString,nsScanner& aScanner){
   static nsAutoString terminals("\b\t\n\r >");
   nsresult result=aScanner.ReadUntil(aString,terminals,PR_FALSE,PR_FALSE);