diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index e9b50716cec1..04f9b05dd46b 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -986,7 +986,7 @@ nsDocument::ResetStylesheetsToURI(nsIURI* aURI)
 {
   NS_PRECONDITION(aURI, "Null URI passed to ResetStylesheetsToURI");
 
-  mozAutoDocUpdate(this, UPDATE_STYLE, PR_TRUE);
+  mozAutoDocUpdate upd(this, UPDATE_STYLE, PR_TRUE);
   
   // The stylesheets should forget us
   PRInt32 indx = mStyleSheets.Count();
diff --git a/content/base/src/nsImageLoadingContent.cpp b/content/base/src/nsImageLoadingContent.cpp
index 91d2ff29d1ab..b5e38bfa34ce 100644
--- a/content/base/src/nsImageLoadingContent.cpp
+++ b/content/base/src/nsImageLoadingContent.cpp
@@ -596,7 +596,7 @@ nsImageLoadingContent::UpdateImageState(PRBool aNotify)
       NS_ASSERTION(thisContent->IsInDoc(), "Something is confused");
       PRInt32 changedBits = oldState ^ ImageState();
       if (changedBits) {
-        mozAutoDocUpdate(doc, UPDATE_CONTENT_STATE, PR_TRUE);
+        mozAutoDocUpdate upd(doc, UPDATE_CONTENT_STATE, PR_TRUE);
         doc->ContentStatesChanged(thisContent, nsnull, changedBits);
       }
     }
diff --git a/content/base/src/nsObjectLoadingContent.cpp b/content/base/src/nsObjectLoadingContent.cpp
index bf8db4fdfa19..ed9fcf419957 100644
--- a/content/base/src/nsObjectLoadingContent.cpp
+++ b/content/base/src/nsObjectLoadingContent.cpp
@@ -979,7 +979,7 @@ nsObjectLoadingContent::NotifyStateChanged(ObjectType aOldType,
     PRInt32 changedBits = aOldState ^ newState;
 
     {
-      mozAutoDocUpdate(doc, UPDATE_CONTENT_STATE, PR_TRUE);
+      mozAutoDocUpdate upd(doc, UPDATE_CONTENT_STATE, PR_TRUE);
       doc->ContentStatesChanged(thisContent, nsnull, changedBits);
     }
     if (aSync) {
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index a5954f8d421d..c4879cf0311c 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -3246,7 +3246,7 @@ nsGenericHTMLFormElement::AfterSetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
     if (aNotify && aName == nsHTMLAtoms::disabled && CanBeDisabled()) {
       nsIDocument* document = GetCurrentDoc();
       if (document) {
-        mozAutoDocUpdate(document, UPDATE_CONTENT_STATE, PR_TRUE);
+        mozAutoDocUpdate upd(document, UPDATE_CONTENT_STATE, PR_TRUE);
         document->ContentStatesChanged(this, nsnull, NS_EVENT_STATE_DISABLED |
                                        NS_EVENT_STATE_ENABLED);
       }
diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp
index 47e0db9560bd..ac5c06243491 100644
--- a/content/html/content/src/nsHTMLInputElement.cpp
+++ b/content/html/content/src/nsHTMLInputElement.cpp
@@ -997,7 +997,7 @@ nsHTMLInputElement::SetCheckedInternal(PRBool aChecked, PRBool aNotify)
   if (aNotify) {
     nsIDocument* document = GetCurrentDoc();
     if (document) {
-      mozAutoDocUpdate(document, UPDATE_CONTENT_STATE, aNotify);
+      mozAutoDocUpdate upd(document, UPDATE_CONTENT_STATE, aNotify);
       document->ContentStatesChanged(this, nsnull, NS_EVENT_STATE_CHECKED);
     }
   }
diff --git a/content/html/content/src/nsHTMLOptGroupElement.cpp b/content/html/content/src/nsHTMLOptGroupElement.cpp
index d0a52a0c2380..66ca2f5cf6f3 100644
--- a/content/html/content/src/nsHTMLOptGroupElement.cpp
+++ b/content/html/content/src/nsHTMLOptGroupElement.cpp
@@ -192,7 +192,7 @@ nsHTMLOptGroupElement::AfterSetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
       aName == nsHTMLAtoms::disabled) {
     nsIDocument* document = GetCurrentDoc();
     if (document) {
-      mozAutoDocUpdate(document, UPDATE_CONTENT_STATE, PR_TRUE);
+      mozAutoDocUpdate upd(document, UPDATE_CONTENT_STATE, PR_TRUE);
       document->ContentStatesChanged(this, nsnull, NS_EVENT_STATE_DISABLED |
                                      NS_EVENT_STATE_ENABLED);
     }
diff --git a/content/html/content/src/nsHTMLOptionElement.cpp b/content/html/content/src/nsHTMLOptionElement.cpp
index c4cc0db24167..97e80b329076 100644
--- a/content/html/content/src/nsHTMLOptionElement.cpp
+++ b/content/html/content/src/nsHTMLOptionElement.cpp
@@ -230,7 +230,7 @@ nsHTMLOptionElement::SetSelectedInternal(PRBool aValue, PRBool aNotify)
   if (aNotify) {
     nsIDocument* document = GetCurrentDoc();
     if (document) {
-      mozAutoDocUpdate(document, UPDATE_CONTENT_STATE, aNotify);
+      mozAutoDocUpdate upd(document, UPDATE_CONTENT_STATE, aNotify);
       document->ContentStatesChanged(this, nsnull, NS_EVENT_STATE_CHECKED);
     }
   }
@@ -502,7 +502,7 @@ nsHTMLOptionElement::AfterSetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
       aName == nsHTMLAtoms::disabled) {
     nsIDocument* document = GetCurrentDoc();
     if (document) {
-      mozAutoDocUpdate(document, UPDATE_CONTENT_STATE, PR_TRUE);
+      mozAutoDocUpdate upd(document, UPDATE_CONTENT_STATE, PR_TRUE);
       document->ContentStatesChanged(this, nsnull, NS_EVENT_STATE_DISABLED |
                                      NS_EVENT_STATE_ENABLED);
     }
diff --git a/content/xtf/src/nsXTFElementWrapper.cpp b/content/xtf/src/nsXTFElementWrapper.cpp
index ece24730de7e..9e915908e3a3 100644
--- a/content/xtf/src/nsXTFElementWrapper.cpp
+++ b/content/xtf/src/nsXTFElementWrapper.cpp
@@ -761,7 +761,7 @@ nsXTFElementWrapper::SetIntrinsicState(PRInt32 aNewState)
     return NS_OK;
 
   mIntrinsicState = aNewState;
-  mozAutoDocUpdate(doc, UPDATE_CONTENT_STATE, PR_TRUE);
+  mozAutoDocUpdate upd(doc, UPDATE_CONTENT_STATE, PR_TRUE);
   doc->ContentStatesChanged(this, nsnull, bits);
 
   return NS_OK;