diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
index 750f6ff5ed7..82f541f3cf9 100644
--- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp
+++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
@@ -2646,10 +2646,6 @@ HTMLContentSink::ProcessSTYLETag(const nsIParserNode& aNode)
 
 typedef PRBool (*nsStringEnumFunc)(const nsString& aSubString, void *aData);
 
-const PRUnichar kNullCh       = PRUnichar('\0');
-const PRUnichar kSingleQuote  = PRUnichar('\'');
-const PRUnichar kDoubleQuote  = PRUnichar('\"');
-const PRUnichar kComma        = PRUnichar(',');
 
 static PRBool EnumerateString(const nsString& aStringList, nsStringEnumFunc aFunc, void* aData)
 {
@@ -2670,7 +2666,7 @@ static PRBool EnumerateString(const nsString& aStringList, nsStringEnumFunc aFun
       start++;
     }
 
-    if ((kSingleQuote == *start) || (kDoubleQuote == *start)) { // quoted string
+    if ((kApostrophe == *start) || (kQuote == *start)) { // quoted string
       PRUnichar quote = *start++;
       quoted = PR_TRUE;
       end = start;
diff --git a/mozilla/content/xml/document/src/nsXMLContentSink.cpp b/mozilla/content/xml/document/src/nsXMLContentSink.cpp
index 0adf57cc608..e667d7e55c4 100644
--- a/mozilla/content/xml/document/src/nsXMLContentSink.cpp
+++ b/mozilla/content/xml/document/src/nsXMLContentSink.cpp
@@ -54,8 +54,6 @@ static char kNameSpaceSeparator[] = ":";
 static char kNameSpaceDef[] = "xmlns";
 static char kStyleSheetPI[] = "<?xml-stylesheet";
 static char kCSSType[] = "text/css";
-static char kQuote = '\"';
-static char kApostrophe = '\'';
 
 #ifdef XSL
 static char kXSLType[] = "text/xsl";
diff --git a/mozilla/editor/txmgr/src/nsTransactionStack.cpp b/mozilla/editor/txmgr/src/nsTransactionStack.cpp
index 14281151189..8edff641ac1 100644
--- a/mozilla/editor/txmgr/src/nsTransactionStack.cpp
+++ b/mozilla/editor/txmgr/src/nsTransactionStack.cpp
@@ -52,7 +52,7 @@ nsTransactionStack::Pop(nsTransactionItem **aTransaction)
   /* nsDeque is a FIFO, so the top of our stack is actually
    * the back of the deque.
    */
-  *aTransaction = (nsTransactionItem *)mQue.PopBack();
+  *aTransaction = (nsTransactionItem *)mQue.Pop();
 
   return NS_OK;
 }
diff --git a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp
index 750f6ff5ed7..82f541f3cf9 100644
--- a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp
+++ b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp
@@ -2646,10 +2646,6 @@ HTMLContentSink::ProcessSTYLETag(const nsIParserNode& aNode)
 
 typedef PRBool (*nsStringEnumFunc)(const nsString& aSubString, void *aData);
 
-const PRUnichar kNullCh       = PRUnichar('\0');
-const PRUnichar kSingleQuote  = PRUnichar('\'');
-const PRUnichar kDoubleQuote  = PRUnichar('\"');
-const PRUnichar kComma        = PRUnichar(',');
 
 static PRBool EnumerateString(const nsString& aStringList, nsStringEnumFunc aFunc, void* aData)
 {
@@ -2670,7 +2666,7 @@ static PRBool EnumerateString(const nsString& aStringList, nsStringEnumFunc aFun
       start++;
     }
 
-    if ((kSingleQuote == *start) || (kDoubleQuote == *start)) { // quoted string
+    if ((kApostrophe == *start) || (kQuote == *start)) { // quoted string
       PRUnichar quote = *start++;
       quoted = PR_TRUE;
       end = start;
diff --git a/mozilla/layout/xml/document/src/nsXMLContentSink.cpp b/mozilla/layout/xml/document/src/nsXMLContentSink.cpp
index 0adf57cc608..e667d7e55c4 100644
--- a/mozilla/layout/xml/document/src/nsXMLContentSink.cpp
+++ b/mozilla/layout/xml/document/src/nsXMLContentSink.cpp
@@ -54,8 +54,6 @@ static char kNameSpaceSeparator[] = ":";
 static char kNameSpaceDef[] = "xmlns";
 static char kStyleSheetPI[] = "<?xml-stylesheet";
 static char kCSSType[] = "text/css";
-static char kQuote = '\"';
-static char kApostrophe = '\'';
 
 #ifdef XSL
 static char kXSLType[] = "text/xsl";