diff --git a/mozilla/htmlparser/src/nsDTDUtils.cpp b/mozilla/htmlparser/src/nsDTDUtils.cpp
index b918ec3d75f..1b7b0ebd8a8 100644
--- a/mozilla/htmlparser/src/nsDTDUtils.cpp
+++ b/mozilla/htmlparser/src/nsDTDUtils.cpp
@@ -461,7 +461,8 @@ void CTokenRecycler::RecycleToken(CToken* aToken) {
   if(aToken) {
     PRInt32 theType=aToken->GetTokenType();
     CTokenFinder finder(aToken);
-    CToken* theMatch=(CToken*)mTokenCache[theType-1]->FirstThat(finder);
+    CToken* theMatch;
+    theMatch=(CToken*)mTokenCache[theType-1]->FirstThat(finder);
     mTokenCache[theType-1]->Push(aToken);
   }
 }
@@ -669,7 +670,7 @@ void CObserverDictionary::UnregisterObservers() {
   nsObserverReleaser theReleaser;
   for(theIndex=0;theIndex<=NS_HTML_TAG_MAX;theIndex++){
     if(mObservers[theIndex]){
-      nsIElementObserver* theElementObserver=0;
+      //nsIElementObserver* theElementObserver=0;
       mObservers[theIndex]->ForEach(theReleaser);
       delete mObservers[theIndex];
     }
diff --git a/mozilla/parser/htmlparser/src/nsDTDUtils.cpp b/mozilla/parser/htmlparser/src/nsDTDUtils.cpp
index b918ec3d75f..1b7b0ebd8a8 100644
--- a/mozilla/parser/htmlparser/src/nsDTDUtils.cpp
+++ b/mozilla/parser/htmlparser/src/nsDTDUtils.cpp
@@ -461,7 +461,8 @@ void CTokenRecycler::RecycleToken(CToken* aToken) {
   if(aToken) {
     PRInt32 theType=aToken->GetTokenType();
     CTokenFinder finder(aToken);
-    CToken* theMatch=(CToken*)mTokenCache[theType-1]->FirstThat(finder);
+    CToken* theMatch;
+    theMatch=(CToken*)mTokenCache[theType-1]->FirstThat(finder);
     mTokenCache[theType-1]->Push(aToken);
   }
 }
@@ -669,7 +670,7 @@ void CObserverDictionary::UnregisterObservers() {
   nsObserverReleaser theReleaser;
   for(theIndex=0;theIndex<=NS_HTML_TAG_MAX;theIndex++){
     if(mObservers[theIndex]){
-      nsIElementObserver* theElementObserver=0;
+      //nsIElementObserver* theElementObserver=0;
       mObservers[theIndex]->ForEach(theReleaser);
       delete mObservers[theIndex];
     }