diff --git a/mozilla/accessible/src/atk/nsAccessibleWrap.cpp b/mozilla/accessible/src/atk/nsAccessibleWrap.cpp
index b1f88a757b7..f64d40544ed 100644
--- a/mozilla/accessible/src/atk/nsAccessibleWrap.cpp
+++ b/mozilla/accessible/src/atk/nsAccessibleWrap.cpp
@@ -376,8 +376,8 @@ NS_IMETHODIMP nsAccessibleWrap::GetNativeInterface(void **aOutAccessible)
         GType type = GetMaiAtkType(CreateMaiInterfaces());
         NS_ENSURE_TRUE(type, NS_ERROR_FAILURE);
         mAtkObject =
-            NS_REINTERPRET_CAST(AtkObject *,
-                                g_object_new(type, NULL));
+            reinterpret_cast<AtkObject *>
+                            (g_object_new(type, NULL));
         NS_ENSURE_TRUE(mAtkObject, NS_ERROR_OUT_OF_MEMORY);
 
         atk_object_initialize(mAtkObject, this);
@@ -394,7 +394,7 @@ nsAccessibleWrap::GetAtkObject(void)
 {
     void *atkObj = nsnull;
     GetNativeInterface(&atkObj);
-    return NS_STATIC_CAST(AtkObject *, atkObj);
+    return static_cast<AtkObject *>(atkObj);
 }
 
 // Get AtkObject from nsIAccessible interface
@@ -690,7 +690,7 @@ initializeCB(AtkObject *aAtkObj, gpointer aData)
 
     /* initialize object */
     MAI_ATK_OBJECT(aAtkObj)->accWrap =
-        NS_STATIC_CAST(nsAccessibleWrap*, aData);
+        static_cast<nsAccessibleWrap*>(aData);
 
 #ifdef MAI_LOGGING
     ++sMaiAtkObjCreated;
@@ -782,7 +782,7 @@ getRoleCB(AtkObject *aAtkObj)
         atkRole = atkRoleMap[accRole]; // map to the actual value
         NS_ASSERTION(atkRoleMap[nsIAccessibleRole::ROLE_LAST_ENTRY] ==
                      kROLE_ATK_LAST_ENTRY, "ATK role map skewed");
-        aAtkObj->role = NS_STATIC_CAST(AtkRole, atkRole);
+        aAtkObj->role = static_cast<AtkRole>(atkRole);
     }
     return aAtkObj->role;
 }
@@ -967,7 +967,7 @@ getIndexInParentCB(AtkObject *aAtkObj)
 
     PRInt32 currentIndex = 0;
 
-    while (sibling != NS_STATIC_CAST(nsIAccessible*, accWrap)) {
+    while (sibling != static_cast<nsIAccessible*>(accWrap)) {
       NS_ASSERTION(sibling, "Never ran into the same child that we started from");
 
       if (!sibling) {
@@ -1060,7 +1060,7 @@ refRelationSetCB(AtkObject *aAtkObj)
                                };
 
     for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(relationType); i++) {
-        relation = atk_relation_set_get_relation_by_type(relation_set, NS_STATIC_CAST(AtkRelationType, relationType[i]));
+        relation = atk_relation_set_get_relation_by_type(relation_set, static_cast<AtkRelationType>(relationType[i]));
         if (relation) {
             atk_relation_set_remove(relation_set, relation);
         }
@@ -1070,7 +1070,7 @@ refRelationSetCB(AtkObject *aAtkObj)
         if (NS_SUCCEEDED(rv) && accRelated) {
             accessible_array[0] = nsAccessibleWrap::GetAtkObject(accRelated);
             relation = atk_relation_new(accessible_array, 1,
-                                        NS_STATIC_CAST(AtkRelationType, relationType[i]));
+                                        static_cast<AtkRelationType>(relationType[i]));
             atk_relation_set_add(relation_set, relation);
             g_object_unref(relation);
         }
@@ -1096,7 +1096,7 @@ nsAccessibleWrap *GetAccessibleWrap(AtkObject *aAtkObj)
     nsRefPtr<nsApplicationAccessibleWrap> appAccWrap =
         nsAccessNode::GetApplicationAccessible();
     nsAccessibleWrap* tmpAppAccWrap =
-        NS_STATIC_CAST(nsAccessibleWrap*, appAccWrap.get());
+        static_cast<nsAccessibleWrap*>(appAccWrap.get());
 
     if (tmpAppAccWrap != tmpAccWrap && !tmpAccWrap->IsValidObject())
         return nsnull;
@@ -1118,7 +1118,7 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent)
     rv = aEvent->GetEventType(&type);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    nsAccEvent *event = NS_REINTERPRET_CAST(nsAccEvent*, aEvent);
+    nsAccEvent *event = reinterpret_cast<nsAccEvent*>(aEvent);
     void *eventData = event->mEventData;
 
     AtkObject *atkObj = nsAccessibleWrap::GetAtkObject(accessible);
@@ -1215,7 +1215,7 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent)
         if (!eventData)
             break;
 
-        pAtkTableChange = NS_REINTERPRET_CAST(AtkTableChange *, eventData);
+        pAtkTableChange = reinterpret_cast<AtkTableChange *>(eventData);
 
         g_signal_emit_by_name(atkObj,
                               "row_inserted",
@@ -1231,7 +1231,7 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent)
         if (!eventData)
             break;
 
-        pAtkTableChange = NS_REINTERPRET_CAST(AtkTableChange *, eventData);
+        pAtkTableChange = reinterpret_cast<AtkTableChange *>(eventData);
 
         g_signal_emit_by_name(atkObj,
                               "row_deleted",
@@ -1252,7 +1252,7 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent)
         if (!eventData)
             break;
 
-        pAtkTableChange = NS_REINTERPRET_CAST(AtkTableChange *, eventData);
+        pAtkTableChange = reinterpret_cast<AtkTableChange *>(eventData);
 
         g_signal_emit_by_name(atkObj,
                               "column_inserted",
@@ -1268,7 +1268,7 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent)
         if (!eventData)
             break;
 
-        pAtkTableChange = NS_REINTERPRET_CAST(AtkTableChange *, eventData);
+        pAtkTableChange = reinterpret_cast<AtkTableChange *>(eventData);
 
         g_signal_emit_by_name(atkObj,
                               "column_deleted",
@@ -1321,7 +1321,7 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent)
       {
         MAI_LOG_DEBUG(("\n\nReceived: EVENT_WINDOW_ACTIVATED\n"));
         nsDocAccessibleWrap *accDocWrap =
-          NS_STATIC_CAST(nsDocAccessibleWrap *, accessible.get());
+          static_cast<nsDocAccessibleWrap *>(accessible.get());
         accDocWrap->mActivated = PR_TRUE;
         guint id = g_signal_lookup ("activate", MAI_TYPE_ATK_OBJECT);
         g_signal_emit(atkObj, id, 0);
@@ -1331,7 +1331,7 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent)
       {
         MAI_LOG_DEBUG(("\n\nReceived: EVENT_WINDOW_DEACTIVATED\n"));
         nsDocAccessibleWrap *accDocWrap =
-          NS_STATIC_CAST(nsDocAccessibleWrap *, accessible.get());
+          static_cast<nsDocAccessibleWrap *>(accessible.get());
         accDocWrap->mActivated = PR_FALSE;
         guint id = g_signal_lookup ("deactivate", MAI_TYPE_ATK_OBJECT);
         g_signal_emit(atkObj, id, 0);
@@ -1457,9 +1457,9 @@ nsAccessibleWrap::FireAtkPropChangedEvent(nsIAccessibleEvent *aEvent,
     AtkPropertyValues values = { NULL };
     nsAccessibleWrap *oldAccWrap = nsnull, *newAccWrap = nsnull;
 
-    nsAccEvent *event = NS_REINTERPRET_CAST(nsAccEvent*, aEvent);
+    nsAccEvent *event = reinterpret_cast<nsAccEvent*>(aEvent);
 
-    pAtkPropChange = NS_REINTERPRET_CAST(AtkPropertyChange *, event->mEventData);
+    pAtkPropChange = reinterpret_cast<AtkPropertyChange *>(event->mEventData);
     values.property_name = sAtkPropertyNameArray[pAtkPropChange->type];
 
     NS_ASSERTION(pAtkPropChange, "Event needs event data");
@@ -1474,12 +1474,12 @@ nsAccessibleWrap::FireAtkPropChangedEvent(nsIAccessibleEvent *aEvent,
     case PROP_TABLE_SUMMARY:
 
         if (pAtkPropChange->oldvalue)
-            oldAccWrap = NS_REINTERPRET_CAST(nsAccessibleWrap *,
-                                             pAtkPropChange->oldvalue);
+            oldAccWrap = reinterpret_cast<nsAccessibleWrap *>
+                                         (pAtkPropChange->oldvalue);
 
         if (pAtkPropChange->newvalue)
-            newAccWrap = NS_REINTERPRET_CAST(nsAccessibleWrap *,
-                                             pAtkPropChange->newvalue);
+            newAccWrap = reinterpret_cast<nsAccessibleWrap *>
+                                         (pAtkPropChange->newvalue);
 
         if (oldAccWrap && newAccWrap) {
             g_value_init(&values.old_value, G_TYPE_POINTER);
@@ -1497,8 +1497,8 @@ nsAccessibleWrap::FireAtkPropChangedEvent(nsIAccessibleEvent *aEvent,
     case PROP_TABLE_ROW_DESCRIPTION:
         g_value_init(&values.new_value, G_TYPE_INT);
         g_value_set_int(&values.new_value,
-                        *NS_REINTERPRET_CAST(gint *,
-                                             pAtkPropChange->newvalue));
+                        *reinterpret_cast<gint *>
+                                         (pAtkPropChange->newvalue));
         break;
 
         //Perhaps need more cases in the future
diff --git a/mozilla/accessible/src/atk/nsAppRootAccessible.cpp b/mozilla/accessible/src/atk/nsAppRootAccessible.cpp
index ba232b54f40..aa186647ad2 100644
--- a/mozilla/accessible/src/atk/nsAppRootAccessible.cpp
+++ b/mozilla/accessible/src/atk/nsAppRootAccessible.cpp
@@ -569,8 +569,8 @@ nsApplicationAccessibleWrap::GetNativeInterface(void **aOutAccessible)
 
     if (!mAtkObject) {
         mAtkObject =
-            NS_REINTERPRET_CAST(AtkObject *,
-                                g_object_new(MAI_TYPE_ATK_OBJECT, NULL));
+            reinterpret_cast<AtkObject *>
+                            (g_object_new(MAI_TYPE_ATK_OBJECT, NULL));
         NS_ENSURE_TRUE(mAtkObject, NS_ERROR_OUT_OF_MEMORY);
 
         atk_object_initialize(mAtkObject, this);
diff --git a/mozilla/accessible/src/atk/nsMaiHyperlink.cpp b/mozilla/accessible/src/atk/nsMaiHyperlink.cpp
index 459b9ae0f7e..a45f339191d 100644
--- a/mozilla/accessible/src/atk/nsMaiHyperlink.cpp
+++ b/mozilla/accessible/src/atk/nsMaiHyperlink.cpp
@@ -150,8 +150,8 @@ MaiHyperlink::GetAtkHyperlink(void)
         return nsnull;
 
     mMaiAtkHyperlink =
-        NS_REINTERPRET_CAST(AtkHyperlink *,
-                            g_object_new(mai_atk_hyperlink_get_type(), NULL));
+        reinterpret_cast<AtkHyperlink *>
+                        (g_object_new(mai_atk_hyperlink_get_type(), NULL));
     NS_ASSERTION(mMaiAtkHyperlink, "OUT OF MEMORY");
     NS_ENSURE_TRUE(mMaiAtkHyperlink, nsnull);
 
@@ -260,7 +260,7 @@ getEndIndexCB(AtkHyperlink *aLink)
     PRInt32 endIndex = -1;
     nsresult rv = accHyperlink->GetEndIndex(&endIndex);
 
-    return (NS_FAILED(rv)) ? -1 : NS_STATIC_CAST(gint, endIndex);
+    return (NS_FAILED(rv)) ? -1 : static_cast<gint>(endIndex);
 }
 
 gint
@@ -272,7 +272,7 @@ getStartIndexCB(AtkHyperlink *aLink)
     PRInt32 startIndex = -1;
     nsresult rv = accHyperlink->GetStartIndex(&startIndex);
 
-    return (NS_FAILED(rv)) ? -1 : NS_STATIC_CAST(gint, startIndex);
+    return (NS_FAILED(rv)) ? -1 : static_cast<gint>(startIndex);
 }
 
 gboolean
@@ -283,7 +283,7 @@ isValidCB(AtkHyperlink *aLink)
 
     PRBool isValid = PR_FALSE;
     nsresult rv = accHyperlink->IsValid(&isValid);
-    return (NS_FAILED(rv)) ? FALSE : NS_STATIC_CAST(gboolean, isValid);
+    return (NS_FAILED(rv)) ? FALSE : static_cast<gboolean>(isValid);
 }
 
 gint
@@ -294,7 +294,7 @@ getAnchorCountCB(AtkHyperlink *aLink)
 
     PRInt32 count = -1;
     nsresult rv = accHyperlink->GetAnchors(&count);
-    return (NS_FAILED(rv)) ? -1 : NS_STATIC_CAST(gint, count);
+    return (NS_FAILED(rv)) ? -1 : static_cast<gint>(count);
 }
 
 // Check if aHyperlink is a valid MaiHyperlink, and return the
diff --git a/mozilla/accessible/src/atk/nsMaiInterfaceAction.cpp b/mozilla/accessible/src/atk/nsMaiInterfaceAction.cpp
index 97e77ddd7df..219d6a8c30d 100644
--- a/mozilla/accessible/src/atk/nsMaiInterfaceAction.cpp
+++ b/mozilla/accessible/src/atk/nsMaiInterfaceAction.cpp
@@ -75,7 +75,7 @@ getActionCountCB(AtkAction *aAction)
 
     PRUint8 num = 0;
     nsresult rv = accWrap->GetNumActions(&num);
-    return (NS_FAILED(rv)) ? 0 : NS_STATIC_CAST(gint, num);
+    return (NS_FAILED(rv)) ? 0 : static_cast<gint>(num);
 }
 
 const gchar *
diff --git a/mozilla/accessible/src/atk/nsMaiInterfaceTable.cpp b/mozilla/accessible/src/atk/nsMaiInterfaceTable.cpp
index f6bfb33cb36..661eb7d9e2d 100644
--- a/mozilla/accessible/src/atk/nsMaiInterfaceTable.cpp
+++ b/mozilla/accessible/src/atk/nsMaiInterfaceTable.cpp
@@ -108,7 +108,7 @@ getIndexAtCB(AtkTable *aTable, gint aRow, gint aColumn)
     nsresult rv = accTable->GetIndexAt(aRow, aColumn, &index);
     NS_ENSURE_SUCCESS(rv, -1);
 
-    return NS_STATIC_CAST(gint, index);
+    return static_cast<gint>(index);
 }
 
 gint
@@ -127,7 +127,7 @@ getColumnAtIndexCB(AtkTable *aTable, gint aIndex)
     nsresult rv = accTable->GetColumnAtIndex(aIndex, &col);
     NS_ENSURE_SUCCESS(rv, -1);
 
-    return NS_STATIC_CAST(gint, col);
+    return static_cast<gint>(col);
 }
 
 gint
@@ -146,7 +146,7 @@ getRowAtIndexCB(AtkTable *aTable, gint aIndex)
     nsresult rv = accTable->GetRowAtIndex(aIndex, &row);
     NS_ENSURE_SUCCESS(rv, -1);
 
-    return NS_STATIC_CAST(gint, row);
+    return static_cast<gint>(row);
 }
 
 gint
@@ -165,7 +165,7 @@ getColumnCountCB(AtkTable *aTable)
     nsresult rv = accTable->GetColumns(&count);
     NS_ENSURE_SUCCESS(rv, -1);
 
-    return NS_STATIC_CAST(gint, count);
+    return static_cast<gint>(count);
 }
 
 gint
@@ -184,7 +184,7 @@ getRowCountCB(AtkTable *aTable)
     nsresult rv = accTable->GetRows(&count);
     NS_ENSURE_SUCCESS(rv, -1);
 
-    return NS_STATIC_CAST(gint, count);
+    return static_cast<gint>(count);
 }
 
 gint
@@ -204,7 +204,7 @@ getColumnExtentAtCB(AtkTable *aTable,
     nsresult rv = accTable->GetColumnExtentAt(aRow, aColumn, &extent);
     NS_ENSURE_SUCCESS(rv, -1);
 
-    return NS_STATIC_CAST(gint, extent);
+    return static_cast<gint>(extent);
 }
 
 gint
@@ -224,7 +224,7 @@ getRowExtentAtCB(AtkTable *aTable,
     nsresult rv = accTable->GetRowExtentAt(aRow, aColumn, &extent);
     NS_ENSURE_SUCCESS(rv, -1);
 
-    return NS_STATIC_CAST(gint, extent);
+    return static_cast<gint>(extent);
 }
 
 AtkObject*
@@ -375,7 +375,7 @@ getSelectedColumnsCB(AtkTable *aTable, gint **aSelected)
 
     //copy
     for (PRUint32 index = 0; index < size; ++index)
-        atkColumns[index] = NS_STATIC_CAST(gint, columns[index]);
+        atkColumns[index] = static_cast<gint>(columns[index]);
     nsMemory::Free(columns);
 
     *aSelected = atkColumns;
@@ -410,7 +410,7 @@ getSelectedRowsCB(AtkTable *aTable, gint **aSelected)
 
     //copy
     for (PRUint32 index = 0; index < size; ++index)
-        atkRows[index] = NS_STATIC_CAST(gint, rows[index]);
+        atkRows[index] = static_cast<gint>(rows[index]);
     nsMemory::Free(rows);
 
     *aSelected = atkRows;
@@ -431,7 +431,7 @@ isColumnSelectedCB(AtkTable *aTable, gint aColumn)
 
     PRBool outValue;
     nsresult rv = accTable->IsColumnSelected(aColumn, &outValue);
-    return NS_FAILED(rv) ? FALSE : NS_STATIC_CAST(gboolean, outValue);
+    return NS_FAILED(rv) ? FALSE : static_cast<gboolean>(outValue);
 }
 
 gboolean
@@ -448,7 +448,7 @@ isRowSelectedCB(AtkTable *aTable, gint aRow)
 
     PRBool outValue;
     nsresult rv = accTable->IsRowSelected(aRow, &outValue);
-    return NS_FAILED(rv) ? FALSE : NS_STATIC_CAST(gboolean, outValue);
+    return NS_FAILED(rv) ? FALSE : static_cast<gboolean>(outValue);
 }
 
 gboolean
@@ -465,5 +465,5 @@ isCellSelectedCB(AtkTable *aTable, gint aRow, gint aColumn)
 
     PRBool outValue;
     nsresult rv = accTable->IsCellSelected(aRow, aColumn, &outValue);
-    return NS_FAILED(rv) ? FALSE : NS_STATIC_CAST(gboolean, outValue);
+    return NS_FAILED(rv) ? FALSE : static_cast<gboolean>(outValue);
 }
diff --git a/mozilla/accessible/src/atk/nsMaiInterfaceText.cpp b/mozilla/accessible/src/atk/nsMaiInterfaceText.cpp
index a836163be1d..18b000965e8 100644
--- a/mozilla/accessible/src/atk/nsMaiInterfaceText.cpp
+++ b/mozilla/accessible/src/atk/nsMaiInterfaceText.cpp
@@ -79,7 +79,7 @@ void ConvertTexttoAsterisks(nsAccessibleWrap* accWrap, nsAString& aString)
     // convert each char to "*" when it's "password text" 
     PRUint32 accRole;
     accWrap->GetRole(&accRole);
-    if (NS_STATIC_CAST(AtkRole, accRole) == ATK_ROLE_PASSWORD_TEXT) {
+    if (static_cast<AtkRole>(accRole) == ATK_ROLE_PASSWORD_TEXT) {
         for (PRUint32 i = 0; i < aString.Length(); i++)
             aString.Replace(i, 1, NS_LITERAL_STRING("*"));
     }
@@ -187,11 +187,11 @@ getCharacterAtOffsetCB(AtkText *aText, gint aOffset)
     // convert char to "*" when it's "password text" 
     PRUint32 accRole;
     accWrap->GetRole(&accRole);
-    if (NS_STATIC_CAST(AtkRole, accRole) == ATK_ROLE_PASSWORD_TEXT) {
+    if (static_cast<AtkRole>(accRole) == ATK_ROLE_PASSWORD_TEXT) {
         uniChar = '*';
     }
 
-    return (NS_FAILED(rv)) ? 0 : NS_STATIC_CAST(gunichar, uniChar);
+    return (NS_FAILED(rv)) ? 0 : static_cast<gunichar>(uniChar);
 }
 
 gchar *
@@ -237,7 +237,7 @@ getCaretOffsetCB(AtkText *aText)
 
     PRInt32 offset;
     nsresult rv = accText->GetCaretOffset(&offset);
-    return (NS_FAILED(rv)) ? 0 : NS_STATIC_CAST(gint, offset);
+    return (NS_FAILED(rv)) ? 0 : static_cast<gint>(offset);
 }
 
 AtkAttributeSet *
@@ -358,7 +358,7 @@ getCharacterCountCB(AtkText *aText)
 
     PRInt32 count = 0;
     nsresult rv = accText->GetCharacterCount(&count);
-    return (NS_FAILED(rv)) ? 0 : NS_STATIC_CAST(gint, count);
+    return (NS_FAILED(rv)) ? 0 : static_cast<gint>(count);
 }
 
 gint
@@ -383,7 +383,7 @@ getOffsetAtPointCB(AtkText *aText,
         geckoCoordType = nsIAccessibleCoordinateType::COORDTYPE_WINDOW_RELATIVE;
 
     accText->GetOffsetAtPoint(aX, aY, geckoCoordType, &offset);
-    return NS_STATIC_CAST(gint, offset);
+    return static_cast<gint>(offset);
 }
 
 gint
diff --git a/mozilla/accessible/src/base/nsAccessNode.cpp b/mozilla/accessible/src/base/nsAccessNode.cpp
index b73c378d77e..bd58451e32c 100755
--- a/mozilla/accessible/src/base/nsAccessNode.cpp
+++ b/mozilla/accessible/src/base/nsAccessNode.cpp
@@ -198,7 +198,7 @@ NS_IMETHODIMP nsAccessNode::Shutdown()
 
 NS_IMETHODIMP nsAccessNode::GetUniqueID(void **aUniqueID)
 {
-  *aUniqueID = NS_STATIC_CAST(void*, mDOMNode);
+  *aUniqueID = static_cast<void*>(mDOMNode);
   return NS_OK;
 }
 
@@ -659,7 +659,7 @@ nsAccessNode::GetDocAccessibleFor(nsIWeakReference *aPresShell)
 {
   nsIAccessibleDocument *docAccessible = nsnull;
   nsCOMPtr<nsIAccessNode> accessNode;
-  gGlobalDocAccessibleCache.Get(NS_STATIC_CAST(void*, aPresShell), getter_AddRefs(accessNode));
+  gGlobalDocAccessibleCache.Get(static_cast<void*>(aPresShell), getter_AddRefs(accessNode));
   if (accessNode) {
     CallQueryInterface(accessNode, &docAccessible);
   }
diff --git a/mozilla/accessible/src/base/nsAccessibilityService.cpp b/mozilla/accessible/src/base/nsAccessibilityService.cpp
index 7c40189cefb..56c02b42e2a 100644
--- a/mozilla/accessible/src/base/nsAccessibilityService.cpp
+++ b/mozilla/accessible/src/base/nsAccessibilityService.cpp
@@ -125,7 +125,7 @@ nsAccessibilityService::nsAccessibilityService()
   observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_FALSE);
   nsCOMPtr<nsIWebProgress> progress(do_GetService(NS_DOCUMENTLOADER_SERVICE_CONTRACTID));
   if (progress) {
-    progress->AddProgressListener(NS_STATIC_CAST(nsIWebProgressListener*,this),
+    progress->AddProgressListener(static_cast<nsIWebProgressListener*>(this),
                                   nsIWebProgress::NOTIFY_STATE_DOCUMENT |
                                   nsIWebProgress::NOTIFY_LOCATION);
   }
@@ -155,7 +155,7 @@ nsAccessibilityService::Observe(nsISupports *aSubject, const char *aTopic,
     }
     nsCOMPtr<nsIWebProgress> progress(do_GetService(NS_DOCUMENTLOADER_SERVICE_CONTRACTID));
     if (progress) {
-      progress->RemoveProgressListener(NS_STATIC_CAST(nsIWebProgressListener*,this));
+      progress->RemoveProgressListener(static_cast<nsIWebProgressListener*>(this));
     }
     nsAccessNodeWrap::ShutdownAccessibility();
   }
@@ -279,7 +279,7 @@ nsresult
 nsAccessibilityService::GetInfo(nsISupports* aFrame, nsIFrame** aRealFrame, nsIWeakReference** aShell, nsIDOMNode** aNode)
 {
   NS_ASSERTION(aFrame,"Error -- 1st argument (aFrame) is null!!");
-  *aRealFrame = NS_STATIC_CAST(nsIFrame*, aFrame);
+  *aRealFrame = static_cast<nsIFrame*>(aFrame);
   nsCOMPtr<nsIContent> content = (*aRealFrame)->GetContent();
   nsCOMPtr<nsIDOMNode> node(do_QueryInterface(content));
   if (!content || !node)
@@ -651,7 +651,7 @@ nsAccessibilityService::CreateHTMLObjectFrameAccessible(nsObjectFrame *aFrame,
   nsCOMPtr<nsIDOMNode> node;
   nsCOMPtr<nsIWeakReference> weakShell;
   nsIFrame *frame;
-  GetInfo(NS_STATIC_CAST(nsIFrame*, aFrame), &frame, getter_AddRefs(weakShell), getter_AddRefs(node));
+  GetInfo(static_cast<nsIFrame*>(aFrame), &frame, getter_AddRefs(weakShell), getter_AddRefs(node));
 
   *aAccessible = nsnull;
   if (!frame || frame->GetRect().IsEmpty()) {
@@ -763,7 +763,7 @@ nsAccessibilityService::CreateHTMLTableHeadAccessible(nsIDOMNode *aDOMNode, nsIA
 
   NS_ENSURE_TRUE(accTableHead, NS_ERROR_OUT_OF_MEMORY);
 
-  *_retval = NS_STATIC_CAST(nsIAccessible *, accTableHead);
+  *_retval = static_cast<nsIAccessible *>(accTableHead);
   NS_IF_ADDREF(*_retval);
 
   return rv;
@@ -922,7 +922,7 @@ NS_IMETHODIMP nsAccessibilityService::GetCachedAccessNode(nsIDOMNode *aNode,
     return NS_ERROR_FAILURE;
   }
 
-  return accessibleDoc->GetCachedAccessNode(NS_STATIC_CAST(void*, aNode), aAccessNode);
+  return accessibleDoc->GetCachedAccessNode(static_cast<void*>(aNode), aAccessNode);
 }
 
 NS_IMETHODIMP
@@ -1724,7 +1724,7 @@ NS_IMETHODIMP nsAccessibilityService::AddNativeRootAccessible(void * aAtkAccessi
   nsNativeRootAccessibleWrap* rootAccWrap =
     new nsNativeRootAccessibleWrap((AtkObject*)aAtkAccessible);
 
-  *aRootAccessible = NS_STATIC_CAST(nsIAccessible*, rootAccWrap);
+  *aRootAccessible = static_cast<nsIAccessible*>(rootAccWrap);
   NS_ADDREF(*aRootAccessible);
 
   nsRefPtr<nsApplicationAccessibleWrap> appRoot =
diff --git a/mozilla/accessible/src/base/nsAccessible.cpp b/mozilla/accessible/src/base/nsAccessible.cpp
index 906392b5496..033383570ee 100644
--- a/mozilla/accessible/src/base/nsAccessible.cpp
+++ b/mozilla/accessible/src/base/nsAccessible.cpp
@@ -192,13 +192,13 @@ nsresult nsAccessible::QueryInterface(REFNSIID aIID, void** aInstancePtr)
   *aInstancePtr = nsnull;
   
   if (aIID.Equals(NS_GET_IID(nsIAccessible))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIAccessible*, this);
+    *aInstancePtr = static_cast<nsIAccessible*>(this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
 
   if(aIID.Equals(NS_GET_IID(nsPIAccessible))) {
-    *aInstancePtr = NS_STATIC_CAST(nsPIAccessible*, this);
+    *aInstancePtr = static_cast<nsPIAccessible*>(this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
@@ -220,7 +220,7 @@ nsresult nsAccessible::QueryInterface(REFNSIID aIID, void** aInstancePtr)
                                    nsAccessibilityAtoms::multiselectable,
                                    strings, eCaseMatters) ==
           nsIContent::ATTR_VALUE_NO_MATCH) {
-        *aInstancePtr = NS_STATIC_CAST(nsIAccessibleSelectable*, this);
+        *aInstancePtr = static_cast<nsIAccessibleSelectable*>(this);
         NS_ADDREF_THIS();
       }
     }
@@ -228,7 +228,7 @@ nsresult nsAccessible::QueryInterface(REFNSIID aIID, void** aInstancePtr)
 
   if (aIID.Equals(NS_GET_IID(nsIAccessibleValue))) {
     if (mRoleMapEntry && mRoleMapEntry->valueRule != eNoValue) {
-      *aInstancePtr = NS_STATIC_CAST(nsIAccessibleValue*, this);
+      *aInstancePtr = static_cast<nsIAccessibleValue*>(this);
       NS_ADDREF_THIS();
     }
   }                       
@@ -237,7 +237,7 @@ nsresult nsAccessible::QueryInterface(REFNSIID aIID, void** aInstancePtr)
     nsCOMPtr<nsIAccessible> parent(GetParent());
     nsCOMPtr<nsIAccessibleHyperText> hyperTextParent(do_QueryInterface(parent));
     if (hyperTextParent) {
-      *aInstancePtr = NS_STATIC_CAST(nsIAccessibleHyperLink*, this);
+      *aInstancePtr = static_cast<nsIAccessibleHyperLink*>(this);
       NS_ADDREF_THIS();
       return NS_OK;
     }
@@ -255,7 +255,7 @@ nsAccessible::nsAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell): nsAcces
    {
      nsCOMPtr<nsIPresShell> shell(do_QueryReferent(aShell));
      printf(">>> %p Created Acc - DOM: %p  PS: %p", 
-            (void*)NS_STATIC_CAST(nsIAccessible*, this), (void*)aNode,
+            (void*)static_cast<nsIAccessible*>(this), (void*)aNode,
             (void*)shell.get());
     nsCOMPtr<nsIContent> content = do_QueryInterface(aNode);
     if (content) {
@@ -2810,7 +2810,7 @@ void nsAccessible::DoCommandCallback(nsITimer *aTimer, void *aClosure)
   NS_ASSERTION(gDoCommandTimer, "How did we get here if there was no gDoCommandTimer?");
   NS_RELEASE(gDoCommandTimer);
 
-  nsIContent *content = NS_REINTERPRET_CAST(nsIContent*, aClosure);
+  nsIContent *content = reinterpret_cast<nsIContent*>(aClosure);
   nsCOMPtr<nsIDOMXULElement> xulElement(do_QueryInterface(content));
   if (xulElement) {
     xulElement->Click();
diff --git a/mozilla/accessible/src/base/nsAccessible.h b/mozilla/accessible/src/base/nsAccessible.h
index 28c85a65ece..7a2aec7a618 100644
--- a/mozilla/accessible/src/base/nsAccessible.h
+++ b/mozilla/accessible/src/base/nsAccessible.h
@@ -68,7 +68,7 @@ class nsIAtom;
 class nsIView;
 
 // When mNextSibling is set to this, it indicates there ar eno more siblings
-#define DEAD_END_ACCESSIBLE NS_STATIC_CAST(nsIAccessible*, (void*)1)
+#define DEAD_END_ACCESSIBLE static_cast<nsIAccessible*>((void*)1)
 
 // Saves a data member -- if child count equals this value we haven't
 // cached children or child count yet
diff --git a/mozilla/accessible/src/base/nsApplicationAccessible.cpp b/mozilla/accessible/src/base/nsApplicationAccessible.cpp
index b3338218b0d..7c1a5d1f582 100755
--- a/mozilla/accessible/src/base/nsApplicationAccessible.cpp
+++ b/mozilla/accessible/src/base/nsApplicationAccessible.cpp
@@ -143,7 +143,7 @@ nsApplicationAccessible::GetChildAt(PRInt32 aChildNum, nsIAccessible **aChild)
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
-  if (aChildNum >= NS_STATIC_CAST(PRInt32, count) || count == 0)
+  if (aChildNum >= static_cast<PRInt32>(count) || count == 0)
     return NS_ERROR_INVALID_ARG;
 
   if (aChildNum < 0)
@@ -213,7 +213,7 @@ nsApplicationAccessible::CacheChildren()
 
     PRUint32 count = 0;
     mChildren->GetLength(&count);
-    mAccChildCount = NS_STATIC_CAST(PRInt32, count);
+    mAccChildCount = static_cast<PRInt32>(count);
   }
 }
 
diff --git a/mozilla/accessible/src/base/nsDocAccessible.cpp b/mozilla/accessible/src/base/nsDocAccessible.cpp
index 16cb3767f0e..fbb0893ac5d 100644
--- a/mozilla/accessible/src/base/nsDocAccessible.cpp
+++ b/mozilla/accessible/src/base/nsDocAccessible.cpp
@@ -516,7 +516,7 @@ NS_IMETHODIMP nsDocAccessible::Init()
 NS_IMETHODIMP nsDocAccessible::Destroy()
 {
   if (mWeakShell) {
-    gGlobalDocAccessibleCache.Remove(NS_STATIC_CAST(void*, mWeakShell));
+    gGlobalDocAccessibleCache.Remove(static_cast<void*>(mWeakShell));
   }
   return Shutdown();
 }
@@ -822,7 +822,7 @@ NS_IMETHODIMP nsDocAccessible::FireDocLoadEvents(PRUint32 aEventType)
 
 void nsDocAccessible::ScrollTimerCallback(nsITimer *aTimer, void *aClosure)
 {
-  nsDocAccessible *docAcc = NS_REINTERPRET_CAST(nsDocAccessible*, aClosure);
+  nsDocAccessible *docAcc = reinterpret_cast<nsDocAccessible*>(aClosure);
 
   if (docAcc && docAcc->mScrollPositionChangedTicks &&
       ++docAcc->mScrollPositionChangedTicks > 2) {
@@ -1235,7 +1235,7 @@ nsDocAccessible::FireDelayedAccessibleEvent(nsIAccessibleEvent *aEvent,
     // This is be the first delayed event in queue, start timer
     // so that event gets fired via FlushEventsCallback
     mFireEventTimer->InitWithFuncCallback(FlushEventsCallback,
-                                          NS_STATIC_CAST(nsPIAccessibleDocument*, this),
+                                          static_cast<nsPIAccessibleDocument*>(this),
                                           0, nsITimer::TYPE_ONE_SHOT);
   }
 
@@ -1294,7 +1294,7 @@ NS_IMETHODIMP nsDocAccessible::FlushPendingEvents()
 
 void nsDocAccessible::FlushEventsCallback(nsITimer *aTimer, void *aClosure)
 {
-  nsPIAccessibleDocument *accessibleDoc = NS_STATIC_CAST(nsPIAccessibleDocument*, aClosure);
+  nsPIAccessibleDocument *accessibleDoc = static_cast<nsPIAccessibleDocument*>(aClosure);
   NS_ASSERTION(accessibleDoc, "How did we get here without an accessible document?");
   accessibleDoc->FlushPendingEvents();
 }
@@ -1315,7 +1315,7 @@ void nsDocAccessible::RefreshNodes(nsIDOMNode *aStartNode, PRUint32 aChangeEvent
       // children when they override Shutdown()
 
       // Don't shutdown our doc object!
-      if (accessNode != NS_STATIC_CAST(nsIAccessNode*, this)) {
+      if (accessNode != static_cast<nsIAccessNode*>(this)) {
 
         nsCOMPtr<nsIAccessible> accessible(do_QueryInterface(accessNode));
         if (accessible) {
@@ -1545,7 +1545,7 @@ void nsDocAccessible::DocLoadCallback(nsITimer *aTimer, void *aClosure)
   // which is important because we only fire doc loaded events for focused documents.
 
   nsDocAccessible *docAcc =
-    NS_REINTERPRET_CAST(nsDocAccessible*, aClosure);
+    reinterpret_cast<nsDocAccessible*>(aClosure);
   if (!docAcc) {
     return;
   }
diff --git a/mozilla/accessible/src/base/nsRootAccessible.cpp b/mozilla/accessible/src/base/nsRootAccessible.cpp
index 75217c4837e..0d145da988a 100644
--- a/mozilla/accessible/src/base/nsRootAccessible.cpp
+++ b/mozilla/accessible/src/base/nsRootAccessible.cpp
@@ -94,7 +94,7 @@
 NS_IMPL_QUERY_HEAD(nsRootAccessible)
 NS_IMPL_QUERY_BODY(nsIDOMEventListener)
 if (aIID.Equals(NS_GET_IID(nsRootAccessible)))
-  foundInterface = NS_REINTERPRET_CAST(nsISupports*, this);
+  foundInterface = reinterpret_cast<nsISupports*>(this);
 else
 NS_IMPL_QUERY_TAIL_INHERITING(nsDocAccessible)
 
@@ -866,7 +866,7 @@ void nsRootAccessible::GetTargetNode(nsIDOMEvent *aEvent, nsIDOMNode **aTargetNo
 
 void nsRootAccessible::FireFocusCallback(nsITimer *aTimer, void *aClosure)
 {
-  nsRootAccessible *rootAccessible = NS_STATIC_CAST(nsRootAccessible*, aClosure);
+  nsRootAccessible *rootAccessible = static_cast<nsRootAccessible*>(aClosure);
   NS_ASSERTION(rootAccessible, "How did we get here without a root accessible?");
   rootAccessible->FireCurrentFocusEvent();
 }
diff --git a/mozilla/accessible/src/html/nsHTMLSelectAccessible.cpp b/mozilla/accessible/src/html/nsHTMLSelectAccessible.cpp
index 2912687b579..de8b0615ca4 100644
--- a/mozilla/accessible/src/html/nsHTMLSelectAccessible.cpp
+++ b/mozilla/accessible/src/html/nsHTMLSelectAccessible.cpp
@@ -132,7 +132,7 @@ void nsHTMLSelectableAccessible::iterator::AddAccessibleIfSelected(nsIAccessibil
   }
 
   if (tempAccess)
-    aSelectedAccessibles->AppendElement(NS_STATIC_CAST(nsISupports*, tempAccess), PR_FALSE);
+    aSelectedAccessibles->AppendElement(static_cast<nsISupports*>(tempAccess), PR_FALSE);
 }
 
 PRBool nsHTMLSelectableAccessible::iterator::GetAccessibleIfSelected(PRInt32 aIndex, 
@@ -565,7 +565,7 @@ nsHTMLSelectOptionAccessible::GetAttributesInternal(nsIPersistentProperties *aAt
   }
 
   nsAccUtils::SetAccGroupAttrs(aAttributes, level, posInSet,
-                               NS_STATIC_CAST(PRInt32, setSize));
+                               static_cast<PRInt32>(setSize));
   return  NS_OK;
 }
 
@@ -1170,7 +1170,7 @@ nsHTMLTextFieldAccessible(aDOMNode, aShell)
 NS_IMETHODIMP nsHTMLComboboxTextFieldAccessible::GetUniqueID(void **aUniqueID)
 {
   // Since mDOMNode is same as for our parent, use |this| pointer as the unique Id
-  *aUniqueID = NS_STATIC_CAST(void*, this);
+  *aUniqueID = static_cast<void*>(this);
   return NS_OK;
 }
 
@@ -1290,7 +1290,7 @@ NS_IMETHODIMP nsHTMLComboboxButtonAccessible::GetActionName(PRUint8 aIndex, nsAS
 NS_IMETHODIMP nsHTMLComboboxButtonAccessible::GetUniqueID(void **aUniqueID)
 {
   // Since mDOMNode is same for all tree item, use |this| pointer as the unique Id
-  *aUniqueID = NS_STATIC_CAST(void*, this);
+  *aUniqueID = static_cast<void*>(this);
   return NS_OK;
 }
 
@@ -1422,7 +1422,7 @@ NS_IMETHODIMP nsHTMLComboboxListAccessible::GetParent(nsIAccessible **aParent)
 NS_IMETHODIMP nsHTMLComboboxListAccessible::GetUniqueID(void **aUniqueID)
 {
   // Since mDOMNode is same for all tree item, use |this| pointer as the unique Id
-  *aUniqueID = NS_STATIC_CAST(void*, this);
+  *aUniqueID = static_cast<void*>(this);
   return NS_OK;
 }
 
diff --git a/mozilla/accessible/src/html/nsHTMLTextAccessible.cpp b/mozilla/accessible/src/html/nsHTMLTextAccessible.cpp
index 0c84d07def5..d865c73fe76 100644
--- a/mozilla/accessible/src/html/nsHTMLTextAccessible.cpp
+++ b/mozilla/accessible/src/html/nsHTMLTextAccessible.cpp
@@ -167,7 +167,7 @@ nsHTMLBRAccessible::GetState(PRUint32 *aState, PRUint32 *aExtraState)
 
 NS_IMETHODIMP nsHTMLBRAccessible::GetName(nsAString& aName)
 {
-  aName = NS_STATIC_CAST(PRUnichar, '\n');    // Newline char
+  aName = static_cast<PRUnichar>('\n');    // Newline char
   return NS_OK;
 }
 
@@ -313,7 +313,7 @@ NS_IMETHODIMP
 nsHTMLListBulletAccessible::GetUniqueID(void **aUniqueID)
 {
   // Since mDOMNode is same as for list item, use |this| pointer as the unique Id
-  *aUniqueID = NS_STATIC_CAST(void*, this);
+  *aUniqueID = static_cast<void*>(this);
   return NS_OK;
 }
 
diff --git a/mozilla/accessible/src/html/nsHyperTextAccessible.cpp b/mozilla/accessible/src/html/nsHyperTextAccessible.cpp
index c9a8aed27cd..11a826f3da1 100644
--- a/mozilla/accessible/src/html/nsHyperTextAccessible.cpp
+++ b/mozilla/accessible/src/html/nsHyperTextAccessible.cpp
@@ -81,7 +81,7 @@ nsresult nsHyperTextAccessible::QueryInterface(REFNSIID aIID, void** aInstancePt
       PRInt32 numChildren;
       GetChildCount(&numChildren);
       if (numChildren > 0) {
-        *aInstancePtr = NS_STATIC_CAST(nsIAccessibleText*, this);
+        *aInstancePtr = static_cast<nsIAccessibleText*>(this);
         NS_ADDREF_THIS();
         return NS_OK;
       }
@@ -91,7 +91,7 @@ nsresult nsHyperTextAccessible::QueryInterface(REFNSIID aIID, void** aInstancePt
     if (aIID.Equals(NS_GET_IID(nsIAccessibleHyperText))) {
       if (IsHyperText()) {
         // If |this| contains text and embedded objects
-        *aInstancePtr = NS_STATIC_CAST(nsIAccessibleHyperText*, this);
+        *aInstancePtr = static_cast<nsIAccessibleHyperText*>(this);
         NS_ADDREF_THIS();
         return NS_OK;
       }
@@ -103,7 +103,7 @@ nsresult nsHyperTextAccessible::QueryInterface(REFNSIID aIID, void** aInstancePt
       PRUint32 state, extState;
       GetState(&state, &extState);
       if (extState & nsIAccessibleStates::EXT_STATE_EDITABLE) {
-        *aInstancePtr = NS_STATIC_CAST(nsIAccessibleEditableText*, this);
+        *aInstancePtr = static_cast<nsIAccessibleEditableText*>(this);
         NS_ADDREF_THIS();
         return NS_OK;
       }
diff --git a/mozilla/accessible/src/mac/mozAccessible.mm b/mozilla/accessible/src/mac/mozAccessible.mm
index 106c2b1e64e..83bcf1600f1 100644
--- a/mozilla/accessible/src/mac/mozAccessible.mm
+++ b/mozilla/accessible/src/mac/mozAccessible.mm
@@ -328,7 +328,7 @@ GetNativeFromGeckoAccessible(nsIAccessible *anAccessible)
   //
   // get the native root accessible, and tell it to return its first parent unignored accessible.
   nsRefPtr<nsRootAccessible> root(mGeckoAccessible->GetRootAccessible());
-  id nativeParent = GetNativeFromGeckoAccessible(NS_STATIC_CAST(nsIAccessible*, root));
+  id nativeParent = GetNativeFromGeckoAccessible(static_cast<nsIAccessible*>(root));
   NSAssert1 (nativeParent, @"!!! we can't find a parent for %@", self);
   
   return GetClosestInterestingAccessible(nativeParent);
@@ -510,7 +510,7 @@ GetNativeFromGeckoAccessible(nsIAccessible *anAccessible)
 
 - (NSWindow*)window
 {
-  nsAccessibleWrap *accWrap = NS_STATIC_CAST (nsAccessibleWrap*, mGeckoAccessible);
+  nsAccessibleWrap *accWrap = static_cast<nsAccessibleWrap*>(mGeckoAccessible);
   NSWindow *nativeWindow = nil;
   accWrap->GetNativeWindow ((void**)&nativeWindow);
   
diff --git a/mozilla/accessible/src/mac/mozDocAccessible.mm b/mozilla/accessible/src/mac/mozDocAccessible.mm
index fecebf56e42..bdd3b3da48a 100644
--- a/mozilla/accessible/src/mac/mozDocAccessible.mm
+++ b/mozilla/accessible/src/mac/mozDocAccessible.mm
@@ -44,7 +44,7 @@
 
 static id <mozAccessible, mozView> getNativeViewFromRootAccessible (nsAccessible *accessible)
 {
-  nsRootAccessibleWrap *root = NS_STATIC_CAST (nsRootAccessibleWrap*, accessible);
+  nsRootAccessibleWrap *root = static_cast<nsRootAccessibleWrap*>(accessible);
   id <mozAccessible, mozView> nativeView = nil;
   root->GetNativeWidget ((void**)&nativeView);
   return nativeView;
diff --git a/mozilla/accessible/src/mac/nsAccessibleWrap.h b/mozilla/accessible/src/mac/nsAccessibleWrap.h
index f9eac9af8cd..1f81f0b9f3e 100644
--- a/mozilla/accessible/src/mac/nsAccessibleWrap.h
+++ b/mozilla/accessible/src/mac/nsAccessibleWrap.h
@@ -117,10 +117,10 @@ class nsAccessibleWrap : public nsAccessible
       
       nsCOMPtr<nsIAccessible> curParent = GetParent();
       while (curParent) {
-        nsAccessibleWrap *ancestorWrap = NS_STATIC_CAST(nsAccessibleWrap*, (nsIAccessible*)curParent.get());
+        nsAccessibleWrap *ancestorWrap = static_cast<nsAccessibleWrap*>((nsIAccessible*)curParent.get());
         if (ancestorWrap->IsFlat())
           return PR_TRUE;
-        curParent = NS_STATIC_CAST(nsAccessibleWrap*, (nsIAccessible*)curParent.get())->GetParent();
+        curParent = static_cast<nsAccessibleWrap*>((nsIAccessible*)curParent.get())->GetParent();
       }
       // no parent was flat
       return PR_FALSE;
diff --git a/mozilla/accessible/src/mac/nsAccessibleWrap.mm b/mozilla/accessible/src/mac/nsAccessibleWrap.mm
index 855db24d110..76ed4fb5b18 100644
--- a/mozilla/accessible/src/mac/nsAccessibleWrap.mm
+++ b/mozilla/accessible/src/mac/nsAccessibleWrap.mm
@@ -214,7 +214,7 @@ nsAccessibleWrap::GetUnignoredChildCount(PRBool aDeepCount)
   nsCOMPtr<nsIAccessible> curAcc;
   
   while (NextChild(curAcc)) {
-    nsAccessibleWrap *childWrap = NS_STATIC_CAST(nsAccessibleWrap*, (nsIAccessible*)curAcc.get());
+    nsAccessibleWrap *childWrap = static_cast<nsAccessibleWrap*>((nsIAccessible*)curAcc.get());
     
     // if the current child is not ignored, count it.
     if (!childWrap->IsIgnored())
@@ -256,7 +256,7 @@ nsAccessibleWrap::GetUnignoredChildren(nsTArray<nsRefPtr<nsAccessibleWrap> > &aC
     return;
   
   while (NextChild(curAcc)) {
-    nsAccessibleWrap *childWrap = NS_STATIC_CAST(nsAccessibleWrap*, (nsIAccessible*)curAcc.get());
+    nsAccessibleWrap *childWrap = static_cast<nsAccessibleWrap*>((nsIAccessible*)curAcc.get());
     if (childWrap->IsIgnored()) {
       // element is ignored, so try adding its children as substitutes, if it has any.
       if (!childWrap->IsFlat()) {
@@ -277,7 +277,7 @@ already_AddRefed<nsIAccessible>
 nsAccessibleWrap::GetUnignoredParent()
 {
   nsCOMPtr<nsIAccessible> parent(GetParent());
-  nsAccessibleWrap *parentWrap = NS_STATIC_CAST(nsAccessibleWrap*, (nsIAccessible*)parent.get());
+  nsAccessibleWrap *parentWrap = static_cast<nsAccessibleWrap*>((nsIAccessible*)parent.get());
   if (!parentWrap)
     return nsnull;
     
diff --git a/mozilla/accessible/src/msaa/CAccessibleAction.cpp b/mozilla/accessible/src/msaa/CAccessibleAction.cpp
index 20c296386f0..f3bc2da0c28 100755
--- a/mozilla/accessible/src/msaa/CAccessibleAction.cpp
+++ b/mozilla/accessible/src/msaa/CAccessibleAction.cpp
@@ -56,8 +56,8 @@ CAccessibleAction::QueryInterface(REFIID iid, void** ppv)
   *ppv = NULL;
 
   if (IID_IAccessibleAction == iid) {
-    *ppv = NS_STATIC_CAST(IAccessibleAction*, this);
-    (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef();
+    *ppv = static_cast<IAccessibleAction*>(this);
+    (reinterpret_cast<IUnknown*>(*ppv))->AddRef();
     return S_OK;
   }
 
@@ -89,7 +89,7 @@ CAccessibleAction::doAction(long aActionIndex)
   if (!acc)
     return E_FAIL;
 
-  PRUint8 index = NS_STATIC_CAST(PRUint8, aActionIndex);
+  PRUint8 index = static_cast<PRUint8>(aActionIndex);
   if (NS_SUCCEEDED(acc->DoAction(index)))
     return S_OK;
   return E_FAIL;
@@ -105,7 +105,7 @@ CAccessibleAction::get_description(long aActionIndex, BSTR *aDescription)
     return E_FAIL;
 
   nsAutoString description;
-  PRUint8 index = NS_STATIC_CAST(PRUint8, aActionIndex);
+  PRUint8 index = static_cast<PRUint8>(aActionIndex);
   if (NS_FAILED(acc->GetActionDescription(index, description)))
     return E_FAIL;
 
@@ -130,7 +130,7 @@ CAccessibleAction::get_keyBinding(long aActionIndex, long aNumMaxBinding,
     return E_FAIL;
 
   nsCOMPtr<nsIDOMDOMStringList> keys;
-  PRUint8 index = NS_STATIC_CAST(PRUint8, aActionIndex);
+  PRUint8 index = static_cast<PRUint8>(aActionIndex);
   nsresult rv = acc->GetKeyBindings(index, getter_AddRefs(keys));
   if (NS_FAILED(rv))
     return E_FAIL;
@@ -138,9 +138,9 @@ CAccessibleAction::get_keyBinding(long aActionIndex, long aNumMaxBinding,
   PRUint32 length = 0;
   keys->GetLength(&length);
 
-  PRBool aUseNumMaxBinding = length > NS_STATIC_CAST(PRUint32, aNumMaxBinding);
+  PRBool aUseNumMaxBinding = length > static_cast<PRUint32>(aNumMaxBinding);
 
-  PRUint32 maxBinding = NS_STATIC_CAST(PRUint32, aNumMaxBinding);
+  PRUint32 maxBinding = static_cast<PRUint32>(aNumMaxBinding);
 
   PRUint32 numBinding = length > maxBinding ? maxBinding : length;
   *aNumBinding = numBinding;
@@ -171,7 +171,7 @@ CAccessibleAction::get_name(long aActionIndex, BSTR *aName)
     return E_FAIL;
 
   nsAutoString name;
-  PRUint8 index = NS_STATIC_CAST(PRUint8, aActionIndex);
+  PRUint8 index = static_cast<PRUint8>(aActionIndex);
   if (NS_FAILED(acc->GetActionName(index, name)))
     return E_FAIL;
 
diff --git a/mozilla/accessible/src/msaa/CAccessibleComponent.cpp b/mozilla/accessible/src/msaa/CAccessibleComponent.cpp
index a2943460c01..3b7b9322a94 100755
--- a/mozilla/accessible/src/msaa/CAccessibleComponent.cpp
+++ b/mozilla/accessible/src/msaa/CAccessibleComponent.cpp
@@ -67,8 +67,8 @@ CAccessibleComponent::QueryInterface(REFIID iid, void** ppv)
   *ppv = NULL;
 
   if (IID_IAccessibleComponent == iid) {
-    *ppv = NS_STATIC_CAST(IAccessibleComponent*, this);
-    (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef();
+    *ppv = static_cast<IAccessibleComponent*>(this);
+    (reinterpret_cast<IUnknown*>(*ppv))->AddRef();
     return S_OK;
   }
 
diff --git a/mozilla/accessible/src/msaa/CAccessibleEditableText.cpp b/mozilla/accessible/src/msaa/CAccessibleEditableText.cpp
index b69873306a2..cb08b230ce6 100755
--- a/mozilla/accessible/src/msaa/CAccessibleEditableText.cpp
+++ b/mozilla/accessible/src/msaa/CAccessibleEditableText.cpp
@@ -64,8 +64,8 @@ CAccessibleEditableText::QueryInterface(REFIID iid, void** ppv)
     nsCOMPtr<nsIAccessibleEditableText> editTextAcc(do_QueryInterface(this));
     if (!editTextAcc)
       return E_NOINTERFACE;
-    *ppv = NS_STATIC_CAST(IAccessibleEditableText*, this);
-    (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef(); 
+    *ppv = static_cast<IAccessibleEditableText*>(this);
+    (reinterpret_cast<IUnknown*>(*ppv))->AddRef(); 
     return S_OK;
   }
 
diff --git a/mozilla/accessible/src/msaa/CAccessibleHyperlink.cpp b/mozilla/accessible/src/msaa/CAccessibleHyperlink.cpp
index 49971739b58..1cda3df1d81 100755
--- a/mozilla/accessible/src/msaa/CAccessibleHyperlink.cpp
+++ b/mozilla/accessible/src/msaa/CAccessibleHyperlink.cpp
@@ -65,8 +65,8 @@ CAccessibleHyperlink::QueryInterface(REFIID iid, void** ppv)
     if (!acc)
       return E_NOINTERFACE;
 
-    *ppv = NS_STATIC_CAST(IAccessibleHyperlink*, this);
-    (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef();
+    *ppv = static_cast<IAccessibleHyperlink*>(this);
+    (reinterpret_cast<IUnknown*>(*ppv))->AddRef();
     return S_OK;
   }
 
@@ -99,7 +99,7 @@ CAccessibleHyperlink::get_anchor(long aIndex, VARIANT *aAnchor)
   if (NS_FAILED(rv))
     return E_FAIL;
 
-  IUnknown *unknownPtr = NS_STATIC_CAST(IUnknown*, instancePtr);
+  IUnknown *unknownPtr = static_cast<IUnknown*>(instancePtr);
   aAnchor->ppunkVal = &unknownPtr;
   aAnchor->vt = VT_UNKNOWN;
 
diff --git a/mozilla/accessible/src/msaa/CAccessibleHypertext.cpp b/mozilla/accessible/src/msaa/CAccessibleHypertext.cpp
index 1870812d190..1a3ed6a6a58 100755
--- a/mozilla/accessible/src/msaa/CAccessibleHypertext.cpp
+++ b/mozilla/accessible/src/msaa/CAccessibleHypertext.cpp
@@ -59,8 +59,8 @@ CAccessibleHypertext::QueryInterface(REFIID iid, void** ppv)
     if (!hyperAcc)
       return E_NOINTERFACE;
 
-    *ppv = NS_STATIC_CAST(IAccessibleHypertext*, this);
-    (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef();
+    *ppv = static_cast<IAccessibleHypertext*>(this);
+    (reinterpret_cast<IUnknown*>(*ppv))->AddRef();
     return S_OK;
   }
 
@@ -107,7 +107,7 @@ CAccessibleHypertext::get_hyperlink(long aIndex,
   void *instancePtr = NULL;
   nsresult rv =  winAccessNode->QueryNativeInterface(IID_IAccessibleHyperlink,
                                                      &instancePtr);
-  *aHyperlink = NS_STATIC_CAST(IAccessibleHyperlink*, instancePtr);
+  *aHyperlink = static_cast<IAccessibleHyperlink*>(instancePtr);
 
   return NS_FAILED(rv) ? E_FAIL : S_OK;
 }
diff --git a/mozilla/accessible/src/msaa/CAccessibleImage.cpp b/mozilla/accessible/src/msaa/CAccessibleImage.cpp
index 9ad444837b0..70e241fc50d 100755
--- a/mozilla/accessible/src/msaa/CAccessibleImage.cpp
+++ b/mozilla/accessible/src/msaa/CAccessibleImage.cpp
@@ -60,8 +60,8 @@ CAccessibleImage::QueryInterface(REFIID iid, void** ppv)
     if (!imageAcc)
       return E_FAIL;
 
-    *ppv = NS_STATIC_CAST(IAccessibleImage*, this);
-    (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef();
+    *ppv = static_cast<IAccessibleImage*>(this);
+    (reinterpret_cast<IUnknown*>(*ppv))->AddRef();
     return S_OK;
   }
 
diff --git a/mozilla/accessible/src/msaa/CAccessibleTable.cpp b/mozilla/accessible/src/msaa/CAccessibleTable.cpp
index 842161cd8f9..a1889e339c1 100755
--- a/mozilla/accessible/src/msaa/CAccessibleTable.cpp
+++ b/mozilla/accessible/src/msaa/CAccessibleTable.cpp
@@ -61,8 +61,8 @@ CAccessibleTable::QueryInterface(REFIID iid, void** ppv)
   *ppv = NULL;
 
   if (IID_IAccessibleTable == iid) {
-    *ppv = NS_STATIC_CAST(IAccessibleTable*, this);
-    (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef();
+    *ppv = static_cast<IAccessibleTable*>(this);
+    (reinterpret_cast<IUnknown*>(*ppv))->AddRef();
     return S_OK;
   }
 
@@ -95,7 +95,7 @@ CAccessibleTable::get_accessibleAt(long aRow, long aColumn,
   if (NS_FAILED(rv))
     return E_FAIL;
 
-  *aAccessible = NS_STATIC_CAST(IUnknown*, instancePtr);
+  *aAccessible = static_cast<IUnknown*>(instancePtr);
   return S_OK;
 }
 
@@ -122,7 +122,7 @@ CAccessibleTable::get_caption(IUnknown **aAccessible)
   if (NS_FAILED(rv))
     return E_FAIL;
 
-  *aAccessible = NS_STATIC_CAST(IUnknown*, instancePtr);
+  *aAccessible = static_cast<IUnknown*>(instancePtr);
   return S_OK;
 }
 
@@ -208,7 +208,7 @@ CAccessibleTable::get_columnHeader(IAccessibleTable **aAccessibleTable,
   if (NS_FAILED(rv))
     return E_FAIL;
 
-  *aAccessibleTable = NS_STATIC_CAST(IAccessibleTable*, instancePtr);
+  *aAccessibleTable = static_cast<IAccessibleTable*>(instancePtr);
   return S_OK;
 }
 
@@ -348,7 +348,7 @@ CAccessibleTable::get_rowHeader(IAccessibleTable **aAccessibleTable,
   if (NS_FAILED(rv))
     return E_FAIL;
 
-  *aAccessibleTable = NS_STATIC_CAST(IAccessibleTable*, instancePtr);
+  *aAccessibleTable = static_cast<IAccessibleTable*>(instancePtr);
   return S_OK;
 }
 
diff --git a/mozilla/accessible/src/msaa/CAccessibleText.cpp b/mozilla/accessible/src/msaa/CAccessibleText.cpp
index ece978cf965..92acbc450e7 100755
--- a/mozilla/accessible/src/msaa/CAccessibleText.cpp
+++ b/mozilla/accessible/src/msaa/CAccessibleText.cpp
@@ -70,8 +70,8 @@ CAccessibleText::QueryInterface(REFIID iid, void** ppv)
     if (!textAcc) {
       return E_NOINTERFACE;
     }
-    *ppv = NS_STATIC_CAST(IAccessibleText*, this);
-    (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef();
+    *ppv = static_cast<IAccessibleText*>(this);
+    (reinterpret_cast<IUnknown*>(*ppv))->AddRef();
     return S_OK;
   }
 
@@ -111,7 +111,7 @@ CAccessibleText::get_attributes(long aOffset, long *aStartOffset,
   if (!instancePtr)
     return E_FAIL;
 
-  IAccessible2 *pAccessible2 = NS_STATIC_CAST(IAccessible2*, *instancePtr);
+  IAccessible2 *pAccessible2 = static_cast<IAccessible2*>(*instancePtr);
   HRESULT hr = pAccessible2->get_attributes(aTextAttributes);
   pAccessible2->Release();
 
@@ -378,7 +378,7 @@ CAccessibleText::scrollSubstringTo(long aStartIndex, long aEndIndex,
   if (!instancePtr)
     return E_FAIL;
 
-  IAccessible2 *pAccessible2 = NS_STATIC_CAST(IAccessible2*, *instancePtr);
+  IAccessible2 *pAccessible2 = static_cast<IAccessible2*>(*instancePtr);
   HRESULT hr = pAccessible2->scrollTo(aScrollType);
   pAccessible2->Release();
 
@@ -410,7 +410,7 @@ CAccessibleText::scrollSubstringToPoint(long aStartIndex, long aEndIndex,
   if (!instancePtr)
     return E_FAIL;
 
-  IAccessible2 *pAccessible2 = NS_STATIC_CAST(IAccessible2*, *instancePtr);
+  IAccessible2 *pAccessible2 = static_cast<IAccessible2*>(*instancePtr);
   HRESULT hr = pAccessible2->scrollToPoint(aCoordinateType, aX, aY);
   pAccessible2->Release();
 
diff --git a/mozilla/accessible/src/msaa/CAccessibleValue.cpp b/mozilla/accessible/src/msaa/CAccessibleValue.cpp
index 883b5c0d526..71691d1ee7e 100755
--- a/mozilla/accessible/src/msaa/CAccessibleValue.cpp
+++ b/mozilla/accessible/src/msaa/CAccessibleValue.cpp
@@ -58,8 +58,8 @@ CAccessibleValue::QueryInterface(REFIID iid, void** ppv)
     if (!valueAcc)
       return E_NOINTERFACE;
 
-    *ppv = NS_STATIC_CAST(IAccessibleValue*, this);
-    (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef();
+    *ppv = static_cast<IAccessibleValue*>(this);
+    (reinterpret_cast<IUnknown*>(*ppv))->AddRef();
     return S_OK;
   }
 
diff --git a/mozilla/accessible/src/msaa/nsAccessNodeWrap.cpp b/mozilla/accessible/src/msaa/nsAccessNodeWrap.cpp
index 02c6a1e015d..0e96cc2655a 100644
--- a/mozilla/accessible/src/msaa/nsAccessNodeWrap.cpp
+++ b/mozilla/accessible/src/msaa/nsAccessNodeWrap.cpp
@@ -117,12 +117,12 @@ STDMETHODIMP nsAccessNodeWrap::QueryInterface(REFIID iid, void** ppv)
   *ppv = nsnull;
 
   if (IID_IUnknown == iid || IID_ISimpleDOMNode == iid)
-    *ppv = NS_STATIC_CAST(ISimpleDOMNode*, this);
+    *ppv = static_cast<ISimpleDOMNode*>(this);
 
   if (nsnull == *ppv)
     return E_NOINTERFACE;      //iid not supported.
    
-  (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef(); 
+  (reinterpret_cast<IUnknown*>(*ppv))->AddRef(); 
   return S_OK;
 }
 
@@ -148,7 +148,7 @@ STDMETHODIMP nsAccessNodeWrap::get_nodeInfo(
 
   PRUint16 nodeType = 0;
   mDOMNode->GetNodeType(&nodeType);
-  *aNodeType=NS_STATIC_CAST(unsigned short, nodeType);
+  *aNodeType=static_cast<unsigned short>(nodeType);
 
   if (*aNodeType !=  NODETYPE_TEXT) {
     nsAutoString nodeName;
@@ -160,7 +160,7 @@ STDMETHODIMP nsAccessNodeWrap::get_nodeInfo(
 
   mDOMNode->GetNodeValue(nodeValue);
   *aNodeValue = ::SysAllocString(nodeValue.get());
-  *aNameSpaceID = content ? NS_STATIC_CAST(short, content->GetNameSpaceID()) : 0;
+  *aNameSpaceID = content ? static_cast<short>(content->GetNameSpaceID()) : 0;
 
   // This is a unique ID for every content node.  The 3rd party
   // accessibility application can compare this to the childID we
@@ -175,7 +175,7 @@ STDMETHODIMP nsAccessNodeWrap::get_nodeInfo(
   nsCOMPtr<nsIDOMNodeList> nodeList;
   mDOMNode->GetChildNodes(getter_AddRefs(nodeList));
   if (nodeList && NS_OK == nodeList->GetLength(&numChildren))
-    *aNumChildren = NS_STATIC_CAST(unsigned int, numChildren);
+    *aNumChildren = static_cast<unsigned int>(numChildren);
 
   return S_OK;
 }
@@ -199,7 +199,7 @@ STDMETHODIMP nsAccessNodeWrap::get_attributes(
 
   if (numAttribs > aMaxAttribs)
     numAttribs = aMaxAttribs;
-  *aNumAttribs = NS_STATIC_CAST(unsigned short, numAttribs);
+  *aNumAttribs = static_cast<unsigned short>(numAttribs);
 
   for (PRUint32 index = 0; index < numAttribs; index++) {
     aNameSpaceIDs[index] = 0; aAttribValues[index] = aAttribNames[index] = nsnull;
@@ -207,7 +207,7 @@ STDMETHODIMP nsAccessNodeWrap::get_attributes(
     const char *pszAttributeName; 
 
     const nsAttrName* name = content->GetAttrNameAt(index);
-    aNameSpaceIDs[index] = NS_STATIC_CAST(short, name->NamespaceID());
+    aNameSpaceIDs[index] = static_cast<short>(name->NamespaceID());
     name->LocalName()->GetUTF8String(&pszAttributeName);
     aAttribNames[index] = ::SysAllocString(NS_ConvertUTF8toUTF16(pszAttributeName).get());
     content->GetAttr(name->NamespaceID(), name->LocalName(), attributeValue);
@@ -242,7 +242,7 @@ STDMETHODIMP nsAccessNodeWrap::get_attributesForNames(
     aAttribValues[index] = nsnull;
     if (aAttribNames[index]) {
       nsAutoString attributeValue, nameSpaceURI;
-      nsAutoString attributeName(nsDependentString(NS_STATIC_CAST(PRUnichar*,aAttribNames[index])));
+      nsAutoString attributeName(nsDependentString(static_cast<PRUnichar*>(aAttribNames[index])));
       nsresult rv;
 
       if (aNameSpaceID[index]>0 && 
@@ -290,7 +290,7 @@ STDMETHODIMP nsAccessNodeWrap::get_computedStyle(
       ++realIndex;
     }
   }
-  *aNumStyleProperties = NS_STATIC_CAST(unsigned short, realIndex);
+  *aNumStyleProperties = static_cast<unsigned short>(realIndex);
 
   return S_OK;
 }
@@ -314,7 +314,7 @@ STDMETHODIMP nsAccessNodeWrap::get_computedStyleForProperties(
   for (index = 0; index < aNumStyleProperties; index ++) {
     nsAutoString value;
     if (aStyleProperties[index])
-      cssDecl->GetPropertyValue(nsDependentString(NS_STATIC_CAST(PRUnichar*,aStyleProperties[index])), value);  // Get property value
+      cssDecl->GetPropertyValue(nsDependentString(static_cast<PRUnichar*>(aStyleProperties[index])), value);  // Get property value
     aStyleValues[index] = ::SysAllocString(value.get());
   }
 
@@ -376,7 +376,7 @@ ISimpleDOMNode* nsAccessNodeWrap::MakeAccessNode(nsIDOMNode *node)
       return NULL;
 
     newNode->Init();
-    iNode = NS_STATIC_CAST(ISimpleDOMNode*, newNode);
+    iNode = static_cast<ISimpleDOMNode*>(newNode);
     iNode->AddRef();
   }
 
@@ -498,7 +498,7 @@ STDMETHODIMP
 nsAccessNodeWrap::get_localInterface( 
     /* [out] */ void __RPC_FAR *__RPC_FAR *localInterface)
 {
-  *localInterface = NS_STATIC_CAST(nsIAccessNode*, this);
+  *localInterface = static_cast<nsIAccessNode*>(this);
   NS_ADDREF_THIS();
   return S_OK;
 }
diff --git a/mozilla/accessible/src/msaa/nsAccessibleRelationWrap.cpp b/mozilla/accessible/src/msaa/nsAccessibleRelationWrap.cpp
index 8060ad76437..54b5587813c 100755
--- a/mozilla/accessible/src/msaa/nsAccessibleRelationWrap.cpp
+++ b/mozilla/accessible/src/msaa/nsAccessibleRelationWrap.cpp
@@ -71,8 +71,8 @@ nsAccessibleRelationWrap::QueryInterface(REFIID iid, void** ppv)
   *ppv = NULL;
 
   if (IID_IAccessibleRelation == iid || IID_IUnknown == iid) {
-    *ppv = NS_STATIC_CAST(IAccessibleRelation*, this);
-    (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef();
+    *ppv = static_cast<IAccessibleRelation*>(this);
+    (reinterpret_cast<IUnknown*>(*ppv))->AddRef();
     return S_OK;
   }
 
@@ -175,7 +175,7 @@ nsAccessibleRelationWrap::get_target(long aTargetIndex, IUnknown **aTarget)
   if (NS_FAILED(rv))
     return E_FAIL;
 
-  *aTarget = NS_STATIC_CAST(IUnknown*, instancePtr);
+  *aTarget = static_cast<IUnknown*>(instancePtr);
   return S_OK;
 }
 
@@ -209,7 +209,7 @@ nsAccessibleRelationWrap::get_targets(long aMaxTargets, IUnknown **aTarget,
     if (NS_FAILED(rv))
       break;
 
-    aTarget[index] = NS_STATIC_CAST(IUnknown*, instancePtr);
+    aTarget[index] = static_cast<IUnknown*>(instancePtr);
   }
 
   if (NS_FAILED(rv)) {
diff --git a/mozilla/accessible/src/msaa/nsAccessibleWrap.cpp b/mozilla/accessible/src/msaa/nsAccessibleWrap.cpp
index 514252ecbd8..38b07212813 100644
--- a/mozilla/accessible/src/msaa/nsAccessibleWrap.cpp
+++ b/mozilla/accessible/src/msaa/nsAccessibleWrap.cpp
@@ -106,16 +106,16 @@ STDMETHODIMP nsAccessibleWrap::QueryInterface(REFIID iid, void** ppv)
   *ppv = NULL;
 
   if (IID_IUnknown == iid || IID_IDispatch == iid || IID_IAccessible == iid)
-    *ppv = NS_STATIC_CAST(IAccessible*, this);
+    *ppv = static_cast<IAccessible*>(this);
   else if (IID_IEnumVARIANT == iid && !gIsEnumVariantSupportDisabled) {
     long numChildren;
     get_accChildCount(&numChildren);
     if (numChildren > 0)  // Don't support this interface for leaf elements
-      *ppv = NS_STATIC_CAST(IEnumVARIANT*, this);
+      *ppv = static_cast<IEnumVARIANT*>(this);
   } else if (IID_IServiceProvider == iid)
-    *ppv = NS_STATIC_CAST(IServiceProvider*, this);
+    *ppv = static_cast<IServiceProvider*>(this);
   else if (IID_IAccessible2 == iid)
-    *ppv = NS_STATIC_CAST(IAccessible2*, this);
+    *ppv = static_cast<IAccessible2*>(this);
 
   if (NULL == *ppv) {
     HRESULT hr = CAccessibleComponent::QueryInterface(iid, ppv);
@@ -138,7 +138,7 @@ STDMETHODIMP nsAccessibleWrap::QueryInterface(REFIID iid, void** ppv)
   if (NULL == *ppv)
     return nsAccessNodeWrap::QueryInterface(iid, ppv);
 
-  (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef();
+  (reinterpret_cast<IUnknown*>(*ppv))->AddRef();
   return S_OK;
 }
 
@@ -260,7 +260,7 @@ STDMETHODIMP nsAccessibleWrap::get_accChild(
     return E_FAIL;
 
   if (varChild.lVal == CHILDID_SELF) {
-    *ppdispChild = NS_STATIC_CAST(IDispatch*, this);
+    *ppdispChild = static_cast<IDispatch*>(this);
     AddRef();
     return S_OK;
   }
@@ -728,7 +728,7 @@ STDMETHODIMP nsAccessibleWrap::get_accSelection(VARIANT __RPC_FAR *pvarChildren)
   pvarChildren->vt = VT_EMPTY;
 
   nsCOMPtr<nsIAccessibleSelectable> 
-    select(do_QueryInterface(NS_STATIC_CAST(nsIAccessible*, this)));
+    select(do_QueryInterface(static_cast<nsIAccessible*>(this)));
 
   if (select) {  // do we have an nsIAccessibleSelectable?
     // we have an accessible that can have children selected
@@ -959,7 +959,7 @@ STDMETHODIMP nsAccessibleWrap::accHitTest(
   // if we got a child
   if (xpAccessible) {
     // if the child is us
-    if (xpAccessible == NS_STATIC_CAST(nsIAccessible*, this)) {
+    if (xpAccessible == static_cast<nsIAccessible*>(this)) {
       pvarChild->vt = VT_I4;
       pvarChild->lVal = CHILDID_SELF;
     } else { // its not create an Accessible for it.
@@ -1061,7 +1061,7 @@ nsAccessibleWrap::Next(ULONG aNumElementsRequested, VARIANT FAR* pvar, ULONG FAR
   for (long childIndex = 0; pvar[*aNumElementsFetched].vt == VT_DISPATCH; ++childIndex) {
     PRBool wasAccessibleFetched = PR_FALSE;
     nsAccessibleWrap *msaaAccessible =
-      NS_STATIC_CAST(nsAccessibleWrap*, pvar[*aNumElementsFetched].pdispVal);
+      static_cast<nsAccessibleWrap*>(pvar[*aNumElementsFetched].pdispVal);
     if (!msaaAccessible)
       break;
     if (childIndex >= mEnumVARIANTPosition) {
@@ -1074,14 +1074,14 @@ nsAccessibleWrap::Next(ULONG aNumElementsRequested, VARIANT FAR* pvar, ULONG FAR
       msaaAccessible->nsAccessNode::Release(); // this accessible will not be received by the caller
   }
 
-  mEnumVARIANTPosition += NS_STATIC_CAST(PRUint16, *aNumElementsFetched);
+  mEnumVARIANTPosition += static_cast<PRUint16>(*aNumElementsFetched);
   return NOERROR;
 }
 
 STDMETHODIMP
 nsAccessibleWrap::Skip(ULONG aNumElements)
 {
-  mEnumVARIANTPosition += NS_STATIC_CAST(PRUint16, aNumElements);
+  mEnumVARIANTPosition += static_cast<PRUint16>(aNumElements);
 
   PRInt32 numChildren;
   GetChildCount(&numChildren);
@@ -1133,7 +1133,7 @@ nsAccessibleWrap::get_relation(long aRelationIndex,
   if (NS_FAILED(rv))
     return E_FAIL;
 
-  *aRelation = NS_STATIC_CAST(IAccessibleRelation*, instancePtr);
+  *aRelation = static_cast<IAccessibleRelation*>(instancePtr);
   return S_OK;
 }
 
@@ -1168,7 +1168,7 @@ nsAccessibleWrap::get_relations(long aMaxRelations,
     if (NS_FAILED(rv))
       break;
 
-    aRelation[index] = NS_STATIC_CAST(IAccessibleRelation*, instancePtr);
+    aRelation[index] = static_cast<IAccessibleRelation*>(instancePtr);
   }
 
   if (NS_FAILED(rv)) {
@@ -1326,7 +1326,7 @@ nsAccessibleWrap::get_uniqueID(long *uniqueID)
 {
   void *id;
   if (NS_SUCCEEDED(GetUniqueID(&id))) {
-    *uniqueID = NS_REINTERPRET_POINTER_CAST(long, id);
+    *uniqueID = reinterpret_cast<long>(id);
     return S_OK;
   }
   return E_FAIL;
@@ -1337,7 +1337,7 @@ nsAccessibleWrap::get_windowHandle(HWND *windowHandle)
 {
   void **handle = nsnull;
   if (NS_SUCCEEDED(GetOwnerWindow(handle))) {
-    *windowHandle = NS_REINTERPRET_POINTER_CAST(HWND, *handle);
+    *windowHandle = reinterpret_cast<HWND>(*handle);
     return S_OK;
   }
   return E_FAIL;
@@ -1434,7 +1434,7 @@ nsAccessibleWrap::Clone(IEnumVARIANT FAR* FAR* ppenum)
   if (!accessibleWrap)
     return E_FAIL;
 
-  IAccessible *msaaAccessible = NS_STATIC_CAST(IAccessible*, accessibleWrap);
+  IAccessible *msaaAccessible = static_cast<IAccessible*>(accessibleWrap);
   msaaAccessible->AddRef();
   QueryInterface(IID_IEnumVARIANT, (void**)ppenum);
   if (*ppenum)
@@ -1479,7 +1479,7 @@ STDMETHODIMP nsAccessibleWrap::Invoke(DISPID dispIdMember, REFIID riid,
 
 NS_IMETHODIMP nsAccessibleWrap::GetNativeInterface(void **aOutAccessible)
 {
-  *aOutAccessible = NS_STATIC_CAST(IAccessible*, this);
+  *aOutAccessible = static_cast<IAccessible*>(this);
   NS_ADDREF_THIS();
   return NS_OK;
 }
@@ -1637,7 +1637,7 @@ IDispatch *nsAccessibleWrap::NativeAccessible(nsIAccessible *aXPAccessible)
     accObject->GetHwnd(&hwnd);
     if (hwnd) {
       IDispatch *retval = nsnull;
-      AccessibleObjectFromWindow(NS_REINTERPRET_CAST(HWND, hwnd),
+      AccessibleObjectFromWindow(reinterpret_cast<HWND>(hwnd),
         OBJID_WINDOW, IID_IAccessible, (void **) &retval);
       return retval;
     }
@@ -1646,7 +1646,7 @@ IDispatch *nsAccessibleWrap::NativeAccessible(nsIAccessible *aXPAccessible)
   IAccessible *msaaAccessible;
   aXPAccessible->GetNativeInterface((void**)&msaaAccessible);
 
-  return NS_STATIC_CAST(IDispatch*, msaaAccessible);
+  return static_cast<IDispatch*>(msaaAccessible);
 }
 
 
@@ -1658,7 +1658,7 @@ void nsAccessibleWrap::GetXPAccessibleFor(const VARIANT& aVarChild, nsIAccessibl
 
   // if its us real easy - this seems to always be the case
   if (aVarChild.lVal == CHILDID_SELF) {
-    *aXPAccessible = NS_STATIC_CAST(nsIAccessible*, this);
+    *aXPAccessible = static_cast<nsIAccessible*>(this);
   }
   else if (MustPrune(this)) {
     return;
diff --git a/mozilla/accessible/src/msaa/nsApplicationAccessibleWrap.cpp b/mozilla/accessible/src/msaa/nsApplicationAccessibleWrap.cpp
index 841ffa216ca..522945aadea 100755
--- a/mozilla/accessible/src/msaa/nsApplicationAccessibleWrap.cpp
+++ b/mozilla/accessible/src/msaa/nsApplicationAccessibleWrap.cpp
@@ -58,8 +58,8 @@ nsApplicationAccessibleWrap::QueryInterface(REFIID iid, void** ppv)
   *ppv = NULL;
 
   if (IID_IAccessibleApplication == iid) {
-    *ppv = NS_STATIC_CAST(IAccessibleApplication*, this);
-    (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef();
+    *ppv = static_cast<IAccessibleApplication*>(this);
+    (reinterpret_cast<IUnknown*>(*ppv))->AddRef();
     return S_OK;
   }
 
diff --git a/mozilla/accessible/src/msaa/nsDocAccessibleWrap.cpp b/mozilla/accessible/src/msaa/nsDocAccessibleWrap.cpp
index dd4bb57df65..63e189b35a4 100644
--- a/mozilla/accessible/src/msaa/nsDocAccessibleWrap.cpp
+++ b/mozilla/accessible/src/msaa/nsDocAccessibleWrap.cpp
@@ -85,12 +85,12 @@ STDMETHODIMP nsDocAccessibleWrap::QueryInterface(REFIID iid, void** ppv)
   *ppv = NULL;
 
   if (IID_ISimpleDOMDocument == iid)
-    *ppv = NS_STATIC_CAST(ISimpleDOMDocument*, this);
+    *ppv = static_cast<ISimpleDOMDocument*>(this);
 
   if (NULL == *ppv)
     return nsHyperTextAccessibleWrap::QueryInterface(iid, ppv);
     
-  (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef();
+  (reinterpret_cast<IUnknown*>(*ppv))->AddRef();
   return S_OK;
 }
 
@@ -127,7 +127,7 @@ STDMETHODIMP nsDocAccessibleWrap::get_accChild(
     if (xpAccessible) {
       IAccessible *msaaAccessible;
       xpAccessible->GetNativeInterface((void**)&msaaAccessible);
-      *ppdispChild = NS_STATIC_CAST(IDispatch*, msaaAccessible);
+      *ppdispChild = static_cast<IDispatch*>(msaaAccessible);
       return S_OK;
     }
     else if (mDocument) {
diff --git a/mozilla/accessible/src/msaa/nsHyperTextAccessibleWrap.cpp b/mozilla/accessible/src/msaa/nsHyperTextAccessibleWrap.cpp
index b64ef2c1f2f..b800cf549c6 100755
--- a/mozilla/accessible/src/msaa/nsHyperTextAccessibleWrap.cpp
+++ b/mozilla/accessible/src/msaa/nsHyperTextAccessibleWrap.cpp
@@ -67,7 +67,7 @@ nsHyperTextAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent)
           NS_IF_RELEASE(gTextEvent);
 
           CallQueryInterface(aEvent, &gTextEvent);
-          (NS_STATIC_CAST(IUnknown*, instancePtr))->Release();
+          (static_cast<IUnknown*>(instancePtr))->Release();
         }
       }
     }
diff --git a/mozilla/accessible/src/msaa/nsTextAccessibleWrap.cpp b/mozilla/accessible/src/msaa/nsTextAccessibleWrap.cpp
index 36880ae4e7d..a8e9047f5c2 100755
--- a/mozilla/accessible/src/msaa/nsTextAccessibleWrap.cpp
+++ b/mozilla/accessible/src/msaa/nsTextAccessibleWrap.cpp
@@ -78,12 +78,12 @@ STDMETHODIMP nsTextAccessibleWrap::QueryInterface(REFIID iid, void** ppv)
   *ppv = nsnull;
 
   if (IID_IUnknown == iid || IID_ISimpleDOMText == iid)
-    *ppv = NS_STATIC_CAST(ISimpleDOMText*, this);
+    *ppv = static_cast<ISimpleDOMText*>(this);
 
   if (nsnull == *ppv)
     return nsAccessibleWrap::QueryInterface(iid, ppv);
    
-  (NS_REINTERPRET_CAST(IUnknown*, *ppv))->AddRef(); 
+  (reinterpret_cast<IUnknown*>(*ppv))->AddRef(); 
   return S_OK;
 }
 
diff --git a/mozilla/accessible/src/xul/nsXULTreeAccessible.cpp b/mozilla/accessible/src/xul/nsXULTreeAccessible.cpp
index f20933a5f54..a13a74d4417 100644
--- a/mozilla/accessible/src/xul/nsXULTreeAccessible.cpp
+++ b/mozilla/accessible/src/xul/nsXULTreeAccessible.cpp
@@ -567,7 +567,7 @@ NS_IMETHODIMP nsXULTreeitemAccessible::GetName(nsAString& aName)
 NS_IMETHODIMP nsXULTreeitemAccessible::GetUniqueID(void **aUniqueID)
 {
   // Since mDOMNode is same for all tree item, use |this| pointer as the unique Id
-  *aUniqueID = NS_STATIC_CAST(void*, this);
+  *aUniqueID = static_cast<void*>(this);
   return NS_OK;
 }
 
diff --git a/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp b/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp
index 993fe2e64f1..7fffe72d6f6 100644
--- a/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp
+++ b/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp
@@ -2009,7 +2009,7 @@ nsBookmarksService::GetBookmarkToPing(nsIRDFResource **theBookmark)
 void
 nsBookmarksService::FireTimer(nsITimer* aTimer, void* aClosure)
 {
-    nsBookmarksService *bmks = NS_STATIC_CAST(nsBookmarksService *, aClosure);
+    nsBookmarksService *bmks = static_cast<nsBookmarksService *>(aClosure);
     if (!bmks)  return;
     nsresult            rv;
 
@@ -3613,7 +3613,7 @@ CompareLastModifiedFolders(nsIRDFResource* aResource1, nsIRDFResource* aResource
 {
     
     nsCOMPtr<nsIRDFNode> node1, node2;
-    nsIRDFDataSource* outer = NS_STATIC_CAST(nsIRDFDataSource*, aOuter);
+    nsIRDFDataSource* outer = static_cast<nsIRDFDataSource*>(aOuter);
     outer->GetTarget(aResource1, kWEB_LastModifiedDate, PR_TRUE, getter_AddRefs(node1));
     outer->GetTarget(aResource2, kWEB_LastModifiedDate, PR_TRUE, getter_AddRefs(node2));
 
@@ -3666,7 +3666,7 @@ nsBookmarksService::GetLastModifiedFolders(nsISimpleEnumerator **aResult)
     }
 
     // sort the array containing all the folders
-    folderArray.Sort(CompareLastModifiedFolders, NS_STATIC_CAST(void*, mInner));
+    folderArray.Sort(CompareLastModifiedFolders, static_cast<void*>(mInner));
 
     // only keep the first elements
     PRInt32 index;
diff --git a/mozilla/browser/components/feeds/src/nsFeedSniffer.cpp b/mozilla/browser/components/feeds/src/nsFeedSniffer.cpp
index a176c41dd5b..615fdb6c017 100644
--- a/mozilla/browser/components/feeds/src/nsFeedSniffer.cpp
+++ b/mozilla/browser/components/feeds/src/nsFeedSniffer.cpp
@@ -388,7 +388,7 @@ nsFeedSniffer::AppendSegmentToString(nsIInputStream* inputStream,
                                      PRUint32 count,
                                      PRUint32* writeCount)
 {
-  nsCString* decodedData = NS_STATIC_CAST(nsCString*, closure);
+  nsCString* decodedData = static_cast<nsCString*>(closure);
   decodedData->Append(rawSegment, count);
   *writeCount = count;
   return NS_OK;
diff --git a/mozilla/browser/components/migration/src/nsIEProfileMigrator.cpp b/mozilla/browser/components/migration/src/nsIEProfileMigrator.cpp
index ec17e3b09aa..29a870254ad 100644
--- a/mozilla/browser/components/migration/src/nsIEProfileMigrator.cpp
+++ b/mozilla/browser/components/migration/src/nsIEProfileMigrator.cpp
@@ -196,7 +196,7 @@ TranslateDWORDtoPRInt32(nsIWindowsRegKey *aRegKey,
   PRInt32 prefIntValue = 0;
 
   if (NS_SUCCEEDED(aRegKey->ReadIntValue(aRegValueName, 
-                   NS_REINTERPRET_CAST(PRUint32 *, &prefIntValue))))
+                   reinterpret_cast<PRUint32 *>(&prefIntValue))))
     aPrefs->SetIntPref(aPrefKeyName, prefIntValue);
 }
 
diff --git a/mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp b/mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp
index 4ca66f71273..7887d3a3c67 100644
--- a/mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp
+++ b/mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp
@@ -796,7 +796,7 @@ nsOperaCookieMigrator::Migrate()
       break;
     case COOKIE_EXPIRY:
       mStream->Read16(&length);
-      mStream->Read32(NS_REINTERPRET_CAST(PRUint32*, &(mCurrCookie.expiryTime)));
+      mStream->Read32(reinterpret_cast<PRUint32*>(&(mCurrCookie.expiryTime)));
       break;
     case COOKIE_SECURE:
       mCurrCookie.isSecure = PR_TRUE;
@@ -808,7 +808,7 @@ nsOperaCookieMigrator::Migrate()
       {
         mStream->Read16(&length);
         PRTime temp;
-        mStream->Read32(NS_REINTERPRET_CAST(PRUint32*, &temp));
+        mStream->Read32(reinterpret_cast<PRUint32*>(&temp));
       }
       break;
     case COOKIE_COMMENT:
diff --git a/mozilla/browser/components/places/src/nsPlacesImportExportService.cpp b/mozilla/browser/components/places/src/nsPlacesImportExportService.cpp
index 85124f270e3..480f9379a24 100644
--- a/mozilla/browser/components/places/src/nsPlacesImportExportService.cpp
+++ b/mozilla/browser/components/places/src/nsPlacesImportExportService.cpp
@@ -1298,12 +1298,12 @@ BookmarkContentSink::SetFaviconForURI(nsIURI* aPageURI, nsIURI* aIconURI,
     return NS_ERROR_FAILURE;
 
   // read all the decoded data
-  PRUint8* buffer = NS_STATIC_CAST(PRUint8*,
-                                   nsMemory::Alloc(sizeof(PRUint8) * available));
+  PRUint8* buffer = static_cast<PRUint8*>
+                               (nsMemory::Alloc(sizeof(PRUint8) * available));
   if (!buffer)
     return NS_ERROR_OUT_OF_MEMORY;
   PRUint32 numRead;
-  rv = stream->Read(NS_REINTERPRET_CAST(char*, buffer), available, &numRead);
+  rv = stream->Read(reinterpret_cast<char*>(buffer), available, &numRead);
   if (NS_FAILED(rv) || numRead != available) {
     nsMemory::Free(buffer);
     return rv;
@@ -1484,7 +1484,7 @@ static nsresult
 DataToDataURI(PRUint8* aData, PRUint32 aDataLen, const nsACString& aMimeType,
               nsACString& aDataURI)
 {
-  char* encoded = PL_Base64Encode(NS_REINTERPRET_CAST(const char*, aData),
+  char* encoded = PL_Base64Encode(reinterpret_cast<const char*>(aData),
                                   aDataLen, nsnull);
   if (!encoded)
     return NS_ERROR_OUT_OF_MEMORY;
diff --git a/mozilla/caps/include/nsScriptSecurityManager.h b/mozilla/caps/include/nsScriptSecurityManager.h
index c5400a9208c..39cbd299084 100644
--- a/mozilla/caps/include/nsScriptSecurityManager.h
+++ b/mozilla/caps/include/nsScriptSecurityManager.h
@@ -97,7 +97,7 @@ public:
     typedef const nsIPrincipal* KeyTypePointer;
 
     PrincipalKey(const nsIPrincipal* key)
-      : mKey(NS_CONST_CAST(nsIPrincipal*, key))
+      : mKey(const_cast<nsIPrincipal*>(key))
     {
     }
 
@@ -118,7 +118,7 @@ public:
     PRBool KeyEquals(KeyTypePointer aKey) const
     {
         PRBool eq;
-        mKey->Equals(NS_CONST_CAST(nsIPrincipal*, aKey),
+        mKey->Equals(const_cast<nsIPrincipal*>(aKey),
                      &eq);
         return eq;
     }
@@ -131,7 +131,7 @@ public:
     static PLDHashNumber HashKey(KeyTypePointer aKey)
     {
         PRUint32 hash;
-        NS_CONST_CAST(nsIPrincipal*, aKey)->GetHashValue(&hash);
+        const_cast<nsIPrincipal*>(aKey)->GetHashValue(&hash);
         return PLDHashNumber(hash);
     }
 
@@ -352,10 +352,10 @@ MoveClassPolicyEntry(PLDHashTable *table,
     memcpy(to, from, table->entrySize);
 
     // Now update the mDefaultPolicy pointer that points to us, if any.
-    ClassPolicy* cp = NS_STATIC_CAST(ClassPolicy*, to);
+    ClassPolicy* cp = static_cast<ClassPolicy*>(to);
     if (cp->mDomainWeAreWildcardFor) {
         NS_ASSERTION(cp->mDomainWeAreWildcardFor->mWildcardPolicy ==
-                     NS_STATIC_CAST(const ClassPolicy*, from),
+                     static_cast<const ClassPolicy*>(from),
                      "Unexpected wildcard policy on mDomainWeAreWildcardFor");
         cp->mDomainWeAreWildcardFor->mWildcardPolicy = cp;
     }
diff --git a/mozilla/caps/src/nsJSPrincipals.cpp b/mozilla/caps/src/nsJSPrincipals.cpp
index 21da40b8615..efd471ce277 100644
--- a/mozilla/caps/src/nsJSPrincipals.cpp
+++ b/mozilla/caps/src/nsJSPrincipals.cpp
@@ -63,8 +63,8 @@ nsGlobalPrivilegesEnabled(JSContext *cx, JSPrincipals *jsprin)
 JS_STATIC_DLL_CALLBACK(JSBool)
 nsJSPrincipalsSubsume(JSPrincipals *jsprin, JSPrincipals *other)
 {
-    nsJSPrincipals *nsjsprin = NS_STATIC_CAST(nsJSPrincipals *, jsprin);
-    nsJSPrincipals *nsother  = NS_STATIC_CAST(nsJSPrincipals *, other);
+    nsJSPrincipals *nsjsprin = static_cast<nsJSPrincipals *>(jsprin);
+    nsJSPrincipals *nsother  = static_cast<nsJSPrincipals *>(other);
 
     JSBool result;
     nsresult rv = nsjsprin->nsIPrincipalPtr->Subsumes(nsother->nsIPrincipalPtr,
@@ -75,7 +75,7 @@ nsJSPrincipalsSubsume(JSPrincipals *jsprin, JSPrincipals *other)
 JS_STATIC_DLL_CALLBACK(void)
 nsDestroyJSPrincipals(JSContext *cx, struct JSPrincipals *jsprin)
 {
-    nsJSPrincipals *nsjsprin = NS_STATIC_CAST(nsJSPrincipals *, jsprin);
+    nsJSPrincipals *nsjsprin = static_cast<nsJSPrincipals *>(jsprin);
 
     // We need to destroy the nsIPrincipal. We'll do this by adding
     // to the refcount and calling release
@@ -106,7 +106,7 @@ nsTranscodeJSPrincipals(JSXDRState *xdr, JSPrincipals **jsprinp)
 
     if (xdr->mode == JSXDR_ENCODE) {
         nsIObjectOutputStream *stream =
-            NS_REINTERPRET_CAST(nsIObjectOutputStream*, xdr->userdata);
+            reinterpret_cast<nsIObjectOutputStream*>(xdr->userdata);
 
         // Flush xdr'ed data to the underlying object output stream.
         uint32 size;
@@ -121,7 +121,7 @@ nsTranscodeJSPrincipals(JSXDRState *xdr, JSPrincipals **jsprinp)
                 // Require that GetJSPrincipals has been called already by the
                 // code that compiled the script that owns the principals.
                 nsJSPrincipals *nsjsprin =
-                    NS_STATIC_CAST(nsJSPrincipals*, *jsprinp);
+                    static_cast<nsJSPrincipals*>(*jsprinp);
 
                 rv = stream->WriteObject(nsjsprin->nsIPrincipalPtr, PR_TRUE);
             }
@@ -129,7 +129,7 @@ nsTranscodeJSPrincipals(JSXDRState *xdr, JSPrincipals **jsprinp)
     } else {
         NS_ASSERTION(JS_XDRMemDataLeft(xdr) == 0, "XDR out of sync?!");
         nsIObjectInputStream *stream =
-            NS_REINTERPRET_CAST(nsIObjectInputStream*, xdr->userdata);
+            reinterpret_cast<nsIObjectInputStream*>(xdr->userdata);
 
         nsCOMPtr<nsIPrincipal> prin;
         rv = stream->ReadObject(PR_TRUE, getter_AddRefs(prin));
diff --git a/mozilla/caps/src/nsPrincipal.cpp b/mozilla/caps/src/nsPrincipal.cpp
index 4a669cc2c94..78fe6258aa9 100755
--- a/mozilla/caps/src/nsPrincipal.cpp
+++ b/mozilla/caps/src/nsPrincipal.cpp
@@ -235,8 +235,7 @@ nsPrincipal::GetSecurityPolicy(void** aSecurityPolicy)
 NS_IMETHODIMP
 nsPrincipal::SetSecurityPolicy(void* aSecurityPolicy)
 {
-  DomainPolicy *newPolicy = NS_REINTERPRET_CAST(
-                              DomainPolicy *, aSecurityPolicy);
+  DomainPolicy *newPolicy = reinterpret_cast<DomainPolicy *>(aSecurityPolicy);
   if (newPolicy)
     newPolicy->Hold();
  
@@ -932,7 +931,7 @@ nsPrincipal::Read(nsIObjectInputStream* aStream)
       return rv;
     }
 
-    if (!mAnnotations.InsertElementAt(NS_REINTERPRET_CAST(void*, ht), i)) {
+    if (!mAnnotations.InsertElementAt(reinterpret_cast<void*>(ht), i)) {
       delete ht;
       return NS_ERROR_OUT_OF_MEMORY;
     }
@@ -977,7 +976,7 @@ nsPrincipal::Write(nsIObjectOutputStream* aStream)
   }
 
   for (PRInt32 i = 0, n = PRInt32(annotationCount); i < n; i++) {
-    nsHashtable *ht = NS_REINTERPRET_CAST(nsHashtable *, mAnnotations[i]);
+    nsHashtable *ht = reinterpret_cast<nsHashtable *>(mAnnotations[i]);
     rv = ht->Write(aStream, WriteScalarValue);
     if (NS_FAILED(rv)) {
       return rv;
diff --git a/mozilla/caps/src/nsScriptSecurityManager.cpp b/mozilla/caps/src/nsScriptSecurityManager.cpp
index 2d0c27ee5ad..172164fffc5 100644
--- a/mozilla/caps/src/nsScriptSecurityManager.cpp
+++ b/mozilla/caps/src/nsScriptSecurityManager.cpp
@@ -106,7 +106,7 @@ JSValIDToString(JSContext *cx, const jsval idval)
     JSString *str = JS_ValueToString(cx, idval);
     if(!str)
         return nsnull;
-    return NS_REINTERPRET_CAST(PRUnichar*, JS_GetStringChars(str));
+    return reinterpret_cast<PRUnichar*>(JS_GetStringChars(str));
 }
 
 static nsIScriptContext *
@@ -127,7 +127,7 @@ inline void SetPendingException(JSContext *cx, const PRUnichar *aMsg)
 {
     JSAutoRequest ar(cx);
     JSString *str = JS_NewUCStringCopyZ(cx,
-                        NS_REINTERPRET_CAST(const jschar*, aMsg));
+                        reinterpret_cast<const jschar*>(aMsg));
     if (str)
         JS_SetPendingException(cx, STRING_TO_JSVAL(str));
 }
@@ -150,7 +150,7 @@ class ClassInfoData
 public:
     ClassInfoData(nsIClassInfo *aClassInfo, const char *aName)
         : mClassInfo(aClassInfo),
-          mName(NS_CONST_CAST(char *, aName)),
+          mName(const_cast<char *>(aName)),
           mDidGetFlags(PR_FALSE),
           mMustFreeName(PR_FALSE)
     {
@@ -200,7 +200,7 @@ public:
             if (mName) {
                 mMustFreeName = PR_TRUE;
             } else {
-                mName = NS_CONST_CAST(char *, "UnnamedClass");
+                mName = const_cast<char *>("UnnamedClass");
             }
         }
 
@@ -1056,8 +1056,8 @@ nsScriptSecurityManager::LookupPolicy(nsIPrincipal* aPrincipal,
         printf("ClassLookup ");
 #endif
 
-        cpolicy = NS_STATIC_CAST(ClassPolicy*,
-                                 PL_DHashTableOperate(dpolicy,
+        cpolicy = static_cast<ClassPolicy*>
+                             (PL_DHashTableOperate(dpolicy,
                                                       aClassData.GetName(),
                                                       PL_DHASH_LOOKUP));
 
@@ -1076,8 +1076,8 @@ nsScriptSecurityManager::LookupPolicy(nsIPrincipal* aPrincipal,
     PropertyPolicy* ppolicy = nsnull;
     if (cpolicy != NO_POLICY_FOR_CLASS)
     {
-        ppolicy = NS_STATIC_CAST(PropertyPolicy*,
-                                 PL_DHashTableOperate(cpolicy->mPolicy,
+        ppolicy = static_cast<PropertyPolicy*>
+                             (PL_DHashTableOperate(cpolicy->mPolicy,
                                                       (void*)aProperty,
                                                       PL_DHASH_LOOKUP));
     }
@@ -1088,8 +1088,8 @@ nsScriptSecurityManager::LookupPolicy(nsIPrincipal* aPrincipal,
         (!ppolicy || PL_DHASH_ENTRY_IS_FREE(ppolicy)))
     {
         ppolicy =
-            NS_STATIC_CAST(PropertyPolicy*,
-                           PL_DHashTableOperate(dpolicy->mWildcardPolicy->mPolicy,
+            static_cast<PropertyPolicy*>
+                       (PL_DHashTableOperate(dpolicy->mWildcardPolicy->mPolicy,
                                                 (void*)aProperty,
                                                 PL_DHASH_LOOKUP));
     }
@@ -1100,16 +1100,16 @@ nsScriptSecurityManager::LookupPolicy(nsIPrincipal* aPrincipal,
     if (dpolicy != mDefaultPolicy &&
         (!ppolicy || PL_DHASH_ENTRY_IS_FREE(ppolicy)))
     {
-        cpolicy = NS_STATIC_CAST(ClassPolicy*,
-                                 PL_DHashTableOperate(mDefaultPolicy,
+        cpolicy = static_cast<ClassPolicy*>
+                             (PL_DHashTableOperate(mDefaultPolicy,
                                                       aClassData.GetName(),
                                                       PL_DHASH_LOOKUP));
 
         if (PL_DHASH_ENTRY_IS_BUSY(cpolicy))
         {
             ppolicy =
-                NS_STATIC_CAST(PropertyPolicy*,
-                               PL_DHashTableOperate(cpolicy->mPolicy,
+                static_cast<PropertyPolicy*>
+                           (PL_DHashTableOperate(cpolicy->mPolicy,
                                                     (void*)aProperty,
                                                     PL_DHASH_LOOKUP));
         }
@@ -1118,8 +1118,8 @@ nsScriptSecurityManager::LookupPolicy(nsIPrincipal* aPrincipal,
             mDefaultPolicy->mWildcardPolicy)
         {
             ppolicy =
-              NS_STATIC_CAST(PropertyPolicy*,
-                             PL_DHashTableOperate(mDefaultPolicy->mWildcardPolicy->mPolicy,
+              static_cast<PropertyPolicy*>
+                         (PL_DHashTableOperate(mDefaultPolicy->mWildcardPolicy->mPolicy,
                                                   (void*)aProperty,
                                                   PL_DHASH_LOOKUP));
         }
@@ -1833,8 +1833,8 @@ nsScriptSecurityManager::DoGetCertificatePrincipal(const nsACString& aCertFinger
             // Make sure this principal has names, so if we ever go to save it
             // we'll save them.  If we get a name mismatch here we'll throw,
             // but that's desirable.
-            rv = NS_STATIC_CAST(nsPrincipal*,
-                                NS_STATIC_CAST(nsIPrincipal*, fromTable))
+            rv = static_cast<nsPrincipal*>
+                            (static_cast<nsIPrincipal*>(fromTable))
                 ->EnsureCertData(aSubjectName, aPrettyName, aCertificate);
             if (NS_FAILED(rv)) {
                 // We have a subject name mismatch for the same cert id.
@@ -1848,9 +1848,9 @@ nsScriptSecurityManager::DoGetCertificatePrincipal(const nsACString& aCertFinger
         if (!aURI) {
             // We were asked to just get the base certificate, so output
             // what we have in the table.
-            certificate = NS_STATIC_CAST(nsPrincipal*,
-                                         NS_STATIC_CAST(nsIPrincipal*,
-                                                        fromTable));
+            certificate = static_cast<nsPrincipal*>
+                                     (static_cast<nsIPrincipal*>
+                                                 (fromTable));
         } else {
             // We found a certificate and now need to install a codebase
             // on it.  We don't want to modify the principal in the hash
@@ -2040,7 +2040,7 @@ nsScriptSecurityManager::GetScriptPrincipal(JSContext *cx,
         // Script didn't have principals -- shouldn't happen.
         return nsnull;
     }
-    nsJSPrincipals *nsJSPrin = NS_STATIC_CAST(nsJSPrincipals *, jsp);
+    nsJSPrincipals *nsJSPrin = static_cast<nsJSPrincipals *>(jsp);
     nsIPrincipal* result = nsJSPrin->nsIPrincipalPtr;
     if (!result)
         *rv = NS_ERROR_FAILURE;
@@ -3236,7 +3236,7 @@ nsScriptSecurityManager::SystemPrincipalSingletonConstructor()
     nsIPrincipal *sysprin = nsnull;
     if (gScriptSecMan)
         NS_ADDREF(sysprin = gScriptSecMan->mSystemPrincipal);
-    return NS_STATIC_CAST(nsSystemPrincipal*, sysprin);
+    return static_cast<nsSystemPrincipal*>(sysprin);
 }
 
 nsresult
@@ -3468,7 +3468,7 @@ nsScriptSecurityManager::InitDomainPolicy(JSContext* cx,
         {  //-- pref value is the name of a capability
             nsCStringKey secLevelKey(prefValue);
             secLevel.capability =
-                NS_REINTERPRET_CAST(char*, mCapabilities->Get(&secLevelKey));
+                reinterpret_cast<char*>(mCapabilities->Get(&secLevelKey));
             if (!secLevel.capability)
             {
                 secLevel.capability = NS_strdup(prefValue);
@@ -3482,8 +3482,8 @@ nsScriptSecurityManager::InitDomainPolicy(JSContext* cx,
         *end = '\0';
         // Find or store this class in the classes table
         ClassPolicy* cpolicy = 
-          NS_STATIC_CAST(ClassPolicy*,
-                         PL_DHashTableOperate(aDomainPolicy, start,
+          static_cast<ClassPolicy*>
+                     (PL_DHashTableOperate(aDomainPolicy, start,
                                               PL_DHASH_ADD));
         if (!cpolicy)
             break;
@@ -3513,10 +3513,10 @@ nsScriptSecurityManager::InitDomainPolicy(JSContext* cx,
 
         // Store this property in the class policy
         const void* ppkey =
-          NS_REINTERPRET_CAST(const void*, STRING_TO_JSVAL(propertyKey));
+          reinterpret_cast<const void*>(STRING_TO_JSVAL(propertyKey));
         PropertyPolicy* ppolicy = 
-          NS_STATIC_CAST(PropertyPolicy*,
-                         PL_DHashTableOperate(cpolicy->mPolicy, ppkey,
+          static_cast<PropertyPolicy*>
+                     (PL_DHashTableOperate(cpolicy->mPolicy, ppkey,
                                               PL_DHASH_ADD));
         if (!ppolicy)
             break;
diff --git a/mozilla/chrome/src/nsChromeRegistry.cpp b/mozilla/chrome/src/nsChromeRegistry.cpp
index b75d488d7c3..604892997da 100644
--- a/mozilla/chrome/src/nsChromeRegistry.cpp
+++ b/mozilla/chrome/src/nsChromeRegistry.cpp
@@ -251,7 +251,7 @@ nsChromeRegistry::nsProviderArray::GetProvider(const nsACString& aPreferred, Mat
   ProviderEntry* entry;
 
   while (i--) {
-    entry = NS_REINTERPRET_CAST(ProviderEntry*, mArray[i]);
+    entry = reinterpret_cast<ProviderEntry*>(mArray[i]);
     if (aPreferred.Equals(entry->provider))
       return entry;
 
@@ -318,7 +318,7 @@ nsChromeRegistry::nsProviderArray::EnumerateToArray(nsCStringArray *a)
 {
   PRInt32 i = mArray.Count();
   while (i--) {
-    ProviderEntry *entry = NS_REINTERPRET_CAST(ProviderEntry*, mArray[i]);
+    ProviderEntry *entry = reinterpret_cast<ProviderEntry*>(mArray[i]);
     a->AppendCString(entry->provider);
   }
 }
@@ -328,7 +328,7 @@ nsChromeRegistry::nsProviderArray::Clear()
 {
   PRInt32 i = mArray.Count();
   while (i--) {
-    ProviderEntry* entry = NS_REINTERPRET_CAST(ProviderEntry*, mArray[i]);
+    ProviderEntry* entry = reinterpret_cast<ProviderEntry*>(mArray[i]);
     delete entry;
   }
 
@@ -343,7 +343,7 @@ nsChromeRegistry::PackageEntry::PackageEntry(const nsACString& aPackage) :
 PLHashNumber
 nsChromeRegistry::HashKey(PLDHashTable *table, const void *key)
 {
-  const nsACString& str = *NS_REINTERPRET_CAST(const nsACString*, key);
+  const nsACString& str = *reinterpret_cast<const nsACString*>(key);
   return HashString(str);
 }
 
@@ -351,15 +351,15 @@ PRBool
 nsChromeRegistry::MatchKey(PLDHashTable *table, const PLDHashEntryHdr *entry,
                            const void *key)
 {
-  const nsACString& str = *NS_REINTERPRET_CAST(const nsACString*, key);
-  const PackageEntry* pentry = NS_STATIC_CAST(const PackageEntry*, entry);
+  const nsACString& str = *reinterpret_cast<const nsACString*>(key);
+  const PackageEntry* pentry = static_cast<const PackageEntry*>(entry);
   return str.Equals(pentry->package);
 }
 
 void
 nsChromeRegistry::ClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry)
 {
-  PackageEntry* pentry = NS_STATIC_CAST(PackageEntry*, entry);
+  PackageEntry* pentry = static_cast<PackageEntry*>(entry);
   pentry->~PackageEntry();
 }
 
@@ -367,7 +367,7 @@ PRBool
 nsChromeRegistry::InitEntry(PLDHashTable *table, PLDHashEntryHdr *entry,
                             const void *key)
 {
-  const nsACString& str = *NS_REINTERPRET_CAST(const nsACString*, key);
+  const nsACString& str = *reinterpret_cast<const nsACString*>(key);
 
   new (entry) PackageEntry(str);
   return PR_TRUE;
@@ -701,7 +701,7 @@ nsChromeRegistry::ConvertChromeURL(nsIURI* aChromeURI, nsIURI* *aResult)
   NS_ENSURE_SUCCESS(rv, rv);
 
   PackageEntry* entry =
-    NS_STATIC_CAST(PackageEntry*, PL_DHashTableOperate(&mPackagesHash,
+    static_cast<PackageEntry*>(PL_DHashTableOperate(&mPackagesHash,
                                                        & (nsACString&) package,
                                                        PL_DHASH_LOOKUP));
 
@@ -749,7 +749,7 @@ nsresult
 nsChromeRegistry::GetSelectedLocale(const nsACString& aPackage, nsACString& aLocale)
 {
   PackageEntry* entry =
-    NS_STATIC_CAST(PackageEntry*, PL_DHashTableOperate(&mPackagesHash,
+    static_cast<PackageEntry*>(PL_DHashTableOperate(&mPackagesHash,
                                                        & aPackage,
                                                        PL_DHASH_LOOKUP));
 
@@ -772,7 +772,7 @@ nsChromeRegistry::GetLocalesForPackage(const nsACString& aPackage,
     return NS_ERROR_OUT_OF_MEMORY;
 
   PackageEntry* entry =
-    NS_STATIC_CAST(PackageEntry*, PL_DHashTableOperate(&mPackagesHash,
+    static_cast<PackageEntry*>(PL_DHashTableOperate(&mPackagesHash,
                                                        & aPackage,
                                                        PL_DHASH_LOOKUP));
 
@@ -883,7 +883,7 @@ nsChromeRegistry::FlushSkinCaches()
     do_GetService("@mozilla.org/observer-service;1");
   NS_ASSERTION(obsSvc, "Couldn't get observer service.");
 
-  obsSvc->NotifyObservers(NS_STATIC_CAST(nsIChromeRegistry*, this),
+  obsSvc->NotifyObservers(static_cast<nsIChromeRegistry*>(this),
                           NS_CHROME_FLUSH_SKINS_TOPIC, nsnull);
 }
 
@@ -2158,7 +2158,7 @@ nsChromeRegistry::ProcessManifestBuffer(char *buf, PRInt32 length,
         continue;
 
       PackageEntry* entry =
-        NS_STATIC_CAST(PackageEntry*, PL_DHashTableOperate(&mPackagesHash,
+        static_cast<PackageEntry*>(PL_DHashTableOperate(&mPackagesHash,
                                                             & (const nsACString&) nsDependentCString(package),
                                                             PL_DHASH_ADD));
       if (!entry)
@@ -2227,7 +2227,7 @@ nsChromeRegistry::ProcessManifestBuffer(char *buf, PRInt32 length,
         continue;
 
       PackageEntry* entry =
-        NS_STATIC_CAST(PackageEntry*, PL_DHashTableOperate(&mPackagesHash,
+        static_cast<PackageEntry*>(PL_DHashTableOperate(&mPackagesHash,
                                                             & (const nsACString&) nsDependentCString(package),
                                                             PL_DHASH_ADD));
       if (!entry)
@@ -2277,7 +2277,7 @@ nsChromeRegistry::ProcessManifestBuffer(char *buf, PRInt32 length,
         continue;
 
       PackageEntry* entry =
-        NS_STATIC_CAST(PackageEntry*, PL_DHashTableOperate(&mPackagesHash,
+        static_cast<PackageEntry*>(PL_DHashTableOperate(&mPackagesHash,
                                                             & (const nsACString&) nsDependentCString(package),
                                                             PL_DHASH_ADD));
       if (!entry)
diff --git a/mozilla/content/base/public/nsContentUtils.h b/mozilla/content/base/public/nsContentUtils.h
index f0c2ca36d21..8587fd013ed 100644
--- a/mozilla/content/base/public/nsContentUtils.h
+++ b/mozilla/content/base/public/nsContentUtils.h
@@ -979,7 +979,7 @@ public:
   static void DestroyMatchString(void* aData)
   {
     if (aData) {
-      nsString* matchString = NS_STATIC_CAST(nsString*, aData);
+      nsString* matchString = static_cast<nsString*>(aData);
       delete matchString;
     }
   }
@@ -1205,7 +1205,7 @@ private:
 
 #define NS_INTERFACE_MAP_ENTRY_TEAROFF(_interface, _allocator)                \
   if (aIID.Equals(NS_GET_IID(_interface))) {                                  \
-    foundInterface = NS_STATIC_CAST(_interface *, _allocator);                \
+    foundInterface = static_cast<_interface *>(_allocator);                \
     if (!foundInterface) {                                                    \
       *aInstancePtr = nsnull;                                                 \
       return NS_ERROR_OUT_OF_MEMORY;                                          \
diff --git a/mozilla/content/base/public/nsINode.h b/mozilla/content/base/public/nsINode.h
index d06e9e259ea..67dc1671c29 100644
--- a/mozilla/content/base/public/nsINode.h
+++ b/mozilla/content/base/public/nsINode.h
@@ -101,8 +101,8 @@ class nsNodeSupportsWeakRefTearoff;
 // Returns the first argument cast to nsINode if it is non-null, otherwise
 // returns the second (which may be null)
 #define NODE_FROM(content_, document_)                  \
-  ((content_) ? NS_STATIC_CAST(nsINode*, (content_)) :  \
-                NS_STATIC_CAST(nsINode*, (document_)))
+  ((content_) ? static_cast<nsINode*>((content_)) :  \
+                static_cast<nsINode*>((document_)))
 
 
 // IID for the nsINode interface
@@ -460,8 +460,8 @@ public:
   nsIContent* GetParent() const
   {
     return NS_LIKELY(mParentPtrBits & PARENT_BIT_PARENT_IS_CONTENT) ?
-           NS_REINTERPRET_CAST(nsIContent*,
-                               mParentPtrBits & ~kParentBitMask) :
+           reinterpret_cast<nsIContent*>
+                           (mParentPtrBits & ~kParentBitMask) :
            nsnull;
   }
 
@@ -472,7 +472,7 @@ public:
    */
   nsINode* GetNodeParent() const
   {
-    return NS_REINTERPRET_CAST(nsINode*, mParentPtrBits & ~kParentBitMask);
+    return reinterpret_cast<nsINode*>(mParentPtrBits & ~kParentBitMask);
   }
 
   /**
@@ -621,7 +621,7 @@ protected:
   nsSlots* FlagsAsSlots() const
   {
     NS_ASSERTION(HasSlots(), "check HasSlots first");
-    return NS_REINTERPRET_CAST(nsSlots*, mFlagsOrSlots);
+    return reinterpret_cast<nsSlots*>(mFlagsOrSlots);
   }
 
   nsSlots* GetExistingSlots() const
@@ -637,7 +637,7 @@ protected:
 
     nsSlots* slots = CreateSlots();
     if (slots) {
-      mFlagsOrSlots = NS_REINTERPRET_CAST(PtrBits, slots);
+      mFlagsOrSlots = reinterpret_cast<PtrBits>(slots);
     }
 
     return slots;
diff --git a/mozilla/content/base/src/mozSanitizingSerializer.cpp b/mozilla/content/base/src/mozSanitizingSerializer.cpp
index 163d9a59657..53359478541 100644
--- a/mozilla/content/base/src/mozSanitizingSerializer.cpp
+++ b/mozilla/content/base/src/mozSanitizingSerializer.cpp
@@ -300,7 +300,7 @@ mozSanitizingHTMLSerializer::OpenContainer(const nsIParserNode& aNode)
 {
   PRInt32 type = aNode.GetNodeType();
 
-  mParserNode = NS_CONST_CAST(nsIParserNode *, &aNode);
+  mParserNode = const_cast<nsIParserNode *>(&aNode);
   return DoOpenContainer(type);
 }
 
@@ -316,7 +316,7 @@ mozSanitizingHTMLSerializer::AddLeaf(const nsIParserNode& aNode)
   eHTMLTags type = (eHTMLTags)aNode.GetNodeType();
   const nsAString& text = aNode.GetText();
 
-  mParserNode = NS_CONST_CAST(nsIParserNode*, &aNode);
+  mParserNode = const_cast<nsIParserNode*>(&aNode);
   return DoAddLeaf(type, text);
 }
 
diff --git a/mozilla/content/base/src/nsAttrAndChildArray.cpp b/mozilla/content/base/src/nsAttrAndChildArray.cpp
index c79518279af..58e0c5211ab 100644
--- a/mozilla/content/base/src/nsAttrAndChildArray.cpp
+++ b/mozilla/content/base/src/nsAttrAndChildArray.cpp
@@ -113,7 +113,7 @@ GetIndexFromCache(const nsAttrAndChildArray* aArray)
  * See Bug 231104 for more information.
  */
 #define ATTRS(_impl) \
-  NS_REINTERPRET_CAST(InternalAttr*, &((_impl)->mBuffer[0]))
+  reinterpret_cast<InternalAttr*>(&((_impl)->mBuffer[0]))
   
 
 #define NS_IMPL_EXTRA_SIZE \
@@ -213,7 +213,7 @@ nsAttrAndChildArray::RemoveChildAt(PRUint32 aPos)
 
   PRUint32 childCount = ChildCount();
   void** pos = mImpl->mBuffer + AttrSlotsSize() + aPos;
-  nsIContent* child = NS_STATIC_CAST(nsIContent*, *pos);
+  nsIContent* child = static_cast<nsIContent*>(*pos);
   NS_RELEASE(child);
   memmove(pos, pos + 1, (childCount - aPos - 1) * sizeof(nsIContent*));
   SetChildCount(childCount - 1);
@@ -265,7 +265,7 @@ nsAttrAndChildArray::IndexOfChild(nsINode* aPossibleChild) const
         if (children[cursor] == aPossibleChild) {
           AddIndexToCache(this, cursor);
 
-          return NS_STATIC_CAST(PRInt32, cursor);
+          return static_cast<PRInt32>(cursor);
         }
       }
     }
@@ -274,7 +274,7 @@ nsAttrAndChildArray::IndexOfChild(nsINode* aPossibleChild) const
         if (children[cursor] == aPossibleChild) {
           AddIndexToCache(this, cursor);
 
-          return NS_STATIC_CAST(PRInt32, cursor);
+          return static_cast<PRInt32>(cursor);
         }
       }
     }
@@ -285,7 +285,7 @@ nsAttrAndChildArray::IndexOfChild(nsINode* aPossibleChild) const
 
   for (i = 0; i < count; ++i) {
     if (children[i] == aPossibleChild) {
-      return NS_STATIC_CAST(PRInt32, i);
+      return static_cast<PRInt32>(i);
     }
   }
 
@@ -497,7 +497,7 @@ nsAttrAndChildArray::GetSafeAttrNameAt(PRUint32 aPos) const
     return nsnull;
   }
 
-  return &NS_REINTERPRET_CAST(InternalAttr*, pos)->mName;
+  return &reinterpret_cast<InternalAttr*>(pos)->mName;
 }
 
 const nsAttrName*
@@ -619,7 +619,7 @@ nsAttrAndChildArray::Compact()
     mImpl = nsnull;
   }
   else if (newSize < mImpl->mBufferSize) {
-    mImpl = NS_STATIC_CAST(Impl*, PR_Realloc(mImpl, (newSize + NS_IMPL_EXTRA_SIZE) * sizeof(nsIContent*)));
+    mImpl = static_cast<Impl*>(PR_Realloc(mImpl, (newSize + NS_IMPL_EXTRA_SIZE) * sizeof(nsIContent*)));
     NS_ASSERTION(mImpl, "failed to reallocate to smaller buffer");
 
     mImpl->mBufferSize = newSize;
@@ -644,7 +644,7 @@ nsAttrAndChildArray::Clear()
 
   PRUint32 end = slotCount * ATTRSIZE + ChildCount();
   for (i = slotCount * ATTRSIZE; i < end; ++i) {
-    nsIContent* child = NS_STATIC_CAST(nsIContent*, mImpl->mBuffer[i]);
+    nsIContent* child = static_cast<nsIContent*>(mImpl->mBuffer[i]);
     // making this PR_FALSE so tree teardown doesn't end up being
     // O(N*D) (number of nodes times average depth of tree).
     child->UnbindFromTree(PR_FALSE); // XXX is it better to let the owner do this?
@@ -755,8 +755,8 @@ nsAttrAndChildArray::GrowBy(PRUint32 aGrowSize)
     size = PR_BIT(PR_CeilingLog2(minSize));
   }
 
-  Impl* newImpl = NS_STATIC_CAST(Impl*,
-      mImpl ? PR_Realloc(mImpl, size * sizeof(void*)) :
+  Impl* newImpl = static_cast<Impl*>
+                             (mImpl ? PR_Realloc(mImpl, size * sizeof(void*)) :
               PR_Malloc(size * sizeof(void*)));
   NS_ENSURE_TRUE(newImpl, PR_FALSE);
 
diff --git a/mozilla/content/base/src/nsAttrAndChildArray.h b/mozilla/content/base/src/nsAttrAndChildArray.h
index 07816861d47..5f475a8bad9 100644
--- a/mozilla/content/base/src/nsAttrAndChildArray.h
+++ b/mozilla/content/base/src/nsAttrAndChildArray.h
@@ -85,7 +85,7 @@ public:
   nsIContent* ChildAt(PRUint32 aPos) const
   {
     NS_ASSERTION(aPos < ChildCount(), "out-of-bounds access in nsAttrAndChildArray");
-    return NS_REINTERPRET_CAST(nsIContent*, mImpl->mBuffer[AttrSlotsSize() + aPos]);
+    return reinterpret_cast<nsIContent*>(mImpl->mBuffer[AttrSlotsSize() + aPos]);
   }
   nsIContent* GetSafeChildAt(PRUint32 aPos) const;
   nsresult AppendChild(nsIContent* aChild)
diff --git a/mozilla/content/base/src/nsAttrName.h b/mozilla/content/base/src/nsAttrName.h
index 8a0714cc606..652a6d72714 100644
--- a/mozilla/content/base/src/nsAttrName.h
+++ b/mozilla/content/base/src/nsAttrName.h
@@ -62,7 +62,7 @@ public:
   }
 
   explicit nsAttrName(nsIAtom* aAtom)
-    : mBits(NS_REINTERPRET_CAST(PtrBits, aAtom))
+    : mBits(reinterpret_cast<PtrBits>(aAtom))
   {
     NS_ASSERTION(aAtom, "null atom-name in nsAttrName");
     NS_ADDREF(aAtom);
@@ -72,11 +72,11 @@ public:
   {
     NS_ASSERTION(aNodeInfo, "null nodeinfo-name in nsAttrName");
     if (aNodeInfo->NamespaceEquals(kNameSpaceID_None)) {
-      mBits = NS_REINTERPRET_CAST(PtrBits, aNodeInfo->NameAtom());
+      mBits = reinterpret_cast<PtrBits>(aNodeInfo->NameAtom());
       NS_ADDREF(aNodeInfo->NameAtom());
     }
     else {
-      mBits = NS_REINTERPRET_CAST(PtrBits, aNodeInfo) |
+      mBits = reinterpret_cast<PtrBits>(aNodeInfo) |
               NS_ATTRNAME_NODEINFO_BIT;
       NS_ADDREF(aNodeInfo);
     }
@@ -93,11 +93,11 @@ public:
 
     ReleaseInternalName();
     if (aNodeInfo->NamespaceEquals(kNameSpaceID_None)) {
-      mBits = NS_REINTERPRET_CAST(PtrBits, aNodeInfo->NameAtom());
+      mBits = reinterpret_cast<PtrBits>(aNodeInfo->NameAtom());
       NS_ADDREF(aNodeInfo->NameAtom());
     }
     else {
-      mBits = NS_REINTERPRET_CAST(PtrBits, aNodeInfo) |
+      mBits = reinterpret_cast<PtrBits>(aNodeInfo) |
               NS_ATTRNAME_NODEINFO_BIT;
       NS_ADDREF(aNodeInfo);
     }
@@ -108,7 +108,7 @@ public:
     NS_ASSERTION(aAtom, "null atom-name in nsAttrName");
 
     ReleaseInternalName();
-    mBits = NS_REINTERPRET_CAST(PtrBits, aAtom);
+    mBits = reinterpret_cast<PtrBits>(aAtom);
     NS_ADDREF(aAtom);
   }
 
@@ -120,13 +120,13 @@ public:
   nsINodeInfo* NodeInfo() const
   {
     NS_ASSERTION(!IsAtom(), "getting nodeinfo-value of atom-name");
-    return NS_REINTERPRET_CAST(nsINodeInfo*, mBits & ~NS_ATTRNAME_NODEINFO_BIT);
+    return reinterpret_cast<nsINodeInfo*>(mBits & ~NS_ATTRNAME_NODEINFO_BIT);
   }
 
   nsIAtom* Atom() const
   {
     NS_ASSERTION(IsAtom(), "getting atom-value of nodeinfo-name");
-    return NS_REINTERPRET_CAST(nsIAtom*, mBits);
+    return reinterpret_cast<nsIAtom*>(mBits);
   }
 
   PRBool Equals(const nsAttrName& aOther) const
@@ -137,7 +137,7 @@ public:
   // Faster comparison in the case we know the namespace is null
   PRBool Equals(nsIAtom* aAtom) const
   {
-    return NS_REINTERPRET_CAST(PtrBits, aAtom) == mBits;
+    return reinterpret_cast<PtrBits>(aAtom) == mBits;
   }
 
   PRBool Equals(nsIAtom* aLocalName, PRInt32 aNamespaceID) const
@@ -211,7 +211,7 @@ public:
 
   PRBool IsSmaller(nsIAtom* aOther) const
   {
-    return mBits < NS_REINTERPRET_CAST(PtrBits, aOther);
+    return mBits < reinterpret_cast<PtrBits>(aOther);
   }
 
 private:
@@ -220,8 +220,8 @@ private:
   {
     // Since both nsINodeInfo and nsIAtom inherit nsISupports as its first
     // interface we can safely assume that it's first in the vtable
-    nsISupports* name = NS_REINTERPRET_CAST(nsISupports *,
-      mBits & ~NS_ATTRNAME_NODEINFO_BIT);
+    nsISupports* name = reinterpret_cast<nsISupports *>
+                                        (mBits & ~NS_ATTRNAME_NODEINFO_BIT);
 
     NS_ADDREF(name);
   }
@@ -230,8 +230,8 @@ private:
   {
     // Since both nsINodeInfo and nsIAtom inherit nsISupports as its first
     // interface we can safely assume that it's first in the vtable
-    nsISupports* name = NS_REINTERPRET_CAST(nsISupports *,
-      mBits & ~NS_ATTRNAME_NODEINFO_BIT);
+    nsISupports* name = reinterpret_cast<nsISupports *>
+                                        (mBits & ~NS_ATTRNAME_NODEINFO_BIT);
 
     NS_RELEASE(name);
   }
diff --git a/mozilla/content/base/src/nsAttrValue.cpp b/mozilla/content/base/src/nsAttrValue.cpp
index 9e8be91fd5f..a03ab03b54f 100644
--- a/mozilla/content/base/src/nsAttrValue.cpp
+++ b/mozilla/content/base/src/nsAttrValue.cpp
@@ -118,7 +118,7 @@ nsAttrValue::Type() const
   switch (BaseType()) {
     case eIntegerBase:
     {
-      return NS_STATIC_CAST(ValueType, mBits & NS_ATTRVALUE_INTEGERTYPE_MASK);
+      return static_cast<ValueType>(mBits & NS_ATTRVALUE_INTEGERTYPE_MASK);
     }
     case eOtherBase:
     {
@@ -126,7 +126,7 @@ nsAttrValue::Type() const
     }
     default:
     {
-      return NS_STATIC_CAST(ValueType, NS_STATIC_CAST(PRUint16, BaseType()));
+      return static_cast<ValueType>(static_cast<PRUint16>(BaseType()));
     }
   }
 }
@@ -137,7 +137,7 @@ nsAttrValue::Reset()
   switch(BaseType()) {
     case eStringBase:
     {
-      nsStringBuffer* str = NS_STATIC_CAST(nsStringBuffer*, GetPtr());
+      nsStringBuffer* str = static_cast<nsStringBuffer*>(GetPtr());
       if (str) {
         str->Release();
       }
@@ -174,7 +174,7 @@ nsAttrValue::SetTo(const nsAttrValue& aOther)
     case eStringBase:
     {
       ResetIfSet();
-      nsStringBuffer* str = NS_STATIC_CAST(nsStringBuffer*, aOther.GetPtr());
+      nsStringBuffer* str = static_cast<nsStringBuffer*>(aOther.GetPtr());
       if (str) {
         str->AddRef();
         SetPtrValueAndType(str, eStringBase);
@@ -257,7 +257,7 @@ nsAttrValue::SetTo(const nsAString& aValue)
     if (!buf) {
       return;
     }
-    PRUnichar *data = NS_STATIC_CAST(PRUnichar*, buf->Data());
+    PRUnichar *data = static_cast<PRUnichar*>(buf->Data());
     CopyUnicodeTo(aValue, 0, data, len);
     data[len] = PRUnichar(0);
 
@@ -308,7 +308,7 @@ nsAttrValue::ToString(nsAString& aResult) const
   switch(Type()) {
     case eString:
     {
-      nsStringBuffer* str = NS_STATIC_CAST(nsStringBuffer*, GetPtr());
+      nsStringBuffer* str = static_cast<nsStringBuffer*>(GetPtr());
       if (str) {
         str->ToString(str->StorageSize()/sizeof(PRUnichar) - 1, aResult);
       }
@@ -319,7 +319,7 @@ nsAttrValue::ToString(nsAString& aResult) const
     }
     case eAtom:
     {
-      nsIAtom *atom = NS_STATIC_CAST(nsIAtom*, GetPtr());
+      nsIAtom *atom = static_cast<nsIAtom*>(GetPtr());
       atom->ToString(aResult);
 
       break;
@@ -417,7 +417,7 @@ nsAttrValue::GetStringValue() const
 {
   NS_PRECONDITION(Type() == eString, "wrong type");
 
-  return nsCheapString(NS_STATIC_CAST(nsStringBuffer*, GetPtr()));
+  return nsCheapString(static_cast<nsStringBuffer*>(GetPtr()));
 }
 
 PRBool
@@ -437,7 +437,7 @@ nsAttrValue::GetColorValue(nscolor& aColor) const
     }
     case eIntegerBase:
     {
-      aColor = NS_STATIC_CAST(nscolor, GetIntInternal());
+      aColor = static_cast<nscolor>(GetIntInternal());
       
       break;
     }
@@ -489,10 +489,10 @@ nsAttrValue::HashValue() const
   switch(BaseType()) {
     case eStringBase:
     {
-      nsStringBuffer* str = NS_STATIC_CAST(nsStringBuffer*, GetPtr());
+      nsStringBuffer* str = static_cast<nsStringBuffer*>(GetPtr());
       if (str) {
         PRUint32 len = str->StorageSize()/sizeof(PRUnichar) - 1;
-        return nsCRT::BufferHashCode(NS_STATIC_CAST(PRUnichar*, str->Data()), len);
+        return nsCRT::BufferHashCode(static_cast<PRUnichar*>(str->Data()), len);
       }
 
       return 0;
@@ -622,9 +622,9 @@ nsAttrValue::Equals(const nsAString& aValue,
   switch (BaseType()) {
     case eStringBase:
     {
-      nsStringBuffer* str = NS_STATIC_CAST(nsStringBuffer*, GetPtr());
+      nsStringBuffer* str = static_cast<nsStringBuffer*>(GetPtr());
       if (str) {
-        nsDependentString dep(NS_STATIC_CAST(PRUnichar*, str->Data()),
+        nsDependentString dep(static_cast<PRUnichar*>(str->Data()),
                               str->StorageSize()/sizeof(PRUnichar) - 1);
         return aCaseSensitive == eCaseMatters ? aValue.Equals(dep) :
           aValue.Equals(dep, nsCaseInsensitiveStringComparator());
@@ -634,7 +634,7 @@ nsAttrValue::Equals(const nsAString& aValue,
     case eAtomBase:
       // Need a way to just do case-insensitive compares on atoms..
       if (aCaseSensitive == eCaseMatters) {
-        return NS_STATIC_CAST(nsIAtom*, GetPtr())->Equals(aValue);;
+        return static_cast<nsIAtom*>(GetPtr())->Equals(aValue);;
       }
     default:
       break;
@@ -659,9 +659,9 @@ nsAttrValue::Equals(nsIAtom* aValue, nsCaseTreatment aCaseSensitive) const
   switch (BaseType()) {
     case eStringBase:
     {
-      nsStringBuffer* str = NS_STATIC_CAST(nsStringBuffer*, GetPtr());
+      nsStringBuffer* str = static_cast<nsStringBuffer*>(GetPtr());
       if (str) {
-        nsDependentString dep(NS_STATIC_CAST(PRUnichar*, str->Data()),
+        nsDependentString dep(static_cast<PRUnichar*>(str->Data()),
                               str->StorageSize()/sizeof(PRUnichar) - 1);
         return aValue->Equals(dep);
       }
@@ -669,7 +669,7 @@ nsAttrValue::Equals(nsIAtom* aValue, nsCaseTreatment aCaseSensitive) const
     }
     case eAtomBase:
     {
-      return NS_STATIC_CAST(nsIAtom*, GetPtr()) == aValue;
+      return static_cast<nsIAtom*>(GetPtr()) == aValue;
     }
     default:
       break;
@@ -971,7 +971,7 @@ nsAttrValue::ParseColor(const nsAString& aString, nsIDocument* aDocument)
     }
   }
 
-  PRInt32 colAsInt = NS_STATIC_CAST(PRInt32, color);
+  PRInt32 colAsInt = static_cast<PRInt32>(color);
   PRInt32 tmp = colAsInt * NS_ATTRVALUE_INTEGERTYPE_MULTIPLIER;
   if (tmp / NS_ATTRVALUE_INTEGERTYPE_MULTIPLIER == colAsInt) {
     ResetIfSet();
diff --git a/mozilla/content/base/src/nsAttrValue.h b/mozilla/content/base/src/nsAttrValue.h
index 15dbef316a6..9672633249c 100644
--- a/mozilla/content/base/src/nsAttrValue.h
+++ b/mozilla/content/base/src/nsAttrValue.h
@@ -298,7 +298,7 @@ inline nsIAtom*
 nsAttrValue::GetAtomValue() const
 {
   NS_PRECONDITION(Type() == eAtom, "wrong type");
-  return NS_REINTERPRET_CAST(nsIAtom*, GetPtr());
+  return reinterpret_cast<nsIAtom*>(GetPtr());
 }
 
 inline PRInt32
@@ -321,15 +321,15 @@ nsAttrValue::GetEnumValue() const
   NS_PRECONDITION(Type() == eEnum, "wrong type");
   // We don't need to worry about sign extension here since we're
   // returning an PRInt16 which will cut away the top bits.
-  return NS_STATIC_CAST(PRInt16,
-            GetIntInternal() >> NS_ATTRVALUE_ENUMTABLEINDEX_BITS);
+  return static_cast<PRInt16>
+                    (GetIntInternal() >> NS_ATTRVALUE_ENUMTABLEINDEX_BITS);
 }
 
 inline float
 nsAttrValue::GetPercentValue() const
 {
   NS_PRECONDITION(Type() == ePercent, "wrong type");
-  return NS_STATIC_CAST(float, GetIntInternal()) /
+  return static_cast<float>(GetIntInternal()) /
          100.0f;
 }
 
@@ -359,7 +359,7 @@ nsAttrValue::GetSVGValue() const
 inline nsAttrValue::ValueBaseType
 nsAttrValue::BaseType() const
 {
-  return NS_STATIC_CAST(ValueBaseType, mBits & NS_ATTRVALUE_BASETYPE_MASK);
+  return static_cast<ValueBaseType>(mBits & NS_ATTRVALUE_BASETYPE_MASK);
 }
 
 inline void
@@ -367,7 +367,7 @@ nsAttrValue::SetPtrValueAndType(void* aValue, ValueBaseType aType)
 {
   NS_ASSERTION(!(NS_PTR_TO_INT32(aValue) & ~NS_ATTRVALUE_POINTERVALUE_MASK),
                "pointer not properly aligned, this will crash");
-  mBits = NS_REINTERPRET_CAST(PtrBits, aValue) | aType;
+  mBits = reinterpret_cast<PtrBits>(aValue) | aType;
 }
 
 inline void
@@ -396,14 +396,14 @@ nsAttrValue::GetPtr() const
 {
   NS_ASSERTION(BaseType() != eIntegerBase,
                "getting pointer from non-pointer");
-  return NS_REINTERPRET_CAST(void*, mBits & NS_ATTRVALUE_POINTERVALUE_MASK);
+  return reinterpret_cast<void*>(mBits & NS_ATTRVALUE_POINTERVALUE_MASK);
 }
 
 inline nsAttrValue::MiscContainer*
 nsAttrValue::GetMiscContainer() const
 {
   NS_ASSERTION(BaseType() == eOtherBase, "wrong type");
-  return NS_STATIC_CAST(MiscContainer*, GetPtr());
+  return static_cast<MiscContainer*>(GetPtr());
 }
 
 inline PRInt32
@@ -414,7 +414,7 @@ nsAttrValue::GetIntInternal() const
   // Make sure we get a signed value.
   // Lets hope the optimizer optimizes this into a shift. Unfortunatly signed
   // bitshift right is implementaion dependant.
-  return NS_STATIC_CAST(PRInt32, mBits & ~NS_ATTRVALUE_INTEGERTYPE_MASK) /
+  return static_cast<PRInt32>(mBits & ~NS_ATTRVALUE_INTEGERTYPE_MASK) /
          NS_ATTRVALUE_INTEGERTYPE_MULTIPLIER;
 }
 
diff --git a/mozilla/content/base/src/nsContentAreaDragDrop.cpp b/mozilla/content/base/src/nsContentAreaDragDrop.cpp
index 467b95b7610..3741ab1fb27 100644
--- a/mozilla/content/base/src/nsContentAreaDragDrop.cpp
+++ b/mozilla/content/base/src/nsContentAreaDragDrop.cpp
@@ -217,7 +217,7 @@ nsContentAreaDragDrop::AddDragListener()
   nsresult rv = NS_ERROR_FAILURE;
 
   if (mEventTarget) {
-    nsIDOMDragListener *pListener = NS_STATIC_CAST(nsIDOMDragListener *, this);
+    nsIDOMDragListener *pListener = static_cast<nsIDOMDragListener *>(this);
     rv = mEventTarget->AddEventListenerByIID(pListener,
                                              NS_GET_IID(nsIDOMDragListener));
     if (NS_SUCCEEDED(rv))
@@ -239,7 +239,7 @@ nsContentAreaDragDrop::RemoveDragListener()
   nsresult rv = NS_ERROR_FAILURE;
 
   if (mEventTarget) {
-    nsIDOMDragListener *pListener = NS_STATIC_CAST(nsIDOMDragListener *, this);
+    nsIDOMDragListener *pListener = static_cast<nsIDOMDragListener *>(this);
     rv =
       mEventTarget->RemoveEventListenerByIID(pListener,
                                              NS_GET_IID(nsIDOMDragListener));
@@ -743,7 +743,7 @@ nsContentAreaDragDrop::DragGesture(nsIDOMEvent* inMouseEvent)
 
   PRBool isSelection = PR_FALSE;
   nsCOMPtr<nsITransferable> trans;
-  nsTransferableFactory factory(inMouseEvent, NS_STATIC_CAST(nsIFlavorDataProvider*, this));
+  nsTransferableFactory factory(inMouseEvent, static_cast<nsIFlavorDataProvider*>(this));
   factory.Produce(&isSelection, getter_AddRefs(trans));
 
   if (trans) {
@@ -1636,7 +1636,7 @@ void nsTransferableFactory::GetSelectedLink(nsISelection* inSelection,
   nsAutoString nodeStr;
   selectionStart->GetNodeValue(nodeStr);
   if (nodeStr.IsEmpty() ||
-      startOffset+1 >= NS_STATIC_CAST(PRInt32, nodeStr.Length())) {
+      startOffset+1 >= static_cast<PRInt32>(nodeStr.Length())) {
     nsCOMPtr<nsIDOMNode> curr = selectionStart;
     nsIDOMNode* next;
 
diff --git a/mozilla/content/base/src/nsContentIterator.cpp b/mozilla/content/base/src/nsContentIterator.cpp
index a2cdd464a6a..fa95bb41638 100644
--- a/mozilla/content/base/src/nsContentIterator.cpp
+++ b/mozilla/content/base/src/nsContentIterator.cpp
@@ -415,7 +415,7 @@ nsContentIterator::Init(nsIDOMRange* aRange)
       NS_ASSERTION(startNode->IsNodeOfType(nsINode::eCONTENT),
                    "Data node that's not content?");
 
-      mFirst   = NS_STATIC_CAST(nsIContent*, startNode);
+      mFirst   = static_cast<nsIContent*>(startNode);
       mLast    = mFirst;
       mCurNode = mFirst;
 
@@ -459,13 +459,13 @@ nsContentIterator::Init(nsIDOMRange* aRange)
         NS_ASSERTION(startNode->IsNodeOfType(nsINode::eCONTENT),
                    "Data node that's not content?");
 
-        mFirst = NS_STATIC_CAST(nsIContent*, startNode);
+        mFirst = static_cast<nsIContent*>(startNode);
       }
     }
     else {
       // post-order
       if (startNode->IsNodeOfType(nsINode::eCONTENT)) {
-        mFirst = NS_STATIC_CAST(nsIContent*, startNode);
+        mFirst = static_cast<nsIContent*>(startNode);
       } else {
         // What else can we do?
         mFirst = nsnull;
@@ -500,7 +500,7 @@ nsContentIterator::Init(nsIDOMRange* aRange)
   {
     if (mPre) {
       if (endNode->IsNodeOfType(nsINode::eCONTENT)) {
-        mLast = NS_STATIC_CAST(nsIContent*, endNode);
+        mLast = static_cast<nsIContent*>(endNode);
       } else {
         // Not much else to do here...
         mLast = nsnull;
@@ -524,7 +524,7 @@ nsContentIterator::Init(nsIDOMRange* aRange)
         NS_ASSERTION(endNode->IsNodeOfType(nsINode::eCONTENT),
                      "Data node that's not content?");
 
-        mLast = NS_STATIC_CAST(nsIContent*, endNode);
+        mLast = static_cast<nsIContent*>(endNode);
       }
     }
   }
diff --git a/mozilla/content/base/src/nsContentList.cpp b/mozilla/content/base/src/nsContentList.cpp
index e96936e7d90..51481f4532c 100644
--- a/mozilla/content/base/src/nsContentList.cpp
+++ b/mozilla/content/base/src/nsContentList.cpp
@@ -188,7 +188,7 @@ struct ContentListHashEntry : public PLDHashEntryHdr
 PR_STATIC_CALLBACK(PLDHashNumber)
 ContentListHashtableHashKey(PLDHashTable *table, const void *key)
 {
-  const nsContentListKey* list = NS_STATIC_CAST(const nsContentListKey *, key);
+  const nsContentListKey* list = static_cast<const nsContentListKey *>(key);
   return list->GetHash();
 }
 
@@ -198,9 +198,9 @@ ContentListHashtableMatchEntry(PLDHashTable *table,
                                const void *key)
 {
   const ContentListHashEntry *e =
-    NS_STATIC_CAST(const ContentListHashEntry *, entry);
+    static_cast<const ContentListHashEntry *>(entry);
   const nsContentListKey* list1 = e->mContentList->GetKey();
-  const nsContentListKey* list2 = NS_STATIC_CAST(const nsContentListKey *, key);
+  const nsContentListKey* list2 = static_cast<const nsContentListKey *>(key);
 
   return list1->Equals(*list2);
 }
@@ -244,8 +244,8 @@ NS_GetContentList(nsINode* aRootNode, nsIAtom* aMatchAtom,
     
     // A PL_DHASH_ADD is equivalent to a PL_DHASH_LOOKUP for cases
     // when the entry is already in the hashtable.
-    entry = NS_STATIC_CAST(ContentListHashEntry *,
-                           PL_DHashTableOperate(&gContentListHashTable,
+    entry = static_cast<ContentListHashEntry *>
+                       (PL_DHashTableOperate(&gContentListHashTable,
                                                 &hashKey,
                                                 PL_DHASH_ADD));
     if (entry)
@@ -873,10 +873,10 @@ nsContentList::AssertInSync()
   // elements that are outside of the document element.
   nsIContent *root;
   if (mRootNode->IsNodeOfType(nsINode::eDOCUMENT)) {
-    root = NS_STATIC_CAST(nsIDocument*, mRootNode)->GetRootContent();
+    root = static_cast<nsIDocument*>(mRootNode)->GetRootContent();
   }
   else {
-    root = NS_STATIC_CAST(nsIContent*, mRootNode);
+    root = static_cast<nsIContent*>(mRootNode);
   }
 
   nsCOMPtr<nsIContentIterator> iter;
diff --git a/mozilla/content/base/src/nsContentList.h b/mozilla/content/base/src/nsContentList.h
index cf97823b29f..031ea981171 100644
--- a/mozilla/content/base/src/nsContentList.h
+++ b/mozilla/content/base/src/nsContentList.h
@@ -240,7 +240,7 @@ public:
   NS_HIDDEN_(nsIContent*) NamedItem(const nsAString& aName, PRBool aDoFlush);
 
   nsContentListKey* GetKey() {
-    return NS_STATIC_CAST(nsContentListKey*, this);
+    return static_cast<nsContentListKey*>(this);
   }
   
 
diff --git a/mozilla/content/base/src/nsContentSink.cpp b/mozilla/content/base/src/nsContentSink.cpp
index 086e3ab2947..ec59ea71539 100644
--- a/mozilla/content/base/src/nsContentSink.cpp
+++ b/mozilla/content/base/src/nsContentSink.cpp
@@ -1352,12 +1352,12 @@ nsContentSink::DidProcessATokenImpl()
   // to pressing the ENTER key in the URL bar...
 
   PRUint32 delayBeforeLoweringThreshold =
-    NS_STATIC_CAST(PRUint32, ((2 * mDynamicIntervalSwitchThreshold) +
+    static_cast<PRUint32>(((2 * mDynamicIntervalSwitchThreshold) +
                               NS_DELAY_FOR_WINDOW_CREATION));
 
   if ((currentTime - mBeginLoadTime) > delayBeforeLoweringThreshold) {
     if ((currentTime - eventTime) <
-        NS_STATIC_CAST(PRUint32, mDynamicIntervalSwitchThreshold)) {
+        static_cast<PRUint32>(mDynamicIntervalSwitchThreshold)) {
 
       if (!mDynamicLowerValue) {
         // lower the dynamic values to favor application
@@ -1380,7 +1380,7 @@ nsContentSink::DidProcessATokenImpl()
   }
 
   if ((currentTime - mDelayTimerStart) >
-      NS_STATIC_CAST(PRUint32, GetMaxTokenProcessingTime())) {
+      static_cast<PRUint32>(GetMaxTokenProcessingTime())) {
     return NS_ERROR_HTMLPARSER_INTERRUPTED;
   }
 
diff --git a/mozilla/content/base/src/nsContentUtils.cpp b/mozilla/content/base/src/nsContentUtils.cpp
index 7cc43bae1a9..3424e3070da 100644
--- a/mozilla/content/base/src/nsContentUtils.cpp
+++ b/mozilla/content/base/src/nsContentUtils.cpp
@@ -227,7 +227,7 @@ PR_STATIC_CALLBACK(void)
 EventListenerManagerHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry)
 {
   EventListenerManagerMapEntry *lm =
-    NS_STATIC_CAST(EventListenerManagerMapEntry *, entry);
+    static_cast<EventListenerManagerMapEntry *>(entry);
 
   // Let the EventListenerManagerMapEntry clean itself up...
   lm->~EventListenerManagerMapEntry();
@@ -690,7 +690,7 @@ nsContentUtils::Shutdown()
   if (sPtrsToPtrsToRelease) {
     for (i = 0; i < sPtrsToPtrsToRelease->Count(); ++i) {
       nsISupports** ptrToPtr =
-        NS_STATIC_CAST(nsISupports**, sPtrsToPtrsToRelease->ElementAt(i));
+        static_cast<nsISupports**>(sPtrsToPtrsToRelease->ElementAt(i));
       NS_RELEASE(*ptrToPtr);
     }
     delete sPtrsToPtrsToRelease;
@@ -823,7 +823,7 @@ nsContentUtils::InProlog(nsINode *aNode)
     return PR_FALSE;
   }
 
-  nsIDocument* doc = NS_STATIC_CAST(nsIDocument*, parent);
+  nsIDocument* doc = static_cast<nsIDocument*>(parent);
   nsIContent* root = doc->GetRootContent();
 
   return !root || doc->IndexOf(aNode) < doc->IndexOf(root);
@@ -1000,13 +1000,13 @@ nsContentUtils::ReparentContentWrappersInScope(nsIScriptGlobalObject *aOldScope,
   // Try really hard to find a context to work on.
   nsIScriptContext *context = aOldScope->GetContext();
   if (context) {
-    cx = NS_STATIC_CAST(JSContext *, context->GetNativeContext());
+    cx = static_cast<JSContext *>(context->GetNativeContext());
   }
 
   if (!cx) {
     context = aNewScope->GetContext();
     if (context) {
-      cx = NS_STATIC_CAST(JSContext *, context->GetNativeContext());
+      cx = static_cast<JSContext *>(context->GetNativeContext());
     }
 
     if (!cx) {
@@ -1293,17 +1293,17 @@ nsContentUtils::ComparePosition(nsINode* aNode1,
   // Check if either node is an attribute
   nsIAttribute* attr1 = nsnull;
   if (aNode1->IsNodeOfType(nsINode::eATTRIBUTE)) {
-    attr1 = NS_STATIC_CAST(nsIAttribute*, aNode1);
+    attr1 = static_cast<nsIAttribute*>(aNode1);
     nsIContent* elem = attr1->GetContent();
     // If there is an owner element add the attribute
     // to the chain and walk up to the element
     if (elem) {
       aNode1 = elem;
-      parents1.AppendElement(NS_STATIC_CAST(nsINode*, attr1));
+      parents1.AppendElement(static_cast<nsINode*>(attr1));
     }
   }
   if (aNode2->IsNodeOfType(nsINode::eATTRIBUTE)) {
-    nsIAttribute* attr2 = NS_STATIC_CAST(nsIAttribute*, aNode2);
+    nsIAttribute* attr2 = static_cast<nsIAttribute*>(aNode2);
     nsIContent* elem = attr2->GetContent();
     if (elem == aNode1 && attr1) {
       // Both nodes are attributes on the same element.
@@ -1329,7 +1329,7 @@ nsContentUtils::ComparePosition(nsINode* aNode1,
 
     if (elem) {
       aNode2 = elem;
-      parents2.AppendElement(NS_STATIC_CAST(nsINode*, attr2));
+      parents2.AppendElement(static_cast<nsINode*>(attr2));
     }
   }
 
@@ -1374,8 +1374,8 @@ nsContentUtils::ComparePosition(nsINode* aNode1,
       // IndexOf will return -1 for the attribute making the attribute be
       // considered before any child.
       return parent->IndexOf(child1) < parent->IndexOf(child2) ?
-        NS_STATIC_CAST(PRUint16, nsIDOM3Node::DOCUMENT_POSITION_PRECEDING) :
-        NS_STATIC_CAST(PRUint16, nsIDOM3Node::DOCUMENT_POSITION_FOLLOWING);
+        static_cast<PRUint16>(nsIDOM3Node::DOCUMENT_POSITION_PRECEDING) :
+        static_cast<PRUint16>(nsIDOM3Node::DOCUMENT_POSITION_FOLLOWING);
     }
     parent = child1;
   }
@@ -3039,8 +3039,8 @@ nsContentUtils::TraverseListenerManager(nsINode *aNode,
   }
 
   EventListenerManagerMapEntry *entry =
-    NS_STATIC_CAST(EventListenerManagerMapEntry *,
-                   PL_DHashTableOperate(&sEventListenerManagersHash, aNode,
+    static_cast<EventListenerManagerMapEntry *>
+               (PL_DHashTableOperate(&sEventListenerManagersHash, aNode,
                                         PL_DHASH_LOOKUP));
   if (PL_DHASH_ENTRY_IS_BUSY(entry)) {
     cb.NoteXPCOMChild(entry->mListenerManager);
@@ -3067,8 +3067,8 @@ nsContentUtils::GetListenerManager(nsINode *aNode,
 
   if (!aCreateIfNotFound) {
     EventListenerManagerMapEntry *entry =
-      NS_STATIC_CAST(EventListenerManagerMapEntry *,
-                     PL_DHashTableOperate(&sEventListenerManagersHash, aNode,
+      static_cast<EventListenerManagerMapEntry *>
+                 (PL_DHashTableOperate(&sEventListenerManagersHash, aNode,
                                           PL_DHASH_LOOKUP));
     if (PL_DHASH_ENTRY_IS_BUSY(entry)) {
       *aResult = entry->mListenerManager;
@@ -3078,8 +3078,8 @@ nsContentUtils::GetListenerManager(nsINode *aNode,
   }
 
   EventListenerManagerMapEntry *entry =
-    NS_STATIC_CAST(EventListenerManagerMapEntry *,
-                   PL_DHashTableOperate(&sEventListenerManagersHash, aNode,
+    static_cast<EventListenerManagerMapEntry *>
+               (PL_DHashTableOperate(&sEventListenerManagersHash, aNode,
                                         PL_DHASH_ADD));
 
   if (!entry) {
@@ -3112,8 +3112,8 @@ nsContentUtils::RemoveListenerManager(nsINode *aNode)
 {
   if (sEventListenerManagersHash.ops) {
     EventListenerManagerMapEntry *entry =
-      NS_STATIC_CAST(EventListenerManagerMapEntry *,
-                     PL_DHashTableOperate(&sEventListenerManagersHash, aNode,
+      static_cast<EventListenerManagerMapEntry *>
+                 (PL_DHashTableOperate(&sEventListenerManagersHash, aNode,
                                           PL_DHASH_LOOKUP));
     if (PL_DHASH_ENTRY_IS_BUSY(entry)) {
       nsCOMPtr<nsIEventListenerManager> listenerManager;
@@ -3426,7 +3426,7 @@ nsContentUtils::AppendNodeTextContent(nsINode* aNode, PRBool aDeep,
                                       nsAString& aResult)
 {
   if (aNode->IsNodeOfType(nsINode::eTEXT)) {
-    NS_STATIC_CAST(nsIContent*, aNode)->AppendTextTo(aResult);
+    static_cast<nsIContent*>(aNode)->AppendTextTo(aResult);
   }
   else if (aDeep) {
     AppendNodeTextContentsRecurse(aNode, aResult);
@@ -3478,7 +3478,7 @@ nsContentUtils::IsInSameAnonymousTree(nsINode* aNode,
     return aContent->GetBindingParent() == nsnull;
   }
 
-  return NS_STATIC_CAST(nsIContent*, aNode)->GetBindingParent() ==
+  return static_cast<nsIContent*>(aNode)->GetBindingParent() ==
          aContent->GetBindingParent();
  
 }
diff --git a/mozilla/content/base/src/nsDOMAttribute.cpp b/mozilla/content/base/src/nsDOMAttribute.cpp
index 32d4da317d3..d01023df035 100644
--- a/mozilla/content/base/src/nsDOMAttribute.cpp
+++ b/mozilla/content/base/src/nsDOMAttribute.cpp
@@ -366,7 +366,7 @@ nsresult
 nsDOMAttribute::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const
 {
   nsAutoString value;
-  NS_CONST_CAST(nsDOMAttribute*, this)->GetValue(value);
+  const_cast<nsDOMAttribute*>(this)->GetValue(value);
 
   *aResult = new nsDOMAttribute(nsnull, aNodeInfo, value);
   if (!*aResult) {
@@ -469,7 +469,7 @@ nsDOMAttribute::IsSupported(const nsAString& aFeature,
                             const nsAString& aVersion,
                             PRBool* aReturn)
 {
-  return nsGenericElement::InternalIsSupported(NS_STATIC_CAST(nsIDOMAttr*, this), 
+  return nsGenericElement::InternalIsSupported(static_cast<nsIDOMAttr*>(this), 
                                                aFeature, aVersion, aReturn);
 }
 
@@ -503,7 +503,7 @@ nsDOMAttribute::IsSameNode(nsIDOMNode* aOther,
 {
   NS_ASSERTION(aReturn, "IsSameNode() called with aReturn == nsnull!");
   
-  *aReturn = SameCOMIdentity(NS_STATIC_CAST(nsIDOMNode*, this), aOther);
+  *aReturn = SameCOMIdentity(static_cast<nsIDOMNode*>(this), aOther);
 
   return NS_OK;
 }
@@ -572,7 +572,7 @@ nsDOMAttribute::GetFeature(const nsAString& aFeature,
                            const nsAString& aVersion,
                            nsISupports** aReturn)
 {
-  return nsGenericElement::InternalGetFeature(NS_STATIC_CAST(nsIDOMAttr*, this), 
+  return nsGenericElement::InternalGetFeature(static_cast<nsIDOMAttr*>(this), 
                                               aFeature, aVersion, aReturn);
 }
 
@@ -768,7 +768,7 @@ nsDOMAttribute::EnsureChildState(PRBool aSetText, PRBool &aHasChild) const
 {
   aHasChild = PR_FALSE;
 
-  nsDOMAttribute* mutableThis = NS_CONST_CAST(nsDOMAttribute*, this);
+  nsDOMAttribute* mutableThis = const_cast<nsDOMAttribute*>(this);
 
   nsAutoString value;
   mutableThis->GetValue(value);
diff --git a/mozilla/content/base/src/nsDOMAttributeMap.cpp b/mozilla/content/base/src/nsDOMAttributeMap.cpp
index f995a4b46e1..53f6fdffa7d 100644
--- a/mozilla/content/base/src/nsDOMAttributeMap.cpp
+++ b/mozilla/content/base/src/nsDOMAttributeMap.cpp
@@ -101,7 +101,7 @@ PLDHashOperator
 TraverseMapEntry(nsAttrHashKey::KeyType aKey, nsCOMPtr<nsIDOMNode>& aData, void* aUserArg)
 {
   nsCycleCollectionTraversalCallback *cb = 
-    NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aUserArg);
+    static_cast<nsCycleCollectionTraversalCallback*>(aUserArg);
 
   cb->NoteXPCOMChild(aData.get());
 
@@ -129,7 +129,7 @@ SetOwnerDocumentFunc(nsAttrHashKey::KeyType aKey, nsCOMPtr<nsIDOMNode>& aData,
 {
   nsCOMPtr<nsIAttribute> attr(do_QueryInterface(aData));
   NS_ASSERTION(attr, "non-nsIAttribute somehow made it into the hashmap?!");
-  nsresult rv = attr->SetOwnerDocument(NS_STATIC_CAST(nsIDocument*, aUserArg));
+  nsresult rv = attr->SetOwnerDocument(static_cast<nsIDocument*>(aUserArg));
 
   return NS_FAILED(rv) ? PL_DHASH_STOP : PL_DHASH_NEXT;
 }
diff --git a/mozilla/content/base/src/nsDOMParser.cpp b/mozilla/content/base/src/nsDOMParser.cpp
index e225dc15eda..67306825241 100644
--- a/mozilla/content/base/src/nsDOMParser.cpp
+++ b/mozilla/content/base/src/nsDOMParser.cpp
@@ -163,7 +163,7 @@ nsDOMParser::ParseFromBuffer(const PRUint8 *buf,
   // The new stream holds a reference to the buffer
   nsCOMPtr<nsIInputStream> stream;
   nsresult rv = NS_NewByteInputStream(getter_AddRefs(stream),
-                                      NS_REINTERPRET_CAST(const char *, buf),
+                                      reinterpret_cast<const char *>(buf),
                                       bufLen, NS_ASSIGNMENT_DEPEND);
   if (NS_FAILED(rv))
     return rv;
@@ -225,13 +225,12 @@ nsDOMParser::ParseFromStream(nsIInputStream *stream,
   // Register as a load listener on the document
   nsCOMPtr<nsPIDOMEventTarget> target(do_QueryInterface(domDocument));
   if (target) {
-    nsWeakPtr requestWeak(do_GetWeakReference(NS_STATIC_CAST(nsIDOMParser*, this)));
+    nsWeakPtr requestWeak(do_GetWeakReference(static_cast<nsIDOMParser*>(this)));
     nsLoadListenerProxy* proxy = new nsLoadListenerProxy(requestWeak);
     if (!proxy) return NS_ERROR_OUT_OF_MEMORY;
 
     // This will addref the proxy
-    rv = target->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMEventListener*, 
-                                                      proxy), 
+    rv = target->AddEventListenerByIID(static_cast<nsIDOMEventListener*>(proxy), 
                                        NS_GET_IID(nsIDOMLoadListener));
     NS_ENSURE_SUCCESS(rv, rv);
   }
diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp
index b8fbd645a7b..754244e9fc6 100644
--- a/mozilla/content/base/src/nsDocument.cpp
+++ b/mozilla/content/base/src/nsDocument.cpp
@@ -258,8 +258,8 @@ nsUint32ToContentHashEntryVisitorCallback(nsISupportsHashKey* aEntry,
                                           void* aClosure)
 {
   nsUint32ToContentHashEntry::Visitor* visitor =
-    NS_STATIC_CAST(nsUint32ToContentHashEntry::Visitor*, aClosure);
-  visitor->Visit(NS_STATIC_CAST(nsIContent*, aEntry->GetKey()));
+    static_cast<nsUint32ToContentHashEntry::Visitor*>(aClosure);
+  visitor->Visit(static_cast<nsIContent*>(aEntry->GetKey()));
   return PL_DHASH_NEXT;
 }
 
@@ -673,7 +673,7 @@ nsDOMImplementation::HasFeature(const nsAString& aFeature,
                                 PRBool* aReturn)
 {
   return nsGenericElement::InternalIsSupported(
-           NS_STATIC_CAST(nsIDOMDOMImplementation*, this),
+           static_cast<nsIDOMDOMImplementation*>(this),
            aFeature, aVersion, aReturn);
 }
 
@@ -786,7 +786,7 @@ nsDocument::~nsDocument()
 #endif
 
 #ifdef DEBUG
-  nsCycleCollector_DEBUG_wasFreed(NS_STATIC_CAST(nsIDocument*, this));
+  nsCycleCollector_DEBUG_wasFreed(static_cast<nsIDocument*>(this));
 #endif
 
   mInDestructor = PR_TRUE;
@@ -913,7 +913,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDocument)
       nsresult rv;
       mXPathEvaluatorTearoff =
         do_CreateInstance(NS_XPATH_EVALUATOR_CONTRACTID,
-                          NS_STATIC_CAST(nsIDocument *, this), &rv);
+                          static_cast<nsIDocument *>(this), &rv);
       NS_ENSURE_SUCCESS(rv, rv);
     }
 
@@ -933,9 +933,9 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 SubDocTraverser(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number,
                 void *arg)
 {
-  SubDocMapEntry *entry = NS_STATIC_CAST(SubDocMapEntry*, hdr);
+  SubDocMapEntry *entry = static_cast<SubDocMapEntry*>(hdr);
   nsCycleCollectionTraversalCallback *cb = 
-    NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, arg);
+    static_cast<nsCycleCollectionTraversalCallback*>(arg);
 
   cb->NoteXPCOMChild(entry->mKey);
   cb->NoteXPCOMChild(entry->mSubDocument);
@@ -946,16 +946,16 @@ SubDocTraverser(PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number,
 PR_STATIC_CALLBACK(PRIntn)
 RadioGroupsTraverser(nsHashKey *aKey, void *aData, void* aClosure)
 {
-  nsRadioGroupStruct *entry = NS_STATIC_CAST(nsRadioGroupStruct*, aData);
+  nsRadioGroupStruct *entry = static_cast<nsRadioGroupStruct*>(aData);
   nsCycleCollectionTraversalCallback *cb = 
-    NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aClosure);
+    static_cast<nsCycleCollectionTraversalCallback*>(aClosure);
 
   cb->NoteXPCOMChild(entry->mSelectedRadioButton);
 
   nsSmallVoidArray &radioButtons = entry->mRadioButtons;
   PRUint32 i, count = radioButtons.Count();
   for (i = 0; i < count; ++i) {
-    cb->NoteXPCOMChild(NS_STATIC_CAST(nsIFormControl*, radioButtons[i]));
+    cb->NoteXPCOMChild(static_cast<nsIFormControl*>(radioButtons[i]));
   }
   
 
@@ -966,7 +966,7 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 BoxObjectTraverser(nsISupports* key, nsPIBoxObject* boxObject, void* userArg)
 {
   nsCycleCollectionTraversalCallback *cb = 
-    NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, userArg);
+    static_cast<nsCycleCollectionTraversalCallback*>(userArg);
  
   cb->NoteXPCOMChild(key);
   cb->NoteXPCOMChild(boxObject);
@@ -988,7 +988,7 @@ PLDHashOperator PR_CALLBACK
 LinkMapTraverser(nsUint32ToContentHashEntry* aEntry, void* userArg)
 {
   LinkMapTraversalVisitor visitor;
-  visitor.mCb = NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, userArg);
+  visitor.mCb = static_cast<nsCycleCollectionTraversalCallback*>(userArg);
   aEntry->VisitContent(&visitor);
   return PL_DHASH_NEXT;
 }
@@ -1622,7 +1622,7 @@ nsDocument::GetActiveElement(nsIDOMElement **aElement)
 
   // No focused element anywhere in this document.  Try to get the BODY.
   nsCOMPtr<nsIDOMHTMLDocument> htmlDoc =
-    do_QueryInterface(NS_STATIC_CAST(nsIDocument*, this));
+    do_QueryInterface(static_cast<nsIDocument*>(this));
   if (htmlDoc) {
     nsCOMPtr<nsIDOMHTMLElement> bodyElement;
     htmlDoc->GetBody(getter_AddRefs(bodyElement));
@@ -1694,7 +1694,7 @@ nsDocument::MatchClassNames(nsIContent* aContent,
   }
   
   // need to match *all* of the classes
-  nsCOMArray<nsIAtom>* classes = NS_STATIC_CAST(nsCOMArray<nsIAtom>*, aData);
+  nsCOMArray<nsIAtom>* classes = static_cast<nsCOMArray<nsIAtom>*>(aData);
   PRInt32 length = classes->Count();
   PRInt32 i;
   for (i = 0; i < length; ++i) {
@@ -1710,7 +1710,7 @@ nsDocument::MatchClassNames(nsIContent* aContent,
 void
 nsDocument::DestroyClassNameArray(void* aData)
 {
-  nsCOMArray<nsIAtom>* classes = NS_STATIC_CAST(nsCOMArray<nsIAtom>*, aData);
+  nsCOMArray<nsIAtom>* classes = static_cast<nsCOMArray<nsIAtom>*>(aData);
   delete classes;
 }
 
@@ -1765,9 +1765,9 @@ nsDocument::SetDocumentCharacterSet(const nsACString& aCharSetID)
 
     for (PRInt32 i = 0; i < n; i++) {
       nsIObserver* observer =
-        NS_STATIC_CAST(nsIObserver *, mCharSetObservers.ElementAt(i));
+        static_cast<nsIObserver *>(mCharSetObservers.ElementAt(i));
 
-      observer->Observe(NS_STATIC_CAST(nsIDocument *, this), "charset",
+      observer->Observe(static_cast<nsIDocument *>(this), "charset",
                         NS_ConvertASCIItoUTF16(aCharSetID).get());
     }
   }
@@ -1979,7 +1979,7 @@ nsDocument::GetPrimaryShell() const
 PR_STATIC_CALLBACK(void)
 SubDocClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry)
 {
-  SubDocMapEntry *e = NS_STATIC_CAST(SubDocMapEntry *, entry);
+  SubDocMapEntry *e = static_cast<SubDocMapEntry *>(entry);
 
   NS_RELEASE(e->mKey);
   NS_IF_RELEASE(e->mSubDocument);
@@ -1989,11 +1989,11 @@ PR_STATIC_CALLBACK(PRBool)
 SubDocInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, const void *key)
 {
   SubDocMapEntry *e =
-    NS_CONST_CAST(SubDocMapEntry *,
-                  NS_STATIC_CAST(const SubDocMapEntry *, entry));
+    const_cast<SubDocMapEntry *>
+              (static_cast<const SubDocMapEntry *>(entry));
 
-  e->mKey = NS_CONST_CAST(nsIContent *,
-                          NS_STATIC_CAST(const nsIContent *, key));
+  e->mKey = const_cast<nsIContent *>
+                      (static_cast<const nsIContent *>(key));
   NS_ADDREF(e->mKey);
 
   e->mSubDocument = nsnull;
@@ -2010,8 +2010,8 @@ nsDocument::SetSubDocumentFor(nsIContent *aContent, nsIDocument* aSubDoc)
 
     if (mSubDocuments) {
       SubDocMapEntry *entry =
-        NS_STATIC_CAST(SubDocMapEntry*,
-                       PL_DHashTableOperate(mSubDocuments, aContent,
+        static_cast<SubDocMapEntry*>
+                   (PL_DHashTableOperate(mSubDocuments, aContent,
                                             PL_DHASH_LOOKUP));
 
       if (PL_DHASH_ENTRY_IS_BUSY(entry)) {
@@ -2045,8 +2045,8 @@ nsDocument::SetSubDocumentFor(nsIContent *aContent, nsIDocument* aSubDoc)
 
     // Add a mapping to the hash table
     SubDocMapEntry *entry =
-      NS_STATIC_CAST(SubDocMapEntry*,
-                     PL_DHashTableOperate(mSubDocuments, aContent,
+      static_cast<SubDocMapEntry*>
+                 (PL_DHashTableOperate(mSubDocuments, aContent,
                                           PL_DHASH_ADD));
 
     if (!entry) {
@@ -2074,8 +2074,8 @@ nsDocument::GetSubDocumentFor(nsIContent *aContent) const
 {
   if (mSubDocuments) {
     SubDocMapEntry *entry =
-      NS_STATIC_CAST(SubDocMapEntry*,
-                     PL_DHashTableOperate(mSubDocuments, aContent,
+      static_cast<SubDocMapEntry*>
+                 (PL_DHashTableOperate(mSubDocuments, aContent,
                                           PL_DHASH_LOOKUP));
 
     if (PL_DHASH_ENTRY_IS_BUSY(entry)) {
@@ -2090,8 +2090,8 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 FindContentEnumerator(PLDHashTable *table, PLDHashEntryHdr *hdr,
                       PRUint32 number, void *arg)
 {
-  SubDocMapEntry *entry = NS_STATIC_CAST(SubDocMapEntry*, hdr);
-  FindContentData *data = NS_STATIC_CAST(FindContentData*, arg);
+  SubDocMapEntry *entry = static_cast<SubDocMapEntry*>(hdr);
+  FindContentData *data = static_cast<FindContentData*>(arg);
 
   if (entry->mSubDocument == data->mSubDocument) {
     data->mResult = entry->mKey;
@@ -2683,7 +2683,7 @@ nsDocument::DispatchContentLoadedEvents()
   // Fire a DOM event notifying listeners that this document has been
   // loaded (excluding images and other loads initiated by this
   // document).
-  nsContentUtils::DispatchTrustedEvent(this, NS_STATIC_CAST(nsIDocument*, this),
+  nsContentUtils::DispatchTrustedEvent(this, static_cast<nsIDocument*>(this),
                                        NS_LITERAL_STRING("DOMContentLoaded"),
                                        PR_TRUE, PR_TRUE);
 
@@ -3436,7 +3436,7 @@ nsDocument::LoadBindingDocument(const nsAString& aURI)
   nsCOMPtr<nsIURI> uri;
   nsresult rv = NS_NewURI(getter_AddRefs(uri), aURI,
                           mCharacterSet.get(),
-                          NS_STATIC_CAST(nsIDocument *, this)->GetBaseURI());
+                          static_cast<nsIDocument *>(this)->GetBaseURI());
   NS_ENSURE_SUCCESS(rv, rv);
 
   mBindingManager->LoadBindingDocument(this, uri);
@@ -3636,7 +3636,7 @@ nsDocument::SetTitle(const nsAString& aTitle)
   mDocumentTitle.Assign(aTitle);
 
   // Fire a DOM event for the title change.
-  nsContentUtils::DispatchTrustedEvent(this, NS_STATIC_CAST(nsIDocument*, this),
+  nsContentUtils::DispatchTrustedEvent(this, static_cast<nsIDocument*>(this),
                                        NS_LITERAL_STRING("DOMTitleChanged"),
                                        PR_TRUE, PR_TRUE);
 
@@ -4018,7 +4018,7 @@ NS_IMETHODIMP
 nsDocument::IsSupported(const nsAString& aFeature, const nsAString& aVersion,
                         PRBool* aReturn)
 {
-  return nsGenericElement::InternalIsSupported(NS_STATIC_CAST(nsIDOMDocument*, this),
+  return nsGenericElement::InternalIsSupported(static_cast<nsIDOMDocument*>(this),
                                                aFeature, aVersion, aReturn);
 }
 
@@ -4131,7 +4131,7 @@ nsDocument::GetFeature(const nsAString& aFeature,
                        const nsAString& aVersion,
                        nsISupports** aReturn)
 {
-  return nsGenericElement::InternalGetFeature(NS_STATIC_CAST(nsIDOMDocument*, this),
+  return nsGenericElement::InternalGetFeature(static_cast<nsIDOMDocument*>(this),
                                               aFeature, aVersion, aReturn);
 }
 
@@ -4274,7 +4274,7 @@ PLDHashOperator PR_CALLBACK
 BlastFunc(nsAttrHashKey::KeyType aKey, nsIDOMNode *aData, void* aUserArg)
 {
   nsCOMPtr<nsIAttribute> *attr =
-    NS_STATIC_CAST(nsCOMPtr<nsIAttribute>*, aUserArg);
+    static_cast<nsCOMPtr<nsIAttribute>*>(aUserArg);
 
   *attr = do_QueryInterface(aData);
 
@@ -4289,7 +4289,7 @@ BlastSubtreeToPieces(nsINode *aNode)
 {
   PRUint32 i, count;
   if (aNode->IsNodeOfType(nsINode::eELEMENT)) {
-    nsGenericElement *element = NS_STATIC_CAST(nsGenericElement*, aNode);
+    nsGenericElement *element = static_cast<nsGenericElement*>(aNode);
     const nsDOMAttributeMap *map = element->GetAttributeMap();
     if (map) {
       nsCOMPtr<nsIAttribute> attr;
@@ -4523,7 +4523,7 @@ nsDocument::GetListenerManager(PRBool aCreateIfNotFound,
   nsresult rv = NS_NewEventListenerManager(getter_AddRefs(mListenerManager));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  mListenerManager->SetListenerTarget(NS_STATIC_CAST(nsIDocument *,this));
+  mListenerManager->SetListenerTarget(static_cast<nsIDocument *>(this));
 
   *aInstancePtrResult = mListenerManager;
   NS_ADDREF(*aInstancePtrResult);
@@ -4570,7 +4570,7 @@ nsDocument::DispatchDOMEvent(nsEvent* aEvent,
                              nsPresContext* aPresContext,
                              nsEventStatus* aEventStatus)
 {
-  return nsEventDispatcher::DispatchDOMEvent(NS_STATIC_CAST(nsINode*, this),
+  return nsEventDispatcher::DispatchDOMEvent(static_cast<nsINode*>(this),
                                              aEvent, aDOMEvent,
                                              aPresContext, aEventStatus);
 }
@@ -4632,7 +4632,7 @@ nsDocument::DispatchEvent(nsIDOMEvent* aEvent, PRBool *_retval)
 
   nsEventStatus status = nsEventStatus_eIgnore;
   nsresult rv =
-    nsEventDispatcher::DispatchDOMEvent(NS_STATIC_CAST(nsINode*, this),
+    nsEventDispatcher::DispatchDOMEvent(static_cast<nsINode*>(this),
                                         nsnull, aEvent, context, &status);
 
   *_retval = (status != nsEventStatus_eConsumeNoDefault);
@@ -4931,7 +4931,7 @@ nsDocument::GetRadioGroup(const nsAString& aName,
      ToLowerCase(tmKey); //should case-insensitive.
   nsStringKey key(tmKey);
   nsRadioGroupStruct *radioGroup =
-    NS_STATIC_CAST(nsRadioGroupStruct *, mRadioGroups.Get(&key));
+    static_cast<nsRadioGroupStruct *>(mRadioGroups.Get(&key));
 
   if (!radioGroup) {
     radioGroup = new nsRadioGroupStruct();
@@ -5045,8 +5045,7 @@ nsDocument::GetNextRadioButton(const nsAString& aName,
     else if (++index >= numRadios) {
       index = 0;
     }
-    radio = do_QueryInterface(NS_STATIC_CAST(nsIFormControl*, 
-                              radioGroup->mRadioButtons.ElementAt(index)));
+    radio = do_QueryInterface(static_cast<nsIFormControl*>(radioGroup->mRadioButtons.ElementAt(index)));
     NS_ASSERTION(radio, "mRadioButtons holding a non-radio button");
     radio->GetDisabled(&disabled);
   } while (disabled && radio != currentRadio);
@@ -5097,8 +5096,8 @@ nsDocument::WalkRadioGroup(const nsAString& aName,
 
   PRBool stop = PR_FALSE;
   for (int i = 0; i < radioGroup->mRadioButtons.Count(); i++) {
-    aVisitor->Visit(NS_STATIC_CAST(nsIFormControl *,
-                                   radioGroup->mRadioButtons.ElementAt(i)),
+    aVisitor->Visit(static_cast<nsIFormControl *>
+                               (radioGroup->mRadioButtons.ElementAt(i)),
                     &stop);
     if (stop) {
       return NS_OK;
@@ -5245,8 +5244,8 @@ PRBool
 nsDocument::IsSafeToFlush() const
 {
   PRBool isSafeToFlush = PR_TRUE;
-  nsPresShellIterator iter(NS_CONST_CAST(nsIDocument*,
-                           NS_STATIC_CAST(const nsIDocument*, this)));
+  nsPresShellIterator iter(const_cast<nsIDocument*>
+                                     (static_cast<const nsIDocument*>(this)));
   nsCOMPtr<nsIPresShell> shell;
   while ((shell = iter.GetNextShell()) && isSafeToFlush) {
     shell->IsSafeToFlush(isSafeToFlush);
@@ -5338,8 +5337,8 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 SubDocHashEnum(PLDHashTable *table, PLDHashEntryHdr *hdr,
                PRUint32 number, void *arg)
 {
-  SubDocMapEntry *entry = NS_STATIC_CAST(SubDocMapEntry*, hdr);
-  SubDocEnumArgs *args = NS_STATIC_CAST(SubDocEnumArgs*, arg);
+  SubDocMapEntry *entry = static_cast<SubDocMapEntry*>(hdr);
+  SubDocEnumArgs *args = static_cast<SubDocEnumArgs*>(arg);
 
   nsIDocument *subdoc = entry->mSubDocument;
   PRBool next = subdoc ? args->callback(subdoc, args->data) : PR_TRUE;
@@ -5360,8 +5359,8 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 CanCacheSubDocument(PLDHashTable *table, PLDHashEntryHdr *hdr,
                     PRUint32 number, void *arg)
 {
-  SubDocMapEntry *entry = NS_STATIC_CAST(SubDocMapEntry*, hdr);
-  PRBool *canCacheArg = NS_STATIC_CAST(PRBool*, arg);
+  SubDocMapEntry *entry = static_cast<SubDocMapEntry*>(hdr);
+  PRBool *canCacheArg = static_cast<PRBool*>(arg);
 
   nsIDocument *subdoc = entry->mSubDocument;
 
@@ -5565,7 +5564,7 @@ nsDocument::CheckAncestryAndGetFrame(nsIDocument* aDocument) const
 {
   nsIDocument* parentDoc;
   for (parentDoc = aDocument->GetParentDocument();
-       parentDoc != NS_STATIC_CAST(const nsIDocument* const, this);
+       parentDoc != static_cast<const nsIDocument* const>(this);
        parentDoc = parentDoc->GetParentDocument()) {
     if (!parentDoc) {
       return nsnull;
@@ -5603,7 +5602,7 @@ nsDocument::DispatchEventToWindow(nsEvent *aEvent)
   if (!window)
     return;
 
-  aEvent->target = NS_STATIC_CAST(nsIDocument*, this);
+  aEvent->target = static_cast<nsIDocument*>(this);
   nsEventDispatcher::Dispatch(window, nsnull, aEvent);
 }
 
diff --git a/mozilla/content/base/src/nsDocument.h b/mozilla/content/base/src/nsDocument.h
index 3b0a77b9718..fc7c35c5e4b 100644
--- a/mozilla/content/base/src/nsDocument.h
+++ b/mozilla/content/base/src/nsDocument.h
@@ -153,7 +153,7 @@ class nsUint32ToContentHashEntry : public PLDHashEntryHdr
       // Pathetic attempt to not die: clear out the other mValOrHash so we're
       // effectively stealing it. If toCopy is destroyed right after this,
       // we'll be OK.
-      NS_CONST_CAST(nsUint32ToContentHashEntry&, toCopy).mValOrHash = nsnull;
+      const_cast<nsUint32ToContentHashEntry&>(toCopy).mValOrHash = nsnull;
       NS_ERROR("Copying not supported. Fasten your seat belt.");
     }
     ~nsUint32ToContentHashEntry() { Destroy(); }
diff --git a/mozilla/content/base/src/nsDocumentEncoder.cpp b/mozilla/content/base/src/nsDocumentEncoder.cpp
index 1ad83cbf729..120f7a1263b 100644
--- a/mozilla/content/base/src/nsDocumentEncoder.cpp
+++ b/mozilla/content/base/src/nsDocumentEncoder.cpp
@@ -649,11 +649,11 @@ nsDocumentEncoder::SerializeRangeNodes(nsIDOMRange* aRange,
   nsCOMPtr<nsIContent> startNode, endNode;
   PRInt32 start = mStartRootIndex - aDepth;
   if (start >= 0 && start <= mStartNodes.Count())
-    startNode = NS_STATIC_CAST(nsIContent *, mStartNodes[start]);
+    startNode = static_cast<nsIContent *>(mStartNodes[start]);
 
   PRInt32 end = mEndRootIndex - aDepth;
   if (end >= 0 && end <= mEndNodes.Count())
-    endNode = NS_STATIC_CAST(nsIContent *, mEndNodes[end]);
+    endNode = static_cast<nsIContent *>(mEndNodes[end]);
 
   if ((startNode != content) && (endNode != content))
   {
@@ -1236,7 +1236,7 @@ nsHTMLCopyEncoder::EncodeToStringWithContext(nsAString& aContextString,
   PRInt32 i;
   nsCOMPtr<nsIDOMNode> node;
   if (count > 0)
-    node = NS_STATIC_CAST(nsIDOMNode *, mCommonAncestors.ElementAt(0));
+    node = static_cast<nsIDOMNode *>(mCommonAncestors.ElementAt(0));
 
   if (node && IsTextNode(node)) 
   {
@@ -1251,13 +1251,13 @@ nsHTMLCopyEncoder::EncodeToStringWithContext(nsAString& aContextString,
   i = count;
   while (i > 0)
   {
-    node = NS_STATIC_CAST(nsIDOMNode *, mCommonAncestors.ElementAt(--i));
+    node = static_cast<nsIDOMNode *>(mCommonAncestors.ElementAt(--i));
     SerializeNodeStart(node, 0, -1, aContextString);
   }
   //i = 0; guaranteed by above
   while (i < count)
   {
-    node = NS_STATIC_CAST(nsIDOMNode *, mCommonAncestors.ElementAt(i++));
+    node = static_cast<nsIDOMNode *>(mCommonAncestors.ElementAt(i++));
     SerializeNodeEnd(node, aContextString);
   }
 
diff --git a/mozilla/content/base/src/nsGenericDOMDataNode.cpp b/mozilla/content/base/src/nsGenericDOMDataNode.cpp
index 71dc85ef87d..5f436eae71b 100644
--- a/mozilla/content/base/src/nsGenericDOMDataNode.cpp
+++ b/mozilla/content/base/src/nsGenericDOMDataNode.cpp
@@ -236,7 +236,7 @@ nsGenericDOMDataNode::IsSupported(const nsAString& aFeature,
                                   const nsAString& aVersion,
                                   PRBool* aReturn)
 {
-  return nsGenericElement::InternalIsSupported(NS_STATIC_CAST(nsIContent*, this),
+  return nsGenericElement::InternalIsSupported(static_cast<nsIContent*>(this),
                                                aFeature, aVersion, aReturn);
 }
 
@@ -580,10 +580,10 @@ nsGenericDOMDataNode::BindToTree(nsIDocument* aDocument, nsIContent* aParent,
   // Set parent
   if (aParent) {
     mParentPtrBits =
-      NS_REINTERPRET_CAST(PtrBits, aParent) | PARENT_BIT_PARENT_IS_CONTENT;
+      reinterpret_cast<PtrBits>(aParent) | PARENT_BIT_PARENT_IS_CONTENT;
   }
   else {
-    mParentPtrBits = NS_REINTERPRET_CAST(PtrBits, aDocument);
+    mParentPtrBits = reinterpret_cast<PtrBits>(aDocument);
   }
 
   // XXXbz sXBL/XBL2 issue!
@@ -702,7 +702,7 @@ nsGenericDOMDataNode::DispatchDOMEvent(nsEvent* aEvent,
                                        nsPresContext* aPresContext,
                                        nsEventStatus* aEventStatus)
 {
-  return nsEventDispatcher::DispatchDOMEvent(NS_STATIC_CAST(nsINode*, this),
+  return nsEventDispatcher::DispatchDOMEvent(static_cast<nsINode*>(this),
                                              aEvent, aDOMEvent,
                                              aPresContext, aEventStatus);
 }
diff --git a/mozilla/content/base/src/nsGenericDOMDataNode.h b/mozilla/content/base/src/nsGenericDOMDataNode.h
index 94209db51c2..dedcbcd51c9 100644
--- a/mozilla/content/base/src/nsGenericDOMDataNode.h
+++ b/mozilla/content/base/src/nsGenericDOMDataNode.h
@@ -298,12 +298,12 @@ protected:
 
   nsDataSlots *GetDataSlots()
   {
-    return NS_STATIC_CAST(nsDataSlots*, GetSlots());
+    return static_cast<nsDataSlots*>(GetSlots());
   }
 
   nsDataSlots *GetExistingDataSlots() const
   {
-    return NS_STATIC_CAST(nsDataSlots*, GetExistingSlots());
+    return static_cast<nsDataSlots*>(GetExistingSlots());
   }
 
   nsresult SplitText(PRUint32 aOffset, nsIDOMText** aReturn);
diff --git a/mozilla/content/base/src/nsGenericElement.cpp b/mozilla/content/base/src/nsGenericElement.cpp
index 523b5738323..52cff174305 100644
--- a/mozilla/content/base/src/nsGenericElement.cpp
+++ b/mozilla/content/base/src/nsGenericElement.cpp
@@ -1091,7 +1091,7 @@ nsGenericElement::~nsGenericElement()
   NS_PRECONDITION(!IsInDoc(),
                   "Please remove this from the document properly");
 #ifdef DEBUG
-  nsCycleCollector_DEBUG_wasFreed(NS_STATIC_CAST(nsINode*, this));
+  nsCycleCollector_DEBUG_wasFreed(static_cast<nsINode*>(this));
 #endif
 }
 
@@ -1959,14 +1959,14 @@ nsGenericElement::BindToTree(nsIDocument* aDocument, nsIContent* aParent,
 
   // Now set the parent and set the "Force attach xbl" flag if needed.
   if (aParent) {
-    mParentPtrBits = NS_REINTERPRET_CAST(PtrBits, aParent) | PARENT_BIT_PARENT_IS_CONTENT;
+    mParentPtrBits = reinterpret_cast<PtrBits>(aParent) | PARENT_BIT_PARENT_IS_CONTENT;
 
     if (aParent->HasFlag(NODE_FORCE_XBL_BINDINGS)) {
       SetFlags(NODE_FORCE_XBL_BINDINGS);
     }
   }
   else {
-    mParentPtrBits = NS_REINTERPRET_CAST(PtrBits, aDocument);
+    mParentPtrBits = reinterpret_cast<PtrBits>(aDocument);
   }
 
   // XXXbz sXBL/XBL2 issue!
@@ -2109,7 +2109,7 @@ nsGenericElement::UnbindFromTree(PRBool aDeep, PRBool aNullParent)
 
   nsNodeUtils::ParentChainChanged(this);
 #ifdef DEBUG
-  nsCycleCollector_DEBUG_shouldBeFreed(NS_STATIC_CAST(nsINode*, this));
+  nsCycleCollector_DEBUG_shouldBeFreed(static_cast<nsINode*>(this));
 #endif
 }
 
@@ -2150,8 +2150,8 @@ nsGenericElement::doPreHandleEvent(nsIContent* aContent,
   if (aVisitor.mEvent->message == NS_MOUSE_ENTER_SYNTH ||
       aVisitor.mEvent->message == NS_MOUSE_EXIT_SYNTH) {
      nsCOMPtr<nsIContent> relatedTarget =
-       do_QueryInterface(NS_STATIC_CAST(nsMouseEvent*,
-                                        aVisitor.mEvent)->relatedTarget);
+       do_QueryInterface(static_cast<nsMouseEvent*>
+                                    (aVisitor.mEvent)->relatedTarget);
     if (relatedTarget &&
         relatedTarget->GetOwnerDoc() == aContent->GetOwnerDoc()) {
 
@@ -2231,7 +2231,7 @@ nsGenericElement::DispatchDOMEvent(nsEvent* aEvent,
                                    nsPresContext* aPresContext,
                                    nsEventStatus* aEventStatus)
 {
-  return nsEventDispatcher::DispatchDOMEvent(NS_STATIC_CAST(nsIContent*, this),
+  return nsEventDispatcher::DispatchDOMEvent(static_cast<nsIContent*>(this),
                                              aEvent, aDOMEvent,
                                              aPresContext, aEventStatus);
 }
@@ -2256,7 +2256,7 @@ nsGenericElement::GetID() const
         nsAutoString idVal(attrVal->GetStringValue());
 
         // Create an atom from the value and set it into the attribute list. 
-        NS_CONST_CAST(nsAttrValue*, attrVal)->ParseAtom(idVal);
+        const_cast<nsAttrValue*>(attrVal)->ParseAtom(idVal);
         return attrVal->GetAtomValue();
       }
     }
@@ -2699,7 +2699,7 @@ nsGenericElement::doRemoveChildAt(PRUint32 aIndex, PRBool aNotify,
   // was processing.
   if (guard.Mutated(0)) {
     aIndex = container->IndexOf(aKid);
-    if (NS_STATIC_CAST(PRInt32, aIndex) < 0) {
+    if (static_cast<PRInt32>(aIndex) < 0) {
       return NS_OK;
     }
   }
@@ -2760,7 +2760,7 @@ nsGenericElement::DispatchClickEvent(nsPresContext* aPresContext,
   event.refPoint = aSourceEvent->refPoint;
   PRUint32 clickCount = 1;
   if (aSourceEvent->eventStructType == NS_MOUSE_EVENT) {
-    clickCount = NS_STATIC_CAST(nsMouseEvent*, aSourceEvent)->clickCount;
+    clickCount = static_cast<nsMouseEvent*>(aSourceEvent)->clickCount;
   }
   event.clickCount = clickCount;
   event.isShift = aSourceEvent->isShift;
@@ -3325,11 +3325,11 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsGenericElement)
 
   if (tmp->HasProperties() && tmp->IsNodeOfType(nsINode::eXUL)) {
     nsISupports* property =
-      NS_STATIC_CAST(nsISupports*,
-                     tmp->GetProperty(nsGkAtoms::contextmenulistener));
+      static_cast<nsISupports*>
+                 (tmp->GetProperty(nsGkAtoms::contextmenulistener));
     cb.NoteXPCOMChild(property);
-    property = NS_STATIC_CAST(nsISupports*,
-                              tmp->GetProperty(nsGkAtoms::popuplistener));
+    property = static_cast<nsISupports*>
+                          (tmp->GetProperty(nsGkAtoms::popuplistener));
     cb.NoteXPCOMChild(property);
   }
 
@@ -3576,8 +3576,8 @@ nsGenericElement::SetAttrAndNotify(PRInt32 aNamespaceID,
 {
   nsresult rv;
   PRUint8 modType = aModification ?
-    NS_STATIC_CAST(PRUint8, nsIDOMMutationEvent::MODIFICATION) :
-    NS_STATIC_CAST(PRUint8, nsIDOMMutationEvent::ADDITION);
+    static_cast<PRUint8>(nsIDOMMutationEvent::MODIFICATION) :
+    static_cast<PRUint8>(nsIDOMMutationEvent::ADDITION);
 
   nsIDocument* document = GetCurrentDoc();
   mozAutoDocUpdate updateBatch(document, UPDATE_CONTENT_MODEL, aNotify);
@@ -3683,7 +3683,7 @@ nsGenericElement::GetEventListenerManagerForAttr(nsIEventListenerManager** aMana
 {
   nsresult rv = GetListenerManager(PR_TRUE, aManager);
   if (NS_SUCCEEDED(rv)) {
-    NS_ADDREF(*aTarget = NS_STATIC_CAST(nsIContent*, this));
+    NS_ADDREF(*aTarget = static_cast<nsIContent*>(this));
   }
   *aDefer = PR_TRUE;
   return rv;
@@ -3850,7 +3850,7 @@ nsGenericElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
 
   if (hasMutationListeners) {
     nsCOMPtr<nsIDOMEventTarget> node =
-      do_QueryInterface(NS_STATIC_CAST(nsIContent *, this));
+      do_QueryInterface(static_cast<nsIContent *>(this));
     nsMutationEvent mutation(PR_TRUE, NS_MUTATION_ATTRMODIFIED);
 
     mutation.mRelatedNode = attrNode;
@@ -3990,7 +3990,7 @@ nsGenericElement::List(FILE* out, PRInt32 aIndent,
 
   fputs(">\n", out);
   
-  nsGenericElement* nonConstThis = NS_CONST_CAST(nsGenericElement*, this);
+  nsGenericElement* nonConstThis = const_cast<nsGenericElement*>(this);
 
   // XXX sXBL/XBL2 issue! Owner or current document?
   nsIDocument *document = GetOwnerDoc();
@@ -4198,7 +4198,7 @@ nsGenericElement::PostHandleEventForLinks(nsEventChainPostVisitor& aVisitor)
   case NS_MOUSE_BUTTON_DOWN:
     {
       if (aVisitor.mEvent->eventStructType == NS_MOUSE_EVENT &&
-          NS_STATIC_CAST(nsMouseEvent*, aVisitor.mEvent)->button ==
+          static_cast<nsMouseEvent*>(aVisitor.mEvent)->button ==
           nsMouseEvent::eLeftButton) {
         // don't make the link grab the focus if there is no link handler
         nsILinkHandler *handler = aVisitor.mPresContext->GetLinkHandler();
@@ -4232,7 +4232,7 @@ nsGenericElement::PostHandleEventForLinks(nsEventChainPostVisitor& aVisitor)
 
   case NS_MOUSE_CLICK:
     if (NS_IS_MOUSE_LEFT_CLICK(aVisitor.mEvent)) {
-      nsInputEvent* inputEvent = NS_STATIC_CAST(nsInputEvent*, aVisitor.mEvent);
+      nsInputEvent* inputEvent = static_cast<nsInputEvent*>(aVisitor.mEvent);
       if (inputEvent->isControl || inputEvent->isMeta ||
           inputEvent->isAlt ||inputEvent->isShift) {
         break;
@@ -4262,7 +4262,7 @@ nsGenericElement::PostHandleEventForLinks(nsEventChainPostVisitor& aVisitor)
   case NS_KEY_PRESS:
     {
       if (aVisitor.mEvent->eventStructType == NS_KEY_EVENT) {
-        nsKeyEvent* keyEvent = NS_STATIC_CAST(nsKeyEvent*, aVisitor.mEvent);
+        nsKeyEvent* keyEvent = static_cast<nsKeyEvent*>(aVisitor.mEvent);
         if (keyEvent->keyCode == NS_VK_RETURN) {
           nsEventStatus status = nsEventStatus_eIgnore;
           rv = DispatchClickEvent(aVisitor.mPresContext, keyEvent, this,
diff --git a/mozilla/content/base/src/nsGenericElement.h b/mozilla/content/base/src/nsGenericElement.h
index bd745348017..b6103e0e22f 100644
--- a/mozilla/content/base/src/nsGenericElement.h
+++ b/mozilla/content/base/src/nsGenericElement.h
@@ -309,7 +309,7 @@ public:
    */
   PRBool Mutated(PRUint8 aIgnoreCount)
   {
-    return sMutationCount < NS_STATIC_CAST(PRUint32, eMaxMutations - aIgnoreCount);
+    return sMutationCount < static_cast<PRUint32>(eMaxMutations - aIgnoreCount);
   }
 
   // This function should be called whenever a mutation that we want to keep
@@ -960,12 +960,12 @@ protected:
 
   nsDOMSlots *GetDOMSlots()
   {
-    return NS_STATIC_CAST(nsDOMSlots*, GetSlots());
+    return static_cast<nsDOMSlots*>(GetSlots());
   }
 
   nsDOMSlots *GetExistingDOMSlots() const
   {
-    return NS_STATIC_CAST(nsDOMSlots*, GetExistingSlots());
+    return static_cast<nsDOMSlots*>(GetExistingSlots());
   }
 
   /**
diff --git a/mozilla/content/base/src/nsMappedAttributes.cpp b/mozilla/content/base/src/nsMappedAttributes.cpp
index a90b74c7a78..eb0f7634a78 100644
--- a/mozilla/content/base/src/nsMappedAttributes.cpp
+++ b/mozilla/content/base/src/nsMappedAttributes.cpp
@@ -99,7 +99,7 @@ void* nsMappedAttributes::operator new(size_t aSize, PRUint32 aAttrCount) CPP_TH
 
 #ifdef DEBUG
   if (newAttrs) {
-    NS_STATIC_CAST(nsMappedAttributes*, newAttrs)->mBufferSize = aAttrCount;
+    static_cast<nsMappedAttributes*>(newAttrs)->mBufferSize = aAttrCount;
   }
 #endif
 
diff --git a/mozilla/content/base/src/nsMappedAttributes.h b/mozilla/content/base/src/nsMappedAttributes.h
index cd826319a17..9f00c6853b0 100644
--- a/mozilla/content/base/src/nsMappedAttributes.h
+++ b/mozilla/content/base/src/nsMappedAttributes.h
@@ -127,11 +127,11 @@ private:
    */
   const InternalAttr* Attrs() const
   {
-    return NS_REINTERPRET_CAST(const InternalAttr*, &(mAttrs[0]));
+    return reinterpret_cast<const InternalAttr*>(&(mAttrs[0]));
   }
   InternalAttr* Attrs()
   {
-    return NS_REINTERPRET_CAST(InternalAttr*, &(mAttrs[0]));
+    return reinterpret_cast<InternalAttr*>(&(mAttrs[0]));
   }
 
   PRUint16 mAttrCount;
diff --git a/mozilla/content/base/src/nsNodeInfoManager.cpp b/mozilla/content/base/src/nsNodeInfoManager.cpp
index 65f629e878e..83e956e8643 100644
--- a/mozilla/content/base/src/nsNodeInfoManager.cpp
+++ b/mozilla/content/base/src/nsNodeInfoManager.cpp
@@ -60,7 +60,7 @@ nsNodeInfoManager::GetNodeInfoInnerHashValue(const void *key)
   NS_ASSERTION(key, "Null key passed to nsNodeInfo::GetHashValue!");
 
   const nsINodeInfo::nsNodeInfoInner *node =
-    NS_REINTERPRET_CAST(const nsINodeInfo::nsNodeInfoInner *, key);
+    reinterpret_cast<const nsINodeInfo::nsNodeInfoInner *>(key);
 
   // Is this an acceptable hash value?
   return (PLHashNumber(NS_PTR_TO_INT32(node->mName)) & 0xffff) >> 8;
@@ -73,9 +73,9 @@ nsNodeInfoManager::NodeInfoInnerKeyCompare(const void *key1, const void *key2)
   NS_ASSERTION(key1 && key2, "Null key passed to NodeInfoInnerKeyCompare!");
 
   const nsINodeInfo::nsNodeInfoInner *node1 =
-    NS_REINTERPRET_CAST(const nsINodeInfo::nsNodeInfoInner *, key1);
+    reinterpret_cast<const nsINodeInfo::nsNodeInfoInner *>(key1);
   const nsINodeInfo::nsNodeInfoInner *node2 =
-    NS_REINTERPRET_CAST(const nsINodeInfo::nsNodeInfoInner *, key2);
+    reinterpret_cast<const nsINodeInfo::nsNodeInfoInner *>(key2);
 
   return (node1->mName == node2->mName &&
           node1->mPrefix == node2->mPrefix &&
@@ -187,7 +187,7 @@ nsNodeInfoManager::GetNodeInfo(nsIAtom *aName, nsIAtom *aPrefix,
   void *node = PL_HashTableLookup(mNodeInfoHash, &tmpKey);
 
   if (node) {
-    *aNodeInfo = NS_STATIC_CAST(nsINodeInfo *, node);
+    *aNodeInfo = static_cast<nsINodeInfo *>(node);
 
     NS_ADDREF(*aNodeInfo);
 
diff --git a/mozilla/content/base/src/nsNodeUtils.cpp b/mozilla/content/base/src/nsNodeUtils.cpp
index 7d0a9cfe73f..01abf066c45 100755
--- a/mozilla/content/base/src/nsNodeUtils.cpp
+++ b/mozilla/content/base/src/nsNodeUtils.cpp
@@ -121,12 +121,12 @@ nsNodeUtils::ContentInserted(nsINode* aContainer,
   nsIContent* container;
   nsIDocument* document;
   if (aContainer->IsNodeOfType(nsINode::eCONTENT)) {
-    container = NS_STATIC_CAST(nsIContent*, aContainer);
+    container = static_cast<nsIContent*>(aContainer);
     document = aContainer->GetOwnerDoc();
   }
   else {
     container = nsnull;
-    document = NS_STATIC_CAST(nsIDocument*, aContainer);
+    document = static_cast<nsIDocument*>(aContainer);
   }
 
   IMPL_MUTATION_NOTIFICATION(ContentInserted, aContainer,
@@ -144,12 +144,12 @@ nsNodeUtils::ContentRemoved(nsINode* aContainer,
   nsIContent* container;
   nsIDocument* document;
   if (aContainer->IsNodeOfType(nsINode::eCONTENT)) {
-    container = NS_STATIC_CAST(nsIContent*, aContainer);
+    container = static_cast<nsIContent*>(aContainer);
     document = aContainer->GetOwnerDoc();
   }
   else {
     container = nsnull;
-    document = NS_STATIC_CAST(nsIDocument*, aContainer);
+    document = static_cast<nsIDocument*>(aContainer);
   }
 
   IMPL_MUTATION_NOTIFICATION(ContentRemoved, aContainer,
@@ -195,7 +195,7 @@ nsNodeUtils::LastRelease(nsINode* aNode)
     // Delete all properties before tearing down the document. Some of the
     // properties are bound to nsINode objects and the destructor functions of
     // the properties may want to use the owner document of the nsINode.
-    NS_STATIC_CAST(nsIDocument*, aNode)->PropertyTable()->DeleteAllProperties();
+    static_cast<nsIDocument*>(aNode)->PropertyTable()->DeleteAllProperties();
   }
   else if (aNode->HasProperties()) {
     // Strong reference to the document so that deleting properties can't
@@ -266,7 +266,7 @@ nsNodeUtils::SetUserData(nsINode *aNode, const nsAString &aKey,
   }
 
   // Take over ownership of the old data from the property table.
-  nsCOMPtr<nsIVariant> oldData = dont_AddRef(NS_STATIC_CAST(nsIVariant*, data));
+  nsCOMPtr<nsIVariant> oldData = dont_AddRef(static_cast<nsIVariant*>(data));
 
   if (aData && aHandler) {
     nsCOMPtr<nsIDOMUserDataHandler> oldHandler;
@@ -298,8 +298,8 @@ nsNodeUtils::GetUserData(nsINode *aNode, const nsAString &aKey,
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
-  *aResult = NS_STATIC_CAST(nsIVariant*,
-                            aNode->GetProperty(DOM_USER_DATA, key));
+  *aResult = static_cast<nsIVariant*>
+                        (aNode->GetProperty(DOM_USER_DATA, key));
   NS_IF_ADDREF(*aResult);
 
   return NS_OK;
@@ -314,12 +314,12 @@ struct nsHandlerData
 static void
 CallHandler(void *aObject, nsIAtom *aKey, void *aHandler, void *aData)
 {
-  nsHandlerData *handlerData = NS_STATIC_CAST(nsHandlerData*, aData);
+  nsHandlerData *handlerData = static_cast<nsHandlerData*>(aData);
   nsCOMPtr<nsIDOMUserDataHandler> handler =
-    NS_STATIC_CAST(nsIDOMUserDataHandler*, aHandler);
-  nsINode *node = NS_STATIC_CAST(nsINode*, aObject);
+    static_cast<nsIDOMUserDataHandler*>(aHandler);
+  nsINode *node = static_cast<nsINode*>(aObject);
   nsCOMPtr<nsIVariant> data =
-    NS_STATIC_CAST(nsIVariant*, node->GetProperty(DOM_USER_DATA, aKey));
+    static_cast<nsIVariant*>(node->GetProperty(DOM_USER_DATA, aKey));
   NS_ASSERTION(data, "Handler without data?");
 
   nsAutoString key;
@@ -371,8 +371,8 @@ static void
 NoteUserData(void *aObject, nsIAtom *aKey, void *aXPCOMChild, void *aData)
 {
   nsCycleCollectionTraversalCallback* cb =
-    NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aData);
-  cb->NoteXPCOMChild(NS_STATIC_CAST(nsISupports*, aXPCOMChild));
+    static_cast<nsCycleCollectionTraversalCallback*>(aData);
+  cb->NoteXPCOMChild(static_cast<nsISupports*>(aXPCOMChild));
 }
 
 /* static */
@@ -443,7 +443,7 @@ AdoptFunc(nsAttrHashKey::KeyType aKey, nsIDOMNode *aData, void* aUserArg)
   nsCOMPtr<nsIAttribute> attr = do_QueryInterface(aData);
   NS_ASSERTION(attr, "non-nsIAttribute somehow made it into the hashmap?!");
 
-  AdoptFuncData *data = NS_STATIC_CAST(AdoptFuncData*, aUserArg);
+  AdoptFuncData *data = static_cast<AdoptFuncData*>(aUserArg);
 
   // If we were passed an element we need to clone the attribute nodes and
   // insert them into the element.
@@ -505,7 +505,7 @@ nsNodeUtils::CloneAndAdopt(nsINode *aNode, PRBool aClone, PRBool aDeep,
   }
 
   nsGenericElement *elem = aNode->IsNodeOfType(nsINode::eELEMENT) ?
-                           NS_STATIC_CAST(nsGenericElement*, aNode) :
+                           static_cast<nsGenericElement*>(aNode) :
                            nsnull;
 
   nsCOMPtr<nsINode> clone;
@@ -642,7 +642,7 @@ nsNodeUtils::CloneAndAdopt(nsINode *aNode, PRBool aClone, PRBool aDeep,
   // in a document.
 #ifdef MOZ_XUL
   if (aClone && !aParent && aNode->IsNodeOfType(nsINode::eXUL)) {
-    nsXULElement *xulElem = NS_STATIC_CAST(nsXULElement*, elem);
+    nsXULElement *xulElem = static_cast<nsXULElement*>(elem);
     if (!xulElem->mPrototype || xulElem->IsInDoc()) {
       clone->SetFlags(NODE_FORCE_XBL_BINDINGS);
     }
diff --git a/mozilla/content/base/src/nsObjectLoadingContent.cpp b/mozilla/content/base/src/nsObjectLoadingContent.cpp
index f26eaee1b1c..9d3661e6a37 100644
--- a/mozilla/content/base/src/nsObjectLoadingContent.cpp
+++ b/mozilla/content/base/src/nsObjectLoadingContent.cpp
@@ -105,12 +105,12 @@ public:
                           nsIURI* aURI)
     : mContent(aContent), mFrame(aFrame), mContentType(aType), mURI(aURI)
   {
-    NS_STATIC_CAST(nsIObjectLoadingContent *, mContent)->AddRef();
+    static_cast<nsIObjectLoadingContent *>(mContent)->AddRef();
   }
 
   ~nsAsyncInstantiateEvent()
   {
-    NS_STATIC_CAST(nsIObjectLoadingContent *, mContent)->Release();
+    static_cast<nsIObjectLoadingContent *>(mContent)->Release();
   }
 
   NS_IMETHOD Run();
@@ -339,7 +339,7 @@ nsObjectLoadingContent::OnStartRequest(nsIRequest *aRequest, nsISupports *aConte
   }
 
   nsCOMPtr<nsIContent> thisContent = 
-    do_QueryInterface(NS_STATIC_CAST(nsIImageLoadingContent*, this));
+    do_QueryInterface(static_cast<nsIImageLoadingContent*>(this));
   NS_ASSERTION(thisContent, "must be a content");
   switch (newType) {
     case eType_Image:
@@ -543,7 +543,7 @@ nsObjectLoadingContent::EnsureInstantiation(nsIPluginInstance** aInstance)
     mInstantiating = PR_TRUE;
 
     nsCOMPtr<nsIContent> thisContent = 
-      do_QueryInterface(NS_STATIC_CAST(nsIImageLoadingContent*, this));
+      do_QueryInterface(static_cast<nsIImageLoadingContent*>(this));
     NS_ASSERTION(thisContent, "must be a content");
 
     nsIDocument* doc = thisContent->GetCurrentDoc();
@@ -703,7 +703,7 @@ nsObjectLoadingContent::LoadObject(const nsAString& aURI,
 
   // Avoid StringToURI in order to use the codebase attribute as base URI
   nsCOMPtr<nsIContent> thisContent = 
-    do_QueryInterface(NS_STATIC_CAST(nsIImageLoadingContent*, this));
+    do_QueryInterface(static_cast<nsIImageLoadingContent*>(this));
   NS_ASSERTION(thisContent, "must be a content");
 
   nsIDocument* doc = thisContent->GetOwnerDoc();
@@ -765,7 +765,7 @@ nsObjectLoadingContent::LoadObject(nsIURI* aURI,
   mContentType = aTypeHint;
 
   nsCOMPtr<nsIContent> thisContent = 
-    do_QueryInterface(NS_STATIC_CAST(nsIImageLoadingContent*, this));
+    do_QueryInterface(static_cast<nsIImageLoadingContent*>(this));
   NS_ASSERTION(thisContent, "must be a content");
 
   nsIDocument* doc = thisContent->GetOwnerDoc();
@@ -812,7 +812,7 @@ nsObjectLoadingContent::LoadObject(nsIURI* aURI,
       NS_CheckContentLoadPolicy(nsIContentPolicy::TYPE_OBJECT,
                                 aURI,
                                 doc->GetDocumentURI(),
-                                NS_STATIC_CAST(nsIImageLoadingContent*, this),
+                                static_cast<nsIImageLoadingContent*>(this),
                                 aTypeHint,
                                 nsnull, //extra
                                 &shouldLoad,
@@ -1095,7 +1095,7 @@ PRBool
 nsObjectLoadingContent::IsSupportedDocument(const nsCString& aMimeType)
 {
   nsCOMPtr<nsIContent> thisContent = 
-    do_QueryInterface(NS_STATIC_CAST(nsIImageLoadingContent*, this));
+    do_QueryInterface(static_cast<nsIImageLoadingContent*>(this));
   NS_ASSERTION(thisContent, "must be a content");
 
   nsresult rv;
@@ -1156,7 +1156,7 @@ nsObjectLoadingContent::NotifyStateChanged(ObjectType aOldType,
        this, aOldType, aOldState, mType, ObjectState(), aSync));
 
   nsCOMPtr<nsIContent> thisContent = 
-    do_QueryInterface(NS_STATIC_CAST(nsIImageLoadingContent*, this));
+    do_QueryInterface(static_cast<nsIImageLoadingContent*>(this));
   NS_ASSERTION(thisContent, "must be a content");
 
   nsIDocument* doc = thisContent->GetCurrentDoc();
@@ -1230,7 +1230,7 @@ nsObjectLoadingContent::GetTypeOfContent(const nsCString& aMIMEType)
   }
 
   nsCOMPtr<nsIContent> thisContent = 
-    do_QueryInterface(NS_STATIC_CAST(nsIImageLoadingContent*, this));
+    do_QueryInterface(static_cast<nsIImageLoadingContent*>(this));
   NS_ASSERTION(thisContent, "must be a content");
 
   if (ShouldShowDefaultPlugin(thisContent, aMIMEType)) {
@@ -1299,7 +1299,7 @@ nsIObjectFrame*
 nsObjectLoadingContent::GetFrame()
 {
   nsCOMPtr<nsIContent> thisContent = 
-    do_QueryInterface(NS_STATIC_CAST(nsIImageLoadingContent*, this));
+    do_QueryInterface(static_cast<nsIImageLoadingContent*>(this));
   NS_ASSERTION(thisContent, "must be a content");
 
   PRBool flushed = PR_FALSE;
@@ -1375,7 +1375,7 @@ nsObjectLoadingContent::Instantiate(const nsACString& aMIMEType, nsIURI* aURI)
     // We need some URI. If we have nothing else, use the base URI.
     // XXX(biesi): The code used to do this. Not sure why this is correct...
     nsCOMPtr<nsIContent> thisContent = 
-      do_QueryInterface(NS_STATIC_CAST(nsIImageLoadingContent*, this));
+      do_QueryInterface(static_cast<nsIImageLoadingContent*>(this));
     NS_ASSERTION(thisContent, "must be a content");
 
     GetObjectBaseURI(thisContent, getter_AddRefs(baseURI));
diff --git a/mozilla/content/base/src/nsPlainTextSerializer.cpp b/mozilla/content/base/src/nsPlainTextSerializer.cpp
index 8e58b64688f..ff512b5e27e 100644
--- a/mozilla/content/base/src/nsPlainTextSerializer.cpp
+++ b/mozilla/content/base/src/nsPlainTextSerializer.cpp
@@ -237,7 +237,7 @@ nsPlainTextSerializer::GetLastBool(const nsVoidArray& aStack)
   if (size == 0) {
     return PR_FALSE;
   }
-  return (aStack.ElementAt(size-1) != NS_REINTERPRET_CAST(void*, PR_FALSE));
+  return (aStack.ElementAt(size-1) != reinterpret_cast<void*>(PR_FALSE));
 }
 
 void
@@ -245,7 +245,7 @@ nsPlainTextSerializer::SetLastBool(nsVoidArray& aStack, PRBool aValue)
 {
   PRUint32 size = aStack.Count();
   if (size > 0) {
-    aStack.ReplaceElementAt(NS_REINTERPRET_CAST(void*, aValue), size-1);
+    aStack.ReplaceElementAt(reinterpret_cast<void*>(aValue), size-1);
   }
   else {
     NS_ERROR("There is no \"Last\" value");
@@ -255,7 +255,7 @@ nsPlainTextSerializer::SetLastBool(nsVoidArray& aStack, PRBool aValue)
 void
 nsPlainTextSerializer::PushBool(nsVoidArray& aStack, PRBool aValue)
 {
-    aStack.AppendElement(NS_REINTERPRET_CAST(void*, aValue));
+    aStack.AppendElement(reinterpret_cast<void*>(aValue));
 }
 
 PRBool
@@ -264,7 +264,7 @@ nsPlainTextSerializer::PopBool(nsVoidArray& aStack)
   PRBool returnValue = PR_FALSE;
   PRUint32 size = aStack.Count();
   if (size > 0) {
-    returnValue = (aStack.ElementAt(size-1) != NS_REINTERPRET_CAST(void*, PR_FALSE));
+    returnValue = (aStack.ElementAt(size-1) != reinterpret_cast<void*>(PR_FALSE));
     aStack.RemoveElementAt(size-1);
   }
   return returnValue;
diff --git a/mozilla/content/base/src/nsPropertyTable.cpp b/mozilla/content/base/src/nsPropertyTable.cpp
index 8f0f0ca33b1..2fc62d6c0aa 100644
--- a/mozilla/content/base/src/nsPropertyTable.cpp
+++ b/mozilla/content/base/src/nsPropertyTable.cpp
@@ -133,8 +133,8 @@ nsPropertyTable::TransferOrDeleteAllPropertiesFor(nsPropertyOwner aObject,
   nsresult rv = NS_OK;
   for (PropertyList* prop = mPropertyList; prop; prop = prop->mNext) {
     if (prop->mTransfer) {
-      PropertyListMapEntry *entry = NS_STATIC_CAST(PropertyListMapEntry*,
-          PL_DHashTableOperate(&prop->mObjectValueMap, aObject,
+      PropertyListMapEntry *entry = static_cast<PropertyListMapEntry*>
+                                               (PL_DHashTableOperate(&prop->mObjectValueMap, aObject,
                                PL_DHASH_LOOKUP));
       if (PL_DHASH_ENTRY_IS_BUSY(entry)) {
         rv = aOtherTable->SetProperty(aObject, prop->mCategory, prop->mName,
@@ -165,11 +165,11 @@ nsPropertyTable::Enumerate(nsPropertyOwner aObject, PRUint16 aCategory,
   PropertyList* prop;
   for (prop = mPropertyList; prop; prop = prop->mNext) {
     if (prop->mCategory == aCategory) {
-      PropertyListMapEntry *entry = NS_STATIC_CAST(PropertyListMapEntry*,
-          PL_DHashTableOperate(&prop->mObjectValueMap, aObject,
+      PropertyListMapEntry *entry = static_cast<PropertyListMapEntry*>
+                                               (PL_DHashTableOperate(&prop->mObjectValueMap, aObject,
                                PL_DHASH_LOOKUP));
       if (PL_DHASH_ENTRY_IS_BUSY(entry)) {
-        aCallback(NS_CONST_CAST(void*, aObject.get()), prop->mName, entry->value,
+        aCallback(const_cast<void*>(aObject.get()), prop->mName, entry->value,
                   aData);
       }
     }
@@ -189,8 +189,8 @@ nsPropertyTable::GetPropertyInternal(nsPropertyOwner aObject,
 
   PropertyList* propertyList = GetPropertyListFor(aCategory, aPropertyName);
   if (propertyList) {
-    PropertyListMapEntry *entry = NS_STATIC_CAST(PropertyListMapEntry*,
-        PL_DHashTableOperate(&propertyList->mObjectValueMap, aObject,
+    PropertyListMapEntry *entry = static_cast<PropertyListMapEntry*>
+                                             (PL_DHashTableOperate(&propertyList->mObjectValueMap, aObject,
                              PL_DHASH_LOOKUP));
     if (PL_DHASH_ENTRY_IS_BUSY(entry)) {
       propValue = entry->value;
@@ -246,8 +246,8 @@ nsPropertyTable::SetPropertyInternal(nsPropertyOwner     aObject,
   // The current property value (if there is one) is replaced and the current
   // value is destroyed
   nsresult result = NS_OK;
-  PropertyListMapEntry *entry = NS_STATIC_CAST(PropertyListMapEntry*,
-    PL_DHashTableOperate(&propertyList->mObjectValueMap, aObject, PL_DHASH_ADD));
+  PropertyListMapEntry *entry = static_cast<PropertyListMapEntry*>
+                                           (PL_DHashTableOperate(&propertyList->mObjectValueMap, aObject, PL_DHASH_ADD));
   if (!entry)
     return NS_ERROR_OUT_OF_MEMORY;
   // A NULL entry->key is the sign that the entry has just been allocated
@@ -256,7 +256,7 @@ nsPropertyTable::SetPropertyInternal(nsPropertyOwner     aObject,
     if (aOldValue)
       *aOldValue = entry->value;
     else if (propertyList->mDtorFunc)
-      propertyList->mDtorFunc(NS_CONST_CAST(void*, entry->key), aPropertyName,
+      propertyList->mDtorFunc(const_cast<void*>(entry->key), aPropertyName,
                               entry->value, propertyList->mDtorData);
     result = NS_PROPTABLE_PROP_OVERWRITTEN;
   }
@@ -329,10 +329,10 @@ DestroyPropertyEnumerator(PLDHashTable *table, PLDHashEntryHdr *hdr,
                           PRUint32 number, void *arg)
 {
   nsPropertyTable::PropertyList *propList =
-      NS_STATIC_CAST(nsPropertyTable::PropertyList*, table->data);
-  PropertyListMapEntry* entry = NS_STATIC_CAST(PropertyListMapEntry*, hdr);
+      static_cast<nsPropertyTable::PropertyList*>(table->data);
+  PropertyListMapEntry* entry = static_cast<PropertyListMapEntry*>(hdr);
 
-  propList->mDtorFunc(NS_CONST_CAST(void*, entry->key), propList->mName,
+  propList->mDtorFunc(const_cast<void*>(entry->key), propList->mName,
                       entry->value, propList->mDtorData);
   return PL_DHASH_NEXT;
 }
@@ -349,8 +349,8 @@ nsPropertyTable::PropertyList::Destroy()
 PRBool
 nsPropertyTable::PropertyList::DeletePropertyFor(nsPropertyOwner aObject)
 {
-  PropertyListMapEntry *entry = NS_STATIC_CAST(PropertyListMapEntry*,
-      PL_DHashTableOperate(&mObjectValueMap, aObject, PL_DHASH_LOOKUP));
+  PropertyListMapEntry *entry = static_cast<PropertyListMapEntry*>
+                                           (PL_DHashTableOperate(&mObjectValueMap, aObject, PL_DHASH_LOOKUP));
   if (!PL_DHASH_ENTRY_IS_BUSY(entry))
     return PR_FALSE;
 
@@ -358,7 +358,7 @@ nsPropertyTable::PropertyList::DeletePropertyFor(nsPropertyOwner aObject)
   PL_DHashTableRawRemove(&mObjectValueMap, entry);
 
   if (mDtorFunc)
-    mDtorFunc(NS_CONST_CAST(void*, aObject.get()), mName, value, mDtorData);
+    mDtorFunc(const_cast<void*>(aObject.get()), mName, value, mDtorData);
 
   return PR_TRUE;
 }
@@ -368,6 +368,6 @@ void
 nsPropertyTable::SupportsDtorFunc(void *aObject, nsIAtom *aPropertyName,
                                   void *aPropertyValue, void *aData)
 {
-  nsISupports *propertyValue = NS_STATIC_CAST(nsISupports*, aPropertyValue);
+  nsISupports *propertyValue = static_cast<nsISupports*>(aPropertyValue);
   NS_IF_RELEASE(propertyValue);
 }
diff --git a/mozilla/content/base/src/nsRange.cpp b/mozilla/content/base/src/nsRange.cpp
index 8ba148d9211..c174349cf1d 100644
--- a/mozilla/content/base/src/nsRange.cpp
+++ b/mozilla/content/base/src/nsRange.cpp
@@ -392,7 +392,7 @@ nsRange::ComparePoint(nsIDOMNode* aParent, PRInt32 aOffset, PRInt16* aResult)
 static PRInt32 GetNodeLength(nsINode *aNode)
 {
   if(aNode->IsNodeOfType(nsINode::eDATA_NODE)) {
-    return NS_STATIC_CAST(nsIContent*, aNode)->TextLength();
+    return static_cast<nsIContent*>(aNode)->TextLength();
   }
 
   return aNode->GetChildCount();
@@ -421,9 +421,9 @@ nsRange::DoSetRange(nsINode* aStartN, PRInt32 aStartOffset,
                   (aStartN->IsNodeOfType(nsINode::eCONTENT) &&
                    aEndN->IsNodeOfType(nsINode::eCONTENT) &&
                    aRoot ==
-                    NS_STATIC_CAST(nsIContent*, aStartN)->GetBindingParent() &&
+                    static_cast<nsIContent*>(aStartN)->GetBindingParent() &&
                    aRoot ==
-                    NS_STATIC_CAST(nsIContent*, aEndN)->GetBindingParent()) ||
+                    static_cast<nsIContent*>(aEndN)->GetBindingParent()) ||
                   (!aRoot->GetNodeParent() &&
                    (aRoot->IsNodeOfType(nsINode::eDOCUMENT) ||
                     aRoot->IsNodeOfType(nsINode::eATTRIBUTE) ||
@@ -556,7 +556,7 @@ nsINode* nsRange::IsValidBoundary(nsINode* aNode)
   }
 
   if (aNode->IsNodeOfType(nsINode::eCONTENT)) {
-    nsIContent* content = NS_STATIC_CAST(nsIContent*, aNode);
+    nsIContent* content = static_cast<nsIContent*>(aNode);
     if (content->Tag() == nsGkAtoms::documentTypeNodeName) {
       return nsnull;
     }
diff --git a/mozilla/content/base/src/nsScriptElement.cpp b/mozilla/content/base/src/nsScriptElement.cpp
index b4636d1d9ee..20e0999e088 100755
--- a/mozilla/content/base/src/nsScriptElement.cpp
+++ b/mozilla/content/base/src/nsScriptElement.cpp
@@ -166,7 +166,7 @@ InNonScriptingContainer(nsINode* aNode)
     // prefs or per-document container settings for not allowing
     // frames or plugins.
     if (aNode->IsNodeOfType(nsINode::eHTML)) {
-      nsIAtom *localName = NS_STATIC_CAST(nsIContent*, aNode)->Tag();
+      nsIAtom *localName = static_cast<nsIContent*>(aNode)->Tag();
       if (localName == nsGkAtoms::iframe ||
           localName == nsGkAtoms::noframes ||
           localName == nsGkAtoms::noembed) {
diff --git a/mozilla/content/base/src/nsScriptLoader.cpp b/mozilla/content/base/src/nsScriptLoader.cpp
index 64060586d11..ee11a91e001 100644
--- a/mozilla/content/base/src/nsScriptLoader.cpp
+++ b/mozilla/content/base/src/nsScriptLoader.cpp
@@ -744,7 +744,7 @@ nsScriptLoader::ConvertToUTF16(nsIChannel* aChannel, const PRUint8* aData,
   if (NS_SUCCEEDED(rv)) {
     PRInt32 unicodeLength = 0;
 
-    rv = unicodeDecoder->GetMaxLength(NS_REINTERPRET_CAST(const char*, aData),
+    rv = unicodeDecoder->GetMaxLength(reinterpret_cast<const char*>(aData),
                                       aLength, &unicodeLength);
     if (NS_SUCCEEDED(rv)) {
       if (!EnsureStringLength(aString, unicodeLength))
@@ -757,7 +757,7 @@ nsScriptLoader::ConvertToUTF16(nsIChannel* aChannel, const PRUint8* aData,
       PRInt32 convertedLength = 0;
       PRInt32 bufferLength = unicodeLength;
       do {
-        rv = unicodeDecoder->Convert(NS_REINTERPRET_CAST(const char*, aData),
+        rv = unicodeDecoder->Convert(reinterpret_cast<const char*>(aData),
                                      (PRInt32 *) &aLength, ustr,
                                      &unicodeLength);
         if (NS_FAILED(rv)) {
@@ -787,7 +787,7 @@ nsScriptLoader::OnStreamComplete(nsIStreamLoader* aLoader,
                                  PRUint32 aStringLen,
                                  const PRUint8* aString)
 {
-  nsScriptLoadRequest* request = NS_STATIC_CAST(nsScriptLoadRequest*, aContext);
+  nsScriptLoadRequest* request = static_cast<nsScriptLoadRequest*>(aContext);
   NS_ASSERTION(request, "null request in stream complete handler");
   NS_ENSURE_TRUE(request, NS_ERROR_FAILURE);
 
diff --git a/mozilla/content/base/src/nsStyleLinkElement.cpp b/mozilla/content/base/src/nsStyleLinkElement.cpp
index 81de24ea769..a18f4e31f76 100644
--- a/mozilla/content/base/src/nsStyleLinkElement.cpp
+++ b/mozilla/content/base/src/nsStyleLinkElement.cpp
@@ -91,7 +91,7 @@ nsStyleLinkElement::SetStyleSheet(nsIStyleSheet* aStyleSheet)
   if (cssSheet) {
     nsCOMPtr<nsIDOMNode> node;
     CallQueryInterface(this,
-                       NS_STATIC_CAST(nsIDOMNode**, getter_AddRefs(node)));
+                       static_cast<nsIDOMNode**>(getter_AddRefs(node)));
     if (node) {
       cssSheet->SetOwningNode(node);
     }
diff --git a/mozilla/content/base/src/nsSyncLoadService.cpp b/mozilla/content/base/src/nsSyncLoadService.cpp
index 353851aa9b4..6b1b4a5e3fc 100644
--- a/mozilla/content/base/src/nsSyncLoadService.cpp
+++ b/mozilla/content/base/src/nsSyncLoadService.cpp
@@ -227,13 +227,12 @@ nsSyncLoader::LoadDocument(nsIChannel* aChannel,
     nsCOMPtr<nsPIDOMEventTarget> target = do_QueryInterface(document);
     NS_ENSURE_TRUE(target, NS_ERROR_FAILURE);
 
-    nsWeakPtr requestWeak = do_GetWeakReference(NS_STATIC_CAST(nsIDOMLoadListener*, this));
+    nsWeakPtr requestWeak = do_GetWeakReference(static_cast<nsIDOMLoadListener*>(this));
     nsLoadListenerProxy* proxy = new nsLoadListenerProxy(requestWeak);
     NS_ENSURE_TRUE(proxy, NS_ERROR_OUT_OF_MEMORY);
 
     // This will addref the proxy
-    rv = target->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMEventListener*, 
-                                                      proxy), 
+    rv = target->AddEventListenerByIID(static_cast<nsIDOMEventListener*>(proxy), 
                                        NS_GET_IID(nsIDOMLoadListener));
     NS_ENSURE_SUCCESS(rv, rv);
     
@@ -255,8 +254,7 @@ nsSyncLoader::LoadDocument(nsIChannel* aChannel,
 
     // This will release the proxy. Don't use the errorvalue from this since
     // we're more interested in the errorvalue from the loading
-    target->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMEventListener*, 
-                                                    proxy), 
+    target->RemoveEventListenerByIID(static_cast<nsIDOMEventListener*>(proxy), 
                                      NS_GET_IID(nsIDOMLoadListener));
 
     // check that the load succeeded
diff --git a/mozilla/content/base/src/nsTextFragment.cpp b/mozilla/content/base/src/nsTextFragment.cpp
index 5d27b747bd6..a09f40d121f 100644
--- a/mozilla/content/base/src/nsTextFragment.cpp
+++ b/mozilla/content/base/src/nsTextFragment.cpp
@@ -130,8 +130,8 @@ nsTextFragment::operator=(const nsTextFragment& aOther)
       m1b = aOther.m1b; // This will work even if aOther is using m2b
     }
     else {
-      m2b = NS_STATIC_CAST(PRUnichar*,
-        nsMemory::Clone(aOther.m2b, aOther.mState.mLength *
+      m2b = static_cast<PRUnichar*>
+                       (nsMemory::Clone(aOther.m2b, aOther.mState.mLength *
                                     (aOther.mState.mIs2b ? sizeof(PRUnichar) : sizeof(char))));
     }
 
@@ -358,7 +358,7 @@ nsTextFragment::Append(const PRUnichar* aBuffer, PRUint32 aLength)
   // The new and the old data is all 1-byte
   char* buff;
   if (mState.mInHeap) {
-    buff = (char*)nsMemory::Realloc(NS_CONST_CAST(char*, m1b),
+    buff = (char*)nsMemory::Realloc(const_cast<char*>(m1b),
                                     (mState.mLength + aLength) * sizeof(char));
     if (!buff) {
       return;
diff --git a/mozilla/content/base/src/nsTextFragment.h b/mozilla/content/base/src/nsTextFragment.h
index 896b17f68aa..6c65e147f9f 100644
--- a/mozilla/content/base/src/nsTextFragment.h
+++ b/mozilla/content/base/src/nsTextFragment.h
@@ -182,7 +182,7 @@ public:
   PRUnichar CharAt(PRInt32 aIndex) const
   {
     NS_ASSERTION(PRUint32(aIndex) < mState.mLength, "bad index");
-    return mState.mIs2b ? m2b[aIndex] : NS_STATIC_CAST(unsigned char, m1b[aIndex]);
+    return mState.mIs2b ? m2b[aIndex] : static_cast<unsigned char>(m1b[aIndex]);
   }
 
   /**
diff --git a/mozilla/content/base/src/nsTreeWalker.cpp b/mozilla/content/base/src/nsTreeWalker.cpp
index 111835e282f..c5d61c6919b 100644
--- a/mozilla/content/base/src/nsTreeWalker.cpp
+++ b/mozilla/content/base/src/nsTreeWalker.cpp
@@ -585,7 +585,7 @@ nsresult nsTreeWalker::TestNode(nsINode* aNode, PRInt16* _filtered)
         nodeType = nsIDOMNode::ELEMENT_NODE;
     }
     else if (aNode->IsNodeOfType(nsINode::eCONTENT)) {
-        nsIAtom* tag = NS_STATIC_CAST(nsIContent*, aNode)->Tag();
+        nsIAtom* tag = static_cast<nsIContent*>(aNode)->Tag();
         if (tag == nsGkAtoms::textTagName) {
             nodeType = nsIDOMNode::TEXT_NODE;
         }
diff --git a/mozilla/content/base/src/nsXMLHttpRequest.cpp b/mozilla/content/base/src/nsXMLHttpRequest.cpp
index 302a574ae53..73b6b4365e6 100644
--- a/mozilla/content/base/src/nsXMLHttpRequest.cpp
+++ b/mozilla/content/base/src/nsXMLHttpRequest.cpp
@@ -652,7 +652,7 @@ nsXMLHttpRequest::ConvertBodyToText(nsAString& aOutBuffer)
     return rv;
 
   PRUnichar * outBuffer =
-    NS_STATIC_CAST(PRUnichar*, nsMemory::Alloc((outBufferLength + 1) *
+    static_cast<PRUnichar*>(nsMemory::Alloc((outBufferLength + 1) *
                                                sizeof(PRUnichar)));
   if (!outBuffer) {
     return NS_ERROR_OUT_OF_MEMORY;
@@ -1170,8 +1170,8 @@ nsXMLHttpRequest::Open(const nsACString& method, const nsACString& url)
         JSString* userStr = ::JS_ValueToString(cx, argv[3]);
 
         if (userStr) {
-          user.Assign(NS_REINTERPRET_CAST(PRUnichar *,
-                                          ::JS_GetStringChars(userStr)),
+          user.Assign(reinterpret_cast<PRUnichar *>
+                                      (::JS_GetStringChars(userStr)),
                       ::JS_GetStringLength(userStr));
         }
 
@@ -1179,8 +1179,8 @@ nsXMLHttpRequest::Open(const nsACString& method, const nsACString& url)
           JSString* passwdStr = JS_ValueToString(cx, argv[4]);
 
           if (passwdStr) {
-            password.Assign(NS_REINTERPRET_CAST(PRUnichar *,
-                                                ::JS_GetStringChars(passwdStr)),
+            password.Assign(reinterpret_cast<PRUnichar *>
+                                            (::JS_GetStringChars(passwdStr)),
                             ::JS_GetStringLength(passwdStr));
           }
         }
@@ -1202,7 +1202,7 @@ nsXMLHttpRequest::StreamReaderFunc(nsIInputStream* in,
                                    PRUint32 count,
                                    PRUint32 *writeCount)
 {
-  nsXMLHttpRequest* xmlHttpRequest = NS_STATIC_CAST(nsXMLHttpRequest*, closure);
+  nsXMLHttpRequest* xmlHttpRequest = static_cast<nsXMLHttpRequest*>(closure);
   if (!xmlHttpRequest || !writeCount) {
     NS_WARNING("XMLHttpRequest cannot read from stream: no closure or writeCount");
     return NS_ERROR_FAILURE;
@@ -1300,13 +1300,13 @@ nsXMLHttpRequest::OnStartRequest(nsIRequest *request, nsISupports *ctxt)
   nsCOMPtr<nsPIDOMEventTarget> target(do_QueryInterface(mDocument));
   if (target) {
     nsWeakPtr requestWeak =
-      do_GetWeakReference(NS_STATIC_CAST(nsIXMLHttpRequest*, this));
+      do_GetWeakReference(static_cast<nsIXMLHttpRequest*>(this));
     nsCOMPtr<nsIDOMEventListener> proxy = new nsLoadListenerProxy(requestWeak);
     if (!proxy) return NS_ERROR_OUT_OF_MEMORY;
 
     // This will addref the proxy
-    rv = target->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMEventListener*,
-                                                      proxy),
+    rv = target->AddEventListenerByIID(static_cast<nsIDOMEventListener*>
+                                                  (proxy),
                                        NS_GET_IID(nsIDOMLoadListener));
     if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
   }
@@ -2089,12 +2089,12 @@ nsXMLHttpRequest::GetInterface(const nsIID & aIID, void **aResult)
   // need to see these notifications for proper functioning.
   if (aIID.Equals(NS_GET_IID(nsIChannelEventSink))) {
     mChannelEventSink = do_GetInterface(mNotificationCallbacks);
-    *aResult = NS_STATIC_CAST(nsIChannelEventSink*, this);
+    *aResult = static_cast<nsIChannelEventSink*>(this);
     NS_ADDREF_THIS();
     return NS_OK;
   } else if (aIID.Equals(NS_GET_IID(nsIProgressEventSink))) {
     mProgressEventSink = do_GetInterface(mNotificationCallbacks);
-    *aResult = NS_STATIC_CAST(nsIProgressEventSink*, this);
+    *aResult = static_cast<nsIProgressEventSink*>(this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
diff --git a/mozilla/content/base/src/nsXMLNameSpaceMap.cpp b/mozilla/content/base/src/nsXMLNameSpaceMap.cpp
index 10328caed1c..5e62e2e6dfb 100755
--- a/mozilla/content/base/src/nsXMLNameSpaceMap.cpp
+++ b/mozilla/content/base/src/nsXMLNameSpaceMap.cpp
@@ -86,8 +86,8 @@ nsXMLNameSpaceMap::AddPrefix(nsIAtom *aPrefix, PRInt32 aNameSpaceID)
   nsNameSpaceEntry *foundEntry = nsnull;
 
   for (PRInt32 i = 0; i < count; ++i) {
-    nsNameSpaceEntry *entry = NS_STATIC_CAST(nsNameSpaceEntry*,
-                                             mNameSpaces.FastElementAt(i));
+    nsNameSpaceEntry *entry = static_cast<nsNameSpaceEntry*>
+                                         (mNameSpaces.FastElementAt(i));
 
     NS_ASSERTION(entry, "null entry in namespace map!");
 
@@ -129,8 +129,8 @@ nsXMLNameSpaceMap::RemovePrefix(nsIAtom *aPrefix)
   PRInt32 count = mNameSpaces.Count();
 
   for (PRInt32 i = 0; i < count; ++i) {
-    nsNameSpaceEntry *entry = NS_STATIC_CAST(nsNameSpaceEntry*,
-                                             mNameSpaces.FastElementAt(i));
+    nsNameSpaceEntry *entry = static_cast<nsNameSpaceEntry*>
+                                         (mNameSpaces.FastElementAt(i));
 
     NS_ASSERTION(entry, "null entry in namespace map!");
 
@@ -147,8 +147,8 @@ nsXMLNameSpaceMap::FindNameSpaceID(nsIAtom *aPrefix) const
   PRInt32 count = mNameSpaces.Count();
 
   for (PRInt32 i = 0; i < count; ++i) {
-    nsNameSpaceEntry *entry = NS_STATIC_CAST(nsNameSpaceEntry*,
-                                             mNameSpaces.FastElementAt(i));
+    nsNameSpaceEntry *entry = static_cast<nsNameSpaceEntry*>
+                                         (mNameSpaces.FastElementAt(i));
 
     NS_ASSERTION(entry, "null entry in namespace map!");
 
@@ -169,8 +169,8 @@ nsXMLNameSpaceMap::FindPrefix(PRInt32 aNameSpaceID) const
   PRInt32 count = mNameSpaces.Count();
 
   for (PRInt32 i = 0; i < count; ++i) {
-    nsNameSpaceEntry *entry = NS_STATIC_CAST(nsNameSpaceEntry*,
-                                             mNameSpaces.FastElementAt(i));
+    nsNameSpaceEntry *entry = static_cast<nsNameSpaceEntry*>
+                                         (mNameSpaces.FastElementAt(i));
 
     NS_ASSERTION(entry, "null entry in namespace map!");
 
@@ -184,7 +184,7 @@ nsXMLNameSpaceMap::FindPrefix(PRInt32 aNameSpaceID) const
 
 PR_STATIC_CALLBACK(PRBool) DeleteEntry(void *aElement, void *aData)
 {
-  delete NS_STATIC_CAST(nsNameSpaceEntry*, aElement);
+  delete static_cast<nsNameSpaceEntry*>(aElement);
   return PR_TRUE;
 }
 
diff --git a/mozilla/content/events/src/nsDOMCommandEvent.cpp b/mozilla/content/events/src/nsDOMCommandEvent.cpp
index f27b1dab417..b7c3ca4c3c4 100644
--- a/mozilla/content/events/src/nsDOMCommandEvent.cpp
+++ b/mozilla/content/events/src/nsDOMCommandEvent.cpp
@@ -62,7 +62,7 @@ NS_IMPL_RELEASE_INHERITED(nsDOMCommandEvent, nsDOMEvent)
 NS_IMETHODIMP
 nsDOMCommandEvent::GetCommand(nsAString& aCommand)
 {
-  nsIAtom* command = NS_STATIC_CAST(nsCommandEvent*, mEvent)->command;
+  nsIAtom* command = static_cast<nsCommandEvent*>(mEvent)->command;
   if (command) {
     command->ToString(aCommand);
   } else {
@@ -80,7 +80,7 @@ nsDOMCommandEvent::InitCommandEvent(const nsAString& aTypeArg,
   nsresult rv = nsDOMEvent::InitEvent(aTypeArg, aCanBubbleArg, aCancelableArg);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  NS_STATIC_CAST(nsCommandEvent*, mEvent)->command = do_GetAtom(aCommand);
+  static_cast<nsCommandEvent*>(mEvent)->command = do_GetAtom(aCommand);
   return NS_OK;
 }
 
diff --git a/mozilla/content/events/src/nsDOMEvent.cpp b/mozilla/content/events/src/nsDOMEvent.cpp
index 9c171f14efd..6788a391420 100644
--- a/mozilla/content/events/src/nsDOMEvent.cpp
+++ b/mozilla/content/events/src/nsDOMEvent.cpp
@@ -162,13 +162,13 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDOMEvent)
     switch (tmp->mEvent->eventStructType) {
       case NS_MOUSE_EVENT:
       case NS_MOUSE_SCROLL_EVENT:
-        NS_STATIC_CAST(nsMouseEvent_base*, tmp->mEvent)->relatedTarget = nsnull;
+        static_cast<nsMouseEvent_base*>(tmp->mEvent)->relatedTarget = nsnull;
         break;
       case NS_XUL_COMMAND_EVENT:
-        NS_STATIC_CAST(nsXULCommandEvent*, tmp->mEvent)->sourceEvent = nsnull;
+        static_cast<nsXULCommandEvent*>(tmp->mEvent)->sourceEvent = nsnull;
         break;
       case NS_MUTATION_EVENT:
-        NS_STATIC_CAST(nsMutationEvent*, tmp->mEvent)->mRelatedNode = nsnull;
+        static_cast<nsMutationEvent*>(tmp->mEvent)->mRelatedNode = nsnull;
         break;
       default:
         break;
@@ -188,15 +188,15 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsDOMEvent)
       case NS_MOUSE_EVENT:
       case NS_MOUSE_SCROLL_EVENT:
         cb.NoteXPCOMChild(
-          NS_STATIC_CAST(nsMouseEvent_base*, tmp->mEvent)->relatedTarget);
+          static_cast<nsMouseEvent_base*>(tmp->mEvent)->relatedTarget);
         break;
       case NS_XUL_COMMAND_EVENT:
         cb.NoteXPCOMChild(
-          NS_STATIC_CAST(nsXULCommandEvent*, tmp->mEvent)->sourceEvent);
+          static_cast<nsXULCommandEvent*>(tmp->mEvent)->sourceEvent);
         break;
       case NS_MUTATION_EVENT:
         cb.NoteXPCOMChild(
-          NS_STATIC_CAST(nsMutationEvent*, tmp->mEvent)->mRelatedNode);
+          static_cast<nsMutationEvent*>(tmp->mEvent)->mRelatedNode);
         break;
       default:
         break;
@@ -631,8 +631,8 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData()
     {
       nsSizeEvent* sizeEvent = new nsSizeEvent(PR_FALSE, msg, nsnull);
       NS_ENSURE_TRUE(sizeEvent, NS_ERROR_OUT_OF_MEMORY);
-      sizeEvent->mWinWidth = NS_STATIC_CAST(nsSizeEvent*, mEvent)->mWinWidth;
-      sizeEvent->mWinHeight = NS_STATIC_CAST(nsSizeEvent*, mEvent)->mWinHeight;
+      sizeEvent->mWinWidth = static_cast<nsSizeEvent*>(mEvent)->mWinWidth;
+      sizeEvent->mWinHeight = static_cast<nsSizeEvent*>(mEvent)->mWinHeight;
       newEvent = sizeEvent;
       break;
     }
@@ -640,15 +640,15 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData()
     {
       newEvent = new nsSizeModeEvent(PR_FALSE, msg, nsnull);
       NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY);
-      NS_STATIC_CAST(nsSizeModeEvent*, newEvent)->mSizeMode =
-        NS_STATIC_CAST(nsSizeModeEvent*, mEvent)->mSizeMode;
+      static_cast<nsSizeModeEvent*>(newEvent)->mSizeMode =
+        static_cast<nsSizeModeEvent*>(mEvent)->mSizeMode;
       break;
     }
     case NS_ZLEVEL_EVENT:
     {
       nsZLevelEvent* zLevelEvent = new nsZLevelEvent(PR_FALSE, msg, nsnull);
       NS_ENSURE_TRUE(zLevelEvent, NS_ERROR_OUT_OF_MEMORY);
-      nsZLevelEvent* oldZLevelEvent = NS_STATIC_CAST(nsZLevelEvent*, mEvent);
+      nsZLevelEvent* oldZLevelEvent = static_cast<nsZLevelEvent*>(mEvent);
       zLevelEvent->mPlacement = oldZLevelEvent->mPlacement;
       zLevelEvent->mImmediate = oldZLevelEvent->mImmediate;
       zLevelEvent->mAdjusted = oldZLevelEvent->mAdjusted;
@@ -664,8 +664,8 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData()
     {
       newEvent = new nsScrollbarEvent(PR_FALSE, msg, nsnull);
       NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY);
-      NS_STATIC_CAST(nsScrollbarEvent*, newEvent)->position =
-        NS_STATIC_CAST(nsScrollbarEvent*, mEvent)->position;
+      static_cast<nsScrollbarEvent*>(newEvent)->position =
+        static_cast<nsScrollbarEvent*>(mEvent)->position;
       break;
     }
     case NS_INPUT_EVENT:
@@ -678,7 +678,7 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData()
     {
       nsKeyEvent* keyEvent = new nsKeyEvent(PR_FALSE, msg, nsnull);
       NS_ENSURE_TRUE(keyEvent, NS_ERROR_OUT_OF_MEMORY);
-      nsKeyEvent* oldKeyEvent = NS_STATIC_CAST(nsKeyEvent*, mEvent);
+      nsKeyEvent* oldKeyEvent = static_cast<nsKeyEvent*>(mEvent);
       isInputEvent = PR_TRUE;
       keyEvent->keyCode = oldKeyEvent->keyCode;
       keyEvent->charCode = oldKeyEvent->charCode;
@@ -688,7 +688,7 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData()
     }
     case NS_MOUSE_EVENT:
     {
-      nsMouseEvent* oldMouseEvent = NS_STATIC_CAST(nsMouseEvent*, mEvent);
+      nsMouseEvent* oldMouseEvent = static_cast<nsMouseEvent*>(mEvent);
       nsMouseEvent* mouseEvent =
         new nsMouseEvent(PR_FALSE, msg, nsnull, oldMouseEvent->reason);
       NS_ENSURE_TRUE(mouseEvent, NS_ERROR_OUT_OF_MEMORY);
@@ -704,16 +704,16 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData()
     {
       newEvent = new nsMenuEvent(PR_FALSE, msg, nsnull);
       NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY);
-      NS_STATIC_CAST(nsMenuEvent*, newEvent)->mCommand =
-        NS_STATIC_CAST(nsMenuEvent*, mEvent)->mCommand;
+      static_cast<nsMenuEvent*>(newEvent)->mCommand =
+        static_cast<nsMenuEvent*>(mEvent)->mCommand;
       break;
     }
     case NS_SCRIPT_ERROR_EVENT:
     {
       newEvent = new nsScriptErrorEvent(PR_FALSE, msg);
       NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY);
-      NS_STATIC_CAST(nsScriptErrorEvent*, newEvent)->lineNr =
-        NS_STATIC_CAST(nsScriptErrorEvent*, mEvent)->lineNr;
+      static_cast<nsScriptErrorEvent*>(newEvent)->lineNr =
+        static_cast<nsScriptErrorEvent*>(mEvent)->lineNr;
       break;
     }
     case NS_TEXT_EVENT:
@@ -741,7 +741,7 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData()
       NS_ENSURE_TRUE(mouseScrollEvent, NS_ERROR_OUT_OF_MEMORY);
       isInputEvent = PR_TRUE;
       nsMouseScrollEvent* oldMouseScrollEvent =
-        NS_STATIC_CAST(nsMouseScrollEvent*, mEvent);
+        static_cast<nsMouseScrollEvent*>(mEvent);
       mouseScrollEvent->scrollFlags = oldMouseScrollEvent->scrollFlags;
       mouseScrollEvent->delta = oldMouseScrollEvent->delta;
       mouseScrollEvent->relatedTarget = oldMouseScrollEvent->relatedTarget;
@@ -753,8 +753,8 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData()
     {
       newEvent = new nsScrollPortEvent(PR_FALSE, msg, nsnull);
       NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY);
-      NS_STATIC_CAST(nsScrollPortEvent*, newEvent)->orient =
-        NS_STATIC_CAST(nsScrollPortEvent*, mEvent)->orient;
+      static_cast<nsScrollPortEvent*>(newEvent)->orient =
+        static_cast<nsScrollPortEvent*>(mEvent)->orient;
       break;
     }
     case NS_MUTATION_EVENT:
@@ -762,7 +762,7 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData()
       nsMutationEvent* mutationEvent = new nsMutationEvent(PR_FALSE, msg);
       NS_ENSURE_TRUE(mutationEvent, NS_ERROR_OUT_OF_MEMORY);
       nsMutationEvent* oldMutationEvent =
-        NS_STATIC_CAST(nsMutationEvent*, mEvent);
+        static_cast<nsMutationEvent*>(mEvent);
       mutationEvent->mRelatedNode = oldMutationEvent->mRelatedNode;
       mutationEvent->mAttrName = oldMutationEvent->mAttrName;
       mutationEvent->mPrevAttrValue = oldMutationEvent->mPrevAttrValue;
@@ -786,8 +786,8 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData()
     {
       newEvent = new nsFocusEvent(PR_FALSE, msg, nsnull);
       NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY);
-      NS_STATIC_CAST(nsFocusEvent*, newEvent)->isMozWindowTakingFocus =
-        NS_STATIC_CAST(nsFocusEvent*, mEvent)->isMozWindowTakingFocus;
+      static_cast<nsFocusEvent*>(newEvent)->isMozWindowTakingFocus =
+        static_cast<nsFocusEvent*>(mEvent)->isMozWindowTakingFocus;
       break;
     }
     case NS_POPUP_EVENT:
@@ -801,7 +801,7 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData()
     case NS_COMMAND_EVENT:
     {
       newEvent = new nsCommandEvent(PR_FALSE, mEvent->userType,
-        NS_STATIC_CAST(nsCommandEvent*, mEvent)->command, nsnull);
+        static_cast<nsCommandEvent*>(mEvent)->command, nsnull);
       NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY);
       break;
     }
@@ -815,14 +815,14 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData()
     {
       newEvent = new nsBeforePageUnloadEvent(PR_FALSE, msg);
       NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY);
-      NS_STATIC_CAST(nsBeforePageUnloadEvent*, newEvent)->text =
-        NS_STATIC_CAST(nsBeforePageUnloadEvent*, mEvent)->text;
+      static_cast<nsBeforePageUnloadEvent*>(newEvent)->text =
+        static_cast<nsBeforePageUnloadEvent*>(mEvent)->text;
       break;
     }
     case NS_UI_EVENT:
     {
       newEvent = new nsUIEvent(PR_FALSE, msg,
-                               NS_STATIC_CAST(nsUIEvent*, mEvent)->detail);
+                               static_cast<nsUIEvent*>(mEvent)->detail);
       break;
     }
     case NS_QUERYCARETRECT_EVENT:
@@ -860,8 +860,8 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData()
       NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY);
       isInputEvent = PR_TRUE;
       newEvent->eventStructType = NS_XUL_COMMAND_EVENT;
-       NS_STATIC_CAST(nsXULCommandEvent*, newEvent)->sourceEvent =
-         NS_STATIC_CAST(nsXULCommandEvent*, mEvent)->sourceEvent;
+       static_cast<nsXULCommandEvent*>(newEvent)->sourceEvent =
+         static_cast<nsXULCommandEvent*>(mEvent)->sourceEvent;
       break;
     }
     default:
@@ -874,8 +874,8 @@ NS_METHOD nsDOMEvent::DuplicatePrivateData()
   NS_ENSURE_TRUE(newEvent, NS_ERROR_OUT_OF_MEMORY);
 
   if (isInputEvent) {
-    nsInputEvent* oldInputEvent = NS_STATIC_CAST(nsInputEvent*, mEvent);
-    nsInputEvent* newInputEvent = NS_STATIC_CAST(nsInputEvent*, newEvent);
+    nsInputEvent* oldInputEvent = static_cast<nsInputEvent*>(mEvent);
+    nsInputEvent* newInputEvent = static_cast<nsInputEvent*>(newEvent);
     newInputEvent->isShift = oldInputEvent->isShift;
     newInputEvent->isControl = oldInputEvent->isControl;
     newInputEvent->isAlt = oldInputEvent->isAlt;
@@ -1055,7 +1055,7 @@ nsDOMEvent::GetEventPopupControlState(nsEvent *aEvent)
     break;
   case NS_KEY_EVENT :
     if (NS_IS_TRUSTED_EVENT(aEvent)) {
-      PRUint32 key = NS_STATIC_CAST(nsKeyEvent *, aEvent)->keyCode;
+      PRUint32 key = static_cast<nsKeyEvent *>(aEvent)->keyCode;
       switch(aEvent->message) {
       case NS_KEY_PRESS :
         // return key on focused button. see note at NS_MOUSE_CLICK.
@@ -1080,7 +1080,7 @@ nsDOMEvent::GetEventPopupControlState(nsEvent *aEvent)
     break;
   case NS_MOUSE_EVENT :
     if (NS_IS_TRUSTED_EVENT(aEvent) &&
-        NS_STATIC_CAST(nsMouseEvent*, aEvent)->button == nsMouseEvent::eLeftButton) {
+        static_cast<nsMouseEvent*>(aEvent)->button == nsMouseEvent::eLeftButton) {
       switch(aEvent->message) {
       case NS_MOUSE_BUTTON_UP :
         if (::PopupAllowedForEvent("mouseup"))
diff --git a/mozilla/content/events/src/nsDOMKeyboardEvent.cpp b/mozilla/content/events/src/nsDOMKeyboardEvent.cpp
index f1a38754d06..4a0206bac9f 100644
--- a/mozilla/content/events/src/nsDOMKeyboardEvent.cpp
+++ b/mozilla/content/events/src/nsDOMKeyboardEvent.cpp
@@ -174,7 +174,7 @@ nsDOMKeyboardEvent::InitKeyEvent(const nsAString& aType, PRBool aCanBubble, PRBo
   nsresult rv = nsDOMUIEvent::InitUIEvent(aType, aCanBubble, aCancelable, aView, 0);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  nsKeyEvent* keyEvent = NS_STATIC_CAST(nsKeyEvent*, mEvent);
+  nsKeyEvent* keyEvent = static_cast<nsKeyEvent*>(mEvent);
   keyEvent->isControl = aCtrlKey;
   keyEvent->isAlt = aAltKey;
   keyEvent->isShift = aShiftKey;
diff --git a/mozilla/content/events/src/nsDOMMouseEvent.cpp b/mozilla/content/events/src/nsDOMMouseEvent.cpp
index 272fac3b840..a9b04e00506 100644
--- a/mozilla/content/events/src/nsDOMMouseEvent.cpp
+++ b/mozilla/content/events/src/nsDOMMouseEvent.cpp
@@ -65,10 +65,10 @@ nsDOMMouseEvent::nsDOMMouseEvent(nsPresContext* aPresContext,
   switch (mEvent->eventStructType)
   {
     case NS_MOUSE_EVENT:
-      mDetail = NS_STATIC_CAST(nsMouseEvent*, mEvent)->clickCount;
+      mDetail = static_cast<nsMouseEvent*>(mEvent)->clickCount;
       break;
     case NS_MOUSE_SCROLL_EVENT:
-      mDetail = NS_STATIC_CAST(nsMouseScrollEvent*, mEvent)->delta;
+      mDetail = static_cast<nsMouseScrollEvent*>(mEvent)->delta;
       break;
     default:
       break;
@@ -81,10 +81,10 @@ nsDOMMouseEvent::~nsDOMMouseEvent()
     switch (mEvent->eventStructType)
     {
       case NS_MOUSE_EVENT:
-        delete NS_STATIC_CAST(nsMouseEvent*, mEvent);
+        delete static_cast<nsMouseEvent*>(mEvent);
         break;
       case NS_MOUSE_SCROLL_EVENT:
-        delete NS_STATIC_CAST(nsMouseScrollEvent*, mEvent);
+        delete static_cast<nsMouseScrollEvent*>(mEvent);
         break;
       default:
         delete mEvent;
@@ -117,9 +117,9 @@ nsDOMMouseEvent::InitMouseEvent(const nsAString & aType, PRBool aCanBubble, PRBo
     case NS_MOUSE_EVENT:
     case NS_MOUSE_SCROLL_EVENT:
     {
-       NS_STATIC_CAST(nsMouseEvent_base*, mEvent)->relatedTarget = aRelatedTarget;
-       NS_STATIC_CAST(nsMouseEvent_base*, mEvent)->button = aButton;
-       nsInputEvent* inputEvent = NS_STATIC_CAST(nsInputEvent*, mEvent);
+       static_cast<nsMouseEvent_base*>(mEvent)->relatedTarget = aRelatedTarget;
+       static_cast<nsMouseEvent_base*>(mEvent)->button = aButton;
+       nsInputEvent* inputEvent = static_cast<nsInputEvent*>(mEvent);
        inputEvent->isControl = aCtrlKey;
        inputEvent->isAlt = aAltKey;
        inputEvent->isShift = aShiftKey;
@@ -130,10 +130,10 @@ nsDOMMouseEvent::InitMouseEvent(const nsAString & aType, PRBool aCanBubble, PRBo
        inputEvent->refPoint.y = aScreenY;
 
        if (mEvent->eventStructType == NS_MOUSE_SCROLL_EVENT) {
-         nsMouseScrollEvent* scrollEvent = NS_STATIC_CAST(nsMouseScrollEvent*, mEvent);
+         nsMouseScrollEvent* scrollEvent = static_cast<nsMouseScrollEvent*>(mEvent);
          scrollEvent->delta = aDetail;
        } else {
-         nsMouseEvent* mouseEvent = NS_STATIC_CAST(nsMouseEvent*, mEvent);
+         nsMouseEvent* mouseEvent = static_cast<nsMouseEvent*>(mEvent);
          mouseEvent->clickCount = aDetail;
        }
        break;
@@ -153,7 +153,7 @@ nsDOMMouseEvent::GetButton(PRUint16* aButton)
   {
     case NS_MOUSE_EVENT:
     case NS_MOUSE_SCROLL_EVENT:
-      *aButton = NS_STATIC_CAST(nsMouseEvent_base*, mEvent)->button;
+      *aButton = static_cast<nsMouseEvent_base*>(mEvent)->button;
       break;
     default:
       NS_WARNING("Tried to get mouse button for non-mouse event!");
@@ -173,7 +173,7 @@ nsDOMMouseEvent::GetRelatedTarget(nsIDOMEventTarget** aRelatedTarget)
   {
     case NS_MOUSE_EVENT:
     case NS_MOUSE_SCROLL_EVENT:
-      relatedTarget = NS_STATIC_CAST(nsMouseEvent_base*, mEvent)->relatedTarget;
+      relatedTarget = static_cast<nsMouseEvent_base*>(mEvent)->relatedTarget;
       break;
     default:
       break;
diff --git a/mozilla/content/events/src/nsDOMMutationEvent.cpp b/mozilla/content/events/src/nsDOMMutationEvent.cpp
index 89fccb6f26c..179795925b6 100644
--- a/mozilla/content/events/src/nsDOMMutationEvent.cpp
+++ b/mozilla/content/events/src/nsDOMMutationEvent.cpp
@@ -53,7 +53,7 @@ nsDOMMutationEvent::nsDOMMutationEvent(nsPresContext* aPresContext,
 nsDOMMutationEvent::~nsDOMMutationEvent()
 {
   if (mEventIsInternal) {
-    nsMutationEvent* mutation = NS_STATIC_CAST(nsMutationEvent*, mEvent);
+    nsMutationEvent* mutation = static_cast<nsMutationEvent*>(mEvent);
     delete mutation;
     mEvent = nsnull;
   }
@@ -71,7 +71,7 @@ NS_IMETHODIMP
 nsDOMMutationEvent::GetRelatedNode(nsIDOMNode** aRelatedNode)
 {
   *aRelatedNode = nsnull;
-  nsMutationEvent* mutation = NS_STATIC_CAST(nsMutationEvent*, mEvent);
+  nsMutationEvent* mutation = static_cast<nsMutationEvent*>(mEvent);
   *aRelatedNode = mutation->mRelatedNode;
   NS_IF_ADDREF(*aRelatedNode);
   return NS_OK;
@@ -80,7 +80,7 @@ nsDOMMutationEvent::GetRelatedNode(nsIDOMNode** aRelatedNode)
 NS_IMETHODIMP
 nsDOMMutationEvent::GetPrevValue(nsAString& aPrevValue)
 {
-  nsMutationEvent* mutation = NS_STATIC_CAST(nsMutationEvent*, mEvent);
+  nsMutationEvent* mutation = static_cast<nsMutationEvent*>(mEvent);
   if (mutation->mPrevAttrValue)
     mutation->mPrevAttrValue->ToString(aPrevValue);
   return NS_OK;
@@ -89,7 +89,7 @@ nsDOMMutationEvent::GetPrevValue(nsAString& aPrevValue)
 NS_IMETHODIMP
 nsDOMMutationEvent::GetNewValue(nsAString& aNewValue)
 {
-  nsMutationEvent* mutation = NS_STATIC_CAST(nsMutationEvent*, mEvent);
+  nsMutationEvent* mutation = static_cast<nsMutationEvent*>(mEvent);
   if (mutation->mNewAttrValue)
       mutation->mNewAttrValue->ToString(aNewValue);
   return NS_OK;
@@ -98,7 +98,7 @@ nsDOMMutationEvent::GetNewValue(nsAString& aNewValue)
 NS_IMETHODIMP
 nsDOMMutationEvent::GetAttrName(nsAString& aAttrName)
 {
-  nsMutationEvent* mutation = NS_STATIC_CAST(nsMutationEvent*, mEvent);
+  nsMutationEvent* mutation = static_cast<nsMutationEvent*>(mEvent);
   if (mutation->mAttrName)
       mutation->mAttrName->ToString(aAttrName);
   return NS_OK;
@@ -108,7 +108,7 @@ NS_IMETHODIMP
 nsDOMMutationEvent::GetAttrChange(PRUint16* aAttrChange)
 {
   *aAttrChange = 0;
-  nsMutationEvent* mutation = NS_STATIC_CAST(nsMutationEvent*, mEvent);
+  nsMutationEvent* mutation = static_cast<nsMutationEvent*>(mEvent);
   if (mutation->mAttrChange)
       *aAttrChange = mutation->mAttrChange;
   return NS_OK;
@@ -120,7 +120,7 @@ nsDOMMutationEvent::InitMutationEvent(const nsAString& aTypeArg, PRBool aCanBubb
   nsresult rv = nsDOMEvent::InitEvent(aTypeArg, aCanBubbleArg, aCancelableArg);
   NS_ENSURE_SUCCESS(rv, rv);
   
-  nsMutationEvent* mutation = NS_STATIC_CAST(nsMutationEvent*, mEvent);
+  nsMutationEvent* mutation = static_cast<nsMutationEvent*>(mEvent);
   mutation->mRelatedNode = aRelatedNodeArg;
   if (!aPrevValueArg.IsEmpty())
     mutation->mPrevAttrValue = do_GetAtom(aPrevValueArg);
diff --git a/mozilla/content/events/src/nsDOMPageTransitionEvent.cpp b/mozilla/content/events/src/nsDOMPageTransitionEvent.cpp
index a432cb842a2..4c7f6fddf78 100755
--- a/mozilla/content/events/src/nsDOMPageTransitionEvent.cpp
+++ b/mozilla/content/events/src/nsDOMPageTransitionEvent.cpp
@@ -65,7 +65,7 @@ NS_IMPL_RELEASE_INHERITED(nsDOMPageTransitionEvent, nsDOMEvent)
 NS_IMETHODIMP
 nsDOMPageTransitionEvent::GetPersisted(PRBool* aPersisted)
 {
-  *aPersisted = NS_STATIC_CAST(nsPageTransitionEvent*, mEvent)->persisted;
+  *aPersisted = static_cast<nsPageTransitionEvent*>(mEvent)->persisted;
   return NS_OK;
 }
 
@@ -78,7 +78,7 @@ nsDOMPageTransitionEvent::InitPageTransitionEvent(const nsAString &aTypeArg,
   nsresult rv = nsDOMEvent::InitEvent(aTypeArg, aCanBubbleArg, aCancelableArg);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  NS_STATIC_CAST(nsPageTransitionEvent*, mEvent)->persisted = aPersisted;
+  static_cast<nsPageTransitionEvent*>(mEvent)->persisted = aPersisted;
   return NS_OK;
 }
 
diff --git a/mozilla/content/events/src/nsDOMPopupBlockedEvent.cpp b/mozilla/content/events/src/nsDOMPopupBlockedEvent.cpp
index 1a986cad26e..0b5eff05f3c 100644
--- a/mozilla/content/events/src/nsDOMPopupBlockedEvent.cpp
+++ b/mozilla/content/events/src/nsDOMPopupBlockedEvent.cpp
@@ -61,7 +61,7 @@ nsDOMPopupBlockedEvent::~nsDOMPopupBlockedEvent()
 {
   if (mEventIsInternal) {
     if (mEvent->eventStructType == NS_POPUPBLOCKED_EVENT) {
-      nsPopupBlockedEvent* event = NS_STATIC_CAST(nsPopupBlockedEvent*, mEvent);
+      nsPopupBlockedEvent* event = static_cast<nsPopupBlockedEvent*>(mEvent);
       NS_IF_RELEASE(event->mPopupWindowURI);
     }
   }
@@ -90,7 +90,7 @@ nsDOMPopupBlockedEvent::InitPopupBlockedEvent(const nsAString & aTypeArg,
   {
     case NS_POPUPBLOCKED_EVENT:
     {
-       nsPopupBlockedEvent* event = NS_STATIC_CAST(nsPopupBlockedEvent*, mEvent);
+       nsPopupBlockedEvent* event = static_cast<nsPopupBlockedEvent*>(mEvent);
        event->mRequestingWindow = do_GetWeakReference(aRequestingWindow);
        event->mPopupWindowURI = aPopupWindowURI;
        NS_IF_ADDREF(event->mPopupWindowURI);
@@ -109,7 +109,7 @@ NS_IMETHODIMP
 nsDOMPopupBlockedEvent::GetRequestingWindow(nsIDOMWindow **aRequestingWindow)
 {
   if (mEvent->eventStructType == NS_POPUPBLOCKED_EVENT) {
-    nsPopupBlockedEvent* event = NS_STATIC_CAST(nsPopupBlockedEvent*, mEvent);
+    nsPopupBlockedEvent* event = static_cast<nsPopupBlockedEvent*>(mEvent);
     CallQueryReferent(event->mRequestingWindow.get(), aRequestingWindow);
   } else {
     *aRequestingWindow = 0;
@@ -123,7 +123,7 @@ nsDOMPopupBlockedEvent::GetPopupWindowURI(nsIURI **aPopupWindowURI)
 {
   NS_ENSURE_ARG_POINTER(aPopupWindowURI);
   if (mEvent->eventStructType == NS_POPUPBLOCKED_EVENT) {
-    nsPopupBlockedEvent* event = NS_STATIC_CAST(nsPopupBlockedEvent*, mEvent);
+    nsPopupBlockedEvent* event = static_cast<nsPopupBlockedEvent*>(mEvent);
     *aPopupWindowURI = event->mPopupWindowURI;
     NS_IF_ADDREF(*aPopupWindowURI);
     return NS_OK;
@@ -136,7 +136,7 @@ NS_IMETHODIMP
 nsDOMPopupBlockedEvent::GetPopupWindowFeatures(nsAString &aPopupWindowFeatures)
 {
   if (mEvent->eventStructType == NS_POPUPBLOCKED_EVENT) {
-    nsPopupBlockedEvent* event = NS_STATIC_CAST(nsPopupBlockedEvent*, mEvent);
+    nsPopupBlockedEvent* event = static_cast<nsPopupBlockedEvent*>(mEvent);
     aPopupWindowFeatures = event->mPopupWindowFeatures;
     return NS_OK;
   }
@@ -148,7 +148,7 @@ NS_IMETHODIMP
 nsDOMPopupBlockedEvent::GetPopupWindowName(nsAString &aPopupWindowName)
 {
   if (mEvent->eventStructType == NS_POPUPBLOCKED_EVENT) {
-    nsPopupBlockedEvent* event = NS_STATIC_CAST(nsPopupBlockedEvent*, mEvent);
+    nsPopupBlockedEvent* event = static_cast<nsPopupBlockedEvent*>(mEvent);
     aPopupWindowName = event->mPopupWindowName;
     return NS_OK;
   }
diff --git a/mozilla/content/events/src/nsDOMTextEvent.cpp b/mozilla/content/events/src/nsDOMTextEvent.cpp
index 1b0720c0de9..2f7cedd928a 100644
--- a/mozilla/content/events/src/nsDOMTextEvent.cpp
+++ b/mozilla/content/events/src/nsDOMTextEvent.cpp
@@ -59,7 +59,7 @@ nsDOMTextEvent::nsDOMTextEvent(nsPresContext* aPresContext,
   //
   // extract the IME composition string
   //
-  nsTextEvent *te = NS_STATIC_CAST(nsTextEvent*, mEvent);
+  nsTextEvent *te = static_cast<nsTextEvent*>(mEvent);
   mText = te->theText;
 
   //
@@ -113,7 +113,7 @@ NS_METHOD nsDOMTextEvent::GetEventReply(nsTextEventReply** aReply)
 {
   if (mEvent->message == NS_TEXT_TEXT)
   {
-     *aReply = &(NS_STATIC_CAST(nsTextEvent*, mEvent)->theReply);
+     *aReply = &(static_cast<nsTextEvent*>(mEvent)->theReply);
      return NS_OK;
   }
   aReply = 0;
diff --git a/mozilla/content/events/src/nsDOMUIEvent.cpp b/mozilla/content/events/src/nsDOMUIEvent.cpp
index 6086aafd8c4..5b7c6695f04 100644
--- a/mozilla/content/events/src/nsDOMUIEvent.cpp
+++ b/mozilla/content/events/src/nsDOMUIEvent.cpp
@@ -55,8 +55,8 @@
 
 nsDOMUIEvent::nsDOMUIEvent(nsPresContext* aPresContext, nsGUIEvent* aEvent)
   : nsDOMEvent(aPresContext, aEvent ?
-               NS_STATIC_CAST(nsEvent *, aEvent) :
-               NS_STATIC_CAST(nsEvent *, new nsUIEvent(PR_FALSE, 0, 0)))
+               static_cast<nsEvent *>(aEvent) :
+               static_cast<nsEvent *>(new nsUIEvent(PR_FALSE, 0, 0)))
   , mClientPoint(0,0)
 {
   if (aEvent) {
@@ -73,14 +73,14 @@ nsDOMUIEvent::nsDOMUIEvent(nsPresContext* aPresContext, nsGUIEvent* aEvent)
   {
     case NS_UI_EVENT:
     {
-      nsUIEvent *event = NS_STATIC_CAST(nsUIEvent*, mEvent);
+      nsUIEvent *event = static_cast<nsUIEvent*>(mEvent);
       mDetail = event->detail;
       break;
     }
 
     case NS_SCROLLPORT_EVENT:
     {
-      nsScrollPortEvent* scrollEvent = NS_STATIC_CAST(nsScrollPortEvent*, mEvent);
+      nsScrollPortEvent* scrollEvent = static_cast<nsScrollPortEvent*>(mEvent);
       mDetail = (PRInt32)scrollEvent->orient;
       break;
     }
@@ -444,7 +444,7 @@ NS_METHOD nsDOMUIEvent::GetCompositionReply(nsTextEventReply** aReply)
      (mEvent->message == NS_COMPOSITION_START) ||
      (mEvent->message == NS_COMPOSITION_QUERY))
   {
-    *aReply = &(NS_STATIC_CAST(nsCompositionEvent*, mEvent)->theReply);
+    *aReply = &(static_cast<nsCompositionEvent*>(mEvent)->theReply);
     return NS_OK;
   }
   *aReply = nsnull;
@@ -456,7 +456,7 @@ nsDOMUIEvent::GetReconversionReply(nsReconversionEventReply** aReply)
 {
   if (mEvent->eventStructType == NS_RECONVERSION_EVENT)
   {
-    *aReply = &(NS_STATIC_CAST(nsReconversionEvent*, mEvent)->theReply);
+    *aReply = &(static_cast<nsReconversionEvent*>(mEvent)->theReply);
     return NS_OK;
   }
   *aReply = nsnull;
@@ -468,7 +468,7 @@ nsDOMUIEvent::GetQueryCaretRectReply(nsQueryCaretRectEventReply** aReply)
 {
   if (mEvent->eventStructType == NS_QUERYCARETRECT_EVENT)
   {
-    *aReply = &(NS_STATIC_CAST(nsQueryCaretRectEvent*, mEvent)->theReply);
+    *aReply = &(static_cast<nsQueryCaretRectEvent*>(mEvent)->theReply);
     return NS_OK;
   }
   *aReply = nsnull;
diff --git a/mozilla/content/events/src/nsDOMXULCommandEvent.cpp b/mozilla/content/events/src/nsDOMXULCommandEvent.cpp
index 4211091986c..d5415a8d41a 100644
--- a/mozilla/content/events/src/nsDOMXULCommandEvent.cpp
+++ b/mozilla/content/events/src/nsDOMXULCommandEvent.cpp
@@ -56,7 +56,7 @@ nsDOMXULCommandEvent::nsDOMXULCommandEvent(nsPresContext* aPresContext,
 nsDOMXULCommandEvent::~nsDOMXULCommandEvent()
 {
   if (mEventIsInternal) {
-    nsXULCommandEvent* command = NS_STATIC_CAST(nsXULCommandEvent*, mEvent);
+    nsXULCommandEvent* command = static_cast<nsXULCommandEvent*>(mEvent);
     delete command;
     mEvent = nsnull;
   }
diff --git a/mozilla/content/events/src/nsDOMXULCommandEvent.h b/mozilla/content/events/src/nsDOMXULCommandEvent.h
index 2eff7f5ce37..1401c542ef8 100644
--- a/mozilla/content/events/src/nsDOMXULCommandEvent.h
+++ b/mozilla/content/events/src/nsDOMXULCommandEvent.h
@@ -60,7 +60,7 @@ public:
 private:
   // Convenience accessor for the event
   nsXULCommandEvent* Event() {
-    return NS_STATIC_CAST(nsXULCommandEvent*, mEvent);
+    return static_cast<nsXULCommandEvent*>(mEvent);
   }
 };
 
diff --git a/mozilla/content/events/src/nsEventDispatcher.cpp b/mozilla/content/events/src/nsEventDispatcher.cpp
index b9e35ae7eb7..dcbc4d24ec0 100644
--- a/mozilla/content/events/src/nsEventDispatcher.cpp
+++ b/mozilla/content/events/src/nsEventDispatcher.cpp
@@ -549,54 +549,54 @@ nsEventDispatcher::CreateEvent(nsPresContext* aPresContext,
     switch(aEvent->eventStructType) {
     case NS_MUTATION_EVENT:
       return NS_NewDOMMutationEvent(aDOMEvent, aPresContext,
-                                    NS_STATIC_CAST(nsMutationEvent*,aEvent));
+                                    static_cast<nsMutationEvent*>(aEvent));
     case NS_GUI_EVENT:
     case NS_COMPOSITION_EVENT:
     case NS_RECONVERSION_EVENT:
     case NS_QUERYCARETRECT_EVENT:
     case NS_SCROLLPORT_EVENT:
       return NS_NewDOMUIEvent(aDOMEvent, aPresContext,
-                              NS_STATIC_CAST(nsGUIEvent*,aEvent));
+                              static_cast<nsGUIEvent*>(aEvent));
     case NS_KEY_EVENT:
       return NS_NewDOMKeyboardEvent(aDOMEvent, aPresContext,
-                                    NS_STATIC_CAST(nsKeyEvent*,aEvent));
+                                    static_cast<nsKeyEvent*>(aEvent));
     case NS_MOUSE_EVENT:
     case NS_MOUSE_SCROLL_EVENT:
     case NS_POPUP_EVENT:
       return NS_NewDOMMouseEvent(aDOMEvent, aPresContext,
-                                 NS_STATIC_CAST(nsInputEvent*,aEvent));
+                                 static_cast<nsInputEvent*>(aEvent));
     case NS_POPUPBLOCKED_EVENT:
       return NS_NewDOMPopupBlockedEvent(aDOMEvent, aPresContext,
-                                        NS_STATIC_CAST(nsPopupBlockedEvent*,
-                                                       aEvent));
+                                        static_cast<nsPopupBlockedEvent*>
+                                                   (aEvent));
     case NS_TEXT_EVENT:
       return NS_NewDOMTextEvent(aDOMEvent, aPresContext,
-                                NS_STATIC_CAST(nsTextEvent*,aEvent));
+                                static_cast<nsTextEvent*>(aEvent));
     case NS_BEFORE_PAGE_UNLOAD_EVENT:
       return
         NS_NewDOMBeforeUnloadEvent(aDOMEvent, aPresContext,
-                                   NS_STATIC_CAST(nsBeforePageUnloadEvent*,
-                                                  aEvent));
+                                   static_cast<nsBeforePageUnloadEvent*>
+                                              (aEvent));
     case NS_PAGETRANSITION_EVENT:
       return NS_NewDOMPageTransitionEvent(aDOMEvent, aPresContext,
-                                          NS_STATIC_CAST(nsPageTransitionEvent*,
-                                                         aEvent));
+                                          static_cast<nsPageTransitionEvent*>
+                                                     (aEvent));
 #ifdef MOZ_SVG
     case NS_SVG_EVENT:
       return NS_NewDOMSVGEvent(aDOMEvent, aPresContext,
                                aEvent);
     case NS_SVGZOOM_EVENT:
       return NS_NewDOMSVGZoomEvent(aDOMEvent, aPresContext,
-                                   NS_STATIC_CAST(nsGUIEvent*,aEvent));
+                                   static_cast<nsGUIEvent*>(aEvent));
 #endif // MOZ_SVG
 
     case NS_XUL_COMMAND_EVENT:
       return NS_NewDOMXULCommandEvent(aDOMEvent, aPresContext,
-                                      NS_STATIC_CAST(nsXULCommandEvent*,
-                                                     aEvent));
+                                      static_cast<nsXULCommandEvent*>
+                                                 (aEvent));
     case NS_COMMAND_EVENT:
       return NS_NewDOMCommandEvent(aDOMEvent, aPresContext,
-                                   NS_STATIC_CAST(nsCommandEvent*, aEvent));
+                                   static_cast<nsCommandEvent*>(aEvent));
     }
 
     // For all other types of events, create a vanilla event object.
diff --git a/mozilla/content/events/src/nsEventListenerManager.cpp b/mozilla/content/events/src/nsEventListenerManager.cpp
index 6597d3a14fa..bbe98c8b8c0 100644
--- a/mozilla/content/events/src/nsEventListenerManager.cpp
+++ b/mozilla/content/events/src/nsEventListenerManager.cpp
@@ -198,7 +198,7 @@ struct EventTypeData
   const nsIID*             iid;
 };
 
-#define HANDLER(x) NS_REINTERPRET_CAST(GenericHandler, x)
+#define HANDLER(x) reinterpret_cast<GenericHandler>(x)
 
 static const EventDispatchData sMouseEvents[] = {
   { NS_MOUSE_BUTTON_DOWN,        HANDLER(&nsIDOMMouseListener::MouseDown)     },
@@ -373,7 +373,7 @@ nsEventListenerManager::RemoveAllListeners()
   mListenersRemoved = PR_TRUE;
   PRInt32 count = mListeners.Count();
   for (PRInt32 i = 0; i < count; i++) {
-    delete NS_STATIC_CAST(nsListenerStruct*, mListeners.ElementAt(i));
+    delete static_cast<nsListenerStruct*>(mListeners.ElementAt(i));
   }
   mListeners.Clear();
   return NS_OK;
@@ -402,7 +402,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsEventListenerManager)
   PRInt32 i, count = tmp->mListeners.Count();
   nsListenerStruct *ls;
   for (i = 0; i < count; i++) {
-    ls = NS_STATIC_CAST(nsListenerStruct*, tmp->mListeners.ElementAt(i));
+    ls = static_cast<nsListenerStruct*>(tmp->mListeners.ElementAt(i));
     if (ls) {
       cb.NoteXPCOMChild(ls->mListener.get());
     }
@@ -485,7 +485,7 @@ nsEventListenerManager::AddEventListener(nsIDOMEventListener *aListener,
   nsListenerStruct* ls = nsnull;
   PRInt32 count = mListeners.Count();
   for (PRInt32 i = 0; i < count; i++) {
-    ls = NS_STATIC_CAST(nsListenerStruct*, mListeners.ElementAt(i));
+    ls = static_cast<nsListenerStruct*>(mListeners.ElementAt(i));
     if (ls->mListener == aListener && ls->mFlags == aFlags &&
         ls->mGroupFlags == group &&
         (EVENT_TYPE_EQUALS(ls, aType, aTypeAtom) ||
@@ -571,7 +571,7 @@ nsEventListenerManager::RemoveEventListener(nsIDOMEventListener *aListener,
 
   PRInt32 count = mListeners.Count();
   for (PRInt32 i = 0; i < count; ++i) {
-    ls = NS_STATIC_CAST(nsListenerStruct*, mListeners.ElementAt(i));
+    ls = static_cast<nsListenerStruct*>(mListeners.ElementAt(i));
     if (ls->mListener == aListener &&
         ls->mGroupFlags == group &&
         ((ls->mFlags & ~NS_PRIV_EVENT_UNTRUSTED_PERMITTED) == aFlags) &&
@@ -654,7 +654,7 @@ nsEventListenerManager::FindJSEventListener(PRUint32 aEventType,
   nsListenerStruct *ls;
   PRInt32 count = mListeners.Count();
   for (PRInt32 i = 0; i < count; ++i) {
-    ls = NS_STATIC_CAST(nsListenerStruct*, mListeners.ElementAt(i));
+    ls = static_cast<nsListenerStruct*>(mListeners.ElementAt(i));
     if (EVENT_TYPE_EQUALS(ls, aEventType, aTypeAtom) &&
         ls->mFlags & NS_PRIV_EVENT_FLAG_SCRIPT) {
       return ls;
@@ -809,7 +809,7 @@ nsEventListenerManager::AddScriptEventListener(nsISupports *aObject,
       else {
         PRInt32 nameSpace = kNameSpaceID_Unknown;
         if (node && node->IsNodeOfType(nsINode::eCONTENT)) {
-          nsIContent* content = NS_STATIC_CAST(nsIContent*, node.get());
+          nsIContent* content = static_cast<nsIContent*>(node.get());
           nameSpace = content->GetNameSpaceID();
         }
         else if (doc) {
@@ -1179,7 +1179,7 @@ found:
   PRBool hasListener = PR_FALSE;
   for (PRInt32 k = 0; !mListenersRemoved && k < count; ++k) {
     nsListenerStruct* ls =
-      NS_STATIC_CAST(nsListenerStruct*, originalListeners.FastElementAt(k));
+      static_cast<nsListenerStruct*>(originalListeners.FastElementAt(k));
     if (!ls || (mListenerRemoved && mListeners.IndexOf(ls) == -1)) {
       continue;
     }
@@ -1391,7 +1391,7 @@ nsEventListenerManager::FixContextMenuEvent(nsPresContext* aPresContext,
   nsresult ret = NS_OK;
 
   PRBool contextMenuKey =
-    NS_STATIC_CAST(nsMouseEvent*, aEvent)->context == nsMouseEvent::eContextMenuKey;
+    static_cast<nsMouseEvent*>(aEvent)->context == nsMouseEvent::eContextMenuKey;
   if (nsnull == *aDOMEvent) {
     // If we're here because of the key-equiv for showing context menus, we
     // have to twiddle with the NS event to make sure the context menu comes
@@ -1404,7 +1404,7 @@ nsEventListenerManager::FixContextMenuEvent(nsPresContext* aPresContext,
       aEvent->refPoint.x = 0;
       aEvent->refPoint.y = 0;
     }
-    ret = NS_NewDOMMouseEvent(aDOMEvent, aPresContext, NS_STATIC_CAST(nsInputEvent*, aEvent));
+    ret = NS_NewDOMMouseEvent(aDOMEvent, aPresContext, static_cast<nsInputEvent*>(aEvent));
     NS_ENSURE_SUCCESS(ret, ret);
   }
 
@@ -1676,8 +1676,8 @@ nsEventListenerManager::HasMutationListeners(PRBool* aListener)
   if (mMayHaveMutationListeners) {
     PRInt32 count = mListeners.Count();
     for (PRInt32 i = 0; i < count; ++i) {
-      nsListenerStruct* ls = NS_STATIC_CAST(nsListenerStruct*,
-                                            mListeners.FastElementAt(i));
+      nsListenerStruct* ls = static_cast<nsListenerStruct*>
+                                        (mListeners.FastElementAt(i));
       if (ls &&
           ls->mEventType >= NS_MUTATION_START &&
           ls->mEventType <= NS_MUTATION_END) {
@@ -1697,8 +1697,8 @@ nsEventListenerManager::MutationListenerBits()
   if (mMayHaveMutationListeners) {
     PRInt32 i, count = mListeners.Count();
     for (i = 0; i < count; ++i) {
-      nsListenerStruct* ls = NS_STATIC_CAST(nsListenerStruct*,
-                                            mListeners.FastElementAt(i));
+      nsListenerStruct* ls = static_cast<nsListenerStruct*>
+                                        (mListeners.FastElementAt(i));
       if (ls &&
           (ls->mEventType >= NS_MUTATION_START &&
            ls->mEventType <= NS_MUTATION_END)) {
@@ -1737,8 +1737,8 @@ found:
 
   PRInt32 i, count = mListeners.Count();
   for (i = 0; i < count; ++i) {
-    nsListenerStruct* ls = NS_STATIC_CAST(nsListenerStruct*,
-                                          mListeners.FastElementAt(i));
+    nsListenerStruct* ls = static_cast<nsListenerStruct*>
+                                      (mListeners.FastElementAt(i));
     if (ls &&
         (ls->mTypeAtom == atom ||
          EVENT_TYPE_DATA_EQUALS(ls->mTypeData, typeData))) {
@@ -1753,8 +1753,8 @@ nsEventListenerManager::HasUnloadListeners()
 {
   PRInt32 count = mListeners.Count();
   for (PRInt32 i = 0; i < count; ++i) {
-    nsListenerStruct* ls = NS_STATIC_CAST(nsListenerStruct*,
-                                          mListeners.FastElementAt(i));
+    nsListenerStruct* ls = static_cast<nsListenerStruct*>
+                                      (mListeners.FastElementAt(i));
     if (ls &&
         (ls->mEventType == NS_PAGE_UNLOAD ||
          ls->mEventType == NS_BEFORE_PAGE_UNLOAD) ||
diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp
index b837932de17..97ecd971d4a 100644
--- a/mozilla/content/events/src/nsEventStateManager.cpp
+++ b/mozilla/content/events/src/nsEventStateManager.cpp
@@ -634,7 +634,7 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
 
   switch (aEvent->message) {
   case NS_MOUSE_BUTTON_DOWN:
-    switch (NS_STATIC_CAST(nsMouseEvent*, aEvent)->button) {
+    switch (static_cast<nsMouseEvent*>(aEvent)->button) {
     case nsMouseEvent::eLeftButton:
 #ifndef XP_OS2
       BeginTrackingDragGesture ( aPresContext, (nsMouseEvent*)aEvent, aTargetFrame );
@@ -657,7 +657,7 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
     }
     break;
   case NS_MOUSE_BUTTON_UP:
-    switch (NS_STATIC_CAST(nsMouseEvent*, aEvent)->button) {
+    switch (static_cast<nsMouseEvent*>(aEvent)->button) {
       case nsMouseEvent::eLeftButton:
 #ifdef CLICK_HOLD_CONTEXT_MENUS
       KillClickHoldTimer();
@@ -685,7 +685,7 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
     // window bounds --- the mouse probably moved into some
     // "on top" window.
     {
-      nsMouseEvent* mouseEvent = NS_STATIC_CAST(nsMouseEvent*, aEvent);
+      nsMouseEvent* mouseEvent = static_cast<nsMouseEvent*>(aEvent);
       nsIWidget* parentWidget = mouseEvent->widget->GetParent();
       nsPoint eventPoint;
       eventPoint = nsLayoutUtils::TranslateWidgetToView(aPresContext,
@@ -904,7 +904,7 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
       // This allows "-moz-user-focus: ignore" to work.
 
 #if defined(XP_WIN) || defined(XP_OS2)
-      if (!NS_STATIC_CAST(nsFocusEvent*, aEvent)->isMozWindowTakingFocus) {
+      if (!static_cast<nsFocusEvent*>(aEvent)->isMozWindowTakingFocus) {
 
         // This situation occurs when focus goes to a non-gecko child window
         // in an embedding application.  In this case we do fire a blur
@@ -1172,7 +1172,7 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext,
         mCurrentTargetContent = mCurrentFocus;
       }
 
-      nsMouseScrollEvent* msEvent = NS_STATIC_CAST(nsMouseScrollEvent*, aEvent);
+      nsMouseScrollEvent* msEvent = static_cast<nsMouseScrollEvent*>(aEvent);
 
       NS_NAMED_LITERAL_CSTRING(actionslot,      ".action");
       NS_NAMED_LITERAL_CSTRING(numlinesslot,    ".numlines");
@@ -1271,7 +1271,7 @@ nsEventStateManager::HandleAccessKey(nsPresContext* aPresContext,
     nsVoidKey key(NS_INT32_TO_PTR(accKey));
     if (mAccessKeys->Exists(&key)) {
       nsCOMPtr<nsIContent> content =
-        dont_AddRef(NS_STATIC_CAST(nsIContent*, mAccessKeys->Get(&key)));
+        dont_AddRef(static_cast<nsIContent*>(mAccessKeys->Get(&key)));
       content->PerformAccesskey(sKeyCausesActivation,
                                 NS_IS_TRUSTED_EVENT(aEvent));
       *aStatus = nsEventStatus_eConsumeNoDefault;
@@ -1313,7 +1313,7 @@ nsEventStateManager::HandleAccessKey(nsPresContext* aPresContext,
         nsPresContext *subPC = subPS->GetPresContext();
 
         nsEventStateManager* esm =
-          NS_STATIC_CAST(nsEventStateManager *, subPC->EventStateManager());
+          static_cast<nsEventStateManager *>(subPC->EventStateManager());
 
         if (esm)
           esm->HandleAccessKey(subPC, aEvent, aStatus, nsnull,
@@ -1346,7 +1346,7 @@ nsEventStateManager::HandleAccessKey(nsPresContext* aPresContext,
       NS_ASSERTION(parentPC, "PresShell without PresContext");
 
       nsEventStateManager* esm =
-        NS_STATIC_CAST(nsEventStateManager *, parentPC->EventStateManager());
+        static_cast<nsEventStateManager *>(parentPC->EventStateManager());
 
       if (esm)
         esm->HandleAccessKey(parentPC, aEvent, aStatus, docShell,
@@ -1424,7 +1424,7 @@ nsEventStateManager::KillClickHoldTimer()
 void
 nsEventStateManager::sClickHoldCallback(nsITimer *aTimer, void* aESM)
 {
-  nsEventStateManager* self = NS_STATIC_CAST(nsEventStateManager*, aESM);
+  nsEventStateManager* self = static_cast<nsEventStateManager*>(aESM);
   if ( self )
     self->FireContextClick();
 
@@ -2054,7 +2054,7 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
   switch (aEvent->message) {
   case NS_MOUSE_BUTTON_DOWN:
     {
-      if (NS_STATIC_CAST(nsMouseEvent*, aEvent)->button == nsMouseEvent::eLeftButton &&
+      if (static_cast<nsMouseEvent*>(aEvent)->button == nsMouseEvent::eLeftButton &&
           !mNormalLMouseEventInProcess) {
         //Our state is out of whack.  We got a mouseup while still processing
         //the mousedown.  Kill View-level mouse capture or it'll stay stuck
@@ -2113,7 +2113,7 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
         }
 
         // The rest is left button-specific.
-        if (NS_STATIC_CAST(nsMouseEvent*, aEvent)->button !=
+        if (static_cast<nsMouseEvent*>(aEvent)->button !=
             nsMouseEvent::eLeftButton)
           break;
 
@@ -2242,7 +2242,7 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
         nsMouseEvent event(NS_IS_TRUSTED_EVENT(aEvent), NS_DRAGDROP_DRAGDROP,
                            widget, nsMouseEvent::eReal);
 
-        nsMouseEvent* mouseEvent = NS_STATIC_CAST(nsMouseEvent*, aEvent);
+        nsMouseEvent* mouseEvent = static_cast<nsMouseEvent*>(aEvent);
         event.refPoint = mouseEvent->refPoint;
         event.isShift = mouseEvent->isShift;
         event.isControl = mouseEvent->isControl;
@@ -2731,7 +2731,7 @@ nsEventStateManager::NotifyMouseOut(nsGUIEvent* aEvent, nsIContent* aMovingInto)
         
         if (presContext) {
           nsEventStateManager* kidESM =
-            NS_STATIC_CAST(nsEventStateManager*, presContext->EventStateManager());
+            static_cast<nsEventStateManager*>(presContext->EventStateManager());
           // Not moving into any element in this subdocument
           kidESM->NotifyMouseOut(aEvent, nsnull);
         }
@@ -2790,8 +2790,8 @@ nsEventStateManager::NotifyMouseOver(nsGUIEvent* aEvent, nsIContent* aContent)
       nsIPresShell *parentShell = parentDoc->GetPrimaryShell();
       if (parentShell) {
         nsEventStateManager* parentESM =
-          NS_STATIC_CAST(nsEventStateManager*,
-                         parentShell->GetPresContext()->EventStateManager());
+          static_cast<nsEventStateManager*>
+                     (parentShell->GetPresContext()->EventStateManager());
         parentESM->NotifyMouseOver(aEvent, docContent);
       }
     }
@@ -4516,7 +4516,7 @@ nsEventStateManager::EventStatusOK(nsGUIEvent* aEvent, PRBool *aOK)
 {
   *aOK = PR_TRUE;
   if (aEvent->message == NS_MOUSE_BUTTON_DOWN &&
-      NS_STATIC_CAST(nsMouseEvent*, aEvent)->button == nsMouseEvent::eLeftButton) {
+      static_cast<nsMouseEvent*>(aEvent)->button == nsMouseEvent::eLeftButton) {
     if (!mNormalLMouseEventInProcess) {
       *aOK = PR_FALSE;
     }
@@ -4543,7 +4543,7 @@ nsEventStateManager::RegisterAccessKey(nsIContent* aContent, PRUint32 aKey)
     nsVoidKey key(NS_INT32_TO_PTR(accKey));
 
 #ifdef DEBUG_jag
-    nsCOMPtr<nsIContent> oldContent = dont_AddRef(NS_STATIC_CAST(nsIContent*,  mAccessKeys->Get(&key)));
+    nsCOMPtr<nsIContent> oldContent = dont_AddRef(static_cast<nsIContent*>(mAccessKeys->Get(&key)));
     NS_ASSERTION(!oldContent, "Overwriting accesskey registration");
 #endif
     mAccessKeys->Put(&key, aContent);
@@ -4564,7 +4564,7 @@ nsEventStateManager::UnregisterAccessKey(nsIContent* aContent, PRUint32 aKey)
 
     nsVoidKey key(NS_INT32_TO_PTR(accKey));
 
-    nsCOMPtr<nsIContent> oldContent = dont_AddRef(NS_STATIC_CAST(nsIContent*, mAccessKeys->Get(&key)));
+    nsCOMPtr<nsIContent> oldContent = dont_AddRef(static_cast<nsIContent*>(mAccessKeys->Get(&key)));
 #ifdef DEBUG_jag
     NS_ASSERTION(oldContent == aContent, "Trying to unregister wrong content");
 #endif
@@ -4655,7 +4655,7 @@ nsEventStateManager::GetDocSelectionLocation(nsIContent **aStartContent,
     if (domRange) {
       domRange->GetStartContainer(getter_AddRefs(startNode));
       domRange->GetEndContainer(getter_AddRefs(endNode));
-      domRange->GetStartOffset(NS_REINTERPRET_CAST(PRInt32 *, aStartOffset));
+      domRange->GetStartOffset(reinterpret_cast<PRInt32 *>(aStartOffset));
 
       nsIContent *childContent = nsnull;
 
@@ -4741,7 +4741,7 @@ nsEventStateManager::GetDocSelectionLocation(nsIContent **aStartContent,
             frameTraversal->Next();
             nsISupports* currentItem;
             frameTraversal->CurrentItem(&currentItem);
-            if (nsnull == (newCaretFrame = NS_STATIC_CAST(nsIFrame*, currentItem))) {
+            if (nsnull == (newCaretFrame = static_cast<nsIFrame*>(currentItem))) {
               break;
             }
             newCaretContent = newCaretFrame->GetContent();            
diff --git a/mozilla/content/events/src/nsPrivateTextRange.cpp b/mozilla/content/events/src/nsPrivateTextRange.cpp
index 6c7e25c2498..f1ff0995f11 100644
--- a/mozilla/content/events/src/nsPrivateTextRange.cpp
+++ b/mozilla/content/events/src/nsPrivateTextRange.cpp
@@ -96,7 +96,7 @@ void nsPrivateTextRangeList::AppendTextRange(nsRefPtr<nsPrivateTextRange>& aRang
 
 NS_METHOD nsPrivateTextRangeList::GetLength(PRUint16* aLength)
 {
-	*aLength = NS_STATIC_CAST(PRUint16, mList.Length());
+	*aLength = static_cast<PRUint16>(mList.Length());
 	return NS_OK;
 }
 
diff --git a/mozilla/content/events/src/nsXMLEventsManager.cpp b/mozilla/content/events/src/nsXMLEventsManager.cpp
index 9be1dd59bf5..54289332023 100644
--- a/mozilla/content/events/src/nsXMLEventsManager.cpp
+++ b/mozilla/content/events/src/nsXMLEventsManager.cpp
@@ -265,7 +265,7 @@ PR_STATIC_CALLBACK(PLDHashOperator) EnumAndSetIncomplete(nsISupports * aContent,
                                                          void * aData)
 {
   if (aListener && aData) {
-    nsCOMPtr<nsIContent> content = NS_STATIC_CAST(nsIContent *, aData);
+    nsCOMPtr<nsIContent> content = static_cast<nsIContent *>(aData);
     if (content) { 
       if (aListener->ObserverEquals(content) || aListener->HandlerEquals(content)) {
         aListener->SetIncomplete();
diff --git a/mozilla/content/html/content/src/nsFormSubmission.cpp b/mozilla/content/html/content/src/nsFormSubmission.cpp
index 8cacb30db79..06e07f05cd5 100644
--- a/mozilla/content/html/content/src/nsFormSubmission.cpp
+++ b/mozilla/content/html/content/src/nsFormSubmission.cpp
@@ -1203,7 +1203,7 @@ GetSubmissionFromForm(nsGenericHTMLElement* aForm,
 
   // This ASSUMES that all encodings above inherit from nsFormSubmission, which
   // they currently do.  If that changes, change this too.
-  NS_STATIC_CAST(nsFormSubmission*, *aFormSubmission)->Init();
+  static_cast<nsFormSubmission*>(*aFormSubmission)->Init();
 
   return NS_OK;
 }
diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
index 7e788631c66..993edd6c60d 100644
--- a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
@@ -230,21 +230,21 @@ nsGenericHTMLElement::DOMQueryInterface(nsIDOMHTMLElement *aElement,
   nsISupports *inst = nsnull;
 
   if (aIID.Equals(NS_GET_IID(nsIDOMNode))) {
-    inst = NS_STATIC_CAST(nsIDOMNode *, aElement);
+    inst = static_cast<nsIDOMNode *>(aElement);
   } else if (aIID.Equals(NS_GET_IID(nsIDOMElement))) {
-    inst = NS_STATIC_CAST(nsIDOMElement *, aElement);
+    inst = static_cast<nsIDOMElement *>(aElement);
   } else if (aIID.Equals(NS_GET_IID(nsIDOMHTMLElement))) {
-    inst = NS_STATIC_CAST(nsIDOMHTMLElement *, aElement);
+    inst = static_cast<nsIDOMHTMLElement *>(aElement);
   } else if (aIID.Equals(NS_GET_IID(nsIDOMNSHTMLElement))) {
-    inst = NS_STATIC_CAST(nsIDOMNSHTMLElement *,
-                          new nsGenericHTMLElementTearoff(this));
+    inst = static_cast<nsIDOMNSHTMLElement *>
+                      (new nsGenericHTMLElementTearoff(this));
     if (NS_UNLIKELY(!inst)) {
       *aInstancePtr = nsnull;
       return NS_ERROR_OUT_OF_MEMORY;
     }
   } else if (aIID.Equals(NS_GET_IID(nsIDOMElementCSSInlineStyle))) {
-    inst = NS_STATIC_CAST(nsIDOMElementCSSInlineStyle *,
-                          new nsGenericHTMLElementTearoff(this));
+    inst = static_cast<nsIDOMElementCSSInlineStyle *>
+                      (new nsGenericHTMLElementTearoff(this));
     if (NS_UNLIKELY(!inst)) {
       *aInstancePtr = nsnull;
       return NS_ERROR_OUT_OF_MEMORY;
@@ -306,14 +306,14 @@ nsGenericHTMLElement::CopyInnerTo(nsGenericElement* aDst) const
     rv = aDst->SetProperty(nsGkAtoms::htmlBaseHref, prop,
                            nsPropertyTable::SupportsDtorFunc, PR_TRUE);
     if (NS_SUCCEEDED(rv)) {
-      NS_ADDREF(NS_STATIC_CAST(nsIURI*, prop));
+      NS_ADDREF(static_cast<nsIURI*>(prop));
     }
   }
   if ((prop = GetProperty(nsGkAtoms::htmlBaseTarget))) {
     rv = aDst->SetProperty(nsGkAtoms::htmlBaseTarget, prop,
                            nsPropertyTable::SupportsDtorFunc, PR_TRUE);
     if (NS_SUCCEEDED(rv)) {
-      NS_ADDREF(NS_STATIC_CAST(nsIAtom*, prop));
+      NS_ADDREF(static_cast<nsIAtom*>(prop));
     }
   }
 
@@ -724,8 +724,8 @@ nsGenericHTMLElement::GetInnerHTML(nsAString& aInnerHTML)
     return NS_OK; // We rely on the document for doing HTML conversion
   }
 
-  nsCOMPtr<nsIDOMNode> thisNode(do_QueryInterface(NS_STATIC_CAST(nsIContent *,
-                                                                 this)));
+  nsCOMPtr<nsIDOMNode> thisNode(do_QueryInterface(static_cast<nsIContent *>
+                                                             (this)));
   nsresult rv = NS_OK;
 
   nsAutoString contentType;
@@ -791,8 +791,8 @@ nsGenericHTMLElement::SetInnerHTML(const nsAString& aInnerHTML)
     loader->SetEnabled(PR_FALSE);
   }
 
-  nsCOMPtr<nsIDOMNode> thisNode(do_QueryInterface(NS_STATIC_CAST(nsIContent *,
-                                                                 this)));
+  nsCOMPtr<nsIDOMNode> thisNode(do_QueryInterface(static_cast<nsIContent *>
+                                                             (this)));
   nsresult rv = nsContentUtils::CreateContextualFragment(thisNode, aInnerHTML,
                                                          getter_AddRefs(df));
   if (NS_SUCCEEDED(rv)) {
@@ -1094,7 +1094,7 @@ nsGenericHTMLElement::GetSpellcheck(PRBool* aSpellcheck)
     if (node->IsNodeOfType(nsINode::eHTML)) {
       static nsIContent::AttrValuesArray strings[] =
         {&nsGkAtoms::_true, &nsGkAtoms::_false, nsnull};
-      switch (NS_STATIC_CAST(nsIContent*, node)->
+      switch (static_cast<nsIContent*>(node)->
               FindAttrValueIn(kNameSpaceID_None, nsGkAtoms::spellcheck,
                               strings, eCaseMatters)) {
         case 0:                         // spellcheck = "true"
@@ -1571,7 +1571,7 @@ nsGenericHTMLElement::GetBaseURI() const
 
   void* prop;
   if (HasFlag(NODE_HAS_PROPERTIES) && (prop = GetProperty(nsGkAtoms::htmlBaseHref))) {
-    nsIURI* uri = NS_STATIC_CAST(nsIURI*, prop);
+    nsIURI* uri = static_cast<nsIURI*>(prop);
     NS_ADDREF(uri);
     
     return uri;
@@ -1598,7 +1598,7 @@ nsGenericHTMLElement::GetBaseTarget(nsAString& aBaseTarget) const
 {
   void* prop;
   if (HasFlag(NODE_HAS_PROPERTIES) && (prop = GetProperty(nsGkAtoms::htmlBaseTarget))) {
-    NS_STATIC_CAST(nsIAtom*, prop)->ToString(aBaseTarget);
+    static_cast<nsIAtom*>(prop)->ToString(aBaseTarget);
     
     return;
   }
@@ -3047,8 +3047,8 @@ nsGenericHTMLFormElement::IntrinsicState() const
   
   if (mForm &&
       // XXXbz Need the cast to make VC++6 happy.
-      NS_STATIC_CAST(const nsIFormControl*,
-                     mForm->GetDefaultSubmitElement()) == this) {
+      static_cast<const nsIFormControl*>
+                 (mForm->GetDefaultSubmitElement()) == this) {
       NS_ASSERTION(IsSubmitControl(),
                    "Default submit element that isn't a submit control.");
       // We are the default submit element (:default)
diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.h b/mozilla/content/html/content/src/nsGenericHTMLElement.h
index c0e7c3d69c7..5656d101344 100644
--- a/mozilla/content/html/content/src/nsGenericHTMLElement.h
+++ b/mozilla/content/html/content/src/nsGenericHTMLElement.h
@@ -86,7 +86,7 @@ public:
   static nsGenericHTMLElement* FromContent(nsIContent *aContent)
   {
     if (aContent->IsNodeOfType(eHTML))
-      return NS_STATIC_CAST(nsGenericHTMLElement*, aContent);
+      return static_cast<nsGenericHTMLElement*>(aContent);
     return nsnull;
   }
 
@@ -1103,7 +1103,7 @@ NS_NewHTML##_elementName##Element(nsINodeInfo *aNodeInfo, PRBool aFromParser)\
     if (NS_SUCCEEDED(rv))                                                     \
       return rv;                                                              \
                                                                               \
-    rv = DOMQueryInterface(NS_STATIC_CAST(_base_if *, this), aIID,            \
+    rv = DOMQueryInterface(static_cast<_base_if *>(this), aIID,            \
                            aInstancePtr);                                     \
                                                                               \
     if (NS_SUCCEEDED(rv))                                                     \
@@ -1134,7 +1134,7 @@ NS_NewHTML##_elementName##Element(nsINodeInfo *aNodeInfo, PRBool aFromParser)\
     if (NS_SUCCEEDED(rv))                                                     \
       return rv;                                                              \
                                                                               \
-    rv = DOMQueryInterface(NS_STATIC_CAST(_base_if *, this), aIID,            \
+    rv = DOMQueryInterface(static_cast<_base_if *>(this), aIID,            \
                            aInstancePtr);                                     \
                                                                               \
     if (NS_SUCCEEDED(rv))                                                     \
diff --git a/mozilla/content/html/content/src/nsHTMLButtonElement.cpp b/mozilla/content/html/content/src/nsHTMLButtonElement.cpp
index e928a1311ce..5e826438b00 100644
--- a/mozilla/content/html/content/src/nsHTMLButtonElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLButtonElement.cpp
@@ -229,7 +229,7 @@ nsHTMLButtonElement::Click()
                            NS_MOUSE_CLICK, nsnull,
                            nsMouseEvent::eReal);
         nsEventStatus status = nsEventStatus_eIgnore;
-        nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this), context,
+        nsEventDispatcher::Dispatch(static_cast<nsIContent*>(this), context,
                                     &event, nsnull, &status);
       }
     }
@@ -369,7 +369,7 @@ nsHTMLButtonElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
             nsMouseEvent event(NS_IS_TRUSTED_EVENT(aVisitor.mEvent),
                                NS_MOUSE_CLICK, nsnull,
                                nsMouseEvent::eReal);
-            nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this),
+            nsEventDispatcher::Dispatch(static_cast<nsIContent*>(this),
                                         aVisitor.mPresContext, &event, nsnull,
                                         &status);
           }
@@ -423,14 +423,14 @@ nsHTMLButtonElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
       case NS_MOUSE_BUTTON_DOWN:
         {
           if (aVisitor.mEvent->eventStructType == NS_MOUSE_EVENT) {
-            if (NS_STATIC_CAST(nsMouseEvent*, aVisitor.mEvent)->button ==
+            if (static_cast<nsMouseEvent*>(aVisitor.mEvent)->button ==
                   nsMouseEvent::eLeftButton) {
               aVisitor.mPresContext->EventStateManager()->
                 SetContentState(this, NS_EVENT_STATE_ACTIVE | NS_EVENT_STATE_FOCUS);
               aVisitor.mEventStatus = nsEventStatus_eConsumeNoDefault;
-            } else if (NS_STATIC_CAST(nsMouseEvent*, aVisitor.mEvent)->button ==
+            } else if (static_cast<nsMouseEvent*>(aVisitor.mEvent)->button ==
                          nsMouseEvent::eMiddleButton ||
-                       NS_STATIC_CAST(nsMouseEvent*, aVisitor.mEvent)->button ==
+                       static_cast<nsMouseEvent*>(aVisitor.mEvent)->button ==
                          nsMouseEvent::eRightButton) {
               // cancel all of these events for buttons
               //XXXsmaug What to do with these events? Why these should be cancelled?
@@ -449,9 +449,9 @@ nsHTMLButtonElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
         {
           if (aVisitor.mEvent->eventStructType == NS_MOUSE_EVENT &&
               aVisitor.mDOMEvent &&
-              (NS_STATIC_CAST(nsMouseEvent*, aVisitor.mEvent)->button ==
+              (static_cast<nsMouseEvent*>(aVisitor.mEvent)->button ==
                  nsMouseEvent::eMiddleButton ||
-               NS_STATIC_CAST(nsMouseEvent*, aVisitor.mEvent)->button ==
+               static_cast<nsMouseEvent*>(aVisitor.mEvent)->button ==
                  nsMouseEvent::eRightButton)) {
             aVisitor.mDOMEvent->StopPropagation();
           }
diff --git a/mozilla/content/html/content/src/nsHTMLCanvasElement.cpp b/mozilla/content/html/content/src/nsHTMLCanvasElement.cpp
index e1e870d7223..1cc32fa664f 100644
--- a/mozilla/content/html/content/src/nsHTMLCanvasElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLCanvasElement.cpp
@@ -321,7 +321,7 @@ nsHTMLCanvasElement::ToDataURL(nsAString& aDataURL)
     if (!JSVAL_IS_STRING(argv[0]))
       return NS_ERROR_DOM_SYNTAX_ERR;
     JSString *type = JS_ValueToString(ctx, argv[0]);
-    return ToDataURLImpl (nsDependentString(NS_REINTERPRET_CAST(PRUnichar*,(JS_GetStringChars(type)))),
+    return ToDataURLImpl (nsDependentString(reinterpret_cast<PRUnichar*>((JS_GetStringChars(type)))),
                           EmptyString(), aDataURL);
   }
 
@@ -334,8 +334,8 @@ nsHTMLCanvasElement::ToDataURL(nsAString& aDataURL)
     type = JS_ValueToString(ctx, argv[0]);
     params = JS_ValueToString(ctx, argv[1]);
 
-    return ToDataURLImpl (nsDependentString(NS_REINTERPRET_CAST(PRUnichar*,JS_GetStringChars(type))),
-                          nsDependentString(NS_REINTERPRET_CAST(PRUnichar*,JS_GetStringChars(params))),
+    return ToDataURLImpl (nsDependentString(reinterpret_cast<PRUnichar*>(JS_GetStringChars(type))),
+                          nsDependentString(reinterpret_cast<PRUnichar*>(JS_GetStringChars(params))),
                           aDataURL);
   }
 
diff --git a/mozilla/content/html/content/src/nsHTMLFormElement.cpp b/mozilla/content/html/content/src/nsHTMLFormElement.cpp
index 84230618c70..68fd85bddf3 100644
--- a/mozilla/content/html/content/src/nsHTMLFormElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLFormElement.cpp
@@ -563,7 +563,7 @@ ElementTraverser(const nsAString& key, nsIDOMHTMLInputElement* element,
                  void* userArg)
 {
   nsCycleCollectionTraversalCallback *cb = 
-    NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, userArg);
+    static_cast<nsCycleCollectionTraversalCallback*>(userArg);
  
   cb->NoteXPCOMChild(element);
   return PL_DHASH_NEXT;
@@ -688,7 +688,7 @@ NS_IMETHODIMP
 nsHTMLFormElement::Reset()
 {
   nsFormEvent event(PR_TRUE, NS_FORM_RESET);
-  nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this), nsnull,
+  nsEventDispatcher::Dispatch(static_cast<nsIContent*>(this), nsnull,
                               &event);
   return NS_OK;
 }
@@ -759,7 +759,7 @@ nsHTMLFormElement::UnbindFromTree(PRBool aDeep, PRBool aNullParent)
 nsresult
 nsHTMLFormElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
 {
-  if (aVisitor.mEvent->originalTarget == NS_STATIC_CAST(nsIContent*, this)) {
+  if (aVisitor.mEvent->originalTarget == static_cast<nsIContent*>(this)) {
     PRUint32 msg = aVisitor.mEvent->message;
     if (msg == NS_FORM_SUBMIT) {
       if (mGeneratingSubmit) {
@@ -787,7 +787,7 @@ nsHTMLFormElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
 nsresult
 nsHTMLFormElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
 {
-  if (aVisitor.mEvent->originalTarget == NS_STATIC_CAST(nsIContent*, this)) {
+  if (aVisitor.mEvent->originalTarget == static_cast<nsIContent*>(this)) {
     PRUint32 msg = aVisitor.mEvent->message;
     if (msg == NS_FORM_SUBMIT) {
       // let the form know not to defer subsequent submissions
@@ -1744,7 +1744,7 @@ nsHTMLFormElement::GetPositionInGroup(nsIDOMHTMLInputElement *aRadio,
   // XXX If ResolveName could return an nsContentList instead then we 
   //     could get an nsContentList instead of using this hacky upcast
   nsBaseContentList *radioGroup =
-    NS_STATIC_CAST(nsBaseContentList *, (nsIDOMNodeList *)radioNodeList);
+    static_cast<nsBaseContentList *>((nsIDOMNodeList *)radioNodeList);
   NS_ASSERTION(radioGroup, "No such radio group in this container");
   if (!radioGroup) {
     return NS_OK;
@@ -1787,7 +1787,7 @@ nsHTMLFormElement::GetNextRadioButton(const nsAString& aName,
   //     could get an nsContentList instead of using this hacky upcast
 
   nsBaseContentList *radioGroup =
-    NS_STATIC_CAST(nsBaseContentList *, (nsIDOMNodeList *)radioNodeList);
+    static_cast<nsBaseContentList *>((nsIDOMNodeList *)radioNodeList);
   if (!radioGroup) {
     return NS_ERROR_FAILURE;
   }
@@ -1986,7 +1986,7 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 ControlTraverser(const nsAString& key, nsISupports* control, void* userArg)
 {
   nsCycleCollectionTraversalCallback *cb = 
-    NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, userArg);
+    static_cast<nsCycleCollectionTraversalCallback*>(userArg);
  
   cb->NoteXPCOMChild(control);
   return PL_DHASH_NEXT;
@@ -2144,8 +2144,8 @@ nsFormControlList::AddElementToTable(nsIFormControl* aChild,
       NS_ENSURE_TRUE(nodeList, NS_ERROR_FAILURE);
 
       // Upcast, uggly, but it works!
-      nsBaseContentList *list = NS_STATIC_CAST(nsBaseContentList *,
-                                               (nsIDOMNodeList *)nodeList.get());
+      nsBaseContentList *list = static_cast<nsBaseContentList *>
+                                           ((nsIDOMNodeList *)nodeList.get());
 
       PRInt32 oldIndex = list->IndexOf(newChild, PR_FALSE);
       
@@ -2206,8 +2206,8 @@ nsFormControlList::RemoveElementFromTable(nsIFormControl* aChild,
   NS_ENSURE_TRUE(nodeList, NS_ERROR_FAILURE);
 
   // Upcast, uggly, but it works!
-  nsBaseContentList *list = NS_STATIC_CAST(nsBaseContentList *,
-                                           (nsIDOMNodeList *)nodeList.get());
+  nsBaseContentList *list = static_cast<nsBaseContentList *>
+                                       ((nsIDOMNodeList *)nodeList.get());
 
   list->RemoveElement(content);
 
diff --git a/mozilla/content/html/content/src/nsHTMLImageElement.cpp b/mozilla/content/html/content/src/nsHTMLImageElement.cpp
index b6d75ba9151..821205e9554 100644
--- a/mozilla/content/html/content/src/nsHTMLImageElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLImageElement.cpp
@@ -422,7 +422,7 @@ nsHTMLImageElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
   // element. (bug 39723)
   if (aVisitor.mEvent->eventStructType == NS_MOUSE_EVENT &&
       aVisitor.mEvent->message == NS_MOUSE_CLICK &&
-      NS_STATIC_CAST(nsMouseEvent*, aVisitor.mEvent)->button ==
+      static_cast<nsMouseEvent*>(aVisitor.mEvent)->button ==
         nsMouseEvent::eLeftButton) {
     PRBool isMap = PR_FALSE;
     GetIsMap(&isMap);
@@ -553,7 +553,7 @@ nsHTMLImageElement::Initialize(JSContext* aContext, JSObject *aObj,
   JSBool ret = JS_ValueToInt32(aContext, argv[0], &width);
   NS_ENSURE_TRUE(ret, NS_ERROR_INVALID_ARG);
 
-  nsresult rv = SetIntAttr(nsGkAtoms::width, NS_STATIC_CAST(PRInt32, width));
+  nsresult rv = SetIntAttr(nsGkAtoms::width, static_cast<PRInt32>(width));
 
   if (NS_SUCCEEDED(rv) && (argc > 1)) {
     // The second (optional) argument is the height of the image
@@ -561,7 +561,7 @@ nsHTMLImageElement::Initialize(JSContext* aContext, JSObject *aObj,
     ret = JS_ValueToInt32(aContext, argv[1], &height);
     NS_ENSURE_TRUE(ret, NS_ERROR_INVALID_ARG);
 
-    rv = SetIntAttr(nsGkAtoms::height, NS_STATIC_CAST(PRInt32, height));
+    rv = SetIntAttr(nsGkAtoms::height, static_cast<PRInt32>(height));
   }
 
   return rv;
diff --git a/mozilla/content/html/content/src/nsHTMLInputElement.cpp b/mozilla/content/html/content/src/nsHTMLInputElement.cpp
index b839bcfa9bd..974f518e918 100644
--- a/mozilla/content/html/content/src/nsHTMLInputElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLInputElement.cpp
@@ -429,7 +429,7 @@ nsHTMLInputElement::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const
         // the clone.
         // XXX GetValue should be const
         nsAutoString value;
-        NS_CONST_CAST(nsHTMLInputElement*, this)->GetValue(value);
+        const_cast<nsHTMLInputElement*>(this)->GetValue(value);
         // SetValueInternal handles setting the VALUE_CHANGED bit for us
         it->SetValueInternal(value, nsnull);
       }
@@ -446,7 +446,7 @@ nsHTMLInputElement::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const
         // checked state on the clone.
         // XXX GetChecked should be const
         PRBool checked;
-        NS_CONST_CAST(nsHTMLInputElement*, this)->GetChecked(&checked);
+        const_cast<nsHTMLInputElement*>(this)->GetChecked(&checked);
         it->DoSetChecked(checked, PR_FALSE);
       }
       break;
@@ -1019,9 +1019,8 @@ nsHTMLInputElement::RadioSetChecked(PRBool aNotify)
   if (currentlySelected) {
     // Pass PR_TRUE for the aNotify parameter since the currently selected
     // button is already in the document.
-    rv = NS_STATIC_CAST(nsHTMLInputElement*,
-                        NS_STATIC_CAST(nsIDOMHTMLInputElement*, currentlySelected)
-         )->SetCheckedInternal(PR_FALSE, PR_TRUE);
+    rv = static_cast<nsHTMLInputElement*>
+                    (static_cast<nsIDOMHTMLInputElement*>(currentlySelected))->SetCheckedInternal(PR_FALSE, PR_TRUE);
   }
 
   //
@@ -1144,7 +1143,7 @@ nsHTMLInputElement::FireOnChange()
   nsEventStatus status = nsEventStatus_eIgnore;
   nsEvent event(PR_TRUE, NS_FORM_CHANGE);
   nsCOMPtr<nsPresContext> presContext = GetPresContext();
-  nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this), presContext,
+  nsEventDispatcher::Dispatch(static_cast<nsIContent*>(this), presContext,
                               &event, nsnull, &status);
 }
 
@@ -1251,7 +1250,7 @@ nsHTMLInputElement::Select()
       nsEvent event(nsContentUtils::IsCallerChrome(), NS_FORM_SELECTED);
 
       SET_BOOLBIT(mBitField, BF_HANDLING_SELECT_EVENT, PR_TRUE);
-      nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this),
+      nsEventDispatcher::Dispatch(static_cast<nsIContent*>(this),
                                   presContext, &event, nsnull, &status);
       SET_BOOLBIT(mBitField, BF_HANDLING_SELECT_EVENT, PR_FALSE);
     }
@@ -1345,7 +1344,7 @@ nsHTMLInputElement::Click()
 
         SET_BOOLBIT(mBitField, BF_HANDLING_CLICK, PR_TRUE);
 
-        nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this), context,
+        nsEventDispatcher::Dispatch(static_cast<nsIContent*>(this), context,
                                     &event, nsnull, &status);
 
         SET_BOOLBIT(mBitField, BF_HANDLING_CLICK, PR_FALSE);
@@ -1475,13 +1474,13 @@ nsHTMLInputElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
   if ((mType == NS_FORM_INPUT_TEXT || mType == NS_FORM_INPUT_PASSWORD) &&
       aVisitor.mEvent->message == NS_MOUSE_CLICK &&
       aVisitor.mEvent->eventStructType == NS_MOUSE_EVENT &&
-      NS_STATIC_CAST(nsMouseEvent*, aVisitor.mEvent)->button ==
+      static_cast<nsMouseEvent*>(aVisitor.mEvent)->button ==
         nsMouseEvent::eMiddleButton) {
     aVisitor.mEvent->flags &= ~NS_EVENT_FLAG_NO_CONTENT_DISPATCH;
   }
 
   // We must cache type because mType may change during JS event (bug 2369)
-  aVisitor.mItemFlags |= NS_STATIC_CAST(PRUint8, mType);
+  aVisitor.mItemFlags |= static_cast<PRUint8>(mType);
 
   // Fire onchange (if necessary), before we do the blur, bug 357684.
   if (aVisitor.mEvent->message == NS_BLUR_CONTENT) {
@@ -1606,7 +1605,7 @@ nsHTMLInputElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
           // this parent file control -- leave focus on the child.
           nsIFormControlFrame* formControlFrame = GetFormControlFrame(PR_FALSE);
           if (formControlFrame && ShouldFocus(this) &&
-              aVisitor.mEvent->originalTarget == NS_STATIC_CAST(nsINode*, this))
+              aVisitor.mEvent->originalTarget == static_cast<nsINode*>(this))
             formControlFrame->SetFocus(PR_TRUE, PR_TRUE);
         }
         break; // NS_FOCUS_CONTENT
@@ -1643,7 +1642,7 @@ nsHTMLInputElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
                                    NS_MOUSE_CLICK, nsnull, nsMouseEvent::eReal);
                 nsEventStatus status = nsEventStatus_eIgnore;
 
-                nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this),
+                nsEventDispatcher::Dispatch(static_cast<nsIContent*>(this),
                                             aVisitor.mPresContext, &event,
                                             nsnull, &status);
               } // case
@@ -1749,9 +1748,9 @@ nsHTMLInputElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
           // cancel all of these events for buttons
           //XXXsmaug Why?
           if (aVisitor.mEvent->eventStructType == NS_MOUSE_EVENT &&
-              (NS_STATIC_CAST(nsMouseEvent*, aVisitor.mEvent)->button ==
+              (static_cast<nsMouseEvent*>(aVisitor.mEvent)->button ==
                  nsMouseEvent::eMiddleButton ||
-               NS_STATIC_CAST(nsMouseEvent*, aVisitor.mEvent)->button ==
+               static_cast<nsMouseEvent*>(aVisitor.mEvent)->button ==
                  nsMouseEvent::eRightButton)) {
             if (mType == NS_FORM_INPUT_BUTTON ||
                 mType == NS_FORM_INPUT_RESET ||
@@ -2311,7 +2310,7 @@ nsHTMLInputElement::SubmitNamesValues(nsIFormSubmission* aFormSubmission,
     nsAutoString yVal;
 
     nsIntPoint* lastClickedPoint =
-      NS_STATIC_CAST(nsIntPoint*, GetProperty(nsGkAtoms::imageClickedPoint));
+      static_cast<nsIntPoint*>(GetProperty(nsGkAtoms::imageClickedPoint));
     if (lastClickedPoint) {
       // Convert the values to strings for submission
       xVal.AppendInt(lastClickedPoint->x);
@@ -2597,7 +2596,7 @@ nsHTMLInputElement::IntrinsicState() const
     // The call is to an interface function, which makes it non-const, so we
     // use a nasty hack :(
     PRBool defaultState = PR_FALSE;
-    NS_CONST_CAST(nsHTMLInputElement*, this)->GetDefaultChecked(&defaultState);
+    const_cast<nsHTMLInputElement*>(this)->GetDefaultChecked(&defaultState);
     if (defaultState) {
       state |= NS_EVENT_STATE_DEFAULT;
     }
@@ -2725,7 +2724,7 @@ nsHTMLInputElement::AddedToRadioGroup(PRBool aNotify)
   if (container) {
     nsAutoString name;
     if (GetNameIfExists(name)) {
-      container->AddToRadioGroup(name, NS_STATIC_CAST(nsIFormControl*, this));
+      container->AddToRadioGroup(name, static_cast<nsIFormControl*>(this));
     }
   }
 
@@ -2780,7 +2779,7 @@ nsHTMLInputElement::WillRemoveFromRadioGroup()
       gotName = PR_TRUE;
     }
     container->RemoveFromRadioGroup(name,
-                                    NS_STATIC_CAST(nsIFormControl*, this));
+                                    static_cast<nsIFormControl*>(this));
   }
 
   return NS_OK;
diff --git a/mozilla/content/html/content/src/nsHTMLLabelElement.cpp b/mozilla/content/html/content/src/nsHTMLLabelElement.cpp
index a673d0a4142..a0bb837ab24 100644
--- a/mozilla/content/html/content/src/nsHTMLLabelElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLLabelElement.cpp
@@ -240,7 +240,7 @@ nsHTMLLabelElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
           // Ok to use aVisitor.mEvent as parameter because DispatchClickEvent
           // will actually create a new event.
           DispatchClickEvent(aVisitor.mPresContext,
-                             NS_STATIC_CAST(nsInputEvent*, aVisitor.mEvent),
+                             static_cast<nsInputEvent*>(aVisitor.mEvent),
                              content, PR_FALSE, &status);
           // Do we care about the status this returned?  I don't think we do...
         }
@@ -342,7 +342,7 @@ nsHTMLLabelElement::PerformAccesskey(PRBool aKeyCausesActivation,
     nsAutoPopupStatePusher popupStatePusher(aIsTrustedEvent ?
                                             openAllowed : openAbused);
 
-    nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this), presContext,
+    nsEventDispatcher::Dispatch(static_cast<nsIContent*>(this), presContext,
                                 &event);
   }
 }
diff --git a/mozilla/content/html/content/src/nsHTMLLegendElement.cpp b/mozilla/content/html/content/src/nsHTMLLegendElement.cpp
index 1d84337b91e..c074d849354 100644
--- a/mozilla/content/html/content/src/nsHTMLLegendElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLLegendElement.cpp
@@ -267,7 +267,7 @@ nsHTMLLegendElement::SetFocus(nsPresContext* aPresContext)
       nsIFocusController* focusController =
         ourWindow->GetRootFocusController();
       nsCOMPtr<nsIDOMElement> domElement =
-        do_QueryInterface(NS_STATIC_CAST(nsIContent *, this));
+        do_QueryInterface(static_cast<nsIContent *>(this));
       if (focusController && domElement) {
         focusController->MoveFocus(PR_TRUE, domElement);
       }
diff --git a/mozilla/content/html/content/src/nsHTMLLinkElement.cpp b/mozilla/content/html/content/src/nsHTMLLinkElement.cpp
index 045f8b77250..260b1e433db 100644
--- a/mozilla/content/html/content/src/nsHTMLLinkElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLLinkElement.cpp
@@ -274,7 +274,7 @@ nsHTMLLinkElement::CreateAndDispatchEvent(nsIDocument* aDoc,
     return;
 
   nsContentUtils::DispatchTrustedEvent(aDoc,
-                                       NS_STATIC_CAST(nsIContent*, this),
+                                       static_cast<nsIContent*>(this),
                                        aEventName, PR_TRUE, PR_TRUE);
 }
 
diff --git a/mozilla/content/html/content/src/nsHTMLOptionElement.cpp b/mozilla/content/html/content/src/nsHTMLOptionElement.cpp
index c623dc3db09..2e05efb3366 100644
--- a/mozilla/content/html/content/src/nsHTMLOptionElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLOptionElement.cpp
@@ -324,7 +324,7 @@ nsHTMLOptionElement::GetIndex(PRInt32* aIndex)
       for (PRUint32 i = 0; i < length; i++) {
         options->Item(i, getter_AddRefs(thisOption));
 
-        if (thisOption.get() == NS_STATIC_CAST(nsIDOMNode *, this)) {
+        if (thisOption.get() == static_cast<nsIDOMNode *>(this)) {
           *aIndex = i;
 
           break;
@@ -377,13 +377,13 @@ nsHTMLOptionElement::IntrinsicState() const
   // toggles some of our hidden internal state at that!  Would that we could
   // use |mutable|.
   PRBool selected;
-  NS_CONST_CAST(nsHTMLOptionElement*, this)->GetSelected(&selected);
+  const_cast<nsHTMLOptionElement*>(this)->GetSelected(&selected);
   if (selected) {
     state |= NS_EVENT_STATE_CHECKED;
   }
 
   // Also calling a non-const interface method (for :default)
-  NS_CONST_CAST(nsHTMLOptionElement*, this)->GetDefaultSelected(&selected);
+  const_cast<nsHTMLOptionElement*>(this)->GetDefaultSelected(&selected);
   if (selected) {
     state |= NS_EVENT_STATE_DEFAULT;
   }
@@ -463,8 +463,8 @@ nsHTMLOptionElement::Initialize(JSContext* aContext,
         return result;
       }
 
-      textContent->SetText(NS_REINTERPRET_CAST(const PRUnichar*,
-                                               JS_GetStringChars(jsstr)),
+      textContent->SetText(reinterpret_cast<const PRUnichar*>
+                                           (JS_GetStringChars(jsstr)),
                            JS_GetStringLength(jsstr),
                            PR_FALSE);
       
@@ -479,8 +479,8 @@ nsHTMLOptionElement::Initialize(JSContext* aContext,
       jsstr = JS_ValueToString(aContext, argv[1]);
       if (nsnull != jsstr) {
         // Set the value attribute for this element
-        nsAutoString value(NS_REINTERPRET_CAST(const PRUnichar*,
-                                               JS_GetStringChars(jsstr)));
+        nsAutoString value(reinterpret_cast<const PRUnichar*>
+                                           (JS_GetStringChars(jsstr)));
 
         result = SetAttr(kNameSpaceID_None, nsGkAtoms::value, value,
                          PR_FALSE);
diff --git a/mozilla/content/html/content/src/nsHTMLScriptElement.cpp b/mozilla/content/html/content/src/nsHTMLScriptElement.cpp
index 6d461fe1f32..25967009491 100644
--- a/mozilla/content/html/content/src/nsHTMLScriptElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLScriptElement.cpp
@@ -389,8 +389,8 @@ NS_HTML_CONTENT_INTERFACE_MAP_BEGIN(nsHTMLScriptElement, nsGenericHTMLElement)
   NS_INTERFACE_MAP_ENTRY(nsIScriptElement)
   NS_INTERFACE_MAP_ENTRY(nsIMutationObserver)
   if (mScriptEventHandler && aIID.Equals(NS_GET_IID(nsIScriptEventHandler)))
-    foundInterface = NS_STATIC_CAST(nsIScriptEventHandler*,
-                                    mScriptEventHandler);
+    foundInterface = static_cast<nsIScriptEventHandler*>
+                                (mScriptEventHandler);
   else
   NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(HTMLScriptElement)
 NS_HTML_CONTENT_INTERFACE_MAP_END
diff --git a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp
index a131dee6c99..1edb7876919 100644
--- a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp
@@ -1034,7 +1034,7 @@ nsHTMLSelectElement::Add(nsIDOMHTMLElement* aElement,
 
   nsCOMPtr<nsIDOMNode> ancestor(parent);
   nsCOMPtr<nsIDOMNode> temp;
-  while (ancestor != NS_STATIC_CAST(nsIDOMNode*, this)) {
+  while (ancestor != static_cast<nsIDOMNode*>(this)) {
     ancestor->GetParentNode(getter_AddRefs(temp));
     if (!temp) {
       // NOT_FOUND_ERR: Raised if before is not a descendant of the SELECT
@@ -1947,7 +1947,7 @@ nsHTMLSelectElement::GetBoxObject(nsIBoxObject** aResult)
     return NS_ERROR_FAILURE;
   }
 
-  return nsDoc->GetBoxObjectFor(NS_STATIC_CAST(nsIDOMElement*, this), aResult);
+  return nsDoc->GetBoxObjectFor(static_cast<nsIDOMElement*>(this), aResult);
 }
 
 void
@@ -2102,7 +2102,7 @@ void
 nsHTMLSelectElement::DispatchDOMEvent(const nsAString& aName)
 {
   nsContentUtils::DispatchTrustedEvent(GetOwnerDoc(),
-                                       NS_STATIC_CAST(nsIContent*, this),
+                                       static_cast<nsIContent*>(this),
                                        aName, PR_TRUE, PR_TRUE);
 }
 
diff --git a/mozilla/content/html/content/src/nsHTMLTableCellElement.cpp b/mozilla/content/html/content/src/nsHTMLTableCellElement.cpp
index 8212e0c32cc..f9235c480b9 100644
--- a/mozilla/content/html/content/src/nsHTMLTableCellElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLTableCellElement.cpp
@@ -181,7 +181,7 @@ nsHTMLTableCellElement::GetCellIndex(PRInt32* aCellIndex)
     nsCOMPtr<nsIDOMNode> node;
     cells->Item(i, getter_AddRefs(node));
 
-    if (node.get() == NS_STATIC_CAST(nsIDOMNode *, this)) {
+    if (node.get() == static_cast<nsIDOMNode *>(this)) {
       *aCellIndex = i;
       found = PR_TRUE;
     }
diff --git a/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp b/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp
index 2ff0deec60b..5380430bc96 100644
--- a/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp
@@ -186,7 +186,7 @@ nsHTMLTableRowElement::GetRowIndex(PRInt32* aValue)
 
       rows->Item(i, getter_AddRefs(node));
 
-      if (node.get() == NS_STATIC_CAST(nsIDOMNode *, this)) {
+      if (node.get() == static_cast<nsIDOMNode *>(this)) {
         *aValue = i;
         found = PR_TRUE;
       }
@@ -219,7 +219,7 @@ nsHTMLTableRowElement::GetSectionRowIndex(PRInt32* aValue)
       nsCOMPtr<nsIDOMNode> node;
       rows->Item(i, getter_AddRefs(node));
 
-      if (node.get() == NS_STATIC_CAST(nsIDOMNode *, this)) {
+      if (node.get() == static_cast<nsIDOMNode *>(this)) {
         *aValue = i;
         found = PR_TRUE;
       }
diff --git a/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp b/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp
index 8cb6e900a12..c24004ee2b6 100644
--- a/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp
@@ -371,7 +371,7 @@ nsHTMLTextAreaElement::Select()
 
   nsEventStatus status = nsEventStatus_eIgnore;
   nsGUIEvent event(PR_TRUE, NS_FORM_SELECTED, nsnull);
-  nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this), presContext,
+  nsEventDispatcher::Dispatch(static_cast<nsIContent*>(this), presContext,
                               &event, nsnull, &status);
 
   // If the DOM event was not canceled (e.g. by a JS event handler
@@ -645,7 +645,7 @@ nsHTMLTextAreaElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
     aVisitor.mItemFlags |= NS_NO_CONTENT_DISPATCH;
   if (aVisitor.mEvent->message == NS_MOUSE_CLICK &&
       aVisitor.mEvent->eventStructType == NS_MOUSE_EVENT &&
-      NS_STATIC_CAST(nsMouseEvent*, aVisitor.mEvent)->button ==
+      static_cast<nsMouseEvent*>(aVisitor.mEvent)->button ==
         nsMouseEvent::eMiddleButton) {
     aVisitor.mEvent->flags &= ~NS_EVENT_FLAG_NO_CONTENT_DISPATCH;
   }
diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
index 83ad7d0258e..2de042b0c21 100644
--- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp
+++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
@@ -1726,7 +1726,7 @@ HTMLContentSink::Init(nsIDocument* aDoc,
     // If the document already has a root we'll use it. This will
     // happen when we do document.open()/.write()/.close()...
 
-    NS_ADDREF(mRoot = NS_STATIC_CAST(nsGenericHTMLElement*, doc_root));
+    NS_ADDREF(mRoot = static_cast<nsGenericHTMLElement*>(doc_root));
   } else {
     mRoot = NS_NewHTMLHtmlElement(nodeInfo);
     if (!mRoot) {
@@ -2829,7 +2829,7 @@ HTMLContentSink::AddBaseTagInfo(nsIContent* aContent)
                                nsPropertyTable::SupportsDtorFunc, PR_TRUE);
     if (NS_SUCCEEDED(rv)) {
       // circumvent nsDerivedSafe
-      NS_ADDREF(NS_STATIC_CAST(nsIURI*, mBaseHref));
+      NS_ADDREF(static_cast<nsIURI*>(mBaseHref));
     }
   }
   if (mBaseTarget) {
@@ -2837,7 +2837,7 @@ HTMLContentSink::AddBaseTagInfo(nsIContent* aContent)
                                nsPropertyTable::SupportsDtorFunc, PR_TRUE);
     if (NS_SUCCEEDED(rv)) {
       // circumvent nsDerivedSafe
-      NS_ADDREF(NS_STATIC_CAST(nsIAtom*, mBaseTarget));
+      NS_ADDREF(static_cast<nsIAtom*>(mBaseTarget));
     }
   }
 }
diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp
index 25c233fdd49..7a482101fa3 100644
--- a/mozilla/content/html/document/src/nsHTMLDocument.cpp
+++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp
@@ -229,7 +229,7 @@ public:
   }
 
   nsIContent* GetIdContent() {
-    return NS_STATIC_CAST(nsIContent*, mIdContentList.SafeElementAt(0));
+    return static_cast<nsIContent*>(mIdContentList.SafeElementAt(0));
   }
 
   PRBool AddIdContent(nsIContent* aContent);
@@ -292,8 +292,8 @@ IdAndNameHashMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry,
                         const void *key)
 {
   const IdAndNameMapEntry *e =
-    NS_STATIC_CAST(const IdAndNameMapEntry *, entry);
-  const nsIAtom *atom = NS_STATIC_CAST(const nsIAtom *, key);
+    static_cast<const IdAndNameMapEntry *>(entry);
+  const nsIAtom *atom = static_cast<const nsIAtom *>(key);
 
   return atom == e->mKey;
 }
@@ -301,7 +301,7 @@ IdAndNameHashMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry,
 PR_STATIC_CALLBACK(void)
 IdAndNameHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry)
 {
-  IdAndNameMapEntry *e = NS_STATIC_CAST(IdAndNameMapEntry *, entry);
+  IdAndNameMapEntry *e = static_cast<IdAndNameMapEntry *>(entry);
 
   // An entry is being cleared, let the entry do its own cleanup.
   e->~IdAndNameMapEntry();
@@ -311,8 +311,8 @@ PR_STATIC_CALLBACK(PRBool)
 IdAndNameHashInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry,
                        const void *key)
 {
-  nsIAtom *atom = NS_CONST_CAST(nsIAtom *,
-                                NS_STATIC_CAST(const nsIAtom*, key));
+  nsIAtom *atom = const_cast<nsIAtom *>
+                            (static_cast<const nsIAtom*>(key));
 
   // Inititlize the entry with placement new
   new (entry) IdAndNameMapEntry(atom);
@@ -348,8 +348,8 @@ IdAndNameMapEntryTraverse(PLDHashTable *table, PLDHashEntryHdr *hdr,
                           PRUint32 number, void *arg)
 {
   nsCycleCollectionTraversalCallback *cb =
-    NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, arg);
-  IdAndNameMapEntry *entry = NS_STATIC_CAST(IdAndNameMapEntry*, hdr);
+    static_cast<nsCycleCollectionTraversalCallback*>(arg);
+  IdAndNameMapEntry *entry = static_cast<IdAndNameMapEntry*>(hdr);
 
   if (entry->mNameContentList != NAME_NOT_VALID)
     cb->NoteXPCOMChild(entry->mNameContentList);
@@ -1121,7 +1121,7 @@ nsHTMLDocument::DocumentWriteTerminationFunc(nsISupports *aRef)
   nsCOMPtr<nsIParser> parser = do_QueryElementAt(arr, 1);
   NS_ASSERTION(parser, "Must have parser!");
 
-  nsHTMLDocument *htmldoc = NS_STATIC_CAST(nsHTMLDocument*, doc.get());
+  nsHTMLDocument *htmldoc = static_cast<nsHTMLDocument*>(doc.get());
 
   // Check whether htmldoc still has the same parser.  If not, it's
   // not for us to mess with it.
@@ -1184,7 +1184,7 @@ nsHTMLDocument::EndLoad()
           nsCOMPtr<nsIMutableArray> arr =
             do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
           if (NS_SUCCEEDED(rv)) {
-            rv = arr->AppendElement(NS_STATIC_CAST(nsIDocument*, this),
+            rv = arr->AppendElement(static_cast<nsIDocument*>(this),
                                     PR_FALSE);
             if (NS_SUCCEEDED(rv)) {
               rv = arr->AppendElement(mParser, PR_FALSE);
@@ -2033,7 +2033,7 @@ nsHTMLDocument::OpenCommon(const nsACString& aContentType, PRBool aReplace)
     return NS_OK;
   }
 
-  if (!nsContentUtils::CanCallerAccess(NS_STATIC_CAST(nsIDOMHTMLDocument*, this))) {
+  if (!nsContentUtils::CanCallerAccess(static_cast<nsIDOMHTMLDocument*>(this))) {
     nsPIDOMWindow *win = GetWindow();
     if (win) {
       nsCOMPtr<nsIDOMElement> frameElement;
@@ -2272,7 +2272,7 @@ nsHTMLDocument::OpenCommon(const nsACString& aContentType, PRBool aReplace)
     docshell->GetContentViewer(getter_AddRefs(cv));
     nsCOMPtr<nsIDocumentViewer> docViewer = do_QueryInterface(cv);
     if (docViewer) {
-      docViewer->LoadStart(NS_STATIC_CAST(nsIHTMLDocument *, this));
+      docViewer->LoadStart(static_cast<nsIHTMLDocument *>(this));
     }
   }
 
@@ -2493,8 +2493,8 @@ nsHTMLDocument::ScriptWriteCommon(PRBool aNewlineTerminate)
       JSString *jsstr = JS_ValueToString(cx, argv[0]);
       NS_ENSURE_TRUE(jsstr, NS_ERROR_OUT_OF_MEMORY);
 
-      nsDependentString str(NS_REINTERPRET_CAST(const PRUnichar *,
-                                              ::JS_GetStringChars(jsstr)),
+      nsDependentString str(reinterpret_cast<const PRUnichar *>
+                                            (::JS_GetStringChars(jsstr)),
                           ::JS_GetStringLength(jsstr));
 
       return WriteCommon(str, aNewlineTerminate);
@@ -2509,8 +2509,8 @@ nsHTMLDocument::ScriptWriteCommon(PRBool aNewlineTerminate)
         JSString *str = JS_ValueToString(cx, argv[i]);
         NS_ENSURE_TRUE(str, NS_ERROR_OUT_OF_MEMORY);
 
-        string_buffer.Append(NS_REINTERPRET_CAST(const PRUnichar *,
-                                                 ::JS_GetStringChars(str)),
+        string_buffer.Append(reinterpret_cast<const PRUnichar *>
+                                             (::JS_GetStringChars(str)),
                              ::JS_GetStringLength(str));
       }
 
@@ -2549,8 +2549,8 @@ nsHTMLDocument::GetElementById(const nsAString& aElementId,
   // us being notified (all removals notify immediately, as far as I can tell).
   // So do the lookup first.
   IdAndNameMapEntry *entry =
-    NS_STATIC_CAST(IdAndNameMapEntry *,
-                   PL_DHashTableOperate(&mIdAndNameHashTable, idAtom,
+    static_cast<IdAndNameMapEntry *>
+               (PL_DHashTableOperate(&mIdAndNameHashTable, idAtom,
                                         PL_DHASH_ADD));
   NS_ENSURE_TRUE(entry, NS_ERROR_OUT_OF_MEMORY);
 
@@ -2573,8 +2573,8 @@ nsHTMLDocument::GetElementById(const nsAString& aElementId,
       // entry again, adding if necessary (the adding may be necessary in case
       // the flush actually deleted entries).
       entry =
-        NS_STATIC_CAST(IdAndNameMapEntry *,
-                       PL_DHashTableOperate(&mIdAndNameHashTable, idAtom,
+        static_cast<IdAndNameMapEntry *>
+                   (PL_DHashTableOperate(&mIdAndNameHashTable, idAtom,
                                             PL_DHASH_ADD));
       NS_ENSURE_TRUE(entry, NS_ERROR_OUT_OF_MEMORY);
     }
@@ -2673,7 +2673,7 @@ nsHTMLDocument::MatchNameAttribute(nsIContent* aContent, PRInt32 aNamespaceID,
                                    nsIAtom* aAtom, void* aData)
 {
   NS_PRECONDITION(aContent, "Must have content node to work with!");
-  nsString* elementName = NS_STATIC_CAST(nsString*, aData);
+  nsString* elementName = static_cast<nsString*>(aData);
   return aContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::name,
                                *elementName, eCaseMatters);
 }
@@ -3023,7 +3023,7 @@ ReportUseOfDeprecatedMethod(nsHTMLDocument* aDoc, const char* aWarning)
   nsContentUtils::ReportToConsole(nsContentUtils::eDOM_PROPERTIES,
                                   aWarning,
                                   nsnull, 0,
-                                  NS_STATIC_CAST(nsIDocument*, aDoc)->
+                                  static_cast<nsIDocument*>(aDoc)->
                                     GetDocumentURI(),
                                   EmptyString(), 0, 0,
                                   nsIScriptError::warningFlag,
@@ -3103,8 +3103,8 @@ ReserveNameInHash(const char* aName, PLDHashTable *aHash)
   NS_ENSURE_TRUE(atom, NS_ERROR_OUT_OF_MEMORY);
   
   IdAndNameMapEntry *entry =
-    NS_STATIC_CAST(IdAndNameMapEntry *,
-                   PL_DHashTableOperate(aHash, atom, PL_DHASH_ADD));
+    static_cast<IdAndNameMapEntry *>
+               (PL_DHashTableOperate(aHash, atom, PL_DHASH_ADD));
 
   NS_ENSURE_TRUE(entry, NS_ERROR_OUT_OF_MEMORY);
 
@@ -3192,8 +3192,8 @@ nsHTMLDocument::UpdateNameTableEntry(nsIAtom* aName,
   "nsHTMLDocument::UpdateNameTableEntry Don't call me on an XHTML document!!!");
 
   IdAndNameMapEntry *entry =
-    NS_STATIC_CAST(IdAndNameMapEntry *,
-                   PL_DHashTableOperate(&mIdAndNameHashTable, aName,
+    static_cast<IdAndNameMapEntry *>
+               (PL_DHashTableOperate(&mIdAndNameHashTable, aName,
                                         PL_DHASH_LOOKUP));
 
   if (PL_DHASH_ENTRY_IS_FREE(entry)) {
@@ -3223,8 +3223,8 @@ nsHTMLDocument::UpdateIdTableEntry(nsIAtom* aId, nsIContent *aContent)
   PRBool liveTable = IdTableIsLive();
   PLDHashOperator op = liveTable ? PL_DHASH_ADD : PL_DHASH_LOOKUP;
   IdAndNameMapEntry *entry =
-    NS_STATIC_CAST(IdAndNameMapEntry *,
-                   PL_DHashTableOperate(&mIdAndNameHashTable, aId,
+    static_cast<IdAndNameMapEntry *>
+               (PL_DHashTableOperate(&mIdAndNameHashTable, aId,
                                         op));
 
   NS_ENSURE_TRUE(entry, NS_ERROR_OUT_OF_MEMORY);
@@ -3245,8 +3245,8 @@ nsHTMLDocument::RemoveFromNameTable(nsIAtom* aName, nsIContent *aContent)
   "nsHTMLDocument::RemoveFromNameTable Don't call me on an XHTML document!!!");
 
   IdAndNameMapEntry *entry =
-    NS_STATIC_CAST(IdAndNameMapEntry *,
-                   PL_DHashTableOperate(&mIdAndNameHashTable, aName,
+    static_cast<IdAndNameMapEntry *>
+               (PL_DHashTableOperate(&mIdAndNameHashTable, aName,
                                         PL_DHASH_LOOKUP));
 
   if (PL_DHASH_ENTRY_IS_BUSY(entry) && entry->mNameContentList &&
@@ -3267,8 +3267,8 @@ nsHTMLDocument::RemoveFromIdTable(nsIContent *aContent)
   }
 
   IdAndNameMapEntry *entry =
-    NS_STATIC_CAST(IdAndNameMapEntry *,
-                   PL_DHashTableOperate(&mIdAndNameHashTable, id,
+    static_cast<IdAndNameMapEntry *>
+               (PL_DHashTableOperate(&mIdAndNameHashTable, id,
                                         PL_DHASH_LOOKUP));
 
   if (PL_DHASH_ENTRY_IS_FREE(entry)) {
@@ -3403,8 +3403,8 @@ nsHTMLDocument::ResolveName(const nsAString& aName,
   // be updated as content is added and removed.
 
   IdAndNameMapEntry *entry =
-    NS_STATIC_CAST(IdAndNameMapEntry *,
-                   PL_DHashTableOperate(&mIdAndNameHashTable, name,
+    static_cast<IdAndNameMapEntry *>
+               (PL_DHashTableOperate(&mIdAndNameHashTable, name,
                                         PL_DHASH_ADD));
   NS_ENSURE_TRUE(entry, NS_ERROR_OUT_OF_MEMORY);
 
@@ -3432,8 +3432,8 @@ nsHTMLDocument::ResolveName(const nsAString& aName,
     // entry again, adding if necessary (the adding may be necessary in case
     // the flush actually deleted entries).
     entry =
-      NS_STATIC_CAST(IdAndNameMapEntry *,
-                     PL_DHashTableOperate(&mIdAndNameHashTable, name,
+      static_cast<IdAndNameMapEntry *>
+                 (PL_DHashTableOperate(&mIdAndNameHashTable, name,
                                           PL_DHASH_ADD));
     NS_ENSURE_TRUE(entry, NS_ERROR_OUT_OF_MEMORY);
   }
diff --git a/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp b/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp
index b5bbb6b6019..ee61da91eb7 100644
--- a/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp
+++ b/mozilla/content/html/document/src/nsHTMLFragmentContentSink.cpp
@@ -347,7 +347,7 @@ nsHTMLFragmentContentSink::AddBaseTagInfo(nsIContent* aContent)
                                nsPropertyTable::SupportsDtorFunc, PR_TRUE);
     if (NS_SUCCEEDED(rv)) {
       // circumvent nsDerivedSafe
-      NS_ADDREF(NS_STATIC_CAST(nsIURI*, mBaseHref));
+      NS_ADDREF(static_cast<nsIURI*>(mBaseHref));
     }
   }
   if (mBaseTarget) {
@@ -355,7 +355,7 @@ nsHTMLFragmentContentSink::AddBaseTagInfo(nsIContent* aContent)
                                nsPropertyTable::SupportsDtorFunc, PR_TRUE);
     if (NS_SUCCEEDED(rv)) {
       // circumvent nsDerivedSafe
-      NS_ADDREF(NS_STATIC_CAST(nsIAtom*, mBaseTarget));
+      NS_ADDREF(static_cast<nsIAtom*>(mBaseTarget));
     }
   }
 }
diff --git a/mozilla/content/svg/content/src/nsDOMSVGZoomEvent.cpp b/mozilla/content/svg/content/src/nsDOMSVGZoomEvent.cpp
index b9c0946d61d..0dcea674b5c 100755
--- a/mozilla/content/svg/content/src/nsDOMSVGZoomEvent.cpp
+++ b/mozilla/content/svg/content/src/nsDOMSVGZoomEvent.cpp
@@ -89,7 +89,7 @@ nsDOMSVGZoomEvent::nsDOMSVGZoomEvent(nsPresContext* aPresContext,
           NS_NewSVGReadonlyPoint(getter_AddRefs(mNewTranslate), x, y);
 
           nsSVGSVGElement *SVGSVGElement =
-            NS_STATIC_CAST(nsSVGSVGElement*, rootContent);
+            static_cast<nsSVGSVGElement*>(rootContent);
           mPreviousScale = SVGSVGElement->GetPreviousScale();
           NS_NewSVGReadonlyPoint(getter_AddRefs(mPreviousTranslate),
                                  SVGSVGElement->GetPreviousTranslate_x(),
diff --git a/mozilla/content/svg/content/src/nsSVGElement.cpp b/mozilla/content/svg/content/src/nsSVGElement.cpp
index ddb77406fef..8b4b03cc908 100644
--- a/mozilla/content/svg/content/src/nsSVGElement.cpp
+++ b/mozilla/content/svg/content/src/nsSVGElement.cpp
@@ -810,7 +810,7 @@ nsSVGElement::GetCtx()
 {
   nsCOMPtr<nsIDOMSVGSVGElement> svg;
   GetOwnerSVGElement(getter_AddRefs(svg));
-  return NS_STATIC_CAST(nsSVGSVGElement*, svg.get());
+  return static_cast<nsSVGSVGElement*>(svg.get());
 }
 
 nsSVGElement::LengthAttributesInfo
diff --git a/mozilla/content/svg/content/src/nsSVGFilters.cpp b/mozilla/content/svg/content/src/nsSVGFilters.cpp
index c6eb7ffa599..c322967f689 100644
--- a/mozilla/content/svg/content/src/nsSVGFilters.cpp
+++ b/mozilla/content/svg/content/src/nsSVGFilters.cpp
@@ -117,7 +117,7 @@ nsSVGFE::ScanDualValueAttribute(const nsAString& aValue, nsIAtom* aAttribute,
   NS_ConvertUTF16toUTF8 value(aValue);
   value.CompressWhitespace(PR_FALSE, PR_TRUE);
   const char *str = value.get();
-  x = NS_STATIC_CAST(float, PR_strtod(str, &rest));
+  x = static_cast<float>(PR_strtod(str, &rest));
   if (str == rest) {
     //first value was illformed
     parseError = PR_TRUE;
@@ -126,7 +126,7 @@ nsSVGFE::ScanDualValueAttribute(const nsAString& aValue, nsIAtom* aAttribute,
       //second value was not supplied
       y = x;
     } else {
-      y = NS_STATIC_CAST(float, PR_strtod(rest, &rest));
+      y = static_cast<float>(PR_strtod(rest, &rest));
       if (*rest != '\0') {
         //second value was illformed or there was trailing content
         parseError = PR_TRUE;
@@ -659,8 +659,8 @@ nsSVGFEGaussianBlurElement::GaussianBlur(PRUint8 *aInput, PRUint8 *aOutput,
   dX = (PRUint32) floor(aStdX * 3*sqrt(2*M_PI)/4 + 0.5);
   dY = (PRUint32) floor(aStdY * 3*sqrt(2*M_PI)/4 + 0.5);
 
-  PRUint8 *tmp = NS_STATIC_CAST(PRUint8*,
-                                calloc(aFilterResource->GetDataLength(), 1));
+  PRUint8 *tmp = static_cast<PRUint8*>
+                            (calloc(aFilterResource->GetDataLength(), 1));
   nsRect rect = aFilterResource->GetRect();
   PRUint32 stride = aFilterResource->GetDataStride();
 
@@ -981,7 +981,7 @@ nsSVGFEBlendElement::Filter(nsSVGFilterInstance *instance)
             break;
         }
         val = PR_MIN(val / 255, 255);
-        targetData[targIndex + i] =  NS_STATIC_CAST(PRUint8, val);
+        targetData[targIndex + i] =  static_cast<PRUint8>(val);
       }
       PRUint32 alpha = 255 * 255 - (255 - qa) * (255 - qb);
       FAST_DIVIDE_BY_255(targetData[targIndex + GFX_ARGB32_OFFSET_A], alpha);
@@ -1265,8 +1265,8 @@ nsSVGFEColorMatrixElement::Filter(nsSVGFilterInstance *instance)
     list->GetItem(0, getter_AddRefs(number));
     number->GetValue(&hueRotateValue);
 
-    c = NS_STATIC_CAST(float, cos(hueRotateValue * M_PI / 180));
-    s = NS_STATIC_CAST(float, sin(hueRotateValue * M_PI / 180));
+    c = static_cast<float>(cos(hueRotateValue * M_PI / 180));
+    s = static_cast<float>(sin(hueRotateValue * M_PI / 180));
 
     memcpy(colorMatrix, identityMatrix, sizeof(colorMatrix));
 
@@ -1308,13 +1308,13 @@ nsSVGFEColorMatrixElement::Filter(nsSVGFilterInstance *instance)
         col[i] = PR_MIN(PR_MAX(0, col[i]), 255);
       }
       targetData[targIndex + GFX_ARGB32_OFFSET_R] =
-        NS_STATIC_CAST(PRUint8, col[0]);
+        static_cast<PRUint8>(col[0]);
       targetData[targIndex + GFX_ARGB32_OFFSET_G] =
-        NS_STATIC_CAST(PRUint8, col[1]);
+        static_cast<PRUint8>(col[1]);
       targetData[targIndex + GFX_ARGB32_OFFSET_B] =
-        NS_STATIC_CAST(PRUint8, col[2]);
+        static_cast<PRUint8>(col[2]);
       targetData[targIndex + GFX_ARGB32_OFFSET_A] =
-        NS_STATIC_CAST(PRUint8, col[3]);
+        static_cast<PRUint8>(col[3]);
     }
   }
   return NS_OK;
@@ -1574,7 +1574,7 @@ nsSVGFECompositeElement::Filter(nsSVGFilterInstance *instance)
           PRUint8 i1 = sourceData[targIndex + i];
           float result = k1Scaled*i1*i2 + k2*i1 + k3*i2 + k4Scaled;
           targetData[targIndex + i] =
-                       NS_STATIC_CAST(PRUint8, PR_MIN(PR_MAX(0, result), 255));
+                       static_cast<PRUint8>(PR_MIN(PR_MAX(0, result), 255));
         }
       }
     }
@@ -3988,7 +3988,7 @@ ConvolvePixel(const PRUint8 *aSourceData,
   }
   for (PRInt32 i = 0; i < channels; i++) {
     aTargetData[aY * aStride + 4 * aX + offsets[i]] =
-      BOUND(NS_STATIC_CAST(PRInt32, sum[i] / aDivisor + aBias * 255), 0, 255);
+      BOUND(static_cast<PRInt32>(sum[i] / aDivisor + aBias * 255), 0, 255);
   }
   if (aPreserveAlpha) {
     aTargetData[aY * aStride + 4 * aX + GFX_ARGB32_OFFSET_A] =
@@ -4013,7 +4013,7 @@ nsSVGFEConvolveMatrixElement::Filter(nsSVGFilterInstance *instance)
   mOrderX->GetAnimVal(&orderX);
   mOrderY->GetAnimVal(&orderY);
   if (orderX <= 0 || orderY <= 0 ||
-      NS_STATIC_CAST(PRUint32, orderX * orderY) != num) {
+      static_cast<PRUint32>(orderX * orderY) != num) {
     return NS_ERROR_FAILURE;
   }
 
diff --git a/mozilla/content/svg/content/src/nsSVGLength.cpp b/mozilla/content/svg/content/src/nsSVGLength.cpp
index e8b97b2ddc7..e99c194df93 100644
--- a/mozilla/content/svg/content/src/nsSVGLength.cpp
+++ b/mozilla/content/svg/content/src/nsSVGLength.cpp
@@ -531,7 +531,7 @@ float nsSVGLength::mmPerPixel()
   }
 
   nsSVGSVGElement *ctx =
-    NS_STATIC_CAST(nsSVGElement*, element.get())->GetCtx();
+    static_cast<nsSVGElement*>(element.get())->GetCtx();
   float mmPerPx = ctx->GetMMPerPx(mCtxType);
 
   if (mmPerPx == 0.0f) {
@@ -551,7 +551,7 @@ float nsSVGLength::AxisLength()
   }
 
   nsSVGSVGElement *ctx =
-    NS_STATIC_CAST(nsSVGElement*, element.get())->GetCtx();
+    static_cast<nsSVGElement*>(element.get())->GetCtx();
   float d = ctx->GetLength(mCtxType);
 
   if (d == 0.0f) {
@@ -588,7 +588,7 @@ already_AddRefed<nsIDOMSVGRect> nsSVGLength::MaybeGetCtxRect()
     nsCOMPtr<nsIContent> element = do_QueryReferent(mElement);
     if (element) {
       nsSVGSVGElement *ctx =
-        NS_STATIC_CAST(nsSVGElement*, element.get())->GetCtx();
+        static_cast<nsSVGElement*>(element.get())->GetCtx();
       if (ctx)
         return ctx->GetCtxRect();
     }
diff --git a/mozilla/content/svg/content/src/nsSVGLengthList.cpp b/mozilla/content/svg/content/src/nsSVGLengthList.cpp
index 5f06cc4b3f0..d94bfd94bb4 100644
--- a/mozilla/content/svg/content/src/nsSVGLengthList.cpp
+++ b/mozilla/content/svg/content/src/nsSVGLengthList.cpp
@@ -105,7 +105,7 @@ protected:
 nsSVGLengthList::nsSVGLengthList(nsSVGElement *aContext, PRUint8 aCtxType)
   : mCtxType(aCtxType)
 {
-  mContext = do_GetWeakReference(NS_STATIC_CAST(nsGenericElement*, aContext));
+  mContext = do_GetWeakReference(static_cast<nsGenericElement*>(aContext));
 }
 
 nsSVGLengthList::~nsSVGLengthList()
@@ -225,7 +225,7 @@ NS_IMETHODIMP nsSVGLengthList::Initialize(nsIDOMSVGLength *newItem,
 /* nsIDOMSVGLength getItem (in unsigned long index); */
 NS_IMETHODIMP nsSVGLengthList::GetItem(PRUint32 index, nsIDOMSVGLength **_retval)
 {
-  if (index >= NS_STATIC_CAST(PRUint32, mLengths.Count())) {
+  if (index >= static_cast<PRUint32>(mLengths.Count())) {
     *_retval = nsnull;
     return NS_ERROR_DOM_INDEX_SIZE_ERR;
   }
@@ -266,7 +266,7 @@ nsSVGLengthList::ReplaceItem(nsIDOMSVGLength *newItem,
 /* nsIDOMSVGLengthList removeItem (in unsigned long index); */
 NS_IMETHODIMP nsSVGLengthList::RemoveItem(PRUint32 index, nsIDOMSVGLength **_retval)
 {
-  if (index >= NS_STATIC_CAST(PRUint32, mLengths.Count())) {
+  if (index >= static_cast<PRUint32>(mLengths.Count())) {
     *_retval = nsnull;
     return NS_ERROR_DOM_INDEX_SIZE_ERR;
   }
diff --git a/mozilla/content/svg/content/src/nsSVGNumber2.cpp b/mozilla/content/svg/content/src/nsSVGNumber2.cpp
index 4930b034b1f..d7f0ff810d9 100644
--- a/mozilla/content/svg/content/src/nsSVGNumber2.cpp
+++ b/mozilla/content/svg/content/src/nsSVGNumber2.cpp
@@ -58,7 +58,7 @@ nsSVGNumber2::SetBaseValueString(const nsAString &aValueAsString,
   s.Assign(aValueAsString);
   PRInt32 err;
   float val = s.ToFloat(&err);
-  nsresult rv = NS_STATIC_CAST(nsresult, err);
+  nsresult rv = static_cast<nsresult>(err);
   NS_ENSURE_SUCCESS(rv, rv);
   mBaseVal = mAnimVal = val;
   return NS_OK;
diff --git a/mozilla/content/svg/content/src/nsSVGNumberList.cpp b/mozilla/content/svg/content/src/nsSVGNumberList.cpp
index 5cdfd6e0248..af9494a705f 100644
--- a/mozilla/content/svg/content/src/nsSVGNumberList.cpp
+++ b/mozilla/content/svg/content/src/nsSVGNumberList.cpp
@@ -222,7 +222,7 @@ NS_IMETHODIMP nsSVGNumberList::Initialize(nsIDOMSVGNumber *newItem,
 /* nsIDOMSVGNumber getItem (in unsigned long index); */
 NS_IMETHODIMP nsSVGNumberList::GetItem(PRUint32 index, nsIDOMSVGNumber **_retval)
 {
-  if (index >= NS_STATIC_CAST(PRUint32, mNumbers.Count())) {
+  if (index >= static_cast<PRUint32>(mNumbers.Count())) {
     *_retval = nsnull;
     return NS_ERROR_DOM_INDEX_SIZE_ERR;
   }
@@ -277,7 +277,7 @@ nsSVGNumberList::ReplaceItem(nsIDOMSVGNumber *newItem,
 /* nsIDOMSVGNumberList removeItem (in unsigned long index); */
 NS_IMETHODIMP nsSVGNumberList::RemoveItem(PRUint32 index, nsIDOMSVGNumber **_retval)
 {
-  if (index >= NS_STATIC_CAST(PRUint32, mNumbers.Count())) {
+  if (index >= static_cast<PRUint32>(mNumbers.Count())) {
     *_retval = nsnull;
     return NS_ERROR_DOM_INDEX_SIZE_ERR;
   }
diff --git a/mozilla/content/svg/content/src/nsSVGPathDataParser.cpp b/mozilla/content/svg/content/src/nsSVGPathDataParser.cpp
index 421c59de93c..d2d6bfe0362 100644
--- a/mozilla/content/svg/content/src/nsSVGPathDataParser.cpp
+++ b/mozilla/content/svg/content/src/nsSVGPathDataParser.cpp
@@ -1403,7 +1403,7 @@ nsSVGArcConverter::nsSVGArcConverter(float x1, float y1,
     dtheta += 2.0*M_PI;
 
   // Convert into cubic bezier segments <= 90deg
-  mNumSegs = NS_STATIC_CAST(int, ceil(fabs(dtheta/(M_PI/2.0))));
+  mNumSegs = static_cast<int>(ceil(fabs(dtheta/(M_PI/2.0))));
   mDelta = dtheta/mNumSegs;
   mT = 8.0/3.0 * sin(mDelta/4.0) * sin(mDelta/4.0) / sin(mDelta/2.0);
 
diff --git a/mozilla/content/svg/content/src/nsSVGPathElement.cpp b/mozilla/content/svg/content/src/nsSVGPathElement.cpp
index e97fe89744f..648ad6b16eb 100644
--- a/mozilla/content/svg/content/src/nsSVGPathElement.cpp
+++ b/mozilla/content/svg/content/src/nsSVGPathElement.cpp
@@ -153,7 +153,7 @@ nsSVGPathElement::GetPathSegAtLength(float distance, PRUint32 *_retval)
   while (distCovered < distance && i < numSegments - 1) {
     nsIDOMSVGPathSeg *iSeg;
     mSegments->GetItem(i, &iSeg);
-    nsSVGPathSeg* curSeg = NS_STATIC_CAST(nsSVGPathSeg*, iSeg);
+    nsSVGPathSeg* curSeg = static_cast<nsSVGPathSeg*>(iSeg);
     if (i == 0) {
       curSeg->GetLength(&ts);
     } else {
@@ -975,7 +975,7 @@ nsSVGPathList::Playback(gfxContext *aCtx)
   float *args = mArguments;
   for (PRUint32 i = 0; i < mNumCommands; i++) {
     PRUint8 command =
-      NS_REINTERPRET_CAST(PRUint8*, mArguments + mNumArguments)[i / 4];
+      reinterpret_cast<PRUint8*>(mArguments + mNumArguments)[i / 4];
     command = (command >> (2 * (i % 4))) & 0x3;
     switch (command) {
     case MOVETO:
diff --git a/mozilla/content/svg/content/src/nsSVGPathSegList.cpp b/mozilla/content/svg/content/src/nsSVGPathSegList.cpp
index 592dc9944d3..ef8bba3b246 100644
--- a/mozilla/content/svg/content/src/nsSVGPathSegList.cpp
+++ b/mozilla/content/svg/content/src/nsSVGPathSegList.cpp
@@ -105,7 +105,7 @@ nsSVGPathSegList::~nsSVGPathSegList()
 {
   PRInt32 count = mSegments.Count();
   for (PRInt32 i = 0; i < count; ++i) {
-    nsSVGPathSeg* seg = NS_STATIC_CAST(nsSVGPathSeg*, mSegments.ObjectAt(i));
+    nsSVGPathSeg* seg = static_cast<nsSVGPathSeg*>(mSegments.ObjectAt(i));
     seg->SetCurrentList(nsnull);
   }
 }
@@ -140,7 +140,7 @@ nsSVGPathSegList::SetValueString(const nsAString& aValue)
 
   PRInt32 count = mSegments.Count();
   for (PRInt32 i=0; i<count; ++i) {
-    nsSVGPathSeg* seg = NS_STATIC_CAST(nsSVGPathSeg*, mSegments.ObjectAt(i));
+    nsSVGPathSeg* seg = static_cast<nsSVGPathSeg*>(mSegments.ObjectAt(i));
     seg->SetCurrentList(this);
   }
 
@@ -164,7 +164,7 @@ nsSVGPathSegList::GetValueString(nsAString& aValue)
   PRInt32 i = 0;
 
   while (1) {
-    nsSVGPathSeg* seg = NS_STATIC_CAST(nsSVGPathSeg*, mSegments.ObjectAt(i));
+    nsSVGPathSeg* seg = static_cast<nsSVGPathSeg*>(mSegments.ObjectAt(i));
 
     nsAutoString str;
     seg->GetValueString(str);
@@ -209,7 +209,7 @@ NS_IMETHODIMP nsSVGPathSegList::Initialize(nsIDOMSVGPathSeg *newItem,
 /* nsIDOMSVGPathSeg getItem (in unsigned long index); */
 NS_IMETHODIMP nsSVGPathSegList::GetItem(PRUint32 index, nsIDOMSVGPathSeg **_retval)
 {
-  if (index >= NS_STATIC_CAST(PRUint32, mSegments.Count())) {
+  if (index >= static_cast<PRUint32>(mSegments.Count())) {
     *_retval = nsnull;
     return NS_ERROR_DOM_INDEX_SIZE_ERR;
   }
@@ -226,11 +226,11 @@ NS_IMETHODIMP nsSVGPathSegList::InsertItemBefore(nsIDOMSVGPathSeg *newItem,
 {
   NS_ENSURE_NATIVE_PATH_SEG(newItem, _retval);
 
-  if (index >= NS_STATIC_CAST(PRUint32, mSegments.Count())) {
+  if (index >= static_cast<PRUint32>(mSegments.Count())) {
     return NS_ERROR_DOM_INDEX_SIZE_ERR;
   }
 
-  InsertElementAt(NS_STATIC_CAST(nsSVGPathSeg*, newItem), index);
+  InsertElementAt(static_cast<nsSVGPathSeg*>(newItem), index);
   NS_ADDREF(*_retval = newItem);
 
   return NS_OK;
@@ -243,11 +243,11 @@ NS_IMETHODIMP nsSVGPathSegList::ReplaceItem(nsIDOMSVGPathSeg *newItem,
 {
   NS_ENSURE_NATIVE_PATH_SEG(newItem, _retval);
 
-  if (index >= NS_STATIC_CAST(PRUint32, mSegments.Count())) {
+  if (index >= static_cast<PRUint32>(mSegments.Count())) {
     return NS_ERROR_DOM_INDEX_SIZE_ERR;
   }
 
-  InsertElementAt(NS_STATIC_CAST(nsSVGPathSeg*, newItem), index);
+  InsertElementAt(static_cast<nsSVGPathSeg*>(newItem), index);
   RemoveElementAt(index+1);
   NS_ADDREF(*_retval = newItem);
 
@@ -257,7 +257,7 @@ NS_IMETHODIMP nsSVGPathSegList::ReplaceItem(nsIDOMSVGPathSeg *newItem,
 /* nsIDOMSVGPathSeg removeItem (in unsigned long index); */
 NS_IMETHODIMP nsSVGPathSegList::RemoveItem(PRUint32 index, nsIDOMSVGPathSeg **_retval)
 {
-  if (index >= NS_STATIC_CAST(PRUint32, mSegments.Count())) {
+  if (index >= static_cast<PRUint32>(mSegments.Count())) {
     *_retval = nsnull;
     return NS_ERROR_DOM_INDEX_SIZE_ERR;
   }
@@ -276,7 +276,7 @@ NS_IMETHODIMP nsSVGPathSegList::AppendItem(nsIDOMSVGPathSeg *newItem,
 {
   NS_ENSURE_NATIVE_PATH_SEG(newItem, _retval);
   NS_ADDREF(*_retval = newItem);
-  AppendElement(NS_STATIC_CAST(nsSVGPathSeg*, newItem));
+  AppendElement(static_cast<nsSVGPathSeg*>(newItem));
   return NS_OK;
 }
 
@@ -315,7 +315,7 @@ nsSVGPathSegList::ReleaseSegments(PRBool aModify)
   }
   PRInt32 count = mSegments.Count();
   for (PRInt32 i = 0; i < count; ++i) {
-    nsSVGPathSeg* seg = NS_STATIC_CAST(nsSVGPathSeg*, mSegments.ObjectAt(i));
+    nsSVGPathSeg* seg = static_cast<nsSVGPathSeg*>(mSegments.ObjectAt(i));
     seg->SetCurrentList(nsnull);
   }
   mSegments.Clear();
@@ -340,7 +340,7 @@ void
 nsSVGPathSegList::RemoveElementAt(PRInt32 index)
 {
   WillModify();
-  nsSVGPathSeg* seg = NS_STATIC_CAST(nsSVGPathSeg*, mSegments.ObjectAt(index));
+  nsSVGPathSeg* seg = static_cast<nsSVGPathSeg*>(mSegments.ObjectAt(index));
   seg->SetCurrentList(nsnull);
   mSegments.RemoveObjectAt(index);
   DidModify();
@@ -367,7 +367,7 @@ nsSVGPathSegList::RemoveFromCurrentList(nsSVGPathSeg* aSeg)
   nsCOMPtr<nsISVGValue> currentList = aSeg->GetCurrentList();
   if (currentList) {
     // aSeg's current list must be cast back to a nsSVGPathSegList*
-    nsSVGPathSegList* otherSegList = NS_STATIC_CAST(nsSVGPathSegList*, currentList.get());
+    nsSVGPathSegList* otherSegList = static_cast<nsSVGPathSegList*>(currentList.get());
     PRInt32 ix = otherSegList->mSegments.IndexOfObject(aSeg);
     if (ix != -1) { 
       otherSegList->RemoveElementAt(ix); 
diff --git a/mozilla/content/svg/content/src/nsSVGPointList.cpp b/mozilla/content/svg/content/src/nsSVGPointList.cpp
index 9cea54b6c1e..5be972f95a0 100644
--- a/mozilla/content/svg/content/src/nsSVGPointList.cpp
+++ b/mozilla/content/svg/content/src/nsSVGPointList.cpp
@@ -277,7 +277,7 @@ NS_IMETHODIMP nsSVGPointList::Initialize(nsIDOMSVGPoint *newItem,
 /* nsIDOMSVGPoint getItem (in unsigned long index); */
 NS_IMETHODIMP nsSVGPointList::GetItem(PRUint32 index, nsIDOMSVGPoint **_retval)
 {
-  if (index >= NS_STATIC_CAST(PRUint32, mPoints.Count())) {
+  if (index >= static_cast<PRUint32>(mPoints.Count())) {
     *_retval = nsnull;
     return NS_ERROR_DOM_INDEX_SIZE_ERR;
   }
@@ -316,7 +316,7 @@ NS_IMETHODIMP nsSVGPointList::ReplaceItem(nsIDOMSVGPoint *newItem,
 /* nsIDOMSVGPoint removeItem (in unsigned long index); */
 NS_IMETHODIMP nsSVGPointList::RemoveItem(PRUint32 index, nsIDOMSVGPoint **_retval)
 {
-  if (index >= NS_STATIC_CAST(PRUint32, mPoints.Count())) {
+  if (index >= static_cast<PRUint32>(mPoints.Count())) {
     *_retval = nsnull;
     return NS_ERROR_DOM_INDEX_SIZE_ERR;
   }
diff --git a/mozilla/content/svg/content/src/nsSVGSVGElement.cpp b/mozilla/content/svg/content/src/nsSVGSVGElement.cpp
index 4424eec4b40..36359bf0abc 100644
--- a/mozilla/content/svg/content/src/nsSVGSVGElement.cpp
+++ b/mozilla/content/svg/content/src/nsSVGSVGElement.cpp
@@ -571,7 +571,7 @@ nsSVGSVGElement::CreateSVGNumber(nsIDOMSVGNumber **_retval)
 NS_IMETHODIMP
 nsSVGSVGElement::CreateSVGLength(nsIDOMSVGLength **_retval)
 {
-  return NS_NewSVGLength(NS_REINTERPRET_CAST(nsISVGLength**, _retval));
+  return NS_NewSVGLength(reinterpret_cast<nsISVGLength**>(_retval));
 }
 
 /* nsIDOMSVGAngle createSVGAngle (); */
@@ -769,7 +769,7 @@ nsSVGSVGElement::GetCTM(nsIDOMSVGMatrix **_retval)
     // we didn't find an SVG ancestor
     float s=1, x=0, y=0;
     if (ownerDoc &&
-        ownerDoc->GetRootContent() == NS_STATIC_CAST(nsIContent*, this)) {
+        ownerDoc->GetRootContent() == static_cast<nsIContent*>(this)) {
       // we're the root element. get our currentScale and currentTranslate vals
       mCurrentScale->GetValue(&s);
       mCurrentTranslate->GetX(&x);
@@ -789,10 +789,10 @@ nsSVGSVGElement::GetCTM(nsIDOMSVGMatrix **_retval)
     if (ancestorCount == 0) {
       // our immediate parent is an SVG element. get our 'x' and 'y' attribs.
       // cast to nsSVGElement so we get our ancestor coord context.
-      x = mLengthAttributes[X].GetAnimValue(NS_STATIC_CAST(nsSVGElement*,
-                                                           this));
-      y = mLengthAttributes[Y].GetAnimValue(NS_STATIC_CAST(nsSVGElement*,
-                                                           this));
+      x = mLengthAttributes[X].GetAnimValue(static_cast<nsSVGElement*>
+                                                       (this));
+      y = mLengthAttributes[Y].GetAnimValue(static_cast<nsSVGElement*>
+                                                       (this));
     }
     else {
       // We have an SVG ancestor, but with non-SVG content between us
@@ -879,7 +879,7 @@ nsSVGSVGElement::GetScreenCTM(nsIDOMSVGMatrix **_retval)
     // we didn't find an SVG ancestor
     float s=1, x=0, y=0;
     if (ownerDoc &&
-        ownerDoc->GetRootContent() == NS_STATIC_CAST(nsIContent*, this)) {
+        ownerDoc->GetRootContent() == static_cast<nsIContent*>(this)) {
       // we're the root element. get our currentScale and currentTranslate vals
       mCurrentScale->GetValue(&s);
       mCurrentTranslate->GetX(&x);
@@ -899,10 +899,10 @@ nsSVGSVGElement::GetScreenCTM(nsIDOMSVGMatrix **_retval)
     if (ancestorCount == 0) {
       // our immediate parent is an SVG element. get our 'x' and 'y' attribs
       // cast to nsSVGElement so we get our ancestor coord context.
-      x = mLengthAttributes[X].GetAnimValue(NS_STATIC_CAST(nsSVGElement*,
-                                                           this));
-      y = mLengthAttributes[Y].GetAnimValue(NS_STATIC_CAST(nsSVGElement*,
-                                                           this));
+      x = mLengthAttributes[X].GetAnimValue(static_cast<nsSVGElement*>
+                                                       (this));
+      y = mLengthAttributes[Y].GetAnimValue(static_cast<nsSVGElement*>
+                                                       (this));
     }
     else {
       // We have an SVG ancestor, but with non-SVG content between us
@@ -1013,7 +1013,7 @@ nsSVGSVGElement::SetCurrentScaleTranslate(float s, float x, float y)
     nsCOMPtr<nsIPresShell> presShell = doc->GetPrimaryShell();
     NS_ASSERTION(presShell, "no presShell");
     if (presShell &&
-        doc->GetRootContent() == NS_STATIC_CAST(nsIContent*, this)) {
+        doc->GetRootContent() == static_cast<nsIContent*>(this)) {
       nsEventStatus status = nsEventStatus_eIgnore;
       nsGUIEvent event(PR_TRUE, NS_SVG_ZOOM, 0);
       event.eventStructType = NS_SVGZOOM_EVENT;
@@ -1038,7 +1038,7 @@ nsSVGSVGElement::SetCurrentTranslate(float x, float y)
     nsCOMPtr<nsIPresShell> presShell = doc->GetPrimaryShell();
     NS_ASSERTION(presShell, "no presShell");
     if (presShell &&
-        doc->GetRootContent() == NS_STATIC_CAST(nsIContent*, this)) {
+        doc->GetRootContent() == static_cast<nsIContent*>(this)) {
       nsEventStatus status = nsEventStatus_eIgnore;
       nsEvent event(PR_TRUE, NS_SVG_SCROLL);
       event.eventStructType = NS_SVG_EVENT;
@@ -1176,7 +1176,7 @@ nsSVGSVGElement::DidModifySVGObservable (nsISVGValue* observable,
   nsCOMPtr<nsIDOMSVGNumber> n = do_QueryInterface(observable);
   if (n && n==mCurrentScale) {
     if (mDispatchEvent &&
-        doc->GetRootContent() == NS_STATIC_CAST(nsIContent*, this)) {
+        doc->GetRootContent() == static_cast<nsIContent*>(this)) {
       nsEventStatus status = nsEventStatus_eIgnore;
       nsGUIEvent event(PR_TRUE, NS_SVG_ZOOM, 0);
       event.eventStructType = NS_SVGZOOM_EVENT;
@@ -1190,7 +1190,7 @@ nsSVGSVGElement::DidModifySVGObservable (nsISVGValue* observable,
     nsCOMPtr<nsIDOMSVGPoint> p = do_QueryInterface(observable);
     if (p && p==mCurrentTranslate) {
       if (mDispatchEvent &&
-          doc->GetRootContent() == NS_STATIC_CAST(nsIContent*, this)) {
+          doc->GetRootContent() == static_cast<nsIContent*>(this)) {
         nsEventStatus status = nsEventStatus_eIgnore;
         nsEvent event(PR_TRUE, NS_SVG_SCROLL);
         event.eventStructType = NS_SVG_EVENT;
diff --git a/mozilla/content/svg/content/src/nsSVGSVGElement.h b/mozilla/content/svg/content/src/nsSVGSVGElement.h
index 734644f8b13..0024960e4b2 100644
--- a/mozilla/content/svg/content/src/nsSVGSVGElement.h
+++ b/mozilla/content/svg/content/src/nsSVGSVGElement.h
@@ -52,7 +52,7 @@ class nsISVGEnum;
 
 #define QI_AND_CAST_TO_NSSVGSVGELEMENT(base)                                  \
   (nsCOMPtr<nsIDOMSVGSVGElement>(do_QueryInterface(base)) ?                   \
-   NS_STATIC_CAST(nsSVGSVGElement*, base.get()) : nsnull)
+   static_cast<nsSVGSVGElement*>(base.get()) : nsnull)
 
 typedef nsSVGStylableElement nsSVGSVGElementBase;
 
diff --git a/mozilla/content/svg/content/src/nsSVGStopElement.cpp b/mozilla/content/svg/content/src/nsSVGStopElement.cpp
index d776aeaa593..71c934db4e4 100644
--- a/mozilla/content/svg/content/src/nsSVGStopElement.cpp
+++ b/mozilla/content/svg/content/src/nsSVGStopElement.cpp
@@ -142,7 +142,7 @@ nsSVGStopElement::ParseAttribute(PRInt32 aNamespaceID,
       const char *str = value.get();
 
       char *rest;
-      float offset = NS_STATIC_CAST(float, PR_strtod(str, &rest));
+      float offset = static_cast<float>(PR_strtod(str, &rest));
       if (str != rest) {
         if (*rest == '%') {
           offset /= 100;
diff --git a/mozilla/content/svg/content/src/nsSVGStylableElement.cpp b/mozilla/content/svg/content/src/nsSVGStylableElement.cpp
index 24793401f02..6e8d19d834e 100644
--- a/mozilla/content/svg/content/src/nsSVGStylableElement.cpp
+++ b/mozilla/content/svg/content/src/nsSVGStylableElement.cpp
@@ -77,7 +77,7 @@ nsSVGStylableElement::Init()
     mClassName = new nsSVGClassValue;
     NS_ENSURE_TRUE(mClassName, NS_ERROR_OUT_OF_MEMORY);
     rv = AddMappedSVGValue(nsGkAtoms::_class,
-			   NS_STATIC_CAST(nsIDOMSVGAnimatedString*, mClassName),
+			   static_cast<nsIDOMSVGAnimatedString*>(mClassName),
 			   kNameSpaceID_None);
     NS_ENSURE_SUCCESS(rv, rv);
   }
diff --git a/mozilla/content/svg/content/src/nsSVGTransformList.cpp b/mozilla/content/svg/content/src/nsSVGTransformList.cpp
index b459fc4e684..378cd57b860 100644
--- a/mozilla/content/svg/content/src/nsSVGTransformList.cpp
+++ b/mozilla/content/svg/content/src/nsSVGTransformList.cpp
@@ -263,7 +263,7 @@ NS_IMETHODIMP nsSVGTransformList::Initialize(nsIDOMSVGTransform *newItem,
 /* nsIDOMSVGTransform getItem (in unsigned long index); */
 NS_IMETHODIMP nsSVGTransformList::GetItem(PRUint32 index, nsIDOMSVGTransform **_retval)
 {
-  if (index >= NS_STATIC_CAST(PRUint32, mTransforms.Count())) {
+  if (index >= static_cast<PRUint32>(mTransforms.Count())) {
     *_retval = nsnull;
     return NS_ERROR_DOM_INDEX_SIZE_ERR;
   }
@@ -341,7 +341,7 @@ NS_IMETHODIMP nsSVGTransformList::RemoveItem(PRUint32 index, nsIDOMSVGTransform
 {
   nsSVGValueAutoNotifier autonotifier(this);
 
-  if (index >= NS_STATIC_CAST(PRUint32, mTransforms.Count())) {
+  if (index >= static_cast<PRUint32>(mTransforms.Count())) {
     *_retval = nsnull;
     return NS_ERROR_DOM_INDEX_SIZE_ERR;
   }
diff --git a/mozilla/content/svg/content/src/nsSVGUseElement.cpp b/mozilla/content/svg/content/src/nsSVGUseElement.cpp
index bdc14f8f14e..d28d2134cf0 100644
--- a/mozilla/content/svg/content/src/nsSVGUseElement.cpp
+++ b/mozilla/content/svg/content/src/nsSVGUseElement.cpp
@@ -74,7 +74,7 @@ NS_INTERFACE_MAP_BEGIN(nsSVGUseElement)
   NS_INTERFACE_MAP_ENTRY(nsIMutationObserver)
   NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGUseElement)
   if (aIID.Equals(NS_GET_IID(nsSVGUseElement)))
-    foundInterface = NS_REINTERPRET_CAST(nsISupports*, this);
+    foundInterface = reinterpret_cast<nsISupports*>(this);
   else
 NS_INTERFACE_MAP_END_INHERITING(nsSVGUseElementBase)
 
@@ -129,7 +129,7 @@ nsSVGUseElement::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const
   rv |= CopyInnerTo(it);
 
   // nsSVGUseElement specific portion - record who we cloned from
-  it->mOriginal = NS_CONST_CAST(nsSVGUseElement*, this);
+  it->mOriginal = const_cast<nsSVGUseElement*>(this);
 
   if (NS_SUCCEEDED(rv)) {
     kungFuDeathGrip.swap(*aResult);
diff --git a/mozilla/content/svg/content/src/nsSVGValue.cpp b/mozilla/content/svg/content/src/nsSVGValue.cpp
index f478cbfb484..2b5097a73c1 100644
--- a/mozilla/content/svg/content/src/nsSVGValue.cpp
+++ b/mozilla/content/svg/content/src/nsSVGValue.cpp
@@ -55,7 +55,7 @@ nsSVGValue::ReleaseObservers()
   PRInt32 count = mObservers.Count();
   PRInt32 i;
   for (i = 0; i < count; ++i) {
-    nsIWeakReference* wr = NS_STATIC_CAST(nsIWeakReference*,mObservers.ElementAt(i));
+    nsIWeakReference* wr = static_cast<nsIWeakReference*>(mObservers.ElementAt(i));
     NS_RELEASE(wr);
   }
   while (i)
@@ -72,10 +72,10 @@ nsSVGValue::NotifyObservers(SVGObserverNotifyFunction f,
   // from the observer list (mod_die), walk backwards through the list
   // to catch everyone.
   for (PRInt32 i = count - 1; i >= 0; i--) {
-    nsIWeakReference* wr = NS_STATIC_CAST(nsIWeakReference*,mObservers.ElementAt(i));
+    nsIWeakReference* wr = static_cast<nsIWeakReference*>(mObservers.ElementAt(i));
     nsCOMPtr<nsISVGValueObserver> observer = do_QueryReferent(wr);
     if (observer)
-       (NS_STATIC_CAST(nsISVGValueObserver*,observer)->*f)(this, aModType);
+       (static_cast<nsISVGValueObserver*>(observer)->*f)(this, aModType);
   }
 }
 
@@ -122,7 +122,7 @@ nsSVGValue::RemoveObserver(nsISVGValueObserver* observer)
   if (!wr) return NS_ERROR_FAILURE;
   PRInt32 i = mObservers.IndexOf((void*)wr);
   if (i<0) return NS_ERROR_FAILURE;
-  nsIWeakReference* wr2 = NS_STATIC_CAST(nsIWeakReference*,mObservers.ElementAt(i));
+  nsIWeakReference* wr2 = static_cast<nsIWeakReference*>(mObservers.ElementAt(i));
   NS_RELEASE(wr2);
   mObservers.RemoveElementAt(i);
   return NS_OK;
diff --git a/mozilla/content/xbl/src/nsBindingManager.cpp b/mozilla/content/xbl/src/nsBindingManager.cpp
index 2950dd40c68..db4a48f8b77 100644
--- a/mozilla/content/xbl/src/nsBindingManager.cpp
+++ b/mozilla/content/xbl/src/nsBindingManager.cpp
@@ -100,7 +100,7 @@ public:
 
   PRInt32 GetInsertionPointCount() { return mElements->Length(); }
 
-  nsXBLInsertionPoint* GetInsertionPointAt(PRInt32 i) { return NS_STATIC_CAST(nsXBLInsertionPoint*, mElements->ElementAt(i)); }
+  nsXBLInsertionPoint* GetInsertionPointAt(PRInt32 i) { return static_cast<nsXBLInsertionPoint*>(mElements->ElementAt(i)); }
   void RemoveInsertionPointAt(PRInt32 i) { mElements->RemoveElementAt(i); }
 
 private:
@@ -156,7 +156,7 @@ nsAnonymousContentList::GetLength(PRUint32* aLength)
 
   *aLength = 0;
   for (PRInt32 i = 0; i < cnt; i++)
-    *aLength += NS_STATIC_CAST(nsXBLInsertionPoint*, mElements->ElementAt(i))->ChildCount();
+    *aLength += static_cast<nsXBLInsertionPoint*>(mElements->ElementAt(i))->ChildCount();
 
   return NS_OK;
 }
@@ -170,7 +170,7 @@ nsAnonymousContentList::Item(PRUint32 aIndex, nsIDOMNode** aReturn)
   for (PRInt32 i = 0; i < cnt; i++) {
     aIndex -= pointCount;
     
-    nsXBLInsertionPoint* point = NS_STATIC_CAST(nsXBLInsertionPoint*, mElements->ElementAt(i));
+    nsXBLInsertionPoint* point = static_cast<nsXBLInsertionPoint*>(mElements->ElementAt(i));
     pointCount = point->ChildCount();
 
     if (aIndex < pointCount) {
@@ -211,7 +211,7 @@ private:
 PR_STATIC_CALLBACK(void)
 ClearObjectEntry(PLDHashTable* table, PLDHashEntryHdr *entry)
 {
-  ObjectEntry* objEntry = NS_STATIC_CAST(ObjectEntry*, entry);
+  ObjectEntry* objEntry = static_cast<ObjectEntry*>(entry);
   objEntry->~ObjectEntry();
 }
 
@@ -243,8 +243,8 @@ AddObjectEntry(PLDHashTable& table, nsISupports* aKey, nsISupports* aValue)
   if (!aKey) return NS_ERROR_INVALID_ARG;
   
   ObjectEntry *entry =
-    NS_STATIC_CAST(ObjectEntry*,
-                   PL_DHashTableOperate(&table, aKey, PL_DHASH_ADD));
+    static_cast<ObjectEntry*>
+               (PL_DHashTableOperate(&table, aKey, PL_DHASH_ADD));
 
   if (!entry)
     return NS_ERROR_OUT_OF_MEMORY;
@@ -266,8 +266,8 @@ static nsISupports*
 LookupObject(PLDHashTable& table, nsISupports* aKey)
 {
   ObjectEntry *entry =
-    NS_STATIC_CAST(ObjectEntry*,
-                   PL_DHashTableOperate(&table, aKey, PL_DHASH_LOOKUP));
+    static_cast<ObjectEntry*>
+               (PL_DHashTableOperate(&table, aKey, PL_DHASH_LOOKUP));
 
   if (PL_DHASH_ENTRY_IS_BUSY(entry))
     return entry->GetValue();
@@ -344,7 +344,7 @@ DocumentInfoHashtableTraverser(nsIURI* key,
                                void* userArg)
 {
   nsCycleCollectionTraversalCallback *cb = 
-    NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, userArg);
+    static_cast<nsCycleCollectionTraversalCallback*>(userArg);
   cb->NoteXPCOMChild(di);
   return PL_DHASH_NEXT;
 }
@@ -355,7 +355,7 @@ LoadingDocHashtableTraverser(nsIURI* key,
                              void* userArg)
 {
   nsCycleCollectionTraversalCallback *cb = 
-    NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, userArg);
+    static_cast<nsCycleCollectionTraversalCallback*>(userArg);
   cb->NoteXPCOMChild(sl);
   return PL_DHASH_NEXT;
 }
@@ -458,8 +458,8 @@ nsIContent*
 nsBindingManager::GetInsertionParent(nsIContent* aContent)
 { 
   if (mInsertionParentTable.ops) {
-    return NS_STATIC_CAST(nsIContent*,
-                          LookupObject(mInsertionParentTable, aContent));
+    return static_cast<nsIContent*>
+                      (LookupObject(mInsertionParentTable, aContent));
   }
 
   return nsnull;
@@ -475,7 +475,7 @@ nsIXPConnectWrappedJS*
 nsBindingManager::GetWrappedJS(nsIContent* aContent)
 { 
   if (mWrapperTable.ops) {
-    return NS_STATIC_CAST(nsIXPConnectWrappedJS*, LookupObject(mWrapperTable, aContent));
+    return static_cast<nsIXPConnectWrappedJS*>(LookupObject(mWrapperTable, aContent));
   }
 
   return nsnull;
@@ -541,8 +541,8 @@ nsBindingManager::GetContentListFor(nsIContent* aContent, nsIDOMNodeList** aResu
   *aResult = nsnull;
   
   if (mContentListTable.ops) {
-    *aResult = NS_STATIC_CAST(nsIDOMNodeList*,
-                              LookupObject(mContentListTable, aContent));
+    *aResult = static_cast<nsIDOMNodeList*>
+                          (LookupObject(mContentListTable, aContent));
     NS_IF_ADDREF(*aResult);
   }
   
@@ -584,8 +584,8 @@ nsBindingManager::GetAnonymousNodesInternal(nsIContent* aContent,
   // Locate the primary binding and get its node list of anonymous children.
   *aResult = nsnull;
   if (mAnonymousNodesTable.ops) {
-    *aResult = NS_STATIC_CAST(nsIDOMNodeList*,
-                              LookupObject(mAnonymousNodesTable, aContent));
+    *aResult = static_cast<nsIDOMNodeList*>
+                          (LookupObject(mAnonymousNodesTable, aContent));
     NS_IF_ADDREF(*aResult);
   }
 
@@ -650,8 +650,8 @@ nsBindingManager::GetXBLChildNodesInternal(nsIContent* aContent,
   // insertion points.
   if (!result) {
     if (mContentListTable.ops) {
-      result = NS_STATIC_CAST(nsIDOMNodeList*,
-                              LookupObject(mContentListTable, aContent));
+      result = static_cast<nsIDOMNodeList*>
+                          (LookupObject(mContentListTable, aContent));
       *aIsAnonymousContentList = PR_TRUE;
     }
   }
@@ -844,7 +844,7 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 AccumulateBindingsToDetach(nsISupports *aKey, nsXBLBinding *aBinding,
                            void* aVoidArray)
 {
-  nsVoidArray* arr = NS_STATIC_CAST(nsVoidArray*, aVoidArray);
+  nsVoidArray* arr = static_cast<nsVoidArray*>(aVoidArray);
   // Hold an owning reference to this binding, just in case
   if (arr->AppendElement(aBinding))
     NS_ADDREF(aBinding);
@@ -855,7 +855,7 @@ PR_STATIC_CALLBACK(PRBool)
 ExecuteDetachedHandler(void* aBinding, void* aClosure)
 {
   NS_PRECONDITION(aBinding, "Null binding in list?");
-  nsXBLBinding* binding = NS_STATIC_CAST(nsXBLBinding*, aBinding);
+  nsXBLBinding* binding = static_cast<nsXBLBinding*>(aBinding);
   binding->ExecuteDetachedHandler();
   // Drop our ref to the binding now
   NS_RELEASE(binding);
@@ -1066,7 +1066,7 @@ nsBindingManager::GetBindingImplementation(nsIContent* aContent, REFNSIID aIID,
       // We successfully created a wrapper.  We will own this wrapper for as long as the binding remains
       // alive.  At the time the binding is cleared out of the bindingManager, we will remove the wrapper
       // from the bindingManager as well.
-      nsISupports* supp = NS_STATIC_CAST(nsISupports*, *aResult);
+      nsISupports* supp = static_cast<nsISupports*>(*aResult);
       wrappedJS = do_QueryInterface(supp);
       SetWrappedJS(aContent, wrappedJS);
 
@@ -1220,7 +1220,7 @@ nsBindingManager::ContentAppended(nsIDocument* aDocument,
         // Find a non-pseudo-insertion point and just jam ourselves in.
         // This is not 100% correct.  Hack city, baby.
         nsAnonymousContentList* contentList =
-          NS_STATIC_CAST(nsAnonymousContentList*, nodeList.get());
+          static_cast<nsAnonymousContentList*>(nodeList.get());
 
         PRInt32 count = contentList->GetInsertionPointCount();
         for (PRInt32 i = 0; i < count; i++) {
@@ -1268,7 +1268,7 @@ nsBindingManager::ContentInserted(nsIDocument* aDocument,
         // Find a non-pseudo-insertion point and just jam ourselves in.
         // This is not 100% correct.  Hack city, baby.
         nsAnonymousContentList* contentList =
-          NS_STATIC_CAST(nsAnonymousContentList*, nodeList.get());
+          static_cast<nsAnonymousContentList*>(nodeList.get());
 
         PRInt32 count = contentList->GetInsertionPointCount();
         for (PRInt32 i = 0; i < count; i++) {
@@ -1337,7 +1337,7 @@ nsBindingManager::ContentRemoved(nsIDocument* aDocument,
       
       if (nodeList && isAnonymousContentList) {
         // Find a non-pseudo-insertion point and remove ourselves.
-        nsAnonymousContentList* contentList = NS_STATIC_CAST(nsAnonymousContentList*, NS_STATIC_CAST(nsIDOMNodeList*, nodeList));
+        nsAnonymousContentList* contentList = static_cast<nsAnonymousContentList*>(static_cast<nsIDOMNodeList*>(nodeList));
         PRInt32 count = contentList->GetInsertionPointCount();
         for (PRInt32 i =0; i < count; i++) {
           nsXBLInsertionPoint* point = contentList->GetInsertionPointAt(i);
diff --git a/mozilla/content/xbl/src/nsXBLBinding.cpp b/mozilla/content/xbl/src/nsXBLBinding.cpp
index 1377a8143cb..08b226bc680 100644
--- a/mozilla/content/xbl/src/nsXBLBinding.cpp
+++ b/mozilla/content/xbl/src/nsXBLBinding.cpp
@@ -111,14 +111,14 @@
 PR_STATIC_CALLBACK(void)
 XBLFinalize(JSContext *cx, JSObject *obj)
 {
-  nsXBLJSClass* c = NS_STATIC_CAST(nsXBLJSClass*, ::JS_GetClass(cx, obj));
+  nsXBLJSClass* c = static_cast<nsXBLJSClass*>(::JS_GetClass(cx, obj));
   c->Drop();
 }
 
 nsXBLJSClass::nsXBLJSClass(const nsAFlatCString& aClassName)
 {
   memset(this, 0, sizeof(nsXBLJSClass));
-  next = prev = NS_STATIC_CAST(JSCList*, this);
+  next = prev = static_cast<JSCList*>(this);
   name = ToNewCString(aClassName);
   addProperty = delProperty = setProperty = getProperty = ::JS_PropertyStub;
   enumerate = ::JS_EnumerateStub;
@@ -130,7 +130,7 @@ nsXBLJSClass::nsXBLJSClass(const nsAFlatCString& aClassName)
 nsrefcnt
 nsXBLJSClass::Destroy()
 {
-  NS_ASSERTION(next == prev && prev == NS_STATIC_CAST(JSCList*, this),
+  NS_ASSERTION(next == prev && prev == static_cast<JSCList*>(this),
                "referenced nsXBLJSClass is on LRU list already!?");
 
   if (nsXBLService::gClassTable) {
@@ -143,7 +143,7 @@ nsXBLJSClass::Destroy()
     delete this;
   } else {
     // Put this most-recently-used class on end of the LRU-sorted freelist.
-    JSCList* mru = NS_STATIC_CAST(JSCList*, this);
+    JSCList* mru = static_cast<JSCList*>(this);
     JS_APPEND_LINK(mru, &nsXBLService::gClassLRUList);
     nsXBLService::gClassLRUListLength++;
   }
@@ -177,7 +177,7 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 TraverseKey(nsISupports* aKey, nsInsertionPointList* aData, void* aClosure)
 {
   nsCycleCollectionTraversalCallback &cb = 
-    *NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aClosure);
+    *static_cast<nsCycleCollectionTraversalCallback*>(aClosure);
 
   cb.NoteXPCOMChild(aKey);
   if (aData) {
@@ -1079,10 +1079,10 @@ nsXBLBinding::DoInitJSClass(JSContext *cx, JSObject *global, JSObject *obj,
     classObject = (nsXBLService::gClassTable)->Get(&key);
 
     if (classObject) {
-      c = NS_STATIC_CAST(nsXBLJSClass*, classObject);
+      c = static_cast<nsXBLJSClass*>(classObject);
 
       // If c is on the LRU list (i.e., not linked to itself), remove it now!
-      JSCList* link = NS_STATIC_CAST(JSCList*, c);
+      JSCList* link = static_cast<JSCList*>(c);
       if (c->next != link) {
         JS_REMOVE_AND_INIT_LINK(link);
         nsXBLService::gClassLRUListLength--;
@@ -1101,7 +1101,7 @@ nsXBLBinding::DoInitJSClass(JSContext *cx, JSObject *global, JSObject *obj,
         nsXBLService::gClassLRUListLength--;
 
         // Remove any mapping from the old name to the class struct.
-        c = NS_STATIC_CAST(nsXBLJSClass*, lru);
+        c = static_cast<nsXBLJSClass*>(lru);
         nsCStringKey oldKey(c->name);
         (nsXBLService::gClassTable)->Remove(&oldKey);
 
diff --git a/mozilla/content/xbl/src/nsXBLDocumentInfo.cpp b/mozilla/content/xbl/src/nsXBLDocumentInfo.cpp
index 0ad22c29841..f3bbe1ee0f4 100644
--- a/mozilla/content/xbl/src/nsXBLDocumentInfo.cpp
+++ b/mozilla/content/xbl/src/nsXBLDocumentInfo.cpp
@@ -233,9 +233,9 @@ XBL_ProtoErrorReporter(JSContext *cx,
     PRUint32 column = report->uctokenptr - report->uclinebuf;
 
     errorObject->Init
-         (NS_REINTERPRET_CAST(const PRUnichar*, report->ucmessage),
+         (reinterpret_cast<const PRUnichar*>(report->ucmessage),
           NS_ConvertUTF8toUTF16(report->filename).get(),
-          NS_REINTERPRET_CAST(const PRUnichar*, report->uclinebuf),
+          reinterpret_cast<const PRUnichar*>(report->uclinebuf),
           report->lineno, column, report->flags,
           "xbl javascript"
           );
@@ -372,8 +372,8 @@ nsXBLDocGlobalObject::GetGlobalJSObject()
   if (!mScriptContext)
     return nsnull;
 
-  JSContext* cx = NS_STATIC_CAST(JSContext*,
-                                 mScriptContext->GetNativeContext());
+  JSContext* cx = static_cast<JSContext*>
+                             (mScriptContext->GetNativeContext());
   if (!cx)
     return nsnull;
 
@@ -442,8 +442,8 @@ static PRIntn PR_CALLBACK
 TraverseProtos(nsHashKey *aKey, void *aData, void* aClosure)
 {
   nsCycleCollectionTraversalCallback *cb = 
-    NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aClosure);
-  nsXBLPrototypeBinding *proto = NS_STATIC_CAST(nsXBLPrototypeBinding*, aData);
+    static_cast<nsCycleCollectionTraversalCallback*>(aClosure);
+  nsXBLPrototypeBinding *proto = static_cast<nsXBLPrototypeBinding*>(aData);
   proto->Traverse(*cb);
   return kHashEnumerateNext;
 }
@@ -518,7 +518,7 @@ nsXBLDocumentInfo::GetPrototypeBinding(const nsACString& aRef, nsXBLPrototypeBin
 
   const nsPromiseFlatCString& flat = PromiseFlatCString(aRef);
   nsCStringKey key(flat.get());
-  *aResult = NS_STATIC_CAST(nsXBLPrototypeBinding*, mBindingTable->Get(&key));
+  *aResult = static_cast<nsXBLPrototypeBinding*>(mBindingTable->Get(&key));
 
   return NS_OK;
 }
@@ -526,7 +526,7 @@ nsXBLDocumentInfo::GetPrototypeBinding(const nsACString& aRef, nsXBLPrototypeBin
 static PRBool PR_CALLBACK
 DeletePrototypeBinding(nsHashKey* aKey, void* aData, void* aClosure)
 {
-  nsXBLPrototypeBinding* binding = NS_STATIC_CAST(nsXBLPrototypeBinding*, aData);
+  nsXBLPrototypeBinding* binding = static_cast<nsXBLPrototypeBinding*>(aData);
   delete binding;
   return PR_TRUE;
 }
diff --git a/mozilla/content/xbl/src/nsXBLEventHandler.cpp b/mozilla/content/xbl/src/nsXBLEventHandler.cpp
index a01f88eb5ef..e2ebed8c82e 100644
--- a/mozilla/content/xbl/src/nsXBLEventHandler.cpp
+++ b/mozilla/content/xbl/src/nsXBLEventHandler.cpp
@@ -147,8 +147,8 @@ nsXBLKeyEventHandler::HandleEvent(nsIDOMEvent* aEvent)
 
   PRUint32 i;
   for (i = 0; i < count; ++i) {
-    nsXBLPrototypeHandler* handler = NS_STATIC_CAST(nsXBLPrototypeHandler*,
-                                                    mProtoHandlers[i]);
+    nsXBLPrototypeHandler* handler = static_cast<nsXBLPrototypeHandler*>
+                                                (mProtoHandlers[i]);
     PRBool hasAllowUntrustedAttr = handler->HasAllowUntrustedAttr();
     if ((trustedEvent ||
         (hasAllowUntrustedAttr && handler->AllowUntrustedEvents()) ||
diff --git a/mozilla/content/xbl/src/nsXBLProtoImplField.cpp b/mozilla/content/xbl/src/nsXBLProtoImplField.cpp
index 1d3c552c0c9..4c7480ad608 100644
--- a/mozilla/content/xbl/src/nsXBLProtoImplField.cpp
+++ b/mozilla/content/xbl/src/nsXBLProtoImplField.cpp
@@ -136,8 +136,8 @@ nsXBLProtoImplField::InstallMember(nsIScriptContext* aContext,
     // Define the evaluated result as a JS property
     nsDependentString name(mName);
     JSAutoRequest ar(cx);
-    if (!::JS_DefineUCProperty(cx, NS_STATIC_CAST(JSObject *, aScriptObject),
-                               NS_REINTERPRET_CAST(const jschar*, mName), 
+    if (!::JS_DefineUCProperty(cx, static_cast<JSObject *>(aScriptObject),
+                               reinterpret_cast<const jschar*>(mName), 
                                name.Length(), result, nsnull, nsnull, mJSAttributes))
       return NS_ERROR_OUT_OF_MEMORY;
   }
diff --git a/mozilla/content/xbl/src/nsXBLProtoImplMethod.cpp b/mozilla/content/xbl/src/nsXBLProtoImplMethod.cpp
index dc2fbb98f34..b4dc110df61 100644
--- a/mozilla/content/xbl/src/nsXBLProtoImplMethod.cpp
+++ b/mozilla/content/xbl/src/nsXBLProtoImplMethod.cpp
@@ -166,7 +166,7 @@ nsXBLProtoImplMethod::InstallMember(nsIScriptContext* aContext,
     NS_ENSURE_SUCCESS(rv, rv);
     
     if (!::JS_DefineUCProperty(cx, targetClassObject,
-                               NS_REINTERPRET_CAST(const jschar*, mName), 
+                               reinterpret_cast<const jschar*>(mName), 
                                name.Length(), OBJECT_TO_JSVAL(method),
                                NULL, NULL, JSPROP_ENUMERATE)) {
       return NS_ERROR_OUT_OF_MEMORY;
diff --git a/mozilla/content/xbl/src/nsXBLProtoImplProperty.cpp b/mozilla/content/xbl/src/nsXBLProtoImplProperty.cpp
index 1942311cf3d..76a5b44bec0 100644
--- a/mozilla/content/xbl/src/nsXBLProtoImplProperty.cpp
+++ b/mozilla/content/xbl/src/nsXBLProtoImplProperty.cpp
@@ -211,7 +211,7 @@ nsXBLProtoImplProperty::InstallMember(nsIScriptContext* aContext,
     
     nsDependentString name(mName);
     if (!::JS_DefineUCProperty(cx, targetClassObject,
-                               NS_REINTERPRET_CAST(const jschar*, mName), 
+                               reinterpret_cast<const jschar*>(mName), 
                                name.Length(), JSVAL_VOID,  (JSPropertyOp) getter, 
                                (JSPropertyOp) setter, mJSAttributes))
       return NS_ERROR_OUT_OF_MEMORY;
diff --git a/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp b/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp
index 705e400d42e..24f620512a8 100644
--- a/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp
+++ b/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp
@@ -334,9 +334,9 @@ PR_STATIC_CALLBACK(PRIntn)
 TraverseInsertionPoint(nsHashKey* aKey, void* aData, void* aClosure)
 {
   nsCycleCollectionTraversalCallback &cb = 
-    *NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aClosure);
+    *static_cast<nsCycleCollectionTraversalCallback*>(aClosure);
   nsXBLInsertionPointEntry* entry =
-    NS_STATIC_CAST(nsXBLInsertionPointEntry*, aData);
+    static_cast<nsXBLInsertionPointEntry*>(aData);
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NATIVE_PTR(entry,
                                                nsXBLInsertionPointEntry)
   return kHashEnumerateNext;
@@ -346,8 +346,8 @@ PR_STATIC_CALLBACK(PRBool)
 TraverseBinding(nsHashKey *aKey, void *aData, void* aClosure)
 {
   nsCycleCollectionTraversalCallback *cb = 
-    NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aClosure);
-  cb->NoteXPCOMChild(NS_STATIC_CAST(nsISupports*, aData));
+    static_cast<nsCycleCollectionTraversalCallback*>(aClosure);
+  cb->NoteXPCOMChild(static_cast<nsISupports*>(aData));
   return kHashEnumerateNext;
 }
 
@@ -535,14 +535,13 @@ nsXBLPrototypeBinding::AttributeChanged(nsIAtom* aAttribute,
   if (!mAttributeTable)
     return;
   nsPRUint32Key nskey(aNameSpaceID);
-  nsObjectHashtable *attributesNS = NS_STATIC_CAST(nsObjectHashtable*, 
-                                                   mAttributeTable->Get(&nskey));
+  nsObjectHashtable *attributesNS = static_cast<nsObjectHashtable*>(mAttributeTable->Get(&nskey));
   if (!attributesNS)
     return;
 
   nsISupportsKey key(aAttribute);
-  nsXBLAttributeEntry* xblAttr = NS_STATIC_CAST(nsXBLAttributeEntry*,
-                                                attributesNS->Get(&key));
+  nsXBLAttributeEntry* xblAttr = static_cast<nsXBLAttributeEntry*>
+                                            (attributesNS->Get(&key));
   if (!xblAttr)
     return;
 
@@ -630,8 +629,8 @@ struct InsertionData {
 
 PRBool PR_CALLBACK InstantiateInsertionPoint(nsHashKey* aKey, void* aData, void* aClosure)
 {
-  nsXBLInsertionPointEntry* entry = NS_STATIC_CAST(nsXBLInsertionPointEntry*, aData);
-  InsertionData* data = NS_STATIC_CAST(InsertionData*, aClosure);
+  nsXBLInsertionPointEntry* entry = static_cast<nsXBLInsertionPointEntry*>(aData);
+  InsertionData* data = static_cast<InsertionData*>(aClosure);
   nsXBLBinding* binding = data->mBinding;
   nsXBLPrototypeBinding* proto = data->mPrototype;
 
@@ -699,10 +698,10 @@ nsXBLPrototypeBinding::GetInsertionPoint(nsIContent* aBoundElement,
     return nsnull;
 
   nsISupportsKey key(aChild->Tag());
-  nsXBLInsertionPointEntry* entry = NS_STATIC_CAST(nsXBLInsertionPointEntry*, mInsertionPointTable->Get(&key));
+  nsXBLInsertionPointEntry* entry = static_cast<nsXBLInsertionPointEntry*>(mInsertionPointTable->Get(&key));
   if (!entry) {
     nsISupportsKey key2(nsGkAtoms::children);
-    entry = NS_STATIC_CAST(nsXBLInsertionPointEntry*, mInsertionPointTable->Get(&key2));
+    entry = static_cast<nsXBLInsertionPointEntry*>(mInsertionPointTable->Get(&key2));
   }
 
   nsIContent *realContent = nsnull;
@@ -739,7 +738,7 @@ nsXBLPrototypeBinding::GetSingleInsertionPoint(nsIContent* aBoundElement,
 
   nsISupportsKey key(nsGkAtoms::children);
   nsXBLInsertionPointEntry* entry =
-    NS_STATIC_CAST(nsXBLInsertionPointEntry*, mInsertionPointTable->Get(&key));
+    static_cast<nsXBLInsertionPointEntry*>(mInsertionPointTable->Get(&key));
 
   if (!entry) {
     // The only insertion point specified was actually a filtered insertion
@@ -788,8 +787,7 @@ nsXBLPrototypeBinding::ImplementsInterface(REFNSIID aIID) const
   // Check our IID table.
   if (mInterfaceTable) {
     nsIIDKey key(aIID);
-    nsCOMPtr<nsISupports> supports = getter_AddRefs(NS_STATIC_CAST(nsISupports*, 
-                                                                   mInterfaceTable->Get(&key)));
+    nsCOMPtr<nsISupports> supports = getter_AddRefs(static_cast<nsISupports*>(mInterfaceTable->Get(&key)));
     return supports != nsnull;
   }
 
@@ -889,7 +887,7 @@ nsXBLPrototypeBinding::LocateInstance(nsIContent* aBoundElement,
       // Next we have to find the real insertion point for this proto insertion
       // point.  If it does not contain any default content, then we should 
       // return null, since the content is not in the clone.
-      nsXBLInsertionPoint* currPoint = NS_STATIC_CAST(nsXBLInsertionPoint*, points->ElementAt(i));
+      nsXBLInsertionPoint* currPoint = static_cast<nsXBLInsertionPoint*>(points->ElementAt(i));
       nsCOMPtr<nsIContent> defContent = currPoint->GetDefaultContentTemplate();
       if (defContent == childPoint) {
         // Now check to see if we even built default content at this
@@ -931,8 +929,8 @@ struct nsXBLAttrChangeData
 // XXXbz this duplicates lots of AttributeChanged
 PRBool PR_CALLBACK SetAttrs(nsHashKey* aKey, void* aData, void* aClosure)
 {
-  nsXBLAttributeEntry* entry = NS_STATIC_CAST(nsXBLAttributeEntry*, aData);
-  nsXBLAttrChangeData* changeData = NS_STATIC_CAST(nsXBLAttrChangeData*, aClosure);
+  nsXBLAttributeEntry* entry = static_cast<nsXBLAttributeEntry*>(aData);
+  nsXBLAttrChangeData* changeData = static_cast<nsXBLAttrChangeData*>(aClosure);
 
   nsIAtom* src = entry->GetSrcAttribute();
   PRInt32 srcNs = changeData->mSrcNamespace;
@@ -998,11 +996,11 @@ PRBool PR_CALLBACK SetAttrs(nsHashKey* aKey, void* aData, void* aClosure)
 PRBool PR_CALLBACK SetAttrsNS(nsHashKey* aKey, void* aData, void* aClosure)
 {
   if (aData && aClosure) {
-    nsPRUint32Key * key = NS_STATIC_CAST(nsPRUint32Key*, aKey);
+    nsPRUint32Key * key = static_cast<nsPRUint32Key*>(aKey);
     nsObjectHashtable* xblAttributes =
-      NS_STATIC_CAST(nsObjectHashtable*, aData);
-    nsXBLAttrChangeData * changeData = NS_STATIC_CAST(nsXBLAttrChangeData *,
-                                                      aClosure);
+      static_cast<nsObjectHashtable*>(aData);
+    nsXBLAttrChangeData * changeData = static_cast<nsXBLAttrChangeData *>
+                                                  (aClosure);
     changeData->mSrcNamespace = key->GetValue();
     xblAttributes->Enumerate(SetAttrs, (void*)changeData);
   }
@@ -1045,7 +1043,7 @@ nsXBLPrototypeBinding::ShouldBuildChildFrames() const
     return PR_TRUE;
   nsPRUint32Key nskey(kNameSpaceID_XBL);
   nsObjectHashtable* xblAttributes =
-    NS_STATIC_CAST(nsObjectHashtable*, mAttributeTable->Get(&nskey));
+    static_cast<nsObjectHashtable*>(mAttributeTable->Get(&nskey));
   if (xblAttributes) {
     nsISupportsKey key(nsGkAtoms::text);
     void* entry = xblAttributes->Get(&key);
@@ -1058,14 +1056,14 @@ nsXBLPrototypeBinding::ShouldBuildChildFrames() const
 static PRBool PR_CALLBACK
 DeleteAttributeEntry(nsHashKey* aKey, void* aData, void* aClosure)
 {
-  nsXBLAttributeEntry::Destroy(NS_STATIC_CAST(nsXBLAttributeEntry*, aData));
+  nsXBLAttributeEntry::Destroy(static_cast<nsXBLAttributeEntry*>(aData));
   return PR_TRUE;
 }
 
 static PRBool PR_CALLBACK
 DeleteAttributeTable(nsHashKey* aKey, void* aData, void* aClosure)
 {
-  delete NS_STATIC_CAST(nsObjectHashtable*, aData);
+  delete static_cast<nsObjectHashtable*>(aData);
   return PR_TRUE;
 }
 
@@ -1134,7 +1132,7 @@ nsXBLPrototypeBinding::ConstructAttributeTable(nsIContent* aElement)
 
         nsPRUint32Key nskey(atomNsID);
         nsObjectHashtable* attributesNS =
-          NS_STATIC_CAST(nsObjectHashtable*, mAttributeTable->Get(&nskey));
+          static_cast<nsObjectHashtable*>(mAttributeTable->Get(&nskey));
         if (!attributesNS) {
           attributesNS = new nsObjectHashtable(nsnull, nsnull,
                                                DeleteAttributeEntry,
@@ -1152,8 +1150,8 @@ nsXBLPrototypeBinding::ConstructAttributeTable(nsIContent* aElement)
         // Now we should see if some element within our anonymous
         // content is already observing this attribute.
         nsISupportsKey key(atom);
-        nsXBLAttributeEntry* entry = NS_STATIC_CAST(nsXBLAttributeEntry*,
-                                                    attributesNS->Get(&key));
+        nsXBLAttributeEntry* entry = static_cast<nsXBLAttributeEntry*>
+                                                (attributesNS->Get(&key));
 
         if (!entry) {
           // Put it in the table.
@@ -1189,7 +1187,7 @@ nsXBLPrototypeBinding::ConstructAttributeTable(nsIContent* aElement)
 static PRBool PR_CALLBACK
 DeleteInsertionPointEntry(nsHashKey* aKey, void* aData, void* aClosure)
 {
-  NS_STATIC_CAST(nsXBLInsertionPointEntry*, aData)->Release();
+  static_cast<nsXBLInsertionPointEntry*>(aData)->Release();
   return PR_TRUE;
 }
 
diff --git a/mozilla/content/xbl/src/nsXBLService.cpp b/mozilla/content/xbl/src/nsXBLService.cpp
index 11616fed3b9..ea782d316a6 100644
--- a/mozilla/content/xbl/src/nsXBLService.cpp
+++ b/mozilla/content/xbl/src/nsXBLService.cpp
@@ -742,7 +742,7 @@ nsXBLService::FlushMemory()
 {
   while (!JS_CLIST_IS_EMPTY(&gClassLRUList)) {
     JSCList* lru = gClassLRUList.next;
-    nsXBLJSClass* c = NS_STATIC_CAST(nsXBLJSClass*, lru);
+    nsXBLJSClass* c = static_cast<nsXBLJSClass*>(lru);
 
     JS_REMOVE_AND_INIT_LINK(lru);
     delete c;
@@ -1029,7 +1029,7 @@ nsXBLService::LoadBindingDocumentInfo(nsIContent* aBoundElement,
         listener = bindingManager->GetLoadingDocListener(documentURI);
       if (listener) {
         nsXBLStreamListener* xblListener =
-          NS_STATIC_CAST(nsXBLStreamListener*, listener.get());
+          static_cast<nsXBLStreamListener*>(listener.get());
         // Create a new load observer.
         if (!xblListener->HasRequest(aBindingURI, aBoundElement)) {
           nsXBLBindingRequest* req = nsXBLBindingRequest::Create(mPool, aBindingURI, aBoundElement);
@@ -1178,7 +1178,7 @@ nsXBLService::FetchBindingDocument(nsIContent* aBoundElement, nsIDocument* aBoun
 
     nsCOMPtr<nsIDOMEventTarget> target(do_QueryInterface(doc));
     target->AddEventListener(NS_LITERAL_STRING("load"),
-                             NS_STATIC_CAST(nsIDOMLoadListener*, xblListener),
+                             static_cast<nsIDOMLoadListener*>(xblListener),
                              PR_FALSE);
 
     // Add ourselves to the list of loading docs.
diff --git a/mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp b/mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp
index fe75a1731d0..80c653a88cc 100644
--- a/mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp
+++ b/mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp
@@ -292,7 +292,7 @@ GetEditorKeyBindings()
 static void
 DoCommandCallback(const char *aCommand, void *aData)
 {
-  nsIControllers *controllers = NS_STATIC_CAST(nsIControllers*, aData);
+  nsIControllers *controllers = static_cast<nsIControllers*>(aData);
   if (controllers) {
     nsCOMPtr<nsIController> controller;
     controllers->GetControllerForCommand(aCommand, getter_AddRefs(controller));
diff --git a/mozilla/content/xml/content/src/nsXMLElement.cpp b/mozilla/content/xml/content/src/nsXMLElement.cpp
index ef699fc66e5..803926d0439 100644
--- a/mozilla/content/xml/content/src/nsXMLElement.cpp
+++ b/mozilla/content/xml/content/src/nsXMLElement.cpp
@@ -77,9 +77,9 @@ nsXMLElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
   nsISupports *inst = nsnull;
 
   if (aIID.Equals(NS_GET_IID(nsIDOMNode))) {
-    inst = NS_STATIC_CAST(nsIDOMNode *, this);
+    inst = static_cast<nsIDOMNode *>(this);
   } else if (aIID.Equals(NS_GET_IID(nsIDOMElement))) {
-    inst = NS_STATIC_CAST(nsIDOMElement *, this);
+    inst = static_cast<nsIDOMElement *>(this);
   } else if (aIID.Equals(NS_GET_IID(nsIClassInfo))) {
     inst = NS_GetDOMClassInfoInstance(eDOMClassInfo_Element_id);
     NS_ENSURE_TRUE(inst, NS_ERROR_OUT_OF_MEMORY);
diff --git a/mozilla/content/xml/document/src/nsXMLDocument.cpp b/mozilla/content/xml/document/src/nsXMLDocument.cpp
index 22b88f9e169..84231037dd2 100644
--- a/mozilla/content/xml/document/src/nsXMLDocument.cpp
+++ b/mozilla/content/xml/document/src/nsXMLDocument.cpp
@@ -650,7 +650,7 @@ nsXMLDocument::EndLoad()
 
     nsCxPusher pusher(sgo);
 
-    nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIDocument*, this), nsnull,
+    nsEventDispatcher::Dispatch(static_cast<nsIDocument*>(this), nsnull,
                                 &event, nsnull, &status);
   }    
   nsDocument::EndLoad();  
diff --git a/mozilla/content/xslt/src/base/txStringUtils.cpp b/mozilla/content/xslt/src/base/txStringUtils.cpp
index f2aa8f9887d..df9f4c934f9 100644
--- a/mozilla/content/xslt/src/base/txStringUtils.cpp
+++ b/mozilla/content/xslt/src/base/txStringUtils.cpp
@@ -88,7 +88,7 @@ public:
 
   PRUint32 write( const PRUnichar* aSource, PRUint32 aSourceLength)
   {
-    PRUnichar* cp = NS_CONST_CAST(PRUnichar*, aSource);
+    PRUnichar* cp = const_cast<PRUnichar*>(aSource);
     const PRUnichar* end = aSource + aSourceLength;
     while (cp != end) {
       PRUnichar ch = *cp;
diff --git a/mozilla/content/xslt/src/xml/txXMLParser.cpp b/mozilla/content/xslt/src/xml/txXMLParser.cpp
index d5bfa77348d..4e39fa91f57 100644
--- a/mozilla/content/xslt/src/xml/txXMLParser.cpp
+++ b/mozilla/content/xslt/src/xml/txXMLParser.cpp
@@ -146,7 +146,7 @@ txParseFromStream(istream& aInputStream, const nsAString& aUri,
  */
 
 // shortcut macro for redirection into txXMLParser method calls
-#define TX_XMLPARSER(_userData) NS_STATIC_CAST(txXMLParser*, _userData)
+#define TX_XMLPARSER(_userData) static_cast<txXMLParser*>(_userData)
 #define TX_ENSURE_DATA(_userData)                       \
   PR_BEGIN_MACRO                                        \
     if (!aUserData) {                                   \
@@ -335,9 +335,9 @@ void
 txXMLParser::CharacterData(const XML_Char* aChars, int aLength)
 {
     Node* prevSib = mCurrentNode->getLastChild();
-    const PRUnichar* pChars = NS_STATIC_CAST(const PRUnichar*, aChars);
+    const PRUnichar* pChars = static_cast<const PRUnichar*>(aChars);
     if (prevSib && prevSib->getNodeType() == Node::TEXT_NODE) {
-        NS_STATIC_CAST(NodeDefinition*, prevSib)->appendData(pChars, aLength);
+        static_cast<NodeDefinition*>(prevSib)->appendData(pChars, aLength);
     }
     else {
         // aChars is not null-terminated so we use Substring here.
@@ -351,7 +351,7 @@ void
 txXMLParser::Comment(const XML_Char* aChars)
 {
     Node* node = mDocument->createComment(
-        nsDependentString(NS_STATIC_CAST(const PRUnichar*, aChars)));
+        nsDependentString(static_cast<const PRUnichar*>(aChars)));
     mCurrentNode->appendChild(node);
 }
 
diff --git a/mozilla/content/xslt/src/xml/txXMLUtils.h b/mozilla/content/xslt/src/xml/txXMLUtils.h
index 097f8c8df9c..bb10bb1d0ed 100644
--- a/mozilla/content/xslt/src/xml/txXMLUtils.h
+++ b/mozilla/content/xslt/src/xml/txXMLUtils.h
@@ -166,12 +166,12 @@ public:
         aQName.EndReading(end);
 
         const char *colonPtr;
-        int result = MOZ_XMLCheckQName(NS_REINTERPRET_CAST(const char*,
-                                                           aQName.get()),
-                                       NS_REINTERPRET_CAST(const char*,
-                                                           end),
+        int result = MOZ_XMLCheckQName(reinterpret_cast<const char*>
+                                                       (aQName.get()),
+                                       reinterpret_cast<const char*>
+                                                       (end),
                                        PR_TRUE, &colonPtr);
-        *aColon = NS_REINTERPRET_CAST(const PRUnichar*, colonPtr);
+        *aColon = reinterpret_cast<const PRUnichar*>(colonPtr);
         return result == 0;
 #else
         nsIParserService* ps = nsContentUtils::GetParserService();
@@ -185,7 +185,7 @@ public:
     static PRBool isLetter(PRUnichar aChar)
     {
 #ifdef TX_EXE
-        return MOZ_XMLIsLetter(NS_REINTERPRET_CAST(const char*, &aChar));
+        return MOZ_XMLIsLetter(reinterpret_cast<const char*>(&aChar));
 #else
         nsIParserService* ps = nsContentUtils::GetParserService();
         return ps && ps->IsXMLLetter(aChar);
@@ -198,7 +198,7 @@ public:
     static PRBool isNCNameChar(PRUnichar aChar)
     {
 #ifdef TX_EXE
-        return MOZ_XMLIsNCNameChar(NS_REINTERPRET_CAST(const char*, &aChar));
+        return MOZ_XMLIsNCNameChar(reinterpret_cast<const char*>(&aChar));
 #else
         nsIParserService* ps = nsContentUtils::GetParserService();
         return ps && ps->IsXMLNCNameChar(aChar);
diff --git a/mozilla/content/xslt/src/xpath/nsXPathResult.cpp b/mozilla/content/xslt/src/xpath/nsXPathResult.cpp
index b70dae3317f..5444db5a0c9 100644
--- a/mozilla/content/xslt/src/xpath/nsXPathResult.cpp
+++ b/mozilla/content/xslt/src/xpath/nsXPathResult.cpp
@@ -125,7 +125,7 @@ nsXPathResult::GetSingleNodeValue(nsIDOMNode **aSingleNodeValue)
         return NS_ERROR_DOM_TYPE_ERR;
     }
 
-    txNodeSet *nodeSet = NS_STATIC_CAST(txNodeSet*, mResult.get());
+    txNodeSet *nodeSet = static_cast<txNodeSet*>(mResult.get());
     if (nodeSet->size() > 0) {
         return txXPathNativeNode::getNode(nodeSet->get(0), aSingleNodeValue);
     }
@@ -150,7 +150,7 @@ nsXPathResult::GetSnapshotLength(PRUint32 *aSnapshotLength)
         return NS_ERROR_DOM_TYPE_ERR;
     }
 
-    txNodeSet *nodeSet = NS_STATIC_CAST(txNodeSet*, mResult.get());
+    txNodeSet *nodeSet = static_cast<txNodeSet*>(mResult.get());
     *aSnapshotLength = (PRUint32)nodeSet->size();
 
     return NS_OK;
@@ -171,7 +171,7 @@ nsXPathResult::IterateNext(nsIDOMNode **aResult)
         return NS_ERROR_DOM_INVALID_STATE_ERR;
     }
 
-    txNodeSet *nodeSet = NS_STATIC_CAST(txNodeSet*, mResult.get());
+    txNodeSet *nodeSet = static_cast<txNodeSet*>(mResult.get());
     if (mCurrentPos < (PRUint32)nodeSet->size()) {
         return txXPathNativeNode::getNode(nodeSet->get(mCurrentPos++),
                                           aResult);
@@ -189,7 +189,7 @@ nsXPathResult::SnapshotItem(PRUint32 aIndex, nsIDOMNode **aResult)
         return NS_ERROR_DOM_TYPE_ERR;
     }
 
-    txNodeSet *nodeSet = NS_STATIC_CAST(txNodeSet*, mResult.get());
+    txNodeSet *nodeSet = static_cast<txNodeSet*>(mResult.get());
     if (aIndex < (PRUint32)nodeSet->size()) {
         return txXPathNativeNode::getNode(nodeSet->get(aIndex), aResult);
     }
@@ -274,7 +274,7 @@ nsXPathResult::SetExprResult(txAExprResult* aExprResult, PRUint16 aResultType)
 
     mInvalidIteratorState = PR_FALSE;
 
-    txNodeSet* nodeSet = NS_STATIC_CAST(txNodeSet*, aExprResult);
+    txNodeSet* nodeSet = static_cast<txNodeSet*>(aExprResult);
     nsCOMPtr<nsIDOMNode> node;
     if (nodeSet->size() > 0) {
         nsresult rv = txXPathNativeNode::getNode(nodeSet->get(0),
@@ -360,8 +360,8 @@ txResultHolder::set(txAExprResult *aResult)
 
     if (mResult && mResult->getResultType() == txAExprResult::NODESET) {
         txNodeSet *nodeSet =
-            NS_STATIC_CAST(txNodeSet*,
-                           NS_STATIC_CAST(txAExprResult*, mResult));
+            static_cast<txNodeSet*>
+                       (static_cast<txAExprResult*>(mResult));
         PRInt32 i, count = nodeSet->size();
         for (i = 0; i < count; ++i) {
             txXPathNativeNode::addRef(nodeSet->get(i));
@@ -374,8 +374,8 @@ txResultHolder::releaseNodeSet()
 {
     if (mResult && mResult->getResultType() == txAExprResult::NODESET) {
         txNodeSet *nodeSet =
-            NS_STATIC_CAST(txNodeSet*,
-                           NS_STATIC_CAST(txAExprResult*, mResult));
+            static_cast<txNodeSet*>
+                       (static_cast<txAExprResult*>(mResult));
         PRInt32 i, count = nodeSet->size();
         for (i = 0; i < count; ++i) {
             txXPathNativeNode::release(nodeSet->get(i));
diff --git a/mozilla/content/xslt/src/xpath/txCoreFunctionCall.cpp b/mozilla/content/xslt/src/xpath/txCoreFunctionCall.cpp
index e040a5aab2b..f4d92bddf72 100755
--- a/mozilla/content/xslt/src/xpath/txCoreFunctionCall.cpp
+++ b/mozilla/content/xslt/src/xpath/txCoreFunctionCall.cpp
@@ -134,9 +134,9 @@ txCoreFunctionCall::evaluate(txIEvalContext* aContext, txAExprResult** aResult)
             txXPathTreeWalker walker(aContext->getContextNode());
             
             if (exprResult->getResultType() == txAExprResult::NODESET) {
-                txNodeSet* nodes = NS_STATIC_CAST(txNodeSet*,
-                                                  NS_STATIC_CAST(txAExprResult*,
-                                                                 exprResult));
+                txNodeSet* nodes = static_cast<txNodeSet*>
+                                              (static_cast<txAExprResult*>
+                                                          (exprResult));
                 PRInt32 i;
                 for (i = 0; i < nodes->size(); ++i) {
                     nsAutoString idList;
@@ -741,7 +741,7 @@ txCoreFunctionCall::getTypeFromAtom(nsIAtom* aName, eType& aType)
     PRUint32 i;
     for (i = 0; i < NS_ARRAY_LENGTH(descriptTable); ++i) {
         if (aName == *descriptTable[i].mName) {
-            aType = NS_STATIC_CAST(eType, i);
+            aType = static_cast<eType>(i);
 
             return PR_TRUE;
         }
diff --git a/mozilla/content/xslt/src/xpath/txExprParser.cpp b/mozilla/content/xslt/src/xpath/txExprParser.cpp
index 64de62311e1..36d91927f06 100644
--- a/mozilla/content/xslt/src/xpath/txExprParser.cpp
+++ b/mozilla/content/xslt/src/xpath/txExprParser.cpp
@@ -339,12 +339,12 @@ txExprParser::createExpr(txExprLexer& lexer, txIParseContext* aContext,
         short tokPrecedence = precedence(tok);
         if (tokPrecedence != 0) {
             while (!exprs.isEmpty() && tokPrecedence
-                   <= precedence(NS_STATIC_CAST(Token*, ops.peek()))) {
+                   <= precedence(static_cast<Token*>(ops.peek()))) {
                 // can't use expr as argument due to order of evaluation
-                nsAutoPtr<Expr> left(NS_STATIC_CAST(Expr*, exprs.pop()));
+                nsAutoPtr<Expr> left(static_cast<Expr*>(exprs.pop()));
                 nsAutoPtr<Expr> right(expr);
                 rv = createBinaryExpr(left, right,
-                                      NS_STATIC_CAST(Token*, ops.pop()),
+                                      static_cast<Token*>(ops.pop()),
                                       getter_Transfers(expr));
                 if (NS_FAILED(rv)) {
                     done = PR_TRUE;
@@ -361,14 +361,14 @@ txExprParser::createExpr(txExprLexer& lexer, txIParseContext* aContext,
     }
 
     while (NS_SUCCEEDED(rv) && !exprs.isEmpty()) {
-        nsAutoPtr<Expr> left(NS_STATIC_CAST(Expr*, exprs.pop()));
+        nsAutoPtr<Expr> left(static_cast<Expr*>(exprs.pop()));
         nsAutoPtr<Expr> right(expr);
-        rv = createBinaryExpr(left, right, NS_STATIC_CAST(Token*, ops.pop()),
+        rv = createBinaryExpr(left, right, static_cast<Token*>(ops.pop()),
                               getter_Transfers(expr));
     }
     // clean up on error
     while (!exprs.isEmpty()) {
-        delete NS_STATIC_CAST(Expr*, exprs.pop());
+        delete static_cast<Expr*>(exprs.pop());
     }
     NS_ENSURE_SUCCESS(rv, rv);
 
@@ -716,7 +716,7 @@ txExprParser::createPathExpr(txExprLexer& lexer, txIParseContext* aContext,
         NS_ENSURE_TRUE(expr, NS_ERROR_OUT_OF_MEMORY);
 
 #ifdef TX_TO_STRING
-        NS_STATIC_CAST(RootExpr*, expr.get())->setSerialize(PR_FALSE);
+        static_cast<RootExpr*>(expr.get())->setSerialize(PR_FALSE);
 #endif
     }
     
diff --git a/mozilla/content/xslt/src/xpath/txFilterExpr.cpp b/mozilla/content/xslt/src/xpath/txFilterExpr.cpp
index 65d2fe2d9df..0429997876c 100644
--- a/mozilla/content/xslt/src/xpath/txFilterExpr.cpp
+++ b/mozilla/content/xslt/src/xpath/txFilterExpr.cpp
@@ -68,7 +68,7 @@ FilterExpr::evaluate(txIEvalContext* aContext, txAExprResult** aResult)
                    NS_ERROR_XSLT_NODESET_EXPECTED);
 
     nsRefPtr<txNodeSet> nodes =
-        NS_STATIC_CAST(txNodeSet*, NS_STATIC_CAST(txAExprResult*, exprRes));
+        static_cast<txNodeSet*>(static_cast<txAExprResult*>(exprRes));
     // null out exprRes so that we can test for shared-ness
     exprRes = nsnull;
 
diff --git a/mozilla/content/xslt/src/xpath/txFunctionCall.cpp b/mozilla/content/xslt/src/xpath/txFunctionCall.cpp
index 4f2dec3c415..f118a85cadd 100644
--- a/mozilla/content/xslt/src/xpath/txFunctionCall.cpp
+++ b/mozilla/content/xslt/src/xpath/txFunctionCall.cpp
@@ -84,7 +84,7 @@ FunctionCall::evaluateToNodeSet(Expr* aExpr, txIEvalContext* aContext,
     }
 
     *aResult =
-        NS_STATIC_CAST(txNodeSet*, NS_STATIC_CAST(txAExprResult*, exprRes));
+        static_cast<txNodeSet*>(static_cast<txAExprResult*>(exprRes));
     NS_ADDREF(*aResult);
 
     return NS_OK;
diff --git a/mozilla/content/xslt/src/xpath/txLiteralExpr.cpp b/mozilla/content/xslt/src/xpath/txLiteralExpr.cpp
index d281d8a247b..daf67f4002f 100644
--- a/mozilla/content/xslt/src/xpath/txLiteralExpr.cpp
+++ b/mozilla/content/xslt/src/xpath/txLiteralExpr.cpp
@@ -109,8 +109,8 @@ txLiteralExpr::toString(nsAString& aStr)
         case txAExprResult::STRING:
         {
             StringResult* strRes =
-                NS_STATIC_CAST(StringResult*, NS_STATIC_CAST(txAExprResult*,
-                                                             mValue));
+                static_cast<StringResult*>(static_cast<txAExprResult*>
+                                       (mValue));
             PRUnichar ch = '\'';
             if (strRes->mValue.FindChar(ch) != kNotFound) {
                 ch = '\"';
diff --git a/mozilla/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp b/mozilla/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
index 17b58140521..f953e8e9f83 100644
--- a/mozilla/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
+++ b/mozilla/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
@@ -126,7 +126,7 @@ txXPathTreeWalker::moveToElementById(const nsAString& aID)
                      "root of subtree wasn't an nsIContent");
 
         content = nsContentUtils::MatchElementId(
-            NS_STATIC_CAST(nsIContent*, rootNode), aID);
+            static_cast<nsIContent*>(rootNode), aID);
     }
 
     if (!content) {
@@ -738,9 +738,9 @@ txXPathNodeUtils::comparePosition(const txXPathNode& aNode,
     PRInt32 i;
     parent = nsnull;
     for (i = 0; i <= lastIndex; ++i) {
-        node = NS_STATIC_CAST(nsINode*, parents.ElementAt(total - i));
-        otherNode = NS_STATIC_CAST(nsINode*,
-                                   otherParents.ElementAt(otherTotal - i));
+        node = static_cast<nsINode*>(parents.ElementAt(total - i));
+        otherNode = static_cast<nsINode*>
+                               (otherParents.ElementAt(otherTotal - i));
         if (node != otherNode) {
             if (!parent) {
                 // The two nodes are in different orphan subtrees.
diff --git a/mozilla/content/xslt/src/xpath/txNodeSet.cpp b/mozilla/content/xslt/src/xpath/txNodeSet.cpp
index 45cd1d1f47b..382d5848899 100644
--- a/mozilla/content/xslt/src/xpath/txNodeSet.cpp
+++ b/mozilla/content/xslt/src/xpath/txNodeSet.cpp
@@ -48,12 +48,12 @@
 #ifdef NS_BUILD_REFCNT_LOGGING
 #define LOG_CHUNK_MOVE(_start, _new_start, _count)            \
 {                                                             \
-    txXPathNode *start = NS_CONST_CAST(txXPathNode*, _start); \
+    txXPathNode *start = const_cast<txXPathNode*>(_start); \
     while (start < _start + _count) {                         \
         NS_LogDtor(start, "txXPathNode", sizeof(*start));     \
         ++start;                                              \
     }                                                         \
-    start = NS_CONST_CAST(txXPathNode*, _new_start);          \
+    start = const_cast<txXPathNode*>(_new_start);          \
     while (start < _new_start + _count) {                     \
         NS_LogCtor(start, "txXPathNode", sizeof(*start));     \
         ++start;                                              \
@@ -558,8 +558,8 @@ PRBool txNodeSet::ensureGrowSize(PRInt32 aSize)
         newLength *= kTxNodeSetGrowFactor;
     }
 
-    txXPathNode* newArr = NS_STATIC_CAST(txXPathNode*,
-                                         nsMemory::Alloc(newLength *
+    txXPathNode* newArr = static_cast<txXPathNode*>
+                                     (nsMemory::Alloc(newLength *
                                                          sizeof(txXPathNode)));
     if (!newArr) {
         return PR_FALSE;
diff --git a/mozilla/content/xslt/src/xpath/txPathExpr.cpp b/mozilla/content/xslt/src/xpath/txPathExpr.cpp
index 904363eed02..ef7e13f4527 100644
--- a/mozilla/content/xslt/src/xpath/txPathExpr.cpp
+++ b/mozilla/content/xslt/src/xpath/txPathExpr.cpp
@@ -92,9 +92,9 @@ PathExpr::evaluate(txIEvalContext* aContext, txAExprResult** aResult)
     NS_ENSURE_TRUE(res->getResultType() == txAExprResult::NODESET,
                    NS_ERROR_XSLT_NODESET_EXPECTED);
 
-    nsRefPtr<txNodeSet> nodes = NS_STATIC_CAST(txNodeSet*,
-                                               NS_STATIC_CAST(txAExprResult*,
-                                                              res));
+    nsRefPtr<txNodeSet> nodes = static_cast<txNodeSet*>
+                                           (static_cast<txAExprResult*>
+                                                       (res));
     if (nodes->isEmpty()) {
         res.swap(*aResult);
 
@@ -129,9 +129,9 @@ PathExpr::evaluate(txIEvalContext* aContext, txAExprResult** aResult)
                     //XXX ErrorReport: report nonnodeset error
                     return NS_ERROR_XSLT_NODESET_EXPECTED;
                 }
-                resNodes = NS_STATIC_CAST(txNodeSet*,
-                                          NS_STATIC_CAST(txAExprResult*,
-                                                         res));
+                resNodes = static_cast<txNodeSet*>
+                                      (static_cast<txAExprResult*>
+                                                  (res));
             }
 
             if (tmpNodes) {
@@ -184,8 +184,8 @@ PathExpr::evalDescendants(Expr* aStep, const txXPathNode& aNode,
         return NS_ERROR_XSLT_NODESET_EXPECTED;
     }
 
-    txNodeSet* oldSet = NS_STATIC_CAST(txNodeSet*,
-                                       NS_STATIC_CAST(txAExprResult*, res));
+    txNodeSet* oldSet = static_cast<txNodeSet*>
+                                   (static_cast<txAExprResult*>(res));
     nsRefPtr<txNodeSet> newSet;
     rv = aContext->recycler()->getNonSharedNodeSet(oldSet,
                                                    getter_AddRefs(newSet));
diff --git a/mozilla/content/xslt/src/xpath/txRelationalExpr.cpp b/mozilla/content/xslt/src/xpath/txRelationalExpr.cpp
index a2a26dbcc26..8d5ba79d467 100644
--- a/mozilla/content/xslt/src/xpath/txRelationalExpr.cpp
+++ b/mozilla/content/xslt/src/xpath/txRelationalExpr.cpp
@@ -60,7 +60,7 @@ RelationalExpr::compareResults(txIEvalContext* aContext, txAExprResult* aLeft,
             return compareResults(aContext, &leftBool, aRight);
         }
 
-        txNodeSet* nodeSet = NS_STATIC_CAST(txNodeSet*, aLeft);
+        txNodeSet* nodeSet = static_cast<txNodeSet*>(aLeft);
         nsRefPtr<StringResult> strResult;
         rv = aContext->recycler()->getStringResult(getter_AddRefs(strResult));
         NS_ENSURE_SUCCESS(rv, rv);
@@ -85,7 +85,7 @@ RelationalExpr::compareResults(txIEvalContext* aContext, txAExprResult* aLeft,
             return compareResults(aContext, aLeft, &rightBool);
         }
 
-        txNodeSet* nodeSet = NS_STATIC_CAST(txNodeSet*, aRight);
+        txNodeSet* nodeSet = static_cast<txNodeSet*>(aRight);
         nsRefPtr<StringResult> strResult;
         rv = aContext->recycler()->getStringResult(getter_AddRefs(strResult));
         NS_ENSURE_SUCCESS(rv, rv);
diff --git a/mozilla/content/xslt/src/xpath/txResultRecycler.cpp b/mozilla/content/xslt/src/xpath/txResultRecycler.cpp
index dd88a650ebd..f97d28a9f13 100644
--- a/mozilla/content/xslt/src/xpath/txResultRecycler.cpp
+++ b/mozilla/content/xslt/src/xpath/txResultRecycler.cpp
@@ -51,15 +51,15 @@ txResultRecycler::~txResultRecycler()
 {
     txStackIterator stringIter(&mStringResults);
     while (stringIter.hasNext()) {
-        delete NS_STATIC_CAST(StringResult*, stringIter.next());
+        delete static_cast<StringResult*>(stringIter.next());
     }
     txStackIterator nodesetIter(&mNodeSetResults);
     while (nodesetIter.hasNext()) {
-        delete NS_STATIC_CAST(txNodeSet*, nodesetIter.next());
+        delete static_cast<txNodeSet*>(nodesetIter.next());
     }
     txStackIterator numberIter(&mNumberResults);
     while (numberIter.hasNext()) {
-        delete NS_STATIC_CAST(NumberResult*, numberIter.next());
+        delete static_cast<NumberResult*>(numberIter.next());
     }
 
     NS_IF_RELEASE(mEmptyStringResult);
@@ -103,7 +103,7 @@ txResultRecycler::recycle(txAExprResult* aResult)
     switch (aResult->getResultType()) {
         case txAExprResult::STRING:
         {
-            rv = mStringResults.push(NS_STATIC_CAST(StringResult*, aResult));
+            rv = mStringResults.push(static_cast<StringResult*>(aResult));
             if (NS_FAILED(rv)) {
                 delete aResult;
             }
@@ -111,7 +111,7 @@ txResultRecycler::recycle(txAExprResult* aResult)
         }
         case txAExprResult::NODESET:
         {
-            rv = mNodeSetResults.push(NS_STATIC_CAST(txNodeSet*, aResult));
+            rv = mNodeSetResults.push(static_cast<txNodeSet*>(aResult));
             if (NS_FAILED(rv)) {
                 delete aResult;
             }
@@ -119,7 +119,7 @@ txResultRecycler::recycle(txAExprResult* aResult)
         }
         case txAExprResult::NUMBER:
         {
-            rv = mNumberResults.push(NS_STATIC_CAST(NumberResult*, aResult));
+            rv = mNumberResults.push(static_cast<NumberResult*>(aResult));
             if (NS_FAILED(rv)) {
                 delete aResult;
             }
@@ -140,7 +140,7 @@ txResultRecycler::getStringResult(StringResult** aResult)
         NS_ENSURE_TRUE(*aResult, NS_ERROR_OUT_OF_MEMORY);
     }
     else {
-        *aResult = NS_STATIC_CAST(StringResult*, mStringResults.pop());
+        *aResult = static_cast<StringResult*>(mStringResults.pop());
         (*aResult)->mValue.Truncate();
         (*aResult)->mRecycler = this;
     }
@@ -159,7 +159,7 @@ txResultRecycler::getStringResult(const nsAString& aValue,
     }
     else {
         StringResult* strRes =
-            NS_STATIC_CAST(StringResult*, mStringResults.pop());
+            static_cast<StringResult*>(mStringResults.pop());
         strRes->mValue = aValue;
         strRes->mRecycler = this;
         *aResult = strRes;
@@ -184,7 +184,7 @@ txResultRecycler::getNodeSet(txNodeSet** aResult)
         NS_ENSURE_TRUE(*aResult, NS_ERROR_OUT_OF_MEMORY);
     }
     else {
-        *aResult = NS_STATIC_CAST(txNodeSet*, mNodeSetResults.pop());
+        *aResult = static_cast<txNodeSet*>(mNodeSetResults.pop());
         (*aResult)->clear();
         (*aResult)->mRecycler = this;
     }
@@ -201,7 +201,7 @@ txResultRecycler::getNodeSet(txNodeSet* aNodeSet, txNodeSet** aResult)
         NS_ENSURE_TRUE(*aResult, NS_ERROR_OUT_OF_MEMORY);
     }
     else {
-        *aResult = NS_STATIC_CAST(txNodeSet*, mNodeSetResults.pop());
+        *aResult = static_cast<txNodeSet*>(mNodeSetResults.pop());
         (*aResult)->clear();
         (*aResult)->append(*aNodeSet);
         (*aResult)->mRecycler = this;
@@ -219,7 +219,7 @@ txResultRecycler::getNodeSet(const txXPathNode& aNode, txAExprResult** aResult)
         NS_ENSURE_TRUE(*aResult, NS_ERROR_OUT_OF_MEMORY);
     }
     else {
-        txNodeSet* nodes = NS_STATIC_CAST(txNodeSet*, mNodeSetResults.pop());
+        txNodeSet* nodes = static_cast<txNodeSet*>(mNodeSetResults.pop());
         nodes->clear();
         nodes->append(aNode);
         nodes->mRecycler = this;
@@ -238,7 +238,7 @@ txResultRecycler::getNodeSet(const txXPathNode& aNode, txNodeSet** aResult)
         NS_ENSURE_TRUE(*aResult, NS_ERROR_OUT_OF_MEMORY);
     }
     else {
-        *aResult = NS_STATIC_CAST(txNodeSet*, mNodeSetResults.pop());
+        *aResult = static_cast<txNodeSet*>(mNodeSetResults.pop());
         (*aResult)->clear();
         (*aResult)->append(aNode);
         (*aResult)->mRecycler = this;
@@ -257,7 +257,7 @@ txResultRecycler::getNumberResult(double aValue, txAExprResult** aResult)
     }
     else {
         NumberResult* numRes =
-            NS_STATIC_CAST(NumberResult*, mNumberResults.pop());
+            static_cast<NumberResult*>(mNumberResults.pop());
         numRes->value = aValue;
         numRes->mRecycler = this;
         *aResult = numRes;
diff --git a/mozilla/content/xslt/src/xpath/txStandaloneXPathTreeWalker.cpp b/mozilla/content/xslt/src/xpath/txStandaloneXPathTreeWalker.cpp
index 449b9e649e3..1b6e036e37c 100644
--- a/mozilla/content/xslt/src/xpath/txStandaloneXPathTreeWalker.cpp
+++ b/mozilla/content/xslt/src/xpath/txStandaloneXPathTreeWalker.cpp
@@ -72,7 +72,7 @@ txXPathTreeWalker::moveToElementById(const nsAString& aID)
 {
     Document* document;
     if (INNER->nodeType == Node::DOCUMENT_NODE) {
-        document = NS_STATIC_CAST(Document*, INNER);
+        document = static_cast<Document*>(INNER);
     }
     else {
         document = INNER->ownerDocument;
@@ -96,7 +96,7 @@ txXPathTreeWalker::moveToFirstAttribute()
         return PR_FALSE;
     }
 
-    Element* element = NS_STATIC_CAST(Element*, INNER);
+    Element* element = static_cast<Element*>(INNER);
     Attr *attribute = element->getFirstAttribute();
     while (attribute) {
         if (attribute->getNamespaceID() != kNameSpaceID_XMLNS) {
@@ -119,7 +119,7 @@ txXPathTreeWalker::moveToNextAttribute()
         return PR_FALSE;
     }
 
-    Element* element = NS_STATIC_CAST(Element*, INNER->getXPathParent());
+    Element* element = static_cast<Element*>(INNER->getXPathParent());
     Attr *attribute = element->getFirstAttribute();
     while (attribute != INNER) {
         attribute = attribute->getNextAttribute();
@@ -148,7 +148,7 @@ txXPathTreeWalker::moveToNamedAttribute(nsIAtom* aLocalName, PRInt32 aNSID)
         return PR_FALSE;
     }
 
-    Element* element = NS_STATIC_CAST(Element*, INNER);
+    Element* element = static_cast<Element*>(INNER);
     NamedNodeMap* attrs = element->getAttributes();
     NodeListDefinition::ListItem* item = attrs->firstItem;
     // find requested attribute
@@ -162,7 +162,7 @@ txXPathTreeWalker::moveToNamedAttribute(nsIAtom* aLocalName, PRInt32 aNSID)
         return PR_FALSE;
     }
 
-    INNER = NS_STATIC_CAST(NodeDefinition*, item->node);
+    INNER = static_cast<NodeDefinition*>(item->node);
     return PR_TRUE;
 }
 
@@ -218,7 +218,7 @@ PRBool
 txXPathTreeWalker::moveToParent()
 {
     if (INNER->nodeType == Node::ATTRIBUTE_NODE) {
-        INNER = NS_STATIC_CAST(NodeDefinition*, INNER->getXPathParent());
+        INNER = static_cast<NodeDefinition*>(INNER->getXPathParent());
         return PR_TRUE;
     }
 
@@ -253,7 +253,7 @@ txXPathNodeUtils::getAttr(const txXPathNode& aNode, nsIAtom* aLocalName,
         return PR_FALSE;
     }
 
-    Element* elem = NS_STATIC_CAST(Element*, aNode.mInner);
+    Element* elem = static_cast<Element*>(aNode.mInner);
     return elem->getAttr(aLocalName, aNSID, aValue);
 }
 
@@ -310,8 +310,8 @@ txXPathNodeUtils::appendNodeValueHelper(NodeDefinition* aNode,
                                         nsAString& aResult)
 {
 
-    NodeDefinition* child = NS_STATIC_CAST(NodeDefinition*,
-                                           aNode->getFirstChild());
+    NodeDefinition* child = static_cast<NodeDefinition*>
+                                       (aNode->getFirstChild());
     while (child) {
         switch (child->getNodeType()) {
             case Node::TEXT_NODE:
@@ -323,7 +323,7 @@ txXPathNodeUtils::appendNodeValueHelper(NodeDefinition* aNode,
                 appendNodeValueHelper(child, aResult);
             }
         }
-        child = NS_STATIC_CAST(NodeDefinition*, child->getNextSibling());
+        child = static_cast<NodeDefinition*>(child->getNextSibling());
     }
 }
 
@@ -417,7 +417,7 @@ txXPathNode*
 txXPathNativeNode::createXPathNode(Node* aNode)
 {
     if (aNode != nsnull) {
-        return new txXPathNode(NS_STATIC_CAST(NodeDefinition*, aNode));
+        return new txXPathNode(static_cast<NodeDefinition*>(aNode));
     }
     return nsnull;
 }
@@ -430,7 +430,7 @@ txXPathNativeNode::getElement(const txXPathNode& aNode, Element** aResult)
         return NS_ERROR_FAILURE;
     }
 
-    *aResult = NS_STATIC_CAST(Element*, aNode.mInner);
+    *aResult = static_cast<Element*>(aNode.mInner);
 
     return NS_OK;
 
@@ -444,7 +444,7 @@ txXPathNativeNode::getDocument(const txXPathNode& aNode, Document** aResult)
         return NS_ERROR_FAILURE;
     }
 
-    *aResult = NS_STATIC_CAST(Document*, aNode.mInner);
+    *aResult = static_cast<Document*>(aNode.mInner);
 
     return NS_OK;
 }
diff --git a/mozilla/content/xslt/src/xpath/txUnionExpr.cpp b/mozilla/content/xslt/src/xpath/txUnionExpr.cpp
index 93be071a4aa..8a48c656d60 100644
--- a/mozilla/content/xslt/src/xpath/txUnionExpr.cpp
+++ b/mozilla/content/xslt/src/xpath/txUnionExpr.cpp
@@ -75,8 +75,8 @@ UnionExpr::evaluate(txIEvalContext* aContext, txAExprResult** aResult)
         }
 
         nsRefPtr<txNodeSet> resultSet, ownedSet;
-        resultSet = NS_STATIC_CAST(txNodeSet*,
-                                   NS_STATIC_CAST(txAExprResult*, exprResult));
+        resultSet = static_cast<txNodeSet*>
+                               (static_cast<txAExprResult*>(exprResult));
         exprResult = nsnull;
         rv = aContext->recycler()->
             getNonSharedNodeSet(resultSet, getter_AddRefs(ownedSet));
diff --git a/mozilla/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp b/mozilla/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp
index f2eb82b2dd3..3b24dddb3c6 100644
--- a/mozilla/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp
+++ b/mozilla/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp
@@ -342,7 +342,7 @@ txParamArrayHolder::~txParamArrayHolder()
     for (i = 0; i < mCount; ++i) {
         nsXPTCVariant &variant = mArray[i];
         if (variant.IsValInterface()) {
-            NS_STATIC_CAST(nsISupports*, variant.val.p)->Release();
+            static_cast<nsISupports*>(variant.val.p)->Release();
         }
         else if (variant.IsValDOMString()) {
             delete (nsAString*)variant.val.p;
@@ -532,8 +532,8 @@ txXPCOMExtensionFunctionCall::evaluate(txIEvalContext* aContext,
     switch (returnType) {
         case NODESET:
         {
-            txINodeSet *nodeSet = NS_STATIC_CAST(txINodeSet*,
-                                                 returnParam.val.p);
+            txINodeSet *nodeSet = static_cast<txINodeSet*>
+                                             (returnParam.val.p);
 
             NS_ADDREF(*aResult = nodeSet->GetTxNodeSet());
 
@@ -552,8 +552,8 @@ txXPCOMExtensionFunctionCall::evaluate(txIEvalContext* aContext,
         }
         case STRING:
         {
-            nsString *returned = NS_STATIC_CAST(nsString*,
-                                                returnParam.val.p);
+            nsString *returned = static_cast<nsString*>
+                                            (returnParam.val.p);
             return aContext->recycler()->getStringResult(*returned, aResult);
         }
         default:
diff --git a/mozilla/content/xslt/src/xpath/txXPathNode.h b/mozilla/content/xslt/src/xpath/txXPathNode.h
index 3c38de84c6f..f6755b062d0 100644
--- a/mozilla/content/xslt/src/xpath/txXPathNode.h
+++ b/mozilla/content/xslt/src/xpath/txXPathNode.h
@@ -131,12 +131,12 @@ private:
     nsIContent* Content() const
     {
         NS_ASSERTION(isContent() || isAttribute(), "wrong type");
-        return NS_STATIC_CAST(nsIContent*, mNode);
+        return static_cast<nsIContent*>(mNode);
     }
     nsIDocument* Document() const
     {
         NS_ASSERTION(isDocument(), "wrong type");
-        return NS_STATIC_CAST(nsIDocument*, mNode);
+        return static_cast<nsIDocument*>(mNode);
     }
 
     enum PositionType
diff --git a/mozilla/content/xslt/src/xpath/txXPathOptimizer.cpp b/mozilla/content/xslt/src/xpath/txXPathOptimizer.cpp
index 707111285d0..9251fb7e85f 100755
--- a/mozilla/content/xslt/src/xpath/txXPathOptimizer.cpp
+++ b/mozilla/content/xslt/src/xpath/txXPathOptimizer.cpp
@@ -83,7 +83,7 @@ public:
         // This will return an invalid node, but we should never
         // get here so that's fine.
 
-        return *NS_STATIC_CAST(txXPathNode*, nsnull);
+        return *static_cast<txXPathNode*>(nsnull);
     }
     PRUint32 size()
     {
@@ -167,14 +167,14 @@ txXPathOptimizer::optimize(Expr* aInExpr, Expr** aOutExpr)
 nsresult
 txXPathOptimizer::optimizeStep(Expr* aInExpr, Expr** aOutExpr)
 {
-    LocationStep* step = NS_STATIC_CAST(LocationStep*, aInExpr);
+    LocationStep* step = static_cast<LocationStep*>(aInExpr);
 
     if (step->getAxisIdentifier() == LocationStep::ATTRIBUTE_AXIS) {
         // Test for @foo type steps.
         txNameTest* nameTest = nsnull;
         if (!step->getSubExprAt(0) &&
             step->getNodeTest()->getType() == txNameTest::NAME_TEST &&
-            (nameTest = NS_STATIC_CAST(txNameTest*, step->getNodeTest()))->
+            (nameTest = static_cast<txNameTest*>(step->getNodeTest()))->
                 mLocalName != txXPathAtoms::_asterix) {
 
             *aOutExpr = new txNamedAttributeStep(nameTest->mNamespace,
@@ -204,7 +204,7 @@ txXPathOptimizer::optimizeStep(Expr* aInExpr, Expr** aOutExpr)
 nsresult
 txXPathOptimizer::optimizePath(Expr* aInExpr, Expr** aOutExpr)
 {
-    PathExpr* path = NS_STATIC_CAST(PathExpr*, aInExpr);
+    PathExpr* path = static_cast<PathExpr*>(aInExpr);
 
     PRUint32 i;
     Expr* subExpr;
@@ -214,7 +214,7 @@ txXPathOptimizer::optimizePath(Expr* aInExpr, Expr** aOutExpr)
         if (path->getPathOpAt(i) == PathExpr::DESCENDANT_OP &&
             subExpr->getType() == Expr::LOCATIONSTEP_EXPR &&
             !subExpr->getSubExprAt(0)) {
-            LocationStep* step = NS_STATIC_CAST(LocationStep*, subExpr);
+            LocationStep* step = static_cast<LocationStep*>(subExpr);
             if (step->getAxisIdentifier() == LocationStep::CHILD_AXIS) {
                 step->setAxisIdentifier(LocationStep::DESCENDANT_AXIS);
                 path->setPathOpAt(i, PathExpr::RELATIVE_OP);
@@ -232,13 +232,13 @@ txXPathOptimizer::optimizePath(Expr* aInExpr, Expr** aOutExpr)
     if (subExpr->getType() == Expr::LOCATIONSTEP_EXPR &&
         path->getSubExprAt(1) &&
         path->getPathOpAt(1) != PathExpr::DESCENDANT_OP) {
-        step = NS_STATIC_CAST(LocationStep*, subExpr);
+        step = static_cast<LocationStep*>(subExpr);
         if (step->getAxisIdentifier() == LocationStep::SELF_AXIS &&
             !step->getSubExprAt(0)) {
             txNodeTest* test = step->getNodeTest();
             txNodeTypeTest* typeTest;
             if (test->getType() == txNodeTest::NODETYPE_TEST &&
-                (typeTest = NS_STATIC_CAST(txNodeTypeTest*, test))->
+                (typeTest = static_cast<txNodeTypeTest*>(test))->
                   getNodeTestType() == txNodeTypeTest::NODE_TYPE) {
                 // We have a '.' as first step followed by a single '/'.
 
@@ -263,7 +263,7 @@ txXPathOptimizer::optimizePath(Expr* aInExpr, Expr** aOutExpr)
 nsresult
 txXPathOptimizer::optimizeUnion(Expr* aInExpr, Expr** aOutExpr)
 {
-    UnionExpr* uni = NS_STATIC_CAST(UnionExpr*, aInExpr);
+    UnionExpr* uni = static_cast<UnionExpr*>(aInExpr);
 
     // Check for expressions like "foo | bar" and
     // "descendant::foo | descendant::bar"
@@ -277,7 +277,7 @@ txXPathOptimizer::optimizeUnion(Expr* aInExpr, Expr** aOutExpr)
             continue;
         }
 
-        LocationStep* currentStep = NS_STATIC_CAST(LocationStep*, subExpr);
+        LocationStep* currentStep = static_cast<LocationStep*>(subExpr);
         LocationStep::LocationStepType axis = currentStep->getAxisIdentifier();
 
         txUnionNodeTest* unionTest = nsnull;
@@ -291,7 +291,7 @@ txXPathOptimizer::optimizeUnion(Expr* aInExpr, Expr** aOutExpr)
                 continue;
             }
 
-            LocationStep* step = NS_STATIC_CAST(LocationStep*, subExpr);
+            LocationStep* step = static_cast<LocationStep*>(subExpr);
             if (step->getAxisIdentifier() != axis) {
                 continue;
             }
diff --git a/mozilla/content/xslt/src/xslt/txBufferingHandler.cpp b/mozilla/content/xslt/src/xslt/txBufferingHandler.cpp
index 3627e6f5355..6ea2178eea2 100644
--- a/mozilla/content/xslt/src/xslt/txBufferingHandler.cpp
+++ b/mozilla/content/xslt/src/xslt/txBufferingHandler.cpp
@@ -236,7 +236,7 @@ txBufferingHandler::characters(const nsSubstring& aData, PRBool aDOE)
     txOutputTransaction* transaction = mBuffer->getLastTransaction();
     if (transaction && transaction->mType == type) {
         mBuffer->mStringValue.Append(aData);
-        NS_STATIC_CAST(txCharacterTransaction*, transaction)->mLength +=
+        static_cast<txCharacterTransaction*>(transaction)->mLength +=
             aData.Length();
         return NS_OK;
     }
@@ -350,7 +350,7 @@ txBufferingHandler::startElement(nsIAtom* aPrefix,
 PR_STATIC_CALLBACK(PRBool)
 deleteTransaction(void* aElement, void *aData)
 {
-    delete NS_STATIC_CAST(txOutputTransaction*, aElement);
+    delete static_cast<txOutputTransaction*>(aElement);
     return PR_TRUE;
 }
 
@@ -378,17 +378,17 @@ struct Holder
 PR_STATIC_CALLBACK(PRBool)
 flushTransaction(void* aElement, void *aData)
 {
-    Holder* holder = NS_STATIC_CAST(Holder*, aData);
+    Holder* holder = static_cast<Holder*>(aData);
     txAXMLEventHandler* handler = *holder->mHandler;
     txOutputTransaction* transaction =
-        NS_STATIC_CAST(txOutputTransaction*, aElement);
+        static_cast<txOutputTransaction*>(aElement);
 
     nsresult rv;
     switch (transaction->mType) {
         case txOutputTransaction::eAttributeAtomTransaction:
         {
             txAttributeAtomTransaction* transaction =
-                NS_STATIC_CAST(txAttributeAtomTransaction*, aElement);
+                static_cast<txAttributeAtomTransaction*>(aElement);
             rv = handler->attribute(transaction->mPrefix,
                                     transaction->mLocalName,
                                     transaction->mLowercaseLocalName,
@@ -399,7 +399,7 @@ flushTransaction(void* aElement, void *aData)
         case txOutputTransaction::eAttributeTransaction:
         {
             txAttributeTransaction* attrTransaction =
-                NS_STATIC_CAST(txAttributeTransaction*, aElement);
+                static_cast<txAttributeTransaction*>(aElement);
             rv = handler->attribute(attrTransaction->mPrefix,
                                     attrTransaction->mLocalName,
                                     attrTransaction->mNsID,
@@ -410,7 +410,7 @@ flushTransaction(void* aElement, void *aData)
         case txOutputTransaction::eCharacterNoOETransaction:
         {
             txCharacterTransaction* charTransaction =
-                NS_STATIC_CAST(txCharacterTransaction*, aElement);
+                static_cast<txCharacterTransaction*>(aElement);
             nsAFlatString::const_char_iterator& start =
                 holder->mIter;
             nsAFlatString::const_char_iterator end =
@@ -424,7 +424,7 @@ flushTransaction(void* aElement, void *aData)
         case txOutputTransaction::eCommentTransaction:
         {
             txCommentTransaction* commentTransaction =
-                NS_STATIC_CAST(txCommentTransaction*, aElement);
+                static_cast<txCommentTransaction*>(aElement);
             rv = handler->comment(commentTransaction->mValue);
             break;
         }
@@ -436,7 +436,7 @@ flushTransaction(void* aElement, void *aData)
         case txOutputTransaction::ePITransaction:
         {
             txPITransaction* piTransaction =
-                NS_STATIC_CAST(txPITransaction*, aElement);
+                static_cast<txPITransaction*>(aElement);
             rv = handler->processingInstruction(piTransaction->mTarget,
                                                 piTransaction->mData);
             break;
@@ -449,7 +449,7 @@ flushTransaction(void* aElement, void *aData)
         case txOutputTransaction::eStartElementAtomTransaction:
         {
             txStartElementAtomTransaction* transaction =
-                NS_STATIC_CAST(txStartElementAtomTransaction*, aElement);
+                static_cast<txStartElementAtomTransaction*>(aElement);
             rv = handler->startElement(transaction->mPrefix,
                                        transaction->mLocalName,
                                        transaction->mLowercaseLocalName,
@@ -459,7 +459,7 @@ flushTransaction(void* aElement, void *aData)
         case txOutputTransaction::eStartElementTransaction:
         {
             txStartElementTransaction* transaction =
-                NS_STATIC_CAST(txStartElementTransaction*, aElement);
+                static_cast<txStartElementTransaction*>(aElement);
             rv = handler->startElement(transaction->mPrefix,
                                        transaction->mLocalName,
                                        transaction->mNsID);
@@ -490,5 +490,5 @@ txResultBuffer::getLastTransaction()
     if (last < 0) {
         return nsnull;
     }
-    return NS_STATIC_CAST(txOutputTransaction*, mTransactions[last]);
+    return static_cast<txOutputTransaction*>(mTransactions[last]);
 }
diff --git a/mozilla/content/xslt/src/xslt/txCurrentFunctionCall.cpp b/mozilla/content/xslt/src/xslt/txCurrentFunctionCall.cpp
index 7aa74ca7e84..f03af5b63f8 100644
--- a/mozilla/content/xslt/src/xslt/txCurrentFunctionCall.cpp
+++ b/mozilla/content/xslt/src/xslt/txCurrentFunctionCall.cpp
@@ -28,7 +28,7 @@ CurrentFunctionCall::evaluate(txIEvalContext* aContext, txAExprResult** aResult)
         return NS_ERROR_XPATH_BAD_ARGUMENT_COUNT;
 
     txExecutionState* es = 
-        NS_STATIC_CAST(txExecutionState*, aContext->getPrivateContext());
+        static_cast<txExecutionState*>(aContext->getPrivateContext());
     if (!es) {
         NS_ASSERTION(0,
             "called xslt extension function \"current\" with wrong context");
diff --git a/mozilla/content/xslt/src/xslt/txDocumentFunctionCall.cpp b/mozilla/content/xslt/src/xslt/txDocumentFunctionCall.cpp
index 900499798b6..4d2fc05bc23 100644
--- a/mozilla/content/xslt/src/xslt/txDocumentFunctionCall.cpp
+++ b/mozilla/content/xslt/src/xslt/txDocumentFunctionCall.cpp
@@ -105,7 +105,7 @@ DocumentFunctionCall::evaluate(txIEvalContext* aContext,
 {
     *aResult = nsnull;
     txExecutionState* es =
-        NS_STATIC_CAST(txExecutionState*, aContext->getPrivateContext());
+        static_cast<txExecutionState*>(aContext->getPrivateContext());
 
     nsRefPtr<txNodeSet> nodeSet;
     nsresult rv = aContext->recycler()->getNodeSet(getter_AddRefs(nodeSet));
@@ -143,9 +143,9 @@ DocumentFunctionCall::evaluate(txIEvalContext* aContext,
 
     if (exprResult1->getResultType() == txAExprResult::NODESET) {
         // The first argument is a NodeSet, iterate on its nodes
-        txNodeSet* nodeSet1 = NS_STATIC_CAST(txNodeSet*,
-                                             NS_STATIC_CAST(txAExprResult*,
-                                                            exprResult1));
+        txNodeSet* nodeSet1 = static_cast<txNodeSet*>
+                                         (static_cast<txAExprResult*>
+                                                     (exprResult1));
         PRInt32 i;
         for (i = 0; i < nodeSet1->size(); ++i) {
             const txXPathNode& node = nodeSet1->get(i);
diff --git a/mozilla/content/xslt/src/xslt/txEXSLTFunctions.cpp b/mozilla/content/xslt/src/xslt/txEXSLTFunctions.cpp
index 6623dfc5536..6cacbf47a50 100644
--- a/mozilla/content/xslt/src/xslt/txEXSLTFunctions.cpp
+++ b/mozilla/content/xslt/src/xslt/txEXSLTFunctions.cpp
@@ -67,7 +67,7 @@ static nsresult
 convertRtfToNode(txIEvalContext *aContext, txResultTreeFragment *aRtf)
 {
     txExecutionState* es = 
-        NS_STATIC_CAST(txExecutionState*, aContext->getPrivateContext());
+        static_cast<txExecutionState*>(aContext->getPrivateContext());
     if (!es) {
         NS_ERROR("Need txExecutionState!");
 
@@ -110,7 +110,7 @@ createTextNode(txIEvalContext *aContext, nsString& aValue,
                txXPathNode* *aResult)
 {
     txExecutionState* es = 
-        NS_STATIC_CAST(txExecutionState*, aContext->getPrivateContext());
+        static_cast<txExecutionState*>(aContext->getPrivateContext());
     if (!es) {
         NS_ERROR("Need txExecutionState!");
 
@@ -139,7 +139,7 @@ static nsresult
 createDocFragment(txIEvalContext *aContext, nsIContent** aResult)
 {
     txExecutionState* es = 
-        NS_STATIC_CAST(txExecutionState*, aContext->getPrivateContext());
+        static_cast<txExecutionState*>(aContext->getPrivateContext());
     if (!es) {
         NS_ERROR("Need txExecutionState!");
 
@@ -310,8 +310,8 @@ txEXSLTFunctionCall::evaluate(txIEvalContext *aContext,
                 if (exprResult->getResultType() ==
                     txAExprResult::RESULT_TREE_FRAGMENT) {
                     txResultTreeFragment *rtf =
-                        NS_STATIC_CAST(txResultTreeFragment*,
-                                       exprResult.get());
+                        static_cast<txResultTreeFragment*>
+                                   (exprResult.get());
 
                     const txXPathNode *node = rtf->getNode();
                     if (!node) {
@@ -725,7 +725,7 @@ TX_ConstructEXSLTFunction(nsIAtom *aName,
         txEXSLTFunctionDescriptor& desc = descriptTable[i];
         if (aName == *desc.mName && aNamespaceID == desc.mNamespaceID) {
             *aResult = new txEXSLTFunctionCall(
-                NS_STATIC_CAST(txEXSLTFunctionCall::eType, i));
+                static_cast<txEXSLTFunctionCall::eType>(i));
 
             return *aResult ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
         }
diff --git a/mozilla/content/xslt/src/xslt/txInstructions.cpp b/mozilla/content/xslt/src/xslt/txInstructions.cpp
index 6aaa73c1b33..2bfe93cdf0a 100644
--- a/mozilla/content/xslt/src/xslt/txInstructions.cpp
+++ b/mozilla/content/xslt/src/xslt/txInstructions.cpp
@@ -166,7 +166,7 @@ txAttribute::execute(txExecutionState& aEs)
     }
 
     nsAutoPtr<txTextHandler> handler(
-        NS_STATIC_CAST(txTextHandler*, aEs.popResultHandler()));
+        static_cast<txTextHandler*>(aEs.popResultHandler()));
 
     // add attribute if everything was ok
     return nsId != kNameSpaceID_Unknown ?
@@ -240,7 +240,7 @@ nsresult
 txComment::execute(txExecutionState& aEs)
 {
     nsAutoPtr<txTextHandler> handler(
-        NS_STATIC_CAST(txTextHandler*, aEs.popResultHandler()));
+        static_cast<txTextHandler*>(aEs.popResultHandler()));
     PRUint32 length = handler->mValue.Length();
     PRInt32 pos = 0;
     while ((pos = handler->mValue.FindChar('-', (PRUint32)pos)) != kNotFound) {
@@ -417,9 +417,9 @@ txCopyOf::execute(txExecutionState& aEs)
     switch (exprRes->getResultType()) {
         case txAExprResult::NODESET:
         {
-            txNodeSet* nodes = NS_STATIC_CAST(txNodeSet*,
-                                              NS_STATIC_CAST(txAExprResult*,
-                                                             exprRes));
+            txNodeSet* nodes = static_cast<txNodeSet*>
+                                          (static_cast<txAExprResult*>
+                                                      (exprRes));
             PRInt32 i;
             for (i = 0; i < nodes->size(); ++i) {
                 rv = copyNode(nodes->get(i), aEs);
@@ -430,8 +430,8 @@ txCopyOf::execute(txExecutionState& aEs)
         case txAExprResult::RESULT_TREE_FRAGMENT:
         {
             txResultTreeFragment* rtf =
-                NS_STATIC_CAST(txResultTreeFragment*,
-                               NS_STATIC_CAST(txAExprResult*, exprRes));
+                static_cast<txResultTreeFragment*>
+                           (static_cast<txAExprResult*>(exprRes));
             return rtf->flushToHandler(&aEs.mResultHandler);
         }
         default:
@@ -508,7 +508,7 @@ txLoopNodeSet::execute(txExecutionState& aEs)
 {
     aEs.popTemplateRule();
     txNodeSetContext* context =
-        NS_STATIC_CAST(txNodeSetContext*, aEs.getEvalContext());
+        static_cast<txNodeSetContext*>(aEs.getEvalContext());
     if (!context->hasNext()) {
         delete aEs.popEvalContext();
 
@@ -564,7 +564,7 @@ nsresult
 txMessage::execute(txExecutionState& aEs)
 {
     nsAutoPtr<txTextHandler> handler(
-        NS_STATIC_CAST(txTextHandler*, aEs.popResultHandler()));
+        static_cast<txTextHandler*>(aEs.popResultHandler()));
 
     nsCOMPtr<nsIConsoleService> consoleSvc = 
       do_GetService("@mozilla.org/consoleservice;1");
@@ -617,7 +617,7 @@ nsresult
 txProcessingInstruction::execute(txExecutionState& aEs)
 {
     nsAutoPtr<txTextHandler> handler(
-        NS_STATIC_CAST(txTextHandler*, aEs.popResultHandler()));
+        static_cast<txTextHandler*>(aEs.popResultHandler()));
     XMLUtils::normalizePIValue(handler->mValue);
 
     nsAutoString name;
@@ -645,7 +645,7 @@ txPushNewContext::~txPushNewContext()
     PRInt32 i;
     for (i = 0; i < mSortKeys.Count(); ++i)
     {
-        delete NS_STATIC_CAST(SortKey*, mSortKeys[i]);
+        delete static_cast<SortKey*>(mSortKeys[i]);
     }
 }
 
@@ -662,9 +662,9 @@ txPushNewContext::execute(txExecutionState& aEs)
         return NS_ERROR_XSLT_NODESET_EXPECTED;
     }
     
-    txNodeSet* nodes = NS_STATIC_CAST(txNodeSet*,
-                                      NS_STATIC_CAST(txAExprResult*,
-                                                     exprRes));
+    txNodeSet* nodes = static_cast<txNodeSet*>
+                                  (static_cast<txAExprResult*>
+                                              (exprRes));
     
     if (nodes->isEmpty()) {
         aEs.gotoInstruction(mBailTarget);
@@ -675,7 +675,7 @@ txPushNewContext::execute(txExecutionState& aEs)
     txNodeSorter sorter;
     PRInt32 i, count = mSortKeys.Count();
     for (i = 0; i < count; ++i) {
-        SortKey* sort = NS_STATIC_CAST(SortKey*, mSortKeys[i]);
+        SortKey* sort = static_cast<SortKey*>(mSortKeys[i]);
         rv = sorter.addSortElement(sort->mSelectExpr, sort->mLangExpr,
                                    sort->mDataTypeExpr, sort->mOrderExpr,
                                    sort->mCaseOrderExpr,
@@ -821,7 +821,7 @@ txSetParam::execute(txExecutionState& aEs)
     }
     else {
         nsAutoPtr<txRtfHandler> rtfHandler(
-            NS_STATIC_CAST(txRtfHandler*, aEs.popResultHandler()));
+            static_cast<txRtfHandler*>(aEs.popResultHandler()));
         rv = rtfHandler->getAsRTF(getter_AddRefs(exprRes));
         NS_ENSURE_SUCCESS(rv, rv);
     }
@@ -849,7 +849,7 @@ txSetVariable::execute(txExecutionState& aEs)
     }
     else {
         nsAutoPtr<txRtfHandler> rtfHandler(
-            NS_STATIC_CAST(txRtfHandler*, aEs.popResultHandler()));
+            static_cast<txRtfHandler*>(aEs.popResultHandler()));
         rv = rtfHandler->getAsRTF(getter_AddRefs(exprRes));
         NS_ENSURE_SUCCESS(rv, rv);
     }
diff --git a/mozilla/content/xslt/src/xslt/txKey.h b/mozilla/content/xslt/src/xslt/txKey.h
index 51869d3011a..9efbbdb80f5 100644
--- a/mozilla/content/xslt/src/xslt/txKey.h
+++ b/mozilla/content/xslt/src/xslt/txKey.h
@@ -69,7 +69,7 @@ public:
 struct txKeyValueHashEntry : public PLDHashEntryHdr
 {
     txKeyValueHashEntry(const void* aKey)
-        : mKey(*NS_STATIC_CAST(const txKeyValueHashKey*, aKey)),
+        : mKey(*static_cast<const txKeyValueHashKey*>(aKey)),
           mNodeSet(new txNodeSet(nsnull))
     {
     }
@@ -101,7 +101,7 @@ public:
 struct txIndexedKeyHashEntry : public PLDHashEntryHdr
 {
     txIndexedKeyHashEntry(const void* aKey)
-        : mKey(*NS_STATIC_CAST(const txIndexedKeyHashKey*, aKey)),
+        : mKey(*static_cast<const txIndexedKeyHashKey*>(aKey)),
           mIndexed(PR_FALSE)
     {
     }
diff --git a/mozilla/content/xslt/src/xslt/txKeyFunctionCall.cpp b/mozilla/content/xslt/src/xslt/txKeyFunctionCall.cpp
index 2116a2ceb8c..e1531a7ee3c 100644
--- a/mozilla/content/xslt/src/xslt/txKeyFunctionCall.cpp
+++ b/mozilla/content/xslt/src/xslt/txKeyFunctionCall.cpp
@@ -73,7 +73,7 @@ txKeyFunctionCall::evaluate(txIEvalContext* aContext, txAExprResult** aResult)
         return NS_ERROR_XPATH_BAD_ARGUMENT_COUNT;
 
     txExecutionState* es =
-        NS_STATIC_CAST(txExecutionState*, aContext->getPrivateContext());
+        static_cast<txExecutionState*>(aContext->getPrivateContext());
 
     nsAutoString keyQName;
     nsresult rv = mParams[0]->evaluateToString(aContext, keyQName);
@@ -93,9 +93,9 @@ txKeyFunctionCall::evaluate(txIEvalContext* aContext, txAExprResult** aResult)
     nsRefPtr<txNodeSet> res;
     txNodeSet* nodeSet;
     if (exprResult->getResultType() == txAExprResult::NODESET &&
-        (nodeSet = NS_STATIC_CAST(txNodeSet*,
-                                  NS_STATIC_CAST(txAExprResult*,
-                                                 exprResult)))->size() > 1) {
+        (nodeSet = static_cast<txNodeSet*>
+                              (static_cast<txAExprResult*>
+                                          (exprResult)))->size() > 1) {
         rv = aContext->recycler()->getNodeSet(getter_AddRefs(res));
         NS_ENSURE_SUCCESS(rv, rv);
 
@@ -159,7 +159,7 @@ PRBool
 txKeyValueHashEntry::MatchEntry(const void* aKey) const
 {
     const txKeyValueHashKey* key =
-        NS_STATIC_CAST(const txKeyValueHashKey*, aKey);
+        static_cast<const txKeyValueHashKey*>(aKey);
 
     return mKey.mKeyName == key->mKeyName &&
            mKey.mRootIdentifier == key->mRootIdentifier &&
@@ -170,7 +170,7 @@ PLDHashNumber
 txKeyValueHashEntry::HashKey(const void* aKey)
 {
     const txKeyValueHashKey* key =
-        NS_STATIC_CAST(const txKeyValueHashKey*, aKey);
+        static_cast<const txKeyValueHashKey*>(aKey);
 
     return key->mKeyName.mNamespaceID ^
            NS_PTR_TO_INT32(key->mKeyName.mLocalName.get()) ^
@@ -182,7 +182,7 @@ PRBool
 txIndexedKeyHashEntry::MatchEntry(const void* aKey) const
 {
     const txIndexedKeyHashKey* key =
-        NS_STATIC_CAST(const txIndexedKeyHashKey*, aKey);
+        static_cast<const txIndexedKeyHashKey*>(aKey);
 
     return mKey.mKeyName == key->mKeyName &&
            mKey.mRootIdentifier == key->mRootIdentifier;
@@ -192,7 +192,7 @@ PLDHashNumber
 txIndexedKeyHashEntry::HashKey(const void* aKey)
 {
     const txIndexedKeyHashKey* key =
-        NS_STATIC_CAST(const txIndexedKeyHashKey*, aKey);
+        static_cast<const txIndexedKeyHashKey*>(aKey);
 
     return key->mKeyName.mNamespaceID ^
            NS_PTR_TO_INT32(key->mKeyName.mLocalName.get()) ^
@@ -400,9 +400,9 @@ nsresult txXSLKey::testNode(const txXPathNode& aNode,
             aEs.popEvalContext();
 
             if (exprResult->getResultType() == txAExprResult::NODESET) {
-                txNodeSet* res = NS_STATIC_CAST(txNodeSet*,
-                                                NS_STATIC_CAST(txAExprResult*,
-                                                               exprResult));
+                txNodeSet* res = static_cast<txNodeSet*>
+                                            (static_cast<txAExprResult*>
+                                                        (exprResult));
                 PRInt32 i;
                 for (i = 0; i < res->size(); ++i) {
                     val.Truncate();
diff --git a/mozilla/content/xslt/src/xslt/txMozillaXMLOutput.cpp b/mozilla/content/xslt/src/xslt/txMozillaXMLOutput.cpp
index 488d968834e..44fedd15e12 100644
--- a/mozilla/content/xslt/src/xslt/txMozillaXMLOutput.cpp
+++ b/mozilla/content/xslt/src/xslt/txMozillaXMLOutput.cpp
@@ -315,9 +315,9 @@ txMozillaXMLOutput::endElement()
     NS_ENSURE_TRUE(mCurrentNode->IsNodeOfType(nsINode::eELEMENT),
                    NS_ERROR_UNEXPECTED);
 
-    nsIContent* element = NS_STATIC_CAST(nsIContent*,
-                                         NS_STATIC_CAST(nsINode*,
-                                                        mCurrentNode));
+    nsIContent* element = static_cast<nsIContent*>
+                                     (static_cast<nsINode*>
+                                                 (mCurrentNode));
 
     // Handle html-elements
     if (!mNoFixup) {
@@ -386,7 +386,7 @@ txMozillaXMLOutput::endElement()
     mCurrentNode = parent;
 
     mTableState =
-        NS_STATIC_CAST(TableState, NS_PTR_TO_INT32(mTableStateStack.pop()));
+        static_cast<TableState>(NS_PTR_TO_INT32(mTableStateStack.pop()));
 
     return NS_OK;
 }
@@ -779,8 +779,8 @@ txMozillaXMLOutput::endHTMLElement(nsIContent* aElement)
 
         mCurrentNode = mCurrentNodeStack.SafeObjectAt(last);
         mCurrentNodeStack.RemoveObjectAt(last);
-        mTableState = NS_STATIC_CAST(TableState,
-                                     NS_PTR_TO_INT32(mTableStateStack.pop()));
+        mTableState = static_cast<TableState>
+                                 (NS_PTR_TO_INT32(mTableStateStack.pop()));
 
         return NS_OK;
     }
diff --git a/mozilla/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp b/mozilla/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp
index 905ae477d48..9bdd49f638d 100644
--- a/mozilla/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp
+++ b/mozilla/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp
@@ -515,7 +515,7 @@ txMozillaXSLTProcessor::AddXSLTParam(const nsString& aName,
     NS_ENSURE_SUCCESS(rv, rv);
 
     txExpandedName varName(nsId, name);
-    txVariable* var = NS_STATIC_CAST(txVariable*, mVariables.get(varName));
+    txVariable* var = static_cast<txVariable*>(mVariables.get(varName));
     if (var) {
         var->setValue(value);
         
@@ -678,7 +678,7 @@ txMozillaXSLTProcessor::TransformToDoc(nsIDOMDocument *aOutputDoc,
     if (NS_SUCCEEDED(rv)) {
         if (aResult) {
             txAOutputXMLEventHandler* handler =
-                NS_STATIC_CAST(txAOutputXMLEventHandler*, es.mOutputHandler);
+                static_cast<txAOutputXMLEventHandler*>(es.mOutputHandler);
             handler->getOutputDocument(aResult);
         }
     }
@@ -802,8 +802,8 @@ txMozillaXSLTProcessor::SetParameter(const nsAString & aNamespaceURI,
 
                 if (result->getResultType() == txAExprResult::NODESET) {
                     txNodeSet *nodeSet =
-                        NS_STATIC_CAST(txNodeSet*,
-                                       NS_STATIC_CAST(txAExprResult*, result));
+                        static_cast<txNodeSet*>
+                                   (static_cast<txAExprResult*>(result));
 
                     nsCOMPtr<nsIDOMNode> node;
                     PRInt32 i, count = nodeSet->size();
@@ -882,7 +882,7 @@ txMozillaXSLTProcessor::SetParameter(const nsAString & aNamespaceURI,
                 return NS_ERROR_ILLEGAL_VALUE;
             }
 
-            nsISupports** values = NS_STATIC_CAST(nsISupports**, array);
+            nsISupports** values = static_cast<nsISupports**>(array);
 
             PRUint32 i;
             for (i = 0; i < count; ++i) {
@@ -929,7 +929,7 @@ txMozillaXSLTProcessor::SetParameter(const nsAString & aNamespaceURI,
     nsCOMPtr<nsIAtom> localName = do_GetAtom(aLocalName);
     txExpandedName varName(nsId, localName);
 
-    txVariable* var = NS_STATIC_CAST(txVariable*, mVariables.get(varName));
+    txVariable* var = static_cast<txVariable*>(mVariables.get(varName));
     if (var) {
         var->setValue(value);
         return NS_OK;
@@ -953,7 +953,7 @@ txMozillaXSLTProcessor::GetParameter(const nsAString& aNamespaceURI,
     nsCOMPtr<nsIAtom> localName = do_GetAtom(aLocalName);
     txExpandedName varName(nsId, localName);
 
-    txVariable* var = NS_STATIC_CAST(txVariable*, mVariables.get(varName));
+    txVariable* var = static_cast<txVariable*>(mVariables.get(varName));
     if (var) {
         return var->getValue(aResult);
     }
@@ -1429,8 +1429,8 @@ txVariable::Convert(nsIVariant *aValue, txAExprResult** aResult)
                 NS_ENSURE_TRUE(str, NS_ERROR_FAILURE);
 
                 const PRUnichar *strChars =
-                    NS_REINTERPRET_CAST(const PRUnichar*,
-                                        ::JS_GetStringChars(str));
+                    reinterpret_cast<const PRUnichar*>
+                                    (::JS_GetStringChars(str));
                 nsDependentString value(strChars, ::JS_GetStringLength(str));
 
                 *aResult = new StringResult(value, nsnull);
@@ -1459,7 +1459,7 @@ txVariable::Convert(nsIVariant *aValue, txAExprResult** aResult)
                          type == nsIDataType::VTYPE_INTERFACE_IS,
                          "Huh, we checked this in SetParameter?");
 
-            nsISupports** values = NS_STATIC_CAST(nsISupports**, array);
+            nsISupports** values = static_cast<nsISupports**>(array);
 
             nsRefPtr<txNodeSet> nodeSet = new txNodeSet(nsnull);
             if (!nodeSet) {
diff --git a/mozilla/content/xslt/src/xslt/txNodeSorter.cpp b/mozilla/content/xslt/src/xslt/txNodeSorter.cpp
index 2ea5cf45751..8f52a2d8a02 100644
--- a/mozilla/content/xslt/src/xslt/txNodeSorter.cpp
+++ b/mozilla/content/xslt/src/xslt/txNodeSorter.cpp
@@ -177,12 +177,12 @@ txNodeSorter::sortNodeSet(txNodeSet* aNodes, txExecutionState* aEs,
     NS_ENSURE_SUCCESS(rv, rv);
 
     // Create and set up memoryblock for sort-values and indexarray
-    PRUint32 len = NS_STATIC_CAST(PRUint32, aNodes->size());
+    PRUint32 len = static_cast<PRUint32>(aNodes->size());
     void* mem = PR_Malloc(len * (sizeof(PRUint32) + mNKeys * sizeof(TxObject*)));
     NS_ENSURE_TRUE(mem, NS_ERROR_OUT_OF_MEMORY);
 
-    PRUint32* indexes = NS_STATIC_CAST(PRUint32*, mem);
-    TxObject** sortValues = NS_REINTERPRET_CAST(TxObject**, indexes + len);
+    PRUint32* indexes = static_cast<PRUint32*>(mem);
+    TxObject** sortValues = reinterpret_cast<TxObject**>(indexes + len);
 
     PRUint32 i;
     for (i = 0; i < len; ++i) {
@@ -234,12 +234,12 @@ int
 txNodeSorter::compareNodes(const void* aIndexA, const void* aIndexB,
                            void* aSortData)
 {
-    SortData* sortData = NS_STATIC_CAST(SortData*, aSortData);
+    SortData* sortData = static_cast<SortData*>(aSortData);
     NS_ENSURE_SUCCESS(sortData->mRv, -1);
 
     txListIterator iter(&sortData->mNodeSorter->mSortKeys);
-    PRUint32 indexA = *NS_STATIC_CAST(const PRUint32*, aIndexA);
-    PRUint32 indexB = *NS_STATIC_CAST(const PRUint32*, aIndexB);
+    PRUint32 indexA = *static_cast<const PRUint32*>(aIndexA);
+    PRUint32 indexB = *static_cast<const PRUint32*>(aIndexB);
     TxObject** sortValuesA = sortData->mSortValues +
                              indexA * sortData->mNodeSorter->mNKeys;
     TxObject** sortValuesB = sortData->mSortValues +
diff --git a/mozilla/content/xslt/src/xslt/txPatternOptimizer.cpp b/mozilla/content/xslt/src/xslt/txPatternOptimizer.cpp
index 6cbc496b6d1..584880f7dfa 100755
--- a/mozilla/content/xslt/src/xslt/txPatternOptimizer.cpp
+++ b/mozilla/content/xslt/src/xslt/txPatternOptimizer.cpp
@@ -92,7 +92,7 @@ nsresult
 txPatternOptimizer::optimizeStep(txPattern* aInPattern,
                                  txPattern** aOutPattern)
 {
-    txStepPattern* step = NS_STATIC_CAST(txStepPattern*, aInPattern);
+    txStepPattern* step = static_cast<txStepPattern*>(aInPattern);
 
     // Test for predicates that can be combined into the nodetest
     Expr* pred;
diff --git a/mozilla/content/xslt/src/xslt/txStandaloneStylesheetCompiler.cpp b/mozilla/content/xslt/src/xslt/txStandaloneStylesheetCompiler.cpp
index 5b75f3df855..f5b90e8a10e 100644
--- a/mozilla/content/xslt/src/xslt/txStandaloneStylesheetCompiler.cpp
+++ b/mozilla/content/xslt/src/xslt/txStandaloneStylesheetCompiler.cpp
@@ -117,7 +117,7 @@ TX_CompileStylesheetPath(const txParsedURL& aURL, txStylesheet** aResult)
  */
 
 // shortcut macro for redirection into txDriver method calls
-#define TX_DRIVER(_userData) NS_STATIC_CAST(txDriver*, _userData)
+#define TX_DRIVER(_userData) static_cast<txDriver*>(_userData)
 
 PR_STATIC_CALLBACK(void)
 startElement(void *aUserData, const XML_Char *aName, const XML_Char **aAtts)
@@ -243,8 +243,8 @@ txDriver::StartElement(const XML_Char *aName, const XML_Char **aAtts)
     }
     PRInt32 idOffset = XML_GetIdAttributeIndex(mExpatParser);
     nsresult rv =
-        mCompiler->startElement(NS_STATIC_CAST(const PRUnichar*, aName), 
-                                NS_STATIC_CAST(const PRUnichar**, aAtts),
+        mCompiler->startElement(static_cast<const PRUnichar*>(aName), 
+                                static_cast<const PRUnichar**>(aAtts),
                                 attcount/2, idOffset);
     if (NS_FAILED(rv)) {
         PR_LOG(txLog::xslt, PR_LOG_ALWAYS, 
@@ -266,7 +266,7 @@ txDriver::EndElement(const XML_Char* aName)
 void
 txDriver::CharacterData(const XML_Char* aChars, int aLength)
 {
-    const PRUnichar* pChars = NS_STATIC_CAST(const PRUnichar*, aChars);
+    const PRUnichar* pChars = static_cast<const PRUnichar*>(aChars);
     // ignore rv, as this expat handler returns void
     nsresult rv = mCompiler->characters(Substring(pChars, pChars + aLength));
     if (NS_FAILED(rv)) {
diff --git a/mozilla/content/xslt/src/xslt/txStylesheet.cpp b/mozilla/content/xslt/src/xslt/txStylesheet.cpp
index c4ff582ea83..a5809670c26 100644
--- a/mozilla/content/xslt/src/xslt/txStylesheet.cpp
+++ b/mozilla/content/xslt/src/xslt/txStylesheet.cpp
@@ -118,12 +118,12 @@ txStylesheet::~txStylesheet()
     delete mRootFrame;
     txListIterator frameIter(&mImportFrames);
     while (frameIter.hasNext()) {
-        delete NS_STATIC_CAST(ImportFrame*, frameIter.next());
+        delete static_cast<ImportFrame*>(frameIter.next());
     }
 
     txListIterator instrIter(&mTemplateInstructions);
     while (instrIter.hasNext()) {
-        delete NS_STATIC_CAST(txInstruction*, instrIter.next());
+        delete static_cast<txInstruction*>(instrIter.next());
     }
     
     // We can't make the map own its values because then we wouldn't be able
@@ -149,9 +149,9 @@ txStylesheet::findTemplate(const txXPathNode& aNode,
     txListIterator frameIter(&mImportFrames);
 
     if (aImportedBy) {
-        ImportFrame* curr = NS_STATIC_CAST(ImportFrame*, frameIter.next());
+        ImportFrame* curr = static_cast<ImportFrame*>(frameIter.next());
         while (curr != aImportedBy) {
-               curr = NS_STATIC_CAST(ImportFrame*, frameIter.next());
+               curr = static_cast<ImportFrame*>(frameIter.next());
         }
         endFrame = aImportedBy->mFirstNotImported;
     }
@@ -162,7 +162,7 @@ txStylesheet::findTemplate(const txXPathNode& aNode,
 
     ImportFrame* frame;
     while (!matchTemplate &&
-           (frame = NS_STATIC_CAST(ImportFrame*, frameIter.next())) &&
+           (frame = static_cast<ImportFrame*>(frameIter.next())) &&
            frame != endFrame) {
 
         // get templatelist for this mode
@@ -316,18 +316,18 @@ txStylesheet::doneCompiling()
     // all items
     frameIter.reset();
     ImportFrame* frame;
-    while ((frame = NS_STATIC_CAST(ImportFrame*, frameIter.next()))) {
+    while ((frame = static_cast<ImportFrame*>(frameIter.next()))) {
         nsTPtrArray<txStripSpaceTest> frameStripSpaceTests;
 
         txListIterator itemIter(&frame->mToplevelItems);
         itemIter.resetToEnd();
         txToplevelItem* item;
-        while ((item = NS_STATIC_CAST(txToplevelItem*, itemIter.previous()))) {
+        while ((item = static_cast<txToplevelItem*>(itemIter.previous()))) {
             switch (item->getType()) {
                 case txToplevelItem::attributeSet:
                 {
-                    rv = addAttributeSet(NS_STATIC_CAST(txAttributeSetItem*,
-                                                        item));
+                    rv = addAttributeSet(static_cast<txAttributeSetItem*>
+                                                    (item));
                     NS_ENSURE_SUCCESS(rv, rv);
                     break;
                 }
@@ -338,19 +338,19 @@ txStylesheet::doneCompiling()
                 }
                 case txToplevelItem::output:
                 {
-                    mOutputFormat.merge(NS_STATIC_CAST(txOutputItem*, item)->mFormat);
+                    mOutputFormat.merge(static_cast<txOutputItem*>(item)->mFormat);
                     break;
                 }
                 case txToplevelItem::stripSpace:
                 {
-                    rv = addStripSpace(NS_STATIC_CAST(txStripSpaceItem*, item),
+                    rv = addStripSpace(static_cast<txStripSpaceItem*>(item),
                                        frameStripSpaceTests);
                     NS_ENSURE_SUCCESS(rv, rv);
                     break;
                 }
                 case txToplevelItem::templ:
                 {
-                    rv = addTemplate(NS_STATIC_CAST(txTemplateItem*, item),
+                    rv = addTemplate(static_cast<txTemplateItem*>(item),
                                      frame);
                     NS_ENSURE_SUCCESS(rv, rv);
 
@@ -358,8 +358,8 @@ txStylesheet::doneCompiling()
                 }
                 case txToplevelItem::variable:
                 {
-                    rv = addGlobalVariable(NS_STATIC_CAST(txVariableItem*,
-                                                          item));
+                    rv = addGlobalVariable(static_cast<txVariableItem*>
+                                                      (item));
                     NS_ENSURE_SUCCESS(rv, rv);
 
                     break;
@@ -477,15 +477,15 @@ txStylesheet::addTemplate(txTemplateItem* aTemplate,
 nsresult
 txStylesheet::addFrames(txListIterator& aInsertIter)
 {
-    ImportFrame* frame = NS_STATIC_CAST(ImportFrame*, aInsertIter.current());
+    ImportFrame* frame = static_cast<ImportFrame*>(aInsertIter.current());
     nsresult rv = NS_OK;
     txListIterator iter(&frame->mToplevelItems);
     txToplevelItem* item;
-    while ((item = NS_STATIC_CAST(txToplevelItem*, iter.next()))) {
+    while ((item = static_cast<txToplevelItem*>(iter.next()))) {
         if (item->getType() == txToplevelItem::import) {
-            txImportItem* import = NS_STATIC_CAST(txImportItem*, item);
+            txImportItem* import = static_cast<txImportItem*>(item);
             import->mFrame->mFirstNotImported =
-                NS_STATIC_CAST(ImportFrame*, aInsertIter.next());
+                static_cast<ImportFrame*>(aInsertIter.next());
             rv = aInsertIter.addBefore(import->mFrame);
             NS_ENSURE_SUCCESS(rv, rv);
 
@@ -631,7 +631,7 @@ txStylesheet::ImportFrame::~ImportFrame()
 {
     txListIterator tlIter(&mToplevelItems);
     while (tlIter.hasNext()) {
-        delete NS_STATIC_CAST(txToplevelItem*, tlIter.next());
+        delete static_cast<txToplevelItem*>(tlIter.next());
     }
 }
 
diff --git a/mozilla/content/xslt/src/xslt/txStylesheetCompileHandlers.cpp b/mozilla/content/xslt/src/xslt/txStylesheetCompileHandlers.cpp
index 012ab12f8d6..36e8f0634ab 100644
--- a/mozilla/content/xslt/src/xslt/txStylesheetCompileHandlers.cpp
+++ b/mozilla/content/xslt/src/xslt/txStylesheetCompileHandlers.cpp
@@ -1229,7 +1229,7 @@ txFnEndTopVariable(txStylesheetCompilerState& aState)
 {
     txHandlerTable* prev = aState.mHandlerTable;
     aState.popHandlerTable();
-    txVariableItem* var = NS_STATIC_CAST(txVariableItem*, aState.popPtr());
+    txVariableItem* var = static_cast<txVariableItem*>(aState.popPtr());
 
     if (prev == gTxTopVariableHandler) {
         // No children were found.
@@ -1481,14 +1481,14 @@ txFnEndApplyTemplates(txStylesheetCompilerState& aState)
     aState.popHandlerTable();
 
     txPushNewContext* pushcontext =
-        NS_STATIC_CAST(txPushNewContext*, aState.popObject());
+        static_cast<txPushNewContext*>(aState.popObject());
     nsAutoPtr<txInstruction> instr(pushcontext); // txPushNewContext
     nsresult rv = aState.addInstruction(instr);
     NS_ENSURE_SUCCESS(rv, rv);
 
     aState.popSorter();
 
-    instr = NS_STATIC_CAST(txInstruction*, aState.popObject()); // txApplyTemplates
+    instr = static_cast<txInstruction*>(aState.popObject()); // txApplyTemplates
     nsAutoPtr<txLoopNodeSet> loop(new txLoopNodeSet(instr));
     NS_ENSURE_TRUE(loop, NS_ERROR_OUT_OF_MEMORY);
 
@@ -1559,8 +1559,8 @@ nsresult
 txFnEndAttribute(txStylesheetCompilerState& aState)
 {
     aState.popHandlerTable();
-    nsAutoPtr<txInstruction> instr(NS_STATIC_CAST(txInstruction*,
-                                                  aState.popObject()));
+    nsAutoPtr<txInstruction> instr(static_cast<txInstruction*>
+                                              (aState.popObject()));
     nsresult rv = aState.addInstruction(instr);
     NS_ENSURE_SUCCESS(rv, rv);
 
@@ -1613,8 +1613,7 @@ txFnEndCallTemplate(txStylesheetCompilerState& aState)
     aState.popHandlerTable();
 
     // txCallTemplate
-    nsAutoPtr<txInstruction> instr(NS_STATIC_CAST(txInstruction*, 
-                                                  aState.popObject()));
+    nsAutoPtr<txInstruction> instr(static_cast<txInstruction*>(aState.popObject()));
     nsresult rv = aState.addInstruction(instr);
     NS_ENSURE_SUCCESS(rv, rv);
 
@@ -1662,7 +1661,7 @@ txFnEndChoose(txStylesheetCompilerState& aState)
     aState.popHandlerTable();
     txListIterator iter(aState.mChooseGotoList);
     txGoTo* gotoinstr;
-    while ((gotoinstr = NS_STATIC_CAST(txGoTo*, iter.next()))) {
+    while ((gotoinstr = static_cast<txGoTo*>(iter.next()))) {
         rv = aState.addGotoTarget(&gotoinstr->mTarget);
         NS_ENSURE_SUCCESS(rv, rv);
     }
@@ -1750,7 +1749,7 @@ txFnEndCopy(txStylesheetCompilerState& aState)
     nsresult rv = aState.addInstruction(instr);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    txCopy* copy = NS_STATIC_CAST(txCopy*, aState.popPtr());
+    txCopy* copy = static_cast<txCopy*>(aState.popPtr());
     rv = aState.addGotoTarget(&copy->mBailTarget);
     NS_ENSURE_SUCCESS(rv, rv);
 
@@ -1930,7 +1929,7 @@ txFnEndForEach(txStylesheetCompilerState& aState)
 
     // This is a txPushNullTemplateRule
     txInstruction* pnullrule =
-        NS_STATIC_CAST(txInstruction*, aState.popPtr());
+        static_cast<txInstruction*>(aState.popPtr());
 
     nsAutoPtr<txInstruction> instr(new txLoopNodeSet(pnullrule));
     nsresult rv = aState.addInstruction(instr);
@@ -1938,7 +1937,7 @@ txFnEndForEach(txStylesheetCompilerState& aState)
 
     aState.popSorter();
     txPushNewContext* pushcontext =
-        NS_STATIC_CAST(txPushNewContext*, aState.popPtr());
+        static_cast<txPushNewContext*>(aState.popPtr());
     aState.addGotoTarget(&pushcontext->mBailTarget);
 
     return NS_OK;
@@ -2007,7 +2006,7 @@ nsresult
 txFnEndIf(txStylesheetCompilerState& aState)
 {
     txConditionalGoto* condGoto =
-        NS_STATIC_CAST(txConditionalGoto*, aState.popPtr());
+        static_cast<txConditionalGoto*>(aState.popPtr());
     return aState.addGotoTarget(&condGoto->mTarget);
 }
 
@@ -2051,8 +2050,7 @@ txFnStartMessage(PRInt32 aNamespaceID,
 nsresult
 txFnEndMessage(txStylesheetCompilerState& aState)
 {
-    nsAutoPtr<txInstruction> instr(NS_STATIC_CAST(txInstruction*, 
-                                                  aState.popObject()));
+    nsAutoPtr<txInstruction> instr(static_cast<txInstruction*>(aState.popObject()));
     nsresult rv = aState.addInstruction(instr);
     NS_ENSURE_SUCCESS(rv, rv);
 
@@ -2237,8 +2235,8 @@ txFnStartParam(PRInt32 aNamespaceID,
 nsresult
 txFnEndParam(txStylesheetCompilerState& aState)
 {
-    nsAutoPtr<txSetVariable> var(NS_STATIC_CAST(txSetVariable*,
-                                                aState.popObject()));
+    nsAutoPtr<txSetVariable> var(static_cast<txSetVariable*>
+                                            (aState.popObject()));
     txHandlerTable* prev = aState.mHandlerTable;
     aState.popHandlerTable();
 
@@ -2257,7 +2255,7 @@ txFnEndParam(txStylesheetCompilerState& aState)
     rv = aState.addInstruction(instr);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    txCheckParam* checkParam = NS_STATIC_CAST(txCheckParam*, aState.popPtr());
+    txCheckParam* checkParam = static_cast<txCheckParam*>(aState.popPtr());
     aState.addGotoTarget(&checkParam->mBailTarget);
 
     return NS_OK;
@@ -2303,8 +2301,8 @@ txFnStartPI(PRInt32 aNamespaceID,
 nsresult
 txFnEndPI(txStylesheetCompilerState& aState)
 {
-    nsAutoPtr<txInstruction> instr(NS_STATIC_CAST(txInstruction*,
-                                                  aState.popObject()));
+    nsAutoPtr<txInstruction> instr(static_cast<txInstruction*>
+                                              (aState.popObject()));
     nsresult rv = aState.addInstruction(instr);
     NS_ENSURE_SUCCESS(rv, rv);
 
@@ -2516,8 +2514,8 @@ txFnStartVariable(PRInt32 aNamespaceID,
 nsresult
 txFnEndVariable(txStylesheetCompilerState& aState)
 {
-    nsAutoPtr<txSetVariable> var(NS_STATIC_CAST(txSetVariable*,
-                                                aState.popObject()));
+    nsAutoPtr<txSetVariable> var(static_cast<txSetVariable*>
+                                            (aState.popObject()));
 
     txHandlerTable* prev = aState.mHandlerTable;
     aState.popHandlerTable();
@@ -2623,7 +2621,7 @@ txFnEndWhen(txStylesheetCompilerState& aState)
     NS_ENSURE_SUCCESS(rv, rv);
 
     txConditionalGoto* condGoto =
-        NS_STATIC_CAST(txConditionalGoto*, aState.popPtr());
+        static_cast<txConditionalGoto*>(aState.popPtr());
     rv = aState.addGotoTarget(&condGoto->mTarget);
     NS_ENSURE_SUCCESS(rv, rv);
 
@@ -2681,7 +2679,7 @@ txFnStartWithParam(PRInt32 aNamespaceID,
 nsresult
 txFnEndWithParam(txStylesheetCompilerState& aState)
 {
-    nsAutoPtr<txSetParam> var(NS_STATIC_CAST(txSetParam*, aState.popObject()));
+    nsAutoPtr<txSetParam> var(static_cast<txSetParam*>(aState.popObject()));
     txHandlerTable* prev = aState.mHandlerTable;
     aState.popHandlerTable();
 
diff --git a/mozilla/content/xslt/src/xslt/txStylesheetCompiler.cpp b/mozilla/content/xslt/src/xslt/txStylesheetCompiler.cpp
index c74ff861f05..4556bff080e 100644
--- a/mozilla/content/xslt/src/xslt/txStylesheetCompiler.cpp
+++ b/mozilla/content/xslt/src/xslt/txStylesheetCompiler.cpp
@@ -226,7 +226,7 @@ txStylesheetCompiler::startElementInternal(PRInt32 aNamespaceID,
     nsresult rv = NS_OK;
     PRInt32 i;
     for (i = mInScopeVariables.Count() - 1; i >= 0; --i) {
-        ++(NS_STATIC_CAST(txInScopeVariable*, mInScopeVariables[i]))->mLevel;
+        ++(static_cast<txInScopeVariable*>(mInScopeVariables[i]))->mLevel;
     }
 
     // Update the elementcontext if we have special attributes
@@ -356,7 +356,7 @@ txStylesheetCompiler::startElementInternal(PRInt32 aNamespaceID,
         }
     }
 
-    rv = pushPtr(NS_CONST_CAST(txElementHandler*, handler));
+    rv = pushPtr(const_cast<txElementHandler*>(handler));
     NS_ENSURE_SUCCESS(rv, rv);
 
     mElementContext->mDepth++;
@@ -379,7 +379,7 @@ txStylesheetCompiler::endElement()
     PRInt32 i;
     for (i = mInScopeVariables.Count() - 1; i >= 0; --i) {
         txInScopeVariable* var =
-            NS_STATIC_CAST(txInScopeVariable*, mInScopeVariables[i]);
+            static_cast<txInScopeVariable*>(mInScopeVariables[i]);
         if (!--(var->mLevel)) {
             nsAutoPtr<txInstruction> instr(new txRemoveVariable(var->mName));
             NS_ENSURE_TRUE(instr, NS_ERROR_OUT_OF_MEMORY);
@@ -393,14 +393,14 @@ txStylesheetCompiler::endElement()
     }
 
     const txElementHandler* handler =
-        NS_CONST_CAST(const txElementHandler*,
-                      NS_STATIC_CAST(txElementHandler*, popPtr()));
+        const_cast<const txElementHandler*>
+                  (static_cast<txElementHandler*>(popPtr()));
     rv = (handler->mEndFunction)(*this);
     NS_ENSURE_SUCCESS(rv, rv);
 
     if (!--mElementContext->mDepth) {
         // this will delete the old object
-        mElementContext = NS_STATIC_CAST(txElementContext*, popObject());
+        mElementContext = static_cast<txElementContext*>(popObject());
     }
 
     return NS_OK;
@@ -644,7 +644,7 @@ txStylesheetCompilerState::~txStylesheetCompilerState()
     
     PRInt32 i;
     for (i = mInScopeVariables.Count() - 1; i >= 0; --i) {
-        delete NS_STATIC_CAST(txInScopeVariable*, mInScopeVariables[i]);
+        delete static_cast<txInScopeVariable*>(mInScopeVariables[i]);
     }
 }
 
@@ -662,7 +662,7 @@ txStylesheetCompilerState::pushHandlerTable(txHandlerTable* aTable)
 void
 txStylesheetCompilerState::popHandlerTable()
 {
-    mHandlerTable = NS_STATIC_CAST(txHandlerTable*, popPtr());
+    mHandlerTable = static_cast<txHandlerTable*>(popPtr());
 }
 
 nsresult
@@ -679,7 +679,7 @@ txStylesheetCompilerState::pushSorter(txPushNewContext* aSorter)
 void
 txStylesheetCompilerState::popSorter()
 {
-    mSorter = NS_STATIC_CAST(txPushNewContext*, popPtr());
+    mSorter = static_cast<txPushNewContext*>(popPtr());
 }
 
 nsresult
@@ -699,7 +699,7 @@ void
 txStylesheetCompilerState::popChooseGotoList()
 {
     // this will delete the old value
-    mChooseGotoList = NS_STATIC_CAST(txList*, popObject());
+    mChooseGotoList = static_cast<txList*>(popObject());
 }
 
 nsresult
@@ -711,7 +711,7 @@ txStylesheetCompilerState::pushObject(TxObject* aObject)
 TxObject*
 txStylesheetCompilerState::popObject()
 {
-    return NS_STATIC_CAST(TxObject*, mObjectStack.pop());
+    return static_cast<TxObject*>(mObjectStack.pop());
 }
 
 nsresult
@@ -768,7 +768,7 @@ txStylesheetCompilerState::addInstruction(nsAutoPtr<txInstruction> aInstruction)
     
     PRInt32 i, count = mGotoTargetPointers.Count();
     for (i = 0; i < count; ++i) {
-        *NS_STATIC_CAST(txInstruction**, mGotoTargetPointers[i]) = newInstr;
+        *static_cast<txInstruction**>(mGotoTargetPointers[i]) = newInstr;
     }
     mGotoTargetPointers.Clear();
 
@@ -797,7 +797,7 @@ txStylesheetCompilerState::loadIncludedStylesheet(const nsAString& aURI)
     // step back to the dummy-item
     mToplevelIterator.previous();
     
-    txACompileObserver* observer = NS_STATIC_CAST(txStylesheetCompiler*, this);
+    txACompileObserver* observer = static_cast<txStylesheetCompiler*>(this);
 
     nsRefPtr<txStylesheetCompiler> compiler =
         new txStylesheetCompiler(aURI, mStylesheet, &mToplevelIterator,
@@ -834,7 +834,7 @@ txStylesheetCompilerState::loadImportedStylesheet(const nsAString& aURI,
     txListIterator iter(&aFrame->mToplevelItems);
     iter.next(); // go to the end of the list
 
-    txACompileObserver* observer = NS_STATIC_CAST(txStylesheetCompiler*, this);
+    txACompileObserver* observer = static_cast<txStylesheetCompiler*>(this);
 
     nsRefPtr<txStylesheetCompiler> compiler =
         new txStylesheetCompiler(aURI, mStylesheet, &iter, observer);
diff --git a/mozilla/content/xtf/src/nsXTFElementWrapper.cpp b/mozilla/content/xtf/src/nsXTFElementWrapper.cpp
index 855c66d4460..9fdeb951713 100644
--- a/mozilla/content/xtf/src/nsXTFElementWrapper.cpp
+++ b/mozilla/content/xtf/src/nsXTFElementWrapper.cpp
@@ -91,7 +91,7 @@ nsXTFElementWrapper::Init()
                                      &weakWrapper);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  mXTFElement->OnCreated(NS_STATIC_CAST(nsIXTFElementWrapper*, weakWrapper));
+  mXTFElement->OnCreated(static_cast<nsIXTFElementWrapper*>(weakWrapper));
   weakWrapper->Release();
 
   PRBool innerHandlesAttribs = PR_FALSE;
@@ -113,12 +113,12 @@ nsXTFElementWrapper::QueryInterface(REFNSIID aIID, void** aInstancePtr)
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(NS_GET_IID(nsIClassInfo))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIClassInfo*, this);
+    *aInstancePtr = static_cast<nsIClassInfo*>(this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(NS_GET_IID(nsIXTFElementWrapper))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIXTFElementWrapper*, this);
+    *aInstancePtr = static_cast<nsIXTFElementWrapper*>(this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
@@ -134,7 +134,7 @@ nsXTFElementWrapper::QueryInterface(REFNSIID aIID, void** aInstancePtr)
 
   if (inner) {
     rv = NS_NewXTFInterfaceAggregator(aIID, inner,
-                                      NS_STATIC_CAST(nsIContent*, this),
+                                      static_cast<nsIContent*>(this),
                                       aInstancePtr);
 
     return rv;
@@ -474,7 +474,7 @@ nsXTFElementWrapper::GetAttrNameAt(PRUint32 aIndex) const
     nsresult rv = mAttributeHandler->GetAttributeNameAt(aIndex, getter_AddRefs(localName));
     NS_ENSURE_SUCCESS(rv, nsnull);
 
-    NS_CONST_CAST(nsXTFElementWrapper*, this)->mTmpAttrName.SetTo(localName);
+    const_cast<nsXTFElementWrapper*>(this)->mTmpAttrName.SetTo(localName);
     return &mTmpAttrName;
   }
   else { // wrapper handles attrib
@@ -549,7 +549,7 @@ nsXTFElementWrapper::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const
     return NS_ERROR_OUT_OF_MEMORY;
 
   nsXTFElementWrapper* wrapper =
-    NS_STATIC_CAST(nsXTFElementWrapper*, it.get());
+    static_cast<nsXTFElementWrapper*>(it.get());
   nsresult rv = CopyInnerTo(wrapper);
 
   if (NS_SUCCEEDED(rv)) {
@@ -570,7 +570,7 @@ nsXTFElementWrapper::Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const
   }
 
   // XXX CloneState should take |const nIDOMElement*|
-  wrapper->CloneState(NS_CONST_CAST(nsXTFElementWrapper*, this));
+  wrapper->CloneState(const_cast<nsXTFElementWrapper*>(this));
   return rv;
 }
 
@@ -673,14 +673,14 @@ nsXTFElementWrapper::GetInterfaces(PRUint32* aCount, nsIID*** aArray)
   }
 
   PRUint32 count = baseCount + xtfCount;
-  nsIID** iids = NS_STATIC_CAST(nsIID**,
-                                nsMemory::Alloc(count * sizeof(nsIID*)));
+  nsIID** iids = static_cast<nsIID**>
+                            (nsMemory::Alloc(count * sizeof(nsIID*)));
   NS_ENSURE_TRUE(iids, NS_ERROR_OUT_OF_MEMORY);
 
   PRUint32 i = 0;
   for (; i < baseCount; ++i) {
-    iids[i] = NS_STATIC_CAST(nsIID*,
-                             nsMemory::Clone(baseArray[i], sizeof(nsIID)));
+    iids[i] = static_cast<nsIID*>
+                         (nsMemory::Clone(baseArray[i], sizeof(nsIID)));
     if (!iids[i]) {
       NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(baseCount, baseArray);
       NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(xtfCount, xtfArray);
@@ -690,8 +690,8 @@ nsXTFElementWrapper::GetInterfaces(PRUint32* aCount, nsIID*** aArray)
   }
 
   for (; i < count; ++i) {
-    iids[i] = NS_STATIC_CAST(nsIID*,
-                             nsMemory::Clone(xtfArray[i - baseCount], sizeof(nsIID)));
+    iids[i] = static_cast<nsIID*>
+                         (nsMemory::Clone(xtfArray[i - baseCount], sizeof(nsIID)));
     if (!iids[i]) {
       NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(baseCount, baseArray);
       NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(xtfCount, xtfArray);
@@ -905,7 +905,7 @@ nsXTFElementWrapper::GetClasses() const
       val->ToString(value);
       nsAttrValue newValue;
       newValue.ParseAtomArray(value);
-      NS_CONST_CAST(nsAttrAndChildArray*, &mAttrsAndChildren)->
+      const_cast<nsAttrAndChildArray*>(&mAttrsAndChildren)->
         SetAndTakeAttr(clazzAttr, newValue);
     }
   }
diff --git a/mozilla/content/xul/content/src/nsXULElement.cpp b/mozilla/content/xul/content/src/nsXULElement.cpp
index 708032d138f..4d12f3946c9 100644
--- a/mozilla/content/xul/content/src/nsXULElement.cpp
+++ b/mozilla/content/xul/content/src/nsXULElement.cpp
@@ -380,18 +380,18 @@ nsXULElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
     nsISupports *inst = nsnull;
 
     if (aIID.Equals(NS_GET_IID(nsIDOMNode))) {
-        inst = NS_STATIC_CAST(nsIDOMNode *, this);
+        inst = static_cast<nsIDOMNode *>(this);
     } else if (aIID.Equals(NS_GET_IID(nsIDOMElement))) {
-        inst = NS_STATIC_CAST(nsIDOMElement *, this);
+        inst = static_cast<nsIDOMElement *>(this);
     } else if (aIID.Equals(NS_GET_IID(nsIDOMXULElement))) {
-        inst = NS_STATIC_CAST(nsIDOMXULElement *, this);
+        inst = static_cast<nsIDOMXULElement *>(this);
     } else if (aIID.Equals(NS_GET_IID(nsIScriptEventHandlerOwner))) {
-        inst = NS_STATIC_CAST(nsIScriptEventHandlerOwner*,
-                              new nsScriptEventHandlerOwnerTearoff(this));
+        inst = static_cast<nsIScriptEventHandlerOwner*>
+                          (new nsScriptEventHandlerOwnerTearoff(this));
         NS_ENSURE_TRUE(inst, NS_ERROR_OUT_OF_MEMORY);
     } else if (aIID.Equals(NS_GET_IID(nsIDOMElementCSSInlineStyle))) {
-        inst = NS_STATIC_CAST(nsIDOMElementCSSInlineStyle *,
-                              new nsXULElementTearoff(this));
+        inst = static_cast<nsIDOMElementCSSInlineStyle *>
+                          (new nsXULElementTearoff(this));
         NS_ENSURE_TRUE(inst, NS_ERROR_OUT_OF_MEMORY);
     } else if (aIID.Equals(NS_GET_IID(nsIClassInfo))) {
         inst = NS_GetDOMClassInfoInstance(eDOMClassInfo_XULElement_id);
@@ -548,7 +548,7 @@ nsXULElement::IsFocusable(PRInt32 *aTabIndex)
   PRInt32 tabIndex = aTabIndex? *aTabIndex : -1;
   PRBool disabled = tabIndex < 0;
   nsCOMPtr<nsIDOMXULControlElement> xulControl = 
-    do_QueryInterface(NS_STATIC_CAST(nsIContent*, this));
+    do_QueryInterface(static_cast<nsIContent*>(this));
   if (xulControl) {
     xulControl->GetDisabled(&disabled);
     if (disabled) {
@@ -647,7 +647,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsScriptEventHandlerOwnerTearoff)
   tmp->mElement = nsnull;
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsScriptEventHandlerOwnerTearoff)
-  cb.NoteXPCOMChild(NS_STATIC_CAST(nsIContent*, tmp->mElement));
+  cb.NoteXPCOMChild(static_cast<nsIContent*>(tmp->mElement));
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsScriptEventHandlerOwnerTearoff)
@@ -891,7 +891,7 @@ nsXULElement::RemoveChildAt(PRUint32 aIndex, PRBool aNotify)
       // and cells going away.
       // First, retrieve the tree.
       // Check first whether this element IS the tree
-      controlElement = do_QueryInterface(NS_STATIC_CAST(nsIContent*, this));
+      controlElement = do_QueryInterface(static_cast<nsIContent*>(this));
 
       // If it's not, look at our parent
       if (!controlElement)
@@ -958,7 +958,7 @@ nsXULElement::RemoveChildAt(PRUint32 aIndex, PRBool aNotify)
     nsIDocument* doc;
     if (fireSelectionHandler && (doc = GetCurrentDoc())) {
       nsContentUtils::DispatchTrustedEvent(doc,
-                                           NS_STATIC_CAST(nsIContent*, this),
+                                           static_cast<nsIContent*>(this),
                                            NS_LITERAL_STRING("select"),
                                            PR_FALSE,
                                            PR_TRUE);
@@ -1308,7 +1308,7 @@ nsXULElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, PRBool aNotify)
         mutation.mAttrChange = nsIDOMMutationEvent::REMOVAL;
 
         mozAutoSubtreeModified subtree(GetOwnerDoc(), this);
-        nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this),
+        nsEventDispatcher::Dispatch(static_cast<nsIContent*>(this),
                                     nsnull, &mutation);
     }
 
@@ -1444,7 +1444,7 @@ nsXULElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
     aVisitor.mForceContentDispatch = PR_TRUE; //FIXME! Bug 329119
     nsIAtom* tag = Tag();
     if (aVisitor.mEvent->message == NS_XUL_COMMAND &&
-        aVisitor.mEvent->originalTarget == NS_STATIC_CAST(nsIContent*, this) &&
+        aVisitor.mEvent->originalTarget == static_cast<nsIContent*>(this) &&
         tag != nsGkAtoms::command) {
         // See if we have a command elt.  If so, we execute on the command
         // instead of on our content element.
@@ -1471,7 +1471,7 @@ nsXULElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
                                         NS_XUL_COMMAND, nsnull);
                 if (aVisitor.mEvent->eventStructType == NS_XUL_COMMAND_EVENT) {
                     nsXULCommandEvent *orig =
-                        NS_STATIC_CAST(nsXULCommandEvent*, aVisitor.mEvent);
+                        static_cast<nsXULCommandEvent*>(aVisitor.mEvent);
 
                     event.isShift = orig->isShift;
                     event.isControl = orig->isControl;
@@ -1568,7 +1568,7 @@ nsXULElement::EnsureContentsGenerated(void) const
             return NS_ERROR_NOT_INITIALIZED;
 
         // XXX hack because we can't use "mutable"
-        nsXULElement* unconstThis = NS_CONST_CAST(nsXULElement*, this);
+        nsXULElement* unconstThis = const_cast<nsXULElement*>(this);
 
         // Clear this value *first*, so we can re-enter the nsIContent
         // getters if needed.
@@ -1747,7 +1747,7 @@ nsXULElement::GetControllers(nsIControllers** aResult)
 
         nsresult rv;
         rv = NS_NewXULControllers(nsnull, NS_GET_IID(nsIControllers),
-                                  NS_REINTERPRET_CAST(void**, &slots->mControllers));
+                                  reinterpret_cast<void**>(&slots->mControllers));
 
         NS_ASSERTION(NS_SUCCEEDED(rv), "unable to create a controllers");
         if (NS_FAILED(rv)) return rv;
@@ -1970,17 +1970,17 @@ nsXULElement::Click()
 
             // send mouse down
             nsEventStatus status = nsEventStatus_eIgnore;
-            nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this),
+            nsEventDispatcher::Dispatch(static_cast<nsIContent*>(this),
                                         context, &eventDown,  nsnull, &status);
 
             // send mouse up
             status = nsEventStatus_eIgnore;  // reset status
-            nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this),
+            nsEventDispatcher::Dispatch(static_cast<nsIContent*>(this),
                                         context, &eventUp, nsnull, &status);
 
             // send mouse click
             status = nsEventStatus_eIgnore;  // reset status
-            nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this),
+            nsEventDispatcher::Dispatch(static_cast<nsIContent*>(this),
                                         context, &eventClick, nsnull, &status);
         }
     }
@@ -2000,7 +2000,7 @@ nsXULElement::DoCommand()
             nsCOMPtr<nsPresContext> context = shell->GetPresContext();
             nsEventStatus status = nsEventStatus_eIgnore;
             nsXULCommandEvent event(PR_TRUE, NS_XUL_COMMAND, nsnull);
-            nsEventDispatcher::Dispatch(NS_STATIC_CAST(nsIContent*, this),
+            nsEventDispatcher::Dispatch(static_cast<nsIContent*>(this),
                                         context, &event, nsnull, &status);
         }
     }
@@ -2048,12 +2048,12 @@ PopupListenerPropertyDtor(void* aObject, nsIAtom* aPropertyName,
                           void* aPropertyValue, void* aData)
 {
   nsIDOMEventListener* listener =
-    NS_STATIC_CAST(nsIDOMEventListener*, aPropertyValue);
+    static_cast<nsIDOMEventListener*>(aPropertyValue);
   if (!listener) {
     return;
   }
   nsCOMPtr<nsIDOMEventTarget> target =
-    do_QueryInterface(NS_STATIC_CAST(nsINode*, aObject));
+    do_QueryInterface(static_cast<nsINode*>(aObject));
   if (target) {
     target->RemoveEventListener(NS_LITERAL_STRING("mousedown"), listener,
                                 PR_FALSE);
@@ -2074,7 +2074,7 @@ nsXULElement::AddPopupListener(nsIAtom* aName)
                             nsGkAtoms::popuplistener;
 
     nsCOMPtr<nsIDOMEventListener> popupListener =
-        NS_STATIC_CAST(nsIDOMEventListener*, GetProperty(listenerAtom));
+        static_cast<nsIDOMEventListener*>(GetProperty(listenerAtom));
     if (popupListener) {
         // Popup listener is already installed.
         return NS_OK;
@@ -2086,7 +2086,7 @@ nsXULElement::AddPopupListener(nsIAtom* aName)
         return rv;
 
     // Add the popup as a listener on this element.
-    nsCOMPtr<nsIDOMEventTarget> target(do_QueryInterface(NS_STATIC_CAST(nsIContent *, this)));
+    nsCOMPtr<nsIDOMEventTarget> target(do_QueryInterface(static_cast<nsIContent *>(this)));
     NS_ENSURE_TRUE(target, NS_ERROR_FAILURE);
     rv = SetProperty(listenerAtom, popupListener, PopupListenerPropertyDtor,
                      PR_TRUE);
@@ -2224,7 +2224,7 @@ nsXULElement::HideWindowChrome(PRBool aShouldHide)
     nsIPresShell *shell = doc->GetPrimaryShell();
 
     if (shell) {
-        nsIContent* content = NS_STATIC_CAST(nsIContent*, this);
+        nsIContent* content = static_cast<nsIContent*>(this);
         nsIFrame* frame = shell->GetPrimaryFrameFor(content);
 
         nsPresContext *presContext = shell->GetPresContext();
@@ -2315,7 +2315,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_NATIVE_0(nsXULPrototypeNode)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NATIVE_BEGIN(nsXULPrototypeNode)
     if (tmp->mType == nsXULPrototypeNode::eType_Element) {
         nsXULPrototypeElement *elem =
-            NS_STATIC_CAST(nsXULPrototypeElement*, tmp);
+            static_cast<nsXULPrototypeElement*>(tmp);
         PRUint32 i;
         for (i = 0; i < elem->mNumAttributes; ++i) {
             cb.NoteScriptChild(elem->mScriptTypeID,
@@ -2327,7 +2327,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NATIVE_BEGIN(nsXULPrototypeNode)
         }
     }
     else if (tmp->mType == nsXULPrototypeNode::eType_Script) {
-        NS_STATIC_CAST(nsXULPrototypeScript*, tmp)->mScriptObject.traverse(cb);
+        static_cast<nsXULPrototypeScript*>(tmp)->mScriptObject.traverse(cb);
     }
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(nsXULPrototypeNode, AddRef)
@@ -2415,7 +2415,7 @@ nsXULPrototypeElement::Serialize(nsIObjectOutputStream* aStream,
             break;
         case eType_Script:
             rv |= aStream->Write32(child->mType);
-            nsXULPrototypeScript* script = NS_STATIC_CAST(nsXULPrototypeScript*, child);
+            nsXULPrototypeScript* script = static_cast<nsXULPrototypeScript*>(child);
 
             rv |= aStream->Write32(script->mScriptObject.mLangID);
 
diff --git a/mozilla/content/xul/content/src/nsXULElement.h b/mozilla/content/xul/content/src/nsXULElement.h
index f50c690fcb6..3da3a6dea12 100644
--- a/mozilla/content/xul/content/src/nsXULElement.h
+++ b/mozilla/content/xul/content/src/nsXULElement.h
@@ -463,7 +463,7 @@ public:
     static nsXULElement* FromContent(nsIContent *aContent)
     {
         if (aContent->IsNodeOfType(eXUL))
-            return NS_STATIC_CAST(nsXULElement*, aContent);
+            return static_cast<nsXULElement*>(aContent);
         return nsnull;
     }
 
diff --git a/mozilla/content/xul/content/src/nsXULPopupListener.cpp b/mozilla/content/xul/content/src/nsXULPopupListener.cpp
index 1d5b7d5672a..74f7035567f 100644
--- a/mozilla/content/xul/content/src/nsXULPopupListener.cpp
+++ b/mozilla/content/xul/content/src/nsXULPopupListener.cpp
@@ -502,7 +502,7 @@ NS_NewXULPopupListener(nsIDOMElement* aElement, PRBool aIsContext,
     if (!pl)
       return NS_ERROR_OUT_OF_MEMORY;
 
-    *aListener = NS_STATIC_CAST(nsIDOMMouseListener *, pl);
+    *aListener = static_cast<nsIDOMMouseListener *>(pl);
     NS_ADDREF(*aListener);
     return NS_OK;
 }
diff --git a/mozilla/content/xul/document/src/nsElementMap.cpp b/mozilla/content/xul/document/src/nsElementMap.cpp
index 1cc34d3cdb9..fcc5d140b9f 100644
--- a/mozilla/content/xul/document/src/nsElementMap.cpp
+++ b/mozilla/content/xul/document/src/nsElementMap.cpp
@@ -67,19 +67,19 @@ static void* PR_CALLBACK AllocTable(void* aPool, PRSize aSize)
 
 static void PR_CALLBACK FreeTable(void* aPool, void* aItem)
 {
-    delete[] NS_STATIC_CAST(char*, aItem);
+    delete[] static_cast<char*>(aItem);
 }
 
 static PLHashEntry* PR_CALLBACK AllocEntry(void* aPool, const void* aKey)
 {
-    nsFixedSizeAllocator* pool = NS_STATIC_CAST(nsFixedSizeAllocator*, aPool);
-    PLHashEntry* entry = NS_STATIC_CAST(PLHashEntry*, pool->Alloc(sizeof(PLHashEntry)));
+    nsFixedSizeAllocator* pool = static_cast<nsFixedSizeAllocator*>(aPool);
+    PLHashEntry* entry = static_cast<PLHashEntry*>(pool->Alloc(sizeof(PLHashEntry)));
     return entry;
 }
 
 static void PR_CALLBACK FreeEntry(void* aPool, PLHashEntry* aEntry, PRUintn aFlag) 
 {
-    nsFixedSizeAllocator* pool = NS_STATIC_CAST(nsFixedSizeAllocator*, aPool);
+    nsFixedSizeAllocator* pool = static_cast<nsFixedSizeAllocator*>(aPool);
     if (aFlag == HT_FREE_ENTRY)
         pool->Free(aEntry, sizeof(PLHashEntry));
 }
@@ -142,15 +142,15 @@ nsElementMap::~nsElementMap()
 PRIntn
 nsElementMap::ReleaseContentList(PLHashEntry* aHashEntry, PRIntn aIndex, void* aClosure)
 {
-    nsElementMap* self = NS_STATIC_CAST(nsElementMap*, aClosure);
+    nsElementMap* self = static_cast<nsElementMap*>(aClosure);
 
     PRUnichar* id =
-        NS_REINTERPRET_CAST(PRUnichar*, NS_CONST_CAST(void*, aHashEntry->key));
+        reinterpret_cast<PRUnichar*>(const_cast<void*>(aHashEntry->key));
 
     nsMemory::Free(id);
         
     ContentListItem* head =
-        NS_REINTERPRET_CAST(ContentListItem*, aHashEntry->value);
+        reinterpret_cast<ContentListItem*>(aHashEntry->value);
 
     while (head) {
         ContentListItem* doomed = head;
@@ -173,7 +173,7 @@ nsElementMap::Add(const nsAString& aID, nsIContent* aContent)
     const PRUnichar *id = flatID.get();
 
     ContentListItem* head =
-        NS_STATIC_CAST(ContentListItem*, PL_HashTableLookup(mMap, id));
+        static_cast<ContentListItem*>(PL_HashTableLookup(mMap, id));
 
     if (! head) {
         head = ContentListItem::Create(mPool, aContent);
@@ -282,7 +282,7 @@ nsElementMap::Remove(const nsAString& aID, nsIContent* aContent)
     if (!hep || !*hep)
         return NS_OK;
 
-    ContentListItem* head = NS_REINTERPRET_CAST(ContentListItem*, (*hep)->value);
+    ContentListItem* head = reinterpret_cast<ContentListItem*>((*hep)->value);
 
     if (head->mContent.get() == aContent) {
         ContentListItem* next = head->mNext;
@@ -291,7 +291,7 @@ nsElementMap::Remove(const nsAString& aID, nsIContent* aContent)
         }
         else {
             // It was the last reference in the table
-            PRUnichar* key = NS_REINTERPRET_CAST(PRUnichar*, NS_CONST_CAST(void*, (*hep)->key));
+            PRUnichar* key = reinterpret_cast<PRUnichar*>(const_cast<void*>((*hep)->key));
             PL_HashTableRawRemove(mMap, hep, *hep);
             nsMemory::Free(key);
         }
@@ -324,7 +324,7 @@ nsElementMap::Find(const nsAString& aID, nsCOMArray<nsIContent>& aResults)
 
     aResults.Clear();
     ContentListItem* item =
-        NS_REINTERPRET_CAST(ContentListItem*, PL_HashTableLookup(mMap, (const PRUnichar *)PromiseFlatString(aID).get()));
+        reinterpret_cast<ContentListItem*>(PL_HashTableLookup(mMap, (const PRUnichar *)PromiseFlatString(aID).get()));
 
     while (item) {
         aResults.AppendObject(item->mContent);
@@ -342,7 +342,7 @@ nsElementMap::FindFirst(const nsAString& aID, nsIContent** aResult)
         return NS_ERROR_NOT_INITIALIZED;
 
     ContentListItem* item =
-        NS_REINTERPRET_CAST(ContentListItem*, PL_HashTableLookup(mMap, (const PRUnichar *)PromiseFlatString(aID).get()));
+        reinterpret_cast<ContentListItem*>(PL_HashTableLookup(mMap, (const PRUnichar *)PromiseFlatString(aID).get()));
 
     if (item) {
         *aResult = item->mContent;
@@ -371,14 +371,14 @@ nsElementMap::EnumerateImpl(PLHashEntry* aHashEntry, PRIntn aIndex, void* aClosu
     // hashtable. It will in turn call the enumerator that the user
     // has passed in via Enumerate() once for each element that's been
     // mapped to this ID.
-    EnumerateClosure* closure = NS_REINTERPRET_CAST(EnumerateClosure*, aClosure);
+    EnumerateClosure* closure = reinterpret_cast<EnumerateClosure*>(aClosure);
 
     const PRUnichar* id =
-        NS_REINTERPRET_CAST(const PRUnichar*, aHashEntry->key);
+        reinterpret_cast<const PRUnichar*>(aHashEntry->key);
 
     // 'link' holds a pointer to the previous element's link field.
     ContentListItem** link = 
-        NS_REINTERPRET_CAST(ContentListItem**, &aHashEntry->value);
+        reinterpret_cast<ContentListItem**>(&aHashEntry->value);
 
     ContentListItem* item = *link;
 
@@ -393,10 +393,10 @@ nsElementMap::EnumerateImpl(PLHashEntry* aHashEntry, PRIntn aIndex, void* aClosu
             *link = item;
             ContentListItem::Destroy(closure->mSelf->mPool, current);
 
-            if ((! *link) && (link == NS_REINTERPRET_CAST(ContentListItem**, &aHashEntry->value))) {
+            if ((! *link) && (link == reinterpret_cast<ContentListItem**>(&aHashEntry->value))) {
                 // It's the last content node that was mapped to this
                 // ID. Unhash it.
-                PRUnichar* key = NS_CONST_CAST(PRUnichar*, id);
+                PRUnichar* key = const_cast<PRUnichar*>(id);
                 nsMemory::Free(key);
                 return HT_ENUMERATE_REMOVE;
             }
@@ -414,7 +414,7 @@ PLHashNumber
 nsElementMap::Hash(const void* aKey)
 {
     PLHashNumber result = 0;
-    const PRUnichar* s = NS_REINTERPRET_CAST(const PRUnichar*, aKey);
+    const PRUnichar* s = reinterpret_cast<const PRUnichar*>(aKey);
     while (*s != nsnull) {
         result = (result >> 28) ^ (result << 4) ^ *s;
         ++s;
@@ -426,6 +426,6 @@ nsElementMap::Hash(const void* aKey)
 PRIntn
 nsElementMap::Compare(const void* aLeft, const void* aRight)
 {
-    return 0 == nsCRT::strcmp(NS_REINTERPRET_CAST(const PRUnichar*, aLeft),
-                              NS_REINTERPRET_CAST(const PRUnichar*, aRight));
+    return 0 == nsCRT::strcmp(reinterpret_cast<const PRUnichar*>(aLeft),
+                              reinterpret_cast<const PRUnichar*>(aRight));
 }
diff --git a/mozilla/content/xul/document/src/nsXULContentSink.cpp b/mozilla/content/xul/document/src/nsXULContentSink.cpp
index 1d758e47b7e..507e71603f7 100644
--- a/mozilla/content/xul/document/src/nsXULContentSink.cpp
+++ b/mozilla/content/xul/document/src/nsXULContentSink.cpp
@@ -186,13 +186,13 @@ XULContentSinkImpl::ContextStack::GetTopNodeScriptType(PRUint32 *aScriptType)
     switch (node->mType) {
         case nsXULPrototypeNode::eType_Element: {
             nsXULPrototypeElement *parent = \
-                NS_REINTERPRET_CAST(nsXULPrototypeElement*, node);
+                reinterpret_cast<nsXULPrototypeElement*>(node);
             *aScriptType = parent->mScriptTypeID;
             break;
         }
         case nsXULPrototypeNode::eType_Script: {
             nsXULPrototypeScript *parent = \
-                NS_REINTERPRET_CAST(nsXULPrototypeScript*, node);
+                reinterpret_cast<nsXULPrototypeScript*>(node);
             *aScriptType = parent->mScriptObject.mLangID;
             break;
         }
@@ -238,7 +238,7 @@ XULContentSinkImpl::~XULContentSinkImpl()
         if (NS_SUCCEEDED(rv)) {
             for (PRInt32 i = children->Count() - 1; i >= 0; --i) {
                 nsXULPrototypeNode* child =
-                    NS_REINTERPRET_CAST(nsXULPrototypeNode*, children->ElementAt(i));
+                    reinterpret_cast<nsXULPrototypeNode*>(children->ElementAt(i));
 
                 child->Release();
             }
@@ -421,7 +421,7 @@ XULContentSinkImpl::FlushText(PRBool aCreateTextNode)
         PRBool stripWhitespace = PR_FALSE;
         if (node->mType == nsXULPrototypeNode::eType_Element) {
             nsINodeInfo *nodeInfo =
-                NS_STATIC_CAST(nsXULPrototypeElement*, node)->mNodeInfo;
+                static_cast<nsXULPrototypeElement*>(node)->mNodeInfo;
 
             if (nodeInfo->NamespaceEquals(kNameSpaceID_XUL))
                 stripWhitespace = !nodeInfo->Equals(nsGkAtoms::label) &&
@@ -593,7 +593,7 @@ XULContentSinkImpl::HandleEndElement(const PRUnichar *aName)
         if (NS_FAILED(rv)) return rv;
 
         nsXULPrototypeElement* element =
-            NS_REINTERPRET_CAST(nsXULPrototypeElement*, node);
+            reinterpret_cast<nsXULPrototypeElement*>(node);
 
         PRInt32 count = children->Count();
         if (count) {
@@ -603,7 +603,7 @@ XULContentSinkImpl::HandleEndElement(const PRUnichar *aName)
 
             for (PRInt32 i = count - 1; i >= 0; --i)
                 element->mChildren[i] =
-                    NS_REINTERPRET_CAST(nsXULPrototypeNode*, children->ElementAt(i));
+                    reinterpret_cast<nsXULPrototypeNode*>(children->ElementAt(i));
 
             element->mNumChildren = count;
         }
@@ -612,7 +612,7 @@ XULContentSinkImpl::HandleEndElement(const PRUnichar *aName)
 
     case nsXULPrototypeNode::eType_Script: {
         nsXULPrototypeScript* script =
-            NS_STATIC_CAST(nsXULPrototypeScript*, node);
+            static_cast<nsXULPrototypeScript*>(node);
 
         // If given a src= attribute, we must ignore script tag content.
         if (! script->mSrcURI && ! script->mScriptObject.mObject) {
@@ -648,7 +648,7 @@ XULContentSinkImpl::HandleEndElement(const PRUnichar *aName)
         // root element. This transfers ownership of the prototype
         // element tree to the prototype document.
         nsXULPrototypeElement* element =
-            NS_STATIC_CAST(nsXULPrototypeElement*, node);
+            static_cast<nsXULPrototypeElement*>(node);
 
         mPrototype->SetRootElement(element);
         mState = eInEpilog;
@@ -760,7 +760,7 @@ XULContentSinkImpl::ReportError(const PRUnichar* aErrorText,
     if (NS_SUCCEEDED(rv)) {
       for (PRInt32 i = children->Count() - 1; i >= 0; --i) {
         nsXULPrototypeNode* child =
-            NS_REINTERPRET_CAST(nsXULPrototypeNode*, children->ElementAt(i));
+            reinterpret_cast<nsXULPrototypeNode*>(children->ElementAt(i));
 
         child->Release();
       }
diff --git a/mozilla/content/xul/document/src/nsXULControllers.cpp b/mozilla/content/xul/document/src/nsXULControllers.cpp
index 26029da249c..3af8d9cc2af 100644
--- a/mozilla/content/xul/document/src/nsXULControllers.cpp
+++ b/mozilla/content/xul/document/src/nsXULControllers.cpp
@@ -70,7 +70,7 @@ nsXULControllers::DeleteControllers()
   PRUint32 count = mControllers.Count();
   for (PRUint32 i = 0; i < count; i++)
   {
-    nsXULControllerData*  controllerData = NS_STATIC_CAST(nsXULControllerData*, mControllers.ElementAt(i));
+    nsXULControllerData*  controllerData = static_cast<nsXULControllerData*>(mControllers.ElementAt(i));
     if (controllerData)
       delete controllerData;    // releases the nsIController
   }
@@ -106,7 +106,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsXULControllers)
     PRUint32 i, count = tmp->mControllers.Count();
     for (i = 0; i < count; ++i) {
       nsXULControllerData*  controllerData =
-        NS_STATIC_CAST(nsXULControllerData*, tmp->mControllers[i]);
+        static_cast<nsXULControllerData*>(tmp->mControllers[i]);
       if (controllerData) {
         cb.NoteXPCOMChild(controllerData->mController);
       }
@@ -133,7 +133,7 @@ nsXULControllers::GetControllerForCommand(const char *aCommand, nsIController**
   PRUint32 count = mControllers.Count();
   for (PRUint32 i=0; i < count; i++)
   {
-    nsXULControllerData*  controllerData = NS_STATIC_CAST(nsXULControllerData*, mControllers.ElementAt(i));
+    nsXULControllerData*  controllerData = static_cast<nsXULControllerData*>(mControllers.ElementAt(i));
     if (controllerData)
     {
       nsCOMPtr<nsIController> controller;
@@ -173,7 +173,7 @@ nsXULControllers::RemoveControllerAt(PRUint32 aIndex, nsIController **_retval)
   NS_ENSURE_ARG_POINTER(_retval);
   *_retval = nsnull;
 
-  nsXULControllerData*  controllerData = NS_STATIC_CAST(nsXULControllerData*, mControllers.SafeElementAt(aIndex));
+  nsXULControllerData*  controllerData = static_cast<nsXULControllerData*>(mControllers.SafeElementAt(aIndex));
   if (!controllerData) return NS_ERROR_FAILURE;
 
 #ifdef DEBUG
@@ -195,7 +195,7 @@ nsXULControllers::GetControllerAt(PRUint32 aIndex, nsIController **_retval)
   NS_ENSURE_ARG_POINTER(_retval);
   *_retval = nsnull;
 
-  nsXULControllerData*  controllerData = NS_STATIC_CAST(nsXULControllerData*, mControllers.SafeElementAt(aIndex));
+  nsXULControllerData*  controllerData = static_cast<nsXULControllerData*>(mControllers.SafeElementAt(aIndex));
   if (!controllerData) return NS_ERROR_FAILURE;
 
   return controllerData->GetController(_retval);   // does the addref  
@@ -225,7 +225,7 @@ nsXULControllers::RemoveController(nsIController *controller)
   PRUint32 count = mControllers.Count();
   for (PRUint32 i = 0; i < count; i++)
   {
-    nsXULControllerData*  controllerData = NS_STATIC_CAST(nsXULControllerData*, mControllers.ElementAt(i));
+    nsXULControllerData*  controllerData = static_cast<nsXULControllerData*>(mControllers.ElementAt(i));
     if (controllerData)
     {
       nsCOMPtr<nsIController> thisController;
@@ -251,7 +251,7 @@ nsXULControllers::GetControllerId(nsIController *controller, PRUint32 *_retval)
   PRUint32 count = mControllers.Count();
   for (PRUint32 i = 0; i < count; i++)
   {
-    nsXULControllerData*  controllerData = NS_STATIC_CAST(nsXULControllerData*, mControllers.ElementAt(i));
+    nsXULControllerData*  controllerData = static_cast<nsXULControllerData*>(mControllers.ElementAt(i));
     if (controllerData)
     {
       nsCOMPtr<nsIController> thisController;
@@ -275,7 +275,7 @@ nsXULControllers::GetControllerById(PRUint32 controllerID, nsIController **_retv
   PRUint32 count = mControllers.Count();
   for (PRUint32 i = 0; i < count; i++)
   {
-    nsXULControllerData*  controllerData = NS_STATIC_CAST(nsXULControllerData*, mControllers.ElementAt(i));
+    nsXULControllerData*  controllerData = static_cast<nsXULControllerData*>(mControllers.ElementAt(i));
     if (controllerData && controllerData->GetControllerID() == controllerID)
     {
       return controllerData->GetController(_retval);
diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp
index 10719eabaa6..fc4aeec4b05 100644
--- a/mozilla/content/xul/document/src/nsXULDocument.cpp
+++ b/mozilla/content/xul/document/src/nsXULDocument.cpp
@@ -296,7 +296,7 @@ static PRIntn
 TraverseElement(const PRUnichar* aID, nsIContent* aElement, void* aContext)
 {
     nsCycleCollectionTraversalCallback *cb =
-        NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aContext);
+        static_cast<nsCycleCollectionTraversalCallback*>(aContext);
 
     cb->NoteXPCOMChild(aElement);
 
@@ -308,7 +308,7 @@ TraverseTemplateBuilders(nsISupports* aKey, nsIXULTemplateBuilder* aData,
                          void* aContext)
 {
     nsCycleCollectionTraversalCallback *cb =
-        NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aContext);
+        static_cast<nsCycleCollectionTraversalCallback*>(aContext);
 
     cb->NoteXPCOMChild(aKey);
     cb->NoteXPCOMChild(aData);
@@ -320,7 +320,7 @@ static PLDHashOperator PR_CALLBACK
 TraverseObservers(nsIURI* aKey, nsIObserver* aData, void* aContext)
 {
     nsCycleCollectionTraversalCallback *cb =
-        NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aContext);
+        static_cast<nsCycleCollectionTraversalCallback*>(aContext);
 
     cb->NoteXPCOMChild(aData);
 
@@ -347,8 +347,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsXULDocument, nsXMLDocument)
 
     PRUint32 i, count = tmp->mPrototypes.Length();
     for (i = 0; i < count; ++i) {
-        cb.NoteXPCOMChild(NS_STATIC_CAST(nsIScriptGlobalObjectOwner*, 
-                                         tmp->mPrototypes[i]));
+        cb.NoteXPCOMChild(static_cast<nsIScriptGlobalObjectOwner*>(tmp->mPrototypes[i]));
     }
     
     NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mTooltipNode)
@@ -646,7 +645,7 @@ PR_STATIC_CALLBACK(void)
 ClearBroadcasterMapEntry(PLDHashTable* aTable, PLDHashEntryHdr* aEntry)
 {
     BroadcasterMapEntry* entry =
-        NS_STATIC_CAST(BroadcasterMapEntry*, aEntry);
+        static_cast<BroadcasterMapEntry*>(aEntry);
     for (PRInt32 i = entry->mListeners.Count() - 1; i >= 0; --i) {
         delete (BroadcastListener*)entry->mListeners[i];
     }
@@ -738,14 +737,14 @@ nsXULDocument::AddBroadcastListenerFor(nsIDOMElement* aBroadcaster,
     NS_ENSURE_ARG(aBroadcaster && aListener);
     
     nsresult rv =
-        nsContentUtils::CheckSameOrigin(NS_STATIC_CAST(nsDocument *, this),
+        nsContentUtils::CheckSameOrigin(static_cast<nsDocument *>(this),
                                         aBroadcaster);
 
     if (NS_FAILED(rv)) {
         return rv;
     }
 
-    rv = nsContentUtils::CheckSameOrigin(NS_STATIC_CAST(nsDocument *, this),
+    rv = nsContentUtils::CheckSameOrigin(static_cast<nsDocument *>(this),
                                          aListener);
 
     if (NS_FAILED(rv)) {
@@ -773,14 +772,14 @@ nsXULDocument::AddBroadcastListenerFor(nsIDOMElement* aBroadcaster,
     }
 
     BroadcasterMapEntry* entry =
-        NS_STATIC_CAST(BroadcasterMapEntry*,
-                       PL_DHashTableOperate(mBroadcasterMap, aBroadcaster,
+        static_cast<BroadcasterMapEntry*>
+                   (PL_DHashTableOperate(mBroadcasterMap, aBroadcaster,
                                             PL_DHASH_LOOKUP));
 
     if (PL_DHASH_ENTRY_IS_FREE(entry)) {
         entry =
-            NS_STATIC_CAST(BroadcasterMapEntry*,
-                           PL_DHashTableOperate(mBroadcasterMap, aBroadcaster,
+            static_cast<BroadcasterMapEntry*>
+                       (PL_DHashTableOperate(mBroadcasterMap, aBroadcaster,
                                                 PL_DHASH_ADD));
 
         if (! entry)
@@ -798,7 +797,7 @@ nsXULDocument::AddBroadcastListenerFor(nsIDOMElement* aBroadcaster,
 
     BroadcastListener* bl;
     for (PRInt32 i = entry->mListeners.Count() - 1; i >= 0; --i) {
-        bl = NS_STATIC_CAST(BroadcastListener*, entry->mListeners[i]);
+        bl = static_cast<BroadcastListener*>(entry->mListeners[i]);
 
         if ((bl->mListener == aListener) && (bl->mAttribute == attr))
             return NS_OK;
@@ -828,15 +827,15 @@ nsXULDocument::RemoveBroadcastListenerFor(nsIDOMElement* aBroadcaster,
         return NS_OK;
 
     BroadcasterMapEntry* entry =
-        NS_STATIC_CAST(BroadcasterMapEntry*,
-                       PL_DHashTableOperate(mBroadcasterMap, aBroadcaster,
+        static_cast<BroadcasterMapEntry*>
+                   (PL_DHashTableOperate(mBroadcasterMap, aBroadcaster,
                                             PL_DHASH_LOOKUP));
 
     if (PL_DHASH_ENTRY_IS_BUSY(entry)) {
         nsCOMPtr<nsIAtom> attr = do_GetAtom(aAttr);
         for (PRInt32 i = entry->mListeners.Count() - 1; i >= 0; --i) {
             BroadcastListener* bl =
-                NS_STATIC_CAST(BroadcastListener*, entry->mListeners[i]);
+                static_cast<BroadcastListener*>(entry->mListeners[i]);
 
             if ((bl->mListener == aListener) && (bl->mAttribute == attr)) {
                 entry->mListeners.RemoveElementAt(i);
@@ -944,8 +943,8 @@ nsXULDocument::AttributeChanged(nsIDocument* aDocument,
     if (mBroadcasterMap && CanBroadcast(aNameSpaceID, aAttribute)) {
         nsCOMPtr<nsIDOMElement> domele = do_QueryInterface(aElement);
         BroadcasterMapEntry* entry =
-            NS_STATIC_CAST(BroadcasterMapEntry*,
-                           PL_DHashTableOperate(mBroadcasterMap, domele.get(),
+            static_cast<BroadcasterMapEntry*>
+                       (PL_DHashTableOperate(mBroadcasterMap, domele.get(),
                                                 PL_DHASH_LOOKUP));
 
         if (PL_DHASH_ENTRY_IS_BUSY(entry)) {
@@ -957,7 +956,7 @@ nsXULDocument::AttributeChanged(nsIDocument* aDocument,
             PRInt32 i;
             for (i = entry->mListeners.Count() - 1; i >= 0; --i) {
                 BroadcastListener* bl =
-                    NS_STATIC_CAST(BroadcastListener*, entry->mListeners[i]);
+                    static_cast<BroadcastListener*>(entry->mListeners[i]);
 
                 if ((bl->mAttribute == aAttribute) ||
                     (bl->mAttribute == nsGkAtoms::_asterix)) {
@@ -1810,7 +1809,7 @@ nsXULDocument::RemoveElementsFromMapByContent(const PRUnichar* aID,
                                               nsIContent* aElement,
                                               void* aClosure)
 {
-    nsIContent* content = NS_REINTERPRET_CAST(nsIContent*, aClosure);
+    nsIContent* content = reinterpret_cast<nsIContent*>(aClosure);
     return (aElement == content) ? HT_ENUMERATE_REMOVE : HT_ENUMERATE_NEXT;
 }
 
@@ -1967,7 +1966,7 @@ nsXULDocument::MatchAttribute(nsIContent* aContent,
                               void* aData)
 {
     NS_PRECONDITION(aContent, "Must have content node to work with!");
-    nsString* attrValue = NS_STATIC_CAST(nsString*, aData);
+    nsString* attrValue = static_cast<nsString*>(aData);
     if (aNamespaceID != kNameSpaceID_Unknown &&
         aNamespaceID != kNameSpaceID_Wildcard) {
         return attrValue->EqualsLiteral("*") ?
@@ -2749,7 +2748,7 @@ FirePendingMergeNotification(nsIURI* aKey, nsCOMPtr<nsIObserver>& aObserver, voi
     aObserver->Observe(aKey, "xul-overlay-merged", EmptyString().get());
 
     typedef nsInterfaceHashtable<nsURIHashKey,nsIObserver> table;
-    table* observers = NS_STATIC_CAST(table*, aClosure);
+    table* observers = static_cast<table*>(aClosure);
     observers->Remove(aKey);
 
     return PL_DHASH_REMOVE;
@@ -2843,7 +2842,7 @@ nsXULDocument::ResumeWalk()
             case nsXULPrototypeNode::eType_Element: {
                 // An 'element', which may contain more content.
                 nsXULPrototypeElement* protoele =
-                    NS_STATIC_CAST(nsXULPrototypeElement*, childproto);
+                    static_cast<nsXULPrototypeElement*>(childproto);
 
                 nsCOMPtr<nsIContent> child;
 
@@ -2900,7 +2899,7 @@ nsXULDocument::ResumeWalk()
                 // A script reference. Execute the script immediately;
                 // this may have side effects in the content model.
                 nsXULPrototypeScript* scriptproto =
-                    NS_STATIC_CAST(nsXULPrototypeScript*, childproto);
+                    static_cast<nsXULPrototypeScript*>(childproto);
 
                 if (scriptproto->mSrcURI) {
                     // A transcluded script reference; this may
@@ -2935,7 +2934,7 @@ nsXULDocument::ResumeWalk()
                     NS_ENSURE_SUCCESS(rv, rv);
 
                     nsXULPrototypeText* textproto =
-                        NS_STATIC_CAST(nsXULPrototypeText*, childproto);
+                        static_cast<nsXULPrototypeText*>(childproto);
                     text->SetText(textproto->mValue, PR_FALSE);
 
                     rv = element->AppendChildTo(text, PR_FALSE);
@@ -2946,7 +2945,7 @@ nsXULDocument::ResumeWalk()
 
             case nsXULPrototypeNode::eType_PI: {
                 nsXULPrototypePI* piProto =
-                    NS_STATIC_CAST(nsXULPrototypePI*, childproto);
+                    static_cast<nsXULPrototypePI*>(childproto);
 
                 // <?xul-overlay?> and <?xml-stylesheet?> don't have effect
                 // outside the prolog, like they used to. Issue a warning.
@@ -4242,7 +4241,7 @@ nsXULDocument::InsertElement(nsIContent* aParent, nsIContent* aChild, PRBool aNo
         aChild->GetAttr(kNameSpaceID_None, nsGkAtoms::position, posStr);
         if (!posStr.IsEmpty()) {
             // Positions are one-indexed.
-            PRInt32 pos = posStr.ToInteger(NS_REINTERPRET_CAST(PRInt32*, &rv));
+            PRInt32 pos = posStr.ToInteger(reinterpret_cast<PRInt32*>(&rv));
             // Note: if the insertion index (which is |pos - 1|) would be less
             // than 0 or greater than the number of children aParent has, then
             // don't insert, since the position is bogus.  Just skip on to
diff --git a/mozilla/content/xul/document/src/nsXULPrototypeCache.cpp b/mozilla/content/xul/document/src/nsXULPrototypeCache.cpp
index ed5a391c274..accfb324bb9 100644
--- a/mozilla/content/xul/document/src/nsXULPrototypeCache.cpp
+++ b/mozilla/content/xul/document/src/nsXULPrototypeCache.cpp
@@ -159,7 +159,7 @@ nsXULPrototypeCache::GetInstance()
 
         CallGetService(kXULPrototypeCacheCID, &cache);
 
-        sInstance = NS_STATIC_CAST(nsXULPrototypeCache*, cache);
+        sInstance = static_cast<nsXULPrototypeCache*>(cache);
     }
     return sInstance;
 }
@@ -734,7 +734,7 @@ nsXULPrototypeCache::StartFastLoad(nsIURI* aURI)
     // Give the FastLoad service an object by which it can get or create a
     // file output stream given an input stream on the same file.
     nsXULFastLoadFileIO* xio = new nsXULFastLoadFileIO(file);
-    nsCOMPtr<nsIFastLoadFileIO> io = NS_STATIC_CAST(nsIFastLoadFileIO*, xio);
+    nsCOMPtr<nsIFastLoadFileIO> io = static_cast<nsIFastLoadFileIO*>(xio);
     if (! io)
         return NS_ERROR_OUT_OF_MEMORY;
     fastLoadService->SetFileIO(io);
diff --git a/mozilla/content/xul/document/src/nsXULPrototypeDocument.cpp b/mozilla/content/xul/document/src/nsXULPrototypeDocument.cpp
index 0a0b0135db1..240dd63f63e 100644
--- a/mozilla/content/xul/document/src/nsXULPrototypeDocument.cpp
+++ b/mozilla/content/xul/document/src/nsXULPrototypeDocument.cpp
@@ -381,7 +381,7 @@ GetNodeInfos(nsXULPrototypeElement* aPrototype,
     for (i = 0; i < aPrototype->mNumChildren; ++i) {
         nsXULPrototypeNode* child = aPrototype->mChildren[i];
         if (child->mType == nsXULPrototypeNode::eType_Element) {
-            rv = GetNodeInfos(NS_STATIC_CAST(nsXULPrototypeElement*, child),
+            rv = GetNodeInfos(static_cast<nsXULPrototypeElement*>(child),
                               aArray);
             NS_ENSURE_SUCCESS(rv, rv);
         }
diff --git a/mozilla/content/xul/templates/src/nsContentSupportMap.h b/mozilla/content/xul/templates/src/nsContentSupportMap.h
index 8b8b566c644..c88c58d96ce 100644
--- a/mozilla/content/xul/templates/src/nsContentSupportMap.h
+++ b/mozilla/content/xul/templates/src/nsContentSupportMap.h
@@ -66,7 +66,7 @@ public:
         if (!hdr)
             return NS_ERROR_OUT_OF_MEMORY;
 
-        Entry* entry = NS_REINTERPRET_CAST(Entry*, hdr);
+        Entry* entry = reinterpret_cast<Entry*>(hdr);
         NS_ASSERTION(entry->mMatch == nsnull, "over-writing entry");
         entry->mContent = aElement;
         entry->mMatch   = aMatch;
@@ -80,7 +80,7 @@ public:
         if (PL_DHASH_ENTRY_IS_FREE(hdr))
             return PR_FALSE;
 
-        Entry* entry = NS_REINTERPRET_CAST(Entry*, hdr);
+        Entry* entry = reinterpret_cast<Entry*>(hdr);
         *aMatch = entry->mMatch;
         return PR_TRUE; }
 
diff --git a/mozilla/content/xul/templates/src/nsRDFConInstanceTestNode.h b/mozilla/content/xul/templates/src/nsRDFConInstanceTestNode.h
index ea273acb770..5b45849e1ea 100644
--- a/mozilla/content/xul/templates/src/nsRDFConInstanceTestNode.h
+++ b/mozilla/content/xul/templates/src/nsRDFConInstanceTestNode.h
@@ -115,7 +115,7 @@ public:
 
         virtual PRBool Equals(const MemoryElement& aElement) const {
             if (aElement.Type() == Type()) {
-                const Element& element = NS_STATIC_CAST(const Element&, aElement);
+                const Element& element = static_cast<const Element&>(aElement);
                 return mContainer == element.mContainer
                     && mContainerTest == element.mContainerTest
                     && mEmptyTest == element.mEmptyTest;
diff --git a/mozilla/content/xul/templates/src/nsRDFConMemberTestNode.h b/mozilla/content/xul/templates/src/nsRDFConMemberTestNode.h
index e902299a57f..9cd591f46a1 100644
--- a/mozilla/content/xul/templates/src/nsRDFConMemberTestNode.h
+++ b/mozilla/content/xul/templates/src/nsRDFConMemberTestNode.h
@@ -106,7 +106,7 @@ public:
 
         virtual PRBool Equals(const MemoryElement& aElement) const {
             if (aElement.Type() == Type()) {
-                const Element& element = NS_STATIC_CAST(const Element&, aElement);
+                const Element& element = static_cast<const Element&>(aElement);
                 return mContainer == element.mContainer && mMember == element.mMember;
             }
             return PR_FALSE; }
diff --git a/mozilla/content/xul/templates/src/nsRDFPropertyTestNode.h b/mozilla/content/xul/templates/src/nsRDFPropertyTestNode.h
index 7d726fbc99f..0da978c5082 100644
--- a/mozilla/content/xul/templates/src/nsRDFPropertyTestNode.h
+++ b/mozilla/content/xul/templates/src/nsRDFPropertyTestNode.h
@@ -130,7 +130,7 @@ public:
 
         virtual PRBool Equals(const MemoryElement& aElement) const {
             if (aElement.Type() == Type()) {
-                const Element& element = NS_STATIC_CAST(const Element&, aElement);
+                const Element& element = static_cast<const Element&>(aElement);
                 return mSource == element.mSource
                     && mProperty == element.mProperty
                     && mTarget == element.mTarget;
diff --git a/mozilla/content/xul/templates/src/nsRuleNetwork.cpp b/mozilla/content/xul/templates/src/nsRuleNetwork.cpp
index 7f8a33a73ba..dc1ab12d74a 100644
--- a/mozilla/content/xul/templates/src/nsRuleNetwork.cpp
+++ b/mozilla/content/xul/templates/src/nsRuleNetwork.cpp
@@ -227,7 +227,7 @@ nsAssignmentSet::Equals(const nsAssignmentSet& aSet) const
 PLHashNumber
 Instantiation::Hash(const void* aKey)
 {
-    const Instantiation* inst = NS_STATIC_CAST(const Instantiation*, aKey);
+    const Instantiation* inst = static_cast<const Instantiation*>(aKey);
 
     PLHashNumber result = 0;
 
@@ -243,8 +243,8 @@ Instantiation::Hash(const void* aKey)
 PRIntn
 Instantiation::Compare(const void* aLeft, const void* aRight)
 {
-    const Instantiation* left  = NS_STATIC_CAST(const Instantiation*, aLeft);
-    const Instantiation* right = NS_STATIC_CAST(const Instantiation*, aRight);
+    const Instantiation* left  = static_cast<const Instantiation*>(aLeft);
+    const Instantiation* right = static_cast<const Instantiation*>(aRight);
 
     return *left == *right;
 }
diff --git a/mozilla/content/xul/templates/src/nsRuleNetwork.h b/mozilla/content/xul/templates/src/nsRuleNetwork.h
index f5bdd2dfc6e..b25929dd019 100644
--- a/mozilla/content/xul/templates/src/nsRuleNetwork.h
+++ b/mozilla/content/xul/templates/src/nsRuleNetwork.h
@@ -598,7 +598,7 @@ public:
     };
 
     ConstIterator First() const { return ConstIterator(mHead.mNext); }
-    ConstIterator Last() const { return ConstIterator(NS_CONST_CAST(List*, &mHead)); }
+    ConstIterator Last() const { return ConstIterator(const_cast<List*>(&mHead)); }
 
     class Iterator : public ConstIterator {
     public:
diff --git a/mozilla/content/xul/templates/src/nsTemplateMap.h b/mozilla/content/xul/templates/src/nsTemplateMap.h
index 4c092e83e51..373961b2b5c 100644
--- a/mozilla/content/xul/templates/src/nsTemplateMap.h
+++ b/mozilla/content/xul/templates/src/nsTemplateMap.h
@@ -69,7 +69,7 @@ public:
                      "aContent already in map");
 
         Entry* entry =
-            NS_REINTERPRET_CAST(Entry*, PL_DHashTableOperate(&mTable, aContent, PL_DHASH_ADD));
+            reinterpret_cast<Entry*>(PL_DHashTableOperate(&mTable, aContent, PL_DHASH_ADD));
 
         if (entry) {
             entry->mContent = aContent;
@@ -107,7 +107,7 @@ public:
     void
     GetTemplateFor(nsIContent* aContent, nsIContent** aResult) {
         Entry* entry =
-            NS_REINTERPRET_CAST(Entry*, PL_DHashTableOperate(&mTable, aContent, PL_DHASH_LOOKUP));
+            reinterpret_cast<Entry*>(PL_DHashTableOperate(&mTable, aContent, PL_DHASH_LOOKUP));
 
         if (PL_DHASH_ENTRY_IS_BUSY(&entry->mHdr))
             NS_IF_ADDREF(*aResult = entry->mTemplate);
diff --git a/mozilla/content/xul/templates/src/nsTemplateRule.h b/mozilla/content/xul/templates/src/nsTemplateRule.h
index 5b023644123..7e42df1b22f 100644
--- a/mozilla/content/xul/templates/src/nsTemplateRule.h
+++ b/mozilla/content/xul/templates/src/nsTemplateRule.h
@@ -338,13 +338,13 @@ public:
 
     nsTemplateRule* GetRuleAt(PRInt16 aIndex)
     {
-        return NS_STATIC_CAST(nsTemplateRule*, mRules[aIndex]);
+        return static_cast<nsTemplateRule*>(mRules[aIndex]);
     }
 
     void Clear()
     {
         for (PRInt32 r = mRules.Count() - 1; r >= 0; r--) {
-            nsTemplateRule* rule = NS_STATIC_CAST(nsTemplateRule* , mRules[r]);
+            nsTemplateRule* rule = static_cast<nsTemplateRule*>(mRules[r]);
             delete rule;
         }
         mRules.Clear();
diff --git a/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp b/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp
index 3bbc3ad97e5..e9c69e60360 100644
--- a/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp
+++ b/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp
@@ -1521,7 +1521,7 @@ nsXULContentBuilder::RemoveGeneratedContent(nsIContent* aElement)
     while (0 != (count = ungenerated.Count())) {
         // Pull the next "ungenerated" element off the queue.
         PRInt32 last = count - 1;
-        nsIContent* element = NS_STATIC_CAST(nsIContent*, ungenerated[last]);
+        nsIContent* element = static_cast<nsIContent*>(ungenerated[last]);
         ungenerated.RemoveElementAt(last);
 
         PRUint32 i = element->GetChildCount();
@@ -1871,7 +1871,7 @@ nsXULContentBuilder::ReplaceMatch(nsIXULTemplateResult* aOldResult,
 
 {
     nsresult rv;
-    nsIContent* content = NS_STATIC_CAST(nsIContent*, aContext);
+    nsIContent* content = static_cast<nsIContent*>(aContext);
 
     // update the container attributes for the match
     if (content) {
diff --git a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp
index 314f57bf2d0..4109bdb9314 100644
--- a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp
+++ b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp
@@ -140,7 +140,7 @@ nsXULTemplateBuilder::nsXULTemplateBuilder(void)
 static PLDHashOperator
 DestroyMatchList(nsISupports* aKey, nsTemplateMatch* aMatch, void* aContext)
 {
-    nsFixedSizeAllocator* pool = NS_STATIC_CAST(nsFixedSizeAllocator *, aContext);
+    nsFixedSizeAllocator* pool = static_cast<nsFixedSizeAllocator *>(aContext);
 
     // delete all the matches in the list
     while (aMatch) {
@@ -231,7 +231,7 @@ static PLDHashOperator
 TraverseMatchList(nsISupports* aKey, nsTemplateMatch* aMatch, void* aContext)
 {
     nsCycleCollectionTraversalCallback *cb =
-        NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aContext);
+        static_cast<nsCycleCollectionTraversalCallback*>(aContext);
 
     cb->NoteXPCOMChild(aKey);
     nsTemplateMatch* match = aMatch;
@@ -1425,7 +1425,7 @@ nsXULTemplateBuilder::InitHTMLTemplateRoot()
     if (! context)
         return NS_ERROR_UNEXPECTED;
 
-    JSContext* jscontext = NS_REINTERPRET_CAST(JSContext*, context->GetNativeContext());
+    JSContext* jscontext = reinterpret_cast<JSContext*>(context->GetNativeContext());
     NS_ASSERTION(context != nsnull, "no jscontext");
     if (! jscontext)
         return NS_ERROR_UNEXPECTED;
@@ -1466,7 +1466,7 @@ nsXULTemplateBuilder::InitHTMLTemplateRoot()
         // builder
         nsCOMPtr<nsIXPConnectJSObjectHolder> wrapper;
         rv = xpc->WrapNative(jscontext, jselement,
-                             NS_STATIC_CAST(nsIXULTemplateBuilder*, this),
+                             static_cast<nsIXULTemplateBuilder*>(this),
                              NS_GET_IID(nsIXULTemplateBuilder),
                              getter_AddRefs(wrapper));
         NS_ENSURE_SUCCESS(rv, rv);
@@ -1641,7 +1641,7 @@ nsXULTemplateBuilder::SubstituteTextAppendText(nsXULTemplateBuilder* aThis,
                                                void* aClosure)
 {
     // Append aString to the closure's result
-    SubstituteTextClosure* c = NS_STATIC_CAST(SubstituteTextClosure*, aClosure);
+    SubstituteTextClosure* c = static_cast<SubstituteTextClosure*>(aClosure);
     c->str.Append(aText);
 }
 
@@ -1652,7 +1652,7 @@ nsXULTemplateBuilder::SubstituteTextReplaceVariable(nsXULTemplateBuilder* aThis,
 {
     // Substitute the value for the variable and append to the
     // closure's result.
-    SubstituteTextClosure* c = NS_STATIC_CAST(SubstituteTextClosure*, aClosure);
+    SubstituteTextClosure* c = static_cast<SubstituteTextClosure*>(aClosure);
 
     nsAutoString replacementText;
 
@@ -2511,7 +2511,7 @@ nsXULTemplateBuilder::AddSimpleRuleBindings(nsTemplateRule* aRule,
     while (elements.Count()) {
         // Pop the next element off the stack
         PRUint32 i = (PRUint32)(elements.Count() - 1);
-        nsIContent* element = NS_STATIC_CAST(nsIContent*, elements[i]);
+        nsIContent* element = static_cast<nsIContent*>(elements[i]);
         elements.RemoveElementAt(i);
 
         // Iterate through its attributes, looking for substitutions
@@ -2556,7 +2556,7 @@ nsXULTemplateBuilder::AddBindingsFor(nsXULTemplateBuilder* aThis,
     if (!StringBeginsWith(aVariable, NS_LITERAL_STRING("rdf:")))
         return;
 
-    nsTemplateRule* rule = NS_STATIC_CAST(nsTemplateRule*, aClosure);
+    nsTemplateRule* rule = static_cast<nsTemplateRule*>(aClosure);
 
     nsCOMPtr<nsIAtom> var = do_GetAtom(aVariable);
 
diff --git a/mozilla/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp b/mozilla/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp
index 69abe1aea3b..d012e98266b 100755
--- a/mozilla/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp
+++ b/mozilla/content/xul/templates/src/nsXULTemplateQueryProcessorRDF.cpp
@@ -91,7 +91,7 @@ BindingDependenciesTraverser(nsISupports* key,
                              void* userArg)
 {
     nsCycleCollectionTraversalCallback *cb = 
-        NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, userArg);
+        static_cast<nsCycleCollectionTraversalCallback*>(userArg);
 
     PRInt32 i, count = array->Count();
     for (i = 0; i < count; ++i) {
@@ -107,7 +107,7 @@ MemoryElementTraverser(const PRUint32& key,
                        void* userArg)
 {
     nsCycleCollectionTraversalCallback *cb = 
-        NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, userArg);
+        static_cast<nsCycleCollectionTraversalCallback*>(userArg);
 
     PRInt32 i, count = array->Count();
     for (i = 0; i < count; ++i) {
@@ -121,7 +121,7 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 RuleToBindingTraverser(nsISupports* key, RDFBindingSet* binding, void* userArg)
 {
     nsCycleCollectionTraversalCallback *cb = 
-        NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, userArg);
+        static_cast<nsCycleCollectionTraversalCallback*>(userArg);
 
     cb->NoteXPCOMChild(key);
 
@@ -384,7 +384,7 @@ nsXULTemplateQueryProcessorRDF::GenerateResults(nsISupports* aDatasource,
 
     // should be safe to cast here since the query is a
     // non-scriptable nsITemplateRDFQuery
-    nsRDFQuery* query = NS_STATIC_CAST(nsRDFQuery *, aQuery);
+    nsRDFQuery* query = static_cast<nsRDFQuery *>(aQuery);
 
     *aResults = nsnull;
 
@@ -829,7 +829,7 @@ nsXULTemplateQueryProcessorRDF::Propagate(nsIRDFResource* aSource,
     {
         ReteNodeSet::Iterator last = mRDFTests.Last();
         for (ReteNodeSet::Iterator i = mRDFTests.First(); i != last; ++i) {
-            nsRDFTestNode* rdftestnode = NS_STATIC_CAST(nsRDFTestNode*, *i);
+            nsRDFTestNode* rdftestnode = static_cast<nsRDFTestNode*>(*i);
 
             Instantiation seed;
             if (rdftestnode->CanPropagate(aSource, aProperty, aTarget, seed)) {
@@ -846,7 +846,7 @@ nsXULTemplateQueryProcessorRDF::Propagate(nsIRDFResource* aSource,
     {
         ReteNodeSet::Iterator last = livenodes.Last();
         for (ReteNodeSet::Iterator i = livenodes.First(); i != last; ++i) {
-            nsRDFTestNode* rdftestnode = NS_STATIC_CAST(nsRDFTestNode*, *i);
+            nsRDFTestNode* rdftestnode = static_cast<nsRDFTestNode*>(*i);
 
             // What happens here is we create an instantiation as if we were
             // at the found test in the rule network. For example, if the
@@ -918,7 +918,7 @@ nsXULTemplateQueryProcessorRDF::Retract(nsIRDFResource* aSource,
     // Retract any currently active rules that will no longer be matched.
     ReteNodeSet::ConstIterator lastnode = mRDFTests.Last();
     for (ReteNodeSet::ConstIterator node = mRDFTests.First(); node != lastnode; ++node) {
-        const nsRDFTestNode* rdftestnode = NS_STATIC_CAST(const nsRDFTestNode*, *node);
+        const nsRDFTestNode* rdftestnode = static_cast<const nsRDFTestNode*>(*node);
 
         rdftestnode->Retract(aSource, aProperty, aTarget);
 
diff --git a/mozilla/content/xul/templates/src/nsXULTreeBuilder.cpp b/mozilla/content/xul/templates/src/nsXULTreeBuilder.cpp
index f84f8964d78..109678034bf 100644
--- a/mozilla/content/xul/templates/src/nsXULTreeBuilder.cpp
+++ b/mozilla/content/xul/templates/src/nsXULTreeBuilder.cpp
@@ -1799,13 +1799,13 @@ nsXULTreeBuilder::IsContainerOpen(nsIRDFResource* aResource, PRBool* aOpen)
 int
 nsXULTreeBuilder::Compare(const void* aLeft, const void* aRight, void* aClosure)
 {
-    nsXULTreeBuilder* self = NS_STATIC_CAST(nsXULTreeBuilder*, aClosure);
+    nsXULTreeBuilder* self = static_cast<nsXULTreeBuilder*>(aClosure);
 
-    nsTreeRows::Row* left = NS_STATIC_CAST(nsTreeRows::Row*,
-                                               NS_CONST_CAST(void*, aLeft));
+    nsTreeRows::Row* left = static_cast<nsTreeRows::Row*>
+                                       (const_cast<void*>(aLeft));
 
-    nsTreeRows::Row* right = NS_STATIC_CAST(nsTreeRows::Row*,
-                                                NS_CONST_CAST(void*, aRight));
+    nsTreeRows::Row* right = static_cast<nsTreeRows::Row*>
+                                        (const_cast<void*>(aRight));
 
     return self->CompareResults(left->mMatch->mResult, right->mMatch->mResult);
 }
diff --git a/mozilla/db/mork/build/nsMorkFactory.cpp b/mozilla/db/mork/build/nsMorkFactory.cpp
index 95ef68ccbd4..71fa7b2efd2 100644
--- a/mozilla/db/mork/build/nsMorkFactory.cpp
+++ b/mozilla/db/mork/build/nsMorkFactory.cpp
@@ -85,7 +85,7 @@ nsMorkFactoryFactory::QueryInterface(REFNSIID iid, void** result)
   *result = nsnull;
   if(iid.Equals(NS_GET_IID(nsIMdbFactoryFactory)) ||
     iid.Equals(NS_GET_IID(nsISupports))) {
-    *result = NS_STATIC_CAST(nsIMdbFactoryFactory*, this);
+    *result = static_cast<nsIMdbFactoryFactory*>(this);
     AddRef();
     return NS_OK;
   }
diff --git a/mozilla/db/morkreader/nsMorkReader.cpp b/mozilla/db/morkreader/nsMorkReader.cpp
index f3663764854..10d3bb9ed86 100644
--- a/mozilla/db/morkreader/nsMorkReader.cpp
+++ b/mozilla/db/morkreader/nsMorkReader.cpp
@@ -173,7 +173,7 @@ struct AddColumnClosure
 PR_STATIC_CALLBACK(PLDHashOperator)
 AddColumn(const nsCSubstring &id, nsCString name, void *userData)
 {
-  AddColumnClosure *closure = NS_STATIC_CAST(AddColumnClosure*, userData);
+  AddColumnClosure *closure = static_cast<AddColumnClosure*>(userData);
   nsTArray<nsMorkReader::MorkColumn> *array = closure->array;
 
   if (!array->AppendElement(nsMorkReader::MorkColumn(id, name)) ||
@@ -261,7 +261,7 @@ nsMorkReader::EnumerateRows(RowEnumerator aCallback, void *aUserData) const
 {
   // Constify the table values
   typedef const nsDataHashtable<IDKey, const nsTArray<nsCString>* > ConstTable;
-  NS_REINTERPRET_CAST(ConstTable*, &mTable)->EnumerateRead(aCallback,
+  reinterpret_cast<ConstTable*>(&mTable)->EnumerateRead(aCallback,
                                                            aUserData);
 }
 
diff --git a/mozilla/docshell/base/nsDSURIContentListener.cpp b/mozilla/docshell/base/nsDSURIContentListener.cpp
index 9e1e51146a5..4057ecc73e3 100644
--- a/mozilla/docshell/base/nsDSURIContentListener.cpp
+++ b/mozilla/docshell/base/nsDSURIContentListener.cpp
@@ -142,7 +142,7 @@ nsDSURIContentListener::DoContent(const char* aContentType,
     }
 
     if (loadFlags & nsIChannel::LOAD_RETARGETED_DOCUMENT_URI) {
-        nsCOMPtr<nsIDOMWindowInternal> domWindow = do_GetInterface(NS_STATIC_CAST(nsIDocShell*, mDocShell));
+        nsCOMPtr<nsIDOMWindowInternal> domWindow = do_GetInterface(static_cast<nsIDocShell*>(mDocShell));
         NS_ENSURE_TRUE(domWindow, NS_ERROR_FAILURE);
         domWindow->Focus();
     }
diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index 90e5b0593fe..aed29cf5745 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -360,8 +360,8 @@ nsDocShell::Init()
     // We want to hold a strong ref to the loadgroup, so it better hold a weak
     // ref to us...  use an InterfaceRequestorProxy to do this.
     nsCOMPtr<InterfaceRequestorProxy> proxy =
-        new InterfaceRequestorProxy(NS_STATIC_CAST(nsIInterfaceRequestor*,
-                                                   this));
+        new InterfaceRequestorProxy(static_cast<nsIInterfaceRequestor*>
+                                               (this));
     NS_ENSURE_TRUE(proxy, NS_ERROR_OUT_OF_MEMORY);
     mLoadGroup->SetNotificationCallbacks(proxy);
 
@@ -723,7 +723,7 @@ nsDocShell::LoadURI(nsIURI * aURI,
         nsCOMPtr<nsIDocShell> parentDS(do_QueryInterface(parentAsItem));
         PRUint32 parentLoadType;
 
-        if (parentDS && parentDS != NS_STATIC_CAST(nsIDocShell *, this)) {
+        if (parentDS && parentDS != static_cast<nsIDocShell *>(this)) {
             /* OK. It is a subframe. Checkout the 
              * parent's loadtype. If the parent was loaded thro' a history
              * mechanism, then get the SH entry for the child from the parent.
@@ -1179,7 +1179,7 @@ nsDocShell::SetCurrentURI(nsIURI *aURI, nsIRequest *aRequest,
     nsCOMPtr<nsIDocShellTreeItem> root;
 
     GetSameTypeRootTreeItem(getter_AddRefs(root));
-    if (root.get() == NS_STATIC_CAST(nsIDocShellTreeItem *, this)) 
+    if (root.get() == static_cast<nsIDocShellTreeItem *>(this)) 
     {
         // This is the root docshell
         isRoot = PR_TRUE;
@@ -1784,7 +1784,7 @@ NS_IMETHODIMP
 nsDocShell::GetRootTreeItem(nsIDocShellTreeItem ** aRootTreeItem)
 {
     NS_ENSURE_ARG_POINTER(aRootTreeItem);
-    *aRootTreeItem = NS_STATIC_CAST(nsIDocShellTreeItem *, this);
+    *aRootTreeItem = static_cast<nsIDocShellTreeItem *>(this);
 
     nsCOMPtr<nsIDocShellTreeItem> parent;
     NS_ENSURE_SUCCESS(GetParent(getter_AddRefs(parent)), NS_ERROR_FAILURE);
@@ -1801,7 +1801,7 @@ NS_IMETHODIMP
 nsDocShell::GetSameTypeRootTreeItem(nsIDocShellTreeItem ** aRootTreeItem)
 {
     NS_ENSURE_ARG_POINTER(aRootTreeItem);
-    *aRootTreeItem = NS_STATIC_CAST(nsIDocShellTreeItem *, this);
+    *aRootTreeItem = static_cast<nsIDocShellTreeItem *>(this);
 
     nsCOMPtr<nsIDocShellTreeItem> parent;
     NS_ENSURE_SUCCESS(GetSameTypeParent(getter_AddRefs(parent)),
@@ -2051,8 +2051,8 @@ nsDocShell::FindItemWithName(const PRUnichar * aName,
         if (parentType == mItemType) {
             return parentAsTreeItem->
                 FindItemWithName(aName,
-                                 NS_STATIC_CAST(nsIDocShellTreeItem*,
-                                                this),
+                                 static_cast<nsIDocShellTreeItem*>
+                                            (this),
                                  aOriginalRequestor,
                                  _retval);
         }
@@ -2429,8 +2429,8 @@ nsDocShell::FindChildWithName(const PRUnichar * aName,
 #endif
             child->FindChildWithName(aName, PR_TRUE,
                                      aSameType,
-                                     NS_STATIC_CAST(nsIDocShellTreeItem*,
-                                                    this),
+                                     static_cast<nsIDocShellTreeItem*>
+                                                (this),
                                      aOriginalRequestor,
                                      _retval);
             NS_ASSERTION(NS_SUCCEEDED(rv),
@@ -3282,7 +3282,7 @@ nsDocShell::SetSessionHistory(nsISHistory * aSessionHistory)
      */
     GetSameTypeRootTreeItem(getter_AddRefs(root));
     NS_ENSURE_TRUE(root, NS_ERROR_FAILURE);
-    if (root.get() == NS_STATIC_CAST(nsIDocShellTreeItem *, this)) {
+    if (root.get() == static_cast<nsIDocShellTreeItem *>(this)) {
         mSessionHistory = aSessionHistory;
         nsCOMPtr<nsISHistoryInternal>
             shPrivate(do_QueryInterface(mSessionHistory));
@@ -4083,7 +4083,7 @@ nsDocShell::GetScrollbarVisibility(PRBool * verticalVisible,
     // We should now call nsLayoutUtils::GetScrollableFrameFor,
     // but we can't because of stupid linkage!
     nsIFrame* scrollFrame =
-        NS_STATIC_CAST(nsIFrame*, scrollView->View()->GetParent()->GetClientData());
+        static_cast<nsIFrame*>(scrollView->View()->GetParent()->GetClientData());
     if (!scrollFrame)
         return NS_ERROR_FAILURE;
     nsIScrollableFrame* scrollable = nsnull;
@@ -4634,7 +4634,7 @@ nsDocShell::RefreshURIFromQueue()
             // This is the nsRefreshTimer object, waiting to be
             // setup in a timer object and fired.                         
             // Create the timer and  trigger it.
-            PRUint32 delay = NS_STATIC_CAST(nsRefreshTimer*, NS_STATIC_CAST(nsITimerCallback*, refreshInfo))->GetDelay();
+            PRUint32 delay = static_cast<nsRefreshTimer*>(static_cast<nsITimerCallback*>(refreshInfo))->GetDelay();
             nsCOMPtr<nsITimer> timer = do_CreateInstance("@mozilla.org/timer;1");
             if (timer) {    
                 // Replace the nsRefreshTimer element in the queue with
@@ -5039,7 +5039,7 @@ nsDocShell::CreateAboutBlankContentViewer(nsIPrincipal* aPrincipal)
     docFactory->CreateBlankDocument(mLoadGroup, aPrincipal,
                                     getter_AddRefs(blankDoc));
     if (blankDoc) {
-      blankDoc->SetContainer(NS_STATIC_CAST(nsIDocShell *, this));
+      blankDoc->SetContainer(static_cast<nsIDocShell *>(this));
 
       // create a content viewer for us and the new document
       docFactory->CreateInstanceForDocument(NS_ISUPPORTS_CAST(nsIDocShell *, this),
@@ -5047,7 +5047,7 @@ nsDocShell::CreateAboutBlankContentViewer(nsIPrincipal* aPrincipal)
 
       // hook 'em up
       if (viewer) {
-        viewer->SetContainer(NS_STATIC_CAST(nsIContentViewerContainer *,this));
+        viewer->SetContainer(static_cast<nsIContentViewerContainer *>(this));
         nsCOMPtr<nsIDOMDocument> domdoc(do_QueryInterface(blankDoc));
         Embed(viewer, "", 0);
         viewer->SetDOMDocument(domdoc);
@@ -5607,7 +5607,7 @@ nsDocShell::RestoreFromHistory()
     // Now we simulate a load.  First, we restore the state of the javascript
     // window object.
     nsCOMPtr<nsPIDOMWindow> privWin =
-        do_GetInterface(NS_STATIC_CAST(nsIInterfaceRequestor*, this));
+        do_GetInterface(static_cast<nsIInterfaceRequestor*>(this));
     NS_ASSERTION(privWin, "could not get nsPIDOMWindow interface");
 
     rv = privWin->RestoreWindowState(windowState);
@@ -5880,7 +5880,7 @@ nsDocShell::NewContentViewerObj(const char *aContentType,
                                                        aViewer),
                       NS_ERROR_FAILURE);
 
-    (*aViewer)->SetContainer(NS_STATIC_CAST(nsIContentViewerContainer *, this));
+    (*aViewer)->SetContainer(static_cast<nsIContentViewerContainer *>(this));
     return NS_OK;
 }
 
@@ -6871,7 +6871,7 @@ nsDocShell::DoURILoad(nsIURI * aURI,
                        aURI,
                        nsnull,
                        nsnull,
-                       NS_STATIC_CAST(nsIInterfaceRequestor *, this),
+                       static_cast<nsIInterfaceRequestor *>(this),
                        loadFlags);
     if (NS_FAILED(rv)) {
         if (rv == NS_ERROR_UNKNOWN_PROTOCOL) {
@@ -7059,7 +7059,7 @@ AppendSegmentToString(nsIInputStream *in,
 {
     // aFromSegment now contains aCount bytes of data.
 
-    nsCAutoString *buf = NS_STATIC_CAST(nsCAutoString *, closure);
+    nsCAutoString *buf = static_cast<nsCAutoString *>(closure);
     buf->Append(fromRawSegment, count);
 
     // Indicate that we have consumed all of aFromSegment
@@ -7664,7 +7664,7 @@ nsDocShell::AddToSessionHistory(nsIURI * aURI,
      * other vitalities.
      */
     if (LOAD_TYPE_HAS_FLAGS(mLoadType, LOAD_FLAGS_REPLACE_HISTORY) &&
-        root != NS_STATIC_CAST(nsIDocShellTreeItem *, this)) {
+        root != static_cast<nsIDocShellTreeItem *>(this)) {
         // This is a subframe 
         entry = mOSHE;
         nsCOMPtr<nsISHContainer> shContainer(do_QueryInterface(entry));
@@ -7757,7 +7757,7 @@ nsDocShell::AddToSessionHistory(nsIURI * aURI,
         entry->SetExpirationStatus(PR_TRUE);
 
 
-    if (root == NS_STATIC_CAST(nsIDocShellTreeItem *, this) && mSessionHistory) {
+    if (root == static_cast<nsIDocShellTreeItem *>(this) && mSessionHistory) {
         // This is the root docshell
         if (LOAD_TYPE_HAS_FLAGS(mLoadType, LOAD_FLAGS_REPLACE_HISTORY)) {            
             // Replace current entry in session history.
@@ -7947,7 +7947,7 @@ nsDocShell::WalkHistoryEntries(nsISHEntry *aRootEntry,
             PRInt32 childCount = aRootShell->mChildList.Count();
             for (PRInt32 j = 0; j < childCount; ++j) {
                 nsDocShell *child =
-                    NS_STATIC_CAST(nsDocShell*, aRootShell->ChildAt(j));
+                    static_cast<nsDocShell*>(aRootShell->ChildAt(j));
 
                 if (child->HasHistoryEntry(childEntry)) {
                     childShell = child;
@@ -7984,7 +7984,7 @@ nsDocShell::CloneAndReplaceChild(nsISHEntry *aEntry, nsDocShell *aShell,
     nsresult result = NS_OK;
     nsCOMPtr<nsISHEntry> dest;
 
-    CloneAndReplaceData *data = NS_STATIC_CAST(CloneAndReplaceData*, aData);
+    CloneAndReplaceData *data = static_cast<CloneAndReplaceData*>(aData);
     PRUint32 cloneID = data->cloneID;
     nsISHEntry *replaceEntry = data->replaceEntry;
 
@@ -8066,7 +8066,7 @@ nsresult
 nsDocShell::SetChildHistoryEntry(nsISHEntry *aEntry, nsDocShell *aShell,
                                  PRInt32 aEntryIndex, void *aData)
 {
-    SwapEntriesData *data = NS_STATIC_CAST(SwapEntriesData*, aData);
+    SwapEntriesData *data = static_cast<SwapEntriesData*>(aData);
     nsDocShell *ignoreShell = data->ignoreShell;
 
     if (!aShell || aShell == ignoreShell)
@@ -8159,9 +8159,9 @@ nsDocShell::SetHistoryEntry(nsCOMPtr<nsISHEntry> *aPtr, nsISHEntry *aEntry)
             if (rootShell) { // if we're the root just set it, nothing to swap
                 SwapEntriesData data = { this, newRootEntry };
                 nsIDocShell *rootIDocShell =
-                    NS_STATIC_CAST(nsIDocShell*, rootShell);
-                nsDocShell *rootDocShell = NS_STATIC_CAST(nsDocShell*,
-                                                          rootIDocShell);
+                    static_cast<nsIDocShell*>(rootShell);
+                nsDocShell *rootDocShell = static_cast<nsDocShell*>
+                                                      (rootIDocShell);
 
 #ifdef NS_DEBUG
                 nsresult rv =
@@ -8346,7 +8346,7 @@ nsDocShell::ConfirmRepost(PRBool * aRepost)
 {
   nsresult rv;
   nsCOMPtr<nsIPrompt> prompter;
-  CallGetInterface(this, NS_STATIC_CAST(nsIPrompt**, getter_AddRefs(prompter)));
+  CallGetInterface(this, static_cast<nsIPrompt**>(getter_AddRefs(prompter)));
 
   nsCOMPtr<nsIStringBundleService> 
       stringBundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv));
@@ -8476,7 +8476,7 @@ nsDocShell::EnsureScriptEnvironment()
     NS_ENSURE_TRUE(mScriptGlobal, NS_ERROR_FAILURE);
 
     nsCOMPtr<nsPIDOMWindow> win(do_QueryInterface(mScriptGlobal));
-    win->SetDocShell(NS_STATIC_CAST(nsIDocShell *, this));
+    win->SetDocShell(static_cast<nsIDocShell *>(this));
     mScriptGlobal->
         SetGlobalObjectOwner(static_cast<nsIScriptGlobalObjectOwner *>(this));
 
@@ -8866,7 +8866,7 @@ nsDocShell::GetAuthPrompt(PRUint32 aPromptReason, const nsIID& iid,
     // of the dialogs works as it should when using tabs.
 
     return wwatch->GetPrompt(window, iid,
-                             NS_REINTERPRET_CAST(void**, aResult));
+                             reinterpret_cast<void**>(aResult));
 }
 
 //*****************************************************************************
diff --git a/mozilla/docshell/base/nsDocShellEnumerator.cpp b/mozilla/docshell/base/nsDocShellEnumerator.cpp
index d7e9c9687eb..ad1074b23a9 100644
--- a/mozilla/docshell/base/nsDocShellEnumerator.cpp
+++ b/mozilla/docshell/base/nsDocShellEnumerator.cpp
@@ -70,7 +70,7 @@ NS_IMETHODIMP nsDocShellEnumerator::GetNext(nsISupports **outCurItem)
   
   if (mCurIndex >= 0 && mCurIndex < mItemArray->Count())
   {
-    nsIDocShellTreeItem* thisItem = NS_REINTERPRET_CAST(nsIDocShellTreeItem*, mItemArray->ElementAt(mCurIndex));
+    nsIDocShellTreeItem* thisItem = reinterpret_cast<nsIDocShellTreeItem*>(mItemArray->ElementAt(mCurIndex));
     rv = thisItem->QueryInterface(NS_GET_IID(nsISupports), (void **)outCurItem);
     if (NS_FAILED(rv)) return rv;
   }
diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index 3000869df18..f7a94932fda 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -306,7 +306,7 @@ ForEachPing(nsIContent *content, ForEachPingCallback callback, void *closure)
 static void
 OnPingTimeout(nsITimer *timer, void *closure)
 {
-  nsILoadGroup *loadGroup = NS_STATIC_CAST(nsILoadGroup *, closure);
+  nsILoadGroup *loadGroup = static_cast<nsILoadGroup *>(closure);
   loadGroup->Cancel(NS_ERROR_ABORT);
   loadGroup->Release();
 }
@@ -412,7 +412,7 @@ struct SendPingInfo {
 static void
 SendPing(void *closure, nsIContent *content, nsIURI *uri, nsIIOService *ios)
 {
-  SendPingInfo *info = NS_STATIC_CAST(SendPingInfo *, closure);
+  SendPingInfo *info = static_cast<SendPingInfo *>(closure);
   if (info->numPings >= info->maxPings)
     return;
 
@@ -513,7 +513,7 @@ SendPing(void *closure, nsIContent *content, nsIURI *uri, nsIIOService *ios)
     if (NS_SUCCEEDED(rv)) {
       // When the timer expires, the callback function will release this
       // reference to the loadgroup.
-      NS_STATIC_CAST(nsILoadGroup *, loadGroup.get())->AddRef();
+      static_cast<nsILoadGroup *>(loadGroup.get())->AddRef();
       loadGroup = 0;
     }
   }
@@ -597,7 +597,7 @@ nsWebShell::EnsureCommandHandler()
     nsCOMPtr<nsPICommandUpdater>       commandUpdater = do_QueryInterface(mCommandManager);
     if (!commandUpdater) return NS_ERROR_FAILURE;
     
-    nsCOMPtr<nsIDOMWindow> domWindow = do_GetInterface(NS_STATIC_CAST(nsIInterfaceRequestor *, this));
+    nsCOMPtr<nsIDOMWindow> domWindow = do_GetInterface(static_cast<nsIInterfaceRequestor *>(this));
 #ifdef DEBUG
     nsresult rv =
 #endif
diff --git a/mozilla/docshell/shistory/src/nsSHistory.cpp b/mozilla/docshell/shistory/src/nsSHistory.cpp
index 0adfc3f39ce..b3443fff4ad 100644
--- a/mozilla/docshell/shistory/src/nsSHistory.cpp
+++ b/mozilla/docshell/shistory/src/nsSHistory.cpp
@@ -844,8 +844,8 @@ nsSHistory::EvictGlobalContentViewer()
     nsCOMPtr<nsISHEntry> evictFromSHE;
     nsCOMPtr<nsIContentViewer> evictViewer;
     PRInt32 totalContentViewers = 0;
-    nsSHistory* shist = NS_STATIC_CAST(nsSHistory*,
-                                       PR_LIST_HEAD(&gSHistoryList));
+    nsSHistory* shist = static_cast<nsSHistory*>
+                                   (PR_LIST_HEAD(&gSHistoryList));
     while (shist != &gSHistoryList) {
       // Calculate the window of SHEntries that could possibly have a content
       // viewer.  There could be up to gHistoryMaxViewers content viewers,
@@ -903,7 +903,7 @@ nsSHistory::EvictGlobalContentViewer()
         nsISHTransaction* temp = trans;
         temp->GetNext(getter_AddRefs(trans));
       }
-      shist = NS_STATIC_CAST(nsSHistory*, PR_NEXT_LINK(shist));
+      shist = static_cast<nsSHistory*>(PR_NEXT_LINK(shist));
     }
 
 #ifdef DEBUG_PAGE_CACHE
diff --git a/mozilla/dom/public/nsDOMJSUtils.h b/mozilla/dom/public/nsDOMJSUtils.h
index edff24462d9..5ff7cc68d80 100644
--- a/mozilla/dom/public/nsDOMJSUtils.h
+++ b/mozilla/dom/public/nsDOMJSUtils.h
@@ -15,8 +15,8 @@ GetScriptContextFromJSContext(JSContext *cx)
   }
 
   nsCOMPtr<nsIScriptContext> scx =
-    do_QueryInterface(NS_STATIC_CAST(nsISupports *,
-                                     ::JS_GetContextPrivate(cx)));
+    do_QueryInterface(static_cast<nsISupports *>
+                                 (::JS_GetContextPrivate(cx)));
 
   // This will return a pointer to something that's about to be
   // released, but that's ok here.
diff --git a/mozilla/dom/src/base/nsBarProps.cpp b/mozilla/dom/src/base/nsBarProps.cpp
index 157b657ad81..c794e25c54d 100644
--- a/mozilla/dom/src/base/nsBarProps.cpp
+++ b/mozilla/dom/src/base/nsBarProps.cpp
@@ -264,7 +264,7 @@ nsStatusbarProp::SetVisible(PRBool aVisible)
 nsScrollbarsProp::nsScrollbarsProp(nsGlobalWindow *aWindow)
 {
   mDOMWindow = aWindow;
-  nsISupports *supwin = NS_STATIC_CAST(nsIScriptGlobalObject *, aWindow);
+  nsISupports *supwin = static_cast<nsIScriptGlobalObject *>(aWindow);
   mDOMWindowWeakref = do_GetWeakReference(supwin);
 }
 
diff --git a/mozilla/dom/src/base/nsDOMClassInfo.cpp b/mozilla/dom/src/base/nsDOMClassInfo.cpp
index edbc2489629..5610f361822 100644
--- a/mozilla/dom/src/base/nsDOMClassInfo.cpp
+++ b/mozilla/dom/src/base/nsDOMClassInfo.cpp
@@ -1563,8 +1563,8 @@ nsDOMClassInfo::~nsDOMClassInfo()
 {
   if (IS_EXTERNAL(mData->mCachedClassInfo)) {
     // Some compilers don't like delete'ing a const nsDOMClassInfo*
-    nsDOMClassInfoData* data = NS_CONST_CAST(nsDOMClassInfoData*, mData);
-    delete NS_STATIC_CAST(nsExternalDOMClassInfoData*, data);
+    nsDOMClassInfoData* data = const_cast<nsDOMClassInfoData*>(mData);
+    delete static_cast<nsExternalDOMClassInfoData*>(data);
   }
 }
 
@@ -3312,12 +3312,12 @@ nsDOMClassInfo::GetInterfaces(PRUint32 *aCount, nsIID ***aArray)
     return NS_OK;
   }
 
-  *aArray = NS_STATIC_CAST(nsIID **, nsMemory::Alloc(count * sizeof(nsIID *)));
+  *aArray = static_cast<nsIID **>(nsMemory::Alloc(count * sizeof(nsIID *)));
   NS_ENSURE_TRUE(*aArray, NS_ERROR_OUT_OF_MEMORY);
 
   PRUint32 i;
   for (i = 0; i < count; i++) {
-    nsIID *iid = NS_STATIC_CAST(nsIID *, nsMemory::Clone(mData->mInterfaces[i],
+    nsIID *iid = static_cast<nsIID *>(nsMemory::Clone(mData->mInterfaces[i],
                                                          sizeof(nsIID)));
 
     if (!iid) {
@@ -3336,7 +3336,7 @@ NS_IMETHODIMP
 nsDOMClassInfo::GetHelperForLanguage(PRUint32 language, nsISupports **_retval)
 {
   if (language == nsIProgrammingLanguage::JAVASCRIPT) {
-    *_retval = NS_STATIC_CAST(nsIXPCScriptable *, this);
+    *_retval = static_cast<nsIXPCScriptable *>(this);
 
     NS_ADDREF(*_retval);
   } else {
@@ -4885,7 +4885,7 @@ public:
 
     JSBool ok =
       ::JS_DefineUCProperty(cx, target,
-                            NS_REINTERPRET_CAST(const jschar *, mClassName),
+                            reinterpret_cast<const jschar *>(mClassName),
                             nsCRT::strlen(mClassName), thisAsVal, nsnull,
                             nsnull, 0);
 
@@ -5194,8 +5194,8 @@ nsWindowSH::GlobalResolve(nsGlobalWindow *aWin, JSContext *cx,
     // direct DOM class, create a constructor object...
 
     nsRefPtr<nsDOMConstructor> constructor =
-      new nsDOMConstructor(NS_REINTERPRET_CAST(PRUnichar *,
-                                               ::JS_GetStringChars(str)),
+      new nsDOMConstructor(reinterpret_cast<PRUnichar *>
+                                           (::JS_GetStringChars(str)),
                            name_struct);
     if (!constructor) {
       return NS_ERROR_OUT_OF_MEMORY;
@@ -5255,8 +5255,8 @@ nsWindowSH::GlobalResolve(nsGlobalWindow *aWin, JSContext *cx,
       }
     }
 
-    const PRUnichar *name = NS_REINTERPRET_CAST(PRUnichar *,
-                                                ::JS_GetStringChars(str));
+    const PRUnichar *name = reinterpret_cast<PRUnichar *>
+                                            (::JS_GetStringChars(str));
     nsRefPtr<nsDOMConstructor> constructor =
       new nsDOMConstructor(name, name_struct);
     if (!constructor) {
@@ -5793,7 +5793,7 @@ nsWindowSH::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
 
       const jschar *chars = ::JS_GetStringChars(str);
 
-      dsn->FindChildWithName(NS_REINTERPRET_CAST(const PRUnichar*, chars),
+      dsn->FindChildWithName(reinterpret_cast<const PRUnichar*>(chars),
                              PR_FALSE, PR_TRUE, nsnull, nsnull,
                              getter_AddRefs(child));
 
@@ -7213,7 +7213,7 @@ nsContentListSH::PreCreate(nsISupports *nativeObj, JSContext *cx,
 {
   nsCOMPtr<nsIDOMNodeList> nodeList(do_QueryInterface(nativeObj));
   nsContentList *contentList =
-    NS_STATIC_CAST(nsContentList*, NS_STATIC_CAST(nsIDOMNodeList*, nodeList));
+    static_cast<nsContentList*>(static_cast<nsIDOMNodeList*>(nodeList));
 
   if (!contentList) {
     return NS_OK;
@@ -7589,8 +7589,8 @@ nsDocumentSH::PostCreate(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
     NS_NAMED_LITERAL_STRING(doc_str, "document");
 
     if (!::JS_DefineUCProperty(cx, JSVAL_TO_OBJECT(winVal),
-                               NS_REINTERPRET_CAST(const jschar *,
-                                                   doc_str.get()),
+                               reinterpret_cast<const jschar *>
+                                               (doc_str.get()),
                                doc_str.Length(), OBJECT_TO_JSVAL(obj), nsnull,
                                nsnull, JSPROP_READONLY | JSPROP_ENUMERATE)) {
       return NS_ERROR_FAILURE;
@@ -7673,8 +7673,8 @@ nsHTMLDocumentSH::DocumentOpen(JSContext *cx, JSObject *obj, uintN argc,
     }
 
     replace = NS_LITERAL_STRING("replace").
-      Equals(NS_REINTERPRET_CAST(const PRUnichar*,
-                                 ::JS_GetStringChars(jsstr)));
+      Equals(reinterpret_cast<const PRUnichar*>
+                             (::JS_GetStringChars(jsstr)));
   }
 
   nsCOMPtr<nsIDOMDocument> retval;
@@ -8648,8 +8648,8 @@ nsHTMLFormElementSH::NewEnumerate(nsIXPConnectWrappedNative *wrapper,
         JSAutoRequest ar(cx);
 
         JSString *jsname =
-          JS_NewUCStringCopyN(cx, NS_REINTERPRET_CAST(const jschar *,
-                                                      attr.get()),
+          JS_NewUCStringCopyN(cx, reinterpret_cast<const jschar *>
+                                                  (attr.get()),
                               attr.Length());
         NS_ENSURE_TRUE(jsname, NS_ERROR_OUT_OF_MEMORY);
 
@@ -9564,7 +9564,7 @@ nsStringArraySH::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
   JSAutoRequest ar(cx);
 
   JSString *str =
-    ::JS_NewUCStringCopyN(cx, NS_REINTERPRET_CAST(const jschar *, val.get()),
+    ::JS_NewUCStringCopyN(cx, reinterpret_cast<const jschar *>(val.get()),
                           val.Length());
   NS_ENSURE_TRUE(str, NS_ERROR_OUT_OF_MEMORY);
 
@@ -9903,8 +9903,8 @@ nsStorageSH::NewEnumerate(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
       if (keys->Length() != 0) {
         nsString& key = keys->ElementAt(0);
         JSString *str =
-          JS_NewUCStringCopyN(cx, NS_REINTERPRET_CAST(const jschar *,
-                                                      key.get()),
+          JS_NewUCStringCopyN(cx, reinterpret_cast<const jschar *>
+                                                  (key.get()),
                               key.Length());
         NS_ENSURE_TRUE(str, NS_ERROR_OUT_OF_MEMORY);
 
@@ -9992,7 +9992,7 @@ nsDOMConstructorSH::Call(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                          PRBool *_retval)
 {
   nsDOMConstructor *wrapped =
-    NS_STATIC_CAST(nsDOMConstructor *, wrapper->Native());
+    static_cast<nsDOMConstructor *>(wrapper->Native());
 
 #ifdef DEBUG
   {
@@ -10010,7 +10010,7 @@ nsDOMConstructorSH::Construct(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                               jsval *vp, PRBool *_retval)
 {
   nsDOMConstructor *wrapped =
-    NS_STATIC_CAST(nsDOMConstructor *, wrapper->Native());
+    static_cast<nsDOMConstructor *>(wrapper->Native());
 
 #ifdef DEBUG
   {
@@ -10028,7 +10028,7 @@ nsDOMConstructorSH::HasInstance(nsIXPConnectWrappedNative *wrapper,
                                 PRBool *bp, PRBool *_retval)
 {
   nsDOMConstructor *wrapped =
-    NS_STATIC_CAST(nsDOMConstructor *, wrapper->Native());
+    static_cast<nsDOMConstructor *>(wrapper->Native());
 
 #ifdef DEBUG
   {
diff --git a/mozilla/dom/src/base/nsFocusController.cpp b/mozilla/dom/src/base/nsFocusController.cpp
index d274082e607..a7a33c71555 100644
--- a/mozilla/dom/src/base/nsFocusController.cpp
+++ b/mozilla/dom/src/base/nsFocusController.cpp
@@ -444,8 +444,8 @@ nsFocusController::GetControllerForCommand(const char * aCommand,
   }
   else if (mCurrentWindow) {
     nsGlobalWindow *win =
-      NS_STATIC_CAST(nsGlobalWindow *,
-                     NS_STATIC_CAST(nsIDOMWindowInternal *, mCurrentWindow));
+      static_cast<nsGlobalWindow *>
+                 (static_cast<nsIDOMWindowInternal *>(mCurrentWindow));
     currentWindow = win->GetPrivateParent();
   }
   else return NS_OK;
@@ -465,8 +465,8 @@ nsFocusController::GetControllerForCommand(const char * aCommand,
     }
 
     nsGlobalWindow *win =
-      NS_STATIC_CAST(nsGlobalWindow *,
-                     NS_STATIC_CAST(nsIDOMWindowInternal *, currentWindow));
+      static_cast<nsGlobalWindow *>
+                 (static_cast<nsIDOMWindowInternal *>(currentWindow));
     currentWindow = win->GetPrivateParent();
   }
   
diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp
index 30830b17b4b..170c97362c1 100644
--- a/mozilla/dom/src/base/nsGlobalWindow.cpp
+++ b/mozilla/dom/src/base/nsGlobalWindow.cpp
@@ -557,7 +557,7 @@ nsGlobalWindow::~nsGlobalWindow()
   CleanUp();
 
 #ifdef DEBUG
-  nsCycleCollector_DEBUG_wasFreed(NS_STATIC_CAST(nsIScriptGlobalObject*, this));
+  nsCycleCollector_DEBUG_wasFreed(static_cast<nsIScriptGlobalObject*>(this));
 #endif
 
   delete mPendingStorageEvents;
@@ -614,7 +614,7 @@ nsGlobalWindow::CleanUp()
   mArgumentsLast = nsnull;
 
 #ifdef DEBUG
-  nsCycleCollector_DEBUG_shouldBeFreed(NS_STATIC_CAST(nsIScriptGlobalObject*, this));
+  nsCycleCollector_DEBUG_shouldBeFreed(static_cast<nsIScriptGlobalObject*>(this));
 #endif
 }
 
@@ -680,7 +680,7 @@ nsGlobalWindow::FreeInnerObjects(PRBool aClearScope)
   }
 
 #ifdef DEBUG
-  nsCycleCollector_DEBUG_shouldBeFreed(NS_STATIC_CAST(nsIScriptGlobalObject*, this));
+  nsCycleCollector_DEBUG_shouldBeFreed(static_cast<nsIScriptGlobalObject*>(this));
 #endif
 }
 
@@ -1184,9 +1184,9 @@ WindowStateHolder::WindowStateHolder(nsGlobalWindow *aWindow,
     }
 
     focusedWindow =
-      NS_STATIC_CAST(nsGlobalWindow*,
-                     NS_STATIC_CAST(nsPIDOMWindow*,
-                                    focusedWindow))->GetPrivateParent();
+      static_cast<nsGlobalWindow*>
+                 (static_cast<nsPIDOMWindow*>
+                             (focusedWindow))->GetPrivateParent();
   }
 
   aWindow->SuspendTimeouts();
@@ -1291,7 +1291,7 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument,
     // and other browser commands.
     nsIDOMWindowInternal *internal = nsGlobalWindow::GetPrivateRoot();
 
-    if (internal == NS_STATIC_CAST(nsIDOMWindowInternal *, this)) {
+    if (internal == static_cast<nsIDOMWindowInternal *>(this)) {
       nsCOMPtr<nsIXBLService> xblService = do_GetService("@mozilla.org/xbl;1");
       if (xblService) {
         nsCOMPtr<nsPIDOMEventTarget> piTarget =
@@ -1370,7 +1370,7 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument,
     nsRefPtr<nsGlobalWindow> newInnerWindow;
 
     nsCOMPtr<nsIDOMChromeWindow> thisChrome =
-      do_QueryInterface(NS_STATIC_CAST(nsIDOMWindow *, this));
+      do_QueryInterface(static_cast<nsIDOMWindow *>(this));
     nsCOMPtr<nsIXPConnectJSObjectHolder> navigatorHolder;
 
     PRBool isChrome = PR_FALSE;
@@ -1484,7 +1484,7 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument,
           // 163645 for more on why we need this.
 
           nsIDOMNavigator* navigator =
-            NS_STATIC_CAST(nsIDOMNavigator*, mNavigator.get());
+            static_cast<nsIDOMNavigator*>(mNavigator.get());
           xpc->WrapNative(cx, currentInner->mJSObject, navigator,
                           NS_GET_IID(nsIDOMNavigator),
                           getter_AddRefs(navigatorHolder));
@@ -1514,8 +1514,8 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument,
             JSAutoRequest ar(cx);
 
             callerScx->SetTerminationFunction(ClearWindowScope,
-                                              NS_STATIC_CAST(nsIDOMWindow *,
-                                                             currentInner));
+                                              static_cast<nsIDOMWindow *>
+                                                         (currentInner));
 
             termFuncSet = PR_TRUE;
           }
@@ -1789,7 +1789,7 @@ nsGlobalWindow::SetDocShell(nsIDocShell* aDocShell)
     }
     mContext = nsnull; // we nuked it above also
 #ifdef DEBUG
-    nsCycleCollector_DEBUG_shouldBeFreed(NS_STATIC_CAST(nsIScriptGlobalObject*, this));
+    nsCycleCollector_DEBUG_shouldBeFreed(static_cast<nsIScriptGlobalObject*>(this));
 #endif
   }
 
@@ -1828,7 +1828,7 @@ nsGlobalWindow::SetDocShell(nsIDocShell* aDocShell)
       // our window.
       nsCOMPtr<nsIDOMWindow> parentWindow;
       GetParent(getter_AddRefs(parentWindow));
-      if (parentWindow.get() != NS_STATIC_CAST(nsIDOMWindow*,this)) {
+      if (parentWindow.get() != static_cast<nsIDOMWindow*>(this)) {
         nsCOMPtr<nsPIDOMWindow> piWindow(do_QueryInterface(parentWindow));
         mChromeEventHandler = piWindow->GetChromeEventHandler();
       }
@@ -1990,7 +1990,7 @@ nsGlobalWindow::DispatchDOMEvent(nsEvent* aEvent,
                                  nsEventStatus* aEventStatus)
 {
   return
-    nsEventDispatcher::DispatchDOMEvent(NS_STATIC_CAST(nsPIDOMWindow*, this),
+    nsEventDispatcher::DispatchDOMEvent(static_cast<nsPIDOMWindow*>(this),
                                        aEvent, aDOMEvent, aPresContext,
                                        aEventStatus);
 }
@@ -2130,7 +2130,7 @@ nsGlobalWindow::GetWindow(nsIDOMWindowInternal** aWindow)
 {
   FORWARD_TO_OUTER(GetWindow, (aWindow), NS_ERROR_NOT_INITIALIZED);
 
-  *aWindow = NS_STATIC_CAST(nsIDOMWindowInternal *, this);
+  *aWindow = static_cast<nsIDOMWindowInternal *>(this);
   NS_ADDREF(*aWindow);
   return NS_OK;
 }
@@ -2140,7 +2140,7 @@ nsGlobalWindow::GetSelf(nsIDOMWindowInternal** aWindow)
 {
   FORWARD_TO_OUTER(GetSelf, (aWindow), NS_ERROR_NOT_INITIALIZED);
 
-  *aWindow = NS_STATIC_CAST(nsIDOMWindowInternal *, this);
+  *aWindow = static_cast<nsIDOMWindowInternal *>(this);
   NS_ADDREF(*aWindow);
   return NS_OK;
 }
@@ -2222,7 +2222,7 @@ nsGlobalWindow::GetParent(nsIDOMWindow** aParent)
                       NS_ERROR_FAILURE);
   }
   else {
-    *aParent = NS_STATIC_CAST(nsIDOMWindowInternal *, this);
+    *aParent = static_cast<nsIDOMWindowInternal *>(this);
     NS_ADDREF(*aParent);
   }
   return NS_OK;
@@ -2483,7 +2483,7 @@ nsGlobalWindow::GetFrames(nsIDOMWindowCollection** aFrames)
     }
   }
 
-  *aFrames = NS_STATIC_CAST(nsIDOMWindowCollection *, mFrames);
+  *aFrames = static_cast<nsIDOMWindowCollection *>(mFrames);
   NS_IF_ADDREF(*aFrames);
   return NS_OK;
 }
@@ -2535,7 +2535,7 @@ nsGlobalWindow::GetControllers(nsIControllers** aResult)
     nsCOMPtr<nsIControllerContext> controllerContext = do_QueryInterface(controller);
     if (!controllerContext) return NS_ERROR_FAILURE;
 
-    controllerContext->SetCommandContext(NS_STATIC_CAST(nsIDOMWindow*, this));
+    controllerContext->SetCommandContext(static_cast<nsIDOMWindow*>(this));
   }
 
   *aResult = mControllers;
@@ -2844,7 +2844,7 @@ nsGlobalWindow::GetOuterWidth(PRInt32* aOuterWidth)
   NS_ENSURE_TRUE(treeOwnerAsWin, NS_ERROR_FAILURE);
 
   nsGlobalWindow* rootWindow =
-    NS_STATIC_CAST(nsGlobalWindow *, GetPrivateRoot());
+    static_cast<nsGlobalWindow *>(GetPrivateRoot());
   if (rootWindow) {
     rootWindow->FlushPendingNotifications(Flush_Layout);
   }
@@ -2895,7 +2895,7 @@ nsGlobalWindow::GetOuterHeight(PRInt32* aOuterHeight)
   NS_ENSURE_TRUE(treeOwnerAsWin, NS_ERROR_FAILURE);
 
   nsGlobalWindow* rootWindow =
-    NS_STATIC_CAST(nsGlobalWindow *, GetPrivateRoot());
+    static_cast<nsGlobalWindow *>(GetPrivateRoot());
   if (rootWindow) {
     rootWindow->FlushPendingNotifications(Flush_Layout);
   }
@@ -3080,7 +3080,7 @@ nsGlobalWindow::CheckSecurityLeftAndTop(PRInt32* aLeft, PRInt32* aTop)
     PRInt32 winLeft, winTop, winWidth, winHeight;
 
     nsGlobalWindow* rootWindow =
-      NS_STATIC_CAST(nsGlobalWindow*, GetPrivateRoot());
+      static_cast<nsGlobalWindow*>(GetPrivateRoot());
     if (rootWindow) {
       rootWindow->FlushPendingNotifications(Flush_Layout);
     }
@@ -3266,8 +3266,7 @@ nsGlobalWindow::DispatchCustomEvent(const char *aEventName)
   PRBool defaultActionEnabled = PR_TRUE;
   nsCOMPtr<nsIDocument> doc(do_QueryInterface(mDocument));
   nsContentUtils::DispatchTrustedEvent(doc,
-                                       NS_STATIC_CAST(
-                                         nsIScriptGlobalObject*, this),
+                                       static_cast<nsIScriptGlobalObject*>(this),
                                        NS_ConvertASCIItoUTF16(aEventName),
                                        PR_TRUE, PR_TRUE, &defaultActionEnabled);
 
@@ -3808,7 +3807,7 @@ nsGlobalWindow::Focus()
     NS_ASSERTION(treeItem, "What happened?");
     treeItem->GetItemType(&itemType);
     if (itemType == nsIDocShellTreeItem::typeChrome &&
-        GetPrivateRoot() == NS_STATIC_CAST(nsIDOMWindowInternal*, this) &&
+        GetPrivateRoot() == static_cast<nsIDOMWindowInternal*>(this) &&
         mDocument) {
       nsCOMPtr<nsIDocument> doc(do_QueryInterface(mDocument));
       NS_ASSERTION(doc, "Bogus doc?");
@@ -4529,7 +4528,7 @@ nsGlobalWindow::FireAbuseEvents(PRBool aBlocked, PRBool aWindow,
     }
   }
   if (!contextWindow)
-    contextWindow = NS_STATIC_CAST(nsIDOMWindow*,this);
+    contextWindow = static_cast<nsIDOMWindow*>(this);
 
   nsCOMPtr<nsIDOMDocument> domdoc;
   contextWindow->GetDocument(getter_AddRefs(domdoc));
@@ -4830,8 +4829,8 @@ nsGlobalWindow::Close()
       // (which is what would tend to happen if we did this synchronously
       // here).
       rv = currentCX->SetTerminationFunction(CloseWindow,
-                                             NS_STATIC_CAST(nsIDOMWindow *,
-                                                            this));
+                                             static_cast<nsIDOMWindow *>
+                                                        (this));
       if (NS_SUCCEEDED(rv)) {
         mHavePendingClose = PR_TRUE;
       }
@@ -4925,9 +4924,9 @@ nsGlobalWindow::EnterModalState()
     return;
   }
 
-  NS_STATIC_CAST(nsGlobalWindow *,
-                 NS_STATIC_CAST(nsIDOMWindow *,
-                                top.get()))->mModalStateDepth++;
+  static_cast<nsGlobalWindow *>
+             (static_cast<nsIDOMWindow *>
+                         (top.get()))->mModalStateDepth++;
 }
 
 // static
@@ -4972,9 +4971,9 @@ nsGlobalWindow::RunPendingTimeoutsRecursive(nsGlobalWindow *aTopWindow,
     }
 
     nsGlobalWindow *childWin =
-      NS_STATIC_CAST(nsGlobalWindow *,
-                     NS_STATIC_CAST(nsIDOMWindow *,
-                                    child.get()));
+      static_cast<nsGlobalWindow *>
+                 (static_cast<nsIDOMWindow *>
+                             (child.get()));
 
     RunPendingTimeoutsRecursive(aTopWindow, childWin);
   }
@@ -5013,9 +5012,9 @@ nsGlobalWindow::LeaveModalState()
   }
 
   nsGlobalWindow *topWin =
-    NS_STATIC_CAST(nsGlobalWindow *,
-                   NS_STATIC_CAST(nsIDOMWindow *,
-                                  top.get()));
+    static_cast<nsGlobalWindow *>
+               (static_cast<nsIDOMWindow *>
+                           (top.get()));
 
   topWin->mModalStateDepth--;
 
@@ -5038,9 +5037,9 @@ nsGlobalWindow::IsInModalState()
     return PR_FALSE;
   }
 
-  return NS_STATIC_CAST(nsGlobalWindow *,
-                        NS_STATIC_CAST(nsIDOMWindow *,
-                                       top.get()))->mModalStateDepth != 0;
+  return static_cast<nsGlobalWindow *>
+                    (static_cast<nsIDOMWindow *>
+                                (top.get()))->mModalStateDepth != 0;
 }
 
 NS_IMETHODIMP
@@ -5410,7 +5409,7 @@ nsGlobalWindow::Atob(const nsAString& aAsciiBase64String,
   // the allocated memory (the PL_Base64Decode API should really
   // provide a guaranteed way to figure this out w/o needing to do the
   // above yourself).
-  char *dest = NS_STATIC_CAST(char *, nsMemory::Alloc(resultLen + 4));
+  char *dest = static_cast<char *>(nsMemory::Alloc(resultLen + 4));
   if (!dest) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
@@ -5632,7 +5631,7 @@ nsGlobalWindow::GetListenerManager(PRBool aCreateIfNotFound,
     mListenerManager = do_CreateInstance(kEventListenerManagerCID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
     mListenerManager->SetListenerTarget(
-      NS_STATIC_CAST(nsPIDOMEventTarget*, this));
+      static_cast<nsPIDOMEventTarget*>(this));
   }
 
   NS_ADDREF(*aResult = mListenerManager);
@@ -5663,7 +5662,7 @@ nsGlobalWindow::GetPrivateParent()
   nsCOMPtr<nsIDOMWindow> parent;
   GetParent(getter_AddRefs(parent));
 
-  if (NS_STATIC_CAST(nsIDOMWindow *, this) == parent.get()) {
+  if (static_cast<nsIDOMWindow *>(this) == parent.get()) {
     nsCOMPtr<nsIContent> chromeElement(do_QueryInterface(mChromeEventHandler));
     if (!chromeElement)
       return nsnull;             // This is ok, just means a null parent.
@@ -5680,8 +5679,8 @@ nsGlobalWindow::GetPrivateParent()
   }
 
   if (parent) {
-    return NS_STATIC_CAST(nsGlobalWindow *,
-                          NS_STATIC_CAST(nsIDOMWindow*, parent.get()));
+    return static_cast<nsGlobalWindow *>
+                      (static_cast<nsIDOMWindow*>(parent.get()));
   }
 
   return nsnull;
@@ -5719,8 +5718,8 @@ nsGlobalWindow::GetPrivateRoot()
     }
   }
 
-  return NS_STATIC_CAST(nsGlobalWindow *,
-                        NS_STATIC_CAST(nsIDOMWindow *, top));
+  return static_cast<nsGlobalWindow *>
+                    (static_cast<nsIDOMWindow *>(top));
 }
 
 
@@ -6167,7 +6166,7 @@ nsGlobalWindow::Observe(nsISupports* aSubject, const char* aTopic,
 PR_STATIC_CALLBACK(PLDHashOperator)
 FirePendingStorageEvents(const nsAString& aKey, PRBool aData, void *userArg)
 {
-  nsGlobalWindow *win = NS_STATIC_CAST(nsGlobalWindow *, userArg);
+  nsGlobalWindow *win = static_cast<nsGlobalWindow *>(userArg);
 
   nsCOMPtr<nsIDOMStorage> storage;
   win->GetSessionStorage(getter_AddRefs(storage));
@@ -6212,8 +6211,8 @@ nsGlobalWindow::FireDelayedDOMEvents()
       nsCOMPtr<nsPIDOMWindow> pWin = do_GetInterface(childShell);
       if (pWin) {
         nsGlobalWindow *win =
-          NS_STATIC_CAST(nsGlobalWindow*,
-                         NS_STATIC_CAST(nsPIDOMWindow*, pWin));
+          static_cast<nsGlobalWindow*>
+                     (static_cast<nsPIDOMWindow*>(pWin));
         win->FireDelayedDOMEvents();
       }
     }
@@ -6236,7 +6235,7 @@ nsGlobalWindow::GetParentInternal()
   nsCOMPtr<nsIDOMWindow> parent;
   GetParent(getter_AddRefs(parent));
 
-  if (parent && parent != NS_STATIC_CAST(nsIDOMWindow *, this)) {
+  if (parent && parent != static_cast<nsIDOMWindow *>(this)) {
     nsCOMPtr<nsIDOMWindowInternal> tmp(do_QueryInterface(parent));
     NS_ASSERTION(parent, "Huh, parent not an nsIDOMWindowInternal?");
 
@@ -6250,8 +6249,8 @@ nsGlobalWindow::GetParentInternal()
 void
 nsGlobalWindow::CloseBlockScriptTerminationFunc(nsISupports *aRef)
 {
-  nsGlobalWindow* pwin = NS_STATIC_CAST(nsGlobalWindow*,
-                                        NS_STATIC_CAST(nsPIDOMWindow*, aRef));
+  nsGlobalWindow* pwin = static_cast<nsGlobalWindow*>
+                                    (static_cast<nsPIDOMWindow*>(aRef));
   pwin->mBlockScriptedClosingFlag = PR_FALSE;
 }
 
@@ -6344,8 +6343,8 @@ nsGlobalWindow::OpenInternal(const nsAString& aUrl, const nsAString& aName,
         if (mContext == GetScriptContextFromJSContext(aJSCallerContext)) {
           mBlockScriptedClosingFlag = PR_TRUE;
           mContext->SetTerminationFunction(CloseBlockScriptTerminationFunc,
-                                           NS_STATIC_CAST(nsPIDOMWindow*,
-                                                          this));
+                                           static_cast<nsPIDOMWindow*>
+                                                      (this));
         }
       }
 
@@ -6438,7 +6437,7 @@ nsGlobalWindow::OpenInternal(const nsAString& aUrl, const nsAString& aName,
     
   if (checkForPopup) {
     if (abuseLevel >= openControlled) {
-      nsGlobalWindow *opened = NS_STATIC_CAST(nsGlobalWindow *, *aReturn);
+      nsGlobalWindow *opened = static_cast<nsGlobalWindow *>(*aReturn);
       if (!opened->IsPopupSpamWindow()) {
         opened->SetPopupSpamWindow(PR_TRUE);
         ++gOpenPopupSpamCount;
@@ -6452,7 +6451,7 @@ nsGlobalWindow::OpenInternal(const nsAString& aUrl, const nsAString& aName,
   // necessary.  If the new window has the same domain as this window
   // did at the beginning of this function, the session storage data
   // for that domain, and only that domain, is copied over.
-  nsGlobalWindow *opened = NS_STATIC_CAST(nsGlobalWindow *, *aReturn);
+  nsGlobalWindow *opened = static_cast<nsGlobalWindow *>(*aReturn);
   nsIDocShell* newDocShell = opened->GetDocShell();
 
   if (currentCodebase && newDocShell && mDocShell && url.get()) {
@@ -6490,8 +6489,8 @@ nsGlobalWindow::CloseWindow(nsISupports *aWindow)
   nsCOMPtr<nsPIDOMWindow> win(do_QueryInterface(aWindow));
 
   nsGlobalWindow* globalWin =
-    NS_STATIC_CAST(nsGlobalWindow *,
-                   NS_STATIC_CAST(nsPIDOMWindow*, win));
+    static_cast<nsGlobalWindow *>
+               (static_cast<nsPIDOMWindow*>(win));
 
   // Need to post an event for closing, otherwise window and 
   // presshell etc. may get destroyed while creating frames, bug 338897.
@@ -6858,7 +6857,7 @@ nsGlobalWindow::RunTimeout(nsTimeout *aTimeout)
                                             (PRTime)PR_USEC_PER_MSEC));
 
       nsCOMPtr<nsIVariant> dummy;
-      nsCOMPtr<nsISupports> me(NS_STATIC_CAST(nsIDOMWindow *, this));
+      nsCOMPtr<nsISupports> me(static_cast<nsIDOMWindow *>(this));
       scx->CallEventHandler(me,
                             GetScriptGlobal(handler->GetScriptTypeID()),
                             scriptObject, handler->GetArgv(),
@@ -7301,7 +7300,7 @@ nsGlobalWindow::BuildURIfromBase(const char *aURL, nsIURI **aBuiltURI,
     return NS_ERROR_FAILURE;
 
   nsCOMPtr<nsIDOMChromeWindow> chrome_win =
-    do_QueryInterface(NS_STATIC_CAST(nsIDOMWindow *, this));
+    do_QueryInterface(static_cast<nsIDOMWindow *>(this));
 
   if (nsContentUtils::IsCallerChrome() && !chrome_win) {
     // If open() is called from chrome on a non-chrome window, we'll
@@ -7384,7 +7383,7 @@ nsGlobalWindow::EnsureSizeUpToDate()
   // crosses the content/chrome boundary, since chrome can have pending reflows
   // too.
   nsGlobalWindow *parent =
-    NS_STATIC_CAST(nsGlobalWindow *, GetPrivateParent());
+    static_cast<nsGlobalWindow *>(GetPrivateParent());
   if (parent) {
     parent->FlushPendingNotifications(Flush_Layout);
   }
@@ -7547,8 +7546,8 @@ nsGlobalWindow::SuspendTimeouts()
       nsCOMPtr<nsPIDOMWindow> pWin = do_GetInterface(childShell);
       if (pWin) {
         nsGlobalWindow *win =
-          NS_STATIC_CAST(nsGlobalWindow*,
-                         NS_STATIC_CAST(nsPIDOMWindow*, pWin));
+          static_cast<nsGlobalWindow*>
+                     (static_cast<nsPIDOMWindow*>(pWin));
 
         win->SuspendTimeouts();
 
@@ -7616,8 +7615,8 @@ nsGlobalWindow::ResumeTimeouts()
       nsCOMPtr<nsPIDOMWindow> pWin = do_GetInterface(childShell);
       if (pWin) {
         nsGlobalWindow *win =
-          NS_STATIC_CAST(nsGlobalWindow*,
-                         NS_STATIC_CAST(nsPIDOMWindow*, pWin));
+          static_cast<nsGlobalWindow*>
+                     (static_cast<nsPIDOMWindow*>(pWin));
 
         NS_ASSERTION(win->IsOuterWindow(), "Expected outer window");
         nsGlobalWindow* inner = win->GetCurrentInnerWindowInternal();
@@ -7922,7 +7921,7 @@ NS_NewScriptGlobalObject(PRBool aIsChrome, nsIScriptGlobalObject **aResult)
 
   NS_ENSURE_TRUE(global, NS_ERROR_OUT_OF_MEMORY);
 
-  return CallQueryInterface(NS_STATIC_CAST(nsIScriptGlobalObject *, global),
+  return CallQueryInterface(static_cast<nsIScriptGlobalObject *>(global),
                             aResult);
 }
 
diff --git a/mozilla/dom/src/base/nsGlobalWindow.h b/mozilla/dom/src/base/nsGlobalWindow.h
index a6628581aac..9db140eef2c 100644
--- a/mozilla/dom/src/base/nsGlobalWindow.h
+++ b/mozilla/dom/src/base/nsGlobalWindow.h
@@ -148,12 +148,12 @@ struct nsTimeout : PRCList
 
   nsTimeout* Next() {
     // Note: might not actually return an nsTimeout.  Use IsTimeout to check.
-    return NS_STATIC_CAST(nsTimeout*, PR_NEXT_LINK(this));
+    return static_cast<nsTimeout*>(PR_NEXT_LINK(this));
   }
 
   nsTimeout* Prev() {
     // Note: might not actually return an nsTimeout.  Use IsTimeout to check.
-    return NS_STATIC_CAST(nsTimeout*, PR_PREV_LINK(this));
+    return static_cast<nsTimeout*>(PR_PREV_LINK(this));
   }
 
   // Window for which this timeout fires
@@ -303,11 +303,11 @@ public:
 
   virtual NS_HIDDEN_(nsPIDOMEventTarget*) GetTargetForDOMEvent()
   {
-    return NS_STATIC_CAST(nsPIDOMEventTarget*, GetOuterWindowInternal());
+    return static_cast<nsPIDOMEventTarget*>(GetOuterWindowInternal());
   }
   virtual NS_HIDDEN_(nsPIDOMEventTarget*) GetTargetForEventTargetChain()
   {
-    return NS_STATIC_CAST(nsPIDOMEventTarget*, GetCurrentInnerWindowInternal());
+    return static_cast<nsPIDOMEventTarget*>(GetCurrentInnerWindowInternal());
   }
   virtual NS_HIDDEN_(nsresult) PreHandleEvent(nsEventChainPreVisitor& aVisitor);
   virtual NS_HIDDEN_(nsresult) PostHandleEvent(nsEventChainPostVisitor& aVisitor);
@@ -376,17 +376,17 @@ public:
 
   nsGlobalWindow *GetOuterWindowInternal()
   {
-    return NS_STATIC_CAST(nsGlobalWindow *, GetOuterWindow());
+    return static_cast<nsGlobalWindow *>(GetOuterWindow());
   }
 
   nsGlobalWindow *GetCurrentInnerWindowInternal()
   {
-    return NS_STATIC_CAST(nsGlobalWindow *, mInnerWindow);
+    return static_cast<nsGlobalWindow *>(mInnerWindow);
   }
 
   nsGlobalWindow *EnsureInnerWindowInternal()
   {
-    return NS_STATIC_CAST(nsGlobalWindow *, EnsureInnerWindow());
+    return static_cast<nsGlobalWindow *>(EnsureInnerWindow());
   }
 
   PRBool IsFrozen() const
@@ -593,12 +593,12 @@ protected:
 
   nsTimeout* FirstTimeout() {
     // Note: might not actually return an nsTimeout.  Use IsTimeout to check.
-    return NS_STATIC_CAST(nsTimeout*, PR_LIST_HEAD(&mTimeouts));
+    return static_cast<nsTimeout*>(PR_LIST_HEAD(&mTimeouts));
   }
 
   nsTimeout* LastTimeout() {
     // Note: might not actually return an nsTimeout.  Use IsTimeout to check.
-    return NS_STATIC_CAST(nsTimeout*, PR_LIST_TAIL(&mTimeouts));
+    return static_cast<nsTimeout*>(PR_LIST_TAIL(&mTimeouts));
   }
 
   PRBool IsTimeout(PRCList* aList) {
diff --git a/mozilla/dom/src/base/nsGlobalWindowCommands.cpp b/mozilla/dom/src/base/nsGlobalWindowCommands.cpp
index b0263f69652..b3aab4beea8 100644
--- a/mozilla/dom/src/base/nsGlobalWindowCommands.cpp
+++ b/mozilla/dom/src/base/nsGlobalWindowCommands.cpp
@@ -904,7 +904,7 @@ nsClipboardDragDropHookCommand::GetCommandStateParams(const char *aCommandName,
     NS_NEWXPCOM(theCmd, _cmdClass);                                 \
     if (!theCmd) return NS_ERROR_OUT_OF_MEMORY;                     \
     rv = inCommandTable->RegisterCommand(_cmdName,                  \
-                   NS_STATIC_CAST(nsIControllerCommand *, theCmd)); \
+                   static_cast<nsIControllerCommand *>(theCmd)); \
   }
 
 #define NS_REGISTER_FIRST_COMMAND(_cmdClass, _cmdName)              \
@@ -913,15 +913,15 @@ nsClipboardDragDropHookCommand::GetCommandStateParams(const char *aCommandName,
     NS_NEWXPCOM(theCmd, _cmdClass);                                 \
     if (!theCmd) return NS_ERROR_OUT_OF_MEMORY;                     \
     rv = inCommandTable->RegisterCommand(_cmdName,                  \
-                   NS_STATIC_CAST(nsIControllerCommand *, theCmd));
+                   static_cast<nsIControllerCommand *>(theCmd));
 
 #define NS_REGISTER_NEXT_COMMAND(_cmdClass, _cmdName)               \
     rv = inCommandTable->RegisterCommand(_cmdName,                  \
-                   NS_STATIC_CAST(nsIControllerCommand *, theCmd));
+                   static_cast<nsIControllerCommand *>(theCmd));
 
 #define NS_REGISTER_LAST_COMMAND(_cmdClass, _cmdName)               \
     rv = inCommandTable->RegisterCommand(_cmdName,                  \
-                   NS_STATIC_CAST(nsIControllerCommand *, theCmd)); \
+                   static_cast<nsIControllerCommand *>(theCmd)); \
   }
 
 
diff --git a/mozilla/dom/src/base/nsJSEnvironment.cpp b/mozilla/dom/src/base/nsJSEnvironment.cpp
index 73027f51301..00dcb708b46 100644
--- a/mozilla/dom/src/base/nsJSEnvironment.cpp
+++ b/mozilla/dom/src/base/nsJSEnvironment.cpp
@@ -294,8 +294,8 @@ NS_ScriptErrorReporter(JSContext *cx,
       if (report) {
         fileName.AssignWithConversion(report->filename);
 
-        const PRUnichar *m = NS_REINTERPRET_CAST(const PRUnichar*,
-                                                 report->ucmessage);
+        const PRUnichar *m = reinterpret_cast<const PRUnichar*>
+                                             (report->ucmessage);
 
         if (m) {
           msg.Assign(m);
@@ -371,8 +371,8 @@ NS_ScriptErrorReporter(JSContext *cx,
             PRUint32 column = report->uctokenptr - report->uclinebuf;
 
             rv = errorObject->Init(msg.get(), fileName.get(),
-                                   NS_REINTERPRET_CAST(const PRUnichar*,
-                                                       report->uclinebuf),
+                                   reinterpret_cast<const PRUnichar*>
+                                                   (report->uclinebuf),
                                    report->lineno, column, report->flags,
                                    category);
           } else if (message) {
@@ -412,7 +412,7 @@ NS_ScriptErrorReporter(JSContext *cx,
     error.AppendInt(report->lineno, 10);
     error.Append(": ");
     if (report->ucmessage) {
-      AppendUTF16toUTF8(NS_REINTERPRET_CAST(const PRUnichar*, report->ucmessage),
+      AppendUTF16toUTF8(reinterpret_cast<const PRUnichar*>(report->ucmessage),
                         error);
     } else {
       error.Append(message);
@@ -502,7 +502,7 @@ LocaleToUnicode(JSContext *cx, char *src, jsval *rval)
             unichars = shrunkUnichars;
         }
         str = JS_NewUCString(cx,
-                             NS_REINTERPRET_CAST(jschar*, unichars),
+                             reinterpret_cast<jschar*>(unichars),
                              unicharLength);
       }
       if (!str)
@@ -611,8 +611,8 @@ JSObject2Win(JSContext *cx, JSObject *obj)
   if (wrapper) {
     nsCOMPtr<nsPIDOMWindow> win = do_QueryWrappedNative(wrapper);
     if (win) {
-      return NS_STATIC_CAST(nsGlobalWindow *,
-                            NS_STATIC_CAST(nsPIDOMWindow *, win));
+      return static_cast<nsGlobalWindow *>
+                        (static_cast<nsPIDOMWindow *>(win));
     }
   }
 
@@ -686,7 +686,7 @@ JSBool JS_DLL_CALLBACK
 nsJSContext::DOMBranchCallback(JSContext *cx, JSScript *script)
 {
   // Get the native context
-  nsJSContext *ctx = NS_STATIC_CAST(nsJSContext *, ::JS_GetContextPrivate(cx));
+  nsJSContext *ctx = static_cast<nsJSContext *>(::JS_GetContextPrivate(cx));
 
   if (!ctx) {
     // Can happen; see bug 355811
@@ -891,7 +891,7 @@ static const char js_relimit_option_str[] = JS_OPTIONS_DOT_STR "relimit";
 int PR_CALLBACK
 nsJSContext::JSOptionChangedCallback(const char *pref, void *data)
 {
-  nsJSContext *context = NS_REINTERPRET_CAST(nsJSContext *, data);
+  nsJSContext *context = reinterpret_cast<nsJSContext *>(data);
   PRUint32 oldDefaultJSOptions = context->mDefaultJSOptions;
   PRUint32 newDefaultJSOptions = oldDefaultJSOptions;
 
@@ -945,7 +945,7 @@ nsJSContext::nsJSContext(JSRuntime *aRuntime) : mGCOnDestruction(PR_TRUE)
 
   mContext = ::JS_NewContext(aRuntime, gStackSize);
   if (mContext) {
-    ::JS_SetContextPrivate(mContext, NS_STATIC_CAST(nsIScriptContext *, this));
+    ::JS_SetContextPrivate(mContext, static_cast<nsIScriptContext *>(this));
 
     // Make sure the new context gets the default context options
     ::JS_SetOptions(mContext, mDefaultJSOptions);
@@ -1045,7 +1045,7 @@ NoteContextChild(JSTracer *trc, void *thing, uint32 kind)
 
   if (kind == JSTRACE_OBJECT || kind == JSTRACE_NAMESPACE ||
       kind == JSTRACE_QNAME || kind == JSTRACE_XML) {
-    ContextCallbackItem *item = NS_STATIC_CAST(ContextCallbackItem*, trc);
+    ContextCallbackItem *item = static_cast<ContextCallbackItem*>(trc);
     item->cb->NoteScriptChild(JAVASCRIPT, thing);
   }
 }
@@ -1203,7 +1203,7 @@ nsJSContext::EvaluateStringWithValue(const nsAString& aScript,
       *aIsUndefined = JSVAL_IS_VOID(val);
     }
 
-    *NS_STATIC_CAST(jsval*, aRetValue) = val;
+    *static_cast<jsval*>(aRetValue) = val;
     // XXX - nsScriptObjectHolder should be used once this method moves to
     // the new world order. However, use of 'jsval' appears to make this
     // tricky...
@@ -1241,8 +1241,8 @@ JSValueToAString(JSContext *cx, jsval val, nsAString *result,
 
   JSString* jsstring = ::JS_ValueToString(cx, val);
   if (jsstring) {
-    result->Assign(NS_REINTERPRET_CAST(const PRUnichar*,
-                                       ::JS_GetStringChars(jsstring)),
+    result->Assign(reinterpret_cast<const PRUnichar*>
+                                   (::JS_GetStringChars(jsstring)),
                    ::JS_GetStringLength(jsstring));
   } else {
     result->Truncate();
@@ -1778,7 +1778,7 @@ nsJSContext::CallEventHandler(nsISupports* aTarget, void *aScope, void *aHandler
             global->GetScriptContext(JAVASCRIPT);
           if (context && context != this) {
             JSContext* cx =
-              NS_STATIC_CAST(JSContext*, context->GetNativeContext());
+              static_cast<JSContext*>(context->GetNativeContext());
             rv = stack->Push(cx);
             if (NS_SUCCEEDED(rv)) {
               rv = sSecurityManager->CheckFunctionAccess(cx, aHandler,
@@ -1811,7 +1811,7 @@ nsJSContext::CallEventHandler(nsISupports* aTarget, void *aScope, void *aHandler
     // right scope anyway, and we want to make sure that the arguments end up
     // in the same scope as aTarget.
     rv = ConvertSupportsTojsvals(aargv, target, &argc,
-                                 NS_REINTERPRET_CAST(void **, &argv), &mark);
+                                 reinterpret_cast<void **>(&argv), &mark);
     if (NS_FAILED(rv)) {
       stack->Pop(nsnull);
       return rv;
@@ -1960,8 +1960,8 @@ nsJSContext::Serialize(nsIObjectOutputStream* aStream, void *aScriptObject)
     xdr->userdata = (void*) aStream;
 
     JSAutoRequest ar(cx);
-    JSScript *script = NS_REINTERPRET_CAST(JSScript*,
-                                           ::JS_GetPrivate(cx, mJSObject));
+    JSScript *script = reinterpret_cast<JSScript*>
+                                       (::JS_GetPrivate(cx, mJSObject));
     if (! ::JS_XDRScript(xdr, &script)) {
         rv = NS_ERROR_FAILURE;  // likely to be a principals serialization error
     } else {
@@ -1980,8 +1980,8 @@ nsJSContext::Serialize(nsIObjectOutputStream* aStream, void *aScriptObject)
         // one last buffer of data to write to aStream.
 
         uint32 size;
-        const char* data = NS_REINTERPRET_CAST(const char*,
-                                               ::JS_XDRMemGetData(xdr, &size));
+        const char* data = reinterpret_cast<const char*>
+                                           (::JS_XDRMemGetData(xdr, &size));
         NS_ASSERTION(data, "no decoded JSXDRState data!");
 
         rv = aStream->Write32(size);
@@ -2136,7 +2136,7 @@ nsJSContext::CreateNativeGlobalForInner(
                                           getter_AddRefs(jsholder));
   if (NS_FAILED(rv))
     return rv;
-  jsholder->GetJSObject(NS_REINTERPRET_CAST(JSObject **, aNativeGlobal));
+  jsholder->GetJSObject(reinterpret_cast<JSObject **>(aNativeGlobal));
   *aHolder = jsholder.get();
   NS_ADDREF(*aHolder);
   return NS_OK;
@@ -2346,7 +2346,7 @@ nsJSContext::SetProperty(void *aTarget, const char *aPropName, nsISupports *aArg
   
   nsresult rv;
   rv = ConvertSupportsTojsvals(aArgs, GetNativeGlobal(), &argc,
-                               NS_REINTERPRET_CAST(void **, &argv), &mark);
+                               reinterpret_cast<void **>(&argv), &mark);
   NS_ENSURE_SUCCESS(rv, rv);
   AutoFreeJSStack stackGuard(mContext, mark); // ensure always freed.
 
@@ -2354,7 +2354,7 @@ nsJSContext::SetProperty(void *aTarget, const char *aPropName, nsISupports *aArg
   JSObject *args = ::JS_NewArrayObject(mContext, argc, argv);
   jsval vargs = OBJECT_TO_JSVAL(args);
 
-  rv = ::JS_SetProperty(mContext, NS_REINTERPRET_CAST(JSObject *, aTarget), aPropName, &vargs) ?
+  rv = ::JS_SetProperty(mContext, reinterpret_cast<JSObject *>(aTarget), aPropName, &vargs) ?
        NS_OK : NS_ERROR_FAILURE;
   // free 'args'???
 
@@ -2509,7 +2509,7 @@ nsJSContext::AddSupportsPrimitiveTojsvals(nsISupports *aArg, jsval *aArgv)
       // to be equivalent; both unsigned 16-bit entities
       JSString *str =
         ::JS_NewUCStringCopyN(cx,
-                              NS_REINTERPRET_CAST(const jschar *,data.get()),
+                              reinterpret_cast<const jschar *>(data.get()),
                               data.Length());
       NS_ENSURE_TRUE(str, NS_ERROR_OUT_OF_MEMORY);
 
@@ -2983,7 +2983,7 @@ nsJSContext::InitClasses(void *aGlobalObj)
 {
   nsresult rv = NS_OK;
 
-  JSObject *globalObj = NS_STATIC_CAST(JSObject *, aGlobalObj);
+  JSObject *globalObj = static_cast<JSObject *>(aGlobalObj);
 
   rv = InitializeExternalClasses();
   NS_ENSURE_SUCCESS(rv, rv);
@@ -3747,7 +3747,7 @@ nsresult NS_CreateJSArgv(JSContext *aContext, PRUint32 argc, void *argv,
 {
   nsresult rv;
   nsJSArgArray *ret = new nsJSArgArray(aContext, argc,
-                                       NS_STATIC_CAST(jsval *, argv), &rv);
+                                       static_cast<jsval *>(argv), &rv);
   if (ret == nsnull)
     return NS_ERROR_OUT_OF_MEMORY;
   if (NS_FAILED(rv)) {
diff --git a/mozilla/dom/src/base/nsJSTimeoutHandler.cpp b/mozilla/dom/src/base/nsJSTimeoutHandler.cpp
index 9cd574b8b91..91644af04a0 100644
--- a/mozilla/dom/src/base/nsJSTimeoutHandler.cpp
+++ b/mozilla/dom/src/base/nsJSTimeoutHandler.cpp
@@ -304,7 +304,7 @@ nsJSScriptTimeoutHandler::Init(nsIScriptContext *aContext, PRBool *aIsInterval,
     PRUint32 dummy;
     jsval *jsargv = nsnull;
     nsCOMPtr<nsIJSArgArray> jsarray(do_QueryInterface(array));
-    jsarray->GetArgs(&dummy, NS_REINTERPRET_CAST(void **, &jsargv));
+    jsarray->GetArgs(&dummy, reinterpret_cast<void **>(&jsargv));
     // must have worked - we own the impl! :)
     NS_ASSERTION(jsargv, "No argv!");
     for (PRInt32 i = 2; (PRUint32)i < argc; ++i) {
@@ -336,7 +336,7 @@ void nsJSScriptTimeoutHandler::SetLateness(PRIntervalTime aHowLate)
   if (jsarray) {
     PRUint32 argc;
     jsval *jsargv;
-    jsarray->GetArgs(&argc, NS_REINTERPRET_CAST(void **, &jsargv));
+    jsarray->GetArgs(&argc, reinterpret_cast<void **>(&jsargv));
     if (jsargv && argc)
       jsargv[argc-1] = INT_TO_JSVAL((jsint) aHowLate);
   } else {
@@ -348,8 +348,8 @@ const PRUnichar *
 nsJSScriptTimeoutHandler::GetHandlerText()
 {
   NS_ASSERTION(mExpr, "No expression, so no handler text!");
-  return NS_REINTERPRET_CAST(const PRUnichar *,
-                             ::JS_GetStringChars(mExpr));
+  return reinterpret_cast<const PRUnichar *>
+                         (::JS_GetStringChars(mExpr));
 }
 
 nsresult NS_CreateJSTimeoutHandler(nsIScriptContext *aContext,
@@ -368,5 +368,5 @@ nsresult NS_CreateJSTimeoutHandler(nsIScriptContext *aContext,
     return rv;
   }
   return handler->QueryInterface(NS_GET_IID(nsIScriptTimeoutHandler),
-                                 NS_REINTERPRET_CAST(void **, aRet));
+                                 reinterpret_cast<void **>(aRet));
 }
diff --git a/mozilla/dom/src/base/nsJSUtils.cpp b/mozilla/dom/src/base/nsJSUtils.cpp
index c9aa982fad2..f233bbd4882 100644
--- a/mozilla/dom/src/base/nsJSUtils.cpp
+++ b/mozilla/dom/src/base/nsJSUtils.cpp
@@ -97,8 +97,8 @@ jsval
 nsJSUtils::ConvertStringToJSVal(const nsString& aProp, JSContext* aContext)
 {
   JSString *jsstring =
-    ::JS_NewUCStringCopyN(aContext, NS_REINTERPRET_CAST(const jschar*,
-                                                        aProp.get()),
+    ::JS_NewUCStringCopyN(aContext, reinterpret_cast<const jschar*>
+                                                    (aProp.get()),
                           aProp.Length());
 
   // set the return value
@@ -111,8 +111,8 @@ nsJSUtils::ConvertJSValToString(nsAString& aString, JSContext* aContext,
 {
   JSString *jsstring;
   if ((jsstring = ::JS_ValueToString(aContext, aValue)) != nsnull) {
-    aString.Assign(NS_REINTERPRET_CAST(const PRUnichar*,
-                                       ::JS_GetStringChars(jsstring)),
+    aString.Assign(reinterpret_cast<const PRUnichar*>
+                                   (::JS_GetStringChars(jsstring)),
                    ::JS_GetStringLength(jsstring));
   }
   else {
diff --git a/mozilla/dom/src/base/nsScriptNameSpaceManager.cpp b/mozilla/dom/src/base/nsScriptNameSpaceManager.cpp
index 3fe25de7d2f..972d6a56d47 100644
--- a/mozilla/dom/src/base/nsScriptNameSpaceManager.cpp
+++ b/mozilla/dom/src/base/nsScriptNameSpaceManager.cpp
@@ -71,7 +71,7 @@ public:
 PR_STATIC_CALLBACK(PLDHashNumber)
 GlobalNameHashHashKey(PLDHashTable *table, const void *key)
 {
-  const nsAString *str = NS_STATIC_CAST(const nsAString *, key);
+  const nsAString *str = static_cast<const nsAString *>(key);
 
   return HashString(*str);
 }
@@ -81,8 +81,8 @@ GlobalNameHashMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry,
                          const void *key)
 {
   const GlobalNameMapEntry *e =
-    NS_STATIC_CAST(const GlobalNameMapEntry *, entry);
-  const nsAString *str = NS_STATIC_CAST(const nsAString *, key);
+    static_cast<const GlobalNameMapEntry *>(entry);
+  const nsAString *str = static_cast<const nsAString *>(key);
 
   return str->Equals(e->mKey);
 }
@@ -90,7 +90,7 @@ GlobalNameHashMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry,
 PR_STATIC_CALLBACK(void)
 GlobalNameHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry)
 {
-  GlobalNameMapEntry *e = NS_STATIC_CAST(GlobalNameMapEntry *, entry);
+  GlobalNameMapEntry *e = static_cast<GlobalNameMapEntry *>(entry);
 
   // An entry is being cleared, let the key (nsString) do its own
   // cleanup.
@@ -120,8 +120,8 @@ PR_STATIC_CALLBACK(PRBool)
 GlobalNameHashInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry,
                         const void *key)
 {
-  GlobalNameMapEntry *e = NS_STATIC_CAST(GlobalNameMapEntry *, entry);
-  const nsAString *keyStr = NS_STATIC_CAST(const nsAString *, key);
+  GlobalNameMapEntry *e = static_cast<GlobalNameMapEntry *>(entry);
+  const nsAString *keyStr = static_cast<const nsAString *>(key);
 
   // Initialize the key in the entry with placement new
   new (&e->mKey) nsString(*keyStr);
@@ -150,8 +150,8 @@ nsScriptNameSpaceManager::AddToHash(const char *aKey)
 {
   NS_ConvertASCIItoUTF16 key(aKey);
   GlobalNameMapEntry *entry =
-    NS_STATIC_CAST(GlobalNameMapEntry *,
-                   PL_DHashTableOperate(&mGlobalNames, &key, PL_DHASH_ADD));
+    static_cast<GlobalNameMapEntry *>
+               (PL_DHashTableOperate(&mGlobalNames, &key, PL_DHASH_ADD));
 
   if (!entry) {
     return nsnull;
@@ -167,8 +167,8 @@ nsScriptNameSpaceManager::GetConstructorProto(const nsGlobalNameStruct* aStruct)
                "This function only works on constructor aliases!");
   if (!aStruct->mAlias->mProto) {
     GlobalNameMapEntry *proto =
-      NS_STATIC_CAST(GlobalNameMapEntry *,
-                     PL_DHashTableOperate(&mGlobalNames,
+      static_cast<GlobalNameMapEntry *>
+                 (PL_DHashTableOperate(&mGlobalNames,
                                           &aStruct->mAlias->mProtoName,
                                           PL_DHASH_LOOKUP));
 
@@ -509,7 +509,7 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 NameSetInitCallback(PLDHashTable *table, PLDHashEntryHdr *hdr,
                     PRUint32 number, void *arg)
 {
-  GlobalNameMapEntry *entry = NS_STATIC_CAST(GlobalNameMapEntry *, hdr);
+  GlobalNameMapEntry *entry = static_cast<GlobalNameMapEntry *>(hdr);
 
   if (entry->mGlobalName.mType == nsGlobalNameStruct::eTypeStaticNameSet) {
     nsresult rv = NS_OK;
@@ -517,7 +517,7 @@ NameSetInitCallback(PLDHashTable *table, PLDHashEntryHdr *hdr,
       do_CreateInstance(entry->mGlobalName.mCID, &rv);
     NS_ENSURE_SUCCESS(rv, PL_DHASH_NEXT);
 
-    NameSetClosure *closure = NS_STATIC_CAST(NameSetClosure *, arg);
+    NameSetClosure *closure = static_cast<NameSetClosure *>(arg);
     closure->rv = ns->InitializeNameSet(closure->ctx);
     if (NS_FAILED(closure->rv)) {
       NS_ERROR("Initing external script classes failed!");
@@ -545,8 +545,8 @@ nsScriptNameSpaceManager::LookupName(const nsAString& aName,
                                      const PRUnichar **aClassName)
 {
   GlobalNameMapEntry *entry =
-    NS_STATIC_CAST(GlobalNameMapEntry *,
-                   PL_DHashTableOperate(&mGlobalNames, &aName,
+    static_cast<GlobalNameMapEntry *>
+               (PL_DHashTableOperate(&mGlobalNames, &aName,
                                         PL_DHASH_LOOKUP));
 
   if (PL_DHASH_ENTRY_IS_BUSY(entry)) {
diff --git a/mozilla/dom/src/base/nsWindowRoot.cpp b/mozilla/dom/src/base/nsWindowRoot.cpp
index 1aed10f29ee..3ffdd6b5953 100644
--- a/mozilla/dom/src/base/nsWindowRoot.cpp
+++ b/mozilla/dom/src/base/nsWindowRoot.cpp
@@ -67,10 +67,10 @@ nsWindowRoot::nsWindowRoot(nsIDOMWindow* aWindow)
   nsFocusController::Create(getter_AddRefs(mFocusController));
 
   nsCOMPtr<nsIDOMFocusListener> focusListener(do_QueryInterface(mFocusController));
-  mRefCnt.incr(NS_STATIC_CAST(nsIDOMEventTarget*, this));
+  mRefCnt.incr(static_cast<nsIDOMEventTarget*>(this));
   AddEventListener(NS_LITERAL_STRING("focus"), focusListener, PR_TRUE);
   AddEventListener(NS_LITERAL_STRING("blur"), focusListener, PR_TRUE);
-  mRefCnt.decr(NS_STATIC_CAST(nsIDOMEventTarget*, this));
+  mRefCnt.decr(static_cast<nsIDOMEventTarget*>(this));
 }
 
 nsWindowRoot::~nsWindowRoot()
@@ -111,7 +111,7 @@ nsWindowRoot::DispatchEvent(nsIDOMEvent* aEvt, PRBool *_retval)
 {
   nsEventStatus status = nsEventStatus_eIgnore;
   nsresult rv =  nsEventDispatcher::DispatchDOMEvent(
-    NS_STATIC_CAST(nsPIDOMEventTarget*, this), nsnull, aEvt, nsnull, &status);
+    static_cast<nsPIDOMEventTarget*>(this), nsnull, aEvt, nsnull, &status);
   *_retval = (status != nsEventStatus_eConsumeNoDefault);
   return rv;
 }
@@ -122,7 +122,7 @@ nsWindowRoot::DispatchDOMEvent(nsEvent* aEvent,
                                nsPresContext* aPresContext,
                                nsEventStatus* aEventStatus)
 {
-  return nsEventDispatcher::DispatchDOMEvent(NS_STATIC_CAST(nsPIDOMEventTarget*, this),
+  return nsEventDispatcher::DispatchDOMEvent(static_cast<nsPIDOMEventTarget*>(this),
                                              aEvent, aDOMEvent,
                                              aPresContext, aEventStatus);
 }
@@ -220,7 +220,7 @@ nsWindowRoot::GetListenerManager(PRBool aCreateIfNotFound,
     mListenerManager = do_CreateInstance(kEventListenerManagerCID, &rv);
     if (NS_FAILED(rv)) return rv;
     mListenerManager->SetListenerTarget(
-      NS_STATIC_CAST(nsPIDOMEventTarget*, this));
+      static_cast<nsPIDOMEventTarget*>(this));
   }
 
   *aResult = mListenerManager;
diff --git a/mozilla/dom/src/events/nsJSEventListener.cpp b/mozilla/dom/src/events/nsJSEventListener.cpp
index b02dbdf6835..fffb860a853 100644
--- a/mozilla/dom/src/events/nsJSEventListener.cpp
+++ b/mozilla/dom/src/events/nsJSEventListener.cpp
@@ -162,7 +162,7 @@ nsJSEventListener::HandleEvent(nsIDOMEvent* aEvent)
     if (event->message == NS_LOAD_ERROR &&
         event->eventStructType == NS_SCRIPT_ERROR_EVENT) {
       nsScriptErrorEvent *scriptEvent =
-        NS_STATIC_CAST(nsScriptErrorEvent*, event);
+        static_cast<nsScriptErrorEvent*>(event);
       // Create a temp argv for the error event.
       nsCOMPtr<nsIMutableArray> tempargv = 
         do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
@@ -228,7 +228,7 @@ nsJSEventListener::HandleEvent(nsIDOMEvent* aEvent)
                      NS_ERROR_UNEXPECTED);
 
       nsBeforePageUnloadEvent *beforeUnload =
-        NS_STATIC_CAST(nsBeforePageUnloadEvent *, event);
+        static_cast<nsBeforePageUnloadEvent *>(event);
 
       if (dataType != nsIDataType::VTYPE_VOID) {
         aEvent->PreventDefault();
diff --git a/mozilla/dom/src/storage/nsDOMStorage.cpp b/mozilla/dom/src/storage/nsDOMStorage.cpp
index e206e3cd615..aa753d43f07 100644
--- a/mozilla/dom/src/storage/nsDOMStorage.cpp
+++ b/mozilla/dom/src/storage/nsDOMStorage.cpp
@@ -764,7 +764,7 @@ nsDOMStorage::ClearAll()
 PR_STATIC_CALLBACK(PLDHashOperator)
 CopyStorageItems(nsSessionStorageEntry* aEntry, void* userArg)
 {
-  nsDOMStorage* newstorage = NS_STATIC_CAST(nsDOMStorage*, userArg);
+  nsDOMStorage* newstorage = static_cast<nsDOMStorage*>(userArg);
 
   newstorage->SetItem(aEntry->GetKey(), aEntry->mItem->GetValueInternal());
 
diff --git a/mozilla/editor/composer/src/nsComposerCommandsUpdater.cpp b/mozilla/editor/composer/src/nsComposerCommandsUpdater.cpp
index 01064796368..ac2d90384ed 100644
--- a/mozilla/editor/composer/src/nsComposerCommandsUpdater.cpp
+++ b/mozilla/editor/composer/src/nsComposerCommandsUpdater.cpp
@@ -262,7 +262,7 @@ nsComposerCommandsUpdater::PrimeUpdateTimer()
   }
 
   const PRUint32 kUpdateTimerDelay = 150;
-  return mUpdateTimer->InitWithCallback(NS_STATIC_CAST(nsITimerCallback*, this),
+  return mUpdateTimer->InitWithCallback(static_cast<nsITimerCallback*>(this),
                                         kUpdateTimerDelay,
                                         nsITimer::TYPE_ONE_SHOT);
 }
diff --git a/mozilla/editor/composer/src/nsComposerController.cpp b/mozilla/editor/composer/src/nsComposerController.cpp
index 0670aa4b347..88ab87fa747 100644
--- a/mozilla/editor/composer/src/nsComposerController.cpp
+++ b/mozilla/editor/composer/src/nsComposerController.cpp
@@ -48,7 +48,7 @@
     NS_NEWXPCOM(theCmd, _cmdClass);                                     \
     if (!theCmd) return NS_ERROR_OUT_OF_MEMORY;                         \
     rv = inCommandTable->RegisterCommand(_cmdName,                      \
-                       NS_STATIC_CAST(nsIControllerCommand *, theCmd)); \
+                       static_cast<nsIControllerCommand *>(theCmd)); \
   }
 
 #define NS_REGISTER_FIRST_COMMAND(_cmdClass, _cmdName)                  \
@@ -57,15 +57,15 @@
     NS_NEWXPCOM(theCmd, _cmdClass);                                     \
     if (!theCmd) return NS_ERROR_OUT_OF_MEMORY;                         \
     rv = inCommandTable->RegisterCommand(_cmdName,                      \
-                       NS_STATIC_CAST(nsIControllerCommand *, theCmd));
+                       static_cast<nsIControllerCommand *>(theCmd));
 
 #define NS_REGISTER_NEXT_COMMAND(_cmdClass, _cmdName)                   \
     rv = inCommandTable->RegisterCommand(_cmdName,                      \
-                        NS_STATIC_CAST(nsIControllerCommand *, theCmd));
+                        static_cast<nsIControllerCommand *>(theCmd));
 
 #define NS_REGISTER_LAST_COMMAND(_cmdClass, _cmdName)                   \
     rv = inCommandTable->RegisterCommand(_cmdName,                      \
-                       NS_STATIC_CAST(nsIControllerCommand *, theCmd)); \
+                       static_cast<nsIControllerCommand *>(theCmd)); \
   }
 
 #define NS_REGISTER_STYLE_COMMAND(_cmdClass, _cmdName, _styleTag)       \
@@ -73,7 +73,7 @@
     _cmdClass* theCmd = new _cmdClass(_styleTag);                       \
     if (!theCmd) return NS_ERROR_OUT_OF_MEMORY;                         \
     rv = inCommandTable->RegisterCommand(_cmdName,                      \
-                       NS_STATIC_CAST(nsIControllerCommand *, theCmd)); \
+                       static_cast<nsIControllerCommand *>(theCmd)); \
   }
   
 #define NS_REGISTER_TAG_COMMAND(_cmdClass, _cmdName, _tagName)          \
@@ -81,7 +81,7 @@
     _cmdClass* theCmd = new _cmdClass(_tagName);                        \
     if (!theCmd) return NS_ERROR_OUT_OF_MEMORY;                         \
     rv = inCommandTable->RegisterCommand(_cmdName,                      \
-                       NS_STATIC_CAST(nsIControllerCommand *, theCmd)); \
+                       static_cast<nsIControllerCommand *>(theCmd)); \
   }
   
 
diff --git a/mozilla/editor/composer/src/nsEditingSession.cpp b/mozilla/editor/composer/src/nsEditingSession.cpp
index 19252e69a58..c0a78234a13 100644
--- a/mozilla/editor/composer/src/nsEditingSession.cpp
+++ b/mozilla/editor/composer/src/nsEditingSession.cpp
@@ -205,7 +205,7 @@ nsEditingSession::MakeWindowEditable(nsIDOMWindow *aWindow,
   // the first is an editor controller
   rv = SetupEditorCommandController("@mozilla.org/editor/editorcontroller;1",
                                     aWindow,
-                                    NS_STATIC_CAST(nsIEditingSession*, this),
+                                    static_cast<nsIEditingSession*>(this),
                                     &mBaseCommandControllerId);
   if (NS_FAILED(rv)) return rv;
 
@@ -213,7 +213,7 @@ nsEditingSession::MakeWindowEditable(nsIDOMWindow *aWindow,
   // such as creation and "dirty flag"
   rv = SetupEditorCommandController("@mozilla.org/editor/editordocstatecontroller;1",
                                     aWindow,
-                                    NS_STATIC_CAST(nsIEditingSession*, this),
+                                    static_cast<nsIEditingSession*>(this),
                                     &mDocStateControllerId);
   if (NS_FAILED(rv)) return rv;
 
@@ -382,7 +382,7 @@ nsEditingSession::SetupEditorOnWindow(nsIDOMWindow *aWindow)
   // make the UI state maintainer
   nsComposerCommandsUpdater *stateMaintainer;
   NS_NEWXPCOM(stateMaintainer, nsComposerCommandsUpdater);
-  mStateMaintainer = NS_STATIC_CAST(nsISelectionListener*, stateMaintainer);
+  mStateMaintainer = static_cast<nsISelectionListener*>(stateMaintainer);
 
   if (!mStateMaintainer) return NS_ERROR_OUT_OF_MEMORY;
 
@@ -455,7 +455,7 @@ nsEditingSession::SetupEditorOnWindow(nsIDOMWindow *aWindow)
   // Set up as a doc state listener
   // Important! We must have this to broadcast the "obs_documentCreated" message
   rv = editor->AddDocumentStateListener(
-      NS_STATIC_CAST(nsIDocumentStateListener*, stateMaintainer));
+      static_cast<nsIDocumentStateListener*>(stateMaintainer));
   if (NS_FAILED(rv)) return rv;
 
   // XXXbz we really shouldn't need a presShell here!
@@ -481,8 +481,8 @@ nsEditingSession::SetupEditorOnWindow(nsIDOMWindow *aWindow)
   nsCOMPtr<nsITransactionManager> txnMgr;
   editor->GetTransactionManager(getter_AddRefs(txnMgr));
   if (txnMgr)
-    txnMgr->AddListener(NS_STATIC_CAST(nsITransactionListener*,
-                        stateMaintainer));
+    txnMgr->AddListener(static_cast<nsITransactionListener*>
+                                   (stateMaintainer));
 
   // Set context on all controllers to be the editor
   rv = SetEditorOnControllers(aWindow, editor);
diff --git a/mozilla/editor/libeditor/base/EditAggregateTxn.cpp b/mozilla/editor/libeditor/base/EditAggregateTxn.cpp
index 936d42ff622..a8433f39ea7 100644
--- a/mozilla/editor/libeditor/base/EditAggregateTxn.cpp
+++ b/mozilla/editor/libeditor/base/EditAggregateTxn.cpp
@@ -216,7 +216,7 @@ NS_IMETHODIMP EditAggregateTxn::QueryInterface(REFNSIID aIID, void** aInstancePt
   if (!aInstancePtr) return NS_ERROR_NULL_POINTER;
  
   if (aIID.Equals(EditAggregateTxn::GetCID())) {
-    *aInstancePtr = NS_STATIC_CAST(EditAggregateTxn*, this);
+    *aInstancePtr = static_cast<EditAggregateTxn*>(this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
diff --git a/mozilla/editor/libeditor/base/nsEditor.cpp b/mozilla/editor/libeditor/base/nsEditor.cpp
index 08c3dc82b82..9e87379e7f1 100644
--- a/mozilla/editor/libeditor/base/nsEditor.cpp
+++ b/mozilla/editor/libeditor/base/nsEditor.cpp
@@ -2671,7 +2671,7 @@ NS_IMETHODIMP nsEditor::InsertTextIntoTextNodeImpl(const nsAString& aStringToIns
     {
       DeleteNode(mIMETextNode);
       mIMETextNode = nsnull;
-      NS_STATIC_CAST(IMETextTxn*, txn.get())->MarkFixed();  // mark the ime txn "fixed"
+      static_cast<IMETextTxn*>(txn.get())->MarkFixed();  // mark the ime txn "fixed"
     }
   }
   
diff --git a/mozilla/editor/libeditor/base/nsEditorController.cpp b/mozilla/editor/libeditor/base/nsEditorController.cpp
index f415fec1aeb..9971a8f7133 100644
--- a/mozilla/editor/libeditor/base/nsEditorController.cpp
+++ b/mozilla/editor/libeditor/base/nsEditorController.cpp
@@ -51,7 +51,7 @@
     NS_NEWXPCOM(theCmd, _cmdClass);                                                       \
     if (!theCmd) return NS_ERROR_OUT_OF_MEMORY;                                           \
     rv = inCommandTable->RegisterCommand(_cmdName,                                        \
-                                   NS_STATIC_CAST(nsIControllerCommand *, theCmd));       \
+                                   static_cast<nsIControllerCommand *>(theCmd));       \
   }
 
 #define NS_REGISTER_FIRST_COMMAND(_cmdClass, _cmdName)                                    \
@@ -60,15 +60,15 @@
     NS_NEWXPCOM(theCmd, _cmdClass);                                                       \
     if (!theCmd) return NS_ERROR_OUT_OF_MEMORY;                                           \
     rv = inCommandTable->RegisterCommand(_cmdName,                                        \
-                                   NS_STATIC_CAST(nsIControllerCommand *, theCmd));
+                                   static_cast<nsIControllerCommand *>(theCmd));
 
 #define NS_REGISTER_NEXT_COMMAND(_cmdClass, _cmdName)                                     \
     rv = inCommandTable->RegisterCommand(_cmdName,                                        \
-                                   NS_STATIC_CAST(nsIControllerCommand *, theCmd));
+                                   static_cast<nsIControllerCommand *>(theCmd));
 
 #define NS_REGISTER_LAST_COMMAND(_cmdClass, _cmdName)                                     \
     rv = inCommandTable->RegisterCommand(_cmdName,                                        \
-                                   NS_STATIC_CAST(nsIControllerCommand *, theCmd));       \
+                                   static_cast<nsIControllerCommand *>(theCmd));       \
   }
 
 
diff --git a/mozilla/editor/libeditor/html/nsHTMLCSSUtils.cpp b/mozilla/editor/libeditor/html/nsHTMLCSSUtils.cpp
index f115c0a26f6..1201484c306 100644
--- a/mozilla/editor/libeditor/html/nsHTMLCSSUtils.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLCSSUtils.cpp
@@ -311,7 +311,7 @@ nsresult
 nsHTMLCSSUtils::Init(nsHTMLEditor *aEditor)
 {
   nsresult result = NS_OK;
-  mHTMLEditor = NS_STATIC_CAST(nsHTMLEditor*, aEditor);
+  mHTMLEditor = static_cast<nsHTMLEditor*>(aEditor);
 
   // let's retrieve the value of the "CSS editing" pref
   nsCOMPtr<nsIPrefBranch> prefBranch =
diff --git a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp
index c0fc553829e..15571df651c 100644
--- a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp
@@ -243,7 +243,7 @@ NS_IMPL_QUERY_INTERFACE3(nsHTMLEditRules, nsIHTMLEditRules, nsIEditRules, nsIEdi
 NS_IMETHODIMP
 nsHTMLEditRules::Init(nsPlaintextEditor *aEditor, PRUint32 aFlags)
 {
-  mHTMLEditor = NS_STATIC_CAST(nsHTMLEditor*, aEditor);
+  mHTMLEditor = static_cast<nsHTMLEditor*>(aEditor);
   nsresult res;
   
   // call through to base class Init 
@@ -584,7 +584,7 @@ nsHTMLEditRules::WillDoAction(nsISelection *aSelection,
   *aHandled = PR_FALSE;
     
   // my kingdom for dynamic cast
-  nsTextRulesInfo *info = NS_STATIC_CAST(nsTextRulesInfo*, aInfo);
+  nsTextRulesInfo *info = static_cast<nsTextRulesInfo*>(aInfo);
 
   // Deal with actions for which we don't need to check whether the selection is
   // editable.
@@ -681,7 +681,7 @@ NS_IMETHODIMP
 nsHTMLEditRules::DidDoAction(nsISelection *aSelection,
                              nsRulesInfo *aInfo, nsresult aResult)
 {
-  nsTextRulesInfo *info = NS_STATIC_CAST(nsTextRulesInfo*, aInfo);
+  nsTextRulesInfo *info = static_cast<nsTextRulesInfo*>(aInfo);
   switch (info->action)
   {
     case kInsertBreak:
diff --git a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp
index e97058f8573..74e3a546824 100644
--- a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp
@@ -277,7 +277,7 @@ nsHTMLEditor::Init(nsIDOMDocument *aDoc, nsIPresShell *aPresShell,
   if (1)
   {
     // block to scope nsAutoEditInitRulesTrigger
-    nsAutoEditInitRulesTrigger rulesTrigger(NS_STATIC_CAST(nsPlaintextEditor*,this), rulesRes);
+    nsAutoEditInitRulesTrigger rulesTrigger(static_cast<nsPlaintextEditor*>(this), rulesRes);
 
     // Init the plaintext editor
     result = nsPlaintextEditor::Init(aDoc, aPresShell, aRoot, aSelCon, aFlags);
@@ -432,7 +432,7 @@ nsHTMLEditor::InitRules()
   nsresult res = NS_NewHTMLEditRules(getter_AddRefs(mRules));
   if (NS_FAILED(res)) return res;
   if (!mRules) return NS_ERROR_UNEXPECTED;
-  res = mRules->Init(NS_STATIC_CAST(nsPlaintextEditor*,this), mFlags);
+  res = mRules->Init(static_cast<nsPlaintextEditor*>(this), mFlags);
   
   return res;
 }
@@ -712,7 +712,7 @@ nsHTMLEditor::SetDocumentTitle(const nsAString &aTitle)
   nsresult result = TransactionFactory::GetNewTransaction(SetDocTitleTxn::GetCID(), getter_AddRefs(txn));
   if (NS_SUCCEEDED(result))  
   {
-    result = NS_STATIC_CAST(SetDocTitleTxn*, txn.get())->Init(this, &aTitle);
+    result = static_cast<SetDocTitleTxn*>(txn.get())->Init(this, &aTitle);
 
     if (NS_SUCCEEDED(result)) 
     {
diff --git a/mozilla/editor/libeditor/html/nsHTMLEditorStyle.cpp b/mozilla/editor/libeditor/html/nsHTMLEditorStyle.cpp
index f660f2a5281..75604d178f4 100644
--- a/mozilla/editor/libeditor/html/nsHTMLEditorStyle.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLEditorStyle.cpp
@@ -1665,7 +1665,7 @@ nsHTMLEditor::RelativeFontChangeOnTextNode( PRInt32 aSizeChange,
 
   NS_NAMED_LITERAL_STRING(bigSize, "big");
   NS_NAMED_LITERAL_STRING(smallSize, "small");
-  const nsAString& nodeType = (aSizeChange==1) ? NS_STATIC_CAST(const nsAString&, bigSize) : NS_STATIC_CAST(const nsAString&, smallSize);
+  const nsAString& nodeType = (aSizeChange==1) ? static_cast<const nsAString&>(bigSize) : static_cast<const nsAString&>(smallSize);
   // look for siblings that are correct type of node
   nsCOMPtr<nsIDOMNode> sibling;
   GetPriorHTMLSibling(node, address_of(sibling));
diff --git a/mozilla/editor/libeditor/html/nsHTMLURIRefObject.cpp b/mozilla/editor/libeditor/html/nsHTMLURIRefObject.cpp
index 569506e12cc..adc37838542 100644
--- a/mozilla/editor/libeditor/html/nsHTMLURIRefObject.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLURIRefObject.cpp
@@ -86,7 +86,7 @@
   nsCOMPtr<nsILoadGroup> theLoadGroup(do_CreateInstance(NS_LOADGROUP_CONTRACTID));
   if (!theLoadGroup)
     error;
-		nsCOMPtr<nsIStreamListener> listener(NS_STATIC_CAST(nsIStreamListener*, qaBrowserImpl));
+		nsCOMPtr<nsIStreamListener> listener(static_cast<nsIStreamListener*>(qaBrowserImpl));
 		//nsCOMPtr<nsIWeakReference> thisListener(do_GetWeakReference(listener));
 		//qaWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsIStreamListener));
 
diff --git a/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp b/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp
index 912660154ab..7f77615443d 100644
--- a/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp
+++ b/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp
@@ -864,7 +864,7 @@ nsPlaintextEditor::BeginComposition(nsTextEventReply* aReply)
   if(mFlags & nsIPlaintextEditor::eEditorPasswordMask)  {
     if (mRules) {
       nsIEditRules *p = mRules.get();
-      nsTextEditRules *textEditRules = NS_STATIC_CAST(nsTextEditRules *, p);
+      nsTextEditRules *textEditRules = static_cast<nsTextEditRules *>(p);
       textEditRules->ResetIMETextPWBuf();
     }
     else  {
diff --git a/mozilla/editor/libeditor/text/nsTextEditRules.cpp b/mozilla/editor/libeditor/text/nsTextEditRules.cpp
index f78e18daf9d..33d60f1f1ac 100644
--- a/mozilla/editor/libeditor/text/nsTextEditRules.cpp
+++ b/mozilla/editor/libeditor/text/nsTextEditRules.cpp
@@ -298,7 +298,7 @@ nsTextEditRules::WillDoAction(nsISelection *aSelection,
   *aHandled = PR_FALSE;
 
   // my kingdom for dynamic cast
-  nsTextRulesInfo *info = NS_STATIC_CAST(nsTextRulesInfo*, aInfo);
+  nsTextRulesInfo *info = static_cast<nsTextRulesInfo*>(aInfo);
     
   switch (info->action)
   {
@@ -348,7 +348,7 @@ nsTextEditRules::DidDoAction(nsISelection *aSelection,
     return NS_ERROR_NULL_POINTER;
     
   // my kingdom for dynamic cast
-  nsTextRulesInfo *info = NS_STATIC_CAST(nsTextRulesInfo*, aInfo);
+  nsTextRulesInfo *info = static_cast<nsTextRulesInfo*>(aInfo);
 
   switch (info->action)
   {
diff --git a/mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp b/mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp
index ebcd26c83c1..e9f1ec10e43 100644
--- a/mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp
+++ b/mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp
@@ -2724,7 +2724,7 @@ nsTextServicesDocument::CreateContentIterator(nsIDOMRange *aRange, nsIContentIte
   // This class wraps the ContentIterator in order to give itself a chance 
   // to filter out certain content nodes
   nsFilteredContentIterator* filter = new nsFilteredContentIterator(mTxtSvcFilter);
-  *aIterator = NS_STATIC_CAST(nsIContentIterator *, filter);
+  *aIterator = static_cast<nsIContentIterator *>(filter);
   if (*aIterator) {
     NS_IF_ADDREF(*aIterator);
     result = filter ? NS_OK : NS_ERROR_FAILURE;
@@ -3067,7 +3067,7 @@ nsTextServicesDocument::DidSkip(nsIContentIterator* aFilteredIter)
   // So if the iterator bailed on one of the "filtered" content nodes then we 
   // consider that to be a block and bail with PR_TRUE
   if (aFilteredIter) {
-    nsFilteredContentIterator* filter = NS_STATIC_CAST(nsFilteredContentIterator *, aFilteredIter);
+    nsFilteredContentIterator* filter = static_cast<nsFilteredContentIterator *>(aFilteredIter);
     if (filter && filter->DidSkip()) {
       return PR_TRUE;
     }
@@ -3080,7 +3080,7 @@ nsTextServicesDocument::ClearDidSkip(nsIContentIterator* aFilteredIter)
 {
   // Clear filter's skip flag
   if (aFilteredIter) {
-    nsFilteredContentIterator* filter = NS_STATIC_CAST(nsFilteredContentIterator *, aFilteredIter);
+    nsFilteredContentIterator* filter = static_cast<nsFilteredContentIterator *>(aFilteredIter);
     filter->ClearDidSkip();
   }
 }
diff --git a/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp b/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp
index b170ee71c50..c45632d7e02 100644
--- a/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp
+++ b/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp
@@ -1088,7 +1088,7 @@ HRESULT CMozillaBrowser::Initialize()
         // create our local object
         CWindowCreator *creator = new CWindowCreator();
         nsCOMPtr<nsIWindowCreator> windowCreator;
-        windowCreator = NS_STATIC_CAST(nsIWindowCreator *, creator);
+        windowCreator = static_cast<nsIWindowCreator *>(creator);
 
         // Attach it via the watcher service
         nsCOMPtr<nsIWindowWatcher> watcher =
@@ -1213,12 +1213,12 @@ HRESULT CMozillaBrowser::CreateBrowser()
     mWebBrowserContainer->AddRef();
 
     // Set up the browser with its chrome
-    mWebBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome*, mWebBrowserContainer));
+    mWebBrowser->SetContainerWindow(static_cast<nsIWebBrowserChrome*>(mWebBrowserContainer));
     mWebBrowser->SetParentURIContentListener(mWebBrowserContainer);
 
     // Subscribe for progress notifications
     nsCOMPtr<nsIWeakReference> listener(
-        do_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, mWebBrowserContainer)));
+        do_GetWeakReference(static_cast<nsIWebProgressListener*>(mWebBrowserContainer)));
     mWebBrowser->AddWebBrowserListener(listener, NS_GET_IID(nsIWebProgressListener));
 
     // Visible
diff --git a/mozilla/embedding/browser/activex/src/control/WindowCreator.cpp b/mozilla/embedding/browser/activex/src/control/WindowCreator.cpp
index baf8aae93b2..62d7cbbcfc4 100644
--- a/mozilla/embedding/browser/activex/src/control/WindowCreator.cpp
+++ b/mozilla/embedding/browser/activex/src/control/WindowCreator.cpp
@@ -68,7 +68,7 @@ CWindowCreator::CreateChromeWindow(nsIWebBrowserChrome *aParent, PRUint32 aChrom
         return NS_ERROR_FAILURE;
     }
 
-    CWebBrowserContainer *pContainer = NS_STATIC_CAST(CWebBrowserContainer *, aParent);
+    CWebBrowserContainer *pContainer = static_cast<CWebBrowserContainer *>(aParent);
     
     CComQIPtr<IDispatch> dispNew;
     VARIANT_BOOL bCancel = VARIANT_FALSE;
diff --git a/mozilla/embedding/browser/activex/src/plugin/LegacyPlugin.cpp b/mozilla/embedding/browser/activex/src/plugin/LegacyPlugin.cpp
index aecbf06e900..8ab3fe738dc 100644
--- a/mozilla/embedding/browser/activex/src/plugin/LegacyPlugin.cpp
+++ b/mozilla/embedding/browser/activex/src/plugin/LegacyPlugin.cpp
@@ -432,7 +432,7 @@ GetPluginsContext(PluginInstanceData *pData)
 {
     nsCOMPtr<nsIDOMWindow> window;
     NPN_GetValue(pData->pPluginInstance, NPNVDOMWindow, 
-                 NS_STATIC_CAST(nsIDOMWindow **, getter_AddRefs(window)));
+                 static_cast<nsIDOMWindow **>(getter_AddRefs(window)));
 
     nsCOMPtr<nsIScriptGlobalObject> globalObject(do_QueryInterface(window));
     if (!globalObject)
@@ -443,7 +443,7 @@ GetPluginsContext(PluginInstanceData *pData)
     if (!scriptContext)
         return nsnull;
 
-    return NS_REINTERPRET_CAST(JSContext*, scriptContext->GetNativeContext());
+    return reinterpret_cast<JSContext*>(scriptContext->GetNativeContext());
 }
 
 #endif
@@ -835,7 +835,7 @@ NewControl(const char *pluginType,
             {
                 nsCOMPtr<nsIDOMElement> element;
                 NPN_GetValue(pData->pPluginInstance, NPNVDOMElement, 
-                             NS_STATIC_CAST(nsIDOMElement **, getter_AddRefs(element)));
+                             static_cast<nsIDOMElement **>(getter_AddRefs(element)));
                 if (element)
                 {
                     nsCOMPtr<nsIDOMNode> tagAsNode (do_QueryInterface(element));
diff --git a/mozilla/embedding/browser/activex/src/plugin/XPCBrowser.cpp b/mozilla/embedding/browser/activex/src/plugin/XPCBrowser.cpp
index 6c15bccd6ab..269b50bd716 100644
--- a/mozilla/embedding/browser/activex/src/plugin/XPCBrowser.cpp
+++ b/mozilla/embedding/browser/activex/src/plugin/XPCBrowser.cpp
@@ -65,7 +65,7 @@ HRESULT IEBrowser::Init(PluginInstanceData *pData)
     mData = pData;
     // Get the location URL
     NPN_GetValue(mData->pPluginInstance, NPNVDOMWindow, 
-        NS_STATIC_CAST(nsIDOMWindow **,getter_AddRefs(mDOMWindow)));
+        static_cast<nsIDOMWindow **>(getter_AddRefs(mDOMWindow)));
     if (mDOMWindow)
     {
         mWebNavigation  = do_GetInterface(mDOMWindow);
diff --git a/mozilla/embedding/browser/activex/src/plugin/XPCDocument.cpp b/mozilla/embedding/browser/activex/src/plugin/XPCDocument.cpp
index fd992300cf0..0113364a3b3 100644
--- a/mozilla/embedding/browser/activex/src/plugin/XPCDocument.cpp
+++ b/mozilla/embedding/browser/activex/src/plugin/XPCDocument.cpp
@@ -169,7 +169,7 @@ END_COM_MAP()
         // Get the DOM window
         nsCOMPtr<nsIDOMWindow> domWindow;
         NPN_GetValue(mData->pPluginInstance, NPNVDOMWindow, 
-                     NS_STATIC_CAST(nsIDOMWindow **, getter_AddRefs(domWindow)));
+                     static_cast<nsIDOMWindow **>(getter_AddRefs(domWindow)));
         if (!domWindow)
         {
             return E_FAIL;
@@ -801,7 +801,7 @@ END_COM_MAP()
 
         nsCOMPtr<nsIDOMWindow> domWindow;
         NPN_GetValue(mData->pPluginInstance, NPNVDOMWindow, 
-                     NS_STATIC_CAST(nsIDOMWindow **, getter_AddRefs(domWindow)));
+                     static_cast<nsIDOMWindow **>(getter_AddRefs(domWindow)));
         if (!domWindow)
         {
             return E_UNEXPECTED;
@@ -948,7 +948,7 @@ public:
 
         // Get the DOM document
         NPN_GetValue(mData->pPluginInstance, NPNVDOMElement, 
-                     NS_STATIC_CAST(nsIDOMElement **, getter_AddRefs(mDOMElement)));
+                     static_cast<nsIDOMElement **>(getter_AddRefs(mDOMElement)));
         if (mDOMElement)
         {
             mDOMElement->GetOwnerDocument(getter_AddRefs(mDOMDocument));
@@ -956,7 +956,7 @@ public:
 
         // Get the DOM window
         NPN_GetValue(mData->pPluginInstance, NPNVDOMWindow, 
-                     NS_STATIC_CAST(nsIDOMWindow **, getter_AddRefs(mDOMWindow)));
+                     static_cast<nsIDOMWindow **>(getter_AddRefs(mDOMWindow)));
         if (mDOMWindow)
         {
             nsCOMPtr<nsIDOMWindowInternal> windowInternal = do_QueryInterface(mDOMWindow);
diff --git a/mozilla/embedding/browser/activex/src/plugin/XPConnect.cpp b/mozilla/embedding/browser/activex/src/plugin/XPConnect.cpp
index 9e97fbe43d2..c5dc232d467 100644
--- a/mozilla/embedding/browser/activex/src/plugin/XPConnect.cpp
+++ b/mozilla/embedding/browser/activex/src/plugin/XPConnect.cpp
@@ -107,11 +107,11 @@ nsScriptablePeer::QueryInterface(const nsIID & aIID, void **aInstancePtr)
 
     nsISupports* foundInterface = nsnull;
     if (aIID.Equals(NS_GET_IID(nsISupports)))
-        foundInterface = NS_STATIC_CAST(nsISupports *, NS_STATIC_CAST(nsIClassInfo *, this));
+        foundInterface = static_cast<nsISupports *>(static_cast<nsIClassInfo *>(this));
     else if (aIID.Equals(NS_GET_IID(nsIClassInfo)))
-        foundInterface = NS_STATIC_CAST(nsIClassInfo*, this);
+        foundInterface = static_cast<nsIClassInfo*>(this);
     else if (aIID.Equals(NS_GET_IID(nsIMozAxPlugin)))
-        foundInterface = NS_STATIC_CAST(nsIMozAxPlugin*, this);
+        foundInterface = static_cast<nsIMozAxPlugin*>(this);
     else if (memcmp(&aIID, &__uuidof(IDispatch), sizeof(nsID)) == 0)
     {
         HRESULT hr = mTearOff->QueryInterface(__uuidof(IDispatch), aInstancePtr);
@@ -751,7 +751,7 @@ nsEventSink::InternalInvoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wF
 
     nsCOMPtr<nsIDOMElement> element;
     NPN_GetValue(mPlugin->pPluginInstance, NPNVDOMElement, 
-        NS_STATIC_CAST(nsIDOMElement **, getter_AddRefs(element)));
+        static_cast<nsIDOMElement **>(getter_AddRefs(element)));
     if (!element)
     {
         NS_ERROR("can't get the object element");
@@ -770,7 +770,7 @@ nsEventSink::InternalInvoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wF
     // Fire the script event handler...
     nsCOMPtr<nsIDOMWindow> window;
     NPN_GetValue(mPlugin->pPluginInstance, NPNVDOMWindow, 
-        NS_STATIC_CAST(nsIDOMWindow **, getter_AddRefs(window)));
+        static_cast<nsIDOMWindow **>(getter_AddRefs(window)));
     
     nsCOMPtr<nsIScriptEventManager> eventManager(do_GetInterface(window));
     if (!eventManager) return S_OK;
diff --git a/mozilla/embedding/browser/cocoa/src/CHBrowserView.mm b/mozilla/embedding/browser/cocoa/src/CHBrowserView.mm
index 30975ae3a18..ecc3d81d262 100644
--- a/mozilla/embedding/browser/cocoa/src/CHBrowserView.mm
+++ b/mozilla/embedding/browser/cocoa/src/CHBrowserView.mm
@@ -120,10 +120,10 @@ const char kDirServiceContractID[] = "@mozilla.org/file/directory_service;1";
     NS_ADDREF(_webBrowser);
     
 // Set the container nsIWebBrowserChrome
-    _webBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome *, _listener));
+    _webBrowser->SetContainerWindow(static_cast<nsIWebBrowserChrome *>(_listener));
     
 // Register as a listener for web progress
-    nsCOMPtr<nsIWeakReference> weak = do_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, _listener));
+    nsCOMPtr<nsIWeakReference> weak = do_GetWeakReference(static_cast<nsIWebProgressListener*>(_listener));
     _webBrowser->AddWebBrowserListener(weak, NS_GET_IID(nsIWebProgressListener));
     
 // Hook up the widget hierarchy with us as the parent
@@ -379,8 +379,7 @@ const char kDirServiceContractID[] = "@mozilla.org/file/directory_service;1";
 
   if (_webBrowser) {
     // Set the container nsIWebBrowserChrome
-    _webBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome *, 
-               _listener));
+    _webBrowser->SetContainerWindow(static_cast<nsIWebBrowserChrome *>(_listener));
 
     NSRect frame = [self frame];
  
diff --git a/mozilla/embedding/browser/cocoa/src/NSBrowserView.mm b/mozilla/embedding/browser/cocoa/src/NSBrowserView.mm
index 64df054c2c3..993aa86799d 100644
--- a/mozilla/embedding/browser/cocoa/src/NSBrowserView.mm
+++ b/mozilla/embedding/browser/cocoa/src/NSBrowserView.mm
@@ -591,11 +591,10 @@ nsCocoaBrowserListener::SetContainer(id <NSBrowserContainer> aContainer)
   NS_ADDREF(_webBrowser);
 
   // Set the container nsIWebBrowserChrome
-  _webBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome *, 
-						 _listener));
+  _webBrowser->SetContainerWindow(static_cast<nsIWebBrowserChrome *>(_listener));
   
   // Register as a listener for web progress
-  nsCOMPtr<nsIWeakReference> weak = do_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, _listener));
+  nsCOMPtr<nsIWeakReference> weak = do_GetWeakReference(static_cast<nsIWebProgressListener*>(_listener));
   _webBrowser->AddWebBrowserListener(weak, NS_GET_IID(nsIWebProgressListener));
 
   // Hook up the widget hierarchy with us as the parent
@@ -790,8 +789,7 @@ nsCocoaBrowserListener::SetContainer(id <NSBrowserContainer> aContainer)
 
   if (_webBrowser) {
     // Set the container nsIWebBrowserChrome
-    _webBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome *, 
-						   _listener));
+    _webBrowser->SetContainerWindow(static_cast<nsIWebBrowserChrome *>(_listener));
 
     NSRect frame = [self frame];
  
diff --git a/mozilla/embedding/browser/gtk/src/EmbedGlobalHistory.cpp b/mozilla/embedding/browser/gtk/src/EmbedGlobalHistory.cpp
index eb51de0f5ec..0aefe8a6b67 100644
--- a/mozilla/embedding/browser/gtk/src/EmbedGlobalHistory.cpp
+++ b/mozilla/embedding/browser/gtk/src/EmbedGlobalHistory.cpp
@@ -562,8 +562,8 @@ nsresult EmbedGlobalHistory::RemoveEntries(const PRUnichar *url, int time)
     GList *node = g_list_find_custom(mURLList, NS_ConvertUTF16toUTF8(url).get(), (GCompareFunc) history_entry_find_exist);
     if (!node) return rv;
     if (node->data) {
-      HistoryEntry *entry = NS_STATIC_CAST(HistoryEntry *,
-                                           node->data);
+      HistoryEntry *entry = static_cast<HistoryEntry *>
+                                       (node->data);
 
       entry->mLastVisitTime = 0;
       delete entry;
@@ -685,7 +685,7 @@ nsresult EmbedGlobalHistory::WriteEntryIfWritten(GList *list, OUTPUT_STREAM *fil
 
   unsigned int counter = g_list_length(list);
   while (counter > 0) {
-    HistoryEntry *entry = NS_STATIC_CAST(HistoryEntry*, g_list_nth_data(list, counter-1));
+    HistoryEntry *entry = static_cast<HistoryEntry*>(g_list_nth_data(list, counter-1));
     counter--;
     if (!entry || entryHasExpired(entry)) {
       continue;
@@ -702,7 +702,7 @@ nsresult EmbedGlobalHistory::WriteEntryIfUnwritten(GList *list, OUTPUT_STREAM *f
     return NS_ERROR_FAILURE;
   unsigned int counter = g_list_length(list);
   while (counter > 0) {
-    HistoryEntry *entry = NS_STATIC_CAST(HistoryEntry*, g_list_nth_data(list, counter-1));
+    HistoryEntry *entry = static_cast<HistoryEntry*>(g_list_nth_data(list, counter-1));
     if (!entry || entryHasExpired(entry)) {
       counter--;
       continue;
@@ -896,8 +896,8 @@ nsresult EmbedGlobalHistory::GetContentList(GtkMozHistoryItem **GtkHI, int *coun
   UNACCEPTABLE_CRASHY_GLIB_ALLOCATION(*GtkHI);
   GtkMozHistoryItem * item = (GtkMozHistoryItem *)*GtkHI;
   while (num_items < g_list_length(mURLList)) {
-    HistoryEntry *entry = NS_STATIC_CAST(HistoryEntry*,
-                                         g_list_nth_data(mURLList, num_items));
+    HistoryEntry *entry = static_cast<HistoryEntry*>
+                                     (g_list_nth_data(mURLList, num_items));
     // verify if the entry has expired and discard it
     if (entryHasExpired(entry)) {
       break;
diff --git a/mozilla/embedding/browser/gtk/src/EmbedPasswordMgr.cpp b/mozilla/embedding/browser/gtk/src/EmbedPasswordMgr.cpp
index 77ea28814cf..d4b690f43e8 100644
--- a/mozilla/embedding/browser/gtk/src/EmbedPasswordMgr.cpp
+++ b/mozilla/embedding/browser/gtk/src/EmbedPasswordMgr.cpp
@@ -551,7 +551,7 @@ EmbedPasswordMgr::BuildArrayEnumerator(const nsACString& aKey,
                                        SignonHashEntry* aEntry,
                                        void* aUserData)
 {
-  nsIMutableArray* array = NS_STATIC_CAST(nsIMutableArray*, aUserData);
+  nsIMutableArray* array = static_cast<nsIMutableArray*>(aUserData);
   for (SignonDataEntry* e = aEntry->head; e; e = e->next)
     array->AppendElement(new PasswordEntry(aKey, e), PR_FALSE);
   return PL_DHASH_NEXT;
@@ -573,7 +573,7 @@ EmbedPasswordMgr::BuildRejectArrayEnumerator(const nsACString& aKey,
                                              PRInt32 aEntry,
                                              void* aUserData)
 {
-  nsIMutableArray* array = NS_STATIC_CAST(nsIMutableArray*, aUserData);
+  nsIMutableArray* array = static_cast<nsIMutableArray*>(aUserData);
   nsCOMPtr<nsIPassword> passwordEntry = new PasswordEntry(aKey, nsnull);
   //  if (!passwordEntry) {
   //    // XXX handle oom
@@ -622,7 +622,7 @@ EmbedPasswordMgr::FindEntryEnumerator(const nsACString& aKey,
                                       SignonHashEntry* aEntry,
                                       void* aUserData)
 {
-  findEntryContext* context = NS_STATIC_CAST(findEntryContext*, aUserData);
+  findEntryContext* context = static_cast<findEntryContext*>(aUserData);
   EmbedPasswordMgr* manager = context->manager;
   nsresult rv;
   SignonDataEntry* entry = nsnull;
@@ -1038,7 +1038,7 @@ done:
   nsCOMPtr<nsIDOMEventTarget> targ = do_QueryInterface(domDoc);
   targ->AddEventListener(
       NS_LITERAL_STRING("unload"),
-      NS_STATIC_CAST(nsIDOMLoadListener*, this),
+      static_cast<nsIDOMLoadListener*>(this),
       PR_FALSE);
   return NS_OK;
 }
@@ -1405,7 +1405,7 @@ EmbedPasswordMgr::GetPrompt(nsIDOMWindow* aParent,
     return NS_ERROR_OUT_OF_MEMORY;
 
   NS_ADDREF(wrapper);
-  *_retval = NS_STATIC_CAST(nsIAuthPrompt2*, wrapper);
+  *_retval = static_cast<nsIAuthPrompt2*>(wrapper);
   return NS_OK;
 }
 
@@ -1428,7 +1428,7 @@ EmbedPasswordMgr::RemoveForDOMDocumentEnumerator(nsISupports* aKey,
                                                  PRInt32& aEntry,
                                                  void* aUserData)
 {
-  nsIDOMDocument* domDoc = NS_STATIC_CAST(nsIDOMDocument*, aUserData);
+  nsIDOMDocument* domDoc = static_cast<nsIDOMDocument*>(aUserData);
   nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(aKey);
   nsCOMPtr<nsIDOMDocument> elementDoc;
   element->GetOwnerDocument(getter_AddRefs(elementDoc));
@@ -1465,7 +1465,7 @@ EmbedPasswordMgr::WriteRejectEntryEnumerator(const nsACString& aKey,
                                              PRInt32 aEntry,
                                              void* aUserData)
 {
-  nsIOutputStream* stream = NS_STATIC_CAST(nsIOutputStream*, aUserData);
+  nsIOutputStream* stream = static_cast<nsIOutputStream*>(aUserData);
   PRUint32 bytesWritten;
   nsCAutoString buffer(aKey);
   buffer.Append(NS_LINEBREAK);
@@ -1478,7 +1478,7 @@ EmbedPasswordMgr::WriteSignonEntryEnumerator(const nsACString& aKey,
                                              SignonHashEntry* aEntry,
                                              void* aUserData)
 {
-  nsIOutputStream* stream = NS_STATIC_CAST(nsIOutputStream*, aUserData);
+  nsIOutputStream* stream = static_cast<nsIOutputStream*>(aUserData);
   PRUint32 bytesWritten;
   nsCAutoString buffer(aKey);
   buffer.Append(NS_LINEBREAK);
@@ -1662,7 +1662,7 @@ EmbedPasswordMgr::FindPasswordEntryInternal(const SignonDataEntry* aEntry,
       break;
   }
   if (entry) {
-    *aResult = NS_CONST_CAST(SignonDataEntry*, entry);
+    *aResult = const_cast<SignonDataEntry*>(entry);
     return NS_OK;
   }
   *aResult = nsnull;
@@ -1728,7 +1728,7 @@ void
 EmbedPasswordMgr::AttachToInput(nsIDOMHTMLInputElement* aElement)
 {
   nsCOMPtr<nsIDOMEventTarget> targ = do_QueryInterface(aElement);
-  nsIDOMEventListener* listener = NS_STATIC_CAST(nsIDOMFocusListener*, this);
+  nsIDOMEventListener* listener = static_cast<nsIDOMFocusListener*>(this);
   targ->AddEventListener(NS_LITERAL_STRING("blur"), listener, PR_FALSE);
   targ->AddEventListener(NS_LITERAL_STRING("DOMAutoComplete"), listener, PR_FALSE);
   mAutoCompleteInputs.Put(aElement, 1);
diff --git a/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp b/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp
index 761116b9ef8..cd7ec3e8375 100644
--- a/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp
+++ b/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp
@@ -191,8 +191,8 @@ EmbedCommon::GetAnyLiveWidget()
   //FIXME need to choose right window
   GtkMozEmbed *ret = nsnull;
   for (int i = 0; i < count; i++) {
-    EmbedPrivate *tmpPrivate = NS_STATIC_CAST(EmbedPrivate *,
-                                              EmbedPrivate::sWindowList->ElementAt(i));
+    EmbedPrivate *tmpPrivate = static_cast<EmbedPrivate *>
+                                          (EmbedPrivate::sWindowList->ElementAt(i));
     ret = tmpPrivate->mOwningWidget;
   }
   return ret;
@@ -432,15 +432,15 @@ EmbedPrivate::Init(GtkMozEmbed *aOwningWidget)
   // initialize it.  It is assumed that this window will be destroyed
   // when we go out of scope.
   mWindow = new EmbedWindow();
-  mWindowGuard = NS_STATIC_CAST(nsIWebBrowserChrome *, mWindow);
+  mWindowGuard = static_cast<nsIWebBrowserChrome *>(mWindow);
   mWindow->Init(this);
 
   // Create our progress listener object, make an owning reference,
   // and initialize it.  It is assumed that this progress listener
   // will be destroyed when we go out of scope.
   mProgress = new EmbedProgress();
-  mProgressGuard = NS_STATIC_CAST(nsIWebProgressListener *,
-               mProgress);
+  mProgressGuard = static_cast<nsIWebProgressListener *>
+                              (mProgress);
   mProgress->Init(this);
 
   // Create our content listener object, initialize it and attach it.
@@ -468,7 +468,7 @@ EmbedPrivate::Init(GtkMozEmbed *aOwningWidget)
     // create our local object
     EmbedWindowCreator *creator = new EmbedWindowCreator(&mOpenBlock);
     nsCOMPtr<nsIWindowCreator> windowCreator;
-    windowCreator = NS_STATIC_CAST(nsIWindowCreator *, creator);
+    windowCreator = static_cast<nsIWindowCreator *>(creator);
 
     // Attach it via the watcher service
     nsCOMPtr<nsIWindowWatcher> watcher = do_GetService(NS_WINDOWWATCHER_CONTRACTID);
@@ -531,14 +531,14 @@ EmbedPrivate::Realize(PRBool *aAlreadyRealized)
   mWindow->mBaseWindow->GetMainWidget(getter_AddRefs(mozWidget));
   // get the native drawing area
   GdkWindow *tmp_window =
-    NS_STATIC_CAST(GdkWindow *,
-      mozWidget->GetNativeData(NS_NATIVE_WINDOW));
+    static_cast<GdkWindow *>
+               (mozWidget->GetNativeData(NS_NATIVE_WINDOW));
   // and, thanks to superwin we actually need the parent of that.
   tmp_window = gdk_window_get_parent(tmp_window);
   // save the widget ID - it should be the mozarea of the window.
   gpointer data = nsnull;
   gdk_window_get_user_data(tmp_window, &data);
-  mMozWindowWidget = NS_STATIC_CAST(GtkWidget *, data);
+  mMozWindowWidget = static_cast<GtkWidget *>(data);
 
   // Apply the current chrome mask
   ApplyChromeMask();
@@ -789,8 +789,8 @@ EmbedPrivate::PushStartup(void)
       return;
 
     rv = XRE_InitEmbedding(greDir, binDir,
-                           NS_CONST_CAST(GTKEmbedDirectoryProvider*,
-                                         &kDirectoryProvider),
+                           const_cast<GTKEmbedDirectoryProvider*>
+                                     (&kDirectoryProvider),
                            nsnull, nsnull);
     if (NS_FAILED(rv))
       return;
@@ -972,10 +972,10 @@ EmbedPrivate::FindPrivateForBrowser(nsIWebBrowserChrome *aBrowser)
   // creating a new window) so it's OK to walk the list of open
   // windows.
   for (int i = 0; i < count; i++) {
-    EmbedPrivate *tmpPrivate = NS_STATIC_CAST(EmbedPrivate *, sWindowList->ElementAt(i));
+    EmbedPrivate *tmpPrivate = static_cast<EmbedPrivate *>(sWindowList->ElementAt(i));
     // get the browser object for that window
     nsIWebBrowserChrome *chrome =
-      NS_STATIC_CAST(nsIWebBrowserChrome *, tmpPrivate->mWindow);
+      static_cast<nsIWebBrowserChrome *>(tmpPrivate->mWindow);
     if (chrome == aBrowser)
       return tmpPrivate;
   }
@@ -1046,7 +1046,7 @@ EmbedPrivate::ContentFinishedLoading(void)
 
       GList *ptr = list_full;
       while(ptr) {
-        GtkMozLogin * login = NS_STATIC_CAST(GtkMozLogin*, ptr->data);
+        GtkMozLogin * login = static_cast<GtkMozLogin*>(ptr->data);
         if (login && login->user) {
           users_list = g_list_append(users_list, NS_strdup(login->user));
           NS_Free((void*)login->user);
@@ -1139,8 +1139,8 @@ EmbedPrivate::AttachListeners(void)
     return;
 
   nsIDOMEventListener *eventListener =
-    NS_STATIC_CAST(nsIDOMEventListener *,
-       NS_STATIC_CAST(nsIDOMKeyListener *, mEventListener));
+    static_cast<nsIDOMEventListener *>
+               (static_cast<nsIDOMKeyListener *>(mEventListener));
 
   // add the key listener
   nsresult rv;
@@ -1200,8 +1200,8 @@ EmbedPrivate::DetachListeners(void)
     return;
 
   nsIDOMEventListener *eventListener =
-    NS_STATIC_CAST(nsIDOMEventListener *,
-       NS_STATIC_CAST(nsIDOMKeyListener *, mEventListener));
+    static_cast<nsIDOMEventListener *>
+               (static_cast<nsIDOMKeyListener *>(mEventListener));
 
   nsresult rv;
   rv = mEventTarget->RemoveEventListenerByIID(
diff --git a/mozilla/embedding/browser/gtk/src/EmbedProgress.cpp b/mozilla/embedding/browser/gtk/src/EmbedProgress.cpp
index f6eb8c68fce..0ddd377ef5d 100644
--- a/mozilla/embedding/browser/gtk/src/EmbedProgress.cpp
+++ b/mozilla/embedding/browser/gtk/src/EmbedProgress.cpp
@@ -257,9 +257,9 @@ EmbedProgress::OnStatusChange(nsIWebProgress  *aWebProgress,
 
   gtk_signal_emit(GTK_OBJECT(mOwner->mOwningWidget),
                   moz_embed_signals[STATUS_CHANGE],
-                  NS_STATIC_CAST(void *, aRequest),
-                  NS_STATIC_CAST(gint, aStatus),
-                  NS_STATIC_CAST(void *, tmpString));
+                  static_cast<void *>(aRequest),
+                  static_cast<gint>(aStatus),
+                  static_cast<void *>(tmpString));
 
   NS_Free(tmpString);
 
@@ -273,7 +273,7 @@ EmbedProgress::OnSecurityChange(nsIWebProgress *aWebProgress,
 {
   gtk_signal_emit(GTK_OBJECT(mOwner->mOwningWidget),
                   moz_embed_signals[SECURITY_CHANGE],
-                  NS_STATIC_CAST(void *, aRequest),
+                  static_cast<void *>(aRequest),
                   aState);
   return NS_OK;
 }
diff --git a/mozilla/embedding/browser/gtk/src/EmbedWindow.cpp b/mozilla/embedding/browser/gtk/src/EmbedWindow.cpp
index eefa77de6b1..e923c5d7f06 100644
--- a/mozilla/embedding/browser/gtk/src/EmbedWindow.cpp
+++ b/mozilla/embedding/browser/gtk/src/EmbedWindow.cpp
@@ -76,7 +76,7 @@ EmbedWindow::Init(EmbedPrivate *aOwner)
   if (!mWebBrowser)
     return NS_ERROR_FAILURE;
 
-  mWebBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome *, this));
+  mWebBrowser->SetContainerWindow(static_cast<nsIWebBrowserChrome *>(this));
 
   nsCOMPtr<nsIDocShellTreeItem> item = do_QueryInterface(mWebBrowser);
   item->SetItemType(nsIDocShellTreeItem::typeContentWrapper);
@@ -335,7 +335,7 @@ NS_IMETHODIMP
 EmbedWindow::GetSiteWindow(void **aSiteWindow)
 {
   GtkWidget *ownerAsWidget(GTK_WIDGET(mOwner->mOwningWidget));
-  *aSiteWindow = NS_STATIC_CAST(void *, ownerAsWidget);
+  *aSiteWindow = static_cast<void *>(ownerAsWidget);
   return NS_OK;
 }
 
@@ -398,8 +398,8 @@ EmbedWindow::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords,
   nsCOMPtr<nsIWidget> mainWidget;
   mBaseWindow->GetMainWidget(getter_AddRefs(mainWidget));
   GdkWindow *window;
-  window = NS_STATIC_CAST(GdkWindow *,
-        mainWidget->GetNativeData(NS_NATIVE_WINDOW));
+  window = static_cast<GdkWindow *>
+                      (mainWidget->GetNativeData(NS_NATIVE_WINDOW));
   gint root_x, root_y;
   gdk_window_get_origin(window, &root_x, &root_y);
 
diff --git a/mozilla/embedding/browser/gtk/src/EmbedWindowCreator.cpp b/mozilla/embedding/browser/gtk/src/EmbedWindowCreator.cpp
index 7cd48c5666e..32df005f4af 100644
--- a/mozilla/embedding/browser/gtk/src/EmbedWindowCreator.cpp
+++ b/mozilla/embedding/browser/gtk/src/EmbedWindowCreator.cpp
@@ -98,15 +98,15 @@ EmbedWindowCreator::CreateChromeWindow(nsIWebBrowserChrome *aParent,
   // realized before that can happen.
   gtk_widget_realize(GTK_WIDGET(newEmbed));
 
-  EmbedPrivate *newEmbedPrivate = NS_STATIC_CAST(EmbedPrivate *,
-             newEmbed->data);
+  EmbedPrivate *newEmbedPrivate = static_cast<EmbedPrivate *>
+                                             (newEmbed->data);
 
   // set the chrome flag on the new window if it's a chrome open
   if (aChromeFlags & nsIWebBrowserChrome::CHROME_OPENAS_CHROME)
     newEmbedPrivate->mIsChrome = PR_TRUE;
 
-  *_retval = NS_STATIC_CAST(nsIWebBrowserChrome *,
-            (newEmbedPrivate->mWindow));
+  *_retval = static_cast<nsIWebBrowserChrome *>
+                        ((newEmbedPrivate->mWindow));
 
   if (*_retval) {
     NS_ADDREF(*_retval);
diff --git a/mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp b/mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp
index 4610453e863..dadfaaea493 100644
--- a/mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp
+++ b/mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp
@@ -793,8 +793,8 @@ gtk_moz_embed_get_accessible (GtkWidget *widget)
 
   GtkMozEmbed  *embed = GTK_MOZ_EMBED(widget);;
   EmbedPrivate *embedPrivate = (EmbedPrivate *)embed->data;
-  return NS_STATIC_CAST(AtkObject *,
-                        embedPrivate->GetAtkObjectForCurrentDocument());
+  return static_cast<AtkObject *>
+                    (embedPrivate->GetAtkObjectForCurrentDocument());
 }
 #endif /* MOZ_ACCESSIBILITY_ATK */
 
diff --git a/mozilla/embedding/browser/photon/src/EmbedPrivate.cpp b/mozilla/embedding/browser/photon/src/EmbedPrivate.cpp
index b5d596df0cb..7b73c131f77 100644
--- a/mozilla/embedding/browser/photon/src/EmbedPrivate.cpp
+++ b/mozilla/embedding/browser/photon/src/EmbedPrivate.cpp
@@ -154,15 +154,15 @@ EmbedPrivate::Init(PtWidget_t *aOwningWidget)
 	// initialize it.  It is assumed that this window will be destroyed
 	// when we go out of scope.
 	mWindow = new EmbedWindow();
-	mWindowGuard = NS_STATIC_CAST(nsIWebBrowserChrome *, mWindow);
+	mWindowGuard = static_cast<nsIWebBrowserChrome *>(mWindow);
 	mWindow->Init(this);
 
 	// Create our progress listener object, make an owning reference,
 	// and initialize it.  It is assumed that this progress listener
 	// will be destroyed when we go out of scope.
 	mProgress = new EmbedProgress();
-	mProgressGuard = NS_STATIC_CAST(nsIWebProgressListener *,
-					   mProgress);
+	mProgressGuard = static_cast<nsIWebProgressListener *>
+                             (mProgress);
 	mProgress->Init(this);
 
 	// Create our content listener object, initialize it and attach it.
@@ -176,15 +176,15 @@ EmbedPrivate::Init(PtWidget_t *aOwningWidget)
 	// that this will be destroyed before we go out of scope.
 	mEventListener = new EmbedEventListener();
 	mEventListenerGuard =
-	NS_STATIC_CAST(nsISupports *, NS_STATIC_CAST(nsIDOMKeyListener *,
-						 mEventListener));
+	static_cast<nsISupports *>(static_cast<nsIDOMKeyListener *>
+                        (mEventListener));
 	mEventListener->Init(this);
 
 	// Create our print listener object, make an owning reference,
 	// and initialize it.  It is assumed that this print listener
 	// will be destroyed when we go out of scope.
 	mPrint = new EmbedPrintListener();
-	mPrintGuard = NS_STATIC_CAST(nsIWebProgressListener *, mPrint);
+	mPrintGuard = static_cast<nsIWebProgressListener *>(mPrint);
 	mPrint->Init(this);
 
 	// has the window creator service been set up?
@@ -199,7 +199,7 @@ EmbedPrivate::Init(PtWidget_t *aOwningWidget)
 		// create our local object
 		EmbedWindowCreator *creator = new EmbedWindowCreator();
 		nsCOMPtr<nsIWindowCreator> windowCreator;
-		windowCreator = NS_STATIC_CAST(nsIWindowCreator *, creator);
+		windowCreator = static_cast<nsIWindowCreator *>(creator);
 
 		// Attach it via the watcher service
 		nsCOMPtr<nsIWindowWatcher> watcher = do_GetService(sWatcherContractID);
@@ -714,11 +714,11 @@ EmbedPrivate::FindPrivateForBrowser(nsIWebBrowserChrome *aBrowser)
 	// windows.
 	for (int i = 0; i < count; i++) 
 	{
-	  EmbedPrivate *tmpPrivate = NS_STATIC_CAST(EmbedPrivate *,
-							sWindowList->ElementAt(i));
+	  EmbedPrivate *tmpPrivate = static_cast<EmbedPrivate *>
+                                         (sWindowList->ElementAt(i));
 	  // get the browser object for that window
-	  nsIWebBrowserChrome *chrome = NS_STATIC_CAST(nsIWebBrowserChrome *,
-						   tmpPrivate->mWindow);
+	  nsIWebBrowserChrome *chrome = static_cast<nsIWebBrowserChrome *>
+                                            (tmpPrivate->mWindow);
 	  if (chrome == aBrowser)
 		return tmpPrivate;
 	}
@@ -874,8 +874,8 @@ EmbedPrivate::AttachListeners(void)
     return;
 
   nsIDOMEventListener *eventListener =
-    NS_STATIC_CAST(nsIDOMEventListener *,
-		   NS_STATIC_CAST(nsIDOMKeyListener *, mEventListener));
+    static_cast<nsIDOMEventListener *>
+               (static_cast<nsIDOMKeyListener *>(mEventListener));
 
   // add the key listener
   nsresult rv;
@@ -904,8 +904,8 @@ EmbedPrivate::DetachListeners(void)
     return;
 
   nsIDOMEventListener *eventListener =
-    NS_STATIC_CAST(nsIDOMEventListener *,
-		   NS_STATIC_CAST(nsIDOMKeyListener *, mEventListener));
+    static_cast<nsIDOMEventListener *>
+               (static_cast<nsIDOMKeyListener *>(mEventListener));
 
   nsresult rv;
   rv = mEventTarget->RemoveEventListenerByIID(eventListener,
diff --git a/mozilla/embedding/browser/photon/src/EmbedStream.cpp b/mozilla/embedding/browser/photon/src/EmbedStream.cpp
index f2cebef6802..113f3012986 100644
--- a/mozilla/embedding/browser/photon/src/EmbedStream.cpp
+++ b/mozilla/embedding/browser/photon/src/EmbedStream.cpp
@@ -134,7 +134,7 @@ EmbedStream::OpenStream(const char *aBaseURI, const char *aContentType)
 
   // create a new input stream channel
   rv = NS_NewInputStreamChannel(getter_AddRefs(mChannel), uri,
-				NS_STATIC_CAST(nsIInputStream *, this),
+				static_cast<nsIInputStream *>(this),
 				nsDependentCString(aContentType));
   if (NS_FAILED(rv))
     return rv;
@@ -203,7 +203,7 @@ EmbedStream::AppendToStream(const char *aData, int aLen)
   nsCOMPtr<nsIRequest> request = do_QueryInterface(mChannel); 
   rv = mStreamListener->OnDataAvailable(request,
 					NULL,
-					NS_STATIC_CAST(nsIInputStream *, this),
+					static_cast<nsIInputStream *>(this),
 					mOffset, /* offset */
 					aLen); /* len */
   // move our counter
diff --git a/mozilla/embedding/browser/photon/src/EmbedWindow.cpp b/mozilla/embedding/browser/photon/src/EmbedWindow.cpp
index aa9d0efd506..2d7fccf657f 100644
--- a/mozilla/embedding/browser/photon/src/EmbedWindow.cpp
+++ b/mozilla/embedding/browser/photon/src/EmbedWindow.cpp
@@ -90,7 +90,7 @@ EmbedWindow::Init(EmbedPrivate *aOwner)
   if (!mWebBrowser)
     return NS_ERROR_FAILURE;
 
-  mWebBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome *, this));
+  mWebBrowser->SetContainerWindow(static_cast<nsIWebBrowserChrome *>(this));
   
 	// get the doc shel for cut/copy/paste
 	//mRootDocShell = do_GetInterface(mWebBrowser);
@@ -462,7 +462,7 @@ NS_IMETHODIMP
 EmbedWindow::GetSiteWindow(void **aSiteWindow)
 {
   PtWidget_t *ownerAsWidget = (PtWidget_t *)(mOwner->mOwningWidget);
-  *aSiteWindow = NS_STATIC_CAST(void *, ownerAsWidget);
+  *aSiteWindow = static_cast<void *>(ownerAsWidget);
   return NS_OK;
 }
 
@@ -501,7 +501,7 @@ EmbedWindow::OnShowTooltip(PRInt32 aXCoords, PRInt32 aYCoords,
   nsCOMPtr<nsIWidget> mainWidget;
   mBaseWindow->GetMainWidget(getter_AddRefs(mainWidget));
   PtWidget_t *window;
-  window = NS_STATIC_CAST(PtWidget_t *, mainWidget->GetNativeData(NS_NATIVE_WINDOW));
+  window = static_cast<PtWidget_t *>(mainWidget->GetNativeData(NS_NATIVE_WINDOW));
 
   PgExtentText(&extent, &pos, font, tipString, 0);
   w = extent.lr.x - extent.ul.x + 1;
diff --git a/mozilla/embedding/browser/photon/src/EmbedWindowCreator.cpp b/mozilla/embedding/browser/photon/src/EmbedWindowCreator.cpp
index cb3cb7c5470..97c96d2fff0 100644
--- a/mozilla/embedding/browser/photon/src/EmbedWindowCreator.cpp
+++ b/mozilla/embedding/browser/photon/src/EmbedWindowCreator.cpp
@@ -92,7 +92,7 @@ EmbedWindowCreator::CreateChromeWindow(nsIWebBrowserChrome *aParent,
 		if (aChromeFlags & nsIWebBrowserChrome::CHROME_OPENAS_CHROME)
 			newEmbedPrivate->mIsChrome = PR_TRUE;
 
-		*_retval = NS_STATIC_CAST(nsIWebBrowserChrome *, (newEmbedPrivate->mWindow));
+		*_retval = static_cast<nsIWebBrowserChrome *>((newEmbedPrivate->mWindow));
 
 		if (*_retval) 
 		{
diff --git a/mozilla/embedding/browser/webBrowser/nsCommandHandler.cpp b/mozilla/embedding/browser/webBrowser/nsCommandHandler.cpp
index 82fb6138a92..197dfc251bd 100644
--- a/mozilla/embedding/browser/webBrowser/nsCommandHandler.cpp
+++ b/mozilla/embedding/browser/webBrowser/nsCommandHandler.cpp
@@ -83,7 +83,7 @@ nsresult nsCommandHandler::GetCommandHandler(nsICommandHandler **aCommandHandler
     nsCOMPtr<nsICDocShellTreeOwner> realTreeOwner(do_QueryInterface(treeOwner));
     if (realTreeOwner)
     {
-        nsDocShellTreeOwner *tree = NS_STATIC_CAST(nsDocShellTreeOwner *, treeOwner);
+        nsDocShellTreeOwner *tree = static_cast<nsDocShellTreeOwner *>(treeOwner);
         if (tree->mTreeOwner)
         {
             nsresult rv;
diff --git a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
index bfe4ba3bdf9..2e02fc19da1 100644
--- a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
+++ b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
@@ -909,7 +909,7 @@ nsDocShellTreeOwner::AddChromeListeners()
       nsCOMPtr<nsPIDOMEventTarget> piTarget;
       GetPIDOMEventTarget(mWebBrowser, getter_AddRefs(piTarget));
       nsCOMPtr<nsIDOMEventTarget> target(do_QueryInterface(piTarget));
-      mChromeDragHandler->HookupTo(target, NS_STATIC_CAST(nsIWebNavigation*, mWebBrowser));
+      mChromeDragHandler->HookupTo(target, static_cast<nsIWebNavigation*>(mWebBrowser));
     }
   }
 
@@ -942,7 +942,7 @@ nsDocShellTreeOwner::GetWebBrowserChrome()
   if (mWebBrowserChromeWeak != nsnull) {
     mWebBrowserChromeWeak->
                         QueryReferent(NS_GET_IID(nsIWebBrowserChrome),
-                                      NS_REINTERPRET_CAST(void**, &chrome));
+                                      reinterpret_cast<void**>(&chrome));
   } else if (mWebBrowserChrome) {
     chrome = mWebBrowserChrome;
     NS_ADDREF(mWebBrowserChrome);
@@ -958,7 +958,7 @@ nsDocShellTreeOwner::GetOwnerWin()
   if (mWebBrowserChromeWeak != nsnull) {
     mWebBrowserChromeWeak->
                         QueryReferent(NS_GET_IID(nsIEmbeddingSiteWindow),
-                                      NS_REINTERPRET_CAST(void**, &win));
+                                      reinterpret_cast<void**>(&win));
   } else if (mOwnerWin) {
     win = mOwnerWin;
     NS_ADDREF(mOwnerWin);
@@ -974,7 +974,7 @@ nsDocShellTreeOwner::GetOwnerRequestor()
   if (mWebBrowserChromeWeak != nsnull) {
     mWebBrowserChromeWeak->
                         QueryReferent(NS_GET_IID(nsIInterfaceRequestor),
-                                      NS_REINTERPRET_CAST(void**, &req));
+                                      reinterpret_cast<void**>(&req));
   } else if (mOwnerRequestor) {
     req = mOwnerRequestor;
     NS_ADDREF(mOwnerRequestor);
@@ -1145,7 +1145,7 @@ NS_IMETHODIMP
 ChromeTooltipListener::AddTooltipListener()
 {
   if (mEventTarget) {
-    nsIDOMMouseListener *pListener = NS_STATIC_CAST(nsIDOMMouseListener *, this);
+    nsIDOMMouseListener *pListener = static_cast<nsIDOMMouseListener *>(this);
     nsresult rv = mEventTarget->AddEventListenerByIID(pListener, NS_GET_IID(nsIDOMMouseListener));
     nsresult rv2 = mEventTarget->AddEventListenerByIID(pListener, NS_GET_IID(nsIDOMMouseMotionListener));
     nsresult rv3 = mEventTarget->AddEventListenerByIID(pListener, NS_GET_IID(nsIDOMKeyListener));
@@ -1190,7 +1190,7 @@ NS_IMETHODIMP
 ChromeTooltipListener::RemoveTooltipListener()
 {
   if (mEventTarget) {
-    nsIDOMMouseListener *pListener = NS_STATIC_CAST(nsIDOMMouseListener *, this);
+    nsIDOMMouseListener *pListener = static_cast<nsIDOMMouseListener *>(this);
     nsresult rv = mEventTarget->RemoveEventListenerByIID(pListener, NS_GET_IID(nsIDOMMouseListener));
     nsresult rv2 = mEventTarget->RemoveEventListenerByIID(pListener, NS_GET_IID(nsIDOMMouseMotionListener));
     nsresult rv3 = mEventTarget->RemoveEventListenerByIID(pListener, NS_GET_IID(nsIDOMKeyListener));
@@ -1420,8 +1420,8 @@ void
 ChromeTooltipListener::sTooltipCallback(nsITimer *aTimer,
                                         void *aChromeTooltipListener)
 {
-  ChromeTooltipListener* self = NS_STATIC_CAST(ChromeTooltipListener*,
-                                               aChromeTooltipListener);
+  ChromeTooltipListener* self = static_cast<ChromeTooltipListener*>
+                                           (aChromeTooltipListener);
   if ( self && self->mPossibleTooltipNode ){
     // The actual coordinates we want to put the tooltip at are relative to the
     // toplevel docshell of our mWebBrowser.  We know what the screen
@@ -1430,7 +1430,7 @@ ChromeTooltipListener::sTooltipCallback(nsITimer *aTimer,
     // find those short of groveling for the presentation in that docshell and
     // finding the screen coords of its toplevel widget...
     nsCOMPtr<nsIDocShell> docShell =
-      do_GetInterface(NS_STATIC_CAST(nsIWebBrowser*, self->mWebBrowser));
+      do_GetInterface(static_cast<nsIWebBrowser*>(self->mWebBrowser));
     nsCOMPtr<nsIPresShell> shell;
     if (docShell) {
       docShell->GetPresShell(getter_AddRefs(shell));
@@ -1516,7 +1516,7 @@ ChromeTooltipListener::CreateAutoHideTimer()
 void
 ChromeTooltipListener::sAutoHideCallback(nsITimer *aTimer, void* aListener)
 {
-  ChromeTooltipListener* self = NS_STATIC_CAST(ChromeTooltipListener*, aListener);
+  ChromeTooltipListener* self = static_cast<ChromeTooltipListener*>(aListener);
   if ( self )
     self->HideTooltip();
 
@@ -1570,7 +1570,7 @@ NS_IMETHODIMP
 ChromeContextMenuListener::AddContextMenuListener()
 {
   if (mEventTarget) {
-    nsIDOMContextMenuListener *pListener = NS_STATIC_CAST(nsIDOMContextMenuListener *, this);
+    nsIDOMContextMenuListener *pListener = static_cast<nsIDOMContextMenuListener *>(this);
     nsresult rv = mEventTarget->AddEventListenerByIID(pListener, NS_GET_IID(nsIDOMContextMenuListener));
     if (NS_SUCCEEDED(rv))
       mContextMenuListenerInstalled = PR_TRUE;
@@ -1589,7 +1589,7 @@ NS_IMETHODIMP
 ChromeContextMenuListener::RemoveContextMenuListener()
 {
   if (mEventTarget) {
-    nsIDOMContextMenuListener *pListener = NS_STATIC_CAST(nsIDOMContextMenuListener *, this);
+    nsIDOMContextMenuListener *pListener = static_cast<nsIDOMContextMenuListener *>(this);
     nsresult rv = mEventTarget->RemoveEventListenerByIID(pListener, NS_GET_IID(nsIDOMContextMenuListener));
     if (NS_SUCCEEDED(rv))
       mContextMenuListenerInstalled = PR_FALSE;
diff --git a/mozilla/embedding/browser/webBrowser/nsEmbedStream.cpp b/mozilla/embedding/browser/webBrowser/nsEmbedStream.cpp
index 16793ae3cfc..6b6a4fe9bde 100644
--- a/mozilla/embedding/browser/webBrowser/nsEmbedStream.cpp
+++ b/mozilla/embedding/browser/webBrowser/nsEmbedStream.cpp
@@ -120,7 +120,7 @@ nsEmbedStream::OpenStream(nsIURI *aBaseURI, const nsACString& aContentType)
 
   // create a new input stream channel
   rv = NS_NewInputStreamChannel(getter_AddRefs(mChannel), aBaseURI,
-				NS_STATIC_CAST(nsIInputStream *, this),
+				static_cast<nsIInputStream *>(this),
 				aContentType);
   if (NS_FAILED(rv))
     return rv;
@@ -194,7 +194,7 @@ nsEmbedStream::AppendToStream(const PRUint8 *aData, PRUint32 aLen)
   // notify our listeners
   rv = mStreamListener->OnDataAvailable(mChannel,
 					NULL,
-					NS_STATIC_CAST(nsIInputStream *, this),
+					static_cast<nsIInputStream *>(this),
 					mOffset, /* offset */
 					aLen); /* len */
   // move our counter
@@ -231,7 +231,7 @@ NS_METHOD
 nsEmbedStream::Append(const PRUint8 *aData, PRUint32 aLen)
 {
   PRUint32 bytesWritten = 0;
-  nsresult rv = mOutputStream->Write(NS_REINTERPRET_CAST(const char*, aData),
+  nsresult rv = mOutputStream->Write(reinterpret_cast<const char*>(aData),
                                      aLen, &bytesWritten);
   if (NS_FAILED(rv))
     return rv;
diff --git a/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp b/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp
index 678bf7aaaf9..38bd0ebb308 100644
--- a/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp
+++ b/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp
@@ -379,7 +379,7 @@ NS_IMETHODIMP nsWebBrowser::EnableGlobalHistory(PRBool aEnable)
 #if (defined(XP_MAC) || defined(XP_MACOSX)) && !defined(MOZ_WIDGET_COCOA)
 NS_IMETHODIMP nsWebBrowser::EnsureTopLevelWidget(nativeWindow aWindow)
 {
-    WindowPtr macWindow = NS_STATIC_CAST(WindowPtr, aWindow);
+    WindowPtr macWindow = static_cast<WindowPtr>(aWindow);
     nsIWidget *widget = nsnull;
     nsCOMPtr<nsIWidget> newWidget;
     nsresult rv = NS_ERROR_FAILURE;
@@ -546,7 +546,7 @@ NS_IMETHODIMP nsWebBrowser::GetSameTypeParent(nsIDocShellTreeItem** aParent)
 NS_IMETHODIMP nsWebBrowser::GetRootTreeItem(nsIDocShellTreeItem** aRootTreeItem)
 {
    NS_ENSURE_ARG_POINTER(aRootTreeItem);
-   *aRootTreeItem = NS_STATIC_CAST(nsIDocShellTreeItem*, this);
+   *aRootTreeItem = static_cast<nsIDocShellTreeItem*>(this);
 
    nsCOMPtr<nsIDocShellTreeItem> parent;
    NS_ENSURE_SUCCESS(GetParent(getter_AddRefs(parent)), NS_ERROR_FAILURE);
@@ -562,7 +562,7 @@ NS_IMETHODIMP nsWebBrowser::GetRootTreeItem(nsIDocShellTreeItem** aRootTreeItem)
 NS_IMETHODIMP nsWebBrowser::GetSameTypeRootTreeItem(nsIDocShellTreeItem** aRootTreeItem)
 {
    NS_ENSURE_ARG_POINTER(aRootTreeItem);
-   *aRootTreeItem = NS_STATIC_CAST(nsIDocShellTreeItem*, this);
+   *aRootTreeItem = static_cast<nsIDocShellTreeItem*>(this);
 
    nsCOMPtr<nsIDocShellTreeItem> parent;
    NS_ENSURE_SUCCESS(GetSameTypeParent(getter_AddRefs(parent)), NS_ERROR_FAILURE);
@@ -584,7 +584,7 @@ NS_IMETHODIMP nsWebBrowser::FindItemWithName(const PRUnichar *aName,
    NS_ASSERTION(mDocShellTreeOwner, "This should always be set when in this situation");
 
    return mDocShellAsItem->FindItemWithName(aName, 
-      NS_STATIC_CAST(nsIDocShellTreeOwner*, mDocShellTreeOwner),
+      static_cast<nsIDocShellTreeOwner*>(mDocShellTreeOwner),
       aOriginalRequestor, _retval);
 }
 
@@ -1178,7 +1178,7 @@ NS_IMETHODIMP nsWebBrowser::Create()
       widgetInit.mWindowType = eWindowType_child;
       nsRect bounds(mInitInfo->x, mInitInfo->y, mInitInfo->cx, mInitInfo->cy);
       
-      mInternalWidget->SetClientData(NS_STATIC_CAST(nsWebBrowser *, this));
+      mInternalWidget->SetClientData(static_cast<nsWebBrowser *>(this));
       mInternalWidget->Create(mParentNativeWindow, bounds, nsWebBrowser::HandleEvent,
                               nsnull, nsnull, nsnull, &widgetInit);  
       }
@@ -1218,7 +1218,7 @@ NS_IMETHODIMP nsWebBrowser::Create()
    // nsIWebProgressListener.
    nsCOMPtr<nsISupports> supports = nsnull;
    (void)mDocShellTreeOwner->QueryInterface(NS_GET_IID(nsIWebProgressListener),
-                             NS_STATIC_CAST(void**, getter_AddRefs(supports)));
+                             static_cast<void**>(getter_AddRefs(supports)));
    (void)BindListener(supports, NS_GET_IID(nsIWebProgressListener));
 
    NS_ENSURE_SUCCESS(mDocShellAsWin->InitWindow(nsnull,
@@ -1713,12 +1713,12 @@ nsEventStatus PR_CALLBACK nsWebBrowser::HandleEvent(nsGUIEvent *aEvent)
   if (!data)
     return result;
 
-  browser = NS_STATIC_CAST(nsWebBrowser *, data);
+  browser = static_cast<nsWebBrowser *>(data);
 
   switch(aEvent->message) {
 
   case NS_PAINT: {
-      nsPaintEvent *paintEvent = NS_STATIC_CAST(nsPaintEvent *, aEvent);
+      nsPaintEvent *paintEvent = static_cast<nsPaintEvent *>(aEvent);
       nsIRenderingContext *rc = paintEvent->renderingContext;
       nscolor oldColor;
       rc->GetColor(oldColor);
diff --git a/mozilla/embedding/components/commandhandler/src/nsCommandGroup.cpp b/mozilla/embedding/components/commandhandler/src/nsCommandGroup.cpp
index 5e227c48b05..73667ee9e95 100644
--- a/mozilla/embedding/components/commandhandler/src/nsCommandGroup.cpp
+++ b/mozilla/embedding/components/commandhandler/src/nsCommandGroup.cpp
@@ -137,8 +137,8 @@ nsGroupsEnumerator::GetNext(nsISupports **_retval)
 PRBool
 nsGroupsEnumerator::HashEnum(nsHashKey *aKey, void *aData, void* aClosure)
 {
-  nsGroupsEnumerator*   groupsEnum = NS_REINTERPRET_CAST(nsGroupsEnumerator *, aClosure);
-  nsCStringKey*         stringKey = NS_STATIC_CAST(nsCStringKey*, aKey);
+  nsGroupsEnumerator*   groupsEnum = reinterpret_cast<nsGroupsEnumerator *>(aClosure);
+  nsCStringKey*         stringKey = static_cast<nsCStringKey*>(aKey);
   
   groupsEnum->mGroupNames[groupsEnum->mIndex] = (char*)stringKey->GetString();
   groupsEnum->mIndex ++;
diff --git a/mozilla/embedding/components/commandhandler/src/nsCommandManager.cpp b/mozilla/embedding/components/commandhandler/src/nsCommandManager.cpp
index 368f2107186..3f6d38d444b 100644
--- a/mozilla/embedding/components/commandhandler/src/nsCommandManager.cpp
+++ b/mozilla/embedding/components/commandhandler/src/nsCommandManager.cpp
@@ -75,7 +75,7 @@ TraverseCommandObservers(const char* aKey, nsCOMArray<nsIObserver>* aObservers,
                          void* aClosure)
 {
   nsCycleCollectionTraversalCallback *cb = 
-    NS_STATIC_CAST(nsCycleCollectionTraversalCallback*, aClosure);
+    static_cast<nsCycleCollectionTraversalCallback*>(aClosure);
 
   PRInt32 i, numItems = aObservers->Count();
   for (i = 0; i < numItems; ++i) {
diff --git a/mozilla/embedding/components/commandhandler/src/nsCommandParams.cpp b/mozilla/embedding/components/commandhandler/src/nsCommandParams.cpp
index 252e729e430..7ee1a278cf5 100644
--- a/mozilla/embedding/components/commandhandler/src/nsCommandParams.cpp
+++ b/mozilla/embedding/components/commandhandler/src/nsCommandParams.cpp
@@ -293,7 +293,7 @@ nsCommandParams::GetNamedEntry(const char * name)
 nsCommandParams::HashEntry*
 nsCommandParams::GetIndexedEntry(PRInt32 index)
 {
-  HashEntry*  entry = NS_REINTERPRET_CAST(HashEntry*, mValuesHash.entryStore);
+  HashEntry*  entry = reinterpret_cast<HashEntry*>(mValuesHash.entryStore);
   HashEntry*  limit = entry + PL_DHASH_TABLE_SIZE(&mValuesHash);
   PRUint32    entryCount = 0;
   
@@ -315,7 +315,7 @@ nsCommandParams::GetIndexedEntry(PRInt32 index)
 PRUint32
 nsCommandParams::GetNumEntries()
 {
-  HashEntry*  entry = NS_REINTERPRET_CAST(HashEntry*, mValuesHash.entryStore);
+  HashEntry*  entry = reinterpret_cast<HashEntry*>(mValuesHash.entryStore);
   HashEntry*  limit = entry + PL_DHASH_TABLE_SIZE(&mValuesHash);
   PRUint32    entryCount = 0;
   
@@ -364,7 +364,7 @@ nsCommandParams::HashMatchEntry(PLDHashTable *table,
                                 const PLDHashEntryHdr *entry, const void *key)
 {
   const char*   keyString = (const char*)key;
-  const HashEntry*   thisEntry = NS_STATIC_CAST(const HashEntry*, entry);
+  const HashEntry*   thisEntry = static_cast<const HashEntry*>(entry);
   
   return thisEntry->mEntryName.Equals(keyString);
 }
@@ -373,8 +373,8 @@ void
 nsCommandParams::HashMoveEntry(PLDHashTable *table, const PLDHashEntryHdr *from,
                                 PLDHashEntryHdr *to)
 {
-  const HashEntry*   fromEntry  = NS_STATIC_CAST(const HashEntry*, from);
-  HashEntry*         toEntry    = NS_STATIC_CAST(HashEntry*, to);
+  const HashEntry*   fromEntry  = static_cast<const HashEntry*>(from);
+  HashEntry*         toEntry    = static_cast<HashEntry*>(to);
   
   *toEntry = *fromEntry;
   // we leave from dirty, but that's OK
@@ -383,7 +383,7 @@ nsCommandParams::HashMoveEntry(PLDHashTable *table, const PLDHashEntryHdr *from,
 void
 nsCommandParams::HashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry)
 {
-  HashEntry*    thisEntry = NS_STATIC_CAST(HashEntry*, entry);
+  HashEntry*    thisEntry = static_cast<HashEntry*>(entry);
   thisEntry->~HashEntry();      // call dtor explicitly
   memset(thisEntry, 0, sizeof(HashEntry));    // and clear out
 }
diff --git a/mozilla/embedding/components/commandhandler/src/nsControllerCommandTable.cpp b/mozilla/embedding/components/commandhandler/src/nsControllerCommandTable.cpp
index ed12ee1e5be..620d5ca8fce 100644
--- a/mozilla/embedding/components/commandhandler/src/nsControllerCommandTable.cpp
+++ b/mozilla/embedding/components/commandhandler/src/nsControllerCommandTable.cpp
@@ -110,7 +110,7 @@ nsControllerCommandTable::FindCommandHandler(const char * aCommandName, nsIContr
   if (!foundCommand) return NS_ERROR_FAILURE;
   
   // no need to addref since the .Get does it for us
-  *outCommand = NS_REINTERPRET_CAST(nsIControllerCommand*, foundCommand);
+  *outCommand = reinterpret_cast<nsIControllerCommand*>(foundCommand);
   return NS_OK;
 }
 
diff --git a/mozilla/embedding/components/printingui/src/mac/nsPrintProgress.cpp b/mozilla/embedding/components/printingui/src/mac/nsPrintProgress.cpp
index 6d7e9a6ff9f..f5ea31b18c2 100644
--- a/mozilla/embedding/components/printingui/src/mac/nsPrintProgress.cpp
+++ b/mozilla/embedding/components/printingui/src/mac/nsPrintProgress.cpp
@@ -97,7 +97,7 @@ NS_IMETHODIMP nsPrintProgress::OpenProgressDialog(nsIDOMWindowInternal *parent,
       do_CreateInstance(NS_SUPPORTS_INTERFACE_POINTER_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
     
-    ifptr->SetData(NS_STATIC_CAST(nsIPrintProgress*, this));
+    ifptr->SetData(static_cast<nsIPrintProgress*>(this));
     ifptr->SetDataIID(&NS_GET_IID(nsIPrintProgress));
 
     array->AppendElement(ifptr);
diff --git a/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp b/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp
index 47641d8003d..22b060e04e4 100644
--- a/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp
+++ b/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp
@@ -448,7 +448,7 @@ nsPrintingPromptService::ShowProgress(nsIDOMWindow*            parent,
         }
     }
 
-    *webProgressListener = NS_STATIC_CAST(nsIWebProgressListener*, this);
+    *webProgressListener = static_cast<nsIWebProgressListener*>(this);
     NS_ADDREF(*webProgressListener);
 
     return rv;
diff --git a/mozilla/embedding/components/printingui/src/os2/nsPrintProgress.cpp b/mozilla/embedding/components/printingui/src/os2/nsPrintProgress.cpp
index 8767bcaa4d0..cbb4075f0cf 100644
--- a/mozilla/embedding/components/printingui/src/os2/nsPrintProgress.cpp
+++ b/mozilla/embedding/components/printingui/src/os2/nsPrintProgress.cpp
@@ -97,7 +97,7 @@ NS_IMETHODIMP nsPrintProgress::OpenProgressDialog(nsIDOMWindowInternal *parent,
       do_CreateInstance(NS_SUPPORTS_INTERFACE_POINTER_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
     
-    ifptr->SetData(NS_STATIC_CAST(nsIPrintProgress*, this));
+    ifptr->SetData(static_cast<nsIPrintProgress*>(this));
     ifptr->SetDataIID(&NS_GET_IID(nsIPrintProgress));
 
     array->AppendElement(ifptr);
diff --git a/mozilla/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp b/mozilla/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp
index 30edcfdf563..6a681ebb131 100644
--- a/mozilla/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp
+++ b/mozilla/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp
@@ -170,7 +170,7 @@ nsPrintingPromptService::ShowProgress(nsIDOMWindow*           parent,
         }
     }
 
-    *webProgressListener = NS_STATIC_CAST(nsIWebProgressListener*, this);
+    *webProgressListener = static_cast<nsIWebProgressListener*>(this);
     NS_ADDREF(*webProgressListener);
 
     return rv;
diff --git a/mozilla/embedding/components/printingui/src/unixshared/nsPrintProgress.cpp b/mozilla/embedding/components/printingui/src/unixshared/nsPrintProgress.cpp
index 2f6e67e9817..e6a5f90a044 100644
--- a/mozilla/embedding/components/printingui/src/unixshared/nsPrintProgress.cpp
+++ b/mozilla/embedding/components/printingui/src/unixshared/nsPrintProgress.cpp
@@ -98,7 +98,7 @@ NS_IMETHODIMP nsPrintProgress::OpenProgressDialog(nsIDOMWindowInternal *parent,
       do_CreateInstance(NS_SUPPORTS_INTERFACE_POINTER_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
     
-    ifptr->SetData(NS_STATIC_CAST(nsIPrintProgress*, this));
+    ifptr->SetData(static_cast<nsIPrintProgress*>(this));
     ifptr->SetDataIID(&NS_GET_IID(nsIPrintProgress));
 
     array->AppendElement(ifptr);
diff --git a/mozilla/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp b/mozilla/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp
index 0f5abf7e080..a897df008ca 100644
--- a/mozilla/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp
+++ b/mozilla/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp
@@ -165,7 +165,7 @@ nsPrintingPromptService::ShowProgress(nsIDOMWindow*            parent,
         }
     }
 
-    *webProgressListener = NS_STATIC_CAST(nsIWebProgressListener*, this);
+    *webProgressListener = static_cast<nsIWebProgressListener*>(this);
     NS_ADDREF(*webProgressListener);
 
     return rv;
diff --git a/mozilla/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp b/mozilla/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp
index 390f0183496..ee178ce2f66 100644
--- a/mozilla/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp
+++ b/mozilla/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp
@@ -761,7 +761,7 @@ static HGLOBAL CreateGlobalDevModeAndInit(LPCTSTR aPrintName, nsIPrintSettings*
   nsresult rv = NS_ERROR_FAILURE;
   HANDLE hPrinter = NULL;
   // const cast kludge for silly Win32 api's
-  LPTSTR printName = NS_CONST_CAST(char*, aPrintName);
+  LPTSTR printName = const_cast<char*>(aPrintName);
   BOOL status = ::OpenPrinter(printName, &hPrinter, NULL);
   if (status) {
 
@@ -885,7 +885,7 @@ ShowNativePrintDialog(HWND              aHWnd,
     HANDLE hPrinter = NULL;
     nsCAutoString printerNameNative;
     NS_CopyUnicodeToNative(nsDependentString(printerName), printerNameNative);
-    LPTSTR tempPrinterName = NS_CONST_CAST(char*, printerNameNative.get());
+    LPTSTR tempPrinterName = const_cast<char*>(printerNameNative.get());
     if(!::OpenPrinter(tempPrinterName, &hPrinter, NULL)) {
       // If the last used printer is not found, we should use default printer.
       printerName = GetDefaultPrinterNameFromGlobalPrinters();
diff --git a/mozilla/embedding/components/printingui/src/win/nsPrintProgress.cpp b/mozilla/embedding/components/printingui/src/win/nsPrintProgress.cpp
index 8c86ff155f4..ce030304e6a 100644
--- a/mozilla/embedding/components/printingui/src/win/nsPrintProgress.cpp
+++ b/mozilla/embedding/components/printingui/src/win/nsPrintProgress.cpp
@@ -127,7 +127,7 @@ NS_IMETHODIMP nsPrintProgress::OpenProgressDialog(nsIDOMWindowInternal *parent,
       do_CreateInstance(NS_SUPPORTS_INTERFACE_POINTER_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
     
-    ifptr->SetData(NS_STATIC_CAST(nsIPrintProgress*, this));
+    ifptr->SetData(static_cast<nsIPrintProgress*>(this));
     ifptr->SetDataIID(&NS_GET_IID(nsIPrintProgress));
 
     array->AppendElement(ifptr);
diff --git a/mozilla/embedding/components/printingui/src/win/nsPrintingPromptService.cpp b/mozilla/embedding/components/printingui/src/win/nsPrintingPromptService.cpp
index 3e58df96a2e..d6c08705419 100644
--- a/mozilla/embedding/components/printingui/src/win/nsPrintingPromptService.cpp
+++ b/mozilla/embedding/components/printingui/src/win/nsPrintingPromptService.cpp
@@ -246,7 +246,7 @@ nsPrintingPromptService::ShowProgress(nsIDOMWindow*            parent,
         }
     }
 
-    *webProgressListener = NS_STATIC_CAST(nsIWebProgressListener*, this);
+    *webProgressListener = static_cast<nsIWebProgressListener*>(this);
     NS_ADDREF(*webProgressListener);
 
     return rv;
diff --git a/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp b/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
index e47e034102d..fcbe9054898 100644
--- a/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
+++ b/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
@@ -1231,7 +1231,7 @@ nsresult nsWebBrowserPersist::SaveURIInternal(
     // Open a channel to the URI
     nsCOMPtr<nsIChannel> inputChannel;
     rv = NS_NewChannel(getter_AddRefs(inputChannel), aURI,
-            nsnull, nsnull, NS_STATIC_CAST(nsIInterfaceRequestor *, this),
+            nsnull, nsnull, static_cast<nsIInterfaceRequestor *>(this),
             loadFlags);
     
     if (NS_FAILED(rv) || inputChannel == nsnull)
@@ -3571,7 +3571,7 @@ nsWebBrowserPersist::CreateChannelFromURI(nsIURI *aURI, nsIChannel **aChannel)
     NS_ENSURE_SUCCESS(rv, rv);
     NS_ENSURE_ARG_POINTER(*aChannel);
 
-    rv = (*aChannel)->SetNotificationCallbacks(NS_STATIC_CAST(nsIInterfaceRequestor *, this));
+    rv = (*aChannel)->SetNotificationCallbacks(static_cast<nsIInterfaceRequestor *>(this));
     NS_ENSURE_SUCCESS(rv, rv);
     return NS_OK;
 } 
diff --git a/mozilla/embedding/components/windowwatcher/src/nsPrompt.cpp b/mozilla/embedding/components/windowwatcher/src/nsPrompt.cpp
index 442614ab0e8..ee671221738 100644
--- a/mozilla/embedding/components/windowwatcher/src/nsPrompt.cpp
+++ b/mozilla/embedding/components/windowwatcher/src/nsPrompt.cpp
@@ -126,7 +126,7 @@ NS_NewAuthPrompter2(nsIAuthPrompt2 **result, nsIDOMWindow *aParent)
     // We just delegate everything to the pw mgr.
     return factory->GetPrompt(aParent,
                               NS_GET_IID(nsIAuthPrompt2),
-                              NS_REINTERPRET_CAST(void**, result));
+                              reinterpret_cast<void**>(result));
   }
 
   nsresult rv;
diff --git a/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp b/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
index a0e38af699a..3fe881431b2 100644
--- a/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
+++ b/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
@@ -967,13 +967,13 @@ nsWindowWatcher::GetPrompt(nsIDOMWindow *aParent, const nsIID& aIID,
                            void **_retval)
 {
   if (aIID.Equals(NS_GET_IID(nsIPrompt)))
-    return NS_NewPrompter(NS_REINTERPRET_CAST(nsIPrompt**, _retval), aParent);
+    return NS_NewPrompter(reinterpret_cast<nsIPrompt**>(_retval), aParent);
   if (aIID.Equals(NS_GET_IID(nsIAuthPrompt)))
-    return NS_NewAuthPrompter(NS_REINTERPRET_CAST(nsIAuthPrompt**, _retval),
+    return NS_NewAuthPrompter(reinterpret_cast<nsIAuthPrompt**>(_retval),
                               aParent);
   if (aIID.Equals(NS_GET_IID(nsIAuthPrompt2))) {
-    nsresult rv = NS_NewAuthPrompter2(NS_REINTERPRET_CAST(nsIAuthPrompt2**,
-                                                          _retval),
+    nsresult rv = NS_NewAuthPrompter2(reinterpret_cast<nsIAuthPrompt2**>
+                                                      (_retval),
                                       aParent);
     if (rv == NS_NOINTERFACE) {
       // Return an wrapped nsIAuthPrompt (if we can)
@@ -981,7 +981,7 @@ nsWindowWatcher::GetPrompt(nsIDOMWindow *aParent, const nsIID& aIID,
       rv = NS_NewAuthPrompter(getter_AddRefs(prompt), aParent);
       if (NS_SUCCEEDED(rv)) {
         NS_WrapAuthPrompt(prompt,
-                          NS_REINTERPRET_CAST(nsIAuthPrompt2**, _retval));
+                          reinterpret_cast<nsIAuthPrompt2**>(_retval));
         if (!*_retval)
           rv = NS_ERROR_NOT_AVAILABLE;
       }
@@ -1208,7 +1208,7 @@ nsWindowWatcher::GetChromeForWindow(nsIDOMWindow *aWindow, nsIWebBrowserChrome *
     if (info->mChromeWeak != nsnull) {
       return info->mChromeWeak->
                             QueryReferent(NS_GET_IID(nsIWebBrowserChrome),
-                                          NS_REINTERPRET_CAST(void**, _retval));
+                                          reinterpret_cast<void**>(_retval));
     }
     *_retval = info->mChrome;
     NS_IF_ADDREF(*_retval);
diff --git a/mozilla/embedding/lite/nsEmbedGlobalHistory.cpp b/mozilla/embedding/lite/nsEmbedGlobalHistory.cpp
index 1a61742e58f..476e7297ae2 100644
--- a/mozilla/embedding/lite/nsEmbedGlobalHistory.cpp
+++ b/mozilla/embedding/lite/nsEmbedGlobalHistory.cpp
@@ -216,7 +216,7 @@ NS_IMETHODIMP nsEmbedGlobalHistory::AddPage(const char *aURL)
   NS_ENSURE_SUCCESS(rv, rv);
   
   nsCStringKey asKey(aURL);
-  HistoryEntry *entry = NS_STATIC_CAST(HistoryEntry *, mURLTable->Get(&asKey));
+  HistoryEntry *entry = static_cast<HistoryEntry *>(mURLTable->Get(&asKey));
   if (!entry) {
     
     if (++mEntriesAddedSinceFlush >= kNewEntriesBetweenFlush)
@@ -371,10 +371,10 @@ PRBool nsEmbedGlobalHistory::EntryHasExpired(HistoryEntry *entry)
 
 PRIntn PR_CALLBACK nsEmbedGlobalHistory::enumRemoveEntryIfExpired(nsHashKey *aKey, void *aData, void* closure)
 {
-  HistoryEntry *entry = NS_STATIC_CAST(HistoryEntry*, aData);
+  HistoryEntry *entry = static_cast<HistoryEntry*>(aData);
   if (!entry)
     return PR_FALSE;
-  nsEmbedGlobalHistory *history = NS_STATIC_CAST(nsEmbedGlobalHistory*, closure);
+  nsEmbedGlobalHistory *history = static_cast<nsEmbedGlobalHistory*>(closure);
   if (!history)
     return kHashEnumerateStop;
       
@@ -507,13 +507,13 @@ nsresult writeEntry(FILE *outStm, nsCStringKey *url, HistoryEntry *entry)
 
 PRIntn PR_CALLBACK enumWriteEntry(nsHashKey *aKey, void *aData, void* closure)
 {
-  FILE *outStm = NS_STATIC_CAST(FILE*, closure);
+  FILE *outStm = static_cast<FILE*>(closure);
   if (!outStm)
     return kHashEnumerateStop;
-  nsCStringKey *stringKey = NS_STATIC_CAST(nsCStringKey*, aKey);
+  nsCStringKey *stringKey = static_cast<nsCStringKey*>(aKey);
   if (!stringKey)
     return kHashEnumerateStop;
-  HistoryEntry *entry = NS_STATIC_CAST(HistoryEntry*, aData);
+  HistoryEntry *entry = static_cast<HistoryEntry*>(aData);
   if (!entry)
     return kHashEnumerateStop;
 
@@ -524,13 +524,13 @@ PRIntn PR_CALLBACK enumWriteEntry(nsHashKey *aKey, void *aData, void* closure)
 
 PRIntn PR_CALLBACK enumWriteEntryIfUnwritten(nsHashKey *aKey, void *aData, void* closure)
 {
-  FILE *outStm = NS_STATIC_CAST(FILE*, closure);
+  FILE *outStm = static_cast<FILE*>(closure);
   if (!outStm)
     return kHashEnumerateStop;
-  nsCStringKey *stringKey = NS_STATIC_CAST(nsCStringKey*, aKey);
+  nsCStringKey *stringKey = static_cast<nsCStringKey*>(aKey);
   if (!stringKey)
     return kHashEnumerateStop;
-  HistoryEntry *entry = NS_STATIC_CAST(HistoryEntry*, aData);
+  HistoryEntry *entry = static_cast<HistoryEntry*>(aData);
   if (!entry)
     return kHashEnumerateStop;
 
@@ -543,7 +543,7 @@ PRIntn PR_CALLBACK enumWriteEntryIfUnwritten(nsHashKey *aKey, void *aData, void*
 
 PRIntn PR_CALLBACK enumDeleteEntry(nsHashKey *aKey, void *aData, void* closure)
 {
-  HistoryEntry *entry = NS_STATIC_CAST(HistoryEntry*, aData);
+  HistoryEntry *entry = static_cast<HistoryEntry*>(aData);
   delete entry;
   
   return kHashEnumerateNext;
diff --git a/mozilla/embedding/qa/mozembed/src/mozEmbed.cpp b/mozilla/embedding/qa/mozembed/src/mozEmbed.cpp
index 56f4d7751ac..3a616d061dc 100644
--- a/mozilla/embedding/qa/mozembed/src/mozEmbed.cpp
+++ b/mozilla/embedding/qa/mozembed/src/mozEmbed.cpp
@@ -319,7 +319,7 @@ nsresult InitializeWindowCreator()
     WindowCreator *creatorCallback = new WindowCreator();
     if (creatorCallback)
     {
-        nsCOMPtr<nsIWindowCreator> windowCreator(NS_STATIC_CAST(nsIWindowCreator *, creatorCallback));
+        nsCOMPtr<nsIWindowCreator> windowCreator(static_cast<nsIWindowCreator *>(creatorCallback));
         if (windowCreator)
         {
             nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService("@mozilla.org/embedcomp/window-watcher;1"));
diff --git a/mozilla/embedding/qa/testembed/BrowserImpl.cpp b/mozilla/embedding/qa/testembed/BrowserImpl.cpp
index 25048538d28..2b1954775ba 100644
--- a/mozilla/embedding/qa/testembed/BrowserImpl.cpp
+++ b/mozilla/embedding/qa/testembed/BrowserImpl.cpp
@@ -420,7 +420,7 @@ NS_IMETHODIMP CBrowserImpl::GetSiteWindow(void** aSiteWindow)
   *aSiteWindow = 0;
   if (m_pBrowserFrameGlue) {
     HWND w = m_pBrowserFrameGlue->GetBrowserFrameNativeWnd();
-    *aSiteWindow = NS_REINTERPRET_CAST(void *, w);
+    *aSiteWindow = reinterpret_cast<void *>(w);
   }
   return NS_OK;
 }
diff --git a/mozilla/embedding/qa/testembed/BrowserView.cpp b/mozilla/embedding/qa/testembed/BrowserView.cpp
index 77dd4eac3e4..7167d52609e 100644
--- a/mozilla/embedding/qa/testembed/BrowserView.cpp
+++ b/mozilla/embedding/qa/testembed/BrowserView.cpp
@@ -220,7 +220,7 @@ HRESULT CBrowserView::CreateBrowser()
 	mpBrowserImpl->Init(mpBrowserFrameGlue, mWebBrowser);
 	mpBrowserImpl->AddRef();
 
-    mWebBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome*, mpBrowserImpl));
+    mWebBrowser->SetContainerWindow(static_cast<nsIWebBrowserChrome*>(mpBrowserImpl));
 
 	rv = NS_OK;
     nsCOMPtr<nsIDocShellTreeItem> dsti = do_QueryInterface(mWebBrowser, &rv);
@@ -257,7 +257,7 @@ HRESULT CBrowserView::CreateBrowser()
 	// These callbacks will be used to update the status/progress bars
 
 /*		// from WinEmbed.cpp
-	nsCOMPtr<nsIWebProgressListener> listener(NS_STATIC_CAST(nsIWebProgressListener*, this));
+	nsCOMPtr<nsIWebProgressListener> listener(static_cast<nsIWebProgressListener*>(this));
     nsCOMPtr<nsIWeakReference> thisListener(do_GetWeakReference(listener));
     (void)mWebBrowser->AddWebBrowserListener(thisListener, 
        NS_GET_IID(nsIWebProgressListener));
@@ -289,7 +289,7 @@ HRESULT CBrowserView::DestroyBrowser()
 	}
 /*
 	nsWeakPtr weakling(
-    do_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, mpBrowserImpl)));
+    do_GetWeakReference(static_cast<nsIWebProgressListener*>(mpBrowserImpl)));
 	nsresult rv;
     rv = mWebBrowser->RemoveWebBrowserListener(weakling, NS_GET_IID(nsIWebProgressListener));
 	if (NS_FAILED(rv))
diff --git a/mozilla/embedding/qa/testembed/PrintProgressDialog.cpp b/mozilla/embedding/qa/testembed/PrintProgressDialog.cpp
index 3808356c993..bcc60910eed 100644
--- a/mozilla/embedding/qa/testembed/PrintProgressDialog.cpp
+++ b/mozilla/embedding/qa/testembed/PrintProgressDialog.cpp
@@ -194,7 +194,7 @@ int CPrintProgressDialog::DoModal( )
     m_PrintListener = new CDlgPrintListener(this); // constructor addrefs
     if (m_PrintListener) {
       // doModal will be set to false if the print job was cancelled
-      nsIWebProgressListener * wpl = NS_STATIC_CAST(nsIWebProgressListener*, m_PrintListener);
+      nsIWebProgressListener * wpl = static_cast<nsIWebProgressListener*>(m_PrintListener);
       doModal = NS_SUCCEEDED(print->Print(m_PrintSettings, wpl)) == PR_TRUE;
     }
   }
diff --git a/mozilla/embedding/qa/testembed/TestEmbed.cpp b/mozilla/embedding/qa/testembed/TestEmbed.cpp
index b289a22e5eb..0829f98d4ad 100644
--- a/mozilla/embedding/qa/testembed/TestEmbed.cpp
+++ b/mozilla/embedding/qa/testembed/TestEmbed.cpp
@@ -577,7 +577,7 @@ nsresult CTestEmbedApp::InitializePrefs()
 nsresult CTestEmbedApp::InitializeWindowCreator()
 {
   // give an nsIWindowCreator to the WindowWatcher service
-  nsCOMPtr<nsIWindowCreator> windowCreator(NS_STATIC_CAST(nsIWindowCreator *, this));
+  nsCOMPtr<nsIWindowCreator> windowCreator(static_cast<nsIWindowCreator *>(this));
   if (windowCreator) {
     nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
     if (wwatch) {
@@ -661,7 +661,7 @@ NS_IMETHODIMP CTestEmbedApp::CreateChromeWindow(nsIWebBrowserChrome *parent,
 
   CBrowserFrame *pBrowserFrame = CreateNewBrowserFrame(chromeFlags);
   if(pBrowserFrame) {
-    *_retval = NS_STATIC_CAST(nsIWebBrowserChrome *, pBrowserFrame->GetBrowserImpl());
+    *_retval = static_cast<nsIWebBrowserChrome *>(pBrowserFrame->GetBrowserImpl());
     NS_ADDREF(*_retval);
   }
   return NS_OK;
diff --git a/mozilla/embedding/qa/testembed/Tests.cpp b/mozilla/embedding/qa/testembed/Tests.cpp
index 231fa2006fe..c2b985c96ea 100644
--- a/mozilla/embedding/qa/testembed/Tests.cpp
+++ b/mozilla/embedding/qa/testembed/Tests.cpp
@@ -488,7 +488,7 @@ void CTests::OnTestsCreateprofile()
 void CTests::OnTestsAddTooltipListener()
 {
     nsWeakPtr weakling(
-        do_GetWeakReference(NS_STATIC_CAST(nsITooltipListener*, qaBrowserImpl)));
+        do_GetWeakReference(static_cast<nsITooltipListener*>(qaBrowserImpl)));
  
 	rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsITooltipListener));
 	RvTestResult(rv, "AddWebBrowserListener(). Add Tooltip Listener test", 2);
@@ -499,7 +499,7 @@ void CTests::OnTestsAddTooltipListener()
 void CTests::OnTestsAddWebProgListener()
 {
     nsWeakPtr weakling(
-        do_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, qaBrowserImpl)));
+        do_GetWeakReference(static_cast<nsIWebProgressListener*>(qaBrowserImpl)));
  
 	rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIWebProgressListener));
 	RvTestResult(rv, "AddWebBrowserListener(). Add Web Prog Lstnr test", 2);
@@ -512,7 +512,7 @@ void CTests::OnTestsAddHistoryListener()
    // addSHistoryListener test
 
 	nsWeakPtr weakling(
-        do_GetWeakReference(NS_STATIC_CAST(nsISHistoryListener*, qaBrowserImpl)));
+        do_GetWeakReference(static_cast<nsISHistoryListener*>(qaBrowserImpl)));
 
 	rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsISHistoryListener));
 	RvTestResult(rv, "AddWebBrowserListener(). Add History Lstnr test", 2);
@@ -525,7 +525,7 @@ void CTests::OnTestsRemovehistorylistener()
   // RemoveSHistoryListener test
 
 	nsWeakPtr weakling(
-        do_GetWeakReference(NS_STATIC_CAST(nsISHistoryListener*, qaBrowserImpl)));
+        do_GetWeakReference(static_cast<nsISHistoryListener*>(qaBrowserImpl)));
 
 	rv = qaWebBrowser->RemoveWebBrowserListener(weakling, NS_GET_IID(nsISHistoryListener));
 	RvTestResult(rv, "RemoveWebBrowserListener(). Remove History Lstnr test", 2);
@@ -536,7 +536,7 @@ void CTests::OnTestsRemovehistorylistener()
 void CTests::OnTestsAddUriContentListenerByWebBrowser()
 {
     nsWeakPtr weakling(
-        do_GetWeakReference(NS_STATIC_CAST(nsIURIContentListener*, qaBrowserImpl)));
+        do_GetWeakReference(static_cast<nsIURIContentListener*>(qaBrowserImpl)));
 
     rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIURIContentListener));
 	RvTestResult(rv, "AddWebBrowserListener(). add nsIURIContentListener test", 2);
@@ -554,7 +554,7 @@ void CTests::OnTestsAddUriContentListenerByUriLoader()
 		return;
 	}
 
-	nsCOMPtr<nsIURIContentListener> cntListener(NS_STATIC_CAST(nsIURIContentListener*, qaBrowserImpl));
+	nsCOMPtr<nsIURIContentListener> cntListener(static_cast<nsIURIContentListener*>(qaBrowserImpl));
 
 	if (!cntListener) {
 		QAOutput("Didn't get urIContentListener object. test failed", 2);
@@ -882,7 +882,7 @@ void CTests::OnVerifybugs70228()
 void CTests::OnVerifybugs90195()
 {
     nsWeakPtr weakling(
-        do_GetWeakReference(NS_STATIC_CAST(nsITooltipListener*, qaBrowserImpl)));
+        do_GetWeakReference(static_cast<nsITooltipListener*>(qaBrowserImpl)));
 
     rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsITooltipListener));
 	RvTestResult(rv, "AddWebBrowserListener(). Add Tool Tip Lstnr test", 2);
diff --git a/mozilla/embedding/qa/testembed/nsIObserServ.cpp b/mozilla/embedding/qa/testembed/nsIObserServ.cpp
index 8a1123f0359..e64be6869a8 100644
--- a/mozilla/embedding/qa/testembed/nsIObserServ.cpp
+++ b/mozilla/embedding/qa/testembed/nsIObserServ.cpp
@@ -238,7 +238,7 @@ void CnsIObserServ::EnumerateObserversTest(int displayType)
 			RvTestResultDlg(rv, "nsIObserver() test");
 			
 			// compare 'this' with observer object
-			if( this == NS_REINTERPRET_CAST(CnsIObserServ*,NS_REINTERPRET_CAST(void*, observer.get())))
+			if( this == reinterpret_cast<CnsIObserServ*>(reinterpret_cast<void*>(observer.get())))
 			{
 				QAOutput("observers match. Test passes.");
 				bLoop = PR_FALSE;
diff --git a/mozilla/embedding/qa/testembed/nsIWebBrow.cpp b/mozilla/embedding/qa/testembed/nsIWebBrow.cpp
index 96ef3b1c844..40995ed7483 100644
--- a/mozilla/embedding/qa/testembed/nsIWebBrow.cpp
+++ b/mozilla/embedding/qa/testembed/nsIWebBrow.cpp
@@ -73,7 +73,7 @@ void CNsIWebBrowser::WBAddListener(PRInt16 displayMode)
 {
 	// AddWebBrowserListener
 	nsWeakPtr weakling(
-        do_GetWeakReference(NS_STATIC_CAST(nsIContextMenuListener*, qaBrowserImpl)));
+        do_GetWeakReference(static_cast<nsIContextMenuListener*>(qaBrowserImpl)));
     rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIContextMenuListener));
 	RvTestResult(rv, "AddWebBrowserListener(). nsIContextMenuListener test", displayMode);
 	RvTestResultDlg(rv, "AddWebBrowserListener(). nsIContextMenuListener test", true);
@@ -83,7 +83,7 @@ void CNsIWebBrowser::WBRemoveListener(PRInt16 displayMode)
 {
 	// RemoveWebBrowserListener
 	nsWeakPtr weakling(
-        do_GetWeakReference(NS_STATIC_CAST(nsIContextMenuListener*, qaBrowserImpl)));
+        do_GetWeakReference(static_cast<nsIContextMenuListener*>(qaBrowserImpl)));
 
 	rv = qaWebBrowser->RemoveWebBrowserListener(weakling, NS_GET_IID(nsIContextMenuListener));
 	RvTestResult(rv, "RemoveWebBrowserListener(). nsIContextMenuListener test", displayMode);
@@ -110,7 +110,7 @@ void CNsIWebBrowser::WBSetContainerWindow(PRInt16 displayMode)
 {
 	// SetContainerWindow
 
-	rv = qaWebBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome*, qaBrowserImpl));
+	rv = qaWebBrowser->SetContainerWindow(static_cast<nsIWebBrowserChrome*>(qaBrowserImpl));
 	RvTestResult(rv, "nsIWebBrowser::SetContainerWindow() test", displayMode);
 	RvTestResultDlg(rv, "nsIWebBrowser::SetContainerWindow() test");
 }
@@ -136,7 +136,7 @@ void CNsIWebBrowser::WBSetURIContentListener(PRInt16 displayMode)
 {
 	// SetParentURIContentListener
 
-	rv = qaWebBrowser->SetParentURIContentListener(NS_STATIC_CAST(nsIURIContentListener*, qaBrowserImpl));
+	rv = qaWebBrowser->SetParentURIContentListener(static_cast<nsIURIContentListener*>(qaBrowserImpl));
 	RvTestResult(rv, "nsIWebBrowser::SetParentURIContentListener() test", displayMode);
 	RvTestResultDlg(rv, "nsIWebBrowser::SetParentURIContentListener() test");
 }
diff --git a/mozilla/embedding/qa/testembed/nsIWebProg.cpp b/mozilla/embedding/qa/testembed/nsIWebProg.cpp
index 68491ab6fa6..1b1559bfa0c 100644
--- a/mozilla/embedding/qa/testembed/nsIWebProg.cpp
+++ b/mozilla/embedding/qa/testembed/nsIWebProg.cpp
@@ -98,7 +98,7 @@ void CnsiWebProg::AddWebProgLstnr(PRUint32 theFlag, PRInt16 displayMode)
 
 			// addWebProgListener
 	qaWebProgress = GetWebProgObject();
-	nsCOMPtr<nsIWebProgressListener> listener(NS_STATIC_CAST(nsIWebProgressListener*, qaBrowserImpl));
+	nsCOMPtr<nsIWebProgressListener> listener(static_cast<nsIWebProgressListener*>(qaBrowserImpl));
 	rv = qaWebProgress->AddProgressListener(listener, theFlag);
 //	StoreWebProgFlag(theFlag);
 	RvTestResult(rv, "nsIWebProgress::AddProgressListener() test", displayMode);
@@ -110,7 +110,7 @@ void CnsiWebProg::RemoveWebProgLstnr(PRInt16 displayMode)
 {
 		// removeWebProgListener
 	qaWebProgress = GetWebProgObject();
-	nsCOMPtr<nsIWebProgressListener> listener(NS_STATIC_CAST(nsIWebProgressListener*, qaBrowserImpl));
+	nsCOMPtr<nsIWebProgressListener> listener(static_cast<nsIWebProgressListener*>(qaBrowserImpl));
 	rv = qaWebProgress->RemoveProgressListener(listener);
 	RvTestResult(rv, "nsIWebProgress::RemoveProgressListener() test", displayMode);
 	RvTestResultDlg(rv, "nsIWebProgress::RemoveProgressListener() test");
diff --git a/mozilla/embedding/qa/testembed/nsichanneltests.cpp b/mozilla/embedding/qa/testembed/nsichanneltests.cpp
index 9897375f704..fdc79e5267b 100644
--- a/mozilla/embedding/qa/testembed/nsichanneltests.cpp
+++ b/mozilla/embedding/qa/testembed/nsichanneltests.cpp
@@ -353,7 +353,7 @@ void CnsIChannelTests::OpenTest(nsIChannel *theChannel, PRInt16 displayMode)
 
 void CnsIChannelTests::AsyncOpenTest(nsIChannel *theChannel, PRInt16 displayMode)
 {
-	nsCOMPtr<nsIStreamListener> listener(NS_STATIC_CAST(nsIStreamListener*, qaBrowserImpl));
+	nsCOMPtr<nsIStreamListener> listener(static_cast<nsIStreamListener*>(qaBrowserImpl));
 	nsCOMPtr<nsIWeakReference> thisListener(do_GetWeakReference(listener));
 	qaWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsIStreamListener));
 	if (!theChannel)
diff --git a/mozilla/embedding/qa/testembed/nsirequest.cpp b/mozilla/embedding/qa/testembed/nsirequest.cpp
index 3496dd06db2..a951cf195ef 100644
--- a/mozilla/embedding/qa/testembed/nsirequest.cpp
+++ b/mozilla/embedding/qa/testembed/nsirequest.cpp
@@ -252,7 +252,7 @@ nsIChannel * CNsIRequest::GetTheChannel(int i, nsILoadGroup *theLoadGroup)
 	   RvTestResultDlg(rv, "NS_NewChannel");
 	}
 
-	nsCOMPtr<nsIStreamListener> listener(NS_STATIC_CAST(nsIStreamListener*, qaBrowserImpl));
+	nsCOMPtr<nsIStreamListener> listener(static_cast<nsIStreamListener*>(qaBrowserImpl));
 	nsCOMPtr<nsIWeakReference> thisListener(do_GetWeakReference(listener));
 	qaWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsIStreamListener));
 
diff --git a/mozilla/embedding/tests/os2Embed/WebBrowserChrome.cpp b/mozilla/embedding/tests/os2Embed/WebBrowserChrome.cpp
index a21608e5617..8509506fb77 100644
--- a/mozilla/embedding/tests/os2Embed/WebBrowserChrome.cpp
+++ b/mozilla/embedding/tests/os2Embed/WebBrowserChrome.cpp
@@ -76,14 +76,14 @@ nsresult WebBrowserChrome::CreateBrowser(PRInt32 aX, PRInt32 aY,
     if (!mWebBrowser)
         return NS_ERROR_FAILURE;
 
-    (void)mWebBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome*, this));
+    (void)mWebBrowser->SetContainerWindow(static_cast<nsIWebBrowserChrome*>(this));
 
     nsCOMPtr<nsIDocShellTreeItem> dsti = do_QueryInterface(mWebBrowser);
     dsti->SetItemType(nsIDocShellTreeItem::typeContentWrapper);
 
     nsCOMPtr<nsIBaseWindow> browserBaseWindow = do_QueryInterface(mWebBrowser);
 
-    mNativeWindow = WebBrowserChromeUI::CreateNativeWindow(NS_STATIC_CAST(nsIWebBrowserChrome*, this));
+    mNativeWindow = WebBrowserChromeUI::CreateNativeWindow(static_cast<nsIWebBrowserChrome*>(this));
 
     if (!mNativeWindow)
         return NS_ERROR_FAILURE;
@@ -93,7 +93,7 @@ nsresult WebBrowserChrome::CreateBrowser(PRInt32 aX, PRInt32 aY,
                              aX, aY, aCX, aCY);
     browserBaseWindow->Create();
 
-    nsCOMPtr<nsIWebProgressListener> listener(NS_STATIC_CAST(nsIWebProgressListener*, this));
+    nsCOMPtr<nsIWebProgressListener> listener(static_cast<nsIWebProgressListener*>(this));
     nsCOMPtr<nsIWeakReference> thisListener(do_GetWeakReference(listener));
     (void)mWebBrowser->AddWebBrowserListener(thisListener, 
         NS_GET_IID(nsIWebProgressListener));
diff --git a/mozilla/embedding/tests/os2Embed/os2Embed.cpp b/mozilla/embedding/tests/os2Embed/os2Embed.cpp
index 914718793c6..e590cb6843f 100644
--- a/mozilla/embedding/tests/os2Embed/os2Embed.cpp
+++ b/mozilla/embedding/tests/os2Embed/os2Embed.cpp
@@ -172,9 +172,9 @@ int main(int argc, char *argv[])
 
         ProfileChangeObserver *observer = new ProfileChangeObserver;
         observer->AddRef();
-        observerService->AddObserver(NS_STATIC_CAST(nsIObserver *, observer), "profile-approve-change", PR_TRUE);
-        observerService->AddObserver(NS_STATIC_CAST(nsIObserver *, observer), "profile-change-teardown", PR_TRUE);
-        observerService->AddObserver(NS_STATIC_CAST(nsIObserver *, observer), "profile-after-change", PR_TRUE);
+        observerService->AddObserver(static_cast<nsIObserver *>(observer), "profile-approve-change", PR_TRUE);
+        observerService->AddObserver(static_cast<nsIObserver *>(observer), "profile-change-teardown", PR_TRUE);
+        observerService->AddObserver(static_cast<nsIObserver *>(observer), "profile-after-change", PR_TRUE);
 
         InitializeWindowCreator();
 
@@ -264,7 +264,7 @@ nsresult InitializeWindowCreator()
     WindowCreator *creatorCallback = new WindowCreator();
     if (creatorCallback)
     {
-        nsCOMPtr<nsIWindowCreator> windowCreator(NS_STATIC_CAST(nsIWindowCreator *, creatorCallback));
+        nsCOMPtr<nsIWindowCreator> windowCreator(static_cast<nsIWindowCreator *>(creatorCallback));
         if (windowCreator)
         {
             nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
@@ -1410,7 +1410,7 @@ nsresult CreateBrowserWindow(PRUint32 aChromeFlags,
 
   // the interface to return and one addref, which we assume will be
   // immediately released
-  CallQueryInterface(NS_STATIC_CAST(nsIWebBrowserChrome*, chrome), aNewWindow);
+  CallQueryInterface(static_cast<nsIWebBrowserChrome*>(chrome), aNewWindow);
   // now an extra addref; the window owns itself (to be released by
   // WebBrowserChromeUI::Destroy)
   NS_ADDREF(*aNewWindow);
@@ -1425,12 +1425,12 @@ nsresult CreateBrowserWindow(PRUint32 aChromeFlags,
     return NS_ERROR_FAILURE;
 
   // Place it where we want it.
-  ResizeEmbedding(NS_STATIC_CAST(nsIWebBrowserChrome*, chrome));
+  ResizeEmbedding(static_cast<nsIWebBrowserChrome*>(chrome));
 
   // Subscribe new window to profile changes so it can kill itself when one happens
   nsCOMPtr<nsIObserverService> observerService(do_GetService("@mozilla.org/observer-service;1"));
   if (observerService)
-    observerService->AddObserver(NS_STATIC_CAST(nsIObserver *, chrome),
+    observerService->AddObserver(static_cast<nsIObserver *>(chrome),
                                  "profile-change-teardown", PR_TRUE);
 
   // if opened as chrome, it'll be made visible after the chrome has loaded.
diff --git a/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp b/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp
index 713c2b62755..c0da83d6db0 100644
--- a/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp
+++ b/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp
@@ -77,11 +77,11 @@ nsresult WebBrowserChrome::CreateBrowser(PRInt32 aX, PRInt32 aY,
     if (!mWebBrowser)
         return NS_ERROR_FAILURE;
 
-    (void)mWebBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome*, this));
+    (void)mWebBrowser->SetContainerWindow(static_cast<nsIWebBrowserChrome*>(this));
 
     nsCOMPtr<nsIBaseWindow> browserBaseWindow = do_QueryInterface(mWebBrowser);
 
-    mNativeWindow = WebBrowserChromeUI::CreateNativeWindow(NS_STATIC_CAST(nsIWebBrowserChrome*, this));
+    mNativeWindow = WebBrowserChromeUI::CreateNativeWindow(static_cast<nsIWebBrowserChrome*>(this));
 
     if (!mNativeWindow)
         return NS_ERROR_FAILURE;
@@ -91,7 +91,7 @@ nsresult WebBrowserChrome::CreateBrowser(PRInt32 aX, PRInt32 aY,
                              aX, aY, aCX, aCY);
     browserBaseWindow->Create();
 
-    nsCOMPtr<nsIWebProgressListener> listener(NS_STATIC_CAST(nsIWebProgressListener*, this));
+    nsCOMPtr<nsIWebProgressListener> listener(static_cast<nsIWebProgressListener*>(this));
     nsCOMPtr<nsIWeakReference> thisListener(do_GetWeakReference(listener));
     (void)mWebBrowser->AddWebBrowserListener(thisListener, 
         NS_GET_IID(nsIWebProgressListener));
diff --git a/mozilla/embedding/tests/winEmbed/winEmbed.cpp b/mozilla/embedding/tests/winEmbed/winEmbed.cpp
index 03f2d63f0b2..3be299fef41 100644
--- a/mozilla/embedding/tests/winEmbed/winEmbed.cpp
+++ b/mozilla/embedding/tests/winEmbed/winEmbed.cpp
@@ -1099,7 +1099,7 @@ nsresult AppCallbacks::CreateBrowserWindow(PRUint32 aChromeFlags,
 
   // the interface to return and one addref, which we assume will be
   // immediately released
-  CallQueryInterface(NS_STATIC_CAST(nsIWebBrowserChrome*, chrome), aNewWindow);
+  CallQueryInterface(static_cast<nsIWebBrowserChrome*>(chrome), aNewWindow);
   // now an extra addref; the window owns itself (to be released by
   // WebBrowserChromeUI::Destroy)
   NS_ADDREF(*aNewWindow);
@@ -1114,7 +1114,7 @@ nsresult AppCallbacks::CreateBrowserWindow(PRUint32 aChromeFlags,
     return NS_ERROR_FAILURE;
 
   // Place it where we want it.
-  ResizeEmbedding(NS_STATIC_CAST(nsIWebBrowserChrome*, chrome));
+  ResizeEmbedding(static_cast<nsIWebBrowserChrome*>(chrome));
 
   // if opened as chrome, it'll be made visible after the chrome has loaded.
   // otherwise, go ahead and show it now.
diff --git a/mozilla/embedding/tests/wxEmbed/EmbedApp.cpp b/mozilla/embedding/tests/wxEmbed/EmbedApp.cpp
index 3dc1fb3c709..6e283b1cdcc 100644
--- a/mozilla/embedding/tests/wxEmbed/EmbedApp.cpp
+++ b/mozilla/embedding/tests/wxEmbed/EmbedApp.cpp
@@ -121,7 +121,7 @@ bool EmbedApp::OnInit()
     GeckoWindowCreator *creatorCallback = new GeckoWindowCreator();
     if (creatorCallback)
     {
-        nsCOMPtr<nsIWindowCreator> windowCreator(NS_STATIC_CAST(nsIWindowCreator *, creatorCallback));
+        nsCOMPtr<nsIWindowCreator> windowCreator(static_cast<nsIWindowCreator *>(creatorCallback));
         if (windowCreator)
         {
             nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
diff --git a/mozilla/embedding/tests/wxEmbed/GeckoContainer.cpp b/mozilla/embedding/tests/wxEmbed/GeckoContainer.cpp
index fc8f601ed38..03c4cac406e 100644
--- a/mozilla/embedding/tests/wxEmbed/GeckoContainer.cpp
+++ b/mozilla/embedding/tests/wxEmbed/GeckoContainer.cpp
@@ -76,7 +76,7 @@ nsresult GeckoContainer::CreateBrowser(PRInt32 aX, PRInt32 aY,
     if (!mWebBrowser || NS_FAILED(rv))
         return NS_ERROR_FAILURE;
 
-    mWebBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome *, this));
+    mWebBrowser->SetContainerWindow(static_cast<nsIWebBrowserChrome *>(this));
 
     nsCOMPtr<nsIDocShellTreeItem> dsti = do_QueryInterface(mWebBrowser);
     dsti->SetItemType(
@@ -96,13 +96,13 @@ nsresult GeckoContainer::CreateBrowser(PRInt32 aX, PRInt32 aY,
                              aX, aY, aCX, aCY);
     browserBaseWindow->Create();
 
-    nsCOMPtr<nsIWebProgressListener> listener(NS_STATIC_CAST(nsIWebProgressListener*, this));
+    nsCOMPtr<nsIWebProgressListener> listener(static_cast<nsIWebProgressListener*>(this));
     nsCOMPtr<nsIWeakReference> thisListener(do_GetWeakReference(listener));
     (void)mWebBrowser->AddWebBrowserListener(thisListener, 
         NS_GET_IID(nsIWebProgressListener));
 
     if (mIsURIContentListener)
-        mWebBrowser->SetParentURIContentListener(NS_STATIC_CAST(nsIURIContentListener *, this));
+        mWebBrowser->SetParentURIContentListener(static_cast<nsIURIContentListener *>(this));
 
 
     // The window has been created. Now register for history notifications
diff --git a/mozilla/embedding/tests/wxEmbed/GeckoProtocolHandler.cpp b/mozilla/embedding/tests/wxEmbed/GeckoProtocolHandler.cpp
index af4cbe76957..cbb4af4b5d9 100644
--- a/mozilla/embedding/tests/wxEmbed/GeckoProtocolHandler.cpp
+++ b/mozilla/embedding/tests/wxEmbed/GeckoProtocolHandler.cpp
@@ -367,7 +367,7 @@ GeckoProtocolChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *aCont
         if (stricmp(scheme.get(), gCallbacks[i].mScheme.get()) == 0)
         {
             rv = gCallbacks[i].mCallback->GetData(
-                mURI, NS_STATIC_CAST(nsIChannel *,this), mContentType, &mData, &mContentLength);
+                mURI, static_cast<nsIChannel *>(this), mContentType, &mData, &mContentLength);
             if (NS_FAILED(rv)) return rv;
             
             rv = NS_NewByteInputStream(getter_AddRefs(mContentStream),
diff --git a/mozilla/embedding/wrappers/DotNETEmbed/DotNETEmbed.cpp b/mozilla/embedding/wrappers/DotNETEmbed/DotNETEmbed.cpp
index 21207185f93..27796e88713 100644
--- a/mozilla/embedding/wrappers/DotNETEmbed/DotNETEmbed.cpp
+++ b/mozilla/embedding/wrappers/DotNETEmbed/DotNETEmbed.cpp
@@ -280,7 +280,7 @@ WebBrowserChrome::CreateBrowser(HWND hWnd, PRInt32 aX, PRInt32 aY, PRInt32 aCX,
   if (!mWebBrowser)
     return NS_ERROR_FAILURE;
 
-  mWebBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome*, this));
+  mWebBrowser->SetContainerWindow(static_cast<nsIWebBrowserChrome*>(this));
 
   nsCOMPtr<nsIDocShellTreeItem> dsti = do_QueryInterface(mWebBrowser);
   dsti->SetItemType(nsIDocShellTreeItem::typeContentWrapper);
diff --git a/mozilla/embedding/wrappers/DotNETEmbed/WebChrome.cpp b/mozilla/embedding/wrappers/DotNETEmbed/WebChrome.cpp
index 173780295c9..f94091e8962 100644
--- a/mozilla/embedding/wrappers/DotNETEmbed/WebChrome.cpp
+++ b/mozilla/embedding/wrappers/DotNETEmbed/WebChrome.cpp
@@ -201,7 +201,7 @@ nsresult WebBrowserChrome::CreateBrowser(HWND hWnd, PRInt32 aX, PRInt32 aY,
   if (!mWebBrowser)
     return NS_ERROR_FAILURE;
 
-  (void)mWebBrowser->SetContainerWindow(NS_STATIC_CAST(nsIWebBrowserChrome*, this));
+  (void)mWebBrowser->SetContainerWindow(static_cast<nsIWebBrowserChrome*>(this));
 
   nsCOMPtr<nsIDocShellTreeItem> dsti = do_QueryInterface(mWebBrowser);
   dsti->SetItemType(nsIDocShellTreeItem::typeContentWrapper);
diff --git a/mozilla/extensions/access-builtin/accessproxy/nsAccessProxy.cpp b/mozilla/extensions/access-builtin/accessproxy/nsAccessProxy.cpp
index f11718c34a8..c77e15369e4 100644
--- a/mozilla/extensions/access-builtin/accessproxy/nsAccessProxy.cpp
+++ b/mozilla/extensions/access-builtin/accessproxy/nsAccessProxy.cpp
@@ -189,7 +189,7 @@ NS_IMETHODIMP nsAccessProxy::Observe(nsISupports *aSubject, const char *aTopic,
     nsCOMPtr<nsIWebProgress> progress(do_GetService(NS_DOCUMENTLOADER_SERVICE_CONTRACTID));
     rv = NS_ERROR_FAILURE;
     if (progress) {
-      rv = progress->AddProgressListener(NS_STATIC_CAST(nsIWebProgressListener*,this),
+      rv = progress->AddProgressListener(static_cast<nsIWebProgressListener*>(this),
                                          nsIWebProgress::NOTIFY_STATE_DOCUMENT);
       if (NS_SUCCEEDED(rv))
         AddRef();
diff --git a/mozilla/extensions/auth/nsAuthSambaNTLM.cpp b/mozilla/extensions/auth/nsAuthSambaNTLM.cpp
index 44272d3cb6e..b0bd5b803ce 100644
--- a/mozilla/extensions/auth/nsAuthSambaNTLM.cpp
+++ b/mozilla/extensions/auth/nsAuthSambaNTLM.cpp
@@ -194,7 +194,7 @@ static PRUint8* ExtractMessage(const nsACString& aLine, PRUint32* aLen)
             break;
     }
     *aLen = (length/4)*3 - numEquals;
-    return NS_REINTERPRET_CAST(PRUint8*, PL_Base64Decode(s, length, nsnull));
+    return reinterpret_cast<PRUint8*>(PL_Base64Decode(s, length, nsnull));
 }
 
 nsresult
@@ -208,7 +208,7 @@ nsAuthSambaNTLM::SpawnNTLMAuthHelper()
         "ntlm_auth",
         "--helper-protocol", "ntlmssp-client-1",
         "--use-cached-creds",
-        "--username", NS_CONST_CAST(char*, username),
+        "--username", const_cast<char*>(username),
         nsnull
     };
 
@@ -261,7 +261,7 @@ nsAuthSambaNTLM::GetNextToken(const void *inToken,
     }
 
     /* inToken must be a type 2 message. Get ntlm_auth to generate our response */
-    char* encoded = PL_Base64Encode(NS_STATIC_CAST(const char*, inToken), inTokenLen, nsnull);
+    char* encoded = PL_Base64Encode(static_cast<const char*>(inToken), inTokenLen, nsnull);
     if (!encoded)
         return NS_ERROR_OUT_OF_MEMORY;
 
diff --git a/mozilla/extensions/cookie/nsPermissionManager.cpp b/mozilla/extensions/cookie/nsPermissionManager.cpp
index 8353626a07c..6407f309e1e 100644
--- a/mozilla/extensions/cookie/nsPermissionManager.cpp
+++ b/mozilla/extensions/cookie/nsPermissionManager.cpp
@@ -66,7 +66,7 @@ ArenaStrDup(const char* str, PLArenaPool* aArena)
   PL_ARENA_ALLOCATE(mem, aArena, size);
   if (mem)
     memcpy(mem, str, size);
-  return NS_STATIC_CAST(char*, mem);
+  return static_cast<char*>(mem);
 }
 
 nsHostEntry::nsHostEntry(const char* aHost)
@@ -455,7 +455,7 @@ AddHostToList(nsHostEntry *entry, void *arg)
   // so we dereference it twice to assign the |const char*| string
   // and once so we can increment the |const char**| array location
   // ready for the next assignment.
-  const char*** elementPtr = NS_STATIC_CAST(const char***, arg);
+  const char*** elementPtr = static_cast<const char***>(arg);
   **elementPtr = entry->GetKey();
   ++(*elementPtr);
   return PL_DHASH_NEXT;
@@ -476,7 +476,7 @@ NS_IMETHODIMP nsPermissionManager::GetEnumerator(nsISimpleEnumerator **aEnum)
   const char** hostListCopy = hostList;
   mHostTable.EnumerateEntries(AddHostToList, &hostListCopy);
 
-  nsPermissionEnumerator* permissionEnum = new nsPermissionEnumerator(&mHostTable, hostList, mHostCount, NS_CONST_CAST(const char**, mTypeArray));
+  nsPermissionEnumerator* permissionEnum = new nsPermissionEnumerator(&mHostTable, hostList, mHostCount, const_cast<const char**>(mTypeArray));
   if (!permissionEnum) {
     delete[] hostList;
     return NS_ERROR_OUT_OF_MEMORY;
@@ -833,7 +833,7 @@ AddEntryToList(nsHostEntry *entry, void *arg)
   // so we dereference it twice to assign the |nsHostEntry*|
   // and once so we can increment the |nsHostEntry**| array location
   // ready for the next assignment.
-  nsHostEntry*** elementPtr = NS_STATIC_CAST(nsHostEntry***, arg);
+  nsHostEntry*** elementPtr = static_cast<nsHostEntry***>(arg);
   **elementPtr = entry;
   ++(*elementPtr);
   return PL_DHASH_NEXT;
@@ -857,7 +857,7 @@ void
 nsPermissionManager::DoLazyWrite(nsITimer *aTimer,
                                  void     *aClosure)
 {
-  nsPermissionManager *service = NS_REINTERPRET_CAST(nsPermissionManager*, aClosure);
+  nsPermissionManager *service = reinterpret_cast<nsPermissionManager*>(aClosure);
   service->Write();
   service->mWriteTimer = 0;
 }
@@ -940,7 +940,7 @@ nsPermissionManager::Write()
   mHostTable.EnumerateEntries(AddEntryToList, &hostListCopy);
 
   for (i = 0; i < mHostCount; ++i) {
-    nsHostEntry *entry = NS_STATIC_CAST(nsHostEntry*, hostList[i]);
+    nsHostEntry *entry = static_cast<nsHostEntry*>(hostList[i]);
     NS_ASSERTION(entry, "corrupt permission list");
 
     for (PRInt32 type = 0; type < NUMBER_OF_TYPES; ++type) {
diff --git a/mozilla/extensions/cookie/nsPermissionManager.h b/mozilla/extensions/cookie/nsPermissionManager.h
index 38aaa8d13fc..48e3228ecb0 100644
--- a/mozilla/extensions/cookie/nsPermissionManager.h
+++ b/mozilla/extensions/cookie/nsPermissionManager.h
@@ -122,8 +122,8 @@ public:
   PRBool PermissionsAreEmpty() const
   {
     // Cast to PRUint32, to make this faster. Only 2 checks instead of 8
-    return (*NS_REINTERPRET_CAST(const PRUint32*, &mPermissions[0])==0 && 
-            *NS_REINTERPRET_CAST(const PRUint32*, &mPermissions[4])==0 );
+    return (*reinterpret_cast<const PRUint32*>(&mPermissions[0])==0 && 
+            *reinterpret_cast<const PRUint32*>(&mPermissions[4])==0 );
   }
 
 private:
diff --git a/mozilla/extensions/java/xpcom/src/nsAppFileLocProviderProxy.cpp b/mozilla/extensions/java/xpcom/src/nsAppFileLocProviderProxy.cpp
index ff4bd56fe81..c10bf4c1834 100644
--- a/mozilla/extensions/java/xpcom/src/nsAppFileLocProviderProxy.cpp
+++ b/mozilla/extensions/java/xpcom/src/nsAppFileLocProviderProxy.cpp
@@ -112,8 +112,8 @@ public:
     : mIndex(0)
   {
     JNIEnv* env = GetJNIEnv();
-    mJavaFileArray = NS_STATIC_CAST(jobjectArray,
-                                    env->NewGlobalRef(aJavaFileArray));
+    mJavaFileArray = static_cast<jobjectArray>
+                                (env->NewGlobalRef(aJavaFileArray));
     mArraySize = env->GetArrayLength(aJavaFileArray);
   }
 
@@ -222,8 +222,8 @@ nsAppFileLocProviderProxy::GetFiles(const char* aProp,
 
   if (NS_SUCCEEDED(rv)) {
     // Parse return value
-    *aResult = new DirectoryEnumerator(NS_STATIC_CAST(jobjectArray,
-                                                      javaFileArray));
+    *aResult = new DirectoryEnumerator(static_cast<jobjectArray>
+                                                  (javaFileArray));
     NS_ADDREF(*aResult);
     return NS_OK;
   }
diff --git a/mozilla/extensions/java/xpcom/src/nsJavaInterfaces.cpp b/mozilla/extensions/java/xpcom/src/nsJavaInterfaces.cpp
index bafe8babe8f..c95f9c47d18 100644
--- a/mozilla/extensions/java/xpcom/src/nsJavaInterfaces.cpp
+++ b/mozilla/extensions/java/xpcom/src/nsJavaInterfaces.cpp
@@ -302,7 +302,7 @@ GRE_NATIVE(lockProfileDirectory) (JNIEnv* env, jobject, jobject aDirectory)
         if (clazz) {
           jmethodID mid = env->GetMethodID(clazz, "<init>", "(J)V");
           if (mid) {
-            return env->NewObject(clazz, mid, NS_REINTERPRET_CAST(jlong, lock));
+            return env->NewObject(clazz, mid, reinterpret_cast<jlong>(lock));
           }
         }
 
@@ -392,7 +392,7 @@ JXUTILS_NATIVE(wrapJavaObject) (JNIEnv* env, jobject, jobject aJavaObject,
   if (NS_FAILED(rv)) {
     ThrowException(env, rv, "Failed to create XPCOM proxy for Java object");
   }
-  return NS_REINTERPRET_CAST(jlong, xpcomObject);
+  return reinterpret_cast<jlong>(xpcomObject);
 }
 
 extern "C" NS_EXPORT jobject JNICALL
@@ -401,7 +401,7 @@ JXUTILS_NATIVE(wrapXPCOMObject) (JNIEnv* env, jobject, jlong aXPCOMObject,
 {
   nsresult rv;
   jobject javaObject = nsnull;
-  nsISupports* xpcomObject = NS_REINTERPRET_CAST(nsISupports*, aXPCOMObject);
+  nsISupports* xpcomObject = reinterpret_cast<nsISupports*>(aXPCOMObject);
 
   if (!xpcomObject || !aIID) {
     rv = NS_ERROR_NULL_POINTER;
diff --git a/mozilla/extensions/java/xpcom/src/nsJavaWrapper.cpp b/mozilla/extensions/java/xpcom/src/nsJavaWrapper.cpp
index 592efac5ecc..d38a092e5a9 100644
--- a/mozilla/extensions/java/xpcom/src/nsJavaWrapper.cpp
+++ b/mozilla/extensions/java/xpcom/src/nsJavaWrapper.cpp
@@ -162,73 +162,73 @@ GetNativeArrayElement(PRUint8 aType, void* aArray, PRUint32 aIndex,
   {
     case nsXPTType::T_I8:
     case nsXPTType::T_U8:
-      aResult->val.u8 = NS_STATIC_CAST(PRUint8*, aArray)[aIndex];
+      aResult->val.u8 = static_cast<PRUint8*>(aArray)[aIndex];
       break;
 
     case nsXPTType::T_I16:
     case nsXPTType::T_U16:
-      aResult->val.u16 = NS_STATIC_CAST(PRUint16*, aArray)[aIndex];
+      aResult->val.u16 = static_cast<PRUint16*>(aArray)[aIndex];
       break;
 
     case nsXPTType::T_I32:
     case nsXPTType::T_U32:
-      aResult->val.u32 = NS_STATIC_CAST(PRUint32*, aArray)[aIndex];
+      aResult->val.u32 = static_cast<PRUint32*>(aArray)[aIndex];
       break;
 
     case nsXPTType::T_I64:
     case nsXPTType::T_U64:
-      aResult->val.u64 = NS_STATIC_CAST(PRUint64*, aArray)[aIndex];
+      aResult->val.u64 = static_cast<PRUint64*>(aArray)[aIndex];
       break;
 
     case nsXPTType::T_FLOAT:
-      aResult->val.f = NS_STATIC_CAST(float*, aArray)[aIndex];
+      aResult->val.f = static_cast<float*>(aArray)[aIndex];
       break;
 
     case nsXPTType::T_DOUBLE:
-      aResult->val.d = NS_STATIC_CAST(double*, aArray)[aIndex];
+      aResult->val.d = static_cast<double*>(aArray)[aIndex];
       break;
 
     case nsXPTType::T_BOOL:
-      aResult->val.b = NS_STATIC_CAST(PRBool*, aArray)[aIndex];
+      aResult->val.b = static_cast<PRBool*>(aArray)[aIndex];
       break;
 
     case nsXPTType::T_CHAR:
-      aResult->val.c = NS_STATIC_CAST(char*, aArray)[aIndex];
+      aResult->val.c = static_cast<char*>(aArray)[aIndex];
       break;
 
     case nsXPTType::T_WCHAR:
-      aResult->val.wc = NS_STATIC_CAST(PRUnichar*, aArray)[aIndex];
+      aResult->val.wc = static_cast<PRUnichar*>(aArray)[aIndex];
       break;
 
     case nsXPTType::T_CHAR_STR:
-      aResult->val.p = NS_STATIC_CAST(char**, aArray)[aIndex];
+      aResult->val.p = static_cast<char**>(aArray)[aIndex];
       break;
 
     case nsXPTType::T_WCHAR_STR:
-      aResult->val.p = NS_STATIC_CAST(PRUnichar**, aArray)[aIndex];
+      aResult->val.p = static_cast<PRUnichar**>(aArray)[aIndex];
       break;
 
     case nsXPTType::T_IID:
-      aResult->val.p = NS_STATIC_CAST(nsID**, aArray)[aIndex];
+      aResult->val.p = static_cast<nsID**>(aArray)[aIndex];
       break;
 
     case nsXPTType::T_INTERFACE:
     case nsXPTType::T_INTERFACE_IS:
-      aResult->val.p = NS_STATIC_CAST(nsISupports**, aArray)[aIndex];
+      aResult->val.p = static_cast<nsISupports**>(aArray)[aIndex];
       break;
 
     case nsXPTType::T_ASTRING:
     case nsXPTType::T_DOMSTRING:
-      aResult->val.p = NS_STATIC_CAST(nsString**, aArray)[aIndex];
+      aResult->val.p = static_cast<nsString**>(aArray)[aIndex];
       break;
 
     case nsXPTType::T_UTF8STRING:
     case nsXPTType::T_CSTRING:
-      aResult->val.p = NS_STATIC_CAST(nsCString**, aArray)[aIndex];
+      aResult->val.p = static_cast<nsCString**>(aArray)[aIndex];
       break;
 
     case nsXPTType::T_VOID:
-      aResult->val.p = NS_STATIC_CAST(void**, aArray)[aIndex];
+      aResult->val.p = static_cast<void**>(aArray)[aIndex];
       break;
 
     default:
@@ -345,7 +345,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
           }
           aVariant.SetPtrIsData();
         } else {  // 'array'
-          NS_STATIC_CAST(PRInt8*, aVariant.val.p)[aIndex] = value;
+          static_cast<PRInt8*>(aVariant.val.p)[aIndex] = value;
         }
       }
       break;
@@ -380,9 +380,9 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
           aVariant.SetPtrIsData();
         } else {  // 'array'
           if (aType == nsXPTType::T_I16)
-            NS_STATIC_CAST(PRInt16*, aVariant.val.p)[aIndex] = value;
+            static_cast<PRInt16*>(aVariant.val.p)[aIndex] = value;
           else
-            NS_STATIC_CAST(PRUint8*, aVariant.val.p)[aIndex] = value;
+            static_cast<PRUint8*>(aVariant.val.p)[aIndex] = value;
         }
       }
       break;
@@ -417,9 +417,9 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
           aVariant.SetPtrIsData();
         } else {  // 'array'
           if (aType == nsXPTType::T_I32)
-            NS_STATIC_CAST(PRInt32*, aVariant.val.p)[aIndex] = value;
+            static_cast<PRInt32*>(aVariant.val.p)[aIndex] = value;
           else
-            NS_STATIC_CAST(PRUint16*, aVariant.val.p)[aIndex] = value;
+            static_cast<PRUint16*>(aVariant.val.p)[aIndex] = value;
         }
       }
       break;
@@ -454,9 +454,9 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
           aVariant.SetPtrIsData();
         } else {  // 'array'
           if (aType == nsXPTType::T_I64)
-            NS_STATIC_CAST(PRInt64*, aVariant.val.p)[aIndex] = value;
+            static_cast<PRInt64*>(aVariant.val.p)[aIndex] = value;
           else
-            NS_STATIC_CAST(PRUint32*, aVariant.val.p)[aIndex] = value;
+            static_cast<PRUint32*>(aVariant.val.p)[aIndex] = value;
         }
       }
       break;
@@ -482,7 +482,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
           }
           aVariant.SetPtrIsData();
         } else {  // 'array'
-          NS_STATIC_CAST(float*, aVariant.val.p)[aIndex] = value;
+          static_cast<float*>(aVariant.val.p)[aIndex] = value;
         }
       }
       break;
@@ -498,7 +498,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
         if (aType == nsXPTType::T_DOUBLE)
           aVariant.val.d = value;
         else
-          aVariant.val.u64 = NS_STATIC_CAST(PRUint64, value);
+          aVariant.val.u64 = static_cast<PRUint64>(value);
       } else { // 'inout' & 'array'
         jdouble value;
         if (aParam) {
@@ -510,7 +510,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
             if (aType == nsXPTType::T_DOUBLE)
               aVariant.val.d = value;
             else
-              aVariant.val.u64 = NS_STATIC_CAST(PRUint64, value);
+              aVariant.val.u64 = static_cast<PRUint64>(value);
             aVariant.ptr = &aVariant.val;
           } else {
             aVariant.ptr = nsnull;
@@ -518,10 +518,10 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
           aVariant.SetPtrIsData();
         } else {  // 'array'
           if (aType == nsXPTType::T_DOUBLE)
-            NS_STATIC_CAST(double*, aVariant.val.p)[aIndex] = value;
+            static_cast<double*>(aVariant.val.p)[aIndex] = value;
           else
-            NS_STATIC_CAST(PRUint64*, aVariant.val.p)[aIndex] =
-                                                NS_STATIC_CAST(PRUint64, value);
+            static_cast<PRUint64*>(aVariant.val.p)[aIndex] =
+                                                static_cast<PRUint64>(value);
         }
       }
       break;
@@ -547,7 +547,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
           }
           aVariant.SetPtrIsData();
         } else {  // 'array'
-          NS_STATIC_CAST(PRBool*, aVariant.val.p)[aIndex] = value;
+          static_cast<PRBool*>(aVariant.val.p)[aIndex] = value;
         }
       }
       break;
@@ -573,7 +573,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
           }
           aVariant.SetPtrIsData();
         } else {  // 'array'
-          NS_STATIC_CAST(char*, aVariant.val.p)[aIndex] = value;
+          static_cast<char*>(aVariant.val.p)[aIndex] = value;
         }
       }
       break;
@@ -599,7 +599,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
           }
           aVariant.SetPtrIsData();
         } else {  // 'array'
-          NS_STATIC_CAST(PRUnichar*, aVariant.val.p)[aIndex] = value;
+          static_cast<PRUnichar*>(aVariant.val.p)[aIndex] = value;
         }
       }
       break;
@@ -629,7 +629,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
               break;
             }
 
-            char* char_str = NS_STATIC_CAST(char*, buf);
+            char* char_str = static_cast<char*>(buf);
             env->GetStringUTFRegion(data, 0, uniLength, char_str);
             char_str[utf8Length] = '\0';
 
@@ -640,7 +640,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
               break;
             }
 
-            jchar* jchar_str = NS_STATIC_CAST(jchar*, buf);
+            jchar* jchar_str = static_cast<jchar*>(buf);
             env->GetStringRegion(data, 0, uniLength, jchar_str);
             jchar_str[uniLength] = '\0';
           }
@@ -663,11 +663,11 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
         }
       } else {  // 'array'
         if (aType == nsXPTType::T_CHAR_STR) {
-          char* str = NS_STATIC_CAST(char*, buf);
-          NS_STATIC_CAST(char**, aVariant.val.p)[aIndex] = str;
+          char* str = static_cast<char*>(buf);
+          static_cast<char**>(aVariant.val.p)[aIndex] = str;
         } else {
-          PRUnichar* str = NS_STATIC_CAST(PRUnichar*, buf);
-          NS_STATIC_CAST(PRUnichar**, aVariant.val.p)[aIndex] = str;
+          PRUnichar* str = static_cast<PRUnichar*>(buf);
+          static_cast<PRUnichar**>(aVariant.val.p)[aIndex] = str;
         }
       }
       break;
@@ -711,7 +711,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
           aVariant.SetPtrIsData();
         }
       } else {  // 'array'
-        NS_STATIC_CAST(nsID**, aVariant.val.p)[aIndex] = iid;
+        static_cast<nsID**>(aVariant.val.p)[aIndex] = iid;
       }
       break;
     }
@@ -778,7 +778,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
           aVariant.SetPtrIsData();
         }
       } else {  // 'array'
-        NS_STATIC_CAST(void**, aVariant.val.p)[aIndex] = xpcom_obj;
+        static_cast<void**>(aVariant.val.p)[aIndex] = xpcom_obj;
       }
       break;
     }
@@ -794,7 +794,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
         break;
       }
 
-      jstring jstr = NS_STATIC_CAST(jstring, aParam);
+      jstring jstr = static_cast<jstring>(aParam);
       nsAString* str = jstring_to_nsAString(env, jstr);
       if (!str) {
         rv = NS_ERROR_OUT_OF_MEMORY;
@@ -817,7 +817,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
         break;
       }
 
-      jstring jstr = NS_STATIC_CAST(jstring, aParam);
+      jstring jstr = static_cast<jstring>(aParam);
       nsACString* str = jstring_to_nsACString(env, jstr);
       if (!str) {
         rv = NS_ERROR_OUT_OF_MEMORY;
@@ -839,7 +839,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
       LOG(("long (void*)\n"));
       if (!aIsOut && !aIsArrayElement) {  // 'in'
         aVariant.val.p =
-          NS_REINTERPRET_CAST(void*, env->CallLongMethod(aParam, longValueMID));
+          reinterpret_cast<void*>(env->CallLongMethod(aParam, longValueMID));
       } else { // 'inout' & 'array'
         jlong value;
         if (aParam) {
@@ -848,15 +848,15 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
 
         if (aIsOut) { // 'inout'
           if (aParam) {
-            aVariant.val.p = NS_REINTERPRET_CAST(void*, value);
+            aVariant.val.p = reinterpret_cast<void*>(value);
             aVariant.ptr = &aVariant.val;
           } else {
             aVariant.ptr = nsnull;
           }
           aVariant.SetPtrIsData();
         } else {  // 'array'
-          NS_STATIC_CAST(void**, aVariant.val.p)[aIndex] =
-                  NS_REINTERPRET_CAST(void*, value);
+          static_cast<void**>(aVariant.val.p)[aIndex] =
+                  reinterpret_cast<void*>(value);
         }
       }
       break;
@@ -868,7 +868,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
       if (!aIsOut) {  // 'in'
         sourceArray = aParam;
       } else if (aParam) {  // 'inout'
-        jobjectArray array = NS_STATIC_CAST(jobjectArray, aParam);
+        jobjectArray array = static_cast<jobjectArray>(aParam);
         sourceArray = env->GetObjectArrayElement(array, 0);
       }
 
@@ -935,7 +935,7 @@ SetupParams(JNIEnv *env, const jobject aParam, PRUint8 aType, PRBool aIsOut,
           memcpy(buf, str, length);
           env->ReleaseStringUTFChars(data, str);
         } else {
-          jchar* jchar_str = NS_STATIC_CAST(jchar*, buf);
+          jchar* jchar_str = static_cast<jchar*>(buf);
           env->GetStringRegion(data, 0, length, jchar_str);
         }
       }
@@ -1129,7 +1129,7 @@ FinalizeParams(JNIEnv *env, const nsXPTParamInfo &aParamInfo, PRUint8 aType,
 
     case nsXPTType::T_IID:
     {
-      nsID* iid = NS_STATIC_CAST(nsID*, aVariant.val.p);
+      nsID* iid = static_cast<nsID*>(aVariant.val.p);
 
       if ((aParamInfo.IsOut() || aIsArrayElement) &&
           NS_SUCCEEDED(aInvokeResult))
@@ -1168,7 +1168,7 @@ FinalizeParams(JNIEnv *env, const nsXPTParamInfo &aParamInfo, PRUint8 aType,
     case nsXPTType::T_INTERFACE:
     case nsXPTType::T_INTERFACE_IS:
     {
-      nsISupports* xpcom_obj = NS_STATIC_CAST(nsISupports*, aVariant.val.p);
+      nsISupports* xpcom_obj = static_cast<nsISupports*>(aVariant.val.p);
 
       if ((aParamInfo.IsOut() || aIsArrayElement) &&
           NS_SUCCEEDED(aInvokeResult))
@@ -1204,7 +1204,7 @@ FinalizeParams(JNIEnv *env, const nsXPTParamInfo &aParamInfo, PRUint8 aType,
         break;
       }
 
-      nsString* str = NS_STATIC_CAST(nsString*, aVariant.val.p);
+      nsString* str = static_cast<nsString*>(aVariant.val.p);
       if (NS_SUCCEEDED(aInvokeResult) && aParamInfo.IsDipper()) {
         // Create Java string from returned nsString
         jstring jstr = nsnull;
@@ -1235,7 +1235,7 @@ FinalizeParams(JNIEnv *env, const nsXPTParamInfo &aParamInfo, PRUint8 aType,
         break;
       }
 
-      nsCString* str = NS_STATIC_CAST(nsCString*, aVariant.val.p);
+      nsCString* str = static_cast<nsCString*>(aVariant.val.p);
       if (NS_SUCCEEDED(aInvokeResult) && aParamInfo.IsDipper()) {
         // Create Java string from returned nsString
         jstring jstr = nsnull;
@@ -1260,7 +1260,7 @@ FinalizeParams(JNIEnv *env, const nsXPTParamInfo &aParamInfo, PRUint8 aType,
     case nsXPTType::T_VOID:
     {
       if (NS_SUCCEEDED(aInvokeResult)) {
-        jlong value = NS_REINTERPRET_CAST(jlong, aVariant.val.p);
+        jlong value = reinterpret_cast<jlong>(aVariant.val.p);
         if (aParamInfo.IsRetval() && !aIsArrayElement) {
           *aParam = env->NewObject(longClass, longInitMID, value);
         } else if ((aParamInfo.IsOut() || aIsArrayElement) && *aParam) {
@@ -1481,7 +1481,7 @@ JAVAPROXY_NATIVE(callXPCOMMethod) (JNIEnv *env, jclass that, jobject aJavaProxy,
     ThrowException(env, 0, "Failed to get matching XPCOM object");
     return nsnull;
   }
-  JavaXPCOMInstance* inst = NS_STATIC_CAST(JavaXPCOMInstance*, xpcom_obj);
+  JavaXPCOMInstance* inst = static_cast<JavaXPCOMInstance*>(xpcom_obj);
 
   // Get method info
   PRUint16 methodIndex;
@@ -1791,7 +1791,7 @@ GetNewOrUsedJavaWrapper(JNIEnv* env, nsISupports* aXPCOMObject,
     if (ifaceClass) {
       java_obj = env->CallStaticObjectMethod(xpcomJavaProxyClass,
                                              createProxyMID, ifaceClass,
-                                             NS_REINTERPRET_CAST(jlong, inst));
+                                             reinterpret_cast<jlong>(inst));
       if (env->ExceptionCheck())
         java_obj = nsnull;
     }
@@ -1836,9 +1836,9 @@ GetXPCOMInstFromProxy(JNIEnv* env, jobject aJavaObject, void** aResult)
     return NS_ERROR_FAILURE;
   }
 
-  *aResult = NS_REINTERPRET_CAST(void*, xpcom_obj);
+  *aResult = reinterpret_cast<void*>(xpcom_obj);
 #ifdef DEBUG_JAVAXPCOM
-  JavaXPCOMInstance* inst = NS_STATIC_CAST(JavaXPCOMInstance*, *aResult);
+  JavaXPCOMInstance* inst = static_cast<JavaXPCOMInstance*>(*aResult);
   nsIID* iid;
   inst->InterfaceInfo()->GetInterfaceIID(&iid);
   char* iid_str = iid->ToString();
@@ -1878,9 +1878,9 @@ JAVAPROXY_NATIVE(finalizeProxy) (JNIEnv *env, jclass that, jobject aJavaProxy)
       void* xpcom_obj;
       nsresult rv = GetXPCOMInstFromProxy(env, aJavaProxy, &xpcom_obj);
       if (NS_SUCCEEDED(rv)) {
-        JavaXPCOMInstance* inst = NS_STATIC_CAST(JavaXPCOMInstance*, xpcom_obj);
+        JavaXPCOMInstance* inst = static_cast<JavaXPCOMInstance*>(xpcom_obj);
 #ifdef DEBUG_JAVAXPCOM
-        xpcom_addr = NS_REINTERPRET_CAST(PRUint32, inst->GetInstance());
+        xpcom_addr = reinterpret_cast<PRUint32>(inst->GetInstance());
 #endif
         nsIID* iid;
         rv = inst->InterfaceInfo()->GetInterfaceIID(&iid);
@@ -1917,8 +1917,8 @@ JAVAPROXY_NATIVE(isSameXPCOMObject) (JNIEnv *env, jclass that,
     void* xpcom_obj2;
     rv = GetXPCOMInstFromProxy(env, aProxy2, &xpcom_obj2);
     if (NS_SUCCEEDED(rv)) {
-      JavaXPCOMInstance* inst1 = NS_STATIC_CAST(JavaXPCOMInstance*, xpcom_obj1);
-      JavaXPCOMInstance* inst2 = NS_STATIC_CAST(JavaXPCOMInstance*, xpcom_obj2);
+      JavaXPCOMInstance* inst1 = static_cast<JavaXPCOMInstance*>(xpcom_obj1);
+      JavaXPCOMInstance* inst2 = static_cast<JavaXPCOMInstance*>(xpcom_obj2);
       if (inst1->GetInstance() == inst2->GetInstance()) {
         return JNI_TRUE;
       }
@@ -1937,7 +1937,7 @@ LOCKPROXY_NATIVE(release) (JNIEnv *env, jclass that, jlong aLockObject)
   nsresult rv = NS_ERROR_FAILURE;
   nsCOMPtr<nsIThread> thread = do_GetMainThread();
   if (thread) {
-    rv = NS_ProxyRelease(thread, NS_REINTERPRET_CAST(nsISupports*, aLockObject));
+    rv = NS_ProxyRelease(thread, reinterpret_cast<nsISupports*>(aLockObject));
   }
   NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to release using NS_ProxyRelease");
 }
diff --git a/mozilla/extensions/java/xpcom/src/nsJavaXPCOMBindingUtils.cpp b/mozilla/extensions/java/xpcom/src/nsJavaXPCOMBindingUtils.cpp
index 33ccb8887eb..19967ead8c2 100644
--- a/mozilla/extensions/java/xpcom/src/nsJavaXPCOMBindingUtils.cpp
+++ b/mozilla/extensions/java/xpcom/src/nsJavaXPCOMBindingUtils.cpp
@@ -469,9 +469,9 @@ PLDHashOperator
 DestroyJavaProxyMappingEnum(PLDHashTable* aTable, PLDHashEntryHdr* aHeader,
                             PRUint32 aNumber, void* aData)
 {
-  JNIEnv* env = NS_STATIC_CAST(JNIEnv*, aData);
+  JNIEnv* env = static_cast<JNIEnv*>(aData);
   NativeToJavaProxyMap::Entry* entry =
-                          NS_STATIC_CAST(NativeToJavaProxyMap::Entry*, aHeader);
+                          static_cast<NativeToJavaProxyMap::Entry*>(aHeader);
 
   // first, delete XPCOM instances from the Java proxies
   nsresult rv;
@@ -483,7 +483,7 @@ DestroyJavaProxyMappingEnum(PLDHashTable* aTable, PLDHashEntryHdr* aHeader,
     NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to get XPCOM instance from Java proxy");
 
     if (NS_SUCCEEDED(rv)) {
-      JavaXPCOMInstance* inst = NS_STATIC_CAST(JavaXPCOMInstance*, xpcom_obj);
+      JavaXPCOMInstance* inst = static_cast<JavaXPCOMInstance*>(xpcom_obj);
 #ifdef DEBUG_JAVAXPCOM
       char* iid_str = item->iid.ToString();
       LOG(("- NativeToJavaProxyMap (Java=%08x | XPCOM=%08x | IID=%s)\n",
@@ -524,7 +524,7 @@ NativeToJavaProxyMap::Add(JNIEnv* env, nsISupports* aXPCOMObject,
 {
   nsAutoLock lock(gJavaXPCOMLock);
 
-  Entry* e = NS_STATIC_CAST(Entry*, PL_DHashTableOperate(mHashTable,
+  Entry* e = static_cast<Entry*>(PL_DHashTableOperate(mHashTable,
                                                          aXPCOMObject,
                                                          PL_DHASH_ADD));
   if (!e)
@@ -564,7 +564,7 @@ NativeToJavaProxyMap::Find(JNIEnv* env, nsISupports* aNativeObject,
   nsAutoLock lock(gJavaXPCOMLock);
 
   *aResult = nsnull;
-  Entry* e = NS_STATIC_CAST(Entry*, PL_DHashTableOperate(mHashTable,
+  Entry* e = static_cast<Entry*>(PL_DHashTableOperate(mHashTable,
                                                          aNativeObject,
                                                          PL_DHASH_LOOKUP));
 
@@ -601,7 +601,7 @@ NativeToJavaProxyMap::Remove(JNIEnv* env, nsISupports* aNativeObject,
   // This is only called from finalizeProxy(), which already holds the lock.
   //  nsAutoLock lock(gJavaXPCOMLock);
 
-  Entry* e = NS_STATIC_CAST(Entry*, PL_DHashTableOperate(mHashTable,
+  Entry* e = static_cast<Entry*>(PL_DHashTableOperate(mHashTable,
                                                          aNativeObject,
                                                          PL_DHASH_LOOKUP));
 
@@ -661,7 +661,7 @@ DestroyXPTCMappingEnum(PLDHashTable* aTable, PLDHashEntryHdr* aHeader,
                        PRUint32 aNumber, void* aData)
 {
   JavaToXPTCStubMap::Entry* entry =
-                             NS_STATIC_CAST(JavaToXPTCStubMap::Entry*, aHeader);
+                             static_cast<JavaToXPTCStubMap::Entry*>(aHeader);
 
   // The XPTC stub will be released by the XPCOM side, if it hasn't been
   // already.  We just need to delete the Java global ref held by the XPTC stub,
@@ -689,8 +689,8 @@ JavaToXPTCStubMap::Add(jint aJavaObjectHashCode, nsJavaXPTCStub* aProxy)
 {
   nsAutoLock lock(gJavaXPCOMLock);
 
-  Entry* e = NS_STATIC_CAST(Entry*,
-                            PL_DHashTableOperate(mHashTable,
+  Entry* e = static_cast<Entry*>
+                        (PL_DHashTableOperate(mHashTable,
                                            NS_INT32_TO_PTR(aJavaObjectHashCode),
                                            PL_DHASH_ADD));
   if (!e)
@@ -727,8 +727,8 @@ JavaToXPTCStubMap::Find(jint aJavaObjectHashCode, const nsIID& aIID,
   nsAutoLock lock(gJavaXPCOMLock);
 
   *aResult = nsnull;
-  Entry* e = NS_STATIC_CAST(Entry*,
-                            PL_DHashTableOperate(mHashTable,
+  Entry* e = static_cast<Entry*>
+                        (PL_DHashTableOperate(mHashTable,
                                            NS_INT32_TO_PTR(aJavaObjectHashCode),
                                            PL_DHASH_LOOKUP));
 
@@ -845,7 +845,7 @@ JavaObjectToNativeInterface(JNIEnv* env, jobject aJavaObject, const nsIID& aIID,
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsISupports* rootObject =
-              NS_STATIC_CAST(JavaXPCOMInstance*, inst)->GetInstance();
+              static_cast<JavaXPCOMInstance*>(inst)->GetInstance();
     rv = rootObject->QueryInterface(aIID, aResult);
     NS_ENSURE_SUCCESS(rv, rv);
 
diff --git a/mozilla/extensions/java/xpcom/src/nsJavaXPTCStub.cpp b/mozilla/extensions/java/xpcom/src/nsJavaXPTCStub.cpp
index 4283d3733e1..229b0aeff44 100644
--- a/mozilla/extensions/java/xpcom/src/nsJavaXPTCStub.cpp
+++ b/mozilla/extensions/java/xpcom/src/nsJavaXPTCStub.cpp
@@ -250,7 +250,7 @@ nsJavaXPTCStub::QueryInterface(const nsID &aIID, void **aInstancePtr)
   // All Java objects support weak references
   if (aIID.Equals(NS_GET_IID(nsISupportsWeakReference)))
   {
-    *aInstancePtr = NS_STATIC_CAST(nsISupportsWeakReference*, master);
+    *aInstancePtr = static_cast<nsISupportsWeakReference*>(master);
     NS_ADDREF(master);
     return NS_OK;
   }
@@ -816,7 +816,7 @@ nsJavaXPTCStub::SetupJavaParams(const nsXPTParamInfo &aParamInfo,
       if (!aParamInfo.IsOut()) {  // 'in'
         ptr = aVariant.val.p;
       } else if (aVariant.val.p) {  // 'inout' & 'out'
-        void** variant = NS_STATIC_CAST(void**, aVariant.val.p);
+        void** variant = static_cast<void**>(aVariant.val.p);
         ptr = *variant;
       }
 
@@ -858,9 +858,9 @@ nsJavaXPTCStub::SetupJavaParams(const nsXPTParamInfo &aParamInfo,
     {
       nsID* iid = nsnull;
       if (!aParamInfo.IsOut()) {  // 'in'
-        iid = NS_STATIC_CAST(nsID*, aVariant.val.p);
+        iid = static_cast<nsID*>(aVariant.val.p);
       } else if (aVariant.val.p) {  // 'inout' & 'out'
-        nsID** variant = NS_STATIC_CAST(nsID**, aVariant.val.p);
+        nsID** variant = static_cast<nsID**>(aVariant.val.p);
         iid = *variant;
       }
 
@@ -900,9 +900,9 @@ nsJavaXPTCStub::SetupJavaParams(const nsXPTParamInfo &aParamInfo,
     {
       nsISupports* xpcom_obj = nsnull;
       if (!aParamInfo.IsOut()) {  // 'in'
-        xpcom_obj = NS_STATIC_CAST(nsISupports*, aVariant.val.p);
+        xpcom_obj = static_cast<nsISupports*>(aVariant.val.p);
       } else if (aVariant.val.p) {  // 'inout' & 'out'
-        nsISupports** variant = NS_STATIC_CAST(nsISupports**, aVariant.val.p);
+        nsISupports** variant = static_cast<nsISupports**>(aVariant.val.p);
         xpcom_obj = *variant;
       }
 
@@ -972,7 +972,7 @@ nsJavaXPTCStub::SetupJavaParams(const nsXPTParamInfo &aParamInfo,
         break;
       }
 
-      nsString* str = NS_STATIC_CAST(nsString*, aVariant.val.p);
+      nsString* str = static_cast<nsString*>(aVariant.val.p);
       if (!str) {
         rv = NS_ERROR_FAILURE;
         break;
@@ -1003,7 +1003,7 @@ nsJavaXPTCStub::SetupJavaParams(const nsXPTParamInfo &aParamInfo,
         break;
       }
 
-      nsCString* str = NS_STATIC_CAST(nsCString*, aVariant.val.p);
+      nsCString* str = static_cast<nsCString*>(aVariant.val.p);
       if (!str) {
         rv = NS_ERROR_FAILURE;
         break;
@@ -1027,7 +1027,7 @@ nsJavaXPTCStub::SetupJavaParams(const nsXPTParamInfo &aParamInfo,
     case nsXPTType::T_VOID:
     {
       if (!aParamInfo.IsOut()) {  // 'in'
-        aJValue.j = NS_REINTERPRET_CAST(jlong, aVariant.val.p);
+        aJValue.j = reinterpret_cast<jlong>(aVariant.val.p);
         aMethodSig.Append('J');
       } else {  // 'inout' & 'out'
         if (aVariant.val.p) {
@@ -1282,7 +1282,7 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo,
         if (tag == nsXPTType::T_DOUBLE)
           *((double *) aVariant.val.p) = value;
         else
-          *((PRUint64 *) aVariant.val.p) = NS_STATIC_CAST(PRUint64, value);
+          *((PRUint64 *) aVariant.val.p) = static_cast<PRUint64>(value);
       }
     }
     break;
@@ -1333,7 +1333,7 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo,
         str = (jstring) env->GetObjectArrayElement((jobjectArray) aJValue.l, 0);
       }
 
-      char** variant = NS_STATIC_CAST(char**, aVariant.val.p);
+      char** variant = static_cast<char**>(aVariant.val.p);
       if (str) {
         // Get string buffer
         const char* char_ptr = env->GetStringUTFChars(str, nsnull);
@@ -1379,7 +1379,7 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo,
         str = (jstring) env->GetObjectArrayElement((jobjectArray) aJValue.l, 0);
       }
 
-      PRUnichar** variant = NS_STATIC_CAST(PRUnichar**, aVariant.val.p);
+      PRUnichar** variant = static_cast<PRUnichar**>(aVariant.val.p);
       if (str) {
         // Get string buffer
         const jchar* wchar_ptr = env->GetStringChars(str, nsnull);
@@ -1429,7 +1429,7 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo,
         str = (jstring) env->GetObjectArrayElement((jobjectArray) aJValue.l, 0);
       }
 
-      nsID** variant = NS_STATIC_CAST(nsID**, aVariant.val.p);
+      nsID** variant = static_cast<nsID**>(aVariant.val.p);
       if (str) {
         // Get string buffer
         const char* char_ptr = env->GetStringUTFChars(str, nsnull);
@@ -1526,7 +1526,7 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo,
 
       // For 'inout' params, if the resulting xpcom value is different than the
       // one passed in, then we must release the incoming xpcom value.
-      nsISupports** variant = NS_STATIC_CAST(nsISupports**, aVariant.val.p);
+      nsISupports** variant = static_cast<nsISupports**>(aVariant.val.p);
       if (aParamInfo.IsIn() && *variant) {
         nsCOMPtr<nsISupports> in = do_QueryInterface(*variant);
         nsCOMPtr<nsISupports> out = do_QueryInterface((nsISupports*) xpcom_obj);
@@ -1535,7 +1535,7 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo,
         }
       }
 
-      *(NS_STATIC_CAST(void**, aVariant.val.p)) = xpcom_obj;
+      *(static_cast<void**>(aVariant.val.p)) = xpcom_obj;
     }
     break;
 
@@ -1549,7 +1549,7 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo,
       }
 
       jstring jstr = (jstring) aJValue.l;
-      nsString* variant = NS_STATIC_CAST(nsString*, aVariant.val.p);
+      nsString* variant = static_cast<nsString*>(aVariant.val.p);
       
       if (jstr) {
         // Get string buffer
@@ -1579,7 +1579,7 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo,
       }
 
       jstring jstr = (jstring) aJValue.l;
-      nsCString* variant = NS_STATIC_CAST(nsCString*, aVariant.val.p);
+      nsCString* variant = static_cast<nsCString*>(aVariant.val.p);
       
       if (jstr) {
         // Get string buffer
@@ -1602,7 +1602,7 @@ nsJavaXPTCStub::FinalizeJavaParams(const nsXPTParamInfo &aParamInfo,
     case nsXPTType::T_VOID:
     {
       if (aParamInfo.IsRetval()) {  // 'retval'
-        aVariant.val.p = NS_REINTERPRET_CAST(void*, aJValue.j);
+        aVariant.val.p = reinterpret_cast<void*>(aJValue.j);
       } else if (aJValue.l) {  // 'inout' & 'out'
         env->GetLongArrayRegion((jlongArray) aJValue.l, 0, 1,
                                 (jlong*) aVariant.val.p);
diff --git a/mozilla/extensions/layout-debug/src/nsLayoutDebuggingTools.cpp b/mozilla/extensions/layout-debug/src/nsLayoutDebuggingTools.cpp
index 4471801266c..090b18e4e3f 100644
--- a/mozilla/extensions/layout-debug/src/nsLayoutDebuggingTools.cpp
+++ b/mozilla/extensions/layout-debug/src/nsLayoutDebuggingTools.cpp
@@ -348,11 +348,11 @@ static void DumpAWebShell(nsIDocShellTreeItem* aShellItem, FILE* out, PRInt32 aI
     for (i = aIndent; --i >= 0; )
         fprintf(out, "  ");
 
-    fprintf(out, "%p '", NS_STATIC_CAST(void*, aShellItem));
+    fprintf(out, "%p '", static_cast<void*>(aShellItem));
     aShellItem->GetName(getter_Copies(name));
     aShellItem->GetSameTypeParent(getter_AddRefs(parent));
     fputs(NS_LossyConvertUTF16toASCII(name).get(), out);
-    fprintf(out, "' parent=%p <\n", NS_STATIC_CAST(void*, parent));
+    fprintf(out, "' parent=%p <\n", static_cast<void*>(parent));
 
     ++aIndent;
     nsCOMPtr<nsIDocShellTreeNode> shellAsNode(do_QueryInterface(aShellItem));
@@ -384,7 +384,7 @@ DumpContentRecur(nsIDocShell* aDocShell, FILE* out)
 {
 #ifdef DEBUG
     if (nsnull != aDocShell) {
-        fprintf(out, "docshell=%p \n", NS_STATIC_CAST(void*, aDocShell));
+        fprintf(out, "docshell=%p \n", static_cast<void*>(aDocShell));
         nsCOMPtr<nsIDocument> doc(document(aDocShell));
         if (doc) {
             nsIContent *root = doc->GetRootContent();
@@ -422,7 +422,7 @@ static void
 DumpFramesRecur(nsIDocShell* aDocShell, FILE* out)
 {
     if (nsnull != aDocShell) {
-        fprintf(out, "webshell=%p \n", NS_STATIC_CAST(void*, aDocShell));
+        fprintf(out, "webshell=%p \n", static_cast<void*>(aDocShell));
         nsCOMPtr<nsIPresShell> shell(pres_shell(aDocShell));
         if (shell) {
             nsIFrame* root = shell->GetRootFrame();
@@ -465,7 +465,7 @@ DumpViewsRecur(nsIDocShell* aDocShell, FILE* out)
 {
 #ifdef DEBUG
     if (aDocShell) {
-        fprintf(out, "docshell=%p \n", NS_STATIC_CAST(void*, aDocShell));
+        fprintf(out, "docshell=%p \n", static_cast<void*>(aDocShell));
         nsCOMPtr<nsIViewManager> vm(view_manager(aDocShell));
         if (vm) {
             nsIView* root;
diff --git a/mozilla/extensions/metrics/src/nsLoadCollector.cpp b/mozilla/extensions/metrics/src/nsLoadCollector.cpp
index 9c374ff504f..20eb7cb6150 100644
--- a/mozilla/extensions/metrics/src/nsLoadCollector.cpp
+++ b/mozilla/extensions/metrics/src/nsLoadCollector.cpp
@@ -475,8 +475,8 @@ nsLoadCollector::OnAttach()
 nsLoadCollector::RemoveDocumentFromMap(const nsIDocument *document,
                                        DocumentEntry &entry, void *userData)
 {
-  nsIDocument *mutable_doc = NS_CONST_CAST(nsIDocument*, document);
-  mutable_doc->RemoveObserver(NS_STATIC_CAST(nsLoadCollector*, userData));
+  nsIDocument *mutable_doc = const_cast<nsIDocument*>(document);
+  mutable_doc->RemoveObserver(static_cast<nsLoadCollector*>(userData));
   return PL_DHASH_REMOVE;
 }
 
@@ -526,7 +526,7 @@ nsLoadCollector::EndUpdate(nsIDocument *document, nsUpdateType updateType)
 void
 nsLoadCollector::NodeWillBeDestroyed(const nsINode *node)
 {
-  const nsIDocument* document = NS_STATIC_CAST(const nsIDocument*, node);
+  const nsIDocument* document = static_cast<const nsIDocument*>(node);
   // Look up the document to get its id.
   DocumentEntry entry;
   if (!mDocumentMap.Get(document, &entry)) {
diff --git a/mozilla/extensions/metrics/src/nsMetricsConfig.cpp b/mozilla/extensions/metrics/src/nsMetricsConfig.cpp
index 836d1653044..74b46a09aa7 100644
--- a/mozilla/extensions/metrics/src/nsMetricsConfig.cpp
+++ b/mozilla/extensions/metrics/src/nsMetricsConfig.cpp
@@ -417,7 +417,7 @@ nsMetricsConfig::ClearEvents()
 /* static */ PLDHashOperator PR_CALLBACK
 nsMetricsConfig::CopyKey(nsStringHashKey *entry, void *userData)
 {
-  NS_STATIC_CAST(nsTArray<nsString> *, userData)->
+  static_cast<nsTArray<nsString> *>(userData)->
     AppendElement(entry->GetKey());
   return PL_DHASH_NEXT;
 }
diff --git a/mozilla/extensions/metrics/src/nsMetricsService.cpp b/mozilla/extensions/metrics/src/nsMetricsService.cpp
index 8be5f4bafca..2c2012697b3 100644
--- a/mozilla/extensions/metrics/src/nsMetricsService.cpp
+++ b/mozilla/extensions/metrics/src/nsMetricsService.cpp
@@ -273,7 +273,7 @@ nsMetricsService::BadCertListener::GetInterface(const nsIID &uuid,
   NS_ENSURE_ARG_POINTER(result);
 
   if (uuid.Equals(NS_GET_IID(nsIBadCertListener))) {
-    *result = NS_STATIC_CAST(nsIBadCertListener *, this);
+    *result = static_cast<nsIBadCertListener *>(this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
@@ -871,7 +871,7 @@ nsMetricsService::PruneDisabledCollectors(const nsAString &key,
                                           void *userData)
 {
   DisabledCollectorsClosure *dc =
-    NS_STATIC_CAST(DisabledCollectorsClosure *, userData);
+    static_cast<DisabledCollectorsClosure *>(userData);
 
   // The frozen string API doesn't expose operator==, so we can't use
   // IndexOf() here.
@@ -951,7 +951,7 @@ CopySegmentToStream(nsIInputStream *inStr,
                     PRUint32 count,
                     PRUint32 *countWritten)
 {
-  nsIOutputStream *outStr = NS_STATIC_CAST(nsIOutputStream *, closure);
+  nsIOutputStream *outStr = static_cast<nsIOutputStream *>(closure);
   *countWritten = 0;
   while (count) {
     PRUint32 n;
@@ -1552,7 +1552,7 @@ nsMetricsService::GenerateClientID(nsCString &clientID)
   nsMetricsUtils::GetRandomNoise(input.b, sizeof(input.b));
 
   return HashBytes(
-      NS_REINTERPRET_CAST(const PRUint8 *, &input), sizeof(input), clientID);
+      reinterpret_cast<const PRUint8 *>(&input), sizeof(input), clientID);
 }
 
 nsresult
@@ -1574,7 +1574,7 @@ nsMetricsService::HashBytes(const PRUint8 *bytes, PRUint32 length,
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
-  PL_Base64Encode(NS_REINTERPRET_CAST(char*, buf), resultLength, resultBuffer);
+  PL_Base64Encode(reinterpret_cast<char*>(buf), resultLength, resultBuffer);
 
   // Size the string to its null-terminated length
   result.SetLength(strlen(resultBuffer));
@@ -1626,7 +1626,7 @@ nsMetricsService::HashUTF8(const nsCString &str, nsCString &hashed)
   }
 
   return HashBytes(
-      NS_REINTERPRET_CAST(const PRUint8 *, str.get()), str.Length(), hashed);
+      reinterpret_cast<const PRUint8 *>(str.get()), str.Length(), hashed);
 }
 
 /* static */ nsresult
@@ -1727,7 +1727,7 @@ nsMetricsUtils::GetRandomNoise(void *buf, PRSize size)
   PRSize nbytes = 0;
   while (nbytes < size) {
     PRSize n = PR_GetRandomNoise(
-        NS_STATIC_CAST(char *, buf) + nbytes, size - nbytes);
+        static_cast<char *>(buf) + nbytes, size - nbytes);
     if (n == 0) {
       MS_LOG(("Couldn't get any random bytes"));
       return PR_FALSE;
diff --git a/mozilla/extensions/metrics/src/nsUICommandCollector.cpp b/mozilla/extensions/metrics/src/nsUICommandCollector.cpp
index 1faf34a943f..db8c89bde55 100644
--- a/mozilla/extensions/metrics/src/nsUICommandCollector.cpp
+++ b/mozilla/extensions/metrics/src/nsUICommandCollector.cpp
@@ -71,14 +71,14 @@ PLDHashOperator PR_CALLBACK nsUICommandCollector::AddCommandEventListener(
 const nsIDOMWindow* key, PRUint32 windowID, void* userArg)
 {
   nsCOMPtr<nsIDOMEventTarget> windowTarget =
-    do_QueryInterface(NS_CONST_CAST(nsIDOMWindow *, key));
+    do_QueryInterface(const_cast<nsIDOMWindow *>(key));
   if (!windowTarget) {
     MS_LOG(("Error casting domeventtarget"));
     return PL_DHASH_NEXT;
   }
 
-  nsUICommandCollector* collector = NS_STATIC_CAST(nsUICommandCollector*,
-                                                   userArg);
+  nsUICommandCollector* collector = static_cast<nsUICommandCollector*>
+                                               (userArg);
   collector->AddEventListeners(windowTarget);
   return PL_DHASH_NEXT;
 }
@@ -88,14 +88,14 @@ PLDHashOperator PR_CALLBACK nsUICommandCollector::RemoveCommandEventListener(
 const nsIDOMWindow* key, PRUint32 windowID, void* userArg)
 {
   nsCOMPtr<nsIDOMEventTarget> windowTarget =
-    do_QueryInterface(NS_CONST_CAST(nsIDOMWindow *, key));
+    do_QueryInterface(const_cast<nsIDOMWindow *>(key));
   if (!windowTarget) {
     MS_LOG(("Error casting domeventtarget"));
     return PL_DHASH_NEXT;
   }
 
-  nsUICommandCollector* collector = NS_STATIC_CAST(nsUICommandCollector*,
-                                                   userArg);
+  nsUICommandCollector* collector = static_cast<nsUICommandCollector*>
+                                               (userArg);
   collector->RemoveEventListeners(windowTarget);
   return PL_DHASH_NEXT;
 }
@@ -127,7 +127,7 @@ nsUICommandCollector::OnAttach()
   NS_ENSURE_STATE(ms);
 
   ms->WindowMap().EnumerateRead(AddCommandEventListener,
-                                NS_STATIC_CAST(nsIDOMEventListener*, this));
+                                static_cast<nsIDOMEventListener*>(this));
 
   return NS_OK;
 }
@@ -152,7 +152,7 @@ nsUICommandCollector::OnDetach()
   NS_ENSURE_STATE(ms);
 
   ms->WindowMap().EnumerateRead(RemoveCommandEventListener,
-    NS_STATIC_CAST(nsIDOMEventListener*, this));
+    static_cast<nsIDOMEventListener*>(this));
 
   return NS_OK;
 }
diff --git a/mozilla/extensions/metrics/src/nsWindowCollector.cpp b/mozilla/extensions/metrics/src/nsWindowCollector.cpp
index 25ef15aa5e2..06661223cd8 100644
--- a/mozilla/extensions/metrics/src/nsWindowCollector.cpp
+++ b/mozilla/extensions/metrics/src/nsWindowCollector.cpp
@@ -125,7 +125,7 @@ struct WindowOpenClosure
 /* static */ void
 nsWindowCollector::WindowOpenCallback(nsITimer *timer, void *closure)
 {
-  WindowOpenClosure *wc = NS_STATIC_CAST(WindowOpenClosure *, closure);
+  WindowOpenClosure *wc = static_cast<WindowOpenClosure *>(closure);
   wc->collector->LogWindowOpen(timer, wc->subject);
 
   delete wc;
diff --git a/mozilla/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp b/mozilla/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp
index 3fb1cd73478..159cc7cfb44 100644
--- a/mozilla/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp
+++ b/mozilla/extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp
@@ -156,7 +156,7 @@ nsresult CentralizedAdminPrefManagerInit()
 
     // Create a new Security Manger and set it for the new JS context
     nsCOMPtr<nsIXPCSecurityManager> secman =
-        NS_STATIC_CAST(nsIXPCSecurityManager*, new AutoConfigSecMan());
+        static_cast<nsIXPCSecurityManager*>(new AutoConfigSecMan());
     xpc->SetSecurityManagerForJSContext(autoconfig_cx, secman, 0);
 
     autoconfig_glob = JS_NewObject(autoconfig_cx, &global_class, NULL, NULL);
diff --git a/mozilla/extensions/pref/autoconfig/src/nsLDAPSyncQuery.cpp b/mozilla/extensions/pref/autoconfig/src/nsLDAPSyncQuery.cpp
index 1de5f1f0eb3..5d6e4111256 100644
--- a/mozilla/extensions/pref/autoconfig/src/nsLDAPSyncQuery.cpp
+++ b/mozilla/extensions/pref/autoconfig/src/nsLDAPSyncQuery.cpp
@@ -146,7 +146,7 @@ nsLDAPSyncQuery::OnLDAPInit(nsILDAPConnection *aConn, nsresult aStatus)
     //
     rv = NS_GetProxyForObject(NS_PROXY_TO_CURRENT_THREAD,
                               NS_GET_IID(nsILDAPMessageListener), 
-                              NS_STATIC_CAST(nsILDAPMessageListener *, this),
+                              static_cast<nsILDAPMessageListener *>(this),
                               NS_PROXY_ASYNC | NS_PROXY_ALWAYS, 
                               getter_AddRefs(selfProxy));
     if (NS_FAILED(rv)) {
@@ -285,7 +285,7 @@ nsLDAPSyncQuery::StartLDAPSearch()
     //
     rv = NS_GetProxyForObject(NS_PROXY_TO_CURRENT_THREAD, 
                               NS_GET_IID(nsILDAPMessageListener),
-                              NS_STATIC_CAST(nsILDAPMessageListener *, this),
+                              static_cast<nsILDAPMessageListener *>(this),
                               NS_PROXY_ASYNC | NS_PROXY_ALWAYS,
                               getter_AddRefs(selfProxy));
     if (NS_FAILED(rv)) {
@@ -343,7 +343,7 @@ nsLDAPSyncQuery::StartLDAPSearch()
     // time to kick off the search.
     //
     rv = mOperation->SearchExt(dn, scope, urlFilter, mAttrCount,
-                               NS_CONST_CAST(const char **, mAttrs), 0, 0);
+                               const_cast<const char **>(mAttrs), 0, 0);
 
     if (NS_FAILED(rv)) {
         FinishLDAPQuery();
@@ -409,7 +409,7 @@ nsresult nsLDAPSyncQuery::InitConnection()
     //
     rv = NS_GetProxyForObject(NS_PROXY_TO_CURRENT_THREAD,
                               NS_GET_IID(nsILDAPMessageListener), 
-                              NS_STATIC_CAST(nsILDAPMessageListener *, this), 
+                              static_cast<nsILDAPMessageListener *>(this), 
                               NS_PROXY_ASYNC | NS_PROXY_ALWAYS, 
                               getter_AddRefs(selfProxy));
     if (NS_FAILED(rv)) {
diff --git a/mozilla/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp b/mozilla/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp
index a7071c81391..67af7d25475 100644
--- a/mozilla/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp
+++ b/mozilla/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp
@@ -212,7 +212,7 @@ struct SysPrefCallbackData {
 PRBool PR_CALLBACK
 sysPrefDeleteObserver(void *aElement, void *aData) {
     SysPrefCallbackData *pElement =
-        NS_STATIC_CAST(SysPrefCallbackData *, aElement);
+        static_cast<SysPrefCallbackData *>(aElement);
     NS_RELEASE(pElement->observer);
     nsMemory::Free(pElement);
     return PR_TRUE;
@@ -520,7 +520,7 @@ nsSystemPrefService::OnPrefChange(PRUint32 aPrefAtom, void *aData)
         observer = do_QueryInterface(pData->observer);
 
     if (observer)
-        observer->Observe(NS_STATIC_CAST(nsIPrefBranch *, this),
+        observer->Observe(static_cast<nsIPrefBranch *>(this),
                           NS_SYSTEMPREF_PREFCHANGE_TOPIC_ID,
                           NS_ConvertUTF8toUTF16(mGConf->GetMozKey(aPrefAtom)).
                           get());
@@ -908,7 +908,7 @@ void gconf_key_listener (void* client, guint cnxn_id,
     SYSPREF_LOG(("...SYSPREF_LOG...key listener get called \n"));
     if (!user_data)
         return;
-    GConfCallbackData *pData = NS_REINTERPRET_CAST(GConfCallbackData *,
-                                                   user_data);
+    GConfCallbackData *pData = reinterpret_cast<GConfCallbackData *>
+                                               (user_data);
     pData->proxy->OnNotify(client, entry, cnxn_id, pData);
 }
diff --git a/mozilla/extensions/python/dom/src/nsPyTimeout.cpp b/mozilla/extensions/python/dom/src/nsPyTimeout.cpp
index 74d56a2894e..14516be44cd 100644
--- a/mozilla/extensions/python/dom/src/nsPyTimeout.cpp
+++ b/mozilla/extensions/python/dom/src/nsPyTimeout.cpp
@@ -146,5 +146,5 @@ nsresult CreatePyTimeoutHandler(const nsAString &aExpr,
   if (!aRet)
     return NS_ERROR_OUT_OF_MEMORY;
   return (*aRet)->QueryInterface(NS_GET_IID(nsIScriptTimeoutHandler),
-                                 NS_REINTERPRET_CAST(void **, aRet));
+                                 reinterpret_cast<void **>(aRet));
 }
diff --git a/mozilla/extensions/python/xpcom/src/PyIComponentManager.cpp b/mozilla/extensions/python/xpcom/src/PyIComponentManager.cpp
index c3b891120d4..44ae4c5f42d 100644
--- a/mozilla/extensions/python/xpcom/src/PyIComponentManager.cpp
+++ b/mozilla/extensions/python/xpcom/src/PyIComponentManager.cpp
@@ -54,7 +54,7 @@ static nsIComponentManager *GetI(PyObject *self) {
 		PyErr_SetString(PyExc_TypeError, "This object is not the correct interface");
 		return NULL;
 	}
-	return NS_STATIC_CAST(nsIComponentManager*, Py_nsISupports::GetI(self));
+	return static_cast<nsIComponentManager*>(Py_nsISupports::GetI(self));
 }
 
 static PyObject *PyCreateInstanceByContractID(PyObject *self, PyObject *args)
diff --git a/mozilla/extensions/schema-validation/src/nsSchemaValidator.h b/mozilla/extensions/schema-validation/src/nsSchemaValidator.h
index 0149d10cb7e..9206baed153 100644
--- a/mozilla/extensions/schema-validation/src/nsSchemaValidator.h
+++ b/mozilla/extensions/schema-validation/src/nsSchemaValidator.h
@@ -358,7 +358,7 @@ ReleaseObject(void    *aObject,
               void    *aPropertyValue,
               void    *aData)
 {
-  NS_STATIC_CAST(nsISupports *, aPropertyValue)->Release();
+  static_cast<nsISupports *>(aPropertyValue)->Release();
 }
 
 protected:
diff --git a/mozilla/extensions/schema-validation/src/nsSchemaValidatorUtils.cpp b/mozilla/extensions/schema-validation/src/nsSchemaValidatorUtils.cpp
index aa3ccdb6e20..31f3449397f 100644
--- a/mozilla/extensions/schema-validation/src/nsSchemaValidatorUtils.cpp
+++ b/mozilla/extensions/schema-validation/src/nsSchemaValidatorUtils.cpp
@@ -1061,7 +1061,7 @@ nsSchemaValidatorUtils::ParseSchemaDuration(const nsAString & aStrValue,
                 done = PR_TRUE;
               } else {
                 fractionSecond = modf(temp2, &intpart);
-                second = NS_STATIC_CAST(PRUint32, intpart);
+                second = static_cast<PRUint32>(intpart);
               }
             } else {
               if (!IsValidSchemaInteger(parseBuffer, &temp, PR_TRUE))
diff --git a/mozilla/extensions/spatialnavigation/src/nsSpatialNavigation.cpp b/mozilla/extensions/spatialnavigation/src/nsSpatialNavigation.cpp
index 7df7fa9c190..bf191f214b0 100755
--- a/mozilla/extensions/spatialnavigation/src/nsSpatialNavigation.cpp
+++ b/mozilla/extensions/spatialnavigation/src/nsSpatialNavigation.cpp
@@ -327,7 +327,7 @@ nsSpatialNavigation::Init(nsIDOMWindow *aWindow)
     return rv;  
   
   target->AddGroupedEventListener(NS_LITERAL_STRING("keypress"),
-                                  NS_STATIC_CAST(nsIDOMKeyListener*, this),
+                                  static_cast<nsIDOMKeyListener*>(this),
                                   PR_FALSE, 
                                   systemGroup);
   
@@ -344,7 +344,7 @@ nsSpatialNavigation::Shutdown()
     return rv;
   
   target->RemoveGroupedEventListener(NS_LITERAL_STRING("keypress"),
-                                     NS_STATIC_CAST(nsIDOMKeyListener*, this),
+                                     static_cast<nsIDOMKeyListener*>(this),
                                      PR_FALSE, 
                                      systemGroup);
   mTopWindow = nsnull;
@@ -420,7 +420,7 @@ void DoTraversal(int aDirection,
     
     nsISupports* currentItem;
     aFrameTraversal->CurrentItem(&currentItem);
-    frame = NS_STATIC_CAST(nsIFrame*, currentItem);
+    frame = static_cast<nsIFrame*>(currentItem);
 
     if (!frame)
       break;
diff --git a/mozilla/extensions/spellcheck/src/mozInlineSpellChecker.cpp b/mozilla/extensions/spellcheck/src/mozInlineSpellChecker.cpp
index 0fb1a12b268..eb3ac08e912 100644
--- a/mozilla/extensions/spellcheck/src/mozInlineSpellChecker.cpp
+++ b/mozilla/extensions/spellcheck/src/mozInlineSpellChecker.cpp
@@ -628,9 +628,9 @@ mozInlineSpellChecker::RegisterEventListeners()
   nsCOMPtr<nsPIDOMEventTarget> piTarget = do_QueryInterface(doc, &rv);
   NS_ENSURE_SUCCESS(rv, rv); 
 
-  piTarget->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*, this),
+  piTarget->AddEventListenerByIID(static_cast<nsIDOMMouseListener*>(this),
                                   NS_GET_IID(nsIDOMMouseListener));
-  piTarget->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*, this),
+  piTarget->AddEventListenerByIID(static_cast<nsIDOMKeyListener*>(this),
                                   NS_GET_IID(nsIDOMKeyListener));
 
   return NS_OK;
@@ -653,9 +653,9 @@ mozInlineSpellChecker::UnregisterEventListeners()
   nsCOMPtr<nsPIDOMEventTarget> piTarget = do_QueryInterface(doc);
   NS_ENSURE_TRUE(piTarget, NS_ERROR_NULL_POINTER);
 
-  piTarget->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*, this),
+  piTarget->RemoveEventListenerByIID(static_cast<nsIDOMMouseListener*>(this),
                                      NS_GET_IID(nsIDOMMouseListener));
-  piTarget->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*, this),
+  piTarget->RemoveEventListenerByIID(static_cast<nsIDOMKeyListener*>(this),
                                      NS_GET_IID(nsIDOMKeyListener));
   
   return NS_OK;
diff --git a/mozilla/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp b/mozilla/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
index bb71b996e88..900380daa5c 100644
--- a/mozilla/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
+++ b/mozilla/extensions/spellcheck/src/mozInlineSpellWordUtil.cpp
@@ -536,7 +536,7 @@ static void
 CheckLeavingBreakElement(nsIDOMNode* aNode, void* aClosure)
 {
   CheckLeavingBreakElementClosure* cl =
-    NS_STATIC_CAST(CheckLeavingBreakElementClosure*, aClosure);
+    static_cast<CheckLeavingBreakElementClosure*>(aClosure);
   if (!cl->mLeftBreakElement && IsBreakElement(cl->mDocView, aNode)) {
     cl->mLeftBreakElement = PR_TRUE;
   }
diff --git a/mozilla/extensions/spellcheck/src/mozPersonalDictionary.cpp b/mozilla/extensions/spellcheck/src/mozPersonalDictionary.cpp
index 2805f6e234d..e4c907ceefa 100644
--- a/mozilla/extensions/spellcheck/src/mozPersonalDictionary.cpp
+++ b/mozilla/extensions/spellcheck/src/mozPersonalDictionary.cpp
@@ -158,7 +158,7 @@ NS_IMETHODIMP mozPersonalDictionary::Load()
 PR_STATIC_CALLBACK(PLDHashOperator)
 AddHostToStringArray(nsUniCharEntry *aEntry, void *aArg)
 {
-  NS_STATIC_CAST(nsStringArray*, aArg)->AppendString(nsDependentString(aEntry->GetKey()));
+  static_cast<nsStringArray*>(aArg)->AppendString(nsDependentString(aEntry->GetKey()));
   return PL_DHASH_NEXT;
 }
 
diff --git a/mozilla/extensions/sql/base/src/mozSqlResult.cpp b/mozilla/extensions/sql/base/src/mozSqlResult.cpp
index c9124bedc53..b651d241ddb 100644
--- a/mozilla/extensions/sql/base/src/mozSqlResult.cpp
+++ b/mozilla/extensions/sql/base/src/mozSqlResult.cpp
@@ -416,7 +416,7 @@ mozSqlResult::GetTarget(nsIRDFResource* aSource,
   *_retval = nsnull;
 
   nsVoidKey key(aSource);
-  Row* row = NS_STATIC_CAST(Row*, mSources.Get(&key));
+  Row* row = static_cast<Row*>(mSources.Get(&key));
   if (! row)
     return NS_RDF_NO_VALUE;
 
@@ -543,7 +543,7 @@ mozSqlResult::HasAssertion(nsIRDFResource* aSource,
       aProperty == kNC_Child &&
       aTruthValue) {
     nsVoidKey key(aTarget);
-    Row* row = NS_STATIC_CAST(Row*, mSources.Get(&key));
+    Row* row = static_cast<Row*>(mSources.Get(&key));
     if (row)
       *_retval = PR_TRUE;
   }
diff --git a/mozilla/extensions/sql/base/src/mozSqlService.cpp b/mozilla/extensions/sql/base/src/mozSqlService.cpp
index fb0c6a2293b..55dbc75a111 100644
--- a/mozilla/extensions/sql/base/src/mozSqlService.cpp
+++ b/mozilla/extensions/sql/base/src/mozSqlService.cpp
@@ -374,7 +374,7 @@ mozSqlService::GetConnection(nsIRDFResource* aAlias, mozISqlConnection **_retval
   nsCOMPtr<mozISqlConnection> conn;
 
   if (mConnectionCache) {
-    weakRef = getter_AddRefs(NS_STATIC_CAST(nsIWeakReference*, mConnectionCache->Get(&key)));
+    weakRef = getter_AddRefs(static_cast<nsIWeakReference*>(mConnectionCache->Get(&key)));
     if (weakRef) {
       conn = do_QueryReferent(weakRef);
       if (conn)
diff --git a/mozilla/extensions/tridentprofile/src/nsTridentPreferencesWin.cpp b/mozilla/extensions/tridentprofile/src/nsTridentPreferencesWin.cpp
index bb2baa4006c..e3dc0c0a231 100644
--- a/mozilla/extensions/tridentprofile/src/nsTridentPreferencesWin.cpp
+++ b/mozilla/extensions/tridentprofile/src/nsTridentPreferencesWin.cpp
@@ -84,7 +84,7 @@ TranslateYNtoTF(unsigned char *aRegValue, DWORD aRegValueLength,
 
   if (aRegValueType == REG_SZ && aRegValue[0] != 0) {
     // strcmp is safe; it's bounded by its second parameter
-    prefIntValue = strcmp(NS_REINTERPRET_CAST(char *, aRegValue), "yes") == 0;
+    prefIntValue = strcmp(reinterpret_cast<char *>(aRegValue), "yes") == 0;
     prefs->SetBoolPref(aPrefKeyName, prefIntValue);
   }
 }
@@ -103,7 +103,7 @@ TranslateYNtoFT(unsigned char *aRegValue, DWORD aRegValueLength,
 
   if (aRegValueType == REG_SZ && aRegValue[0] != 0) {
     // strcmp is safe; it's bounded by its second parameter
-    prefIntValue = strcmp(NS_REINTERPRET_CAST(char *, aRegValue), "yes") != 0;
+    prefIntValue = strcmp(reinterpret_cast<char *>(aRegValue), "yes") != 0;
     prefs->SetBoolPref(aPrefKeyName, prefIntValue);
   }
 }
@@ -123,7 +123,7 @@ TranslateDRGBtoHRGB(unsigned char *aRegValue, DWORD aRegValueLength,
 
   if (aRegValueType == REG_SZ && aRegValue[0] != 0) {
     int red, green, blue;
-    ::sscanf(NS_REINTERPRET_CAST(char *, aRegValue), "%d,%d,%d",
+    ::sscanf(reinterpret_cast<char *>(aRegValue), "%d,%d,%d",
              &red, &green, &blue);
     ::sprintf(prefStringValue, "#%02X%02X%02X", red, green, blue);
     prefs->SetCharPref(aPrefKeyName, prefStringValue);
@@ -143,7 +143,7 @@ TranslateDWORDtoPRInt32(unsigned char *aRegValue, DWORD aRegValueLength,
     NS_WARNING("unexpected signed int data type");
 
   if (aRegValueType == REG_DWORD) {
-    prefIntValue = *(NS_REINTERPRET_CAST(DWORD *, aRegValue));
+    prefIntValue = *(reinterpret_cast<DWORD *>(aRegValue));
     prefs->SetIntPref(aPrefKeyName, prefIntValue);
   }
 }
@@ -159,7 +159,7 @@ TranslateString(unsigned char *aRegValue, DWORD aRegValueLength,
 
   if (aRegValueType == REG_SZ)
     prefs->SetCharPref(aPrefKeyName,
-                       NS_REINTERPRET_CAST(char *, aRegValue));
+                       reinterpret_cast<char *>(aRegValue));
 }
 
 // translate homepage
@@ -174,12 +174,12 @@ TranslateHomepage(unsigned char *aRegValue, DWORD aRegValueLength,
 
   if (aRegValueType == REG_SZ) {
     // strcmp is safe; it's bounded by its second parameter
-    if (strcmp(NS_REINTERPRET_CAST(char *, aRegValue), "about:blank") == 0)
+    if (strcmp(reinterpret_cast<char *>(aRegValue), "about:blank") == 0)
       prefs->SetIntPref("browser.startup.page", 0);
     else {
       prefs->SetIntPref("browser.startup.page", 1);
       prefs->SetCharPref(aPrefKeyName,
-                        NS_REINTERPRET_CAST(char *, aRegValue));
+                        reinterpret_cast<char *>(aRegValue));
     }
   }
 }
@@ -202,7 +202,7 @@ TranslateLanglist(unsigned char *aRegValue, DWORD aRegValueLength,
   // copy source format like "en-us,ar-kw;q=0.7,ar-om;q=0.3" into
   // destination format like "en-us, ar-kw, ar-om"
 
-  char   *source = NS_REINTERPRET_CAST(char *, aRegValue),
+  char   *source = reinterpret_cast<char *>(aRegValue),
          *dest = prefStringValue,
          *sourceEnd = source + aRegValueLength,
          *destEnd = dest + (MAX_PATH-2); // room for " \0"
@@ -245,18 +245,18 @@ TranslatePropFont(unsigned char *aRegValue, DWORD aRegValueLength,
   // serif or sans-serif font?
   lf.lfCharSet = DEFAULT_CHARSET;
   lf.lfPitchAndFamily = 0;
-  PL_strncpyz(lf.lfFaceName, NS_REINTERPRET_CAST(char *, aRegValue),
+  PL_strncpyz(lf.lfFaceName, reinterpret_cast<char *>(aRegValue),
               LF_FACESIZE);
   ::EnumFontFamiliesEx(dc, &lf, fontEnumProc, (LPARAM) &isSerif, 0);
   ::ReleaseDC(0, dc);
 
   if (isSerif) {
     prefs->SetCharPref("font.name.serif.x-western",
-                       NS_REINTERPRET_CAST(char *, aRegValue));
+                       reinterpret_cast<char *>(aRegValue));
     prefs->SetCharPref("font.default.x-western", "serif");
   } else {
     prefs->SetCharPref("font.name.sans-serif.x-western",
-                       NS_REINTERPRET_CAST(char *, aRegValue));
+                       reinterpret_cast<char *>(aRegValue));
     prefs->SetCharPref("font.default.x-western", "sans-serif");
   }
 }
@@ -709,13 +709,13 @@ nsTridentPreferencesWin::CopyStyleSheet() {
   
   regLength = sizeof(DWORD);
   if (::RegQueryValueEx(regKey, "Use My Stylesheet", 0, &regType,
-                        NS_REINTERPRET_CAST(unsigned char *, &regDWordValue),
+                        reinterpret_cast<unsigned char *>(&regDWordValue),
                         &regLength) == ERROR_SUCCESS &&
       regType == REG_DWORD && regDWordValue == 1) {
 
     regLength = MAX_PATH;
     if (::RegQueryValueEx(regKey, "User Stylesheet", 0, &regType,
-                          NS_REINTERPRET_CAST(unsigned char *, tridentFilename),
+                          reinterpret_cast<unsigned char *>(tridentFilename),
                           &regLength)
         == ERROR_SUCCESS) {
 
diff --git a/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp b/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp
index 8d422a7fcf0..08691a21506 100644
--- a/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp
+++ b/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp
@@ -2279,7 +2279,7 @@ nsTypeAheadFind::RemoveWindowListeners(nsIDOMWindow *aDOMWin)
   nsCOMPtr<nsIDOM3EventTarget> target(do_QueryInterface(piTarget));
 
   target->RemoveGroupedEventListener(NS_LITERAL_STRING("keypress"),
-                                     NS_STATIC_CAST(nsIDOMKeyListener*, this),
+                                     static_cast<nsIDOMKeyListener*>(this),
                                      PR_FALSE, systemGroup);
 
   if (aDOMWin == mFocusedWindow) {
@@ -2288,7 +2288,7 @@ nsTypeAheadFind::RemoveWindowListeners(nsIDOMWindow *aDOMWin)
 
   // Remove menu listeners
   nsIDOMEventListener *genericEventListener = 
-    NS_STATIC_CAST(nsIDOMEventListener*, NS_STATIC_CAST(nsIDOMKeyListener*, this));
+    static_cast<nsIDOMEventListener*>(static_cast<nsIDOMKeyListener*>(this));
 
   chromeEventHandler->RemoveEventListener(NS_LITERAL_STRING("popupshown"), 
                                           genericEventListener, 
@@ -2311,9 +2311,9 @@ nsTypeAheadFind::RemoveWindowListeners(nsIDOMWindow *aDOMWin)
                                           PR_TRUE);
 
   // Remove DOM Text listener for IME text events
-  piTarget->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMTextListener*, this), 
+  piTarget->RemoveEventListenerByIID(static_cast<nsIDOMTextListener*>(this), 
     NS_GET_IID(nsIDOMTextListener));
-  piTarget->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMCompositionListener*, this), 
+  piTarget->RemoveEventListenerByIID(static_cast<nsIDOMCompositionListener*>(this), 
     NS_GET_IID(nsIDOMCompositionListener));
 }
 
@@ -2334,12 +2334,12 @@ nsTypeAheadFind::AttachWindowListeners(nsIDOMWindow *aDOMWin)
   nsCOMPtr<nsIDOM3EventTarget> target(do_QueryInterface(piTarget));
 
   target->AddGroupedEventListener(NS_LITERAL_STRING("keypress"),
-                                  NS_STATIC_CAST(nsIDOMKeyListener*, this),
+                                  static_cast<nsIDOMKeyListener*>(this),
                                   PR_FALSE, systemGroup);
 
   // Attach menu listeners, this will help us ignore keystrokes meant for menus
   nsIDOMEventListener *genericEventListener = 
-    NS_STATIC_CAST(nsIDOMEventListener*, NS_STATIC_CAST(nsIDOMKeyListener*, this));
+    static_cast<nsIDOMEventListener*>(static_cast<nsIDOMKeyListener*>(this));
 
   chromeEventHandler->AddEventListener(NS_LITERAL_STRING("popupshown"), 
                                        genericEventListener, 
@@ -2362,9 +2362,9 @@ nsTypeAheadFind::AttachWindowListeners(nsIDOMWindow *aDOMWin)
                                        PR_TRUE);
 
   // Add DOM Text listener for IME text events
-  piTarget->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMTextListener*, this),
+  piTarget->AddEventListenerByIID(static_cast<nsIDOMTextListener*>(this),
     NS_GET_IID(nsIDOMTextListener));
-  piTarget->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMCompositionListener*, this),
+  piTarget->AddEventListenerByIID(static_cast<nsIDOMCompositionListener*>(this),
     NS_GET_IID(nsIDOMCompositionListener));
 }
 
@@ -2652,7 +2652,7 @@ nsTypeAheadFind::IsRangeVisible(nsIPresShell *aPresShell,
     frameTraversal->Next();
     nsISupports* currentItem;
     frameTraversal->CurrentItem(&currentItem);
-    frame = NS_STATIC_CAST(nsIFrame*, currentItem);
+    frame = static_cast<nsIFrame*>(currentItem);
     if (!frame) {
       return PR_FALSE;
     }
diff --git a/mozilla/extensions/wallet/src/nsWalletService.cpp b/mozilla/extensions/wallet/src/nsWalletService.cpp
index 23d5b4bfa65..877c4ba3c53 100644
--- a/mozilla/extensions/wallet/src/nsWalletService.cpp
+++ b/mozilla/extensions/wallet/src/nsWalletService.cpp
@@ -559,7 +559,7 @@ nsWalletlibService::GetPrompt(nsIDOMWindow* aParent,
     return NS_ERROR_OUT_OF_MEMORY;
 
   NS_ADDREF(wrapper);
-  *_retval = NS_STATIC_CAST(nsIAuthPrompt2*, wrapper);
+  *_retval = static_cast<nsIAuthPrompt2*>(wrapper);
   return NS_OK;
 }
 
diff --git a/mozilla/extensions/wallet/src/singsign.cpp b/mozilla/extensions/wallet/src/singsign.cpp
index df0a1edc1c3..df6942897f4 100644
--- a/mozilla/extensions/wallet/src/singsign.cpp
+++ b/mozilla/extensions/wallet/src/singsign.cpp
@@ -414,7 +414,7 @@ si_SelectDialog(const PRUnichar* szMessage, nsIPrompt* dialog, PRUnichar** pList
     os->NotifyObservers(nsnull, "signonSelectUser", NS_LITERAL_STRING("suspend").get());
   }
 
-  rv = dialog->Select( title_string, szMessage, *pCount, NS_CONST_CAST(const PRUnichar**, pList), &selectedIndex, &rtnValue );
+  rv = dialog->Select( title_string, szMessage, *pCount, const_cast<const PRUnichar**>(pList), &selectedIndex, &rtnValue );
 
   gSelectUserDialogCount--;
   if (os) {
@@ -714,7 +714,7 @@ public:
   ~si_SignonUserStruct()
   {
     for (PRInt32 i = signonData_list.Count() - 1; i >= 0; i--) {
-      delete NS_STATIC_CAST(si_SignonDataStruct*, signonData_list.ElementAt(i));
+      delete static_cast<si_SignonDataStruct*>(signonData_list.ElementAt(i));
     }
     MOZ_COUNT_DTOR(si_SignonUserStruct);
   }
@@ -782,7 +782,7 @@ si_GetURL(const char * passwordRealm) {
       realmWithoutTrailingSlash.Truncate(realmWithoutTrailingSlash.Length()-1);
 
     for (PRInt32 i=0; i<urlCount; i++) {
-      url = NS_STATIC_CAST(si_SignonURLStruct*, si_signon_list->ElementAt(i));
+      url = static_cast<si_SignonURLStruct*>(si_signon_list->ElementAt(i));
       if(url->passwordRealm && !PL_strcmp(realmWithoutTrailingSlash.get(), url->passwordRealm)) {
         return url;
       }
@@ -962,18 +962,18 @@ si_RemoveUser(const char *passwordRealm, const nsString& userName, PRBool save,
   if (first) {
 
     /* remove the first user */
-    user = NS_STATIC_CAST(si_SignonUserStruct *,
-                          url->signonUser_list.ElementAt(0));
+    user = static_cast<si_SignonUserStruct *>
+                      (url->signonUser_list.ElementAt(0));
 
   } else {
 
     /* find the specified user */
     PRInt32 userCount = url->signonUser_list.Count();
     for (PRInt32 i=0; i<userCount; i++) {
-      user = NS_STATIC_CAST(si_SignonUserStruct*, url->signonUser_list.ElementAt(i));
+      user = static_cast<si_SignonUserStruct*>(url->signonUser_list.ElementAt(i));
       PRInt32 dataCount = user->signonData_list.Count();
       for (PRInt32 ii=0; ii<dataCount; ii++) {
-        data = NS_STATIC_CAST(si_SignonDataStruct*, user->signonData_list.ElementAt(ii));
+        data = static_cast<si_SignonDataStruct*>(user->signonData_list.ElementAt(ii));
         if (si_CompareEncryptedToCleartext(data->value, userName)) {
           goto foundUser;
         }
@@ -1030,7 +1030,7 @@ SINGSIGN_RemoveReject(const char *host) {
   PRInt32 rejectCount = LIST_COUNT(si_reject_list);
   while (rejectCount>0) {
     rejectCount--;
-    reject = NS_STATIC_CAST(si_Reject*, si_reject_list->ElementAt(rejectCount));
+    reject = static_cast<si_Reject*>(si_reject_list->ElementAt(rejectCount));
     if (reject && !PL_strcmp(reject->passwordRealm, host)) {
       si_FreeReject(reject);
       si_signon_list_changed = PR_TRUE;
@@ -1077,10 +1077,10 @@ si_CheckForUser(const char *passwordRealm, const nsString& userName) {
   /* find the specified user */
   PRInt32 userCount = url->signonUser_list.Count();
   for (PRInt32 i=0; i<userCount; i++) {
-    user = NS_STATIC_CAST(si_SignonUserStruct*, url->signonUser_list.ElementAt(i));
+    user = static_cast<si_SignonUserStruct*>(url->signonUser_list.ElementAt(i));
     PRInt32 dataCount = user->signonData_list.Count();
     for (PRInt32 ii=0; ii<dataCount; ii++) {
-      data = NS_STATIC_CAST(si_SignonDataStruct*, user->signonData_list.ElementAt(ii));
+      data = static_cast<si_SignonDataStruct*>(user->signonData_list.ElementAt(ii));
       if (si_CompareEncryptedToCleartext(data->value, userName)) {
         si_unlock_signon_list();
         return PR_TRUE;
@@ -1100,7 +1100,7 @@ si_GetFirstNonPasswordData(si_SignonUserStruct* user) {
   PRInt32 dataCount = user->signonData_list.Count();
   for (PRInt32 j=0; j<dataCount; j++) {
     si_SignonDataStruct * data =
-      NS_STATIC_CAST(si_SignonDataStruct *, user->signonData_list.ElementAt(j));
+      static_cast<si_SignonDataStruct *>(user->signonData_list.ElementAt(j));
     if (!data->isPassword) {
       return data;
     }
@@ -1132,17 +1132,17 @@ si_GetUser(nsIPrompt* dialog, const char* passwordRealm, const char *legacyRealm
     if ((user_count = url->signonUser_list.Count()) == 1) {
 
       /* only one set of data exists for this URL so select it */
-      user = NS_STATIC_CAST(si_SignonUserStruct *,
-                            url->signonUser_list.ElementAt(0));
+      user = static_cast<si_SignonUserStruct *>
+                        (url->signonUser_list.ElementAt(0));
       url->chosen_user = user;
 
     } else if (pickFirstUser) {
       PRInt32 userCount = url->signonUser_list.Count();
       for (PRInt32 i=0; i<userCount; i++) {
-        user = NS_STATIC_CAST(si_SignonUserStruct*, url->signonUser_list.ElementAt(i));
+        user = static_cast<si_SignonUserStruct*>(url->signonUser_list.ElementAt(i));
         /* consider first data node to be the identifying item */
-        data = NS_STATIC_CAST(si_SignonDataStruct *,
-                              user->signonData_list.ElementAt(0));
+        data = static_cast<si_SignonDataStruct *>
+                          (user->signonData_list.ElementAt(0));
         if (data->name != userText) {
           /* name of current data item does not match name in data node */
           continue;
@@ -1171,10 +1171,10 @@ si_GetUser(nsIPrompt* dialog, const char* passwordRealm, const char *legacyRealm
       user_count = 0;
       PRInt32 userCount = url->signonUser_list.Count();
       for (PRInt32 i=0; i<userCount; i++) {
-        user = NS_STATIC_CAST(si_SignonUserStruct*, url->signonUser_list.ElementAt(i));
+        user = static_cast<si_SignonUserStruct*>(url->signonUser_list.ElementAt(i));
         /* consider first data node to be the identifying item */
-        data = NS_STATIC_CAST(si_SignonDataStruct *,
-                              user->signonData_list.ElementAt(0));
+        data = static_cast<si_SignonDataStruct *>
+                          (user->signonData_list.ElementAt(0));
         if (data->name != userText) {
           /* name of current data item does not match name in data node */
           continue;
@@ -1260,10 +1260,10 @@ si_GetSpecificUser(const char* passwordRealm, const nsString& userName, const ns
     /* step through set of user nodes for this URL looking for specified username */
     PRInt32 userCount2 = url->signonUser_list.Count();
     for (PRInt32 i2=0; i2<userCount2; i2++) {
-      user = NS_STATIC_CAST(si_SignonUserStruct*, url->signonUser_list.ElementAt(i2));
+      user = static_cast<si_SignonUserStruct*>(url->signonUser_list.ElementAt(i2));
       /* consider first data node to be the identifying item */
-      data = NS_STATIC_CAST(si_SignonDataStruct *,
-                            user->signonData_list.ElementAt(0));
+      data = static_cast<si_SignonDataStruct *>
+                        (user->signonData_list.ElementAt(0));
       if (data->name != userText) {
         /* desired username text does not match name in data node */
         continue;
@@ -1314,10 +1314,10 @@ si_GetURLAndUserForChangeForm(nsIPrompt* dialog, const nsString& password)
   user_count = 0;
   PRInt32 urlCount = LIST_COUNT(si_signon_list);
   for (PRInt32 i=0; i<urlCount; i++) {
-    url = NS_STATIC_CAST(si_SignonURLStruct*, si_signon_list->ElementAt(i));
+    url = static_cast<si_SignonURLStruct*>(si_signon_list->ElementAt(i));
     PRInt32 userCount = url->signonUser_list.Count();
     for (PRInt32 ii=0; ii<userCount; ii++) {
-      user = NS_STATIC_CAST(si_SignonUserStruct*, url->signonUser_list.ElementAt(ii));
+      user = static_cast<si_SignonUserStruct*>(url->signonUser_list.ElementAt(ii));
       user_count++;
     }
   }
@@ -1340,19 +1340,19 @@ si_GetURLAndUserForChangeForm(nsIPrompt* dialog, const nsString& password)
   user_count = 0;
   PRInt32 urlCount2 = LIST_COUNT(si_signon_list);
   for (PRInt32 i2=0; i2<urlCount2; i2++) {
-    url = NS_STATIC_CAST(si_SignonURLStruct*, si_signon_list->ElementAt(i2));
+    url = static_cast<si_SignonURLStruct*>(si_signon_list->ElementAt(i2));
     PRInt32 userCount = url->signonUser_list.Count();
     for (PRInt32 i3=0; i3<userCount; i3++) {
-      user = NS_STATIC_CAST(si_SignonUserStruct*, url->signonUser_list.ElementAt(i3));
+      user = static_cast<si_SignonUserStruct*>(url->signonUser_list.ElementAt(i3));
       /* find saved password and see if it matches password user just entered */
       PRInt32 dataCount = user->signonData_list.Count();
       for (PRInt32 i4=0; i4<dataCount; i4++) {
-        data = NS_STATIC_CAST(si_SignonDataStruct*, user->signonData_list.ElementAt(i4));
+        data = static_cast<si_SignonDataStruct*>(user->signonData_list.ElementAt(i4));
         if (data->isPassword && si_CompareEncryptedToCleartext(data->value, password)) {
           /* passwords match so add entry to list */
           /* consider first data node to be the identifying item */
-          data = NS_STATIC_CAST(si_SignonDataStruct *,
-                                user->signonData_list.ElementAt(0));
+          data = static_cast<si_SignonDataStruct *>
+                            (user->signonData_list.ElementAt(0));
 
           nsAutoString userName;
           if (NS_SUCCEEDED(Wallet_Decrypt (data->value, userName))) {
@@ -1418,7 +1418,7 @@ SI_RemoveAllSignonData() {
   if (si_reject_list) {
     si_Reject * reject;
     while (LIST_COUNT(si_reject_list)>0) {
-      reject = NS_STATIC_CAST(si_Reject*, si_reject_list->ElementAt(0));
+      reject = static_cast<si_Reject*>(si_reject_list->ElementAt(0));
       if (reject) {
         si_FreeReject(reject);
         si_signon_list_changed = PR_TRUE;
@@ -1491,7 +1491,7 @@ si_CheckForReject(const char * passwordRealm, const nsString& userName) {
   if (si_reject_list) {
     PRInt32 rejectCount = LIST_COUNT(si_reject_list);
     for (PRInt32 i=0; i<rejectCount; i++) {
-      reject = NS_STATIC_CAST(si_Reject*, si_reject_list->ElementAt(i));
+      reject = static_cast<si_Reject*>(si_reject_list->ElementAt(i));
       if(!PL_strcmp(passwordRealm, reject->passwordRealm)) {
 // No need for username check on a rejectlist entry.  URL check is sufficient
 //    if(!PL_strcmp(userName, reject->userName) && !PL_strcmp(passwordRealm, reject->passwordRealm)) {
@@ -1543,7 +1543,7 @@ si_PutReject(const char * passwordRealm, const nsString& userName, PRBool save)
     PRBool rejectAdded = PR_FALSE;
     PRInt32 rejectCount = LIST_COUNT(si_reject_list);
     for (PRInt32 i = 0; i<rejectCount; ++i) {
-      tmp_reject = NS_STATIC_CAST(si_Reject *, si_reject_list->ElementAt(i));
+      tmp_reject = static_cast<si_Reject *>(si_reject_list->ElementAt(i));
       if (tmp_reject) {
         if (PL_strcasecmp(reject->passwordRealm, tmp_reject->passwordRealm)<0) {
           si_reject_list->InsertElementAt(reject, i);
@@ -1589,7 +1589,7 @@ si_PutData(const char *passwordRealm, nsVoidArray *signonData, PRBool save) {
   /* discard this if the password is empty */
   PRInt32 count = signonData->Count();
   for (PRInt32 i=0; i<count; i++) {
-    data2 = NS_STATIC_CAST(si_SignonDataStruct*, signonData->ElementAt(i));
+    data2 = static_cast<si_SignonDataStruct*>(signonData->ElementAt(i));
     if (data2->isPassword && data2->value.IsEmpty()) {
       return;
     }
@@ -1648,7 +1648,7 @@ si_PutData(const char *passwordRealm, nsVoidArray *signonData, PRBool save) {
     si_SignonURLStruct * tmp_URL;
     PRInt32 urlCount = LIST_COUNT(si_signon_list);
     for (PRInt32 ii = 0; ii<urlCount; ++ii) {
-      tmp_URL = NS_STATIC_CAST(si_SignonURLStruct *, si_signon_list->ElementAt(ii));
+      tmp_URL = static_cast<si_SignonURLStruct *>(si_signon_list->ElementAt(ii));
       if (tmp_URL) {
         if (PL_strcasecmp(url->passwordRealm, tmp_URL->passwordRealm)<0) {
           si_signon_list->InsertElementAt(url, ii);
@@ -1678,16 +1678,16 @@ si_PutData(const char *passwordRealm, nsVoidArray *signonData, PRBool save) {
     if (!save) {
       break; /* otherwise we could be asked for master password when loading signon data */
     }
-    user = NS_STATIC_CAST(si_SignonUserStruct*, url->signonUser_list.ElementAt(i2));
+    user = static_cast<si_SignonUserStruct*>(url->signonUser_list.ElementAt(i2));
     PRInt32 j = 0;
     PRInt32 dataCount = user->signonData_list.Count();
     for (PRInt32 i3=0; i3<dataCount; i3++) {
-      data = NS_STATIC_CAST(si_SignonDataStruct*, user->signonData_list.ElementAt(i3));
+      data = static_cast<si_SignonDataStruct*>(user->signonData_list.ElementAt(i3));
       mismatch = PR_FALSE;
 
       /* check for match on name field and type field */
       if (j < signonData->Count()) {
-        data2 = NS_STATIC_CAST(si_SignonDataStruct*, signonData->ElementAt(j));
+        data2 = static_cast<si_SignonDataStruct*>(signonData->ElementAt(j));
         if ((data->isPassword == data2->isPassword) &&
             (data->name == data2->name)) {
 
@@ -1718,11 +1718,11 @@ si_PutData(const char *passwordRealm, nsVoidArray *signonData, PRBool save) {
       j = 0;
       PRInt32 dataCount2 = user->signonData_list.Count();
       for (PRInt32 i4=0; i4<dataCount2; i4++) {
-        data = NS_STATIC_CAST(si_SignonDataStruct*, user->signonData_list.ElementAt(i4));
+        data = static_cast<si_SignonDataStruct*>(user->signonData_list.ElementAt(i4));
 
         /* update saved password */
         if ((j < signonData->Count()) && data->isPassword) {
-          data2 = NS_STATIC_CAST(si_SignonDataStruct*, signonData->ElementAt(j));
+          data2 = static_cast<si_SignonDataStruct*>(signonData->ElementAt(j));
           if (!si_CompareEncryptedToEncrypted(data->value, data2->value)) {
             si_signon_list_changed = PR_TRUE;
             data->value = data2->value;
@@ -1773,7 +1773,7 @@ si_PutData(const char *passwordRealm, nsVoidArray *signonData, PRBool save) {
       }
       return;
     }
-    data2 = NS_STATIC_CAST(si_SignonDataStruct*, signonData->ElementAt(k));
+    data2 = static_cast<si_SignonDataStruct*>(signonData->ElementAt(k));
     data->isPassword = data2->isPassword;
     data->name = data2->name;
     data->value = data2->value;
@@ -2006,7 +2006,7 @@ SI_LoadSignonData() {
     /* free up all the allocations done for processing this URL */
     Recycle(passwordRealm);
     for (PRInt32 i=count-1; i>=0; i--) {
-      data = NS_STATIC_CAST(si_SignonDataStruct*, signonData.ElementAt(i));
+      data = static_cast<si_SignonDataStruct*>(signonData.ElementAt(i));
       delete data;
     }
   }
@@ -2082,7 +2082,7 @@ si_SaveSignonDataLocked(char * state, PRBool notify) {
   if (si_reject_list) {
     PRInt32 rejectCount = LIST_COUNT(si_reject_list);
     for (PRInt32 i=0; i<rejectCount; i++) {
-      reject = NS_STATIC_CAST(si_Reject*, si_reject_list->ElementAt(i));
+      reject = static_cast<si_Reject*>(si_reject_list->ElementAt(i));
       wallet_PutLine(strm, reject->passwordRealm);
     }
   }
@@ -2097,18 +2097,18 @@ si_SaveSignonDataLocked(char * state, PRBool notify) {
   if((si_signon_list)) {
     PRInt32 urlCount = LIST_COUNT(si_signon_list);
     for (PRInt32 i2=0; i2<urlCount; i2++) {
-      url = NS_STATIC_CAST(si_SignonURLStruct*, si_signon_list->ElementAt(i2));
+      url = static_cast<si_SignonURLStruct*>(si_signon_list->ElementAt(i2));
 
       /* write out each user node of the URL node */
       PRInt32 userCount = url->signonUser_list.Count();
       for (PRInt32 i3=0; i3<userCount; i3++) {
-        user = NS_STATIC_CAST(si_SignonUserStruct*, url->signonUser_list.ElementAt(i3));
+        user = static_cast<si_SignonUserStruct*>(url->signonUser_list.ElementAt(i3));
         wallet_PutLine(strm, url->passwordRealm);
 
         /* write out each data node of the user node */
         PRInt32 dataCount = user->signonData_list.Count();
         for (PRInt32 i4=0; i4<dataCount; i4++) {
-          data = NS_STATIC_CAST(si_SignonDataStruct*, user->signonData_list.ElementAt(i4));
+          data = static_cast<si_SignonDataStruct*>(user->signonData_list.ElementAt(i4));
           if (data->isPassword) {
             static const char asterisk = '*';
             PRUint32 dummy;
@@ -2246,7 +2246,7 @@ si_RememberSignonData
 
   /* determine how many passwords are in the form and where they are */
   for (PRInt32 i=0; i<signonData->Count(); i++) {
-    data = NS_STATIC_CAST(si_SignonDataStruct*, signonData->ElementAt(i));
+    data = static_cast<si_SignonDataStruct*>(signonData->ElementAt(i));
     if (data->isPassword) {
       if (passwordCount < 3 ) {
         pswd[passwordCount] = i;
@@ -2262,7 +2262,7 @@ si_RememberSignonData
     /* obtain the index of the first input field (that is the username) */
     PRInt32 j;
     for (j=0; j<signonData->Count(); j++) {
-      data = NS_STATIC_CAST(si_SignonDataStruct*, signonData->ElementAt(j));
+      data = static_cast<si_SignonDataStruct*>(signonData->ElementAt(j));
       if (!data->isPassword) {
         break;
       }
@@ -2276,7 +2276,7 @@ si_RememberSignonData
         }
         Wallet_GiveCaveat(window, nsnull);
         for (j=0; j<signonData->Count(); j++) {
-          data2 = NS_STATIC_CAST(si_SignonDataStruct*, signonData->ElementAt(j));
+          data2 = static_cast<si_SignonDataStruct*>(signonData->ElementAt(j));
           nsAutoString value(data2->value);
           if (NS_FAILED(Wallet_Encrypt(value, data2->value))) {
             return;
@@ -2294,9 +2294,9 @@ si_RememberSignonData
     si_SignonUserStruct* user;
 
     /* make sure all passwords are non-null and 2nd and 3rd are identical */
-    data0 = NS_STATIC_CAST(si_SignonDataStruct*, signonData->ElementAt(pswd[0]));
-    data1 = NS_STATIC_CAST(si_SignonDataStruct*, signonData->ElementAt(pswd[1]));
-    data2 = NS_STATIC_CAST(si_SignonDataStruct*, signonData->ElementAt(pswd[2]));
+    data0 = static_cast<si_SignonDataStruct*>(signonData->ElementAt(pswd[0]));
+    data1 = static_cast<si_SignonDataStruct*>(signonData->ElementAt(pswd[1]));
+    data2 = static_cast<si_SignonDataStruct*>(signonData->ElementAt(pswd[2]));
     if (data0->value.IsEmpty() || data1->value.IsEmpty() ||
         data2->value.IsEmpty() || data1->value != data2->value) {
       return;
@@ -2315,7 +2315,7 @@ si_RememberSignonData
     /* get to password being saved */
     PRInt32 dataCount = user->signonData_list.Count();
     for (PRInt32 k=0; k<dataCount; k++) {
-      data = NS_STATIC_CAST(si_SignonDataStruct*, user->signonData_list.ElementAt(k));
+      data = static_cast<si_SignonDataStruct*>(user->signonData_list.ElementAt(k));
       if (data->isPassword) {
         break;
       }
@@ -2404,7 +2404,7 @@ si_RestoreSignonData(nsIPrompt* dialog,
   if (user) {
     PRInt32 dataCount = user->signonData_list.Count();
     for (PRInt32 i=0; i<dataCount; i++) {
-      data = NS_STATIC_CAST(si_SignonDataStruct*, user->signonData_list.ElementAt(i));
+      data = static_cast<si_SignonDataStruct*>(user->signonData_list.ElementAt(i));
       LOG(("  got [name=%s value=%s]\n",
               NS_LossyConvertUTF16toASCII(data->name).get(),
               NS_LossyConvertUTF16toASCII(data->value).get()));
@@ -2429,8 +2429,8 @@ si_RestoreSignonData(nsIPrompt* dialog,
   /* get first saved user just so we can see the name of the first item on the form */
   user = si_GetUser(passwordRealm, PR_TRUE, NULL, formNumber); /* this is the first saved user */
   if (user) {
-    data = NS_STATIC_CAST(si_SignonDataStruct *,
-                    user->signonData_list.ElementAt(0)); /* 1st item on form */
+    data = static_cast<si_SignonDataStruct *>
+                      (user->signonData_list.ElementAt(0)); /* 1st item on form */
     if(data->isPassword && !correctedName.IsEmpty() && (data->name == correctedName)) {
       /* current item is first item on form and is a password */
       user = (passwordRealm, MK_SIGNON_PASSWORDS_FETCH);
@@ -2438,7 +2438,7 @@ si_RestoreSignonData(nsIPrompt* dialog,
         /* user has confirmed it's a change-of-password form */
         PRInt32 dataCount = user->signonData_list.Count();
         for (PRInt32 i=1; i<dataCount; i++) {
-          data = NS_STATIC_CAST(si_SignonDataStruct*, user->signonData_list.ElementAt(i));
+          data = static_cast<si_SignonDataStruct*>(user->signonData_list.ElementAt(i));
           if (data->isPassword) {
             nsAutoString password;
             if (NS_SUCCEEDED(Wallet_Decrypt(data->value, password))) {
@@ -2459,7 +2459,7 @@ si_RestoreSignonData(nsIPrompt* dialog,
   if (user) {
     PRInt32 dataCount = user->signonData_list.Count();
     for (PRInt32 i=0; i<dataCount; i++) {
-      data = NS_STATIC_CAST(si_SignonDataStruct*, user->signonData_list.ElementAt(i));
+      data = static_cast<si_SignonDataStruct*>(user->signonData_list.ElementAt(i));
       LOG(("  got [name=%s value=%s]\n",
               NS_LossyConvertUTF16toASCII(data->name).get(),
               NS_LossyConvertUTF16toASCII(data->value).get()));
@@ -2556,7 +2556,7 @@ si_RestoreOldSignonDataFromBrowser
   /* restore the data from previous time this URL was visited */
   PRInt32 dataCount = user->signonData_list.Count();
   for (PRInt32 i=0; i<dataCount; i++) {
-    data = NS_STATIC_CAST(si_SignonDataStruct*, user->signonData_list.ElementAt(i));
+    data = static_cast<si_SignonDataStruct*>(user->signonData_list.ElementAt(i));
     nsAutoString decrypted;
     if (NS_SUCCEEDED(Wallet_Decrypt(data->value, decrypted))) {
       if(data->name.EqualsLiteral(USERNAMEFIELD)) {
@@ -2632,7 +2632,7 @@ si_DoDialogIfPrefIsOff(
   }
 
   if (dialogTitle != prompt_string) {
-    Recycle(NS_CONST_CAST(PRUnichar*, prompt_string));
+    Recycle(const_cast<PRUnichar*>(prompt_string));
   }
   return res;
 }
@@ -2964,15 +2964,15 @@ SINGSIGN_ReencryptAll()
   si_lock_signon_list();
   PRInt32 urlCount = LIST_COUNT(si_signon_list);
   for (PRInt32 i=0; i<urlCount; i++) {
-    url = NS_STATIC_CAST(si_SignonURLStruct*, si_signon_list->ElementAt(i));
+    url = static_cast<si_SignonURLStruct*>(si_signon_list->ElementAt(i));
     PRInt32 userCount = url->signonUser_list.Count();
     for (PRInt32 j=0; j<userCount; j++) {
-      user = NS_STATIC_CAST(si_SignonUserStruct*, url->signonUser_list.ElementAt(j));
+      user = static_cast<si_SignonUserStruct*>(url->signonUser_list.ElementAt(j));
 
       PRInt32 dataCount = user->signonData_list.Count();
       for (PRInt32 k=0; k<dataCount; k++) {
-        data = NS_STATIC_CAST(si_SignonDataStruct *,
-                              user->signonData_list.ElementAt(k));
+        data = static_cast<si_SignonDataStruct *>
+                          (user->signonData_list.ElementAt(k));
         nsAutoString userName;
         if (NS_FAILED(Wallet_Decrypt(data->value, userName))) {
           //Don't try to re-encrypt. Just go to the next one.
@@ -3029,7 +3029,7 @@ SINGSIGN_UserCount(PRInt32 host) {
   }
 
   si_SignonURLStruct *hostStruct;
-  hostStruct = NS_STATIC_CAST(si_SignonURLStruct*, si_signon_list->ElementAt(host));
+  hostStruct = static_cast<si_SignonURLStruct*>(si_signon_list->ElementAt(host));
   return hostStruct->signonUser_list.Count();
 }
 
@@ -3054,7 +3054,7 @@ SINGSIGN_Enumerate
   si_SignonUserStruct * userStruct;
   si_SignonDataStruct* data = nsnull;
 
-  hostStruct = NS_STATIC_CAST(si_SignonURLStruct*, si_signon_list->ElementAt(hostNumber));
+  hostStruct = static_cast<si_SignonURLStruct*>(si_signon_list->ElementAt(hostNumber));
   NS_ASSERTION(hostStruct, "corrupt singlesignon list");
   *host = (char *) nsMemory::Clone
     (hostStruct->passwordRealm, strlen(hostStruct->passwordRealm) + 1);
@@ -3066,7 +3066,7 @@ SINGSIGN_Enumerate
   PRInt32 dataCount = userStruct->signonData_list.Count();
   PRInt32 k;
   for (k=0; k<dataCount; k++) {
-    data = NS_STATIC_CAST(si_SignonDataStruct *, userStruct->signonData_list.ElementAt(k));
+    data = static_cast<si_SignonDataStruct *>(userStruct->signonData_list.ElementAt(k));
     if (!(data->isPassword)) {
       break;
     }
@@ -3089,7 +3089,7 @@ SINGSIGN_Enumerate
 
   /* first password data item for user is the password */
   for (k=0; k<dataCount; k++) {
-    data = NS_STATIC_CAST(si_SignonDataStruct *, userStruct->signonData_list.ElementAt(k));
+    data = static_cast<si_SignonDataStruct *>(userStruct->signonData_list.ElementAt(k));
     if ((data->isPassword)) {
       break;
     }
@@ -3126,7 +3126,7 @@ SINGSIGN_RejectEnumerate
     (PRInt32 rejectNumber, char **host) {
 
   si_Reject *reject;
-  reject = NS_STATIC_CAST(si_Reject*, si_reject_list->ElementAt(rejectNumber));
+  reject = static_cast<si_Reject*>(si_reject_list->ElementAt(rejectNumber));
   NS_ASSERTION(reject, "corrupt reject list");
 
   *host = (char *) nsMemory::Clone
@@ -3364,7 +3364,7 @@ si_SaveSignonDataInKeychain() {
   if (si_reject_list) {
     PRInt32 rejectCount = LIST_COUNT(si_reject_list);
     for (PRInt32 i=0; i<rejectCount; i++) {
-      reject = NS_STATIC_CAST(si_Reject*, si_reject_list->ElementAt(i));
+      reject = static_cast<si_Reject*>(si_reject_list->ElementAt(i));
       status = kcaddinternetpassword
         (reject->passwordRealm, nil,
          reject->userName,
@@ -3403,17 +3403,17 @@ si_SaveSignonDataInKeychain() {
   if((si_signon_list)) {
     PRInt32 urlCount = LIST_COUNT(si_signon_list);
     for (PRInt32 i=0; i<urlCount; i++) {
-      URL = NS_STATIC_CAST(si_SignonURLStruct*, si_signon_list->ElementAt(i));
+      URL = static_cast<si_SignonURLStruct*>(si_signon_list->ElementAt(i));
 
       /* add each user node of the URL node */
       PRInt32 userCount = URL->signonUser_list.Count();
       for (PRInt32 i=0; i<userCount; i++) {
-        user = NS_STATIC_CAST(si_SignonUserStruct*, URL->signonUser_list.ElementAt(i));
+        user = static_cast<si_SignonUserStruct*>(URL->signonUser_list.ElementAt(i));
 
         /* write out each data node of the user node */
         PRInt32 count = user->signonData_list.Count();
         for (PRInt32 i=0; i<count; i++) {
-          data = NS_STATIC_CAST(si_SignonDataStruct*, user->signonData_list.ElementAt(i));
+          data = static_cast<si_SignonDataStruct*>(user->signonData_list.ElementAt(i));
           char* attribute = nil;
           if (data->isPassword) {
             password = PR_Malloc(PL_strlen(data->value) + PL_strlen(data->name) + 2);
diff --git a/mozilla/extensions/wallet/src/wallet.cpp b/mozilla/extensions/wallet/src/wallet.cpp
index 54643aa7171..f939ecedc2f 100644
--- a/mozilla/extensions/wallet/src/wallet.cpp
+++ b/mozilla/extensions/wallet/src/wallet.cpp
@@ -202,7 +202,7 @@ public:
       PRInt32 count = LIST_COUNT(itemList);
       wallet_Sublist * sublistPtr;
       for (PRInt32 i=0; i<count; i++) {
-        sublistPtr = NS_STATIC_CAST(wallet_Sublist*, itemList->ElementAt(i));
+        sublistPtr = static_cast<wallet_Sublist*>(itemList->ElementAt(i));
         delete sublistPtr;
       }
       delete itemList;
@@ -304,12 +304,12 @@ wallet_Dump(nsVoidArray * list) {
   wallet_MapElement * mapElementPtr;
   PRInt32 count = LIST_COUNT(list);
   for (PRInt32 i=0; i<count; i++) {
-    mapElementPtr = NS_STATIC_CAST(wallet_MapElement*, list->ElementAt(i));
+    mapElementPtr = static_cast<wallet_MapElement*>(list->ElementAt(i));
     fprintf(stdout, "%s %s \n", (mapElementPtr->item1), (mapElementPtr->item2));
     wallet_Sublist * sublistPtr;
     PRInt32 count2 = LIST_COUNT(mapElementPtr->itemList);
     for (PRInt32 i2=0; i2<count2; i2++) {
-      sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(i2));
+      sublistPtr = static_cast<wallet_Sublist*>(mapElementPtr->itemList->ElementAt(i2));
       fprintf(stdout, "     %s \n", (sublistPtr->item));
     }
   }
@@ -790,7 +790,7 @@ wallet_Clear(nsVoidArray ** list) {
     wallet_MapElement * mapElementPtr;
     PRInt32 count = LIST_COUNT((*list));
     for (PRInt32 i=count-1; i>=0; i--) {
-      mapElementPtr = NS_STATIC_CAST(wallet_MapElement*, (*list)->ElementAt(i));
+      mapElementPtr = static_cast<wallet_MapElement*>((*list)->ElementAt(i));
       delete mapElementPtr;
     }
   }
@@ -836,8 +836,8 @@ wallet_DeallocateMapElements() {
   // initialize remainder of last allocated block so we don't crash on []delete
   for (PRInt32 j=wallet_NextAllocSlot; j<kAllocBlockElems; j++) {
     mapElementPtr =
-      NS_STATIC_CAST(wallet_MapElement*,
-                     (wallet_MapElementAllocations_list)->ElementAt(count-1));
+      static_cast<wallet_MapElement*>
+                 ((wallet_MapElementAllocations_list)->ElementAt(count-1));
     mapElementPtr[j].item1 = nsnull;
     mapElementPtr[j].item2 = nsnull;
     mapElementPtr[j].itemList = nsnull;
@@ -845,7 +845,7 @@ wallet_DeallocateMapElements() {
 
   for (PRInt32 i=count-1; i>=0; i--) {
     mapElementPtr =
-      NS_STATIC_CAST(wallet_MapElement*, (wallet_MapElementAllocations_list)->ElementAt(i));
+      static_cast<wallet_MapElement*>((wallet_MapElementAllocations_list)->ElementAt(i));
     delete [] mapElementPtr;
   }  
   delete wallet_MapElementAllocations_list;
@@ -920,7 +920,7 @@ wallet_WriteToList(
   }
   PRInt32 count = LIST_COUNT(list);
   for (PRInt32 i=0; i<count; i++) {
-    mapElementPtr = NS_STATIC_CAST(wallet_MapElement*, list->ElementAt(i));
+    mapElementPtr = static_cast<wallet_MapElement*>(list->ElementAt(i));
     if (BY_LENGTH==placement) {
       if (LIST_COUNT(mapElementPtr->itemList) < LIST_COUNT(itemList)) {
         list->InsertElementAt(mapElement, i);
@@ -930,8 +930,8 @@ wallet_WriteToList(
         if (itemList) {
           wallet_Sublist * sublistPtr;
           wallet_Sublist * sublistPtr2;
-          sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(0));
-          sublistPtr2 = NS_STATIC_CAST(wallet_Sublist*, itemList->ElementAt(0));
+          sublistPtr = static_cast<wallet_Sublist*>(mapElementPtr->itemList->ElementAt(0));
+          sublistPtr2 = static_cast<wallet_Sublist*>(itemList->ElementAt(0));
           if(PL_strlen(sublistPtr->item) < PL_strlen(sublistPtr2->item)) {
             list->InsertElementAt(mapElement, i);
             added_to_list = PR_TRUE;
@@ -988,7 +988,7 @@ wallet_ReadFromList(
   wallet_MapElement * mapElementPtr;
   PRInt32 count = LIST_COUNT(list);
   for (PRInt32 i=index; i<count; i++) {
-    mapElementPtr = NS_STATIC_CAST(wallet_MapElement*, list->ElementAt(i));
+    mapElementPtr = static_cast<wallet_MapElement*>(list->ElementAt(i));
     if(item1.Equals(mapElementPtr->item1,  nsCaseInsensitiveCStringComparator())) {
       if (obscure) {
         char * plaintext = nsnull;
@@ -1188,7 +1188,7 @@ wallet_WriteToFile(const char * filename, nsVoidArray* list) {
   /* traverse the list */
   PRInt32 count = LIST_COUNT(list);
   for (PRInt32 i=0; i<count; i++) {
-    mapElementPtr = NS_STATIC_CAST(wallet_MapElement*, list->ElementAt(i));
+    mapElementPtr = static_cast<wallet_MapElement*>(list->ElementAt(i));
     wallet_PutLine(strm, (*mapElementPtr).item1);
     if (!WALLET_NULL((*mapElementPtr).item2)) {
       wallet_PutLine(strm, (*mapElementPtr).item2);
@@ -1196,7 +1196,7 @@ wallet_WriteToFile(const char * filename, nsVoidArray* list) {
       wallet_Sublist * sublistPtr;
       PRInt32 count2 = LIST_COUNT(mapElementPtr->itemList);
       for (PRInt32 j=0; j<count2; j++) {
-        sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(j));
+        sublistPtr = static_cast<wallet_Sublist*>(mapElementPtr->itemList->ElementAt(j));
         wallet_PutLine(strm, (*sublistPtr).item);
       }
     }
@@ -1407,7 +1407,7 @@ TextToSchema(
 
     /* get each string associated with this schema */
     PRBool isSubstring = PR_TRUE;
-    mapElementPtr = NS_STATIC_CAST(wallet_MapElement*, wallet_SchemaStrings_list->ElementAt(i));
+    mapElementPtr = static_cast<wallet_MapElement*>(wallet_SchemaStrings_list->ElementAt(i));
     wallet_Sublist * sublistPtr;
     PRInt32 count2 = LIST_COUNT(mapElementPtr->itemList);
 
@@ -1415,7 +1415,7 @@ TextToSchema(
       for (PRInt32 i2=0; i2<count2; i2++) {
 
         /* see if displayable text contains this string */
-        sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(i2));
+        sublistPtr = static_cast<wallet_Sublist*>(mapElementPtr->itemList->ElementAt(i2));
         if (text.Find(sublistPtr->item, PR_TRUE) == -1) {
  
           /* displayable text does not contain this string, reject this schema */
@@ -1521,7 +1521,7 @@ FieldToValue(
         /* process each item in a multi-rhs rule */
         PRInt32 count = LIST_COUNT(itemList2);
         for (PRInt32 i=0; i<count; i++) {
-          sublistPtr = NS_STATIC_CAST(wallet_Sublist*, itemList2->ElementAt(i));
+          sublistPtr = static_cast<wallet_Sublist*>(itemList2->ElementAt(i));
 
           /* skip over values found previously */
           /*   note: a returned index of -1 means not-found.  So we will use the
@@ -1777,7 +1777,7 @@ wallet_ResolvePositionalSchema(nsIDOMNode* elementNode, nsACString& schema) {
   wallet_MapElement * mapElementPtr;
   PRInt32 count = LIST_COUNT(wallet_PositionalSchema_list);
   for (PRInt32 i=0; i<count; i++) {
-    mapElementPtr = NS_STATIC_CAST(wallet_MapElement*, wallet_PositionalSchema_list->ElementAt(i));
+    mapElementPtr = static_cast<wallet_MapElement*>(wallet_PositionalSchema_list->ElementAt(i));
     if (schema.Equals(mapElementPtr->item1, nsCaseInsensitiveCStringComparator())) {
       /* found our positional schema in the list */
 
@@ -1878,11 +1878,11 @@ wallet_ResolvePositionalSchema(nsIDOMNode* elementNode, nsACString& schema) {
       wallet_Sublist * sublistPtr;
       PRInt32 count2 = LIST_COUNT(mapElementPtr->itemList);
       for (PRInt32 j=0; j<count2; j=j+2) {
-        sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(j));
+        sublistPtr = static_cast<wallet_Sublist*>(mapElementPtr->itemList->ElementAt(j));
 
         if (!PL_strcmp(sublistPtr->item, fractionString.get()) ||
             !PL_strcmp(sublistPtr->item, fractionStringWithoutDenominator.get())) {
-          sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(j+1));
+          sublistPtr = static_cast<wallet_Sublist*>(mapElementPtr->itemList->ElementAt(j+1));
           schema.Assign(sublistPtr->item);
           return;
         }
@@ -1912,7 +1912,7 @@ wallet_ResolveStateSchema(nsIDOMNode* elementNode, nsACString& schema) {
   wallet_MapElement * mapElementPtr;
   PRInt32 count = LIST_COUNT(wallet_StateSchema_list);
   for (PRInt32 i=0; i<count; i++) {
-    mapElementPtr = NS_STATIC_CAST(wallet_MapElement*, wallet_StateSchema_list->ElementAt(i));
+    mapElementPtr = static_cast<wallet_MapElement*>(wallet_StateSchema_list->ElementAt(i));
     if (schema.Equals(mapElementPtr->item1, nsCaseInsensitiveCStringComparator())) {
       /* found our state schema in the list */
 
@@ -1952,10 +1952,10 @@ wallet_ResolveStateSchema(nsIDOMNode* elementNode, nsACString& schema) {
           PRInt32 count2 = LIST_COUNT(mapElementPtr->itemList);
           PRInt32 j;
           for (j=0; j<count2; j=j+2) {
-            sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(j));
+            sublistPtr = static_cast<wallet_Sublist*>(mapElementPtr->itemList->ElementAt(j));
             if (!PL_strcasecmp(sublistPtr->item, previousElementState)) {
               previousElementState = sublistPtr->item;
-              sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(j+1));
+              sublistPtr = static_cast<wallet_Sublist*>(mapElementPtr->itemList->ElementAt(j+1));
               schema.Assign(sublistPtr->item);
               return;
             }
@@ -1964,7 +1964,7 @@ wallet_ResolveStateSchema(nsIDOMNode* elementNode, nsACString& schema) {
              *   Note: the catch-all must be the last entry in the list
              */
             if (!PL_strcmp(sublistPtr->item, "*")) {
-              sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(j+1));
+              sublistPtr = static_cast<wallet_Sublist*>(mapElementPtr->itemList->ElementAt(j+1));
               schema.Assign(sublistPtr->item);
               return;
             }
@@ -1978,13 +1978,13 @@ wallet_ResolveStateSchema(nsIDOMNode* elementNode, nsACString& schema) {
         wallet_Sublist * sublistPtr;
         PRInt32 count2 = LIST_COUNT(mapElementPtr->itemList);
         for (PRInt32 j=0; j<count2; j=j+2) {
-          sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(j));
+          sublistPtr = static_cast<wallet_Sublist*>(mapElementPtr->itemList->ElementAt(j));
 
           /* next state obtained, test to see if it is in the text */
           if (text.Find(sublistPtr->item, PR_TRUE) != -1) {
             previousElementState = sublistPtr->item;
             previousElementNode = elementNode;
-            sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(j+1));
+            sublistPtr = static_cast<wallet_Sublist*>(mapElementPtr->itemList->ElementAt(j+1));
             schema.Assign(sublistPtr->item);
             return;
           }
@@ -1995,10 +1995,10 @@ wallet_ResolveStateSchema(nsIDOMNode* elementNode, nsACString& schema) {
       wallet_Sublist * sublistPtr;
       PRInt32 count2 = LIST_COUNT(mapElementPtr->itemList);
       for (PRInt32 j=0; j<count2; j=j+2) {
-        sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(j));
+        sublistPtr = static_cast<wallet_Sublist*>(mapElementPtr->itemList->ElementAt(j));
         if (!PL_strcmp(sublistPtr->item, "*")) {
           previousElementNode = localElementNode;
-          sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(j+1));
+          sublistPtr = static_cast<wallet_Sublist*>(mapElementPtr->itemList->ElementAt(j+1));
           schema.Assign(sublistPtr->item);
           previousElementNode = elementNode;
           return;
@@ -2252,7 +2252,7 @@ wallet_Size(nsVoidArray * list) {
   wallet_MapElement * mapElementPtr;
   PRInt32 count = LIST_COUNT(list);
   for (PRInt32 i=0; i<count; i++) {
-    mapElementPtr = NS_STATIC_CAST(wallet_MapElement*, list->ElementAt(i));
+    mapElementPtr = static_cast<wallet_MapElement*>(list->ElementAt(i));
     size += sizeof(wallet_MapElement*);
     size += sizeof(wallet_MapElement);
     size += PL_strlen(mapElementPtr->item1);
@@ -2260,7 +2260,7 @@ wallet_Size(nsVoidArray * list) {
     wallet_Sublist * sublistPtr;
     PRInt32 count2 = LIST_COUNT(mapElementPtr->itemList);
     for (PRInt32 i2=0; i2<count2; i2++) {
-      sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(i2));
+      sublistPtr = static_cast<wallet_Sublist*>(mapElementPtr->itemList->ElementAt(i2));
       size += sizeof(wallet_Sublist);
       size += PL_strlen(sublistPtr->item);
     }
@@ -2438,7 +2438,7 @@ wallet_ReleasePrefillElementList(nsVoidArray * wallet_PrefillElement_list) {
     wallet_PrefillElement * prefillElementPtr;
     PRInt32 count = LIST_COUNT(wallet_PrefillElement_list);
     for (PRInt32 i=count-1; i>=0; i--) {
-      prefillElementPtr = NS_STATIC_CAST(wallet_PrefillElement*, wallet_PrefillElement_list->ElementAt(i));
+      prefillElementPtr = static_cast<wallet_PrefillElement*>(wallet_PrefillElement_list->ElementAt(i));
       delete prefillElementPtr;
     }
     delete wallet_PrefillElement_list;
@@ -2459,7 +2459,7 @@ WLLT_GetPrefillListForViewer(nsAString& aPrefillList)
   nsAutoString buffer;
   PRInt32 count = LIST_COUNT(wallet_list);
   for (PRInt32 i=0; i<count; i++) {
-    prefillElementPtr = NS_STATIC_CAST(wallet_PrefillElement*, wallet_list->ElementAt(i));
+    prefillElementPtr = static_cast<wallet_PrefillElement*>(wallet_list->ElementAt(i));
     buffer.Append(BREAK);
     buffer.AppendInt(prefillElementPtr->count,10);
     buffer.Append(BREAK);
@@ -2502,7 +2502,7 @@ Wallet_SignonViewerReturn(const nsAString& results)
     PRInt32 count = LIST_COUNT(wallet_URL_list);
     while (count>0) {
       count--;
-      url = NS_STATIC_CAST(wallet_MapElement*, wallet_URL_list->ElementAt(count));
+      url = static_cast<wallet_MapElement*>(wallet_URL_list->ElementAt(count));
       if (url && SI_InSequence(gone, count)) {
         /* clear the NO_PREVIEW indicator */
         oldPermissionChar = NO_CAPTURE(url->item2);
@@ -2526,7 +2526,7 @@ Wallet_SignonViewerReturn(const nsAString& results)
     PRInt32 count2 = LIST_COUNT(wallet_URL_list);
     while (count2>0) {
       count2--;
-      url = NS_STATIC_CAST(wallet_MapElement*, wallet_URL_list->ElementAt(count2));
+      url = static_cast<wallet_MapElement*>(wallet_URL_list->ElementAt(count2));
       if (url && SI_InSequence(gone, count2)) {
         /* clear the NO_CAPTURE indicator */
         oldPermissionChar = NO_PREVIEW(url->item2);
@@ -2727,7 +2727,7 @@ WLLT_GetNopreviewListForViewer(nsAString& aNopreviewList)
   wallet_InitializeURLList();
   PRInt32 count = LIST_COUNT(wallet_URL_list);
   for (PRInt32 i=0; i<count; i++) {
-    url = NS_STATIC_CAST(wallet_MapElement*, wallet_URL_list->ElementAt(i));
+    url = static_cast<wallet_MapElement*>(wallet_URL_list->ElementAt(i));
     if (NO_PREVIEW(url->item2) == 'y') {
       buffer.Append(BREAK);
       AppendUTF8toUTF16(url->item1, buffer);
@@ -2745,7 +2745,7 @@ WLLT_GetNocaptureListForViewer(nsAString& aNocaptureList)
   wallet_InitializeURLList();
   PRInt32 count = LIST_COUNT(wallet_URL_list);
   for (PRInt32 i=0; i<count; i++) {
-    url = NS_STATIC_CAST(wallet_MapElement*, wallet_URL_list->ElementAt(i));
+    url = static_cast<wallet_MapElement*>(wallet_URL_list->ElementAt(i));
     if (NO_CAPTURE(url->item2) == 'y') {
       buffer.Append(BREAK);
       AppendUTF8toUTF16(url->item1, buffer);
@@ -2839,7 +2839,7 @@ WLLT_PreEdit(nsAString& walletList)
   wallet_MapElement * mapElementPtr;
   PRInt32 count = LIST_COUNT(wallet_SchemaToValue_list);
   for (PRInt32 i=0; i<count; i++) {
-    mapElementPtr = NS_STATIC_CAST(wallet_MapElement*, wallet_SchemaToValue_list->ElementAt(i));
+    mapElementPtr = static_cast<wallet_MapElement*>(wallet_SchemaToValue_list->ElementAt(i));
 
     AppendUTF8toUTF16(mapElementPtr->item1, walletList);
     walletList.Append(BREAK);
@@ -2850,7 +2850,7 @@ WLLT_PreEdit(nsAString& walletList)
       wallet_Sublist * sublistPtr;
       PRInt32 count2 = LIST_COUNT(mapElementPtr->itemList);
       for (PRInt32 i2=0; i2<count2; i2++) {
-        sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(i2));
+        sublistPtr = static_cast<wallet_Sublist*>(mapElementPtr->itemList->ElementAt(i2));
         AppendUTF8toUTF16(sublistPtr->item, walletList);
         walletList.Append(BREAK);
       }
@@ -2915,7 +2915,7 @@ if (!changingPassword) {
   wallet_MapElement * mapElementPtr;
   gEncryptionFailure = PR_FALSE;
   for (i=0; i<count && !gEncryptionFailure; i++) {
-    mapElementPtr = NS_STATIC_CAST(wallet_MapElement*, wallet_SchemaToValue_list->ElementAt(i));
+    mapElementPtr = static_cast<wallet_MapElement*>(wallet_SchemaToValue_list->ElementAt(i));
     char * crypt = nsnull;
     if (!WALLET_NULL(mapElementPtr->item2)) {
       if (NS_FAILED(DecryptString(mapElementPtr->item2, plainText))) {
@@ -2929,7 +2929,7 @@ if (!changingPassword) {
       wallet_Sublist * sublistPtr;
       PRInt32 count2 = LIST_COUNT(mapElementPtr->itemList);
       for (PRInt32 i2=0; i2<count2; i2++) {
-        sublistPtr = NS_STATIC_CAST(wallet_Sublist*, mapElementPtr->itemList->ElementAt(i2));
+        sublistPtr = static_cast<wallet_Sublist*>(mapElementPtr->itemList->ElementAt(i2));
         if (NS_FAILED(DecryptString(sublistPtr->item, plainText))) {
           goto fail;
         }
@@ -3059,7 +3059,7 @@ WLLT_PrefillReturn(const nsAString& results)
   /* step through pre-fill list */
   PRInt32 count = LIST_COUNT(wallet_list);
   for (PRInt32 i=0; i<count; i++) {
-    mapElementPtr = NS_STATIC_CAST(wallet_PrefillElement*, wallet_list->ElementAt(i));
+    mapElementPtr = static_cast<wallet_PrefillElement*>(wallet_list->ElementAt(i));
 
     /* advance in fillins list each time a new schema name in pre-fill list is encountered */
     if (mapElementPtr->count != 0) {
@@ -3337,7 +3337,7 @@ WLLT_Prefill(nsIPresShell* shell, PRBool quick, nsIDOMWindowInternal* win)
     wallet_PrefillElement * mapElementPtr;
     PRInt32 count = LIST_COUNT(wallet_PrefillElement_list);
     for (PRInt32 i=0; i<count; i++) {
-      mapElementPtr = NS_STATIC_CAST(wallet_PrefillElement*, wallet_PrefillElement_list->ElementAt(i));
+      mapElementPtr = static_cast<wallet_PrefillElement*>(wallet_PrefillElement_list->ElementAt(i));
       if (mapElementPtr->count) {
         if (mapElementPtr->inputElement) {
           mapElementPtr->inputElement->SetValue(mapElementPtr->value);
@@ -3806,7 +3806,7 @@ WLLT_OnSubmit(nsIDOMHTMLFormElement* currentFormNode, nsIDOMWindowInternal* wind
           }
           PRInt32 count2 = signonData->Count();
           for (PRInt32 i=count2-1; i>=0; i--) {
-            data = NS_STATIC_CAST(si_SignonDataStruct*, signonData->ElementAt(i));
+            data = static_cast<si_SignonDataStruct*>(signonData->ElementAt(i));
             delete data;
           }
           delete signonData;
diff --git a/mozilla/extensions/webdav/src/nsOperationStreamListeners.cpp b/mozilla/extensions/webdav/src/nsOperationStreamListeners.cpp
index 2becf3a5aa1..a8502524e0e 100644
--- a/mozilla/extensions/webdav/src/nsOperationStreamListeners.cpp
+++ b/mozilla/extensions/webdav/src/nsOperationStreamListeners.cpp
@@ -182,8 +182,8 @@ OperationStreamListener::StreamReaderCallback(nsIInputStream *aInputStream,
                                               PRUint32 aCount,
                                               PRUint32 *aWriteCount)
 {
-    OperationStreamListener *osl = NS_STATIC_CAST(OperationStreamListener *,
-                                                  aClosure);
+    OperationStreamListener *osl = static_cast<OperationStreamListener *>
+                                              (aClosure);
     osl->mBody.Append(aRawSegment, aCount);
     *aWriteCount = aCount;
     return NS_OK;
diff --git a/mozilla/extensions/webdav/src/nsWebDAVUtils.cpp b/mozilla/extensions/webdav/src/nsWebDAVUtils.cpp
index 98bc3248ad4..8be0309b364 100644
--- a/mozilla/extensions/webdav/src/nsWebDAVUtils.cpp
+++ b/mozilla/extensions/webdav/src/nsWebDAVUtils.cpp
@@ -127,8 +127,8 @@ NS_WD_GetDocAndResponseListFromBuffer(const nsACString &buffer,
     PR_LOG(gDAVLog, 5, ("XML:\n\n%*s\n\n", flat.Length(), flat.get()));
 
     nsCOMPtr<nsIDOMDocument> doc;
-    rv = parser->ParseFromBuffer(NS_REINTERPRET_CAST(const PRUint8 *,
-                                                     flat.get()),
+    rv = parser->ParseFromBuffer(reinterpret_cast<const PRUint8 *>
+                                                 (flat.get()),
                                  flat.Length(), "text/xml",
                                  getter_AddRefs(doc));
     NS_ENSURE_SUCCESS(rv, rv);
diff --git a/mozilla/extensions/webservices/interfaceinfo/src/nsGenericInterfaceInfoSet.cpp b/mozilla/extensions/webservices/interfaceinfo/src/nsGenericInterfaceInfoSet.cpp
index b1f74964d6c..5dc2280c46d 100644
--- a/mozilla/extensions/webservices/interfaceinfo/src/nsGenericInterfaceInfoSet.cpp
+++ b/mozilla/extensions/webservices/interfaceinfo/src/nsGenericInterfaceInfoSet.cpp
@@ -682,7 +682,7 @@ nsGenericInterfaceInfo::HasAncestor(const nsIID * iid, PRBool *_retval)
     *_retval = PR_FALSE;
 
     nsCOMPtr<nsIInterfaceInfo> current =
-        NS_STATIC_CAST(nsIInterfaceInfo*, this);
+        static_cast<nsIInterfaceInfo*>(this);
     while(current)
     {
         PRBool same;
diff --git a/mozilla/extensions/webservices/interfaceinfo/src/nsScriptableInterfaceInfo.cpp b/mozilla/extensions/webservices/interfaceinfo/src/nsScriptableInterfaceInfo.cpp
index 548793c85cb..06709647c5a 100644
--- a/mozilla/extensions/webservices/interfaceinfo/src/nsScriptableInterfaceInfo.cpp
+++ b/mozilla/extensions/webservices/interfaceinfo/src/nsScriptableInterfaceInfo.cpp
@@ -84,7 +84,7 @@ nsScriptableDataType::Create(const nsXPTType& aType,
     nsScriptableDataType* obj = new nsScriptableDataType(aType);
     if(!obj)
         return NS_ERROR_OUT_OF_MEMORY;
-    *aResult = NS_STATIC_CAST(nsIScriptableDataType*, obj);
+    *aResult = static_cast<nsIScriptableDataType*>(obj);
     NS_ADDREF(*aResult);
     return NS_OK;
 }
@@ -194,7 +194,7 @@ nsScriptableParamInfo::Create(nsIInterfaceInfo* aInfo,
     nsScriptableParamInfo* obj = new nsScriptableParamInfo(aInfo, aParam);
     if(!obj)
         return NS_ERROR_OUT_OF_MEMORY;
-    *aResult = NS_STATIC_CAST(nsIScriptableParamInfo*, obj);
+    *aResult = static_cast<nsIScriptableParamInfo*>(obj);
     NS_ADDREF(*aResult);
     return NS_OK;
 }
@@ -292,7 +292,7 @@ nsScriptableConstant::Create(nsIInterfaceInfo* aInfo,
     nsScriptableConstant* obj = new nsScriptableConstant(aInfo, aConst);
     if(!obj)
         return NS_ERROR_OUT_OF_MEMORY;
-    *aResult = NS_STATIC_CAST(nsIScriptableConstant*, obj);
+    *aResult = static_cast<nsIScriptableConstant*>(obj);
     NS_ADDREF(*aResult);
     return NS_OK;
 }
@@ -323,7 +323,7 @@ nsScriptableConstant::GetValue(nsIVariant * *aValue)
         *aValue = nsnull;
         return NS_ERROR_OUT_OF_MEMORY;
     }
-    *aValue = NS_STATIC_CAST(nsIVariant*, variant);
+    *aValue = static_cast<nsIVariant*>(variant);
     NS_ADDREF(*aValue);
 
     const nsXPTCMiniVariant* varval = mConst.GetValue();
@@ -396,7 +396,7 @@ nsScriptableMethodInfo::Create(nsIInterfaceInfo* aInfo,
     nsScriptableMethodInfo* obj = new nsScriptableMethodInfo(aInfo, aMethod);
     if(!obj)
         return NS_ERROR_OUT_OF_MEMORY;
-    *aResult = NS_STATIC_CAST(nsIScriptableMethodInfo*, obj);
+    *aResult = static_cast<nsIScriptableMethodInfo*>(obj);
     NS_ADDREF(*aResult);
     return NS_OK;
 }
@@ -485,7 +485,7 @@ nsScriptableInterfaceInfo::Create(nsIInterfaceInfo* aInfo,
     nsScriptableInterfaceInfo* obj = new nsScriptableInterfaceInfo(aInfo);
     if(!obj)
         return NS_ERROR_OUT_OF_MEMORY;
-    *aResult = NS_STATIC_CAST(nsIScriptableInterfaceInfo*, obj);
+    *aResult = static_cast<nsIScriptableInterfaceInfo*>(obj);
     NS_ADDREF(*aResult);
     return NS_OK;
 }
diff --git a/mozilla/extensions/webservices/proxy/src/wspcallcontext.cpp b/mozilla/extensions/webservices/proxy/src/wspcallcontext.cpp
index f5beec0d65f..34b74ab9040 100644
--- a/mozilla/extensions/webservices/proxy/src/wspcallcontext.cpp
+++ b/mozilla/extensions/webservices/proxy/src/wspcallcontext.cpp
@@ -246,7 +246,7 @@ WSPCallContext::CallCompletionListener()
   // If we have an exception, report it now
   if (mException) {
     nsCOMPtr<nsISupports> canonical_this = 
-      do_QueryInterface(NS_STATIC_CAST(nsIWebServiceCallContext*, this));
+      do_QueryInterface(static_cast<nsIWebServiceCallContext*>(this));
     dispatchParams[0].val.p = mException.get();
     dispatchParams[0].SetValIsInterface();
     dispatchParams[0].type.flags = XPT_TDP_POINTER | TD_INTERFACE_TYPE;
@@ -390,7 +390,7 @@ WSPCallContext::CallCompletionListener()
         // Give the variant value a nsAString object to hold the data
         // in.
         vars->val.p =
-          NS_STATIC_CAST(nsAString *, &string_array[string_array_index++]);
+          static_cast<nsAString *>(&string_array[string_array_index++]);
       }
 
       rv = WSPProxy::VariantToInParameter(listenerInterfaceInfo,
@@ -405,7 +405,7 @@ WSPCallContext::CallCompletionListener()
                  "WSDL/IInfo param count mismatch");
 
     dispatchParams[paramIndex].val.p =
-        NS_STATIC_CAST(nsIWebServiceCallContext*, this);
+        static_cast<nsIWebServiceCallContext*>(this);
     dispatchParams[paramIndex].SetValIsInterface();
     dispatchParams[paramIndex].type.flags = 
       XPT_TDP_POINTER | TD_INTERFACE_TYPE;
diff --git a/mozilla/extensions/webservices/proxy/src/wspinfoservice.cpp b/mozilla/extensions/webservices/proxy/src/wspinfoservice.cpp
index 5ef64452b9b..9c369681024 100644
--- a/mozilla/extensions/webservices/proxy/src/wspinfoservice.cpp
+++ b/mozilla/extensions/webservices/proxy/src/wspinfoservice.cpp
@@ -381,7 +381,7 @@ AppendMethodForParticle(nsIInterfaceInfoSuperManager* iism,
   // XXX Deal with intercaps in that case?
 
   methodDesc.flags    = params.GetCount() == 1 ? XPT_MD_GETTER : 0;
-  methodDesc.name     = NS_CONST_CAST(char*, identifierName.get());
+  methodDesc.name     = const_cast<char*>(identifierName.get());
   methodDesc.params   = paramArray;
   methodDesc.result   = defaultResult;
   methodDesc.num_args = (PRUint8) params.GetCount();
@@ -1273,7 +1273,7 @@ nsWSPInterfaceInfoService::InfoForPort(nsIWSDLPort *aPort,
 
     WSPFactory::XML2C(tempString, tempCString);
 
-    methodDesc.name     = NS_CONST_CAST(char*, tempCString.get());
+    methodDesc.name     = const_cast<char*>(tempCString.get());
     methodDesc.params   = primaryParamArray;
     methodDesc.result   = defaultResult;
     methodDesc.flags    = 0;
@@ -1285,7 +1285,7 @@ nsWSPInterfaceInfoService::InfoForPort(nsIWSDLPort *aPort,
     }
 
 
-    methodDesc.name     = NS_CONST_CAST(char*, tempCString.get());
+    methodDesc.name     = const_cast<char*>(tempCString.get());
     methodDesc.params   = primaryAsyncParamArray;
     methodDesc.result   = defaultResult;
     methodDesc.flags    = 0;
@@ -1298,7 +1298,7 @@ nsWSPInterfaceInfoService::InfoForPort(nsIWSDLPort *aPort,
 
 
     tempCString.Append("Callback");
-    methodDesc.name     = NS_CONST_CAST(char*, tempCString.get());
+    methodDesc.name     = const_cast<char*>(tempCString.get());
     methodDesc.params   = listenerParamArray;
     methodDesc.result   = defaultResult;
     methodDesc.flags    = 0;
diff --git a/mozilla/extensions/webservices/proxy/src/wsppropertybagwrapper.cpp b/mozilla/extensions/webservices/proxy/src/wsppropertybagwrapper.cpp
index ff372e9c68d..308dcacb42c 100644
--- a/mozilla/extensions/webservices/proxy/src/wsppropertybagwrapper.cpp
+++ b/mozilla/extensions/webservices/proxy/src/wsppropertybagwrapper.cpp
@@ -88,16 +88,16 @@ NS_IMETHODIMP
 WSPPropertyBagWrapper::QueryInterface(REFNSIID aIID, void** aInstancePtr)
 {
   if (aIID.Equals(NS_GET_IID(nsISupports))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIXPTCProxy*, this);
+    *aInstancePtr = static_cast<nsIXPTCProxy*>(this);
   }
   if(mXPTCStub && mIID && aIID.Equals(*mIID)) {
     *aInstancePtr = mXPTCStub;
   }
   else if (aIID.Equals(NS_GET_IID(nsIWebServicePropertyBagWrapper))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIWebServicePropertyBagWrapper*, this);
+    *aInstancePtr = static_cast<nsIWebServicePropertyBagWrapper*>(this);
   }
   else if (aIID.Equals(NS_GET_IID(nsIClassInfo))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIClassInfo*, this);
+    *aInstancePtr = static_cast<nsIClassInfo*>(this);
   } else {
     return NS_ERROR_NO_INTERFACE;
   }
@@ -208,19 +208,19 @@ WSPPropertyBagWrapper::GetInterfaces(PRUint32 *count, nsIID * **array)
   }
 
   *count = 2;
-  nsIID** iids = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(2 * sizeof(nsIID*)));
+  nsIID** iids = static_cast<nsIID**>(nsMemory::Alloc(2 * sizeof(nsIID*)));
   if (!iids) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
-  iids[0] = NS_STATIC_CAST(nsIID *, nsMemory::Clone(mIID, sizeof(nsIID)));
+  iids[0] = static_cast<nsIID *>(nsMemory::Clone(mIID, sizeof(nsIID)));
   if (!iids[0]) {
     nsMemory::Free(iids);
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
   const nsIID& wsiid = NS_GET_IID(nsIWebServicePropertyBagWrapper);
-  iids[1] = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&wsiid, sizeof(nsIID)));
+  iids[1] = static_cast<nsIID *>(nsMemory::Clone(&wsiid, sizeof(nsIID)));
   if (!iids[1]) {
     nsMemory::Free(iids[0]);
     nsMemory::Free(iids);
diff --git a/mozilla/extensions/webservices/proxy/src/wspproxy.cpp b/mozilla/extensions/webservices/proxy/src/wspproxy.cpp
index 45fd4f629e7..e33f4a15fa9 100644
--- a/mozilla/extensions/webservices/proxy/src/wspproxy.cpp
+++ b/mozilla/extensions/webservices/proxy/src/wspproxy.cpp
@@ -140,7 +140,7 @@ NS_IMETHODIMP
 WSPProxy::QueryInterface(REFNSIID aIID, void** aInstancePtr)
 {
   if (aIID.Equals(NS_GET_IID(nsISupports))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIXPTCProxy*, this);
+    *aInstancePtr = static_cast<nsIXPTCProxy*>(this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
@@ -150,12 +150,12 @@ WSPProxy::QueryInterface(REFNSIID aIID, void** aInstancePtr)
     return NS_OK;
   }
   else if (aIID.Equals(NS_GET_IID(nsIWebServiceProxy))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIWebServiceProxy*, this);
+    *aInstancePtr = static_cast<nsIWebServiceProxy*>(this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
   else if (aIID.Equals(NS_GET_IID(nsIClassInfo))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIClassInfo*, this);
+    *aInstancePtr = static_cast<nsIClassInfo*>(this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
@@ -201,7 +201,7 @@ WSPProxy::CallMethod(PRUint16 methodIndex,
   // The first method in the interface for async callers is the
   // one to set the async listener
   if (mIsAsync && (methodIndex == 3)) {
-    nsISupports* listener = NS_STATIC_CAST(nsISupports*, params[0].val.p);
+    nsISupports* listener = static_cast<nsISupports*>(params[0].val.p);
     mAsyncListener = listener;
     return NS_OK;
   }
@@ -338,8 +338,8 @@ WSPProxy::CallMethod(PRUint16 methodIndex,
   // Allocate parameter and header blocks
   nsISOAPParameter** bodyBlocks = nsnull;
   if (bodyCount) {
-    bodyBlocks = NS_STATIC_CAST(nsISOAPParameter**,
-                      nsMemory::Alloc(bodyCount * sizeof(nsISOAPParameter*)));
+    bodyBlocks = static_cast<nsISOAPParameter**>
+                            (nsMemory::Alloc(bodyCount * sizeof(nsISOAPParameter*)));
     if (!bodyBlocks) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
@@ -355,8 +355,8 @@ WSPProxy::CallMethod(PRUint16 methodIndex,
 
   nsISOAPHeaderBlock** headerBlocks = nsnull;
   if (headerCount) {
-    headerBlocks = NS_STATIC_CAST(nsISOAPHeaderBlock**,
-                   nsMemory::Alloc(headerCount * sizeof(nsISOAPHeaderBlock*)));
+    headerBlocks = static_cast<nsISOAPHeaderBlock**>
+                              (nsMemory::Alloc(headerCount * sizeof(nsISOAPHeaderBlock*)));
     if (!headerBlocks) {
       if (bodyBlocks) {
         NS_FREE_XPCOM_ISUPPORTS_POINTER_ARRAY(bodyCount, bodyBlocks);
@@ -525,7 +525,7 @@ WSPProxy::CallMethod(PRUint16 methodIndex,
 #endif
 
     nsIWebServiceCallContext** retval =
-      NS_STATIC_CAST(nsIWebServiceCallContext**, params[pcount-1].val.p);
+      static_cast<nsIWebServiceCallContext**>(params[pcount-1].val.p);
     if (!retval) {
       rv = NS_ERROR_FAILURE;
       goto call_method_end;
@@ -686,10 +686,10 @@ WSPProxy::XPTCMiniVariantToVariant(uint8 aTypeTag, nsXPTCMiniVariant aResult,
       var->SetAsWChar(aResult.val.wc);
       break;
     case nsXPTType::T_CHAR_STR:
-      var->SetAsString(NS_STATIC_CAST(char*, aResult.val.p));
+      var->SetAsString(static_cast<char*>(aResult.val.p));
       break;
     case nsXPTType::T_WCHAR_STR:
-      var->SetAsWString(NS_STATIC_CAST(PRUnichar*, aResult.val.p));
+      var->SetAsWString(static_cast<PRUnichar*>(aResult.val.p));
       break;
     case nsXPTType::T_DOMSTRING:
     case nsXPTType::T_ASTRING:
@@ -1258,18 +1258,18 @@ WSPProxy::GetInterfaces(PRUint32 *count, nsIID * **array)
   }
 
   *count = 2;
-  nsIID** iids = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(2 * sizeof(nsIID*)));
+  nsIID** iids = static_cast<nsIID**>(nsMemory::Alloc(2 * sizeof(nsIID*)));
   if (!iids) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
-  iids[0] = NS_STATIC_CAST(nsIID *, nsMemory::Clone(mIID, sizeof(nsIID)));
+  iids[0] = static_cast<nsIID *>(nsMemory::Clone(mIID, sizeof(nsIID)));
   if (NS_UNLIKELY(!iids[0])) {
     NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(0, iids);
     return NS_ERROR_OUT_OF_MEMORY;
   }
   const nsIID& wsiid = NS_GET_IID(nsIWebServiceProxy);
-  iids[1] = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&wsiid, sizeof(nsIID)));
+  iids[1] = static_cast<nsIID *>(nsMemory::Clone(&wsiid, sizeof(nsIID)));
   if (NS_UNLIKELY(!iids[1])) {
     NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(1, iids);
     return NS_ERROR_OUT_OF_MEMORY;
diff --git a/mozilla/extensions/webservices/schema/src/nsSchemaLoader.cpp b/mozilla/extensions/webservices/schema/src/nsSchemaLoader.cpp
index 9f39148e78b..0005bc00b8b 100644
--- a/mozilla/extensions/webservices/schema/src/nsSchemaLoader.cpp
+++ b/mozilla/extensions/webservices/schema/src/nsSchemaLoader.cpp
@@ -1701,8 +1701,7 @@ nsSchemaLoader::ProcessComplexTypeBody(nsIWebServiceErrorHandler* aErrorHandler,
       
       if (aSequence) {
         // Check if we were collapsed
-        if (modelGroup.get() != NS_STATIC_CAST(nsISchemaModelGroup*, 
-                                               aSequence)) {
+        if (modelGroup.get() != static_cast<nsISchemaModelGroup*>(aSequence)) {
           rv = aSequence->AddParticle(modelGroup);
         }
       }
diff --git a/mozilla/extensions/webservices/security/src/nsWebScriptsAccess.cpp b/mozilla/extensions/webservices/security/src/nsWebScriptsAccess.cpp
index 1b9a9ab1b6e..2ae5c99f95e 100755
--- a/mozilla/extensions/webservices/security/src/nsWebScriptsAccess.cpp
+++ b/mozilla/extensions/webservices/security/src/nsWebScriptsAccess.cpp
@@ -71,7 +71,7 @@
 static PRBool PR_CALLBACK 
 FreeEntries(nsHashKey *aKey, void *aData, void* aClosure)
 {
-  AccessInfoEntry* entry = NS_REINTERPRET_CAST(AccessInfoEntry*, aData);
+  AccessInfoEntry* entry = reinterpret_cast<AccessInfoEntry*>(aData);
   delete entry;
   return PR_TRUE;
 }
@@ -164,7 +164,7 @@ nsWebScriptsAccess::InvalidateCache(const char* aTransportURI)
     nsCStringKey key(aTransportURI);
     if (mAccessInfoTable.Exists(&key)) {
       AccessInfoEntry* entry = 
-        NS_REINTERPRET_CAST(AccessInfoEntry*, mAccessInfoTable.Remove(&key));
+        reinterpret_cast<AccessInfoEntry*>(mAccessInfoTable.Remove(&key));
       delete entry;
     }
   }
@@ -181,7 +181,7 @@ nsWebScriptsAccess::GetAccessInfoEntry(const char* aKey,
 {
   nsCStringKey key(aKey);
 
-  *aEntry = NS_REINTERPRET_CAST(AccessInfoEntry*, mAccessInfoTable.Get(&key));
+  *aEntry = reinterpret_cast<AccessInfoEntry*>(mAccessInfoTable.Get(&key));
   if (*aEntry  && ((*aEntry)->mFlags & WSA_FILE_DELEGATED)) {
     nsresult rv;
     nsCOMPtr<nsIURL> url(do_QueryInterface(mServiceURI, &rv));
@@ -485,7 +485,7 @@ nsWebScriptsAccess::CheckAccess(AccessInfoEntry* aEntry,
   PRUint32 index;
   for (index = 0; index < count; index++) {
     AccessInfo* access_info = 
-      NS_REINTERPRET_CAST(AccessInfo*, aEntry->mInfoArray.ElementAt(index));
+      reinterpret_cast<AccessInfo*>(aEntry->mInfoArray.ElementAt(index));
     NS_ASSERTION(access_info, "Entry is missing attribute information");
     
     if (!access_info->mType || kAny.Equals(access_info->mType) || 
@@ -715,8 +715,8 @@ nsWebScriptsAccess::IsPublicService(const char* aHost, PRBool* aReturn)
 
   // Allocate param block.
   nsISOAPParameter** bodyBlocks = 
-    NS_STATIC_CAST(nsISOAPParameter**,
-                  nsMemory::Alloc(1 * sizeof(nsISOAPParameter*)));
+    static_cast<nsISOAPParameter**>
+               (nsMemory::Alloc(1 * sizeof(nsISOAPParameter*)));
   if (!bodyBlocks)
     return NS_ERROR_OUT_OF_MEMORY;
 
diff --git a/mozilla/extensions/webservices/security/src/nsWebScriptsAccess.h b/mozilla/extensions/webservices/security/src/nsWebScriptsAccess.h
index 67864627563..0ef9bdc2628 100644
--- a/mozilla/extensions/webservices/security/src/nsWebScriptsAccess.h
+++ b/mozilla/extensions/webservices/security/src/nsWebScriptsAccess.h
@@ -78,7 +78,7 @@ public:
     PRUint32 count = mInfoArray.Count();
     while (count) {
       AccessInfo* info = 
-        NS_REINTERPRET_CAST(AccessInfo*, mInfoArray.ElementAt(--count));
+        reinterpret_cast<AccessInfo*>(mInfoArray.ElementAt(--count));
       delete info;
     }
   }
diff --git a/mozilla/extensions/webservices/soap/src/nsDefaultSOAPEncoder.cpp b/mozilla/extensions/webservices/soap/src/nsDefaultSOAPEncoder.cpp
index 5be1c93ae60..1c18f3bf9f8 100644
--- a/mozilla/extensions/webservices/soap/src/nsDefaultSOAPEncoder.cpp
+++ b/mozilla/extensions/webservices/soap/src/nsDefaultSOAPEncoder.cpp
@@ -1188,7 +1188,7 @@ static nsresult GetArrayType(nsIVariant* aSource,
       //  All nested arrays (which is what multi-dimensional arrays are) are variants.
     }
     else {
-      nsIVariant** a = NS_STATIC_CAST(nsIVariant**,array);
+      nsIVariant** a = static_cast<nsIVariant**>(array);
       PRUint16 rtype = nsIDataType::VTYPE_EMPTY;
       for (i = 0; i < count; i++) {
         PRUint16 nexttype;
@@ -1211,7 +1211,7 @@ static nsresult GetArrayType(nsIVariant* aSource,
   switch (type) {
   case nsIDataType::VTYPE_INTERFACE_IS:
     {
-      nsISupports** values = NS_STATIC_CAST(nsISupports**,array);
+      nsISupports** values = static_cast<nsISupports**>(array);
       for (i = 0; i < count; i++)
         NS_RELEASE(values[i]);
     }
@@ -1219,7 +1219,7 @@ static nsresult GetArrayType(nsIVariant* aSource,
   case nsIDataType::VTYPE_WCHAR_STR:
   case nsIDataType::VTYPE_CHAR_STR:
     {
-      void** ptrs = NS_STATIC_CAST(void**,array);
+      void** ptrs = static_cast<void**>(array);
       for (i = 0; i < count; i++) {
         nsMemory::Free(ptrs[i]);
       }
@@ -1307,7 +1307,7 @@ static nsresult EncodeArray(nsISOAPEncoding* aEncoding, nsIVariant* aSource, nsI
 
 #define ENCODE_SIMPLE_ARRAY(XPType, VType, Source)    \
   {                                                   \
-    XPType* values = NS_STATIC_CAST(XPType*, array);  \
+    XPType* values = static_cast<XPType*>(array);  \
     nsCOMPtr<nsIWritableVariant> p =                  \
       do_CreateInstance(NS_VARIANT_CONTRACTID, &rc);  \
     if (NS_FAILED(rc)) break;                         \
@@ -1333,7 +1333,7 @@ static nsresult EncodeArray(nsISOAPEncoding* aEncoding, nsIVariant* aSource, nsI
     switch (type) {
     case nsIDataType::VTYPE_INTERFACE_IS:
       {
-        nsIVariant** values = NS_STATIC_CAST(nsIVariant**, array);//  If not truly a variant, we only release.
+        nsIVariant** values = static_cast<nsIVariant**>(array);//  If not truly a variant, we only release.
         if (iid.Equals(NS_GET_IID(nsIVariant))) {  //  Only do variants for now.
           for (i = 0; i < count; i++) {
             rc = EncodeArray(aEncoding, values[i],
@@ -1392,7 +1392,7 @@ static nsresult EncodeArray(nsISOAPEncoding* aEncoding, nsIVariant* aSource, nsI
     ENCODE_SIMPLE_ARRAY(PRUnichar, WChar, values[i]);
   case nsIDataType::VTYPE_INTERFACE_IS:
     {
-      nsIVariant** values = NS_STATIC_CAST(nsIVariant**, array);//  If not truly a variant, we only use as nsISupports
+      nsIVariant** values = static_cast<nsIVariant**>(array);//  If not truly a variant, we only use as nsISupports
       if (iid.Equals(NS_GET_IID(nsIVariant))) {  //  Only do variants for now.
         for (i = 0; i < count; i++) {
           rc = aEncoding->Encode(values[i],
@@ -1441,7 +1441,7 @@ static nsresult EncodeArray(nsISOAPEncoding* aEncoding, nsIVariant* aSource, nsI
     rc = SOAP_EXCEPTION(NS_ERROR_ILLEGAL_VALUE,"SOAP_ARRAY_TYPES","When encoding an array, unable to handle array elements");
   }
   if (freeptrs) {
-    void** ptrs = NS_STATIC_CAST(void**,array);
+    void** ptrs = static_cast<void**>(array);
     for (i = 0; i < count; i++) {
       nsMemory::Free(ptrs[i]);
     }
@@ -1895,7 +1895,7 @@ nsBase64BinaryEncoder::Encode(nsISOAPEncoding * aEncoding,
     return NS_ERROR_FAILURE;
   }
 
-  char* encodedVal = PL_Base64Encode(NS_STATIC_CAST(char*, array), count, nsnull);
+  char* encodedVal = PL_Base64Encode(static_cast<char*>(array), count, nsnull);
   if (!encodedVal) {
     return NS_ERROR_FAILURE;
   }
diff --git a/mozilla/extensions/webservices/soap/src/nsSOAPBlock.cpp b/mozilla/extensions/webservices/soap/src/nsSOAPBlock.cpp
index 5c770b81ae1..3629e58a605 100644
--- a/mozilla/extensions/webservices/soap/src/nsSOAPBlock.cpp
+++ b/mozilla/extensions/webservices/soap/src/nsSOAPBlock.cpp
@@ -206,8 +206,8 @@ NS_IMETHODIMP
 
   if (!JS_ConvertArguments(cx, argc, argv, "/%iv %is %is %ip %ip",
                            &s1,
-                           NS_STATIC_CAST(nsAString *, &name),
-                           NS_STATIC_CAST(nsAString *, &namespaceURI),
+                           static_cast<nsAString *>(&name),
+                           static_cast<nsAString *>(&namespaceURI),
                            &s2,
                            &s3))
     return SOAP_EXCEPTION(NS_ERROR_ILLEGAL_VALUE,"SOAP_BLOCK_INIT", "Could not interpret block initialization arguments.");
diff --git a/mozilla/extensions/webservices/soap/src/nsSOAPEncoding.cpp b/mozilla/extensions/webservices/soap/src/nsSOAPEncoding.cpp
index e793e78d696..3b1ac59a8b8 100644
--- a/mozilla/extensions/webservices/soap/src/nsSOAPEncoding.cpp
+++ b/mozilla/extensions/webservices/soap/src/nsSOAPEncoding.cpp
@@ -428,7 +428,7 @@ nsSOAPEncoding::MapSchemaURI(const nsAString & aExternalURI,
 NS_IMETHODIMP nsSOAPEncoding::UnmapSchemaURI(const nsAString & aExternalURI, PRBool *_retval)
 {
   nsStringKey externalKey(aExternalURI);
-  nsCOMPtr<nsIVariant> internal = dont_AddRef(NS_STATIC_CAST(nsIVariant*,mMappedExternal.Get(&externalKey)));
+  nsCOMPtr<nsIVariant> internal = dont_AddRef(static_cast<nsIVariant*>(mMappedExternal.Get(&externalKey)));
   if (internal) {
     nsAutoString internalstr;
     nsresult rc = internal->GetAsAString(internalstr);
@@ -452,7 +452,7 @@ NS_IMETHODIMP nsSOAPEncoding::GetInternalSchemaURI(const nsAString & aExternalUR
 {
   if (mMappedExternal.Count()) {
     nsStringKey externalKey(aExternalURI);
-    nsCOMPtr<nsIVariant> internal = dont_AddRef(NS_STATIC_CAST(nsIVariant*,mMappedExternal.Get(&externalKey)));
+    nsCOMPtr<nsIVariant> internal = dont_AddRef(static_cast<nsIVariant*>(mMappedExternal.Get(&externalKey)));
     if (internal) {
       return internal->GetAsAString(_retval);
     }
@@ -469,7 +469,7 @@ NS_IMETHODIMP nsSOAPEncoding::GetExternalSchemaURI(const nsAString & aInternalUR
 {
   if (mMappedInternal.Count()) {
     nsStringKey internalKey(aInternalURI);
-    nsCOMPtr<nsIVariant> external = dont_AddRef(NS_STATIC_CAST(nsIVariant*,mMappedInternal.Get(&internalKey)));
+    nsCOMPtr<nsIVariant> external = dont_AddRef(static_cast<nsIVariant*>(mMappedInternal.Get(&internalKey)));
     if (external) {
       return external->GetAsAString(_retval);
     }
diff --git a/mozilla/extensions/webservices/soap/src/nsSOAPPropertyBag.cpp b/mozilla/extensions/webservices/soap/src/nsSOAPPropertyBag.cpp
index 59eb060912f..ec4010ecf76 100644
--- a/mozilla/extensions/webservices/soap/src/nsSOAPPropertyBag.cpp
+++ b/mozilla/extensions/webservices/soap/src/nsSOAPPropertyBag.cpp
@@ -141,8 +141,8 @@ nsSOAPPropertyBag::GetProperty(nsIXPConnectWrappedNative * wrapper,
   nsresult rv = NS_OK;
   if (JSVAL_IS_STRING(id)) {
     JSString *str = JSVAL_TO_STRING(id);
-    const PRUnichar *name = NS_REINTERPRET_CAST(const PRUnichar *,
-                                                JS_GetStringChars(str));
+    const PRUnichar *name = reinterpret_cast<const PRUnichar *>
+                                            (JS_GetStringChars(str));
     nsCOMPtr<nsIVariant> value;
     mProperties.Get(nsDependentString(name), getter_AddRefs(value));
     if (!value)
@@ -160,7 +160,7 @@ PLDHashOperator PR_CALLBACK
 PropertyBagEnumFunc(const nsAString& aKey, nsIVariant *aData, void *aClosure)
 {
   nsCOMArray<nsISupports>* properties =
-      NS_STATIC_CAST(nsCOMArray<nsISupports>*, aClosure);
+      static_cast<nsCOMArray<nsISupports>*>(aClosure);
   
   nsSOAPProperty* prop = new nsSOAPProperty(aKey, aData);
   NS_ENSURE_TRUE(prop, PL_DHASH_STOP);
diff --git a/mozilla/extensions/webservices/wsdl/src/nsWSDLLoader.cpp b/mozilla/extensions/webservices/wsdl/src/nsWSDLLoader.cpp
index 92dbbf39dbb..c3c37f4ab45 100644
--- a/mozilla/extensions/webservices/wsdl/src/nsWSDLLoader.cpp
+++ b/mozilla/extensions/webservices/wsdl/src/nsWSDLLoader.cpp
@@ -696,8 +696,8 @@ nsWSDLLoadRequest::GetCurrentContext()
 {
   PRUint32 count = mContextStack.Count();
   if (count > 0) {
-    return NS_STATIC_CAST(nsWSDLLoadingContext*,
-                          mContextStack.ElementAt(count-1));
+    return static_cast<nsWSDLLoadingContext*>
+                      (mContextStack.ElementAt(count-1));
   }
 
   return nsnull;
@@ -709,7 +709,7 @@ nsWSDLLoadRequest::PopContext()
   PRUint32 count = mContextStack.Count();
   if (count > 0) {
     nsWSDLLoadingContext* context =
-      NS_STATIC_CAST(nsWSDLLoadingContext*, mContextStack.ElementAt(count-1));
+      static_cast<nsWSDLLoadingContext*>(mContextStack.ElementAt(count-1));
     delete context;
     mContextStack.RemoveElementAt(count-1);
   }
@@ -1356,8 +1356,8 @@ nsWSDLLoadRequest::ProcessMessageBinding(nsIDOMElement* aElement,
         return NS_ERROR_OUT_OF_MEMORY;
       }
       messageBinding = messageBindingInst;
-      nsWSDLMessage* messageInst = NS_REINTERPRET_CAST(nsWSDLMessage*,
-                                                       aMessage);
+      nsWSDLMessage* messageInst = reinterpret_cast<nsWSDLMessage*>
+                                                   (aMessage);
       messageInst->SetBinding(messageBinding);
 
       nsCOMPtr<nsISOAPPartBinding> binding;
@@ -1379,7 +1379,7 @@ nsWSDLLoadRequest::ProcessMessageBinding(nsIDOMElement* aElement,
         aMessage->GetPartCount(&count);
         for (index = 0; index < count; index++) {
           aMessage->GetPart(index, getter_AddRefs(part));
-          partInst = NS_REINTERPRET_CAST(nsWSDLPart*, part.get());
+          partInst = reinterpret_cast<nsWSDLPart*>(part.get());
           if (partInst) {
             partInst->SetBinding(binding);
           }
@@ -1404,7 +1404,7 @@ nsWSDLLoadRequest::ProcessMessageBinding(nsIDOMElement* aElement,
 
           if (!partName.IsEmpty()) {
             aMessage->GetPartByName(partName, getter_AddRefs(part));
-            partInst = NS_REINTERPRET_CAST(nsWSDLPart*, part.get());
+            partInst = reinterpret_cast<nsWSDLPart*>(part.get());
             if (partInst) {
               partInst->SetBinding(binding);
             }
@@ -1444,8 +1444,8 @@ nsWSDLLoadRequest::ProcessOperationBinding(nsIDOMElement* aElement,
 
     return NS_ERROR_WSDL_UNKNOWN_WSDL_COMPONENT;
   }
-  nsWSDLOperation* operationInst = NS_REINTERPRET_CAST(nsWSDLOperation*,
-                                                       operation.get());
+  nsWSDLOperation* operationInst = reinterpret_cast<nsWSDLOperation*>
+                                                   (operation.get());
 
   nsCOMPtr<nsISOAPOperationBinding> binding;
   nsSOAPOperationBinding* bindingInst = new nsSOAPOperationBinding();
@@ -1629,7 +1629,7 @@ nsWSDLLoadRequest::ProcessBindingElement(nsIDOMElement* aElement)
 
     return NS_ERROR_WSDL_BINDING_NOT_FOUND;
   }
-  nsWSDLPort* portInst = NS_REINTERPRET_CAST(nsWSDLPort*, port.get());
+  nsWSDLPort* portInst = reinterpret_cast<nsWSDLPort*>(port.get());
   portInst->SetBinding(binding);
 
   mPort = port;
diff --git a/mozilla/extensions/xforms/nsXFormsControlStub.cpp b/mozilla/extensions/xforms/nsXFormsControlStub.cpp
index c0e9f159663..f20c22629a7 100644
--- a/mozilla/extensions/xforms/nsXFormsControlStub.cpp
+++ b/mozilla/extensions/xforms/nsXFormsControlStub.cpp
@@ -605,7 +605,7 @@ public:
   ~ControlDebug() {
     for (PRInt32 i = 0; i < sControlList->Count(); ++i) {
       nsXFormsControlStub* control =
-        NS_STATIC_CAST(nsXFormsControlStub*, sControlList->ElementAt(i));
+        static_cast<nsXFormsControlStub*>(sControlList->ElementAt(i));
       if (control) {
         printf("Possible leak, <xforms:%s>\n", control->Name());
       }
diff --git a/mozilla/extensions/xforms/nsXFormsElementFactory.cpp b/mozilla/extensions/xforms/nsXFormsElementFactory.cpp
index 67b7ae684de..c83a299c98e 100644
--- a/mozilla/extensions/xforms/nsXFormsElementFactory.cpp
+++ b/mozilla/extensions/xforms/nsXFormsElementFactory.cpp
@@ -243,8 +243,8 @@ nsXFormsElementFactory::GetFeature(nsISupports *aObject,
     NS_ENSURE_STATE(doc);
 
     nsISupports* owner =
-      NS_STATIC_CAST(nsISupports*,
-                     doc->GetProperty(nsXFormsAtoms::instanceDocumentOwner));
+      static_cast<nsISupports*>
+                 (doc->GetProperty(nsXFormsAtoms::instanceDocumentOwner));
     NS_IF_ADDREF(*aReturn = owner);
     return NS_OK;
   }
diff --git a/mozilla/extensions/xforms/nsXFormsMDGEngine.cpp b/mozilla/extensions/xforms/nsXFormsMDGEngine.cpp
index 775254a0b55..f585dc4c9e5 100644
--- a/mozilla/extensions/xforms/nsXFormsMDGEngine.cpp
+++ b/mozilla/extensions/xforms/nsXFormsMDGEngine.cpp
@@ -286,7 +286,7 @@ nsXFormsMDGEngine::PrintDot(const char* aFile)
   }
   fprintf(FD, "digraph {\n");
   for (PRInt32 i = 0; i < mGraph.Count(); ++i) {
-    nsXFormsMDGNode* g = NS_STATIC_CAST(nsXFormsMDGNode*, mGraph[i]);
+    nsXFormsMDGNode* g = static_cast<nsXFormsMDGNode*>(mGraph[i]);
     if (g) {
       nsAutoString domNodeName;
       g->mContextNode->GetNodeName(domNodeName);
@@ -297,8 +297,8 @@ nsXFormsMDGEngine::PrintDot(const char* aFile)
       }
 
       for (PRInt32 j = 0; j < g->mSuc.Count(); ++j) {
-        nsXFormsMDGNode* sucnode = NS_STATIC_CAST(nsXFormsMDGNode*,
-                                                  g->mSuc[j]);
+        nsXFormsMDGNode* sucnode = static_cast<nsXFormsMDGNode*>
+                                              (g->mSuc[j]);
         if (sucnode) {
           nsAutoString sucName;
           sucnode->mContextNode->GetNodeName(sucName);
@@ -346,7 +346,7 @@ nsXFormsMDGEngine::Recalculate(nsCOMArray<nsIDOMNode> *aChangedNodes)
   // Go through all dirty nodes in the graph
   nsXFormsMDGNode* g;
   for (PRInt32 i = 0; i < mGraph.Count(); ++i) {
-    g = NS_STATIC_CAST(nsXFormsMDGNode*, mGraph[i]);
+    g = static_cast<nsXFormsMDGNode*>(mGraph[i]);
 
     if (!g) {
       NS_WARNING("nsXFormsMDGEngine::Calculcate(): Empty node in graph!!!");
@@ -477,7 +477,7 @@ nsXFormsMDGEngine::Recalculate(nsCOMArray<nsIDOMNode> *aChangedNodes)
     // Mark successors dirty
     nsXFormsMDGNode* sucnode;
     for (PRInt32 j = 0; j < g->mSuc.Count(); ++j) {
-      sucnode = NS_STATIC_CAST(nsXFormsMDGNode*, g->mSuc[j]);
+      sucnode = static_cast<nsXFormsMDGNode*>(g->mSuc[j]);
       if (!sucnode) {
         NS_ERROR("nsXFormsMDGEngine::Calculate(): Node has NULL successor!");
         return NS_ERROR_FAILURE;
@@ -552,10 +552,10 @@ nsXFormsMDGEngine::Rebuild()
   
   
   nsXFormsMDGNode* node;
-  while ((node = NS_STATIC_CAST(nsXFormsMDGNode*, sortedNodes.Pop()))) {
+  while ((node = static_cast<nsXFormsMDGNode*>(sortedNodes.Pop()))) {
     for (PRInt32 i = 0; i < node->mSuc.Count(); ++i) {
-      nsXFormsMDGNode* sucNode = NS_STATIC_CAST(nsXFormsMDGNode*,
-                                                node->mSuc[i]);
+      nsXFormsMDGNode* sucNode = static_cast<nsXFormsMDGNode*>
+                                            (node->mSuc[i]);
       NS_ASSERTION(sucNode, "XForms: NULL successor node");
 
       sucNode->mCount--;
@@ -1023,7 +1023,7 @@ nsXFormsMDGEngine::AddStartNodes(nsISupports     *aKey,
          aDeque);
 #endif
 
-  nsDeque* deque = NS_STATIC_CAST(nsDeque*, aDeque);
+  nsDeque* deque = static_cast<nsDeque*>(aDeque);
   if (!deque) {
     NS_ERROR("nsXFormsMDGEngine::AddStartNodes called with NULL aDeque");
     return PL_DHASH_STOP;
@@ -1046,7 +1046,7 @@ nsXFormsMDGEngine::AndFlag(nsISupports                  *aKey,
                            nsAutoPtr<nsXFormsNodeState> &aState,
                            void                         *aMask)
 {
-  PRUint16* andMask = NS_STATIC_CAST(PRUint16*, aMask);
+  PRUint16* andMask = static_cast<PRUint16*>(aMask);
   if (!andMask) {
     return PL_DHASH_STOP;
   }
@@ -1226,7 +1226,7 @@ nsXFormsMDGEngine::Invalidate()
 {
   nsXFormsMDGNode* g;
   for (PRInt32 i = 0; i < mGraph.Count(); ++i) {
-    g = NS_STATIC_CAST(nsXFormsMDGNode*, mGraph[i]);
+    g = static_cast<nsXFormsMDGNode*>(mGraph[i]);
     NS_ENSURE_TRUE(g, NS_ERROR_FAILURE);
     g->MarkDirty();
   }
diff --git a/mozilla/extensions/xforms/nsXFormsMessageElement.cpp b/mozilla/extensions/xforms/nsXFormsMessageElement.cpp
index 635dabcd880..46644399e1a 100644
--- a/mozilla/extensions/xforms/nsXFormsMessageElement.cpp
+++ b/mozilla/extensions/xforms/nsXFormsMessageElement.cpp
@@ -244,8 +244,8 @@ nsXFormsMessageElement::WillChangeDocument(nsIDOMDocument *aNewDocument)
     nsCOMPtr<nsIDocument> doc(do_QueryInterface(mDocument));
     if (doc) {
       nsXFormsMessageElement *msg =
-        NS_STATIC_CAST(nsXFormsMessageElement*,
-                       doc->GetProperty(nsXFormsAtoms::messageProperty));
+        static_cast<nsXFormsMessageElement*>
+                   (doc->GetProperty(nsXFormsAtoms::messageProperty));
       if (msg == this)
         doc->UnsetProperty(nsXFormsAtoms::messageProperty);
     }
@@ -577,8 +577,8 @@ nsXFormsMessageElement::HandleEphemeralMessage(nsIDOMDocument* aDoc,
       return NS_OK;
 
     nsXFormsMessageElement *msg =
-    NS_STATIC_CAST(nsXFormsMessageElement*,
-                   doc->GetProperty(nsXFormsAtoms::messageProperty));
+    static_cast<nsXFormsMessageElement*>
+               (doc->GetProperty(nsXFormsAtoms::messageProperty));
     if (msg == this) {
       if (eventType.EqualsLiteral("xforms-moz-hint-off")) {
         if (mEphemeralTimer) {
@@ -796,7 +796,7 @@ void
 sEphemeralCallbackShow(nsITimer *aTimer, void *aListener)
 {
   nsXFormsMessageElement* self =
-    NS_STATIC_CAST(nsXFormsMessageElement*, aListener);
+    static_cast<nsXFormsMessageElement*>(aListener);
   if (self)
     self->ShowEphemeral();
 }
@@ -805,7 +805,7 @@ void
 sEphemeralCallbackHide(nsITimer *aTimer, void *aListener)
 {
   nsXFormsMessageElement* self =
-    NS_STATIC_CAST(nsXFormsMessageElement*, aListener);
+    static_cast<nsXFormsMessageElement*>(aListener);
   if (self)
     self->HideEphemeral();
 }
@@ -814,7 +814,7 @@ void
 sEphemeralCallbackResetPosition(nsITimer *aTimer, void *aListener)
 {
   nsXFormsMessageElement* self =
-    NS_STATIC_CAST(nsXFormsMessageElement*, aListener);
+    static_cast<nsXFormsMessageElement*>(aListener);
   if (self)
     self->ResetEphemeralPosition();
 }
@@ -876,8 +876,8 @@ nsXFormsMessageElement::HideEphemeral()
   if (!doc)
     return;
   nsXFormsMessageElement *msg =
-    NS_STATIC_CAST(nsXFormsMessageElement*,
-                   doc->GetProperty(nsXFormsAtoms::messageProperty));
+    static_cast<nsXFormsMessageElement*>
+               (doc->GetProperty(nsXFormsAtoms::messageProperty));
   if (msg && msg != this) {
     msg->HideEphemeral();
     return;
@@ -1212,7 +1212,7 @@ nsXFormsMessageElement::AddRemoveExternalResource(PRBool aAdd)
     }
   }
   doc->SetProperty(nsXFormsAtoms::externalMessagesProperty,
-                   NS_REINTERPRET_CAST(void *, loadingMessages), nsnull);
+                   reinterpret_cast<void *>(loadingMessages), nsnull);
 
   if (!loadingMessages) {
     // no outstanding loads left, let the model in the document know in case
diff --git a/mozilla/extensions/xforms/nsXFormsModelElement.cpp b/mozilla/extensions/xforms/nsXFormsModelElement.cpp
index fa701188460..f5f61b078bd 100644
--- a/mozilla/extensions/xforms/nsXFormsModelElement.cpp
+++ b/mozilla/extensions/xforms/nsXFormsModelElement.cpp
@@ -136,7 +136,7 @@ DeleteVoidArray(void    *aObject,
                 void    *aPropertyValue,
                 void    *aData)
 {
-  delete NS_STATIC_CAST(nsVoidArray *, aPropertyValue);
+  delete static_cast<nsVoidArray *>(aPropertyValue);
 }
 
 static nsresult
@@ -145,8 +145,8 @@ AddToModelList(nsIDOMDocument *domDoc, nsXFormsModelElement *model)
   nsCOMPtr<nsIDocument> doc = do_QueryInterface(domDoc);
 
   nsVoidArray *models =
-      NS_STATIC_CAST(nsVoidArray *,
-                     doc->GetProperty(nsXFormsAtoms::modelListProperty));
+      static_cast<nsVoidArray *>
+                 (doc->GetProperty(nsXFormsAtoms::modelListProperty));
   if (!models) {
     models = new nsVoidArray(16);
     if (!models)
@@ -163,8 +163,8 @@ RemoveFromModelList(nsIDOMDocument *domDoc, nsXFormsModelElement *model)
   nsCOMPtr<nsIDocument> doc = do_QueryInterface(domDoc);
 
   nsVoidArray *models =
-      NS_STATIC_CAST(nsVoidArray *,
-                     doc->GetProperty(nsXFormsAtoms::modelListProperty));
+      static_cast<nsVoidArray *>
+                 (doc->GetProperty(nsXFormsAtoms::modelListProperty));
   if (models)
     models->RemoveElement(model);
 }
@@ -174,15 +174,15 @@ GetModelList(nsIDOMDocument *domDoc)
 {
   nsCOMPtr<nsIDocument> doc = do_QueryInterface(domDoc);
 
-  return NS_STATIC_CAST(nsVoidArray *,
-                        doc->GetProperty(nsXFormsAtoms::modelListProperty));
+  return static_cast<nsVoidArray *>
+                    (doc->GetProperty(nsXFormsAtoms::modelListProperty));
 }
 
 static void
 SupportsDtorFunc(void *aObject, nsIAtom *aPropertyName,
                  void *aPropertyValue, void *aData)
 {
-  nsISupports *propertyValue = NS_STATIC_CAST(nsISupports*, aPropertyValue);
+  nsISupports *propertyValue = static_cast<nsISupports*>(aPropertyValue);
   NS_IF_RELEASE(propertyValue);
 }
 
@@ -544,7 +544,7 @@ nsPostRefresh::~nsPostRefresh()
       // see nsVoidArray::RemoveElementsAt().
       PRInt32 last = sPostRefreshList->Count() - 1;
       nsIXFormsControl* control =
-        NS_STATIC_CAST(nsIXFormsControl*, sPostRefreshList->ElementAt(last));
+        static_cast<nsIXFormsControl*>(sPostRefreshList->ElementAt(last));
       sPostRefreshList->RemoveElementAt(last);
       if (control)
         control->Refresh();
@@ -564,7 +564,7 @@ nsPostRefresh::~nsPostRefresh()
   while (sContainerPostRefreshList && sContainerPostRefreshList->Count()) {
     PRInt32 last = sContainerPostRefreshList->Count() - 1;
     nsIXFormsControl* container =
-      NS_STATIC_CAST(nsIXFormsControl*, sContainerPostRefreshList->ElementAt(last));
+      static_cast<nsIXFormsControl*>(sContainerPostRefreshList->ElementAt(last));
     sContainerPostRefreshList->RemoveElementAt(last);
     if (container) {
       container->Refresh();
@@ -1801,7 +1801,7 @@ nsXFormsModelElement::GetTypeFromNode(nsIDOMNode *aInstanceData,
       nsISchemaType *type;
       nsCOMPtr<nsIAtom> myAtom = do_GetAtom("xsdtype");
 
-      type = NS_STATIC_CAST(nsISchemaType *, content->GetProperty(myAtom));
+      type = static_cast<nsISchemaType *>(content->GetProperty(myAtom));
       if (type) {
         type->GetName(aType);
         type->GetTargetNamespace(aNSUri);
@@ -1895,7 +1895,7 @@ nsXFormsModelElement::RequestUpdateEvent(nsXFormsEvent aEvent)
   PRInt32 loopCount = 0;
   while (mUpdateEventQueue.Count()) {
     nsXFormsEvent event =
-      NS_STATIC_CAST(nsXFormsEvent, NS_PTR_TO_UINT32(mUpdateEventQueue[0]));
+      static_cast<nsXFormsEvent>(NS_PTR_TO_UINT32(mUpdateEventQueue[0]));
     NS_ENSURE_TRUE(mUpdateEventQueue.RemoveElementAt(0), NS_ERROR_FAILURE);
 
     rv = nsXFormsUtils::DispatchEvent(mElement, event);
@@ -2264,7 +2264,7 @@ nsXFormsModelElement::MaybeNotifyCompletion()
   // DOMContentLoaded.
   for (i = 0; i < models->Count(); ++i) {
     nsXFormsModelElement *model =
-        NS_STATIC_CAST(nsXFormsModelElement *, models->ElementAt(i));
+        static_cast<nsXFormsModelElement *>(models->ElementAt(i));
     if (!model->mDocumentLoaded || !model->IsComplete())
       return;
 
@@ -2295,7 +2295,7 @@ nsXFormsModelElement::MaybeNotifyCompletion()
   // Okay, dispatch xforms-model-construct-done
   for (i = 0; i < models->Count(); ++i) {
     nsXFormsModelElement *model =
-        NS_STATIC_CAST(nsXFormsModelElement *, models->ElementAt(i));
+        static_cast<nsXFormsModelElement *>(models->ElementAt(i));
     nsXFormsUtils::DispatchEvent(model->mElement, eEvent_ModelConstructDone);
   }
 
@@ -2315,7 +2315,7 @@ nsXFormsModelElement::MaybeNotifyCompletion()
   // Backup instances and fire xforms-ready
   for (i = 0; i < models->Count(); ++i) {
     nsXFormsModelElement *model =
-        NS_STATIC_CAST(nsXFormsModelElement *, models->ElementAt(i));
+        static_cast<nsXFormsModelElement *>(models->ElementAt(i));
     model->BackupOrRestoreInstanceData(PR_FALSE);
     model->mReadyHandled = PR_TRUE;
     nsXFormsUtils::DispatchEvent(model->mElement, eEvent_Ready);
@@ -2397,7 +2397,7 @@ nsXFormsModelElement::ProcessBind(nsIDOMXPathEvaluator *aEvaluator,
     NS_ENSURE_SUCCESS(rv, rv);
 
     // addref, circumventing nsDerivedSave
-    NS_ADDREF(NS_STATIC_CAST(nsIDOMXPathResult*, result));
+    NS_ADDREF(static_cast<nsIDOMXPathResult*>(result));
   }
 
   PRUint32 snapLen;
@@ -2632,8 +2632,8 @@ nsXFormsModelElement::MessageLoadFinished()
   const nsVoidArray *models = GetModelList(domDoc);
   nsCOMPtr<nsIDocument>doc = do_QueryInterface(domDoc);
   nsCOMArray<nsIXFormsControl> *deferredBindList =
-    NS_STATIC_CAST(nsCOMArray<nsIXFormsControl> *,
-                   doc->GetProperty(nsXFormsAtoms::deferredBindListProperty));
+    static_cast<nsCOMArray<nsIXFormsControl> *>
+               (doc->GetProperty(nsXFormsAtoms::deferredBindListProperty));
 
   // if we've already gotten the xforms-model-construct-done event and not
   // yet the xforms-ready, we've hit a window where we may still be
@@ -2649,7 +2649,7 @@ nsXFormsModelElement::MessageLoadFinished()
   // ready to send out xforms-ready to all of the models.
   for (int i = 0; i < models->Count(); ++i) {
     nsXFormsModelElement *model =
-        NS_STATIC_CAST(nsXFormsModelElement *, models->ElementAt(i));
+        static_cast<nsXFormsModelElement *>(models->ElementAt(i));
     model->mReadyHandled = PR_TRUE;
     nsXFormsUtils::DispatchEvent(model->mElement, eEvent_Ready);
   }
@@ -3230,7 +3230,7 @@ DeleteBindList(void    *aObject,
                void    *aPropertyValue,
                void    *aData)
 {
-  delete NS_STATIC_CAST(nsCOMArray<nsIXFormsControl> *, aPropertyValue);
+  delete static_cast<nsCOMArray<nsIXFormsControl> *>(aPropertyValue);
 }
 
 /* static */ nsresult
@@ -3265,8 +3265,8 @@ nsXFormsModelElement::DeferElementBind(nsIXFormsControl *aControl)
   }
 
   nsCOMArray<nsIXFormsControl> *deferredBindList =
-    NS_STATIC_CAST(nsCOMArray<nsIXFormsControl> *,
-                   doc->GetProperty(nsXFormsAtoms::deferredBindListProperty));
+    static_cast<nsCOMArray<nsIXFormsControl> *>
+               (doc->GetProperty(nsXFormsAtoms::deferredBindListProperty));
 
   if (!deferredBindList) {
     deferredBindList = new nsCOMArray<nsIXFormsControl>(16);
@@ -3304,8 +3304,8 @@ nsXFormsModelElement::ProcessDeferredBinds(nsIDOMDocument *aDoc)
   doc->SetProperty(nsXFormsAtoms::readyForBindProperty, doc);
 
   nsCOMArray<nsIXFormsControl> *deferredBindList =
-      NS_STATIC_CAST(nsCOMArray<nsIXFormsControl> *,
-                     doc->GetProperty(nsXFormsAtoms::deferredBindListProperty));
+      static_cast<nsCOMArray<nsIXFormsControl> *>
+                 (doc->GetProperty(nsXFormsAtoms::deferredBindListProperty));
 
   if (deferredBindList) {
     for (PRInt32 i = 0; i < deferredBindList->Count(); ++i) {
diff --git a/mozilla/extensions/xforms/nsXFormsSubmissionElement.cpp b/mozilla/extensions/xforms/nsXFormsSubmissionElement.cpp
index 40b4579a391..6794c9dd8e1 100644
--- a/mozilla/extensions/xforms/nsXFormsSubmissionElement.cpp
+++ b/mozilla/extensions/xforms/nsXFormsSubmissionElement.cpp
@@ -1354,7 +1354,7 @@ nsXFormsSubmissionElement::CreateAttachments(nsIModelElementPrivate *aModel,
           content->GetProperty(nsXFormsAtoms::uploadFileProperty);
       }
 
-      nsIFile *file = NS_STATIC_CAST(nsIFile *, uploadFileProperty);
+      nsIFile *file = static_cast<nsIFile *>(uploadFileProperty);
       // NOTE: this value may be null if a file hasn't been selected.
 
       if (uploadFileProperty) {
@@ -1426,7 +1426,7 @@ nsXFormsSubmissionElement::CreateAttachments(nsIModelElementPrivate *aModel,
             continue;
           }
 
-          nsIFile *file = NS_STATIC_CAST(nsIFile *, uploadFileProperty);
+          nsIFile *file = static_cast<nsIFile *>(uploadFileProperty);
           nsCString cid;
           cid.AssignLiteral("cid:");
           MakeMultipartContentID(cid);
@@ -1458,7 +1458,7 @@ ReleaseObject(void    *aObject,
               void    *aPropertyValue,
               void    *aData)
 {
-  NS_STATIC_CAST(nsISupports *, aPropertyValue)->Release();
+  static_cast<nsISupports *>(aPropertyValue)->Release();
 }
 
 nsresult
@@ -1620,7 +1620,7 @@ nsXFormsSubmissionElement::CopyChildren(nsIModelElementPrivate *aModel,
                     // Clone the local file so the same pointer isn't released
                     // twice
                     nsIFile *file =
-                      NS_STATIC_CAST(nsIFile *, uploadFileProperty);
+                      static_cast<nsIFile *>(uploadFileProperty);
                     nsIFile *fileCopy = nsnull;
                     nsresult rv = file->Clone(&fileCopy);
                     NS_ENSURE_SUCCESS(rv, rv);
@@ -1643,7 +1643,7 @@ nsXFormsSubmissionElement::CopyChildren(nsIModelElementPrivate *aModel,
             nsCOMPtr<nsIContent> destChildContent(do_QueryInterface(node));
             if (destChildContent) {
               // Clone the local file so the same pointer isn't released twice.
-              nsIFile *file = NS_STATIC_CAST(nsIFile *, uploadFileProperty);
+              nsIFile *file = static_cast<nsIFile *>(uploadFileProperty);
               nsIFile *fileCopy = nsnull;
               nsresult rv = file->Clone(&fileCopy);
               NS_ENSURE_SUCCESS(rv, rv);
@@ -2020,7 +2020,7 @@ nsXFormsSubmissionElement::AppendMultipartFormData(nsIDOMNode *data,
           attr->GetProperty(nsXFormsAtoms::uploadFileProperty);
       }
       
-      nsIFile *file = NS_STATIC_CAST(nsIFile *, uploadFileProperty);
+      nsIFile *file = static_cast<nsIFile *>(uploadFileProperty);
 
       nsAutoString leafName;
       if (file)
diff --git a/mozilla/extensions/xforms/nsXFormsUploadElement.cpp b/mozilla/extensions/xforms/nsXFormsUploadElement.cpp
index 7e22228c5a8..a1231ba49f9 100644
--- a/mozilla/extensions/xforms/nsXFormsUploadElement.cpp
+++ b/mozilla/extensions/xforms/nsXFormsUploadElement.cpp
@@ -137,7 +137,7 @@ ReleaseObject(void    *aObject,
               void    *aPropertyValue,
               void    *aData)
 {
-  NS_STATIC_CAST(nsISupports *, aPropertyValue)->Release();
+  static_cast<nsISupports *>(aPropertyValue)->Release();
 }
 
 NS_IMETHODIMP
@@ -507,7 +507,7 @@ nsXFormsUploadElement::EncodeFileContents(nsIFile *aFile, PRUint16 aType,
       // create buffer for hex encoded data
       PRUint32 length = bytesRead * 2 + 1;
       PRUnichar *fileDataHex =
-        NS_STATIC_CAST(PRUnichar*, nsMemory::Alloc(length * sizeof(PRUnichar)));
+        static_cast<PRUnichar*>(nsMemory::Alloc(length * sizeof(PRUnichar)));
       if (!fileDataHex) {
         ReportEncodingMemoryError(mElement, aFile, length * sizeof(PRUnichar));
         rv = NS_ERROR_OUT_OF_MEMORY;
diff --git a/mozilla/extensions/xforms/nsXFormsUtils.cpp b/mozilla/extensions/xforms/nsXFormsUtils.cpp
index 5d9b6a7c57e..fe3fcba8aea 100644
--- a/mozilla/extensions/xforms/nsXFormsUtils.cpp
+++ b/mozilla/extensions/xforms/nsXFormsUtils.cpp
@@ -690,8 +690,8 @@ nsXFormsUtils::EvaluateNodeBinding(nsIDOMElement           *aElement,
       NS_ASSERTION(content, "nsIDOMElement not implementing nsIContent?!");
 
       NS_IF_ADDREF(*aResult =
-                   NS_STATIC_CAST(nsIDOMXPathResult*,
-                                  content->GetProperty(nsXFormsAtoms::bind)));
+                   static_cast<nsIDOMXPathResult*>
+                              (content->GetProperty(nsXFormsAtoms::bind)));
       *aUsesModelBind = PR_TRUE;
       return NS_OK;
     }
@@ -1003,7 +1003,7 @@ DeleteVoidArray(void    *aObject,
                 void    *aPropertyValue,
                 void    *aData)
 {
-  nsVoidArray *array = NS_STATIC_CAST(nsVoidArray *, aPropertyValue);
+  nsVoidArray *array = static_cast<nsVoidArray *>(aPropertyValue);
   PRInt32 count = array->Count();
   for (PRInt32 i = 0; i < count; i++) {
     EventItem *item = (EventItem *)array->ElementAt(i);
@@ -1031,8 +1031,8 @@ DeferDispatchEvent(nsIDOMNode* aTarget, nsXFormsEvent aEvent,
   NS_ENSURE_STATE(doc);
 
   nsVoidArray *eventList =
-    NS_STATIC_CAST(nsVoidArray *,
-                   doc->GetProperty(nsXFormsAtoms::deferredEventListProperty));
+    static_cast<nsVoidArray *>
+               (doc->GetProperty(nsXFormsAtoms::deferredEventListProperty));
   if (!eventList) {
     eventList = new nsVoidArray(16);
     if (!eventList)
@@ -1183,8 +1183,8 @@ nsXFormsUtils::DispatchDeferredEvents(nsIDOMDocument* aDocument)
   NS_ENSURE_STATE(doc);
 
   nsVoidArray *eventList =
-    NS_STATIC_CAST(nsVoidArray *,
-                   doc->GetProperty(nsXFormsAtoms::deferredEventListProperty));
+    static_cast<nsVoidArray *>
+               (doc->GetProperty(nsXFormsAtoms::deferredEventListProperty));
   if (!eventList) {
     return NS_OK;
   }
@@ -1325,15 +1325,15 @@ nsXFormsUtils::CloneScriptingInterfaces(const nsIID *aIIDList,
                                         PRUint32 *aOutCount,
                                         nsIID ***aOutArray)
 {
-  nsIID **iids = NS_STATIC_CAST(nsIID**,
-                                nsMemory::Alloc(aIIDCount * sizeof(nsIID*)));
+  nsIID **iids = static_cast<nsIID**>
+                            (nsMemory::Alloc(aIIDCount * sizeof(nsIID*)));
   if (!iids) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
  
   for (PRUint32 i = 0; i < aIIDCount; ++i) {
-    iids[i] = NS_STATIC_CAST(nsIID*,
-                             nsMemory::Clone(&aIIDList[i], sizeof(nsIID)));
+    iids[i] = static_cast<nsIID*>
+                         (nsMemory::Clone(&aIIDList[i], sizeof(nsIID)));
  
     if (!iids[i]) {
       for (PRUint32 j = 0; j < i; ++j)
@@ -1673,9 +1673,8 @@ nsXFormsUtils::GetInstanceNodeForData(nsIDOMNode             *aInstanceDataNode,
   NS_ENSURE_TRUE(instanceDoc, NS_ERROR_UNEXPECTED);
 
   nsISupports* owner =
-    NS_STATIC_CAST(
-      nsISupports*,
-      instanceDoc->GetProperty(nsXFormsAtoms::instanceDocumentOwner));
+    static_cast<nsISupports*>
+               (instanceDoc->GetProperty(nsXFormsAtoms::instanceDocumentOwner));
 
   nsCOMPtr<nsIDOMNode> instanceNode(do_QueryInterface(owner));
   if (instanceNode) {
diff --git a/mozilla/extensions/xmlextras/ls/src/nsLSParser.cpp b/mozilla/extensions/xmlextras/ls/src/nsLSParser.cpp
index 60cc95af496..0b1c8c0c97a 100755
--- a/mozilla/extensions/xmlextras/ls/src/nsLSParser.cpp
+++ b/mozilla/extensions/xmlextras/ls/src/nsLSParser.cpp
@@ -251,8 +251,8 @@ nsLSParser::FireOnLoad()
     nsRefPtr<nsLSParserLoadEvent> event = new nsLSParserLoadEvent(this);
 
     if (event) {
-      mLoadListeners.ObjectAt(i)->HandleEvent(NS_STATIC_CAST(nsLSEvent *,
-                                                             event));
+      mLoadListeners.ObjectAt(i)->HandleEvent(static_cast<nsLSEvent *>
+                                                         (event));
     }
   }
 }
diff --git a/mozilla/gfx/src/beos/nsDeviceContextBeOS.cpp b/mozilla/gfx/src/beos/nsDeviceContextBeOS.cpp
index c3693c5a134..53f401824a0 100644
--- a/mozilla/gfx/src/beos/nsDeviceContextBeOS.cpp
+++ b/mozilla/gfx/src/beos/nsDeviceContextBeOS.cpp
@@ -97,7 +97,7 @@ NS_IMETHODIMP nsDeviceContextBeOS::Init(nsNativeWidget aNativeWidget)
       screen->GetPixelDepth ( &depth ); 
       mWidthFloat = float(width); 
       mHeightFloat = float(height); 
-      mDepth = NS_STATIC_CAST ( PRUint32, depth ); 
+      mDepth = static_cast<PRUint32>(depth); 
     } 
   } 
   
diff --git a/mozilla/gfx/src/beos/nsImageBeOS.cpp b/mozilla/gfx/src/beos/nsImageBeOS.cpp
index 9aebe6ade81..98b5177c85e 100644
--- a/mozilla/gfx/src/beos/nsImageBeOS.cpp
+++ b/mozilla/gfx/src/beos/nsImageBeOS.cpp
@@ -607,7 +607,7 @@ NS_IMETHODIMP nsImageBeOS::DrawToImage(nsIImage* aDstImage,
 										nscoord aDX, nscoord aDY, 
 										nscoord aDWidth, nscoord aDHeight)
 {
-	nsImageBeOS *dest = NS_STATIC_CAST(nsImageBeOS *, aDstImage);
+	nsImageBeOS *dest = static_cast<nsImageBeOS *>(aDstImage);
 
 	if (!dest)
 		return NS_ERROR_FAILURE;
diff --git a/mozilla/gfx/src/mac/nsDeviceContextMac.cpp b/mozilla/gfx/src/mac/nsDeviceContextMac.cpp
index 878e0afcb7d..105bc160d36 100644
--- a/mozilla/gfx/src/mac/nsDeviceContextMac.cpp
+++ b/mozilla/gfx/src/mac/nsDeviceContextMac.cpp
@@ -379,7 +379,7 @@ NS_IMETHODIMP nsDeviceContextMac::GetDepth(PRUint32& aDepth)
   if ( screen ) {
     PRInt32 depth;
     screen->GetPixelDepth ( &depth );
-    aDepth = NS_STATIC_CAST ( PRUint32, depth );
+    aDepth = static_cast<PRUint32>(depth);
   }
   else 
     aDepth = 1;
@@ -401,7 +401,7 @@ NS_IMETHODIMP nsDeviceContextMac::GetDepth(PRUint32& aDepth)
    
   PRInt32 depth;
   mPrimaryScreen->GetPixelDepth ( &depth );
-  aDepth = NS_STATIC_CAST ( PRUint32, depth );
+  aDepth = static_cast<PRUint32>(depth);
     
   return NS_OK;
 }
@@ -495,8 +495,8 @@ NS_IMETHODIMP nsDeviceContextMac::GetDeviceSurfaceDimensions(PRInt32 & outWidth,
 
 	if( mSpec ) {
 	  // we have a printer device
-		outWidth = NS_STATIC_CAST(PRInt32, (mPageRect.right-mPageRect.left)*mDevUnitsToAppUnits);
-		outHeight = NS_STATIC_CAST(PRInt32, (mPageRect.bottom-mPageRect.top)*mDevUnitsToAppUnits);
+		outWidth = static_cast<PRInt32>((mPageRect.right-mPageRect.left)*mDevUnitsToAppUnits);
+		outHeight = static_cast<PRInt32>((mPageRect.bottom-mPageRect.top)*mDevUnitsToAppUnits);
 	}
 	else {
     // we have a screen device. find the screen that the window is on and
@@ -531,8 +531,8 @@ nsDeviceContextMac::GetRect(nsRect &aRect)
 	  // we have a printer device
 	  aRect.x = 0;
 	  aRect.y = 0;
-		aRect.width = NS_STATIC_CAST(nscoord, (mPageRect.right-mPageRect.left)*mDevUnitsToAppUnits);
-		aRect.height = NS_STATIC_CAST(nscoord, (mPageRect.bottom-mPageRect.top)*mDevUnitsToAppUnits);
+		aRect.width = static_cast<nscoord>((mPageRect.right-mPageRect.left)*mDevUnitsToAppUnits);
+		aRect.height = static_cast<nscoord>((mPageRect.bottom-mPageRect.top)*mDevUnitsToAppUnits);
 	}
 	else {
     // we have a screen device. find the screen that the window is on and
@@ -567,8 +567,8 @@ NS_IMETHODIMP nsDeviceContextMac::GetClientRect(nsRect &aRect)
 	if( mSpec ) {
 	  // we have a printer device
 	  aRect.x = aRect.y = 0;
-		aRect.width = NS_STATIC_CAST(nscoord, (mPageRect.right-mPageRect.left)*mDevUnitsToAppUnits);
-		aRect.height = NS_STATIC_CAST(nscoord, (mPageRect.bottom-mPageRect.top)*mDevUnitsToAppUnits);
+		aRect.width = static_cast<nscoord>((mPageRect.right-mPageRect.left)*mDevUnitsToAppUnits);
+		aRect.height = static_cast<nscoord>((mPageRect.bottom-mPageRect.top)*mDevUnitsToAppUnits);
 	}
 	else {
     // we have a screen device. find the screen that the window is on and
diff --git a/mozilla/gfx/src/mac/nsDrawingSurfaceMac.cpp b/mozilla/gfx/src/mac/nsDrawingSurfaceMac.cpp
index bb9a793b085..e953af80b71 100644
--- a/mozilla/gfx/src/mac/nsDrawingSurfaceMac.cpp
+++ b/mozilla/gfx/src/mac/nsDrawingSurfaceMac.cpp
@@ -345,7 +345,7 @@ static OSStatus
 CreatePathFromRectsProc(UInt16 aMessage, RgnHandle aRegion, const Rect* aRect,
                         void* aData)
 {
-  CGContextRef context = NS_STATIC_CAST(CGContextRef, aData);
+  CGContextRef context = static_cast<CGContextRef>(aData);
 
   if (aMessage == kQDRegionToRectsMsgParse)
   {
diff --git a/mozilla/gfx/src/mac/nsImageMac.cpp b/mozilla/gfx/src/mac/nsImageMac.cpp
index b0fdc17a82f..69a1bd861ca 100644
--- a/mozilla/gfx/src/mac/nsImageMac.cpp
+++ b/mozilla/gfx/src/mac/nsImageMac.cpp
@@ -208,7 +208,7 @@ PRBool nsImageMac::GetIsImageComplete() {
 
 void DataProviderReleaseFunc(void *info, const void *data, size_t size)
 {
-  PR_Free(NS_CONST_CAST(void*, data));
+  PR_Free(const_cast<void*>(data));
 }
 
 
@@ -398,7 +398,7 @@ NS_IMETHODIMP
 nsImageMac::DrawToImage(nsIImage* aDstImage, PRInt32 aDX, PRInt32 aDY,
                         PRInt32 aDWidth, PRInt32 aDHeight)
 {
-  nsImageMac* dest = NS_STATIC_CAST(nsImageMac*, aDstImage);
+  nsImageMac* dest = static_cast<nsImageMac*>(aDstImage);
 
   nsresult rv = EnsureCachedImage();
   NS_ENSURE_SUCCESS(rv, rv);
@@ -680,7 +680,7 @@ PRBool nsImageMac::RenderingToPrinter(nsIRenderingContext &aContext)
   nsCOMPtr<nsIDeviceContext> dc;                   // (this screams for a private interface, sigh!)
   aContext.GetDeviceContext(*getter_AddRefs(dc));
   // a weird and wonderful world of scanky casts and oddly-named intefaces.
-  nsDeviceContextMac* theDevContext = NS_REINTERPRET_CAST(nsDeviceContextMac*, dc.get());
+  nsDeviceContextMac* theDevContext = reinterpret_cast<nsDeviceContextMac*>(dc.get());
   return theDevContext && theDevContext->IsPrinter();
 }
 
diff --git a/mozilla/gfx/src/mac/nsRegionMac.cpp b/mozilla/gfx/src/mac/nsRegionMac.cpp
index 9328c825026..958cdd48eb3 100644
--- a/mozilla/gfx/src/mac/nsRegionMac.cpp
+++ b/mozilla/gfx/src/mac/nsRegionMac.cpp
@@ -48,7 +48,7 @@ static OSStatus
 AddRectToArrayProc(UInt16 message, RgnHandle rgn, const Rect *inRect, void *inArray)
 {
   if (message == kQDRegionToRectsMsgParse) {
-    nsRegionRectSet* rects = NS_REINTERPRET_CAST(nsRegionRectSet*, inArray);
+    nsRegionRectSet* rects = reinterpret_cast<nsRegionRectSet*>(inArray);
     nsRegionRect* rect = &rects->mRects[rects->mNumRects++];
     rect->x = inRect->left;
     rect->y = inRect->top;
@@ -64,7 +64,7 @@ static OSStatus
 CountRectProc(UInt16 message, RgnHandle rgn, const Rect* inRect, void* rectCount)
 {
   if (message == kQDRegionToRectsMsgParse)
-    ++(*NS_REINTERPRET_CAST(long*, rectCount));
+    ++(*reinterpret_cast<long*>(rectCount));
 
   return noErr;
 }
diff --git a/mozilla/gfx/src/mac/nsRenderingContextMac.cpp b/mozilla/gfx/src/mac/nsRenderingContextMac.cpp
index 55f0bd81186..2b154bf06a7 100644
--- a/mozilla/gfx/src/mac/nsRenderingContextMac.cpp
+++ b/mozilla/gfx/src/mac/nsRenderingContextMac.cpp
@@ -1232,7 +1232,7 @@ PRInt32 nsRenderingContextMac::GetMaxStringLength()
 {
   if (!mGS->mFontMetrics)
     return 1;
-  return NS_STATIC_CAST(nsFontMetricsMac*, mGS->mFontMetrics)->GetMaxStringLength();
+  return static_cast<nsFontMetricsMac*>(mGS->mFontMetrics)->GetMaxStringLength();
 }
 
 #pragma mark -
diff --git a/mozilla/gfx/src/nsDeviceContext.cpp b/mozilla/gfx/src/nsDeviceContext.cpp
index 2259b899613..6a26919eb33 100644
--- a/mozilla/gfx/src/nsDeviceContext.cpp
+++ b/mozilla/gfx/src/nsDeviceContext.cpp
@@ -474,7 +474,7 @@ nsFontCache::GetMetricsFor(const nsFont& aFont, nsIAtom* aLangGroup,
   nsIFontMetrics* fm;
   PRInt32 n = mFontMetrics.Count() - 1;
   for (PRInt32 i = n; i >= 0; --i) {
-    fm = NS_STATIC_CAST(nsIFontMetrics*, mFontMetrics[i]);
+    fm = static_cast<nsIFontMetrics*>(mFontMetrics[i]);
     if (fm->Font().Equals(aFont)) {
       nsCOMPtr<nsIAtom> langGroup;
       fm->GetLangGroup(getter_AddRefs(langGroup));
@@ -527,7 +527,7 @@ nsFontCache::GetMetricsFor(const nsFont& aFont, nsIAtom* aLangGroup,
 
   n = mFontMetrics.Count() - 1; // could have changed in Compact()
   if (n >= 0) {
-    aMetrics = NS_STATIC_CAST(nsIFontMetrics*, mFontMetrics[n]);
+    aMetrics = static_cast<nsIFontMetrics*>(mFontMetrics[n]);
     NS_ADDREF(aMetrics);
     return NS_OK;
   }
@@ -556,7 +556,7 @@ nsresult nsFontCache::Compact()
 {
   // Need to loop backward because the running element can be removed on the way
   for (PRInt32 i = mFontMetrics.Count()-1; i >= 0; --i) {
-    nsIFontMetrics* fm = NS_STATIC_CAST(nsIFontMetrics*, mFontMetrics[i]);
+    nsIFontMetrics* fm = static_cast<nsIFontMetrics*>(mFontMetrics[i]);
     nsIFontMetrics* oldfm = fm;
     // Destroy() isn't here because we want our device context to be notified
     NS_RELEASE(fm); // this will reset fm to nsnull
@@ -573,7 +573,7 @@ nsresult nsFontCache::Compact()
 nsresult nsFontCache::Flush()
 {
   for (PRInt32 i = mFontMetrics.Count()-1; i >= 0; --i) {
-    nsIFontMetrics* fm = NS_STATIC_CAST(nsIFontMetrics*, mFontMetrics[i]);
+    nsIFontMetrics* fm = static_cast<nsIFontMetrics*>(mFontMetrics[i]);
     // Destroy() will unhook our device context from the fm so that we won't
     // waste time in triggering the notification of FontMetricsDeleted()
     // in the subsequent release
diff --git a/mozilla/gfx/src/nsFontList.cpp b/mozilla/gfx/src/nsFontList.cpp
index dba6dc87eac..b101969ef1b 100644
--- a/mozilla/gfx/src/nsFontList.cpp
+++ b/mozilla/gfx/src/nsFontList.cpp
@@ -148,7 +148,7 @@ nsFontListEnumerator::GetNext(nsISupports **aFont)
   NS_ENSURE_SUCCESS(rv, rv);
   NS_ENSURE_TRUE(fontNameWrapper, NS_ERROR_OUT_OF_MEMORY);
   fontNameWrapper->SetData(nsDependentString(fontName));
-  *aFont = NS_STATIC_CAST(nsISupports*, fontNameWrapper);
+  *aFont = static_cast<nsISupports*>(fontNameWrapper);
   NS_ADDREF(*aFont);
   return NS_OK;
 }
@@ -167,7 +167,7 @@ nsFontList::AvailableFonts(const PRUnichar *aLangGroup,
   nsresult rv = fontListEnum->Init(aLangGroup, aFontType);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  *aFontEnumerator = NS_STATIC_CAST(nsISimpleEnumerator*, fontListEnum);
+  *aFontEnumerator = static_cast<nsISimpleEnumerator*>(fontListEnum);
   NS_ADDREF(*aFontEnumerator);
   return NS_OK;
 }
diff --git a/mozilla/gfx/src/nsRegion.cpp b/mozilla/gfx/src/nsRegion.cpp
index 2e74c2791e2..8d712025227 100644
--- a/mozilla/gfx/src/nsRegion.cpp
+++ b/mozilla/gfx/src/nsRegion.cpp
@@ -116,8 +116,8 @@ class RgnRectMemoryAllocator
   void* AllocChunk (PRUint32 aEntries, void* aNextChunk, nsRegion::RgnRect* aTailDest)
   {
     PRUint8* pBuf = new PRUint8 [aEntries * sizeof (nsRegion::RgnRect) + sizeof (void*)];
-    *NS_REINTERPRET_CAST (void**, pBuf) = aNextChunk;
-    nsRegion::RgnRect* pRect = NS_REINTERPRET_CAST (nsRegion::RgnRect*, pBuf + sizeof (void*));
+    *reinterpret_cast<void**>(pBuf) = aNextChunk;
+    nsRegion::RgnRect* pRect = reinterpret_cast<nsRegion::RgnRect*>(pBuf + sizeof (void*));
 
     for (PRUint32 cnt = 0 ; cnt < aEntries - 1 ; cnt++)
       pRect [cnt].next = &pRect [cnt + 1];
@@ -128,10 +128,10 @@ class RgnRectMemoryAllocator
   }
 
   void FreeChunk (void* aChunk) {  delete [] (PRUint8 *) aChunk;  }
-  void* NextChunk (void* aThisChunk) const { return *NS_STATIC_CAST (void**, aThisChunk); }
+  void* NextChunk (void* aThisChunk) const { return *static_cast<void**>(aThisChunk); }
 
   nsRegion::RgnRect* ChunkHead (void* aThisChunk) const
-  {   return NS_REINTERPRET_CAST (nsRegion::RgnRect*, NS_STATIC_CAST (PRUint8*, aThisChunk) + sizeof (void*));  }
+  {   return reinterpret_cast<nsRegion::RgnRect*>(static_cast<PRUint8*>(aThisChunk) + sizeof (void*));  }
 
 public:
   RgnRectMemoryAllocator (PRUint32 aNumOfEntries);
@@ -216,7 +216,7 @@ inline void* nsRegion::RgnRect::operator new (size_t) CPP_THROW_NEW
 
 inline void nsRegion::RgnRect::operator delete (void* aRect, size_t)
 {
-  gRectPool.Free (NS_STATIC_CAST (RgnRect*, aRect));
+  gRectPool.Free (static_cast<RgnRect*>(aRect));
 }
 
 
@@ -485,7 +485,7 @@ void nsRegion::Optimize ()
 
 void nsRegion::MoveInto (nsRegion& aDestRegion, const RgnRect* aStartRect)
 {
-  RgnRect* pRect = NS_CONST_CAST (RgnRect*, aStartRect);
+  RgnRect* pRect = const_cast<RgnRect*>(aStartRect);
   RgnRect* pPrev = pRect->prev;
 
   while (pRect != &mRectListHead)
@@ -595,8 +595,8 @@ nsRegion& nsRegion::Copy (const nsRect& aRect)
   else
   {
     SetToElements (1);
-    *mRectListHead.next = NS_STATIC_CAST (const RgnRect&, aRect);
-    mBoundRect = NS_STATIC_CAST (const nsRectFast&, aRect);
+    *mRectListHead.next = static_cast<const RgnRect&>(aRect);
+    mBoundRect = static_cast<const nsRectFast&>(aRect);
   }
 
   return *this;
@@ -634,8 +634,8 @@ nsRegion& nsRegion::And (const nsRegion& aRgn1, const nsRegion& aRgn2)
         else
         {
           nsRegion TmpRegion;
-          nsRegion* pSrcRgn1 = NS_CONST_CAST (nsRegion*, &aRgn1);
-          nsRegion* pSrcRgn2 = NS_CONST_CAST (nsRegion*, &aRgn2);
+          nsRegion* pSrcRgn1 = const_cast<nsRegion*>(&aRgn1);
+          nsRegion* pSrcRgn2 = const_cast<nsRegion*>(&aRgn2);
 
           if (&aRgn1 == this)     // Copy region if it is both source and result
           {
@@ -714,7 +714,7 @@ nsRegion& nsRegion::And (const nsRegion& aRegion, const nsRect& aRect)
     SetEmpty ();
   else                            // Intersect region with rectangle
   {
-    const nsRectFast& aRectFast = NS_STATIC_CAST (const nsRectFast&, aRect);
+    const nsRectFast& aRectFast = static_cast<const nsRectFast&>(aRect);
     nsRectFast TmpRect;
 
     if (aRegion.mRectCount == 1)  // Intersect rectangle with rectangle
@@ -732,7 +732,7 @@ nsRegion& nsRegion::And (const nsRegion& aRegion, const nsRect& aRect)
         else
         {
           nsRegion TmpRegion;
-          nsRegion* pSrcRegion = NS_CONST_CAST (nsRegion*, &aRegion);
+          nsRegion* pSrcRegion = const_cast<nsRegion*>(&aRegion);
 
           if (&aRegion == this)   // Copy region if it is both source and result
           {
@@ -807,7 +807,7 @@ nsRegion& nsRegion::Or (const nsRegion& aRegion, const nsRect& aRect)
     Copy (aRegion);
   else
   {
-    const nsRectFast& aRectFast = NS_STATIC_CAST (const nsRectFast&, aRect);
+    const nsRectFast& aRectFast = static_cast<const nsRectFast&>(aRect);
 
     if (!aRectFast.Intersects (aRegion.mBoundRect))     // Rectangle does not intersect region
     {
@@ -885,7 +885,7 @@ nsRegion& nsRegion::Xor (const nsRegion& aRegion, const nsRect& aRect)
     Copy (aRegion);
   else
   {
-    const nsRectFast& aRectFast = NS_STATIC_CAST (const nsRectFast&, aRect);
+    const nsRectFast& aRectFast = static_cast<const nsRectFast&>(aRect);
 
     if (!aRectFast.Intersects (aRegion.mBoundRect))     // Rectangle does not intersect region
     {
@@ -955,7 +955,7 @@ nsRegion& nsRegion::Sub (const nsRegion& aRegion, const nsRect& aRect)
     Copy (aRegion);
   else
   {
-    const nsRectFast& aRectFast = NS_STATIC_CAST (const nsRectFast&, aRect);
+    const nsRectFast& aRectFast = static_cast<const nsRectFast&>(aRect);
 
     if (!aRectFast.Intersects (aRegion.mBoundRect))   // Rectangle does not intersect region
       Copy (aRegion);
@@ -1066,7 +1066,7 @@ void nsRegion::SubRect (const nsRectFast& aRect, nsRegion& aResult, nsRegion& aC
 
   aResult.SetToElements (0);
 
-  (NS_CONST_CAST (nsRegion*, pSrcRegion))->mRectListHead.y = PR_INT32_MAX;
+  (const_cast<nsRegion*>(pSrcRegion))->mRectListHead.y = PR_INT32_MAX;
   const RgnRect* pSrcRect = pSrcRegion->mRectListHead.next;
 
   for ( ; pSrcRect->y < aRect.YMost () ; pSrcRect = pSrcRect->next)
diff --git a/mozilla/gfx/src/os2/nsFontMetricsOS2.cpp b/mozilla/gfx/src/os2/nsFontMetricsOS2.cpp
index 5bec93f7d35..ed616067a8d 100644
--- a/mozilla/gfx/src/os2/nsFontMetricsOS2.cpp
+++ b/mozilla/gfx/src/os2/nsFontMetricsOS2.cpp
@@ -813,9 +813,9 @@ nsFontMetricsOS2::InitializeGlobalFonts()
         PL_strcasestr(font->szFacename, "regular") != nsnull ||
         PL_strcasestr(font->szFacename, "-normal") != nsnull)
     {
-      f = NS_STATIC_CAST(char*, font->szFamilyname);
+      f = static_cast<char*>(font->szFamilyname);
     } else {
-      f = NS_STATIC_CAST(char*, font->szFacename);
+      f = static_cast<char*>(font->szFacename);
     }
     nsAutoChar16Buffer fontname;
     PRInt32 len;
@@ -2053,7 +2053,7 @@ struct FindGlobalFontData
 PR_STATIC_CALLBACK(PLDHashOperator)
 FindGlobalFontEnumFunc(GlobalFontEntry* aEntry, void* aData)
 {
-  FindGlobalFontData* data = NS_STATIC_CAST(FindGlobalFontData*, aData);
+  FindGlobalFontData* data = static_cast<FindGlobalFontData*>(aData);
   strcpy(data->font->mFattrs.szFacename, aEntry->mMetrics->szFacename);
 #ifdef PERF_HASGLYPH_CHAR_MAP
   if (aEntry->mHaveCheckedCharMap == nsnull) {
@@ -2676,7 +2676,7 @@ struct EnumerateAllFontsData
 PR_STATIC_CALLBACK(PLDHashOperator)
 EnumerateAllFontsCallback(GlobalFontEntry* aEntry, void* aData)
 {
-  EnumerateAllFontsData* data = NS_STATIC_CAST(EnumerateAllFontsData*, aData);
+  EnumerateAllFontsData* data = static_cast<EnumerateAllFontsData*>(aData);
   data->array[data->count++] = ToNewUnicode(aEntry->GetKey());
   return PL_DHASH_NEXT;
 }
diff --git a/mozilla/gfx/src/os2/nsImageOS2.cpp b/mozilla/gfx/src/os2/nsImageOS2.cpp
index cac7e9e9691..d6d4ec92f17 100644
--- a/mozilla/gfx/src/os2/nsImageOS2.cpp
+++ b/mozilla/gfx/src/os2/nsImageOS2.cpp
@@ -951,7 +951,7 @@ NS_IMETHODIMP nsImageOS2::DrawToImage(nsIImage* aDstImage,
 
   GFX (::GpiCreateLogColorTable (MemPS, 0, LCOLF_RGB, 0, 0, 0), FALSE);
 
-  nsImageOS2* destImg = NS_STATIC_CAST(nsImageOS2*, aDstImage); 
+  nsImageOS2* destImg = static_cast<nsImageOS2*>(aDstImage); 
 
   HBITMAP hTmpBitmap = GFX (::GpiCreateBitmap (MemPS, (PBITMAPINFOHEADER2)destImg->mInfo,
                                                CBM_INIT, (PBYTE)destImg->mImageBits,
diff --git a/mozilla/gfx/src/os2/nsRegionOS2.cpp b/mozilla/gfx/src/os2/nsRegionOS2.cpp
index 9f49f6266af..8d6ec2e63ab 100644
--- a/mozilla/gfx/src/os2/nsRegionOS2.cpp
+++ b/mozilla/gfx/src/os2/nsRegionOS2.cpp
@@ -118,7 +118,7 @@ nsresult nsRegionOS2::Init (void)
 
 void nsRegionOS2::SetTo (const nsIRegion &aRegion)
 {
-  const nsRegionOS2* pRegion = NS_STATIC_CAST (const nsRegionOS2*, &aRegion);
+  const nsRegionOS2* pRegion = static_cast<const nsRegionOS2*>(&aRegion);
   mRegion = pRegion->mRegion;
 }
 
@@ -129,7 +129,7 @@ void nsRegionOS2::SetTo (PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight
 
 void nsRegionOS2::Intersect (const nsIRegion &aRegion)
 {
-  const nsRegionOS2* pRegion = NS_STATIC_CAST (const nsRegionOS2*, &aRegion);
+  const nsRegionOS2* pRegion = static_cast<const nsRegionOS2*>(&aRegion);
   mRegion.And (mRegion, pRegion->mRegion);
 }
 
@@ -140,7 +140,7 @@ void nsRegionOS2::Intersect (PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHe
 
 void nsRegionOS2::Union (const nsIRegion &aRegion)
 {
-  const nsRegionOS2* pRegion = NS_STATIC_CAST (const nsRegionOS2*, &aRegion);
+  const nsRegionOS2* pRegion = static_cast<const nsRegionOS2*>(&aRegion);
   mRegion.Or (mRegion, pRegion->mRegion);
 }
 
@@ -151,7 +151,7 @@ void nsRegionOS2::Union (PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight
 
 void nsRegionOS2::Subtract (const nsIRegion &aRegion)
 {
-  const nsRegionOS2* pRegion = NS_STATIC_CAST (const nsRegionOS2*, &aRegion);
+  const nsRegionOS2* pRegion = static_cast<const nsRegionOS2*>(&aRegion);
   mRegion.Sub (mRegion, pRegion->mRegion);
 }
 
@@ -167,7 +167,7 @@ PRBool nsRegionOS2::IsEmpty (void)
 
 PRBool nsRegionOS2::IsEqual (const nsIRegion &aRegion)
 {
-  const nsRegionOS2* pRegion = NS_STATIC_CAST (const nsRegionOS2*, &aRegion);
+  const nsRegionOS2* pRegion = static_cast<const nsRegionOS2*>(&aRegion);
   return mRegion.IsEqual (pRegion->mRegion);
 }
 
@@ -203,15 +203,15 @@ nsresult nsRegionOS2::GetRects (nsRegionRectSet **aRects)
   if (!pRegionSet)                          // Not yet allocated
   {
     PRUint8* pBuf = new PRUint8 [sizeof (nsRegionRectSet) + NumRects * sizeof (nsRegionRect)];
-    pRegionSet = NS_REINTERPRET_CAST (nsRegionRectSet*, pBuf);
+    pRegionSet = reinterpret_cast<nsRegionRectSet*>(pBuf);
     pRegionSet->mRectsLen = NumRects + 1;
   } else                                    // Already allocated in previous call
   {
     if (NumRects > pRegionSet->mRectsLen)   // passed array is not big enough - reallocate it.
     {
-      delete [] NS_REINTERPRET_CAST (PRUint8*, pRegionSet);
+      delete [] reinterpret_cast<PRUint8*>(pRegionSet);
       PRUint8* pBuf = new PRUint8 [sizeof (nsRegionRectSet) + NumRects * sizeof (nsRegionRect)];
-      pRegionSet = NS_REINTERPRET_CAST (nsRegionRectSet*, pBuf);
+      pRegionSet = reinterpret_cast<nsRegionRectSet*>(pBuf);
       pRegionSet->mRectsLen = NumRects + 1;
     }
   }
@@ -241,7 +241,7 @@ nsresult nsRegionOS2::FreeRects (nsRegionRectSet *aRects)
   if (!aRects)
     return NS_ERROR_NULL_POINTER;
 
-  delete [] NS_REINTERPRET_CAST (PRUint8*, aRects);
+  delete [] reinterpret_cast<PRUint8*>(aRects);
   return NS_OK;
 }
 
diff --git a/mozilla/gfx/src/photon/nsDeviceContextSpecPh.cpp b/mozilla/gfx/src/photon/nsDeviceContextSpecPh.cpp
index c4146a5a79a..1a287c6afa6 100644
--- a/mozilla/gfx/src/photon/nsDeviceContextSpecPh.cpp
+++ b/mozilla/gfx/src/photon/nsDeviceContextSpecPh.cpp
@@ -257,7 +257,7 @@ NS_IMETHODIMP nsPrinterEnumeratorPh::GetDefaultPrinterName(PRUnichar * *aDefault
 	if( pc ) {
 		PpLoadDefaultPrinter( pc );
 		PpGetPC( pc, Pp_PC_NAME, &printer );
-  	if( printer ) *aDefaultPrinterName = ToNewUnicode( NS_STATIC_CAST(const nsAFlatString&, NS_MULTILINE_LITERAL_STRING(printer)) );
+  	if( printer ) *aDefaultPrinterName = ToNewUnicode( static_cast<const nsAFlatString&>(NS_MULTILINE_LITERAL_STRING(printer)) );
 		PpReleasePC( pc );
 		}
 
diff --git a/mozilla/gfx/src/photon/nsFontMetricsPh.cpp b/mozilla/gfx/src/photon/nsFontMetricsPh.cpp
index 0e89ce374af..e55ee342803 100644
--- a/mozilla/gfx/src/photon/nsFontMetricsPh.cpp
+++ b/mozilla/gfx/src/photon/nsFontMetricsPh.cpp
@@ -316,7 +316,7 @@ static PRIntn EnumerateFamily( PLHashEntry* he, PRIntn i, void* arg )
 	EnumerateFamilyInfo* info = (EnumerateFamilyInfo*) arg;
 	PRUnichar** array = info->mArray;
 	int j = info->mIndex;
-	PRUnichar* str = ToNewUnicode(*NS_STATIC_CAST(const nsString*, he->key));
+	PRUnichar* str = ToNewUnicode(*static_cast<const nsString*>(he->key));
 
 	if (!str)
 	  {
diff --git a/mozilla/gfx/src/photon/nsImagePh.cpp b/mozilla/gfx/src/photon/nsImagePh.cpp
index cf6c17ebaae..88fc035a655 100644
--- a/mozilla/gfx/src/photon/nsImagePh.cpp
+++ b/mozilla/gfx/src/photon/nsImagePh.cpp
@@ -537,7 +537,7 @@ NS_IMETHODIMP nsImagePh::DrawToImage(nsIImage* aDstImage,
                                       nscoord aDX, nscoord aDY,
                                       nscoord aDWidth, nscoord aDHeight)
 {
-  nsImagePh *dest = NS_STATIC_CAST(nsImagePh *, aDstImage);
+  nsImagePh *dest = static_cast<nsImagePh *>(aDstImage);
 
   if (!dest)
     return NS_ERROR_FAILURE;
diff --git a/mozilla/gfx/src/photon/nsRenderingContextPh.h b/mozilla/gfx/src/photon/nsRenderingContextPh.h
index 285b474adae..c41b3bb12c5 100644
--- a/mozilla/gfx/src/photon/nsRenderingContextPh.h
+++ b/mozilla/gfx/src/photon/nsRenderingContextPh.h
@@ -150,7 +150,7 @@ public:
 	 inline
    NS_IMETHODIMP CopyClipRegion(nsIRegion &aRegion)
 		{ if( !mClipRegion ) return NS_ERROR_FAILURE;
-			aRegion.SetTo(*NS_STATIC_CAST(nsIRegion*, mClipRegion));
+			aRegion.SetTo(*static_cast<nsIRegion*>(mClipRegion));
 			return NS_OK;
 		}
 
diff --git a/mozilla/gfx/src/thebes/nsThebesFontEnumerator.cpp b/mozilla/gfx/src/thebes/nsThebesFontEnumerator.cpp
index 0e995afe0e6..c45d4fda63c 100644
--- a/mozilla/gfx/src/thebes/nsThebesFontEnumerator.cpp
+++ b/mozilla/gfx/src/thebes/nsThebesFontEnumerator.cpp
@@ -88,8 +88,8 @@ nsThebesFontEnumerator::EnumerateFonts(const char *aLangGroup,
         return NS_OK;
     }
 
-    PRUnichar **fs = NS_STATIC_CAST(PRUnichar **,
-                                    nsMemory::Alloc(fontList.Count() * sizeof(PRUnichar*)));
+    PRUnichar **fs = static_cast<PRUnichar **>
+                                (nsMemory::Alloc(fontList.Count() * sizeof(PRUnichar*)));
     for (int i = 0; i < fontList.Count(); i++) {
         fs[i] = ToNewUnicode(*fontList[i]);
     }
diff --git a/mozilla/gfx/src/thebes/nsThebesFontMetrics.h b/mozilla/gfx/src/thebes/nsThebesFontMetrics.h
index fca08d0755c..f58aeabcea7 100644
--- a/mozilla/gfx/src/thebes/nsThebesFontMetrics.h
+++ b/mozilla/gfx/src/thebes/nsThebesFontMetrics.h
@@ -160,9 +160,9 @@ protected:
         AutoTextRun(nsThebesFontMetrics* aMetrics, nsIRenderingContext* aRC,
                     const char* aString, PRInt32 aLength, PRBool aEnableSpacing) {
             mTextRun = gfxTextRunCache::MakeTextRun(
-                NS_REINTERPRET_CAST(const PRUint8*, aString), aLength,
+                reinterpret_cast<const PRUint8*>(aString), aLength,
                 aMetrics->mFontGroup,
-                NS_STATIC_CAST(gfxContext*, aRC->GetNativeGraphicData(nsIRenderingContext::NATIVE_THEBES_CONTEXT)),
+                static_cast<gfxContext*>(aRC->GetNativeGraphicData(nsIRenderingContext::NATIVE_THEBES_CONTEXT)),
                 aMetrics->mP2A,
                 ComputeFlags(aMetrics, aEnableSpacing));
         }
@@ -170,7 +170,7 @@ protected:
                     const PRUnichar* aString, PRInt32 aLength, PRBool aEnableSpacing) {
             mTextRun = gfxTextRunCache::MakeTextRun(
                 aString, aLength, aMetrics->mFontGroup,
-                NS_STATIC_CAST(gfxContext*, aRC->GetNativeGraphicData(nsIRenderingContext::NATIVE_THEBES_CONTEXT)),
+                static_cast<gfxContext*>(aRC->GetNativeGraphicData(nsIRenderingContext::NATIVE_THEBES_CONTEXT)),
                 aMetrics->mP2A,
                 ComputeFlags(aMetrics, aEnableSpacing));
         }
diff --git a/mozilla/gfx/src/thebes/nsThebesImage.cpp b/mozilla/gfx/src/thebes/nsThebesImage.cpp
index e4cd6f2b551..6606f3f0e8a 100644
--- a/mozilla/gfx/src/thebes/nsThebesImage.cpp
+++ b/mozilla/gfx/src/thebes/nsThebesImage.cpp
@@ -336,7 +336,7 @@ nsThebesImage::Draw(nsIRenderingContext &aContext,
         return NS_OK;
     }
 
-    nsThebesRenderingContext *thebesRC = NS_STATIC_CAST(nsThebesRenderingContext*, &aContext);
+    nsThebesRenderingContext *thebesRC = static_cast<nsThebesRenderingContext*>(&aContext);
     gfxContext *ctx = thebesRC->Thebes();
 
 #if 0
@@ -587,7 +587,7 @@ nsThebesImage::ThebesDrawTile(gfxContext *thebesContext,
 NS_IMETHODIMP
 nsThebesImage::DrawToImage(nsIImage* aDstImage, PRInt32 aDX, PRInt32 aDY, PRInt32 aDWidth, PRInt32 aDHeight)
 {
-    nsThebesImage *dstThebesImage = NS_STATIC_CAST(nsThebesImage*, aDstImage);
+    nsThebesImage *dstThebesImage = static_cast<nsThebesImage*>(aDstImage);
 
     nsRefPtr<gfxContext> dst = new gfxContext(dstThebesImage->ThebesSurface());
 
diff --git a/mozilla/gfx/src/thebes/nsThebesRegion.cpp b/mozilla/gfx/src/thebes/nsThebesRegion.cpp
index 3df1b73d512..d8bbb6081bd 100644
--- a/mozilla/gfx/src/thebes/nsThebesRegion.cpp
+++ b/mozilla/gfx/src/thebes/nsThebesRegion.cpp
@@ -54,7 +54,7 @@ nsresult nsThebesRegion::Init (void)
 
 void nsThebesRegion::SetTo (const nsIRegion &aRegion)
 {
-  const nsThebesRegion* pRegion = NS_STATIC_CAST (const nsThebesRegion*, &aRegion);
+  const nsThebesRegion* pRegion = static_cast<const nsThebesRegion*>(&aRegion);
   mRegion = pRegion->mRegion;
 }
 
@@ -65,7 +65,7 @@ void nsThebesRegion::SetTo (PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHei
 
 void nsThebesRegion::Intersect (const nsIRegion &aRegion)
 {
-  const nsThebesRegion* pRegion = NS_STATIC_CAST (const nsThebesRegion*, &aRegion);
+  const nsThebesRegion* pRegion = static_cast<const nsThebesRegion*>(&aRegion);
   mRegion.And (mRegion, pRegion->mRegion);
 }
 
@@ -76,7 +76,7 @@ void nsThebesRegion::Intersect (PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32
 
 void nsThebesRegion::Union (const nsIRegion &aRegion)
 {
-  const nsThebesRegion* pRegion = NS_STATIC_CAST (const nsThebesRegion*, &aRegion);
+  const nsThebesRegion* pRegion = static_cast<const nsThebesRegion*>(&aRegion);
   mRegion.Or (mRegion, pRegion->mRegion);
 }
 
@@ -87,7 +87,7 @@ void nsThebesRegion::Union (PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHei
 
 void nsThebesRegion::Subtract (const nsIRegion &aRegion)
 {
-  const nsThebesRegion* pRegion = NS_STATIC_CAST (const nsThebesRegion*, &aRegion);
+  const nsThebesRegion* pRegion = static_cast<const nsThebesRegion*>(&aRegion);
   mRegion.Sub (mRegion, pRegion->mRegion);
 }
 
@@ -103,7 +103,7 @@ PRBool nsThebesRegion::IsEmpty (void)
 
 PRBool nsThebesRegion::IsEqual (const nsIRegion &aRegion)
 {
-  const nsThebesRegion* pRegion = NS_STATIC_CAST (const nsThebesRegion*, &aRegion);
+  const nsThebesRegion* pRegion = static_cast<const nsThebesRegion*>(&aRegion);
   return mRegion.IsEqual (pRegion->mRegion);
 }
 
@@ -141,15 +141,15 @@ nsThebesRegion::GetRects (nsRegionRectSet **aRects)
   if (pRegionSet == nsnull)                 // Not yet allocated
   {
     PRUint8* pBuf = new PRUint8 [sizeof (nsRegionRectSet) + NumRects * sizeof (nsRegionRect)];
-    pRegionSet = NS_REINTERPRET_CAST (nsRegionRectSet*, pBuf);
+    pRegionSet = reinterpret_cast<nsRegionRectSet*>(pBuf);
     pRegionSet->mRectsLen = NumRects + 1;
   } else                                    // Already allocated in previous call
   {
     if (NumRects > pRegionSet->mRectsLen)   // passed array is not big enough - reallocate it.
     {
-      delete [] NS_REINTERPRET_CAST (PRUint8*, pRegionSet);
+      delete [] reinterpret_cast<PRUint8*>(pRegionSet);
       PRUint8* pBuf = new PRUint8 [sizeof (nsRegionRectSet) + NumRects * sizeof (nsRegionRect)];
-      pRegionSet = NS_REINTERPRET_CAST (nsRegionRectSet*, pBuf);
+      pRegionSet = reinterpret_cast<nsRegionRectSet*>(pBuf);
       pRegionSet->mRectsLen = NumRects + 1;
     }
   }
@@ -180,7 +180,7 @@ nsThebesRegion::FreeRects (nsRegionRectSet *aRects)
   if (!aRects)
     return NS_ERROR_NULL_POINTER;
 
-  delete [] NS_REINTERPRET_CAST (PRUint8*, aRects);
+  delete [] reinterpret_cast<PRUint8*>(aRects);
   return NS_OK;
 }
 
diff --git a/mozilla/gfx/src/thebes/nsThebesRenderingContext.cpp b/mozilla/gfx/src/thebes/nsThebesRenderingContext.cpp
index d8e317b4ece..5e283deaf96 100644
--- a/mozilla/gfx/src/thebes/nsThebesRenderingContext.cpp
+++ b/mozilla/gfx/src/thebes/nsThebesRenderingContext.cpp
@@ -98,7 +98,7 @@ nsThebesRenderingContext::Init(nsIDeviceContext* aContext, gfxASurface *aThebesS
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::Init ctx %p thebesSurface %p\n", this, aContext, aThebesSurface));
 
-    nsThebesDeviceContext *thebesDC = NS_STATIC_CAST(nsThebesDeviceContext*, aContext);
+    nsThebesDeviceContext *thebesDC = static_cast<nsThebesDeviceContext*>(aContext);
 
     mDeviceContext = aContext;
     mWidget = nsnull;
@@ -126,7 +126,7 @@ nsThebesRenderingContext::Init(nsIDeviceContext* aContext, nsIWidget *aWidget)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::Init ctx %p widget %p\n", this, aContext, aWidget));
 
-    nsThebesDeviceContext *thebesDC = NS_STATIC_CAST(nsThebesDeviceContext*, aContext);
+    nsThebesDeviceContext *thebesDC = static_cast<nsThebesDeviceContext*>(aContext);
 
     mDeviceContext = aContext;
     mWidget = aWidget;
@@ -269,7 +269,7 @@ nsThebesRenderingContext::SetClipRegion(const nsIRegion& pxRegion,
 
     mThebes->ResetClip();
     // GetBoundingBox, GetRects, FreeRects are non-const
-    nsIRegion *evilPxRegion = NS_CONST_CAST(nsIRegion*, &pxRegion);
+    nsIRegion *evilPxRegion = const_cast<nsIRegion*>(&pxRegion);
     if (cplx == eRegionComplexity_rect) {
         PRInt32 x, y, w, h;
         evilPxRegion->GetBoundingBox(&x, &y, &w, &h);
@@ -706,7 +706,7 @@ nsThebesRenderingContext::GetNativeGraphicData(GraphicDataType aType)
 #ifdef XP_WIN
     if (aType == NATIVE_WINDOWS_DC) {
         nsRefPtr<gfxASurface> surf(mThebes->CurrentSurface());
-        return NS_STATIC_CAST(gfxWindowsSurface*, NS_STATIC_CAST(gfxASurface*, surf.get()))->GetDC();
+        return static_cast<gfxWindowsSurface*>(static_cast<gfxASurface*>(surf.get()))->GetDC();
     }
 #endif
 
@@ -780,7 +780,7 @@ nsThebesRenderingContext::DrawTile(imgIContainer *aImage,
     nsCOMPtr<nsIImage> img(do_GetInterface(imgFrame));
     if (!img) return NS_ERROR_FAILURE;
     
-    nsThebesImage *thebesImage = NS_STATIC_CAST(nsThebesImage*, (nsIImage*) img.get());
+    nsThebesImage *thebesImage = static_cast<nsThebesImage*>((nsIImage*) img.get());
 
     /* Phase offset of the repeated image from the origin */
     gfxPoint phase(FROM_TWIPS(twXOffset), FROM_TWIPS(twYOffset));
@@ -838,7 +838,7 @@ nsThebesRenderingContext::SetFont(const nsFont& aFont, nsIAtom* aLangGroup)
 
     nsCOMPtr<nsIFontMetrics> newMetrics;
     mDeviceContext->GetMetricsFor(aFont, aLangGroup, *getter_AddRefs(newMetrics));
-    mFontMetrics = NS_REINTERPRET_CAST(nsIThebesFontMetrics*, newMetrics.get());
+    mFontMetrics = reinterpret_cast<nsIThebesFontMetrics*>(newMetrics.get());
     return NS_OK;
 }
 
@@ -847,7 +847,7 @@ nsThebesRenderingContext::SetFont(nsIFontMetrics *aFontMetrics)
 {
     PR_LOG(gThebesGFXLog, PR_LOG_DEBUG, ("## %p nsTRC::SetFont[Metrics] %p\n", this, aFontMetrics));
 
-    mFontMetrics = NS_STATIC_CAST(nsIThebesFontMetrics*, aFontMetrics);
+    mFontMetrics = static_cast<nsIThebesFontMetrics*>(aFontMetrics);
     return NS_OK;
 }
 
diff --git a/mozilla/gfx/src/windows/nsDeviceContextWin.cpp b/mozilla/gfx/src/windows/nsDeviceContextWin.cpp
index 7607c878bfd..28e15736360 100644
--- a/mozilla/gfx/src/windows/nsDeviceContextWin.cpp
+++ b/mozilla/gfx/src/windows/nsDeviceContextWin.cpp
@@ -228,7 +228,7 @@ nsDeviceContextWin :: FindScreen ( nsIScreen** outScreen )
 {
   // now then, if we have more than one screen, we need to find which screen this
   // window is on.
-  HWND window = NS_REINTERPRET_CAST(HWND, mWidget);
+  HWND window = reinterpret_cast<HWND>(mWidget);
   if ( window ) {
     RECT globalPosition;
     ::GetWindowRect ( window, &globalPosition ); 
diff --git a/mozilla/gfx/src/windows/nsFontMetricsWin.cpp b/mozilla/gfx/src/windows/nsFontMetricsWin.cpp
index a32783c650d..1256c34ec04 100644
--- a/mozilla/gfx/src/windows/nsFontMetricsWin.cpp
+++ b/mozilla/gfx/src/windows/nsFontMetricsWin.cpp
@@ -1499,7 +1499,7 @@ PR_STATIC_CALLBACK(PLHashEntry*) fontmap_AllocEntry(void *pool, const void *key)
 PR_STATIC_CALLBACK(void) fontmap_FreeEntry(void *pool, PLHashEntry *he, PRUint32 flag)
 {
   if (flag == HT_FREE_ENTRY)  {
-    nsFontInfo *fontInfo = NS_STATIC_CAST(nsFontInfo *, he);
+    nsFontInfo *fontInfo = static_cast<nsFontInfo *>(he);
     if (fontInfo->mCCMap && (fontInfo->mCCMap != nsFontMetricsWin::gEmptyCCMap))
       FreeCCMap(fontInfo->mCCMap); 
 #ifdef MOZ_MATHML
@@ -1825,7 +1825,7 @@ nsFontMetricsWin::GetCCMAP(HDC aDC, const char* aShortName,
     if (he) {
       // an identical map has already been added
       delete name;
-      info = NS_STATIC_CAST(nsFontInfo *, he);
+      info = static_cast<nsFontInfo *>(he);
       if (aCharset) {
         *aCharset = info->mCharset;
       }
@@ -1889,7 +1889,7 @@ nsFontMetricsWin::GetCCMAP(HDC aDC, const char* aShortName,
   NS_ASSERTION(hep, "bad code");
   he = PL_HashTableRawAdd(gFontMaps, hep, hash, name, nsnull);
   if (he) {
-    info = NS_STATIC_CAST(nsFontInfo*, he);
+    info = static_cast<nsFontInfo*>(he);
     he->value = info;    // so PL_HashTableLookup returns an nsFontInfo*
     info->mType = fontType;
     info->mCharset = charset;
@@ -3005,7 +3005,7 @@ PR_STATIC_CALLBACK(PLHashEntry*) fontweight_AllocEntry(void *pool, const void *k
 PR_STATIC_CALLBACK(void) fontweight_FreeEntry(void *pool, PLHashEntry *he, PRUint32 flag)
 {
   if (flag == HT_FREE_ENTRY)  {
-    nsFontWeightEntry *fontWeightEntry = NS_STATIC_CAST(nsFontWeightEntry *, he);
+    nsFontWeightEntry *fontWeightEntry = static_cast<nsFontWeightEntry *>(he);
     delete fontWeightEntry;
   }
 }
@@ -3290,7 +3290,7 @@ nsFontMetricsWin::LookForFontWeightTable(HDC aDC, const nsString& aName)
   he = *hep;
   if (he) {
     // an identical fontweight has already been added
-    weightEntry = NS_STATIC_CAST(nsFontWeightEntry *, he);
+    weightEntry = static_cast<nsFontWeightEntry *>(he);
     return weightEntry->mWeightTable;
   }
 
@@ -3301,7 +3301,7 @@ nsFontMetricsWin::LookForFontWeightTable(HDC aDC, const nsString& aName)
    // Store it in font weight HashTable.
   he = PL_HashTableRawAdd(gFontWeights, hep, hash, &searchEntry, nsnull);
   if (he) {   
-    weightEntry = NS_STATIC_CAST(nsFontWeightEntry*, he);
+    weightEntry = static_cast<nsFontWeightEntry*>(he);
     weightEntry->mFontName = low;
     weightEntry->mWeightTable = weightTable;
     he->key = weightEntry;
diff --git a/mozilla/gfx/src/windows/nsImageWin.cpp b/mozilla/gfx/src/windows/nsImageWin.cpp
index 7143f76a65a..57e8b13b18b 100644
--- a/mozilla/gfx/src/windows/nsImageWin.cpp
+++ b/mozilla/gfx/src/windows/nsImageWin.cpp
@@ -597,7 +597,7 @@ nsImageWin::Draw(nsIRenderingContext &aContext, nsIDrawingSurface* aSurface,
       aContext.GetDeviceContext(dx);
       
       nsIDrawingSurface*     ds;
-      NS_STATIC_CAST(nsDeviceContextWin*, dx)->GetDrawingSurface(aContext, ds);
+      static_cast<nsDeviceContextWin*>(dx)->GetDrawingSurface(aContext, ds);
 
       nsDrawingSurfaceWin *srcDS = (nsDrawingSurfaceWin *)ds;
       if (!srcDS) {
@@ -1823,7 +1823,7 @@ NS_IMETHODIMP nsImageWin::DrawToImage(nsIImage* aDstImage, nscoord aDX, nscoord
   if (mAlphaDepth > 1)
     return NS_ERROR_UNEXPECTED;
 
-  nsImageWin *dest = NS_STATIC_CAST(nsImageWin *, aDstImage);
+  nsImageWin *dest = static_cast<nsImageWin *>(aDstImage);
 
   if (!dest)
     return NS_ERROR_FAILURE;
@@ -2076,7 +2076,7 @@ CompositeBitsInMemory(HDC aTheHDC, int aDX, int aDY, int aDWidth, int aDHeight,
 
 void nsImageWin::TimerCallBack(nsITimer *aTimer, void *aClosure)
 {
-  nsImageWin *entry = NS_STATIC_CAST(nsImageWin*, aClosure);
+  nsImageWin *entry = static_cast<nsImageWin*>(aClosure);
   if (!entry)
     return;
 
diff --git a/mozilla/gfx/src/windows/nsRenderingContextWin.cpp b/mozilla/gfx/src/windows/nsRenderingContextWin.cpp
index 19bd389e733..359588bc01c 100644
--- a/mozilla/gfx/src/windows/nsRenderingContextWin.cpp
+++ b/mozilla/gfx/src/windows/nsRenderingContextWin.cpp
@@ -2433,7 +2433,7 @@ PRInt32 nsRenderingContextWin::GetMaxStringLength()
 {
   if (!mFontMetrics)
     return 1;
-  return NS_STATIC_CAST(nsFontMetricsWin*, mFontMetrics)->GetMaxStringLength();
+  return static_cast<nsFontMetricsWin*>(mFontMetrics)->GetMaxStringLength();
 }
 
 NS_IMETHODIMP nsRenderingContextWin :: CopyOffScreenBits(nsIDrawingSurface* aSrcSurf,
diff --git a/mozilla/gfx/thebes/public/gfxAtsuiFonts.h b/mozilla/gfx/thebes/public/gfxAtsuiFonts.h
index 6bb0c109e2d..db1f58c1828 100644
--- a/mozilla/gfx/thebes/public/gfxAtsuiFonts.h
+++ b/mozilla/gfx/thebes/public/gfxAtsuiFonts.h
@@ -123,7 +123,7 @@ public:
     ATSUFontFallbacks *GetATSUFontFallbacksPtr() { return &mFallbacks; }
     
     gfxAtsuiFont* GetFontAt(PRInt32 i) {
-        return NS_STATIC_CAST(gfxAtsuiFont*, NS_STATIC_CAST(gfxFont*, mFonts[i]));
+        return static_cast<gfxAtsuiFont*>(static_cast<gfxFont*>(mFonts[i]));
     }
 
     gfxAtsuiFont* FindFontFor(ATSUFontID fid);
diff --git a/mozilla/gfx/thebes/public/gfxFont.h b/mozilla/gfx/thebes/public/gfxFont.h
index d5197fc9b1f..03ef48947ea 100644
--- a/mozilla/gfx/thebes/public/gfxFont.h
+++ b/mozilla/gfx/thebes/public/gfxFont.h
@@ -811,8 +811,8 @@ public:
     { return (mFlags & gfxTextRunFactory::TEXT_IS_8BIT) ? nsnull : mText.mDouble; }
     const void *GetTextAt(PRUint32 aIndex) {
         return (mFlags & gfxTextRunFactory::TEXT_IS_8BIT)
-            ? NS_STATIC_CAST(const void *, mText.mSingle + aIndex)
-            : NS_STATIC_CAST(const void *, mText.mDouble + aIndex);
+            ? static_cast<const void *>(mText.mSingle + aIndex)
+            : static_cast<const void *>(mText.mDouble + aIndex);
     }
     const PRUnichar GetChar(PRUint32 i) const
     { return (mFlags & gfxTextRunFactory::TEXT_IS_8BIT) ? mText.mSingle[i] : mText.mDouble[i]; }
@@ -1150,7 +1150,7 @@ public:
     }
 
     virtual gfxFont *GetFontAt(PRInt32 i) {
-        return NS_STATIC_CAST(gfxFont*, mFonts[i]);
+        return static_cast<gfxFont*>(mFonts[i]);
     }
     virtual PRUint32 FontListLength() const {
         return mFonts.Length();
diff --git a/mozilla/gfx/thebes/public/gfxOS2Fonts.h b/mozilla/gfx/thebes/public/gfxOS2Fonts.h
index e312c4fb497..eb3692a9209 100644
--- a/mozilla/gfx/thebes/public/gfxOS2Fonts.h
+++ b/mozilla/gfx/thebes/public/gfxOS2Fonts.h
@@ -100,7 +100,7 @@ public:
         printf("gfxOS2FontGroup[%#x]::GetFontAt(%d), %#x, %#x\n",
                (unsigned)this, i, (unsigned)&mFonts, (unsigned)&mFonts[i]);
 #endif
-        return NS_STATIC_CAST(gfxOS2Font*, NS_STATIC_CAST(gfxFont*, mFonts[i]));
+        return static_cast<gfxOS2Font*>(static_cast<gfxFont*>(mFonts[i]));
     }
 
     gfxOS2Font *GetCachedFont(const nsAString& aName) const {
diff --git a/mozilla/gfx/thebes/public/gfxPangoFonts.h b/mozilla/gfx/thebes/public/gfxPangoFonts.h
index 9032a9aa5f5..7061e66266d 100644
--- a/mozilla/gfx/thebes/public/gfxPangoFonts.h
+++ b/mozilla/gfx/thebes/public/gfxPangoFonts.h
@@ -131,8 +131,7 @@ public:
                                     const Parameters *aParams, PRUint32 aFlags);
 
     gfxPangoFont *GetFontAt(PRInt32 i) {
-        return NS_STATIC_CAST(gfxPangoFont*, 
-                              NS_STATIC_CAST(gfxFont*, mFonts[i]));
+        return static_cast<gfxPangoFont*>(static_cast<gfxFont*>(mFonts[i]));
     }
 
 protected:
diff --git a/mozilla/gfx/thebes/src/gfxAtsuiFonts.cpp b/mozilla/gfx/thebes/src/gfxAtsuiFonts.cpp
index 2423434a255..701b98e4a5e 100644
--- a/mozilla/gfx/thebes/src/gfxAtsuiFonts.cpp
+++ b/mozilla/gfx/thebes/src/gfxAtsuiFonts.cpp
@@ -361,7 +361,7 @@ gfxAtsuiFontGroup::gfxAtsuiFontGroup(const nsAString& families,
         fids = static_fids;
 
     for (unsigned int i = 0; i < mFonts.Length(); i++) {
-        gfxAtsuiFont* atsuiFont = NS_STATIC_CAST(gfxAtsuiFont*, NS_STATIC_CAST(gfxFont*, mFonts[i]));
+        gfxAtsuiFont* atsuiFont = static_cast<gfxAtsuiFont*>(static_cast<gfxFont*>(mFonts[i]));
         fids[i] = atsuiFont->GetATSUFontID();
     }
     ATSUSetObjFontFallbacks(mFallbacks,
@@ -785,10 +785,10 @@ PostLayoutCallback(ATSULineRef aLine, gfxTextRun *aRun,
                    PRUint32 aSegmentStart, PRUint32 aSegmentLength)
 {
     // AutoLayoutDataArrayPtr advanceDeltasArray(aLine, kATSUDirectDataAdvanceDeltaFixedArray);
-    // Fixed *advanceDeltas = NS_STATIC_CAST(Fixed *, advanceDeltasArray.mArray);
+    // Fixed *advanceDeltas = static_cast<Fixed *>(advanceDeltasArray.mArray);
     // AutoLayoutDataArrayPtr deviceDeltasArray(aLine, kATSUDirectDataDeviceDeltaSInt16Array);
     AutoLayoutDataArrayPtr baselineDeltasArray(aLine, kATSUDirectDataBaselineDeltaFixedArray);
-    Fixed *baselineDeltas = NS_STATIC_CAST(Fixed *, baselineDeltasArray.mArray);
+    Fixed *baselineDeltas = static_cast<Fixed *>(baselineDeltasArray.mArray);
     AutoLayoutDataArrayPtr glyphRecordsArray(aLine, kATSUDirectDataLayoutRecordATSLayoutRecordCurrent);
 
     PRUint32 numGlyphs = glyphRecordsArray.mItemCount;
@@ -796,7 +796,7 @@ PostLayoutCallback(ATSULineRef aLine, gfxTextRun *aRun,
         NS_WARNING("Failed to retrieve key glyph data");
         return PR_FALSE;
     }
-    ATSLayoutRecord *glyphRecords = NS_STATIC_CAST(ATSLayoutRecord *, glyphRecordsArray.mArray);
+    ATSLayoutRecord *glyphRecords = static_cast<ATSLayoutRecord *>(glyphRecordsArray.mArray);
     NS_ASSERTION(!baselineDeltas || baselineDeltasArray.mItemCount == numGlyphs,
                  "Mismatched glyph counts");
     NS_ASSERTION(glyphRecords[numGlyphs - 1].flags & kATSGlyphInfoTerminatorGlyph,
diff --git a/mozilla/gfx/thebes/src/gfxFont.cpp b/mozilla/gfx/thebes/src/gfxFont.cpp
index 79f34e90e92..acedc912567 100644
--- a/mozilla/gfx/thebes/src/gfxFont.cpp
+++ b/mozilla/gfx/thebes/src/gfxFont.cpp
@@ -662,7 +662,7 @@ gfxTextRun::gfxTextRun(const gfxTextRunFactory::Parameters *aParams, const void
         }
     }
     if (mFlags & gfxTextRunFactory::TEXT_IS_8BIT) {
-        mText.mSingle = NS_STATIC_CAST(const PRUint8 *, aText);
+        mText.mSingle = static_cast<const PRUint8 *>(aText);
         if (!(mFlags & gfxTextRunFactory::TEXT_IS_PERSISTENT)) {
             PRUint8 *newText = new PRUint8[aLength];
             if (!newText) {
@@ -674,7 +674,7 @@ gfxTextRun::gfxTextRun(const gfxTextRunFactory::Parameters *aParams, const void
             mText.mSingle = newText;    
         }
     } else {
-        mText.mDouble = NS_STATIC_CAST(const PRUnichar *, aText);
+        mText.mDouble = static_cast<const PRUnichar *>(aText);
         if (!(mFlags & gfxTextRunFactory::TEXT_IS_PERSISTENT)) {
             PRUnichar *newText = new PRUnichar[aLength];
             if (!newText) {
diff --git a/mozilla/gfx/thebes/src/gfxOS2Fonts.cpp b/mozilla/gfx/thebes/src/gfxOS2Fonts.cpp
index a2287ee60e3..bcb4ea4a51c 100644
--- a/mozilla/gfx/thebes/src/gfxOS2Fonts.cpp
+++ b/mozilla/gfx/thebes/src/gfxOS2Fonts.cpp
@@ -437,7 +437,7 @@ gfxTextRun *gfxOS2FontGroup::MakeTextRun(const PRUint8* aString, PRUint32 aLengt
     if (!textRun)
         return nsnull;
 
-    const char *chars = NS_REINTERPRET_CAST(const char *, aString);
+    const char *chars = reinterpret_cast<const char *>(aString);
     PRBool isRTL = textRun->IsRightToLeft();
     if ((aFlags & TEXT_IS_ASCII) && !isRTL) {
         // We don't need to send an override character here, the characters must be all
@@ -590,7 +590,7 @@ PRBool gfxOS2FontGroup::FontCallback(const nsAString& aFontName,
                                      const nsACString& aGenericName,
                                      void *aClosure)
 {
-    nsStringArray *sa = NS_STATIC_CAST(nsStringArray*, aClosure);
+    nsStringArray *sa = static_cast<nsStringArray*>(aClosure);
     if (sa->IndexOf(aFontName) < 0) {
         sa->AppendString(aFontName);
     }
diff --git a/mozilla/gfx/thebes/src/gfxPangoFonts.cpp b/mozilla/gfx/thebes/src/gfxPangoFonts.cpp
index 227fe19bd24..05dc7b73410 100644
--- a/mozilla/gfx/thebes/src/gfxPangoFonts.cpp
+++ b/mozilla/gfx/thebes/src/gfxPangoFonts.cpp
@@ -123,7 +123,7 @@ gfxPangoFontGroup::FontCallback (const nsAString& fontName,
                                  const nsACString& genericName,
                                  void *closure)
 {
-    nsStringArray *sa = NS_STATIC_CAST(nsStringArray*, closure);
+    nsStringArray *sa = static_cast<nsStringArray*>(closure);
 
     if (FFRECountHyphens(fontName) < 3 && sa->IndexOf(fontName) < 0) {
         sa->AppendString(fontName);
@@ -813,10 +813,10 @@ gfxPangoFontGroup::MakeTextRun(const PRUint8 *aString, PRUint32 aLength,
     if ((aFlags & TEXT_IS_ASCII) && !isRTL) {
         // We don't need to send an override character here, the characters must be all
         // LTR
-        const gchar *utf8Chars = NS_REINTERPRET_CAST(const gchar*, aString);
+        const gchar *utf8Chars = reinterpret_cast<const gchar*>(aString);
         InitTextRun(run, utf8Chars, aLength, 0);
     } else {
-        const char *chars = NS_REINTERPRET_CAST(const char*, aString);
+        const char *chars = reinterpret_cast<const char*>(aString);
         // XXX this could be more efficient.
         // Although chars in not necessarily ASCII (as it may point to the low
         // bytes of any UCS-2 characters < 256), NS_ConvertASCIItoUTF16 seems
@@ -1336,7 +1336,7 @@ public:
         if (aName.IsEmpty())
             return PR_TRUE;
 
-        FontSelector *fs = NS_STATIC_CAST(FontSelector*, closure);
+        FontSelector *fs = static_cast<FontSelector*>(closure);
 
         // XXX do something better than this to remove dups
         if (ExistsFont(fs, aName))
diff --git a/mozilla/gfx/thebes/src/gfxTextRunWordCache.cpp b/mozilla/gfx/thebes/src/gfxTextRunWordCache.cpp
index c9099ac62a1..21d81a0f57d 100644
--- a/mozilla/gfx/thebes/src/gfxTextRunWordCache.cpp
+++ b/mozilla/gfx/thebes/src/gfxTextRunWordCache.cpp
@@ -569,8 +569,8 @@ static void *
 GetFontOrGroup(gfxFontGroup *aFontGroup, PRBool aUseFont)
 {
     return aUseFont
-        ? NS_STATIC_CAST(void *, aFontGroup->GetFontAt(0))
-        : NS_STATIC_CAST(void *, aFontGroup);
+        ? static_cast<void *>(aFontGroup->GetFontAt(0))
+        : static_cast<void *>(aFontGroup);
 }
 
 PRBool
@@ -592,12 +592,12 @@ TextRunWordCache::CacheHashEntry::KeyEquals(const KeyTypePointer aKey) const
         if (!aKey->mIsDoubleByteText)
             return memcmp(text, aKey->mString, length) == 0;
         return CompareDifferentWidthStrings(text,
-                                            NS_STATIC_CAST(const PRUnichar *, aKey->mString), length);
+                                            static_cast<const PRUnichar *>(aKey->mString), length);
     } else {
         const PRUnichar *text = mTextRun->GetTextUnicode() + mWordOffset;
         if (aKey->mIsDoubleByteText)
             return memcmp(text, aKey->mString, length*sizeof(PRUnichar)) == 0;
-        return CompareDifferentWidthStrings(NS_STATIC_CAST(const PRUint8 *, aKey->mString),
+        return CompareDifferentWidthStrings(static_cast<const PRUint8 *>(aKey->mString),
                                             text, length);
     }
 }
diff --git a/mozilla/gfx/thebes/src/gfxWindowsFonts.cpp b/mozilla/gfx/thebes/src/gfxWindowsFonts.cpp
index 70a1394a46b..947675d28e2 100644
--- a/mozilla/gfx/thebes/src/gfxWindowsFonts.cpp
+++ b/mozilla/gfx/thebes/src/gfxWindowsFonts.cpp
@@ -84,7 +84,7 @@ GetDCFromSurface(gfxASurface *aSurface)
         NS_ERROR("GetDCFromSurface: Context target is not win32!");
         return nsnull;
     }
-    return NS_STATIC_CAST(gfxWindowsSurface*, aSurface)->GetDC();
+    return static_cast<gfxWindowsSurface*>(aSurface)->GetDC();
 }
 
 /**********************************************************************
@@ -452,7 +452,7 @@ AddFontEntryToArray(const nsAString& aName,
                     void *closure)
 {
     if (!aName.IsEmpty()) {
-        nsTArray<nsRefPtr<FontEntry> > *list = NS_STATIC_CAST(nsTArray<nsRefPtr<FontEntry> >*, closure);
+        nsTArray<nsRefPtr<FontEntry> > *list = static_cast<nsTArray<nsRefPtr<FontEntry> >*>(closure);
 
         nsRefPtr<FontEntry> fe = gfxWindowsPlatform::GetPlatform()->FindFontEntry(aName);
         if (list->IndexOf(fe) == list->NoIndex)
@@ -495,7 +495,7 @@ gfxWindowsFontGroup::GetFontAt(PRInt32 i)
         mFonts[i] = font;
     }
 
-    return NS_STATIC_CAST(gfxWindowsFont*, mFonts[i].get());
+    return static_cast<gfxWindowsFont*>(mFonts[i].get());
 }
 
 gfxFontGroup *
diff --git a/mozilla/gfx/thebes/src/gfxWindowsNativeDrawing.cpp b/mozilla/gfx/thebes/src/gfxWindowsNativeDrawing.cpp
index 582d48f1cf2..f1125c49b26 100644
--- a/mozilla/gfx/thebes/src/gfxWindowsNativeDrawing.cpp
+++ b/mozilla/gfx/thebes/src/gfxWindowsNativeDrawing.cpp
@@ -91,7 +91,7 @@ gfxWindowsNativeDrawing::BeginNativeDrawing()
 
                 mTranslation = m.GetTranslation();
 
-                mWinSurface = NS_STATIC_CAST(gfxWindowsSurface*, NS_STATIC_CAST(gfxASurface*, surf.get()));
+                mWinSurface = static_cast<gfxWindowsSurface*>(static_cast<gfxASurface*>(surf.get()));
             } else if (((mTransformType == AXIS_ALIGNED_SCALE)
                         && (mNativeDrawFlags & CAN_AXIS_ALIGNED_SCALE)) ||
                        (mNativeDrawFlags & CAN_COMPLEX_TRANSFORM))
@@ -104,7 +104,7 @@ gfxWindowsNativeDrawing::BeginNativeDrawing()
                 mWorldTransform.eDy  = (FLOAT) m.y0;
 
                 mRenderState = RENDER_STATE_NATIVE_DRAWING;
-                mWinSurface = NS_STATIC_CAST(gfxWindowsSurface*, NS_STATIC_CAST(gfxASurface*, surf.get()));
+                mWinSurface = static_cast<gfxWindowsSurface*>(static_cast<gfxASurface*>(surf.get()));
             }
         }
 
diff --git a/mozilla/gfx/thebes/test/gfxFontSelectionTest.cpp b/mozilla/gfx/thebes/test/gfxFontSelectionTest.cpp
index 6e68d079c76..57dc91b395b 100644
--- a/mozilla/gfx/thebes/test/gfxFontSelectionTest.cpp
+++ b/mozilla/gfx/thebes/test/gfxFontSelectionTest.cpp
@@ -302,7 +302,7 @@ RunTest (TestEntry *test, gfxContext *ctx) {
     if (test->stringType == S_ASCII) {
         flags |= gfxTextRunFactory::TEXT_IS_ASCII | gfxTextRunFactory::TEXT_IS_8BIT;
         length = strlen(test->string);
-        textRun = gfxTextRunWordCache::MakeTextRun(NS_REINTERPRET_CAST(PRUint8*, test->string), length, fontGroup, &params, flags);
+        textRun = gfxTextRunWordCache::MakeTextRun(reinterpret_cast<PRUint8*>(test->string), length, fontGroup, &params, flags);
     } else {
         flags |= gfxTextRunFactory::TEXT_HAS_SURROGATES; // just in case
         NS_ConvertUTF8toUTF16 str(nsDependentCString(test->string));
diff --git a/mozilla/gfx/thebes/test/gfxTextRunPerfTest.cpp b/mozilla/gfx/thebes/test/gfxTextRunPerfTest.cpp
index 9620906998f..0a5d9694134 100644
--- a/mozilla/gfx/thebes/test/gfxTextRunPerfTest.cpp
+++ b/mozilla/gfx/thebes/test/gfxTextRunPerfTest.cpp
@@ -116,7 +116,7 @@ RunTest (TestEntry *test, gfxContext *ctx) {
         flags |= gfxTextRunFactory::TEXT_IS_ASCII |
                  gfxTextRunFactory::TEXT_IS_8BIT;
         length = strlen(test->mString);
-        textRun = fontGroup->MakeTextRun(NS_REINTERPRET_CAST(const PRUint8*, test->mString), length, &params, flags);
+        textRun = fontGroup->MakeTextRun(reinterpret_cast<const PRUint8*>(test->mString), length, &params, flags);
     } else {
         flags |= gfxTextRunFactory::TEXT_HAS_SURROGATES; // just in case
         NS_ConvertUTF8toUTF16 str(nsDependentCString(test->mString));
diff --git a/mozilla/intl/locale/src/os2/nsCollationOS2.cpp b/mozilla/intl/locale/src/os2/nsCollationOS2.cpp
index 9358416267b..4fa13684093 100644
--- a/mozilla/intl/locale/src/os2/nsCollationOS2.cpp
+++ b/mozilla/intl/locale/src/os2/nsCollationOS2.cpp
@@ -144,7 +144,7 @@ nsresult nsCollationOS2::AllocateRawSortKey(PRInt32 strength,
     UniCreateLocaleObject(UNI_UCS_STRING_POINTER, (UniChar *)L"C", &locObj);
 
   res = NS_ERROR_FAILURE;               // From here on out assume failure...
-  int length = UniStrxfrm(locObj, NULL, NS_REINTERPRET_CAST(const UniChar *,stringNormalized.get()),0);
+  int length = UniStrxfrm(locObj, NULL, reinterpret_cast<const UniChar *>(stringNormalized.get()),0);
   if (length >= 0) {
     length += 5;                        // Allow for the "extra" chars UniStrxfrm()
                                         //  will out put (overrunning the buffer if
@@ -164,7 +164,7 @@ nsresult nsCollationOS2::AllocateRawSortKey(PRInt32 strength,
       pLocalBuffer = (UniChar*) malloc(sizeof(UniChar) * iBufferLength);
     if (pLocalBuffer) {
       // Do the Xfrm
-      int uLen = UniStrxfrm(locObj, pLocalBuffer, NS_REINTERPRET_CAST(const UniChar *,stringNormalized.get()), iBufferLength);
+      int uLen = UniStrxfrm(locObj, pLocalBuffer, reinterpret_cast<const UniChar *>(stringNormalized.get()), iBufferLength);
       // See how big the result really is
       uLen = UniStrlen(pLocalBuffer);
       // make sure it will fit in the output buffer...
diff --git a/mozilla/intl/locale/src/os2/nsDateTimeFormatOS2.cpp b/mozilla/intl/locale/src/os2/nsDateTimeFormatOS2.cpp
index 4aab9c00e16..c64dfc9ef9b 100644
--- a/mozilla/intl/locale/src/os2/nsDateTimeFormatOS2.cpp
+++ b/mozilla/intl/locale/src/os2/nsDateTimeFormatOS2.cpp
@@ -160,7 +160,7 @@ nsresult nsDateTimeFormatOS2::FormatTMTime(nsILocale* locale,
     UniStrcat( uFmtD, (UniChar*)L" ");
   }
   UniStrcat( uFmtD, uFmtT);
-  int length = UniStrftime(locObj, NS_REINTERPRET_CAST(UniChar *, buffer),
+  int length = UniStrftime(locObj, reinterpret_cast<UniChar *>(buffer),
                            NSDATETIME_FORMAT_BUFFER_LEN, uFmtD, tmTime);
   UniFreeLocaleObject(locObj);
 
diff --git a/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.cpp b/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.cpp
index 305d8768a48..7821907272d 100644
--- a/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.cpp
+++ b/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.cpp
@@ -275,8 +275,8 @@ int nsDateTimeFormatWin::nsGetTimeFormatW(DWORD dwFlags, const SYSTEMTIME *lpTim
   int len = 0;
   len = GetTimeFormatW(mLCID, dwFlags, lpTime, 
                        format ?
-                       NS_CONST_CAST(LPCWSTR,
-                                     NS_ConvertASCIItoUTF16(format).get()) :
+                       const_cast<LPCWSTR>
+                                 (NS_ConvertASCIItoUTF16(format).get()) :
                        NULL,
                        (LPWSTR) timeStr, cchTime);
   return len;
@@ -288,8 +288,8 @@ int nsDateTimeFormatWin::nsGetDateFormatW(DWORD dwFlags, const SYSTEMTIME *lpDat
   int len = 0;
   len = GetDateFormatW(mLCID, dwFlags, lpDate, 
                        format ?
-                       NS_CONST_CAST(LPCWSTR,
-                                     NS_ConvertASCIItoUTF16(format).get()) :
+                       const_cast<LPCWSTR>
+                                 (NS_ConvertASCIItoUTF16(format).get()) :
                        NULL,
                        (LPWSTR) dateStr, cchDate);
   return len;
diff --git a/mozilla/intl/uconv/native/nsNativeUConvService.cpp b/mozilla/intl/uconv/native/nsNativeUConvService.cpp
index 036103124f6..03f35a53a3d 100644
--- a/mozilla/intl/uconv/native/nsNativeUConvService.cpp
+++ b/mozilla/intl/uconv/native/nsNativeUConvService.cpp
@@ -378,7 +378,7 @@ NativeUConvService::GetNativeConverter(const char* from,
 
     //nsRefPtr<IConvAdaptor> ucl = new IConvAdaptor();
     IConvAdaptor *adaptor=new IConvAdaptor();
-    nsCOMPtr<nsISupports> ucl(NS_STATIC_CAST(nsIUnicodeDecoder*,adaptor));
+    nsCOMPtr<nsISupports> ucl(static_cast<nsIUnicodeDecoder*>(adaptor));
     if (!ucl)
         return NS_ERROR_OUT_OF_MEMORY;
 
diff --git a/mozilla/intl/uconv/src/nsConverterInputStream.cpp b/mozilla/intl/uconv/src/nsConverterInputStream.cpp
index a81a6171e04..b2951622bce 100644
--- a/mozilla/intl/uconv/src/nsConverterInputStream.cpp
+++ b/mozilla/intl/uconv/src/nsConverterInputStream.cpp
@@ -178,8 +178,7 @@ nsConverterInputStream::ReadString(PRUint32 aCount, nsAString& aString,
   if (readCount > aCount) {
     readCount = aCount;
   }
-  const PRUnichar* buf = NS_REINTERPRET_CAST(const PRUnichar*, 
-                                             mUnicharData->GetBuffer() +
+  const PRUnichar* buf = reinterpret_cast<const PRUnichar*>(mUnicharData->GetBuffer() +
                                              mUnicharDataOffset);
   aString.Assign(buf, readCount);
   mUnicharDataOffset += readCount;
diff --git a/mozilla/intl/uconv/src/nsScriptableUConv.cpp b/mozilla/intl/uconv/src/nsScriptableUConv.cpp
index 160d11e55d0..30a0ecb9f80 100644
--- a/mozilla/intl/uconv/src/nsScriptableUConv.cpp
+++ b/mozilla/intl/uconv/src/nsScriptableUConv.cpp
@@ -152,7 +152,7 @@ nsScriptableUnicodeConverter::ConvertToUnicode(const nsACString& aSrc, nsAString
 {
   nsACString::const_iterator i;
   aSrc.BeginReading(i);
-  return ConvertFromByteArray(NS_REINTERPRET_CAST(const PRUint8*, i.get()),
+  return ConvertFromByteArray(reinterpret_cast<const PRUint8*>(i.get()),
                               aSrc.Length(),
                               _retval);
 }
@@ -171,7 +171,7 @@ nsScriptableUnicodeConverter::ConvertFromByteArray(const PRUint8* aData,
   nsresult rv = NS_OK;
   PRInt32 inLength = aCount;
   PRInt32 outLength;
-  rv = mDecoder->GetMaxLength(NS_REINTERPRET_CAST(const char*, aData),
+  rv = mDecoder->GetMaxLength(reinterpret_cast<const char*>(aData),
                               inLength, &outLength);
   if (NS_SUCCEEDED(rv))
   {
@@ -179,7 +179,7 @@ nsScriptableUnicodeConverter::ConvertFromByteArray(const PRUint8* aData,
     if (!buf)
       return NS_ERROR_OUT_OF_MEMORY;
 
-    rv = mDecoder->Convert(NS_REINTERPRET_CAST(const char*, aData),
+    rv = mDecoder->Convert(reinterpret_cast<const char*>(aData),
                            &inLength, buf, &outLength);
     if (NS_SUCCEEDED(rv))
     {
@@ -217,8 +217,8 @@ nsScriptableUnicodeConverter::ConvertToByteArray(const nsAString& aString,
   str.Append(data, len);
   nsMemory::Free(data);
   // NOTE: this being a byte array, it needs no null termination
-  *_aData = NS_REINTERPRET_CAST(PRUint8*,
-                                nsMemory::Clone(str.get(), str.Length()));
+  *_aData = reinterpret_cast<PRUint8*>
+                            (nsMemory::Clone(str.get(), str.Length()));
   if (!*_aData)
     return NS_ERROR_OUT_OF_MEMORY;
   *aLen = str.Length();
@@ -242,7 +242,7 @@ nsScriptableUnicodeConverter::ConvertToInputStream(const nsAString& aString,
   if (NS_FAILED(rv))
     return rv;
 
-  rv = inputStream->AdoptData(NS_REINTERPRET_CAST(char*, data), dataLen);
+  rv = inputStream->AdoptData(reinterpret_cast<char*>(data), dataLen);
   if (NS_FAILED(rv)) {
     nsMemory::Free(data);
     return rv;
diff --git a/mozilla/intl/uconv/util/nsUnicodeDecodeHelper.cpp b/mozilla/intl/uconv/util/nsUnicodeDecodeHelper.cpp
index f2f20de2650..bc45f0b3ecd 100644
--- a/mozilla/intl/uconv/util/nsUnicodeDecodeHelper.cpp
+++ b/mozilla/intl/uconv/util/nsUnicodeDecodeHelper.cpp
@@ -65,11 +65,11 @@ nsresult nsUnicodeDecodeHelper::ConvertByTable(
     if (aScanClass == uMultibytesCharset) {
       NS_ASSERTION(aShiftInTable, "shift table missing");
       charFound = uScanShift(aShiftInTable, NULL, (PRUint8 *)src,
-                             NS_REINTERPRET_CAST(PRUint16*, &med), srcLen, 
+                             reinterpret_cast<PRUint16*>(&med), srcLen, 
                              (PRUint32 *)&bcr);
     } else {
       charFound = uScan(aScanClass, NULL, (PRUint8 *)src,
-                        NS_REINTERPRET_CAST(PRUint16*, &med),
+                        reinterpret_cast<PRUint16*>(&med),
                         srcLen, (PRUint32 *)&bcr);
     }
     if (!charFound) {
@@ -77,7 +77,7 @@ nsresult nsUnicodeDecodeHelper::ConvertByTable(
       break;
     }
 
-    if (!uMapCode((uTable*) aMappingTable, NS_STATIC_CAST(PRUint16, med), NS_REINTERPRET_CAST(PRUint16*, dest))) {
+    if (!uMapCode((uTable*) aMappingTable, static_cast<PRUint16>(med), reinterpret_cast<PRUint16*>(dest))) {
       if (med < 0x20) {
         // somehow some table miss the 0x00 - 0x20 part
         *dest = med;
@@ -130,13 +130,13 @@ nsresult nsUnicodeDecodeHelper::ConvertByMultiTable(
       {
         passRangeCheck = PR_TRUE;
         if (uScan(aScanClassArray[i], NULL, src, 
-                   NS_REINTERPRET_CAST(PRUint16*, &med), srcLen, 
+                   reinterpret_cast<PRUint16*>(&med), srcLen, 
                    (PRUint32 *)&bcr)) 
         {
           passScan = PR_TRUE;
           done = uMapCode((uTable*) aMappingTable[i], 
-                          NS_STATIC_CAST(PRUint16, med), 
-                          NS_REINTERPRET_CAST(PRUint16*, dest)); 
+                          static_cast<PRUint16>(med), 
+                          reinterpret_cast<PRUint16*>(dest)); 
         } // if (uScan ... )
       } // if Range
     } // for loop
@@ -162,7 +162,7 @@ nsresult nsUnicodeDecodeHelper::ConvertByMultiTable(
           if ((aRangeArray[i].min <= *src) && (*src <= aRangeArray[i].max)) 
           {
             if (uScan(aScanClassArray[i], NULL, src, 
-                   NS_REINTERPRET_CAST(PRUint16*, &med), srcLen, 
+                   reinterpret_cast<PRUint16*>(&med), srcLen, 
                    (PRUint32*)&bcr)) 
             { 
                // match the patten
diff --git a/mozilla/intl/uconv/util/nsUnicodeEncodeHelper.cpp b/mozilla/intl/uconv/util/nsUnicodeEncodeHelper.cpp
index d4be40d4387..e46af6e68e6 100644
--- a/mozilla/intl/uconv/util/nsUnicodeEncodeHelper.cpp
+++ b/mozilla/intl/uconv/util/nsUnicodeEncodeHelper.cpp
@@ -61,7 +61,7 @@ nsresult nsUnicodeEncodeHelper::ConvertByTable(
   nsresult res = NS_OK;
 
   while (src < srcEnd) {
-    if (!uMapCode((uTable*) aMappingTable, NS_STATIC_CAST(PRUnichar, *(src++)), NS_REINTERPRET_CAST(PRUint16*, &med))) {
+    if (!uMapCode((uTable*) aMappingTable, static_cast<PRUnichar>(*(src++)), reinterpret_cast<PRUint16*>(&med))) {
       res = NS_ERROR_UENC_NOMAPPING;
       break;
     }
@@ -114,7 +114,7 @@ nsresult nsUnicodeEncodeHelper::ConvertByMultiTable(
 
   while (src < srcEnd) {
     for (i=0; i<aTableCount; i++) 
-      if (uMapCode((uTable*) aMappingTable[i], NS_STATIC_CAST(PRUint16, *src), NS_REINTERPRET_CAST(PRUint16*, &med))) break;
+      if (uMapCode((uTable*) aMappingTable[i], static_cast<PRUint16>(*src), reinterpret_cast<PRUint16*>(&med))) break;
 
     src++;
     if (i == aTableCount) {
diff --git a/mozilla/intl/unicharutil/src/nsCaseConversionImp2.cpp b/mozilla/intl/unicharutil/src/nsCaseConversionImp2.cpp
index 7afbaef3d4d..0d22c27f7f3 100644
--- a/mozilla/intl/unicharutil/src/nsCaseConversionImp2.cpp
+++ b/mozilla/intl/unicharutil/src/nsCaseConversionImp2.cpp
@@ -152,12 +152,12 @@ struct nsCompressedMap {
 };
 
 static nsCompressedMap gUpperMap = {
-  NS_REINTERPRET_CAST(const PRUnichar*, &gToUpper[0]),
+  reinterpret_cast<const PRUnichar*>(&gToUpper[0]),
   gToUpperItems
 };
 
 static nsCompressedMap gLowerMap = {
-  NS_REINTERPRET_CAST(const PRUnichar*, &gToLower[0]),
+  reinterpret_cast<const PRUnichar*>(&gToLower[0]),
   gToLowerItems
 };
 
diff --git a/mozilla/ipc/ipcd/client/src/ipcdclient.cpp b/mozilla/ipc/ipcd/client/src/ipcdclient.cpp
index 2cc3d90c478..dea8357f8bf 100644
--- a/mozilla/ipc/ipcd/client/src/ipcdclient.cpp
+++ b/mozilla/ipc/ipcd/client/src/ipcdclient.cpp
@@ -449,7 +449,7 @@ private:
 static void
 RunEvent(void *arg)
 {
-  nsIRunnable *ev = NS_STATIC_CAST(nsIRunnable *, arg);
+  nsIRunnable *ev = static_cast<nsIRunnable *>(arg);
   ev->Run();
   NS_RELEASE(ev);
 }
diff --git a/mozilla/js/jsd/jsd_xpc.cpp b/mozilla/js/jsd/jsd_xpc.cpp
index 524ee96e1f5..6f236bf5eb4 100644
--- a/mozilla/js/jsd/jsd_xpc.cpp
+++ b/mozilla/js/jsd/jsd_xpc.cpp
@@ -173,8 +173,8 @@ jsds_FindEphemeral (LiveEphemeral **listHead, void *key)
         return nsnull;
     
     LiveEphemeral *lv_record = 
-        NS_REINTERPRET_CAST (LiveEphemeral *,
-                             PR_NEXT_LINK(&(*listHead)->links));
+        reinterpret_cast<LiveEphemeral *>
+                        (PR_NEXT_LINK(&(*listHead)->links));
     do
     {
         if (lv_record->key == key)
@@ -182,8 +182,8 @@ jsds_FindEphemeral (LiveEphemeral **listHead, void *key)
             NS_IF_ADDREF(lv_record->value);
             return lv_record->value;
         }
-        lv_record = NS_REINTERPRET_CAST (LiveEphemeral *,
-                                         PR_NEXT_LINK(&lv_record->links));
+        lv_record = reinterpret_cast<LiveEphemeral *>
+                                    (PR_NEXT_LINK(&lv_record->links));
     }
     while (lv_record != *listHead);
 
@@ -194,13 +194,13 @@ void
 jsds_InvalidateAllEphemerals (LiveEphemeral **listHead)
 {
     LiveEphemeral *lv_record = 
-        NS_REINTERPRET_CAST (LiveEphemeral *,
-                             PR_NEXT_LINK(&(*listHead)->links));
+        reinterpret_cast<LiveEphemeral *>
+                        (PR_NEXT_LINK(&(*listHead)->links));
     while (*listHead)
     {
         LiveEphemeral *next =
-            NS_REINTERPRET_CAST (LiveEphemeral *,
-                                 PR_NEXT_LINK(&lv_record->links));
+            reinterpret_cast<LiveEphemeral *>
+                            (PR_NEXT_LINK(&lv_record->links));
         lv_record->value->Invalidate();
         lv_record = next;
     }
@@ -222,8 +222,8 @@ jsds_InsertEphemeral (LiveEphemeral **listHead, LiveEphemeral *item)
 void
 jsds_RemoveEphemeral (LiveEphemeral **listHead, LiveEphemeral *item)
 {
-    LiveEphemeral *next = NS_REINTERPRET_CAST (LiveEphemeral *,
-                                               PR_NEXT_LINK(&item->links));
+    LiveEphemeral *next = reinterpret_cast<LiveEphemeral *>
+                                          (PR_NEXT_LINK(&item->links));
 
     if (next == item)
     {
@@ -356,8 +356,8 @@ jsds_FindFilter (jsdIFilter *filter)
     do {
         if (current->filterObject == filter)
             return current;
-        current = NS_REINTERPRET_CAST(FilterRecord *,
-                                      PR_NEXT_LINK(&current->links));
+        current = reinterpret_cast<FilterRecord *>
+                                  (PR_NEXT_LINK(&current->links));
     } while (current != gFilters);
     
     return nsnull;
@@ -368,7 +368,7 @@ PRBool
 jsds_FilterHook (JSDContext *jsdc, JSDThreadState *state)
 {
     JSContext *cx = JSD_GetJSContext (jsdc, state);
-    void *glob = NS_STATIC_CAST(void *, JS_GetGlobalObject (cx));
+    void *glob = static_cast<void *>(JS_GetGlobalObject (cx));
 
     if (!glob) {
         NS_WARNING("No global in threadstate");
@@ -449,8 +449,8 @@ jsds_FilterHook (JSDContext *jsdc, JSDThreadState *state)
                 }                
             }
         }
-        currentFilter = NS_REINTERPRET_CAST(FilterRecord *,
-                                            PR_NEXT_LINK(&currentFilter->links));
+        currentFilter = reinterpret_cast<FilterRecord *>
+                                        (PR_NEXT_LINK(&currentFilter->links));
     } while (currentFilter != gFilters);
 
     return PR_TRUE;
@@ -487,8 +487,8 @@ jsds_NotifyPendingDeadScripts (JSContext *cx)
 #endif
         }
         /* get next deleted script */
-        gDeadScripts = NS_REINTERPRET_CAST(DeadScript *,
-                                           PR_NEXT_LINK(&ds->links));
+        gDeadScripts = reinterpret_cast<DeadScript *>
+                                       (PR_NEXT_LINK(&ds->links));
         if (gDeadScripts == ds) {
             /* last script in the list */
             gDeadScripts = nsnull;
@@ -729,7 +729,7 @@ jsds_ScriptHookProc (JSDContext* jsdc, JSDScript* jsdscript, JSBool creating,
          * we'll still need to invalidate the jsdIScript record, in order
          * to remove the reference held in the JSDScript private data. */
         nsCOMPtr<jsdIScript> jsdis = 
-            NS_STATIC_CAST(jsdIScript *, JSD_GetScriptPrivate(jsdscript));
+            static_cast<jsdIScript *>(JSD_GetScriptPrivate(jsdscript));
         if (!jsdis)
             return;
         
@@ -1058,8 +1058,8 @@ jsdScript::CreatePPLineMap()
     /* allocate worst case size of map (number of lines in script + 1
      * for our 0 record), we'll shrink it with a realloc later. */
     mPPLineMap = 
-        NS_STATIC_CAST(PCMapEntry *,
-                       PR_Malloc((scriptExtent + 1) * sizeof (PCMapEntry)));
+        static_cast<PCMapEntry *>
+                   (PR_Malloc((scriptExtent + 1) * sizeof (PCMapEntry)));
     if (mPPLineMap) {             
         mPCMapSize = 0;
         for (PRUint32 line = baseLine; line < scriptExtent + baseLine; ++line) {
@@ -1072,8 +1072,8 @@ jsdScript::CreatePPLineMap()
         }
         if (scriptExtent != mPCMapSize) {
             mPPLineMap =
-                NS_STATIC_CAST(PCMapEntry *,
-                               PR_Realloc(mPPLineMap,
+                static_cast<PCMapEntry *>
+                           (PR_Realloc(mPPLineMap,
                                           mPCMapSize * sizeof(PCMapEntry)));
         }
     }
@@ -1134,7 +1134,7 @@ jsdScript::GetVersion (PRInt32 *_rval)
     ASSERT_VALID_EPHEMERAL;
     JSContext *cx = JSD_GetDefaultJSContext (mCx);
     JSScript *script = JSD_GetJSScript(mCx, mScript);
-    *_rval = NS_STATIC_CAST (PRInt32, JS_GetScriptVersion(cx, script));
+    *_rval = static_cast<PRInt32>(JS_GetScriptVersion(cx, script));
     return NS_OK;
 }
 
@@ -1155,8 +1155,8 @@ jsdScript::Invalidate()
     mValid = PR_FALSE;
     
     /* release the addref we do in FromPtr */
-    jsdIScript *script = NS_STATIC_CAST(jsdIScript *,
-                                        JSD_GetScriptPrivate(mScript));
+    jsdIScript *script = static_cast<jsdIScript *>
+                                    (JSD_GetScriptPrivate(mScript));
     NS_ASSERTION (script == this, "That's not my script!");
     NS_RELEASE(script);
     JSD_SetScriptPrivate(mScript, NULL);
@@ -1176,7 +1176,7 @@ jsdScript::InvalidateAll ()
     JSD_LockScriptSubsystem(cx);
     while((script = JSD_IterateScripts(cx, &iter)) != NULL) {
         nsCOMPtr<jsdIScript> jsdis = 
-            NS_STATIC_CAST(jsdIScript *, JSD_GetScriptPrivate(script));
+            static_cast<jsdIScript *>(JSD_GetScriptPrivate(script));
         if (jsdis)
             jsdis->Invalidate();
     }
@@ -1275,7 +1275,7 @@ jsdScript::GetFunctionSource(nsAString & aFunctionSource)
     if (!jsstr)
         return NS_ERROR_FAILURE;
 
-    aFunctionSource = NS_REINTERPRET_CAST(PRUnichar*, JS_GetStringChars(jsstr));
+    aFunctionSource = reinterpret_cast<PRUnichar*>(JS_GetStringChars(jsstr));
     return NS_OK;
 }
 
@@ -1426,7 +1426,7 @@ jsdScript::SetBreakpoint(PRUint32 aPC)
     ASSERT_VALID_EPHEMERAL;
     jsuword pc = mFirstPC + aPC;
     JSD_SetExecutionHook (mCx, mScript, pc, jsds_ExecutionHookProc,
-                          NS_REINTERPRET_CAST(void *, PRIVATE_TO_JSVAL(NULL)));
+                          reinterpret_cast<void *>(PRIVATE_TO_JSVAL(NULL)));
     return NS_OK;
 }
 
@@ -1463,7 +1463,7 @@ jsdContext::FromPtr (JSDContext *aJSDCx, JSContext *aJSCx)
     
     nsCOMPtr<jsdIContext> jsdicx;
     nsCOMPtr<jsdIEphemeral> eph = 
-        jsds_FindEphemeral (&gLiveContexts, NS_STATIC_CAST(void *, aJSCx));
+        jsds_FindEphemeral (&gLiveContexts, static_cast<void *>(aJSCx));
     if (eph)
     {
         jsdicx = do_QueryInterface(eph);
@@ -1471,7 +1471,7 @@ jsdContext::FromPtr (JSDContext *aJSDCx, JSContext *aJSCx)
     else
     {
         nsCOMPtr<nsISupports> iscx = 
-            NS_STATIC_CAST(nsISupports *, JS_GetContextPrivate(aJSCx));
+            static_cast<nsISupports *>(JS_GetContextPrivate(aJSCx));
         if (!iscx)
             return nsnull;
         
@@ -1490,7 +1490,7 @@ jsdContext::jsdContext (JSDContext *aJSDCx, JSContext *aJSCx,
 {
     DEBUG_CREATE ("jsdContext", gContextCount);
     mLiveListEntry.value = this;
-    mLiveListEntry.key   = NS_STATIC_CAST (void *, aJSCx);
+    mLiveListEntry.key   = static_cast<void *>(aJSCx);
     jsds_InsertEphemeral (&gLiveContexts, &mLiveListEntry);
 }
 
@@ -1565,7 +1565,7 @@ jsdContext::GetPrivateData(nsISupports **_rval)
     PRUint32 options = JS_GetOptions(mJSCx);
     if (options & JSOPTION_PRIVATE_IS_NSISUPPORTS)
     {
-        *_rval = NS_STATIC_CAST(nsISupports*, JS_GetContextPrivate(mJSCx));
+        *_rval = static_cast<nsISupports*>(JS_GetContextPrivate(mJSCx));
         NS_IF_ADDREF(*_rval);
     }
     else
@@ -1600,7 +1600,7 @@ NS_IMETHODIMP
 jsdContext::GetVersion (PRInt32 *_rval)
 {
     ASSERT_VALID_EPHEMERAL;
-    *_rval = NS_STATIC_CAST (PRInt32, JS_GetVersion(mJSCx));
+    *_rval = static_cast<PRInt32>(JS_GetVersion(mJSCx));
     return NS_OK;
 }
 
@@ -1608,7 +1608,7 @@ NS_IMETHODIMP
 jsdContext::SetVersion (PRInt32 id)
 {
     ASSERT_VALID_EPHEMERAL;
-    JSVersion ver = NS_STATIC_CAST (JSVersion, id);
+    JSVersion ver = static_cast<JSVersion>(id);
     JS_SetVersion(mJSCx, ver);
     return NS_OK;
 }
@@ -1691,7 +1691,7 @@ jsdStackFrame::FromPtr (JSDContext *aCx, JSDThreadState *aThreadState,
 
     nsCOMPtr<jsdIEphemeral> eph =
         jsds_FindEphemeral (&gLiveStackFrames,
-                            NS_REINTERPRET_CAST(void *, aStackFrameInfo));
+                            reinterpret_cast<void *>(aStackFrameInfo));
 
     if (eph)
     {
@@ -1906,7 +1906,7 @@ jsdStackFrame::Eval (const nsAString &bytes, const char *fileName,
     // get pointer to buffer contained in |bytes|
     nsAString::const_iterator h;
     bytes.BeginReading(h);
-    const jschar *char_bytes = NS_REINTERPRET_CAST(const jschar *, h.get());
+    const jschar *char_bytes = reinterpret_cast<const jschar *>(h.get());
 
     JSExceptionState *estate = 0;
     jsval jv;
@@ -2208,8 +2208,8 @@ jsdValue::GetProperties (jsdIProperty ***propArray, PRUint32 *length)
     NS_ENSURE_TRUE(prop_count, NS_OK);
 
     jsdIProperty **pa_temp =
-        NS_STATIC_CAST(jsdIProperty **,
-                       nsMemory::Alloc(sizeof (jsdIProperty *) * 
+        static_cast<jsdIProperty **>
+                   (nsMemory::Alloc(sizeof (jsdIProperty *) * 
                                        prop_count));
     NS_ENSURE_TRUE(pa_temp, NS_ERROR_OUT_OF_MEMORY);
 
@@ -2820,8 +2820,8 @@ jsdService::RemoveFilter (jsdIFilter *filter)
         return NS_ERROR_INVALID_ARG;
     
     if (gFilters == rec) {
-        gFilters = NS_REINTERPRET_CAST(FilterRecord *,
-                                       PR_NEXT_LINK(&rec->links));
+        gFilters = reinterpret_cast<FilterRecord *>
+                                   (PR_NEXT_LINK(&rec->links));
         /* If we're the only filter left, null out the list head. */
         if (gFilters == rec)
             gFilters = nsnull;
@@ -2882,8 +2882,8 @@ jsdService::EnumerateFilters (jsdIFilterEnumerator *enumerator)
             if (NS_FAILED(rv))
                 return rv;
         }
-        current = NS_REINTERPRET_CAST(FilterRecord *,
-                                      PR_NEXT_LINK (&current->links));
+        current = reinterpret_cast<FilterRecord *>
+                                  (PR_NEXT_LINK (&current->links));
     } while (current != gFilters);
     
     return NS_OK;
@@ -2901,11 +2901,11 @@ jsdService::ClearFilters ()
     if (!gFilters)
         return NS_OK;
 
-    FilterRecord *current = NS_REINTERPRET_CAST(FilterRecord *,
-                                                PR_NEXT_LINK (&gFilters->links));
+    FilterRecord *current = reinterpret_cast<FilterRecord *>
+                                            (PR_NEXT_LINK (&gFilters->links));
     do {
-        FilterRecord *next = NS_REINTERPRET_CAST(FilterRecord *,
-                                                 PR_NEXT_LINK (&current->links));
+        FilterRecord *next = reinterpret_cast<FilterRecord *>
+                                             (PR_NEXT_LINK (&current->links));
         PR_REMOVE_AND_INIT_LINK(&current->links);
         jsds_FreeFilter(current);
         current = next;
diff --git a/mozilla/js/jsd/jsd_xpc.h b/mozilla/js/jsd/jsd_xpc.h
index 7ada2a0c93e..0bc57586311 100644
--- a/mozilla/js/jsd/jsd_xpc.h
+++ b/mozilla/js/jsd/jsd_xpc.h
@@ -150,12 +150,12 @@ class jsdScript : public jsdIScript
         jsdIScript *rv;
         
         if (data) {
-            rv = NS_STATIC_CAST(jsdIScript *, data);
+            rv = static_cast<jsdIScript *>(data);
         } else {
             rv = new jsdScript (aCx, aScript);
             NS_IF_ADDREF(rv);  /* addref for the SetScriptPrivate, released in
                                 * Invalidate() */
-            JSD_SetScriptPrivate (aScript, NS_STATIC_CAST(void *, rv));
+            JSD_SetScriptPrivate (aScript, static_cast<void *>(rv));
         }
         
         NS_IF_ADDREF(rv); /* addref for return value */
@@ -343,11 +343,11 @@ class jsdContext : public jsdIContext
         jsdIContext *rv;
         
         if (data) {
-            rv = NS_STATIC_CAST(jsdIContext *, data);
+            rv = static_cast<jsdIContext *>(data);
         } else {
             rv = new jsdContext (aCx);
             NS_IF_ADDREF(rv);  // addref for the SetContextPrivate
-            JSD_SetContextPrivate (aCx, NS_STATIC_CAST(void *, rv));
+            JSD_SetContextPrivate (aCx, static_cast<void *>(rv));
         }
         
         NS_IF_ADDREF(rv); // addref for the return value
diff --git a/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp b/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp
index b4350cb3de3..44969aca19e 100644
--- a/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp
+++ b/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp
@@ -146,11 +146,11 @@ mozJSLoaderErrorReporter(JSContext *cx, const char *message, JSErrorReport *rep)
 
         PRUint32 column = rep->uctokenptr - rep->uclinebuf;
 
-        rv = errorObject->Init(NS_REINTERPRET_CAST(const PRUnichar*,
-                                                   rep->ucmessage),
+        rv = errorObject->Init(reinterpret_cast<const PRUnichar*>
+                                               (rep->ucmessage),
                                fileUni.get(),
-                               NS_REINTERPRET_CAST(const PRUnichar*,
-                                                   rep->uclinebuf),
+                               reinterpret_cast<const PRUnichar*>
+                                               (rep->uclinebuf),
                                rep->lineno, column, rep->flags,
                                "component javascript");
         if (NS_SUCCEEDED(rv)) {
@@ -391,7 +391,7 @@ ReadScriptFromStream(JSContext *cx, nsIObjectInputStream *stream,
         // doesn't get passed to ::JS_free by ::JS_XDRDestroy.
 
         uint32 length;
-        data = NS_STATIC_CAST(char*, JS_XDRMemGetData(xdr, &length));
+        data = static_cast<char*>(JS_XDRMemGetData(xdr, &length));
         if (data) {
             JS_XDRMemSetData(xdr, nsnull, 0);
         }
@@ -435,8 +435,8 @@ WriteScriptToStream(JSContext *cx, JSScript *script,
         // one last buffer of data to write to aStream.
 
         uint32 size;
-        const char* data = NS_REINTERPRET_CAST(const char*,
-                                               JS_XDRMemGetData(xdr, &size));
+        const char* data = reinterpret_cast<const char*>
+                                           (JS_XDRMemGetData(xdr, &size));
         NS_ASSERTION(data, "no decoded JSXDRState data!");
 
         rv = stream->Write32(size);
@@ -797,7 +797,7 @@ FastLoadStateHolder::pop()
 void
 mozJSComponentLoader::CloseFastLoad(nsITimer *timer, void *closure)
 {
-    NS_STATIC_CAST(mozJSComponentLoader*, closure)->CloseFastLoad();
+    static_cast<mozJSComponentLoader*>(closure)->CloseFastLoad();
 }
 
 void
@@ -1181,7 +1181,7 @@ mozJSComponentLoader::GlobalForLocation(nsILocalFile *aComponent,
         PRUint32 fileSize32;
         LL_L2UI(fileSize32, fileSize);
 
-        char *buf = NS_STATIC_CAST(char*, PR_MemMap(map, 0, fileSize32));
+        char *buf = static_cast<char*>(PR_MemMap(map, 0, fileSize32));
         if (!buf) {
             NS_WARNING("Failed to map file");
             return NS_ERROR_FAILURE;
diff --git a/mozilla/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp b/mozilla/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
index 084298dff5b..a52c6874302 100644
--- a/mozilla/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
+++ b/mozilla/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
@@ -223,7 +223,7 @@ mozJSSubScriptLoader::LoadSubScript (const PRUnichar * /*url*/
         goto return_exception;
     }
 
-    rv = serv->NewChannel(nsDependentCString(url), nsnull, NS_STATIC_CAST(nsIURI *, nsnull),
+    rv = serv->NewChannel(nsDependentCString(url), nsnull, static_cast<nsIURI *>(nsnull),
                           getter_AddRefs(chan));
     if (NS_FAILED(rv))
     {
@@ -260,7 +260,7 @@ mozJSSubScriptLoader::LoadSubScript (const PRUnichar * /*url*/
         readcount += lastReadCount;
     } while (lastReadCount && readcount != PRUint32(len));
     
-    if (NS_STATIC_CAST(PRUint32, len) != readcount)
+    if (static_cast<PRUint32>(len) != readcount)
     {
         errmsg = JS_NewStringCopyZ (cx, LOAD_ERROR_READUNDERFLOW);
         goto return_exception;
diff --git a/mozilla/js/src/xpconnect/src/XPCDispConvert.cpp b/mozilla/js/src/xpconnect/src/XPCDispConvert.cpp
index de90e2da867..ed94fdf9574 100644
--- a/mozilla/js/src/xpconnect/src/XPCDispConvert.cpp
+++ b/mozilla/js/src/xpconnect/src/XPCDispConvert.cpp
@@ -112,7 +112,7 @@ JSBool XPCDispConvert::JSArrayToCOMArray(XPCCallContext& ccx, JSObject *obj,
                         err = NS_ERROR_OUT_OF_MEMORY;
                         return JS_FALSE;
                     }
-                    if(FAILED(SafeArrayAccessData(array, NS_REINTERPRET_CAST(void**,&varArray))))
+                    if(FAILED(SafeArrayAccessData(array, reinterpret_cast<void**>(&varArray))))
                     {
                         err = NS_ERROR_FAILURE;
                         return JS_FALSE;
@@ -296,7 +296,7 @@ JSBool XPCDispConvert::JSToCOM(XPCCallContext& ccx,
             }
 
             CComBSTR val(JS_GetStringLength(str),
-                         NS_REINTERPRET_CAST(const WCHAR *, chars));
+                         reinterpret_cast<const WCHAR *>(chars));
             varDest->bstrVal = val.Detach();
         }
         break;
@@ -339,8 +339,8 @@ JSBool XPCDispConvert::JSToCOM(XPCCallContext& ccx,
             }
             varDest->vt = VT_DISPATCH;
             pUnknown->QueryInterface(IID_IDispatch, 
-                                     NS_REINTERPRET_CAST(void**,
-                                                         &varDest->pdispVal));
+                                     reinterpret_cast<void**>
+                                                     (&varDest->pdispVal));
             NS_IF_RELEASE(pUnknown);
         }
         break;
@@ -453,7 +453,7 @@ inline
 jsval StringToJSVal(JSContext* cx, const PRUnichar * str, PRUint32 len)
 {
     JSString * s = JS_NewUCStringCopyN(cx,
-                                       NS_REINTERPRET_CAST(const jschar *, str),
+                                       reinterpret_cast<const jschar *>(str),
                                        len);
     if(s)
         return STRING_TO_JSVAL(s);
@@ -561,8 +561,8 @@ JSBool XPCDispConvert::COMToJS(XPCCallContext& ccx, const VARIANT& src,
         {
             return JS_NewNumberValue(
                 ccx, 
-                NS_STATIC_CAST(double,
-                               isPtr ? src.pcyVal->int64 : 
+                static_cast<double>
+                           (isPtr ? src.pcyVal->int64 : 
                                        src.cyVal.int64) / 100.0,
                 &dest);
         }
@@ -574,8 +574,8 @@ JSBool XPCDispConvert::COMToJS(XPCCallContext& ccx, const VARIANT& src,
         default:
         {
             // Last ditch effort to convert to string
-            if(FAILED(VariantChangeType(NS_CONST_CAST(VARIANT*,&src), 
-                                         NS_CONST_CAST(VARIANT*,&src), 
+            if(FAILED(VariantChangeType(const_cast<VARIANT*>(&src), 
+                                         const_cast<VARIANT*>(&src), 
                                          VARIANT_ALPHABOOL, VT_BSTR)))
             {
                 err = NS_ERROR_XPC_BAD_CONVERT_JS;
diff --git a/mozilla/js/src/xpconnect/src/XPCDispInlines.h b/mozilla/js/src/xpconnect/src/XPCDispInlines.h
index 33b62c6f8f4..07efa451cfd 100644
--- a/mozilla/js/src/xpconnect/src/XPCDispInlines.h
+++ b/mozilla/js/src/xpconnect/src/XPCDispInlines.h
@@ -424,7 +424,7 @@ DISPID XPCDispNameArray::Find(const nsAString &target) const
     for(PRUint32 index = 0; index < mCount; ++index) 
     {
         if(mNames[index].Equals(target)) 
-            return NS_STATIC_CAST(DISPID, index + 1);
+            return static_cast<DISPID>(index + 1);
     }
     return 0; 
 }
@@ -443,8 +443,7 @@ jsval XPCDispIDArray::Item(JSContext* cx, PRUint32 index) const
 {
     jsval val;
     if(!JS_IdToValue(cx, 
-                     NS_REINTERPRET_CAST(jsid, 
-                                         mIDArray.ElementAt(index)), &val))
+                     reinterpret_cast<jsid>(mIDArray.ElementAt(index)), &val))
         return JSVAL_NULL;
     return val;
 }
@@ -467,7 +466,7 @@ JSBool XPCDispIDArray::IsMarked() const
 inline
 FUNCDESC* XPCDispTypeInfo::FuncDescArray::Get(PRUint32 index) 
 {
-    return NS_REINTERPRET_CAST(FUNCDESC*,mArray[index]);
+    return reinterpret_cast<FUNCDESC*>(mArray[index]);
 }
 
 inline
@@ -547,7 +546,7 @@ const nsAString & XPCDispJSPropertyInfo::GetName() const
 inline
 XPCDispJSPropertyInfo::property_type XPCDispJSPropertyInfo::PropertyType() const
 {
-    return NS_STATIC_CAST(property_type,mPropertyType & ~SETTER_MODE);
+    return static_cast<property_type>(mPropertyType & ~SETTER_MODE);
 }
 
 //=============================================================================
@@ -557,28 +556,28 @@ inline
 const nsIID & XPCDispIID2nsIID(const IID & iid)
 {
     NS_ASSERTION(sizeof(IID) == sizeof(nsIID), "IID is not the same size as nsIID");
-    return NS_REINTERPRET_CAST(const nsIID &,iid);
+    return reinterpret_cast<const nsIID &>(iid);
 }
 
 inline
 const IID & XPCDispIID2IID(const nsIID & iid)
 {
     NS_ASSERTION(sizeof(IID) == sizeof(nsIID), "IID is not the same size as nsIID");
-    return NS_REINTERPRET_CAST(const IID &, iid);
+    return reinterpret_cast<const IID &>(iid);
 }
 
 inline
 const nsCID & XPCDispCLSID2nsCID(const CLSID & clsid)
 {
     NS_ASSERTION(sizeof(CLSID) == sizeof(nsCID), "CLSID is not the same size as nsCID");
-    return NS_REINTERPRET_CAST(const nsCID &,clsid);
+    return reinterpret_cast<const nsCID &>(clsid);
 }
 
 inline
 const CLSID & XPCDispnsCID2CLSID(const nsCID & clsid)
 {
     NS_ASSERTION(sizeof(CLSID) == sizeof(nsCID), "CLSID is not the same size as nsCID");
-    return NS_REINTERPRET_CAST(const CLSID &, clsid);
+    return reinterpret_cast<const CLSID &>(clsid);
 }
 
 //=============================================================================
@@ -601,7 +600,7 @@ VARIANT & XPCDispParams::GetParamRef(PRUint32 index)
 inline
 _variant_t XPCDispParams::GetParam(PRUint32 index) const
 {
-    return NS_CONST_CAST(XPCDispParams*,this)->GetParamRef(index);
+    return const_cast<XPCDispParams*>(this)->GetParamRef(index);
 }
 
 inline
@@ -663,6 +662,6 @@ PRUnichar* xpc_JSString2PRUnichar(XPCCallContext& ccx, jsval val,
         return nsnull;
     if(length)
         *length = JS_GetStringLength(str);
-    return NS_REINTERPRET_CAST(PRUnichar*,JS_GetStringChars(str));
+    return reinterpret_cast<PRUnichar*>(JS_GetStringChars(str));
 }
 
diff --git a/mozilla/js/src/xpconnect/src/XPCDispInterface.cpp b/mozilla/js/src/xpconnect/src/XPCDispInterface.cpp
index c816b4e2855..da4847f09f6 100644
--- a/mozilla/js/src/xpconnect/src/XPCDispInterface.cpp
+++ b/mozilla/js/src/xpconnect/src/XPCDispInterface.cpp
@@ -112,7 +112,7 @@ PRUint32 XPCDispInterface::Allocator::Count() const
 XPCDispInterface*
 XPCDispInterface::NewInstance(JSContext* cx, nsISupports * pIface)
 {
-    CComQIPtr<IDispatch> pDispatch(NS_REINTERPRET_CAST(IUnknown*,pIface));
+    CComQIPtr<IDispatch> pDispatch(reinterpret_cast<IUnknown*>(pIface));
 
     if(pDispatch)
     {
@@ -181,7 +181,7 @@ PRBool InitializeMember(JSContext * cx, ITypeInfo * pTypeInfo,
     if(nameCount != 1)
         return PR_FALSE;
     JSString* str = JS_InternUCStringN(cx,
-                                       NS_REINTERPRET_CAST(const jschar *, name),
+                                       reinterpret_cast<const jschar *>(name),
                                        ::SysStringLen(name));
     ::SysFreeString(name);
     if(!str)
@@ -374,8 +374,8 @@ JSBool XPCDispInterface::Member::GetValue(XPCCallContext& ccx,
 
         {   // scoped lock
             XPCAutoLock lock(ccx.GetRuntime()->GetMapLock());
-            NS_CONST_CAST(Member*,this)->mVal = OBJECT_TO_JSVAL(funobj);
-            NS_CONST_CAST(Member*,this)->mType |= RESOLVED;
+            const_cast<Member*>(this)->mVal = OBJECT_TO_JSVAL(funobj);
+            const_cast<Member*>(this)->mType |= RESOLVED;
         }
     }
     *retval = mVal;
diff --git a/mozilla/js/src/xpconnect/src/XPCDispObject.cpp b/mozilla/js/src/xpconnect/src/XPCDispObject.cpp
index 603a195fd00..677cd6cdc5c 100644
--- a/mozilla/js/src/xpconnect/src/XPCDispObject.cpp
+++ b/mozilla/js/src/xpconnect/src/XPCDispObject.cpp
@@ -60,7 +60,7 @@ XPCDispObject::WrapIDispatch(IDispatch *pDispatch, XPCCallContext &ccx,
     // Wrap the desired COM object
     nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
     nsresult rv = ccx.GetXPConnect()->WrapNative(
-        ccx, obj, NS_REINTERPRET_CAST(nsISupports*, pDispatch), NSID_IDISPATCH,
+        ccx, obj, reinterpret_cast<nsISupports*>(pDispatch), NSID_IDISPATCH,
         getter_AddRefs(holder));
     if(NS_FAILED(rv) || !holder)
     {
@@ -274,7 +274,7 @@ JSBool XPCDispObject::Invoke(XPCCallContext & ccx, CallMode mode)
     }
 
     // TODO: Remove type cast and change GetIDispatchMember to use the correct type
-    XPCDispInterface::Member* member = NS_REINTERPRET_CAST(XPCDispInterface::Member*,ccx.GetIDispatchMember());
+    XPCDispInterface::Member* member = reinterpret_cast<XPCDispInterface::Member*>(ccx.GetIDispatchMember());
     XPCJSRuntime* rt = ccx.GetRuntime();
     XPCContext* xpcc = ccx.GetXPCContext();
     XPCPerThreadData* tls = ccx.GetThreadData();
@@ -322,8 +322,8 @@ JSBool XPCDispObject::Invoke(XPCCallContext & ccx, CallMode mode)
         return JS_FALSE;
     }
 
-    IDispatch * pObj = NS_REINTERPRET_CAST(IDispatch*,
-                                            ccx.GetTearOff()->GetNative());
+    IDispatch * pObj = reinterpret_cast<IDispatch*>
+                                       (ccx.GetTearOff()->GetNative());
     PRUint32 args = member->GetParamCount();
     uintN err;
     // Make sure setter has one argument
@@ -423,12 +423,12 @@ JSBool GetMember(XPCCallContext& ccx, JSObject* funobj, XPCNativeInterface*& ifa
         return JS_FALSE;
     if(!JSVAL_IS_INT(val))
         return JS_FALSE;
-    iface = NS_REINTERPRET_CAST(XPCNativeInterface*,JSVAL_TO_PRIVATE(val));
+    iface = reinterpret_cast<XPCNativeInterface*>(JSVAL_TO_PRIVATE(val));
     if(!JS_GetReservedSlot(ccx, funobj, 0, &val))
         return JS_FALSE;
     if(!JSVAL_IS_INT(val))
         return JS_FALSE;
-    member = NS_REINTERPRET_CAST(XPCDispInterface::Member*,JSVAL_TO_PRIVATE(val));
+    member = reinterpret_cast<XPCDispInterface::Member*>(JSVAL_TO_PRIVATE(val));
     return JS_TRUE;
 }
 
diff --git a/mozilla/js/src/xpconnect/src/XPCDispParamPropJSClass.cpp b/mozilla/js/src/xpconnect/src/XPCDispParamPropJSClass.cpp
index 9b3c38aca51..8f685e1ab72 100644
--- a/mozilla/js/src/xpconnect/src/XPCDispParamPropJSClass.cpp
+++ b/mozilla/js/src/xpconnect/src/XPCDispParamPropJSClass.cpp
@@ -52,8 +52,7 @@
 inline
 XPCDispParamPropJSClass* GetParamProp(JSContext* cx, JSObject* obj)
 {
-    return NS_REINTERPRET_CAST(XPCDispParamPropJSClass*, 
-                               JS_GetPrivate(cx, obj));
+    return reinterpret_cast<XPCDispParamPropJSClass*>(JS_GetPrivate(cx, obj));
 }
 
 /**
@@ -211,8 +210,8 @@ XPCDispParamPropJSClass::XPCDispParamPropJSClass(XPCWrappedNative* wrapper,
 {
     NS_ADDREF(mWrapper);
     dispObj->QueryInterface(NSID_IDISPATCH, 
-                                              NS_REINTERPRET_CAST(void**,
-                                              &mDispObj));
+                                              reinterpret_cast<void**>
+                                                              (&mDispObj));
 }
 
 XPCDispParamPropJSClass::~XPCDispParamPropJSClass()
diff --git a/mozilla/js/src/xpconnect/src/XPCDispPrivate.h b/mozilla/js/src/xpconnect/src/XPCDispPrivate.h
index ccfbfadfa04..47e4796788b 100644
--- a/mozilla/js/src/xpconnect/src/XPCDispPrivate.h
+++ b/mozilla/js/src/xpconnect/src/XPCDispPrivate.h
@@ -91,7 +91,7 @@ STDMETHODIMP _class::QueryInterface(REFIID aIID, void** aInstancePtr)         \
 
 #define NS_IMPL_COM_QUERY_BODY(_interface)                                    \
   if(IsEqualIID(aIID, __uuidof(_interface)) )                                 \
-    foundInterface = NS_STATIC_CAST(_interface*, this);                       \
+    foundInterface = static_cast<_interface*>(this);                       \
   else
 
 #define NS_IMPL_COM_QUERY_TAIL_GUTS                                           \
@@ -1228,7 +1228,7 @@ public:
      * Returns a DISPPARAMS structure pointer for the parameters
      * @return a DISPPARAMS structure pointer for the parameters
      */
-    DISPPARAMS* GetDispParams() const { return &NS_CONST_CAST(XPCDispParams*,this)->mDispParams; }
+    DISPPARAMS* GetDispParams() const { return &const_cast<XPCDispParams*>(this)->mDispParams; }
     /**
      * Returns the number of parameters
      * @return the number of parameters
diff --git a/mozilla/js/src/xpconnect/src/XPCDispTearOff.cpp b/mozilla/js/src/xpconnect/src/XPCDispTearOff.cpp
index 6b576b19614..19ed3051bac 100644
--- a/mozilla/js/src/xpconnect/src/XPCDispTearOff.cpp
+++ b/mozilla/js/src/xpconnect/src/XPCDispTearOff.cpp
@@ -172,14 +172,14 @@ STDMETHODIMP XPCDispatchTearOff::QueryInterface(const struct _GUID & guid,
 {
     if(IsEqualIID(guid, IID_IDispatch))
     {
-        *pPtr = NS_STATIC_CAST(IDispatch*,this);
+        *pPtr = static_cast<IDispatch*>(this);
         NS_ADDREF_THIS();
         return NS_OK;
     }
 
     if(IsEqualIID(guid, IID_ISupportErrorInfo))
     {
-        *pPtr = NS_STATIC_CAST(IDispatch*,this);
+        *pPtr = static_cast<IDispatch*>(this);
         NS_ADDREF_THIS();
         return NS_OK;
     }
diff --git a/mozilla/js/src/xpconnect/src/XPCDispTypeInfo.cpp b/mozilla/js/src/xpconnect/src/XPCDispTypeInfo.cpp
index e7762c5dbbb..ecd3689d0bc 100644
--- a/mozilla/js/src/xpconnect/src/XPCDispTypeInfo.cpp
+++ b/mozilla/js/src/xpconnect/src/XPCDispTypeInfo.cpp
@@ -119,7 +119,7 @@ XPCDispJSPropertyInfo::XPCDispJSPropertyInfo(JSContext* cx, PRUint32 memid,
     if(!chars)
         return;
 
-    mName = nsString(NS_REINTERPRET_CAST(const PRUnichar *, chars), len);
+    mName = nsString(reinterpret_cast<const PRUnichar *>(chars), len);
     JSBool found;
     uintN attr;
     // Get the property's attributes, and make sure it's found and enumerable 
@@ -213,7 +213,7 @@ XPCDispTypeInfo::FuncDescArray::~FuncDescArray()
     PRUint32 size = mArray.Count();
     for(PRUint32 index = 0; index < size; ++index)
     {
-        FUNCDESC* funcDesc = NS_REINTERPRET_CAST(FUNCDESC*,mArray.ElementAt(index));
+        FUNCDESC* funcDesc = reinterpret_cast<FUNCDESC*>(mArray.ElementAt(index));
         delete [] funcDesc->lprgelemdescParam;
         delete funcDesc;
     }
@@ -311,8 +311,8 @@ STDMETHODIMP XPCDispTypeInfo::GetIDsOfNames(
     // lookup each name
     for(UINT index = 0; index < cNames; ++index)
     {
-        nsDependentString buffer(NS_STATIC_CAST(const PRUnichar *,
-                                 rgszNames[index]),
+        nsDependentString buffer(static_cast<const PRUnichar *>
+                                            (rgszNames[index]),
                                  wcslen(rgszNames[index]));
         pMemId[index] = mNameArray.Find(buffer);
 
@@ -329,7 +329,7 @@ STDMETHODIMP XPCDispTypeInfo::Invoke(
         /* [out] */ EXCEPINFO __RPC_FAR *pExcepInfo,
         /* [out] */ UINT __RPC_FAR *puArgErr)
 {
-    CComQIPtr<IDispatch> pDisp(NS_REINTERPRET_CAST(IUnknown*,pvInstance));
+    CComQIPtr<IDispatch> pDisp(reinterpret_cast<IUnknown*>(pvInstance));
     if(pDisp)
     {
         return pDisp->Invoke(memid, IID_NULL, LOCALE_SYSTEM_DEFAULT, wFlags, 
@@ -438,8 +438,8 @@ XPCDispIDArray::XPCDispIDArray(XPCCallContext& ccx, JSIdArray* array) :
     // copy the JS ID Array to our internal array
     for(jsint index = 0; index < array->length; ++index)
     {
-        mIDArray.ReplaceElementAt(NS_REINTERPRET_CAST(void*,
-                                                      array->vector[index]), 
+        mIDArray.ReplaceElementAt(reinterpret_cast<void*>
+                                                  (array->vector[index]), 
                                   index);
     }   
 }
@@ -461,7 +461,7 @@ void XPCDispIDArray::TraceJS(JSTracer* trc)
     for(PRInt32 index = 0; index < count; ++index)
     {
         if(JS_IdToValue(trc->context,
-                        NS_REINTERPRET_CAST(jsid, mIDArray.ElementAt(index)),
+                        reinterpret_cast<jsid>(mIDArray.ElementAt(index)),
                         &val))
         {
             JS_CALL_VALUE_TRACER(trc, val, "disp_id_array_element");
diff --git a/mozilla/js/src/xpconnect/src/XPCIDispatchClassInfo.cpp b/mozilla/js/src/xpconnect/src/XPCIDispatchClassInfo.cpp
index 0654c1784dc..4b6bf0d9e14 100644
--- a/mozilla/js/src/xpconnect/src/XPCIDispatchClassInfo.cpp
+++ b/mozilla/js/src/xpconnect/src/XPCIDispatchClassInfo.cpp
@@ -65,10 +65,10 @@ NS_IMETHODIMP
 XPCIDispatchClassInfo::GetInterfaces(PRUint32 *count, nsIID * **array)
 {
     *count = 0;
-    *array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(sizeof(nsIID*)));
+    *array = static_cast<nsIID**>(nsMemory::Alloc(sizeof(nsIID*)));
     NS_ENSURE_TRUE(*array, NS_ERROR_OUT_OF_MEMORY);
 
-    **array = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NSID_IDISPATCH,
+    **array = static_cast<nsIID *>(nsMemory::Clone(&NSID_IDISPATCH,
                                                       sizeof(NSID_IDISPATCH)));
     if(!**array)
     {
diff --git a/mozilla/js/src/xpconnect/src/XPCIDispatchExtension.cpp b/mozilla/js/src/xpconnect/src/XPCIDispatchExtension.cpp
index ab516b118e9..41b3e554dc2 100644
--- a/mozilla/js/src/xpconnect/src/XPCIDispatchExtension.cpp
+++ b/mozilla/js/src/xpconnect/src/XPCIDispatchExtension.cpp
@@ -91,7 +91,7 @@ CommonConstructor(JSContext *cx, int name, JSObject *obj, uintN argc,
     }
 
     jschar * className = JS_GetStringChars(str);
-    CComBSTR bstrClassName(len, NS_REINTERPRET_CAST(const WCHAR *, className));
+    CComBSTR bstrClassName(len, reinterpret_cast<const WCHAR *>(className));
     if(!bstrClassName)
     {
         XPCThrower::Throw(NS_ERROR_XPC_COM_INVALID_CLASS_ID, ccx);
@@ -109,7 +109,7 @@ CommonConstructor(JSContext *cx, int name, JSObject *obj, uintN argc,
     // Get a wrapper for our object
     nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
     nsresult nsrv = ccx.GetXPConnect()->WrapNative(
-        ccx, ccx.GetOperandJSObject(), NS_REINTERPRET_CAST(nsISupports*, pDispatch.p),
+        ccx, ccx.GetOperandJSObject(), reinterpret_cast<nsISupports*>(pDispatch.p),
         NSID_IDISPATCH, getter_AddRefs(holder));
     if(NS_FAILED(nsrv))
     {
@@ -169,7 +169,7 @@ ActiveXSupports(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
     }
     PRUint32 len;
     jschar * className = xpc_JSString2String(ccx, argv[0], &len);
-    CComBSTR bstrClassName(len, NS_REINTERPRET_CAST(const WCHAR *, className));
+    CComBSTR bstrClassName(len, reinterpret_cast<const WCHAR *>(className));
     if(!className)
     {
         XPCThrower::Throw(NS_ERROR_XPC_COM_INVALID_CLASS_ID, ccx);
diff --git a/mozilla/js/src/xpconnect/src/XPCNativeWrapper.cpp b/mozilla/js/src/xpconnect/src/XPCNativeWrapper.cpp
index 8ebf8e566ef..c143c909a11 100644
--- a/mozilla/js/src/xpconnect/src/XPCNativeWrapper.cpp
+++ b/mozilla/js/src/xpconnect/src/XPCNativeWrapper.cpp
@@ -714,8 +714,8 @@ JSBool MaybePreserveWrapper(JSContext* cx, XPCWrappedNative *wn, uintN flags)
   if ((flags & JSRESOLVE_ASSIGNING) &&
       (::JS_GetOptions(cx) & JSOPTION_PRIVATE_IS_NSISUPPORTS)) {
     nsCOMPtr<nsIXPCScriptNotify> scriptNotify = 
-      do_QueryInterface(NS_STATIC_CAST(nsISupports*,
-                                       JS_GetContextPrivate(cx)));
+      do_QueryInterface(static_cast<nsISupports*>
+                                   (JS_GetContextPrivate(cx)));
     if (scriptNotify) {
       return NS_SUCCEEDED(scriptNotify->PreserveWrapper(wn));
     }
@@ -1340,8 +1340,8 @@ XPC_NW_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
     // toString() called on XPCNativeWrapper.prototype
     NS_NAMED_LITERAL_STRING(protoString, "[object XPCNativeWrapper]");
     JSString *str =
-      ::JS_NewUCStringCopyN(cx, NS_REINTERPRET_CAST(const jschar*,
-                                                    protoString.get()),
+      ::JS_NewUCStringCopyN(cx, reinterpret_cast<const jschar*>
+                                                (protoString.get()),
                             protoString.Length());
     NS_ENSURE_TRUE(str, JS_FALSE);
     *rval = STRING_TO_JSVAL(str);
@@ -1415,8 +1415,8 @@ XPC_NW_toString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
 
     resultString.Append(']');
 
-    str = ::JS_NewUCStringCopyN(cx, NS_REINTERPRET_CAST(const jschar *,
-                                                        resultString.get()),
+    str = ::JS_NewUCStringCopyN(cx, reinterpret_cast<const jschar *>
+                                                    (resultString.get()),
                                 resultString.Length());
   }
 
diff --git a/mozilla/js/src/xpconnect/src/nsXPConnect.cpp b/mozilla/js/src/xpconnect/src/nsXPConnect.cpp
index 54ad5518638..93e657b5506 100644
--- a/mozilla/js/src/xpconnect/src/nsXPConnect.cpp
+++ b/mozilla/js/src/xpconnect/src/nsXPConnect.cpp
@@ -332,7 +332,7 @@ nsXPConnect::ReleaseXPConnectSingleton()
                 if(dumpFile)
                 {
                     JS_DumpHeap(ccx, dumpFile, nsnull, 0, nsnull,
-                                NS_STATIC_CAST(size_t, -1), nsnull);
+                                static_cast<size_t>(-1), nsnull);
                     if(dumpFile != stdout)
                         fclose(dumpFile);
                 }
@@ -531,7 +531,7 @@ void XPCMarkNotification(void *thing, uint8 flags, void *closure)
        ty != GCX_XML)
         return;
 
-    JSObjectRefcounts* jsr = NS_STATIC_CAST(JSObjectRefcounts*, closure);
+    JSObjectRefcounts* jsr = static_cast<JSObjectRefcounts*>(closure);
     // We're marking after a mark phase ended, so the GC restarted itself and
     // we want to clear the refcounts first.
     if(jsr->mMarkEnded)
@@ -608,7 +608,7 @@ nsXPConnect::Unlink(void *p)
         return NS_ERROR_FAILURE;
     uint8 ty = *js_GetGCThingFlags(p) & GCF_TYPEMASK;
     if(ty == GCX_OBJECT)
-        JS_ClearScope(*mCycleCollectionContext, NS_STATIC_CAST(JSObject*, p));
+        JS_ClearScope(*mCycleCollectionContext, static_cast<JSObject*>(p));
     return NS_OK;
 }
 
@@ -643,7 +643,7 @@ NoteJSChild(JSTracer *trc, void *thing, uint32 kind)
     if(kind == JSTRACE_OBJECT || kind == JSTRACE_NAMESPACE ||
        kind == JSTRACE_QNAME || kind == JSTRACE_XML)
     {
-        ContextCallbackItem *item = NS_STATIC_CAST(ContextCallbackItem*, trc);
+        ContextCallbackItem *item = static_cast<ContextCallbackItem*>(trc);
         item->cb->NoteScriptChild(nsIProgrammingLanguage::JAVASCRIPT, thing);
     }
 }
@@ -679,7 +679,7 @@ nsXPConnect::Traverse(void *p, nsCycleCollectionTraversalCallback &cb)
 #ifdef DEBUG_CC
     if(ty == GCX_OBJECT)
     {
-        JSObject *obj = NS_STATIC_CAST(JSObject*, p);
+        JSObject *obj = static_cast<JSObject*>(p);
         JSClass *clazz = OBJ_GET_CLASS(cx, obj);
         char name[72];
         if(XPCNativeWrapper::IsNativeWrapperClass(clazz))
@@ -790,7 +790,7 @@ nsXPConnect::Traverse(void *p, nsCycleCollectionTraversalCallback &cb)
     if(ty != GCX_OBJECT)
         return NS_OK;
     
-    JSObject *obj = NS_STATIC_CAST(JSObject*, p);
+    JSObject *obj = static_cast<JSObject*>(p);
     JSClass* clazz = OBJ_GET_CLASS(cx, obj);
 
     if(clazz == &XPC_WN_Tearoff_JSClass)
@@ -810,7 +810,7 @@ nsXPConnect::Traverse(void *p, nsCycleCollectionTraversalCallback &cb)
             clazz->flags & JSCLASS_PRIVATE_IS_NSISUPPORTS &&
             !XPCNativeWrapper::IsNativeWrapperClass(clazz))
     {
-        cb.NoteXPCOMChild(NS_STATIC_CAST(nsISupports*, JS_GetPrivate(cx, obj)));
+        cb.NoteXPCOMChild(static_cast<nsISupports*>(JS_GetPrivate(cx, obj)));
     }
 
 #ifndef XPCONNECT_STANDALONE
@@ -978,7 +978,7 @@ nsXPConnect::InitClassesWithNewWrappedGlobal(JSContext * aJSContext,
         return UnexpectedFailure(NS_ERROR_FAILURE);
 
     XPCWrappedNative* wrapper =
-        NS_REINTERPRET_CAST(XPCWrappedNative*, holder.get());
+        reinterpret_cast<XPCWrappedNative*>(holder.get());
     XPCWrappedNativeScope* scope = wrapper->GetScope();
 
     if(!scope)
@@ -1160,7 +1160,7 @@ nsXPConnect::GetWrappedNativeOfNativeObject(JSContext * aJSContext,
                                                 &wrapper);
     if(NS_FAILED(rv))
         return NS_ERROR_FAILURE;
-    *_retval = NS_STATIC_CAST(nsIXPConnectWrappedNative*, wrapper);
+    *_retval = static_cast<nsIXPConnectWrappedNative*>(wrapper);
     return NS_OK;
 }
 
@@ -1196,7 +1196,7 @@ MoveableWrapperFinder(JSDHashTable *table, JSDHashEntryHdr *hdr,
                       uint32 number, void *arg)
 {
     // Every element counts.
-    nsVoidArray *va = NS_STATIC_CAST(nsVoidArray *,arg);
+    nsVoidArray *va = static_cast<nsVoidArray *>(arg);
     va->AppendElement(((Native2WrappedNativeMap::Entry*)hdr)->value);
     return JS_DHASH_NEXT;
 }
@@ -1238,7 +1238,7 @@ nsXPConnect::ReparentScopeAwareWrappers(JSContext *aJSContext,
             // reparented.
 
             XPCWrappedNative *wrapper =
-                NS_STATIC_CAST(XPCWrappedNative *, wrappersToMove[i]);
+                static_cast<XPCWrappedNative *>(wrappersToMove[i]);
             nsISupports *identity = wrapper->GetIdentityObject();
             nsCOMPtr<nsIClassInfo> info(do_QueryInterface(identity));
 
diff --git a/mozilla/js/src/xpconnect/src/xpccallcontext.cpp b/mozilla/js/src/xpconnect/src/xpccallcontext.cpp
index e2cfa0dc297..e348f295d0d 100644
--- a/mozilla/js/src/xpconnect/src/xpccallcontext.cpp
+++ b/mozilla/js/src/xpconnect/src/xpccallcontext.cpp
@@ -494,7 +494,7 @@ XPCCallContext::SetIDispatchInfo(XPCNativeInterface* iface,
     mInterface = iface;
     mMember = nsnull;
     mIDispatchMember = member;
-    mName = NS_REINTERPRET_CAST(XPCDispInterface::Member*,member)->GetName();
+    mName = reinterpret_cast<XPCDispInterface::Member*>(member)->GetName();
 
     if(mState < HAVE_NAME)
         mState = HAVE_NAME;
diff --git a/mozilla/js/src/xpconnect/src/xpccomponents.cpp b/mozilla/js/src/xpconnect/src/xpccomponents.cpp
index 71f8f7796e1..2ca59438855 100644
--- a/mozilla/js/src/xpconnect/src/xpccomponents.cpp
+++ b/mozilla/js/src/xpconnect/src/xpccomponents.cpp
@@ -115,14 +115,14 @@ nsXPCComponents_Interfaces::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
 #endif
     *aCount = count;
     nsIID **array;
-    *aArray = array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(count * sizeof(nsIID*)));
+    *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
     if(!array)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32 index = 0;
     nsIID* clone;
 #define PUSH_IID(id) \
-    clone = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NS_GET_IID( id ), \
+    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ), \
                                                     sizeof(nsIID)));  \
     if (!clone)                                                       \
         goto oom;                                                     \
@@ -344,7 +344,7 @@ nsXPCComponents_Interfaces::NewResolve(nsIXPConnectWrappedNative *wrapper,
             return NS_OK;
 
         nsCOMPtr<nsIJSIID> nsid =
-            dont_AddRef(NS_STATIC_CAST(nsIJSIID*, nsJSIID::NewID(info)));
+            dont_AddRef(static_cast<nsIJSIID*>(nsJSIID::NewID(info)));
 
         if(nsid)
         {
@@ -354,7 +354,7 @@ nsXPCComponents_Interfaces::NewResolve(nsIXPConnectWrappedNative *wrapper,
             {
                 nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
                 if(NS_SUCCEEDED(xpc->WrapNative(cx, obj,
-                                                NS_STATIC_CAST(nsIJSIID*,nsid),
+                                                static_cast<nsIJSIID*>(nsid),
                                                 NS_GET_IID(nsIJSIID),
                                                 getter_AddRefs(holder))))
                 {
@@ -460,14 +460,14 @@ nsXPCComponents_InterfacesByID::GetInterfaces(PRUint32 *aCount, nsIID * **aArray
 #endif
     *aCount = count;
     nsIID **array;
-    *aArray = array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(count * sizeof(nsIID*)));
+    *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
     if(!array)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32 index = 0;
     nsIID* clone;
 #define PUSH_IID(id) \
-    clone = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NS_GET_IID( id ), \
+    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ), \
                                                     sizeof(nsIID)));  \
     if (!clone)                                                       \
         goto oom;                                                     \
@@ -675,8 +675,8 @@ nsXPCComponents_InterfacesByID::NewResolve(nsIXPConnectWrappedNative *wrapper,
        nsnull != (name = JS_GetStringChars(JSVAL_TO_STRING(id))))
     {
         nsID iid;
-        if (!iid.Parse(NS_ConvertUTF16toUTF8(NS_REINTERPRET_CAST(const PRUnichar*,
-name)).get()))
+        if (!iid.Parse(NS_ConvertUTF16toUTF8(reinterpret_cast<const PRUnichar*>
+                                                             (name)).get()))
             return NS_OK;
 
         nsCOMPtr<nsIInterfaceInfo> info;
@@ -685,7 +685,7 @@ name)).get()))
             return NS_OK;
 
         nsCOMPtr<nsIJSIID> nsid =
-            dont_AddRef(NS_STATIC_CAST(nsIJSIID*, nsJSIID::NewID(info)));
+            dont_AddRef(static_cast<nsIJSIID*>(nsJSIID::NewID(info)));
 
         if (!nsid)
             return NS_ERROR_OUT_OF_MEMORY;
@@ -696,7 +696,7 @@ name)).get()))
         {
             nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
             if(NS_SUCCEEDED(xpc->WrapNative(cx, obj,
-                                            NS_STATIC_CAST(nsIJSIID*,nsid),
+                                            static_cast<nsIJSIID*>(nsid),
                                             NS_GET_IID(nsIJSIID),
                                             getter_AddRefs(holder))))
             {
@@ -791,14 +791,14 @@ nsXPCComponents_Classes::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
     PRUint32 count = 2;
     *aCount = count;
     nsIID **array;
-    *aArray = array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(count * sizeof(nsIID*)));
+    *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
     if(!array)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32 index = 0;
     nsIID* clone;
 #define PUSH_IID(id) \
-    clone = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NS_GET_IID( id ), \
+    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ), \
                                                     sizeof(nsIID)));  \
     if (!clone)                                                       \
         goto oom;                                                     \
@@ -981,7 +981,7 @@ nsXPCComponents_Classes::NewResolve(nsIXPConnectWrappedNative *wrapper,
        name[0] != '{') // we only allow contractids here
     {
         nsCOMPtr<nsIJSCID> nsid =
-            dont_AddRef(NS_STATIC_CAST(nsIJSCID*,nsJSCID::NewID(name)));
+            dont_AddRef(static_cast<nsIJSCID*>(nsJSCID::NewID(name)));
         if(nsid)
         {
             nsCOMPtr<nsIXPConnect> xpc;
@@ -990,7 +990,7 @@ nsXPCComponents_Classes::NewResolve(nsIXPConnectWrappedNative *wrapper,
             {
                 nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
                 if(NS_SUCCEEDED(xpc->WrapNative(cx, obj,
-                                                NS_STATIC_CAST(nsIJSCID*,nsid),
+                                                static_cast<nsIJSCID*>(nsid),
                                                 NS_GET_IID(nsIJSCID),
                                                 getter_AddRefs(holder))))
                 {
@@ -1046,14 +1046,14 @@ nsXPCComponents_ClassesByID::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
     PRUint32 count = 2;
     *aCount = count;
     nsIID **array;
-    *aArray = array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(count * sizeof(nsIID*)));
+    *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
     if(!array)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32 index = 0;
     nsIID* clone;
 #define PUSH_IID(id) \
-    clone = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NS_GET_IID( id ), \
+    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ), \
                                                     sizeof(nsIID)));  \
     if (!clone)                                                       \
         goto oom;                                                     \
@@ -1253,7 +1253,7 @@ nsXPCComponents_ClassesByID::NewResolve(nsIXPConnectWrappedNative *wrapper,
        IsRegisteredCLSID(name)) // we only allow canonical CLSIDs here
     {
         nsCOMPtr<nsIJSCID> nsid =
-            dont_AddRef(NS_STATIC_CAST(nsIJSCID*,nsJSCID::NewID(name)));
+            dont_AddRef(static_cast<nsIJSCID*>(nsJSCID::NewID(name)));
         if(nsid)
         {
             nsCOMPtr<nsIXPConnect> xpc;
@@ -1262,7 +1262,7 @@ nsXPCComponents_ClassesByID::NewResolve(nsIXPConnectWrappedNative *wrapper,
             {
                 nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
                 if(NS_SUCCEEDED(xpc->WrapNative(cx, obj,
-                                                NS_STATIC_CAST(nsIJSCID*,nsid),
+                                                static_cast<nsIJSCID*>(nsid),
                                                 NS_GET_IID(nsIJSCID),
                                                 getter_AddRefs(holder))))
                 {
@@ -1320,14 +1320,14 @@ nsXPCComponents_Results::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
     PRUint32 count = 2;
     *aCount = count;
     nsIID **array;
-    *aArray = array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(count * sizeof(nsIID*)));
+    *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
     if(!array)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32 index = 0;
     nsIID* clone;
 #define PUSH_IID(id) \
-    clone = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NS_GET_IID( id ), \
+    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ), \
                                                     sizeof(nsIID)));  \
     if (!clone)                                                       \
         goto oom;                                                     \
@@ -1552,14 +1552,14 @@ nsXPCComponents_ID::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
     PRUint32 count = 2;
     *aCount = count;
     nsIID **array;
-    *aArray = array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(count * sizeof(nsIID*)));
+    *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
     if(!array)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32 index = 0;
     nsIID* clone;
 #define PUSH_IID(id) \
-    clone = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NS_GET_IID( id ), \
+    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ), \
                                                     sizeof(nsIID)));  \
     if (!clone)                                                       \
         goto oom;                                                     \
@@ -1779,14 +1779,14 @@ nsXPCComponents_Exception::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
     PRUint32 count = 2;
     *aCount = count;
     nsIID **array;
-    *aArray = array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(count * sizeof(nsIID*)));
+    *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
     if(!array)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32 index = 0;
     nsIID* clone;
 #define PUSH_IID(id) \
-    clone = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NS_GET_IID( id ), \
+    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ), \
                                                     sizeof(nsIID)));  \
     if (!clone)                                                       \
         goto oom;                                                     \
@@ -2072,14 +2072,14 @@ nsXPCConstructor::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
     PRUint32 count = 2;
     *aCount = count;
     nsIID **array;
-    *aArray = array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(count * sizeof(nsIID*)));
+    *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
     if(!array)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32 index = 0;
     nsIID* clone;
 #define PUSH_IID(id) \
-    clone = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NS_GET_IID( id ), \
+    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ), \
                                                     sizeof(nsIID)));  \
     if (!clone)                                                       \
         goto oom;                                                     \
@@ -2337,14 +2337,14 @@ nsXPCComponents_Constructor::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
     PRUint32 count = 2;
     *aCount = count;
     nsIID **array;
-    *aArray = array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(count * sizeof(nsIID*)));
+    *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
     if(!array)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32 index = 0;
     nsIID* clone;
 #define PUSH_IID(id) \
-    clone = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NS_GET_IID( id ), \
+    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ), \
                                                     sizeof(nsIID)));  \
     if (!clone)                                                       \
         goto oom;                                                     \
@@ -2565,7 +2565,7 @@ nsXPCComponents_Constructor::CallOrConstruct(nsIXPConnectWrappedNative *wrapper,
         {
             cInterfaceID =
                 dont_AddRef(
-                    NS_STATIC_CAST(nsIJSIID*, nsJSIID::NewID(info)));
+                    static_cast<nsIJSIID*>(nsJSIID::NewID(info)));
         }
         if(!cInterfaceID)
             return ThrowAndFail(NS_ERROR_XPC_UNEXPECTED, cx, _retval);
@@ -2614,8 +2614,8 @@ nsXPCComponents_Constructor::CallOrConstruct(nsIXPConnectWrappedNative *wrapper,
     }
 
     nsCOMPtr<nsIXPCConstructor> ctor =
-        NS_STATIC_CAST(nsIXPCConstructor*,
-            new nsXPCConstructor(cClassID, cInterfaceID, cInitializer));
+        static_cast<nsIXPCConstructor*>
+                   (new nsXPCConstructor(cClassID, cInterfaceID, cInitializer));
     if(!ctor)
         return ThrowAndFail(NS_ERROR_XPC_UNEXPECTED, cx, _retval);
 
@@ -2750,8 +2750,8 @@ nsXPCComponents_Utils::LookupMethod()
     nsCOMPtr<nsISupports> callee;
     cc->GetCallee(getter_AddRefs(callee));
     if(!callee || callee.get() !=
-                  NS_STATIC_CAST(const nsISupports*,
-                                 NS_STATIC_CAST(const nsIXPCComponents_Utils*,this)))
+                  static_cast<const nsISupports*>
+                             (static_cast<const nsIXPCComponents_Utils*>(this)))
         return NS_ERROR_FAILURE;
 #endif
 
@@ -2876,8 +2876,8 @@ nsXPCComponents_Utils::ReportError()
     nsCOMPtr<nsISupports> callee;
     cc->GetCallee(getter_AddRefs(callee));
     if(!callee || callee.get() !=
-                  NS_STATIC_CAST(const nsISupports*,
-                                 NS_STATIC_CAST(const nsIXPCComponents_Utils*,this))) {
+                  static_cast<const nsISupports*>
+                             (static_cast<const nsIXPCComponents_Utils*>(this))) {
         NS_ERROR("reportError() must only be called from JS!");
         return NS_ERROR_FAILURE;
     }
@@ -2912,11 +2912,11 @@ nsXPCComponents_Utils::ReportError()
 
         PRUint32 column = err->uctokenptr - err->uclinebuf;
 
-        rv = scripterr->Init(NS_REINTERPRET_CAST(const PRUnichar*,
-                                                 err->ucmessage),
+        rv = scripterr->Init(reinterpret_cast<const PRUnichar*>
+                                             (err->ucmessage),
                              fileUni.get(),
-                             NS_REINTERPRET_CAST(const PRUnichar*,
-                                                 err->uclinebuf),
+                             reinterpret_cast<const PRUnichar*>
+                                             (err->uclinebuf),
                              err->lineno,
                              column,
                              err->flags,
@@ -2948,8 +2948,8 @@ nsXPCComponents_Utils::ReportError()
             frame->GetLineNumber(&lineNo);
         }
 
-        rv = scripterr->Init(NS_REINTERPRET_CAST(const PRUnichar*,
-                                                 JS_GetStringChars(msgstr)),
+        rv = scripterr->Init(reinterpret_cast<const PRUnichar*>
+                                             (JS_GetStringChars(msgstr)),
                              NS_ConvertUTF8toUTF16(fileName).get(),
                              nsnull,
                              lineNo, 0,
@@ -3280,8 +3280,8 @@ nsXPCComponents_utils_Sandbox::CallOrConstruct(nsIXPConnectWrappedNative *wrappe
     nsISupports *prinOrSop = nsnull;
     if (JSVAL_IS_STRING(argv[0])) {
         JSString *codebasestr = JSVAL_TO_STRING(argv[0]);
-        nsAutoString codebase(NS_REINTERPRET_CAST(PRUnichar*,
-                                                  JS_GetStringChars(codebasestr)),
+        nsAutoString codebase(reinterpret_cast<PRUnichar*>
+                                              (JS_GetStringChars(codebasestr)),
                               JS_GetStringLength(codebasestr));
         nsCOMPtr<nsIURI> uri;
         rv = NS_NewURI(getter_AddRefs(uri), codebase);
@@ -3386,7 +3386,7 @@ JSBool JS_DLL_CALLBACK
 ContextHolder::ContextHolderBranchCallback(JSContext *cx, JSScript *script)
 {
     ContextHolder* thisObject =
-        NS_STATIC_CAST(ContextHolder*, JS_GetContextPrivate(cx));
+        static_cast<ContextHolder*>(JS_GetContextPrivate(cx));
     NS_ASSERTION(thisObject, "How did that happen?");
 
     if (thisObject->mOrigBranchCallback) {
@@ -3523,8 +3523,8 @@ xpc_EvalInSandbox(JSContext *cx, JSObject *sandbox, const nsAString& source,
     AutoJSRequestWithNoCallContext req(sandcx->GetJSContext());
     if (!JS_EvaluateUCScriptForPrincipals(sandcx->GetJSContext(), sandbox,
                                           jsPrincipals,
-                                          NS_REINTERPRET_CAST(const jschar *,
-                                              PromiseFlatString(source).get()),
+                                          reinterpret_cast<const jschar *>
+                                                          (PromiseFlatString(source).get()),
                                           source.Length(), filename, lineNo,
                                           rval)) {
         jsval exn;
@@ -3671,14 +3671,14 @@ nsXPCComponents::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
 #endif
     *aCount = count;
     nsIID **array;
-    *aArray = array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(count * sizeof(nsIID*)));
+    *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
     if(!array)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32 index = 0;
     nsIID* clone;
 #define PUSH_IID(id) \
-    clone = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NS_GET_IID( id ), \
+    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ), \
                                                     sizeof(nsIID)));  \
     if (!clone)                                                       \
         goto oom;                                                     \
diff --git a/mozilla/js/src/xpconnect/src/xpcconvert.cpp b/mozilla/js/src/xpconnect/src/xpcconvert.cpp
index 0e440935329..37893ebf6c6 100644
--- a/mozilla/js/src/xpconnect/src/xpcconvert.cpp
+++ b/mozilla/js/src/xpconnect/src/xpcconvert.cpp
@@ -983,7 +983,7 @@ XPCConvert::JSData2Native(XPCCallContext& ccx, void* d, jsval s,
                 XPCVariant* variant = XPCVariant::newVariant(ccx, s);
                 if(!variant)
                     return JS_FALSE;
-                *((nsISupports**)d) = NS_STATIC_CAST(nsIVariant*, variant);
+                *((nsISupports**)d) = static_cast<nsIVariant*>(variant);
                 return JS_TRUE;
             }
             else if(iid->Equals(NS_GET_IID(nsIAtom)) &&
@@ -992,7 +992,7 @@ XPCConvert::JSData2Native(XPCCallContext& ccx, void* d, jsval s,
                 // We're trying to pass a string as an nsIAtom.  Let's atomize!
                 JSString* str = JSVAL_TO_STRING(s);
                 PRUnichar* chars =
-                    NS_REINTERPRET_CAST(PRUnichar*, JS_GetStringChars(str));
+                    reinterpret_cast<PRUnichar*>(JS_GetStringChars(str));
                 if (!chars) {
                     if (pErr)
                         *pErr = NS_ERROR_XPC_BAD_CONVERT_JS_NULL_REF;
@@ -1191,7 +1191,7 @@ XPCConvert::NativeInterface2JSObject(XPCCallContext& ccx,
                 }
             }
 
-            *dest = NS_STATIC_CAST(nsIXPConnectJSObjectHolder*, wrapper);
+            *dest = static_cast<nsIXPConnectJSObjectHolder*>(wrapper);
             return JS_TRUE;
         }
         
@@ -1407,8 +1407,8 @@ XPCConvert::JSValToXPCException(XPCCallContext& ccx,
                                                 nsnull, &jswrapper);
                     if(NS_FAILED(rv))
                         return rv;
-                    *exceptn = NS_REINTERPRET_CAST(nsIException*,
-                                                   jswrapper);
+                    *exceptn = reinterpret_cast<nsIException*>
+                                               (jswrapper);
                     return NS_OK;
                 }
             }
diff --git a/mozilla/js/src/xpconnect/src/xpcexception.cpp b/mozilla/js/src/xpconnect/src/xpcexception.cpp
index 326d975599b..dab5b42639c 100644
--- a/mozilla/js/src/xpconnect/src/xpcexception.cpp
+++ b/mozilla/js/src/xpconnect/src/xpcexception.cpp
@@ -478,6 +478,6 @@ nsXPCException::NewException(const char *aMessage,
     if(!e)
         return NS_ERROR_FAILURE;
 
-    *exceptn = NS_STATIC_CAST(nsIXPCException*, e);
+    *exceptn = static_cast<nsIXPCException*>(e);
     return NS_OK;
 }
diff --git a/mozilla/js/src/xpconnect/src/xpcinlines.h b/mozilla/js/src/xpconnect/src/xpcinlines.h
index d220156fbd4..6a6a7cf71e3 100644
--- a/mozilla/js/src/xpconnect/src/xpcinlines.h
+++ b/mozilla/js/src/xpconnect/src/xpcinlines.h
@@ -395,7 +395,7 @@ XPCNativeInterface::FindMember(jsval name) const
     const XPCNativeMember* member = mMembers;
     for(int i = (int) mMemberCount; i > 0; i--, member++)
         if(member->GetName() == name)
-            return NS_CONST_CAST(XPCNativeMember*, member);
+            return const_cast<XPCNativeMember*>(member);
     return nsnull;
 }
 
@@ -644,8 +644,8 @@ XPCWrappedNativeTearOff::GetIDispatchInfo() const
 {
     NS_ASSERTION((jsword)mJSObject & 2, "XPCWrappedNativeTearOff::GetIDispatchInfo "
                                 "called on a non IDispatch interface");
-    return NS_REINTERPRET_CAST(XPCDispInterface*,
-                               (((jsword)mJSObject) & ~JSOBJECT_MASK));
+    return reinterpret_cast<XPCDispInterface*>
+                           ((((jsword)mJSObject) & ~JSOBJECT_MASK));
 }
 
 inline JSBool
diff --git a/mozilla/js/src/xpconnect/src/xpcjsid.cpp b/mozilla/js/src/xpconnect/src/xpcjsid.cpp
index 4a274bae6cf..ee0d80b3b42 100644
--- a/mozilla/js/src/xpconnect/src/xpcjsid.cpp
+++ b/mozilla/js/src/xpconnect/src/xpcjsid.cpp
@@ -980,7 +980,7 @@ xpc_NewIDObject(JSContext *cx, JSObject* jsobj, const nsID& aID)
     if(idString)
     {
         nsCOMPtr<nsIJSID> iid =
-            dont_AddRef(NS_STATIC_CAST(nsIJSID*, nsJSID::NewID(idString)));
+            dont_AddRef(static_cast<nsIJSID*>(nsJSID::NewID(idString)));
         PR_Free(idString);
         if(iid)
         {
@@ -989,7 +989,7 @@ xpc_NewIDObject(JSContext *cx, JSObject* jsobj, const nsID& aID)
             {
                 nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
                 nsresult rv = xpc->WrapNative(cx, jsobj,
-                                              NS_STATIC_CAST(nsISupports*,iid),
+                                              static_cast<nsISupports*>(iid),
                                               NS_GET_IID(nsIJSID),
                                               getter_AddRefs(holder));
                 if(NS_SUCCEEDED(rv) && holder)
diff --git a/mozilla/js/src/xpconnect/src/xpcjsruntime.cpp b/mozilla/js/src/xpconnect/src/xpcjsruntime.cpp
index bc0e7158ff5..8e2ae32825b 100644
--- a/mozilla/js/src/xpconnect/src/xpcjsruntime.cpp
+++ b/mozilla/js/src/xpconnect/src/xpcjsruntime.cpp
@@ -278,13 +278,13 @@ void XPCJSRuntime::TraceJS(JSTracer* trc, void* data)
     XPCWrappedNativeScope::TraceJS(trc, self);
 
     for (XPCRootSetElem *e = self->mVariantRoots; e ; e = e->GetNextRoot())
-        NS_STATIC_CAST(XPCTraceableVariant*, e)->TraceJS(trc);
+        static_cast<XPCTraceableVariant*>(e)->TraceJS(trc);
 
     for (XPCRootSetElem *e = self->mWrappedJSRoots; e ; e = e->GetNextRoot())
-        NS_STATIC_CAST(nsXPCWrappedJS*, e)->TraceJS(trc);
+        static_cast<nsXPCWrappedJS*>(e)->TraceJS(trc);
 
     for (XPCRootSetElem *e = self->mObjectHolderRoots; e ; e = e->GetNextRoot())
-        NS_STATIC_CAST(XPCJSObjectHolder*, e)->TraceJS(trc);
+        static_cast<XPCJSObjectHolder*>(e)->TraceJS(trc);
 }
 
 // static
@@ -371,8 +371,8 @@ JSBool XPCJSRuntime::GCCallback(JSContext *cx, JSGCStatus status)
                             dyingWrappedJSArray->Compact();
                             break;
                         }
-                        wrapper = NS_STATIC_CAST(nsXPCWrappedJS*,
-                                    dyingWrappedJSArray->ElementAt(count-1));
+                        wrapper = static_cast<nsXPCWrappedJS*>
+                                             (dyingWrappedJSArray->ElementAt(count-1));
                         dyingWrappedJSArray->RemoveElementAt(count-1);
                     }
                     NS_RELEASE(wrapper);
@@ -596,8 +596,8 @@ JSBool XPCJSRuntime::GCCallback(JSContext *cx, JSGCStatus status)
                                 array->Compact();
                                 break;
                             }
-                            obj = NS_REINTERPRET_CAST(nsISupports*,
-                                    array->ElementAt(count-1));
+                            obj = reinterpret_cast<nsISupports*>
+                                                  (array->ElementAt(count-1));
                             array->RemoveElementAt(count-1);
                         }
                         NS_RELEASE(obj);
diff --git a/mozilla/js/src/xpconnect/src/xpcruntimesvc.cpp b/mozilla/js/src/xpconnect/src/xpcruntimesvc.cpp
index 8514040cf05..8cd37e505b1 100644
--- a/mozilla/js/src/xpconnect/src/xpcruntimesvc.cpp
+++ b/mozilla/js/src/xpconnect/src/xpcruntimesvc.cpp
@@ -93,14 +93,14 @@ BackstagePass::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
 #endif
     *aCount = count;
     nsIID **array;
-    *aArray = array = NS_STATIC_CAST(nsIID**, nsMemory::Alloc(count * sizeof(nsIID*)));
+    *aArray = array = static_cast<nsIID**>(nsMemory::Alloc(count * sizeof(nsIID*)));
     if(!array)
         return NS_ERROR_OUT_OF_MEMORY;
 
     PRUint32 index = 0;
     nsIID* clone;
 #define PUSH_IID(id) \
-    clone = NS_STATIC_CAST(nsIID *, nsMemory::Clone(&NS_GET_IID( id ), \
+    clone = static_cast<nsIID *>(nsMemory::Clone(&NS_GET_IID( id ), \
                                                     sizeof(nsIID)));  \
     if (!clone)                                                       \
         goto oom;                                                     \
diff --git a/mozilla/js/src/xpconnect/src/xpcstring.cpp b/mozilla/js/src/xpconnect/src/xpcstring.cpp
index ef8a8351183..b421d4605c3 100644
--- a/mozilla/js/src/xpconnect/src/xpcstring.cpp
+++ b/mozilla/js/src/xpconnect/src/xpcstring.cpp
@@ -97,7 +97,7 @@ XPCStringConvert::ReadableToJSString(JSContext *cx,
         }
 
         str = JS_NewExternalString(cx, 
-                                   NS_REINTERPRET_CAST(jschar *, buf->Data()),
+                                   reinterpret_cast<jschar *>(buf->Data()),
                                    length, sDOMStringFinalizerIndex);
 
         if (str)
@@ -107,14 +107,14 @@ XPCStringConvert::ReadableToJSString(JSContext *cx,
     {
         // blech, have to copy.
 
-        jschar *chars = NS_REINTERPRET_CAST(jschar *,
-                                            JS_malloc(cx, (length + 1) *
+        jschar *chars = reinterpret_cast<jschar *>
+                                        (JS_malloc(cx, (length + 1) *
                                                       sizeof(jschar)));
         if (!chars)
             return NULL;
 
         if (length && !CopyUnicodeTo(readable, 0,
-                                     NS_REINTERPRET_CAST(PRUnichar *, chars),
+                                     reinterpret_cast<PRUnichar *>(chars),
                                      length))
         {
             JS_free(cx, chars);
@@ -135,7 +135,7 @@ XPCReadableJSStringWrapper *
 XPCStringConvert::JSStringToReadable(JSString *str)
 {
     return new
-        XPCReadableJSStringWrapper(NS_REINTERPRET_CAST(PRUnichar *,
-                                                       JS_GetStringChars(str)),
+        XPCReadableJSStringWrapper(reinterpret_cast<PRUnichar *>
+                                                   (JS_GetStringChars(str)),
                                    JS_GetStringLength(str));
 }
diff --git a/mozilla/js/src/xpconnect/src/xpcthreadcontext.cpp b/mozilla/js/src/xpconnect/src/xpcthreadcontext.cpp
index 02dc332db38..fed607f79ae 100644
--- a/mozilla/js/src/xpconnect/src/xpcthreadcontext.cpp
+++ b/mozilla/js/src/xpconnect/src/xpcthreadcontext.cpp
@@ -155,7 +155,7 @@ SafeFinalize(JSContext* cx, JSObject* obj)
 {
 #ifndef XPCONNECT_STANDALONE
     nsIScriptObjectPrincipal* sop =
-        NS_STATIC_CAST(nsIScriptObjectPrincipal*, JS_GetPrivate(cx, obj));
+        static_cast<nsIScriptObjectPrincipal*>(JS_GetPrivate(cx, obj));
     NS_IF_RELEASE(sop);
 #endif
 }
@@ -199,7 +199,7 @@ XPCJSContextStack::GetSafeJSContext(JSContext * *aSafeJSContext)
         XPCJSRuntime* xpcrt;
 
         nsXPConnect* xpc = nsXPConnect::GetXPConnect();
-        nsCOMPtr<nsIXPConnect> xpcholder(NS_STATIC_CAST(nsIXPConnect*, xpc));
+        nsCOMPtr<nsIXPConnect> xpcholder(static_cast<nsIXPConnect*>(xpc));
 
         if(xpc && (xpcrt = xpc->GetRuntime()) && (rt = xpcrt->GetJSRuntime()))
         {
@@ -667,7 +667,7 @@ nsXPCJSContextStackIterator::Reset(nsIJSContextStack *aStack)
 {
     // XXX This is pretty ugly.
     nsXPCThreadJSContextStackImpl *impl =
-        NS_STATIC_CAST(nsXPCThreadJSContextStackImpl*, aStack);
+        static_cast<nsXPCThreadJSContextStackImpl*>(aStack);
     XPCJSContextStack *stack = impl->GetStackForCurrentThread();
     if(!stack)
         return NS_ERROR_FAILURE;
diff --git a/mozilla/js/src/xpconnect/src/xpcthrower.cpp b/mozilla/js/src/xpconnect/src/xpcthrower.cpp
index a33163dc154..f807dcc40a3 100644
--- a/mozilla/js/src/xpconnect/src/xpcthrower.cpp
+++ b/mozilla/js/src/xpconnect/src/xpcthrower.cpp
@@ -187,8 +187,7 @@ XPCThrower::Verbosify(XPCCallContext& ccx,
         if(ccx.GetIDispatchMember())
         {
             XPCDispInterface::Member * member = 
-                NS_REINTERPRET_CAST(XPCDispInterface::Member*, 
-                                    ccx.GetIDispatchMember());
+                reinterpret_cast<XPCDispInterface::Member*>(ccx.GetIDispatchMember());
             if(member && JSVAL_IS_STRING(member->GetName()))
             {
                 name = JS_GetStringBytes(JSVAL_TO_STRING(member->GetName()));
@@ -305,13 +304,13 @@ XPCThrower::ThrowCOMError(JSContext* cx, unsigned long COMErrorCode,
     msg = format;
     if(exception)
     {
-        msg += NS_STATIC_CAST(const char *,
-                              _bstr_t(exception->bstrSource, false));
+        msg += static_cast<const char *>
+                          (_bstr_t(exception->bstrSource, false));
         msg += " : ";
-        msg.AppendInt(NS_STATIC_CAST(PRUint32, COMErrorCode));
+        msg.AppendInt(static_cast<PRUint32>(COMErrorCode));
         msg += " - ";
-        msg += NS_STATIC_CAST(const char *,
-                              _bstr_t(exception->bstrDescription, false));
+        msg += static_cast<const char *>
+                          (_bstr_t(exception->bstrDescription, false));
     }
     else
     {
@@ -324,23 +323,23 @@ XPCThrower::ThrowCOMError(JSContext* cx, unsigned long COMErrorCode,
             if(SUCCEEDED(pError->GetSource(&bstrSource)) && bstrSource)
             {
                 _bstr_t src(bstrSource, false);
-                msg += NS_STATIC_CAST(const char *,src);
+                msg += static_cast<const char *>(src);
                 msg += " : ";
             }
-            msg.AppendInt(NS_STATIC_CAST(PRUint32, COMErrorCode), 16);
+            msg.AppendInt(static_cast<PRUint32>(COMErrorCode), 16);
             BSTR bstrDesc = NULL;
             if(SUCCEEDED(pError->GetDescription(&bstrDesc)) && bstrDesc)
             {
                 msg += " - ";
                 _bstr_t desc(bstrDesc, false);
-                msg += NS_STATIC_CAST(const char *,desc);
+                msg += static_cast<const char *>(desc);
             }
         }
         else
         {
             // No error object, so just report the result
             msg += "COM Error Result = ";
-            msg.AppendInt(NS_STATIC_CAST(PRUint32, COMErrorCode), 16);
+            msg.AppendInt(static_cast<PRUint32>(COMErrorCode), 16);
         }
     }
     
diff --git a/mozilla/js/src/xpconnect/src/xpcvariant.cpp b/mozilla/js/src/xpconnect/src/xpcvariant.cpp
index 1335b28ee68..69455c2ee3a 100644
--- a/mozilla/js/src/xpconnect/src/xpcvariant.cpp
+++ b/mozilla/js/src/xpconnect/src/xpcvariant.cpp
@@ -298,7 +298,7 @@ JSBool XPCVariant::InitializeData(XPCCallContext& ccx)
                      "Why do we already have data?");
 
         mData.u.wstr.mWStringValue = 
-            NS_REINTERPRET_CAST(PRUnichar*, JS_GetStringChars(str));
+            reinterpret_cast<PRUnichar*>(JS_GetStringChars(str));
         // Use C-style cast, because reinterpret cast from size_t to
         // PRUint32 is not valid on some platforms.
         mData.u.wstr.mWStringLength = (PRUint32)JS_GetStringLength(str);
diff --git a/mozilla/js/src/xpconnect/src/xpcwrappedjs.cpp b/mozilla/js/src/xpconnect/src/xpcwrappedjs.cpp
index 7a42b649f1f..32cd5edcf71 100644
--- a/mozilla/js/src/xpconnect/src/xpcwrappedjs.cpp
+++ b/mozilla/js/src/xpconnect/src/xpcwrappedjs.cpp
@@ -69,12 +69,12 @@ NS_CYCLE_COLLECTION_CLASSNAME(nsXPCWrappedJS)::Traverse
         // Put the nsCOMPtr in a local scope, to avoid messing up the refcount
         // below.
         nsCOMPtr<nsIXPConnectWrappedJS> owner =
-            do_QueryInterface(NS_STATIC_CAST(nsISupports*, p), &rv);
+            do_QueryInterface(static_cast<nsISupports*>(p), &rv);
         if (NS_FAILED(rv))
             return rv;
 
         base = owner.get();
-        tmp = NS_STATIC_CAST(nsXPCWrappedJS*, base);
+        tmp = static_cast<nsXPCWrappedJS*>(base);
         NS_ASSERTION(tmp->mRefCnt.get() > 2,
                      "How can this be, no one else holds a strong ref?");
     }
@@ -107,7 +107,7 @@ NS_CYCLE_COLLECTION_CLASSNAME(nsXPCWrappedJS)::Traverse
         cb.NoteXPCOMChild(tmp->GetAggregatedNativeObject());
     else
         // Non-root wrappers keep their root alive.
-        cb.NoteXPCOMChild(NS_STATIC_CAST(nsIXPConnectWrappedJS*, root));
+        cb.NoteXPCOMChild(static_cast<nsIXPConnectWrappedJS*>(root));
 
     return NS_OK;
 }
@@ -138,7 +138,7 @@ nsXPCWrappedJS::AggregatedQueryInterface(REFNSIID aIID, void** aInstancePtr)
     if(aIID.Equals(NS_GET_IID(nsIXPConnectWrappedJS)))
     {
         NS_ADDREF(this);
-        *aInstancePtr = (void*) NS_STATIC_CAST(nsIXPConnectWrappedJS*,this);
+        *aInstancePtr = (void*) static_cast<nsIXPConnectWrappedJS*>(this);
         return NS_OK;
     }
 
@@ -175,7 +175,7 @@ nsXPCWrappedJS::QueryInterface(REFNSIID aIID, void** aInstancePtr)
     if(aIID.Equals(NS_GET_IID(nsIXPConnectWrappedJS)))
     {
         NS_ADDREF(this);
-        *aInstancePtr = (void*) NS_STATIC_CAST(nsIXPConnectWrappedJS*,this);
+        *aInstancePtr = (void*) static_cast<nsIXPConnectWrappedJS*>(this);
         return NS_OK;
     }
 
@@ -272,8 +272,8 @@ nsXPCWrappedJS::TraceJS(JSTracer* trc)
 void
 nsXPCWrappedJS::PrintTraceName(JSTracer* trc, char *buf, size_t bufsize)
 {
-    const nsXPCWrappedJS* self = NS_STATIC_CAST(const nsXPCWrappedJS*,
-                                                trc->debugPrintArg);
+    const nsXPCWrappedJS* self = static_cast<const nsXPCWrappedJS*>
+                                            (trc->debugPrintArg);
     JS_snprintf(buf, bufsize, "nsXPCWrappedJS[%s,0x%p].mJSObj",
                 self->GetClass()->GetInterfaceName(), self);
 }
diff --git a/mozilla/js/src/xpconnect/src/xpcwrappedjsclass.cpp b/mozilla/js/src/xpconnect/src/xpcwrappedjsclass.cpp
index 849d79f290c..8c032ff1fbf 100644
--- a/mozilla/js/src/xpconnect/src/xpcwrappedjsclass.cpp
+++ b/mozilla/js/src/xpconnect/src/xpcwrappedjsclass.cpp
@@ -100,8 +100,8 @@ AutoScriptEvaluate::~AutoScriptEvaluate()
     if (JS_GetOptions(mJSContext) & JSOPTION_PRIVATE_IS_NSISUPPORTS)
     {
         nsCOMPtr<nsIXPCScriptNotify> scriptNotify = 
-            do_QueryInterface(NS_STATIC_CAST(nsISupports*,
-                                             JS_GetContextPrivate(mJSContext)));
+            do_QueryInterface(static_cast<nsISupports*>
+                                         (JS_GetContextPrivate(mJSContext)));
         if(scriptNotify)
             scriptNotify->ScriptExecuted();
     }
@@ -508,7 +508,7 @@ nsXPCWrappedJSClass::DelegatedQueryInterface(nsXPCWrappedJS* self,
     if(aIID.Equals(NS_GET_IID(nsIXPConnectJSObjectHolder)))
     {
         NS_ADDREF(self);
-        *aInstancePtr = (void*) NS_STATIC_CAST(nsIXPConnectJSObjectHolder*,self);
+        *aInstancePtr = (void*) static_cast<nsIXPConnectJSObjectHolder*>(self);
         return NS_OK;
     }
 
@@ -540,7 +540,7 @@ nsXPCWrappedJSClass::DelegatedQueryInterface(nsXPCWrappedJS* self,
         }
 
         NS_ADDREF(root);
-        *aInstancePtr = (void*) NS_STATIC_CAST(nsIPropertyBag*,root);
+        *aInstancePtr = (void*) static_cast<nsIPropertyBag*>(root);
         return NS_OK;
     }
 
@@ -567,7 +567,7 @@ nsXPCWrappedJSClass::DelegatedQueryInterface(nsXPCWrappedJS* self,
         }
 
         NS_ADDREF(root);
-        *aInstancePtr = (void*) NS_STATIC_CAST(nsISupportsWeakReference*,root);
+        *aInstancePtr = (void*) static_cast<nsISupportsWeakReference*>(root);
         return NS_OK;
     }
 
@@ -1177,8 +1177,8 @@ nsXPCWrappedJSClass::CallMethod(nsXPCWrappedJS* wrapper, uint16 methodIndex,
                             {
                                 if(!newWrapperIID)
                                     newWrapperIID =
-                                        NS_CONST_CAST(nsIID*,
-                                                      &NS_GET_IID(nsISupports));
+                                        const_cast<nsIID*>
+                                                  (&NS_GET_IID(nsISupports));
                                 nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
                                 JSBool ok =
                                   XPCConvert::NativeInterface2JSObject(ccx,
diff --git a/mozilla/js/src/xpconnect/src/xpcwrappednative.cpp b/mozilla/js/src/xpconnect/src/xpcwrappednative.cpp
index 7f1a63ab802..fddda492a5a 100644
--- a/mozilla/js/src/xpconnect/src/xpcwrappednative.cpp
+++ b/mozilla/js/src/xpconnect/src/xpcwrappednative.cpp
@@ -53,7 +53,7 @@ NS_IMETHODIMP
 NS_CYCLE_COLLECTION_CLASSNAME(XPCWrappedNative)::Traverse(void *p,
                                                           nsCycleCollectionTraversalCallback &cb)
 {
-    XPCWrappedNative *tmp = NS_STATIC_CAST(XPCWrappedNative*, p);
+    XPCWrappedNative *tmp = static_cast<XPCWrappedNative*>(p);
     if(!tmp->IsValid())
         return NS_OK;
 
@@ -346,8 +346,8 @@ XPCWrappedNative::GetNewOrUsed(XPCCallContext& ccx,
     // we'll provide a default one
     if(isIDispatch && !info)
     {
-        info = dont_AddRef(NS_STATIC_CAST(nsIClassInfo*,
-                                          XPCIDispatchClassInfo::GetSingleton()));
+        info = dont_AddRef(static_cast<nsIClassInfo*>
+                                      (XPCIDispatchClassInfo::GetSingleton()));
     }
 #endif
 
@@ -1022,7 +1022,7 @@ XPCWrappedNative::SystemIsBeingShutDown(JSContext* cx)
 #ifdef DEBUG_xpc_hacker
     {
         printf("Removing root for still-live XPCWrappedNative %p wrapping:\n",
-               NS_STATIC_CAST(void*, this));
+               static_cast<void*>(this));
         for(PRUint16 i = 0, i_end = mSet->GetInterfaceCount(); i < i_end; ++i)
         {
             nsXPIDLCString name;
diff --git a/mozilla/js/src/xpconnect/tests/TestXPC.cpp b/mozilla/js/src/xpconnect/tests/TestXPC.cpp
index ac69642ab9b..3d540276b51 100644
--- a/mozilla/js/src/xpconnect/tests/TestXPC.cpp
+++ b/mozilla/js/src/xpconnect/tests/TestXPC.cpp
@@ -467,7 +467,7 @@ TestArgFormatter(JSContext* jscontext, JSObject* glob, nsIXPConnect* xpc)
                             a_in, 
                             &NS_GET_IID(nsITestXPCFoo2), b_in.get(), 
                             c_in.get(),
-                            NS_STATIC_CAST(const nsAString*, &d_in), 
+                            static_cast<const nsAString*>(&d_in), 
                             e_in);
 
     if(!argv)
@@ -478,9 +478,9 @@ TestArgFormatter(JSContext* jscontext, JSObject* glob, nsIXPConnect* xpc)
 
     if(!JS_ConvertArguments(jscontext, 5, argv, "s %ip %iv %is s",
                             &a_out, 
-                            NS_STATIC_CAST(nsISupports**, getter_AddRefs(b_out)), 
-                            NS_STATIC_CAST(nsIVariant**, getter_AddRefs(c_out)),
-                            NS_STATIC_CAST(nsAString*, &d_out), 
+                            static_cast<nsISupports**>(getter_AddRefs(b_out)), 
+                            static_cast<nsIVariant**>(getter_AddRefs(c_out)),
+                            static_cast<nsAString*>(&d_out), 
                             &e_out))
     {
         printf(" could not convert from JS to native -- FAILED!\n");
diff --git a/mozilla/js/src/xpconnect/tests/components/xpctest_child.cpp b/mozilla/js/src/xpconnect/tests/components/xpctest_child.cpp
index 40715e78c67..035c24285dc 100644
--- a/mozilla/js/src/xpconnect/tests/components/xpctest_child.cpp
+++ b/mozilla/js/src/xpconnect/tests/components/xpctest_child.cpp
@@ -163,7 +163,7 @@ xpctestChild::QueryInterface(REFNSIID iid, void** result)
     if (iid.Equals(NS_GET_IID(nsIXPCTestChild)) ||
         iid.Equals(NS_GET_IID(nsIXPCTestParent)) ||
         iid.Equals(NS_GET_IID(nsISupports))) {
-        *result = NS_STATIC_CAST(nsIXPCTestChild*, this);
+        *result = static_cast<nsIXPCTestChild*>(this);
         NS_ADDREF(this);
         return NS_OK;
     }
diff --git a/mozilla/js/src/xpconnect/tests/components/xpctest_echo.cpp b/mozilla/js/src/xpconnect/tests/components/xpctest_echo.cpp
index 147bef3a945..15e4aba4983 100644
--- a/mozilla/js/src/xpconnect/tests/components/xpctest_echo.cpp
+++ b/mozilla/js/src/xpconnect/tests/components/xpctest_echo.cpp
@@ -447,7 +447,7 @@ xpctestEcho::PrintArgTypes(void)
 
     nsCOMPtr<nsISupports> callee;
     if(NS_FAILED(cc->GetCallee(getter_AddRefs(callee))) ||
-       callee != NS_STATIC_CAST(nsIEcho*, this))
+       callee != static_cast<nsIEcho*>(this))
         return NS_ERROR_FAILURE;
 
     PRUint32 argc;
@@ -503,7 +503,7 @@ xpctestEcho::ThrowArg(void)
 
     nsCOMPtr<nsISupports> callee;
     if(NS_FAILED(cc->GetCallee(getter_AddRefs(callee))) || 
-       callee != NS_STATIC_CAST(nsIEcho*, this))
+       callee != static_cast<nsIEcho*>(this))
         return NS_ERROR_FAILURE;
 
     PRUint32 argc;
@@ -537,7 +537,7 @@ xpctestEcho::CallReceiverSometimeLater(void)
     timer = do_CreateInstance("@mozilla.org/timer;1", &rv);
     if(NS_FAILED(rv))
         return NS_ERROR_FAILURE;
-    timer->InitWithCallback(NS_STATIC_CAST(nsITimerCallback*,this), 2000,
+    timer->InitWithCallback(static_cast<nsITimerCallback*>(this), 2000,
                             nsITimer::TYPE_ONE_SHOT);
     return NS_OK;
 #else
diff --git a/mozilla/js/src/xpconnect/tests/components/xpctest_noisy.cpp b/mozilla/js/src/xpconnect/tests/components/xpctest_noisy.cpp
index 02c4de91fa3..10f50ca008e 100644
--- a/mozilla/js/src/xpconnect/tests/components/xpctest_noisy.cpp
+++ b/mozilla/js/src/xpconnect/tests/components/xpctest_noisy.cpp
@@ -91,7 +91,7 @@ xpctestNoisy::QueryInterface(REFNSIID iid, void** result)
 
     if (iid.Equals(NS_GET_IID(nsIXPCTestNoisy)) ||
         iid.Equals(NS_GET_IID(nsISupports))) {
-        *result = NS_STATIC_CAST(nsIXPCTestNoisy*, this);
+        *result = static_cast<nsIXPCTestNoisy*>(this);
         printf("Noisy %d - QueryInterface called and succeeding\n", mID);
         NS_ADDREF(this);
         return NS_OK;
diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp
index 7b6db481265..2e63a266011 100644
--- a/mozilla/layout/base/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp
@@ -417,7 +417,7 @@ SVG_TestLanguage(const nsSubstring& lstr, const nsSubstring& prefs)
       }
       const nsDefaultStringComparator defaultComparator;
       const nsStringComparator& comparator = 
-                  NS_STATIC_CAST(const nsStringComparator&, defaultComparator);
+                  static_cast<const nsStringComparator&>(defaultComparator);
       if (nsStyleUtil::DashMatchCompare(Substring(lstr, vbegin, vend-vbegin),
                                         Substring(prefs, gbegin, gend-gbegin),
                                         comparator)) {
@@ -460,7 +460,7 @@ GetSpecialSibling(nsFrameManager* aFrameManager, nsIFrame* aFrame, nsIFrame** aR
 
   void* value = aFrame->GetProperty(nsGkAtoms::IBSplitSpecialSibling);
 
-  *aResult = NS_STATIC_CAST(nsIFrame*, value);
+  *aResult = static_cast<nsIFrame*>(value);
 }
 
 static nsIFrame*
@@ -616,8 +616,8 @@ DoCleanupFrameReferences(nsFrameManager*  aFrameManager,
   nsIContent* content = aFrameIn->GetContent();
 
   if (aFrameIn->GetType() == nsGkAtoms::placeholderFrame) {
-    nsPlaceholderFrame* placeholder = NS_STATIC_CAST(nsPlaceholderFrame*,
-                                                     aFrameIn);
+    nsPlaceholderFrame* placeholder = static_cast<nsPlaceholderFrame*>
+                                                 (aFrameIn);
     // if the frame is a placeholder use the out of flow frame
     aFrameIn = nsPlaceholderFrame::GetRealFrameForPlaceholder(placeholder);
 
@@ -880,14 +880,14 @@ nsPseudoFrameData::Dump()
 {
   nsIFrame* main = nsnull;
   nsIFrame* second = nsnull;
-  printf("        %p\n", NS_STATIC_CAST(void*, mFrame));
+  printf("        %p\n", static_cast<void*>(mFrame));
   main = mChildList.childList;
 
  
   second = mChildList2.childList;
   while (main || second) {
-    printf("          %p   %p\n", NS_STATIC_CAST(void*, main),
-           NS_STATIC_CAST(void*, second));
+    printf("          %p   %p\n", static_cast<void*>(main),
+           static_cast<void*>(second));
     if (main)
       main = main->GetNextSibling();
     if (second)
@@ -2668,7 +2668,7 @@ ProcessPseudoFrames(nsFrameConstructorState& aState,
 #ifdef DEBUG
   if (gTablePseudoFrame) {
     printf("*** ProcessPseudoFrames complete leave, highestframe:%p***\n",
-           NS_STATIC_CAST(void*, highestFrame));
+           static_cast<void*>(highestFrame));
     aState.mPseudoFrames.Dump();
   }
 #endif
@@ -2708,7 +2708,7 @@ ProcessPseudoFrames(nsFrameConstructorState& aState,
 #ifdef DEBUG
   if (gTablePseudoFrame) {
     printf("*** ProcessPseudoFrames limited leave:%p***\n",
-           NS_STATIC_CAST(void*, highestFrame));
+           static_cast<void*>(highestFrame));
     aState.mPseudoFrames.Dump();
   }
 #endif
@@ -4651,7 +4651,7 @@ nsCSSFrameConstructor::CreatePlaceholderFrameFor(nsIPresShell*    aPresShell,
     // Add mapping from absolutely positioned frame to its placeholder frame
     aFrameManager->RegisterPlaceholderFrame(placeholderFrame);
 
-    *aPlaceholderFrame = NS_STATIC_CAST(nsIFrame*, placeholderFrame);
+    *aPlaceholderFrame = static_cast<nsIFrame*>(placeholderFrame);
     
     return NS_OK;
   }
@@ -8257,7 +8257,7 @@ nsCSSFrameConstructor::ContentAppended(nsIContent*     aContainer,
 #ifdef DEBUG
   if (gNoisyContentUpdates) {
     printf("nsCSSFrameConstructor::ContentAppended container=%p index=%d\n",
-           NS_STATIC_CAST(void*, aContainer), aNewIndexInContainer);
+           static_cast<void*>(aContainer), aNewIndexInContainer);
     if (gReallyNoisyContentUpdates && aContainer) {
       aContainer->List(stdout, 0);
     }
@@ -8746,7 +8746,7 @@ PRBool NotifyListBoxBody(nsPresContext*    aPresContext,
     if (listBoxObject) {
       nsIListBoxObject* listboxBody = listBoxObject->GetListBoxBody();
       if (listboxBody) {
-        nsListBoxBodyFrame *listBoxBodyFrame = NS_STATIC_CAST(nsListBoxBodyFrame*, listboxBody);
+        nsListBoxBodyFrame *listBoxBodyFrame = static_cast<nsListBoxBodyFrame*>(listboxBody);
         if (aOperation == CONTENT_REMOVED) {
           // Except if we have an aChildFrame and its parent is not the right
           // thing, then we don't do this.  Pseudo frames are so much fun....
@@ -8793,8 +8793,8 @@ nsCSSFrameConstructor::ContentInserted(nsIContent*            aContainer,
 #ifdef DEBUG
   if (gNoisyContentUpdates) {
     printf("nsCSSFrameConstructor::ContentInserted container=%p child=%p index=%d\n",
-           NS_STATIC_CAST(void*, aContainer),
-           NS_STATIC_CAST(void*, aChild),
+           static_cast<void*>(aContainer),
+           static_cast<void*>(aChild),
            aIndexInContainer);
     if (gReallyNoisyContentUpdates) {
       (aContainer ? aContainer : aChild)->List(stdout, 0);
@@ -9046,8 +9046,8 @@ nsCSSFrameConstructor::ContentInserted(nsIContent*            aContainer,
           nsFrame::ListTag(stdout, parentFrame);
           printf(" is special inline\n");
           printf("  ==> blockContent=%p, parentContainer=%p\n",
-                 NS_STATIC_CAST(void*, blockContent),
-                 NS_STATIC_CAST(void*, parentContainer));
+                 static_cast<void*>(blockContent),
+                 static_cast<void*>(parentContainer));
         }
 #endif
 
@@ -9354,7 +9354,7 @@ DeletingFrameSubtree(nsFrameManager* aFrameManager,
   // Now destroy any out-of-flow frames that have been enqueued for
   // destruction.
   for (PRInt32 i = destroyQueue.Count() - 1; i >= 0; --i) {
-    nsIFrame* outOfFlowFrame = NS_STATIC_CAST(nsIFrame*, destroyQueue[i]);
+    nsIFrame* outOfFlowFrame = static_cast<nsIFrame*>(destroyQueue[i]);
 
     // Ask the out-of-flow's parent to delete the out-of-flow
     // frame from the right list.
@@ -9396,8 +9396,8 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent*     aContainer,
 #ifdef DEBUG
   if (gNoisyContentUpdates) {
     printf("nsCSSFrameConstructor::ContentRemoved container=%p child=%p index=%d\n",
-           NS_STATIC_CAST(void*, aContainer),
-           NS_STATIC_CAST(void*, aChild),
+           static_cast<void*>(aContainer),
+           static_cast<void*>(aChild),
            aIndexInContainer);
     if (gReallyNoisyContentUpdates) {
       aContainer->List(stdout, 0);
@@ -10298,8 +10298,8 @@ nsCSSFrameConstructor::CreateContinuingTableFrame(nsIPresShell* aPresShell,
                                         GetAbsoluteContainingBlock(newFrame),
                                         nsnull);
 
-          headerFooterFrame = NS_STATIC_CAST(nsTableRowGroupFrame*,
-            NS_NewTableRowGroupFrame(aPresShell, rowGroupFrame->GetStyleContext()));
+          headerFooterFrame = static_cast<nsTableRowGroupFrame*>
+                                         (NS_NewTableRowGroupFrame(aPresShell, rowGroupFrame->GetStyleContext()));
           nsIContent* headerFooter = rowGroupFrame->GetContent();
           headerFooterFrame->Init(headerFooter, newFrame, nsnull);
           ProcessChildren(state, headerFooter, headerFooterFrame,
@@ -12725,8 +12725,8 @@ nsCSSFrameConstructor::WipeContainingBlock(nsFrameConstructorState& aState,
 #ifdef DEBUG
   if (gNoisyContentUpdates) {
     printf("nsCSSFrameConstructor::WipeContainingBlock: blockContent=%p parentContainer=%p\n",
-           NS_STATIC_CAST(void*, blockContent),
-           NS_STATIC_CAST(void*, parentContainer));
+           static_cast<void*>(blockContent),
+           static_cast<void*>(parentContainer));
   }
 #endif
   if (parentContainer) {
@@ -12749,7 +12749,7 @@ nsCSSFrameConstructor::ReframeContainingBlock(nsIFrame* aFrame)
   // very poorly
   if (gNoisyContentUpdates) {
     printf("nsCSSFrameConstructor::ReframeContainingBlock frame=%p\n",
-           NS_STATIC_CAST(void*, aFrame));
+           static_cast<void*>(aFrame));
   }
 #endif
 
@@ -12783,8 +12783,8 @@ nsCSSFrameConstructor::ReframeContainingBlock(nsIFrame* aFrame)
 #ifdef DEBUG
         if (gNoisyContentUpdates) {
           printf("  ==> blockContent=%p, parentContainer=%p\n",
-                 NS_STATIC_CAST(void*, blockContent),
-                 NS_STATIC_CAST(void*, parentContainer));
+                 static_cast<void*>(blockContent),
+                 static_cast<void*>(parentContainer));
         }
 #endif
         return ReinsertContent(parentContainer, blockContent);
@@ -12814,7 +12814,7 @@ nsresult nsCSSFrameConstructor::RemoveFixedItems(const nsFrameConstructorState&
                      nsGkAtoms::placeholderFrame,
                      "Wrong type");
         aState.mFrameManager->UnregisterPlaceholderFrame(
-          NS_STATIC_CAST(nsPlaceholderFrame*, placeholderFrame));
+          static_cast<nsPlaceholderFrame*>(placeholderFrame));
         nsIFrame* placeholderParent = placeholderFrame->GetParent();
         ::DeletingFrameSubtree(aState.mFrameManager, placeholderFrame);
         rv = aState.mFrameManager->RemoveFrame(placeholderParent, nsnull,
@@ -12846,11 +12846,11 @@ CollectRestyles(nsISupports* aContent,
                 void* aRestyleArrayPtr)
 {
   nsCSSFrameConstructor::RestyleEnumerateData** restyleArrayPtr =
-    NS_STATIC_CAST(nsCSSFrameConstructor::RestyleEnumerateData**,
-                   aRestyleArrayPtr);
+    static_cast<nsCSSFrameConstructor::RestyleEnumerateData**>
+               (aRestyleArrayPtr);
   nsCSSFrameConstructor::RestyleEnumerateData* currentRestyle =
     *restyleArrayPtr;
-  currentRestyle->mContent = NS_STATIC_CAST(nsIContent*, aContent);
+  currentRestyle->mContent = static_cast<nsIContent*>(aContent);
   currentRestyle->mRestyleHint = aData.mRestyleHint;
   currentRestyle->mChangeHint = aData.mChangeHint;
 
@@ -13017,7 +13017,7 @@ nsCSSFrameConstructor::LazyGenerateChildrenEvent::Run()
     // it is possible that the frame is different than the one that requested
     // the lazy generation, but as long as it's a popup frame that hasn't
     // generated its children yet, that's OK.
-    nsMenuPopupFrame* menuPopupFrame = NS_STATIC_CAST(nsMenuPopupFrame *, frame);
+    nsMenuPopupFrame* menuPopupFrame = static_cast<nsMenuPopupFrame *>(frame);
     if (menuPopupFrame->HasGeneratedChildren())
       return NS_OK;
 
diff --git a/mozilla/layout/base/nsCaret.cpp b/mozilla/layout/base/nsCaret.cpp
index dd105adbfe6..ba600bb5422 100644
--- a/mozilla/layout/base/nsCaret.cpp
+++ b/mozilla/layout/base/nsCaret.cpp
@@ -1128,7 +1128,7 @@ void nsCaret::InvalidateRects(const nsRect &aRect, const nsRect &aHook,
 /* static */
 void nsCaret::CaretBlinkCallback(nsITimer *aTimer, void *aClosure)
 {
-  nsCaret   *theCaret = NS_REINTERPRET_CAST(nsCaret*, aClosure);
+  nsCaret   *theCaret = reinterpret_cast<nsCaret*>(aClosure);
   if (!theCaret) return;
   
   theCaret->DrawCaret(PR_TRUE);
diff --git a/mozilla/layout/base/nsCounterManager.cpp b/mozilla/layout/base/nsCounterManager.cpp
index d257b5b8b14..12b1ebad802 100644
--- a/mozilla/layout/base/nsCounterManager.cpp
+++ b/mozilla/layout/base/nsCounterManager.cpp
@@ -72,7 +72,7 @@ nsCounterUseNode::GetText(nsString& aResult)
     aResult.Truncate();
 
     nsAutoVoidArray stack;
-    stack.AppendElement(NS_STATIC_CAST(nsCounterNode*, this));
+    stack.AppendElement(static_cast<nsCounterNode*>(this));
 
     if (mAllCounters && mScopeStart)
         for (nsCounterNode *n = mScopeStart; n->mScopePrev; n = n->mScopeStart)
@@ -84,7 +84,7 @@ nsCounterUseNode::GetText(nsString& aResult)
         separator = mCounterStyle->Item(1).GetStringBufferValue();
 
     for (PRInt32 i = stack.Count() - 1;; --i) {
-        nsCounterNode *n = NS_STATIC_CAST(nsCounterNode*, stack[i]);
+        nsCounterNode *n = static_cast<nsCounterNode*>(stack[i]);
         nsBulletFrame::AppendCounterText(style, n->mValueAfter, aResult);
         if (i == 0)
             break;
@@ -295,7 +295,7 @@ struct DestroyNodesData {
 PR_STATIC_CALLBACK(PLDHashOperator)
 DestroyNodesInList(const nsAString& aKey, nsCounterList* aList, void* aClosure)
 {
-    DestroyNodesData *data = NS_STATIC_CAST(DestroyNodesData*, aClosure);
+    DestroyNodesData *data = static_cast<DestroyNodesData*>(aClosure);
     if (aList->DestroyNodesFor(data->mFrame)) {
         data->mDestroyedAny = PR_TRUE;
         aList->SetDirty();
diff --git a/mozilla/layout/base/nsCounterManager.h b/mozilla/layout/base/nsCounterManager.h
index 3b7773a8863..b46e4537709 100644
--- a/mozilla/layout/base/nsCounterManager.h
+++ b/mozilla/layout/base/nsCounterManager.h
@@ -167,13 +167,13 @@ struct nsCounterChangeNode : public nsCounterNode {
 inline nsCounterUseNode* nsCounterNode::UseNode()
 {
     NS_ASSERTION(mType == USE, "wrong type");
-    return NS_STATIC_CAST(nsCounterUseNode*, this);
+    return static_cast<nsCounterUseNode*>(this);
 }
 
 inline nsCounterChangeNode* nsCounterNode::ChangeNode()
 {
     NS_ASSERTION(mType == INCREMENT || mType == RESET, "wrong type");
-    return NS_STATIC_CAST(nsCounterChangeNode*, this);
+    return static_cast<nsCounterChangeNode*>(this);
 }
 
 inline void nsCounterNode::Calc(nsCounterList* aList)
@@ -200,14 +200,14 @@ public:
     }
 
     nsCounterNode* First() {
-        return NS_STATIC_CAST(nsCounterNode*, mFirstNode);
+        return static_cast<nsCounterNode*>(mFirstNode);
     }
 
     static nsCounterNode* Next(nsCounterNode* aNode) {
-        return NS_STATIC_CAST(nsCounterNode*, nsGenConList::Next(aNode));
+        return static_cast<nsCounterNode*>(nsGenConList::Next(aNode));
     }
     static nsCounterNode* Prev(nsCounterNode* aNode) {
-        return NS_STATIC_CAST(nsCounterNode*, nsGenConList::Prev(aNode));
+        return static_cast<nsCounterNode*>(nsGenConList::Prev(aNode));
     }
 
     static PRInt32 ValueBefore(nsCounterNode* aNode) {
diff --git a/mozilla/layout/base/nsDisplayList.cpp b/mozilla/layout/base/nsDisplayList.cpp
index b1edff68e0c..35b140f1283 100644
--- a/mozilla/layout/base/nsDisplayList.cpp
+++ b/mozilla/layout/base/nsDisplayList.cpp
@@ -86,7 +86,7 @@ DestroyRectFunc(void*    aFrame,
                 void*    aPropertyValue,
                 void*    aDtorData)
 {
-  delete NS_STATIC_CAST(nsRect*, aPropertyValue);
+  delete static_cast<nsRect*>(aPropertyValue);
 }
 
 static void MarkFrameForDisplay(nsIFrame* aFrame, nsIFrame* aStopAtFrame) {
@@ -268,9 +268,9 @@ nsDisplayList::OptimizeVisibility(nsDisplayListBuilder* aBuilder,
   FlattenTo(&elements);
   
   for (PRInt32 i = elements.Count() - 1; i >= 0; --i) {
-    nsDisplayItem* item = NS_STATIC_CAST(nsDisplayItem*, elements.ElementAt(i));
+    nsDisplayItem* item = static_cast<nsDisplayItem*>(elements.ElementAt(i));
     nsDisplayItem* belowItem = i < 1 ? nsnull :
-      NS_STATIC_CAST(nsDisplayItem*, elements.ElementAt(i - 1));
+      static_cast<nsDisplayItem*>(elements.ElementAt(i - 1));
 
     if (belowItem && item->TryMerge(aBuilder, belowItem)) {
       belowItem->~nsDisplayItem();
@@ -336,7 +336,7 @@ nsIFrame* nsDisplayList::HitTest(nsDisplayListBuilder* aBuilder, nsPoint aPt) co
     elements.AppendElement(item);
   }
   for (PRInt32 i = elements.Count() - 1; i >= 0; --i) {
-    item = NS_STATIC_CAST(nsDisplayItem*, elements.ElementAt(i));
+    item = static_cast<nsDisplayItem*>(elements.ElementAt(i));
     if (item->GetBounds(aBuilder).Contains(aPt)) {
       nsIFrame* f = item->HitTest(aBuilder, aPt);
       // Handle the XUL 'mousethrough' feature.
@@ -395,7 +395,7 @@ static PRBool IsContentLEQ(nsDisplayItem* aItem1, nsDisplayItem* aItem2,
   return nsLayoutUtils::CompareTreePosition(
       aItem1->GetUnderlyingFrame()->GetContent(),
       aItem2->GetUnderlyingFrame()->GetContent(),
-      NS_STATIC_CAST(nsIContent*, aClosure)) <= 0;
+      static_cast<nsIContent*>(aClosure)) <= 0;
 }
 
 static PRBool IsZOrderLEQ(nsDisplayItem* aItem1, nsDisplayItem* aItem2,
@@ -432,7 +432,7 @@ void nsDisplayList::ExplodeAnonymousChildLists(nsDisplayListBuilder* aBuilder) {
       list->ExplodeAnonymousChildLists(aBuilder);
       nsDisplayItem* j;
       while ((j = list->RemoveBottom()) != nsnull) {
-        tmp.AppendToTop(NS_STATIC_CAST(nsDisplayWrapList*, i)->
+        tmp.AppendToTop(static_cast<nsDisplayWrapList*>(i)->
             WrapWithClone(aBuilder, j));
       }
       i->~nsDisplayItem();
@@ -827,7 +827,7 @@ PRBool nsDisplayOpacity::TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem*
   // aItem->GetUnderlyingFrame() returns non-null because it's nsDisplayOpacity
   if (aItem->GetUnderlyingFrame()->GetContent() != mFrame->GetContent())
     return PR_FALSE;
-  mList.AppendToBottom(&NS_STATIC_CAST(nsDisplayOpacity*, aItem)->mList);
+  mList.AppendToBottom(&static_cast<nsDisplayOpacity*>(aItem)->mList);
   return PR_TRUE;
 }
 
@@ -881,7 +881,7 @@ PRBool nsDisplayClip::TryMerge(nsDisplayListBuilder* aBuilder,
                                nsDisplayItem* aItem) {
   if (aItem->GetType() != TYPE_CLIP)
     return PR_FALSE;
-  nsDisplayClip* other = NS_STATIC_CAST(nsDisplayClip*, aItem);
+  nsDisplayClip* other = static_cast<nsDisplayClip*>(aItem);
   if (other->mClip != mClip)
     return PR_FALSE;
   mList.AppendToBottom(&other->mList);
diff --git a/mozilla/layout/base/nsDisplayList.h b/mozilla/layout/base/nsDisplayList.h
index e8fe8090f34..b4d3e4ec030 100644
--- a/mozilla/layout/base/nsDisplayList.h
+++ b/mozilla/layout/base/nsDisplayList.h
@@ -580,7 +580,7 @@ public:
    * @return the item at the top of the list, or null if the list is empty
    */
   nsDisplayItem* GetTop() const {
-    return mTop != &mSentinel ? NS_STATIC_CAST(nsDisplayItem*, mTop) : nsnull;
+    return mTop != &mSentinel ? static_cast<nsDisplayItem*>(mTop) : nsnull;
   }
   /**
    * @return the item at the bottom of the list, or null if the list is empty
diff --git a/mozilla/layout/base/nsDocumentViewer.cpp b/mozilla/layout/base/nsDocumentViewer.cpp
index 8f8f8866da7..ca677c76152 100644
--- a/mozilla/layout/base/nsDocumentViewer.cpp
+++ b/mozilla/layout/base/nsDocumentViewer.cpp
@@ -2006,7 +2006,7 @@ DocumentViewerImpl::RequestWindowClose(PRBool* aCanClose)
 PR_STATIC_CALLBACK(PRBool)
 AppendAgentSheet(nsIStyleSheet *aSheet, void *aData)
 {
-  nsStyleSet *styleSet = NS_STATIC_CAST(nsStyleSet*, aData);
+  nsStyleSet *styleSet = static_cast<nsStyleSet*>(aData);
   styleSet->AppendStyleSheet(nsStyleSet::eAgentSheet, aSheet);
   return PR_TRUE;
 }
@@ -2014,7 +2014,7 @@ AppendAgentSheet(nsIStyleSheet *aSheet, void *aData)
 PR_STATIC_CALLBACK(PRBool)
 PrependUserSheet(nsIStyleSheet *aSheet, void *aData)
 {
-  nsStyleSet *styleSet = NS_STATIC_CAST(nsStyleSet*, aData);
+  nsStyleSet *styleSet = static_cast<nsStyleSet*>(aData);
   styleSet->PrependStyleSheet(nsStyleSet::eUserSheet, aSheet);
   return PR_TRUE;
 }
@@ -2574,7 +2574,7 @@ DocumentViewerImpl::GetTextZoom(float* aTextZoom)
 static void
 SetChildAuthorStyleDisabled(nsIMarkupDocumentViewer* aChild, void* aClosure)
 {
-  PRBool styleDisabled  = *NS_STATIC_CAST(PRBool*, aClosure);
+  PRBool styleDisabled  = *static_cast<PRBool*>(aClosure);
   aChild->SetAuthorStyleDisabled(styleDisabled);
 }
 
@@ -2622,7 +2622,7 @@ DocumentViewerImpl::GetDefaultCharacterSet(nsACString& aDefaultCharacterSet)
 static void
 SetChildDefaultCharacterSet(nsIMarkupDocumentViewer* aChild, void* aClosure)
 {
-  const nsACString* charset = NS_STATIC_CAST(nsACString*, aClosure);
+  const nsACString* charset = static_cast<nsACString*>(aClosure);
   aChild->SetDefaultCharacterSet(*charset);
 }
 
@@ -2647,7 +2647,7 @@ NS_IMETHODIMP DocumentViewerImpl::GetForceCharacterSet(nsACString& aForceCharact
 static void
 SetChildForceCharacterSet(nsIMarkupDocumentViewer* aChild, void* aClosure)
 {
-  const nsACString* charset = NS_STATIC_CAST(nsACString*, aClosure);
+  const nsACString* charset = static_cast<nsACString*>(aClosure);
   aChild->SetForceCharacterSet(*charset);
 }
 
@@ -2695,7 +2695,7 @@ NS_IMETHODIMP DocumentViewerImpl::GetPrevDocCharacterSet(nsACString& aPrevDocCha
 static void
 SetChildPrevDocCharacterSet(nsIMarkupDocumentViewer* aChild, void* aClosure)
 {
-  const nsACString* charset = NS_STATIC_CAST(nsACString*, aClosure);
+  const nsACString* charset = static_cast<nsACString*>(aClosure);
   aChild->SetPrevDocCharacterSet(*charset);
 }
 
@@ -2728,7 +2728,7 @@ DocumentViewerImpl::SetHintCharacterSetSource(PRInt32 aHintCharacterSetSource)
 static void
 SetChildHintCharacterSet(nsIMarkupDocumentViewer* aChild, void* aClosure)
 {
-  const nsACString* charset = NS_STATIC_CAST(nsACString*, aClosure);
+  const nsACString* charset = static_cast<nsACString*>(aClosure);
   aChild->SetHintCharacterSet(*charset);
 }
 
diff --git a/mozilla/layout/base/nsFrameManager.cpp b/mozilla/layout/base/nsFrameManager.cpp
index 620208c91fd..6360130b4e0 100644
--- a/mozilla/layout/base/nsFrameManager.cpp
+++ b/mozilla/layout/base/nsFrameManager.cpp
@@ -128,7 +128,7 @@ PlaceholderMapMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr,
                          const void *key)
 {
   const PlaceholderMapEntry *entry =
-    NS_STATIC_CAST(const PlaceholderMapEntry*, hdr);
+    static_cast<const PlaceholderMapEntry*>(hdr);
   NS_ASSERTION(entry->placeholderFrame->GetOutOfFlowFrame() !=
                (void*)0xdddddddd,
                "Dead placeholder in placeholder map");
@@ -165,7 +165,7 @@ PrimaryFrameMapMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr,
                          const void *key)
 {
   const PrimaryFrameMapEntry *entry =
-    NS_STATIC_CAST(const PrimaryFrameMapEntry*, hdr);
+    static_cast<const PrimaryFrameMapEntry*>(hdr);
   return entry->frame->GetContent() == key;
 }
 
@@ -335,8 +335,8 @@ nsFrameManager::GetPrimaryFrameFor(nsIContent* aContent,
   }
 
   if (mPrimaryFrameMap.ops) {
-    PrimaryFrameMapEntry *entry = NS_STATIC_CAST(PrimaryFrameMapEntry*,
-        PL_DHashTableOperate(&mPrimaryFrameMap, aContent, PL_DHASH_LOOKUP));
+    PrimaryFrameMapEntry *entry = static_cast<PrimaryFrameMapEntry*>
+                                             (PL_DHashTableOperate(&mPrimaryFrameMap, aContent, PL_DHASH_LOOKUP));
     if (PL_DHASH_ENTRY_IS_BUSY(entry)) {
       return entry->frame;
     }
@@ -374,8 +374,8 @@ nsFrameManager::GetPrimaryFrameFor(nsIContent* aContent,
                   prevSibling->IsNodeOfType(nsINode::eCOMMENT) ||
                   prevSibling->IsNodeOfType(nsINode::ePROCESSING_INSTRUCTION)));
         if (prevSibling) {
-          entry = NS_STATIC_CAST(PrimaryFrameMapEntry*,
-                          PL_DHashTableOperate(&mPrimaryFrameMap, prevSibling,
+          entry = static_cast<PrimaryFrameMapEntry*>
+                             (PL_DHashTableOperate(&mPrimaryFrameMap, prevSibling,
                                                PL_DHASH_LOOKUP));
           if (PL_DHASH_ENTRY_IS_BUSY(entry))
             hint.mPrimaryFrameForPrevSibling = entry->frame;
@@ -421,8 +421,8 @@ nsFrameManager::SetPrimaryFrameFor(nsIContent* aContent,
   }
 
   // Add a mapping to the hash table
-  PrimaryFrameMapEntry *entry = NS_STATIC_CAST(PrimaryFrameMapEntry*,
-      PL_DHashTableOperate(&mPrimaryFrameMap, aContent, PL_DHASH_ADD));
+  PrimaryFrameMapEntry *entry = static_cast<PrimaryFrameMapEntry*>
+                                           (PL_DHashTableOperate(&mPrimaryFrameMap, aContent, PL_DHASH_ADD));
 #ifdef DEBUG_dbaron
   if (entry->frame) {
     NS_WARNING("already have primary frame for content");
@@ -440,8 +440,8 @@ nsFrameManager::RemoveAsPrimaryFrame(nsIContent* aContent,
 {
   NS_PRECONDITION(aPrimaryFrame, "Must have a frame");
   if (aContent && mPrimaryFrameMap.ops) {
-    PrimaryFrameMapEntry *entry = NS_STATIC_CAST(PrimaryFrameMapEntry*,
-        PL_DHashTableOperate(&mPrimaryFrameMap, aContent, PL_DHASH_LOOKUP));
+    PrimaryFrameMapEntry *entry = static_cast<PrimaryFrameMapEntry*>
+                                             (PL_DHashTableOperate(&mPrimaryFrameMap, aContent, PL_DHASH_LOOKUP));
     if (PL_DHASH_ENTRY_IS_BUSY(entry) && entry->frame == aPrimaryFrame) {
       // Don't use PL_DHashTableRawRemove, since we want the table to
       // shrink as needed.
@@ -468,8 +468,8 @@ nsFrameManager::GetPlaceholderFrameFor(nsIFrame*  aFrame)
   NS_PRECONDITION(aFrame, "null param unexpected");
 
   if (mPlaceholderMap.ops) {
-    PlaceholderMapEntry *entry = NS_STATIC_CAST(PlaceholderMapEntry*,
-           PL_DHashTableOperate(NS_CONST_CAST(PLDHashTable*, &mPlaceholderMap),
+    PlaceholderMapEntry *entry = static_cast<PlaceholderMapEntry*>
+                                            (PL_DHashTableOperate(const_cast<PLDHashTable*>(&mPlaceholderMap),
                                 aFrame, PL_DHASH_LOOKUP));
     if (PL_DHASH_ENTRY_IS_BUSY(entry)) {
       return entry->placeholderFrame;
@@ -492,8 +492,7 @@ nsFrameManager::RegisterPlaceholderFrame(nsPlaceholderFrame* aPlaceholderFrame)
       return NS_ERROR_OUT_OF_MEMORY;
     }
   }
-  PlaceholderMapEntry *entry = NS_STATIC_CAST(PlaceholderMapEntry*, 
-         PL_DHashTableOperate(&mPlaceholderMap,
+  PlaceholderMapEntry *entry = static_cast<PlaceholderMapEntry*>(PL_DHashTableOperate(&mPlaceholderMap,
                               aPlaceholderFrame->GetOutOfFlowFrame(),
                               PL_DHASH_ADD));
   if (!entry)
@@ -523,7 +522,7 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 UnregisterPlaceholders(PLDHashTable* table, PLDHashEntryHdr* hdr,
                        PRUint32 number, void* arg)
 {
-  PlaceholderMapEntry* entry = NS_STATIC_CAST(PlaceholderMapEntry*, hdr);
+  PlaceholderMapEntry* entry = static_cast<PlaceholderMapEntry*>(hdr);
   entry->placeholderFrame->SetOutOfFlowFrame(nsnull);
   return PL_DHASH_NEXT;
 }
@@ -701,8 +700,8 @@ nsFrameManager::NotifyDestroyingFrame(nsIFrame* aFrame)
   // during frame destruction, since this problem keeps coming back to
   // bite us.  We may want to remove the previous caller.
   if (mPrimaryFrameMap.ops) {
-    PrimaryFrameMapEntry *entry = NS_STATIC_CAST(PrimaryFrameMapEntry*,
-        PL_DHashTableOperate(&mPrimaryFrameMap, aFrame->GetContent(), PL_DHASH_LOOKUP));
+    PrimaryFrameMapEntry *entry = static_cast<PrimaryFrameMapEntry*>
+                                             (PL_DHashTableOperate(&mPrimaryFrameMap, aFrame->GetContent(), PL_DHASH_LOOKUP));
     if (PL_DHASH_ENTRY_IS_BUSY(entry) && entry->frame == aFrame) {
       NS_NOTREACHED("frame was not removed from primary frame map before "
                     "destruction or was readded to map after being removed");
@@ -724,10 +723,10 @@ DumpContext(nsIFrame* aFrame, nsStyleContext* aContext)
       frameDebug->GetFrameName(name);
       fputs(NS_LossyConvertUTF16toASCII(name).get(), stdout);
     }
-    fprintf(stdout, " (%p)", NS_STATIC_CAST(void*, aFrame));
+    fprintf(stdout, " (%p)", static_cast<void*>(aFrame));
   }
   if (aContext) {
-    fprintf(stdout, " style: %p ", NS_STATIC_CAST(void*, aContext));
+    fprintf(stdout, " style: %p ", static_cast<void*>(aContext));
 
     nsIAtom* pseudoTag = aContext->GetPseudoType();
     if (pseudoTag) {
@@ -980,7 +979,7 @@ nsFrameManager::ReParentStyleContext(nsIFrame* aFrame)
         // oldContext)" check will prevent us from redoing work.
         if ((aFrame->GetStateBits() & NS_FRAME_IS_SPECIAL) &&
             !aFrame->GetPrevInFlow()) {
-          nsIFrame* sib = NS_STATIC_CAST(nsIFrame*, aFrame->GetProperty(nsGkAtoms::IBSplitSpecialSibling));
+          nsIFrame* sib = static_cast<nsIFrame*>(aFrame->GetProperty(nsGkAtoms::IBSplitSpecialSibling));
           if (sib) {
             ReParentStyleContext(sib);
           }
@@ -1238,8 +1237,8 @@ nsFrameManager::ReResolveStyleContext(nsPresContext    *aPresContext,
           if (display->mDisplay != NS_STYLE_DISPLAY_NONE) {
             aChangeList->AppendChange(nsnull,
                                       undisplayed->mContent
-                                      ? NS_STATIC_CAST(nsIContent*,
-                                                       undisplayed->mContent)
+                                      ? static_cast<nsIContent*>
+                                                   (undisplayed->mContent)
                                       : localContent, 
                                       NS_STYLE_HINT_FRAMECHANGE);
             // The node should be removed from the undisplayed map when
@@ -1436,8 +1435,8 @@ nsFrameManager::ComputeStyleChangeFor(nsIFrame          *aFrame,
       return topLevelChange;
     }
     
-    frame2 = NS_STATIC_CAST(nsIFrame*,
-         propTable->GetProperty(frame2, nsGkAtoms::IBSplitSpecialSibling));
+    frame2 = static_cast<nsIFrame*>
+                        (propTable->GetProperty(frame2, nsGkAtoms::IBSplitSpecialSibling));
     frame = frame2;
   } while (frame2);
   return topLevelChange;
diff --git a/mozilla/layout/base/nsFrameTraversal.cpp b/mozilla/layout/base/nsFrameTraversal.cpp
index bc9e50bca4f..811485f9564 100644
--- a/mozilla/layout/base/nsFrameTraversal.cpp
+++ b/mozilla/layout/base/nsFrameTraversal.cpp
@@ -183,7 +183,7 @@ NS_NewFrameTraversal(nsIBidirectionalEnumerator **aEnumerator,
   }
   if (!trav)
     return NS_ERROR_OUT_OF_MEMORY;
-  *aEnumerator = NS_STATIC_CAST(nsIBidirectionalEnumerator*, trav);
+  *aEnumerator = static_cast<nsIBidirectionalEnumerator*>(trav);
   NS_ADDREF(trav);
   return NS_OK;
 }
@@ -209,7 +209,7 @@ NS_IMETHODIMP
                                      PRBool aFollowOOFs)
 {
   return NS_NewFrameTraversal(aEnumerator, aPresContext, aStart,
-                              NS_STATIC_CAST(nsIteratorType, aType),
+                              static_cast<nsIteratorType>(aType),
                               aVisual, aLockInScrollView, aFollowOOFs);  
 }
 
diff --git a/mozilla/layout/base/nsGenConList.h b/mozilla/layout/base/nsGenConList.h
index 30ea8768051..776e6490075 100644
--- a/mozilla/layout/base/nsGenConList.h
+++ b/mozilla/layout/base/nsGenConList.h
@@ -95,10 +95,10 @@ public:
   ~nsGenConList() { Clear(); }
   void Clear();
   static nsGenConNode* Next(nsGenConNode* aNode) {
-    return NS_STATIC_CAST(nsGenConNode*, PR_NEXT_LINK(aNode));
+    return static_cast<nsGenConNode*>(PR_NEXT_LINK(aNode));
   }
   static nsGenConNode* Prev(nsGenConNode* aNode) {
-    return NS_STATIC_CAST(nsGenConNode*, PR_PREV_LINK(aNode));
+    return static_cast<nsGenConNode*>(PR_PREV_LINK(aNode));
   }
   void Insert(nsGenConNode* aNode);
   // returns whether any nodes have been destroyed
diff --git a/mozilla/layout/base/nsIPresShell.h b/mozilla/layout/base/nsIPresShell.h
index 049e055d989..a713e35a17a 100644
--- a/mozilla/layout/base/nsIPresShell.h
+++ b/mozilla/layout/base/nsIPresShell.h
@@ -205,8 +205,8 @@ public:
   }
 
   nsFrameManager* FrameManager() const {
-    return NS_REINTERPRET_CAST(nsFrameManager*,
-      &NS_CONST_CAST(nsIPresShell*, this)->mFrameManager);
+    return reinterpret_cast<nsFrameManager*>
+                           (&const_cast<nsIPresShell*>(this)->mFrameManager);
   }
 
 #endif
diff --git a/mozilla/layout/base/nsLayoutDebugger.cpp b/mozilla/layout/base/nsLayoutDebugger.cpp
index 884a81ed315..eaec77eee98 100644
--- a/mozilla/layout/base/nsLayoutDebugger.cpp
+++ b/mozilla/layout/base/nsLayoutDebugger.cpp
@@ -170,7 +170,7 @@ PrintDisplayListTo(nsDisplayListBuilder* aBuilder, const nsDisplayList& aList,
     nsRect rect = i->GetBounds(aBuilder);
     switch (i->GetType()) {
       case nsDisplayItem::TYPE_CLIP: {
-        nsDisplayClip* c = NS_STATIC_CAST(nsDisplayClip*, i);
+        nsDisplayClip* c = static_cast<nsDisplayClip*>(i);
         rect = c->GetClipRect();
         break;
       }
diff --git a/mozilla/layout/base/nsLayoutUtils.cpp b/mozilla/layout/base/nsLayoutUtils.cpp
index 6ba589bba91..c59eea4d254 100644
--- a/mozilla/layout/base/nsLayoutUtils.cpp
+++ b/mozilla/layout/base/nsLayoutUtils.cpp
@@ -248,7 +248,7 @@ nsLayoutUtils::GetCrossDocParentFrame(nsIFrame* aFrame)
   v = v->GetParent(); // subdocumentframe's view
   if (!v)
     return nsnull;
-  return NS_STATIC_CAST(nsIFrame*, v->GetClientData());
+  return static_cast<nsIFrame*>(v->GetClientData());
 }
 
 // static
@@ -332,8 +332,8 @@ nsLayoutUtils::DoCompareTreePosition(nsIContent* aContent1,
   nsINode* content1Ancestor = nsnull;
   nsINode* content2Ancestor = nsnull;
   while (last1 >= 0 && last2 >= 0
-         && ((content1Ancestor = NS_STATIC_CAST(nsINode*, content1Ancestors.ElementAt(last1)))
-             == (content2Ancestor = NS_STATIC_CAST(nsINode*, content2Ancestors.ElementAt(last2))))) {
+         && ((content1Ancestor = static_cast<nsINode*>(content1Ancestors.ElementAt(last1)))
+             == (content2Ancestor = static_cast<nsINode*>(content2Ancestors.ElementAt(last2))))) {
     last1--;
     last2--;
   }
@@ -475,16 +475,16 @@ nsIFrame* nsLayoutUtils::GetLastSibling(nsIFrame* aFrame) {
 // static
 nsIView*
 nsLayoutUtils::FindSiblingViewFor(nsIView* aParentView, nsIFrame* aFrame) {
-  nsIFrame* parentViewFrame = NS_STATIC_CAST(nsIFrame*, aParentView->GetClientData());
+  nsIFrame* parentViewFrame = static_cast<nsIFrame*>(aParentView->GetClientData());
   nsIContent* parentViewContent = parentViewFrame ? parentViewFrame->GetContent() : nsnull;
   for (nsIView* insertBefore = aParentView->GetFirstChild(); insertBefore;
        insertBefore = insertBefore->GetNextSibling()) {
-    nsIFrame* f = NS_STATIC_CAST(nsIFrame*, insertBefore->GetClientData());
+    nsIFrame* f = static_cast<nsIFrame*>(insertBefore->GetClientData());
     if (!f) {
       // this view could be some anonymous view attached to a meaningful parent
       for (nsIView* searchView = insertBefore->GetParent(); searchView;
            searchView = searchView->GetParent()) {
-        f = NS_STATIC_CAST(nsIFrame*, searchView->GetClientData());
+        f = static_cast<nsIFrame*>(searchView->GetClientData());
         if (f) {
           break;
         }
@@ -598,7 +598,7 @@ nsLayoutUtils::GetEventCoordinatesRelativeTo(const nsEvent* aEvent, nsIFrame* aF
                   aEvent->eventStructType != NS_MOUSE_SCROLL_EVENT))
     return nsPoint(NS_UNCONSTRAINEDSIZE, NS_UNCONSTRAINEDSIZE);
 
-  const nsGUIEvent* GUIEvent = NS_STATIC_CAST(const nsGUIEvent*, aEvent);
+  const nsGUIEvent* GUIEvent = static_cast<const nsGUIEvent*>(aEvent);
   if (!GUIEvent->widget)
     return nsPoint(NS_UNCONSTRAINEDSIZE, NS_UNCONSTRAINEDSIZE);
 
@@ -608,7 +608,7 @@ nsLayoutUtils::GetEventCoordinatesRelativeTo(const nsEvent* aEvent, nsIFrame* aF
   for (nsIFrame* f = aFrame; f; f = GetCrossDocParentFrame(f)) {
 #ifdef MOZ_SVG_FOREIGNOBJECT
     if (f->IsFrameOfType(nsIFrame::eSVGForeignObject) && f->GetFirstChild(nsnull)) {
-      nsSVGForeignObjectFrame* fo = NS_STATIC_CAST(nsSVGForeignObjectFrame*, f);
+      nsSVGForeignObjectFrame* fo = static_cast<nsSVGForeignObjectFrame*>(f);
       nsIFrame* outer = nsSVGUtils::GetOuterSVGFrame(fo);
       return fo->TransformPointFromOuter(
           GetEventCoordinatesRelativeTo(aEvent, outer)) -
@@ -641,7 +641,7 @@ nsLayoutUtils::GetEventCoordinatesForNearestView(nsEvent* aEvent,
                   aEvent->eventStructType != NS_MOUSE_SCROLL_EVENT))
     return nsPoint(NS_UNCONSTRAINEDSIZE, NS_UNCONSTRAINEDSIZE);
 
-  nsGUIEvent* GUIEvent = NS_STATIC_CAST(nsGUIEvent*, aEvent);
+  nsGUIEvent* GUIEvent = static_cast<nsGUIEvent*>(aEvent);
   if (!GUIEvent->widget)
     return nsPoint(NS_UNCONSTRAINEDSIZE, NS_UNCONSTRAINEDSIZE);
 
@@ -850,7 +850,7 @@ AddItemsToRegion(nsDisplayListBuilder* aBuilder, nsDisplayList* aList,
     if (sublist) {
       if (item->GetType() == nsDisplayItem::TYPE_CLIP) {
         nsRect clip;
-        clip.IntersectRect(aClipRect, NS_STATIC_CAST(nsDisplayClip*, item)->GetClipRect());
+        clip.IntersectRect(aClipRect, static_cast<nsDisplayClip*>(item)->GetClipRect());
         AddItemsToRegion(aBuilder, sublist, aRect, clip, aDelta, aRegion);
       } else {
         // opacity, or a generic sublist
@@ -1148,7 +1148,7 @@ nsLayoutUtils::GetClosestCommonAncestorViaPlaceholders(nsIFrame* aFrame1,
   PRInt32 last1 = frame1Ancestors.Count() - 1;
   PRInt32 last2 = frame2Ancestors.Count() - 1;
   while (last1 >= 0 && last2 >= 0) {
-    nsIFrame* frame1 = NS_STATIC_CAST(nsIFrame*, frame1Ancestors.ElementAt(last1));
+    nsIFrame* frame1 = static_cast<nsIFrame*>(frame1Ancestors.ElementAt(last1));
     if (frame1 != frame2Ancestors.ElementAt(last2))
       break;
     lastCommonFrame = frame1;
@@ -1171,7 +1171,7 @@ nsLayoutUtils::GetNextContinuationOrSpecialSibling(nsIFrame *aFrame)
     aFrame = aFrame->GetFirstInFlow();
 
     void* value = aFrame->GetProperty(nsGkAtoms::IBSplitSpecialSibling);
-    return NS_STATIC_CAST(nsIFrame*, value);
+    return static_cast<nsIFrame*>(value);
   }
 
   return nsnull;
@@ -1356,7 +1356,7 @@ nsLayoutUtils::IntrinsicForContainer(nsIRenderingContext *aRenderingContext,
 
 #ifdef DEBUG_INTRINSIC_WIDTH
   nsFrame::IndentBy(stdout, gNoiseIndent);
-  NS_STATIC_CAST(nsFrame*, aFrame)->ListTag(stdout);
+  static_cast<nsFrame*>(aFrame)->ListTag(stdout);
   printf(" %s intrinsic width for container:\n",
          aType == MIN_WIDTH ? "min" : "pref");
 #endif
@@ -1407,7 +1407,7 @@ nsLayoutUtils::IntrinsicForContainer(nsIRenderingContext *aRenderingContext,
 #ifdef DEBUG_INTRINSIC_WIDTH
     --gNoiseIndent;
     nsFrame::IndentBy(stdout, gNoiseIndent);
-    NS_STATIC_CAST(nsFrame*, aFrame)->ListTag(stdout);
+    static_cast<nsFrame*>(aFrame)->ListTag(stdout);
     printf(" %s intrinsic width from frame is %d.\n",
            aType == MIN_WIDTH ? "min" : "pref", result);
 #endif
@@ -1553,7 +1553,7 @@ nsLayoutUtils::IntrinsicForContainer(nsIRenderingContext *aRenderingContext,
 
 #ifdef DEBUG_INTRINSIC_WIDTH
   nsFrame::IndentBy(stdout, gNoiseIndent);
-  NS_STATIC_CAST(nsFrame*, aFrame)->ListTag(stdout);
+  static_cast<nsFrame*>(aFrame)->ListTag(stdout);
   printf(" %s intrinsic width for container is %d twips.\n",
          aType == MIN_WIDTH ? "min" : "pref", result);
 #endif
@@ -1975,7 +1975,7 @@ nsLayoutUtils::GetStringWidth(const nsIFrame*      aFrame,
 nsLayoutUtils::GetFirstLineBaseline(const nsIFrame* aFrame, nscoord* aResult)
 {
   const nsBlockFrame* block;
-  if (NS_FAILED(NS_CONST_CAST(nsIFrame*, aFrame)->
+  if (NS_FAILED(const_cast<nsIFrame*>(aFrame)->
                   QueryInterface(kBlockFrameCID, (void**)&block))) {
     // For the first-line baseline we also have to check for a table, and if
     // so, use the baseline of its first row.
@@ -1988,8 +1988,8 @@ nsLayoutUtils::GetFirstLineBaseline(const nsIFrame* aFrame, nscoord* aResult)
     // For first-line baselines, we have to consider scroll frames.
     if (fType == nsGkAtoms::scrollFrame) {
       nsIScrollableFrame *sFrame;
-      if (NS_FAILED(CallQueryInterface(NS_CONST_CAST(nsIFrame*,
-                                         aFrame), &sFrame)) || !sFrame) {
+      if (NS_FAILED(CallQueryInterface(const_cast<nsIFrame*>
+                                                 (aFrame), &sFrame)) || !sFrame) {
         NS_NOTREACHED("not scroll frame");
       }
       nscoord kidBaseline;
@@ -2033,7 +2033,7 @@ nsLayoutUtils::GetFirstLineBaseline(const nsIFrame* aFrame, nscoord* aResult)
 nsLayoutUtils::GetLastLineBaseline(const nsIFrame* aFrame, nscoord* aResult)
 {
   const nsBlockFrame* block;
-  if (NS_FAILED(NS_CONST_CAST(nsIFrame*, aFrame)->
+  if (NS_FAILED(const_cast<nsIFrame*>(aFrame)->
                   QueryInterface(kBlockFrameCID, (void**)&block)))
     // No baseline.  (We intentionally don't descend into scroll frames.)
     return PR_FALSE;
@@ -2123,8 +2123,8 @@ nsLayoutUtils::DrawImage(nsIRenderingContext* aRenderingContext,
   aRenderingContext->GetDeviceContext(*getter_AddRefs(dc));
   PRInt32 d2a = dc->AppUnitsPerDevPixel();
 
-  nsRefPtr<gfxContext> ctx = NS_STATIC_CAST(gfxContext*,
-    aRenderingContext->GetNativeGraphicData(
+  nsRefPtr<gfxContext> ctx = static_cast<gfxContext*>
+                                        (aRenderingContext->GetNativeGraphicData(
       nsIRenderingContext::NATIVE_THEBES_CONTEXT));
 
   // the dest rect is affected by the current transform; that'll be
diff --git a/mozilla/layout/base/nsLayoutUtils.h b/mozilla/layout/base/nsLayoutUtils.h
index 24d860bffc5..aa4fdd60421 100644
--- a/mozilla/layout/base/nsLayoutUtils.h
+++ b/mozilla/layout/base/nsLayoutUtils.h
@@ -244,7 +244,7 @@ public:
     * @return the root frame for the view
     */
   static nsIFrame* GetFrameFor(nsIView *aView)
-  { return NS_STATIC_CAST(nsIFrame*, aView->GetClientData()); }
+  { return static_cast<nsIFrame*>(aView->GetClientData()); }
   
   /**
     * GetScrollableFrameFor returns the scrollable frame for a scrollable view
diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp
index 0bdcf10fa04..b280dc268d8 100644
--- a/mozilla/layout/base/nsPresShell.cpp
+++ b/mozilla/layout/base/nsPresShell.cpp
@@ -2455,7 +2455,7 @@ PresShell::InitialReflow(nscoord aWidth, nscoord aHeight)
 void
 PresShell::sPaintSuppressionCallback(nsITimer *aTimer, void* aPresShell)
 {
-  PresShell* self = NS_STATIC_CAST(PresShell*, aPresShell);
+  PresShell* self = static_cast<PresShell*>(aPresShell);
   if (self)
     self->UnsuppressPainting();
 }
@@ -2538,7 +2538,7 @@ PresShell::KillResizeEventTimer()
 void
 PresShell::sResizeEventCallback(nsITimer *aTimer, void* aPresShell)
 {
-  PresShell* self = NS_STATIC_CAST(PresShell*, aPresShell);
+  PresShell* self = static_cast<PresShell*>(aPresShell);
   if (self) {
     self->FireResizeEvent();  
   }
@@ -3130,7 +3130,7 @@ PresShell::FrameNeedsReflow(nsIFrame *aFrame, IntrinsicDirty aIntrinsicDirty,
 
     while (stack.Count() != 0) {
       nsIFrame *f =
-        NS_STATIC_CAST(nsIFrame*, stack.FastElementAt(stack.Count() - 1));
+        static_cast<nsIFrame*>(stack.FastElementAt(stack.Count() - 1));
       stack.RemoveElementAt(stack.Count() - 1);
 
       PRInt32 childListIndex = 0;
@@ -4633,8 +4633,8 @@ PresShell::ComputeRepaintRegionForCopy(nsIView*      aRootView,
                                        nsRegion*     aRepaintRegion)
 {
   return nsLayoutUtils::ComputeRepaintRegionForCopy(
-      NS_STATIC_CAST(nsIFrame*, aRootView->GetClientData()),
-      NS_STATIC_CAST(nsIFrame*, aMovingView->GetClientData()),
+      static_cast<nsIFrame*>(aRootView->GetClientData()),
+      static_cast<nsIFrame*>(aMovingView->GetClientData()),
       aDelta, aCopyRect, aRepaintRegion);
 }
 
@@ -4842,7 +4842,7 @@ PresShell::CreateRangePaintInfo(nsIDOMRange* aRange,
     if (!ancestor || !ancestor->IsNodeOfType(nsINode::eCONTENT))
       return nsnull;
 
-    nsIContent* ancestorContent = NS_STATIC_CAST(nsIContent*, ancestor);
+    nsIContent* ancestorContent = static_cast<nsIContent*>(ancestor);
     ancestorFrame = GetPrimaryFrameFor(ancestorContent);
 
     // use the nearest ancestor frame that includes all continuations as the
@@ -5101,7 +5101,7 @@ PresShell::Paint(nsIView*             aView,
 
   NS_ASSERTION(!(nsnull == aView), "null view");
 
-  frame = NS_STATIC_CAST(nsIFrame*, aView->GetClientData());
+  frame = static_cast<nsIFrame*>(aView->GetClientData());
   nscolor backgroundColor;
   mViewManager->GetDefaultBackgroundColor(&backgroundColor);
   for (nsIView *view = aView; view; view = view->GetParent()) {
@@ -5290,7 +5290,7 @@ PresShell::HandleEvent(nsIView         *aView,
     return NS_OK;
   }
   
-  nsIFrame* frame = NS_STATIC_CAST(nsIFrame*, aView->GetClientData());
+  nsIFrame* frame = static_cast<nsIFrame*>(aView->GetClientData());
 
   PRBool dispatchUsingCoordinates =
       !NS_IS_KEY_EVENT(aEvent) && !NS_IS_IME_EVENT(aEvent) &&
@@ -5308,7 +5308,7 @@ PresShell::HandleEvent(nsIView         *aView,
     
     if (targetView) {
       aView = targetView;
-      frame = NS_STATIC_CAST(nsIFrame*, aView->GetClientData());
+      frame = static_cast<nsIFrame*>(aView->GetClientData());
     }
   }
 
@@ -5345,7 +5345,7 @@ PresShell::HandleEvent(nsIView         *aView,
     nsIFrame* targetFrame = nsLayoutUtils::GetFrameForPoint(frame, eventPoint);
     if (targetFrame) {
       PresShell* shell =
-          NS_STATIC_CAST(PresShell*, targetFrame->PresContext()->PresShell());
+          static_cast<PresShell*>(targetFrame->PresContext()->PresShell());
       if (shell != this) {
         // Handle the event in the correct shell.
         // Prevent deletion until we're done with event handling (bug 336582).
@@ -5547,7 +5547,7 @@ inline PRBool
 IsSynthesizedMouseMove(nsEvent* aEvent)
 {
   return aEvent->eventStructType == NS_MOUSE_EVENT &&
-         NS_STATIC_CAST(nsMouseEvent*, aEvent)->reason != nsMouseEvent::eReal;
+         static_cast<nsMouseEvent*>(aEvent)->reason != nsMouseEvent::eReal;
 }
 
 nsresult
@@ -5557,7 +5557,7 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView,
 #ifdef ACCESSIBILITY
   if (aEvent->eventStructType == NS_ACCESSIBLE_EVENT)
   {
-    NS_STATIC_CAST(nsAccessibleEvent*, aEvent)->accessible = nsnull;
+    static_cast<nsAccessibleEvent*>(aEvent)->accessible = nsnull;
     nsCOMPtr<nsIAccessibilityService> accService = 
       do_GetService("@mozilla.org/accessibilityService;1");
     if (accService) {
@@ -5574,7 +5574,7 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView,
       // Addref this - it's not a COM Ptr
       // We'll make sure the right number of Addref's occur before
       // handing this back to the accessibility client
-      NS_STATIC_CAST(nsAccessibleEvent*, aEvent)->accessible = acc;
+      static_cast<nsAccessibleEvent*>(aEvent)->accessible = acc;
       // Ensure this is set in case a11y was activated before any
       // nsPresShells existed to observe "a11y-init-or-shutdown" topic
       gIsAccessibilityActive = PR_TRUE;
@@ -6087,7 +6087,7 @@ PresShell::ProcessReflowCommands(PRBool aInterruptible)
       do {
         // Send an incremental reflow notification to the target frame.
         PRInt32 idx = mDirtyRoots.Count() - 1;
-        nsIFrame *target = NS_STATIC_CAST(nsIFrame*, mDirtyRoots[idx]);
+        nsIFrame *target = static_cast<nsIFrame*>(mDirtyRoots[idx]);
         mDirtyRoots.RemoveElementAt(idx);
 
         if (!NS_SUBTREE_DIRTY(target)) {
@@ -6173,14 +6173,14 @@ ReResolveMenusAndTrees(nsIFrame *aFrame, void *aClosure)
   // have to special-case them on a skin switch, and ensure that the
   // popup frames just get destroyed completely.
   if (aFrame && aFrame->GetType() == nsGkAtoms::menuFrame)
-    (NS_STATIC_CAST(nsMenuFrame *, aFrame))->CloseMenu(PR_TRUE);
+    (static_cast<nsMenuFrame *>(aFrame))->CloseMenu(PR_TRUE);
   return PR_TRUE;
 }
 
 PR_STATIC_CALLBACK(PRBool)
 ReframeImageBoxes(nsIFrame *aFrame, void *aClosure)
 {
-  nsStyleChangeList *list = NS_STATIC_CAST(nsStyleChangeList*, aClosure);
+  nsStyleChangeList *list = static_cast<nsStyleChangeList*>(aClosure);
   if (aFrame->GetType() == nsGkAtoms::imageBoxFrame) {
     list->AppendChange(aFrame, aFrame->GetContent(),
                        NS_STYLE_HINT_FRAMECHANGE);
@@ -6478,12 +6478,12 @@ CompareTrees(nsPresContext* aFirstPresContext, nsIFrame* aFirstFrame,
 
         // verify that neither frame has a space manager,
         // or they both do and the space managers are equivalent
-        nsSpaceManager *sm1 = NS_STATIC_CAST(nsSpaceManager*,
-                         k1->GetProperty(nsGkAtoms::spaceManagerProperty));
+        nsSpaceManager *sm1 = static_cast<nsSpaceManager*>
+                                         (k1->GetProperty(nsGkAtoms::spaceManagerProperty));
 
         // look at the test frame
-        nsSpaceManager *sm2 = NS_STATIC_CAST(nsSpaceManager*,
-                         k2->GetProperty(nsGkAtoms::spaceManagerProperty));
+        nsSpaceManager *sm2 = static_cast<nsSpaceManager*>
+                                         (k2->GetProperty(nsGkAtoms::spaceManagerProperty));
 
         // now compare the space managers
         if (((nsnull == sm1) && (nsnull != sm2)) ||
diff --git a/mozilla/layout/base/nsQuoteList.cpp b/mozilla/layout/base/nsQuoteList.cpp
index 4395593aed8..3810b4275e5 100644
--- a/mozilla/layout/base/nsQuoteList.cpp
+++ b/mozilla/layout/base/nsQuoteList.cpp
@@ -109,7 +109,7 @@ nsQuoteList::PrintChain()
   }
   nsQuoteNode* node = FirstNode();
   do {
-    printf("  %p %d - ", NS_STATIC_CAST(void*, node), node->mDepthBefore);
+    printf("  %p %d - ", static_cast<void*>(node), node->mDepthBefore);
     switch(node->mType) {
         case (eStyleContentType_OpenQuote):
           printf("open");
diff --git a/mozilla/layout/base/nsQuoteList.h b/mozilla/layout/base/nsQuoteList.h
index 1e6b062d0ba..02f47cda440 100644
--- a/mozilla/layout/base/nsQuoteList.h
+++ b/mozilla/layout/base/nsQuoteList.h
@@ -105,17 +105,17 @@ struct nsQuoteNode : public nsGenConNode {
 
 class nsQuoteList : public nsGenConList {
 private:
-  nsQuoteNode* FirstNode() { return NS_STATIC_CAST(nsQuoteNode*, mFirstNode); }
+  nsQuoteNode* FirstNode() { return static_cast<nsQuoteNode*>(mFirstNode); }
 public:
   // assign the correct |mDepthBefore| value to a node that has been inserted
   // Should be called immediately after calling |Insert|.
   void Calc(nsQuoteNode* aNode);
 
   nsQuoteNode* Next(nsQuoteNode* aNode) {
-    return NS_STATIC_CAST(nsQuoteNode*, nsGenConList::Next(aNode));
+    return static_cast<nsQuoteNode*>(nsGenConList::Next(aNode));
   }
   nsQuoteNode* Prev(nsQuoteNode* aNode) {
-    return NS_STATIC_CAST(nsQuoteNode*, nsGenConList::Prev(aNode));
+    return static_cast<nsQuoteNode*>(nsGenConList::Prev(aNode));
   }
   
   void RecalcAll();
diff --git a/mozilla/layout/build/nsContentDLF.cpp b/mozilla/layout/build/nsContentDLF.cpp
index c284bb62da9..070589e4c9f 100644
--- a/mozilla/layout/build/nsContentDLF.cpp
+++ b/mozilla/layout/build/nsContentDLF.cpp
@@ -308,10 +308,10 @@ nsContentDLF::CreateInstanceForDocument(nsISupports* aContainer,
     if (NS_FAILED(rv))
       break;
 
-    docv->SetUAStyleSheet(NS_STATIC_CAST(nsIStyleSheet*, gUAStyleSheet));
+    docv->SetUAStyleSheet(static_cast<nsIStyleSheet*>(gUAStyleSheet));
 
     // Bind the document to the Content Viewer
-    nsIContentViewer* cv = NS_STATIC_CAST(nsIContentViewer*, docv.get());
+    nsIContentViewer* cv = static_cast<nsIContentViewer*>(docv.get());
     rv = cv->LoadStart(aDocument);
     NS_ADDREF(*aDocViewerResult = cv);
   } while (PR_FALSE);
diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp
index 4caf9ae775a..b986acde90d 100644
--- a/mozilla/layout/forms/nsComboboxControlFrame.cpp
+++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp
@@ -293,25 +293,25 @@ nsComboboxControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(NS_GET_IID(nsIComboboxControlFrame))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIComboboxControlFrame*, this);
+    *aInstancePtr = static_cast<nsIComboboxControlFrame*>(this);
     return NS_OK;
   } else if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIFormControlFrame*, this);
+    *aInstancePtr = static_cast<nsIFormControlFrame*>(this);
     return NS_OK;
   } else if (aIID.Equals(NS_GET_IID(nsIAnonymousContentCreator))) {                                         
-    *aInstancePtr = NS_STATIC_CAST(nsIAnonymousContentCreator*, this);
+    *aInstancePtr = static_cast<nsIAnonymousContentCreator*>(this);
     return NS_OK;   
   } else if (aIID.Equals(NS_GET_IID(nsISelectControlFrame))) {
-    *aInstancePtr = NS_STATIC_CAST(nsISelectControlFrame*, this);
+    *aInstancePtr = static_cast<nsISelectControlFrame*>(this);
     return NS_OK;
   } else if (aIID.Equals(NS_GET_IID(nsIStatefulFrame))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIStatefulFrame*, this);
+    *aInstancePtr = static_cast<nsIStatefulFrame*>(this);
     return NS_OK;
   } else if (aIID.Equals(NS_GET_IID(nsIRollupListener))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIRollupListener*, this);
+    *aInstancePtr = static_cast<nsIRollupListener*>(this);
     return NS_OK;
   } else if (aIID.Equals(NS_GET_IID(nsIScrollableViewProvider))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIScrollableViewProvider*, this);
+    *aInstancePtr = static_cast<nsIScrollableViewProvider*>(this);
     return NS_OK;
   } 
   
@@ -877,7 +877,7 @@ nsComboboxControlFrame::AddOption(nsPresContext* aPresContext, PRInt32 aIndex)
     ++mDisplayedIndex;
   }
 
-  nsListControlFrame* lcf = NS_STATIC_CAST(nsListControlFrame*, mDropdownFrame);
+  nsListControlFrame* lcf = static_cast<nsListControlFrame*>(mDropdownFrame);
   return lcf->AddOption(aPresContext, aIndex);
 }
   
@@ -898,7 +898,7 @@ nsComboboxControlFrame::RemoveOption(nsPresContext* aPresContext, PRInt32 aIndex
     RedisplayText(-1);
   }
 
-  nsListControlFrame* lcf = NS_STATIC_CAST(nsListControlFrame*, mDropdownFrame);
+  nsListControlFrame* lcf = static_cast<nsListControlFrame*>(mDropdownFrame);
   return lcf->RemoveOption(aPresContext, aIndex);
 }
 
@@ -1205,7 +1205,7 @@ nsComboboxControlFrame::Destroy()
   // Revoke any pending RedisplayTextEvent
   mRedisplayTextEvent.Revoke();
 
-  nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_FALSE);
+  nsFormControlFrame::RegUnRegAccessKey(static_cast<nsIFrame*>(this), PR_FALSE);
 
   if (mDroppedDown) {
     // Get parent view
@@ -1333,7 +1333,7 @@ public:
 void nsDisplayComboboxFocus::Paint(nsDisplayListBuilder* aBuilder,
      nsIRenderingContext* aCtx, const nsRect& aDirtyRect)
 {
-  NS_STATIC_CAST(nsComboboxControlFrame*, mFrame)
+  static_cast<nsComboboxControlFrame*>(mFrame)
     ->PaintFocus(*aCtx, aBuilder->ToReferenceFrame(mFrame));
 }
 
diff --git a/mozilla/layout/forms/nsFieldSetFrame.cpp b/mozilla/layout/forms/nsFieldSetFrame.cpp
index 43ae052f045..1ce03eb9323 100644
--- a/mozilla/layout/forms/nsFieldSetFrame.cpp
+++ b/mozilla/layout/forms/nsFieldSetFrame.cpp
@@ -202,7 +202,7 @@ void
 nsDisplayFieldSetBorderBackground::Paint(nsDisplayListBuilder* aBuilder,
      nsIRenderingContext* aCtx, const nsRect& aDirtyRect)
 {
-  NS_STATIC_CAST(nsFieldSetFrame*, mFrame)->
+  static_cast<nsFieldSetFrame*>(mFrame)->
     PaintBorderBackground(*aCtx, aBuilder->ToReferenceFrame(mFrame), aDirtyRect);
 }
 
@@ -708,7 +708,7 @@ NS_IMETHODIMP nsFieldSetFrame::GetAccessible(nsIAccessible** aAccessible)
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    return accService->CreateHTMLGroupboxAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+    return accService->CreateHTMLGroupboxAccessible(static_cast<nsIFrame*>(this), aAccessible);
   }
 
   return NS_ERROR_FAILURE;
diff --git a/mozilla/layout/forms/nsFileControlFrame.cpp b/mozilla/layout/forms/nsFileControlFrame.cpp
index d8af5577490..4d6117cc7dc 100644
--- a/mozilla/layout/forms/nsFileControlFrame.cpp
+++ b/mozilla/layout/forms/nsFileControlFrame.cpp
@@ -211,11 +211,11 @@ nsFileControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(NS_GET_IID(nsIAnonymousContentCreator))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIAnonymousContentCreator*, this);
+    *aInstancePtr = static_cast<nsIAnonymousContentCreator*>(this);
     return NS_OK;
   }
   if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIFormControlFrame*, this);
+    *aInstancePtr = static_cast<nsIFormControlFrame*>(this);
     return NS_OK;
   }
 
diff --git a/mozilla/layout/forms/nsFormControlFrame.cpp b/mozilla/layout/forms/nsFormControlFrame.cpp
index 8c52d5c7e81..1c4507c532a 100644
--- a/mozilla/layout/forms/nsFormControlFrame.cpp
+++ b/mozilla/layout/forms/nsFormControlFrame.cpp
@@ -58,7 +58,7 @@ void
 nsFormControlFrame::Destroy()
 {
   // Unregister the access key registered in reflow
-  nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_FALSE);
+  nsFormControlFrame::RegUnRegAccessKey(static_cast<nsIFrame*>(this), PR_FALSE);
   nsLeafFrame::Destroy();
 }
 
@@ -69,7 +69,7 @@ nsFormControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIFormControlFrame*, this);
+    *aInstancePtr = static_cast<nsIFormControlFrame*>(this);
     return NS_OK;
   }
 
@@ -104,7 +104,7 @@ nsFormControlFrame::Reflow(nsPresContext*          aPresContext,
   DISPLAY_REFLOW(aPresContext, this, aReflowState, aDesiredSize, aStatus);
 
   if (mState & NS_FRAME_FIRST_REFLOW) {
-    RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_TRUE);
+    RegUnRegAccessKey(static_cast<nsIFrame*>(this), PR_TRUE);
   }
 
   return nsLeafFrame::Reflow(aPresContext, aDesiredSize, aReflowState,
diff --git a/mozilla/layout/forms/nsGfxButtonControlFrame.cpp b/mozilla/layout/forms/nsGfxButtonControlFrame.cpp
index 693c91c7fea..40e5eeb6d5e 100644
--- a/mozilla/layout/forms/nsGfxButtonControlFrame.cpp
+++ b/mozilla/layout/forms/nsGfxButtonControlFrame.cpp
@@ -165,7 +165,7 @@ nsGfxButtonControlFrame::GetFormProperty(nsIAtom* aName, nsAString& aValue) cons
     // This property is used by accessibility to get
     // the default label of the button.
     nsXPIDLString temp;
-    rv = NS_CONST_CAST(nsGfxButtonControlFrame*, this)->GetDefaultLabel(temp);
+    rv = const_cast<nsGfxButtonControlFrame*>(this)->GetDefaultLabel(temp);
     aValue = temp;
   } else {
     aValue.Truncate();
@@ -179,7 +179,7 @@ NS_IMETHODIMP nsGfxButtonControlFrame::GetAccessible(nsIAccessible** aAccessible
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    return accService->CreateHTMLButtonAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+    return accService->CreateHTMLButtonAccessible(static_cast<nsIFrame*>(this), aAccessible);
   }
 
   return NS_ERROR_FAILURE;
@@ -193,7 +193,7 @@ nsGfxButtonControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(NS_GET_IID(nsIAnonymousContentCreator))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIAnonymousContentCreator*, this);
+    *aInstancePtr = static_cast<nsIAnonymousContentCreator*>(this);
     return NS_OK;
   }
 
diff --git a/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp b/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp
index bfdaf44d4a1..b5cbb860cf3 100644
--- a/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp
+++ b/mozilla/layout/forms/nsGfxCheckboxControlFrame.cpp
@@ -103,7 +103,7 @@ nsGfxCheckboxControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(NS_GET_IID(nsICheckboxControlFrame))) {
-    *aInstancePtr = NS_STATIC_CAST(nsICheckboxControlFrame*, this);
+    *aInstancePtr = static_cast<nsICheckboxControlFrame*>(this);
     return NS_OK;
   }
 
@@ -116,7 +116,7 @@ NS_IMETHODIMP nsGfxCheckboxControlFrame::GetAccessible(nsIAccessible** aAccessib
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    return accService->CreateHTMLCheckboxAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+    return accService->CreateHTMLCheckboxAccessible(static_cast<nsIFrame*>(this), aAccessible);
   }
 
   return NS_ERROR_FAILURE;
@@ -171,7 +171,7 @@ nsGfxCheckboxControlFrame::OnChecked(nsPresContext* aPresContext,
 
 static void PaintCheckMarkFromStyle(nsIFrame* aFrame,
      nsIRenderingContext* aCtx, const nsRect& aDirtyRect, nsPoint aPt) {
-  NS_STATIC_CAST(nsGfxCheckboxControlFrame*, aFrame)
+  static_cast<nsGfxCheckboxControlFrame*>(aFrame)
     ->PaintCheckBoxFromStyle(*aCtx, aPt, aDirtyRect);
 }
 
@@ -195,7 +195,7 @@ public:
 void
 nsDisplayCheckMark::Paint(nsDisplayListBuilder* aBuilder,
      nsIRenderingContext* aCtx, const nsRect& aDirtyRect) {
-  NS_STATIC_CAST(nsGfxCheckboxControlFrame*, mFrame)->
+  static_cast<nsGfxCheckboxControlFrame*>(mFrame)->
     PaintCheckBox(*aCtx, aBuilder->ToReferenceFrame(mFrame), aDirtyRect);
 }
 
diff --git a/mozilla/layout/forms/nsGfxRadioControlFrame.cpp b/mozilla/layout/forms/nsGfxRadioControlFrame.cpp
index dcc1fcca133..b36f57658b6 100644
--- a/mozilla/layout/forms/nsGfxRadioControlFrame.cpp
+++ b/mozilla/layout/forms/nsGfxRadioControlFrame.cpp
@@ -68,7 +68,7 @@ nsGfxRadioControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(NS_GET_IID(nsIRadioControlFrame))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIRadioControlFrame*, this);
+    *aInstancePtr = static_cast<nsIRadioControlFrame*>(this);
     return NS_OK;
   }
 
@@ -81,7 +81,7 @@ NS_IMETHODIMP nsGfxRadioControlFrame::GetAccessible(nsIAccessible** aAccessible)
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    return accService->CreateHTMLRadioButtonAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+    return accService->CreateHTMLRadioButtonAccessible(static_cast<nsIFrame*>(this), aAccessible);
   }
 
   return NS_ERROR_FAILURE;
@@ -179,7 +179,7 @@ public:
 void
 nsDisplayRadioButtonFromStyle::Paint(nsDisplayListBuilder* aBuilder,
      nsIRenderingContext* aCtx, const nsRect& aDirtyRect) {
-  NS_STATIC_CAST(nsGfxRadioControlFrame*, mFrame)->
+  static_cast<nsGfxRadioControlFrame*>(mFrame)->
     PaintRadioButtonFromStyle(*aCtx, aBuilder->ToReferenceFrame(mFrame), aDirtyRect);
 }
 
diff --git a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp
index 1ab551a26ba..e6882c0cda6 100644
--- a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp
+++ b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp
@@ -88,7 +88,7 @@ nsHTMLButtonControlFrame::~nsHTMLButtonControlFrame()
 void
 nsHTMLButtonControlFrame::Destroy()
 {
-  nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_FALSE);
+  nsFormControlFrame::RegUnRegAccessKey(static_cast<nsIFrame*>(this), PR_FALSE);
   nsHTMLContainerFrame::Destroy();
 }
 
@@ -124,7 +124,7 @@ nsHTMLButtonControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIFormControlFrame*, this);
+    *aInstancePtr = static_cast<nsIFormControlFrame*>(this);
     return NS_OK;
   }
 
@@ -140,10 +140,10 @@ NS_IMETHODIMP nsHTMLButtonControlFrame::GetAccessible(nsIAccessible** aAccessibl
     nsIContent* content = GetContent();
     nsCOMPtr<nsIDOMHTMLButtonElement> buttonElement(do_QueryInterface(content));
     if (buttonElement) //If turned XBL-base form control off, the frame contains HTML 4 button
-      return accService->CreateHTML4ButtonAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+      return accService->CreateHTML4ButtonAccessible(static_cast<nsIFrame*>(this), aAccessible);
     nsCOMPtr<nsIDOMHTMLInputElement> inputElement(do_QueryInterface(content));
     if (inputElement) //If turned XBL-base form control on, the frame contains normal HTML button
-      return accService->CreateHTMLButtonAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+      return accService->CreateHTMLButtonAccessible(static_cast<nsIFrame*>(this), aAccessible);
   }
 
   return NS_ERROR_FAILURE;
@@ -283,7 +283,7 @@ nsHTMLButtonControlFrame::Reflow(nsPresContext* aPresContext,
                   "Should have real computed width by now");
 
   if (mState & NS_FRAME_FIRST_REFLOW) {
-    nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_TRUE);
+    nsFormControlFrame::RegUnRegAccessKey(static_cast<nsIFrame*>(this), PR_TRUE);
   }
 
   // Reflow the child
diff --git a/mozilla/layout/forms/nsImageControlFrame.cpp b/mozilla/layout/forms/nsImageControlFrame.cpp
index 8f988486845..935c4054bd5 100644
--- a/mozilla/layout/forms/nsImageControlFrame.cpp
+++ b/mozilla/layout/forms/nsImageControlFrame.cpp
@@ -64,7 +64,7 @@ void
 IntPointDtorFunc(void *aObject, nsIAtom *aPropertyName,
                  void *aPropertyValue, void *aData)
 {
-  nsIntPoint *propertyValue = NS_STATIC_CAST(nsIntPoint*, aPropertyValue);
+  nsIntPoint *propertyValue = static_cast<nsIntPoint*>(aPropertyValue);
   delete propertyValue;
 }
 
@@ -129,7 +129,7 @@ nsImageControlFrame::~nsImageControlFrame()
 void
 nsImageControlFrame::Destroy()
 {
-  nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_FALSE);
+  nsFormControlFrame::RegUnRegAccessKey(static_cast<nsIFrame*>(this), PR_FALSE);
   nsImageControlFrameSuper::Destroy();
 }
 
@@ -161,7 +161,7 @@ nsImageControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIFormControlFrame*, this);
+    *aInstancePtr = static_cast<nsIFormControlFrame*>(this);
     return NS_OK;
   } 
 
@@ -175,10 +175,10 @@ NS_IMETHODIMP nsImageControlFrame::GetAccessible(nsIAccessible** aAccessible)
 
   if (accService) {
     if (mContent->Tag() == nsGkAtoms::button) {
-      return accService->CreateHTML4ButtonAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+      return accService->CreateHTML4ButtonAccessible(static_cast<nsIFrame*>(this), aAccessible);
     }
     else if (mContent->Tag() == nsGkAtoms::input) {
-      return accService->CreateHTMLButtonAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+      return accService->CreateHTMLButtonAccessible(static_cast<nsIFrame*>(this), aAccessible);
     }
   }
 
@@ -213,7 +213,7 @@ nsImageControlFrame::Reflow(nsPresContext*         aPresContext,
   DO_GLOBAL_REFLOW_COUNT("nsImageControlFrame");
   DISPLAY_REFLOW(aPresContext, this, aReflowState, aDesiredSize, aStatus);
   if (mState & NS_FRAME_FIRST_REFLOW) {
-    nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_TRUE);
+    nsFormControlFrame::RegUnRegAccessKey(static_cast<nsIFrame*>(this), PR_TRUE);
   }
   return nsImageControlFrameSuper::Reflow(aPresContext, aDesiredSize, aReflowState, aStatus);
 }
@@ -243,12 +243,12 @@ nsImageControlFrame::HandleEvent(nsPresContext* aPresContext,
 
   if (aEvent->eventStructType == NS_MOUSE_EVENT &&
       aEvent->message == NS_MOUSE_BUTTON_UP &&
-      NS_STATIC_CAST(nsMouseEvent*, aEvent)->button == nsMouseEvent::eLeftButton) {
+      static_cast<nsMouseEvent*>(aEvent)->button == nsMouseEvent::eLeftButton) {
     // Store click point for nsHTMLInputElement::SubmitNamesValues
     // Do this on MouseUp because the specs don't say and that's what IE does
     nsIntPoint* lastClickPoint =
-      NS_STATIC_CAST(nsIntPoint*,
-                     mContent->GetProperty(nsGkAtoms::imageClickedPoint));
+      static_cast<nsIntPoint*>
+                 (mContent->GetProperty(nsGkAtoms::imageClickedPoint));
     if (lastClickPoint) {
       // normally lastClickedPoint is not null, as it's allocated in Init()
       nsPoint pt = nsLayoutUtils::GetEventCoordinatesRelativeTo(aEvent, this);
diff --git a/mozilla/layout/forms/nsIsIndexFrame.cpp b/mozilla/layout/forms/nsIsIndexFrame.cpp
index 845b1d452a6..ba7b36a2027 100644
--- a/mozilla/layout/forms/nsIsIndexFrame.cpp
+++ b/mozilla/layout/forms/nsIsIndexFrame.cpp
@@ -241,15 +241,15 @@ nsIsIndexFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(NS_GET_IID(nsIAnonymousContentCreator))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIAnonymousContentCreator*, this);
+    *aInstancePtr = static_cast<nsIAnonymousContentCreator*>(this);
     return NS_OK;
   }
   if (aIID.Equals(NS_GET_IID(nsIStatefulFrame))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIStatefulFrame*, this);
+    *aInstancePtr = static_cast<nsIStatefulFrame*>(this);
     return NS_OK;
   }
   if (aIID.Equals(NS_GET_IID(nsIDOMKeyListener))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIDOMKeyListener*, this);
+    *aInstancePtr = static_cast<nsIDOMKeyListener*>(this);
     return NS_OK;
   }
 
diff --git a/mozilla/layout/forms/nsLegendFrame.cpp b/mozilla/layout/forms/nsLegendFrame.cpp
index b2d2312a066..abc4a08c446 100644
--- a/mozilla/layout/forms/nsLegendFrame.cpp
+++ b/mozilla/layout/forms/nsLegendFrame.cpp
@@ -73,7 +73,7 @@ nsLegendFrame::GetType() const
 void
 nsLegendFrame::Destroy()
 {
-  nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_FALSE);
+  nsFormControlFrame::RegUnRegAccessKey(static_cast<nsIFrame*>(this), PR_FALSE);
   nsAreaFrame::Destroy();
 }
 
@@ -100,7 +100,7 @@ nsLegendFrame::Reflow(nsPresContext*          aPresContext,
   DO_GLOBAL_REFLOW_COUNT("nsLegendFrame");
   DISPLAY_REFLOW(aPresContext, this, aReflowState, aDesiredSize, aStatus);
   if (mState & NS_FRAME_FIRST_REFLOW) {
-    nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_TRUE);
+    nsFormControlFrame::RegUnRegAccessKey(static_cast<nsIFrame*>(this), PR_TRUE);
   }
   return nsAreaFrame::Reflow(aPresContext, aDesiredSize, aReflowState, aStatus);
 }
diff --git a/mozilla/layout/forms/nsListControlFrame.cpp b/mozilla/layout/forms/nsListControlFrame.cpp
index 1f34dbed1a5..b0dcd4eebd3 100644
--- a/mozilla/layout/forms/nsListControlFrame.cpp
+++ b/mozilla/layout/forms/nsListControlFrame.cpp
@@ -201,19 +201,19 @@ nsListControlFrame::Destroy()
 
   mEventListener->SetFrame(nsnull);
 
-  mContent->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*,
-                                                    mEventListener),
+  mContent->RemoveEventListenerByIID(static_cast<nsIDOMMouseListener*>
+                                                (mEventListener),
                                      NS_GET_IID(nsIDOMMouseListener));
 
-  mContent->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseMotionListener*,
-                                                    mEventListener),
+  mContent->RemoveEventListenerByIID(static_cast<nsIDOMMouseMotionListener*>
+                                                (mEventListener),
                                      NS_GET_IID(nsIDOMMouseMotionListener));
 
-  mContent->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*,
-                                                    mEventListener),
+  mContent->RemoveEventListenerByIID(static_cast<nsIDOMKeyListener*>
+                                                (mEventListener),
                                      NS_GET_IID(nsIDOMKeyListener));
 
-  nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_FALSE);
+  nsFormControlFrame::RegUnRegAccessKey(static_cast<nsIFrame*>(this), PR_FALSE);
   nsHTMLScrollFrame::Destroy();
 }
 
@@ -383,15 +383,15 @@ nsListControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIFormControlFrame*, this);
+    *aInstancePtr = static_cast<nsIFormControlFrame*>(this);
     return NS_OK;
   }
   if (aIID.Equals(NS_GET_IID(nsIListControlFrame))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIListControlFrame*, this);
+    *aInstancePtr = static_cast<nsIListControlFrame*>(this);
     return NS_OK;
   }
   if (aIID.Equals(NS_GET_IID(nsISelectControlFrame))) {
-    *aInstancePtr = NS_STATIC_CAST(nsISelectControlFrame*, this);
+    *aInstancePtr = static_cast<nsISelectControlFrame*>(this);
     return NS_OK;
   }
 
@@ -1123,16 +1123,16 @@ nsListControlFrame::Init(nsIContent*     aContent,
   if (!mEventListener) 
     return NS_ERROR_OUT_OF_MEMORY;
 
-  mContent->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*,
-                                                 mEventListener),
+  mContent->AddEventListenerByIID(static_cast<nsIDOMMouseListener*>
+                                             (mEventListener),
                                   NS_GET_IID(nsIDOMMouseListener));
 
-  mContent->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseMotionListener*,
-                                                 mEventListener),
+  mContent->AddEventListenerByIID(static_cast<nsIDOMMouseMotionListener*>
+                                             (mEventListener),
                                   NS_GET_IID(nsIDOMMouseMotionListener));
 
-  mContent->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*,
-                                                 mEventListener),
+  mContent->AddEventListenerByIID(static_cast<nsIDOMKeyListener*>
+                                             (mEventListener),
                                   NS_GET_IID(nsIDOMKeyListener));
 
   mStartSelectionIndex = kNothingSelected;
@@ -2643,7 +2643,7 @@ nsListControlFrame::KeyPress(nsIDOMEvent* aKeyEvent)
       gLastKeyTime = keyTime;
 
       // Append this keystroke to the search string. 
-      PRUnichar uniChar = ToLowerCase(NS_STATIC_CAST(PRUnichar, charcode));
+      PRUnichar uniChar = ToLowerCase(static_cast<PRUnichar>(charcode));
       GetIncrementalString().Append(uniChar);
 
       // See bug 188199, if all letters in incremental string are same, just try to match the first one
diff --git a/mozilla/layout/forms/nsListControlFrame.h b/mozilla/layout/forms/nsListControlFrame.h
index a8bc60a6744..84a993f4aa1 100644
--- a/mozilla/layout/forms/nsListControlFrame.h
+++ b/mozilla/layout/forms/nsListControlFrame.h
@@ -401,7 +401,7 @@ protected:
   void     InitSelectionRange(PRInt32 aClickedIndex);
 
   nsSelectsAreaFrame* GetOptionsContainer() const {
-    return NS_STATIC_CAST(nsSelectsAreaFrame*, GetScrolledFrame());
+    return static_cast<nsSelectsAreaFrame*>(GetScrolledFrame());
   }
 
   nscoord HeightOfARow() {
diff --git a/mozilla/layout/forms/nsSelectsAreaFrame.cpp b/mozilla/layout/forms/nsSelectsAreaFrame.cpp
index f4a9df5e328..a41dcba0e3a 100644
--- a/mozilla/layout/forms/nsSelectsAreaFrame.cpp
+++ b/mozilla/layout/forms/nsSelectsAreaFrame.cpp
@@ -147,7 +147,7 @@ static nsListControlFrame* GetEnclosingListFrame(nsIFrame* aSelectsAreaFrame)
   nsIFrame* frame = aSelectsAreaFrame->GetParent();
   while (frame) {
     if (frame->GetType() == nsGkAtoms::listControlFrame)
-      return NS_STATIC_CAST(nsListControlFrame*, frame);
+      return static_cast<nsListControlFrame*>(frame);
     frame = frame->GetParent();
   }
   return nsnull;
diff --git a/mozilla/layout/forms/nsTextControlFrame.cpp b/mozilla/layout/forms/nsTextControlFrame.cpp
index db75dfc40e1..395e4385afd 100644
--- a/mozilla/layout/forms/nsTextControlFrame.cpp
+++ b/mozilla/layout/forms/nsTextControlFrame.cpp
@@ -373,7 +373,7 @@ nsTextInputListener::Blur(nsIDOMEvent* aEvent)
 static void
 DoCommandCallback(const char *aCommand, void *aData)
 {
-  nsTextControlFrame *frame = NS_STATIC_CAST(nsTextControlFrame*, aData);
+  nsTextControlFrame *frame = static_cast<nsTextControlFrame*>(aData);
   nsIContent *content = frame->GetContent();
 
   nsCOMPtr<nsIControllers> controllers;
@@ -986,23 +986,23 @@ nsTextControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(NS_GET_IID(nsIFormControlFrame))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIFormControlFrame*, this);
+    *aInstancePtr = static_cast<nsIFormControlFrame*>(this);
     return NS_OK;
   }
   if (aIID.Equals(NS_GET_IID(nsIAnonymousContentCreator))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIAnonymousContentCreator*, this);
+    *aInstancePtr = static_cast<nsIAnonymousContentCreator*>(this);
     return NS_OK;
   }
   if (aIID.Equals(NS_GET_IID(nsITextControlFrame))) {
-    *aInstancePtr = NS_STATIC_CAST(nsITextControlFrame*, this);
+    *aInstancePtr = static_cast<nsITextControlFrame*>(this);
     return NS_OK;
   }
   if (aIID.Equals(NS_GET_IID(nsIScrollableViewProvider)) && IsScrollable()) {
-    *aInstancePtr = NS_STATIC_CAST(nsIScrollableViewProvider*, this);
+    *aInstancePtr = static_cast<nsIScrollableViewProvider*>(this);
     return NS_OK;
   }
   if (aIID.Equals(NS_GET_IID(nsIPhonetic))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIPhonetic*, this);
+    *aInstancePtr = static_cast<nsIPhonetic*>(this);
     return NS_OK;
   }
 
@@ -1015,7 +1015,7 @@ NS_IMETHODIMP nsTextControlFrame::GetAccessible(nsIAccessible** aAccessible)
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    return accService->CreateHTMLTextFieldAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+    return accService->CreateHTMLTextFieldAccessible(static_cast<nsIFrame*>(this), aAccessible);
   }
 
   return NS_ERROR_FAILURE;
@@ -1130,12 +1130,12 @@ nsTextControlFrame::PreDestroy()
 
 //unregister self from content
   mTextListener->SetFrame(nsnull);
-  nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_FALSE);
+  nsFormControlFrame::RegUnRegAccessKey(static_cast<nsIFrame*>(this), PR_FALSE);
   if (mTextListener)
   {
     if (mContent)
     {
-      mContent->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener  *,mTextListener), NS_GET_IID(nsIDOMFocusListener));
+      mContent->RemoveEventListenerByIID(static_cast<nsIDOMFocusListener  *>(mTextListener), NS_GET_IID(nsIDOMFocusListener));
     }
 
     nsCOMPtr<nsIDOMEventGroup> systemGroup;
@@ -1143,8 +1143,8 @@ nsTextControlFrame::PreDestroy()
     nsCOMPtr<nsIDOM3EventTarget> dom3Targ = do_QueryInterface(mContent);
     if (dom3Targ) {
       // cast because of ambiguous base
-      nsIDOMEventListener *listener = NS_STATIC_CAST(nsIDOMKeyListener*,
-                                                     mTextListener);
+      nsIDOMEventListener *listener = static_cast<nsIDOMKeyListener*>
+                                                 (mTextListener);
 
       dom3Targ->RemoveGroupedEventListener(NS_LITERAL_STRING("keydown"),
                                            listener, PR_FALSE, systemGroup);
@@ -1387,8 +1387,8 @@ nsTextControlFrame::CreateFrameFor(nsIContent*      aContent)
 
   // Create a SelectionController
 
-  mSelCon = NS_STATIC_CAST(nsISelectionController*,
-              new nsTextInputSelectionImpl(mFrameSel, shell, aContent));
+  mSelCon = static_cast<nsISelectionController*>
+                       (new nsTextInputSelectionImpl(mFrameSel, shell, aContent));
   if (!mSelCon)
     return nsnull;
   mTextListener = new nsTextInputListener();
@@ -1516,8 +1516,8 @@ nsTextControlFrame::CreateFrameFor(nsIContent*      aContent)
       }
     }
 
-    selPriv->AddSelectionListener(NS_STATIC_CAST(nsISelectionListener*,
-                                                 mTextListener));
+    selPriv->AddSelectionListener(static_cast<nsISelectionListener*>
+                                             (mTextListener));
   }
   
   if (mContent) {
@@ -2732,7 +2732,7 @@ nsTextControlFrame::SetInitialChildList(nsIAtom*        aListName,
   //register focus and key listeners
   if (mContent) {
     // register the event listeners with the DOM event receiver
-    rv = mContent->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *,mTextListener),
+    rv = mContent->AddEventListenerByIID(static_cast<nsIDOMFocusListener *>(mTextListener),
                                          NS_GET_IID(nsIDOMFocusListener));
     NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register focus listener");
     // XXXbryner do we need to check for a null presshell here?
@@ -2745,8 +2745,8 @@ nsTextControlFrame::SetInitialChildList(nsIAtom*        aListName,
   nsCOMPtr<nsIDOM3EventTarget> dom3Targ = do_QueryInterface(mContent);
   if (dom3Targ) {
     // cast because of ambiguous base
-    nsIDOMEventListener *listener = NS_STATIC_CAST(nsIDOMKeyListener*,
-                                                   mTextListener);
+    nsIDOMEventListener *listener = static_cast<nsIDOMKeyListener*>
+                                               (mTextListener);
 
     dom3Targ->AddGroupedEventListener(NS_LITERAL_STRING("keydown"),
                                       listener, PR_FALSE, systemGroup);
diff --git a/mozilla/layout/generic/nsBRFrame.cpp b/mozilla/layout/generic/nsBRFrame.cpp
index dce1186397b..3ab544c71c8 100644
--- a/mozilla/layout/generic/nsBRFrame.cpp
+++ b/mozilla/layout/generic/nsBRFrame.cpp
@@ -273,7 +273,7 @@ NS_IMETHODIMP BRFrame::GetAccessible(nsIAccessible** aAccessible)
 {
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
   if (accService) {
-    return accService->CreateHTMLBRAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+    return accService->CreateHTMLBRAccessible(static_cast<nsIFrame*>(this), aAccessible);
   }
   return NS_ERROR_FAILURE;
 }
diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp
index 8d66572f0cc..21b9d4e0a51 100644
--- a/mozilla/layout/generic/nsBlockFrame.cpp
+++ b/mozilla/layout/generic/nsBlockFrame.cpp
@@ -333,7 +333,7 @@ nsBlockFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(kBlockFrameCID)) {
-    *aInstancePtr = NS_STATIC_CAST(void*, NS_STATIC_CAST(nsBlockFrame*, this));
+    *aInstancePtr = static_cast<void*>(static_cast<nsBlockFrame*>(this));
     return NS_OK;
   }
   if (aIID.Equals(NS_GET_IID(nsILineIterator)) ||
@@ -352,7 +352,7 @@ nsBlockFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
       NS_RELEASE(it);
       return rv;
     }
-    *aInstancePtr = NS_STATIC_CAST(nsILineIteratorNavigator*, it);
+    *aInstancePtr = static_cast<nsILineIteratorNavigator*>(it);
     return NS_OK;
   }
 
@@ -375,18 +375,18 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
   fprintf(out, " [parent=%p]", mParent);
 #endif
   if (HasView()) {
-    fprintf(out, " [view=%p]", NS_STATIC_CAST(void*, GetView()));
+    fprintf(out, " [view=%p]", static_cast<void*>(GetView()));
   }
   if (nsnull != mNextSibling) {
-    fprintf(out, " next=%p", NS_STATIC_CAST(void*, mNextSibling));
+    fprintf(out, " next=%p", static_cast<void*>(mNextSibling));
   }
 
   // Output the flow linkage
   if (nsnull != GetPrevInFlow()) {
-    fprintf(out, " prev-in-flow=%p", NS_STATIC_CAST(void*, GetPrevInFlow()));
+    fprintf(out, " prev-in-flow=%p", static_cast<void*>(GetPrevInFlow()));
   }
   if (nsnull != GetNextInFlow()) {
-    fprintf(out, " next-in-flow=%p", NS_STATIC_CAST(void*, GetNextInFlow()));
+    fprintf(out, " next-in-flow=%p", static_cast<void*>(GetNextInFlow()));
   }
 
   // Output the rect and state
@@ -394,7 +394,7 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
   if (0 != mState) {
     fprintf(out, " [state=%08x]", mState);
   }
-  nsBlockFrame* f = NS_CONST_CAST(nsBlockFrame*, this);
+  nsBlockFrame* f = const_cast<nsBlockFrame*>(this);
   nsRect* overflowArea = f->GetOverflowAreaProperty(PR_FALSE);
   if (overflowArea) {
     fprintf(out, " [overflow=%d,%d,%d,%d]", overflowArea->x, overflowArea->y,
@@ -414,7 +414,7 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
     }
   }
   fprintf(out, " sc=%p(i=%d,b=%d)",
-          NS_STATIC_CAST(void*, mStyleContext), numInlineLines, numBlockLines);
+          static_cast<void*>(mStyleContext), numInlineLines, numBlockLines);
   nsIAtom* pseudoTag = mStyleContext->GetPseudoType();
   if (pseudoTag) {
     nsAutoString atomString;
@@ -861,7 +861,7 @@ nsBlockFrame::Reflow(nsPresContext*          aPresContext,
   nsSize oldSize = GetSize();
 
   // Should we create a space manager?
-  nsAutoSpaceManager autoSpaceManager(NS_CONST_CAST(nsHTMLReflowState &, aReflowState));
+  nsAutoSpaceManager autoSpaceManager(const_cast<nsHTMLReflowState &>(aReflowState));
 
   // XXXldb If we start storing the space manager in the frame rather
   // than keeping it around only during reflow then we should create it
@@ -1385,7 +1385,7 @@ nsBlockFrame::MarkLineDirty(line_iterator aLine)
   if (gNoisyReflow) {
     IndentBy(stdout, gNoiseIndent);
     ListTag(stdout);
-    printf(": mark line %p dirty\n", NS_STATIC_CAST(void*, aLine.get()));
+    printf(": mark line %p dirty\n", static_cast<void*>(aLine.get()));
   }
 #endif
 
@@ -1401,7 +1401,7 @@ nsBlockFrame::MarkLineDirty(line_iterator aLine)
       IndentBy(stdout, gNoiseIndent);
       ListTag(stdout);
       printf(": mark prev-line %p dirty\n",
-             NS_STATIC_CAST(void*, aLine.prev().get()));
+             static_cast<void*>(aLine.prev().get()));
     }
 #endif
   }
@@ -1485,8 +1485,8 @@ nsBlockFrame::PrepareResizeReflow(nsBlockReflowState& aState)
       if (gNoisyReflow && !line->IsDirty()) {
         IndentBy(stdout, gNoiseIndent + 1);
         printf("skipped: line=%p next=%p %s %s%s%s breakTypeBefore/After=%d/%d xmost=%d\n",
-           NS_STATIC_CAST(void*, line.get()),
-           NS_STATIC_CAST(void*, (line.next() != end_lines() ? line.next().get() : nsnull)),
+           static_cast<void*>(line.get()),
+           static_cast<void*>((line.next() != end_lines() ? line.next().get() : nsnull)),
            line->IsBlock() ? "block" : "inline",
            line->HasBreakAfter() ? "has-break-after " : "",
            line->HasFloats() ? "has-floats " : "",
@@ -1639,7 +1639,7 @@ static void DumpLine(const nsBlockReflowState& aState, nsLineBox* aLine,
     nsRect lca(aLine->GetCombinedArea());
     nsBlockFrame::IndentBy(stdout, nsBlockFrame::gNoiseIndent + aDeltaIndent);
     printf("line=%p mY=%d dirty=%s oldBounds={%d,%d,%d,%d} oldCombinedArea={%d,%d,%d,%d} deltaY=%d mPrevBottomMargin=%d childCount=%d\n",
-           NS_STATIC_CAST(void*, aLine), aState.mY,
+           static_cast<void*>(aLine), aState.mY,
            aLine->IsDirty() ? "yes" : "no",
            aLine->mBounds.x, aLine->mBounds.y,
            aLine->mBounds.width, aLine->mBounds.height,
@@ -1959,7 +1959,7 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
         }
         if (!overflowLines) {
           aState.mNextInFlow =
-            NS_STATIC_CAST(nsBlockFrame*, nextInFlow->GetNextInFlow());
+            static_cast<nsBlockFrame*>(nextInFlow->GetNextInFlow());
           continue;
         }
         nifLine = overflowLines->begin();
@@ -2198,7 +2198,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
     printf("%p invalidate (%d, %d, %d, %d)\n",
            this, dirtyRect.x, dirtyRect.y, dirtyRect.width, dirtyRect.height);
     if (aLine->IsForceInvalidate())
-      printf("  dirty line is %p\n", NS_STATIC_CAST(void*, aLine.get());
+      printf("  dirty line is %p\n", static_cast<void*>(aLine.get());
 #endif
     Invalidate(dirtyRect);
   }
@@ -2652,7 +2652,7 @@ nsBlockFrame::UndoSplitPlaceholders(nsBlockReflowState& aState,
     aState.mOverflowPlaceholders.SetFrames(nsnull);
   }
   // remove the next in flows of the placeholders that need to be removed
-  for (nsPlaceholderFrame* placeholder = NS_STATIC_CAST(nsPlaceholderFrame*, undoPlaceholder);
+  for (nsPlaceholderFrame* placeholder = static_cast<nsPlaceholderFrame*>(undoPlaceholder);
        placeholder; ) {
     NS_ASSERTION(!placeholder->GetNextInFlow(), "Must be the last placeholder");
 
@@ -2664,7 +2664,7 @@ nsBlockFrame::UndoSplitPlaceholders(nsBlockReflowState& aState,
 
     nsSplittableFrame::RemoveFromFlow(placeholder);
     nsIFrame* savePlaceholder = placeholder; 
-    placeholder = NS_STATIC_CAST(nsPlaceholderFrame*, placeholder->GetNextSibling());
+    placeholder = static_cast<nsPlaceholderFrame*>(placeholder->GetNextSibling());
     savePlaceholder->Destroy();
   }
 }
@@ -2989,7 +2989,7 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
             // the line is already marked dirty, so just handle the
             // first case.
             if (!madeContinuation) {
-              nsBlockFrame* nifBlock = NS_STATIC_CAST(nsBlockFrame*, nextFrame->GetParent());
+              nsBlockFrame* nifBlock = static_cast<nsBlockFrame*>(nextFrame->GetParent());
               NS_ASSERTION(nifBlock->GetType() == nsGkAtoms::blockFrame
                            || nifBlock->GetType() == nsGkAtoms::areaFrame,
                            "A block's child's next in flow's parent must be a block!");
@@ -3449,7 +3449,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
   if (frameReflowStatus & NS_FRAME_REFLOW_NEXTINFLOW) {
     // we need to ensure that the frame's nextinflow gets reflowed.
     aState.mReflowStatus |= NS_FRAME_REFLOW_NEXTINFLOW;
-    nsBlockFrame* ourNext = NS_STATIC_CAST(nsBlockFrame*, GetNextInFlow());
+    nsBlockFrame* ourNext = static_cast<nsBlockFrame*>(GetNextInFlow());
     if (ourNext && aFrame->GetNextInFlow()) {
       line_iterator f = ourNext->FindLineFor(aFrame->GetNextInFlow());
       if (f != ourNext->end_lines()) {
@@ -3711,7 +3711,7 @@ nsBlockFrame::SplitLine(nsBlockReflowState& aState,
   if (gNoisyReflow) {
     nsFrame::IndentBy(stdout, gNoiseIndent);
     printf("split line: from line=%p pushCount=%d aFrame=",
-           NS_STATIC_CAST(void*, aLine.get()), pushCount);
+           static_cast<void*>(aLine.get()), pushCount);
     if (aFrame) {
       nsFrame::ListTag(stdout, aFrame);
     }
@@ -3841,7 +3841,7 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
       if (abs(aLine->mBounds.y - lastHeight) > CRAZY_H/10) {
         nsFrame::ListTag(stdout);
         printf(": line=%p y=%d line.bounds.height=%d\n",
-               NS_STATIC_CAST(void*, aLine.get()),
+               static_cast<void*>(aLine.get()),
                aLine->mBounds.y, aLine->mBounds.height);
       }
     }
@@ -4109,7 +4109,7 @@ nsBlockFrame::HandleOverflowPlaceholdersForPulledFrame(
       return PR_FALSE;
   }
 
-  nsBlockFrame* parent = NS_STATIC_CAST(nsBlockFrame*, frame->GetParent());
+  nsBlockFrame* parent = static_cast<nsBlockFrame*>(frame->GetParent());
   // Remove aFrame and all its next in flows from their parents, but
   // don't destroy the frames.
 #ifdef DEBUG
@@ -4123,7 +4123,7 @@ nsBlockFrame::HandleOverflowPlaceholdersForPulledFrame(
     NS_ASSERTION(IsContinuationPlaceholder(frame),
                  "Should only be dealing with continuation placeholders here");
 
-    parent = NS_STATIC_CAST(nsBlockFrame*, frame->GetParent());
+    parent = static_cast<nsBlockFrame*>(frame->GetParent());
     ReparentFrame(frame, parent, this);
 
     // continuation placeholders are always direct children of a block
@@ -4300,8 +4300,8 @@ nsBlockFrame::DrainOverflowLines(nsBlockReflowState& aState)
           nsLineBox* line = iter;
           iter = ll->erase(iter);
           nsIFrame* next;
-          for (nsPlaceholderFrame* f = NS_STATIC_CAST(nsPlaceholderFrame*, line->mFirstChild);
-               n > 0; --n, f = NS_STATIC_CAST(nsPlaceholderFrame*, next)) {
+          for (nsPlaceholderFrame* f = static_cast<nsPlaceholderFrame*>(line->mFirstChild);
+               n > 0; --n, f = static_cast<nsPlaceholderFrame*>(next)) {
             if (!IsContinuationPlaceholder(f)) {
               NS_ASSERTION(IsContinuationPlaceholder(f),
                            "Line frames should all be continuation placeholders");
@@ -4361,7 +4361,7 @@ nsBlockFrame::DrainOverflowLines(nsBlockReflowState& aState)
                   nsLineBox* newLine = aState.NewLineBox(f, 1, PR_FALSE);
                   if (newLine) {
                     nsBlockFrame* target =
-                      NS_STATIC_CAST(nsBlockFrame*, fpAncestor->GetNextInFlow());
+                      static_cast<nsBlockFrame*>(fpAncestor->GetNextInFlow());
                     if (!target->mLines.empty()) {
                       f->SetNextSibling(target->mLines.front()->mFirstChild);
                     } else {
@@ -4443,8 +4443,8 @@ nsBlockFrame::GetOverflowLines() const
   if (!(GetStateBits() & NS_BLOCK_HAS_OVERFLOW_LINES)) {
     return nsnull;
   }
-  nsLineList* lines = NS_STATIC_CAST(nsLineList*,
-    GetProperty(nsGkAtoms::overflowLinesProperty));
+  nsLineList* lines = static_cast<nsLineList*>
+                                 (GetProperty(nsGkAtoms::overflowLinesProperty));
   NS_ASSERTION(lines && !lines->empty(),
                "value should always be stored and non-empty when state set");
   return lines;
@@ -4456,8 +4456,8 @@ nsBlockFrame::RemoveOverflowLines()
   if (!(GetStateBits() & NS_BLOCK_HAS_OVERFLOW_LINES)) {
     return nsnull;
   }
-  nsLineList* lines = NS_STATIC_CAST(nsLineList*,
-    UnsetProperty(nsGkAtoms::overflowLinesProperty));
+  nsLineList* lines = static_cast<nsLineList*>
+                                 (UnsetProperty(nsGkAtoms::overflowLinesProperty));
   NS_ASSERTION(lines && !lines->empty(),
                "value should always be stored and non-empty when state set");
   RemoveStateBits(NS_BLOCK_HAS_OVERFLOW_LINES);
@@ -4472,8 +4472,8 @@ DestroyOverflowLines(void*           aFrame,
                      void*           aDtorData)
 {
   if (aPropertyValue) {
-    nsLineList* lines = NS_STATIC_CAST(nsLineList*, aPropertyValue);
-    nsPresContext *context = NS_STATIC_CAST(nsPresContext*, aDtorData);
+    nsLineList* lines = static_cast<nsLineList*>(aPropertyValue);
+    nsPresContext *context = static_cast<nsPresContext*>(aDtorData);
     nsLineBox::DeleteLineList(context, *lines);
     delete lines;
   }
@@ -4505,8 +4505,8 @@ nsBlockFrame::GetOverflowOutOfFlows() const
   if (!(GetStateBits() & NS_BLOCK_HAS_OVERFLOW_OUT_OF_FLOWS)) {
     return nsFrameList();
   }
-  nsIFrame* result = NS_STATIC_CAST(nsIFrame*,
-    GetProperty(nsGkAtoms::overflowOutOfFlowsProperty));
+  nsIFrame* result = static_cast<nsIFrame*>
+                                (GetProperty(nsGkAtoms::overflowOutOfFlowsProperty));
   NS_ASSERTION(result, "value should always be non-empty when state set");
   return nsFrameList(result);
 }
@@ -4519,8 +4519,8 @@ nsBlockFrame::SetOverflowOutOfFlows(const nsFrameList& aList)
     if (!(GetStateBits() & NS_BLOCK_HAS_OVERFLOW_OUT_OF_FLOWS)) {
       return;
     }
-    nsIFrame* result = NS_STATIC_CAST(nsIFrame*,
-                                      UnsetProperty(nsGkAtoms::overflowOutOfFlowsProperty));
+    nsIFrame* result = static_cast<nsIFrame*>
+                                  (UnsetProperty(nsGkAtoms::overflowOutOfFlowsProperty));
     NS_ASSERTION(result, "value should always be non-empty when state set");
     RemoveStateBits(NS_BLOCK_HAS_OVERFLOW_OUT_OF_FLOWS);
   } else {
@@ -4536,8 +4536,8 @@ nsBlockFrame::GetOverflowPlaceholders() const
   if (!(GetStateBits() & NS_BLOCK_HAS_OVERFLOW_PLACEHOLDERS)) {
     return nsnull;
   }
-  nsFrameList* result = NS_STATIC_CAST(nsFrameList*,
-    GetProperty(nsGkAtoms::overflowPlaceholdersProperty));
+  nsFrameList* result = static_cast<nsFrameList*>
+                                   (GetProperty(nsGkAtoms::overflowPlaceholdersProperty));
   NS_ASSERTION(result, "value should always be non-empty when state set");
   return result;
 }
@@ -4830,7 +4830,7 @@ static void MarkAllDescendantLinesDirty(nsBlockFrame* aBlock)
       nsIFrame* f = line->mFirstChild;
       void* bf;
       if (NS_SUCCEEDED(f->QueryInterface(kBlockFrameCID, &bf))) {
-        MarkAllDescendantLinesDirty(NS_STATIC_CAST(nsBlockFrame*, f));
+        MarkAllDescendantLinesDirty(static_cast<nsBlockFrame*>(f));
       }
     }
     line->MarkDirty();
@@ -4847,7 +4847,7 @@ static void MarkSameSpaceManagerLinesDirty(nsBlockFrame* aBlock)
                   QueryInterface(kBlockFrameCID, &bf))) {
       break;
     }
-    blockWithSpaceMgr = NS_STATIC_CAST(nsBlockFrame*, blockWithSpaceMgr->GetParent());
+    blockWithSpaceMgr = static_cast<nsBlockFrame*>(blockWithSpaceMgr->GetParent());
   }
     
   // Mark every line at and below the line where the float was
@@ -4865,7 +4865,7 @@ static PRBool BlockHasAnyFloats(nsIFrame* aFrame)
   void* bf;
   if (NS_FAILED(aFrame->QueryInterface(kBlockFrameCID, &bf)))
     return PR_FALSE;
-  nsBlockFrame* block = NS_STATIC_CAST(nsBlockFrame*, aFrame);
+  nsBlockFrame* block = static_cast<nsBlockFrame*>(aFrame);
   if (block->GetFirstChild(nsGkAtoms::floatList))
     return PR_TRUE;
     
@@ -4976,7 +4976,7 @@ static nsresult RemoveBlockChild(nsIFrame* aFrame, PRBool aDestroyFrames)
   if (!aFrame)
     return NS_OK;
 
-  nsBlockFrame* nextBlock = NS_STATIC_CAST(nsBlockFrame*, aFrame->GetParent());
+  nsBlockFrame* nextBlock = static_cast<nsBlockFrame*>(aFrame->GetParent());
   NS_ASSERTION(nextBlock->GetType() == nsGkAtoms::blockFrame ||
                nextBlock->GetType() == nsGkAtoms::areaFrame,
                "Our child's continuation's parent is not a block?");
@@ -5329,7 +5329,7 @@ nsBlockFrame::ReflowFloat(nsBlockReflowState& aState,
     // XXX won't this be done later in nsLineLayout::ReflowFrame anyway??
     nsIFrame* nextInFlow = aPlaceholder->GetNextInFlow();
     if (nextInFlow) {
-      NS_STATIC_CAST(nsHTMLContainerFrame*, nextInFlow->GetParent())
+      static_cast<nsHTMLContainerFrame*>(nextInFlow->GetParent())
         ->DeleteNextInFlowChild(aState.mPresContext, nextInFlow);
       // that takes care of all subsequent nextinflows too
     }
@@ -5535,7 +5535,7 @@ static void DebugOutputDrawLine(PRInt32 aDepth, nsLineBox* aLine, PRBool aDrawn)
     nsRect lineArea = aLine->GetCombinedArea();
     printf("%s line=%p bounds=%d,%d,%d,%d ca=%d,%d,%d,%d\n",
            aDrawn ? "draw" : "skip",
-           NS_STATIC_CAST(void*, aLine),
+           static_cast<void*>(aLine),
            aLine->mBounds.x, aLine->mBounds.y,
            aLine->mBounds.width, aLine->mBounds.height,
            lineArea.x, lineArea.y,
@@ -5718,7 +5718,7 @@ NS_IMETHODIMP nsBlockFrame::GetAccessible(nsIAccessible** aAccessible)
 
   // block frame may be for <hr>
   if (mContent->Tag() == nsGkAtoms::hr) {
-    return accService->CreateHTMLHRAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+    return accService->CreateHTMLHRAccessible(static_cast<nsIFrame*>(this), aAccessible);
   }
 
   nsPresContext *aPresContext = PresContext();
@@ -5742,7 +5742,7 @@ NS_IMETHODIMP nsBlockFrame::GetAccessible(nsIAccessible** aAccessible)
     }
 
     // Not a bullet, treat as normal HTML container
-    return accService->CreateHyperTextAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+    return accService->CreateHyperTextAccessible(static_cast<nsIFrame*>(this), aAccessible);
   }
 
   // Create special list bullet accessible
@@ -5757,8 +5757,8 @@ NS_IMETHODIMP nsBlockFrame::GetAccessible(nsIAccessible** aAccessible)
     mBullet->GetListItemText(*myList, bulletText);
   }
 
-  return accService->CreateHTMLLIAccessible(NS_STATIC_CAST(nsIFrame*, this), 
-                                            NS_STATIC_CAST(nsIFrame*, mBullet), 
+  return accService->CreateHTMLLIAccessible(static_cast<nsIFrame*>(this), 
+                                            static_cast<nsIFrame*>(mBullet), 
                                             bulletText,
                                             aAccessible);
 }
@@ -5789,8 +5789,8 @@ nsLineBox* nsBlockFrame::GetFirstLineContaining(nscoord y) {
     return nsnull;
   }
 
-  nsLineBox* property = NS_STATIC_CAST(nsLineBox*,
-    GetProperty(nsGkAtoms::lineCursorProperty));
+  nsLineBox* property = static_cast<nsLineBox*>
+                                   (GetProperty(nsGkAtoms::lineCursorProperty));
   line_iterator cursor = mLines.begin(property);
   nsRect cursorArea = cursor->GetCombinedArea();
 
@@ -6110,7 +6110,7 @@ nsBlockFrame::RenumberListsInBlock(nsPresContext* aPresContext,
     }
 
     // Advance to the next continuation
-    aBlockFrame = NS_STATIC_CAST(nsBlockFrame*, aBlockFrame->GetNextInFlow());
+    aBlockFrame = static_cast<nsBlockFrame*>(aBlockFrame->GetNextInFlow());
   }
 
   return renumberedABullet;
diff --git a/mozilla/layout/generic/nsBlockReflowContext.cpp b/mozilla/layout/generic/nsBlockReflowContext.cpp
index ad46e9ae510..9b0581b1aac 100644
--- a/mozilla/layout/generic/nsBlockReflowContext.cpp
+++ b/mozilla/layout/generic/nsBlockReflowContext.cpp
@@ -122,8 +122,8 @@ nsBlockReflowContext::ComputeCollapsedTopMargin(const nsHTMLReflowState& aRS,
     // for example, if A contains B and A->nextinflow contains
     // B->nextinflow, we'll traverse B->nextinflow twice. But this is
     // OK because our traversal is idempotent.
-    for (nsBlockFrame* block = NS_STATIC_CAST(nsBlockFrame*, frame);
-         block; block = NS_STATIC_CAST(nsBlockFrame*, block->GetNextInFlow())) {
+    for (nsBlockFrame* block = static_cast<nsBlockFrame*>(frame);
+         block; block = static_cast<nsBlockFrame*>(block->GetNextInFlow())) {
       for (PRBool overflowLines = PR_FALSE; overflowLines <= PR_TRUE; ++overflowLines) {
         nsBlockFrame::line_iterator line;
         nsBlockFrame::line_iterator line_end;
@@ -200,7 +200,7 @@ nsBlockReflowContext::ComputeCollapsedTopMargin(const nsHTMLReflowState& aRS,
                 aMargin->Include(innerReflowState.mComputedMargin.bottom);
             }
             if (outerReflowState != &aRS) {
-              delete NS_CONST_CAST(nsHTMLReflowState*, outerReflowState);
+              delete const_cast<nsHTMLReflowState*>(outerReflowState);
             }
           }
           if (!isEmpty) {
@@ -240,7 +240,7 @@ static void
 nsPointDtor(void *aFrame, nsIAtom *aPropertyName,
             void *aPropertyValue, void *aDtorData)
 {
-  nsPoint *point = NS_STATIC_CAST(nsPoint*, aPropertyValue);
+  nsPoint *point = static_cast<nsPoint*>(aPropertyValue);
   delete point;
 }
 
@@ -264,8 +264,8 @@ nsBlockReflowContext::ReflowBlock(const nsRect&       aSpace,
   if (NS_STYLE_POSITION_RELATIVE == display->mPosition) {
     nsPropertyTable *propTable = mPresContext->PropertyTable();
 
-    nsPoint *offsets = NS_STATIC_CAST(nsPoint*,
-        propTable->GetProperty(mFrame, nsGkAtoms::computedOffsetProperty));
+    nsPoint *offsets = static_cast<nsPoint*>
+                                  (propTable->GetProperty(mFrame, nsGkAtoms::computedOffsetProperty));
 
     if (offsets)
       offsets->MoveTo(aComputedOffsets.left, aComputedOffsets.top);
@@ -409,7 +409,7 @@ nsBlockReflowContext::ReflowBlock(const nsRect&       aSpace,
         // Floats will eventually be removed via nsBlockFrame::RemoveFloat
         // which detaches the placeholder from the float.
 /* XXX promote DeleteChildsNextInFlow to nsIFrame to elminate this cast */
-        NS_STATIC_CAST(nsHTMLContainerFrame*, kidNextInFlow->GetParent())
+        static_cast<nsHTMLContainerFrame*>(kidNextInFlow->GetParent())
           ->DeleteNextInFlowChild(mPresContext, kidNextInFlow);
       }
     }
diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp
index 9c0ea3e62dd..c5f28e8bc60 100644
--- a/mozilla/layout/generic/nsBlockReflowState.cpp
+++ b/mozilla/layout/generic/nsBlockReflowState.cpp
@@ -104,7 +104,7 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
   mReflowStatus = NS_FRAME_COMPLETE;
 
   mPresContext = aPresContext;
-  mNextInFlow = NS_STATIC_CAST(nsBlockFrame*, mBlock->GetNextInFlow());
+  mNextInFlow = static_cast<nsBlockFrame*>(mBlock->GetNextInFlow());
 
   NS_ASSERTION(NS_UNCONSTRAINEDSIZE != aReflowState.ComputedWidth(),
                "no unconstrained widths should be present anymore");
@@ -411,8 +411,8 @@ nsBlockReflowState::RecoverFloats(nsLineList::iterator aLine,
       // accordingly so that we consider relatively positioned frames
       // at their original position.
       if (NS_STYLE_POSITION_RELATIVE == kid->GetStyleDisplay()->mPosition) {
-        nsPoint *offsets = NS_STATIC_CAST(nsPoint*,
-          mPresContext->PropertyTable()->GetProperty(kid,
+        nsPoint *offsets = static_cast<nsPoint*>
+                                      (mPresContext->PropertyTable()->GetProperty(kid,
                                        nsGkAtoms::computedOffsetProperty));
 
         if (offsets) {
@@ -939,8 +939,8 @@ nsBlockReflowState::FlowAndPlaceFloat(nsFloatCache*   aFloatCache,
 
   // If float is relatively positioned, factor that in as well
   if (NS_STYLE_POSITION_RELATIVE == floatDisplay->mPosition) {
-    nsPoint *offsets = NS_STATIC_CAST(nsPoint*,
-        floatFrame->GetProperty(nsGkAtoms::computedOffsetProperty));
+    nsPoint *offsets = static_cast<nsPoint*>
+                                  (floatFrame->GetProperty(nsGkAtoms::computedOffsetProperty));
     if (offsets) {
       origin += *offsets;
     }
@@ -1018,7 +1018,7 @@ nsBlockReflowState::PlaceBelowCurrentLineFloats(nsFloatCacheFreeList& aList, PRB
         nsIFrame* nextPlaceholder = fc->mPlaceholder->GetNextInFlow();
         if (nextPlaceholder) {
           nsHTMLContainerFrame* parent =
-            NS_STATIC_CAST(nsHTMLContainerFrame*, nextPlaceholder->GetParent());
+            static_cast<nsHTMLContainerFrame*>(nextPlaceholder->GetParent());
           parent->DeleteNextInFlowChild(mPresContext, nextPlaceholder);
         }
       }
diff --git a/mozilla/layout/generic/nsBulletFrame.cpp b/mozilla/layout/generic/nsBulletFrame.cpp
index 05145e34bfc..d8e7495ebe6 100644
--- a/mozilla/layout/generic/nsBulletFrame.cpp
+++ b/mozilla/layout/generic/nsBulletFrame.cpp
@@ -103,7 +103,7 @@ nsBulletFrame::Destroy()
   }
 
   if (mListener)
-    NS_REINTERPRET_CAST(nsBulletListener*, mListener.get())->SetFrame(nsnull);
+    reinterpret_cast<nsBulletListener*>(mListener.get())->SetFrame(nsnull);
 
   // Let base class do the rest
   nsFrame::Destroy();
@@ -194,7 +194,7 @@ public:
 void nsDisplayBullet::Paint(nsDisplayListBuilder* aBuilder,
      nsIRenderingContext* aCtx, const nsRect& aDirtyRect)
 {
-  NS_STATIC_CAST(nsBulletFrame*, mFrame)->
+  static_cast<nsBulletFrame*>(mFrame)->
     PaintBullet(*aCtx, aBuilder->ToReferenceFrame(mFrame), aDirtyRect);
 }
 
diff --git a/mozilla/layout/generic/nsColumnSetFrame.cpp b/mozilla/layout/generic/nsColumnSetFrame.cpp
index 291ddd259b7..4d842407af0 100644
--- a/mozilla/layout/generic/nsColumnSetFrame.cpp
+++ b/mozilla/layout/generic/nsColumnSetFrame.cpp
@@ -615,7 +615,7 @@ nsColumnSetFrame::DrainOverflowColumns()
 {
   // First grab the prev-in-flows overflows and reparent them to this
   // frame.
-  nsColumnSetFrame* prev = NS_STATIC_CAST(nsColumnSetFrame*, GetPrevInFlow());
+  nsColumnSetFrame* prev = static_cast<nsColumnSetFrame*>(GetPrevInFlow());
   if (prev) {
     nsIFrame* overflows = prev->GetOverflowFrames(PresContext(), PR_TRUE);
     if (overflows) {
diff --git a/mozilla/layout/generic/nsContainerFrame.cpp b/mozilla/layout/generic/nsContainerFrame.cpp
index 47ee56beb03..8500d49519a 100644
--- a/mozilla/layout/generic/nsContainerFrame.cpp
+++ b/mozilla/layout/generic/nsContainerFrame.cpp
@@ -199,7 +199,7 @@ nsContainerFrame::RemoveFrame(nsIAtom*  aListName,
     PRBool generateReflowCommand =
       aOldFrame->GetType() == nsGkAtoms::brFrame;
 
-    nsContainerFrame* parent = NS_STATIC_CAST(nsContainerFrame*, aOldFrame->GetParent());
+    nsContainerFrame* parent = static_cast<nsContainerFrame*>(aOldFrame->GetParent());
     while (aOldFrame) {
 #ifdef IBMBIDI
       if (nsGkAtoms::nextBidi != aListName) {
@@ -221,7 +221,7 @@ nsContainerFrame::RemoveFrame(nsIAtom*  aListName,
       parent->mFrames.DestroyFrame(aOldFrame);
       aOldFrame = oldFrameNextContinuation;
       if (aOldFrame) {
-        parent = NS_STATIC_CAST(nsContainerFrame*, aOldFrame->GetParent());
+        parent = static_cast<nsContainerFrame*>(aOldFrame->GetParent());
       }
     }
 
@@ -602,10 +602,10 @@ nsContainerFrame::DoInlineIntrinsicWidth(nsIRenderingContext *aRenderingContext,
          kid = kid->GetNextSibling()) {
       if (aType == nsLayoutUtils::MIN_WIDTH)
         kid->AddInlineMinWidth(aRenderingContext,
-                               NS_STATIC_CAST(InlineMinWidthData*, aData));
+                               static_cast<InlineMinWidthData*>(aData));
       else
         kid->AddInlinePrefWidth(aRenderingContext,
-                                NS_STATIC_CAST(InlinePrefWidthData*, aData));
+                                static_cast<InlinePrefWidthData*>(aData));
     }
   }
 
@@ -683,7 +683,7 @@ nsContainerFrame::ReflowChild(nsIFrame*                aKidFrame,
       // Remove all of the childs next-in-flows. Make sure that we ask
       // the right parent to do the removal (it's possible that the
       // parent is not this because we are executing pullup code)
-      NS_STATIC_CAST(nsContainerFrame*, kidNextInFlow->GetParent())
+      static_cast<nsContainerFrame*>(kidNextInFlow->GetParent())
         ->DeleteNextInFlowChild(aPresContext, kidNextInFlow);
     }
   }
@@ -811,8 +811,8 @@ nsContainerFrame::DeleteNextInFlowChild(nsPresContext* aPresContext,
       frames.AppendElement(f);
     }
     for (PRInt32 i = frames.Count() - 1; i >= 0; --i) {
-      nsIFrame* delFrame = NS_STATIC_CAST(nsIFrame*, frames.ElementAt(i));
-      NS_STATIC_CAST(nsContainerFrame*, delFrame->GetParent())
+      nsIFrame* delFrame = static_cast<nsIFrame*>(frames.ElementAt(i));
+      static_cast<nsContainerFrame*>(delFrame->GetParent())
         ->DeleteNextInFlowChild(aPresContext, delFrame);
     }
   }
@@ -988,32 +988,32 @@ nsContainerFrame::List(FILE* out, PRInt32 aIndent) const
   IndentBy(out, aIndent);
   ListTag(out);
 #ifdef DEBUG_waterson
-  fprintf(out, " [parent=%p]", NS_STATIC_CAST(void*, mParent));
+  fprintf(out, " [parent=%p]", static_cast<void*>(mParent));
 #endif
   if (HasView()) {
-    fprintf(out, " [view=%p]", NS_STATIC_CAST(void*, GetView()));
+    fprintf(out, " [view=%p]", static_cast<void*>(GetView()));
   }
   if (nsnull != mNextSibling) {
-    fprintf(out, " next=%p", NS_STATIC_CAST(void*, mNextSibling));
+    fprintf(out, " next=%p", static_cast<void*>(mNextSibling));
   }
   if (nsnull != GetPrevContinuation()) {
-    fprintf(out, " prev-continuation=%p", NS_STATIC_CAST(void*, GetPrevContinuation()));
+    fprintf(out, " prev-continuation=%p", static_cast<void*>(GetPrevContinuation()));
   }
   if (nsnull != GetNextContinuation()) {
-    fprintf(out, " next-continuation=%p", NS_STATIC_CAST(void*, GetNextContinuation()));
+    fprintf(out, " next-continuation=%p", static_cast<void*>(GetNextContinuation()));
   }
   fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height);
   if (0 != mState) {
     fprintf(out, " [state=%08x]", mState);
   }
-  fprintf(out, " [content=%p]", NS_STATIC_CAST(void*, mContent));
-  nsContainerFrame* f = NS_CONST_CAST(nsContainerFrame*, this);
+  fprintf(out, " [content=%p]", static_cast<void*>(mContent));
+  nsContainerFrame* f = const_cast<nsContainerFrame*>(this);
   nsRect* overflowArea = f->GetOverflowAreaProperty(PR_FALSE);
   if (overflowArea) {
     fprintf(out, " [overflow=%d,%d,%d,%d]", overflowArea->x, overflowArea->y,
             overflowArea->width, overflowArea->height);
   }
-  fprintf(out, " [sc=%p]", NS_STATIC_CAST(void*, mStyleContext));
+  fprintf(out, " [sc=%p]", static_cast<void*>(mStyleContext));
   nsIAtom* pseudoTag = mStyleContext->GetPseudoType();
   if (pseudoTag) {
     nsAutoString atomString;
diff --git a/mozilla/layout/generic/nsFirstLetterFrame.cpp b/mozilla/layout/generic/nsFirstLetterFrame.cpp
index a1729a01833..c0e258d527b 100644
--- a/mozilla/layout/generic/nsFirstLetterFrame.cpp
+++ b/mozilla/layout/generic/nsFirstLetterFrame.cpp
@@ -291,7 +291,7 @@ nsFirstLetterFrame::Reflow(nsPresContext*          aPresContext,
     nsIFrame* kidNextInFlow = kid->GetNextInFlow();
     if (kidNextInFlow) {
       // Remove all of the childs next-in-flows
-      NS_STATIC_CAST(nsContainerFrame*, kidNextInFlow->GetParent())
+      static_cast<nsContainerFrame*>(kidNextInFlow->GetParent())
         ->DeleteNextInFlowChild(aPresContext, kidNextInFlow);
     }
   }
diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp
index 05003c63710..7b428e0f29f 100644
--- a/mozilla/layout/generic/nsFrame.cpp
+++ b/mozilla/layout/generic/nsFrame.cpp
@@ -513,14 +513,14 @@ nsFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
 
 #ifdef DEBUG
   if (aIID.Equals(NS_GET_IID(nsIFrameDebug))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIFrameDebug*, this);
+    *aInstancePtr = static_cast<nsIFrameDebug*>(this);
     return NS_OK;
   }
 #endif
 
   if (aIID.Equals(NS_GET_IID(nsIFrame)) ||
       aIID.Equals(NS_GET_IID(nsISupports))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIFrame*, this);
+    *aInstancePtr = static_cast<nsIFrame*>(this);
     return NS_OK;
   }
 
@@ -690,8 +690,8 @@ nsIFrame::GetUsedMargin() const
 
   nsMargin margin(0, 0, 0, 0);
   if (!GetStyleMargin()->GetMargin(margin)) {
-    nsMargin *m = NS_STATIC_CAST(nsMargin*,
-                    GetProperty(nsGkAtoms::usedMarginProperty));
+    nsMargin *m = static_cast<nsMargin*>
+                             (GetProperty(nsGkAtoms::usedMarginProperty));
     NS_ASSERTION(m, "used margin property missing (out of memory?)");
     if (m) {
       margin = *m;
@@ -708,7 +708,7 @@ nsIFrame::GetUsedBorder() const
                "cannot call on a dirty frame not currently being reflowed");
 
   // Theme methods don't use const-ness.
-  nsIFrame *mutable_this = NS_CONST_CAST(nsIFrame*, this);
+  nsIFrame *mutable_this = const_cast<nsIFrame*>(this);
 
   const nsStyleDisplay *disp = GetStyleDisplay();
   if (mutable_this->IsThemed(disp)) {
@@ -737,7 +737,7 @@ nsIFrame::GetUsedPadding() const
   nsMargin padding(0, 0, 0, 0);
 
   // Theme methods don't use const-ness.
-  nsIFrame *mutable_this = NS_CONST_CAST(nsIFrame*, this);
+  nsIFrame *mutable_this = const_cast<nsIFrame*>(this);
 
   const nsStyleDisplay *disp = GetStyleDisplay();
   if (mutable_this->IsThemed(disp)) {
@@ -754,8 +754,8 @@ nsIFrame::GetUsedPadding() const
     }
   }
   if (!GetStylePadding()->GetPadding(padding)) {
-    nsMargin *p = NS_STATIC_CAST(nsMargin*,
-                    GetProperty(nsGkAtoms::usedPaddingProperty));
+    nsMargin *p = static_cast<nsMargin*>
+                             (GetProperty(nsGkAtoms::usedPaddingProperty));
     NS_ASSERTION(p, "used padding property missing (out of memory?)");
     if (p) {
       padding = *p;
@@ -1452,7 +1452,7 @@ nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder*   aBuilder,
 
   nsIAtom* childType = aChild->GetType();
   if (childType == nsGkAtoms::placeholderFrame) {
-    nsPlaceholderFrame* placeholder = NS_STATIC_CAST(nsPlaceholderFrame*, aChild);
+    nsPlaceholderFrame* placeholder = static_cast<nsPlaceholderFrame*>(aChild);
     aChild = placeholder->GetOutOfFlowFrame();
     NS_ASSERTION(aChild, "No out of flow frame?");
     if (!aChild)
@@ -1466,8 +1466,8 @@ nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder*   aBuilder,
     // Recheck NS_FRAME_IS_FLOWABLE
     if (aChild->GetStateBits() & NS_FRAME_IS_UNFLOWABLE)
       return NS_OK;
-    nsRect* savedDirty = NS_STATIC_CAST(nsRect*,
-        aChild->GetProperty(nsGkAtoms::outOfFlowDirtyRectProperty));
+    nsRect* savedDirty = static_cast<nsRect*>
+                                    (aChild->GetProperty(nsGkAtoms::outOfFlowDirtyRectProperty));
     if (savedDirty) {
       dirty = *savedDirty;
     } else {
@@ -1676,7 +1676,7 @@ nsFrame::HandleEvent(nsPresContext* aPresContext,
   }
 
   if (aEvent->eventStructType == NS_MOUSE_EVENT &&
-      NS_STATIC_CAST(nsMouseEvent*, aEvent)->button == nsMouseEvent::eLeftButton) {
+      static_cast<nsMouseEvent*>(aEvent)->button == nsMouseEvent::eLeftButton) {
     if (aEvent->message == NS_MOUSE_BUTTON_DOWN) {
       HandlePress(aPresContext, aEvent, aEventStatus);
     } else if (aEvent->message == NS_MOUSE_BUTTON_UP) {
@@ -2123,7 +2123,7 @@ nsFrame::HandleMultiplePress(nsPresContext* aPresContext,
   if (!theFrame)
     return NS_ERROR_FAILURE;
 
-  nsFrame* frame = NS_STATIC_CAST(nsFrame*, theFrame);
+  nsFrame* frame = static_cast<nsFrame*>(theFrame);
 
   return frame->PeekBackwardAndForward(beginAmount, endAmount,
                                        offsets.offset, aPresContext,
@@ -2422,7 +2422,7 @@ NS_IMETHODIMP nsFrame::HandleRelease(nsPresContext* aPresContext,
   // trickle down here. Make sure that document's frame selection is notified.
   // Note, this may cause the current nsFrame object to be deleted, bug 336592.
   if (activeFrame != this &&
-      NS_STATIC_CAST(nsFrame*, activeFrame)->DisplaySelection(activeFrame->PresContext())
+      static_cast<nsFrame*>(activeFrame)->DisplaySelection(activeFrame->PresContext())
         != nsISelectionController::SELECTION_OFF) {
     nsRefPtr<nsFrameSelection> frameSelection =
       activeFrame->GetFrameSelection();
@@ -2870,7 +2870,7 @@ nsIFrame::ContentOffsets nsIFrame::GetContentOffsetsFromPoint(nsPoint aPoint,
     return offsets;
   }
   nsPoint pt = aPoint - closest.frame->GetOffsetTo(this);
-  return NS_STATIC_CAST(nsFrame*, closest.frame)->CalcContentOffsetsFromFramePoint(pt);
+  return static_cast<nsFrame*>(closest.frame)->CalcContentOffsetsFromFramePoint(pt);
 
   // XXX should I add some kind of offset standardization?
   // consider <b>xxxxx</b><i>zzzzz</i>; should any click between the last
@@ -2970,7 +2970,7 @@ nsIFrame::InlineMinWidthData::ForceBreak(nsIRenderingContext *aRenderingContext)
   currentLine = trailingWhitespace = 0;
 
   for (PRInt32 i = 0, i_end = floats.Count(); i != i_end; ++i) {
-    nsIFrame *floatFrame = NS_STATIC_CAST(nsIFrame*, floats[i]);
+    nsIFrame *floatFrame = static_cast<nsIFrame*>(floats[i]);
     nscoord float_min =
       nsLayoutUtils::IntrinsicForContainer(aRenderingContext, floatFrame,
                                            nsLayoutUtils::MIN_WIDTH);
@@ -3009,7 +3009,7 @@ nsIFrame::InlinePrefWidthData::ForceBreak(nsIRenderingContext *aRenderingContext
             floats_cur_right = 0;
 
     for (PRInt32 i = 0, i_end = floats.Count(); i != i_end; ++i) {
-      nsIFrame *floatFrame = NS_STATIC_CAST(nsIFrame*, floats[i]);
+      nsIFrame *floatFrame = static_cast<nsIFrame*>(floats[i]);
       const nsStyleDisplay *floatDisp = floatFrame->GetStyleDisplay();
       if (floatDisp->mBreakType == NS_STYLE_CLEAR_LEFT ||
           floatDisp->mBreakType == NS_STYLE_CLEAR_RIGHT ||
@@ -3448,7 +3448,7 @@ nsIFrame::GetView() const
 
   NS_ENSURE_SUCCESS(rv, nsnull);
   NS_ASSERTION(value, "frame state bit was set but frame has no view");
-  return NS_STATIC_CAST(nsIView*, value);
+  return static_cast<nsIView*>(value);
 }
 
 /* virtual */ nsIView*
@@ -3757,7 +3757,7 @@ nsIFrame::GetOverflowRect() const
   // of child frames. That's OK because any reflow that updates these
   // areas will invalidate the appropriate area, so any (mis)uses of
   // this method will be fixed up.
-  nsRect* storedOA = NS_CONST_CAST(nsIFrame*, this)
+  nsRect* storedOA = const_cast<nsIFrame*>(this)
     ->GetOverflowAreaProperty(PR_FALSE);
   if (storedOA) {
     return *storedOA;
@@ -3887,10 +3887,10 @@ nsFrame::List(FILE* out, PRInt32 aIndent) const
   IndentBy(out, aIndent);
   ListTag(out);
 #ifdef DEBUG_waterson
-  fprintf(out, " [parent=%p]", NS_STATIC_CAST(void*, mParent));
+  fprintf(out, " [parent=%p]", static_cast<void*>(mParent));
 #endif
   if (HasView()) {
-    fprintf(out, " [view=%p]", NS_STATIC_CAST(void*, GetView()));
+    fprintf(out, " [view=%p]", static_cast<void*>(GetView()));
   }
   fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height);
   if (0 != mState) {
@@ -3899,13 +3899,13 @@ nsFrame::List(FILE* out, PRInt32 aIndent) const
   nsIFrame* prevInFlow = GetPrevInFlow();
   nsIFrame* nextInFlow = GetNextInFlow();
   if (nsnull != prevInFlow) {
-    fprintf(out, " prev-in-flow=%p", NS_STATIC_CAST(void*, prevInFlow));
+    fprintf(out, " prev-in-flow=%p", static_cast<void*>(prevInFlow));
   }
   if (nsnull != nextInFlow) {
-    fprintf(out, " next-in-flow=%p", NS_STATIC_CAST(void*, nextInFlow));
+    fprintf(out, " next-in-flow=%p", static_cast<void*>(nextInFlow));
   }
-  fprintf(out, " [content=%p]", NS_STATIC_CAST(void*, mContent));
-  nsFrame* f = NS_CONST_CAST(nsFrame*, this);
+  fprintf(out, " [content=%p]", static_cast<void*>(mContent));
+  nsFrame* f = const_cast<nsFrame*>(this);
   nsRect* overflowArea = f->GetOverflowAreaProperty(PR_FALSE);
   if (overflowArea) {
     fprintf(out, " [overflow=%d,%d,%d,%d]", overflowArea->x, overflowArea->y,
@@ -5287,7 +5287,7 @@ DestroyRectFunc(void*    aFrame,
                 void*    aPropertyValue,
                 void*    aDtorData)
 {
-  delete NS_STATIC_CAST(nsRect*, aPropertyValue);
+  delete static_cast<nsRect*>(aPropertyValue);
 }
 
 nsRect*
@@ -5435,8 +5435,8 @@ GetIBSpecialSibling(nsPresContext* aPresContext,
    * interested in.
    */
   nsresult rv;
-  nsIFrame *specialSibling = NS_STATIC_CAST(nsIFrame*,
-                             aPresContext->PropertyTable()->GetProperty(aFrame,
+  nsIFrame *specialSibling = static_cast<nsIFrame*>
+                                        (aPresContext->PropertyTable()->GetProperty(aFrame,
                                nsGkAtoms::IBSplitSpecialPrevSibling, &rv));
 
   if (NS_PROPTABLE_PROP_NOT_THERE == rv) {
@@ -5585,7 +5585,7 @@ nsFrame::DoGetParentStyleContextFrame(nsPresContext* aPresContext,
     GetCorrectedParent(aPresContext, this, aProviderFrame);
     return NS_ERROR_FAILURE;
   }
-  return NS_STATIC_CAST(nsFrame*, placeholder)->
+  return static_cast<nsFrame*>(placeholder)->
     GetParentStyleContextFrame(aPresContext, aProviderFrame, aIsChild);
 }
 
@@ -5871,7 +5871,7 @@ nsFrame::RefreshSizeCache(nsBoxLayoutState& aState)
     metrics->mBlockMinSize.height = 0;
     // ok we need the max ascent of the items on the line. So to do this
     // ask the block for its line iterator. Get the max ascent.
-    nsCOMPtr<nsILineIterator> lines = do_QueryInterface(NS_STATIC_CAST(nsIFrame*, this));
+    nsCOMPtr<nsILineIterator> lines = do_QueryInterface(static_cast<nsIFrame*>(this));
     if (lines) 
     {
       metrics->mBlockMinSize.height = 0;
@@ -6369,7 +6369,7 @@ nsBoxLayoutMetrics*
 nsFrame::BoxMetrics() const
 {
   nsBoxLayoutMetrics* metrics =
-    NS_STATIC_CAST(nsBoxLayoutMetrics*, GetProperty(nsGkAtoms::boxMetricsProperty));
+    static_cast<nsBoxLayoutMetrics*>(GetProperty(nsGkAtoms::boxMetricsProperty));
   NS_ASSERTION(metrics, "A box layout method was called but InitBoxMetrics was never called");
   return metrics;
 }
@@ -6402,7 +6402,7 @@ DeleteBoxMetrics(void    *aObject,
                  void    *aPropertyValue,
                  void    *aData)
 {
-  delete NS_STATIC_CAST(nsBoxLayoutMetrics*, aPropertyValue);
+  delete static_cast<nsBoxLayoutMetrics*>(aPropertyValue);
 }
 
 void
diff --git a/mozilla/layout/generic/nsFrame.h b/mozilla/layout/generic/nsFrame.h
index 21a848f0b5b..4fe4cd0681f 100644
--- a/mozilla/layout/generic/nsFrame.h
+++ b/mozilla/layout/generic/nsFrame.h
@@ -440,7 +440,7 @@ public:
       frameDebug->GetFrameName(tmp);
     }
     fputs(NS_LossyConvertUTF16toASCII(tmp).get(), out);
-    fprintf(out, "@%p", NS_STATIC_CAST(void*, aFrame));
+    fprintf(out, "@%p", static_cast<void*>(aFrame));
   }
 
   static void IndentBy(FILE* out, PRInt32 aIndent) {
diff --git a/mozilla/layout/generic/nsFrameFrame.cpp b/mozilla/layout/generic/nsFrameFrame.cpp
index 05b2f5ca90e..a654fb0f022 100644
--- a/mozilla/layout/generic/nsFrameFrame.cpp
+++ b/mozilla/layout/generic/nsFrameFrame.cpp
@@ -205,7 +205,7 @@ nsSubDocumentFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(NS_GET_IID(nsIFrameFrame))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIFrameFrame*, this);
+    *aInstancePtr = static_cast<nsIFrameFrame*>(this);
     return NS_OK;
   }
 
@@ -300,7 +300,7 @@ nsSubDocumentFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
   nsIView* subdocView = mInnerView->GetFirstChild();
   if (!subdocView)
     return NS_OK;
-  nsIFrame* f = NS_STATIC_CAST(nsIFrame*, subdocView->GetClientData());
+  nsIFrame* f = static_cast<nsIFrame*>(subdocView->GetClientData());
   if (!f)
     return NS_OK;
   
diff --git a/mozilla/layout/generic/nsFrameList.cpp b/mozilla/layout/generic/nsFrameList.cpp
index 77c252db1ec..6b534f55df3 100644
--- a/mozilla/layout/generic/nsFrameList.cpp
+++ b/mozilla/layout/generic/nsFrameList.cpp
@@ -304,8 +304,8 @@ nsFrameList::GetLength() const
 static int PR_CALLBACK CompareByContentOrder(const void* aF1, const void* aF2,
                                              void* aDummy)
 {
-  const nsIFrame* f1 = NS_STATIC_CAST(const nsIFrame*, aF1);
-  const nsIFrame* f2 = NS_STATIC_CAST(const nsIFrame*, aF2);
+  const nsIFrame* f1 = static_cast<const nsIFrame*>(aF1);
+  const nsIFrame* f2 = static_cast<const nsIFrame*>(aF2);
   if (f1->GetContent() != f2->GetContent()) {
     return nsLayoutUtils::CompareTreePosition(f1->GetContent(), f2->GetContent());
   }
@@ -344,9 +344,9 @@ nsFrameList::SortByContentOrder()
     array.AppendElement(f);
   }
   array.Sort(CompareByContentOrder, nsnull);
-  f = mFirstChild = NS_STATIC_CAST(nsIFrame*, array.FastElementAt(0));
+  f = mFirstChild = static_cast<nsIFrame*>(array.FastElementAt(0));
   for (PRInt32 i = 1; i < array.Count(); ++i) {
-    nsIFrame* ff = NS_STATIC_CAST(nsIFrame*, array.FastElementAt(i));
+    nsIFrame* ff = static_cast<nsIFrame*>(array.FastElementAt(i));
     f->SetNextSibling(ff);
     f = ff;
   }
diff --git a/mozilla/layout/generic/nsFrameSetFrame.cpp b/mozilla/layout/generic/nsFrameSetFrame.cpp
index f5b835e35e9..bf94e96b154 100644
--- a/mozilla/layout/generic/nsFrameSetFrame.cpp
+++ b/mozilla/layout/generic/nsFrameSetFrame.cpp
@@ -268,7 +268,7 @@ int
 nsHTMLFramesetFrame::FrameResizePrefCallback(const char* aPref, void* aClosure)
 {
   nsHTMLFramesetFrame *frame =
-    NS_REINTERPRET_CAST(nsHTMLFramesetFrame *, aClosure);
+    reinterpret_cast<nsHTMLFramesetFrame *>(aClosure);
 
   nsIDocument* doc = frame->mContent->GetDocument();
   mozAutoDocUpdate updateBatch(doc, UPDATE_CONTENT_MODEL, PR_TRUE);
@@ -791,7 +791,7 @@ NS_METHOD nsHTMLFramesetFrame::HandleEvent(nsPresContext* aPresContext,
 	      break;
       case NS_MOUSE_BUTTON_UP:
         if (aEvent->eventStructType == NS_MOUSE_EVENT &&
-            NS_STATIC_CAST(nsMouseEvent*, aEvent)->button ==
+            static_cast<nsMouseEvent*>(aEvent)->button ==
               nsMouseEvent::eLeftButton) {
           EndMouseDrag(aPresContext);
         }
@@ -1680,7 +1680,7 @@ public:
 void nsDisplayFramesetBorder::Paint(nsDisplayListBuilder* aBuilder,
      nsIRenderingContext* aCtx, const nsRect& aDirtyRect)
 {
-  NS_STATIC_CAST(nsHTMLFramesetBorderFrame*, mFrame)->
+  static_cast<nsHTMLFramesetBorderFrame*>(mFrame)->
     PaintBorder(*aCtx, aBuilder->ToReferenceFrame(mFrame));
 }
 
@@ -1793,7 +1793,7 @@ nsHTMLFramesetBorderFrame::HandleEvent(nsPresContext* aPresContext,
 
   if (aEvent->eventStructType == NS_MOUSE_EVENT &&
       aEvent->message == NS_MOUSE_BUTTON_DOWN &&
-      NS_STATIC_CAST(nsMouseEvent*, aEvent)->button == nsMouseEvent::eLeftButton) {
+      static_cast<nsMouseEvent*>(aEvent)->button == nsMouseEvent::eLeftButton) {
     nsHTMLFramesetFrame* parentFrame;
     nsIFrame* fptr = GetParent();
     parentFrame = (nsHTMLFramesetFrame*) fptr;
diff --git a/mozilla/layout/generic/nsGfxScrollFrame.cpp b/mozilla/layout/generic/nsGfxScrollFrame.cpp
index a58362920de..5de52542c0a 100644
--- a/mozilla/layout/generic/nsGfxScrollFrame.cpp
+++ b/mozilla/layout/generic/nsGfxScrollFrame.cpp
@@ -422,8 +422,7 @@ nsHTMLScrollFrame::ReflowScrolledFrame(const ScrollReflowState& aState,
 
   if (aAssumeVScroll) {
     nsSize vScrollbarPrefSize = 
-      mInner.mVScrollbarBox->GetPrefSize(NS_CONST_CAST(nsBoxLayoutState&, 
-                                                       aState.mBoxState));
+      mInner.mVScrollbarBox->GetPrefSize(const_cast<nsBoxLayoutState&>(aState.mBoxState));
     availWidth = PR_MAX(0, availWidth - vScrollbarPrefSize.width);
   }
   // pixel align the content
@@ -837,7 +836,7 @@ NS_IMETHODIMP nsHTMLScrollFrame::GetAccessible(nsIAccessible** aAccessible)
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    return accService->CreateHTMLGenericAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+    return accService->CreateHTMLGenericAccessible(static_cast<nsIFrame*>(this), aAccessible);
   }
 
   return NS_ERROR_FAILURE;
diff --git a/mozilla/layout/generic/nsHTMLCanvasFrame.cpp b/mozilla/layout/generic/nsHTMLCanvasFrame.cpp
index b12eba102fd..52f70a225b0 100644
--- a/mozilla/layout/generic/nsHTMLCanvasFrame.cpp
+++ b/mozilla/layout/generic/nsHTMLCanvasFrame.cpp
@@ -221,7 +221,7 @@ nsHTMLCanvasFrame::PaintCanvas(nsIRenderingContext& aRenderingContext,
 static void PaintCanvas(nsIFrame* aFrame, nsIRenderingContext* aCtx,
                         const nsRect& aDirtyRect, nsPoint aPt)
 {
-  NS_STATIC_CAST(nsHTMLCanvasFrame*, aFrame)->PaintCanvas(*aCtx, aDirtyRect, aPt);
+  static_cast<nsHTMLCanvasFrame*>(aFrame)->PaintCanvas(*aCtx, aDirtyRect, aPt);
 }
 
 NS_IMETHODIMP
diff --git a/mozilla/layout/generic/nsHTMLContainerFrame.cpp b/mozilla/layout/generic/nsHTMLContainerFrame.cpp
index b69aee2a246..7529f3c8d28 100644
--- a/mozilla/layout/generic/nsHTMLContainerFrame.cpp
+++ b/mozilla/layout/generic/nsHTMLContainerFrame.cpp
@@ -112,7 +112,7 @@ nsDisplayTextDecoration::Paint(nsDisplayListBuilder* aBuilder,
 
   // REVIEW: From nsHTMLContainerFrame::PaintTextDecorations
   nscoord ascent, offset, size;
-  nsHTMLContainerFrame* f = NS_STATIC_CAST(nsHTMLContainerFrame*, mFrame);
+  nsHTMLContainerFrame* f = static_cast<nsHTMLContainerFrame*>(mFrame);
   fm->GetMaxAscent(ascent);
   if (mDecoration != NS_STYLE_TEXT_DECORATION_LINE_THROUGH) {
     fm->GetUnderline(offset, size);
diff --git a/mozilla/layout/generic/nsHTMLFrame.cpp b/mozilla/layout/generic/nsHTMLFrame.cpp
index cead8c5072c..133fb49f489 100644
--- a/mozilla/layout/generic/nsHTMLFrame.cpp
+++ b/mozilla/layout/generic/nsHTMLFrame.cpp
@@ -165,11 +165,11 @@ CanvasFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(NS_GET_IID(nsIScrollPositionListener))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIScrollPositionListener*, this);
+    *aInstancePtr = static_cast<nsIScrollPositionListener*>(this);
     return NS_OK;
   } 
   if (aIID.Equals(NS_GET_IID(nsICanvasFrame))) {
-    *aInstancePtr = NS_STATIC_CAST(nsICanvasFrame*, this);
+    *aInstancePtr = static_cast<nsICanvasFrame*>(this);
     return NS_OK;
   } 
 
@@ -361,14 +361,14 @@ public:
 
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder)
   {
-    CanvasFrame* frame = NS_STATIC_CAST(CanvasFrame*, mFrame);
+    CanvasFrame* frame = static_cast<CanvasFrame*>(mFrame);
     return frame->CanvasArea() + aBuilder->ToReferenceFrame(mFrame);
   }
 
   virtual void Paint(nsDisplayListBuilder* aBuilder,
                      nsIRenderingContext* aCtx, const nsRect& aDirtyRect)
   {
-    CanvasFrame* frame = NS_STATIC_CAST(CanvasFrame*, mFrame);
+    CanvasFrame* frame = static_cast<CanvasFrame*>(mFrame);
     nsPoint offset = aBuilder->ToReferenceFrame(mFrame);
     nsRect bgClipRect = frame->CanvasArea() + offset;
     nsCSSRendering::PaintBackground(mFrame->PresContext(), *aCtx, mFrame,
@@ -398,14 +398,14 @@ public:
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder)
   {
     // This is an overestimate, but that's not a problem.
-    CanvasFrame* frame = NS_STATIC_CAST(CanvasFrame*, mFrame);
+    CanvasFrame* frame = static_cast<CanvasFrame*>(mFrame);
     return frame->CanvasArea() + aBuilder->ToReferenceFrame(mFrame);
   }
 
   virtual void Paint(nsDisplayListBuilder* aBuilder,
                      nsIRenderingContext* aCtx, const nsRect& aDirtyRect)
   {
-    CanvasFrame* frame = NS_STATIC_CAST(CanvasFrame*, mFrame);
+    CanvasFrame* frame = static_cast<CanvasFrame*>(mFrame);
     frame->PaintFocus(*aCtx, aBuilder->ToReferenceFrame(mFrame));
   }
 
diff --git a/mozilla/layout/generic/nsHTMLReflowState.cpp b/mozilla/layout/generic/nsHTMLReflowState.cpp
index 683443d2e5c..b36ef9495c2 100644
--- a/mozilla/layout/generic/nsHTMLReflowState.cpp
+++ b/mozilla/layout/generic/nsHTMLReflowState.cpp
@@ -914,7 +914,7 @@ nsHTMLReflowState::CalculateHypotheticalBox(nsPresContext*    aPresContext,
   // First, determine the hypothetical box's mTop
   nsBlockFrame* blockFrame;
   if (NS_SUCCEEDED(aContainingBlock->QueryInterface(kBlockFrameCID,
-                                  NS_REINTERPRET_CAST(void**, &blockFrame)))) {
+                                  reinterpret_cast<void**>(&blockFrame)))) {
     // We need the immediate child of the block frame, and that may not be
     // the placeholder frame
     nsIFrame *blockChild =
@@ -1574,8 +1574,8 @@ static eNormalLineHeightControl GetNormalLineHeightCalcControl(void)
     // browser.display.normal_lineheight_calc_control is not user
     // changeable, so no need to register callback for it.
     sNormalLineHeightControl =
-      NS_STATIC_CAST(eNormalLineHeightControl,
-                     nsContentUtils::GetIntPref("browser.display.normal_lineheight_calc_control", eNoExternalLeading));
+      static_cast<eNormalLineHeightControl>
+                 (nsContentUtils::GetIntPref("browser.display.normal_lineheight_calc_control", eNoExternalLeading));
   }
   return sNormalLineHeightControl;
 }
@@ -1863,7 +1863,7 @@ nsCSSOffsetState::InitOffsets(nscoord aContainingBlockWidth,
   mComputedBorderPadding += mComputedPadding;
 
   if (frame->GetType() == nsGkAtoms::tableFrame) {
-    nsTableFrame *tableFrame = NS_STATIC_CAST(nsTableFrame*, frame);
+    nsTableFrame *tableFrame = static_cast<nsTableFrame*>(frame);
 
     if (tableFrame->IsBorderCollapse()) {
       // border-collapsed tables don't use any of their padding, and
@@ -2086,7 +2086,7 @@ nsCSSOffsetState::DestroyMarginFunc(void*    aFrame,
                                     void*    aPropertyValue,
                                     void*    aDtorData)
 {
-  delete NS_STATIC_CAST(nsMargin*, aPropertyValue);
+  delete static_cast<nsMargin*>(aPropertyValue);
 }
 
 void
diff --git a/mozilla/layout/generic/nsIFrame.h b/mozilla/layout/generic/nsIFrame.h
index 98b33907b5c..97b1272af67 100644
--- a/mozilla/layout/generic/nsIFrame.h
+++ b/mozilla/layout/generic/nsIFrame.h
@@ -616,7 +616,7 @@ public:
 #else
   #define STYLE_STRUCT(name_, checkdata_cb_, ctor_args_)                      \
     const nsStyle##name_ * GetStyle##name_ () const {                         \
-      return NS_STATIC_CAST(const nsStyle##name_*,                            \
+      return static_cast<const nsStyle##name_*>(\
                             GetStyleDataExternal(eStyleStruct_##name_));      \
     }
 #endif
@@ -1011,10 +1011,10 @@ public:
   virtual nsIFrame* GetNextContinuation() const = 0;
   NS_IMETHOD SetNextContinuation(nsIFrame*) = 0;
   virtual nsIFrame* GetFirstContinuation() const {
-    return NS_CONST_CAST(nsIFrame*, this);
+    return const_cast<nsIFrame*>(this);
   }
   virtual nsIFrame* GetLastContinuation() const {
-    return NS_CONST_CAST(nsIFrame*, this);
+    return const_cast<nsIFrame*>(this);
   }
   
   /**
@@ -1032,14 +1032,14 @@ public:
    * Return the first frame in our current flow. 
    */
   virtual nsIFrame* GetFirstInFlow() const {
-    return NS_CONST_CAST(nsIFrame*, this);
+    return const_cast<nsIFrame*>(this);
   }
 
   /**
    * Return the last frame in our current flow.
    */
   virtual nsIFrame* GetLastInFlow() const {
-    return NS_CONST_CAST(nsIFrame*, this);
+    return const_cast<nsIFrame*>(this);
   }
 
 
diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp
index 626a2b3f336..dfb1ba7540d 100644
--- a/mozilla/layout/generic/nsImageFrame.cpp
+++ b/mozilla/layout/generic/nsImageFrame.cpp
@@ -191,7 +191,7 @@ nsImageFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(NS_GET_IID(nsIImageFrame))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIImageFrame*, this);
+    *aInstancePtr = static_cast<nsIImageFrame*>(this);
     return NS_OK;
   }
 
@@ -204,7 +204,7 @@ NS_IMETHODIMP nsImageFrame::GetAccessible(nsIAccessible** aAccessible)
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    return accService->CreateHTMLImageAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+    return accService->CreateHTMLImageAccessible(static_cast<nsIFrame*>(this), aAccessible);
   }
 
   return NS_ERROR_FAILURE;
@@ -241,7 +241,7 @@ nsImageFrame::Destroy()
       imageLoader->RemoveObserver(mListener);
     }
     
-    NS_REINTERPRET_CAST(nsImageListener*, mListener.get())->SetFrame(nsnull);
+    reinterpret_cast<nsImageListener*>(mListener.get())->SetFrame(nsnull);
   }
   
   mListener = nsnull;
@@ -1108,7 +1108,7 @@ nsImageFrame::DisplayAltFeedback(nsIRenderingContext& aRenderingContext,
 static void PaintAltFeedback(nsIFrame* aFrame, nsIRenderingContext* aCtx,
      const nsRect& aDirtyRect, nsPoint aPt)
 {
-  nsImageFrame* f = NS_STATIC_CAST(nsImageFrame*, aFrame);
+  nsImageFrame* f = static_cast<nsImageFrame*>(aFrame);
   f->DisplayAltFeedback(*aCtx,
                         aDirtyRect,
                         IMAGE_OK(f->GetContent()->IntrinsicState(), PR_TRUE)
@@ -1120,7 +1120,7 @@ static void PaintAltFeedback(nsIFrame* aFrame, nsIRenderingContext* aCtx,
 #ifdef NS_DEBUG
 static void PaintDebugImageMap(nsIFrame* aFrame, nsIRenderingContext* aCtx,
      const nsRect& aDirtyRect, nsPoint aPt) {
-  nsImageFrame* f = NS_STATIC_CAST(nsImageFrame*, aFrame);
+  nsImageFrame* f = static_cast<nsImageFrame*>(aFrame);
   nsRect inner = f->GetInnerArea() + aPt;
   nsPresContext* pc = f->PresContext();
 
@@ -1157,7 +1157,7 @@ private:
 void
 nsDisplayImage::Paint(nsDisplayListBuilder* aBuilder,
      nsIRenderingContext* aCtx, const nsRect& aDirtyRect) {
-  NS_STATIC_CAST(nsImageFrame*, mFrame)->
+  static_cast<nsImageFrame*>(mFrame)->
     PaintImage(*aCtx, aBuilder->ToReferenceFrame(mFrame), aDirtyRect, mImage);
 }
 
@@ -1469,7 +1469,7 @@ nsImageFrame::HandleEvent(nsPresContext* aPresContext,
 
   if (aEvent->eventStructType == NS_MOUSE_EVENT &&
       (aEvent->message == NS_MOUSE_BUTTON_UP && 
-      NS_STATIC_CAST(nsMouseEvent*, aEvent)->button == nsMouseEvent::eLeftButton) ||
+      static_cast<nsMouseEvent*>(aEvent)->button == nsMouseEvent::eLeftButton) ||
       aEvent->message == NS_MOUSE_MOVE) {
     map = GetImageMap(aPresContext);
     PRBool isServerMap = IsServerImageMap();
diff --git a/mozilla/layout/generic/nsInlineFrame.cpp b/mozilla/layout/generic/nsInlineFrame.cpp
index 5bf3699a5d5..3ccf389839e 100644
--- a/mozilla/layout/generic/nsInlineFrame.cpp
+++ b/mozilla/layout/generic/nsInlineFrame.cpp
@@ -798,11 +798,11 @@ NS_IMETHODIMP nsInlineFrame::GetAccessible(nsIAccessible** aAccessible)
     if (!accService)
       return NS_ERROR_FAILURE;
     if (tagAtom == nsGkAtoms::input)  // Broken <input type=image ... />
-      return accService->CreateHTMLButtonAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+      return accService->CreateHTMLButtonAccessible(static_cast<nsIFrame*>(this), aAccessible);
     else if (tagAtom == nsGkAtoms::img)  // Create accessible for broken <img>
-      return accService->CreateHTMLImageAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+      return accService->CreateHTMLImageAccessible(static_cast<nsIFrame*>(this), aAccessible);
     else if (tagAtom == nsGkAtoms::label)  // Creat accessible for <label>
-      return accService->CreateHTMLLabelAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+      return accService->CreateHTMLLabelAccessible(static_cast<nsIFrame*>(this), aAccessible);
   }
 
   return NS_ERROR_FAILURE;
diff --git a/mozilla/layout/generic/nsIntervalSet.cpp b/mozilla/layout/generic/nsIntervalSet.cpp
index 0a9ed4e2747..ce6a9aca31f 100644
--- a/mozilla/layout/generic/nsIntervalSet.cpp
+++ b/mozilla/layout/generic/nsIntervalSet.cpp
@@ -71,8 +71,8 @@ void nsIntervalSet::FreeInterval(nsIntervalSet::Interval *aInterval)
 
 void nsIntervalSet::IncludeInterval(coord_type aBegin, coord_type aEnd)
 {
-    Interval *newInterval = NS_STATIC_CAST(Interval*,
-                               (*mAlloc)(sizeof(Interval), mAllocatorClosure));
+    Interval *newInterval = static_cast<Interval*>
+                                       ((*mAlloc)(sizeof(Interval), mAllocatorClosure));
     if (!newInterval) {
         NS_NOTREACHED("allocation failure");
         return;
diff --git a/mozilla/layout/generic/nsLineBox.cpp b/mozilla/layout/generic/nsLineBox.cpp
index 1306ae0d090..7c940e1e2f7 100644
--- a/mozilla/layout/generic/nsLineBox.cpp
+++ b/mozilla/layout/generic/nsLineBox.cpp
@@ -143,7 +143,7 @@ ListFloats(FILE* out, PRInt32 aIndent, const nsFloatCacheList& aFloats)
     nsFrame::IndentBy(out, aIndent);
     nsPlaceholderFrame* ph = fc->mPlaceholder;
     if (nsnull != ph) {
-      fprintf(out, "placeholder@%p ", NS_STATIC_CAST(void*, ph));
+      fprintf(out, "placeholder@%p ", static_cast<void*>(ph));
       nsIFrame* frame = ph->GetOutOfFlowFrame();
       if (nsnull != frame) {
         nsIFrameDebug*  frameDebug;
@@ -206,7 +206,7 @@ nsLineBox::List(FILE* out, PRInt32 aIndent) const
   for (i = aIndent; --i >= 0; ) fputs("  ", out);
   char cbuf[100];
   fprintf(out, "line %p: count=%d state=%s ",
-          NS_STATIC_CAST(const void*, this), GetChildCount(),
+          static_cast<const void*>(this), GetChildCount(),
           StateToString(cbuf, sizeof(cbuf)));
   if (IsBlock() && !GetCarriedOutBottomMargin().IsZero()) {
     fprintf(out, "bm=%d ", GetCarriedOutBottomMargin().get());
diff --git a/mozilla/layout/generic/nsLineBox.h b/mozilla/layout/generic/nsLineBox.h
index ab1bd6266c8..b068bd22a10 100644
--- a/mozilla/layout/generic/nsLineBox.h
+++ b/mozilla/layout/generic/nsLineBox.h
@@ -610,7 +610,7 @@ class nsLineList_iterator {
 #ifdef NS_LINELIST_DEBUG_PASS_END
       NS_ASSERTION(mCurrent != mListLink, "running past end");
 #endif
-      return *NS_STATIC_CAST(pointer, mCurrent);
+      return *static_cast<pointer>(mCurrent);
     }
 
     pointer operator->()
@@ -618,7 +618,7 @@ class nsLineList_iterator {
 #ifdef NS_LINELIST_DEBUG_PASS_END
       NS_ASSERTION(mCurrent != mListLink, "running past end");
 #endif
-      return NS_STATIC_CAST(pointer, mCurrent);
+      return static_cast<pointer>(mCurrent);
     }
 
     pointer get()
@@ -626,7 +626,7 @@ class nsLineList_iterator {
 #ifdef NS_LINELIST_DEBUG_PASS_END
       NS_ASSERTION(mCurrent != mListLink, "running past end");
 #endif
-      return NS_STATIC_CAST(pointer, mCurrent);
+      return static_cast<pointer>(mCurrent);
     }
 
     operator pointer()
@@ -634,7 +634,7 @@ class nsLineList_iterator {
 #ifdef NS_LINELIST_DEBUG_PASS_END
       NS_ASSERTION(mCurrent != mListLink, "running past end");
 #endif
-      return NS_STATIC_CAST(pointer, mCurrent);
+      return static_cast<pointer>(mCurrent);
     }
 
     const_reference operator*() const
@@ -642,7 +642,7 @@ class nsLineList_iterator {
 #ifdef NS_LINELIST_DEBUG_PASS_END
       NS_ASSERTION(mCurrent != mListLink, "running past end");
 #endif
-      return *NS_STATIC_CAST(const_pointer, mCurrent);
+      return *static_cast<const_pointer>(mCurrent);
     }
 
     const_pointer operator->() const
@@ -650,7 +650,7 @@ class nsLineList_iterator {
 #ifdef NS_LINELIST_DEBUG_PASS_END
       NS_ASSERTION(mCurrent != mListLink, "running past end");
 #endif
-      return NS_STATIC_CAST(const_pointer, mCurrent);
+      return static_cast<const_pointer>(mCurrent);
     }
 
 #ifndef __MWERKS__
@@ -659,7 +659,7 @@ class nsLineList_iterator {
 #ifdef NS_LINELIST_DEBUG_PASS_END
       NS_ASSERTION(mCurrent != mListLink, "running past end");
 #endif
-      return NS_STATIC_CAST(const_pointer, mCurrent);
+      return static_cast<const_pointer>(mCurrent);
     }
 #endif /* !__MWERKS__ */
 
@@ -772,7 +772,7 @@ class nsLineList_reverse_iterator {
 #ifdef NS_LINELIST_DEBUG_PASS_END
       NS_ASSERTION(mCurrent != mListLink, "running past end");
 #endif
-      return *NS_STATIC_CAST(pointer, mCurrent);
+      return *static_cast<pointer>(mCurrent);
     }
 
     pointer operator->()
@@ -780,7 +780,7 @@ class nsLineList_reverse_iterator {
 #ifdef NS_LINELIST_DEBUG_PASS_END
       NS_ASSERTION(mCurrent != mListLink, "running past end");
 #endif
-      return NS_STATIC_CAST(pointer, mCurrent);
+      return static_cast<pointer>(mCurrent);
     }
 
     pointer get()
@@ -788,7 +788,7 @@ class nsLineList_reverse_iterator {
 #ifdef NS_LINELIST_DEBUG_PASS_END
       NS_ASSERTION(mCurrent != mListLink, "running past end");
 #endif
-      return NS_STATIC_CAST(pointer, mCurrent);
+      return static_cast<pointer>(mCurrent);
     }
 
     operator pointer()
@@ -796,7 +796,7 @@ class nsLineList_reverse_iterator {
 #ifdef NS_LINELIST_DEBUG_PASS_END
       NS_ASSERTION(mCurrent != mListLink, "running past end");
 #endif
-      return NS_STATIC_CAST(pointer, mCurrent);
+      return static_cast<pointer>(mCurrent);
     }
 
     const_reference operator*() const
@@ -804,7 +804,7 @@ class nsLineList_reverse_iterator {
 #ifdef NS_LINELIST_DEBUG_PASS_END
       NS_ASSERTION(mCurrent != mListLink, "running past end");
 #endif
-      return *NS_STATIC_CAST(const_pointer, mCurrent);
+      return *static_cast<const_pointer>(mCurrent);
     }
 
     const_pointer operator->() const
@@ -812,7 +812,7 @@ class nsLineList_reverse_iterator {
 #ifdef NS_LINELIST_DEBUG_PASS_END
       NS_ASSERTION(mCurrent != mListLink, "running past end");
 #endif
-      return NS_STATIC_CAST(const_pointer, mCurrent);
+      return static_cast<const_pointer>(mCurrent);
     }
 
 #ifndef __MWERKS__
@@ -821,7 +821,7 @@ class nsLineList_reverse_iterator {
 #ifdef NS_LINELIST_DEBUG_PASS_END
       NS_ASSERTION(mCurrent != mListLink, "running past end");
 #endif
-      return NS_STATIC_CAST(const_pointer, mCurrent);
+      return static_cast<const_pointer>(mCurrent);
     }
 #endif /* !__MWERKS__ */
 
@@ -914,7 +914,7 @@ class nsLineList_const_iterator {
 #ifdef NS_LINELIST_DEBUG_PASS_END
       NS_ASSERTION(mCurrent != mListLink, "running past end");
 #endif
-      return *NS_STATIC_CAST(const_pointer, mCurrent);
+      return *static_cast<const_pointer>(mCurrent);
     }
 
     const_pointer operator->() const
@@ -922,7 +922,7 @@ class nsLineList_const_iterator {
 #ifdef NS_LINELIST_DEBUG_PASS_END
       NS_ASSERTION(mCurrent != mListLink, "running past end");
 #endif
-      return NS_STATIC_CAST(const_pointer, mCurrent);
+      return static_cast<const_pointer>(mCurrent);
     }
 
     const_pointer get() const
@@ -930,7 +930,7 @@ class nsLineList_const_iterator {
 #ifdef NS_LINELIST_DEBUG_PASS_END
       NS_ASSERTION(mCurrent != mListLink, "running past end");
 #endif
-      return NS_STATIC_CAST(const_pointer, mCurrent);
+      return static_cast<const_pointer>(mCurrent);
     }
 
 #ifndef __MWERKS__
@@ -939,7 +939,7 @@ class nsLineList_const_iterator {
 #ifdef NS_LINELIST_DEBUG_PASS_END
       NS_ASSERTION(mCurrent != mListLink, "running past end");
 #endif
-      return NS_STATIC_CAST(const_pointer, mCurrent);
+      return static_cast<const_pointer>(mCurrent);
     }
 #endif /* !__MWERKS__ */
 
@@ -1044,7 +1044,7 @@ class nsLineList_const_reverse_iterator {
 #ifdef NS_LINELIST_DEBUG_PASS_END
       NS_ASSERTION(mCurrent != mListLink, "running past end");
 #endif
-      return *NS_STATIC_CAST(const_pointer, mCurrent);
+      return *static_cast<const_pointer>(mCurrent);
     }
 
     const_pointer operator->() const
@@ -1052,7 +1052,7 @@ class nsLineList_const_reverse_iterator {
 #ifdef NS_LINELIST_DEBUG_PASS_END
       NS_ASSERTION(mCurrent != mListLink, "running past end");
 #endif
-      return NS_STATIC_CAST(const_pointer, mCurrent);
+      return static_cast<const_pointer>(mCurrent);
     }
 
     const_pointer get() const
@@ -1060,7 +1060,7 @@ class nsLineList_const_reverse_iterator {
 #ifdef NS_LINELIST_DEBUG_PASS_END
       NS_ASSERTION(mCurrent != mListLink, "running past end");
 #endif
-      return NS_STATIC_CAST(const_pointer, mCurrent);
+      return static_cast<const_pointer>(mCurrent);
     }
 
 #ifndef __MWERKS__
@@ -1069,7 +1069,7 @@ class nsLineList_const_reverse_iterator {
 #ifdef NS_LINELIST_DEBUG_PASS_END
       NS_ASSERTION(mCurrent != mListLink, "running past end");
 #endif
-      return NS_STATIC_CAST(const_pointer, mCurrent);
+      return static_cast<const_pointer>(mCurrent);
     }
 #endif /* !__MWERKS__ */
 
@@ -1238,25 +1238,25 @@ class nsLineList {
     pointer front()
     {
       NS_ASSERTION(!empty(), "no element to return");
-      return NS_STATIC_CAST(pointer, mLink._mNext);
+      return static_cast<pointer>(mLink._mNext);
     }
 
     const_pointer front() const
     {
       NS_ASSERTION(!empty(), "no element to return");
-      return NS_STATIC_CAST(const_pointer, mLink._mNext);
+      return static_cast<const_pointer>(mLink._mNext);
     }
 
     pointer back()
     {
       NS_ASSERTION(!empty(), "no element to return");
-      return NS_STATIC_CAST(pointer, mLink._mPrev);
+      return static_cast<pointer>(mLink._mPrev);
     }
 
     const_pointer back() const
     {
       NS_ASSERTION(!empty(), "no element to return");
-      return NS_STATIC_CAST(const_pointer, mLink._mPrev);
+      return static_cast<const_pointer>(mLink._mPrev);
     }
 
     void push_front(pointer aNew)
diff --git a/mozilla/layout/generic/nsLineLayout.cpp b/mozilla/layout/generic/nsLineLayout.cpp
index 70bff471d13..bf25ff565fe 100644
--- a/mozilla/layout/generic/nsLineLayout.cpp
+++ b/mozilla/layout/generic/nsLineLayout.cpp
@@ -408,7 +408,7 @@ nsLineLayout::NewPerSpanData(PerSpanData** aResult)
     if (nsnull == mem) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
-    psd = NS_REINTERPRET_CAST(PerSpanData*, mem);
+    psd = reinterpret_cast<PerSpanData*>(mem);
   }
   else {
     mSpanFreeList = psd->mNextFreeSpan;
@@ -656,7 +656,7 @@ nsLineLayout::NewPerFrameData(PerFrameData** aResult)
     if (nsnull == mem) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
-    pfd = NS_REINTERPRET_CAST(PerFrameData*, mem);
+    pfd = reinterpret_cast<PerFrameData*>(mem);
   }
   else {
     mFrameFreeList = pfd->mNext;
@@ -915,7 +915,7 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
       pfd->SetFlag(PFD_SKIPWHENTRIMMINGWHITESPACE, PR_TRUE);
       nsIFrame* outOfFlowFrame = nsLayoutUtils::GetFloatFromPlaceholder(aFrame);
       if (outOfFlowFrame) {
-        nsPlaceholderFrame* placeholder = NS_STATIC_CAST(nsPlaceholderFrame*, aFrame);
+        nsPlaceholderFrame* placeholder = static_cast<nsPlaceholderFrame*>(aFrame);
         // XXXldb What is this test supposed to be?
         if (!NS_SUBTREE_DIRTY(aFrame)) {
           // incremental reflow of child
@@ -1025,8 +1025,8 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
         // Remove all of the childs next-in-flows. Make sure that we ask
         // the right parent to do the removal (it's possible that the
         // parent is not this because we are executing pullup code)
-        nsHTMLContainerFrame* parent = NS_STATIC_CAST(nsHTMLContainerFrame*,
-                                                      kidNextInFlow->GetParent());
+        nsHTMLContainerFrame* parent = static_cast<nsHTMLContainerFrame*>
+                                                  (kidNextInFlow->GetParent());
         parent->DeleteNextInFlowChild(mPresContext, kidNextInFlow);
       }
     }
@@ -1401,7 +1401,7 @@ void
 nsLineLayout::DumpPerSpanData(PerSpanData* psd, PRInt32 aIndent)
 {
   nsFrame::IndentBy(stdout, aIndent);
-  printf("%p: left=%d x=%d right=%d\n", NS_STATIC_CAST(void*, psd),
+  printf("%p: left=%d x=%d right=%d\n", static_cast<void*>(psd),
          psd->mLeftEdge, psd->mX, psd->mRightEdge);
   PerFrameData* pfd = psd->mFirstFrame;
   while (nsnull != pfd) {
diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp
index cb55093b7b2..f422b911a5d 100644
--- a/mozilla/layout/generic/nsObjectFrame.cpp
+++ b/mozilla/layout/generic/nsObjectFrame.cpp
@@ -451,7 +451,7 @@ nsObjectFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(NS_GET_IID(nsIObjectFrame))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIObjectFrame*, this);
+    *aInstancePtr = static_cast<nsIObjectFrame*>(this);
     return NS_OK;
   }
 
@@ -946,12 +946,12 @@ nsObjectFrame::DidReflow(nsPresContext*            aPresContext,
     nsIWidget* widget = GetWindow();
     if (widget) {
       NPSetWindowCallbackStruct* ws_info = 
-        NS_STATIC_CAST(NPSetWindowCallbackStruct*, window->ws_info);
+        static_cast<NPSetWindowCallbackStruct*>(window->ws_info);
       ws_info->display =
-        NS_STATIC_CAST(Display*, widget->GetNativeData(NS_NATIVE_DISPLAY));
+        static_cast<Display*>(widget->GetNativeData(NS_NATIVE_DISPLAY));
 #ifdef MOZ_WIDGET_GTK2
       GdkWindow* gdkWindow =
-        NS_STATIC_CAST(GdkWindow*, widget->GetNativeData(NS_NATIVE_WINDOW));
+        static_cast<GdkWindow*>(widget->GetNativeData(NS_NATIVE_WINDOW));
       GdkColormap* gdkColormap = gdk_drawable_get_colormap(gdkWindow);
       ws_info->colormap = gdk_x11_colormap_get_xcolormap(gdkColormap);
       GdkVisual* gdkVisual = gdk_colormap_get_visual(gdkColormap);
@@ -979,7 +979,7 @@ static void PaintPrintPlugin(nsIFrame* aFrame, nsIRenderingContext* aCtx,
                              const nsRect& aDirtyRect, nsPoint aPt)
 {
   nsIRenderingContext::AutoPushTranslation translate(aCtx, aPt.x, aPt.y);
-  NS_STATIC_CAST(nsObjectFrame*, aFrame)->PrintPlugin(*aCtx, aDirtyRect);
+  static_cast<nsObjectFrame*>(aFrame)->PrintPlugin(*aCtx, aDirtyRect);
 }
 
 static void PaintPlugin(nsIFrame* aFrame, nsIRenderingContext* aCtx,
@@ -988,9 +988,9 @@ static void PaintPlugin(nsIFrame* aFrame, nsIRenderingContext* aCtx,
   nsIRenderingContext::AutoPushTranslation translate(aCtx, aPt.x, aPt.y);
 #ifdef MOZ_X11 // FIXME - Bug 385435: Don't others want this too!
   nsRect relativeDirtyRect = aDirtyRect - aPt;
-  NS_STATIC_CAST(nsObjectFrame*, aFrame)->PaintPlugin(*aCtx, relativeDirtyRect);
+  static_cast<nsObjectFrame*>(aFrame)->PaintPlugin(*aCtx, relativeDirtyRect);
 #else
-  NS_STATIC_CAST(nsObjectFrame*, aFrame)->PaintPlugin(*aCtx, aDirtyRect);
+  static_cast<nsObjectFrame*>(aFrame)->PaintPlugin(*aCtx, aDirtyRect);
 #endif
 }
 
@@ -1188,8 +1188,8 @@ nsObjectFrame::PaintPlugin(nsIRenderingContext& aRenderingContext,
       // check if we need to update hdc
       HDC hdc = (HDC)aRenderingContext.GetNativeGraphicData(nsIRenderingContext::NATIVE_WINDOWS_DC);
 
-      if (NS_REINTERPRET_CAST(HDC, window->window) != hdc) {
-        window->window = NS_REINTERPRET_CAST(nsPluginPort*, hdc);
+      if (reinterpret_cast<HDC>(window->window) != hdc) {
+        window->window = reinterpret_cast<nsPluginPort*>(hdc);
         doupdatewindow = PR_TRUE;
       }
 
@@ -2017,11 +2017,11 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetValue(nsPluginInstancePeerVariable varia
         if (!win)
           return rv;
         GdkWindow* gdkWindow =
-          NS_STATIC_CAST(GdkWindow*, win->GetNativeData(NS_NATIVE_WINDOW));
+          static_cast<GdkWindow*>(win->GetNativeData(NS_NATIVE_WINDOW));
         if (!gdkWindow)
           return rv;
         gdkWindow = gdk_window_get_toplevel(gdkWindow);
-        *NS_STATIC_CAST(Window*, value) = GDK_WINDOW_XID(gdkWindow);
+        *static_cast<Window*>(value) = GDK_WINDOW_XID(gdkWindow);
         return NS_OK;
 #endif
       } else NS_ASSERTION(mOwner, "plugin owner has no owner in getting doc's window handle");
@@ -2420,7 +2420,7 @@ nsresult nsPluginInstanceOwner::EnsureCachedAttrParamArrays()
 
   if (cattrs < 0x0000FFFF) {
     // unsigned 32 bits to unsigned 16 bits conversion
-    mNumCachedAttrs = NS_STATIC_CAST(PRUint16, cattrs);
+    mNumCachedAttrs = static_cast<PRUint16>(cattrs);
   } else {
     mNumCachedAttrs = 0xFFFE;  // minus one in case we add an extra "src" entry below
   }
@@ -2521,7 +2521,7 @@ nsresult nsPluginInstanceOwner::EnsureCachedAttrParamArrays()
 
   PRUint32 cparams = ourParams.Count(); // unsigned 32 bits to unsigned 16 bits conversion
   if (cparams < 0x0000FFFF)
-    mNumCachedParams = NS_STATIC_CAST(PRUint16, cparams);
+    mNumCachedParams = static_cast<PRUint16>(cparams);
   else 
     mNumCachedParams = 0xFFFF;
 
@@ -3133,7 +3133,7 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const nsGUIEvent& anEvent)
 
       if (eventHandled && !(anEvent.eventStructType == NS_MOUSE_EVENT &&
                             anEvent.message == NS_MOUSE_BUTTON_DOWN &&
-                            NS_STATIC_CAST(const nsMouseEvent&, anEvent).button ==
+                            static_cast<const nsMouseEvent&>(anEvent).button ==
                               nsMouseEvent::eLeftButton &&
                             !mContentFocused))
         rv = nsEventStatus_eConsumeNoDefault;
@@ -3199,7 +3199,7 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const nsGUIEvent& anEvent)
         nsIntPoint pluginPoint(presContext->AppUnitsToDevPixels(appPoint.x),
                                presContext->AppUnitsToDevPixels(appPoint.y));
         const nsMouseEvent& mouseEvent =
-          NS_STATIC_CAST(const nsMouseEvent&, anEvent);
+          static_cast<const nsMouseEvent&>(anEvent);
         // Get reference point relative to screen:
         nsRect windowRect(anEvent.refPoint, nsSize(1, 1));
         nsRect rootPoint(-1,-1,1,1);
@@ -3295,7 +3295,7 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const nsGUIEvent& anEvent)
           event.root = GDK_ROOT_WINDOW();
           event.time = anEvent.time;
           const GdkEventKey* gdkEvent =
-            NS_STATIC_CAST(const GdkEventKey*, anEvent.nativeMsg);
+            static_cast<const GdkEventKey*>(anEvent.nativeMsg);
           event.keycode = gdkEvent->hardware_keycode;
           event.state = gdkEvent->state;
           switch (anEvent.message)
@@ -3354,7 +3354,7 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const nsGUIEvent& anEvent)
   // Fill in (useless) generic event information.
   XAnyEvent& event = pluginEvent.event.xany;
   event.display = widget ?
-    NS_STATIC_CAST(Display*, widget->GetNativeData(NS_NATIVE_DISPLAY)) : nsnull;
+    static_cast<Display*>(widget->GetNativeData(NS_NATIVE_DISPLAY)) : nsnull;
   event.window = None; // not a real window
   // information lost:
   event.serial = 0;
@@ -3530,15 +3530,15 @@ void nsPluginInstanceOwner::Paint(nsIRenderingContext& aRenderingContext,
     rendererFlags |= Renderer::DRAW_IS_OPAQUE;
 
   gfxContext* ctx =
-    NS_STATIC_CAST(gfxContext*,
-                   aRenderingContext.GetNativeGraphicData(nsIRenderingContext::NATIVE_THEBES_CONTEXT));
+    static_cast<gfxContext*>
+               (aRenderingContext.GetNativeGraphicData(nsIRenderingContext::NATIVE_THEBES_CONTEXT));
 
   // The display used by gfxXlibNativeRenderer will be the one for the cairo
   // surface (provided that it is an Xlib surface) but the display argument
   // here needs to be non-NULL for cairo_draw_with_xlib ->
   // _create_temp_xlib_surface -> DefaultScreen(dpy).
   NPSetWindowCallbackStruct* ws_info = 
-    NS_STATIC_CAST(NPSetWindowCallbackStruct*, window->ws_info);
+    static_cast<NPSetWindowCallbackStruct*>(window->ws_info);
   renderer.Draw(ws_info->display, ctx, window->width, window->height,
                 rendererFlags, nsnull);
 }
@@ -3586,7 +3586,7 @@ nsPluginInstanceOwner::Renderer::NativeDraw(Display* dpy, Drawable drawable,
   }
 
   NPSetWindowCallbackStruct* ws_info = 
-    NS_STATIC_CAST(NPSetWindowCallbackStruct*, mWindow->ws_info);
+    static_cast<NPSetWindowCallbackStruct*>(mWindow->ws_info);
   if ( ws_info->visual != visual) {
     // NPAPI needs a colormap but the surface doesn't provide a colormap.  If
     // gfxContent::CurrentSurface is a gfxXlibSurface then the visual here
diff --git a/mozilla/layout/generic/nsPageFrame.cpp b/mozilla/layout/generic/nsPageFrame.cpp
index 132f3c24386..f008bddc4e9 100644
--- a/mozilla/layout/generic/nsPageFrame.cpp
+++ b/mozilla/layout/generic/nsPageFrame.cpp
@@ -93,15 +93,15 @@ NS_IMETHODIMP nsPageFrame::Reflow(nsPresContext*          aPresContext,
   // Do we have any children?
   // XXX We should use the overflow list instead...
   nsIFrame*           firstFrame  = mFrames.FirstChild();
-  nsPageContentFrame* contentPage = NS_STATIC_CAST(nsPageContentFrame*, firstFrame);
+  nsPageContentFrame* contentPage = static_cast<nsPageContentFrame*>(firstFrame);
   NS_ASSERTION(contentPage, "There should always be a content page");
   NS_ASSERTION(nsGkAtoms::pageContentFrame == firstFrame->GetType(),
                "This frame isn't a pageContentFrame");
 
   if (contentPage && GetPrevInFlow() && !contentPage->GetFirstChild(nsnull)) {
 
-    nsPageFrame*        prevPage        = NS_STATIC_CAST(nsPageFrame*, GetPrevInFlow());
-    nsPageContentFrame* prevContentPage = NS_STATIC_CAST(nsPageContentFrame*, prevPage->mFrames.FirstChild());
+    nsPageFrame*        prevPage        = static_cast<nsPageFrame*>(GetPrevInFlow());
+    nsPageContentFrame* prevContentPage = static_cast<nsPageContentFrame*>(prevPage->mFrames.FirstChild());
     nsIFrame*           prevLastChild   = prevContentPage->mFrames.LastChild();
 
     // Create a continuing child of the previous page's last child
@@ -416,19 +416,19 @@ nsPageFrame::DrawHeaderFooter(nsIRenderingContext& aRenderingContext,
 static void PaintPrintPreviewBackground(nsIFrame* aFrame, nsIRenderingContext* aCtx,
                                         const nsRect& aDirtyRect, nsPoint aPt)
 {
-  NS_STATIC_CAST(nsPageFrame*, aFrame)->PaintPrintPreviewBackground(*aCtx, aPt);
+  static_cast<nsPageFrame*>(aFrame)->PaintPrintPreviewBackground(*aCtx, aPt);
 }
 
 static void PaintPageContent(nsIFrame* aFrame, nsIRenderingContext* aCtx,
                              const nsRect& aDirtyRect, nsPoint aPt)
 {
-  NS_STATIC_CAST(nsPageFrame*, aFrame)->PaintPageContent(*aCtx, aDirtyRect, aPt);
+  static_cast<nsPageFrame*>(aFrame)->PaintPageContent(*aCtx, aDirtyRect, aPt);
 }
 
 static void PaintHeaderFooter(nsIFrame* aFrame, nsIRenderingContext* aCtx,
                               const nsRect& aDirtyRect, nsPoint aPt)
 {
-  NS_STATIC_CAST(nsPageFrame*, aFrame)->PaintHeaderFooter(*aCtx, aPt);
+  static_cast<nsPageFrame*>(aFrame)->PaintHeaderFooter(*aCtx, aPt);
 }
 
 //------------------------------------------------------------------------------
@@ -592,7 +592,7 @@ nsPageFrame::SetSharedPageData(nsSharedPageData* aPD)
 { 
   mPD = aPD;
   // Set the shared data into the page frame before reflow
-  nsPageContentFrame * pcf = NS_STATIC_CAST(nsPageContentFrame*, mFrames.FirstChild());
+  nsPageContentFrame * pcf = static_cast<nsPageContentFrame*>(mFrames.FirstChild());
   if (pcf) {
     pcf->SetSharedPageData(mPD);
   }
diff --git a/mozilla/layout/generic/nsPlaceholderFrame.cpp b/mozilla/layout/generic/nsPlaceholderFrame.cpp
index 40440dd3a6d..4227ac7d1ee 100644
--- a/mozilla/layout/generic/nsPlaceholderFrame.cpp
+++ b/mozilla/layout/generic/nsPlaceholderFrame.cpp
@@ -208,7 +208,7 @@ nsPlaceholderFrame::List(FILE* out, PRInt32 aIndent) const
   IndentBy(out, aIndent);
   ListTag(out);
 #ifdef DEBUG_waterson
-  fprintf(out, " [parent=%p]", NS_STATIC_CAST(void*, mParent));
+  fprintf(out, " [parent=%p]", static_cast<void*>(mParent));
 #endif
   if (HasView()) {
     fprintf(out, " [view=%p]", (void*)GetView());
@@ -220,10 +220,10 @@ nsPlaceholderFrame::List(FILE* out, PRInt32 aIndent) const
   nsIFrame* prevInFlow = GetPrevInFlow();
   nsIFrame* nextInFlow = GetNextInFlow();
   if (nsnull != prevInFlow) {
-    fprintf(out, " prev-in-flow=%p", NS_STATIC_CAST(void*, prevInFlow));
+    fprintf(out, " prev-in-flow=%p", static_cast<void*>(prevInFlow));
   }
   if (nsnull != nextInFlow) {
-    fprintf(out, " next-in-flow=%p", NS_STATIC_CAST(void*, nextInFlow));
+    fprintf(out, " next-in-flow=%p", static_cast<void*>(nextInFlow));
   }
   if (mOutOfFlowFrame) {
     fprintf(out, " outOfFlowFrame=");
diff --git a/mozilla/layout/generic/nsPlaceholderFrame.h b/mozilla/layout/generic/nsPlaceholderFrame.h
index 9ee29b57f16..ee400713cd3 100644
--- a/mozilla/layout/generic/nsPlaceholderFrame.h
+++ b/mozilla/layout/generic/nsPlaceholderFrame.h
@@ -168,7 +168,7 @@ public:
     NS_PRECONDITION(aFrame->GetType() == nsGkAtoms::placeholderFrame,
                     "Must have placeholder frame as input");
     nsIFrame* outOfFlow =
-      NS_STATIC_CAST(nsPlaceholderFrame*, aFrame)->GetOutOfFlowFrame();
+      static_cast<nsPlaceholderFrame*>(aFrame)->GetOutOfFlowFrame();
     NS_ASSERTION(outOfFlow, "Null out-of-flow for placeholder?");
     return outOfFlow;
   }
diff --git a/mozilla/layout/generic/nsSelection.cpp b/mozilla/layout/generic/nsSelection.cpp
index f4163ff58ab..9880d3adbb7 100644
--- a/mozilla/layout/generic/nsSelection.cpp
+++ b/mozilla/layout/generic/nsSelection.cpp
@@ -447,7 +447,7 @@ public:
 
     // Store the content from the nearest capturing frame. If this returns null
     // the capturing frame is the root.
-    nsIFrame* clientFrame = NS_STATIC_CAST(nsIFrame*, aView->GetClientData());
+    nsIFrame* clientFrame = static_cast<nsIFrame*>(aView->GetClientData());
     NS_ASSERTION(clientFrame, "Missing client frame");
 
     nsIFrame* capturingFrame = nsFrame::GetNearestCapturingFrame(clientFrame);
@@ -550,7 +550,7 @@ public:
 
       nsIView* captureView = capturingFrame->GetMouseCapturer();
     
-      nsIFrame* viewFrame = NS_STATIC_CAST(nsIFrame*, captureView->GetClientData());
+      nsIFrame* viewFrame = static_cast<nsIFrame*>(captureView->GetClientData());
       NS_ASSERTION(viewFrame, "View must have a client frame");
       
       mFrameSelection->HandleDrag(viewFrame, mPoint);
@@ -2529,7 +2529,7 @@ nsFrameSelection::GetSelection(SelectionType aType)
   if (index < 0)
     return nsnull;
 
-  return NS_STATIC_CAST(nsISelection*, mDomSelections[index]);
+  return static_cast<nsISelection*>(mDomSelections[index]);
 }
 
 nsresult
@@ -2687,7 +2687,7 @@ nsFrameSelection::CommonPageMove(PRBool aForward,
     return;
 
   if (scrolledView)
-    mainframe = NS_STATIC_CAST(nsIFrame*, scrolledView->GetClientData());
+    mainframe = static_cast<nsIFrame*>(scrolledView->GetClientData());
 
   if (!mainframe)
     return;
@@ -3902,7 +3902,7 @@ nsFrameSelection::DeleteFromDocument()
   nsCOMPtr<nsIDOMRange> range;
   while (iter.IsDone())
   {
-    res = iter.CurrentItem(NS_STATIC_CAST(nsIDOMRange**, getter_AddRefs(range)));
+    res = iter.CurrentItem(static_cast<nsIDOMRange**>(getter_AddRefs(range)));
     if (NS_FAILED(res))
       return res;
     res = range->DeleteContents();
@@ -4661,8 +4661,8 @@ nsTypedSelection::GetRangesForInterval(nsIDOMNode* aBeginNode, PRInt32 aBeginOff
   if (results.Count() == 0)
     return NS_OK;
 
-  *aResults = NS_STATIC_CAST(nsIDOMRange**,
-      nsMemory::Alloc(sizeof(nsIDOMRange*) * results.Count()));
+  *aResults = static_cast<nsIDOMRange**>
+                         (nsMemory::Alloc(sizeof(nsIDOMRange*) * results.Count()));
   NS_ENSURE_TRUE(*aResults, NS_ERROR_OUT_OF_MEMORY);
 
   *aResultCount = results.Count();
diff --git a/mozilla/layout/generic/nsSimplePageSequence.cpp b/mozilla/layout/generic/nsSimplePageSequence.cpp
index 02edcd99a54..3157377f7c8 100644
--- a/mozilla/layout/generic/nsSimplePageSequence.cpp
+++ b/mozilla/layout/generic/nsSimplePageSequence.cpp
@@ -142,7 +142,7 @@ nsSimplePageSequenceFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(NS_GET_IID(nsIPageSequenceFrame))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIPageSequenceFrame*, this);
+    *aInstancePtr = static_cast<nsIPageSequenceFrame*>(this);
     return NS_OK;
   }
   return nsContainerFrame::QueryInterface(aIID, aInstancePtr);
@@ -291,7 +291,7 @@ nsSimplePageSequenceFrame::Reflow(nsPresContext*          aPresContext,
     PR_PL(("AV W: %d   H: %d\n", kidReflowState.availableWidth, kidReflowState.availableHeight));
 
     // Set the shared data into the page frame before reflow
-    nsPageFrame * pf = NS_STATIC_CAST(nsPageFrame*, kidFrame);
+    nsPageFrame * pf = static_cast<nsPageFrame*>(kidFrame);
     pf->SetSharedPageData(mPageData);
 
     // Place and size the page. If the page is narrower than our
@@ -337,7 +337,7 @@ nsSimplePageSequenceFrame::Reflow(nsPresContext*          aPresContext,
   // Set Page Number Info
   PRInt32 pageNum = 1;
   for (page = mFrames.FirstChild(); page; page = page->GetNextSibling()) {
-    nsPageFrame * pf = NS_STATIC_CAST(nsPageFrame*, page);
+    nsPageFrame * pf = static_cast<nsPageFrame*>(page);
     if (pf != nsnull) {
       pf->SetPageNumInfo(pageNum, pageTot);
     }
@@ -611,7 +611,7 @@ nsSimplePageSequenceFrame::PrintNextPage()
     }
 
     // cast the frame to be a page frame
-    nsPageFrame * pf = NS_STATIC_CAST(nsPageFrame*, mCurrentPageFrame);
+    nsPageFrame * pf = static_cast<nsPageFrame*>(mCurrentPageFrame);
     pf->SetPageNumInfo(mPageNum, mTotalPages);
     pf->SetSharedPageData(mPageData);
 
@@ -675,7 +675,7 @@ nsSimplePageSequenceFrame::DoPageEnd()
 static void PaintPageSequence(nsIFrame* aFrame, nsIRenderingContext* aCtx,
                              const nsRect& aDirtyRect, nsPoint aPt)
 {
-  NS_STATIC_CAST(nsSimplePageSequenceFrame*, aFrame)->PaintPageSequence(*aCtx, aDirtyRect, aPt);
+  static_cast<nsSimplePageSequenceFrame*>(aFrame)->PaintPageSequence(*aCtx, aDirtyRect, aPt);
 }
 
 //------------------------------------------------------------------------------
diff --git a/mozilla/layout/generic/nsSpaceManager.cpp b/mozilla/layout/generic/nsSpaceManager.cpp
index ec5773b6662..dc35e6f5941 100644
--- a/mozilla/layout/generic/nsSpaceManager.cpp
+++ b/mozilla/layout/generic/nsSpaceManager.cpp
@@ -95,14 +95,14 @@ nsSpaceManager::BandList::Clear()
 PR_STATIC_CALLBACK(void*)
 PSArenaAllocCB(size_t aSize, void* aClosure)
 {
-  return NS_STATIC_CAST(nsIPresShell*, aClosure)->AllocateFrame(aSize);
+  return static_cast<nsIPresShell*>(aClosure)->AllocateFrame(aSize);
 }
 
 // PresShell Arena free callback (for nsIntervalSet use below)
 PR_STATIC_CALLBACK(void)
 PSArenaFreeCB(size_t aSize, void* aPtr, void* aClosure)
 {
-  NS_STATIC_CAST(nsIPresShell*, aClosure)->FreeFrame(aSize, aPtr);
+  static_cast<nsIPresShell*>(aClosure)->FreeFrame(aSize, aPtr);
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1571,7 +1571,7 @@ nsAutoSpaceManager::~nsAutoSpaceManager()
 
 #ifdef NOISY_SPACEMANAGER
     if (mOld) {
-      NS_STATIC_CAST(nsFrame *, mReflowState.frame)->ListTag(stdout);
+      static_cast<nsFrame *>(mReflowState.frame)->ListTag(stdout);
       printf(": space-manager %p after reflow\n", mOld);
       mOld->List(stdout);
     }
diff --git a/mozilla/layout/generic/nsSplittableFrame.cpp b/mozilla/layout/generic/nsSplittableFrame.cpp
index d4e2c413889..cbf7f360038 100644
--- a/mozilla/layout/generic/nsSplittableFrame.cpp
+++ b/mozilla/layout/generic/nsSplittableFrame.cpp
@@ -110,9 +110,9 @@ NS_METHOD nsSplittableFrame::SetNextContinuation(nsIFrame* aFrame)
 
 nsIFrame* nsSplittableFrame::GetFirstContinuation() const
 {
-  nsSplittableFrame* firstContinuation = NS_CONST_CAST(nsSplittableFrame*, this);
+  nsSplittableFrame* firstContinuation = const_cast<nsSplittableFrame*>(this);
   while (firstContinuation->mPrevContinuation)  {
-    firstContinuation = NS_STATIC_CAST(nsSplittableFrame*, firstContinuation->mPrevContinuation);
+    firstContinuation = static_cast<nsSplittableFrame*>(firstContinuation->mPrevContinuation);
   }
   NS_POSTCONDITION(firstContinuation, "illegal state in continuation chain.");
   return firstContinuation;
@@ -120,9 +120,9 @@ nsIFrame* nsSplittableFrame::GetFirstContinuation() const
 
 nsIFrame* nsSplittableFrame::GetLastContinuation() const
 {
-  nsSplittableFrame* lastContinuation = NS_CONST_CAST(nsSplittableFrame*, this);
+  nsSplittableFrame* lastContinuation = const_cast<nsSplittableFrame*>(this);
   while (lastContinuation->mNextContinuation)  {
-    lastContinuation = NS_STATIC_CAST(nsSplittableFrame*, lastContinuation->mNextContinuation);
+    lastContinuation = static_cast<nsSplittableFrame*>(lastContinuation->mNextContinuation);
   }
   NS_POSTCONDITION(lastContinuation, "illegal state in continuation chain.");
   return lastContinuation;
@@ -182,9 +182,9 @@ NS_METHOD nsSplittableFrame::SetNextInFlow(nsIFrame* aFrame)
 
 nsIFrame* nsSplittableFrame::GetFirstInFlow() const
 {
-  nsSplittableFrame* firstInFlow = NS_CONST_CAST(nsSplittableFrame*, this);
+  nsSplittableFrame* firstInFlow = const_cast<nsSplittableFrame*>(this);
   while (nsIFrame *prev = firstInFlow->GetPrevInFlow())  {
-    firstInFlow = NS_STATIC_CAST(nsSplittableFrame*, prev);
+    firstInFlow = static_cast<nsSplittableFrame*>(prev);
   }
   NS_POSTCONDITION(firstInFlow, "illegal state in flow chain.");
   return firstInFlow;
@@ -192,9 +192,9 @@ nsIFrame* nsSplittableFrame::GetFirstInFlow() const
 
 nsIFrame* nsSplittableFrame::GetLastInFlow() const
 {
-  nsSplittableFrame* lastInFlow = NS_CONST_CAST(nsSplittableFrame*, this);
+  nsSplittableFrame* lastInFlow = const_cast<nsSplittableFrame*>(this);
   while (nsIFrame* next = lastInFlow->GetNextInFlow())  {
-    lastInFlow = NS_STATIC_CAST(nsSplittableFrame*, next);
+    lastInFlow = static_cast<nsSplittableFrame*>(next);
   }
   NS_POSTCONDITION(lastInFlow, "illegal state in flow chain.");
   return lastInFlow;
diff --git a/mozilla/layout/generic/nsTextFrameThebes.cpp b/mozilla/layout/generic/nsTextFrameThebes.cpp
index 03e60125f61..5a5e7ad1bdc 100644
--- a/mozilla/layout/generic/nsTextFrameThebes.cpp
+++ b/mozilla/layout/generic/nsTextFrameThebes.cpp
@@ -567,7 +567,7 @@ protected:
 static void
 DestroyUserData(void* aUserData)
 {
-  TextRunUserData* userData = NS_STATIC_CAST(TextRunUserData*, aUserData);
+  TextRunUserData* userData = static_cast<TextRunUserData*>(aUserData);
   if (userData) {
     nsMemory::Free(userData);
   }
@@ -585,7 +585,7 @@ ClearAllTextRunReferences(nsTextFrame* aFrame, gfxTextRun* aTextRun)
     if (aFrame->GetTextRun() != aTextRun)
       break;
     aFrame->SetTextRun(nsnull);
-    aFrame = NS_STATIC_CAST(nsTextFrame*, aFrame->GetNextContinuation());
+    aFrame = static_cast<nsTextFrame*>(aFrame->GetNextContinuation());
   }
 }
 
@@ -599,11 +599,11 @@ UnhookTextRunFromFrames(gfxTextRun* aTextRun)
   // Kill all references to the textrun. It could be referenced by any of its
   // owners, and all their in-flows.
   if (aTextRun->GetFlags() & nsTextFrameUtils::TEXT_IS_SIMPLE_FLOW) {
-    nsIFrame* firstInFlow = NS_STATIC_CAST(nsIFrame*, aTextRun->GetUserData());
-    ClearAllTextRunReferences(NS_STATIC_CAST(nsTextFrame*, firstInFlow), aTextRun);
+    nsIFrame* firstInFlow = static_cast<nsIFrame*>(aTextRun->GetUserData());
+    ClearAllTextRunReferences(static_cast<nsTextFrame*>(firstInFlow), aTextRun);
   } else {
     TextRunUserData* userData =
-      NS_STATIC_CAST(TextRunUserData*, aTextRun->GetUserData());
+      static_cast<TextRunUserData*>(aTextRun->GetUserData());
     PRInt32 i;
     for (i = 0; i < userData->mMappedFlowCount; ++i) {
       ClearAllTextRunReferences(userData->mMappedFlows[i].mStartFrame, aTextRun);
@@ -712,7 +712,7 @@ PRInt32 nsTextFrame::GetInFlowContentLength() {
   PRInt32      start = -1, end;
 
   if (mState & NS_FRAME_IS_BIDI) {
-    nextBidi = NS_STATIC_CAST(nsTextFrame*, GetLastInFlow()->GetNextContinuation());
+    nextBidi = static_cast<nsTextFrame*>(GetLastInFlow()->GetNextContinuation());
     if (nextBidi) {
       nextBidi->GetOffsets(start, end);
       return start - mContentOffset;
@@ -960,14 +960,14 @@ TextContainsLineBreakerWhiteSpace(const void* aText, PRUint32 aLength,
 {
   PRUint32 i;
   if (aIsDoubleByte) {
-    const PRUnichar* chars = NS_STATIC_CAST(const PRUnichar*, aText);
+    const PRUnichar* chars = static_cast<const PRUnichar*>(aText);
     for (i = 0; i < aLength; ++i) {
       if (nsLineBreaker::IsSpace(chars[i]))
         return PR_TRUE;
     }
     return PR_FALSE;
   } else {
-    const PRUint8* chars = NS_STATIC_CAST(const PRUint8*, aText);
+    const PRUint8* chars = static_cast<const PRUint8*>(aText);
     for (i = 0; i < aLength; ++i) {
       if (nsLineBreaker::IsSpace(chars[i]))
         return PR_TRUE;
@@ -990,7 +990,7 @@ BuildTextRunsScanner::FindBoundaryResult
 BuildTextRunsScanner::FindBoundaries(nsIFrame* aFrame, FindBoundaryState* aState)
 {
   nsTextFrame* textFrame = aFrame->GetType() == nsGkAtoms::textFrame
-    ? NS_STATIC_CAST(nsTextFrame*, aFrame) : nsnull;
+    ? static_cast<nsTextFrame*>(aFrame) : nsnull;
   if (textFrame) {
     if (aState->mLastTextFrame &&
         textFrame != aState->mLastTextFrame->GetNextInFlow() &&
@@ -1013,8 +1013,8 @@ BuildTextRunsScanner::FindBoundaries(nsIFrame* aFrame, FindBoundaryState* aState
       const nsTextFragment* frag = textFrame->GetContent()->GetText();
       PRUint32 start = textFrame->GetContentOffset();
       const void* text = frag->Is2b()
-          ? NS_STATIC_CAST(const void*, frag->Get2b() + start)
-          : NS_STATIC_CAST(const void*, frag->Get1b() + start);
+          ? static_cast<const void*>(frag->Get2b() + start)
+          : static_cast<const void*>(frag->Get1b() + start);
       if (TextContainsLineBreakerWhiteSpace(text, textFrame->GetContentLength(),
                                             frag->Is2b())) {
         aState->mSeenSpaceForLineBreakingOnThisLine = PR_TRUE;
@@ -1075,8 +1075,8 @@ BuildTextRuns(nsIRenderingContext* aRC, nsTextFrame* aForFrame,
   }
 
   nsPresContext* presContext = aLineContainer->PresContext();
-  gfxContext* ctx = NS_STATIC_CAST(gfxContext*,
-    aRC->GetNativeGraphicData(nsIRenderingContext::NATIVE_THEBES_CONTEXT));
+  gfxContext* ctx = static_cast<gfxContext*>
+                               (aRC->GetNativeGraphicData(nsIRenderingContext::NATIVE_THEBES_CONTEXT));
   BuildTextRunsScanner scanner(presContext, ctx, aLineContainer);
 
   nsBlockFrame* block = nsnull;
@@ -1339,8 +1339,8 @@ void BuildTextRunsScanner::ScanFrame(nsIFrame* aFrame)
       // This is almost always true:
       if (mLastFrame->GetStyleContext() == aFrame->GetStyleContext() &&
           !HasTerminalNewline(mLastFrame)) {
-        nsTextFrame* frame = NS_STATIC_CAST(nsTextFrame*, aFrame);
-        mappedFlow->mEndFrame = NS_STATIC_CAST(nsTextFrame*, frame->GetNextInFlow());
+        nsTextFrame* frame = static_cast<nsTextFrame*>(aFrame);
+        mappedFlow->mEndFrame = static_cast<nsTextFrame*>(frame->GetNextInFlow());
         NS_ASSERTION(mappedFlow->mContentEndOffset <= frame->GetContentOffset(),
                      "frame offsets overlap!");
         mappedFlow->mContentEndOffset = frame->GetContentEnd();
@@ -1352,7 +1352,7 @@ void BuildTextRunsScanner::ScanFrame(nsIFrame* aFrame)
 
   // Now see if we can add a new set of frames to the current textrun
   if (aFrame->GetType() == nsGkAtoms::textFrame) {
-    nsTextFrame* frame = NS_STATIC_CAST(nsTextFrame*, aFrame);
+    nsTextFrame* frame = static_cast<nsTextFrame*>(aFrame);
 
     if (mLastFrame && !ContinueTextRunAcrossFrames(mLastFrame, frame)) {
       FlushFrames(PR_FALSE);
@@ -1363,7 +1363,7 @@ void BuildTextRunsScanner::ScanFrame(nsIFrame* aFrame)
       return;
 
     mappedFlow->mStartFrame = frame;
-    mappedFlow->mEndFrame = NS_STATIC_CAST(nsTextFrame*, frame->GetNextInFlow());
+    mappedFlow->mEndFrame = static_cast<nsTextFrame*>(frame->GetNextInFlow());
     mappedFlow->mAncestorControllingInitialBreak = mCommonAncestorWithLastFrame;
     mappedFlow->mContentOffset = frame->GetContentOffset();
     mappedFlow->mContentEndOffset = frame->GetContentEnd();
@@ -1418,7 +1418,7 @@ BuildTextRunsScanner::GetNextBreakBeforeFrame(PRUint32* aIndex)
   if (index >= mLineBreakBeforeFrames.Length())
     return nsnull;
   *aIndex = index + 1;
-  return NS_STATIC_CAST(nsTextFrame*, mLineBreakBeforeFrames.ElementAt(index));
+  return static_cast<nsTextFrame*>(mLineBreakBeforeFrames.ElementAt(index));
 }
 
 static PRUint32
@@ -1446,7 +1446,7 @@ GetFontGroupForFrame(nsIFrame* aFrame)
     return nsnull;
 
   nsIFontMetrics* metricsRaw = metrics;
-  nsIThebesFontMetrics* fm = NS_STATIC_CAST(nsIThebesFontMetrics*, metricsRaw);
+  nsIThebesFontMetrics* fm = static_cast<nsIThebesFontMetrics*>(metricsRaw);
   return fm->GetThebesFontGroup();
 }
 
@@ -1456,8 +1456,8 @@ GetHyphenTextRun(gfxTextRun* aTextRun, nsIRenderingContext* aRefContext)
   if (NS_UNLIKELY(!aRefContext)) {
     return nsnull;
   }
-  gfxContext* ctx = NS_STATIC_CAST(gfxContext*,
-    aRefContext->GetNativeGraphicData(nsIRenderingContext::NATIVE_THEBES_CONTEXT));
+  gfxContext* ctx = static_cast<gfxContext*>
+                               (aRefContext->GetNativeGraphicData(nsIRenderingContext::NATIVE_THEBES_CONTEXT));
   gfxFontGroup* fontGroup = aTextRun->GetFontGroup();
   PRUint32 flags = gfxFontGroup::TEXT_IS_PERSISTENT;
 
@@ -1518,9 +1518,9 @@ BuildTextRunsScanner::BuildTextRunForFrames(void* aTextBuffer)
     userData = &dummyData;
     dummyData.mMappedFlows = &dummyMappedFlow;
   } else {
-    userData = NS_STATIC_CAST(TextRunUserData*,
-      nsMemory::Alloc(sizeof(TextRunUserData) + mMappedFlows.Length()*sizeof(TextRunMappedFlow)));
-    userData->mMappedFlows = NS_REINTERPRET_CAST(TextRunMappedFlow*, userData + 1);
+    userData = static_cast<TextRunUserData*>
+                          (nsMemory::Alloc(sizeof(TextRunUserData) + mMappedFlows.Length()*sizeof(TextRunMappedFlow)));
+    userData->mMappedFlows = reinterpret_cast<TextRunMappedFlow*>(userData + 1);
   }
   userData->mLastFlowIndex = 0;
 
@@ -1582,7 +1582,7 @@ BuildTextRunsScanner::BuildTextRunForFrames(void* aTextBuffer)
     PRUint32 analysisFlags;
     if (frag->Is2b()) {
       NS_ASSERTION(mDoubleByteText, "Wrong buffer char size!");
-      PRUnichar* bufStart = NS_STATIC_CAST(PRUnichar*, aTextBuffer);
+      PRUnichar* bufStart = static_cast<PRUnichar*>(aTextBuffer);
       PRUnichar* bufEnd = nsTextFrameUtils::TransformText(
           frag->Get2b() + contentStart, contentLength, bufStart,
           compressWhitespace, &mTrimNextRunLeadingWhitespace, &builder, &analysisFlags);
@@ -1598,15 +1598,15 @@ BuildTextRunsScanner::BuildTextRunForFrames(void* aTextBuffer)
         }
         PRUint8* bufStart = tempBuf.Elements();
         PRUint8* end = nsTextFrameUtils::TransformText(
-            NS_REINTERPRET_CAST(const PRUint8*, frag->Get1b()) + contentStart, contentLength,
+            reinterpret_cast<const PRUint8*>(frag->Get1b()) + contentStart, contentLength,
             bufStart, compressWhitespace, &mTrimNextRunLeadingWhitespace,
             &builder, &analysisFlags);
-        aTextBuffer = ExpandBuffer(NS_STATIC_CAST(PRUnichar*, aTextBuffer),
+        aTextBuffer = ExpandBuffer(static_cast<PRUnichar*>(aTextBuffer),
                                    tempBuf.Elements(), end - tempBuf.Elements());
       } else {
-        PRUint8* bufStart = NS_STATIC_CAST(PRUint8*, aTextBuffer);
+        PRUint8* bufStart = static_cast<PRUint8*>(aTextBuffer);
         PRUint8* end = nsTextFrameUtils::TransformText(
-            NS_REINTERPRET_CAST(const PRUint8*, frag->Get1b()) + contentStart, contentLength,
+            reinterpret_cast<const PRUint8*>(frag->Get1b()) + contentStart, contentLength,
             bufStart,
             compressWhitespace, &mTrimNextRunLeadingWhitespace, &builder, &analysisFlags);
         aTextBuffer = end;
@@ -1620,7 +1620,7 @@ BuildTextRunsScanner::BuildTextRunForFrames(void* aTextBuffer)
     textFlags |= analysisFlags;
 
     currentTransformedTextOffset =
-      (NS_STATIC_CAST(const PRUint8*, aTextBuffer) - NS_STATIC_CAST(const PRUint8*, textPtr)) >> mDoubleByteText;
+      (static_cast<const PRUint8*>(aTextBuffer) - static_cast<const PRUint8*>(textPtr)) >> mDoubleByteText;
 
     lastContent = content;
     endOfLastContent = contentEnd;
@@ -1638,11 +1638,11 @@ BuildTextRunsScanner::BuildTextRunForFrames(void* aTextBuffer)
     userData = nsnull;
     finalUserData = mMappedFlows[0].mStartFrame;
   } else {
-    userData = NS_STATIC_CAST(TextRunUserData*,
-      nsMemory::Realloc(userData, sizeof(TextRunUserData) + finalMappedFlowCount*sizeof(TextRunMappedFlow)));
+    userData = static_cast<TextRunUserData*>
+                          (nsMemory::Realloc(userData, sizeof(TextRunUserData) + finalMappedFlowCount*sizeof(TextRunMappedFlow)));
     if (!userData)
       return;
-    userData->mMappedFlows = NS_REINTERPRET_CAST(TextRunMappedFlow*, userData + 1);
+    userData->mMappedFlows = reinterpret_cast<TextRunMappedFlow*>(userData + 1);
     userData->mMappedFlowCount = finalMappedFlowCount;
     finalUserData = userData;
   }
@@ -1734,7 +1734,7 @@ BuildTextRunsScanner::BuildTextRunForFrames(void* aTextBuffer)
         firstFrame->PresContext()->AppUnitsPerDevPixel() };
 
   if (mDoubleByteText) {
-    const PRUnichar* text = NS_STATIC_CAST(const PRUnichar*, textPtr);
+    const PRUnichar* text = static_cast<const PRUnichar*>(textPtr);
     if (transformingFactory) {
       textRun = transformingFactory->MakeTextRun(text, transformedLength, &params,
                                                  fontGroup, textFlags, styles.Elements());
@@ -1746,7 +1746,7 @@ BuildTextRunsScanner::BuildTextRunForFrames(void* aTextBuffer)
       textRun = MakeTextRun(text, transformedLength, fontGroup, &params, textFlags);
     }
   } else {
-    const PRUint8* text = NS_STATIC_CAST(const PRUint8*, textPtr);
+    const PRUint8* text = static_cast<const PRUint8*>(textPtr);
     textFlags |= gfxFontGroup::TEXT_IS_8BIT;
     if (transformingFactory) {
       textRun = transformingFactory->MakeTextRun(text, transformedLength, &params,
@@ -1888,17 +1888,17 @@ BuildTextRunsScanner::AssignTextRun(gfxTextRun* aTextRun)
     nsTextFrame* endFrame = mappedFlow->mEndFrame;
     nsTextFrame* f;
     for (f = startFrame; f != endFrame;
-         f = NS_STATIC_CAST(nsTextFrame*, f->GetNextInFlow())) {
+         f = static_cast<nsTextFrame*>(f->GetNextInFlow())) {
 #ifdef DEBUG_roc
       if (f->GetTextRun()) {
         gfxTextRun* textRun = f->GetTextRun();
         if (textRun->GetFlags() & nsTextFrameUtils::TEXT_IS_SIMPLE_FLOW) {
-          if (mMappedFlows[0].mStartFrame != NS_STATIC_CAST(nsTextFrame*, textRun->GetUserData())) {
+          if (mMappedFlows[0].mStartFrame != static_cast<nsTextFrame*>(textRun->GetUserData())) {
             NS_WARNING("REASSIGNING SIMPLE FLOW TEXT RUN!");
           }
         } else {
           TextRunUserData* userData =
-            NS_STATIC_CAST(TextRunUserData*, textRun->GetUserData());
+            static_cast<TextRunUserData*>(textRun->GetUserData());
          
           if (PRUint32(userData->mMappedFlowCount) >= mMappedFlows.Length() ||
               userData->mMappedFlows[userData->mMappedFlowCount - 1].mStartFrame !=
@@ -1967,7 +1967,7 @@ nsTextFrame::EnsureTextRun(nsIRenderingContext* aRC, nsIFrame* aLineContainer,
     return gfxSkipCharsIterator(mTextRun->GetSkipChars(), 0, mContentOffset);
   }
 
-  TextRunUserData* userData = NS_STATIC_CAST(TextRunUserData*, mTextRun->GetUserData());
+  TextRunUserData* userData = static_cast<TextRunUserData*>(mTextRun->GetUserData());
   // Find the flow that contains us
   PRInt32 direction;
   PRInt32 startAt = userData->mLastFlowIndex;
@@ -2115,7 +2115,7 @@ static PRInt32 FindChar(const nsTextFragment* frag,
       const char* str = frag->Get1b() + aOffset;
       const void* p = memchr(str, ch, aLength);
       if (p)
-        return (NS_STATIC_CAST(const char*, p) - str) + aOffset;
+        return (static_cast<const char*>(p) - str) + aOffset;
     }
   }
   return -1;
@@ -2406,7 +2406,7 @@ PropertyProvider::GetSpacingInternal(PRUint32 aStart, PRUint32 aLength,
 static void TabWidthDestructor(void* aObject, nsIAtom* aProp, void* aValue,
                                void* aData)
 {
-  delete NS_STATIC_CAST(nsTArray<gfxFloat>*, aValue);
+  delete static_cast<nsTArray<gfxFloat>*>(aValue);
 }
 
 gfxFloat*
@@ -2414,8 +2414,8 @@ PropertyProvider::GetTabWidths(PRUint32 aStart, PRUint32 aLength)
 {
   if (!mTabWidths) {
     if (!mReflowing) {
-      mTabWidths = NS_STATIC_CAST(nsTArray<gfxFloat>*,
-        mFrame->GetProperty(nsGkAtoms::tabWidthProperty));
+      mTabWidths = static_cast<nsTArray<gfxFloat>*>
+                              (mFrame->GetProperty(nsGkAtoms::tabWidthProperty));
       if (!mTabWidths) {
         NS_WARNING("We need precomputed tab widths, but they're not here...");
         return nsnull;
@@ -2989,7 +2989,7 @@ FindElementAncestor(nsINode* aNode)
   while (aNode && !aNode->IsNodeOfType(nsINode::eELEMENT)) {
     aNode = aNode->GetParent();
   }
-  return NS_STATIC_CAST(nsIContent*, aNode);
+  return static_cast<nsIContent*>(aNode);
 }
 
 PRBool
@@ -3171,7 +3171,7 @@ NS_IMETHODIMP nsTextFrame::GetAccessible(nsIAccessible** aAccessible)
     nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
     if (accService) {
-      return accService->CreateHTMLTextAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+      return accService->CreateHTMLTextAccessible(static_cast<nsIFrame*>(this), aAccessible);
     }
   }
   return NS_ERROR_FAILURE;
@@ -3266,9 +3266,9 @@ nsContinuingTextFrame::Init(nsIContent* aContent,
   nsresult rv = nsFrame::Init(aContent, aParent, aPrevInFlow);
 
   // Hook the frame into the flow
-  nsTextFrame* prev = NS_STATIC_CAST(nsTextFrame*, aPrevInFlow);
-  nsTextFrame* nextContinuation = NS_STATIC_CAST(nsTextFrame*,
-      prev->GetNextContinuation());
+  nsTextFrame* prev = static_cast<nsTextFrame*>(aPrevInFlow);
+  nsTextFrame* nextContinuation = static_cast<nsTextFrame*>
+                                             (prev->GetNextContinuation());
   SetPrevInFlow(prev);
   prev->SetNextInFlow(this);
 
@@ -3318,8 +3318,8 @@ nsContinuingTextFrame::GetFirstInFlow() const
 {
   // Can't cast to |nsContinuingTextFrame*| because the first one isn't.
   nsIFrame *firstInFlow,
-           *previous = NS_CONST_CAST(nsIFrame*,
-                                     NS_STATIC_CAST(const nsIFrame*, this));
+           *previous = const_cast<nsIFrame*>
+                                 (static_cast<const nsIFrame*>(this));
   do {
     firstInFlow = previous;
     previous = firstInFlow->GetPrevInFlow();
@@ -3332,8 +3332,8 @@ nsContinuingTextFrame::GetFirstContinuation() const
 {
   // Can't cast to |nsContinuingTextFrame*| because the first one isn't.
   nsIFrame *firstContinuation,
-  *previous = NS_CONST_CAST(nsIFrame*,
-                            NS_STATIC_CAST(const nsIFrame*, mPrevContinuation));
+  *previous = const_cast<nsIFrame*>
+                        (static_cast<const nsIFrame*>(mPrevContinuation));
   do {
     firstContinuation = previous;
     previous = firstContinuation->GetPrevContinuation();
@@ -3460,9 +3460,9 @@ nsTextFrame::GetCursor(const nsPoint& aPoint,
 nsIFrame*
 nsTextFrame::GetLastInFlow() const
 {
-  nsTextFrame* lastInFlow = NS_CONST_CAST(nsTextFrame*, this);
+  nsTextFrame* lastInFlow = const_cast<nsTextFrame*>(this);
   while (lastInFlow->GetNextInFlow())  {
-    lastInFlow = NS_STATIC_CAST(nsTextFrame*, lastInFlow->GetNextInFlow());
+    lastInFlow = static_cast<nsTextFrame*>(lastInFlow->GetNextInFlow());
   }
   NS_POSTCONDITION(lastInFlow, "illegal state in flow chain.");
   return lastInFlow;
@@ -3470,9 +3470,9 @@ nsTextFrame::GetLastInFlow() const
 nsIFrame*
 nsTextFrame::GetLastContinuation() const
 {
-  nsTextFrame* lastInFlow = NS_CONST_CAST(nsTextFrame*, this);
+  nsTextFrame* lastInFlow = const_cast<nsTextFrame*>(this);
   while (lastInFlow->mNextContinuation)  {
-    lastInFlow = NS_STATIC_CAST(nsTextFrame*, lastInFlow->mNextContinuation);
+    lastInFlow = static_cast<nsTextFrame*>(lastInFlow->mNextContinuation);
   }
   NS_POSTCONDITION(lastInFlow, "illegal state in continuation chain.");
   return lastInFlow;
@@ -3511,7 +3511,7 @@ static void
 ClearTextRunsInFlowChain(nsTextFrame* aFrame)
 {
   nsTextFrame* f;
-  for (f = aFrame; f; f = NS_STATIC_CAST(nsTextFrame*, f->GetNextInFlow())) {
+  for (f = aFrame; f; f = static_cast<nsTextFrame*>(f->GetNextInFlow())) {
     f->ClearTextRun();
   }
 }
@@ -3528,7 +3528,7 @@ nsTextFrame::CharacterDataChanged(nsPresContext* aPresContext,
   PRInt32 nodeLength = mContent->GetText()->GetLength();
 
   if (aAppend) {
-    lastTextFrame = NS_STATIC_CAST(nsTextFrame*, GetLastContinuation());
+    lastTextFrame = static_cast<nsTextFrame*>(GetLastContinuation());
     lastTextFrame->mState &= ~TEXT_WHITESPACE_FLAGS;
     targetTextFrame = lastTextFrame;
   } else {
@@ -3548,7 +3548,7 @@ nsTextFrame::CharacterDataChanged(nsPresContext* aPresContext,
         textFrame->mContentLength = newLength - textFrame->mContentOffset;
       }
       lastTextFrame = textFrame;
-      textFrame = NS_STATIC_CAST(nsTextFrame*, textFrame->GetNextContinuation());
+      textFrame = static_cast<nsTextFrame*>(textFrame->GetNextContinuation());
       if (!textFrame) {
         break;
       }
@@ -3597,7 +3597,7 @@ public:
 void
 nsDisplayText::Paint(nsDisplayListBuilder* aBuilder,
      nsIRenderingContext* aCtx, const nsRect& aDirtyRect) {
-  NS_STATIC_CAST(nsTextFrame*, mFrame)->
+  static_cast<nsTextFrame*>(mFrame)->
     PaintText(aCtx, aBuilder->ToReferenceFrame(mFrame), aDirtyRect);
 }
 
@@ -4194,8 +4194,8 @@ nsTextFrame::PaintText(nsIRenderingContext* aRenderingContext, nsPoint aPt,
   // Trim trailing whitespace
   provider.InitializeForDisplay(PR_TRUE);
 
-  gfxContext* ctx = NS_STATIC_CAST(gfxContext*,
-      aRenderingContext->GetNativeGraphicData(nsIRenderingContext::NATIVE_THEBES_CONTEXT));
+  gfxContext* ctx = static_cast<gfxContext*>
+                               (aRenderingContext->GetNativeGraphicData(nsIRenderingContext::NATIVE_THEBES_CONTEXT));
 
   gfxPoint framePt(aPt.x, aPt.y);
   gfxPoint textBaselinePt(
@@ -4540,7 +4540,7 @@ nsTextFrame::GetChildFrameContainingOffset(PRInt32   aContentOffset,
   nsTextFrame* f = this;
   if (aContentOffset >= mContentOffset) {
     while (PR_TRUE) {
-      nsTextFrame* next = NS_STATIC_CAST(nsTextFrame*, f->GetNextContinuation());
+      nsTextFrame* next = static_cast<nsTextFrame*>(f->GetNextContinuation());
       if (!next || aContentOffset < next->GetContentOffset())
         break;
       if (aContentOffset == next->GetContentOffset()) {
@@ -4553,7 +4553,7 @@ nsTextFrame::GetChildFrameContainingOffset(PRInt32   aContentOffset,
     }
   } else {
     while (PR_TRUE) {
-      nsTextFrame* prev = NS_STATIC_CAST(nsTextFrame*, f->GetPrevContinuation());
+      nsTextFrame* prev = static_cast<nsTextFrame*>(f->GetPrevContinuation());
       if (!prev || aContentOffset > f->GetContentOffset())
         break;
       if (aContentOffset == f->GetContentOffset()) {
@@ -4829,7 +4829,7 @@ nsTextFrame::CheckVisibility(nsPresContext* aContext, PRInt32 aStartIndex,
   // that is not skipped and is mapped by this frame (which is the primary frame)
   // or one of its continuations.
   for (nsTextFrame* f = this; f;
-       f = NS_STATIC_CAST(nsTextFrame*, GetNextContinuation())) {
+       f = static_cast<nsTextFrame*>(GetNextContinuation())) {
     if (f->PeekOffsetNoAmount(PR_TRUE, nsnull)) {
       *aRetval = PR_TRUE;
       return NS_OK;
@@ -5006,7 +5006,7 @@ nsTextFrame::AddInlineMinWidth(nsIRenderingContext *aRenderingContext,
   gfxTextRun* lastTextRun = nsnull;
   // nsContinuingTextFrame does nothing for AddInlineMinWidth; all text frames
   // in the flow are handled right here.
-  for (f = this; f; f = NS_STATIC_CAST(nsTextFrame*, f->GetNextContinuation())) {
+  for (f = this; f; f = static_cast<nsTextFrame*>(f->GetNextContinuation())) {
     // f->mTextRun could be null if we haven't set up textruns yet for f.
     // Except in OOM situations, lastTextRun will only be null for the first
     // text frame.
@@ -5094,7 +5094,7 @@ nsTextFrame::AddInlinePrefWidth(nsIRenderingContext *aRenderingContext,
   gfxTextRun* lastTextRun = nsnull;
   // nsContinuingTextFrame does nothing for AddInlineMinWidth; all text frames
   // in the flow are handled right here.
-  for (f = this; f; f = NS_STATIC_CAST(nsTextFrame*, f->GetNextContinuation())) {
+  for (f = this; f; f = static_cast<nsTextFrame*>(f->GetNextContinuation())) {
     // f->mTextRun could be null if we haven't set up textruns yet for f.
     // Except in OOM situations, lastTextRun will only be null for the first
     // text frame.
@@ -5167,10 +5167,10 @@ nsTextFrame::AdjustNextInFlowContentOffsetsForGrowth(PRBool aClearTextRuns)
   PRInt32 end = GetContentEnd();
   nsTextFrame* f = this;
   NS_ASSERTION(!GetNextInFlow() ||
-               NS_STATIC_CAST(nsTextFrame*, GetNextInFlow())->GetContentOffset() <= GetContentEnd(),
+               static_cast<nsTextFrame*>(GetNextInFlow())->GetContentOffset() <= GetContentEnd(),
                "We shrunk, this should not be called");
   while (PR_TRUE) {
-    f = NS_STATIC_CAST(nsTextFrame*, f->GetNextInFlow());
+    f = static_cast<nsTextFrame*>(f->GetNextInFlow());
     if (!f || f->GetContentOffset() >= end)
       break;
     f->mContentLength = PR_MAX(end, f->GetContentEnd()) - end;
@@ -5205,7 +5205,7 @@ nsTextFrame::Reflow(nsPresContext*           aPresContext,
   RemoveStateBits(TEXT_REFLOW_FLAGS | TEXT_WHITESPACE_FLAGS);
 
   NS_ASSERTION(!GetPrevInFlow() ||
-               NS_STATIC_CAST(nsTextFrame*, GetPrevInFlow())->GetContentEnd() == mContentOffset,
+               static_cast<nsTextFrame*>(GetPrevInFlow())->GetContentEnd() == mContentOffset,
                "Discontinuous content offsets!");
   PRInt32 maxContentLength = GetInFlowContentLength();
 
@@ -5435,7 +5435,7 @@ nsTextFrame::Reflow(nsPresContext*           aPresContext,
   mContentLength = offset + charsFit - mContentOffset;
 
   // Now fix up content offsets/lengths for in-flows
-  nsTextFrame* f = NS_STATIC_CAST(nsTextFrame*, GetNextInFlow());
+  nsTextFrame* f = static_cast<nsTextFrame*>(GetNextInFlow());
   if (f) {
     if (f->GetContentOffset() > GetContentEnd()) {
       // We must have shrunk. Add the leftover text to the start of f.
@@ -5655,8 +5655,8 @@ nsTextFrame::TrimTrailingWhiteSpace(nsPresContext* aPresContext,
     }
   }
 
-  gfxContext* ctx = NS_STATIC_CAST(gfxContext*,
-    aRC.GetNativeGraphicData(nsIRenderingContext::NATIVE_THEBES_CONTEXT));
+  gfxContext* ctx = static_cast<gfxContext*>
+                               (aRC.GetNativeGraphicData(nsIRenderingContext::NATIVE_THEBES_CONTEXT));
   gfxFloat advanceDelta;
   mTextRun->SetLineBreaks(trimmedStart, trimmedEnd - trimmedStart,
                           (GetStateBits() & TEXT_START_OF_LINE) != 0, PR_TRUE,
@@ -5782,7 +5782,7 @@ nsTextFrame::List(FILE* out, PRInt32 aIndent) const
   fprintf(out, " [parent=%p]", mParent);
 #endif
   if (HasView()) {
-    fprintf(out, " [view=%p]", NS_STATIC_CAST(void*, GetView()));
+    fprintf(out, " [view=%p]", static_cast<void*>(GetView()));
   }
 
   PRInt32 totalContentLength;
@@ -5796,14 +5796,14 @@ nsTextFrame::List(FILE* out, PRInt32 aIndent) const
           isComplete ? 'T':'F');
   
   if (nsnull != mNextSibling) {
-    fprintf(out, " next=%p", NS_STATIC_CAST(void*, mNextSibling));
+    fprintf(out, " next=%p", static_cast<void*>(mNextSibling));
   }
   nsIFrame* prevContinuation = GetPrevContinuation();
   if (nsnull != prevContinuation) {
-    fprintf(out, " prev-continuation=%p", NS_STATIC_CAST(void*, prevContinuation));
+    fprintf(out, " prev-continuation=%p", static_cast<void*>(prevContinuation));
   }
   if (nsnull != mNextContinuation) {
-    fprintf(out, " next-continuation=%p", NS_STATIC_CAST(void*, mNextContinuation));
+    fprintf(out, " next-continuation=%p", static_cast<void*>(mNextContinuation));
   }
 
   // Output the rect and state
@@ -5815,8 +5815,8 @@ nsTextFrame::List(FILE* out, PRInt32 aIndent) const
       fprintf(out, " [state=%08x]", mState);
     }
   }
-  fprintf(out, " [content=%p]", NS_STATIC_CAST(void*, mContent));
-  fprintf(out, " sc=%p", NS_STATIC_CAST(void*, mStyleContext));
+  fprintf(out, " [content=%p]", static_cast<void*>(mContent));
+  fprintf(out, " sc=%p", static_cast<void*>(mStyleContext));
   nsIAtom* pseudoTag = mStyleContext->GetPseudoType();
   if (pseudoTag) {
     nsAutoString atomString;
@@ -5911,7 +5911,7 @@ nsTextFrame::AdjustOffsetsForBidi(PRInt32 aStart, PRInt32 aEnd)
      * shouldn't be holding a local reference to a textrun anywhere.
      */
     f->ClearTextRun();
-    f = NS_STATIC_CAST(nsTextFrame*, f->GetNextInFlow());
+    f = static_cast<nsTextFrame*>(f->GetNextInFlow());
     if (!f)
       break;
     f->mContentOffset = aEnd;
diff --git a/mozilla/layout/generic/nsTextRunTransformations.cpp b/mozilla/layout/generic/nsTextRunTransformations.cpp
index 29885a4fb0e..c8b1dd24555 100644
--- a/mozilla/layout/generic/nsTextRunTransformations.cpp
+++ b/mozilla/layout/generic/nsTextRunTransformations.cpp
@@ -174,7 +174,7 @@ nsTransformingTextRunFactory::MakeTextRun(const PRUint8* aString, PRUint32 aLeng
 {
   // We'll only have a Unicode code path to minimize the amount of code needed
   // for these rarely used features
-  NS_ConvertASCIItoUTF16 unicodeString(NS_REINTERPRET_CAST(const char*, aString), aLength);
+  NS_ConvertASCIItoUTF16 unicodeString(reinterpret_cast<const char*>(aString), aLength);
   return MakeTextRun(unicodeString.get(), aLength, aParams, aFontGroup,
                      aFlags & ~(gfxFontGroup::TEXT_IS_PERSISTENT | gfxFontGroup::TEXT_IS_8BIT),
                      aStyles, aOwnsFactory);
diff --git a/mozilla/layout/inspector/src/inDeepTreeWalker.cpp b/mozilla/layout/inspector/src/inDeepTreeWalker.cpp
index 931e74e0b9c..eb9fa308a54 100644
--- a/mozilla/layout/inspector/src/inDeepTreeWalker.cpp
+++ b/mozilla/layout/inspector/src/inDeepTreeWalker.cpp
@@ -75,7 +75,7 @@ inDeepTreeWalker::inDeepTreeWalker()
 inDeepTreeWalker::~inDeepTreeWalker() 
 { 
   for (PRInt32 i = mStack.Count() - 1; i >= 0; --i) {
-    delete NS_STATIC_CAST(DeepTreeStackItem*, mStack[i]);
+    delete static_cast<DeepTreeStackItem*>(mStack[i]);
   }
 }
 
diff --git a/mozilla/layout/mathml/base/src/nsMathMLChar.cpp b/mozilla/layout/mathml/base/src/nsMathMLChar.cpp
index 9fe5d2ca10f..522b550575d 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLChar.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLChar.cpp
@@ -686,14 +686,14 @@ public:
   nsresult Finalize();
 
   nsGlyphTable* TableAt(PRInt32 aIndex) {
-    return NS_STATIC_CAST(nsGlyphTable*, mTableList.ElementAt(aIndex));
+    return static_cast<nsGlyphTable*>(mTableList.ElementAt(aIndex));
   }
   PRInt32 Count(PRBool aEverything = PR_FALSE) {
     return (aEverything) ? mTableList.Count() : mDefaultCount;
   }
 
   nsGlyphTable* AdditionalTableAt(PRInt32 aIndex) {
-    return NS_STATIC_CAST(nsGlyphTable*, mAdditionalTableList.ElementAt(aIndex));
+    return static_cast<nsGlyphTable*>(mAdditionalTableList.ElementAt(aIndex));
   }
   PRInt32 AdditionalCount() {
     return mAdditionalTableList.Count();
@@ -1679,7 +1679,7 @@ nsMathMLChar::Stretch(nsPresContext*      aPresContext,
   count = tableList.Count();
   for (t = 0; t < count; t++) {
     // see if this table has a glyph that matches the container
-    glyphTable = NS_STATIC_CAST(nsGlyphTable*, tableList.ElementAt(t));
+    glyphTable = static_cast<nsGlyphTable*>(tableList.ElementAt(t));
     // figure out the starting size : if this is a largeop, start at 2 else 1
     size = 1; // size=0 is the char at its normal size
     if (largeop && glyphTable->BigOf(aPresContext, this, 2)) {
@@ -1754,7 +1754,7 @@ nsMathMLChar::Stretch(nsPresContext*      aPresContext,
 
   count = tableList.Count();
   for (t = 0; t < count; t++) {
-    glyphTable = NS_STATIC_CAST(nsGlyphTable*, tableList.ElementAt(t));
+    glyphTable = static_cast<nsGlyphTable*>(tableList.ElementAt(t));
     if (!glyphTable->HasPartsOf(aPresContext, this)) continue; // to next table
 
     // See if this is a composite character //////////////////////////////////////////
diff --git a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp
index e2324eb27db..ede4d6d0c8a 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLContainerFrame.cpp
@@ -1006,7 +1006,7 @@ nsMathMLContainerFrame::ReflowForeignChild(nsIFrame*                aChildFrame,
                                            const nsHTMLReflowState& aReflowState,
                                            nsReflowStatus&          aStatus)
 {
-  nsAutoSpaceManager autoSpaceManager(NS_CONST_CAST(nsHTMLReflowState &, aReflowState));
+  nsAutoSpaceManager autoSpaceManager(const_cast<nsHTMLReflowState &>(aReflowState));
   nsresult rv = autoSpaceManager.CreateSpaceManagerFor(aPresContext, this);
   NS_ENSURE_SUCCESS(rv, rv);
 
diff --git a/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.cpp
index 20082483d35..1fb1babb2e0 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLmfencedFrame.cpp
@@ -260,7 +260,7 @@ nsMathMLmfencedFrame::doReflow(nsPresContext*          aPresContext,
   aDesiredSize.mBoundingMetrics.Clear();
 
   nsMathMLContainerFrame* mathMLFrame =
-    NS_STATIC_CAST(nsMathMLContainerFrame*, aForFrame);
+    static_cast<nsMathMLContainerFrame*>(aForFrame);
 
   PRInt32 i;
   nsCOMPtr<nsIFontMetrics> fm;
diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.cpp
index 610d9873a3f..f76839a8bbd 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLmsubFrame.cpp
@@ -138,8 +138,7 @@ nsMathMLmsubFrame::PlaceSubScript (nsPresContext*      aPresContext,
   if (!baseFrame || !subScriptFrame || subScriptFrame->GetNextSibling()) {
     // report an error, encourage people to get their markups in order
     NS_WARNING("invalid markup");
-    return NS_STATIC_CAST(nsMathMLContainerFrame*, 
-                          aFrame)->ReflowError(aRenderingContext, 
+    return static_cast<nsMathMLContainerFrame*>(aFrame)->ReflowError(aRenderingContext, 
                                                aDesiredSize);
   }
   GetReflowAndBoundingMetricsFor(baseFrame, baseSize, bmBase);
diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.cpp
index 4eab1cee65e..bc1dcd243b8 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLmsubsupFrame.cpp
@@ -161,8 +161,8 @@ nsMathMLmsubsupFrame::PlaceSubSupScript(nsPresContext*      aPresContext,
       supScriptFrame->GetNextSibling()) {
     // report an error, encourage people to get their markups in order
     NS_WARNING("invalid markup");
-    return NS_STATIC_CAST(nsMathMLContainerFrame*,
-                          aFrame)->ReflowError(aRenderingContext,
+    return static_cast<nsMathMLContainerFrame*>
+                      (aFrame)->ReflowError(aRenderingContext,
                                                aDesiredSize);
   }
   GetReflowAndBoundingMetricsFor(baseFrame, baseSize, bmBase);
diff --git a/mozilla/layout/mathml/base/src/nsMathMLmsupFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmsupFrame.cpp
index 944c1e07034..2707849cb2e 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLmsupFrame.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLmsupFrame.cpp
@@ -139,8 +139,7 @@ nsMathMLmsupFrame::PlaceSuperScript(nsPresContext*      aPresContext,
   if (!baseFrame || !supScriptFrame || supScriptFrame->GetNextSibling()) {
     // report an error, encourage people to get their markups in order
     NS_WARNING("invalid markup");
-    return NS_STATIC_CAST(nsMathMLContainerFrame*, 
-                          aFrame)->ReflowError(aRenderingContext, 
+    return static_cast<nsMathMLContainerFrame*>(aFrame)->ReflowError(aRenderingContext, 
                                                aDesiredSize);
   }
   GetReflowAndBoundingMetricsFor(baseFrame, baseSize, bmBase);
diff --git a/mozilla/layout/mathml/base/src/nsMathMLmtableFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmtableFrame.cpp
index 68c9b500779..822a24a8054 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLmtableFrame.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLmtableFrame.cpp
@@ -117,7 +117,7 @@ DestroyValueListFunc(void*    aFrame,
                      void*    aPropertyValue,
                      void*    aDtorData)
 {
-  delete NS_STATIC_CAST(nsValueList*, aPropertyValue);
+  delete static_cast<nsValueList*>(aPropertyValue);
 }
 
 static PRUnichar*
@@ -125,8 +125,8 @@ GetValueAt(nsIFrame* aTableOrRowFrame,
            nsIAtom*  aAttribute,
            PRInt32   aRowOrColIndex)
 {
-  nsValueList* valueList = NS_STATIC_CAST(nsValueList*,
-    aTableOrRowFrame->GetProperty(aAttribute));
+  nsValueList* valueList = static_cast<nsValueList*>
+                                      (aTableOrRowFrame->GetProperty(aAttribute));
   if (!valueList) {
     // The property isn't there yet, so set it
     nsAutoString values;
diff --git a/mozilla/layout/style/nsCSSDataBlock.cpp b/mozilla/layout/style/nsCSSDataBlock.cpp
index 5b80386e64d..3e531a38f8c 100644
--- a/mozilla/layout/style/nsCSSDataBlock.cpp
+++ b/mozilla/layout/style/nsCSSDataBlock.cpp
@@ -103,73 +103,73 @@ enum {
  */
 
 inline nsCSSProperty& PropertyAtCursor(char *aCursor) {
-    return *NS_REINTERPRET_CAST(nsCSSProperty*, aCursor);
+    return *reinterpret_cast<nsCSSProperty*>(aCursor);
 }
 
 inline nsCSSProperty PropertyAtCursor(const char *aCursor) {
-    return *NS_REINTERPRET_CAST(const nsCSSProperty*, aCursor);
+    return *reinterpret_cast<const nsCSSProperty*>(aCursor);
 }
 
 inline nsCSSValue* ValueAtCursor(char *aCursor) {
-    return & NS_REINTERPRET_CAST(CDBValueStorage*, aCursor)->value;
+    return & reinterpret_cast<CDBValueStorage*>(aCursor)->value;
 }
 
 inline const nsCSSValue* ValueAtCursor(const char *aCursor) {
-    return & NS_REINTERPRET_CAST(const CDBValueStorage*, aCursor)->value;
+    return & reinterpret_cast<const CDBValueStorage*>(aCursor)->value;
 }
 
 inline nsCSSRect* RectAtCursor(char *aCursor) {
-    return & NS_REINTERPRET_CAST(CDBRectStorage*, aCursor)->value;
+    return & reinterpret_cast<CDBRectStorage*>(aCursor)->value;
 }
 
 inline const nsCSSRect* RectAtCursor(const char *aCursor) {
-    return & NS_REINTERPRET_CAST(const CDBRectStorage*, aCursor)->value;
+    return & reinterpret_cast<const CDBRectStorage*>(aCursor)->value;
 }
 
 inline nsCSSValuePair* ValuePairAtCursor(char *aCursor) {
-  return & NS_REINTERPRET_CAST(CDBValuePairStorage*, aCursor)->value;
+  return & reinterpret_cast<CDBValuePairStorage*>(aCursor)->value;
 }
 
 inline const nsCSSValuePair* ValuePairAtCursor(const char *aCursor) {
-  return & NS_REINTERPRET_CAST(const CDBValuePairStorage*, aCursor)->value;
+  return & reinterpret_cast<const CDBValuePairStorage*>(aCursor)->value;
 }
 
 inline void*& PointerAtCursor(char *aCursor) {
-    return NS_REINTERPRET_CAST(CDBPointerStorage*, aCursor)->value;
+    return reinterpret_cast<CDBPointerStorage*>(aCursor)->value;
 }
 
 inline void* PointerAtCursor(const char *aCursor) {
-    return NS_REINTERPRET_CAST(const CDBPointerStorage*, aCursor)->value;
+    return reinterpret_cast<const CDBPointerStorage*>(aCursor)->value;
 }
 
 inline nsCSSValueList*& ValueListAtCursor(char *aCursor) {
-    return * NS_REINTERPRET_CAST(nsCSSValueList**,
-                    & NS_REINTERPRET_CAST(CDBPointerStorage*, aCursor)->value);
+    return * reinterpret_cast<nsCSSValueList**>
+                             (& reinterpret_cast<CDBPointerStorage*>(aCursor)->value);
 }
 
 inline nsCSSValueList* ValueListAtCursor(const char *aCursor) {
-    return NS_STATIC_CAST(nsCSSValueList*,
-                NS_REINTERPRET_CAST(const CDBPointerStorage*, aCursor)->value);
+    return static_cast<nsCSSValueList*>
+                      (reinterpret_cast<const CDBPointerStorage*>(aCursor)->value);
 }
 
 inline nsCSSCounterData*& CounterDataAtCursor(char *aCursor) {
-    return * NS_REINTERPRET_CAST(nsCSSCounterData**,
-                    & NS_REINTERPRET_CAST(CDBPointerStorage*, aCursor)->value);
+    return * reinterpret_cast<nsCSSCounterData**>
+                             (& reinterpret_cast<CDBPointerStorage*>(aCursor)->value);
 }
 
 inline nsCSSCounterData* CounterDataAtCursor(const char *aCursor) {
-    return NS_STATIC_CAST(nsCSSCounterData*,
-                NS_REINTERPRET_CAST(const CDBPointerStorage*, aCursor)->value);
+    return static_cast<nsCSSCounterData*>
+                      (reinterpret_cast<const CDBPointerStorage*>(aCursor)->value);
 }
 
 inline nsCSSQuotes*& QuotesAtCursor(char *aCursor) {
-    return * NS_REINTERPRET_CAST(nsCSSQuotes**,
-                    & NS_REINTERPRET_CAST(CDBPointerStorage*, aCursor)->value);
+    return * reinterpret_cast<nsCSSQuotes**>
+                             (& reinterpret_cast<CDBPointerStorage*>(aCursor)->value);
 }
 
 inline nsCSSQuotes* QuotesAtCursor(const char *aCursor) {
-    return NS_STATIC_CAST(nsCSSQuotes*,
-                NS_REINTERPRET_CAST(const CDBPointerStorage*, aCursor)->value);
+    return static_cast<nsCSSQuotes*>
+                      (reinterpret_cast<const CDBPointerStorage*>(aCursor)->value);
 }
 
 static PRBool
@@ -203,7 +203,7 @@ nsCSSCompressedDataBlock::MapRuleInfoInto(nsRuleData *aRuleData) const
                 nsCSSExpandedDataBlock::RuleDataPropertyAt(aRuleData, iProp);
             switch (nsCSSProps::kTypeTable[iProp]) {
                 case eCSSType_Value: {
-                    nsCSSValue* target = NS_STATIC_CAST(nsCSSValue*, prop);
+                    nsCSSValue* target = static_cast<nsCSSValue*>(prop);
                     if (target->GetUnit() == eCSSUnit_Null) {
                         const nsCSSValue *val = ValueAtCursor(cursor);
                         NS_ASSERTION(val->GetUnit() != eCSSUnit_Null, "oops");
@@ -251,7 +251,7 @@ nsCSSCompressedDataBlock::MapRuleInfoInto(nsRuleData *aRuleData) const
                 case eCSSType_Rect: {
                     const nsCSSRect* val = RectAtCursor(cursor);
                     NS_ASSERTION(val->HasValue(), "oops");
-                    nsCSSRect* target = NS_STATIC_CAST(nsCSSRect*, prop);
+                    nsCSSRect* target = static_cast<nsCSSRect*>(prop);
                     if (target->mTop.GetUnit() == eCSSUnit_Null)
                         target->mTop = val->mTop;
                     if (target->mRight.GetUnit() == eCSSUnit_Null)
@@ -267,7 +267,7 @@ nsCSSCompressedDataBlock::MapRuleInfoInto(nsRuleData *aRuleData) const
                     const nsCSSValuePair* val = ValuePairAtCursor(cursor);
                     NS_ASSERTION(val->mXValue.GetUnit() != eCSSUnit_Null ||
                                  val->mYValue.GetUnit() != eCSSUnit_Null, "oops");
-                    nsCSSValuePair* target = NS_STATIC_CAST(nsCSSValuePair*, prop);
+                    nsCSSValuePair* target = static_cast<nsCSSValuePair*>(prop);
                     if (target->mXValue.GetUnit() == eCSSUnit_Null)
                         target->mXValue = val->mXValue;
                     if (target->mYValue.GetUnit() == eCSSUnit_Null)
@@ -298,7 +298,7 @@ nsCSSCompressedDataBlock::MapRuleInfoInto(nsRuleData *aRuleData) const
                 // fall through
                 case eCSSType_CounterData:
                 case eCSSType_Quotes: {
-                    void** target = NS_STATIC_CAST(void**, prop);
+                    void** target = static_cast<void**>(prop);
                     if (!*target) {
                         void* val = PointerAtCursor(cursor);
                         NS_ASSERTION(val, "oops");
@@ -374,7 +374,7 @@ nsCSSCompressedDataBlock::StorageFor(nsCSSProperty aProperty) const
                 case eCSSType_ValueList:
                 case eCSSType_CounterData:
                 case eCSSType_Quotes: {
-                    return &PointerAtCursor(NS_CONST_CAST(char*, cursor));
+                    return &PointerAtCursor(const_cast<char*>(cursor));
                 }
             }
         }
@@ -640,7 +640,7 @@ nsCSSExpandedDataBlock::DoExpand(nsCSSCompressedDataBlock *aBlock,
             case eCSSType_Quotes: {
                 void* val = PointerAtCursor(cursor);
                 NS_ASSERTION(val, "oops");
-                *NS_STATIC_CAST(void**, prop) = val;
+                *static_cast<void**>(prop) = val;
                 cursor += CDBPointerStorage_advance;
             } break;
         }
@@ -684,7 +684,7 @@ nsCSSExpandedDataBlock::ComputeSize()
             switch (nsCSSProps::kTypeTable[iProp]) {
                 case eCSSType_Value: {
 #ifdef DEBUG
-                    nsCSSValue* val = NS_STATIC_CAST(nsCSSValue*, prop);
+                    nsCSSValue* val = static_cast<nsCSSValue*>(prop);
                     NS_ASSERTION(val->GetUnit() != eCSSUnit_Null,
                                  "null value while computing size");
 #endif
@@ -693,7 +693,7 @@ nsCSSExpandedDataBlock::ComputeSize()
 
                 case eCSSType_Rect: {
 #ifdef DEBUG
-                    nsCSSRect* val = NS_STATIC_CAST(nsCSSRect*, prop);
+                    nsCSSRect* val = static_cast<nsCSSRect*>(prop);
                     NS_ASSERTION(val->HasValue(),
                                  "Valueless rect while computing size");
 #endif
@@ -702,7 +702,7 @@ nsCSSExpandedDataBlock::ComputeSize()
 
                 case eCSSType_ValuePair: {
 #ifdef DEBUG
-                    nsCSSValuePair* val = NS_STATIC_CAST(nsCSSValuePair*, prop);
+                    nsCSSValuePair* val = static_cast<nsCSSValuePair*>(prop);
                     NS_ASSERTION(val->mXValue.GetUnit() != eCSSUnit_Null ||
                                  val->mYValue.GetUnit() != eCSSUnit_Null,
                                  "Valueless pair while computing size");
@@ -714,7 +714,7 @@ nsCSSExpandedDataBlock::ComputeSize()
                 case eCSSType_CounterData:
                 case eCSSType_Quotes: {
 #ifdef DEBUG
-                    void* val = *NS_STATIC_CAST(void**, prop);
+                    void* val = *static_cast<void**>(prop);
                     NS_ASSERTION(val, "Null pointer while computing size");
 #endif
                     increment = CDBPointerStorage_advance;
@@ -782,11 +782,11 @@ nsCSSExpandedDataBlock::Compress(nsCSSCompressedDataBlock **aNormalBlock,
                 important ? result_important : result_normal;
             switch (nsCSSProps::kTypeTable[iProp]) {
                 case eCSSType_Value: {
-                    nsCSSValue* val = NS_STATIC_CAST(nsCSSValue*, prop);
+                    nsCSSValue* val = static_cast<nsCSSValue*>(prop);
                     NS_ASSERTION(val->GetUnit() != eCSSUnit_Null,
                                  "Null value while compressing");
                     CDBValueStorage *storage =
-                        NS_REINTERPRET_CAST(CDBValueStorage*, cursor);
+                        reinterpret_cast<CDBValueStorage*>(cursor);
                     storage->property = iProp;
                     memcpy(&storage->value, val, sizeof(nsCSSValue));
                     new (val) nsCSSValue();
@@ -794,11 +794,11 @@ nsCSSExpandedDataBlock::Compress(nsCSSCompressedDataBlock **aNormalBlock,
                 } break;
 
                 case eCSSType_Rect: {
-                    nsCSSRect* val = NS_STATIC_CAST(nsCSSRect*, prop);
+                    nsCSSRect* val = static_cast<nsCSSRect*>(prop);
                     NS_ASSERTION(val->HasValue(),
                                  "Valueless rect while compressing");
                     CDBRectStorage *storage =
-                        NS_REINTERPRET_CAST(CDBRectStorage*, cursor);
+                        reinterpret_cast<CDBRectStorage*>(cursor);
                     storage->property = iProp;
                     memcpy(&storage->value, val, sizeof(nsCSSRect));
                     new (val) nsCSSRect();
@@ -806,12 +806,12 @@ nsCSSExpandedDataBlock::Compress(nsCSSCompressedDataBlock **aNormalBlock,
                 } break;
 
                 case eCSSType_ValuePair: {
-                    nsCSSValuePair* val = NS_STATIC_CAST(nsCSSValuePair*, prop);
+                    nsCSSValuePair* val = static_cast<nsCSSValuePair*>(prop);
                     NS_ASSERTION(val->mXValue.GetUnit() != eCSSUnit_Null ||
                                  val->mYValue.GetUnit() != eCSSUnit_Null,
                                  "Valueless pair while compressing");
                     CDBValuePairStorage *storage =
-                        NS_REINTERPRET_CAST(CDBValuePairStorage*, cursor);
+                        reinterpret_cast<CDBValuePairStorage*>(cursor);
                     storage->property = iProp;
                     memcpy(&storage->value, val, sizeof(nsCSSValuePair));
                     new (val) nsCSSValuePair();
@@ -821,10 +821,10 @@ nsCSSExpandedDataBlock::Compress(nsCSSCompressedDataBlock **aNormalBlock,
                 case eCSSType_ValueList:
                 case eCSSType_CounterData:
                 case eCSSType_Quotes: {
-                    void*& val = *NS_STATIC_CAST(void**, prop);
+                    void*& val = *static_cast<void**>(prop);
                     NS_ASSERTION(val, "Null pointer while compressing");
                     CDBPointerStorage *storage =
-                        NS_REINTERPRET_CAST(CDBPointerStorage*, cursor);
+                        reinterpret_cast<CDBPointerStorage*>(cursor);
                     storage->property = iProp;
                     storage->value = val;
                     val = nsnull;
@@ -881,23 +881,23 @@ nsCSSExpandedDataBlock::ClearProperty(nsCSSProperty aPropID)
     void *prop = PropertyAt(aPropID);
     switch (nsCSSProps::kTypeTable[aPropID]) {
         case eCSSType_Value: {
-            nsCSSValue* val = NS_STATIC_CAST(nsCSSValue*, prop);
+            nsCSSValue* val = static_cast<nsCSSValue*>(prop);
             val->Reset();
         } break;
 
         case eCSSType_Rect: {
-            nsCSSRect* val = NS_STATIC_CAST(nsCSSRect*, prop);
+            nsCSSRect* val = static_cast<nsCSSRect*>(prop);
             val->Reset();
         } break;
 
         case eCSSType_ValuePair: {
-            nsCSSValuePair* val = NS_STATIC_CAST(nsCSSValuePair*, prop);
+            nsCSSValuePair* val = static_cast<nsCSSValuePair*>(prop);
             val->mXValue.Reset();
             val->mYValue.Reset();
         } break;
 
         case eCSSType_ValueList: {
-            nsCSSValueList*& val = *NS_STATIC_CAST(nsCSSValueList**, prop);
+            nsCSSValueList*& val = *static_cast<nsCSSValueList**>(prop);
             if (val) {
                 delete val;
                 val = nsnull;
@@ -906,7 +906,7 @@ nsCSSExpandedDataBlock::ClearProperty(nsCSSProperty aPropID)
 
         case eCSSType_CounterData: {
             nsCSSCounterData*& val =
-                *NS_STATIC_CAST(nsCSSCounterData**, prop);
+                *static_cast<nsCSSCounterData**>(prop);
             if (val) {
                 delete val;
                 val = nsnull;
@@ -914,7 +914,7 @@ nsCSSExpandedDataBlock::ClearProperty(nsCSSProperty aPropID)
         } break;
 
         case eCSSType_Quotes: {
-            nsCSSQuotes*& val = *NS_STATIC_CAST(nsCSSQuotes**, prop);
+            nsCSSQuotes*& val = *static_cast<nsCSSQuotes**>(prop);
             if (val) {
                 delete val;
                 val = nsnull;
@@ -939,13 +939,13 @@ nsCSSExpandedDataBlock::DoAssertInitialState()
         void *prop = PropertyAt(nsCSSProperty(i));
         switch (nsCSSProps::kTypeTable[i]) {
             case eCSSType_Value: {
-                nsCSSValue* val = NS_STATIC_CAST(nsCSSValue*, prop);
+                nsCSSValue* val = static_cast<nsCSSValue*>(prop);
                 NS_ASSERTION(val->GetUnit() == eCSSUnit_Null,
                              "not initial state");
             } break;
 
             case eCSSType_Rect: {
-                nsCSSRect* val = NS_STATIC_CAST(nsCSSRect*, prop);
+                nsCSSRect* val = static_cast<nsCSSRect*>(prop);
                 NS_ASSERTION(val->mTop.GetUnit() == eCSSUnit_Null,
                              "not initial state");
                 NS_ASSERTION(val->mRight.GetUnit() == eCSSUnit_Null,
@@ -957,7 +957,7 @@ nsCSSExpandedDataBlock::DoAssertInitialState()
             } break;
 
             case eCSSType_ValuePair: {
-                nsCSSValuePair* val = NS_STATIC_CAST(nsCSSValuePair*, prop);
+                nsCSSValuePair* val = static_cast<nsCSSValuePair*>(prop);
                 NS_ASSERTION(val->mXValue.GetUnit() == eCSSUnit_Null,
                              "not initial state");
                 NS_ASSERTION(val->mYValue.GetUnit() == eCSSUnit_Null,
@@ -965,18 +965,18 @@ nsCSSExpandedDataBlock::DoAssertInitialState()
             } break;
 
             case eCSSType_ValueList: {
-                nsCSSValueList* val = *NS_STATIC_CAST(nsCSSValueList**, prop);
+                nsCSSValueList* val = *static_cast<nsCSSValueList**>(prop);
                 NS_ASSERTION(val == nsnull, "not initial state");
             } break;
 
             case eCSSType_CounterData: {
                 nsCSSCounterData* val =
-                    *NS_STATIC_CAST(nsCSSCounterData**, prop);
+                    *static_cast<nsCSSCounterData**>(prop);
                 NS_ASSERTION(val == nsnull, "not initial state");
             } break;
 
             case eCSSType_Quotes: {
-                nsCSSQuotes* val = *NS_STATIC_CAST(nsCSSQuotes**, prop);
+                nsCSSQuotes* val = *static_cast<nsCSSQuotes**>(prop);
                 NS_ASSERTION(val == nsnull, "not initial state");
             } break;
         }
diff --git a/mozilla/layout/style/nsCSSDataBlock.h b/mozilla/layout/style/nsCSSDataBlock.h
index e36263ec6a6..01ff8ab14b7 100644
--- a/mozilla/layout/style/nsCSSDataBlock.h
+++ b/mozilla/layout/style/nsCSSDataBlock.h
@@ -238,7 +238,7 @@ public:
     void* PropertyAt(nsCSSProperty aProperty) {
         const PropertyOffsetInfo& offsets =
             nsCSSExpandedDataBlock::kOffsetTable[aProperty];
-        return NS_REINTERPRET_CAST(void*, NS_REINTERPRET_CAST(char*, this) +
+        return reinterpret_cast<void*>(reinterpret_cast<char*>(this) +
                                           offsets.block_offset);
     }
 
@@ -253,11 +253,11 @@ public:
             nsCSSExpandedDataBlock::kOffsetTable[aProperty];
         NS_ASSERTION(offsets.ruledata_struct_offset != size_t(-1),
                      "property should not use CSS_PROP_BACKENDONLY");
-        char* cssstruct = *NS_REINTERPRET_CAST(char**,
-                              NS_REINTERPRET_CAST(char*, aRuleData) +
+        char* cssstruct = *reinterpret_cast<char**>
+                                           (reinterpret_cast<char*>(aRuleData) +
                               offsets.ruledata_struct_offset);
-        return NS_REINTERPRET_CAST(void*,
-                                   cssstruct + offsets.ruledata_member_offset);
+        return reinterpret_cast<void*>
+                               (cssstruct + offsets.ruledata_member_offset);
     }
 
     void AssertInSetRange(nsCSSProperty aProperty) {
diff --git a/mozilla/layout/style/nsCSSDeclaration.cpp b/mozilla/layout/style/nsCSSDeclaration.cpp
index 283cdd507e5..cb63f5a62f0 100644
--- a/mozilla/layout/style/nsCSSDeclaration.cpp
+++ b/mozilla/layout/style/nsCSSDeclaration.cpp
@@ -173,7 +173,7 @@ nsCSSDeclaration::GetValueOrImportantValue(nsCSSProperty aProperty, nsCSSValue&
   const void *storage = data->StorageFor(aProperty);
   if (!storage)
     return NS_OK;
-  aValue = *NS_STATIC_CAST(const nsCSSValue*, storage);
+  aValue = *static_cast<const nsCSSValue*>(storage);
   return NS_OK;
 }
 
@@ -193,11 +193,11 @@ PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, nsAString&
   if (storage) {
     switch (nsCSSProps::kTypeTable[aProperty]) {
       case eCSSType_Value: {
-        const nsCSSValue *val = NS_STATIC_CAST(const nsCSSValue*, storage);
+        const nsCSSValue *val = static_cast<const nsCSSValue*>(storage);
         AppendCSSValueToString(aProperty, *val, aResult);
       } break;
       case eCSSType_Rect: {
-        const nsCSSRect *rect = NS_STATIC_CAST(const nsCSSRect*, storage);
+        const nsCSSRect *rect = static_cast<const nsCSSRect*>(storage);
         if (rect->mTop.GetUnit() == eCSSUnit_Inherit ||
             rect->mTop.GetUnit() == eCSSUnit_Initial) {
           NS_ASSERTION(rect->mRight.GetUnit() == rect->mTop.GetUnit(),
@@ -221,7 +221,7 @@ PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, nsAString&
         }
       } break;
       case eCSSType_ValuePair: {
-        const nsCSSValuePair *pair = NS_STATIC_CAST(const nsCSSValuePair*, storage);
+        const nsCSSValuePair *pair = static_cast<const nsCSSValuePair*>(storage);
         AppendCSSValueToString(aProperty, pair->mXValue, aResult);
         if (pair->mYValue != pair->mXValue ||
             (aProperty == eCSSProperty_background_position &&
@@ -236,7 +236,7 @@ PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, nsAString&
       } break;
       case eCSSType_ValueList: {
         const nsCSSValueList* val =
-            *NS_STATIC_CAST(nsCSSValueList*const*, storage);
+            *static_cast<nsCSSValueList*const*>(storage);
         do {
           AppendCSSValueToString(aProperty, val->mValue, aResult);
           val = val->mNext;
@@ -254,7 +254,7 @@ PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, nsAString&
       } break;
       case eCSSType_CounterData: {
         const nsCSSCounterData* counter =
-            *NS_STATIC_CAST(nsCSSCounterData*const*, storage);
+            *static_cast<nsCSSCounterData*const*>(storage);
         do {
           if (AppendCSSValueToString(aProperty, counter->mCounter, aResult)) {
             if (counter->mValue.GetUnit() != eCSSUnit_Null) {
@@ -270,7 +270,7 @@ PRBool nsCSSDeclaration::AppendValueToString(nsCSSProperty aProperty, nsAString&
       } break;
       case eCSSType_Quotes: {
         const nsCSSQuotes* quotes = 
-            *NS_STATIC_CAST(nsCSSQuotes*const*, storage);
+            *static_cast<nsCSSQuotes*const*>(storage);
         NS_ASSERTION((quotes->mOpen.GetUnit() == eCSSUnit_String) ||
                      (quotes->mNext == nsnull),
                      "non-strings must be alone");
diff --git a/mozilla/layout/style/nsCSSLoader.cpp b/mozilla/layout/style/nsCSSLoader.cpp
index c7e6853cf31..00a6eee5da3 100644
--- a/mozilla/layout/style/nsCSSLoader.cpp
+++ b/mozilla/layout/style/nsCSSLoader.cpp
@@ -346,7 +346,7 @@ CollectNonAlternates(nsURIAndPrincipalHashKey *aKey,
     return PL_DHASH_NEXT;
   }
 
-  NS_STATIC_CAST(CSSLoaderImpl::LoadDataArray*,aClosure)->AppendElement(aData);
+  static_cast<CSSLoaderImpl::LoadDataArray*>(aClosure)->AppendElement(aData);
   return PL_DHASH_REMOVE;
 }
 
@@ -1798,7 +1798,7 @@ CSSLoaderImpl::LoadStyleLink(nsIContent* aElement,
 
   if (state == eSheetComplete) {
     LOG(("  Sheet already complete: 0x%p",
-         NS_STATIC_CAST(void*, sheet.get())));
+         static_cast<void*>(sheet.get())));
     if (aObserver) {
       rv = PostLoadEvent(aURL, sheet, aObserver, *aIsAlternate);
       return rv;
@@ -1900,8 +1900,8 @@ CSSLoaderImpl::LoadChildSheet(nsICSSStyleSheet* aParentSheet,
   PRInt32 count = mParsingDatas.Count();
   if (count > 0) {
     LOG(("  Have a parent load"));
-    parentData = NS_STATIC_CAST(SheetLoadData*,
-                                mParsingDatas.ElementAt(count - 1));
+    parentData = static_cast<SheetLoadData*>
+                            (mParsingDatas.ElementAt(count - 1));
     // Check for cycles
     SheetLoadData* data = parentData;
     while (data && data->mURI) {
@@ -2153,7 +2153,7 @@ StopLoadingSheetCallback(nsURIAndPrincipalHashKey* aKey,
   aData->mIsLoading = PR_FALSE; // we will handle the removal right here
   aData->mIsCancelled = PR_TRUE;
   
-  NS_STATIC_CAST(CSSLoaderImpl::LoadDataArray*,aClosure)->AppendElement(aData);
+  static_cast<CSSLoaderImpl::LoadDataArray*>(aClosure)->AppendElement(aData);
 
   return PL_DHASH_REMOVE;
 }
@@ -2218,7 +2218,7 @@ StopLoadingSheetByURICallback(nsURIAndPrincipalHashKey* aKey,
   NS_PRECONDITION(aClosure, "Must have a loader");
 
   StopLoadingSheetsByURIClosure* closure =
-    NS_STATIC_CAST(StopLoadingSheetsByURIClosure*, aClosure);
+    static_cast<StopLoadingSheetsByURIClosure*>(aClosure);
 
   PRBool equal;
   if (NS_SUCCEEDED(aData->mURI->Equals(closure->uri, &equal)) &&
@@ -2332,7 +2332,7 @@ CollectLoadDatas(nsURIAndPrincipalHashKey *aKey,
                  SheetLoadData* &aData,
                  void* aClosure)
 {
-  NS_STATIC_CAST(CSSLoaderImpl::LoadDataArray*,aClosure)->AppendElement(aData);
+  static_cast<CSSLoaderImpl::LoadDataArray*>(aClosure)->AppendElement(aData);
   return PL_DHASH_REMOVE;
 }
 
diff --git a/mozilla/layout/style/nsCSSLoader.h b/mozilla/layout/style/nsCSSLoader.h
index 262cd6dec68..19db07cbbf0 100644
--- a/mozilla/layout/style/nsCSSLoader.h
+++ b/mozilla/layout/style/nsCSSLoader.h
@@ -245,7 +245,7 @@ public:
   }
  
   nsURIAndPrincipalHashKey* GetKey() const {
-    return NS_CONST_CAST(nsURIAndPrincipalHashKey*, this);
+    return const_cast<nsURIAndPrincipalHashKey*>(this);
   }
   const nsURIAndPrincipalHashKey* GetKeyPointer() const { return this; }
  
diff --git a/mozilla/layout/style/nsCSSParser.cpp b/mozilla/layout/style/nsCSSParser.cpp
index a233b6c4f24..d455fea115e 100644
--- a/mozilla/layout/style/nsCSSParser.cpp
+++ b/mozilla/layout/style/nsCSSParser.cpp
@@ -490,7 +490,7 @@ protected:
 
 PR_STATIC_CALLBACK(void) AppendRuleToArray(nsICSSRule* aRule, void* aArray)
 {
-  NS_STATIC_CAST(nsCOMArray<nsICSSRule>*, aArray)->AppendObject(aRule);
+  static_cast<nsCOMArray<nsICSSRule>*>(aArray)->AppendObject(aRule);
 }
 
 PR_STATIC_CALLBACK(void) AppendRuleToSheet(nsICSSRule* aRule, void* aParser)
@@ -3462,8 +3462,8 @@ CSSParserImpl::DoTransferTempData(nsCSSDeclaration* aDeclaration,
   void *v_dest = mData.PropertyAt(aPropID);
   switch (nsCSSProps::kTypeTable[aPropID]) {
     case eCSSType_Value: {
-      nsCSSValue *source = NS_STATIC_CAST(nsCSSValue*, v_source);
-      nsCSSValue *dest = NS_STATIC_CAST(nsCSSValue*, v_dest);
+      nsCSSValue *source = static_cast<nsCSSValue*>(v_source);
+      nsCSSValue *dest = static_cast<nsCSSValue*>(v_dest);
       if (*source != *dest)
         *aChanged = PR_TRUE;
       dest->~nsCSSValue();
@@ -3472,8 +3472,8 @@ CSSParserImpl::DoTransferTempData(nsCSSDeclaration* aDeclaration,
     } break;
 
     case eCSSType_Rect: {
-      nsCSSRect *source = NS_STATIC_CAST(nsCSSRect*, v_source);
-      nsCSSRect *dest = NS_STATIC_CAST(nsCSSRect*, v_dest);
+      nsCSSRect *source = static_cast<nsCSSRect*>(v_source);
+      nsCSSRect *dest = static_cast<nsCSSRect*>(v_dest);
       if (*source != *dest)
         *aChanged = PR_TRUE;
       dest->~nsCSSRect();
@@ -3482,8 +3482,8 @@ CSSParserImpl::DoTransferTempData(nsCSSDeclaration* aDeclaration,
     } break;
 
     case eCSSType_ValuePair: {
-      nsCSSValuePair *source = NS_STATIC_CAST(nsCSSValuePair*, v_source);
-      nsCSSValuePair *dest = NS_STATIC_CAST(nsCSSValuePair*, v_dest);
+      nsCSSValuePair *source = static_cast<nsCSSValuePair*>(v_source);
+      nsCSSValuePair *dest = static_cast<nsCSSValuePair*>(v_dest);
       if (*source != *dest)
         *aChanged = PR_TRUE;
       dest->~nsCSSValuePair();
@@ -3492,8 +3492,8 @@ CSSParserImpl::DoTransferTempData(nsCSSDeclaration* aDeclaration,
     } break;
 
     case eCSSType_ValueList: {
-      nsCSSValueList **source = NS_STATIC_CAST(nsCSSValueList**, v_source);
-      nsCSSValueList **dest = NS_STATIC_CAST(nsCSSValueList**, v_dest);
+      nsCSSValueList **source = static_cast<nsCSSValueList**>(v_source);
+      nsCSSValueList **dest = static_cast<nsCSSValueList**>(v_dest);
       if (!nsCSSValueList::Equal(*source, *dest))
         *aChanged = PR_TRUE;
       delete *dest;
@@ -3502,8 +3502,8 @@ CSSParserImpl::DoTransferTempData(nsCSSDeclaration* aDeclaration,
     } break;
 
     case eCSSType_CounterData: {
-      nsCSSCounterData **source = NS_STATIC_CAST(nsCSSCounterData**, v_source);
-      nsCSSCounterData **dest = NS_STATIC_CAST(nsCSSCounterData**, v_dest);
+      nsCSSCounterData **source = static_cast<nsCSSCounterData**>(v_source);
+      nsCSSCounterData **dest = static_cast<nsCSSCounterData**>(v_dest);
       if (!nsCSSCounterData::Equal(*source, *dest))
         *aChanged = PR_TRUE;
       delete *dest;
@@ -3512,8 +3512,8 @@ CSSParserImpl::DoTransferTempData(nsCSSDeclaration* aDeclaration,
     } break;
 
     case eCSSType_Quotes: {
-      nsCSSQuotes **source = NS_STATIC_CAST(nsCSSQuotes**, v_source);
-      nsCSSQuotes **dest = NS_STATIC_CAST(nsCSSQuotes**, v_dest);
+      nsCSSQuotes **source = static_cast<nsCSSQuotes**>(v_source);
+      nsCSSQuotes **dest = static_cast<nsCSSQuotes**>(v_dest);
       if (!nsCSSQuotes::Equal(*source, *dest))
         *aChanged = PR_TRUE;
       delete *dest;
@@ -4186,7 +4186,7 @@ CSSParserImpl::AppendValue(nsCSSProperty aPropID,
                nsPrintfCString(64, "type error (property=\'%s\')",
                              nsCSSProps::GetStringValue(aPropID).get()).get());
   nsCSSValue& storage =
-      *NS_STATIC_CAST(nsCSSValue*, mTempData.PropertyAt(aPropID));
+      *static_cast<nsCSSValue*>(mTempData.PropertyAt(aPropID));
   storage = aValue;
   mTempData.SetPropertyBit(aPropID);
 }
diff --git a/mozilla/layout/style/nsCSSRuleProcessor.cpp b/mozilla/layout/style/nsCSSRuleProcessor.cpp
index 093e085cea9..5a82ff2379f 100644
--- a/mozilla/layout/style/nsCSSRuleProcessor.cpp
+++ b/mozilla/layout/style/nsCSSRuleProcessor.cpp
@@ -130,7 +130,7 @@ struct RuleHashTableEntry : public PLDHashEntryHdr {
 PR_STATIC_CALLBACK(PLDHashNumber)
 RuleHash_CIHashKey(PLDHashTable *table, const void *key)
 {
-  nsIAtom *atom = NS_CONST_CAST(nsIAtom*, NS_STATIC_CAST(const nsIAtom*, key));
+  nsIAtom *atom = const_cast<nsIAtom*>(static_cast<const nsIAtom*>(key));
 
   nsAutoString str;
   atom->ToString(str);
@@ -161,8 +161,8 @@ PR_STATIC_CALLBACK(PRBool)
 RuleHash_CIMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr,
                       const void *key)
 {
-  nsIAtom *match_atom = NS_CONST_CAST(nsIAtom*, NS_STATIC_CAST(const nsIAtom*,
-                            key));
+  nsIAtom *match_atom = const_cast<nsIAtom*>(static_cast<const nsIAtom*>
+                                              (key));
   // Use our extra |getKey| callback to avoid code duplication.
   nsIAtom *entry_atom = ToLocalOps(table->ops)->getKey(table, hdr);
 
@@ -181,8 +181,8 @@ PR_STATIC_CALLBACK(PRBool)
 RuleHash_CSMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr,
                       const void *key)
 {
-  nsIAtom *match_atom = NS_CONST_CAST(nsIAtom*, NS_STATIC_CAST(const nsIAtom*,
-                            key));
+  nsIAtom *match_atom = const_cast<nsIAtom*>(static_cast<const nsIAtom*>
+                                              (key));
   // Use our extra |getKey| callback to avoid code duplication.
   nsIAtom *entry_atom = ToLocalOps(table->ops)->getKey(table, hdr);
 
@@ -193,7 +193,7 @@ PR_STATIC_CALLBACK(nsIAtom*)
 RuleHash_TagTable_GetKey(PLDHashTable *table, const PLDHashEntryHdr *hdr)
 {
   const RuleHashTableEntry *entry =
-    NS_STATIC_CAST(const RuleHashTableEntry*, hdr);
+    static_cast<const RuleHashTableEntry*>(hdr);
   return entry->mRules->mSelector->mTag;
 }
 
@@ -201,7 +201,7 @@ PR_STATIC_CALLBACK(nsIAtom*)
 RuleHash_ClassTable_GetKey(PLDHashTable *table, const PLDHashEntryHdr *hdr)
 {
   const RuleHashTableEntry *entry =
-    NS_STATIC_CAST(const RuleHashTableEntry*, hdr);
+    static_cast<const RuleHashTableEntry*>(hdr);
   return entry->mRules->mSelector->mClassList->mAtom;
 }
 
@@ -209,7 +209,7 @@ PR_STATIC_CALLBACK(nsIAtom*)
 RuleHash_IdTable_GetKey(PLDHashTable *table, const PLDHashEntryHdr *hdr)
 {
   const RuleHashTableEntry *entry =
-    NS_STATIC_CAST(const RuleHashTableEntry*, hdr);
+    static_cast<const RuleHashTableEntry*>(hdr);
   return entry->mRules->mSelector->mIDList->mAtom;
 }
 
@@ -225,7 +225,7 @@ RuleHash_NameSpaceTable_MatchEntry(PLDHashTable *table,
                                    const void *key)
 {
   const RuleHashTableEntry *entry =
-    NS_STATIC_CAST(const RuleHashTableEntry*, hdr);
+    static_cast<const RuleHashTableEntry*>(hdr);
 
   return NS_PTR_TO_INT32(key) ==
          entry->mRules->mSelector->mNameSpace;
@@ -432,7 +432,7 @@ RuleHash::~RuleHash()
 "  Content Nodes: Elements(%u) Pseudo-Elements(%u)\n"
 "  Element Calls: Universal(%u) NameSpace(%u) Tag(%u) Class(%u) Id(%u)\n"
 "  Pseudo-Element Calls: Tag(%u)\n",
-         NS_STATIC_CAST(void*, this),
+         static_cast<void*>(this),
          mUniversalSelectors, mNameSpaceSelectors, mTagSelectors,
            mClassSelectors, mIdSelectors,
          mElementsMatched,
@@ -479,8 +479,8 @@ void RuleHash::PrependRuleToTable(PLDHashTable* aTable, const void* aKey,
                                   RuleValue* aRuleInfo)
 {
   // Get a new or existing entry.
-  RuleHashTableEntry *entry = NS_STATIC_CAST(RuleHashTableEntry*,
-      PL_DHashTableOperate(aTable, aKey, PL_DHASH_ADD));
+  RuleHashTableEntry *entry = static_cast<RuleHashTableEntry*>
+                                         (PL_DHashTableOperate(aTable, aKey, PL_DHASH_ADD));
   if (!entry)
     return;
   entry->mRules = aRuleInfo->Add(mRuleCount++, entry->mRules);
@@ -556,8 +556,8 @@ void RuleHash::EnumerateAllRules(PRInt32 aNameSpace, nsIAtom* aTag,
   }
   // universal rules within the namespace
   if (kNameSpaceID_Unknown != aNameSpace) {
-    RuleHashTableEntry *entry = NS_STATIC_CAST(RuleHashTableEntry*,
-        PL_DHashTableOperate(&mNameSpaceTable, NS_INT32_TO_PTR(aNameSpace),
+    RuleHashTableEntry *entry = static_cast<RuleHashTableEntry*>
+                                           (PL_DHashTableOperate(&mNameSpaceTable, NS_INT32_TO_PTR(aNameSpace),
                              PL_DHASH_LOOKUP));
     if (PL_DHASH_ENTRY_IS_BUSY(entry)) {
       RuleValue *value = entry->mRules;
@@ -566,8 +566,8 @@ void RuleHash::EnumerateAllRules(PRInt32 aNameSpace, nsIAtom* aTag,
     }
   }
   if (nsnull != aTag) {
-    RuleHashTableEntry *entry = NS_STATIC_CAST(RuleHashTableEntry*,
-        PL_DHashTableOperate(&mTagTable, aTag, PL_DHASH_LOOKUP));
+    RuleHashTableEntry *entry = static_cast<RuleHashTableEntry*>
+                                           (PL_DHashTableOperate(&mTagTable, aTag, PL_DHASH_LOOKUP));
     if (PL_DHASH_ENTRY_IS_BUSY(entry)) {
       RuleValue *value = entry->mRules;
       mEnumList[valueCount++] = value;
@@ -575,8 +575,8 @@ void RuleHash::EnumerateAllRules(PRInt32 aNameSpace, nsIAtom* aTag,
     }
   }
   if (nsnull != aID) {
-    RuleHashTableEntry *entry = NS_STATIC_CAST(RuleHashTableEntry*,
-        PL_DHashTableOperate(&mIdTable, aID, PL_DHASH_LOOKUP));
+    RuleHashTableEntry *entry = static_cast<RuleHashTableEntry*>
+                                           (PL_DHashTableOperate(&mIdTable, aID, PL_DHASH_LOOKUP));
     if (PL_DHASH_ENTRY_IS_BUSY(entry)) {
       RuleValue *value = entry->mRules;
       mEnumList[valueCount++] = value;
@@ -585,8 +585,8 @@ void RuleHash::EnumerateAllRules(PRInt32 aNameSpace, nsIAtom* aTag,
   }
   { // extra scope to work around compiler bugs with |for| scoping.
     for (PRInt32 index = 0; index < classCount; ++index) {
-      RuleHashTableEntry *entry = NS_STATIC_CAST(RuleHashTableEntry*,
-        PL_DHashTableOperate(&mClassTable, aClassList->AtomAt(index),
+      RuleHashTableEntry *entry = static_cast<RuleHashTableEntry*>
+                                             (PL_DHashTableOperate(&mClassTable, aClassList->AtomAt(index),
                              PL_DHASH_LOOKUP));
       if (PL_DHASH_ENTRY_IS_BUSY(entry)) {
         RuleValue *value = entry->mRules;
@@ -626,8 +626,8 @@ void RuleHash::EnumerateAllRules(PRInt32 aNameSpace, nsIAtom* aTag,
 
 void RuleHash::EnumerateTagRules(nsIAtom* aTag, RuleEnumFunc aFunc, void* aData)
 {
-  RuleHashTableEntry *entry = NS_STATIC_CAST(RuleHashTableEntry*,
-      PL_DHashTableOperate(&mTagTable, aTag, PL_DHASH_LOOKUP));
+  RuleHashTableEntry *entry = static_cast<RuleHashTableEntry*>
+                                         (PL_DHashTableOperate(&mTagTable, aTag, PL_DHASH_LOOKUP));
 
   RULE_HASH_STAT_INCREMENT(mPseudosMatched);
   if (PL_DHASH_ENTRY_IS_BUSY(entry)) {
@@ -651,7 +651,7 @@ struct AttributeSelectorEntry : public PLDHashEntryHdr {
 PR_STATIC_CALLBACK(void)
 AttributeSelectorClearEntry(PLDHashTable *table, PLDHashEntryHdr *hdr)
 {
-  AttributeSelectorEntry *entry = NS_STATIC_CAST(AttributeSelectorEntry*, hdr);
+  AttributeSelectorEntry *entry = static_cast<AttributeSelectorEntry*>(hdr);
   delete entry->mSelectors;
   memset(entry, 0, table->entrySize);
 }
@@ -702,8 +702,8 @@ struct RuleCascadeData {
 nsVoidArray*
 RuleCascadeData::AttributeListFor(nsIAtom* aAttribute)
 {
-  AttributeSelectorEntry *entry = NS_STATIC_CAST(AttributeSelectorEntry*,
-      PL_DHashTableOperate(&mAttributeSelectors, aAttribute, PL_DHASH_ADD));
+  AttributeSelectorEntry *entry = static_cast<AttributeSelectorEntry*>
+                                             (PL_DHashTableOperate(&mAttributeSelectors, aAttribute, PL_DHASH_ADD));
   if (!entry)
     return nsnull;
   if (!entry->mSelectors) {
@@ -835,8 +835,8 @@ RuleProcessorData::~RuleProcessorData()
     destroyQueue.AppendElement(this);
 
     do {
-      RuleProcessorData *d = NS_STATIC_CAST(RuleProcessorData*,
-        destroyQueue.FastElementAt(destroyQueue.Count() - 1));
+      RuleProcessorData *d = static_cast<RuleProcessorData*>
+                                        (destroyQueue.FastElementAt(destroyQueue.Count() - 1));
       destroyQueue.RemoveElementAt(destroyQueue.Count() - 1);
 
       if (d->mPreviousSiblingData) {
@@ -964,8 +964,8 @@ static PRBool AttrMatchesValue(const nsAttrSelector* aAttrSelector,
   const nsDefaultStringComparator defaultComparator;
   const nsCaseInsensitiveStringComparator ciComparator;
   const nsStringComparator& comparator = aAttrSelector->mCaseSensitive
-                ? NS_STATIC_CAST(const nsStringComparator&, defaultComparator)
-                : NS_STATIC_CAST(const nsStringComparator&, ciComparator);
+                ? static_cast<const nsStringComparator&>(defaultComparator)
+                : static_cast<const nsStringComparator&>(ciComparator);
   switch (aAttrSelector->mFunction) {
     case NS_ATTR_FUNC_EQUALS: 
       return aValue.Equals(aAttrSelector->mValue, comparator);
@@ -1581,10 +1581,10 @@ static void ContentEnumFunc(nsICSSStyleRule* aRule, nsCSSSelector* aSelector,
       // would anything multiply inherit nsIStyleRule anyway?)
 #ifdef DEBUG
       nsCOMPtr<nsIStyleRule> iRule = do_QueryInterface(aRule);
-      NS_ASSERTION(NS_STATIC_CAST(nsIStyleRule*, aRule) == iRule.get(),
+      NS_ASSERTION(static_cast<nsIStyleRule*>(aRule) == iRule.get(),
                    "Please fix QI so this performance optimization is valid");
 #endif
-      data->mRuleWalker->Forward(NS_STATIC_CAST(nsIStyleRule*, aRule));
+      data->mRuleWalker->Forward(static_cast<nsIStyleRule*>(aRule));
       // nsStyleSet will deal with the !important rule
     }
   }
@@ -1646,10 +1646,10 @@ static void PseudoEnumFunc(nsICSSStyleRule* aRule, nsCSSSelector* aSelector,
     // would anything multiply inherit nsIStyleRule anyway?)
 #ifdef DEBUG
     nsCOMPtr<nsIStyleRule> iRule = do_QueryInterface(aRule);
-    NS_ASSERTION(NS_STATIC_CAST(nsIStyleRule*, aRule) == iRule.get(),
+    NS_ASSERTION(static_cast<nsIStyleRule*>(aRule) == iRule.get(),
                  "Please fix QI so this performance optimization is valid");
 #endif
-    data->mRuleWalker->Forward(NS_STATIC_CAST(nsIStyleRule*, aRule));
+    data->mRuleWalker->Forward(static_cast<nsIStyleRule*>(aRule));
     // nsStyleSet will deal with the !important rule
   }
 }
@@ -1686,9 +1686,9 @@ struct StateEnumData {
 
 PR_STATIC_CALLBACK(PRBool) StateEnumFunc(void* aSelector, void* aData)
 {
-  StateEnumData *enumData = NS_STATIC_CAST(StateEnumData*, aData);
+  StateEnumData *enumData = static_cast<StateEnumData*>(aData);
   StateRuleProcessorData *data = enumData->data;
-  nsCSSSelector* selector = NS_STATIC_CAST(nsCSSSelector*, aSelector);
+  nsCSSSelector* selector = static_cast<nsCSSSelector*>(aSelector);
 
   nsReStyleHint possibleChange = IsSiblingOperator(selector->mOperator) ?
     eReStyle_LaterSiblings : eReStyle_Self;
@@ -1740,9 +1740,9 @@ struct AttributeEnumData {
 
 PR_STATIC_CALLBACK(PRBool) AttributeEnumFunc(void* aSelector, void* aData)
 {
-  AttributeEnumData *enumData = NS_STATIC_CAST(AttributeEnumData*, aData);
+  AttributeEnumData *enumData = static_cast<AttributeEnumData*>(aData);
   AttributeRuleProcessorData *data = enumData->data;
-  nsCSSSelector* selector = NS_STATIC_CAST(nsCSSSelector*, aSelector);
+  nsCSSSelector* selector = static_cast<nsCSSSelector*>(aSelector);
 
   nsReStyleHint possibleChange = IsSiblingOperator(selector->mOperator) ?
     eReStyle_LaterSiblings : eReStyle_Self;
@@ -1797,8 +1797,8 @@ nsCSSRuleProcessor::HasAttributeDependentStyle(AttributeRuleProcessorData* aData
       cascade->mClassSelectors.EnumerateForwards(AttributeEnumFunc, &data);
     }
 
-    AttributeSelectorEntry *entry = NS_STATIC_CAST(AttributeSelectorEntry*,
-        PL_DHashTableOperate(&cascade->mAttributeSelectors, aData->mAttribute,
+    AttributeSelectorEntry *entry = static_cast<AttributeSelectorEntry*>
+                                               (PL_DHashTableOperate(&cascade->mAttributeSelectors, aData->mAttribute,
                              PL_DHASH_LOOKUP));
     if (PL_DHASH_ENTRY_IS_BUSY(entry)) {
       entry->mSelectors->EnumerateForwards(AttributeEnumFunc, &data);
@@ -1862,8 +1862,8 @@ PRBool IsStateSelector(nsCSSSelector& aSelector)
 PR_STATIC_CALLBACK(PRBool)
 AddRule(void* aRuleInfo, void* aCascade)
 {
-  RuleValue* ruleInfo = NS_STATIC_CAST(RuleValue*, aRuleInfo);
-  RuleCascadeData *cascade = NS_STATIC_CAST(RuleCascadeData*, aCascade);
+  RuleValue* ruleInfo = static_cast<RuleValue*>(aRuleInfo);
+  RuleCascadeData *cascade = static_cast<RuleCascadeData*>(aCascade);
 
   // Build the rule hash.
   cascade->mRuleHash.PrependRule(ruleInfo);
@@ -1915,7 +1915,7 @@ AddRule(void* aRuleInfo, void* aCascade)
 PR_STATIC_CALLBACK(PRIntn)
 RuleArraysDestroy(nsHashKey *aKey, void *aData, void *aClosure)
 {
-  delete NS_STATIC_CAST(nsAutoVoidArray*, aData);
+  delete static_cast<nsAutoVoidArray*>(aData);
   return PR_TRUE;
 }
 
@@ -1947,7 +1947,7 @@ InsertRuleByWeight(nsICSSRule* aRule, void* aData)
       PRInt32 weight = sel->mWeight;
       nsPRUint32Key key(weight);
       nsAutoVoidArray *rules =
-        NS_STATIC_CAST(nsAutoVoidArray*, data->mRuleArrays.Get(&key));
+        static_cast<nsAutoVoidArray*>(data->mRuleArrays.Get(&key));
       if (!rules) {
         rules = new nsAutoVoidArray();
         if (!rules) return PR_FALSE; // out of memory
@@ -1971,8 +1971,8 @@ InsertRuleByWeight(nsICSSRule* aRule, void* aData)
 static PRBool
 CascadeSheetRulesInto(nsICSSStyleSheet* aSheet, void* aData)
 {
-  nsCSSStyleSheet*  sheet = NS_STATIC_CAST(nsCSSStyleSheet*, aSheet);
-  CascadeEnumData* data = NS_STATIC_CAST(CascadeEnumData*, aData);
+  nsCSSStyleSheet*  sheet = static_cast<nsCSSStyleSheet*>(aSheet);
+  CascadeEnumData* data = static_cast<CascadeEnumData*>(aData);
   PRBool bSheetApplicable = PR_TRUE;
   sheet->GetApplicable(bSheetApplicable);
 
@@ -1998,8 +1998,8 @@ struct RuleArrayData {
 PR_STATIC_CALLBACK(int) CompareArrayData(const void* aArg1, const void* aArg2,
                                          void* closure)
 {
-  const RuleArrayData* arg1 = NS_STATIC_CAST(const RuleArrayData*, aArg1);
-  const RuleArrayData* arg2 = NS_STATIC_CAST(const RuleArrayData*, aArg2);
+  const RuleArrayData* arg1 = static_cast<const RuleArrayData*>(aArg1);
+  const RuleArrayData* arg2 = static_cast<const RuleArrayData*>(aArg2);
   return arg1->mWeight - arg2->mWeight; // put lower weight first
 }
 
@@ -2017,9 +2017,9 @@ struct FillArrayData {
 PR_STATIC_CALLBACK(PRBool)
 FillArray(nsHashKey* aKey, void* aData, void* aClosure)
 {
-  nsPRUint32Key* key = NS_STATIC_CAST(nsPRUint32Key*, aKey);
-  nsVoidArray* weightArray = NS_STATIC_CAST(nsVoidArray*, aData);
-  FillArrayData* data = NS_STATIC_CAST(FillArrayData*, aClosure);
+  nsPRUint32Key* key = static_cast<nsPRUint32Key*>(aKey);
+  nsVoidArray* weightArray = static_cast<nsVoidArray*>(aData);
+  FillArrayData* data = static_cast<FillArrayData*>(aClosure);
 
   RuleArrayData& ruleData = data->mArrayData[data->mIndex++];
   ruleData.mRuleArray = weightArray;
diff --git a/mozilla/layout/style/nsCSSRules.cpp b/mozilla/layout/style/nsCSSRules.cpp
index 0e126ca3a58..843c2d5f311 100644
--- a/mozilla/layout/style/nsCSSRules.cpp
+++ b/mozilla/layout/style/nsCSSRules.cpp
@@ -515,7 +515,7 @@ CSSImportRuleImpl::SetSheet(nsICSSStyleSheet* aSheet)
   nsCOMPtr<nsIDOMMediaList> mediaList;
   rv = sheet->GetMedia(getter_AddRefs(mediaList));
   NS_ENSURE_SUCCESS(rv, rv);
-  mMedia = NS_STATIC_CAST(nsMediaList*, mediaList.get());
+  mMedia = static_cast<nsMediaList*>(mediaList.get());
   
   return NS_OK;
 }
@@ -633,7 +633,7 @@ CloneRuleInto(nsICSSRule* aRule, void* aArray)
   nsICSSRule* clone = nsnull;
   aRule->Clone(clone);
   if (clone) {
-    NS_STATIC_CAST(nsCOMArray<nsICSSRule>*, aArray)->AppendObject(clone);
+    static_cast<nsCOMArray<nsICSSRule>*>(aArray)->AppendObject(clone);
     NS_RELEASE(clone);
   }
   return PR_TRUE;
@@ -642,7 +642,7 @@ CloneRuleInto(nsICSSRule* aRule, void* aArray)
 static PRBool
 SetParentRuleReference(nsICSSRule* aRule, void* aParentRule)
 {
-  nsCSSGroupRule* parentRule = NS_STATIC_CAST(nsCSSGroupRule*, aParentRule);
+  nsCSSGroupRule* parentRule = static_cast<nsCSSGroupRule*>(aParentRule);
   aRule->SetParentRule(parentRule);
   return PR_TRUE;
 }
@@ -651,7 +651,7 @@ nsCSSGroupRule::nsCSSGroupRule(const nsCSSGroupRule& aCopy)
   : nsCSSRule(aCopy)
   , mRuleCollection(nsnull) // lazily constructed
 {
-  NS_CONST_CAST(nsCSSGroupRule&, aCopy).mRules.EnumerateForwards(CloneRuleInto, &mRules);
+  const_cast<nsCSSGroupRule&>(aCopy).mRules.EnumerateForwards(CloneRuleInto, &mRules);
   mRules.EnumerateForwards(SetParentRuleReference, this);
 }
 
@@ -731,7 +731,7 @@ nsCSSGroupRule::GetStyleRuleAt(PRInt32 aIndex, nsICSSRule*& aRule) const
 NS_IMETHODIMP
 nsCSSGroupRule::EnumerateRulesForwards(RuleEnumFunc aFunc, void * aData) const
 {
-  NS_CONST_CAST(nsCSSGroupRule*, this)->mRules.EnumerateForwards(aFunc, aData);
+  const_cast<nsCSSGroupRule*>(this)->mRules.EnumerateForwards(aFunc, aData);
   return NS_OK;
 }
 
diff --git a/mozilla/layout/style/nsCSSStyleRule.cpp b/mozilla/layout/style/nsCSSStyleRule.cpp
index b7fa59565f5..6c2ef9f0372 100644
--- a/mozilla/layout/style/nsCSSStyleRule.cpp
+++ b/mozilla/layout/style/nsCSSStyleRule.cpp
@@ -878,8 +878,8 @@ DOMCSSDeclarationImpl::~DOMCSSDeclarationImpl(void)
 
 inline DOMCSSStyleRuleImpl* DOMCSSDeclarationImpl::DomRule()
 {
-  return NS_REINTERPRET_CAST(DOMCSSStyleRuleImpl*,
-           NS_REINTERPRET_CAST(char*, this) -
+  return reinterpret_cast<DOMCSSStyleRuleImpl*>
+                         (reinterpret_cast<char*>(this) -
            offsetof(DOMCSSStyleRuleImpl, mDOMDeclaration));
 }
 
diff --git a/mozilla/layout/style/nsCSSStyleSheet.cpp b/mozilla/layout/style/nsCSSStyleSheet.cpp
index dccc4d6a678..a2f458ff4f4 100644
--- a/mozilla/layout/style/nsCSSStyleSheet.cpp
+++ b/mozilla/layout/style/nsCSSStyleSheet.cpp
@@ -212,7 +212,7 @@ nsMediaList::SetText(const nsAString& aMediaText)
 
   PRBool htmlMode = PR_FALSE;
   nsCOMPtr<nsIDOMStyleSheet> domSheet =
-    do_QueryInterface(NS_STATIC_CAST(nsICSSStyleSheet*, mStyleSheet));
+    do_QueryInterface(static_cast<nsICSSStyleSheet*>(mStyleSheet));
   if (domSheet) {
     nsCOMPtr<nsIDOMNode> node;
     domSheet->GetOwnerNode(getter_AddRefs(node));
@@ -242,7 +242,7 @@ nsMediaList::SetStyleSheet(nsICSSStyleSheet *aSheet)
 {
   NS_ASSERTION(aSheet == mStyleSheet || !aSheet || !mStyleSheet,
                "multiple style sheets competing for one media list");
-  mStyleSheet = NS_STATIC_CAST(nsCSSStyleSheet*, aSheet);
+  mStyleSheet = static_cast<nsCSSStyleSheet*>(aSheet);
   return NS_OK;
 }
 
@@ -512,7 +512,7 @@ CloneRuleInto(nsICSSRule* aRule, void* aArray)
   nsICSSRule* clone = nsnull;
   aRule->Clone(clone);
   if (clone) {
-    NS_STATIC_CAST(nsCOMArray<nsICSSRule>*, aArray)->AppendObject(clone);
+    static_cast<nsCOMArray<nsICSSRule>*>(aArray)->AppendObject(clone);
     NS_RELEASE(clone);
   }
   return PR_TRUE;
@@ -581,7 +581,7 @@ CreateNameSpace(nsICSSRule* aRule, void* aNameSpacePtr)
   if (nsICSSRule::NAMESPACE_RULE == type) {
     nsICSSNameSpaceRule*  nameSpaceRule = (nsICSSNameSpaceRule*)aRule;
     nsXMLNameSpaceMap *nameSpaceMap =
-      NS_STATIC_CAST(nsXMLNameSpaceMap*, aNameSpacePtr);
+      static_cast<nsXMLNameSpaceMap*>(aNameSpacePtr);
 
     nsIAtom*      prefix = nsnull;
     nsAutoString  urlSpec;
@@ -1223,7 +1223,7 @@ nsCSSStyleSheet::Clone(nsICSSStyleSheet* aCloneParent,
                                                    aCloneDocument,
                                                    aCloneOwningNode);
   if (clone) {
-    *aClone = NS_STATIC_CAST(nsICSSStyleSheet*, clone);
+    *aClone = static_cast<nsICSSStyleSheet*>(clone);
     NS_ADDREF(*aClone);
   }
   return NS_OK;
@@ -1286,7 +1286,7 @@ static PRBool PR_CALLBACK
 EnumClearRuleCascades(void* aProcessor, void* aData)
 {
   nsCSSRuleProcessor* processor =
-    NS_STATIC_CAST(nsCSSRuleProcessor*, aProcessor);
+    static_cast<nsCSSRuleProcessor*>(aProcessor);
   processor->ClearRuleCascades();
   return PR_TRUE;
 }
diff --git a/mozilla/layout/style/nsCSSValue.cpp b/mozilla/layout/style/nsCSSValue.cpp
index e83e11b7476..d840fe2bb87 100644
--- a/mozilla/layout/style/nsCSSValue.cpp
+++ b/mozilla/layout/style/nsCSSValue.cpp
@@ -365,7 +365,7 @@ void nsCSSValue::StartImageLoad(nsIDocument* aDocument) const
                           mValue.mURL->mOriginPrincipal,
                           aDocument);
   if (image) {
-    nsCSSValue* writable = NS_CONST_CAST(nsCSSValue*, this);
+    nsCSSValue* writable = const_cast<nsCSSValue*>(this);
     writable->SetImageValue(image);
   }
 }
@@ -383,7 +383,7 @@ nsCSSValue::BufferFromString(const nsString& aValue)
   PRUnichar length = aValue.Length();
   buffer = nsStringBuffer::Alloc((length + 1) * sizeof(PRUnichar));
   if (NS_LIKELY(buffer != 0)) {
-    PRUnichar* data = NS_STATIC_CAST(PRUnichar*, buffer->Data());
+    PRUnichar* data = static_cast<PRUnichar*>(buffer->Data());
     nsCharTraits<PRUnichar>::copy(data, aValue.get(), length);
     // Null-terminate.
     data[length] = 0;
diff --git a/mozilla/layout/style/nsCSSValue.h b/mozilla/layout/style/nsCSSValue.h
index de795b96395..0a8cdd0631b 100644
--- a/mozilla/layout/style/nsCSSValue.h
+++ b/mozilla/layout/style/nsCSSValue.h
@@ -420,7 +420,7 @@ public:
 
 private:
   static const PRUnichar* GetBufferValue(nsStringBuffer* aBuffer) {
-    return NS_STATIC_CAST(PRUnichar*, aBuffer->Data());
+    return static_cast<PRUnichar*>(aBuffer->Data());
   }
 
 protected:
diff --git a/mozilla/layout/style/nsComputedDOMStyle.cpp b/mozilla/layout/style/nsComputedDOMStyle.cpp
index cf69eae1627..deb52327f14 100644
--- a/mozilla/layout/style/nsComputedDOMStyle.cpp
+++ b/mozilla/layout/style/nsComputedDOMStyle.cpp
@@ -133,7 +133,7 @@ nsComputedDOMStyle::Shutdown()
   // already did that manually in doDestroyComputedDOMStyle(),
   // so cast our cached object to something that doesn't know
   // about our dtor.
-  delete NS_REINTERPRET_CAST(char*, sCachedComputedDOMStyle);
+  delete reinterpret_cast<char*>(sCachedComputedDOMStyle);
   sCachedComputedDOMStyle = nsnull;
 }
 
diff --git a/mozilla/layout/style/nsHTMLStyleSheet.cpp b/mozilla/layout/style/nsHTMLStyleSheet.cpp
index b946a89c932..13d4f29b164 100644
--- a/mozilla/layout/style/nsHTMLStyleSheet.cpp
+++ b/mozilla/layout/style/nsHTMLStyleSheet.cpp
@@ -304,7 +304,7 @@ PR_STATIC_CALLBACK(PLDHashNumber)
 MappedAttrTable_HashKey(PLDHashTable *table, const void *key)
 {
   nsMappedAttributes *attributes =
-    NS_STATIC_CAST(nsMappedAttributes*, NS_CONST_CAST(void*, key));
+    static_cast<nsMappedAttributes*>(const_cast<void*>(key));
 
   return attributes->HashValue();
 }
@@ -312,7 +312,7 @@ MappedAttrTable_HashKey(PLDHashTable *table, const void *key)
 PR_STATIC_CALLBACK(void)
 MappedAttrTable_ClearEntry(PLDHashTable *table, PLDHashEntryHdr *hdr)
 {
-  MappedAttrTableEntry *entry = NS_STATIC_CAST(MappedAttrTableEntry*, hdr);
+  MappedAttrTableEntry *entry = static_cast<MappedAttrTableEntry*>(hdr);
 
   entry->mAttributes->DropStyleSheetReference();
   memset(entry, 0, sizeof(MappedAttrTableEntry));
@@ -323,9 +323,9 @@ MappedAttrTable_MatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr,
                            const void *key)
 {
   nsMappedAttributes *attributes =
-    NS_STATIC_CAST(nsMappedAttributes*, NS_CONST_CAST(void*, key));
+    static_cast<nsMappedAttributes*>(const_cast<void*>(key));
   const MappedAttrTableEntry *entry =
-    NS_STATIC_CAST(const MappedAttrTableEntry*, hdr);
+    static_cast<const MappedAttrTableEntry*>(hdr);
 
   return attributes->Equals(entry->mAttributes);
 }
@@ -801,8 +801,8 @@ nsHTMLStyleSheet::UniqueMappedAttributes(nsMappedAttributes* aMapped)
       return nsnull;
     }
   }
-  MappedAttrTableEntry *entry = NS_STATIC_CAST(MappedAttrTableEntry*,
-    PL_DHashTableOperate(&mMappedAttrTable, aMapped, PL_DHASH_ADD));
+  MappedAttrTableEntry *entry = static_cast<MappedAttrTableEntry*>
+                                           (PL_DHashTableOperate(&mMappedAttrTable, aMapped, PL_DHASH_ADD));
   if (!entry)
     return nsnull;
   if (!entry->mAttributes) {
diff --git a/mozilla/layout/style/nsRuleNode.cpp b/mozilla/layout/style/nsRuleNode.cpp
index 6ce2b578ab3..443de5ed1c4 100644
--- a/mozilla/layout/style/nsRuleNode.cpp
+++ b/mozilla/layout/style/nsRuleNode.cpp
@@ -118,7 +118,7 @@ struct ChildrenHashEntry : public PLDHashEntryHdr {
 nsRuleNode::ChildrenHashHashKey(PLDHashTable *aTable, const void *aKey)
 {
   const nsRuleNode::Key *key =
-    NS_STATIC_CAST(const nsRuleNode::Key*, aKey);
+    static_cast<const nsRuleNode::Key*>(aKey);
   // Disagreement on importance and level for the same rule is extremely
   // rare, so hash just on the rule.
   return PL_DHashVoidPtrKeyStub(aTable, key->mRule);
@@ -130,9 +130,9 @@ nsRuleNode::ChildrenHashMatchEntry(PLDHashTable *aTable,
                                    const void *aKey)
 {
   const ChildrenHashEntry *entry =
-    NS_STATIC_CAST(const ChildrenHashEntry*, aHdr);
+    static_cast<const ChildrenHashEntry*>(aHdr);
   const nsRuleNode::Key *key =
-    NS_STATIC_CAST(const nsRuleNode::Key*, aKey);
+    static_cast<const nsRuleNode::Key*>(aKey);
   return entry->mRuleNode->GetKey() == *key;
 }
 
@@ -442,7 +442,7 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 DeleteRuleNodeChildren(PLDHashTable *table, PLDHashEntryHdr *hdr,
                        PRUint32 number, void *arg)
 {
-  ChildrenHashEntry *entry = NS_STATIC_CAST(ChildrenHashEntry*, hdr);
+  ChildrenHashEntry *entry = static_cast<ChildrenHashEntry*>(hdr);
   entry->mRuleNode->Destroy();
   return PL_DHASH_NEXT;
 }
@@ -482,8 +482,8 @@ nsRuleNode::Transition(nsIStyleRule* aRule, PRUint8 aLevel,
   }
 
   if (ChildrenAreHashed()) {
-    ChildrenHashEntry *entry = NS_STATIC_CAST(ChildrenHashEntry*,
-        PL_DHashTableOperate(ChildrenHash(), &key, PL_DHASH_ADD));
+    ChildrenHashEntry *entry = static_cast<ChildrenHashEntry*>
+                                          (PL_DHashTableOperate(ChildrenHash(), &key, PL_DHASH_ADD));
     if (!entry) {
       return nsnull;
     }
@@ -528,8 +528,8 @@ nsRuleNode::ConvertChildrenToHash()
   for (nsRuleList* curr = ChildrenList(); curr;
        curr = curr->DestroySelf(mPresContext)) {
     // This will never fail because of the initial size we gave the table.
-    ChildrenHashEntry *entry = NS_STATIC_CAST(ChildrenHashEntry*,
-        PL_DHashTableOperate(hash, curr->mRuleNode->mRule, PL_DHASH_ADD));
+    ChildrenHashEntry *entry = static_cast<ChildrenHashEntry*>
+                                          (PL_DHashTableOperate(hash, curr->mRuleNode->mRule, PL_DHASH_ADD));
     NS_ASSERTION(!entry->mRuleNode, "duplicate entries in list");
     entry->mRuleNode = curr->mRuleNode;
   }
@@ -540,7 +540,7 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 ClearStyleDataHelper(PLDHashTable *table, PLDHashEntryHdr *hdr,
                                PRUint32 number, void *arg)
 {
-  ChildrenHashEntry *entry = NS_STATIC_CAST(ChildrenHashEntry*, hdr);
+  ChildrenHashEntry *entry = static_cast<ChildrenHashEntry*>(hdr);
   entry->mRuleNode->ClearStyleData();
   return PL_DHASH_NEXT;
 }
@@ -670,7 +670,7 @@ CheckFontCallback(const nsRuleDataStruct& aData,
                   nsRuleNode::RuleDetail aResult)
 {
   const nsRuleDataFont& fontData =
-      NS_STATIC_CAST(const nsRuleDataFont&, aData);
+      static_cast<const nsRuleDataFont&>(aData);
   if (eCSSUnit_Enumerated == fontData.mFamily.GetUnit()) {
     // A special case. We treat this as a fully specified font,
     // since no other font props are legal with a system font.
@@ -730,7 +730,7 @@ CheckColorCallback(const nsRuleDataStruct& aData,
                    nsRuleNode::RuleDetail aResult)
 {
   const nsRuleDataColor& colorData =
-      NS_STATIC_CAST(const nsRuleDataColor&, aData);
+      static_cast<const nsRuleDataColor&>(aData);
 
   // currentColor values for color require inheritance
   if (colorData.mColor.GetUnit() == eCSSUnit_Integer && 
@@ -932,50 +932,50 @@ static const StructCheckData gCheckProperties[] = {
 inline const nsCSSValue&
 ValueAtOffset(const nsRuleDataStruct& aRuleDataStruct, size_t aOffset)
 {
-  return * NS_REINTERPRET_CAST(const nsCSSValue*,
-                     NS_REINTERPRET_CAST(const char*, &aRuleDataStruct) + aOffset);
+  return * reinterpret_cast<const nsCSSValue*>
+                           (reinterpret_cast<const char*>(&aRuleDataStruct) + aOffset);
 }
 
 inline const nsCSSRect*
 RectAtOffset(const nsRuleDataStruct& aRuleDataStruct, size_t aOffset)
 {
-  return NS_REINTERPRET_CAST(const nsCSSRect*,
-                     NS_REINTERPRET_CAST(const char*, &aRuleDataStruct) + aOffset);
+  return reinterpret_cast<const nsCSSRect*>
+                         (reinterpret_cast<const char*>(&aRuleDataStruct) + aOffset);
 }
 
 inline const nsCSSValuePair*
 ValuePairAtOffset(const nsRuleDataStruct& aRuleDataStruct, size_t aOffset)
 {
-  return NS_REINTERPRET_CAST(const nsCSSValuePair*,
-                     NS_REINTERPRET_CAST(const char*, &aRuleDataStruct) + aOffset);
+  return reinterpret_cast<const nsCSSValuePair*>
+                         (reinterpret_cast<const char*>(&aRuleDataStruct) + aOffset);
 }
 
 inline const nsCSSValueList*
 ValueListAtOffset(const nsRuleDataStruct& aRuleDataStruct, size_t aOffset)
 {
-  return * NS_REINTERPRET_CAST(const nsCSSValueList*const*,
-                     NS_REINTERPRET_CAST(const char*, &aRuleDataStruct) + aOffset);
+  return * reinterpret_cast<const nsCSSValueList*const*>
+                           (reinterpret_cast<const char*>(&aRuleDataStruct) + aOffset);
 }
 
 inline const nsCSSValueList**
 ValueListArrayAtOffset(const nsRuleDataStruct& aRuleDataStruct, size_t aOffset)
 {
-  return * NS_REINTERPRET_CAST(const nsCSSValueList**const*,
-                     NS_REINTERPRET_CAST(const char*, &aRuleDataStruct) + aOffset);
+  return * reinterpret_cast<const nsCSSValueList**const*>
+                           (reinterpret_cast<const char*>(&aRuleDataStruct) + aOffset);
 }
 
 inline const nsCSSCounterData*
 CounterDataAtOffset(const nsRuleDataStruct& aRuleDataStruct, size_t aOffset)
 {
-  return * NS_REINTERPRET_CAST(const nsCSSCounterData*const*,
-                     NS_REINTERPRET_CAST(const char*, &aRuleDataStruct) + aOffset);
+  return * reinterpret_cast<const nsCSSCounterData*const*>
+                           (reinterpret_cast<const char*>(&aRuleDataStruct) + aOffset);
 }
 
 inline const nsCSSQuotes*
 QuotesAtOffset(const nsRuleDataStruct& aRuleDataStruct, size_t aOffset)
 {
-  return * NS_REINTERPRET_CAST(const nsCSSQuotes*const*,
-                     NS_REINTERPRET_CAST(const char*, &aRuleDataStruct) + aOffset);
+  return * reinterpret_cast<const nsCSSQuotes*const*>
+                           (reinterpret_cast<const char*>(&aRuleDataStruct) + aOffset);
 }
 
 inline nsRuleNode::RuleDetail
@@ -1460,7 +1460,7 @@ nsRuleNode::WalkRuleTree(const nsStyleStructID aSID,
       // should be walked to find the data.
       const nsStyleStruct* parentStruct = parentContext->GetStyleData(aSID);
       aContext->AddStyleBit(bit); // makes const_cast OK.
-      aContext->SetStyle(aSID, NS_CONST_CAST(nsStyleStruct*, parentStruct));
+      aContext->SetStyle(aSID, const_cast<nsStyleStruct*>(parentStruct));
       return parentStruct;
     }
     else
@@ -1763,7 +1763,7 @@ nsRuleNode::AdjustLogicalBoxProp(nsStyleContext* aContext,
   nsStyleContext* parentContext = aContext->GetParent();                      \
                                                                               \
   const nsRuleData##rdtype_& rdata_ =                                         \
-    NS_STATIC_CAST(const nsRuleData##rdtype_&, aData);                        \
+    static_cast<const nsRuleData##rdtype_&>(aData);                        \
   nsStyle##type_* data_ = nsnull;                                             \
   const nsStyle##type_* parentdata_ = nsnull;                                 \
   PRBool inherited = aInherited;                                              \
@@ -1774,7 +1774,7 @@ nsRuleNode::AdjustLogicalBoxProp(nsStyleContext* aContext,
     /* We only need to compute the delta between this computed data and */    \
     /* our computed data. */                                                  \
     data_ = new (mPresContext)                                                \
-            nsStyle##type_(*NS_STATIC_CAST(nsStyle##type_*, aStartStruct));   \
+            nsStyle##type_(*static_cast<nsStyle##type_*>(aStartStruct));   \
   else {                                                                      \
     /* XXXldb What about eRuleFullInherited?  Which path is faster? */        \
     if (aRuleDetail != eRuleFullMixed && aRuleDetail != eRuleFullReset) {     \
@@ -1811,13 +1811,13 @@ nsRuleNode::AdjustLogicalBoxProp(nsStyleContext* aContext,
   nsStyleContext* parentContext = aContext->GetParent();                      \
                                                                               \
   const nsRuleData##rdtype_& rdata_ =                                         \
-    NS_STATIC_CAST(const nsRuleData##rdtype_&, aData);                        \
+    static_cast<const nsRuleData##rdtype_&>(aData);                        \
   nsStyle##type_* data_;                                                      \
   if (aStartStruct)                                                           \
     /* We only need to compute the delta between this computed data and */    \
     /* our computed data. */                                                  \
     data_ = new (mPresContext)                                                \
-            nsStyle##type_(*NS_STATIC_CAST(nsStyle##type_*, aStartStruct));   \
+            nsStyle##type_(*static_cast<nsStyle##type_*>(aStartStruct));   \
   else                                                                        \
     data_ = new (mPresContext) nsStyle##type_ ctorargs_;                      \
                                                                               \
@@ -2260,7 +2260,7 @@ nsRuleNode::SetGenericFont(nsPresContext* aPresContext,
 static PRBool ExtractGeneric(const nsString& aFamily, PRBool aGeneric,
                              void *aData)
 {
-  nsAutoString *data = NS_STATIC_CAST(nsAutoString*, aData);
+  nsAutoString *data = static_cast<nsAutoString*>(aData);
 
   if (aGeneric) {
     *data = aFamily;
@@ -4644,14 +4644,14 @@ nsRuleNode::GetStyle##name_(nsStyleContext* aContext, PRBool aComputeData)    \
     return nsnull;                                                            \
                                                                               \
   data =                                                                      \
-    NS_STATIC_CAST(const nsStyle##name_ *, Get##name_##Data(aContext));       \
+    static_cast<const nsStyle##name_ *>(Get##name_##Data(aContext));       \
                                                                               \
   if (NS_LIKELY(data != nsnull))                                              \
     return data;                                                              \
                                                                               \
   NS_NOTREACHED("could not create style struct");                             \
   return                                                                      \
-    NS_STATIC_CAST(const nsStyle##name_ *,                                    \
+    static_cast<const nsStyle##name_ *>(\
                    mPresContext->PresShell()->StyleSet()->                    \
                      DefaultStyleData()->GetStyleData(eStyleStruct_##name_)); \
 }
@@ -4671,7 +4671,7 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 SweepRuleNodeChildren(PLDHashTable *table, PLDHashEntryHdr *hdr,
                       PRUint32 number, void *arg)
 {
-  ChildrenHashEntry *entry = NS_STATIC_CAST(ChildrenHashEntry*, hdr);
+  ChildrenHashEntry *entry = static_cast<ChildrenHashEntry*>(hdr);
   if (entry->mRuleNode->Sweep())
     return PL_DHASH_REMOVE; // implies NEXT, unless |ed with STOP
   return PL_DHASH_NEXT;
diff --git a/mozilla/layout/style/nsRuleNode.h b/mozilla/layout/style/nsRuleNode.h
index cf4472a6f05..a9aa6ac560f 100644
--- a/mozilla/layout/style/nsRuleNode.h
+++ b/mozilla/layout/style/nsRuleNode.h
@@ -208,17 +208,17 @@ struct nsCachedStyleData
     const StyleStructInfo& info = gInfo[aSID];
 
     // Get either &mInheritedData or &mResetData.
-    char* resetOrInheritSlot = NS_REINTERPRET_CAST(char*, this) + info.mCachedStyleDataOffset;
+    char* resetOrInheritSlot = reinterpret_cast<char*>(this) + info.mCachedStyleDataOffset;
 
     // Get either mInheritedData or mResetData.
-    char* resetOrInherit = NS_REINTERPRET_CAST(char*, *NS_REINTERPRET_CAST(void**, resetOrInheritSlot));
+    char* resetOrInherit = reinterpret_cast<char*>(*reinterpret_cast<void**>(resetOrInheritSlot));
 
     nsStyleStruct* data = nsnull;
     if (resetOrInherit) {
       // If we have the mInheritedData or mResetData, then we might have
       // the struct, so get it.
       char* dataSlot = resetOrInherit + info.mInheritResetOffset;
-      data = *NS_REINTERPRET_CAST(nsStyleStruct**, dataSlot);
+      data = *reinterpret_cast<nsStyleStruct**>(dataSlot);
     }
     return data;
   }
@@ -394,10 +394,10 @@ private:
     return (PRWord(mChildrenTaggedPtr) & kTypeMask) == kHashType;
   }
   nsRuleList* ChildrenList() {
-    return NS_REINTERPRET_CAST(nsRuleList*, mChildrenTaggedPtr);
+    return reinterpret_cast<nsRuleList*>(mChildrenTaggedPtr);
   }
   nsRuleList** ChildrenListPtr() {
-    return NS_REINTERPRET_CAST(nsRuleList**, &mChildrenTaggedPtr);
+    return reinterpret_cast<nsRuleList**>(&mChildrenTaggedPtr);
   }
   PLDHashTable* ChildrenHash() {
     return (PLDHashTable*) (PRWord(mChildrenTaggedPtr) & ~PRWord(kTypeMask));
diff --git a/mozilla/layout/style/nsStyleContext.cpp b/mozilla/layout/style/nsStyleContext.cpp
index e60ce7d0705..17968642245 100644
--- a/mozilla/layout/style/nsStyleContext.cpp
+++ b/mozilla/layout/style/nsStyleContext.cpp
@@ -259,7 +259,7 @@ nsStyleContext::GetUniqueStyleData(const nsStyleStructID& aSID)
   if (!mChild && !mEmptyChild &&
       !(mBits & nsCachedStyleData::GetBitForSID(aSID)) &&
       mCachedStyleData.GetStyleData(aSID))
-    return NS_CONST_CAST(nsStyleStruct*, current);
+    return const_cast<nsStyleStruct*>(current);
 
   nsStyleStruct* result;
   nsPresContext *presContext = PresContext();
@@ -268,7 +268,7 @@ nsStyleContext::GetUniqueStyleData(const nsStyleStructID& aSID)
 #define UNIQUE_CASE(c_)                                                       \
   case eStyleStruct_##c_:                                                     \
     result = new (presContext) nsStyle##c_(                                   \
-      * NS_STATIC_CAST(const nsStyle##c_ *, current));                        \
+      * static_cast<const nsStyle##c_ *>(current));                        \
     break;
 
   UNIQUE_CASE(Display)
@@ -286,7 +286,7 @@ nsStyleContext::GetUniqueStyleData(const nsStyleStructID& aSID)
   if (!result) {
     NS_WARNING("Ran out of memory while trying to allocate memory for a unique nsStyleStruct! "
                "Returning the non-unique data.");
-    return NS_CONST_CAST(nsStyleStruct*, current);
+    return const_cast<nsStyleStruct*>(current);
   }
 
   SetStyle(aSID, result);
@@ -309,24 +309,24 @@ nsStyleContext::SetStyle(nsStyleStructID aSID, nsStyleStruct* aStruct)
 
   const nsCachedStyleData::StyleStructInfo& info =
       nsCachedStyleData::gInfo[aSID];
-  char* resetOrInheritSlot = NS_REINTERPRET_CAST(char*, &mCachedStyleData) +
+  char* resetOrInheritSlot = reinterpret_cast<char*>(&mCachedStyleData) +
                              info.mCachedStyleDataOffset;
-  char* resetOrInherit = NS_REINTERPRET_CAST(char*,
-      *NS_REINTERPRET_CAST(void**, resetOrInheritSlot));
+  char* resetOrInherit = reinterpret_cast<char*>
+                                         (*reinterpret_cast<void**>(resetOrInheritSlot));
   if (!resetOrInherit) {
     nsPresContext *presContext = mRuleNode->GetPresContext();
     if (mCachedStyleData.IsReset(aSID)) {
       mCachedStyleData.mResetData = new (presContext) nsResetStyleData;
-      resetOrInherit = NS_REINTERPRET_CAST(char*, mCachedStyleData.mResetData);
+      resetOrInherit = reinterpret_cast<char*>(mCachedStyleData.mResetData);
     } else {
       mCachedStyleData.mInheritedData =
           new (presContext) nsInheritedStyleData;
       resetOrInherit =
-          NS_REINTERPRET_CAST(char*, mCachedStyleData.mInheritedData);
+          reinterpret_cast<char*>(mCachedStyleData.mInheritedData);
     }
   }
   char* dataSlot = resetOrInherit + info.mInheritResetOffset;
-  *NS_REINTERPRET_CAST(nsStyleStruct**, dataSlot) = aStruct;
+  *reinterpret_cast<nsStyleStruct**>(dataSlot) = aStruct;
 }
 
 void
@@ -371,8 +371,8 @@ nsStyleContext::ApplyStyleFixups(nsPresContext* aPresContext)
     if (disp->mDisplay != NS_STYLE_DISPLAY_NONE &&
         disp->mDisplay != NS_STYLE_DISPLAY_BLOCK &&
         disp->mDisplay != NS_STYLE_DISPLAY_TABLE) {
-      nsStyleDisplay *mutable_display = NS_STATIC_CAST(nsStyleDisplay*,
-        GetUniqueStyleData(eStyleStruct_Display));
+      nsStyleDisplay *mutable_display = static_cast<nsStyleDisplay*>
+                                                   (GetUniqueStyleData(eStyleStruct_Display));
       if (mutable_display->mDisplay == NS_STYLE_DISPLAY_INLINE_TABLE)
         mutable_display->mDisplay = NS_STYLE_DISPLAY_TABLE;
       else
@@ -437,7 +437,7 @@ nsStyleContext::CalcStyleDifference(nsStyleContext* aOther)
     NS_ASSERTION(NS_IsHintSubset(nsStyle##struct_::MaxDifference(), maxHint), \
                  "Struct placed in the wrong maxHint section");               \
     const nsStyle##struct_* this##struct_ =                                   \
-        NS_STATIC_CAST(const nsStyle##struct_*,                               \
+        static_cast<const nsStyle##struct_*>(\
                        PeekStyleData(eStyleStruct_##struct_));                \
     if (this##struct_) {                                                      \
       const nsStyle##struct_* other##struct_ = aOther->GetStyle##struct_();   \
diff --git a/mozilla/layout/style/nsStyleSet.cpp b/mozilla/layout/style/nsStyleSet.cpp
index a806a140bc3..7f4c1c4a2b7 100644
--- a/mozilla/layout/style/nsStyleSet.cpp
+++ b/mozilla/layout/style/nsStyleSet.cpp
@@ -305,7 +305,7 @@ nsStyleSet::EnableQuirkStyleSheet(PRBool aEnable)
       nsIStyleSheet *sheet = mSheets[eAgentSheet].ObjectAt(i);
       NS_ASSERTION(sheet, "mAgentSheets should not contain null sheets");
 
-      nsICSSStyleSheet *cssSheet = NS_STATIC_CAST(nsICSSStyleSheet*, sheet);
+      nsICSSStyleSheet *cssSheet = static_cast<nsICSSStyleSheet*>(sheet);
       NS_ASSERTION(nsCOMPtr<nsICSSStyleSheet>(do_QueryInterface(sheet)) == cssSheet,
                    "Agent sheet must be a CSSStyleSheet");
 
@@ -340,7 +340,7 @@ static PRBool
 EnumRulesMatching(nsIStyleRuleProcessor* aProcessor, void* aData)
 {
   ElementRuleProcessorData* data =
-    NS_STATIC_CAST(ElementRuleProcessorData*, aData);
+    static_cast<ElementRuleProcessorData*>(aData);
 
   aProcessor->RulesMatching(data);
   return PR_TRUE;
@@ -644,7 +644,7 @@ static PRBool
 EnumPseudoRulesMatching(nsIStyleRuleProcessor* aProcessor, void* aData)
 {
   PseudoRuleProcessorData* data =
-    NS_STATIC_CAST(PseudoRuleProcessorData*, aData);
+    static_cast<PseudoRuleProcessorData*>(aData);
 
   aProcessor->RulesMatching(data);
   return PR_TRUE;
@@ -798,7 +798,7 @@ nsStyleSet::NotifyStyleContextDestroyed(nsPresContext* aPresContext,
     // undisplayed map and "additional style contexts" since they are
     // descendants of the root.
     for (PRInt32 i = mRoots.Count() - 1; i >= 0; --i) {
-      NS_STATIC_CAST(nsStyleContext*,mRoots[i])->Mark();
+      static_cast<nsStyleContext*>(mRoots[i])->Mark();
     }
 
     // Sweep the rule tree.
@@ -817,7 +817,7 @@ nsStyleSet::ClearStyleData(nsPresContext* aPresContext)
   mRuleTree->ClearStyleData();
 
   for (PRInt32 i = mRoots.Count() - 1; i >= 0; --i) {
-    NS_STATIC_CAST(nsStyleContext*,mRoots[i])->ClearStyleData(aPresContext);
+    static_cast<nsStyleContext*>(mRoots[i])->ClearStyleData(aPresContext);
   }
 }
 
diff --git a/mozilla/layout/svg/base/src/nsSVGAFrame.cpp b/mozilla/layout/svg/base/src/nsSVGAFrame.cpp
index 3289edb3a51..6608aa53ebb 100755
--- a/mozilla/layout/svg/base/src/nsSVGAFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGAFrame.cpp
@@ -182,14 +182,14 @@ nsSVGAFrame::GetCanvasTM()
   if (!mCanvasTM) {
     // get our parent's tm and append local transforms (if any):
     NS_ASSERTION(mParent, "null parent");
-    nsSVGContainerFrame *containerFrame = NS_STATIC_CAST(nsSVGContainerFrame*,
-                                                         mParent);
+    nsSVGContainerFrame *containerFrame = static_cast<nsSVGContainerFrame*>
+                                                     (mParent);
     nsCOMPtr<nsIDOMSVGMatrix> parentTM = containerFrame->GetCanvasTM();
     NS_ASSERTION(parentTM, "null TM");
 
     // got the parent tm, now check for local tm:
     nsSVGGraphicElement *element =
-      NS_STATIC_CAST(nsSVGGraphicElement*, mContent);
+      static_cast<nsSVGGraphicElement*>(mContent);
     nsCOMPtr<nsIDOMSVGMatrix> localTM = element->GetLocalTransformMatrix();
 
     if (localTM)
diff --git a/mozilla/layout/svg/base/src/nsSVGClipPathFrame.cpp b/mozilla/layout/svg/base/src/nsSVGClipPathFrame.cpp
index 2ac27a03792..90c954fde56 100644
--- a/mozilla/layout/svg/base/src/nsSVGClipPathFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGClipPathFrame.cpp
@@ -198,8 +198,8 @@ nsSVGClipPathFrame::GetCanvasTM()
 {
   NS_ASSERTION(mClipParentMatrix, "null parent matrix");
 
-  nsSVGClipPathElement *clipPath = NS_STATIC_CAST(nsSVGClipPathElement*,
-                                                  mContent);
+  nsSVGClipPathElement *clipPath = static_cast<nsSVGClipPathElement*>
+                                              (mContent);
 
   nsCOMPtr<nsIDOMSVGMatrix> localTM = clipPath->GetLocalTransformMatrix();
 
diff --git a/mozilla/layout/svg/base/src/nsSVGFilterFrame.cpp b/mozilla/layout/svg/base/src/nsSVGFilterFrame.cpp
index aeacd026125..08f59f9e841 100644
--- a/mozilla/layout/svg/base/src/nsSVGFilterFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGFilterFrame.cpp
@@ -136,12 +136,12 @@ nsSVGFilterFrame::FilterPaint(nsSVGRenderState *aContext,
 
   nsCOMPtr<nsIDOMSVGMatrix> ctm = nsSVGUtils::GetCanvasTM(frame);
 
-  nsSVGElement *target = NS_STATIC_CAST(nsSVGElement*, frame->GetContent());
+  nsSVGElement *target = static_cast<nsSVGElement*>(frame->GetContent());
 
   aTarget->SetMatrixPropagation(PR_FALSE);
   aTarget->NotifyCanvasTMChanged(PR_TRUE);
 
-  nsSVGFilterElement *filter = NS_STATIC_CAST(nsSVGFilterElement*, mContent);
+  nsSVGFilterElement *filter = static_cast<nsSVGFilterElement*>(mContent);
 
   float x, y, width, height;
   nsCOMPtr<nsIDOMSVGRect> bbox;
@@ -318,14 +318,14 @@ nsRect
 nsSVGFilterFrame::GetInvalidationRegion(nsIFrame *aTarget)
 {
   nsSVGElement *targetContent =
-    NS_STATIC_CAST(nsSVGElement*, aTarget->GetContent());
+    static_cast<nsSVGElement*>(aTarget->GetContent());
   nsISVGChildFrame *svg;
 
   nsCOMPtr<nsIDOMSVGMatrix> ctm = nsSVGUtils::GetCanvasTM(aTarget);
 
   CallQueryInterface(aTarget, &svg);
 
-  nsSVGFilterElement *filter = NS_STATIC_CAST(nsSVGFilterElement*, mContent);
+  nsSVGFilterElement *filter = static_cast<nsSVGFilterElement*>(mContent);
 
   nsCOMPtr<nsIDOMSVGAnimatedEnumeration> units;
   filter->GetFilterUnits(getter_AddRefs(units));
@@ -440,7 +440,7 @@ nsSVGFilterInstance::GetFilterSubregion(
   nsRect defaultRegion,
   nsRect *result)
 {
-  nsSVGFE *fE = NS_STATIC_CAST(nsSVGFE*, aFilter);
+  nsSVGFE *fE = static_cast<nsSVGFE*>(aFilter);
   nsSVGLength2 *tmpX, *tmpY, *tmpWidth, *tmpHeight;
 
   tmpX = &fE->mLengthAttributes[nsSVGFE::X];
diff --git a/mozilla/layout/svg/base/src/nsSVGForeignObjectFrame.cpp b/mozilla/layout/svg/base/src/nsSVGForeignObjectFrame.cpp
index cf384b8ef97..c92034f3d8f 100644
--- a/mozilla/layout/svg/base/src/nsSVGForeignObjectFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGForeignObjectFrame.cpp
@@ -267,7 +267,7 @@ nsSVGForeignObjectFrame::PaintSVG(nsSVGRenderState *aContext,
 
   if (GetStyleDisplay()->IsScrollableOverflow()) {
     float x, y, width, height;
-    NS_STATIC_CAST(nsSVGElement*, mContent)->
+    static_cast<nsSVGElement*>(mContent)->
       GetAnimatedLengthValues(&x, &y, &width, &height, nsnull);
 
     // tm already includes the x,y offset
@@ -349,7 +349,7 @@ nsSVGForeignObjectFrame::UpdateCoveredRegion()
     return NS_ERROR_FAILURE;
 
   float x, y, w, h;
-  NS_STATIC_CAST(nsSVGForeignObjectElement*, mContent)->
+  static_cast<nsSVGForeignObjectElement*>(mContent)->
     GetAnimatedLengthValues(&x, &y, &w, &h, nsnull);
 
   // If mRect's width or height are negative, reflow blows up! We must clamp!
@@ -434,7 +434,7 @@ nsSVGForeignObjectFrame::GetBBox(nsIDOMSVGRect **_retval)
   }
 
   float x, y, w, h;
-  NS_STATIC_CAST(nsSVGForeignObjectElement*, mContent)->
+  static_cast<nsSVGForeignObjectElement*>(mContent)->
     GetAnimatedLengthValues(&x, &y, &w, &h, nsnull);
 
   if (w < 0.0f) w = 0.0f;
@@ -453,7 +453,7 @@ nsSVGForeignObjectFrame::GetTMIncludingOffset()
     return nsnull;
 
   nsSVGForeignObjectElement *fO =
-    NS_STATIC_CAST(nsSVGForeignObjectElement*, mContent);
+    static_cast<nsSVGForeignObjectElement*>(mContent);
   float x, y;
   fO->GetAnimatedLengthValues(&x, &y, nsnull);
   nsIDOMSVGMatrix* matrix;
@@ -478,14 +478,14 @@ nsSVGForeignObjectFrame::GetCanvasTM()
   if (!mCanvasTM) {
     // get our parent's tm and append local transforms (if any):
     NS_ASSERTION(mParent, "null parent");
-    nsSVGContainerFrame *containerFrame = NS_STATIC_CAST(nsSVGContainerFrame*,
-                                                         mParent);
+    nsSVGContainerFrame *containerFrame = static_cast<nsSVGContainerFrame*>
+                                                     (mParent);
     nsCOMPtr<nsIDOMSVGMatrix> parentTM = containerFrame->GetCanvasTM();
     NS_ASSERTION(parentTM, "null TM");
 
     // got the parent tm, now check for local tm:
     nsSVGGraphicElement *element =
-      NS_STATIC_CAST(nsSVGGraphicElement*, mContent);
+      static_cast<nsSVGGraphicElement*>(mContent);
     nsCOMPtr<nsIDOMSVGMatrix> localTM = element->GetLocalTransformMatrix();
     
     if (localTM)
@@ -580,8 +580,8 @@ nsSVGForeignObjectFrame::DoReflow()
   if (!renderingContext)
     return;
 
-  nsSVGForeignObjectElement *fO = NS_STATIC_CAST(nsSVGForeignObjectElement*,
-                                                 mContent);
+  nsSVGForeignObjectElement *fO = static_cast<nsSVGForeignObjectElement*>
+                                             (mContent);
 
   float width =
     fO->mLengthAttributes[nsSVGForeignObjectElement::WIDTH].GetAnimValue(fO);
diff --git a/mozilla/layout/svg/base/src/nsSVGGFrame.cpp b/mozilla/layout/svg/base/src/nsSVGGFrame.cpp
index 018ddc621eb..970a3bff2df 100644
--- a/mozilla/layout/svg/base/src/nsSVGGFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGGFrame.cpp
@@ -111,14 +111,14 @@ nsSVGGFrame::GetCanvasTM()
   if (!mCanvasTM) {
     // get our parent's tm and append local transforms (if any):
     NS_ASSERTION(mParent, "null parent");
-    nsSVGContainerFrame *containerFrame = NS_STATIC_CAST(nsSVGContainerFrame*,
-                                                         mParent);
+    nsSVGContainerFrame *containerFrame = static_cast<nsSVGContainerFrame*>
+                                                     (mParent);
     nsCOMPtr<nsIDOMSVGMatrix> parentTM = containerFrame->GetCanvasTM();
     NS_ASSERTION(parentTM, "null TM");
 
     // got the parent tm, now check for local tm:
     nsSVGGraphicElement *element =
-      NS_STATIC_CAST(nsSVGGraphicElement*, mContent);
+      static_cast<nsSVGGraphicElement*>(mContent);
     nsCOMPtr<nsIDOMSVGMatrix> localTM = element->GetLocalTransformMatrix();
 
     if (localTM)
diff --git a/mozilla/layout/svg/base/src/nsSVGGenericContainerFrame.cpp b/mozilla/layout/svg/base/src/nsSVGGenericContainerFrame.cpp
index fed16aebd0e..8c85706c88a 100644
--- a/mozilla/layout/svg/base/src/nsSVGGenericContainerFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGGenericContainerFrame.cpp
@@ -80,8 +80,8 @@ nsSVGGenericContainerFrame::GetCanvasTM()
 {
   NS_ASSERTION(mParent, "null parent");
   
-  nsSVGContainerFrame *containerFrame = NS_STATIC_CAST(nsSVGContainerFrame*,
-                                                       mParent);
+  nsSVGContainerFrame *containerFrame = static_cast<nsSVGContainerFrame*>
+                                                   (mParent);
 
   return containerFrame->GetCanvasTM();  
 }
diff --git a/mozilla/layout/svg/base/src/nsSVGGeometryFrame.cpp b/mozilla/layout/svg/base/src/nsSVGGeometryFrame.cpp
index 5b25166f2ea..9d7090169c9 100644
--- a/mozilla/layout/svg/base/src/nsSVGGeometryFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGGeometryFrame.cpp
@@ -100,7 +100,7 @@ nsSVGGeometryFrame::GetPaintServer(const nsStyleSVGPaint *aPaint)
     return nsnull;
 
   nsSVGPaintServerFrame *server =
-    NS_STATIC_CAST(nsSVGPaintServerFrame*, result);
+    static_cast<nsSVGPaintServerFrame*>(result);
 
   server->AddObserver(this);
   return server;
@@ -163,7 +163,7 @@ nsSVGGeometryFrame::DidModifySVGObservable(nsISVGValue* observable,
     return NS_OK;
 
   if (GetStateBits() & NS_STATE_SVG_FILL_PSERVER) {
-    nsIFrame *ps = NS_STATIC_CAST(nsIFrame*, GetProperty(nsGkAtoms::fill));
+    nsIFrame *ps = static_cast<nsIFrame*>(GetProperty(nsGkAtoms::fill));
     if (frame == ps) {
       if (aModType == nsISVGValue::mod_die) {
         DeleteProperty(nsGkAtoms::fill);
@@ -174,7 +174,7 @@ nsSVGGeometryFrame::DidModifySVGObservable(nsISVGValue* observable,
   }
 
   if (GetStateBits() & NS_STATE_SVG_STROKE_PSERVER) {
-    nsIFrame *ps = NS_STATIC_CAST(nsIFrame*, GetProperty(nsGkAtoms::stroke));
+    nsIFrame *ps = static_cast<nsIFrame*>(GetProperty(nsGkAtoms::stroke));
     if (frame == ps) {
       if (aModType == nsISVGValue::mod_die) {
         DeleteProperty(nsGkAtoms::stroke);
@@ -193,8 +193,8 @@ nsSVGGeometryFrame::DidModifySVGObservable(nsISVGValue* observable,
 float
 nsSVGGeometryFrame::GetStrokeWidth()
 {
-  nsSVGElement *ctx = NS_STATIC_CAST(nsSVGElement*,
-                                     GetType() == nsGkAtoms::svgGlyphFrame ?
+  nsSVGElement *ctx = static_cast<nsSVGElement*>
+                                 (GetType() == nsGkAtoms::svgGlyphFrame ?
                                      mContent->GetParent() : mContent);
 
   return
@@ -222,7 +222,7 @@ nsSVGGeometryFrame::GetStrokeDashArray(gfxFloat **aDashes, PRUint32 *aCount)
       for (PRUint32 i = 0; i < count; i++) {
         dashes[i] =
           nsSVGUtils::CoordToFloat(presContext,
-                                   NS_STATIC_CAST(nsSVGElement*, mContent),
+                                   static_cast<nsSVGElement*>(mContent),
                                    dasharray[i]);
         if (dashes[i] < 0.0f) {
           delete [] dashes;
@@ -251,7 +251,7 @@ nsSVGGeometryFrame::GetStrokeDashoffset()
 {
   return
     nsSVGUtils::CoordToFloat(PresContext(),
-                             NS_STATIC_CAST(nsSVGElement*, mContent),
+                             static_cast<nsSVGElement*>(mContent),
                              GetStyleSVG()->mStrokeDashoffset);
 }
 
@@ -265,8 +265,8 @@ static void
 PServerPropertyDtor(void *aObject, nsIAtom *aPropertyName,
                     void *aPropertyValue, void *aData)
 {
-  nsIFrame *ps = NS_STATIC_CAST(nsIFrame*, aPropertyValue);
-  nsSVGUtils::RemoveObserver(NS_STATIC_CAST(nsIFrame*, aObject), ps);
+  nsIFrame *ps = static_cast<nsIFrame*>(aPropertyValue);
+  nsSVGUtils::RemoveObserver(static_cast<nsIFrame*>(aObject), ps);
 }
 
 PRBool
@@ -360,8 +360,8 @@ nsSVGGeometryFrame::SetupCairoFill(gfxContext *aContext,
   float opacity = MaybeOptimizeOpacity(GetStyleSVG()->mFillOpacity);
 
   if (GetStateBits() & NS_STATE_SVG_FILL_PSERVER) {
-    nsSVGPaintServerFrame *ps = NS_STATIC_CAST(nsSVGPaintServerFrame*,
-                                               GetProperty(nsGkAtoms::fill));
+    nsSVGPaintServerFrame *ps = static_cast<nsSVGPaintServerFrame*>
+                                           (GetProperty(nsGkAtoms::fill));
     return ps->SetupPaintServer(aContext, this, opacity, aClosure);
   } else if (GetStyleSVG()->mFill.mType == eStyleSVGPaintType_Server) {
     SetupCairoColor(aContext,
@@ -430,8 +430,8 @@ nsSVGGeometryFrame::SetupCairoStroke(gfxContext *aContext,
   float opacity = MaybeOptimizeOpacity(GetStyleSVG()->mStrokeOpacity);
 
   if (GetStateBits() & NS_STATE_SVG_STROKE_PSERVER) {
-    nsSVGPaintServerFrame *ps = NS_STATIC_CAST(nsSVGPaintServerFrame*,
-                                               GetProperty(nsGkAtoms::stroke));
+    nsSVGPaintServerFrame *ps = static_cast<nsSVGPaintServerFrame*>
+                                           (GetProperty(nsGkAtoms::stroke));
     return ps->SetupPaintServer(aContext, this, opacity, aClosure);
   } else if (GetStyleSVG()->mStroke.mType == eStyleSVGPaintType_Server) {
     SetupCairoColor(aContext,
diff --git a/mozilla/layout/svg/base/src/nsSVGGlyphFrame.cpp b/mozilla/layout/svg/base/src/nsSVGGlyphFrame.cpp
index 3a1313dd088..4758ecaa6d3 100644
--- a/mozilla/layout/svg/base/src/nsSVGGlyphFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGGlyphFrame.cpp
@@ -111,7 +111,7 @@ nsSVGGlyphFrame::UpdateGraphic(PRBool suppressInvalidation)
     return NS_OK;
 
   nsSVGTextContainerFrame *containerFrame =
-    NS_STATIC_CAST(nsSVGTextContainerFrame *, mParent);
+    static_cast<nsSVGTextContainerFrame *>(mParent);
   if (containerFrame)
     containerFrame->UpdateGraphic();
 
@@ -543,8 +543,8 @@ nsSVGGlyphFrame::GetCanvasTM(nsIDOMSVGMatrix * *aCTM)
 {
   NS_ASSERTION(mParent, "null parent");
   
-  nsSVGContainerFrame *containerFrame = NS_STATIC_CAST(nsSVGContainerFrame*,
-                                                       mParent);
+  nsSVGContainerFrame *containerFrame = static_cast<nsSVGContainerFrame*>
+                                                   (mParent);
   nsCOMPtr<nsIDOMSVGMatrix> parentTM = containerFrame->GetCanvasTM();
 
   *aCTM = parentTM.get();
@@ -1004,7 +1004,7 @@ nsSVGGlyphFrame::FindTextPathParent()
        frame = frame->GetParent()) {
     nsIAtom* type = frame->GetType();
     if (type == nsGkAtoms::svgTextPathFrame) {
-      return NS_STATIC_CAST(nsSVGTextPathFrame*, frame);
+      return static_cast<nsSVGTextPathFrame*>(frame);
     } else if (type == nsGkAtoms::svgTextFrame)
       return nsnull;
   }
@@ -1030,7 +1030,7 @@ NS_IMETHODIMP_(already_AddRefed<nsIDOMSVGLengthList>)
 nsSVGGlyphFrame::GetX()
 {
   nsSVGTextContainerFrame *containerFrame;
-  containerFrame = NS_STATIC_CAST(nsSVGTextContainerFrame *, mParent);
+  containerFrame = static_cast<nsSVGTextContainerFrame *>(mParent);
   if (containerFrame)
     return containerFrame->GetX();
   return nsnull;
@@ -1040,7 +1040,7 @@ NS_IMETHODIMP_(already_AddRefed<nsIDOMSVGLengthList>)
 nsSVGGlyphFrame::GetY()
 {
   nsSVGTextContainerFrame *containerFrame;
-  containerFrame = NS_STATIC_CAST(nsSVGTextContainerFrame *, mParent);
+  containerFrame = static_cast<nsSVGTextContainerFrame *>(mParent);
   if (containerFrame)
     return containerFrame->GetY();
   return nsnull;
@@ -1050,7 +1050,7 @@ NS_IMETHODIMP_(already_AddRefed<nsIDOMSVGLengthList>)
 nsSVGGlyphFrame::GetDx()
 {
   nsSVGTextContainerFrame *containerFrame;
-  containerFrame = NS_STATIC_CAST(nsSVGTextContainerFrame *, mParent);
+  containerFrame = static_cast<nsSVGTextContainerFrame *>(mParent);
   if (containerFrame)
     return containerFrame->GetDx();
   return nsnull;
@@ -1060,7 +1060,7 @@ NS_IMETHODIMP_(already_AddRefed<nsIDOMSVGLengthList>)
 nsSVGGlyphFrame::GetDy()
 {
   nsSVGTextContainerFrame *containerFrame;
-  containerFrame = NS_STATIC_CAST(nsSVGTextContainerFrame *, mParent);
+  containerFrame = static_cast<nsSVGTextContainerFrame *>(mParent);
   if (containerFrame)
     return containerFrame->GetDy();
   return nsnull;
diff --git a/mozilla/layout/svg/base/src/nsSVGGradientFrame.cpp b/mozilla/layout/svg/base/src/nsSVGGradientFrame.cpp
index 952edbf5644..1a84515cc0c 100644
--- a/mozilla/layout/svg/base/src/nsSVGGradientFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGGradientFrame.cpp
@@ -249,10 +249,10 @@ nsSVGGradientFrame::GetGradientTransform(nsSVGGeometryFrame *aSource)
     // will be the glyph, which is not a container, so we
     // need to get the parent
     if (callerType ==  nsGkAtoms::svgGlyphFrame)
-      mSourceContent = NS_STATIC_CAST(nsSVGElement*,
-                                      aSource->GetContent()->GetParent());
+      mSourceContent = static_cast<nsSVGElement*>
+                                  (aSource->GetContent()->GetParent());
     else
-      mSourceContent = NS_STATIC_CAST(nsSVGElement*, aSource->GetContent());
+      mSourceContent = static_cast<nsSVGElement*>(aSource->GetContent());
     NS_ASSERTION(mSourceContent, "Can't get content for gradient");
   }
   else {
@@ -289,8 +289,8 @@ nsSVGGradientFrame::GetGradientTransform(nsSVGGeometryFrame *aSource)
   if (!gradient)
     gradient = mContent;  // use our gradient to get the correct default value
 
-  nsSVGGradientElement *gradElement = NS_STATIC_CAST(nsSVGGradientElement*,
-                                                     gradient);
+  nsSVGGradientElement *gradElement = static_cast<nsSVGGradientElement*>
+                                                 (gradient);
   nsCOMPtr<nsIDOMSVGTransformList> trans;
   gradElement->mGradientTransform->GetAnimVal(getter_AddRefs(trans));
   nsCOMPtr<nsIDOMSVGMatrix> gradientTransform =
@@ -309,8 +309,8 @@ nsSVGGradientFrame::GetSpreadMethod()
   if (!gradient)
     gradient = mContent;  // use our gradient to get the correct default value
 
-  nsSVGGradientElement *gradElement = NS_STATIC_CAST(nsSVGGradientElement*,
-                                                     gradient);
+  nsSVGGradientElement *gradElement = static_cast<nsSVGGradientElement*>
+                                                 (gradient);
 
   PRUint16 val;
   gradElement->mSpreadMethod->GetAnimVal(&val);
@@ -416,7 +416,7 @@ nsSVGGradientFrame::GetRefedGradientFromHref()
         frameType != nsGkAtoms::svgRadialGradientFrame)
       return;
 
-    mNextGrad = NS_REINTERPRET_CAST(nsSVGGradientFrame*, nextGrad);
+    mNextGrad = reinterpret_cast<nsSVGGradientFrame*>(nextGrad);
 
     // Add ourselves to the observer list
     if (mNextGrad) {
@@ -531,8 +531,8 @@ nsSVGGradientFrame::GetGradientUnits()
   if (!gradient)
     gradient = mContent;  // use our gradient to get the correct default value
 
-  nsSVGGradientElement *gradElement = NS_STATIC_CAST(nsSVGGradientElement*,
-                                                     gradient);
+  nsSVGGradientElement *gradElement = static_cast<nsSVGGradientElement*>
+                                                 (gradient);
 
   PRUint16 units;
   gradElement->mGradientUnits->GetAnimVal(&units);
@@ -579,7 +579,7 @@ nsSVGLinearGradientFrame::GradientLookupAttribute(nsIAtom *aAtomName,
     gradient = mContent;  // use our gradient to get the correct default value
 
   nsSVGLinearGradientElement *element =
-    NS_STATIC_CAST(nsSVGLinearGradientElement*, gradient);
+    static_cast<nsSVGLinearGradientElement*>(gradient);
 
   // Object bounding box units are handled by setting the appropriate
   // transform in GetGradientTransfrom, but we need to handle user
@@ -595,7 +595,7 @@ nsSVGLinearGradientFrame::GradientLookupAttribute(nsIAtom *aAtomName,
                "Unknown gradientUnits type");
 
   return element->mLengthAttributes[aEnumName].
-    GetAnimValue(NS_STATIC_CAST(nsSVGSVGElement*, nsnull));
+    GetAnimValue(static_cast<nsSVGSVGElement*>(nsnull));
 }
 
 already_AddRefed<gfxPattern>
@@ -661,7 +661,7 @@ nsSVGRadialGradientFrame::GradientLookupAttribute(nsIAtom *aAtomName,
   }
 
   nsSVGRadialGradientElement *element =
-    NS_STATIC_CAST(nsSVGRadialGradientElement*, gradient);
+    static_cast<nsSVGRadialGradientElement*>(gradient);
 
   // Object bounding box units are handled by setting the appropriate
   // transform in GetGradientTransfrom, but we need to handle user
@@ -677,7 +677,7 @@ nsSVGRadialGradientFrame::GradientLookupAttribute(nsIAtom *aAtomName,
                "Unknown gradientUnits type");
 
   return element->mLengthAttributes[aEnumName].
-    GetAnimValue(NS_STATIC_CAST(nsSVGSVGElement*, nsnull));
+    GetAnimValue(static_cast<nsSVGSVGElement*>(nsnull));
 }
 
 already_AddRefed<gfxPattern>
diff --git a/mozilla/layout/svg/base/src/nsSVGImageFrame.cpp b/mozilla/layout/svg/base/src/nsSVGImageFrame.cpp
index 8ed57b4b0a1..c224626cd1f 100644
--- a/mozilla/layout/svg/base/src/nsSVGImageFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGImageFrame.cpp
@@ -155,7 +155,7 @@ nsSVGImageFrame::~nsSVGImageFrame()
     if (imageLoader) {
       imageLoader->RemoveObserver(mListener);
     }
-    NS_REINTERPRET_CAST(nsSVGImageListener*, mListener.get())->SetFrame(nsnull);
+    reinterpret_cast<nsSVGImageListener*>(mListener.get())->SetFrame(nsnull);
   }
   mListener = nsnull;
 }
@@ -215,7 +215,7 @@ nsSVGImageFrame::GetImageTransform()
   GetCanvasTM(getter_AddRefs(ctm));
 
   float x, y, width, height;
-  nsSVGElement *element = NS_STATIC_CAST(nsSVGElement*, mContent);
+  nsSVGElement *element = static_cast<nsSVGElement*>(mContent);
   element->GetAnimatedLengthValues(&x, &y, &width, &height, nsnull);
 
   PRInt32 nativeWidth, nativeHeight;
@@ -270,7 +270,7 @@ nsSVGImageFrame::PaintSVG(nsSVGRenderState *aContext, nsRect *aDirtyRect)
 
     nsThebesImage *thebesImage = nsnull;
     if (img)
-      thebesImage = NS_STATIC_CAST(nsThebesImage*, img.get());
+      thebesImage = static_cast<nsThebesImage*>(img.get());
 
     if (thebesImage)
       thebesSurface = thebesImage->ThebesSurface();
@@ -287,7 +287,7 @@ nsSVGImageFrame::PaintSVG(nsSVGRenderState *aContext, nsRect *aDirtyRect)
 
       if (ctm) {
         float x, y, width, height;
-        nsSVGElement *element = NS_STATIC_CAST(nsSVGElement*, mContent);
+        nsSVGElement *element = static_cast<nsSVGElement*>(mContent);
         element->GetAnimatedLengthValues(&x, &y, &width, &height, nsnull);
 
         nsSVGUtils::SetClipRect(gfx, ctm, x, y, width, height);
diff --git a/mozilla/layout/svg/base/src/nsSVGInnerSVGFrame.cpp b/mozilla/layout/svg/base/src/nsSVGInnerSVGFrame.cpp
index 90845fa36d2..90eca0bf791 100644
--- a/mozilla/layout/svg/base/src/nsSVGInnerSVGFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGInnerSVGFrame.cpp
@@ -169,13 +169,13 @@ nsSVGInnerSVGFrame::PaintSVG(nsSVGRenderState *aContext, nsRect *aDirtyRect)
     if (!mPropagateTransform) {
       NS_NewSVGMatrix(getter_AddRefs(clipTransform));
     } else {
-      nsSVGContainerFrame *parent = NS_STATIC_CAST(nsSVGContainerFrame*,
-                                                   mParent);
+      nsSVGContainerFrame *parent = static_cast<nsSVGContainerFrame*>
+                                               (mParent);
       clipTransform = parent->GetCanvasTM();
     }
 
     if (clipTransform) {
-      nsSVGSVGElement *svg = NS_STATIC_CAST(nsSVGSVGElement*, mContent);
+      nsSVGSVGElement *svg = static_cast<nsSVGSVGElement*>(mContent);
 
       float x, y, width, height;
       svg->GetAnimatedLengthValues(&x, &y, &width, &height, nsnull);
@@ -221,11 +221,11 @@ nsSVGInnerSVGFrame::GetFrameForPointSVG(float x, float y, nsIFrame** hit)
     float clipX, clipY, clipWidth, clipHeight;
     nsCOMPtr<nsIDOMSVGMatrix> clipTransform;
 
-    nsSVGElement *svg = NS_STATIC_CAST(nsSVGElement*, mContent);
+    nsSVGElement *svg = static_cast<nsSVGElement*>(mContent);
     svg->GetAnimatedLengthValues(&clipX, &clipY, &clipWidth, &clipHeight, nsnull);
 
-    nsSVGContainerFrame *parent = NS_STATIC_CAST(nsSVGContainerFrame*,
-                                                 mParent);
+    nsSVGContainerFrame *parent = static_cast<nsSVGContainerFrame*>
+                                             (mParent);
     clipTransform = parent->GetCanvasTM();
 
     if (!nsSVGUtils::HitTestRect(clipTransform,
@@ -306,14 +306,14 @@ nsSVGInnerSVGFrame::GetCanvasTM()
   if (!mCanvasTM) {
     // get the transform from our parent's coordinate system to ours:
     NS_ASSERTION(mParent, "null parent");
-    nsSVGContainerFrame *containerFrame = NS_STATIC_CAST(nsSVGContainerFrame*,
-                                                         mParent);
+    nsSVGContainerFrame *containerFrame = static_cast<nsSVGContainerFrame*>
+                                                     (mParent);
     nsCOMPtr<nsIDOMSVGMatrix> parentTM = containerFrame->GetCanvasTM();
     NS_ASSERTION(parentTM, "null TM");
 
     // append the transform due to the 'x' and 'y' attributes:
     float x, y;
-    nsSVGSVGElement *svg = NS_STATIC_CAST(nsSVGSVGElement*, mContent);
+    nsSVGSVGElement *svg = static_cast<nsSVGSVGElement*>(mContent);
     svg->GetAnimatedLengthValues(&x, &y, nsnull);
 
     nsCOMPtr<nsIDOMSVGMatrix> xyTM;
@@ -321,7 +321,7 @@ nsSVGInnerSVGFrame::GetCanvasTM()
 
     // append the viewbox to viewport transform:
     nsCOMPtr<nsIDOMSVGMatrix> viewBoxToViewportTM;
-    nsSVGSVGElement *svgElement = NS_STATIC_CAST(nsSVGSVGElement*, mContent);
+    nsSVGSVGElement *svgElement = static_cast<nsSVGSVGElement*>(mContent);
     svgElement->GetViewboxToViewportTransform(getter_AddRefs(viewBoxToViewportTM));
     xyTM->Multiply(viewBoxToViewportTM, getter_AddRefs(mCanvasTM));
   }    
diff --git a/mozilla/layout/svg/base/src/nsSVGMarkerFrame.cpp b/mozilla/layout/svg/base/src/nsSVGMarkerFrame.cpp
index d949a55bd42..1e1046df09e 100644
--- a/mozilla/layout/svg/base/src/nsSVGMarkerFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGMarkerFrame.cpp
@@ -106,7 +106,7 @@ nsSVGMarkerFrame::GetCanvasTM()
   NS_ASSERTION(markedTM, "null marked TM");
 
   // get element
-  nsSVGMarkerElement *element = NS_STATIC_CAST(nsSVGMarkerElement*, mContent);
+  nsSVGMarkerElement *element = static_cast<nsSVGMarkerElement*>(mContent);
 
   // scale/move marker
   nsCOMPtr<nsIDOMSVGMatrix> markerTM;
@@ -152,7 +152,7 @@ nsSVGMarkerFrame::PaintMark(nsSVGRenderState *aContext,
   gfxContext *gfx = aContext->GetGfxContext();
 
   if (GetStyleDisplay()->IsScrollableOverflow()) {
-    nsSVGMarkerElement *marker = NS_STATIC_CAST(nsSVGMarkerElement*, mContent);
+    nsSVGMarkerElement *marker = static_cast<nsSVGMarkerElement*>(mContent);
 
     nsCOMPtr<nsIDOMSVGAnimatedRect> arect;
     nsresult rv = marker->GetViewBox(getter_AddRefs(arect));
@@ -233,7 +233,7 @@ nsSVGMarkerFrame::GetType() const
 void
 nsSVGMarkerFrame::SetParentCoordCtxProvider(nsSVGSVGElement *aContext)
 {
-  nsSVGMarkerElement *marker = NS_STATIC_CAST(nsSVGMarkerElement*, mContent);
+  nsSVGMarkerElement *marker = static_cast<nsSVGMarkerElement*>(mContent);
   marker->SetParentCoordCtxProvider(aContext);
 }
 
@@ -249,7 +249,7 @@ nsSVGMarkerFrame::AutoMarkerReferencer::AutoMarkerReferencer(
   mFrame->mMarkedFrame = aMarkedFrame;
 
   nsSVGSVGElement *ctx =
-    NS_STATIC_CAST(nsSVGElement*, aMarkedFrame->GetContent())->GetCtx();
+    static_cast<nsSVGElement*>(aMarkedFrame->GetContent())->GetCtx();
   mFrame->SetParentCoordCtxProvider(ctx);
 }
 
diff --git a/mozilla/layout/svg/base/src/nsSVGMaskFrame.cpp b/mozilla/layout/svg/base/src/nsSVGMaskFrame.cpp
index 2214a10cde3..b70486380a3 100644
--- a/mozilla/layout/svg/base/src/nsSVGMaskFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGMaskFrame.cpp
@@ -105,11 +105,11 @@ nsSVGMaskFrame::ComputeMaskAlpha(nsSVGRenderState *aContext,
   {
     nsIFrame *frame;
     CallQueryInterface(aParent, &frame);
-    nsSVGElement *parent = NS_STATIC_CAST(nsSVGElement*, frame->GetContent());
+    nsSVGElement *parent = static_cast<nsSVGElement*>(frame->GetContent());
 
     float x, y, width, height;
 
-    nsSVGMaskElement *mask = NS_STATIC_CAST(nsSVGMaskElement*, mContent);
+    nsSVGMaskElement *mask = static_cast<nsSVGMaskElement*>(mContent);
 
     nsSVGLength2 *tmpX, *tmpY, *tmpWidth, *tmpHeight;
     tmpX = &mask->mLengthAttributes[nsSVGMaskElement::X];
@@ -226,8 +226,8 @@ nsSVGMaskFrame::ComputeMaskAlpha(nsSVGRenderState *aContext,
 
       /* linearRGB -> intensity */
       PRUint8 alpha =
-        NS_STATIC_CAST(PRUint8,
-                       (pixel[GFX_ARGB32_OFFSET_R] * 0.2125 +
+        static_cast<PRUint8>
+                   ((pixel[GFX_ARGB32_OFFSET_R] * 0.2125 +
                         pixel[GFX_ARGB32_OFFSET_G] * 0.7154 +
                         pixel[GFX_ARGB32_OFFSET_B] * 0.0721) *
                        (pixel[GFX_ARGB32_OFFSET_A] / 255.0) * aOpacity);
@@ -257,7 +257,7 @@ nsSVGMaskFrame::GetCanvasTM()
   nsCOMPtr<nsIDOMSVGMatrix> canvasTM = mMaskParentMatrix;
 
   /* object bounding box? */
-  nsSVGMaskElement *mask = NS_STATIC_CAST(nsSVGMaskElement*, mContent);
+  nsSVGMaskElement *mask = static_cast<nsSVGMaskElement*>(mContent);
 
   PRUint16 contentUnits;
   mask->mMaskContentUnits->GetAnimVal(&contentUnits);
diff --git a/mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.cpp b/mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
index 23731c12f75..478637b5f6a 100644
--- a/mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGOuterSVGFrame.cpp
@@ -102,7 +102,7 @@ nsSVGMutationObserver::AttributeChanged(nsIDocument *aDocument,
     CallQueryInterface(frame, &metrics);
     if (metrics) {
       nsSVGTextContainerFrame *containerFrame =
-        NS_STATIC_CAST(nsSVGTextContainerFrame *, frame);
+        static_cast<nsSVGTextContainerFrame *>(frame);
       containerFrame->UpdateGraphic();
       continue;
     }
@@ -120,7 +120,7 @@ nsSVGMutationObserver::UpdateTextFragmentTrees(nsIFrame *aFrame)
   nsIFrame* kid = aFrame->GetFirstChild(nsnull);
   while (kid) {
     if (kid->GetType() == nsGkAtoms::svgTextFrame) {
-      nsSVGTextFrame* textFrame = NS_STATIC_CAST(nsSVGTextFrame*, kid);
+      nsSVGTextFrame* textFrame = static_cast<nsSVGTextFrame*>(kid);
       textFrame->NotifyGlyphMetricsChange();
     } else {
       UpdateTextFragmentTrees(kid);
@@ -159,7 +159,7 @@ nsSVGOuterSVGFrame::InitSVG()
   if (doc) {
     // we only care about our content's zoom and pan values if it's the root element
     if (doc->GetRootContent() == mContent) {
-      nsSVGSVGElement *SVGElement = NS_STATIC_CAST(nsSVGSVGElement*, mContent);
+      nsSVGSVGElement *SVGElement = static_cast<nsSVGSVGElement*>(mContent);
       SVGElement->GetZoomAndPanEnum(getter_AddRefs(mZoomAndPan));
       SVGElement->GetCurrentTranslate(getter_AddRefs(mCurrentTranslate));
       SVGElement->GetCurrentScaleNumber(getter_AddRefs(mCurrentScale));
@@ -220,7 +220,7 @@ nsSVGOuterSVGFrame::Reflow(nsPresContext*          aPresContext,
   // attributes. These can be thought of as our "computed" width/height in CSS
   // terms (and maybe we should call them that).
 
-  nsSVGSVGElement *svgElem = NS_STATIC_CAST(nsSVGSVGElement*, mContent);
+  nsSVGSVGElement *svgElem = static_cast<nsSVGSVGElement*>(mContent);
   float oldViewportWidth  = svgElem->mViewportWidth;
   float oldViewportHeight = svgElem->mViewportHeight;
 
@@ -321,7 +321,7 @@ public:
 nsIFrame*
 nsDisplaySVG::HitTest(nsDisplayListBuilder* aBuilder, nsPoint aPt)
 {
-  return NS_STATIC_CAST(nsSVGOuterSVGFrame*, mFrame)->
+  return static_cast<nsSVGOuterSVGFrame*>(mFrame)->
     GetFrameForPoint(aPt - aBuilder->ToReferenceFrame(mFrame));
 }
 
@@ -329,7 +329,7 @@ void
 nsDisplaySVG::Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx,
      const nsRect& aDirtyRect)
 {
-  NS_STATIC_CAST(nsSVGOuterSVGFrame*, mFrame)->
+  static_cast<nsSVGOuterSVGFrame*>(mFrame)->
     Paint(*aCtx, aDirtyRect, aBuilder->ToReferenceFrame(mFrame));
 }
 
@@ -539,7 +539,7 @@ nsSVGOuterSVGFrame::NotifyViewportChange()
 
 /* XXX this caused reftest failures
   // viewport changes only affect our transform if we have a viewBox attribute
-  nsSVGSVGElement *svgElem = NS_STATIC_CAST(nsSVGSVGElement*, mContent);
+  nsSVGSVGElement *svgElem = static_cast<nsSVGSVGElement*>(mContent);
   if (!svgElem->HasAttr(kNameSpaceID_None, nsGkAtoms::viewBox)) {
     return NS_OK;
   }
@@ -569,7 +569,7 @@ already_AddRefed<nsIDOMSVGMatrix>
 nsSVGOuterSVGFrame::GetCanvasTM()
 {
   if (!mCanvasTM) {
-    nsSVGSVGElement *svgElement = NS_STATIC_CAST(nsSVGSVGElement*, mContent);
+    nsSVGSVGElement *svgElement = static_cast<nsSVGSVGElement*>(mContent);
     svgElement->GetViewboxToViewportTransform(getter_AddRefs(mCanvasTM));
 
     if (mZoomAndPan) {
diff --git a/mozilla/layout/svg/base/src/nsSVGPathGeometryFrame.cpp b/mozilla/layout/svg/base/src/nsSVGPathGeometryFrame.cpp
index bd6956eadbe..dcb101bea11 100644
--- a/mozilla/layout/svg/base/src/nsSVGPathGeometryFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGPathGeometryFrame.cpp
@@ -105,7 +105,7 @@ nsSVGMarkerProperty::nsSVGMarkerProperty(nsIURI                 *aMarkerStart,
 
   NS_ADDREF(this); // addref to allow QI - SupportsDtorFunc releases
   mFrame->SetProperty(nsGkAtoms::marker,
-                      NS_STATIC_CAST(nsISupports*, this),
+                      static_cast<nsISupports*>(this),
                       nsPropertyTable::SupportsDtorFunc);
 
   mFrame->AddStateBits(NS_STATE_SVG_HAS_MARKERS);
@@ -126,9 +126,9 @@ nsSVGMarkerProperty::GetMarkerFrame(nsWeakPtr aObservedMarker)
   nsCOMPtr<nsIContent> marker = do_QueryReferent(aObservedMarker);
   if (marker) {
     nsIFrame *frame =
-      NS_STATIC_CAST(nsGenericElement*, marker.get())->GetPrimaryFrame();
+      static_cast<nsGenericElement*>(marker.get())->GetPrimaryFrame();
     if (frame && frame->GetType() == nsGkAtoms::svgMarkerFrame)
-      return NS_STATIC_CAST(nsSVGMarkerFrame*, frame);
+      return static_cast<nsSVGMarkerFrame*>(frame);
   }
   return nsnull;
 }
@@ -256,8 +256,8 @@ nsSVGPathGeometryFrame::AttributeChanged(PRInt32         aNameSpaceID,
                                          PRInt32         aModType)
 {
   if (aNameSpaceID == kNameSpaceID_None &&
-      (NS_STATIC_CAST(nsSVGPathGeometryElement*,
-                      mContent)->IsDependentAttribute(aAttribute) ||
+      (static_cast<nsSVGPathGeometryElement*>
+                  (mContent)->IsDependentAttribute(aAttribute) ||
        aAttribute == nsGkAtoms::transform))
     UpdateGraphic();
 
@@ -292,8 +292,8 @@ nsSVGMarkerProperty *
 nsSVGPathGeometryFrame::GetMarkerProperty()
 {
   if (GetStateBits() & NS_STATE_SVG_HAS_MARKERS)
-    return NS_STATIC_CAST(nsSVGMarkerProperty *,
-                          GetProperty(nsGkAtoms::marker));
+    return static_cast<nsSVGMarkerProperty *>
+                      (GetProperty(nsGkAtoms::marker));
 
   return nsnull;
 }
@@ -338,15 +338,15 @@ nsSVGPathGeometryFrame::PaintSVG(nsSVGRenderState *aContext,
   /* render */
   Render(aContext);
 
-  if (NS_STATIC_CAST(nsSVGPathGeometryElement*, mContent)->IsMarkable()) {
+  if (static_cast<nsSVGPathGeometryElement*>(mContent)->IsMarkable()) {
     nsSVGMarkerProperty *property = GetMarkerProperty();
       
     if (property) {
       float strokeWidth = GetStrokeWidth();
         
       nsTArray<nsSVGMark> marks;
-      NS_STATIC_CAST(nsSVGPathGeometryElement*,
-                     mContent)->GetMarkPoints(&marks);
+      static_cast<nsSVGPathGeometryElement*>
+                 (mContent)->GetMarkPoints(&marks);
         
       PRUint32 num = marks.Length();
 
@@ -414,7 +414,7 @@ nsSVGPathGeometryFrame::GetFrameForPointSVG(float x, float y, nsIFrame** hit)
 NS_IMETHODIMP_(nsRect)
 nsSVGPathGeometryFrame::GetCoveredRegion()
 {
-  if (NS_STATIC_CAST(nsSVGPathGeometryElement*, mContent)->IsMarkable()) {
+  if (static_cast<nsSVGPathGeometryElement*>(mContent)->IsMarkable()) {
     nsSVGMarkerProperty *property = GetMarkerProperty();
 
     if (!property)
@@ -425,7 +425,7 @@ nsSVGPathGeometryFrame::GetCoveredRegion()
     float strokeWidth = GetStrokeWidth();
 
     nsTArray<nsSVGMark> marks;
-    NS_STATIC_CAST(nsSVGPathGeometryElement*, mContent)->GetMarkPoints(&marks);
+    static_cast<nsSVGPathGeometryElement*>(mContent)->GetMarkPoints(&marks);
 
     PRUint32 num = marks.Length();
 
@@ -580,14 +580,14 @@ nsSVGPathGeometryFrame::GetCanvasTM(nsIDOMSVGMatrix * *aCTM)
     return NS_NewSVGMatrix(aCTM);
   }
 
-  nsSVGContainerFrame *containerFrame = NS_STATIC_CAST(nsSVGContainerFrame*,
-                                                       mParent);
+  nsSVGContainerFrame *containerFrame = static_cast<nsSVGContainerFrame*>
+                                                   (mParent);
   nsCOMPtr<nsIDOMSVGMatrix> parentTM = containerFrame->GetCanvasTM();
   NS_ASSERTION(parentTM, "null TM");
 
   // append our local transformations if we have any:
   nsSVGGraphicElement *element =
-    NS_STATIC_CAST(nsSVGGraphicElement*, mContent);
+    static_cast<nsSVGGraphicElement*>(mContent);
   nsCOMPtr<nsIDOMSVGMatrix> localTM = element->GetLocalTransformMatrix();
 
   if (localTM)
@@ -673,7 +673,7 @@ nsSVGPathGeometryFrame::GeneratePath(gfxContext* aContext)
   aContext->Multiply(matrix);
 
   aContext->NewPath();
-  NS_STATIC_CAST(nsSVGPathGeometryElement*, mContent)->ConstructPath(aContext);
+  static_cast<nsSVGPathGeometryElement*>(mContent)->ConstructPath(aContext);
 }
 
 PRUint16
diff --git a/mozilla/layout/svg/base/src/nsSVGPatternFrame.cpp b/mozilla/layout/svg/base/src/nsSVGPatternFrame.cpp
index 9972df1e995..4f055c1eff5 100644
--- a/mozilla/layout/svg/base/src/nsSVGPatternFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGPatternFrame.cpp
@@ -385,8 +385,8 @@ nsSVGPatternFrame::GetPatternUnits()
   // See if we need to get the value from another pattern
   if (!checkURITarget(nsGkAtoms::patternUnits)) {
     // No, return the values
-    nsSVGPatternElement *patternElement = NS_STATIC_CAST(nsSVGPatternElement*,
-                                                         mContent);
+    nsSVGPatternElement *patternElement = static_cast<nsSVGPatternElement*>
+                                                     (mContent);
     patternElement->mPatternUnits->GetAnimVal(&rv);
   } else {
     // Yes, get it from the target
@@ -404,8 +404,8 @@ nsSVGPatternFrame::GetPatternContentUnits()
   // See if we need to get the value from another pattern
   if (!checkURITarget(nsGkAtoms::patternContentUnits)) {
     // No, return the values
-    nsSVGPatternElement *patternElement = NS_STATIC_CAST(nsSVGPatternElement*,
-                                                         mContent);
+    nsSVGPatternElement *patternElement = static_cast<nsSVGPatternElement*>
+                                                     (mContent);
     patternElement->mPatternContentUnits->GetAnimVal(&rv);
   } else {
     // Yes, get it from the target
@@ -422,8 +422,8 @@ nsSVGPatternFrame::GetPatternTransform()
   // See if we need to get the value from another pattern
   if (!checkURITarget(nsGkAtoms::patternTransform)) {
     // No, return the values
-    nsSVGPatternElement *patternElement = NS_STATIC_CAST(nsSVGPatternElement*,
-                                                         mContent);
+    nsSVGPatternElement *patternElement = static_cast<nsSVGPatternElement*>
+                                                     (mContent);
     nsCOMPtr<nsIDOMSVGTransformList> lTrans;
     patternElement->mPatternTransform->GetAnimVal(getter_AddRefs(lTrans));
     nsCOMPtr<nsIDOMSVGMatrix> patternTransform =
@@ -489,7 +489,7 @@ nsSVGPatternFrame::GetX()
   } else {
     // No, return the values
     nsSVGPatternElement *pattern =
-      NS_STATIC_CAST(nsSVGPatternElement*, mContent);
+      static_cast<nsSVGPatternElement*>(mContent);
     rv = &pattern->mLengthAttributes[nsSVGPatternElement::X];
   }
   mLoopFlag = PR_FALSE;
@@ -508,7 +508,7 @@ nsSVGPatternFrame::GetY()
   } else {
     // No, return the values
     nsSVGPatternElement *pattern =
-      NS_STATIC_CAST(nsSVGPatternElement*, mContent);
+      static_cast<nsSVGPatternElement*>(mContent);
     rv = &pattern->mLengthAttributes[nsSVGPatternElement::Y];
   }
   mLoopFlag = PR_FALSE;
@@ -527,7 +527,7 @@ nsSVGPatternFrame::GetWidth()
   } else {
     // No, return the values
     nsSVGPatternElement *pattern =
-      NS_STATIC_CAST(nsSVGPatternElement*, mContent);
+      static_cast<nsSVGPatternElement*>(mContent);
     rv = &pattern->mLengthAttributes[nsSVGPatternElement::WIDTH];
   }
   mLoopFlag = PR_FALSE;
@@ -546,7 +546,7 @@ nsSVGPatternFrame::GetHeight()
   } else {
     // No, return the values
     nsSVGPatternElement *pattern =
-      NS_STATIC_CAST(nsSVGPatternElement*, mContent);
+      static_cast<nsSVGPatternElement*>(mContent);
     rv = &pattern->mLengthAttributes[nsSVGPatternElement::HEIGHT];
   }
   mLoopFlag = PR_FALSE;
@@ -654,7 +654,7 @@ nsSVGPatternFrame::GetPatternRect(nsIDOMSVGRect **patternRect,
 static float
 GetLengthValue(nsSVGLength2 *aLength)
 {
-  return aLength->GetAnimValue(NS_STATIC_CAST(nsSVGSVGElement*, nsnull));
+  return aLength->GetAnimValue(static_cast<nsSVGSVGElement*>(nsnull));
 }
 
 nsresult
@@ -756,10 +756,10 @@ nsSVGPatternFrame::GetCallerGeometry(nsIDOMSVGMatrix **aCTM,
   // element.
   nsIAtom *callerType = aSource->GetType();
   if (callerType ==  nsGkAtoms::svgGlyphFrame) {
-    *aContent = NS_STATIC_CAST(nsSVGElement*,
-                               aSource->GetContent()->GetParent());
+    *aContent = static_cast<nsSVGElement*>
+                           (aSource->GetContent()->GetParent());
   } else {
-    *aContent = NS_STATIC_CAST(nsSVGElement*, aSource->GetContent());
+    *aContent = static_cast<nsSVGElement*>(aSource->GetContent());
   }
   NS_ASSERTION(aContent,"Caller does not have any content!");
   if (!aContent)
diff --git a/mozilla/layout/svg/base/src/nsSVGTSpanFrame.cpp b/mozilla/layout/svg/base/src/nsSVGTSpanFrame.cpp
index 7914e025ffd..bddd8e967c8 100644
--- a/mozilla/layout/svg/base/src/nsSVGTSpanFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGTSpanFrame.cpp
@@ -135,8 +135,8 @@ nsSVGTSpanFrame::GetCanvasTM()
   }
 
   NS_ASSERTION(mParent, "null parent");
-  nsSVGContainerFrame *containerFrame = NS_STATIC_CAST(nsSVGContainerFrame*,
-                                                       mParent);
+  nsSVGContainerFrame *containerFrame = static_cast<nsSVGContainerFrame*>
+                                                   (mParent);
   return containerFrame->GetCanvasTM();  
 }
 
diff --git a/mozilla/layout/svg/base/src/nsSVGTextContainerFrame.cpp b/mozilla/layout/svg/base/src/nsSVGTextContainerFrame.cpp
index 60614e7a222..4f8b1e8f0bb 100755
--- a/mozilla/layout/svg/base/src/nsSVGTextContainerFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGTextContainerFrame.cpp
@@ -460,7 +460,7 @@ nsSVGTextContainerFrame::GetTextFrame()
 {
   for (nsIFrame *frame = this; frame != nsnull; frame = frame->GetParent()) {
     if (frame->GetType() == nsGkAtoms::svgTextFrame) {
-      return NS_STATIC_CAST(nsSVGTextFrame*, frame);
+      return static_cast<nsSVGTextFrame*>(frame);
     }
   }
   return nsnull;
diff --git a/mozilla/layout/svg/base/src/nsSVGTextFrame.cpp b/mozilla/layout/svg/base/src/nsSVGTextFrame.cpp
index 6fd11558c4d..4066207a1fe 100644
--- a/mozilla/layout/svg/base/src/nsSVGTextFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGTextFrame.cpp
@@ -268,14 +268,14 @@ nsSVGTextFrame::GetCanvasTM()
   if (!mCanvasTM) {
     // get our parent's tm and append local transforms (if any):
     NS_ASSERTION(mParent, "null parent");
-    nsSVGContainerFrame *containerFrame = NS_STATIC_CAST(nsSVGContainerFrame*,
-                                                         mParent);
+    nsSVGContainerFrame *containerFrame = static_cast<nsSVGContainerFrame*>
+                                                     (mParent);
     nsCOMPtr<nsIDOMSVGMatrix> parentTM = containerFrame->GetCanvasTM();
     NS_ASSERTION(parentTM, "null TM");
 
     // got the parent tm, now check for local tm:
     nsSVGGraphicElement *element =
-      NS_STATIC_CAST(nsSVGGraphicElement*, mContent);
+      static_cast<nsSVGGraphicElement*>(mContent);
     nsCOMPtr<nsIDOMSVGMatrix> localTM = element->GetLocalTransformMatrix();
     
     if (localTM)
diff --git a/mozilla/layout/svg/base/src/nsSVGTextPathFrame.cpp b/mozilla/layout/svg/base/src/nsSVGTextPathFrame.cpp
index 588e84b1809..1e16720acf3 100644
--- a/mozilla/layout/svg/base/src/nsSVGTextPathFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGTextPathFrame.cpp
@@ -129,7 +129,7 @@ nsSVGTextPathFrame::Init(nsIContent*      aContent,
       return NS_ERROR_FAILURE;
 
     NS_NewSVGLengthList(getter_AddRefs(mX),
-                        NS_STATIC_CAST(nsSVGElement*, mContent),
+                        static_cast<nsSVGElement*>(mContent),
                         nsSVGUtils::X);
     if (mX) {
       nsCOMPtr<nsIDOMSVGLength> length;
@@ -209,8 +209,8 @@ nsSVGTextPathFrame::GetFlattenedPath() {
   if (!path)
     return nsnull;
 
-  nsSVGPathGeometryElement *element = NS_STATIC_CAST(nsSVGPathGeometryElement*,
-                                                     path->GetContent());
+  nsSVGPathGeometryElement *element = static_cast<nsSVGPathGeometryElement*>
+                                                 (path->GetContent());
 
   if (!mPathListener) {
     mPathListener = new nsSVGPathListener(path->GetContent(), this);
diff --git a/mozilla/layout/svg/base/src/nsSVGUseFrame.cpp b/mozilla/layout/svg/base/src/nsSVGUseFrame.cpp
index f1b4dedb8ea..8b590570bc4 100644
--- a/mozilla/layout/svg/base/src/nsSVGUseFrame.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGUseFrame.cpp
@@ -149,7 +149,7 @@ nsSVGUseFrame::AttributeChanged(PRInt32         aNameSpaceID,
 void
 nsSVGUseFrame::Destroy()
 {
-  nsRefPtr<nsSVGUseElement> use = NS_STATIC_CAST(nsSVGUseElement*, mContent);
+  nsRefPtr<nsSVGUseElement> use = static_cast<nsSVGUseElement*>(mContent);
   nsSVGUseFrameBase::Destroy();
   use->DestroyAnonymousContent();
 }
@@ -176,7 +176,7 @@ nsSVGUseFrame::GetCanvasTM()
 
   // x and y:
   float x, y;
-  nsSVGElement *element = NS_STATIC_CAST(nsSVGElement*, mContent);
+  nsSVGElement *element = static_cast<nsSVGElement*>(mContent);
   element->GetAnimatedLengthValues(&x, &y, nsnull);
 
   nsCOMPtr<nsIDOMSVGMatrix> fini;
@@ -194,7 +194,7 @@ nsSVGUseFrame::GetCanvasTM()
 nsresult
 nsSVGUseFrame::CreateAnonymousContent(nsTArray<nsIContent*>& aElements)
 {
-  nsSVGUseElement *use = NS_STATIC_CAST(nsSVGUseElement*, mContent);
+  nsSVGUseElement *use = static_cast<nsSVGUseElement*>(mContent);
 
   nsIContent* clone = use->CreateAnonymousContent();
   if (!clone)
diff --git a/mozilla/layout/svg/base/src/nsSVGUtils.cpp b/mozilla/layout/svg/base/src/nsSVGUtils.cpp
index 1c1b2178e0b..1d68e44e960 100644
--- a/mozilla/layout/svg/base/src/nsSVGUtils.cpp
+++ b/mozilla/layout/svg/base/src/nsSVGUtils.cpp
@@ -115,7 +115,7 @@ nsSVGPropertyBase::nsSVGPropertyBase(nsIContent *aContent,
 
   NS_ADDREF(this); // addref to allow QI - SupportsDtorFunc releases
   mFrame->SetProperty(aName,
-                      NS_STATIC_CAST(nsISupports*, this),
+                      static_cast<nsISupports*>(this),
                       nsPropertyTable::SupportsDtorFunc);
 }
 
@@ -200,9 +200,9 @@ nsSVGFilterProperty::GetFilterFrame()
   nsCOMPtr<nsIContent> filter = do_QueryReferent(mObservedContent);
   if (filter) {
     nsIFrame *frame =
-      NS_STATIC_CAST(nsGenericElement*, filter.get())->GetPrimaryFrame();
+      static_cast<nsGenericElement*>(filter.get())->GetPrimaryFrame();
     if (frame && frame->GetType() == nsGkAtoms::svgFilterFrame)
-      return NS_STATIC_CAST(nsSVGFilterFrame*, frame);
+      return static_cast<nsSVGFilterFrame*>(frame);
   }
 
   return nsnull;
@@ -265,9 +265,9 @@ nsSVGClipPathProperty::GetClipPathFrame()
   nsCOMPtr<nsIContent> clipPath = do_QueryReferent(mObservedContent);
   if (clipPath) {
     nsIFrame *frame =
-      NS_STATIC_CAST(nsGenericElement*, clipPath.get())->GetPrimaryFrame();
+      static_cast<nsGenericElement*>(clipPath.get())->GetPrimaryFrame();
     if (frame && frame->GetType() == nsGkAtoms::svgClipPathFrame)
-      return NS_STATIC_CAST(nsSVGClipPathFrame*, frame);
+      return static_cast<nsSVGClipPathFrame*>(frame);
   }
 
   return nsnull;
@@ -324,9 +324,9 @@ nsSVGMaskProperty::GetMaskFrame()
   nsCOMPtr<nsIContent> mask = do_QueryReferent(mObservedContent);
   if (mask) {
     nsIFrame *frame =
-      NS_STATIC_CAST(nsGenericElement*, mask.get())->GetPrimaryFrame();
+      static_cast<nsGenericElement*>(mask.get())->GetPrimaryFrame();
     if (frame && frame->GetType() == nsGkAtoms::svgMaskFrame)
-      return NS_STATIC_CAST(nsSVGMaskFrame*, frame);
+      return static_cast<nsSVGMaskFrame*>(frame);
   }
 
   return nsnull;
@@ -683,7 +683,7 @@ nsSVGUtils::CoordToFloat(nsPresContext *aPresContext,
         break;
 
       nsWeakPtr weakCtx =
-        do_GetWeakReference(NS_STATIC_CAST(nsGenericElement*, aContent));
+        do_GetWeakReference(static_cast<nsGenericElement*>(aContent));
       length->SetContext(weakCtx, nsSVGUtils::XY);
       length->GetValue(&val);
       break;
@@ -777,8 +777,8 @@ nsSVGUtils::FindFilterInvalidation(nsIFrame *aFrame)
 
     if (aFrame->GetStateBits() & NS_STATE_SVG_FILTERED) {
       nsSVGFilterProperty *property;
-      property = NS_STATIC_CAST(nsSVGFilterProperty *,
-                                aFrame->GetProperty(nsGkAtoms::filter));
+      property = static_cast<nsSVGFilterProperty *>
+                            (aFrame->GetProperty(nsGkAtoms::filter));
       rect = property->GetRect();
     }
     aFrame = aFrame->GetParent();
@@ -792,8 +792,8 @@ nsSVGUtils::UpdateFilterRegion(nsIFrame *aFrame)
 {
   if (aFrame->GetStateBits() & NS_STATE_SVG_FILTERED) {
     nsSVGFilterProperty *property;
-    property = NS_STATIC_CAST(nsSVGFilterProperty *,
-                              aFrame->GetProperty(nsGkAtoms::filter));
+    property = static_cast<nsSVGFilterProperty *>
+                          (aFrame->GetProperty(nsGkAtoms::filter));
     property->UpdateRect();
   }
 }
@@ -823,8 +823,8 @@ nsSVGUtils::ObjectSpace(nsIDOMSVGRect *aRect, nsSVGLength2 *aLength)
       nsIDOMSVGLength::SVG_LENGTHTYPE_PERCENTAGE) {
     fraction = aLength->GetAnimValInSpecifiedUnits() / 100;
   } else
-    fraction = aLength->GetAnimValue(NS_STATIC_CAST(nsSVGSVGElement*,
-                                                    nsnull));
+    fraction = aLength->GetAnimValue(static_cast<nsSVGSVGElement*>
+                                                (nsnull));
 
   return fraction * axis;
 }
@@ -856,7 +856,7 @@ nsSVGUtils::TransformPoint(nsIDOMSVGMatrix *matrix,
 float
 nsSVGUtils::AngleBisect(float a1, float a2)
 {
-  float delta = fmod(a2 - a1, NS_STATIC_CAST(float, 2*M_PI));
+  float delta = fmod(a2 - a1, static_cast<float>(2*M_PI));
   if (delta < 0) {
     delta += 2*M_PI;
   }
@@ -874,7 +874,7 @@ nsSVGUtils::GetOuterSVGFrame(nsIFrame *aFrame)
 {
   while (aFrame) {
     if (aFrame->GetStateBits() & NS_STATE_IS_OUTER_SVG) {
-      return NS_STATIC_CAST(nsSVGOuterSVGFrame*, aFrame);
+      return static_cast<nsSVGOuterSVGFrame*>(aFrame);
     }
     aFrame = aFrame->GetParent();
   }
@@ -997,16 +997,16 @@ nsSVGUtils::GetCanvasTM(nsIFrame *aFrame)
     // foreignObject is the one non-leaf svg frame that isn't a SVGContainer
     if (aFrame->GetType() == nsGkAtoms::svgForeignObjectFrame) {
       nsSVGForeignObjectFrame *foreignFrame =
-        NS_STATIC_CAST(nsSVGForeignObjectFrame*, aFrame);
+        static_cast<nsSVGForeignObjectFrame*>(aFrame);
       return foreignFrame->GetCanvasTM();
     }
-    nsSVGContainerFrame *containerFrame = NS_STATIC_CAST(nsSVGContainerFrame*,
-                                                         aFrame);
+    nsSVGContainerFrame *containerFrame = static_cast<nsSVGContainerFrame*>
+                                                     (aFrame);
     return containerFrame->GetCanvasTM();
   }
 
-  nsSVGGeometryFrame *geometryFrame = NS_STATIC_CAST(nsSVGGeometryFrame*,
-                                                     aFrame);
+  nsSVGGeometryFrame *geometryFrame = static_cast<nsSVGGeometryFrame*>
+                                                 (aFrame);
   nsCOMPtr<nsIDOMSVGMatrix> matrix;
   nsIDOMSVGMatrix *retval;
   geometryFrame->GetCanvasTM(getter_AddRefs(matrix));
@@ -1078,8 +1078,8 @@ GetFilterFrame(nsFrameState aState, nsIFrame *aFrame)
 {
   if (aState & NS_STATE_SVG_FILTERED) {
     nsSVGFilterProperty *property;
-    property = NS_STATIC_CAST(nsSVGFilterProperty *,
-                              aFrame->GetProperty(nsGkAtoms::filter));
+    property = static_cast<nsSVGFilterProperty *>
+                          (aFrame->GetProperty(nsGkAtoms::filter));
     return property->GetFilterFrame();
   }
   return nsnull;
@@ -1090,8 +1090,8 @@ GetClipPathFrame(nsFrameState aState, nsIFrame *aFrame)
 {
   if (aState & NS_STATE_SVG_CLIPPED) {
     nsSVGClipPathProperty *property;
-    property = NS_STATIC_CAST(nsSVGClipPathProperty *,
-                              aFrame->GetProperty(nsGkAtoms::clipPath));
+    property = static_cast<nsSVGClipPathProperty *>
+                          (aFrame->GetProperty(nsGkAtoms::clipPath));
     return property->GetClipPathFrame();
   }
   return nsnull;
@@ -1102,8 +1102,8 @@ GetMaskFrame(nsFrameState aState, nsIFrame *aFrame)
 {
   if (aState & NS_STATE_SVG_MASKED) {
     nsSVGMaskProperty *property;
-    property = NS_STATIC_CAST(nsSVGMaskProperty *,
-                              aFrame->GetProperty(nsGkAtoms::mask));
+    property = static_cast<nsSVGMaskProperty *>
+                          (aFrame->GetProperty(nsGkAtoms::mask));
     return property->GetMaskFrame();
   }
   return nsnull;
@@ -1483,7 +1483,7 @@ nsSVGUtils::CanOptimizeOpacity(nsIFrame *aFrame)
     if (type == nsGkAtoms::svgImageFrame)
       return PR_TRUE;
     if (type == nsGkAtoms::svgPathGeometryFrame) {
-      nsSVGGeometryFrame *geom = NS_STATIC_CAST(nsSVGGeometryFrame*, aFrame);
+      nsSVGGeometryFrame *geom = static_cast<nsSVGGeometryFrame*>(aFrame);
       if (!(geom->HasFill() && geom->HasStroke()))
         return PR_TRUE;
     }
@@ -1496,8 +1496,8 @@ nsSVGUtils::CanOptimizeOpacity(nsIFrame *aFrame)
 nsSVGRenderState::nsSVGRenderState(nsIRenderingContext *aContext) :
   mRenderMode(NORMAL), mRenderingContext(aContext)
 {
-  mGfxContext = NS_STATIC_CAST(gfxContext*,
-                               aContext->GetNativeGraphicData(nsIRenderingContext::NATIVE_THEBES_CONTEXT));
+  mGfxContext = static_cast<gfxContext*>
+                           (aContext->GetNativeGraphicData(nsIRenderingContext::NATIVE_THEBES_CONTEXT));
 }
 
 nsSVGRenderState::nsSVGRenderState(gfxContext *aContext) :
diff --git a/mozilla/layout/tables/SpanningCellSorter.cpp b/mozilla/layout/tables/SpanningCellSorter.cpp
index a086102ac35..173b9c766d6 100644
--- a/mozilla/layout/tables/SpanningCellSorter.cpp
+++ b/mozilla/layout/tables/SpanningCellSorter.cpp
@@ -88,7 +88,7 @@ SpanningCellSorter::HashTableMatchEntry(PLDHashTable *table,
                                         const PLDHashEntryHdr *hdr,
                                         const void *key)
 {
-    const HashTableEntry *entry = NS_STATIC_CAST(const HashTableEntry*, hdr);
+    const HashTableEntry *entry = static_cast<const HashTableEntry*>(hdr);
     return NS_PTR_TO_INT32(key) == entry->mColSpan;
 }
 
@@ -116,8 +116,8 @@ SpanningCellSorter::AddCell(PRInt32 aColSpan, PRInt32 aRow, PRInt32 aCol)
             mHashTable.entryCount = 0;
             return PR_FALSE;
         }
-        HashTableEntry *entry = NS_STATIC_CAST(HashTableEntry*,
-            PL_DHashTableOperate(&mHashTable, NS_INT32_TO_PTR(aColSpan),
+        HashTableEntry *entry = static_cast<HashTableEntry*>
+                                           (PL_DHashTableOperate(&mHashTable, NS_INT32_TO_PTR(aColSpan),
                                  PL_DHASH_ADD));
         NS_ENSURE_TRUE(entry, PR_FALSE);
 
@@ -138,8 +138,8 @@ SpanningCellSorter::AddCell(PRInt32 aColSpan, PRInt32 aRow, PRInt32 aCol)
 SpanningCellSorter::FillSortedArray(PLDHashTable *table, PLDHashEntryHdr *hdr,
                                     PRUint32 number, void *arg)
 {
-    HashTableEntry *entry = NS_STATIC_CAST(HashTableEntry*, hdr);
-    HashTableEntry **sh = NS_STATIC_CAST(HashTableEntry**, arg);
+    HashTableEntry *entry = static_cast<HashTableEntry*>(hdr);
+    HashTableEntry **sh = static_cast<HashTableEntry**>(arg);
 
     sh[number] = entry;
 
@@ -149,8 +149,8 @@ SpanningCellSorter::FillSortedArray(PLDHashTable *table, PLDHashEntryHdr *hdr,
 /* static */ int
 SpanningCellSorter::SortArray(const void *a, const void *b, void *closure)
 {
-    PRInt32 spanA = (*NS_STATIC_CAST(HashTableEntry*const*, a))->mColSpan;
-    PRInt32 spanB = (*NS_STATIC_CAST(HashTableEntry*const*, b))->mColSpan;
+    PRInt32 spanA = (*static_cast<HashTableEntry*const*>(a))->mColSpan;
+    PRInt32 spanB = (*static_cast<HashTableEntry*const*>(b))->mColSpan;
 
     if (spanA < spanB)
         return -1;
@@ -180,7 +180,7 @@ SpanningCellSorter::GetNext(PRInt32 *aColSpan)
 #ifdef DEBUG_SPANNING_CELL_SORTER
                 printf("SpanningCellSorter[%p]:"
                        " returning list for colspan=%d from array\n",
-                       NS_STATIC_CAST(void*, this), *aColSpan);
+                       static_cast<void*>(this), *aColSpan);
 #endif
                 ++mEnumerationIndex;
                 return result;
@@ -210,7 +210,7 @@ SpanningCellSorter::GetNext(PRInt32 *aColSpan)
 #ifdef DEBUG_SPANNING_CELL_SORTER
                 printf("SpanningCellSorter[%p]:"
                        " returning list for colspan=%d from hash\n",
-                       NS_STATIC_CAST(void*, this), *aColSpan);
+                       static_cast<void*>(this), *aColSpan);
 #endif
                 ++mEnumerationIndex;
                 return result;
diff --git a/mozilla/layout/tables/nsCellMap.cpp b/mozilla/layout/tables/nsCellMap.cpp
index ff3f1b36664..99b1db557e6 100644
--- a/mozilla/layout/tables/nsCellMap.cpp
+++ b/mozilla/layout/tables/nsCellMap.cpp
@@ -290,7 +290,7 @@ nsTableCellMap::GetMapFor(const nsTableRowGroupFrame* aRowGroup,
   
   // if aRowGroup is a repeated header or footer find the header or footer it was repeated from
   if (aRowGroup->IsRepeatable()) {
-    nsTableFrame* fifTable = NS_STATIC_CAST(nsTableFrame*, mTableFrame.GetFirstInFlow());
+    nsTableFrame* fifTable = static_cast<nsTableFrame*>(mTableFrame.GetFirstInFlow());
 
     const nsStyleDisplay* display = aRowGroup->GetStyleDisplay();
     nsTableRowGroupFrame* rgOrig = 
@@ -2708,7 +2708,7 @@ void nsCellMap::DestroyCellData(CellData* aData)
   }
   
   if (mIsBC) {
-    BCCellData* bcData = NS_STATIC_CAST(BCCellData*, aData);
+    BCCellData* bcData = static_cast<BCCellData*>(aData);
     bcData->~BCCellData();
     mPresContext->FreeToShell(sizeof(BCCellData), bcData);
   } else {
diff --git a/mozilla/layout/tables/nsTableCellFrame.cpp b/mozilla/layout/tables/nsTableCellFrame.cpp
index 6c2600d8d75..37c24f7c4e8 100644
--- a/mozilla/layout/tables/nsTableCellFrame.cpp
+++ b/mozilla/layout/tables/nsTableCellFrame.cpp
@@ -192,7 +192,7 @@ nsresult
 nsTableCellFrame::GetRowIndex(PRInt32 &aRowIndex) const
 {
   nsresult result;
-  nsTableRowFrame* row = NS_STATIC_CAST(nsTableRowFrame*, GetParent());
+  nsTableRowFrame* row = static_cast<nsTableRowFrame*>(GetParent());
   if (row) {
     aRowIndex = row->GetRowIndex();
     result = NS_OK;
@@ -381,7 +381,7 @@ public:
 void nsDisplayTableCellBackground::Paint(nsDisplayListBuilder* aBuilder,
      nsIRenderingContext* aCtx, const nsRect& aDirtyRect)
 {
-  NS_STATIC_CAST(nsTableCellFrame*, mFrame)->
+  static_cast<nsTableCellFrame*>(mFrame)->
     PaintBackground(*aCtx, aDirtyRect, aBuilder->ToReferenceFrame(mFrame));
 }
 
@@ -389,7 +389,7 @@ static void
 PaintTableCellSelection(nsIFrame* aFrame, nsIRenderingContext* aCtx,
                         const nsRect& aRect, nsPoint aPt)
 {
-  NS_STATIC_CAST(nsTableCellFrame*, aFrame)->DecorateForSelection(*aCtx, aPt);
+  static_cast<nsTableCellFrame*>(aFrame)->DecorateForSelection(*aCtx, aPt);
 }
 
 NS_IMETHODIMP
@@ -742,9 +742,9 @@ CalcUnpaginagedHeight(nsPresContext*       aPresContext,
   const nsTableCellFrame* firstCellInFlow   = (nsTableCellFrame*)aCellFrame.GetFirstInFlow();
   nsTableFrame*           firstTableInFlow  = (nsTableFrame*)aTableFrame.GetFirstInFlow();
   nsTableRowFrame*        row
-    = NS_STATIC_CAST(nsTableRowFrame*, firstCellInFlow->GetParent());
+    = static_cast<nsTableRowFrame*>(firstCellInFlow->GetParent());
   nsTableRowGroupFrame*   firstRGInFlow
-    = NS_STATIC_CAST(nsTableRowGroupFrame*, row->GetParent());
+    = static_cast<nsTableRowGroupFrame*>(row->GetParent());
 
   PRInt32 rowIndex;
   firstCellInFlow->GetRowIndex(rowIndex);
@@ -917,11 +917,11 @@ nsTableCellFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(NS_GET_IID(nsITableCellLayout))) {
-    *aInstancePtr = NS_STATIC_CAST(nsITableCellLayout*, this);
+    *aInstancePtr = static_cast<nsITableCellLayout*>(this);
     return NS_OK;
   }
   if (aIID.Equals(NS_GET_IID(nsIPercentHeightObserver))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIPercentHeightObserver*, this);
+    *aInstancePtr = static_cast<nsIPercentHeightObserver*>(this);
     return NS_OK;
   }
 
@@ -934,7 +934,7 @@ NS_IMETHODIMP nsTableCellFrame::GetAccessible(nsIAccessible** aAccessible)
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    return accService->CreateHTMLTableCellAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+    return accService->CreateHTMLTableCellAccessible(static_cast<nsIFrame*>(this), aAccessible);
   }
 
   return NS_ERROR_FAILURE;
diff --git a/mozilla/layout/tables/nsTableColGroupFrame.cpp b/mozilla/layout/tables/nsTableColGroupFrame.cpp
index 958b25b0a8b..79dfb368b55 100644
--- a/mozilla/layout/tables/nsTableColGroupFrame.cpp
+++ b/mozilla/layout/tables/nsTableColGroupFrame.cpp
@@ -90,8 +90,8 @@ void nsTableColGroupFrame::ResetColIndices(nsIFrame*       aFirstColGroup,
         colFrame = colFrame->GetNextSibling();
       }
     }
-    colGroupFrame = NS_STATIC_CAST(nsTableColGroupFrame*,
-                                   colGroupFrame->GetNextSibling());
+    colGroupFrame = static_cast<nsTableColGroupFrame*>
+                               (colGroupFrame->GetNextSibling());
   }
 }
 
diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp
index 4e9d44d92a3..423dfa87958 100644
--- a/mozilla/layout/tables/nsTableFrame.cpp
+++ b/mozilla/layout/tables/nsTableFrame.cpp
@@ -171,7 +171,7 @@ nsTableFrame::GetParentStyleContextFrame(nsPresContext* aPresContext,
     return NS_OK;
   }
     
-  return NS_STATIC_CAST(nsFrame*, mParent)->
+  return static_cast<nsFrame*>(mParent)->
           DoGetParentStyleContextFrame(aPresContext, aProviderFrame, aIsChild);
 }
 
@@ -205,7 +205,7 @@ nsTableFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(NS_GET_IID(nsITableLayout))) {
-    *aInstancePtr = NS_STATIC_CAST(nsITableLayout*, this);
+    *aInstancePtr = static_cast<nsITableLayout*>(this);
     return NS_OK;
   }
 
@@ -899,7 +899,7 @@ nsTableFrame::DidResizeColumns()
     return; // already marked
 
   for (nsTableFrame *f = this; f;
-       f = NS_STATIC_CAST(nsTableFrame*, f->GetNextInFlow()))
+       f = static_cast<nsTableFrame*>(f->GetNextInFlow()))
     f->mBits.mResizedColumns = PR_TRUE;
 }
 
@@ -945,7 +945,7 @@ nsTableFrame::DestroyAnonymousColFrames(PRInt32 aNumFrames)
     nsTableColFrame* colFrame = GetColFrame(colX);
     if (colFrame && (eColAnonymousCell == colFrame->GetColType())) {
       nsTableColGroupFrame* cgFrame =
-        NS_STATIC_CAST(nsTableColGroupFrame*, colFrame->GetParent());
+        static_cast<nsTableColGroupFrame*>(colFrame->GetParent());
       // remove the frame from the colgroup
       cgFrame->RemoveChild(*colFrame, PR_FALSE);
       // remove the frame from the cache, but not the cell map 
@@ -1281,7 +1281,7 @@ public:
   // the table frame, so allow this display element to blow out to our
   // overflow rect.
   virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder) {
-    return NS_STATIC_CAST(nsTableFrame*, mFrame)->GetOverflowRect() +
+    return static_cast<nsTableFrame*>(mFrame)->GetOverflowRect() +
       aBuilder->ToReferenceFrame(mFrame);
   }
   NS_DISPLAY_DECL_NAME("TableBorderBackground")
@@ -1291,7 +1291,7 @@ void
 nsDisplayTableBorderBackground::Paint(nsDisplayListBuilder* aBuilder,
     nsIRenderingContext* aCtx, const nsRect& aDirtyRect)
 {
-  NS_STATIC_CAST(nsTableFrame*, mFrame)->
+  static_cast<nsTableFrame*>(mFrame)->
     PaintTableBorderBackground(*aCtx, aDirtyRect,
                                aBuilder->ToReferenceFrame(mFrame));
 }
@@ -1584,7 +1584,7 @@ ProcessRowInserted(nsTableFrame&   aTableFrame,
 /* virtual */ void
 nsTableFrame::MarkIntrinsicWidthsDirty()
 {
-  NS_STATIC_CAST(nsTableFrame*, GetFirstInFlow())->
+  static_cast<nsTableFrame*>(GetFirstInFlow())->
     mTableLayoutStrategy->MarkIntrinsicWidthsDirty();
 
   // XXXldb Call SetBCDamageArea?
@@ -1882,7 +1882,7 @@ NS_METHOD nsTableFrame::Reflow(nsPresContext*          aPresContext,
     nsIFrame* lastChildReflowed = nsnull;
 
     nsHTMLReflowState &mutable_rs =
-      NS_CONST_CAST(nsHTMLReflowState&, aReflowState);
+      const_cast<nsHTMLReflowState&>(aReflowState);
     PRBool oldSpecialHeightReflow = mutable_rs.mFlags.mSpecialHeightReflow;
     mutable_rs.mFlags.mSpecialHeightReflow = PR_FALSE;
 
@@ -2480,7 +2480,7 @@ nsMargin
 nsTableFrame::GetOuterBCBorder() const
 {
   if (NeedToCalcBCBorders())
-    NS_CONST_CAST(nsTableFrame*, this)->CalcBCBorders();
+    const_cast<nsTableFrame*>(this)->CalcBCBorders();
 
   nsMargin border(0, 0, 0, 0);
   PRInt32 p2t = nsPresContext::AppUnitsPerCSSPixel();
@@ -4046,8 +4046,8 @@ BCMapCellIterator::SetInfo(nsTableRowFrame* aRow,
     aCellInfo.cell = (nsBCTableCellFrame*)aCellData->GetCellFrame(); 
     if (aCellInfo.cell) {
       if (!aCellInfo.topRow) {
-        aCellInfo.topRow = NS_STATIC_CAST(nsTableRowFrame*,
-                                          aCellInfo.cell->GetParent());
+        aCellInfo.topRow = static_cast<nsTableRowFrame*>
+                                      (aCellInfo.cell->GetParent());
         if (!aCellInfo.topRow) ABORT0();
         aCellInfo.rowIndex = aCellInfo.topRow->GetRowIndex();
       }
@@ -4101,8 +4101,8 @@ BCMapCellIterator::SetInfo(nsTableRowFrame* aRow,
   }
 
   // col group frame info
-  aCellInfo.cg = NS_STATIC_CAST(nsTableColGroupFrame*,
-                                aCellInfo.leftCol->GetParent());
+  aCellInfo.cg = static_cast<nsTableColGroupFrame*>
+                            (aCellInfo.leftCol->GetParent());
   PRInt32 cgStart  = aCellInfo.cg->GetStartColumnIndex();
   PRInt32 cgEnd    = PR_MAX(0, cgStart + aCellInfo.cg->GetColCount() - 1);
   aCellInfo.cgLeft  = (cgStart == aColIndex);
@@ -6582,7 +6582,7 @@ DestroyCoordFunc(void*           aFrame,
                  void*           aPropertyValue,
                  void*           aDtorData)
 {
-  delete NS_STATIC_CAST(nscoord*, aPropertyValue);
+  delete static_cast<nscoord*>(aPropertyValue);
 }
 
 // Destructor function point properties
@@ -6592,7 +6592,7 @@ DestroyPointFunc(void*           aFrame,
                  void*           aPropertyValue,
                  void*           aDtorData)
 {
-  delete NS_STATIC_CAST(nsPoint*, aPropertyValue);
+  delete static_cast<nsPoint*>(aPropertyValue);
 }
 
 // Destructor function for nscoord properties
@@ -6602,7 +6602,7 @@ DestroyBCPropertyDataFunc(void*           aFrame,
                           void*           aPropertyValue,
                           void*           aDtorData)
 {
-  delete NS_STATIC_CAST(BCPropertyData*, aPropertyValue);
+  delete static_cast<BCPropertyData*>(aPropertyValue);
 }
 
 void*
@@ -6685,15 +6685,15 @@ nsTableFrame::DumpTableFrames(nsIFrame* aFrame)
   nsTableFrame* tableFrame = nsnull;
 
   if (nsGkAtoms::tableFrame == aFrame->GetType()) { 
-    tableFrame = NS_STATIC_CAST(nsTableFrame*, aFrame);
+    tableFrame = static_cast<nsTableFrame*>(aFrame);
   }
   else {
     tableFrame = nsTableFrame::GetTableFrame(aFrame);
   }
-  tableFrame = NS_STATIC_CAST(nsTableFrame*, tableFrame->GetFirstInFlow());
+  tableFrame = static_cast<nsTableFrame*>(tableFrame->GetFirstInFlow());
   while (tableFrame) {
     DumpTableFramesRecur(tableFrame, 0);
-    tableFrame = NS_STATIC_CAST(nsTableFrame*, tableFrame->GetNextInFlow());
+    tableFrame = static_cast<nsTableFrame*>(tableFrame->GetNextInFlow());
   }
 }
 #endif
diff --git a/mozilla/layout/tables/nsTableFrame.h b/mozilla/layout/tables/nsTableFrame.h
index b56e1822372..ee3a683ac0e 100644
--- a/mozilla/layout/tables/nsTableFrame.h
+++ b/mozilla/layout/tables/nsTableFrame.h
@@ -527,7 +527,7 @@ protected:
                                    nsMargin             aBorderPadding);
 
   nsITableLayoutStrategy* LayoutStrategy() {
-    return NS_STATIC_CAST(nsTableFrame*, GetFirstInFlow())->
+    return static_cast<nsTableFrame*>(GetFirstInFlow())->
       mTableLayoutStrategy;
   }
 
@@ -854,7 +854,7 @@ inline PRBool nsTableFrame::NeedColSpanExpansion() const
 
 inline nsFrameList& nsTableFrame::GetColGroups()
 {
-  return NS_STATIC_CAST(nsTableFrame*, GetFirstInFlow())->mColGroups;
+  return static_cast<nsTableFrame*>(GetFirstInFlow())->mColGroups;
 }
 
 inline nsVoidArray& nsTableFrame::GetColCache()
diff --git a/mozilla/layout/tables/nsTableOuterFrame.cpp b/mozilla/layout/tables/nsTableOuterFrame.cpp
index 1b40c497664..cacdba96447 100644
--- a/mozilla/layout/tables/nsTableOuterFrame.cpp
+++ b/mozilla/layout/tables/nsTableOuterFrame.cpp
@@ -144,7 +144,7 @@ NS_IMETHODIMP nsTableCaptionFrame::GetAccessible(nsIAccessible** aAccessible)
   if (!GetRect().IsEmpty()) {
     nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
     if (accService) {
-      return accService->CreateHTMLCaptionAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+      return accService->CreateHTMLCaptionAccessible(static_cast<nsIFrame*>(this), aAccessible);
     }
   }
 
@@ -186,7 +186,7 @@ nsTableOuterFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(NS_GET_IID(nsITableLayout))) {
-    *aInstancePtr = NS_STATIC_CAST(nsITableLayout*, this);
+    *aInstancePtr = static_cast<nsITableLayout*>(this);
     return NS_OK;
   }
 
@@ -199,7 +199,7 @@ NS_IMETHODIMP nsTableOuterFrame::GetAccessible(nsIAccessible** aAccessible)
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    return accService->CreateHTMLTableAccessible(NS_STATIC_CAST(nsIFrame*, this), aAccessible);
+    return accService->CreateHTMLTableAccessible(static_cast<nsIFrame*>(this), aAccessible);
   }
 
   return NS_ERROR_FAILURE;
@@ -1268,7 +1268,7 @@ NS_METHOD nsTableOuterFrame::Reflow(nsPresContext*           aPresContext,
                      innerMargin, captionSize, captionMargin, captionOrigin);
     if (reflowCaption) {
       nsHTMLReflowState *captionRS =
-        NS_STATIC_CAST(nsHTMLReflowState*, (void*)captionRSSpace);
+        static_cast<nsHTMLReflowState*>((void*)captionRSSpace);
       FinishReflowChild(mCaptionFrame, aPresContext, captionRS, captionMet,
                         captionOrigin.x, captionOrigin.y, 0);
       captionRS->~nsHTMLReflowState();
@@ -1285,7 +1285,7 @@ NS_METHOD nsTableOuterFrame::Reflow(nsPresContext*           aPresContext,
                  captionMargin, innerSize, innerMargin, innerOrigin);
   if (reflowInner) {
     nsHTMLReflowState *innerRS =
-      NS_STATIC_CAST(nsHTMLReflowState*, (void*) innerRSSpace);
+      static_cast<nsHTMLReflowState*>((void*) innerRSSpace);
     FinishReflowChild(mInnerTableFrame, aPresContext, innerRS, innerMet,
                       innerOrigin.x, innerOrigin.y, 0);
     innerRS->~nsHTMLReflowState();
@@ -1334,8 +1334,8 @@ void nsTableOuterFrame::DeleteChildsNextInFlow(nsPresContext* aPresContext,
     return;
   }
 
-  nsTableOuterFrame* parent = NS_STATIC_CAST(nsTableOuterFrame*,
-                                             nextInFlow->GetParent());
+  nsTableOuterFrame* parent = static_cast<nsTableOuterFrame*>
+                                         (nextInFlow->GetParent());
   if (!parent) {
     NS_ASSERTION(PR_FALSE, "null parent");
     return;
diff --git a/mozilla/layout/tables/nsTablePainter.cpp b/mozilla/layout/tables/nsTablePainter.cpp
index d3396ebfc1b..c0dbec76203 100644
--- a/mozilla/layout/tables/nsTablePainter.cpp
+++ b/mozilla/layout/tables/nsTablePainter.cpp
@@ -378,8 +378,8 @@ TableBackgroundPainter::PaintTable(nsTableFrame* aTableFrame,
        right border is the next one's left border.*/
     //Start with table's left border.
     nscoord lastLeftBorder = aTableFrame->GetContinuousLeftBCBorderWidth();
-    for (nsTableColGroupFrame* cgFrame = NS_STATIC_CAST(nsTableColGroupFrame*, colGroupList.FirstChild());
-         cgFrame; cgFrame = NS_STATIC_CAST(nsTableColGroupFrame*, cgFrame->GetNextSibling())) {
+    for (nsTableColGroupFrame* cgFrame = static_cast<nsTableColGroupFrame*>(colGroupList.FirstChild());
+         cgFrame; cgFrame = static_cast<nsTableColGroupFrame*>(cgFrame->GetNextSibling())) {
 
       if (cgFrame->GetColCount() < 1) {
         //No columns, no cells, so no need for data
@@ -406,7 +406,7 @@ TableBackgroundPainter::PaintTable(nsTableFrame* aTableFrame,
       
       /*Loop over columns in this colgroup*/
       for (nsTableColFrame* col = cgFrame->GetFirstColumn(); col;
-           col = NS_STATIC_CAST(nsTableColFrame*, col->GetNextSibling())) {
+           col = static_cast<nsTableColFrame*>(col->GetNextSibling())) {
         /*Create data struct for column*/
         PRUint32 colIndex = col->GetColIndex();
         NS_ASSERTION(colIndex < mNumCols, "prevent array boundary violation");
@@ -506,7 +506,7 @@ TableBackgroundPainter::PaintRowGroup(nsTableRowGroupFrame* aFrame,
   }
 
   // It's OK if cursor is null here.
-  nsTableRowFrame* row = NS_STATIC_CAST(nsTableRowFrame*, cursor);  
+  nsTableRowFrame* row = static_cast<nsTableRowFrame*>(cursor);  
   if (!row) {
     // No useful cursor; just start at the top.  Don't bother to set up a
     // cursor; if we've gotten this far then we've already built the display
@@ -560,7 +560,7 @@ TableBackgroundPainter::PaintRow(nsTableRowFrame* aFrame,
         border.bottom = nextRow->GetOuterTopContBCBorderWidth();
       }
       else { //acquire rg's bottom border
-        nsTableRowGroupFrame* rowGroup = NS_STATIC_CAST(nsTableRowGroupFrame*, aFrame->GetParent());
+        nsTableRowGroupFrame* rowGroup = static_cast<nsTableRowGroupFrame*>(aFrame->GetParent());
         rowGroup->GetContinuousBCBorderWidth(border);
       }
       //get the rest of the borders; will overwrite all but bottom
diff --git a/mozilla/layout/tables/nsTableRowFrame.cpp b/mozilla/layout/tables/nsTableRowFrame.cpp
index 9bd6db9ae1d..886338dfd26 100644
--- a/mozilla/layout/tables/nsTableRowFrame.cpp
+++ b/mozilla/layout/tables/nsTableRowFrame.cpp
@@ -549,7 +549,7 @@ public:
     // the overflow rect contains any row-spanning cells, so it contains
     // our background. Note that this means we may not be opaque even if
     // the background style is a solid color.
-    return NS_STATIC_CAST(nsTableRowFrame*, mFrame)->GetOverflowRect() +
+    return static_cast<nsTableRowFrame*>(mFrame)->GetOverflowRect() +
       aBuilder->ToReferenceFrame(mFrame);
   }
   virtual void Paint(nsDisplayListBuilder* aBuilder, nsIRenderingContext* aCtx,
@@ -568,7 +568,7 @@ nsDisplayTableRowBackground::Paint(nsDisplayListBuilder* aBuilder,
                                  TableBackgroundPainter::eOrigin_TableRow,
                                  mFrame->PresContext(), *aCtx,
                                  aDirtyRect - pt);
-  painter.PaintRow(NS_STATIC_CAST(nsTableRowFrame*, mFrame));
+  painter.PaintRow(static_cast<nsTableRowFrame*>(mFrame));
 }
 
 NS_IMETHODIMP
@@ -815,7 +815,7 @@ nsTableRowFrame::ReflowChildren(nsPresContext*          aPresContext,
       continue;
     }
 
-    nsTableCellFrame* cellFrame = NS_STATIC_CAST(nsTableCellFrame*, kidFrame);
+    nsTableCellFrame* cellFrame = static_cast<nsTableCellFrame*>(kidFrame);
 
     // See if we should only reflow the dirty child frames
     PRBool doReflowChild = PR_TRUE;
@@ -1101,7 +1101,7 @@ nsTableRowFrame::CollapseRowIfNecessary(nscoord aRowOffset,
 {
   const nsStyleVisibility* rowVis = GetStyleVisibility();
   PRBool collapseRow = (NS_STYLE_VISIBILITY_COLLAPSE == rowVis->mVisible);
-  nsTableFrame* tableFrame = NS_STATIC_CAST(nsTableFrame*, nsTableFrame::GetTableFrame(this)->GetFirstInFlow());
+  nsTableFrame* tableFrame = static_cast<nsTableFrame*>(nsTableFrame::GetTableFrame(this)->GetFirstInFlow());
   if (!tableFrame)
       return 0;
   if (collapseRow) {
@@ -1351,7 +1351,7 @@ void nsTableRowFrame::InitHasCellWithStyleHeight(nsTableFrame* aTableFrame)
       NS_NOTREACHED("Table row has a non-cell child.");
       continue;
     }
-    nsTableCellFrame* cellFrame = NS_STATIC_CAST(nsTableCellFrame*, kidFrame);
+    nsTableCellFrame* cellFrame = static_cast<nsTableCellFrame*>(kidFrame);
     // Ignore row-spanning cells
     if (aTableFrame->GetEffectiveRowSpan(*cellFrame) == 1 &&
         cellFrame->GetStylePosition()->mHeight.GetUnit() != eStyleUnit_Auto) {
diff --git a/mozilla/layout/tables/nsTableRowGroupFrame.cpp b/mozilla/layout/tables/nsTableRowGroupFrame.cpp
index ea6571aaa14..ba4e9ee537a 100644
--- a/mozilla/layout/tables/nsTableRowGroupFrame.cpp
+++ b/mozilla/layout/tables/nsTableRowGroupFrame.cpp
@@ -86,7 +86,7 @@ nsTableRowGroupFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
     return NS_OK;
   }
   if (aIID.Equals(NS_GET_IID(nsILineIteratorNavigator))) {
-    *aInstancePtr = NS_STATIC_CAST(nsILineIteratorNavigator*, this);
+    *aInstancePtr = static_cast<nsILineIteratorNavigator*>(this);
     return NS_OK;
   }
 
@@ -198,7 +198,7 @@ PaintRowGroupBackground(nsIFrame* aFrame, nsIRenderingContext* aCtx,
                                  TableBackgroundPainter::eOrigin_TableRowGroup,
                                  aFrame->PresContext(), *aCtx,
                                  aDirtyRect - aPt);
-  painter.PaintRowGroup(NS_STATIC_CAST(nsTableRowGroupFrame*, aFrame));
+  painter.PaintRowGroup(static_cast<nsTableRowGroupFrame*>(aFrame));
 }
 
 // Handle the child-traversal part of DisplayGenericTablePart
@@ -207,7 +207,7 @@ DisplayRows(nsDisplayListBuilder* aBuilder, nsFrame* aFrame,
             const nsRect& aDirtyRect, const nsDisplayListSet& aLists)
 {
   nscoord overflowAbove;
-  nsTableRowGroupFrame* f = NS_STATIC_CAST(nsTableRowGroupFrame*, aFrame);
+  nsTableRowGroupFrame* f = static_cast<nsTableRowGroupFrame*>(aFrame);
   // Don't try to use the row cursor if we have to descend into placeholders;
   // we might have rows containing placeholders, where the row's overflow
   // area doesn't intersect the dirty rect but we need to descend into the row
@@ -1799,7 +1799,7 @@ static void
 DestroyFrameCursorData(void* aObject, nsIAtom* aPropertyName,
                        void* aPropertyValue, void* aData)
 {
-  delete NS_STATIC_CAST(nsTableRowGroupFrame::FrameCursorData*, aPropertyValue);
+  delete static_cast<nsTableRowGroupFrame::FrameCursorData*>(aPropertyValue);
 }
 
 void
@@ -1849,8 +1849,8 @@ nsTableRowGroupFrame::GetFirstRowContaining(nscoord aY, nscoord* aOverflowAbove)
   if (!(GetStateBits() & NS_ROWGROUP_HAS_ROW_CURSOR))
     return nsnull;
 
-  FrameCursorData* property = NS_STATIC_CAST(FrameCursorData*,
-    GetProperty(nsGkAtoms::rowCursorProperty));
+  FrameCursorData* property = static_cast<FrameCursorData*>
+                                         (GetProperty(nsGkAtoms::rowCursorProperty));
   PRUint32 cursorIndex = property->mCursorIndex;
   PRUint32 frameCount = property->mFrames.Length();
   if (cursorIndex >= frameCount)
diff --git a/mozilla/layout/xul/base/src/nsBox.cpp b/mozilla/layout/xul/base/src/nsBox.cpp
index 430e3563708..bda7d16f725 100644
--- a/mozilla/layout/xul/base/src/nsBox.cpp
+++ b/mozilla/layout/xul/base/src/nsBox.cpp
@@ -91,7 +91,7 @@ nsBox::ListBox(nsAutoString& aResult)
     GetBoxName(name);
 
     char addr[100];
-    sprintf(addr, "[@%p] ", NS_STATIC_CAST(void*, this));
+    sprintf(addr, "[@%p] ", static_cast<void*>(this));
 
     aResult.AppendASCII(addr);
     aResult.Append(name);
@@ -555,7 +555,7 @@ nsIFrame::Layout(nsBoxLayoutState& aState)
 {
   NS_ASSERTION(aState.GetRenderingContext(), "must have rendering context");
 
-  nsBox *box = NS_STATIC_CAST(nsBox*, this);
+  nsBox *box = static_cast<nsBox*>(this);
   DISPLAY_LAYOUT(box);
 
   box->BeginLayout(aState);
diff --git a/mozilla/layout/xul/base/src/nsBoxFrame.cpp b/mozilla/layout/xul/base/src/nsBoxFrame.cpp
index 6350e95e088..cb049710c98 100644
--- a/mozilla/layout/xul/base/src/nsBoxFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsBoxFrame.cpp
@@ -1237,7 +1237,7 @@ public:
 #endif
 
   virtual nsIFrame* HitTest(nsDisplayListBuilder* aBuilder, nsPoint aPt) {
-    NS_STATIC_CAST(nsBoxFrame*, mFrame)->
+    static_cast<nsBoxFrame*>(mFrame)->
       DisplayDebugInfoFor(this, aPt - aBuilder->ToReferenceFrame(mFrame));
     return PR_TRUE;
   }
@@ -1250,7 +1250,7 @@ void
 nsDisplayXULDebug::Paint(nsDisplayListBuilder* aBuilder,
      nsIRenderingContext* aCtx, const nsRect& aDirtyRect)
 {
-  NS_STATIC_CAST(nsBoxFrame*, mFrame)->
+  static_cast<nsBoxFrame*>(mFrame)->
     PaintXULDebugOverlay(*aCtx, aBuilder->ToReferenceFrame(mFrame));
 }
 
@@ -1258,7 +1258,7 @@ static void
 PaintXULDebugBackground(nsIFrame* aFrame, nsIRenderingContext* aCtx,
                         const nsRect& aDirtyRect, nsPoint aPt)
 {
-  NS_STATIC_CAST(nsBoxFrame*, aFrame)->PaintXULDebugBackground(*aCtx, aPt);
+  static_cast<nsBoxFrame*>(aFrame)->PaintXULDebugBackground(*aCtx, aPt);
 }
 #endif
 
diff --git a/mozilla/layout/xul/base/src/nsGroupBoxFrame.cpp b/mozilla/layout/xul/base/src/nsGroupBoxFrame.cpp
index 4f58e3f24dd..4be5916b0cb 100644
--- a/mozilla/layout/xul/base/src/nsGroupBoxFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsGroupBoxFrame.cpp
@@ -121,7 +121,7 @@ void
 nsDisplayXULGroupBackground::Paint(nsDisplayListBuilder* aBuilder,
      nsIRenderingContext* aCtx, const nsRect& aDirtyRect)
 {
-  NS_STATIC_CAST(nsGroupBoxFrame*, mFrame)->
+  static_cast<nsGroupBoxFrame*>(mFrame)->
     PaintBorderBackground(*aCtx, aBuilder->ToReferenceFrame(mFrame), aDirtyRect);
 }
 
diff --git a/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp b/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp
index 03a7ee6b0d5..a0919008a78 100644
--- a/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsImageBoxFrame.cpp
@@ -210,7 +210,7 @@ nsImageBoxFrame::Destroy()
     mImageRequest->Cancel(NS_ERROR_FAILURE);
 
   if (mListener)
-    NS_REINTERPRET_CAST(nsImageBoxListener*, mListener.get())->SetFrame(nsnull); // set the frame to null so we don't send messages to a dead object.
+    reinterpret_cast<nsImageBoxListener*>(mListener.get())->SetFrame(nsnull); // set the frame to null so we don't send messages to a dead object.
 
   nsLeafBoxFrame::Destroy();
 }
@@ -331,7 +331,7 @@ public:
 void nsDisplayXULImage::Paint(nsDisplayListBuilder* aBuilder,
      nsIRenderingContext* aCtx, const nsRect& aDirtyRect)
 {
-  NS_STATIC_CAST(nsImageBoxFrame*, mFrame)->
+  static_cast<nsImageBoxFrame*>(mFrame)->
     PaintImage(*aCtx, aDirtyRect, aBuilder->ToReferenceFrame(mFrame));
 }
 
diff --git a/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp b/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp
index 5e8687ee791..23b61b71bd1 100644
--- a/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp
@@ -1094,7 +1094,7 @@ nsListBoxBodyFrame::GetFirstItemBox(PRInt32 aOffset, PRBool* aCreated)
   mBottomFrame = mTopFrame;
 
   if (mTopFrame) {
-    return mTopFrame->IsBoxFrame() ? NS_STATIC_CAST(nsIBox*, mTopFrame) : nsnull;
+    return mTopFrame->IsBoxFrame() ? static_cast<nsIBox*>(mTopFrame) : nsnull;
   }
 
   // top frame was cleared out
@@ -1102,7 +1102,7 @@ nsListBoxBodyFrame::GetFirstItemBox(PRInt32 aOffset, PRBool* aCreated)
   mBottomFrame = mTopFrame;
 
   if (mTopFrame && mRowsToPrepend <= 0) {
-    return mTopFrame->IsBoxFrame() ? NS_STATIC_CAST(nsIBox*, mTopFrame) : nsnull;
+    return mTopFrame->IsBoxFrame() ? static_cast<nsIBox*>(mTopFrame) : nsnull;
   }
 
   // At this point, we either have no frames at all, 
@@ -1144,7 +1144,7 @@ nsListBoxBodyFrame::GetFirstItemBox(PRInt32 aOffset, PRBool* aCreated)
 
       mBottomFrame = mTopFrame;
 
-      return mTopFrame->IsBoxFrame() ? NS_STATIC_CAST(nsIBox*, mTopFrame) : nsnull;
+      return mTopFrame->IsBoxFrame() ? static_cast<nsIBox*>(mTopFrame) : nsnull;
     } else
       return GetFirstItemBox(++aOffset, 0);
   }
diff --git a/mozilla/layout/xul/base/src/nsListBoxLayout.cpp b/mozilla/layout/xul/base/src/nsListBoxLayout.cpp
index 9e755c50fa3..08ad0e756d8 100644
--- a/mozilla/layout/xul/base/src/nsListBoxLayout.cpp
+++ b/mozilla/layout/xul/base/src/nsListBoxLayout.cpp
@@ -61,7 +61,7 @@ nsListBoxLayout::GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState, ns
 {
   nsresult rv = nsGridRowGroupLayout::GetPrefSize(aBox, aBoxLayoutState, aSize);
 
-  nsListBoxBodyFrame* frame = NS_STATIC_CAST(nsListBoxBodyFrame*, aBox);
+  nsListBoxBodyFrame* frame = static_cast<nsListBoxBodyFrame*>(aBox);
   if (frame) {
     nscoord rowheight = frame->GetRowHeightAppUnits();
     aSize.height = frame->GetRowCount() * rowheight;
@@ -87,7 +87,7 @@ nsListBoxLayout::GetMinSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState, nsS
 {
   nsresult rv = nsGridRowGroupLayout::GetMinSize(aBox, aBoxLayoutState, aSize);
 
-  nsListBoxBodyFrame* frame = NS_STATIC_CAST(nsListBoxBodyFrame*, aBox);
+  nsListBoxBodyFrame* frame = static_cast<nsListBoxBodyFrame*>(aBox);
   if (frame) {
     nscoord rowheight = frame->GetRowHeightAppUnits();
     aSize.height = frame->GetRowCount() * rowheight;
@@ -113,7 +113,7 @@ nsListBoxLayout::GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState, nsS
 {
   nsresult rv = nsGridRowGroupLayout::GetMaxSize(aBox, aBoxLayoutState, aSize);
 
-  nsListBoxBodyFrame* frame = NS_STATIC_CAST(nsListBoxBodyFrame*, aBox);
+  nsListBoxBodyFrame* frame = static_cast<nsListBoxBodyFrame*>(aBox);
   if (frame) {
     nscoord rowheight = frame->GetRowHeightAppUnits();
     aSize.height = frame->GetRowCount() * rowheight;
@@ -131,7 +131,7 @@ nsListBoxLayout::GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aBoxLayoutState, nsS
 NS_IMETHODIMP
 nsListBoxLayout::Layout(nsIBox* aBox, nsBoxLayoutState& aState)
 {
-  nsListBoxBodyFrame* frame = NS_STATIC_CAST(nsListBoxBodyFrame*, aBox);
+  nsListBoxBodyFrame* frame = static_cast<nsListBoxBodyFrame*>(aBox);
 
   // Always ensure an accurate scrollview position
   // This is an edge case that was caused by the row height
@@ -165,7 +165,7 @@ nsListBoxLayout::LayoutInternal(nsIBox* aBox, nsBoxLayoutState& aState)
   PRInt32 redrawStart = -1;
 
   // Get the start y position.
-  nsListBoxBodyFrame* body = NS_STATIC_CAST(nsListBoxBodyFrame*, aBox);
+  nsListBoxBodyFrame* body = static_cast<nsListBoxBodyFrame*>(aBox);
   if (!body) {
     NS_ERROR("Frame encountered that isn't a listboxbody!\n");
     return NS_ERROR_FAILURE;
diff --git a/mozilla/layout/xul/base/src/nsMenuBarFrame.cpp b/mozilla/layout/xul/base/src/nsMenuBarFrame.cpp
index 63dd3d2eda7..15df2a0a7d6 100644
--- a/mozilla/layout/xul/base/src/nsMenuBarFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsMenuBarFrame.cpp
@@ -279,7 +279,7 @@ nsMenuBarFrame::FindMenuWithShortcut(nsIDOMKeyEvent* aKeyEvent)
                                 nsCaseInsensitiveStringComparator()) )  {
           // We match!
           return (currFrame->GetType() == nsGkAtoms::menuFrame) ?
-                 NS_STATIC_CAST(nsMenuFrame *, currFrame) : nsnull;
+                 static_cast<nsMenuFrame *>(currFrame) : nsnull;
         }
       }
     }
diff --git a/mozilla/layout/xul/base/src/nsMenuBoxObject.cpp b/mozilla/layout/xul/base/src/nsMenuBoxObject.cpp
index 41daa3d5e09..3ca80a858bb 100644
--- a/mozilla/layout/xul/base/src/nsMenuBoxObject.cpp
+++ b/mozilla/layout/xul/base/src/nsMenuBoxObject.cpp
@@ -69,7 +69,7 @@ nsMenuBoxObject::QueryInterface(REFNSIID iid, void** aResult)
   NS_PRECONDITION(aResult, "null out param");
 
   if (iid.Equals(NS_GET_IID(nsIMenuBoxObject))) {
-    *aResult = NS_STATIC_CAST(nsIMenuBoxObject*, this);
+    *aResult = static_cast<nsIMenuBoxObject*>(this);
     NS_ADDREF(this);
     return NS_OK;
   }
@@ -99,7 +99,7 @@ NS_IMETHODIMP nsMenuBoxObject::OpenMenu(PRBool aOpenFlag)
       }
       else {
         if (frame->GetType() == nsGkAtoms::menuFrame) {
-          nsMenuPopupFrame* popupFrame = (NS_STATIC_CAST(nsMenuFrame *, frame))->GetPopup();
+          nsMenuPopupFrame* popupFrame = (static_cast<nsMenuFrame *>(frame))->GetPopup();
           if (popupFrame)
             pm->HidePopup(popupFrame->GetContent(), PR_FALSE, PR_TRUE, PR_FALSE);
         }
@@ -115,7 +115,7 @@ NS_IMETHODIMP nsMenuBoxObject::GetActiveChild(nsIDOMElement** aResult)
   *aResult = nsnull;
   nsIFrame* frame = GetFrame(PR_FALSE);
   if (frame && frame->GetType() == nsGkAtoms::menuFrame)
-    return NS_STATIC_CAST(nsMenuFrame *, frame)->GetActiveChild(aResult);
+    return static_cast<nsMenuFrame *>(frame)->GetActiveChild(aResult);
   return NS_OK;
 }
 
@@ -123,7 +123,7 @@ NS_IMETHODIMP nsMenuBoxObject::SetActiveChild(nsIDOMElement* aResult)
 {
   nsIFrame* frame = GetFrame(PR_FALSE);
   if (frame && frame->GetType() == nsGkAtoms::menuFrame)
-    return NS_STATIC_CAST(nsMenuFrame *, frame)->SetActiveChild(aResult);
+    return static_cast<nsMenuFrame *>(frame)->SetActiveChild(aResult);
   return NS_OK;
 }
 
@@ -154,7 +154,7 @@ NS_IMETHODIMP nsMenuBoxObject::HandleKeyPress(nsIDOMKeyEvent* aKeyEvent, PRBool*
   if (!frame || frame->GetType() != nsGkAtoms::menuFrame)
     return NS_OK;
 
-  nsMenuPopupFrame* popupFrame = NS_STATIC_CAST(nsMenuFrame *, frame)->GetPopup();
+  nsMenuPopupFrame* popupFrame = static_cast<nsMenuFrame *>(frame)->GetPopup();
   if (!popupFrame)
     return NS_OK;
 
diff --git a/mozilla/layout/xul/base/src/nsMenuFrame.cpp b/mozilla/layout/xul/base/src/nsMenuFrame.cpp
index 3f1f4d30efd..ef5042adfe0 100644
--- a/mozilla/layout/xul/base/src/nsMenuFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsMenuFrame.cpp
@@ -155,7 +155,7 @@ NS_IMETHODIMP
 nsMenuFrame::SetParent(const nsIFrame* aParent)
 {
   nsBoxFrame::SetParent(aParent);
-  InitMenuParent(NS_CONST_CAST(nsIFrame *, aParent));
+  InitMenuParent(const_cast<nsIFrame *>(aParent));
   return NS_OK;
 }
 
@@ -165,11 +165,11 @@ nsMenuFrame::InitMenuParent(nsIFrame* aParent)
   while (aParent) {
     nsIAtom* type = aParent->GetType();
     if (type == nsGkAtoms::menuPopupFrame) {
-      mMenuParent = NS_STATIC_CAST(nsMenuPopupFrame *, aParent);
+      mMenuParent = static_cast<nsMenuPopupFrame *>(aParent);
       break;
     }
     else if (type == nsGkAtoms::menuBarFrame) {
-      mMenuParent = NS_STATIC_CAST(nsMenuBarFrame *, aParent);
+      mMenuParent = static_cast<nsMenuBarFrame *>(aParent);
       break;
     }
     aParent = aParent->GetParent();
@@ -188,7 +188,7 @@ public:
     PRBool shouldFlush = PR_FALSE;
     if (mWeakFrame.IsAlive()) {
       if (mWeakFrame.GetFrame()->GetType() == nsGkAtoms::menuFrame) {
-        nsMenuFrame* menu = NS_STATIC_CAST(nsMenuFrame*, mWeakFrame.GetFrame());
+        nsMenuFrame* menu = static_cast<nsMenuFrame*>(mWeakFrame.GetFrame());
         menu->UpdateMenuType(menu->PresContext());
         shouldFlush = PR_TRUE;
       }
@@ -384,7 +384,7 @@ nsMenuFrame::HandleEvent(nsPresContext* aPresContext,
   }
   else if (aEvent->eventStructType == NS_MOUSE_EVENT &&
            aEvent->message == NS_MOUSE_BUTTON_DOWN &&
-           NS_STATIC_CAST(nsMouseEvent*, aEvent)->button == nsMouseEvent::eLeftButton &&
+           static_cast<nsMouseEvent*>(aEvent)->button == nsMouseEvent::eLeftButton &&
            !IsDisabled() && IsMenu()) {
     // The menu item was selected. Bring up the menu.
     // We have children.
@@ -400,7 +400,7 @@ nsMenuFrame::HandleEvent(nsPresContext* aPresContext,
 #ifndef NSCONTEXTMENUISMOUSEUP
            (aEvent->eventStructType == NS_MOUSE_EVENT &&
             aEvent->message == NS_MOUSE_BUTTON_UP &&
-            NS_STATIC_CAST(nsMouseEvent*, aEvent)->button ==
+            static_cast<nsMouseEvent*>(aEvent)->button ==
               nsMouseEvent::eRightButton) &&
 #else
             aEvent->message == NS_CONTEXTMENU &&
@@ -423,7 +423,7 @@ nsMenuFrame::HandleEvent(nsPresContext* aPresContext,
   }
   else if (aEvent->eventStructType == NS_MOUSE_EVENT &&
            aEvent->message == NS_MOUSE_BUTTON_UP &&
-           NS_STATIC_CAST(nsMouseEvent*, aEvent)->button == nsMouseEvent::eLeftButton &&
+           static_cast<nsMouseEvent*>(aEvent)->button == nsMouseEvent::eLeftButton &&
            !IsMenu() && !IsDisabled()) {
     // Execute the execute event handler.
     Execute(aEvent);
@@ -918,7 +918,7 @@ nsMenuFrame::UpdateMenuSpecialState(nsPresContext* aPresContext)
 
   while (sib) {
     if (sib != this && sib->GetType() == nsGkAtoms::menuFrame) {
-      nsMenuFrame* menu = NS_STATIC_CAST(nsMenuFrame*, sib);
+      nsMenuFrame* menu = static_cast<nsMenuFrame*>(sib);
       if (menu->GetMenuType() == eMenuType_Radio &&
           menu->IsChecked() &&
           (menu->GetRadioGroupName() == mGroupName)) {      
@@ -1139,7 +1139,7 @@ nsMenuFrame::InsertFrames(nsIAtom*        aListName,
   nsresult          rv;
 
   if (!mPopupFrame && aFrameList->GetType() == nsGkAtoms::menuPopupFrame) {
-    mPopupFrame = NS_STATIC_CAST(nsMenuPopupFrame *, aFrameList);
+    mPopupFrame = static_cast<nsMenuPopupFrame *>(aFrameList);
 
 #ifdef DEBUG_LAYOUT
     nsBoxLayoutState state(PresContext());
@@ -1166,7 +1166,7 @@ nsMenuFrame::AppendFrames(nsIAtom*        aListName,
   nsresult          rv;
 
   if (!mPopupFrame && aFrameList->GetType() == nsGkAtoms::menuPopupFrame) {
-    mPopupFrame = NS_STATIC_CAST(nsMenuPopupFrame *, aFrameList);
+    mPopupFrame = static_cast<nsMenuPopupFrame *>(aFrameList);
 
 #ifdef DEBUG_LAYOUT
     nsBoxLayoutState state(PresContext());
@@ -1256,7 +1256,7 @@ nsMenuFrame::SetActiveChild(nsIDOMElement* aChild)
 
   nsIFrame* kid = PresContext()->PresShell()->GetPrimaryFrameFor(child);
   if (kid && kid->GetType() == nsGkAtoms::menuFrame)
-    mPopupFrame->ChangeMenuItem(NS_STATIC_CAST(nsMenuFrame *, kid), PR_FALSE);
+    mPopupFrame->ChangeMenuItem(static_cast<nsMenuFrame *>(kid), PR_FALSE);
   return NS_OK;
 }
 
diff --git a/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp b/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp
index e80b9058271..aefe1eeb74d 100644
--- a/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp
@@ -470,7 +470,7 @@ LazyGeneratePopupDone(nsIContent* aPopup, nsIFrame* aFrame, void* aArg)
   // be safe and check the frame type
   if (aFrame->GetType() == nsGkAtoms::menuPopupFrame) {
     nsWeakFrame weakFrame(aFrame);
-    nsMenuPopupFrame* popupFrame = NS_STATIC_CAST(nsMenuPopupFrame*, aFrame);
+    nsMenuPopupFrame* popupFrame = static_cast<nsMenuPopupFrame*>(aFrame);
 
     popupFrame->SetGeneratedChildren();
 
@@ -509,7 +509,7 @@ nsMenuPopupFrame::ShowPopup(PRBool aIsContextMenu, PRBool aSelectFirstItem)
     nsIFrame* parent = GetParent();
     if (parent && parent->GetType() == nsGkAtoms::menuFrame) {
       nsWeakFrame weakFrame(this);
-      (NS_STATIC_CAST(nsMenuFrame*, parent))->PopupOpened();
+      (static_cast<nsMenuFrame*>(parent))->PopupOpened();
       if (!weakFrame.IsAlive())
         return PR_FALSE;
       PresContext()->RootPresContext()->NotifyAddedActivePopupToTop(this);
@@ -567,7 +567,7 @@ nsMenuPopupFrame::HidePopup(PRBool aDeselectMenu)
 
   nsIFrame* parent = GetParent();
   if (parent && parent->GetType() == nsGkAtoms::menuFrame) {
-    (NS_STATIC_CAST(nsMenuFrame*, parent))->PopupClosed(aDeselectMenu);
+    (static_cast<nsMenuFrame*>(parent))->PopupClosed(aDeselectMenu);
     PresContext()->RootPresContext()->NotifyRemovedActivePopup(this);
   }
 }
@@ -1439,7 +1439,7 @@ nsMenuPopupFrame::FindMenuWithShortcut(nsIDOMKeyEvent* aKeyEvent, PRBool& doActi
     return nsnull;
   }
   else {
-    PRUnichar uniChar = ToLowerCase(NS_STATIC_CAST(PRUnichar, charCode));
+    PRUnichar uniChar = ToLowerCase(static_cast<PRUnichar>(charCode));
     if (isMenu || // Menu supports only first-letter navigation
         keyTime - lastKeyTime > INC_TYP_INTERVAL) // Interval too long, treat as new typing
       mIncrementalString = uniChar;
@@ -1503,17 +1503,17 @@ nsMenuPopupFrame::FindMenuWithShortcut(nsIDOMKeyEvent* aKeyEvent, PRBool& doActi
             // There is one shortcut-key match
             matchShortcutCount++;
             // Record the matched item. If there is only one matched shortcut item, do it
-            frameShortcut = NS_STATIC_CAST(nsMenuFrame *, currFrame);
+            frameShortcut = static_cast<nsMenuFrame *>(currFrame);
           }
           if (!foundActive) {
             // It's a first candidate item located before/on the current item
             if (!frameBefore)
-              frameBefore = NS_STATIC_CAST(nsMenuFrame *, currFrame);
+              frameBefore = static_cast<nsMenuFrame *>(currFrame);
           }
           else {
             // It's a first candidate item located after the current item
             if (!frameAfter)
-              frameAfter = NS_STATIC_CAST(nsMenuFrame *, currFrame);
+              frameAfter = static_cast<nsMenuFrame *>(currFrame);
           }
         }
         else
diff --git a/mozilla/layout/xul/base/src/nsPopupBoxObject.cpp b/mozilla/layout/xul/base/src/nsPopupBoxObject.cpp
index 07f1e2fdbf9..7ffb809ac4f 100644
--- a/mozilla/layout/xul/base/src/nsPopupBoxObject.cpp
+++ b/mozilla/layout/xul/base/src/nsPopupBoxObject.cpp
@@ -68,7 +68,7 @@ protected:
   {
     nsIFrame* frame = GetFrame(PR_FALSE);
     if (frame && frame->GetType() == nsGkAtoms::menuPopupFrame)
-      return NS_STATIC_CAST(nsMenuPopupFrame*, frame);
+      return static_cast<nsMenuPopupFrame*>(frame);
     return nsnull;
   }
 };
diff --git a/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp b/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp
index 8d90a719cab..d38c4550258 100644
--- a/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp
@@ -291,7 +291,7 @@ nsPopupSetFrame::AddPopupFrame(nsIFrame* aPopup)
   }
 
   // Set the frame connection.
-  entry->mPopupFrame = NS_STATIC_CAST(nsMenuPopupFrame *, aPopup);
+  entry->mPopupFrame = static_cast<nsMenuPopupFrame *>(aPopup);
   
   return NS_OK;
 }
diff --git a/mozilla/layout/xul/base/src/nsResizerFrame.cpp b/mozilla/layout/xul/base/src/nsResizerFrame.cpp
index 7bf4aeef143..82d45318a5d 100644
--- a/mozilla/layout/xul/base/src/nsResizerFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsResizerFrame.cpp
@@ -97,7 +97,7 @@ nsResizerFrame::HandleEvent(nsPresContext* aPresContext,
 
    case NS_MOUSE_BUTTON_DOWN: {
        if (aEvent->eventStructType == NS_MOUSE_EVENT &&
-           NS_STATIC_CAST(nsMouseEvent*, aEvent)->button ==
+           static_cast<nsMouseEvent*>(aEvent)->button ==
              nsMouseEvent::eLeftButton)
        {
          // we're tracking.
@@ -121,7 +121,7 @@ nsResizerFrame::HandleEvent(nsPresContext* aPresContext,
    case NS_MOUSE_BUTTON_UP: {
 
        if(mTrackingMouseMove && aEvent->eventStructType == NS_MOUSE_EVENT &&
-          NS_STATIC_CAST(nsMouseEvent*, aEvent)->button ==
+          static_cast<nsMouseEvent*>(aEvent)->button ==
             nsMouseEvent::eLeftButton)
        {
          // we're done tracking.
diff --git a/mozilla/layout/xul/base/src/nsScrollbarButtonFrame.cpp b/mozilla/layout/xul/base/src/nsScrollbarButtonFrame.cpp
index d92ea613b03..d86426662b5 100644
--- a/mozilla/layout/xul/base/src/nsScrollbarButtonFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsScrollbarButtonFrame.cpp
@@ -73,7 +73,7 @@ nsScrollbarButtonFrame::QueryInterface(REFNSIID aIID, void** aInstancePtr)
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(NS_GET_IID(nsITimerCallback))) {                                         
-    *aInstancePtr = NS_STATIC_CAST(nsITimerCallback*, this);
+    *aInstancePtr = static_cast<nsITimerCallback*>(this);
     return NS_OK;                                                        
   }   
 
@@ -106,7 +106,7 @@ nsScrollbarButtonFrame::HandleButtonPress(nsPresContext* aPresContext,
   nsILookAndFeel::nsMetricID tmpAction;
   if (aEvent->eventStructType == NS_MOUSE_EVENT &&
       aEvent->message == NS_MOUSE_BUTTON_DOWN) {
-    PRUint16 button = NS_STATIC_CAST(nsMouseEvent*, aEvent)->button;
+    PRUint16 button = static_cast<nsMouseEvent*>(aEvent)->button;
     if (button == nsMouseEvent::eLeftButton) {
       tmpAction = nsILookAndFeel::eMetric_ScrollButtonLeftMouseButtonAction;
     } else if (button == nsMouseEvent::eMiddleButton) {
diff --git a/mozilla/layout/xul/base/src/nsSliderFrame.cpp b/mozilla/layout/xul/base/src/nsSliderFrame.cpp
index e6333323196..33955f6f707 100644
--- a/mozilla/layout/xul/base/src/nsSliderFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsSliderFrame.cpp
@@ -512,8 +512,8 @@ nsSliderFrame::HandleEvent(nsPresContext* aPresContext,
     break;
 
     case NS_MOUSE_BUTTON_UP:
-      if (NS_STATIC_CAST(nsMouseEvent*, aEvent)->button == nsMouseEvent::eLeftButton ||
-          (NS_STATIC_CAST(nsMouseEvent*, aEvent)->button == nsMouseEvent::eMiddleButton &&
+      if (static_cast<nsMouseEvent*>(aEvent)->button == nsMouseEvent::eLeftButton ||
+          (static_cast<nsMouseEvent*>(aEvent)->button == nsMouseEvent::eMiddleButton &&
            gMiddlePref)) {
         // stop capturing
         AddListener();
@@ -530,11 +530,11 @@ nsSliderFrame::HandleEvent(nsPresContext* aPresContext,
     //return nsFrame::HandleEvent(aPresContext, aEvent, aEventStatus);
     return NS_OK;
   } else if ((aEvent->message == NS_MOUSE_BUTTON_DOWN &&
-              NS_STATIC_CAST(nsMouseEvent*, aEvent)->button ==
+              static_cast<nsMouseEvent*>(aEvent)->button ==
                 nsMouseEvent::eLeftButton &&
-              NS_STATIC_CAST(nsMouseEvent*, aEvent)->isShift) ||
+              static_cast<nsMouseEvent*>(aEvent)->isShift) ||
              (gMiddlePref && aEvent->message == NS_MOUSE_BUTTON_DOWN &&
-              NS_STATIC_CAST(nsMouseEvent*, aEvent)->button ==
+              static_cast<nsMouseEvent*>(aEvent)->button ==
                 nsMouseEvent::eMiddleButton)) {
     // convert coord from twips to pixels
     nsPoint eventPoint = nsLayoutUtils::GetEventCoordinatesRelativeTo(aEvent,
@@ -765,7 +765,7 @@ nsSliderFrame::SetCurrentPositionInternal(nsIContent* aScrollbar, nscoord newpos
       if (shell) {
         nsIFrame* frame = shell->GetPrimaryFrameFor(content);
         if (frame && frame->GetType() == nsGkAtoms::sliderFrame) {
-          NS_STATIC_CAST(nsSliderFrame*, frame)->
+          static_cast<nsSliderFrame*>(frame)->
             CurrentPositionChanged(frame->PresContext(), aImmediateRedraw);
         }
       }
diff --git a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp
index fcff7caf5dd..cc6e2f44759 100644
--- a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp
@@ -476,7 +476,7 @@ nsSplitterFrame::HandleEvent(nsPresContext* aPresContext,
   
     case NS_MOUSE_BUTTON_UP:
       if (aEvent->eventStructType == NS_MOUSE_EVENT &&
-          NS_STATIC_CAST(nsMouseEvent*, aEvent)->button ==
+          static_cast<nsMouseEvent*>(aEvent)->button ==
             nsMouseEvent::eLeftButton) {
         mInner->MouseUp(aPresContext, aEvent);
       }
@@ -630,10 +630,10 @@ void
 nsSplitterFrameInner::AddListener(nsPresContext* aPresContext)
 {
   mOuter->GetContent()->
-    AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*,this),
+    AddEventListenerByIID(static_cast<nsIDOMMouseListener*>(this),
                           NS_GET_IID(nsIDOMMouseListener));
   mOuter->GetContent()->
-    AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseMotionListener*,this),
+    AddEventListenerByIID(static_cast<nsIDOMMouseMotionListener*>(this),
                           NS_GET_IID(nsIDOMMouseMotionListener));
 }
 
@@ -642,10 +642,10 @@ nsSplitterFrameInner::RemoveListener()
 {
   ENSURE_TRUE(mOuter);
   mOuter->GetContent()->
-    RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*,this),
+    RemoveEventListenerByIID(static_cast<nsIDOMMouseListener*>(this),
                              NS_GET_IID(nsIDOMMouseListener));
   mOuter->GetContent()->
-    RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseMotionListener*,this),
+    RemoveEventListenerByIID(static_cast<nsIDOMMouseMotionListener*>(this),
                              NS_GET_IID(nsIDOMMouseMotionListener));
 }
 
diff --git a/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp b/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp
index a179b43819d..40d53d8ea14 100644
--- a/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp
@@ -294,7 +294,7 @@ public:
 void nsDisplayXULTextBox::Paint(nsDisplayListBuilder* aBuilder,
      nsIRenderingContext* aCtx, const nsRect& aDirtyRect)
 {
-  NS_STATIC_CAST(nsTextBoxFrame*, mFrame)->
+  static_cast<nsTextBoxFrame*>(mFrame)->
     PaintTitle(*aCtx, aDirtyRect, aBuilder->ToReferenceFrame(mFrame));
 }
 
diff --git a/mozilla/layout/xul/base/src/nsTitleBarFrame.cpp b/mozilla/layout/xul/base/src/nsTitleBarFrame.cpp
index af475ddf19c..cfd4ef79a80 100644
--- a/mozilla/layout/xul/base/src/nsTitleBarFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsTitleBarFrame.cpp
@@ -111,7 +111,7 @@ nsTitleBarFrame::HandleEvent(nsPresContext* aPresContext,
 
    case NS_MOUSE_BUTTON_DOWN:  {
        if (aEvent->eventStructType == NS_MOUSE_EVENT &&
-           NS_STATIC_CAST(nsMouseEvent*, aEvent)->button ==
+           static_cast<nsMouseEvent*>(aEvent)->button ==
              nsMouseEvent::eLeftButton)
        {
          // titlebar has no effect in non-chrome shells
@@ -141,7 +141,7 @@ nsTitleBarFrame::HandleEvent(nsPresContext* aPresContext,
 
    case NS_MOUSE_BUTTON_UP: {
        if(mTrackingMouseMove && aEvent->eventStructType == NS_MOUSE_EVENT &&
-          NS_STATIC_CAST(nsMouseEvent*, aEvent)->button ==
+          static_cast<nsMouseEvent*>(aEvent)->button ==
             nsMouseEvent::eLeftButton)
        {
          // we're done tracking.
@@ -169,7 +169,7 @@ nsTitleBarFrame::HandleEvent(nsPresContext* aPresContext,
          // move the widget associated with the window
          if (parent) {
            nsCOMPtr<nsIWidget> widget;
-           (NS_STATIC_CAST(nsMenuPopupFrame*, parent))->
+           (static_cast<nsMenuPopupFrame*>(parent))->
              GetWidget(getter_AddRefs(widget));
            nsRect bounds;
            widget->GetScreenBounds(bounds);
diff --git a/mozilla/layout/xul/base/src/nsXULPopupManager.cpp b/mozilla/layout/xul/base/src/nsXULPopupManager.cpp
index 22ee933f4ce..92262e094c1 100644
--- a/mozilla/layout/xul/base/src/nsXULPopupManager.cpp
+++ b/mozilla/layout/xul/base/src/nsXULPopupManager.cpp
@@ -198,15 +198,15 @@ nsXULPopupManager::GetFrameOfTypeForContent(nsIContent* aContent,
 nsMenuFrame*
 nsXULPopupManager::GetMenuFrameForContent(nsIContent* aContent)
 {
-  return NS_STATIC_CAST(nsMenuFrame *,
-                        GetFrameOfTypeForContent(aContent, nsGkAtoms::menuFrame));
+  return static_cast<nsMenuFrame *>
+                    (GetFrameOfTypeForContent(aContent, nsGkAtoms::menuFrame));
 }
 
 nsMenuPopupFrame*
 nsXULPopupManager::GetPopupFrameForContent(nsIContent* aContent)
 {
-  return NS_STATIC_CAST(nsMenuPopupFrame *,
-                        GetFrameOfTypeForContent(aContent, nsGkAtoms::menuPopupFrame));
+  return static_cast<nsMenuPopupFrame *>
+                    (GetFrameOfTypeForContent(aContent, nsGkAtoms::menuPopupFrame));
 }
 
 void
@@ -371,7 +371,7 @@ nsXULPopupManager::ShowPopupCallback(nsIContent* aPopup,
     // if the menu is on a menubar, use the menubar's listener instead
     nsIFrame* parent = aPopupFrame->GetParent();
     if (parent && parent->GetType() == nsGkAtoms::menuFrame) {
-      nsMenuFrame* menuFrame = NS_STATIC_CAST(nsMenuFrame *, parent);
+      nsMenuFrame* menuFrame = static_cast<nsMenuFrame *>(parent);
       item->SetOnMenuBar(menuFrame->IsOnMenuBar());
     }
   }
@@ -627,10 +627,10 @@ nsXULPopupManager::ExecuteMenu(nsIContent* aMenu, nsEvent* aEvent)
   if (aEvent && (aEvent->eventStructType == NS_MOUSE_EVENT ||
                  aEvent->eventStructType == NS_KEY_EVENT ||
                  aEvent->eventStructType == NS_ACCESSIBLE_EVENT)) {
-    shift = NS_STATIC_CAST(nsInputEvent *, aEvent)->isShift;
-    control = NS_STATIC_CAST(nsInputEvent *, aEvent)->isControl;
-    alt = NS_STATIC_CAST(nsInputEvent *, aEvent)->isAlt;
-    meta = NS_STATIC_CAST(nsInputEvent *, aEvent)->isMeta;
+    shift = static_cast<nsInputEvent *>(aEvent)->isShift;
+    control = static_cast<nsInputEvent *>(aEvent)->isControl;
+    alt = static_cast<nsInputEvent *>(aEvent)->isAlt;
+    meta = static_cast<nsInputEvent *>(aEvent)->isMeta;
   }
 
   nsCOMPtr<nsIRunnable> event =
@@ -674,7 +674,7 @@ nsXULPopupManager::FirePopupShowingEvent(nsIContent* aPopup,
   // get the frame again in case it went away
   nsIFrame* frame = presShell->GetPrimaryFrameFor(aPopup);
   if (frame && frame->GetType() == nsGkAtoms::menuPopupFrame) {
-    nsMenuPopupFrame* popupFrame = NS_STATIC_CAST(nsMenuPopupFrame *, frame);
+    nsMenuPopupFrame* popupFrame = static_cast<nsMenuPopupFrame *>(frame);
     popupFrame->ClearOpenPending();
 
     if (status != nsEventStatus_eConsumeNoDefault)
@@ -699,7 +699,7 @@ nsXULPopupManager::FirePopupHidingEvent(nsIContent* aPopup,
   // get frame again in case it went away
   nsIFrame* frame = presShell->GetPrimaryFrameFor(aPopup);
   if (frame && frame->GetType() == nsGkAtoms::menuPopupFrame) {
-    nsMenuPopupFrame* popupFrame = NS_STATIC_CAST(nsMenuPopupFrame *, frame);
+    nsMenuPopupFrame* popupFrame = static_cast<nsMenuPopupFrame *>(frame);
     popupFrame->ClearOpenPending();
 
     if (status != nsEventStatus_eConsumeNoDefault) {
@@ -716,7 +716,7 @@ nsXULPopupManager::IsPopupOpenForMenuParent(nsIMenuParent* aMenuParent)
   while (item) {
     nsIFrame* parent = item->Frame()->GetParent();
     if (parent && parent->GetType() == nsGkAtoms::menuFrame) {
-      nsMenuFrame* menuFrame = NS_STATIC_CAST(nsMenuFrame *, parent);
+      nsMenuFrame* menuFrame = static_cast<nsMenuFrame *>(parent);
       if (menuFrame->GetMenuParent() == aMenuParent)
         return PR_TRUE;
     }
@@ -785,7 +785,7 @@ nsXULPopupManager::MayShowPopup(nsMenuPopupFrame* aPopup)
   // cannot open a popup that is a submenu of a menupopup that isn't open.
   nsIFrame* parent = aPopup->GetParent();
   if (parent && parent->GetType() == nsGkAtoms::menuFrame) {
-    nsMenuFrame* menuFrame = NS_STATIC_CAST(nsMenuFrame *, parent);
+    nsMenuFrame* menuFrame = static_cast<nsMenuFrame *>(parent);
     nsIMenuParent* parentPopup = menuFrame->GetMenuParent();
     if (parentPopup && !parentPopup->IsOpen())
       return PR_FALSE;
@@ -1098,10 +1098,10 @@ nsXULPopupManager::HandleKeyboardNavigation(PRUint32 aKeyCode)
       // check to make sure that the parent is actually the parent menu. It won't
       // be if the parent is in a different frame hierarchy, for example, for a
       // context menu opened on another menu.
-      nsIMenuParent* expectedParent = NS_STATIC_CAST(nsIMenuParent *, nextitem->Frame());
+      nsIMenuParent* expectedParent = static_cast<nsIMenuParent *>(nextitem->Frame());
       nsIFrame* parent = item->Frame()->GetParent();
       if (parent && parent->GetType() == nsGkAtoms::menuFrame) {
-        nsMenuFrame* menuFrame = NS_STATIC_CAST(nsMenuFrame *, parent);
+        nsMenuFrame* menuFrame = static_cast<nsMenuFrame *>(parent);
         if (menuFrame->GetMenuParent() != expectedParent)
           break;
       }
@@ -1245,7 +1245,7 @@ nsXULPopupManager::GetNextMenuItem(nsIFrame* aParent,
     // See if it's a menu item.
     if (IsValidMenuItem(presContext, currFrame->GetContent(), aIsPopup)) {
       return (currFrame->GetType() == nsGkAtoms::menuFrame) ?
-             NS_STATIC_CAST(nsMenuFrame *, currFrame) : nsnull;
+             static_cast<nsMenuFrame *>(currFrame) : nsnull;
     }
     currFrame = currFrame->GetNextSibling();
   }
@@ -1257,7 +1257,7 @@ nsXULPopupManager::GetNextMenuItem(nsIFrame* aParent,
     // See if it's a menu item.
     if (IsValidMenuItem(presContext, currFrame->GetContent(), aIsPopup)) {
       return (currFrame->GetType() == nsGkAtoms::menuFrame) ?
-             NS_STATIC_CAST(nsMenuFrame *, currFrame) : nsnull;
+             static_cast<nsMenuFrame *>(currFrame) : nsnull;
     }
 
     currFrame = currFrame->GetNextSibling();
@@ -1291,7 +1291,7 @@ nsXULPopupManager::GetPreviousMenuItem(nsIFrame* aParent,
     // See if it's a menu item.
     if (IsValidMenuItem(presContext, currFrame->GetContent(), aIsPopup)) {
       return (currFrame->GetType() == nsGkAtoms::menuFrame) ?
-             NS_STATIC_CAST(nsMenuFrame *, currFrame) : nsnull;
+             static_cast<nsMenuFrame *>(currFrame) : nsnull;
     }
     currFrame = frames.GetPrevSiblingFor(currFrame);
   }
@@ -1303,7 +1303,7 @@ nsXULPopupManager::GetPreviousMenuItem(nsIFrame* aParent,
     // See if it's a menu item.
     if (IsValidMenuItem(presContext, currFrame->GetContent(), aIsPopup)) {
       return (currFrame->GetType() == nsGkAtoms::menuFrame) ?
-             NS_STATIC_CAST(nsMenuFrame *, currFrame) : nsnull;
+             static_cast<nsMenuFrame *>(currFrame) : nsnull;
     }
 
     currFrame = frames.GetPrevSiblingFor(currFrame);
diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index f5c36939348..19883def1c9 100644
--- a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -373,9 +373,9 @@ nsTreeBodyFrame::EnsureBoxObject()
         nsCOMPtr<nsITreeBoxObject> realTreeBoxObject = do_QueryInterface(pBox);
         if (realTreeBoxObject) {
           nsITreeBoxObject* innerTreeBoxObject =
-            NS_STATIC_CAST(nsTreeBoxObject*, realTreeBoxObject.get())->GetTreeBody();
+            static_cast<nsTreeBoxObject*>(realTreeBoxObject.get())->GetTreeBody();
           ENSURE_TRUE(!innerTreeBoxObject || innerTreeBoxObject ==
-                      NS_STATIC_CAST(nsITreeBoxObject*, this));
+                      static_cast<nsITreeBoxObject*>(this));
           mTreeBoxObject = realTreeBoxObject;
           mColumns->SetTree(mTreeBoxObject);
         }
@@ -2674,7 +2674,7 @@ static void
 PaintTreeBody(nsIFrame* aFrame, nsIRenderingContext* aCtx,
               const nsRect& aDirtyRect, nsPoint aPt)
 {
-  NS_STATIC_CAST(nsTreeBodyFrame*, aFrame)->PaintTreeBody(*aCtx, aDirtyRect, aPt);
+  static_cast<nsTreeBodyFrame*>(aFrame)->PaintTreeBody(*aCtx, aDirtyRect, aPt);
 }
 
 // Painting routines
@@ -4209,7 +4209,7 @@ nsTreeBodyFrame::ComputeDropPosition(nsGUIEvent* aEvent, PRInt32* aRow, PRInt16*
 void
 nsTreeBodyFrame::OpenCallback(nsITimer *aTimer, void *aClosure)
 {
-  nsTreeBodyFrame* self = NS_STATIC_CAST(nsTreeBodyFrame*, aClosure);
+  nsTreeBodyFrame* self = static_cast<nsTreeBodyFrame*>(aClosure);
   if (self) {
     aTimer->Cancel();
     self->mSlots->mTimer = nsnull;
@@ -4224,7 +4224,7 @@ nsTreeBodyFrame::OpenCallback(nsITimer *aTimer, void *aClosure)
 void
 nsTreeBodyFrame::CloseCallback(nsITimer *aTimer, void *aClosure)
 {
-  nsTreeBodyFrame* self = NS_STATIC_CAST(nsTreeBodyFrame*, aClosure);
+  nsTreeBodyFrame* self = static_cast<nsTreeBodyFrame*>(aClosure);
   if (self) {
     aTimer->Cancel();
     self->mSlots->mTimer = nsnull;
@@ -4240,7 +4240,7 @@ nsTreeBodyFrame::CloseCallback(nsITimer *aTimer, void *aClosure)
 void
 nsTreeBodyFrame::LazyScrollCallback(nsITimer *aTimer, void *aClosure)
 {
-  nsTreeBodyFrame* self = NS_STATIC_CAST(nsTreeBodyFrame*, aClosure);
+  nsTreeBodyFrame* self = static_cast<nsTreeBodyFrame*>(aClosure);
   if (self) {
     aTimer->Cancel();
     self->mSlots->mTimer = nsnull;
@@ -4259,7 +4259,7 @@ nsTreeBodyFrame::LazyScrollCallback(nsITimer *aTimer, void *aClosure)
 void
 nsTreeBodyFrame::ScrollCallback(nsITimer *aTimer, void *aClosure)
 {
-  nsTreeBodyFrame* self = NS_STATIC_CAST(nsTreeBodyFrame*, aClosure);
+  nsTreeBodyFrame* self = static_cast<nsTreeBodyFrame*>(aClosure);
   if (self) {
     // Don't scroll if we are already at the top or bottom of the view.
     if (self->mView && self->CanAutoScroll(self->mSlots->mDropRow)) {
diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeBoxObject.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeBoxObject.cpp
index 33f9ea601a8..810be3db6ee 100644
--- a/mozilla/layout/xul/base/src/tree/src/nsTreeBoxObject.cpp
+++ b/mozilla/layout/xul/base/src/tree/src/nsTreeBoxObject.cpp
@@ -136,8 +136,8 @@ nsTreeBoxObject::GetTreeBody()
   nsITreeBoxObject* innerTreeBoxObject = nsnull;
   CallQueryInterface(frame, &innerTreeBoxObject);
   NS_ENSURE_TRUE(innerTreeBoxObject &&
-    NS_STATIC_CAST(nsTreeBodyFrame*, innerTreeBoxObject)->GetTreeBoxObject() ==
-    NS_STATIC_CAST(nsITreeBoxObject*, this), nsnull);
+    static_cast<nsTreeBodyFrame*>(innerTreeBoxObject)->GetTreeBoxObject() ==
+    static_cast<nsITreeBoxObject*>(this), nsnull);
 
   mTreeBody = innerTreeBoxObject;
   return mTreeBody;
diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeColumns.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeColumns.cpp
index 7679d8ecb94..04ef3fd4756 100644
--- a/mozilla/layout/xul/base/src/tree/src/nsTreeColumns.cpp
+++ b/mozilla/layout/xul/base/src/tree/src/nsTreeColumns.cpp
@@ -80,7 +80,7 @@ NS_INTERFACE_MAP_BEGIN(nsTreeColumn)
   NS_INTERFACE_MAP_ENTRY(nsISupports)
   NS_INTERFACE_MAP_ENTRY_DOM_CLASSINFO(TreeColumn)
   if (aIID.Equals(kTreeColumnImplCID))
-    foundInterface = NS_STATIC_CAST(nsITreeColumn*, this);
+    foundInterface = static_cast<nsITreeColumn*>(this);
   else
 NS_INTERFACE_MAP_END
                                                                                 
diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeSelection.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeSelection.cpp
index f5b4bf98bac..aaf6e59e639 100644
--- a/mozilla/layout/xul/base/src/tree/src/nsTreeSelection.cpp
+++ b/mozilla/layout/xul/base/src/tree/src/nsTreeSelection.cpp
@@ -845,7 +845,7 @@ nsTreeSelection::FireOnSelectHandler()
 void
 nsTreeSelection::SelectCallback(nsITimer *aTimer, void *aClosure)
 {
-  nsTreeSelection* self = NS_STATIC_CAST(nsTreeSelection*, aClosure);
+  nsTreeSelection* self = static_cast<nsTreeSelection*>(aClosure);
   if (self) {
     self->FireOnSelectHandler();
     aTimer->Cancel();
diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeStyleCache.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeStyleCache.cpp
index f163188d1b4..acadfc2d4ee 100644
--- a/mozilla/layout/xul/base/src/tree/src/nsTreeStyleCache.cpp
+++ b/mozilla/layout/xul/base/src/tree/src/nsTreeStyleCache.cpp
@@ -66,7 +66,7 @@ nsTreeStyleCache::GetStyleContext(nsICSSPseudoComparator* aComparator,
 
   // The first transition is always made off the supplied pseudo-element.
   nsTransitionKey key(currState->GetStateID(), aPseudoElement);
-  currState = NS_STATIC_CAST(nsDFAState*, mTransitionTable->Get(&key));
+  currState = static_cast<nsDFAState*>(mTransitionTable->Get(&key));
 
   if (!currState) {
     // We had a miss. Make a new state and add it to our hash.
@@ -78,9 +78,9 @@ nsTreeStyleCache::GetStyleContext(nsICSSPseudoComparator* aComparator,
   }
 
   for (PRUint32 i = 0; i < count; i++) {
-    nsCOMPtr<nsIAtom> pseudo = getter_AddRefs(NS_STATIC_CAST(nsIAtom*, aInputWord->ElementAt(i)));
+    nsCOMPtr<nsIAtom> pseudo = getter_AddRefs(static_cast<nsIAtom*>(aInputWord->ElementAt(i)));
     nsTransitionKey key(currState->GetStateID(), pseudo);
-    currState = NS_STATIC_CAST(nsDFAState*, mTransitionTable->Get(&key));
+    currState = static_cast<nsDFAState*>(mTransitionTable->Get(&key));
 
     if (!currState) {
       // We had a miss. Make a new state and add it to our hash.
@@ -97,7 +97,7 @@ nsTreeStyleCache::GetStyleContext(nsICSSPseudoComparator* aComparator,
   // Look up our style context for this state.
   nsStyleContext* result = nsnull;
   if (mCache)
-    result = NS_STATIC_CAST(nsStyleContext*, mCache->Get(currState));
+    result = static_cast<nsStyleContext*>(mCache->Get(currState));
   if (!result) {
     // We missed the cache. Resolve this pseudo-style.
     result = aPresContext->StyleSet()->
@@ -121,7 +121,7 @@ nsTreeStyleCache::DeleteDFAState(nsHashKey *aKey,
                                  void *aData,
                                  void *closure)
 {
-  nsDFAState* entry = NS_STATIC_CAST(nsDFAState*, aData);
+  nsDFAState* entry = static_cast<nsDFAState*>(aData);
   delete entry;
   return PR_TRUE;
 }
@@ -131,7 +131,7 @@ nsTreeStyleCache::ReleaseStyleContext(nsHashKey *aKey,
                                       void *aData,
                                       void *closure)
 {
-  nsStyleContext* context = NS_STATIC_CAST(nsStyleContext*, aData);
+  nsStyleContext* context = static_cast<nsStyleContext*>(aData);
   context->Release();
   return PR_TRUE;
 }
diff --git a/mozilla/modules/libjar/nsJAR.cpp b/mozilla/modules/libjar/nsJAR.cpp
index c3321dfa643..437d2837960 100644
--- a/mozilla/modules/libjar/nsJAR.cpp
+++ b/mozilla/modules/libjar/nsJAR.cpp
@@ -389,7 +389,7 @@ nsJAR::GetCertificatePrincipal(const char* aFilename, nsIPrincipal** aPrincipal)
   {
     //-- Find the item
     nsCStringKey key(aFilename);
-    nsJARManifestItem* manItem = NS_STATIC_CAST(nsJARManifestItem*, mManifestData.Get(&key));
+    nsJARManifestItem* manItem = static_cast<nsJARManifestItem*>(mManifestData.Get(&key));
     if (!manItem)
       return NS_OK;
     //-- Verify the item against the manifest
@@ -1127,7 +1127,7 @@ nsZipReaderCache::GetZip(nsIFile* zipFile, nsIZipReader* *result)
   if (NS_FAILED(rv)) return rv;
 
   nsCStringKey key(path);
-  nsJAR* zip = NS_STATIC_CAST(nsJAR*, NS_STATIC_CAST(nsIZipReader*,mZips.Get(&key))); // AddRefs
+  nsJAR* zip = static_cast<nsJAR*>(static_cast<nsIZipReader*>(mZips.Get(&key))); // AddRefs
   if (zip) {
 #ifdef ZIP_CACHE_HIT_RATE
     mZipCacheHits++;
@@ -1147,7 +1147,7 @@ nsZipReaderCache::GetZip(nsIFile* zipFile, nsIZipReader* *result)
       return rv;
     }
 
-    PRBool collision = mZips.Put(&key, NS_STATIC_CAST(nsIZipReader*, zip)); // AddRefs to 2
+    PRBool collision = mZips.Put(&key, static_cast<nsIZipReader*>(zip)); // AddRefs to 2
     NS_ASSERTION(!collision, "horked");
   }
   *result = zip;
diff --git a/mozilla/modules/libjar/nsJARURI.cpp b/mozilla/modules/libjar/nsJARURI.cpp
index a1329c198cc..3631745f0ca 100644
--- a/mozilla/modules/libjar/nsJARURI.cpp
+++ b/mozilla/modules/libjar/nsJARURI.cpp
@@ -76,7 +76,7 @@ NS_INTERFACE_MAP_BEGIN(nsJARURI)
   NS_INTERFACE_MAP_ENTRY(nsINestedURI)
   // see nsJARURI::Equals
   if (aIID.Equals(NS_GET_IID(nsJARURI)))
-      foundInterface = NS_REINTERPRET_CAST(nsISupports*, this);
+      foundInterface = reinterpret_cast<nsISupports*>(this);
   else
 NS_INTERFACE_MAP_END
 
diff --git a/mozilla/modules/libjar/nsZipArchive.cpp b/mozilla/modules/libjar/nsZipArchive.cpp
index 4e9504fd8bf..04497460d9a 100644
--- a/mozilla/modules/libjar/nsZipArchive.cpp
+++ b/mozilla/modules/libjar/nsZipArchive.cpp
@@ -181,7 +181,7 @@ PR_PUBLIC_API(PRInt32) ZIP_OpenArchive(const char * zipname, void** hZip)
 
   status = zip->OpenArchive(fd);
   if (status == ZIP_OK)
-    *hZip = NS_STATIC_CAST(void*,zip);
+    *hZip = static_cast<void*>(zip);
   else {
     delete zip;
     PR_Close(fd);
@@ -207,7 +207,7 @@ PR_PUBLIC_API(PRInt32) ZIP_TestArchive(void *hZip)
   if (hZip == 0)
     return ZIP_ERR_PARAM;
 
-  nsZipArchive* zip = NS_STATIC_CAST(nsZipArchive*,hZip);
+  nsZipArchive* zip = static_cast<nsZipArchive*>(hZip);
   if (zip->kMagic != ZIP_MAGIC)
     return ZIP_ERR_PARAM;   /* whatever it is isn't one of ours! */
 
@@ -229,7 +229,7 @@ PR_PUBLIC_API(PRInt32) ZIP_CloseArchive(void** hZip)
   if (hZip == 0 || *hZip == 0)
     return ZIP_ERR_PARAM;
 
-  nsZipArchive* zip = NS_STATIC_CAST(nsZipArchive*,*hZip);
+  nsZipArchive* zip = static_cast<nsZipArchive*>(*hZip);
   if (zip->kMagic != ZIP_MAGIC)
     return ZIP_ERR_PARAM;   /* whatever it is isn't one of ours! */
 
@@ -257,7 +257,7 @@ PR_PUBLIC_API(PRInt32) ZIP_ExtractFile(void* hZip, const char * filename, const
   if (hZip == 0)
     return ZIP_ERR_PARAM;
 
-  nsZipArchive* zip = NS_STATIC_CAST(nsZipArchive*,hZip);
+  nsZipArchive* zip = static_cast<nsZipArchive*>(hZip);
   if (zip->kMagic != ZIP_MAGIC)
     return ZIP_ERR_PARAM;   /* whatever it is isn't one of ours! */
 
@@ -305,7 +305,7 @@ PR_PUBLIC_API(void*) ZIP_FindInit(void* hZip, const char * pattern)
   if (hZip == 0)
     return 0;
 
-  nsZipArchive* zip = NS_STATIC_CAST(nsZipArchive*,hZip);
+  nsZipArchive* zip = static_cast<nsZipArchive*>(hZip);
   if (zip->kMagic != ZIP_MAGIC)
     return 0;   /* whatever it is isn't one of ours! */
 
@@ -339,7 +339,7 @@ PR_PUBLIC_API(PRInt32) ZIP_FindNext(void* hFind, char * outbuf, PRUint16 bufsize
   if (hFind == 0)
     return ZIP_ERR_PARAM;
 
-  nsZipFind* find = NS_STATIC_CAST(nsZipFind*,hFind);
+  nsZipFind* find = static_cast<nsZipFind*>(hFind);
   if (find->kMagic != ZIPFIND_MAGIC)
     return ZIP_ERR_PARAM;   /* whatever it is isn't one of ours! */
 
@@ -376,7 +376,7 @@ PR_PUBLIC_API(PRInt32) ZIP_FindFree(void* hFind)
   if (hFind == 0)
     return ZIP_ERR_PARAM;
 
-  nsZipFind* find = NS_STATIC_CAST(nsZipFind*,hFind);
+  nsZipFind* find = static_cast<nsZipFind*>(hFind);
   if (find->kMagic != ZIPFIND_MAGIC)
     return ZIP_ERR_PARAM;   /* whatever it is isn't one of ours! */
 
diff --git a/mozilla/modules/libjar/zipstub.h b/mozilla/modules/libjar/zipstub.h
index 76184e884c9..950b1a7c91e 100644
--- a/mozilla/modules/libjar/zipstub.h
+++ b/mozilla/modules/libjar/zipstub.h
@@ -91,8 +91,6 @@
 #define PR_CALLBACK
 #define PR_STATIC_CALLBACK(__x) static __x
 
-#define NS_STATIC_CAST(__type, __ptr)      ((__type)(__ptr))
-
 #define PRFileDesc          FILE
 typedef long                PRInt32;
 typedef PRInt32             PROffset32;
diff --git a/mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp b/mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp
index b0d64f2f329..584394049f8 100644
--- a/mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp
+++ b/mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp
@@ -119,7 +119,7 @@ NS_IMETHODIMP nsBMPDecoder::Flush()
 NS_METHOD nsBMPDecoder::ReadSegCb(nsIInputStream* aIn, void* aClosure,
                              const char* aFromRawSegment, PRUint32 aToOffset,
                              PRUint32 aCount, PRUint32 *aWriteCount) {
-    nsBMPDecoder *decoder = NS_REINTERPRET_CAST(nsBMPDecoder*, aClosure);
+    nsBMPDecoder *decoder = reinterpret_cast<nsBMPDecoder*>(aClosure);
     *aWriteCount = aCount;
     return decoder->ProcessData(aFromRawSegment, aCount);
 }
diff --git a/mozilla/modules/libpr0n/decoders/bmp/nsICODecoder.cpp b/mozilla/modules/libpr0n/decoders/bmp/nsICODecoder.cpp
index a63b48de1ff..1dd5ed56747 100644
--- a/mozilla/modules/libpr0n/decoders/bmp/nsICODecoder.cpp
+++ b/mozilla/modules/libpr0n/decoders/bmp/nsICODecoder.cpp
@@ -187,7 +187,7 @@ NS_IMETHODIMP nsICODecoder::Flush()
 NS_METHOD nsICODecoder::ReadSegCb(nsIInputStream* aIn, void* aClosure,
                              const char* aFromRawSegment, PRUint32 aToOffset,
                              PRUint32 aCount, PRUint32 *aWriteCount) {
-  nsICODecoder *decoder = NS_REINTERPRET_CAST(nsICODecoder*, aClosure);
+  nsICODecoder *decoder = reinterpret_cast<nsICODecoder*>(aClosure);
   *aWriteCount = aCount;
   decoder->mStatus = decoder->ProcessData(aFromRawSegment, aCount);
   return decoder->mStatus;
diff --git a/mozilla/modules/libpr0n/decoders/gif/imgContainerGIF.cpp b/mozilla/modules/libpr0n/decoders/gif/imgContainerGIF.cpp
index 2bc9a3c67fc..bff87fcf7a7 100644
--- a/mozilla/modules/libpr0n/decoders/gif/imgContainerGIF.cpp
+++ b/mozilla/modules/libpr0n/decoders/gif/imgContainerGIF.cpp
@@ -283,7 +283,7 @@ NS_IMETHODIMP imgContainerGIF::StartAnimation()
 
     // The only way mAnimating becomes true is if the mTimer is created
     mAnimating = PR_TRUE;
-    mTimer->InitWithCallback(NS_STATIC_CAST(nsITimerCallback*, this),
+    mTimer->InitWithCallback(static_cast<nsITimerCallback*>(this),
                              timeout, nsITimer::TYPE_REPEATING_SLACK);
   }
 
diff --git a/mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp b/mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
index bcbced61fac..1a7f05f104e 100644
--- a/mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
+++ b/mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
@@ -185,7 +185,7 @@ static NS_METHOD ReadDataOut(nsIInputStream* in,
                              PRUint32 count,
                              PRUint32 *writeCount)
 {
-  nsGIFDecoder2 *decoder = NS_STATIC_CAST(nsGIFDecoder2*, closure);
+  nsGIFDecoder2 *decoder = static_cast<nsGIFDecoder2*>(closure);
   nsresult rv = decoder->ProcessData((unsigned char*)fromRawSegment, count, writeCount);
   if (NS_FAILED(rv)) {
     *writeCount = 0;
diff --git a/mozilla/modules/libpr0n/decoders/icon/os2/nsIconChannel.cpp b/mozilla/modules/libpr0n/decoders/icon/os2/nsIconChannel.cpp
index c11bc64b9e5..5dbd61257fd 100644
--- a/mozilla/modules/libpr0n/decoders/icon/os2/nsIconChannel.cpp
+++ b/mozilla/modules/libpr0n/decoders/icon/os2/nsIconChannel.cpp
@@ -413,7 +413,7 @@ nsresult nsIconChannel::MakeInputStream(nsIInputStream** _retval, PRBool nonBloc
   
     // put our data into the pipe
     PRUint32 written;
-    rv = outStream->Write( NS_REINTERPRET_CAST(const char*, pOutBuf),
+    rv = outStream->Write( reinterpret_cast<const char*>(pOutBuf),
                            cbOutBuf, &written);
     if (NS_FAILED(rv))
       break;
diff --git a/mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.cpp b/mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.cpp
index 5891f1c26bf..8be507173af 100644
--- a/mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.cpp
+++ b/mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.cpp
@@ -131,8 +131,8 @@ void nsPNGDecoder::SetAnimFrameInfo()
     
     // Need to cast delay_num to float to have a proper division and
     // the result to int to avoid compiler warning
-    timeout = NS_STATIC_CAST( PRInt32,
-              NS_STATIC_CAST(PRFloat64, delay_num) * 1000 / delay_den );
+    timeout = static_cast<PRInt32>
+                         (static_cast<PRFloat64>(delay_num) * 1000 / delay_den);
   }
   mFrame->SetTimeout(timeout);
   
@@ -195,7 +195,7 @@ NS_IMETHODIMP nsPNGDecoder::Init(imgILoad *aLoad)
 #endif
 
   /* use this as libpng "progressive pointer" (retrieve in callbacks) */
-  png_set_progressive_read_fn(mPNG, NS_STATIC_CAST(png_voidp, this),
+  png_set_progressive_read_fn(mPNG, static_cast<png_voidp>(this),
                               info_callback, row_callback, end_callback);
 
   return NS_OK;
@@ -224,7 +224,7 @@ static NS_METHOD ReadDataOut(nsIInputStream* in,
                              PRUint32 count,
                              PRUint32 *writeCount)
 {
-  nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*, closure);
+  nsPNGDecoder *decoder = static_cast<nsPNGDecoder*>(closure);
 
   if (decoder->mError) {
     *writeCount = 0;
@@ -241,7 +241,7 @@ static NS_METHOD ReadDataOut(nsIInputStream* in,
   }
 
   png_process_data(decoder->mPNG, decoder->mInfo,
-                   NS_REINTERPRET_CAST(unsigned char *, NS_CONST_CAST(char *, fromRawSegment)), count);
+                   reinterpret_cast<unsigned char *>(const_cast<char *>(fromRawSegment)), count);
 
   *writeCount = count;
   return NS_OK;
@@ -279,7 +279,7 @@ info_callback(png_structp png_ptr, png_infop info_ptr)
   png_bytep trans = NULL;
   int num_trans = 0;
 
-  nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*, png_get_progressive_ptr(png_ptr));
+  nsPNGDecoder *decoder = static_cast<nsPNGDecoder*>(png_get_progressive_ptr(png_ptr));
 
   /* always decode to 24-bit RGB or 32-bit RGBA  */
   png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
@@ -446,7 +446,7 @@ row_callback(png_structp png_ptr, png_bytep new_row,
    * to pass the current row, and the function will combine the
    * old row and the new row.
    */
-  nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*, png_get_progressive_ptr(png_ptr));
+  nsPNGDecoder *decoder = static_cast<nsPNGDecoder*>(png_get_progressive_ptr(png_ptr));
   
   // do nothing
   // is it ok that we're not telling the observer there is some data?
@@ -519,7 +519,7 @@ frame_info_callback(png_structp png_ptr, png_uint_32 frame_num)
   png_uint_32 x_offset, y_offset;
   PRInt32 width, height;
   
-  nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*, png_get_progressive_ptr(png_ptr));
+  nsPNGDecoder *decoder = static_cast<nsPNGDecoder*>(png_get_progressive_ptr(png_ptr));
   
   // old frame is done
   if (!(decoder->apngFlags & FRAME_HIDDEN)) {
@@ -554,7 +554,7 @@ end_callback(png_structp png_ptr, png_infop info_ptr)
    * marks the image as finished.
    */
 
-  nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*, png_get_progressive_ptr(png_ptr));
+  nsPNGDecoder *decoder = static_cast<nsPNGDecoder*>(png_get_progressive_ptr(png_ptr));
   
   if (png_get_valid(png_ptr, info_ptr, PNG_INFO_acTL)) {
     PRInt32 num_plays = png_get_num_plays(png_ptr, info_ptr);
diff --git a/mozilla/modules/libpr0n/decoders/xbm/nsXBMDecoder.cpp b/mozilla/modules/libpr0n/decoders/xbm/nsXBMDecoder.cpp
index fb2638ef930..835698338a7 100644
--- a/mozilla/modules/libpr0n/decoders/xbm/nsXBMDecoder.cpp
+++ b/mozilla/modules/libpr0n/decoders/xbm/nsXBMDecoder.cpp
@@ -121,7 +121,7 @@ NS_IMETHODIMP nsXBMDecoder::Flush()
 NS_METHOD nsXBMDecoder::ReadSegCb(nsIInputStream* aIn, void* aClosure,
                              const char* aFromRawSegment, PRUint32 aToOffset,
                              PRUint32 aCount, PRUint32 *aWriteCount) {
-    nsXBMDecoder *decoder = NS_REINTERPRET_CAST(nsXBMDecoder*, aClosure);
+    nsXBMDecoder *decoder = reinterpret_cast<nsXBMDecoder*>(aClosure);
     *aWriteCount = aCount;
     return decoder->ProcessData(aFromRawSegment, aCount);
 }
diff --git a/mozilla/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.cpp b/mozilla/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.cpp
index 412f8768675..7903b1890fe 100644
--- a/mozilla/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.cpp
+++ b/mozilla/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.cpp
@@ -166,7 +166,7 @@ NS_IMETHODIMP nsJPEGEncoder::InitFromData(const PRUint8* aData,
   if (aInputFormat == INPUT_FORMAT_RGB) {
     while (cinfo.next_scanline < cinfo.image_height) {
       const PRUint8* row = &aData[cinfo.next_scanline * aStride];
-      jpeg_write_scanlines(&cinfo, NS_CONST_CAST(PRUint8**, &row), 1);
+      jpeg_write_scanlines(&cinfo, const_cast<PRUint8**>(&row), 1);
     }
   } else if (aInputFormat == INPUT_FORMAT_RGBA) {
     PRUint8* row = new PRUint8[aWidth * 3];
@@ -262,7 +262,7 @@ NS_IMETHODIMP nsJPEGEncoder::ReadSegments(nsWriteSegmentFun aWriter, void *aClos
   if (aCount > maxCount)
     aCount = maxCount;
   nsresult rv = aWriter(this, aClosure,
-                        NS_REINTERPRET_CAST(const char*, mImageBuffer),
+                        reinterpret_cast<const char*>(mImageBuffer),
                         0, aCount, _retval);
   if (NS_SUCCEEDED(rv)) {
     NS_ASSERTION(*_retval <= aCount, "bad write count");
@@ -335,7 +335,7 @@ nsJPEGEncoder::StripAlpha(const PRUint8* aSrc, PRUint8* aDest,
 void // static
 nsJPEGEncoder::initDestination(jpeg_compress_struct* cinfo)
 {
-  nsJPEGEncoder* that = NS_STATIC_CAST(nsJPEGEncoder*, cinfo->client_data);
+  nsJPEGEncoder* that = static_cast<nsJPEGEncoder*>(cinfo->client_data);
   NS_ASSERTION(! that->mImageBuffer, "Image buffer already initialized");
 
   that->mImageBufferSize = 8192;
@@ -361,7 +361,7 @@ nsJPEGEncoder::initDestination(jpeg_compress_struct* cinfo)
 boolean // static
 nsJPEGEncoder::emptyOutputBuffer(jpeg_compress_struct* cinfo)
 {
-  nsJPEGEncoder* that = NS_STATIC_CAST(nsJPEGEncoder*, cinfo->client_data);
+  nsJPEGEncoder* that = static_cast<nsJPEGEncoder*>(cinfo->client_data);
   NS_ASSERTION(that->mImageBuffer, "No buffer to empty!");
 
   that->mImageBufferUsed = that->mImageBufferSize;
@@ -400,7 +400,7 @@ nsJPEGEncoder::emptyOutputBuffer(jpeg_compress_struct* cinfo)
 void // static
 nsJPEGEncoder::termDestination(jpeg_compress_struct* cinfo)
 {
-  nsJPEGEncoder* that = NS_STATIC_CAST(nsJPEGEncoder*, cinfo->client_data);
+  nsJPEGEncoder* that = static_cast<nsJPEGEncoder*>(cinfo->client_data);
   if (! that->mImageBuffer)
     return;
   that->mImageBufferUsed = cinfo->dest->next_output_byte - that->mImageBuffer;
diff --git a/mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp b/mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp
index 80b84ae8db3..791b5d1fb5e 100644
--- a/mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp
+++ b/mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp
@@ -476,7 +476,7 @@ NS_IMETHODIMP nsPNGEncoder::ReadSegments(nsWriteSegmentFun aWriter,
   if (aCount > maxCount)
     aCount = maxCount;
   nsresult rv = aWriter(this, aClosure,
-                        NS_REINTERPRET_CAST(const char*, mImageBuffer),
+                        reinterpret_cast<const char*>(mImageBuffer),
                         0, aCount, _retval);
   if (NS_SUCCEEDED(rv)) {
     NS_ASSERTION(*_retval <= aCount, "bad write count");
@@ -560,7 +560,7 @@ nsPNGEncoder::ErrorCallback(png_structp png_ptr, png_const_charp warning_msg)
 void // static
 nsPNGEncoder::WriteCallback(png_structp png, png_bytep data, png_size_t size)
 {
-  nsPNGEncoder* that = NS_STATIC_CAST(nsPNGEncoder*, png_get_io_ptr(png));
+  nsPNGEncoder* that = static_cast<nsPNGEncoder*>(png_get_io_ptr(png));
   if (! that->mImageBuffer)
     return;
 
diff --git a/mozilla/modules/libpr0n/public/ImageLogging.h b/mozilla/modules/libpr0n/public/ImageLogging.h
index 2261024a1b0..91d93f30006 100644
--- a/mozilla/modules/libpr0n/public/ImageLogging.h
+++ b/mozilla/modules/libpr0n/public/ImageLogging.h
@@ -173,23 +173,23 @@ public:
 
 #define LOG_SCOPE(l, s) \
   LogScope LOG_SCOPE_TMP_VAR ##__LINE__ (l,                            \
-                                         NS_STATIC_CAST(void *, this), \
+                                         static_cast<void *>(this), \
                                          NS_LITERAL_CSTRING(s))
 
 #define LOG_SCOPE_WITH_PARAM(l, s, pn, pv) \
   LogScope LOG_SCOPE_TMP_VAR ##__LINE__ (l,                            \
-                                         NS_STATIC_CAST(void *, this), \
+                                         static_cast<void *>(this), \
                                          NS_LITERAL_CSTRING(s),        \
                                          NS_LITERAL_CSTRING(pn), pv)
 
 #define LOG_FUNC(l, s)                  \
   LogFunc(l,                            \
-          NS_STATIC_CAST(void *, this), \
+          static_cast<void *>(this), \
           NS_LITERAL_CSTRING(s))
 
 #define LOG_FUNC_WITH_PARAM(l, s, pn, pv) \
   LogFunc(l,                              \
-          NS_STATIC_CAST(void *, this),   \
+          static_cast<void *>(this),   \
           NS_LITERAL_CSTRING(s),          \
           NS_LITERAL_CSTRING(pn), pv)
 
@@ -208,7 +208,7 @@ public:
 
 #define LOG_MSG(l, s, m)                   \
   LogMessage(l,                            \
-             NS_STATIC_CAST(void *, this), \
+             static_cast<void *>(this), \
              NS_LITERAL_CSTRING(s),        \
              NS_LITERAL_CSTRING(m))
 
diff --git a/mozilla/modules/libpr0n/src/imgCache.cpp b/mozilla/modules/libpr0n/src/imgCache.cpp
index a51ff6c1b81..210c67ff3f2 100644
--- a/mozilla/modules/libpr0n/src/imgCache.cpp
+++ b/mozilla/modules/libpr0n/src/imgCache.cpp
@@ -225,7 +225,7 @@ PRBool imgCache::Put(nsIURI *aKey, imgRequest *request, nsICacheEntryDescriptor
   if (NS_FAILED(rv) || !entry)
     return PR_FALSE;
 
-  nsCOMPtr<nsISupports> sup = NS_REINTERPRET_CAST(nsISupports*, request);
+  nsCOMPtr<nsISupports> sup = reinterpret_cast<nsISupports*>(request);
   entry->SetCacheElement(sup);
 
   entry->MarkValid();
@@ -307,7 +307,7 @@ PRBool imgCache::Get(nsIURI *aKey, PRBool *aHasExpired, imgRequest **aRequest, n
   nsCOMPtr<nsISupports> sup;
   entry->GetCacheElement(getter_AddRefs(sup));
 
-  *aRequest = NS_REINTERPRET_CAST(imgRequest*, sup.get());
+  *aRequest = reinterpret_cast<imgRequest*>(sup.get());
   NS_IF_ADDREF(*aRequest);
 
   *aEntry = entry;
diff --git a/mozilla/modules/libpr0n/src/imgContainer.cpp b/mozilla/modules/libpr0n/src/imgContainer.cpp
index cb27c77a765..ee261defaf3 100644
--- a/mozilla/modules/libpr0n/src/imgContainer.cpp
+++ b/mozilla/modules/libpr0n/src/imgContainer.cpp
@@ -157,7 +157,7 @@ NS_IMETHODIMP imgContainer::GetNumFrames(PRUint32 *aNumFrames)
 /* gfxIImageFrame getFrameAt (in unsigned long index); */
 NS_IMETHODIMP imgContainer::GetFrameAt(PRUint32 index, gfxIImageFrame **_retval)
 {
-  NS_ENSURE_ARG(index < NS_STATIC_CAST(PRUint32, mFrames.Count()));
+  NS_ENSURE_ARG(index < static_cast<PRUint32>(mFrames.Count()));
   
   NS_ASSERTION(_retval, "imgContainer::GetFrameAt; Invalid Arg");
   if (!_retval)
@@ -327,7 +327,7 @@ NS_IMETHODIMP imgContainer::StartAnimation()
     
     // The only way animating becomes true is if the timer is created
     mAnim->animating = PR_TRUE;
-    mAnim->timer->InitWithCallback(NS_STATIC_CAST(nsITimerCallback*, this),
+    mAnim->timer->InitWithCallback(static_cast<nsITimerCallback*>(this),
                                    timeout, nsITimer::TYPE_REPEATING_SLACK);
   }
   
diff --git a/mozilla/modules/libpr0n/src/imgLoader.cpp b/mozilla/modules/libpr0n/src/imgLoader.cpp
index 8f0550f377e..3029d771e6c 100644
--- a/mozilla/modules/libpr0n/src/imgLoader.cpp
+++ b/mozilla/modules/libpr0n/src/imgLoader.cpp
@@ -402,7 +402,7 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI,
                                     requestFlags, aRequest, _retval);
 
       if (*_retval)
-        request->mValidator->AddProxy(NS_STATIC_CAST(imgRequestProxy*, *_retval));
+        request->mValidator->AddProxy(static_cast<imgRequestProxy*>(*_retval));
 
       NS_RELEASE(request);
       return rv;
@@ -447,10 +447,10 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI,
       NS_ADDREF(hvc);
       request->mValidator = hvc;
 
-      hvc->AddProxy(NS_STATIC_CAST(imgRequestProxy*,
-                                   NS_STATIC_CAST(imgIRequest*, req.get())));
+      hvc->AddProxy(static_cast<imgRequestProxy*>
+                               (static_cast<imgIRequest*>(req.get())));
 
-      rv = newChannel->AsyncOpen(NS_STATIC_CAST(nsIStreamListener *, hvc), nsnull);
+      rv = newChannel->AsyncOpen(static_cast<nsIStreamListener *>(hvc), nsnull);
       if (NS_SUCCEEDED(rv))
         NS_ADDREF(*_retval = req.get());
 
@@ -496,7 +496,7 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI,
     request->Init(aURI, loadGroup, entry, cacheId, aCX);
 
     // create the proxy listener
-    ProxyListener *pl = new ProxyListener(NS_STATIC_CAST(nsIStreamListener *, request));
+    ProxyListener *pl = new ProxyListener(static_cast<nsIStreamListener *>(request));
     if (!pl) {
       request->Cancel(NS_ERROR_OUT_OF_MEMORY);
       NS_RELEASE(request);
@@ -509,7 +509,7 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI,
            ("[this=%p] imgLoader::LoadImage -- Calling channel->AsyncOpen()\n", this));
 
     nsresult openRes;
-    openRes = newChannel->AsyncOpen(NS_STATIC_CAST(nsIStreamListener *, pl), nsnull);
+    openRes = newChannel->AsyncOpen(static_cast<nsIStreamListener *>(pl), nsnull);
 
     NS_RELEASE(pl);
 
@@ -637,7 +637,7 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb
     channel->GetOriginalURI(getter_AddRefs(originalURI));
     request->Init(originalURI, channel, entry, thread, aCX);
 
-    ProxyListener *pl = new ProxyListener(NS_STATIC_CAST(nsIStreamListener *, request));
+    ProxyListener *pl = new ProxyListener(static_cast<nsIStreamListener *>(request));
     if (!pl) {
       NS_RELEASE(request);
       return NS_ERROR_OUT_OF_MEMORY;
@@ -645,7 +645,7 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb
 
     NS_ADDREF(pl);
 
-    *listener = NS_STATIC_CAST(nsIStreamListener*, pl);
+    *listener = static_cast<nsIStreamListener*>(pl);
     NS_ADDREF(*listener);
 
     NS_RELEASE(pl);
@@ -656,7 +656,7 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb
 
   rv = CreateNewProxyForRequest(request, loadGroup, aObserver,
                                 requestFlags, nsnull, _retval);
-  request->NotifyProxyListener(NS_STATIC_CAST(imgRequestProxy*, *_retval));
+  request->NotifyProxyListener(static_cast<imgRequestProxy*>(*_retval));
 
   NS_RELEASE(request);
 
@@ -679,7 +679,7 @@ imgLoader::CreateNewProxyForRequest(imgRequest *aRequest, nsILoadGroup *aLoadGro
 
   imgRequestProxy *proxyRequest;
   if (aProxyRequest) {
-    proxyRequest = NS_STATIC_CAST(imgRequestProxy *, aProxyRequest);
+    proxyRequest = static_cast<imgRequestProxy *>(aProxyRequest);
   } else {
     NS_NEWXPCOM(proxyRequest, imgRequestProxy);
     if (!proxyRequest) return NS_ERROR_OUT_OF_MEMORY;
@@ -703,7 +703,7 @@ imgLoader::CreateNewProxyForRequest(imgRequest *aRequest, nsILoadGroup *aLoadGro
     NS_RELEASE(*_retval);
   }
   // transfer reference to caller
-  *_retval = NS_STATIC_CAST(imgIRequest*, proxyRequest);
+  *_retval = static_cast<imgIRequest*>(proxyRequest);
 
   return NS_OK;
 }
@@ -926,7 +926,7 @@ NS_IMETHODIMP imgCacheValidator::OnStartRequest(nsIRequest *aRequest, nsISupport
 
       PRUint32 count = mProxies.Count();
       for (PRInt32 i = count-1; i>=0; i--) {
-        imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy *, mProxies[i]);
+        imgRequestProxy *proxy = static_cast<imgRequestProxy *>(mProxies[i]);
         mRequest->NotifyProxyListener(proxy);
       }
 
@@ -965,17 +965,17 @@ NS_IMETHODIMP imgCacheValidator::OnStartRequest(nsIRequest *aRequest, nsISupport
   channel->GetOriginalURI(getter_AddRefs(originalURI));
   request->Init(originalURI, channel, entry, NS_GetCurrentThread(), mContext);
 
-  ProxyListener *pl = new ProxyListener(NS_STATIC_CAST(nsIStreamListener *, request));
+  ProxyListener *pl = new ProxyListener(static_cast<nsIStreamListener *>(request));
   if (!pl) {
     NS_RELEASE(request);
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
-  mDestListener = NS_STATIC_CAST(nsIStreamListener*, pl);
+  mDestListener = static_cast<nsIStreamListener*>(pl);
 
   PRUint32 count = mProxies.Count();
   for (PRInt32 i = count-1; i>=0; i--) {
-    imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy *, mProxies[i]);
+    imgRequestProxy *proxy = static_cast<imgRequestProxy *>(mProxies[i]);
     proxy->ChangeOwner(request);
     request->NotifyProxyListener(proxy);
   }
diff --git a/mozilla/modules/libpr0n/src/imgRequest.cpp b/mozilla/modules/libpr0n/src/imgRequest.cpp
index 953cf4060bd..74ea235f5be 100644
--- a/mozilla/modules/libpr0n/src/imgRequest.cpp
+++ b/mozilla/modules/libpr0n/src/imgRequest.cpp
@@ -128,7 +128,7 @@ nsresult imgRequest::AddProxy(imgRequestProxy *proxy, PRBool aNotify)
 {
   LOG_SCOPE_WITH_PARAM(gImgLog, "imgRequest::AddProxy", "proxy", proxy);
 
-  mObservers.AppendElement(NS_STATIC_CAST(void*, proxy));
+  mObservers.AppendElement(static_cast<void*>(proxy));
 
   if (aNotify)
     NotifyProxyListener(proxy);
@@ -140,7 +140,7 @@ nsresult imgRequest::RemoveProxy(imgRequestProxy *proxy, nsresult aStatus, PRBoo
 {
   LOG_SCOPE_WITH_PARAM(gImgLog, "imgRequest::RemoveProxy", "proxy", proxy);
 
-  mObservers.RemoveElement(NS_STATIC_CAST(void*, proxy));
+  mObservers.RemoveElement(static_cast<void*>(proxy));
 
   /* Check mState below before we potentially call Cancel() below. Since
      Cancel() may result in OnStopRequest being called back before Cancel()
@@ -324,7 +324,7 @@ void imgRequest::RemoveFromCache()
 PRBool imgRequest::HaveProxyWithObserver(imgRequestProxy* aProxyToIgnore) const
 {
   for (PRInt32 i = 0; i < mObservers.Count(); ++i) {
-    imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy*, mObservers[i]);
+    imgRequestProxy *proxy = static_cast<imgRequestProxy*>(mObservers[i]);
     if (proxy == aProxyToIgnore) {
       continue;
     }
@@ -403,7 +403,7 @@ NS_IMETHODIMP imgRequest::FrameChanged(imgIContainer *container,
 
   PRInt32 count = mObservers.Count();
   for (PRInt32 i = 0; i < count; i++) {
-    imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy*, mObservers[i]);
+    imgRequestProxy *proxy = static_cast<imgRequestProxy*>(mObservers[i]);
     if (proxy) proxy->FrameChanged(container, newframe, dirtyRect);
 
     // If this assertion fires, it means that imgRequest notifications could
@@ -426,7 +426,7 @@ NS_IMETHODIMP imgRequest::OnStartDecode(imgIRequest *request)
 
   PRInt32 count = mObservers.Count();
   for (PRInt32 i = 0; i < count; i++) {
-    imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy*, mObservers[i]);
+    imgRequestProxy *proxy = static_cast<imgRequestProxy*>(mObservers[i]);
     if (proxy) proxy->OnStartDecode();
 
     // If this assertion fires, it means that imgRequest notifications could
@@ -466,7 +466,7 @@ NS_IMETHODIMP imgRequest::OnStartContainer(imgIRequest *request, imgIContainer *
 
   PRInt32 count = mObservers.Count();
   for (PRInt32 i = 0; i < count; i++) {
-    imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy*, mObservers[i]);
+    imgRequestProxy *proxy = static_cast<imgRequestProxy*>(mObservers[i]);
     if (proxy) proxy->OnStartContainer(image);
 
     // If this assertion fires, it means that imgRequest notifications could
@@ -487,7 +487,7 @@ NS_IMETHODIMP imgRequest::OnStartFrame(imgIRequest *request,
 
   PRInt32 count = mObservers.Count();
   for (PRInt32 i = 0; i < count; i++) {
-    imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy*, mObservers[i]);
+    imgRequestProxy *proxy = static_cast<imgRequestProxy*>(mObservers[i]);
     if (proxy) proxy->OnStartFrame(frame);
 
     // If this assertion fires, it means that imgRequest notifications could
@@ -508,7 +508,7 @@ NS_IMETHODIMP imgRequest::OnDataAvailable(imgIRequest *request,
 
   PRInt32 count = mObservers.Count();
   for (PRInt32 i = 0; i < count; i++) {
-    imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy*, mObservers[i]);
+    imgRequestProxy *proxy = static_cast<imgRequestProxy*>(mObservers[i]);
     if (proxy) proxy->OnDataAvailable(frame, rect);
 
     // If this assertion fires, it means that imgRequest notifications could
@@ -543,7 +543,7 @@ NS_IMETHODIMP imgRequest::OnStopFrame(imgIRequest *request,
 
   PRInt32 count = mObservers.Count();
   for (PRInt32 i = 0; i < count; i++) {
-    imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy*, mObservers[i]);
+    imgRequestProxy *proxy = static_cast<imgRequestProxy*>(mObservers[i]);
     if (proxy) proxy->OnStopFrame(frame);
 
     // If this assertion fires, it means that imgRequest notifications could
@@ -565,7 +565,7 @@ NS_IMETHODIMP imgRequest::OnStopContainer(imgIRequest *request,
 
   PRInt32 count = mObservers.Count();
   for (PRInt32 i = 0; i < count; i++) {
-    imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy*, mObservers[i]);
+    imgRequestProxy *proxy = static_cast<imgRequestProxy*>(mObservers[i]);
     if (proxy) proxy->OnStopContainer(image);
 
     // If this assertion fires, it means that imgRequest notifications could
@@ -594,7 +594,7 @@ NS_IMETHODIMP imgRequest::OnStopDecode(imgIRequest *aRequest,
 
   PRInt32 count = mObservers.Count();
   for (PRInt32 i = 0; i < count; i++) {
-    imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy*, mObservers[i]);
+    imgRequestProxy *proxy = static_cast<imgRequestProxy*>(mObservers[i]);
     if (proxy) proxy->OnStopDecode(GetResultFromImageStatus(mImageStatus), aStatusArg);
 
     // If this assertion fires, it means that imgRequest notifications could
@@ -639,7 +639,7 @@ NS_IMETHODIMP imgRequest::OnStartRequest(nsIRequest *aRequest, nsISupports *ctxt
   /* notify our kids */
   PRInt32 count = mObservers.Count();
   for (PRInt32 i = 0; i < count; i++) {
-    imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy*, mObservers[i]);
+    imgRequestProxy *proxy = static_cast<imgRequestProxy*>(mObservers[i]);
     if (proxy) proxy->OnStartRequest(aRequest, ctxt);
 
     // If this assertion fires, it means that imgRequest notifications could
@@ -764,7 +764,7 @@ NS_IMETHODIMP imgRequest::OnStopRequest(nsIRequest *aRequest, nsISupports *ctxt,
   /* notify the kids */
   PRInt32 count = mObservers.Count();
   for (PRInt32 i = count-1; i>=0; i--) {
-    imgRequestProxy *proxy = NS_STATIC_CAST(imgRequestProxy*, mObservers[i]);
+    imgRequestProxy *proxy = static_cast<imgRequestProxy*>(mObservers[i]);
     /* calling OnStopRequest may result in the death of |proxy| so don't use the
        pointer after this call.
      */
@@ -872,7 +872,7 @@ NS_IMETHODIMP imgRequest::OnDataAvailable(nsIRequest *aRequest, nsISupports *ctx
       return NS_IMAGELIB_ERROR_NO_DECODER;
     }
 
-    nsresult rv = mDecoder->Init(NS_STATIC_CAST(imgILoad*, this));
+    nsresult rv = mDecoder->Init(static_cast<imgILoad*>(this));
     if (NS_FAILED(rv)) {
       PR_LOG(gImgLog, PR_LOG_WARNING,
              ("[this=%p] imgRequest::OnDataAvailable -- mDecoder->Init failed\n", this));
@@ -914,7 +914,7 @@ static NS_METHOD sniff_mimetype_callback(nsIInputStream* in,
                                          PRUint32 count,
                                          PRUint32 *writeCount)
 {
-  imgRequest *request = NS_STATIC_CAST(imgRequest*, closure);
+  imgRequest *request = static_cast<imgRequest*>(closure);
 
   NS_ASSERTION(request, "request is null!");
 
diff --git a/mozilla/modules/libpref/src/nsPrefBranch.cpp b/mozilla/modules/libpref/src/nsPrefBranch.cpp
index 2d19b2cec9a..28057e302a9 100644
--- a/mozilla/modules/libpref/src/nsPrefBranch.cpp
+++ b/mozilla/modules/libpref/src/nsPrefBranch.cpp
@@ -332,7 +332,7 @@ NS_IMETHODIMP nsPrefBranch::GetComplexValue(const char *aPrefName, const nsIID &
       return rv;
 
     *_retval = relativePref;
-    NS_ADDREF(NS_STATIC_CAST(nsIRelativeFilePref*, *_retval));
+    NS_ADDREF(static_cast<nsIRelativeFilePref*>(*_retval));
     return NS_OK;
   }
 
@@ -745,7 +745,7 @@ PR_STATIC_CALLBACK(nsresult) NotifyObserver(const char *newpref, void *data)
     observer = pData->pObserver;
   }
 
-  observer->Observe(NS_STATIC_CAST(nsIPrefBranch *, pData->pBranch),
+  observer->Observe(static_cast<nsIPrefBranch *>(pData->pBranch),
                     NS_PREFBRANCH_PREFCHANGE_TOPIC_ID,
                     NS_ConvertASCIItoUTF16(suffix).get());
   return NS_OK;
@@ -869,8 +869,8 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 pref_enumChild(PLDHashTable *table, PLDHashEntryHdr *heh,
                PRUint32 i, void *arg)
 {
-  PrefHashEntry *he = NS_STATIC_CAST(PrefHashEntry*, heh);
-  EnumerateData *d = NS_REINTERPRET_CAST(EnumerateData *, arg);
+  PrefHashEntry *he = static_cast<PrefHashEntry*>(heh);
+  EnumerateData *d = reinterpret_cast<EnumerateData *>(arg);
   if (PL_strncmp(he->key, d->parent, PL_strlen(d->parent)) == 0) {
     d->pref_list->AppendElement((void*)he->key);
   }
diff --git a/mozilla/modules/libpref/src/nsPrefService.cpp b/mozilla/modules/libpref/src/nsPrefService.cpp
index 490fdd9fd0a..e7d96a9b051 100644
--- a/mozilla/modules/libpref/src/nsPrefService.cpp
+++ b/mozilla/modules/libpref/src/nsPrefService.cpp
@@ -152,7 +152,7 @@ nsresult nsPrefService::Init()
   rv = mRootBranch->GetCharPref("general.config.filename", getter_Copies(lockFileName));
   if (NS_SUCCEEDED(rv))
     NS_CreateServicesFromCategory("pref-config-startup",
-                                  NS_STATIC_CAST(nsISupports *, NS_STATIC_CAST(void *, this)),
+                                  static_cast<nsISupports *>(static_cast<void *>(this)),
                                   "pref-config-startup");    
 
   nsCOMPtr<nsIObserverService> observerService = 
diff --git a/mozilla/modules/libpref/src/nsSharedPrefHandler.cpp b/mozilla/modules/libpref/src/nsSharedPrefHandler.cpp
index 5b583fc1512..b0b791c22aa 100644
--- a/mozilla/modules/libpref/src/nsSharedPrefHandler.cpp
+++ b/mozilla/modules/libpref/src/nsSharedPrefHandler.cpp
@@ -211,7 +211,7 @@ PRBool nsSharedPrefHandler::IsPrefShared(const char* prefName)
     return PR_TRUE;
     
   // returns PR_TRUE if we reached the end without finding it.
-  return mExceptionList.EnumerateForwards(enumFind, NS_CONST_CAST(char*, prefName));
+  return mExceptionList.EnumerateForwards(enumFind, const_cast<char*>(prefName));
 }
 
 //*****************************************************************************
@@ -365,8 +365,8 @@ NS_IMETHODIMP nsSharedPrefHandler::OnFlushReply(PRUint32 aQueueID, PRUint32 aSta
 
 static PRBool PR_CALLBACK enumFind(void* aElement, void *aData)
 {
-  char *elemStr = NS_STATIC_CAST(char*, aElement);
-  char *searchStr = NS_STATIC_CAST(char*, aData);
+  char *elemStr = static_cast<char*>(aElement);
+  char *searchStr = static_cast<char*>(aData);
   // return PR_FALSE for a match and to stop search
   return (strncmp(elemStr, searchStr, strlen(elemStr)) != 0);
 }
diff --git a/mozilla/modules/libpref/src/prefapi.cpp b/mozilla/modules/libpref/src/prefapi.cpp
index f09aa5ddbe5..8b41f205192 100644
--- a/mozilla/modules/libpref/src/prefapi.cpp
+++ b/mozilla/modules/libpref/src/prefapi.cpp
@@ -88,7 +88,7 @@
 PR_STATIC_CALLBACK(void)
 clearPrefEntry(PLDHashTable *table, PLDHashEntryHdr *entry)
 {
-    PrefHashEntry *pref = NS_STATIC_CAST(PrefHashEntry *, entry);
+    PrefHashEntry *pref = static_cast<PrefHashEntry *>(entry);
     if (pref->flags & PREF_STRING)
     {
         PR_FREEIF(pref->defaultPref.stringVal);
@@ -105,13 +105,13 @@ matchPrefEntry(PLDHashTable*, const PLDHashEntryHdr* entry,
                const void* key)
 {
     const PrefHashEntry *prefEntry =
-        NS_STATIC_CAST(const PrefHashEntry*,entry);
+        static_cast<const PrefHashEntry*>(entry);
 
     if (prefEntry->key == key) return PR_TRUE;
 
     if (!prefEntry->key || !key) return PR_FALSE;
 
-    const char *otherKey = NS_REINTERPRET_CAST(const char*, key);
+    const char *otherKey = reinterpret_cast<const char*>(key);
     return (strcmp(prefEntry->key, otherKey) == 0);
 }
 
@@ -160,7 +160,7 @@ static char *ArenaStrDup(const char* str, PLArenaPool* aArena)
     PL_ARENA_ALLOCATE(mem, aArena, len+1);
     if (mem)
         memcpy(mem, str, len+1);
-    return NS_STATIC_CAST(char*, mem);
+    return static_cast<char*>(mem);
 }
 
 /*---------------------------------------------------------------------------*/
@@ -311,8 +311,8 @@ PREF_SetBoolPref(const char *pref_name, PRBool value, PRBool set_default)
 PLDHashOperator
 pref_savePref(PLDHashTable *table, PLDHashEntryHdr *heh, PRUint32 i, void *arg)
 {
-    pref_saveArgs *argData = NS_STATIC_CAST(pref_saveArgs *, arg);
-    PrefHashEntry *pref = NS_STATIC_CAST(PrefHashEntry *, heh);
+    pref_saveArgs *argData = static_cast<pref_saveArgs *>(arg);
+    PrefHashEntry *pref = static_cast<PrefHashEntry *>(heh);
 
     PR_ASSERT(pref);
     if (!pref)
@@ -511,7 +511,7 @@ nsresult PREF_GetBoolPref(const char *pref_name, PRBool * return_value, PRBool g
 PR_STATIC_CALLBACK(PLDHashOperator)
 pref_DeleteItem(PLDHashTable *table, PLDHashEntryHdr *heh, PRUint32 i, void *arg)
 {
-    PrefHashEntry* he = NS_STATIC_CAST(PrefHashEntry*,heh);
+    PrefHashEntry* he = static_cast<PrefHashEntry*>(heh);
     const char *to_delete = (const char *) arg;
     int len = PL_strlen(to_delete);
 
@@ -581,7 +581,7 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 pref_ClearUserPref(PLDHashTable *table, PLDHashEntryHdr *he, PRUint32,
                    void *arg)
 {
-    PrefHashEntry *pref = NS_STATIC_CAST(PrefHashEntry*,  he);
+    PrefHashEntry *pref = static_cast<PrefHashEntry*>(he);
 
     PLDHashOperator nextOp = PL_DHASH_NEXT;
 
@@ -682,7 +682,7 @@ static void pref_SetValue(PrefValue* oldValue, PrefValue newValue, PrefType type
 static inline PrefHashEntry* pref_HashTableLookup(const void *key)
 {
     PrefHashEntry* result =
-        NS_STATIC_CAST(PrefHashEntry*, PL_DHashTableOperate(&gHashTable, key, PL_DHASH_LOOKUP));
+        static_cast<PrefHashEntry*>(PL_DHashTableOperate(&gHashTable, key, PL_DHASH_LOOKUP));
 
     if (PL_DHASH_ENTRY_IS_FREE(result))
         return nsnull;
@@ -695,7 +695,7 @@ nsresult pref_HashPref(const char *key, PrefValue value, PrefType type, PRBool s
     if (!gHashTable.ops)
         return NS_ERROR_OUT_OF_MEMORY;
 
-    PrefHashEntry* pref = NS_STATIC_CAST(PrefHashEntry*, PL_DHashTableOperate(&gHashTable, key, PL_DHASH_ADD));
+    PrefHashEntry* pref = static_cast<PrefHashEntry*>(PL_DHashTableOperate(&gHashTable, key, PL_DHASH_ADD));
 
     if (!pref)
         return NS_ERROR_OUT_OF_MEMORY;
diff --git a/mozilla/modules/oji/src/ProxyJNI.cpp b/mozilla/modules/oji/src/ProxyJNI.cpp
index cde3cf2c94e..ff71d67a245 100644
--- a/mozilla/modules/oji/src/ProxyJNI.cpp
+++ b/mozilla/modules/oji/src/ProxyJNI.cpp
@@ -190,19 +190,19 @@ jvalue* JNIMethod::marshallArgs(va_list args)
             for (PRUint32 i = 0; i < argCount; i++) {
                 switch (argTypes[i]) {
                 case jobject_type:
-                    jargs[i].l = NS_STATIC_CAST(jobject, va_arg(args, void*));
+                    jargs[i].l = static_cast<jobject>(va_arg(args, void*));
                     break;
                 case jboolean_type:
-                    jargs[i].z = NS_STATIC_CAST(jboolean, va_arg(args, jint));
+                    jargs[i].z = static_cast<jboolean>(va_arg(args, jint));
                     break;
                 case jbyte_type:
-                    jargs[i].b = NS_STATIC_CAST(jbyte, va_arg(args, jint));
+                    jargs[i].b = static_cast<jbyte>(va_arg(args, jint));
                     break;
                 case jchar_type:
-                    jargs[i].c = NS_STATIC_CAST(jchar, va_arg(args, jint));
+                    jargs[i].c = static_cast<jchar>(va_arg(args, jint));
                     break;
                 case jshort_type:
-                    jargs[i].s = NS_STATIC_CAST(jshort, va_arg(args, jint));
+                    jargs[i].s = static_cast<jshort>(va_arg(args, jint));
                     break;
                 case jint_type:
                     jargs[i].i = va_arg(args, jint);
@@ -211,7 +211,7 @@ jvalue* JNIMethod::marshallArgs(va_list args)
                     jargs[i].j = va_arg(args, jlong);
                     break;
                 case jfloat_type:
-                    jargs[i].f = NS_STATIC_CAST(jfloat, va_arg(args, jdouble));
+                    jargs[i].f = static_cast<jfloat>(va_arg(args, jdouble));
                     break;
                 case jdouble_type:
                     jargs[i].d = va_arg(args, jdouble);
diff --git a/mozilla/modules/oji/src/lcglue.cpp b/mozilla/modules/oji/src/lcglue.cpp
index a936c92df7d..adfad99fc75 100644
--- a/mozilla/modules/oji/src/lcglue.cpp
+++ b/mozilla/modules/oji/src/lcglue.cpp
@@ -89,7 +89,7 @@ private:
 
 static void PR_CALLBACK detach_JVMContext(void* storage)
 {
-	JVMContext* context = NS_REINTERPRET_CAST(JVMContext*, storage);
+	JVMContext* context = reinterpret_cast<JVMContext*>(storage);
 	
 	JNIEnv* proxyEnv = context->proxyEnv;
 	if (proxyEnv != NULL) {
@@ -130,7 +130,7 @@ map_jsj_thread_to_js_context_impl(JSJavaThreadState *jsj_env, void* java_applet_
 	// it lives in to make any sense of all this.
 	JSContext* context = NULL;
 	if (java_applet_obj != NULL) {
-		nsIPluginInstance* pluginInstance = NS_REINTERPRET_CAST(nsIPluginInstance*, java_applet_obj);
+		nsIPluginInstance* pluginInstance = reinterpret_cast<nsIPluginInstance*>(java_applet_obj);
 	        nsIPluginInstancePeer* pluginPeer = NULL;
 		if (pluginInstance->GetPeer(&pluginPeer) == NS_OK) {
 			nsIPluginInstancePeer2* pluginPeer2 = NULL;
@@ -218,7 +218,7 @@ map_java_object_to_js_object_impl(JNIEnv *env, void *pluginInstancePtr, char* *e
 	/*
 	 * Check for the mayscript tag.
 	 */
-	nsIPluginInstance* pluginInstance = NS_REINTERPRET_CAST(nsIPluginInstance*, pluginInstancePtr);
+	nsIPluginInstance* pluginInstance = reinterpret_cast<nsIPluginInstance*>(pluginInstancePtr);
 	nsIPluginInstancePeer* pluginPeer;
 	if (pluginInstance->GetPeer(&pluginPeer) == NS_OK) {
 		nsIJVMPluginTagInfo* tagInfo;
@@ -344,7 +344,7 @@ create_java_vm_impl(SystemJavaVM* *jvm, JNIEnv* *initialEnv, void* initargs)
         return PR_FALSE;
     // serv will be released when this function returns, but that's OK because
     // the XPCOM service manager will keep it alive.
-    *jvm = NS_REINTERPRET_CAST(SystemJavaVM*, serv.get());
+    *jvm = reinterpret_cast<SystemJavaVM*>(serv.get());
     return PR_TRUE;
 }
 
@@ -376,7 +376,7 @@ get_java_vm_impl(JNIEnv* env)
     nsresult rv;
     nsCOMPtr<nsIJVMManager> managerService = do_GetService(kJVMManagerCID, &rv);
     if (NS_FAILED(rv)) return NULL;
-    SystemJavaVM* jvm = NS_REINTERPRET_CAST(SystemJavaVM*, managerService.get());  
+    SystemJavaVM* jvm = reinterpret_cast<SystemJavaVM*>(managerService.get());  
     return jvm;
 }
 
diff --git a/mozilla/modules/oji/src/nsJVMConfigManagerUnix.cpp b/mozilla/modules/oji/src/nsJVMConfigManagerUnix.cpp
index 9c459d29da8..744066de50f 100644
--- a/mozilla/modules/oji/src/nsJVMConfigManagerUnix.cpp
+++ b/mozilla/modules/oji/src/nsJVMConfigManagerUnix.cpp
@@ -65,7 +65,7 @@ nsJVMConfigManagerUnix::nsJVMConfigManagerUnix()
 PR_STATIC_CALLBACK(PRBool)
 FreeJVMConfig(nsHashKey *aKey, void *aData, void* aClosure)
 {
-    nsJVMConfig* config = NS_STATIC_CAST(nsJVMConfig *, aData);
+    nsJVMConfig* config = static_cast<nsJVMConfig *>(aData);
 
     NS_IF_RELEASE(config);
 
@@ -75,8 +75,8 @@ FreeJVMConfig(nsHashKey *aKey, void *aData, void* aClosure)
 PR_STATIC_CALLBACK(PRBool)
 AppendJVMConfig(nsHashKey *aKey, void *aData, void* aClosure)
 {
-    nsJVMConfig* config = NS_STATIC_CAST(nsJVMConfig *, aData);
-    nsIMutableArray *array = NS_STATIC_CAST(nsIMutableArray *, aClosure);
+    nsJVMConfig* config = static_cast<nsJVMConfig *>(aData);
+    nsIMutableArray *array = static_cast<nsIMutableArray *>(aClosure);
     NS_ENSURE_TRUE(config && array, PR_FALSE);
 
     array->AppendElement(config, PR_FALSE);
@@ -110,8 +110,8 @@ nsJVMConfigManagerUnix::GetJVMConfigList(nsIArray **_retval)
 
     if (mJVMConfigList.Count() > 0) {
         mJVMConfigList.Enumerate(AppendJVMConfig,
-                                 NS_STATIC_CAST(void *, array));
-        *_retval = NS_STATIC_CAST(nsIArray *, array);
+                                 static_cast<void *>(array));
+        *_retval = static_cast<nsIArray *>(array);
         NS_IF_ADDREF(*_retval);
     } else
         *_retval = nsnull;
@@ -337,15 +337,15 @@ nsJVMConfigManagerUnix::ParseLine(nsAString& aLine)
     // will contain only one java installation.
     // This could make sure we don't duplicate the config info in the list
     nsStringKey key(pathStr);
-    nsJVMConfig* config = NS_STATIC_CAST(nsJVMConfig *,
-                                         mJVMConfigList.Get(&key));
+    nsJVMConfig* config = static_cast<nsJVMConfig *>
+                                     (mJVMConfigList.Get(&key));
 
     // Only create it and add the config to list if it doesn't exist.
     if (!config) {
         config = new nsJVMConfig(version, type, os, arch, path,
                                  mozPluginPath, description);
         NS_ENSURE_TRUE(config, NS_ERROR_OUT_OF_MEMORY);
-        mJVMConfigList.Put(&key, NS_STATIC_CAST(void *, config));
+        mJVMConfigList.Put(&key, static_cast<void *>(config));
         NS_ADDREF(config);
     }
     
@@ -611,13 +611,13 @@ nsJVMConfigManagerUnix::AddDirectory(nsAString& aHomeDirName)
     path->GetLeafName(version);
 
     nsStringKey key(aHomeDirName);
-    nsJVMConfig* config = NS_STATIC_CAST(nsJVMConfig *,
-                                         mJVMConfigList.Get(&key));
+    nsJVMConfig* config = static_cast<nsJVMConfig *>
+                                     (mJVMConfigList.Get(&key));
     if (!config) {
         config = new nsJVMConfig(version, type, EmptyString(), arch, path,
                                  mozPluginPath, EmptyString());
         NS_ENSURE_TRUE(config, NS_ERROR_OUT_OF_MEMORY);
-        mJVMConfigList.Put(&key, NS_STATIC_CAST(void *, config));
+        mJVMConfigList.Put(&key, static_cast<void *>(config));
         NS_ADDREF(config);
     }
 
diff --git a/mozilla/modules/oji/src/nsJVMManager.cpp b/mozilla/modules/oji/src/nsJVMManager.cpp
index 094a7c46199..eb950cca436 100644
--- a/mozilla/modules/oji/src/nsJVMManager.cpp
+++ b/mozilla/modules/oji/src/nsJVMManager.cpp
@@ -426,12 +426,12 @@ nsJVMManager::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr)
         return NS_OK;
     }
     if (aIID.Equals(kIJVMThreadManagerIID)) {
-        *aInstancePtr = (void*) NS_STATIC_CAST(nsIJVMThreadManager*, this);
+        *aInstancePtr = (void*) static_cast<nsIJVMThreadManager*>(this);
         NS_ADDREF_THIS();
         return NS_OK;
     }
     if (aIID.Equals(kILiveConnectManagerIID)) {
-        *aInstancePtr = (void*) NS_STATIC_CAST(nsILiveConnectManager*, this);
+        *aInstancePtr = (void*) static_cast<nsILiveConnectManager*>(this);
         NS_ADDREF_THIS();
         return NS_OK;
     }
@@ -441,7 +441,7 @@ nsJVMManager::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr)
         return NS_OK;
     }
     if (aIID.Equals(NS_GET_IID(nsIObserver))) {
-        *aInstancePtr = (void*) NS_STATIC_CAST(nsIObserver*, this);
+        *aInstancePtr = (void*) static_cast<nsIObserver*>(this);
         NS_ADDREF_THIS();
         return NS_OK;
     }
diff --git a/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp b/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
index 07f0c449e92..b1ab9d16804 100644
--- a/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
+++ b/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
@@ -1141,7 +1141,7 @@ NS_IMETHODIMP ns4xPluginInstance::SetWindow(nsPluginWindow* window)
     if (!mXtBin && window->ws_info) {
 
       NPSetWindowCallbackStruct* ws =
-        NS_STATIC_CAST(NPSetWindowCallbackStruct*, window->ws_info);
+        static_cast<NPSetWindowCallbackStruct*>(window->ws_info);
 
       if (!isXembed) {  
 #ifdef NS_DEBUG      
diff --git a/mozilla/modules/plugin/base/src/nsJSNPRuntime.cpp b/mozilla/modules/plugin/base/src/nsJSNPRuntime.cpp
index 2531ade2804..0d5536250cb 100644
--- a/mozilla/modules/plugin/base/src/nsJSNPRuntime.cpp
+++ b/mozilla/modules/plugin/base/src/nsJSNPRuntime.cpp
@@ -302,8 +302,8 @@ NPVariantToJSVal(NPP npp, JSContext *cx, const NPVariant *variant)
       NS_ConvertUTF8toUTF16 utf16String(s->utf8characters, s->utf8length);
 
       JSString *str =
-        ::JS_NewUCStringCopyN(cx, NS_REINTERPRET_CAST(const jschar*,
-                                                      utf16String.get()),
+        ::JS_NewUCStringCopyN(cx, reinterpret_cast<const jschar*>
+                                                  (utf16String.get()),
                               utf16String.Length());
 
       if (str) {
@@ -874,7 +874,7 @@ public:
 PR_STATIC_CALLBACK(PLDHashNumber)
 JSObjWrapperHash(PLDHashTable *table, const void *key)
 {
-  const nsJSObjWrapperKey *e = NS_STATIC_CAST(const nsJSObjWrapperKey *, key);
+  const nsJSObjWrapperKey *e = static_cast<const nsJSObjWrapperKey *>(key);
 
   return (PLDHashNumber)((PRWord)e->mJSObj ^ (PRWord)e->mNpp) >> 2;
 }
@@ -884,9 +884,9 @@ JSObjWrapperHashMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry,
                            const void *key)
 {
   const nsJSObjWrapperKey *objWrapperKey =
-    NS_STATIC_CAST(const nsJSObjWrapperKey *, key);
+    static_cast<const nsJSObjWrapperKey *>(key);
   const JSObjWrapperHashEntry *e =
-    NS_STATIC_CAST(const JSObjWrapperHashEntry *, entry);
+    static_cast<const JSObjWrapperHashEntry *>(entry);
 
   return (e->mJSObjWrapper->mJSObj == objWrapperKey->mJSObj &&
           e->mJSObjWrapper->mNpp == objWrapperKey->mNpp);
@@ -952,8 +952,8 @@ nsJSObjWrapper::GetNewOrUsed(NPP npp, JSContext *cx, JSObject *obj)
   nsJSObjWrapperKey key(obj, npp);
 
   JSObjWrapperHashEntry *entry =
-    NS_STATIC_CAST(JSObjWrapperHashEntry *,
-                   PL_DHashTableOperate(&sJSObjWrappers, &key, PL_DHASH_ADD));
+    static_cast<JSObjWrapperHashEntry *>
+               (PL_DHashTableOperate(&sJSObjWrappers, &key, PL_DHASH_ADD));
   if (!entry) {
     // Out of memory.
     return nsnull;
@@ -1485,8 +1485,8 @@ nsNPObjWrapper::GetNewOrUsed(NPP npp, JSContext *cx, NPObject *npobj)
   }
 
   NPObjWrapperHashEntry *entry =
-    NS_STATIC_CAST(NPObjWrapperHashEntry *,
-                   PL_DHashTableOperate(&sNPObjWrappers, npobj,
+    static_cast<NPObjWrapperHashEntry *>
+               (PL_DHashTableOperate(&sNPObjWrappers, npobj,
                                         PL_DHASH_ADD));
   if (!entry) {
     // Out of memory
@@ -1725,8 +1725,8 @@ LookupNPP(NPObject *npobj)
 
 
   NPObjWrapperHashEntry *entry =
-    NS_STATIC_CAST(NPObjWrapperHashEntry *,
-                   PL_DHashTableOperate(&sNPObjWrappers, npobj,
+    static_cast<NPObjWrapperHashEntry *>
+               (PL_DHashTableOperate(&sNPObjWrappers, npobj,
                                         PL_DHASH_ADD));
 
   if (PL_DHASH_ENTRY_IS_FREE(entry)) {
diff --git a/mozilla/modules/plugin/base/src/nsPluginDirServiceProvider.cpp b/mozilla/modules/plugin/base/src/nsPluginDirServiceProvider.cpp
index 768d67aadc8..05c703de884 100644
--- a/mozilla/modules/plugin/base/src/nsPluginDirServiceProvider.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginDirServiceProvider.cpp
@@ -614,7 +614,7 @@ nsPluginDirServiceProvider::GetPLIDDirectoriesWithHKEY(HKEY aKey, nsCOMArray<nsI
           if (NS_SUCCEEDED(localFile->Exists(&isFileThere)) && isFileThere) {
             PRInt32 c = aDirs.Count();
             for (PRInt32 i = 0; i < c; i++) {
-              nsIFile *dup = NS_STATIC_CAST(nsIFile*, aDirs[i]);
+              nsIFile *dup = static_cast<nsIFile*>(aDirs[i]);
               if (dup &&
                   NS_SUCCEEDED(dup->Equals(localFile, &isDupEntry)) &&
                   isDupEntry) {
diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index d399987f253..7f66065dde7 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -1834,7 +1834,7 @@ nsPluginStreamListenerPeer::SetupPluginCacheFile(nsIChannel* channel)
     pActivePlugins->mStreams->Count((PRUint32*)&cnt);
     while (--cnt >= 0 && !useExistingCacheFile) {
       nsPluginStreamListenerPeer *lp =
-        NS_REINTERPRET_CAST(nsPluginStreamListenerPeer *, pActivePlugins->mStreams->ElementAt(cnt));
+        reinterpret_cast<nsPluginStreamListenerPeer *>(pActivePlugins->mStreams->ElementAt(cnt));
       if (lp) {
         if (lp->mLocalCachedFile &&
             lp->mPluginStreamInfo &&
@@ -1903,7 +1903,7 @@ nsPluginStreamListenerPeer::SetupPluginCacheFile(nsIChannel* channel)
       return rv;
     }
 
-    nsISupports* supports = NS_STATIC_CAST(nsISupports*, (NS_STATIC_CAST(nsIStreamListener*, this)));
+    nsISupports* supports = static_cast<nsISupports*>((static_cast<nsIStreamListener*>(this)));
     pActivePlugins->mStreams->AppendElement(supports);
   }
 
@@ -2680,7 +2680,7 @@ NS_IMETHODIMP nsPluginHostImpl::GetValue(nsPluginManagerVariable aVariable, void
 
 #if defined(XP_UNIX) && !defined(XP_MACOSX) && defined(MOZ_X11)
   if (nsPluginManagerVariable_XDisplay == aVariable) {
-    Display** value = NS_REINTERPRET_CAST(Display**, aValue);
+    Display** value = reinterpret_cast<Display**>(aValue);
 #if defined (MOZ_WIDGET_GTK2)
     *value = GDK_DISPLAY();
 #endif
@@ -4425,8 +4425,8 @@ nsPluginHostImpl::GetPluginTags(PRUint32* aPluginCount, nsIPluginTag*** aResults
     plugin = plugin->mNext;
   }
 
-  *aResults = NS_STATIC_CAST(nsIPluginTag**,
-                             nsMemory::Alloc(count * sizeof(**aResults)));
+  *aResults = static_cast<nsIPluginTag**>
+                         (nsMemory::Alloc(count * sizeof(**aResults)));
   if (!*aResults)
     return NS_ERROR_OUT_OF_MEMORY;
 
@@ -4880,8 +4880,8 @@ struct pluginFileinDirectory
 // if the times are the same, compare the filenames
 static int PR_CALLBACK ComparePluginFileInDirectory (const void *v1, const void *v2, void *)
 {
-  const pluginFileinDirectory* pfd1 = NS_STATIC_CAST(const pluginFileinDirectory*, v1);
-  const pluginFileinDirectory* pfd2 = NS_STATIC_CAST(const pluginFileinDirectory*, v2);
+  const pluginFileinDirectory* pfd1 = static_cast<const pluginFileinDirectory*>(v1);
+  const pluginFileinDirectory* pfd2 = static_cast<const pluginFileinDirectory*>(v2);
 
   PRInt32 result = 0;
   if (LL_EQ(pfd1->mModTime, pfd2->mModTime))
@@ -4948,7 +4948,7 @@ public:
   ~nsAutoPluginFileDeleter()
   {
     for (PRInt32 i = 0; i < mPluginFiles.Count(); ++i) {
-      pluginFileinDirectory* pfd = NS_STATIC_CAST(pluginFileinDirectory*, mPluginFiles[i]);
+      pluginFileinDirectory* pfd = static_cast<pluginFileinDirectory*>(mPluginFiles[i]);
       delete pfd;
     }
   }
@@ -5027,7 +5027,7 @@ nsresult nsPluginHostImpl::ScanPluginsDirectory(nsIFile * pluginsDir,
 
   // finally, go through the array, looking at each entry and continue processing it
   for (PRInt32 i = 0; i < pluginFilesArray.Count(); i++) {
-    pluginFileinDirectory* pfd = NS_STATIC_CAST(pluginFileinDirectory*, pluginFilesArray[i]);
+    pluginFileinDirectory* pfd = static_cast<pluginFileinDirectory*>(pluginFilesArray[i]);
     nsCOMPtr <nsIFile> file = do_CreateInstance("@mozilla.org/file/local;1");
     nsCOMPtr <nsILocalFile> localfile = do_QueryInterface(file);
     localfile->InitWithPath(pfd->mFilename);
@@ -6988,8 +6988,8 @@ nsPluginByteRangeStreamListener::OnStartRequest(nsIRequest *request, nsISupports
   mRemoveMagicNumber = PR_TRUE;
 
   //get nsPluginStreamListenerPeer* ptr from finalStreamListener
-  nsPluginStreamListenerPeer *pslp = NS_REINTERPRET_CAST(nsPluginStreamListenerPeer*,
-                                                         finalStreamListener.get());
+  nsPluginStreamListenerPeer *pslp = reinterpret_cast<nsPluginStreamListenerPeer*>
+                                                     (finalStreamListener.get());
   rv = pslp->ServeStreamAsFile(request, ctxt);
   return rv;
 }
diff --git a/mozilla/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp b/mozilla/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp
index 46196fec48d..67f7cbf8d84 100644
--- a/mozilla/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp
+++ b/mozilla/modules/plugin/samples/SanePlugin/nsSanePluginFactory.cpp
@@ -94,19 +94,19 @@ nsSanePluginFactoryImpl::QueryInterface(const nsIID &aIID,
         return NS_ERROR_NULL_POINTER;
 
     if (aIID.Equals(kISupportsIID)) {
-        *aInstancePtr = NS_STATIC_CAST(nsISupports*,this);
+        *aInstancePtr = static_cast<nsISupports*>(this);
     } else if (aIID.Equals(kIFactoryIID)) {
-        *aInstancePtr = NS_STATIC_CAST(nsISupports*,
-                                       NS_STATIC_CAST(nsIFactory*,this));
+        *aInstancePtr = static_cast<nsISupports*>
+                                   (static_cast<nsIFactory*>(this));
     } else if (aIID.Equals(kIPluginIID)) {
-        *aInstancePtr = NS_STATIC_CAST(nsISupports*,
-                                       NS_STATIC_CAST(nsIPlugin*,this));
+        *aInstancePtr = static_cast<nsISupports*>
+                                   (static_cast<nsIPlugin*>(this));
     } else {
         *aInstancePtr = nsnull;
         return NS_ERROR_NO_INTERFACE;
     }
 
-    NS_ADDREF(NS_REINTERPRET_CAST(nsISupports*,*aInstancePtr));
+    NS_ADDREF(reinterpret_cast<nsISupports*>(*aInstancePtr));
 
     return NS_OK;
 }
diff --git a/mozilla/modules/plugin/samples/simple/npsimple.cpp b/mozilla/modules/plugin/samples/simple/npsimple.cpp
index f1cec7b7c08..97eea6f5e16 100644
--- a/mozilla/modules/plugin/samples/simple/npsimple.cpp
+++ b/mozilla/modules/plugin/samples/simple/npsimple.cpp
@@ -407,8 +407,8 @@ SimplePluginInstance::GetScriptablePeer(void **aScriptablePeer)
    // nsISecurityCheckedComponent to be scriptable from content
    // javascript.
 
-   *aScriptablePeer = NS_STATIC_CAST(nsISimplePluginInstance *, this);
-   NS_ADDREF(NS_STATIC_CAST(nsISimplePluginInstance *, *aScriptablePeer));
+   *aScriptablePeer = static_cast<nsISimplePluginInstance *>(this);
+   NS_ADDREF(static_cast<nsISimplePluginInstance *>(*aScriptablePeer));
    return NS_OK;
 }
 
@@ -456,14 +456,14 @@ SimplePluginInstance::RegisterSelf(nsIComponentManager* aCompMgr,
 
     nsIServiceManager *svcMgr;
     rv = aCompMgr->QueryInterface(NS_GET_IID(nsIServiceManager),
-                                  NS_REINTERPRET_CAST(void**, &svcMgr));
+                                  reinterpret_cast<void**>(&svcMgr));
     if (NS_FAILED(rv))
         return rv;
 
     nsIPluginManager* pm;
     rv = svcMgr->GetService(kPluginManagerCID,
                             NS_GET_IID(nsIPluginManager),
-                            NS_REINTERPRET_CAST(void**, &pm));
+                            reinterpret_cast<void**>(&pm));
     NS_RELEASE(svcMgr);
 
     if (NS_SUCCEEDED(rv)) {
@@ -492,14 +492,14 @@ SimplePluginInstance::UnregisterSelf(nsIComponentManager* aCompMgr,
 
     nsIServiceManager *svcMgr;
     rv = aCompMgr->QueryInterface(NS_GET_IID(nsIServiceManager),
-                                  NS_REINTERPRET_CAST(void**, &svcMgr));
+                                  reinterpret_cast<void**>(&svcMgr));
     if (NS_FAILED(rv))
         return rv;
 
     nsIPluginManager* pm;
     rv = svcMgr->GetService(kPluginManagerCID,
                             NS_GET_IID(nsIPluginManager),
-                            NS_REINTERPRET_CAST(void**, &pm));
+                            reinterpret_cast<void**>(&pm));
     NS_RELEASE(svcMgr);
 
     if (NS_SUCCEEDED(rv)) {
diff --git a/mozilla/modules/plugin/samples/testevents/npevents.cpp b/mozilla/modules/plugin/samples/testevents/npevents.cpp
index 95d032c2cb3..fa4e729b2f0 100644
--- a/mozilla/modules/plugin/samples/testevents/npevents.cpp
+++ b/mozilla/modules/plugin/samples/testevents/npevents.cpp
@@ -305,14 +305,14 @@ EventsPluginInstance::RegisterSelf(nsIComponentManager* aCompMgr,
 
     nsIServiceManager *svcMgr;
     rv = aCompMgr->QueryInterface(NS_GET_IID(nsIServiceManager),
-                                  NS_REINTERPRET_CAST(void**, &svcMgr));
+                                  reinterpret_cast<void**>(&svcMgr));
     if (NS_FAILED(rv))
         return rv;
 
     nsIPluginManager* pm;
     rv = svcMgr->GetService(kPluginManagerCID,
                             NS_GET_IID(nsIPluginManager),
-                            NS_REINTERPRET_CAST(void**, &pm));
+                            reinterpret_cast<void**>(&pm));
     NS_RELEASE(svcMgr);
 
     if (NS_SUCCEEDED(rv)) {
@@ -341,14 +341,14 @@ EventsPluginInstance::UnregisterSelf(nsIComponentManager* aCompMgr,
 
     nsIServiceManager *svcMgr;
     rv = aCompMgr->QueryInterface(NS_GET_IID(nsIServiceManager),
-                                  NS_REINTERPRET_CAST(void**, &svcMgr));
+                                  reinterpret_cast<void**>(&svcMgr));
     if (NS_FAILED(rv))
         return rv;
 
     nsIPluginManager* pm;
     rv = svcMgr->GetService(kPluginManagerCID,
                             NS_GET_IID(nsIPluginManager),
-                            NS_REINTERPRET_CAST(void**, &pm));
+                            reinterpret_cast<void**>(&pm));
     NS_RELEASE(svcMgr);
 
     if (NS_SUCCEEDED(rv)) {
diff --git a/mozilla/modules/plugin/tools/sdk/samples/simple/nsScriptablePeer.cpp b/mozilla/modules/plugin/tools/sdk/samples/simple/nsScriptablePeer.cpp
index b6e22f6b728..1754868101b 100644
--- a/mozilla/modules/plugin/tools/sdk/samples/simple/nsScriptablePeer.cpp
+++ b/mozilla/modules/plugin/tools/sdk/samples/simple/nsScriptablePeer.cpp
@@ -87,19 +87,19 @@ NS_IMETHODIMP nsScriptablePeer::QueryInterface(const nsIID& aIID, void** aInstan
     return NS_ERROR_NULL_POINTER; 
 
   if(aIID.Equals(kISimplePluginIID)) {
-    *aInstancePtr = NS_STATIC_CAST(nsISimplePlugin*, this); 
+    *aInstancePtr = static_cast<nsISimplePlugin*>(this); 
     AddRef();
     return NS_OK;
   }
 
   if(aIID.Equals(kIClassInfoIID)) {
-    *aInstancePtr = NS_STATIC_CAST(nsIClassInfo*, this); 
+    *aInstancePtr = static_cast<nsIClassInfo*>(this); 
     AddRef();
     return NS_OK;
   }
 
   if(aIID.Equals(kISupportsIID)) {
-    *aInstancePtr = NS_STATIC_CAST(nsISupports*,(NS_STATIC_CAST(nsISimplePlugin*, this))); 
+    *aInstancePtr = static_cast<nsISupports*>((static_cast<nsISimplePlugin*>(this))); 
     AddRef();
     return NS_OK;
   }
diff --git a/mozilla/netwerk/base/public/nsURIHashKey.h b/mozilla/netwerk/base/public/nsURIHashKey.h
index cd4984b2101..2629f9f6a10 100644
--- a/mozilla/netwerk/base/public/nsURIHashKey.h
+++ b/mozilla/netwerk/base/public/nsURIHashKey.h
@@ -53,7 +53,7 @@ public:
     typedef const nsIURI* KeyTypePointer;
 
     nsURIHashKey(const nsIURI* aKey) :
-        mKey(NS_CONST_CAST(nsIURI*, aKey)) { MOZ_COUNT_CTOR(nsURIHashKey); }
+        mKey(const_cast<nsIURI*>(aKey)) { MOZ_COUNT_CTOR(nsURIHashKey); }
     nsURIHashKey(const nsURIHashKey& toCopy) :
         mKey(toCopy.mKey) { MOZ_COUNT_CTOR(nsURIHashKey); }
     ~nsURIHashKey() { MOZ_COUNT_DTOR(nsURIHashKey); }
@@ -62,7 +62,7 @@ public:
 
     PRBool KeyEquals(const nsIURI* aKey) const {
         PRBool eq;
-        if (NS_SUCCEEDED(mKey->Equals(NS_CONST_CAST(nsIURI*,aKey), &eq))) {
+        if (NS_SUCCEEDED(mKey->Equals(const_cast<nsIURI*>(aKey), &eq))) {
             return eq;
         }
         return PR_FALSE;
@@ -71,7 +71,7 @@ public:
     static const nsIURI* KeyToPointer(nsIURI* aKey) { return aKey; }
     static PLDHashNumber HashKey(const nsIURI* aKey) {
         nsCAutoString spec;
-        NS_CONST_CAST(nsIURI*,aKey)->GetSpec(spec);
+        const_cast<nsIURI*>(aKey)->GetSpec(spec);
         return nsCRT::HashCode(spec.get());
     }
     
diff --git a/mozilla/netwerk/base/src/nsBaseChannel.cpp b/mozilla/netwerk/base/src/nsBaseChannel.cpp
index d21ec797dc3..3c8e886a299 100644
--- a/mozilla/netwerk/base/src/nsBaseChannel.cpp
+++ b/mozilla/netwerk/base/src/nsBaseChannel.cpp
@@ -51,7 +51,7 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 CopyProperties(const nsAString &key, nsIVariant *data, void *closure)
 {
   nsIWritablePropertyBag *bag =
-      NS_STATIC_CAST(nsIWritablePropertyBag *, closure);
+      static_cast<nsIWritablePropertyBag *>(closure);
 
   bag->SetProperty(key, data);
   return PL_DHASH_NEXT;
@@ -553,7 +553,7 @@ nsBaseChannel::GetInterface(const nsIID &iid, void **result)
 static void
 CallTypeSniffers(void *aClosure, const PRUint8 *aData, PRUint32 aCount)
 {
-  nsIChannel *chan = NS_STATIC_CAST(nsIChannel*, aClosure);
+  nsIChannel *chan = static_cast<nsIChannel*>(aClosure);
 
   const nsCOMArray<nsIContentSniffer>& sniffers =
     gIOService->GetContentSniffers();
@@ -572,7 +572,7 @@ CallTypeSniffers(void *aClosure, const PRUint8 *aData, PRUint32 aCount)
 static void
 CallUnknownTypeSniffer(void *aClosure, const PRUint8 *aData, PRUint32 aCount)
 {
-  nsIChannel *chan = NS_STATIC_CAST(nsIChannel*, aClosure);
+  nsIChannel *chan = static_cast<nsIChannel*>(aClosure);
 
   nsCOMPtr<nsIContentSniffer> sniffer =
     do_CreateInstance(NS_GENERIC_CONTENT_SNIFFER);
@@ -591,13 +591,13 @@ nsBaseChannel::OnStartRequest(nsIRequest *request, nsISupports *ctxt)
   // If our content type is unknown, then use the content type sniffer.  If the
   // sniffer is not available for some reason, then we just keep going as-is.
   if (NS_SUCCEEDED(mStatus) && mContentType.EqualsLiteral(UNKNOWN_CONTENT_TYPE)) {
-    mPump->PeekStream(CallUnknownTypeSniffer, NS_STATIC_CAST(nsIChannel*, this));
+    mPump->PeekStream(CallUnknownTypeSniffer, static_cast<nsIChannel*>(this));
   }
 
   // Now, the general type sniffers. Skip this if we have none.
   if ((mLoadFlags & LOAD_CALL_CONTENT_SNIFFERS) &&
       gIOService->GetContentSniffers().Count() != 0)
-    mPump->PeekStream(CallTypeSniffers, NS_STATIC_CAST(nsIChannel*, this));
+    mPump->PeekStream(CallTypeSniffers, static_cast<nsIChannel*>(this));
 
   SUSPEND_PUMP_FOR_SCOPE();
 
diff --git a/mozilla/netwerk/base/src/nsBaseChannel.h b/mozilla/netwerk/base/src/nsBaseChannel.h
index 697b426eeb1..4ead1b88f98 100644
--- a/mozilla/netwerk/base/src/nsBaseChannel.h
+++ b/mozilla/netwerk/base/src/nsBaseChannel.h
@@ -184,7 +184,7 @@ public:
 
   // Helper function for calling QueryInterface on this.
   nsQueryInterface do_QueryInterface() {
-    return nsQueryInterface(NS_STATIC_CAST(nsIChannel *, this));
+    return nsQueryInterface(static_cast<nsIChannel *>(this));
   }
   // MSVC needs this:
   nsQueryInterface do_QueryInterface(nsISupports *obj) {
diff --git a/mozilla/netwerk/base/src/nsIOService.cpp b/mozilla/netwerk/base/src/nsIOService.cpp
index 776bf584a4b..5b791b302e8 100644
--- a/mozilla/netwerk/base/src/nsIOService.cpp
+++ b/mozilla/netwerk/base/src/nsIOService.cpp
@@ -224,7 +224,7 @@ nsIOService::Init()
     
     // setup our bad port list stuff
     for(int i=0; gBadPortList[i]; i++)
-        mRestrictedPortList.AppendElement(NS_REINTERPRET_CAST(void *, gBadPortList[i]));
+        mRestrictedPortList.AppendElement(reinterpret_cast<void *>(gBadPortList[i]));
 
     // Further modifications to the port list come from prefs
     nsCOMPtr<nsIPrefBranch2> prefBranch;
@@ -619,7 +619,7 @@ nsIOService::SetOffline(PRBool offline)
         // don't care if notification fails
         // this allows users to attempt a little cleanup before dns and socket transport are shut down.
         if (observerService)
-            observerService->NotifyObservers(NS_STATIC_CAST(nsIIOService *, this),
+            observerService->NotifyObservers(static_cast<nsIIOService *>(this),
                                              NS_IOSERVICE_GOING_OFFLINE_TOPIC,
                                              offlineString.get());
 
@@ -636,7 +636,7 @@ nsIOService::SetOffline(PRBool offline)
 
         // don't care if notification fails
         if (observerService)
-            observerService->NotifyObservers(NS_STATIC_CAST(nsIIOService *, this),
+            observerService->NotifyObservers(static_cast<nsIIOService *>(this),
                                              NS_IOSERVICE_OFFLINE_STATUS_TOPIC,
                                              offlineString.get());
     }
@@ -659,7 +659,7 @@ nsIOService::SetOffline(PRBool offline)
  
         // don't care if notification fails
         if (observerService)
-            observerService->NotifyObservers(NS_STATIC_CAST(nsIIOService *, this),
+            observerService->NotifyObservers(static_cast<nsIIOService *>(this),
                                              NS_IOSERVICE_OFFLINE_STATUS_TOPIC,
                                              NS_LITERAL_STRING(NS_IOSERVICE_ONLINE).get());
     }
diff --git a/mozilla/netwerk/base/src/nsIncrementalDownload.cpp b/mozilla/netwerk/base/src/nsIncrementalDownload.cpp
index 54407c397d4..748b13b898f 100644
--- a/mozilla/netwerk/base/src/nsIncrementalDownload.cpp
+++ b/mozilla/netwerk/base/src/nsIncrementalDownload.cpp
@@ -725,7 +725,7 @@ nsIncrementalDownload::GetInterface(const nsIID &iid, void **result)
 {
   if (iid.Equals(NS_GET_IID(nsIChannelEventSink))) {
     NS_ADDREF_THIS();
-    *result = NS_STATIC_CAST(nsIChannelEventSink *, this);
+    *result = static_cast<nsIChannelEventSink *>(this);
     return NS_OK;
   }
 
diff --git a/mozilla/netwerk/base/src/nsInputStreamPump.cpp b/mozilla/netwerk/base/src/nsInputStreamPump.cpp
index b599a3d887b..381f86871d0 100644
--- a/mozilla/netwerk/base/src/nsInputStreamPump.cpp
+++ b/mozilla/netwerk/base/src/nsInputStreamPump.cpp
@@ -120,9 +120,9 @@ CallPeekFunc(nsIInputStream *aInStream, void *aClosure,
   NS_ASSERTION(aToOffset == 0, "Called more than once?");
   NS_ASSERTION(aCount > 0, "Called without data?");
 
-  PeekData* data = NS_STATIC_CAST(PeekData*, aClosure);
+  PeekData* data = static_cast<PeekData*>(aClosure);
   data->mFunc(data->mClosure,
-              NS_REINTERPRET_CAST(const PRUint8*, aFromSegment), aCount);
+              reinterpret_cast<const PRUint8*>(aFromSegment), aCount);
   return NS_BINDING_ABORTED;
 }
 
diff --git a/mozilla/netwerk/base/src/nsLoadGroup.cpp b/mozilla/netwerk/base/src/nsLoadGroup.cpp
index c09cb8a2eaf..bf2a4246b67 100644
--- a/mozilla/netwerk/base/src/nsLoadGroup.cpp
+++ b/mozilla/netwerk/base/src/nsLoadGroup.cpp
@@ -86,8 +86,8 @@ RequestHashMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry,
                       const void *key)
 {
     const RequestMapEntry *e =
-        NS_STATIC_CAST(const RequestMapEntry *, entry);
-    const nsIRequest *request = NS_STATIC_CAST(const nsIRequest *, key);
+        static_cast<const RequestMapEntry *>(entry);
+    const nsIRequest *request = static_cast<const nsIRequest *>(key);
 
     return e->mKey == request;
 }
@@ -95,7 +95,7 @@ RequestHashMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry,
 PR_STATIC_CALLBACK(void)
 RequestHashClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry)
 {
-    RequestMapEntry *e = NS_STATIC_CAST(RequestMapEntry *, entry);
+    RequestMapEntry *e = static_cast<RequestMapEntry *>(entry);
 
     // An entry is being cleared, let the entry do its own cleanup.
     e->~RequestMapEntry();
@@ -105,8 +105,8 @@ PR_STATIC_CALLBACK(PRBool)
 RequestHashInitEntry(PLDHashTable *table, PLDHashEntryHdr *entry,
                      const void *key)
 {
-    const nsIRequest *const_request = NS_STATIC_CAST(const nsIRequest *, key);
-    nsIRequest *request = NS_CONST_CAST(nsIRequest *, const_request);
+    const nsIRequest *const_request = static_cast<const nsIRequest *>(key);
+    nsIRequest *request = const_cast<nsIRequest *>(const_request);
 
     // Initialize the entry with placement new
     new (entry) RequestMapEntry(request);
@@ -126,8 +126,8 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 RescheduleRequests(PLDHashTable *table, PLDHashEntryHdr *hdr,
                    PRUint32 number, void *arg)
 {
-    RequestMapEntry *e = NS_STATIC_CAST(RequestMapEntry *, hdr);
-    PRInt32 *delta = NS_STATIC_CAST(PRInt32 *, arg);
+    RequestMapEntry *e = static_cast<RequestMapEntry *>(hdr);
+    PRInt32 *delta = static_cast<PRInt32 *>(arg);
 
     RescheduleRequest(e->mKey, *delta);
     return PL_DHASH_NEXT;
@@ -248,8 +248,8 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 AppendRequestsToVoidArray(PLDHashTable *table, PLDHashEntryHdr *hdr,
                           PRUint32 number, void *arg)
 {
-    RequestMapEntry *e = NS_STATIC_CAST(RequestMapEntry *, hdr);
-    nsVoidArray *array = NS_STATIC_CAST(nsVoidArray *, arg);
+    RequestMapEntry *e = static_cast<RequestMapEntry *>(hdr);
+    nsVoidArray *array = static_cast<nsVoidArray *>(arg);
 
     nsIRequest *request = e->mKey;
     NS_ASSERTION(request, "What? Null key in pldhash entry?");
@@ -270,7 +270,7 @@ AppendRequestsToVoidArray(PLDHashTable *table, PLDHashEntryHdr *hdr,
 PR_STATIC_CALLBACK(PRBool)
 ReleaseVoidArrayItems(void *aElement, void *aData)
 {
-    nsISupports *s = NS_STATIC_CAST(nsISupports *, aElement);
+    nsISupports *s = static_cast<nsISupports *>(aElement);
 
     NS_RELEASE(s);
 
@@ -287,7 +287,7 @@ nsLoadGroup::Cancel(nsresult status)
     nsAutoVoidArray requests;
 
     PL_DHashTableEnumerate(&mRequests, AppendRequestsToVoidArray,
-                           NS_STATIC_CAST(nsVoidArray *, &requests));
+                           static_cast<nsVoidArray *>(&requests));
 
     if (requests.Count() != (PRInt32)count) {
         requests.EnumerateForwards(ReleaseVoidArrayItems, nsnull);
@@ -308,13 +308,13 @@ nsLoadGroup::Cancel(nsresult status)
     nsresult firstError = NS_OK;
 
     while (count > 0) {
-        nsIRequest* request = NS_STATIC_CAST(nsIRequest*, requests.ElementAt(--count));
+        nsIRequest* request = static_cast<nsIRequest*>(requests.ElementAt(--count));
 
         NS_ASSERTION(request, "NULL request found in list.");
 
         RequestMapEntry *entry =
-            NS_STATIC_CAST(RequestMapEntry *,
-                           PL_DHashTableOperate(&mRequests, request,
+            static_cast<RequestMapEntry *>
+                       (PL_DHashTableOperate(&mRequests, request,
                                                 PL_DHASH_LOOKUP));
 
         if (PL_DHASH_ENTRY_IS_FREE(entry)) {
@@ -371,7 +371,7 @@ nsLoadGroup::Suspend()
     nsAutoVoidArray requests;
 
     PL_DHashTableEnumerate(&mRequests, AppendRequestsToVoidArray,
-                           NS_STATIC_CAST(nsVoidArray *, &requests));
+                           static_cast<nsVoidArray *>(&requests));
 
     if (requests.Count() != (PRInt32)count) {
         requests.EnumerateForwards(ReleaseVoidArrayItems, nsnull);
@@ -386,7 +386,7 @@ nsLoadGroup::Suspend()
     //
     while (count > 0) {
         nsIRequest* request =
-            NS_STATIC_CAST(nsIRequest*, requests.ElementAt(--count));
+            static_cast<nsIRequest*>(requests.ElementAt(--count));
 
         NS_ASSERTION(request, "NULL request found in list.");
         if (!request)
@@ -422,7 +422,7 @@ nsLoadGroup::Resume()
     nsAutoVoidArray requests;
 
     PL_DHashTableEnumerate(&mRequests, AppendRequestsToVoidArray,
-                           NS_STATIC_CAST(nsVoidArray *, &requests));
+                           static_cast<nsVoidArray *>(&requests));
 
     if (requests.Count() != (PRInt32)count) {
         requests.EnumerateForwards(ReleaseVoidArrayItems, nsnull);
@@ -437,7 +437,7 @@ nsLoadGroup::Resume()
     //
     while (count > 0) {
         nsIRequest* request =
-            NS_STATIC_CAST(nsIRequest*, requests.ElementAt(--count));
+            static_cast<nsIRequest*>(requests.ElementAt(--count));
 
         NS_ASSERTION(request, "NULL request found in list.");
         if (!request)
@@ -562,8 +562,8 @@ nsLoadGroup::AddRequest(nsIRequest *request, nsISupports* ctxt)
     //
 
     RequestMapEntry *entry =
-        NS_STATIC_CAST(RequestMapEntry *,
-                       PL_DHashTableOperate(&mRequests, request,
+        static_cast<RequestMapEntry *>
+                   (PL_DHashTableOperate(&mRequests, request,
                                         PL_DHASH_ADD));
 
     if (!entry) {
@@ -642,8 +642,8 @@ nsLoadGroup::RemoveRequest(nsIRequest *request, nsISupports* ctxt,
     // count or it will get messed up...
     //
     RequestMapEntry *entry =
-        NS_STATIC_CAST(RequestMapEntry *,
-                       PL_DHashTableOperate(&mRequests, request,
+        static_cast<RequestMapEntry *>
+                   (PL_DHashTableOperate(&mRequests, request,
                                         PL_DHASH_LOOKUP));
 
     if (PL_DHASH_ENTRY_IS_FREE(entry)) {
@@ -698,8 +698,8 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 AppendRequestsToISupportsArray(PLDHashTable *table, PLDHashEntryHdr *hdr,
                                PRUint32 number, void *arg)
 {
-    RequestMapEntry *e = NS_STATIC_CAST(RequestMapEntry *, hdr);
-    nsISupportsArray *array = NS_STATIC_CAST(nsISupportsArray *, arg);
+    RequestMapEntry *e = static_cast<RequestMapEntry *>(hdr);
+    nsISupportsArray *array = static_cast<nsISupportsArray *>(arg);
 
     PRBool ok = array->AppendElement(e->mKey);
 
diff --git a/mozilla/netwerk/base/src/nsPACMan.cpp b/mozilla/netwerk/base/src/nsPACMan.cpp
index 8b6261965f1..b3f3bb4e952 100644
--- a/mozilla/netwerk/base/src/nsPACMan.cpp
+++ b/mozilla/netwerk/base/src/nsPACMan.cpp
@@ -373,7 +373,7 @@ nsPACMan::ProcessPendingQ(nsresult status)
   // Now, start any pending queries
   PRCList *node = PR_LIST_HEAD(&mPendingQ);
   while (node != &mPendingQ) {
-    PendingPACQuery *query = NS_STATIC_CAST(PendingPACQuery *, node);
+    PendingPACQuery *query = static_cast<PendingPACQuery *>(node);
     node = PR_NEXT_LINK(node);
     if (NS_SUCCEEDED(status)) {
       // keep the query in the list (so we can complete it from Shutdown if
@@ -466,7 +466,7 @@ nsPACMan::GetInterface(const nsIID &iid, void **result)
   // In case loading the PAC file results in a redirect.
   if (iid.Equals(NS_GET_IID(nsIChannelEventSink))) {
     NS_ADDREF_THIS();
-    *result = NS_STATIC_CAST(nsIChannelEventSink *, this);
+    *result = static_cast<nsIChannelEventSink *>(this);
     return NS_OK;
   }
 
diff --git a/mozilla/netwerk/base/src/nsProtocolProxyService.cpp b/mozilla/netwerk/base/src/nsProtocolProxyService.cpp
index e96dd10d676..526b064e1a7 100644
--- a/mozilla/netwerk/base/src/nsProtocolProxyService.cpp
+++ b/mozilla/netwerk/base/src/nsProtocolProxyService.cpp
@@ -401,7 +401,7 @@ nsProtocolProxyService::PrefsChanged(nsIPrefBranch *prefBranch,
                 LOG(("unknown proxy type: %lu; assuming direct\n", type));
                 type = eProxyConfig_Direct;
             }
-            mProxyConfig = NS_STATIC_CAST(ProxyConfig, type);
+            mProxyConfig = static_cast<ProxyConfig>(type);
             reloadPAC = PR_TRUE;
         }
     }
diff --git a/mozilla/netwerk/base/src/nsSimpleURI.cpp b/mozilla/netwerk/base/src/nsSimpleURI.cpp
index 6a2bf8db2e1..92c9afb012e 100644
--- a/mozilla/netwerk/base/src/nsSimpleURI.cpp
+++ b/mozilla/netwerk/base/src/nsSimpleURI.cpp
@@ -81,13 +81,13 @@ nsSimpleURI::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr)
         *aInstancePtr = InnerObject();
     } else if (aIID.Equals(kThisSimpleURIImplementationCID) || // used by Equals
                aIID.Equals(NS_GET_IID(nsIURI))) {
-        *aInstancePtr = NS_STATIC_CAST(nsIURI*, this);
+        *aInstancePtr = static_cast<nsIURI*>(this);
     } else if (aIID.Equals(NS_GET_IID(nsISerializable))) {
-        *aInstancePtr = NS_STATIC_CAST(nsISerializable*, this);
+        *aInstancePtr = static_cast<nsISerializable*>(this);
     } else if (aIID.Equals(NS_GET_IID(nsIClassInfo))) {
-        *aInstancePtr = NS_STATIC_CAST(nsIClassInfo*, this);
+        *aInstancePtr = static_cast<nsIClassInfo*>(this);
     } else if (aIID.Equals(NS_GET_IID(nsIMutable))) {
-        *aInstancePtr = NS_STATIC_CAST(nsIMutable*, this);
+        *aInstancePtr = static_cast<nsIMutable*>(this);
     } else {
         *aInstancePtr = nsnull;
         return NS_NOINTERFACE;
diff --git a/mozilla/netwerk/base/src/nsSocketTransport2.cpp b/mozilla/netwerk/base/src/nsSocketTransport2.cpp
index dfbd9e37af8..84675d9820c 100644
--- a/mozilla/netwerk/base/src/nsSocketTransport2.cpp
+++ b/mozilla/netwerk/base/src/nsSocketTransport2.cpp
@@ -1394,7 +1394,7 @@ nsSocketTransport::OnSocketEvent(PRUint32 type, nsresult status, nsISupports *pa
         LOG(("  MSG_DNS_LOOKUP_COMPLETE\n"));
         mDNSRequest = 0;
         if (param) {
-            mDNSRecord = NS_STATIC_CAST(nsIDNSRecord *, param);
+            mDNSRecord = static_cast<nsIDNSRecord *>(param);
             mDNSRecord->GetNextAddr(SocketPort(), &mNetAddr);
         }
         // status contains DNS lookup status
diff --git a/mozilla/netwerk/base/src/nsStandardURL.cpp b/mozilla/netwerk/base/src/nsStandardURL.cpp
index 385c0e1bdfb..9f311a19772 100644
--- a/mozilla/netwerk/base/src/nsStandardURL.cpp
+++ b/mozilla/netwerk/base/src/nsStandardURL.cpp
@@ -941,7 +941,7 @@ NS_INTERFACE_MAP_BEGIN(nsStandardURL)
     NS_INTERFACE_MAP_ENTRY(nsIMutable)
     // see nsStandardURL::Equals
     if (aIID.Equals(kThisImplCID))
-        foundInterface = NS_STATIC_CAST(nsIURI *, this);
+        foundInterface = static_cast<nsIURI *>(this);
     else
 NS_INTERFACE_MAP_END
 
diff --git a/mozilla/netwerk/base/src/nsStreamLoader.cpp b/mozilla/netwerk/base/src/nsStreamLoader.cpp
index 1954e72c0be..cbc27a12ee6 100644
--- a/mozilla/netwerk/base/src/nsStreamLoader.cpp
+++ b/mozilla/netwerk/base/src/nsStreamLoader.cpp
@@ -104,8 +104,8 @@ nsStreamLoader::OnStopRequest(nsIRequest* request, nsISupports *ctxt,
     mRequest = request;
     mObserver->OnStreamComplete(this, mContext, aStatus, 
                                 mData.Length(),
-                                NS_REINTERPRET_CAST(const PRUint8*,
-                                                    mData.get()));
+                                reinterpret_cast<const PRUint8*>
+                                                (mData.get()));
     // done.. cleanup
     mRequest = 0;
     mObserver = 0;
diff --git a/mozilla/netwerk/cache/src/nsDeleteDir.cpp b/mozilla/netwerk/cache/src/nsDeleteDir.cpp
index 106a77ea613..830dca855e6 100644
--- a/mozilla/netwerk/cache/src/nsDeleteDir.cpp
+++ b/mozilla/netwerk/cache/src/nsDeleteDir.cpp
@@ -43,7 +43,7 @@
 
 PR_STATIC_CALLBACK(void) DeleteDirThreadFunc(void *arg)
 {
-  nsIFile *dir = NS_STATIC_CAST(nsIFile *, arg);
+  nsIFile *dir = static_cast<nsIFile *>(arg);
   dir->Remove(PR_TRUE);
   NS_RELEASE(dir);
 }
diff --git a/mozilla/netwerk/cache/src/nsDiskCacheDeviceSQL.cpp b/mozilla/netwerk/cache/src/nsDiskCacheDeviceSQL.cpp
index c92c1085d33..61a4928fc54 100644
--- a/mozilla/netwerk/cache/src/nsDiskCacheDeviceSQL.cpp
+++ b/mozilla/netwerk/cache/src/nsDiskCacheDeviceSQL.cpp
@@ -1321,7 +1321,7 @@ nsOfflineCacheDevice::GetOwnedKeys(const char * clientID,
   }
 
   *count = keyArray.Length();
-  char **ret = NS_STATIC_CAST(char **, NS_Alloc(*count * sizeof(char*)));
+  char **ret = static_cast<char **>(NS_Alloc(*count * sizeof(char*)));
   if (!ret) return NS_ERROR_OUT_OF_MEMORY;
 
   for (PRUint32 i = 0; i <  *count; i++) {
diff --git a/mozilla/netwerk/cache/src/nsDiskCacheEntry.h b/mozilla/netwerk/cache/src/nsDiskCacheEntry.h
index f3c8c276526..90a8ebb4d86 100644
--- a/mozilla/netwerk/cache/src/nsDiskCacheEntry.h
+++ b/mozilla/netwerk/cache/src/nsDiskCacheEntry.h
@@ -67,7 +67,7 @@ struct nsDiskCacheEntry {
                                     mKeySize + mMetaDataSize;
                               }
 
-    char*           Key()     { return NS_REINTERPRET_CAST(char*const, this) + 
+    char*           Key()     { return reinterpret_cast<char*const>(this) + 
                                     sizeof(nsDiskCacheEntry);
                               }
 
diff --git a/mozilla/netwerk/cookie/src/nsCookie.cpp b/mozilla/netwerk/cookie/src/nsCookie.cpp
index 32c12f8a663..83b8b6e76c4 100644
--- a/mozilla/netwerk/cookie/src/nsCookie.cpp
+++ b/mozilla/netwerk/cookie/src/nsCookie.cpp
@@ -106,7 +106,7 @@ nsCookie::Create(const nsACString &aName,
 
   // assign string members
   char *name, *value, *host, *path, *end;
-  name = NS_STATIC_CAST(char *, place) + sizeof(nsCookie);
+  name = static_cast<char *>(place) + sizeof(nsCookie);
   StrBlockCopy(aName, aValue, aHost, aPath,
                name, value, host, path, end);
 
diff --git a/mozilla/netwerk/cookie/src/nsCookieService.cpp b/mozilla/netwerk/cookie/src/nsCookieService.cpp
index cfd715ae492..ec007ffd1ec 100644
--- a/mozilla/netwerk/cookie/src/nsCookieService.cpp
+++ b/mozilla/netwerk/cookie/src/nsCookieService.cpp
@@ -314,8 +314,8 @@ compareCookiesForSending(const void *aElement1,
                          const void *aElement2,
                          void       *aData)
 {
-  const nsCookie *cookie1 = NS_STATIC_CAST(const nsCookie*, aElement1);
-  const nsCookie *cookie2 = NS_STATIC_CAST(const nsCookie*, aElement2);
+  const nsCookie *cookie1 = static_cast<const nsCookie*>(aElement1);
+  const nsCookie *cookie2 = static_cast<const nsCookie*>(aElement2);
 
   // compare by cookie path length in accordance with RFC2109
   int rv = cookie2->Path().Length() - cookie1->Path().Length();
@@ -764,7 +764,7 @@ COMArrayCallback(nsCookieEntry *aEntry,
                  void          *aArg)
 {
   for (nsCookie *cookie = aEntry->Head(); cookie; cookie = cookie->Next()) {
-    NS_STATIC_CAST(nsCOMArray<nsICookie>*, aArg)->AppendObject(cookie);
+    static_cast<nsCOMArray<nsICookie>*>(aArg)->AppendObject(cookie);
   }
   return PL_DHASH_NEXT;
 }
@@ -1171,7 +1171,7 @@ nsCookieService::GetCookieInternal(nsIURI      *aHostURI,
   nsCAutoString cookieData;
   PRInt32 count = foundCookieList.Count();
   for (PRInt32 i = 0; i < count; ++i) {
-    cookie = NS_STATIC_CAST(nsCookie*, foundCookieList.ElementAt(i));
+    cookie = static_cast<nsCookie*>(foundCookieList.ElementAt(i));
 
     // check if we have anything to write
     if (!cookie->Name().IsEmpty() || !cookie->Value().IsEmpty()) {
@@ -1274,7 +1274,7 @@ nsCookieService::SetCookieInternal(nsIURI             *aHostURI,
     // needs one to prompt, so right now it has to fend for itself to get one
     mPermissionService->CanSetCookie(aHostURI,
                                      aChannel,
-                                     NS_STATIC_CAST(nsICookie2*, NS_STATIC_CAST(nsCookie*, cookie)),
+                                     static_cast<nsICookie2*>(static_cast<nsCookie*>(cookie)),
                                      &cookieAttributes.isSession,
                                      &cookieAttributes.expiryTime,
                                      &permission);
@@ -2012,7 +2012,7 @@ PLDHashOperator PR_CALLBACK
 removeExpiredCallback(nsCookieEntry *aEntry,
                       void          *aArg)
 {
-  const PRInt64 &currentTime = *NS_STATIC_CAST(PRInt64*, aArg);
+  const PRInt64 &currentTime = *static_cast<PRInt64*>(aArg);
   for (nsListIter iter(aEntry, nsnull, aEntry->Head()); iter.current; ) {
     if (iter.current->Expiry() <= currentTime)
       // remove from list. this takes care of updating the iterator for us
@@ -2040,7 +2040,7 @@ nsCookieService::CookieExists(nsICookie2 *aCookie,
 
   // just a placeholder
   nsEnumerationData data(PR_Now() / PR_USEC_PER_SEC, LL_MININT);
-  nsCookie *cookie = NS_STATIC_CAST(nsCookie*, aCookie);
+  nsCookie *cookie = static_cast<nsCookie*>(aCookie);
 
   *aFoundCookie = FindCookie(cookie->Host(), cookie->Name(), cookie->Path(), data.iter);
   return NS_OK;
@@ -2220,7 +2220,7 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 findOldestCallback(nsCookieEntry *aEntry,
                    void          *aArg)
 {
-  nsEnumerationData *data = NS_STATIC_CAST(nsEnumerationData*, aArg);
+  nsEnumerationData *data = static_cast<nsEnumerationData*>(aArg);
   for (nsListIter iter(aEntry, nsnull, aEntry->Head()); iter.current; ++iter) {
     // check if we've found the oldest cookie so far
     if (data->oldestID > iter.current->CreationID()) {
diff --git a/mozilla/netwerk/dns/src/nsEffectiveTLDService.cpp b/mozilla/netwerk/dns/src/nsEffectiveTLDService.cpp
index 3e44e068fd8..3f064f0c297 100644
--- a/mozilla/netwerk/dns/src/nsEffectiveTLDService.cpp
+++ b/mozilla/netwerk/dns/src/nsEffectiveTLDService.cpp
@@ -231,7 +231,7 @@ nsEffectiveTLDService::GetEffectiveTLDLength(const nsACString &aHostname,
   else {
     defaultTLDLength = nameLength - dotLoc - 1;
   }
-  *effTLDLength = NS_STATIC_CAST(PRUint32, defaultTLDLength);
+  *effTLDLength = static_cast<PRUint32>(defaultTLDLength);
 
   // Create a mutable copy of the hostname and normalize it.  This will fail
   // if the hostname includes invalid characters.
@@ -252,14 +252,14 @@ nsEffectiveTLDService::GetEffectiveTLDLength(const nsACString &aHostname,
       break;
     if (child->exception) {
       // Exception rules use one fewer levels than were matched.
-      *effTLDLength = NS_STATIC_CAST(PRUint32, nameLength - dotLoc - 1);
+      *effTLDLength = static_cast<PRUint32>(nameLength - dotLoc - 1);
       node = child;
       break;
     }
     // For a normal match, save the location of the last stop, in case we find
     // a non-stop match followed by a non-match further along.
     if (child->stopOK)
-      *effTLDLength = NS_STATIC_CAST(PRUint32, nameLength - nextDotLoc - 1);
+      *effTLDLength = static_cast<PRUint32>(nameLength - nextDotLoc - 1);
     node = child;
     dotLoc = nextDotLoc;
   }
diff --git a/mozilla/netwerk/dns/src/nsHostResolver.cpp b/mozilla/netwerk/dns/src/nsHostResolver.cpp
index af0a09d3faa..0d797f34895 100644
--- a/mozilla/netwerk/dns/src/nsHostResolver.cpp
+++ b/mozilla/netwerk/dns/src/nsHostResolver.cpp
@@ -202,7 +202,7 @@ struct nsHostDBEnt : PLDHashEntryHdr
 PR_STATIC_CALLBACK(PLDHashNumber)
 HostDB_HashKey(PLDHashTable *table, const void *key)
 {
-    const nsHostKey *hk = NS_STATIC_CAST(const nsHostKey *, key);
+    const nsHostKey *hk = static_cast<const nsHostKey *>(key);
     return PL_DHashStringKey(table, hk->host) ^ hk->flags ^ hk->af;
 }
 
@@ -211,8 +211,8 @@ HostDB_MatchEntry(PLDHashTable *table,
                   const PLDHashEntryHdr *entry,
                   const void *key)
 {
-    const nsHostDBEnt *he = NS_STATIC_CAST(const nsHostDBEnt *, entry);
-    const nsHostKey *hk = NS_STATIC_CAST(const nsHostKey *, key); 
+    const nsHostDBEnt *he = static_cast<const nsHostDBEnt *>(entry);
+    const nsHostKey *hk = static_cast<const nsHostKey *>(key); 
 
     return !strcmp(he->rec->host, hk->host) &&
             he->rec->flags == hk->flags &&
@@ -224,8 +224,8 @@ HostDB_MoveEntry(PLDHashTable *table,
                  const PLDHashEntryHdr *from,
                  PLDHashEntryHdr *to)
 {
-    NS_STATIC_CAST(nsHostDBEnt *, to)->rec =
-            NS_STATIC_CAST(const nsHostDBEnt *, from)->rec;
+    static_cast<nsHostDBEnt *>(to)->rec =
+            static_cast<const nsHostDBEnt *>(from)->rec;
 }
 
 PR_STATIC_CALLBACK(void)
@@ -233,7 +233,7 @@ HostDB_ClearEntry(PLDHashTable *table,
                   PLDHashEntryHdr *entry)
 {
     LOG(("evicting record\n"));
-    nsHostDBEnt *he = NS_STATIC_CAST(nsHostDBEnt *, entry);
+    nsHostDBEnt *he = static_cast<nsHostDBEnt *>(entry);
 #if defined(DEBUG) && defined(PR_LOGGING)
     if (!he->rec->addr_info)
         LOG(("%s: => no addr_info\n", he->rec->host));
@@ -263,8 +263,8 @@ HostDB_InitEntry(PLDHashTable *table,
                  PLDHashEntryHdr *entry,
                  const void *key)
 {
-    nsHostDBEnt *he = NS_STATIC_CAST(nsHostDBEnt *, entry);
-    nsHostRecord::Create(NS_STATIC_CAST(const nsHostKey *, key), &he->rec);
+    nsHostDBEnt *he = static_cast<nsHostDBEnt *>(entry);
+    nsHostRecord::Create(static_cast<const nsHostKey *>(key), &he->rec);
     return PR_TRUE;
 }
 
@@ -377,7 +377,7 @@ nsHostResolver::Shutdown()
     if (!PR_CLIST_IS_EMPTY(&pendingQ)) {
         PRCList *node = pendingQ.next;
         while (node != &pendingQ) {
-            nsHostRecord *rec = NS_STATIC_CAST(nsHostRecord *, node);
+            nsHostRecord *rec = static_cast<nsHostRecord *>(node);
             node = node->next;
             OnLookupComplete(rec, NS_ERROR_ABORT, nsnull);
         }
@@ -386,7 +386,7 @@ nsHostResolver::Shutdown()
     if (!PR_CLIST_IS_EMPTY(&evictionQ)) {
         PRCList *node = evictionQ.next;
         while (node != &evictionQ) {
-            nsHostRecord *rec = NS_STATIC_CAST(nsHostRecord *, node);
+            nsHostRecord *rec = static_cast<nsHostRecord *>(node);
             node = node->next;
             NS_RELEASE(rec);
         }
@@ -433,8 +433,8 @@ nsHostResolver::ResolveHost(const char            *host,
             // callback, and proceed to do the lookup.
 
             nsHostKey key = { host, flags, af };
-            nsHostDBEnt *he = NS_STATIC_CAST(nsHostDBEnt *,
-                    PL_DHashTableOperate(&mDB, &key, PL_DHASH_ADD));
+            nsHostDBEnt *he = static_cast<nsHostDBEnt *>
+                                         (PL_DHashTableOperate(&mDB, &key, PL_DHASH_ADD));
 
             // if the record is null, then HostDB_InitEntry failed.
             if (!he || !he->rec)
@@ -491,14 +491,14 @@ nsHostResolver::DetachCallback(const char            *host,
         nsAutoLock lock(mLock);
 
         nsHostKey key = { host, flags, af };
-        nsHostDBEnt *he = NS_STATIC_CAST(nsHostDBEnt *,
-                PL_DHashTableOperate(&mDB, &key, PL_DHASH_LOOKUP));
+        nsHostDBEnt *he = static_cast<nsHostDBEnt *>
+                                     (PL_DHashTableOperate(&mDB, &key, PL_DHASH_LOOKUP));
         if (he && he->rec) {
             // walk list looking for |callback|... we cannot assume
             // that it will be there!
             PRCList *node = he->rec->callbacks.next;
             while (node != &he->rec->callbacks) {
-                if (NS_STATIC_CAST(nsResolveHostCallback *, node) == callback) {
+                if (static_cast<nsResolveHostCallback *>(node) == callback) {
                     PR_REMOVE_LINK(callback);
                     rec = he->rec;
                     break;
@@ -589,7 +589,7 @@ nsHostResolver::GetHostToLookup(nsHostRecord **result)
 
     if (!PR_CLIST_IS_EMPTY(&mPendingQ)) {
         // remove next record from mPendingQ; hand over owning reference.
-        *result = NS_STATIC_CAST(nsHostRecord *, mPendingQ.next);
+        *result = static_cast<nsHostRecord *>(mPendingQ.next);
         PR_REMOVE_AND_INIT_LINK(*result);
         return PR_TRUE;
     }
@@ -626,7 +626,7 @@ nsHostResolver::OnLookupComplete(nsHostRecord *rec, nsresult status, PRAddrInfo
             else {
                 // remove first element on mEvictionQ
                 nsHostRecord *head =
-                    NS_STATIC_CAST(nsHostRecord *, PR_LIST_HEAD(&mEvictionQ));
+                    static_cast<nsHostRecord *>(PR_LIST_HEAD(&mEvictionQ));
                 PR_REMOVE_AND_INIT_LINK(head);
                 PL_DHashTableOperate(&mDB, (nsHostKey *) head, PL_DHASH_REMOVE);
                 // release reference to rec owned by mEvictionQ
@@ -639,7 +639,7 @@ nsHostResolver::OnLookupComplete(nsHostRecord *rec, nsresult status, PRAddrInfo
         PRCList *node = cbs.next;
         while (node != &cbs) {
             nsResolveHostCallback *callback =
-                    NS_STATIC_CAST(nsResolveHostCallback *, node);
+                    static_cast<nsResolveHostCallback *>(node);
             node = node->next;
             callback->OnLookupComplete(this, rec, status);
             // NOTE: callback must not be dereferenced after this point!!
diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp
index f70baf3461e..1d85df091fb 100644
--- a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp
+++ b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp
@@ -660,7 +660,7 @@ nsFtpState::S_user() {
     } else {
         if (mUsername.IsEmpty()) {
             nsCOMPtr<nsIAuthPrompt2> prompter;
-            NS_QueryAuthPrompt2(NS_STATIC_CAST(nsIChannel*, mChannel),
+            NS_QueryAuthPrompt2(static_cast<nsIChannel*>(mChannel),
                                 getter_AddRefs(prompter));
             if (!prompter)
                 return NS_ERROR_NOT_INITIALIZED;
@@ -750,7 +750,7 @@ nsFtpState::S_pass() {
     } else {
         if (mPassword.IsEmpty() || mRetryPass) {
             nsCOMPtr<nsIAuthPrompt2> prompter;
-            NS_QueryAuthPrompt2(NS_STATIC_CAST(nsIChannel*, mChannel),
+            NS_QueryAuthPrompt2(static_cast<nsIChannel*>(mChannel),
                                 getter_AddRefs(prompter));
             if (!prompter)
                 return NS_ERROR_NOT_INITIALIZED;
diff --git a/mozilla/netwerk/protocol/http/src/nsHttp.cpp b/mozilla/netwerk/protocol/http/src/nsHttp.cpp
index 3a55e54cd08..523ed595043 100644
--- a/mozilla/netwerk/protocol/http/src/nsHttp.cpp
+++ b/mozilla/netwerk/protocol/http/src/nsHttp.cpp
@@ -77,7 +77,7 @@ NewHeapAtom(const char *value) {
     int len = strlen(value);
 
     HttpHeapAtom *a =
-        NS_REINTERPRET_CAST(HttpHeapAtom *, malloc(sizeof(*a) + len));
+        reinterpret_cast<HttpHeapAtom *>(malloc(sizeof(*a) + len));
     if (!a)
         return nsnull;
     memcpy(a->value, value, len + 1);
@@ -94,7 +94,7 @@ PR_STATIC_CALLBACK(PLDHashNumber)
 StringHash(PLDHashTable *table, const void *key)
 {
     PLDHashNumber h = 0;
-    for (const char *s = NS_REINTERPRET_CAST(const char*, key); *s; ++s)
+    for (const char *s = reinterpret_cast<const char*>(key); *s; ++s)
         h = (h >> 28) ^ (h << 4) ^ nsCRT::ToLower(*s);
     return h;
 }
@@ -104,10 +104,10 @@ StringCompare(PLDHashTable *table, const PLDHashEntryHdr *entry,
               const void *testKey)
 {
     const void *entryKey =
-            NS_REINTERPRET_CAST(const PLDHashEntryStub *, entry)->key;
+            reinterpret_cast<const PLDHashEntryStub *>(entry)->key;
 
-    return PL_strcasecmp(NS_REINTERPRET_CAST(const char *, entryKey),
-                         NS_REINTERPRET_CAST(const char *, testKey)) == 0;
+    return PL_strcasecmp(reinterpret_cast<const char *>(entryKey),
+                         reinterpret_cast<const char *>(testKey)) == 0;
 }
 
 static const PLDHashTableOps ops = {
@@ -151,8 +151,8 @@ nsHttp::CreateAtomTable()
     };
 
     for (int i = 0; atoms[i]; ++i) {
-        PLDHashEntryStub *stub = NS_REINTERPRET_CAST(PLDHashEntryStub *,
-                PL_DHashTableOperate(&sAtomTable, atoms[i], PL_DHASH_ADD));
+        PLDHashEntryStub *stub = reinterpret_cast<PLDHashEntryStub *>
+                                                 (PL_DHashTableOperate(&sAtomTable, atoms[i], PL_DHASH_ADD));
         if (!stub)
             return NS_ERROR_OUT_OF_MEMORY;
         
@@ -194,13 +194,13 @@ nsHttp::ResolveAtom(const char *str)
 
     nsAutoLock lock(sLock);
 
-    PLDHashEntryStub *stub = NS_REINTERPRET_CAST(PLDHashEntryStub *,
-            PL_DHashTableOperate(&sAtomTable, str, PL_DHASH_ADD));
+    PLDHashEntryStub *stub = reinterpret_cast<PLDHashEntryStub *>
+                                             (PL_DHashTableOperate(&sAtomTable, str, PL_DHASH_ADD));
     if (!stub)
         return atom;  // out of memory
 
     if (stub->key) {
-        atom._val = NS_REINTERPRET_CAST(const char *, stub->key);
+        atom._val = reinterpret_cast<const char *>(stub->key);
         return atom;
     }
 
diff --git a/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp b/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp
index a0562100043..2d33467c825 100644
--- a/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp
+++ b/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp
@@ -648,7 +648,7 @@ nsHttpChannel::ApplyContentConversions()
 static void
 CallTypeSniffers(void *aClosure, const PRUint8 *aData, PRUint32 aCount)
 {
-  nsIChannel *chan = NS_STATIC_CAST(nsIChannel*, aClosure);
+  nsIChannel *chan = static_cast<nsIChannel*>(aClosure);
 
   const nsCOMArray<nsIContentSniffer>& sniffers =
     gIOService->GetContentSniffers();
@@ -709,7 +709,7 @@ nsHttpChannel::CallOnStartRequest()
         // because that's the one that has the initial contents. If that fails
         // then give the transaction pump a shot.
 
-        nsIChannel* thisChannel = NS_STATIC_CAST(nsIChannel*, this);
+        nsIChannel* thisChannel = static_cast<nsIChannel*>(this);
 
         PRBool typeSniffersCalled = PR_FALSE;
         if (mCachePump) {
@@ -2128,8 +2128,8 @@ nsHttpChannel::InstallOfflineCacheListener()
 PR_STATIC_CALLBACK(PLDHashOperator)
 CopyProperties(const nsAString& aKey, nsIVariant *aData, void *aClosure)
 {
-    nsIWritablePropertyBag* bag = NS_STATIC_CAST(nsIWritablePropertyBag*,
-                                                 aClosure);
+    nsIWritablePropertyBag* bag = static_cast<nsIWritablePropertyBag*>
+                                             (aClosure);
     bag->SetProperty(aKey, aData);
     return PL_DHASH_NEXT;
 }
@@ -2399,7 +2399,7 @@ GetAuthPrompt(nsIInterfaceRequestor *ifreq, PRBool proxyAuth,
     if (promptProvider)
         promptProvider->GetAuthPrompt(promptReason,
                                       NS_GET_IID(nsIAuthPrompt2),
-                                      NS_REINTERPRET_CAST(void**, result));
+                                      reinterpret_cast<void**>(result));
     else
         NS_QueryAuthPrompt2(ifreq, result);
 }
diff --git a/mozilla/netwerk/protocol/http/src/nsHttpChunkedDecoder.cpp b/mozilla/netwerk/protocol/http/src/nsHttpChunkedDecoder.cpp
index c596df06402..d8f6159fec9 100644
--- a/mozilla/netwerk/protocol/http/src/nsHttpChunkedDecoder.cpp
+++ b/mozilla/netwerk/protocol/http/src/nsHttpChunkedDecoder.cpp
@@ -119,7 +119,7 @@ nsHttpChunkedDecoder::ParseChunkRemaining(char *buf,
 
     *bytesConsumed = 0;
     
-    char *p = NS_STATIC_CAST(char *, memchr(buf, '\n', count));
+    char *p = static_cast<char *>(memchr(buf, '\n', count));
     if (p) {
         *p = 0;
         if ((p > buf) && (*(p-1) == '\r')) // eliminate a preceding CR
diff --git a/mozilla/netwerk/protocol/http/src/nsHttpConnection.cpp b/mozilla/netwerk/protocol/http/src/nsHttpConnection.cpp
index 0d844aa53ed..d7bdf910554 100644
--- a/mozilla/netwerk/protocol/http/src/nsHttpConnection.cpp
+++ b/mozilla/netwerk/protocol/http/src/nsHttpConnection.cpp
@@ -365,7 +365,7 @@ nsHttpConnection::OnHeadersAvailable(nsAHttpTransaction *trans,
             // processing a transaction pipeline until after the first HTTP/1.1
             // response.
             nsHttpTransaction *trans =
-                    NS_STATIC_CAST(nsHttpTransaction *, mTransaction);
+                    static_cast<nsHttpTransaction *>(mTransaction);
             trans->SetSSLConnectFailed();
         }
     }
@@ -693,7 +693,7 @@ nsHttpConnection::SetupSSLProxyConnect()
 
     // NOTE: this cast is valid since this connection cannot be processing a
     // transaction pipeline until after the first HTTP/1.1 response.
-    nsHttpTransaction *trans = NS_STATIC_CAST(nsHttpTransaction *, mTransaction);
+    nsHttpTransaction *trans = static_cast<nsHttpTransaction *>(mTransaction);
     
     val = trans->RequestHead()->PeekHeader(nsHttp::Host);
     if (val) {
diff --git a/mozilla/netwerk/protocol/http/src/nsHttpHandler.cpp b/mozilla/netwerk/protocol/http/src/nsHttpHandler.cpp
index 4defbb4bbd4..8763f68cb72 100644
--- a/mozilla/netwerk/protocol/http/src/nsHttpHandler.cpp
+++ b/mozilla/netwerk/protocol/http/src/nsHttpHandler.cpp
@@ -269,7 +269,7 @@ nsHttpHandler::Init()
     // Startup the http category
     // Bring alive the objects in the http-protocol-startup category
     NS_CreateServicesFromCategory(NS_HTTP_STARTUP_CATEGORY,
-                                  NS_STATIC_CAST(nsISupports*,NS_STATIC_CAST(void*,this)),
+                                  static_cast<nsISupports*>(static_cast<void*>(this)),
                                   NS_HTTP_STARTUP_TOPIC);    
     
     mObserverService = do_GetService("@mozilla.org/observer-service;1");
@@ -740,8 +740,8 @@ nsHttpHandler::InitUserAgentComponents()
 
 static int StringCompare(const void* s1, const void* s2, void*)
 {
-    return nsCRT::strcmp(*NS_STATIC_CAST(const char *const *, s1),
-                         *NS_STATIC_CAST(const char *const *, s2));
+    return nsCRT::strcmp(*static_cast<const char *const *>(s1),
+                         *static_cast<const char *const *>(s2));
 }
 
 void
diff --git a/mozilla/netwerk/protocol/http/src/nsHttpTransaction.cpp b/mozilla/netwerk/protocol/http/src/nsHttpTransaction.cpp
index 411d2ea86f9..f6702672594 100644
--- a/mozilla/netwerk/protocol/http/src/nsHttpTransaction.cpp
+++ b/mozilla/netwerk/protocol/http/src/nsHttpTransaction.cpp
@@ -346,7 +346,7 @@ nsHttpTransaction::OnTransportStatus(nsresult status, PRUint64 progress)
         mActivityDistributor->ObserveActivity(
             mChannel,
             NS_HTTP_ACTIVITY_TYPE_SOCKET_TRANSPORT,
-            NS_STATIC_CAST(PRUint32, status),
+            static_cast<PRUint32>(status),
             LL_ZERO,
             progress,
             EmptyCString());
@@ -533,7 +533,7 @@ nsHttpTransaction::Close(nsresult reason)
                 NS_HTTP_ACTIVITY_TYPE_HTTP_TRANSACTION,
                 NS_HTTP_ACTIVITY_SUBTYPE_RESPONSE_COMPLETE,
                 LL_ZERO,
-                NS_STATIC_CAST(PRUint64, mContentRead.mValue),
+                static_cast<PRUint64>(mContentRead.mValue),
                 EmptyCString());
 
         // report that this transaction is closing
@@ -757,7 +757,7 @@ nsHttpTransaction::ParseHead(char *buf,
     }
     // otherwise we can assume that we don't have a HTTP/0.9 response.
 
-    while ((eol = NS_STATIC_CAST(char *, memchr(buf, '\n', count - *countRead))) != nsnull) {
+    while ((eol = static_cast<char *>(memchr(buf, '\n', count - *countRead))) != nsnull) {
         // found line in range [buf:eol]
         len = eol - buf + 1;
 
@@ -950,7 +950,7 @@ nsHttpTransaction::HandleContent(char *buf,
                 NS_HTTP_ACTIVITY_TYPE_HTTP_TRANSACTION,
                 NS_HTTP_ACTIVITY_SUBTYPE_RESPONSE_COMPLETE,
                 LL_ZERO,
-                NS_STATIC_CAST(PRUint64, mContentRead.mValue),
+                static_cast<PRUint64>(mContentRead.mValue),
                 EmptyCString());
     }
 
diff --git a/mozilla/netwerk/protocol/viewsource/src/nsViewSourceChannel.cpp b/mozilla/netwerk/protocol/viewsource/src/nsViewSourceChannel.cpp
index 9f0d5ce3ffc..d0363ca71a0 100644
--- a/mozilla/netwerk/protocol/viewsource/src/nsViewSourceChannel.cpp
+++ b/mozilla/netwerk/protocol/viewsource/src/nsViewSourceChannel.cpp
@@ -224,14 +224,14 @@ nsViewSourceChannel::AsyncOpen(nsIStreamListener *aListener, nsISupports *ctxt)
     nsCOMPtr<nsILoadGroup> loadGroup;
     mChannel->GetLoadGroup(getter_AddRefs(loadGroup));
     if (loadGroup)
-        loadGroup->AddRequest(NS_STATIC_CAST(nsIViewSourceChannel*,
-                                             this), nsnull);
+        loadGroup->AddRequest(static_cast<nsIViewSourceChannel*>
+                                         (this), nsnull);
     
     nsresult rv = mChannel->AsyncOpen(this, ctxt);
 
     if (NS_FAILED(rv) && loadGroup)
-        loadGroup->RemoveRequest(NS_STATIC_CAST(nsIViewSourceChannel*,
-                                                this),
+        loadGroup->RemoveRequest(static_cast<nsIViewSourceChannel*>
+                                            (this),
                                  nsnull, rv);
 
     if (NS_SUCCEEDED(rv)) {
@@ -471,8 +471,8 @@ nsViewSourceChannel::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext)
     mCachingChannel = do_QueryInterface(aRequest);
     mUploadChannel = do_QueryInterface(aRequest);
     
-    return mListener->OnStartRequest(NS_STATIC_CAST(nsIViewSourceChannel*,
-                                                    this),
+    return mListener->OnStartRequest(static_cast<nsIViewSourceChannel*>
+                                                (this),
                                      aContext);
 }
 
@@ -488,13 +488,13 @@ nsViewSourceChannel::OnStopRequest(nsIRequest *aRequest, nsISupports* aContext,
         mChannel->GetLoadGroup(getter_AddRefs(loadGroup));
         if (loadGroup)
         {
-            loadGroup->RemoveRequest(NS_STATIC_CAST(nsIViewSourceChannel*,
-                                                    this),
+            loadGroup->RemoveRequest(static_cast<nsIViewSourceChannel*>
+                                                (this),
                                      nsnull, aStatus);
         }
     }
-    return mListener->OnStopRequest(NS_STATIC_CAST(nsIViewSourceChannel*,
-                                                   this),
+    return mListener->OnStopRequest(static_cast<nsIViewSourceChannel*>
+                                               (this),
                                     aContext, aStatus);
 }
 
@@ -506,8 +506,8 @@ nsViewSourceChannel::OnDataAvailable(nsIRequest *aRequest, nsISupports* aContext
                                PRUint32 aLength) 
 {
     NS_ENSURE_TRUE(mListener, NS_ERROR_FAILURE);
-    return mListener->OnDataAvailable(NS_STATIC_CAST(nsIViewSourceChannel*,
-                                                     this),
+    return mListener->OnDataAvailable(static_cast<nsIViewSourceChannel*>
+                                                 (this),
                                       aContext, aInputStream,
                                       aSourceOffset, aLength);
 }
diff --git a/mozilla/netwerk/protocol/viewsource/src/nsViewSourceHandler.cpp b/mozilla/netwerk/protocol/viewsource/src/nsViewSourceHandler.cpp
index 27c29c90f72..aece5f6eda7 100644
--- a/mozilla/netwerk/protocol/viewsource/src/nsViewSourceHandler.cpp
+++ b/mozilla/netwerk/protocol/viewsource/src/nsViewSourceHandler.cpp
@@ -138,7 +138,7 @@ nsViewSourceHandler::NewChannel(nsIURI* uri, nsIChannel* *result)
         return rv;
     }
 
-    *result = NS_STATIC_CAST(nsIViewSourceChannel*, channel);
+    *result = static_cast<nsIViewSourceChannel*>(channel);
     return NS_OK;
 }
 
diff --git a/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp b/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp
index edd238f5fbc..d77a6fa52f9 100644
--- a/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp
@@ -272,7 +272,7 @@ nsUnknownDecoder::GetMIMETypeFromContent(nsIRequest* aRequest,
                                          PRUint32 aLength,
                                          nsACString& type)
 {
-  mBuffer = NS_CONST_CAST(char*, NS_REINTERPRET_CAST(const char*, aData));
+  mBuffer = const_cast<char*>(reinterpret_cast<const char*>(aData));
   mBufferLen = aLength;
   DetermineContentType(aRequest);
   mBuffer = nsnull;
diff --git a/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp b/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp
index 8cb6af5b75b..e507a1125a9 100644
--- a/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp
+++ b/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp
@@ -272,7 +272,7 @@ static PRBool PR_CALLBACK InitBFSTable(nsHashKey *aKey, void *aData, void* closu
     state->distance = -1;
     state->predecessor = nsnull;
 
-    SCTableData *data = new SCTableData(NS_STATIC_CAST(nsCStringKey*, aKey));
+    SCTableData *data = new SCTableData(static_cast<nsCStringKey*>(aKey));
     if (!data) {
         delete state;
         return PR_FALSE;
diff --git a/mozilla/netwerk/test/TestCallbacks.cpp b/mozilla/netwerk/test/TestCallbacks.cpp
index 37cfbf2ebc9..2374575dd23 100644
--- a/mozilla/netwerk/test/TestCallbacks.cpp
+++ b/mozilla/netwerk/test/TestCallbacks.cpp
@@ -299,5 +299,5 @@ nsresult StartLoad(const char *aURISpec) {
 
     // kick off the load
     nsCOMPtr<nsIRequest> request;
-    return channel->AsyncOpen(NS_STATIC_CAST(nsIStreamListener*, consumer), contextSup);
+    return channel->AsyncOpen(static_cast<nsIStreamListener*>(consumer), contextSup);
 }
diff --git a/mozilla/netwerk/test/TestThreadedIO.cpp b/mozilla/netwerk/test/TestThreadedIO.cpp
index 59bc993a4db..25615a8607d 100644
--- a/mozilla/netwerk/test/TestThreadedIO.cpp
+++ b/mozilla/netwerk/test/TestThreadedIO.cpp
@@ -199,7 +199,7 @@ TestListener::IOThread( void *p ) {
     printf( "I/O thread (0x%08X) started...\n", (int)(void*)PR_GetCurrentThread() );
 
     // Argument is pointer to the nsIEventQueue for the main thread.
-    nsIEventQueue *mainThreadQ = NS_STATIC_CAST( nsIEventQueue*, p );
+    nsIEventQueue *mainThreadQ = static_cast<nsIEventQueue*>(p);
 
     // Create channel for random web page.
     nsCOMPtr<nsIChannel> channel = createChannel( (const char*)p );
diff --git a/mozilla/parser/htmlparser/public/nsScannerString.h b/mozilla/parser/htmlparser/public/nsScannerString.h
index 1d50e963d87..b979c42ce28 100644
--- a/mozilla/parser/htmlparser/public/nsScannerString.h
+++ b/mozilla/parser/htmlparser/public/nsScannerString.h
@@ -107,11 +107,11 @@ class nsScannerBufferList
             const PRUnichar* DataEnd() const { return mDataEnd; }
                   PRUnichar* DataEnd()       { return mDataEnd; }
 
-            const Buffer* Next() const { return NS_STATIC_CAST(const Buffer*, next); }
-                  Buffer* Next()       { return NS_STATIC_CAST(      Buffer*, next); }
+            const Buffer* Next() const { return static_cast<const Buffer*>(next); }
+                  Buffer* Next()       { return static_cast<Buffer*>(next); }
 
-            const Buffer* Prev() const { return NS_STATIC_CAST(const Buffer*, prev); }
-                  Buffer* Prev()       { return NS_STATIC_CAST(      Buffer*, prev); }
+            const Buffer* Prev() const { return static_cast<const Buffer*>(prev); }
+                  Buffer* Prev()       { return static_cast<Buffer*>(prev); }
 
             PRUint32 DataLength() const { return mDataEnd - DataStart(); }
             void SetDataLength(PRUint32 len) { mDataEnd = DataStart() + len; }
@@ -170,11 +170,11 @@ class nsScannerBufferList
       void  SplitBuffer( const Position& );
       void  DiscardUnreferencedPrefix( Buffer* );
 
-            Buffer* Head()       { return NS_STATIC_CAST(      Buffer*, PR_LIST_HEAD(&mBuffers)); }
-      const Buffer* Head() const { return NS_STATIC_CAST(const Buffer*, PR_LIST_HEAD(&mBuffers)); }
+            Buffer* Head()       { return static_cast<Buffer*>(PR_LIST_HEAD(&mBuffers)); }
+      const Buffer* Head() const { return static_cast<const Buffer*>(PR_LIST_HEAD(&mBuffers)); }
 
-            Buffer* Tail()       { return NS_STATIC_CAST(      Buffer*, PR_LIST_TAIL(&mBuffers)); }
-      const Buffer* Tail() const { return NS_STATIC_CAST(const Buffer*, PR_LIST_TAIL(&mBuffers)); }
+            Buffer* Tail()       { return static_cast<Buffer*>(PR_LIST_TAIL(&mBuffers)); }
+      const Buffer* Tail() const { return static_cast<const Buffer*>(PR_LIST_TAIL(&mBuffers)); }
 
     private:
 
@@ -547,16 +547,16 @@ operator!=( const nsScannerIterator& lhs, const nsScannerIterator& rhs )
 
 inline
 nsScannerBufferList::Position::Position(const nsScannerIterator& aIter)
-  : mBuffer(NS_CONST_CAST(Buffer*, aIter.buffer()))
-  , mPosition(NS_CONST_CAST(PRUnichar*, aIter.get()))
+  : mBuffer(const_cast<Buffer*>(aIter.buffer()))
+  , mPosition(const_cast<PRUnichar*>(aIter.get()))
   {}
 
 inline
 nsScannerBufferList::Position&
 nsScannerBufferList::Position::operator=(const nsScannerIterator& aIter)
   {
-    mBuffer   = NS_CONST_CAST(Buffer*, aIter.buffer());
-    mPosition = NS_CONST_CAST(PRUnichar*, aIter.get());
+    mBuffer   = const_cast<Buffer*>(aIter.buffer());
+    mPosition = const_cast<PRUnichar*>(aIter.get());
     return *this;
   }
 
diff --git a/mozilla/parser/htmlparser/src/CNavDTD.cpp b/mozilla/parser/htmlparser/src/CNavDTD.cpp
index 78bbd4f2b5f..8eddf24958e 100644
--- a/mozilla/parser/htmlparser/src/CNavDTD.cpp
+++ b/mozilla/parser/htmlparser/src/CNavDTD.cpp
@@ -494,8 +494,8 @@ DoesRequireBody(CToken* aToken, nsITokenizer* aTokenizer)
         // IE & Nav4x opens up a body for type=text - Bug 66985
         PRInt32 ac = aToken->GetAttributeCount();
         for(PRInt32 i = 0; i < ac; ++i) {
-          CAttributeToken* attr = NS_STATIC_CAST(CAttributeToken*,
-                                                 aTokenizer->GetTokenAt(i));
+          CAttributeToken* attr = static_cast<CAttributeToken*>
+                                             (aTokenizer->GetTokenAt(i));
           const nsSubstring& name = attr->GetKey();
           const nsAString& value = attr->GetValue();
 
@@ -542,7 +542,7 @@ CNavDTD::HandleToken(CToken* aToken, nsIParser* aParser)
   }
 
   nsresult        result   = NS_OK;
-  CHTMLToken*     theToken = NS_STATIC_CAST(CHTMLToken*, aToken);
+  CHTMLToken*     theToken = static_cast<CHTMLToken*>(aToken);
   eHTMLTokenTypes theType  = eHTMLTokenTypes(theToken->GetTokenType());
   eHTMLTags       theTag   = (eHTMLTags)theToken->GetTypeID();
 
@@ -665,7 +665,7 @@ CNavDTD::HandleToken(CToken* aToken, nsIParser* aParser)
               CToken *current = aToken;
               while (current->GetTokenType() != eToken_end ||
                      current->GetTypeID() != theTag) {
-                current = NS_STATIC_CAST(CToken *, mTokenizer->PopToken());
+                current = static_cast<CToken *>(mTokenizer->PopToken());
                 NS_ASSERTION(current, "The tokenizer is not creating good "
                                       "alternate tags");
                 PushIntoMisplacedStack(current);
@@ -1057,7 +1057,7 @@ CNavDTD::WillHandleStartTag(CToken* aToken, eHTMLTags aTag,
 static void
 PushMisplacedAttributes(nsIParserNode& aNode, nsDeque& aDeque)
 {
-  nsCParserNode& theAttrNode = NS_STATIC_CAST(nsCParserNode &, aNode);
+  nsCParserNode& theAttrNode = static_cast<nsCParserNode &>(aNode);
 
   for (PRInt32 count = aNode.GetAttributeCount(); count > 0; --count) {
     CToken* theAttrToken = theAttrNode.PopAttributeToken();
@@ -1938,7 +1938,7 @@ CNavDTD::HandleDocTypeDeclToken(CToken* aToken)
 {
   NS_PRECONDITION(nsnull != aToken, kNullToken);
 
-  CDoctypeDeclToken* theToken = NS_STATIC_CAST(CDoctypeDeclToken*, aToken);
+  CDoctypeDeclToken* theToken = static_cast<CDoctypeDeclToken*>(aToken);
   nsAutoString docTypeStr(theToken->GetStringValue());
   // XXX Doesn't this count the newlines twice?
   if (!IsParserInDocWrite()) {
@@ -2437,7 +2437,7 @@ CNavDTD::OpenHTML(const nsCParserNode *aNode)
 
   // Don't push more than one HTML tag into the stack.
   if (mBodyContext->GetCount() == 0)  {
-    mBodyContext->Push(NS_CONST_CAST(nsCParserNode*, aNode), 0, PR_FALSE); 
+    mBodyContext->Push(const_cast<nsCParserNode*>(aNode), 0, PR_FALSE); 
   }
 
   return result;
@@ -2474,7 +2474,7 @@ CNavDTD::OpenBody(const nsCParserNode *aNode)
     START_TIMER();
 
     if (!HasOpenContainer(eHTMLTag_body)) {
-      mBodyContext->Push(NS_CONST_CAST(nsCParserNode*, aNode), 0, PR_FALSE);
+      mBodyContext->Push(const_cast<nsCParserNode*>(aNode), 0, PR_FALSE);
       mTokenizer->PrependTokens(mMisplacedContent);
     }
   }
@@ -2605,7 +2605,7 @@ CNavDTD::OpenContainer(const nsCParserNode *aNode,
 
     // For residual style tags rs_tag will be true and hence
     // the body context will hold an extra reference to the node.
-    mBodyContext->Push(NS_CONST_CAST(nsCParserNode*, aNode), aStyleStack, rs_tag); 
+    mBodyContext->Push(const_cast<nsCParserNode*>(aNode), aStyleStack, rs_tag); 
   }
 
   return result;
@@ -2983,7 +2983,7 @@ CNavDTD::AddHeadContent(nsIParserNode *aNode)
         mHeadContainerPosition = mBodyContext->GetCount();
       }
 
-      mBodyContext->Push(NS_STATIC_CAST(nsCParserNode*, aNode), nsnull,
+      mBodyContext->Push(static_cast<nsCParserNode*>(aNode), nsnull,
                          PR_FALSE);
 
       // Note: The head context is already opened.
diff --git a/mozilla/parser/htmlparser/src/nsDTDUtils.cpp b/mozilla/parser/htmlparser/src/nsDTDUtils.cpp
index 1b1cdd99686..2f4ce50dc1e 100644
--- a/mozilla/parser/htmlparser/src/nsDTDUtils.cpp
+++ b/mozilla/parser/htmlparser/src/nsDTDUtils.cpp
@@ -159,7 +159,7 @@ void nsEntryStack::Push(nsCParserNode* aNode,
     mEntries[mCount].mTag = (eHTMLTags)aNode->GetNodeType();
     if (aRefCntNode) {
       aNode->mUseCount++;
-      mEntries[mCount].mNode = NS_CONST_CAST(nsCParserNode*,aNode);
+      mEntries[mCount].mNode = const_cast<nsCParserNode*>(aNode);
       IF_HOLD(mEntries[mCount].mNode);
     }
     mEntries[mCount].mParent=aStyleStack;
@@ -199,7 +199,7 @@ void nsEntryStack::PushFront(nsCParserNode* aNode,
     mEntries[0].mTag = (eHTMLTags)aNode->GetNodeType();
     if (aRefCntNode) {
       aNode->mUseCount++;
-      mEntries[0].mNode = NS_CONST_CAST(nsCParserNode*,aNode);
+      mEntries[0].mNode = const_cast<nsCParserNode*>(aNode);
       IF_HOLD(mEntries[0].mNode);
     }
     mEntries[0].mParent=aStyleStack;
@@ -995,7 +995,7 @@ nsCParserNode* nsNodeAllocator::CreateNode(CToken* aToken,
     int x=10; //this is very BAD!
   }
 #endif
-  result = NS_STATIC_CAST(nsCParserNode*,mSharedNodes.Pop());
+  result = static_cast<nsCParserNode*>(mSharedNodes.Pop());
   if (result) {
     result->Init(aToken, aTokenAllocator,this);
   }
@@ -1003,7 +1003,7 @@ nsCParserNode* nsNodeAllocator::CreateNode(CToken* aToken,
     result = nsCParserNode::Create(aToken, aTokenAllocator,this);
 #ifdef DEBUG_TRACK_NODES
     ++mCount;
-    AddNode(NS_STATIC_CAST(nsCParserNode*,result));
+    AddNode(static_cast<nsCParserNode*>(result));
 #endif
     IF_HOLD(result);
   }
@@ -1103,7 +1103,7 @@ nsObserverEntry::Notify(nsIParserNode* aNode,
         aParser->GetChannel(getter_AddRefs(channel));
 
         for (index=0;index<theObserversCount;++index) {
-          nsIElementObserver* observer = NS_STATIC_CAST(nsIElementObserver*,theObservers->ElementAt(index));
+          nsIElementObserver* observer = static_cast<nsIElementObserver*>(theObservers->ElementAt(index));
           if (observer) {
             result = observer->Notify(aWebShell, channel,
                                       nsHTMLTags::GetStringValue(theTag),
diff --git a/mozilla/parser/htmlparser/src/nsDTDUtils.h b/mozilla/parser/htmlparser/src/nsDTDUtils.h
index aa37d8918aa..581e70d9087 100644
--- a/mozilla/parser/htmlparser/src/nsDTDUtils.h
+++ b/mozilla/parser/htmlparser/src/nsDTDUtils.h
@@ -284,7 +284,7 @@ public:
   nsFixedSizeAllocator&  GetArenaPool() { return mNodePool; }
 
 #ifdef HEAP_ALLOCATED_NODES
-  void Recycle(nsCParserNode* aNode) { mSharedNodes.Push(NS_STATIC_CAST(void*,aNode)); }
+  void Recycle(nsCParserNode* aNode) { mSharedNodes.Push(static_cast<void*>(aNode)); }
 protected:
   nsDeque mSharedNodes;
 #ifdef DEBUG_TRACK_NODES
diff --git a/mozilla/parser/htmlparser/src/nsExpatDriver.cpp b/mozilla/parser/htmlparser/src/nsExpatDriver.cpp
index 2d615f140e9..d9c84866ec2 100644
--- a/mozilla/parser/htmlparser/src/nsExpatDriver.cpp
+++ b/mozilla/parser/htmlparser/src/nsExpatDriver.cpp
@@ -78,7 +78,7 @@ Driver_HandleXMLDeclaration(void *aUserData,
 {
   NS_ASSERTION(aUserData, "expat driver should exist");
   if (aUserData) {
-    nsExpatDriver* driver = NS_STATIC_CAST(nsExpatDriver*, aUserData);
+    nsExpatDriver* driver = static_cast<nsExpatDriver*>(aUserData);
     driver->HandleXMLDeclaration(aVersion, aEncoding, aStandalone);
   }
 }
@@ -90,7 +90,7 @@ Driver_HandleStartElement(void *aUserData,
 {
   NS_ASSERTION(aUserData, "expat driver should exist");
   if (aUserData) {
-    NS_STATIC_CAST(nsExpatDriver*, aUserData)->HandleStartElement(aName,
+    static_cast<nsExpatDriver*>(aUserData)->HandleStartElement(aName,
                                                                   aAtts);
   }
 }
@@ -101,7 +101,7 @@ Driver_HandleEndElement(void *aUserData,
 {
   NS_ASSERTION(aUserData, "expat driver should exist");
   if (aUserData) {
-    NS_STATIC_CAST(nsExpatDriver*, aUserData)->HandleEndElement(aName);
+    static_cast<nsExpatDriver*>(aUserData)->HandleEndElement(aName);
   }
 }
 
@@ -112,7 +112,7 @@ Driver_HandleCharacterData(void *aUserData,
 {
   NS_ASSERTION(aUserData, "expat driver should exist");
   if (aUserData) {
-    nsExpatDriver* driver = NS_STATIC_CAST(nsExpatDriver*, aUserData);
+    nsExpatDriver* driver = static_cast<nsExpatDriver*>(aUserData);
     driver->HandleCharacterData(aData, PRUint32(aLength));
   }
 }
@@ -123,7 +123,7 @@ Driver_HandleComment(void *aUserData,
 {
   NS_ASSERTION(aUserData, "expat driver should exist");
   if(aUserData) {
-    NS_STATIC_CAST(nsExpatDriver*, aUserData)->HandleComment(aName);
+    static_cast<nsExpatDriver*>(aUserData)->HandleComment(aName);
   }
 }
 
@@ -134,7 +134,7 @@ Driver_HandleProcessingInstruction(void *aUserData,
 {
   NS_ASSERTION(aUserData, "expat driver should exist");
   if (aUserData) {
-    nsExpatDriver* driver = NS_STATIC_CAST(nsExpatDriver*, aUserData);
+    nsExpatDriver* driver = static_cast<nsExpatDriver*>(aUserData);
     driver->HandleProcessingInstruction(aTarget, aData);
   }
 }
@@ -146,7 +146,7 @@ Driver_HandleDefault(void *aUserData,
 {
   NS_ASSERTION(aUserData, "expat driver should exist");
   if (aUserData) {
-    nsExpatDriver* driver = NS_STATIC_CAST(nsExpatDriver*, aUserData);
+    nsExpatDriver* driver = static_cast<nsExpatDriver*>(aUserData);
     driver->HandleDefault(aData, PRUint32(aLength));
   }
 }
@@ -156,7 +156,7 @@ Driver_HandleStartCdataSection(void *aUserData)
 {
   NS_ASSERTION(aUserData, "expat driver should exist");
   if (aUserData) {
-    NS_STATIC_CAST(nsExpatDriver*, aUserData)->HandleStartCdataSection();
+    static_cast<nsExpatDriver*>(aUserData)->HandleStartCdataSection();
   }
 }
 
@@ -165,7 +165,7 @@ Driver_HandleEndCdataSection(void *aUserData)
 {
   NS_ASSERTION(aUserData, "expat driver should exist");
   if (aUserData) {
-    NS_STATIC_CAST(nsExpatDriver*, aUserData)->HandleEndCdataSection();
+    static_cast<nsExpatDriver*>(aUserData)->HandleEndCdataSection();
   }
 }
 
@@ -178,7 +178,7 @@ Driver_HandleStartDoctypeDecl(void *aUserData,
 {
   NS_ASSERTION(aUserData, "expat driver should exist");
   if (aUserData) {
-    NS_STATIC_CAST(nsExpatDriver*, aUserData)->
+    static_cast<nsExpatDriver*>(aUserData)->
       HandleStartDoctypeDecl(aDoctypeName, aSysid, aPubid, aHasInternalSubset);
   }
 }
@@ -188,7 +188,7 @@ Driver_HandleEndDoctypeDecl(void *aUserData)
 {
   NS_ASSERTION(aUserData, "expat driver should exist");
   if (aUserData) {
-    NS_STATIC_CAST(nsExpatDriver*, aUserData)->HandleEndDoctypeDecl();
+    static_cast<nsExpatDriver*>(aUserData)->HandleEndDoctypeDecl();
   }
 }
 
@@ -204,8 +204,8 @@ Driver_HandleExternalEntityRef(void *aExternalEntityRefHandler,
     return 1;
   }
 
-  nsExpatDriver* driver = NS_STATIC_CAST(nsExpatDriver*,
-                                         aExternalEntityRefHandler);
+  nsExpatDriver* driver = static_cast<nsExpatDriver*>
+                                     (aExternalEntityRefHandler);
 
   return driver->HandleExternalEntityRef(aOpenEntityNames, aBase, aSystemId,
                                          aPublicId);
@@ -218,7 +218,7 @@ Driver_HandleStartNamespaceDecl(void *aUserData,
 {
   NS_ASSERTION(aUserData, "expat driver should exist");
   if (aUserData) {
-    NS_STATIC_CAST(nsExpatDriver*, aUserData)->
+    static_cast<nsExpatDriver*>(aUserData)->
       HandleStartNamespaceDecl(aPrefix, aUri);
   }
 }
@@ -229,7 +229,7 @@ Driver_HandleEndNamespaceDecl(void *aUserData,
 {
   NS_ASSERTION(aUserData, "expat driver should exist");
   if (aUserData) {
-    NS_STATIC_CAST(nsExpatDriver*, aUserData)->
+    static_cast<nsExpatDriver*>(aUserData)->
       HandleEndNamespaceDecl(aPrefix);
   }
 }
@@ -243,7 +243,7 @@ Driver_HandleNotationDecl(void *aUserData,
 {
   NS_ASSERTION(aUserData, "expat driver should exist");
   if (aUserData) {
-    NS_STATIC_CAST(nsExpatDriver*, aUserData)->
+    static_cast<nsExpatDriver*>(aUserData)->
       HandleNotationDecl(aNotationName, aBase, aSysid, aPubid);
   }
 }
@@ -258,7 +258,7 @@ Driver_HandleUnparsedEntityDecl(void *aUserData,
 {
   NS_ASSERTION(aUserData, "expat driver should exist");
   if (aUserData) {
-    NS_STATIC_CAST(nsExpatDriver*, aUserData)->
+    static_cast<nsExpatDriver*>(aUserData)->
       HandleUnparsedEntityDecl(aEntityName, aBase, aSysid, aPubid,
                                aNotationName);
   }
@@ -985,7 +985,7 @@ nsExpatDriver::ParseBuffer(const PRUnichar *aBuffer,
     }
     else {
       status = XML_Parse(mExpatParser,
-                         NS_REINTERPRET_CAST(const char*, aBuffer),
+                         reinterpret_cast<const char*>(aBuffer),
                          aLength * sizeof(PRUnichar), aIsFinal);
     }
 
diff --git a/mozilla/parser/htmlparser/src/nsHTMLEntities.cpp b/mozilla/parser/htmlparser/src/nsHTMLEntities.cpp
index ee123c3b9c3..460f3ec6f19 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLEntities.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLEntities.cpp
@@ -58,8 +58,8 @@ PR_STATIC_CALLBACK(PRBool)
   matchNodeString(PLDHashTable*, const PLDHashEntryHdr* aHdr,
                   const void* key)
 {
-  const EntityNodeEntry* entry = NS_STATIC_CAST(const EntityNodeEntry*, aHdr);
-  const char* str = NS_STATIC_CAST(const char*, key);
+  const EntityNodeEntry* entry = static_cast<const EntityNodeEntry*>(aHdr);
+  const char* str = static_cast<const char*>(key);
   return (nsCRT::strcmp(entry->node->mStr, str) == 0);
 }
 
@@ -67,7 +67,7 @@ PR_STATIC_CALLBACK(PRBool)
   matchNodeUnicode(PLDHashTable*, const PLDHashEntryHdr* aHdr,
                    const void* key)
 {
-  const EntityNodeEntry* entry = NS_STATIC_CAST(const EntityNodeEntry*, aHdr);
+  const EntityNodeEntry* entry = static_cast<const EntityNodeEntry*>(aHdr);
   const PRInt32 ucode = NS_PTR_TO_INT32(key);
   return (entry->node->mUnicode == ucode);
 }
@@ -137,8 +137,8 @@ nsHTMLEntities::AddRefTable(void)
 
       // add to Entity->Unicode table
       EntityNodeEntry* entry =
-        NS_STATIC_CAST(EntityNodeEntry*,
-                       PL_DHashTableOperate(&gEntityToUnicode,
+        static_cast<EntityNodeEntry*>
+                   (PL_DHashTableOperate(&gEntityToUnicode,
                                             node->mStr,
                                             PL_DHASH_ADD));
       NS_ASSERTION(entry, "Error adding an entry");
@@ -147,8 +147,8 @@ nsHTMLEntities::AddRefTable(void)
         entry->node = node;
 
       // add to Unicode->Entity table
-      entry = NS_STATIC_CAST(EntityNodeEntry*,
-                             PL_DHashTableOperate(&gUnicodeToEntity,
+      entry = static_cast<EntityNodeEntry*>
+                         (PL_DHashTableOperate(&gUnicodeToEntity,
                                                   NS_INT32_TO_PTR(node->mUnicode),
                                                   PL_DHASH_ADD));
       NS_ASSERTION(entry, "Error adding an entry");
@@ -195,8 +195,8 @@ nsHTMLEntities::EntityToUnicode(const nsCString& aEntity)
     }
       
   EntityNodeEntry* entry = 
-    NS_STATIC_CAST(EntityNodeEntry*,
-                   PL_DHashTableOperate(&gEntityToUnicode, aEntity.get(), PL_DHASH_LOOKUP));
+    static_cast<EntityNodeEntry*>
+               (PL_DHashTableOperate(&gEntityToUnicode, aEntity.get(), PL_DHASH_LOOKUP));
 
   if (!entry || PL_DHASH_ENTRY_IS_FREE(entry))
   return -1;
@@ -221,8 +221,8 @@ nsHTMLEntities::UnicodeToEntity(PRInt32 aUnicode)
 {
   NS_ASSERTION(gUnicodeToEntity.ops, "no lookup table, needs addref");
   EntityNodeEntry* entry =
-    NS_STATIC_CAST(EntityNodeEntry*,
-                   PL_DHashTableOperate(&gUnicodeToEntity, NS_INT32_TO_PTR(aUnicode), PL_DHASH_LOOKUP));
+    static_cast<EntityNodeEntry*>
+               (PL_DHashTableOperate(&gUnicodeToEntity, NS_INT32_TO_PTR(aUnicode), PL_DHASH_LOOKUP));
                    
   if (!entry || PL_DHASH_ENTRY_IS_FREE(entry))
   return nsnull;
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp b/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp
index 303c0afa47f..3147c149ddc 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp
@@ -395,7 +395,7 @@ nsresult nsHTMLTokenizer::ScanDocStructure(PRBool aFinalChunk)
                   nsDequeIterator it(theStack, earlyPos), end(theStack.End());
                   while (it < end) {
                     CHTMLToken *theMalformedToken = 
-                        NS_STATIC_CAST(CHTMLToken*, it++);
+                        static_cast<CHTMLToken*>(it++);
                   
                     theMalformedToken->SetContainerInfo(eMalformed);
                   }
@@ -409,7 +409,7 @@ nsresult nsHTMLTokenizer::ScanDocStructure(PRBool aFinalChunk)
           case eToken_end: 
             {
               CHTMLToken *theLastToken =
-                NS_STATIC_CAST(CHTMLToken*, theStack.Peek());
+                static_cast<CHTMLToken*>(theStack.Peek());
               if (theLastToken) {
                 if (theTag == theLastToken->GetTypeID()) {
                   theStack.Pop(); // Yank it for real 
@@ -427,7 +427,7 @@ nsresult nsHTMLTokenizer::ScanDocStructure(PRBool aFinalChunk)
                     do {
                       theLastToken->SetContainerInfo(eMalformed);
                       tempStack.Push(theLastToken);
-                      theLastToken = NS_STATIC_CAST(CHTMLToken*, theStack.Pop());
+                      theLastToken = static_cast<CHTMLToken*>(theStack.Pop());
                     } while (theLastToken && theTag != theLastToken->GetTypeID());
                     // XXX The above test can confuse two different userdefined 
                     // tags.
@@ -643,8 +643,8 @@ nsHTMLTokenizer::ConsumeAttributes(PRUnichar aChar,
 
   while (!done && result == NS_OK) {
     CAttributeToken* theToken =
-      NS_STATIC_CAST(CAttributeToken*,
-                     theAllocator->CreateTokenOfType(eToken_attribute,
+      static_cast<CAttributeToken*>
+                 (theAllocator->CreateTokenOfType(eToken_attribute,
                                                      eHTMLTag_unknown));
     if (NS_LIKELY(theToken != nsnull)) {
       // Tell the new token to finish consuming text...
@@ -791,7 +791,7 @@ nsHTMLTokenizer::ConsumeStartTag(PRUnichar aChar,
             theAllocator->CreateTokenOfType(eToken_text, eHTMLTag_text);
         NS_ENSURE_TRUE(text, NS_ERROR_OUT_OF_MEMORY);
 
-        CTextToken* textToken = NS_STATIC_CAST(CTextToken*, text);
+        CTextToken* textToken = static_cast<CTextToken*>(text);
 
         if (isCDATA) {
           result = textToken->ConsumeCharacterData(theTag != eHTMLTag_script,
diff --git a/mozilla/parser/htmlparser/src/nsParser.cpp b/mozilla/parser/htmlparser/src/nsParser.cpp
index d60ac6697e1..7cb84d41878 100644
--- a/mozilla/parser/htmlparser/src/nsParser.cpp
+++ b/mozilla/parser/htmlparser/src/nsParser.cpp
@@ -1454,9 +1454,9 @@ nsParser::ParseFragment(const nsAString& aSourceBuffer,
     // XXX This is extremely ugly. Maybe CNavDTD should have FlushMisplaced()?
     NS_ASSERTION(mParserContext, "Parsing didn't create a parser context?");
 
-    CNavDTD* dtd = NS_STATIC_CAST(CNavDTD*,
-                                  NS_STATIC_CAST(nsIDTD*,
-                                                 mParserContext->mDTD));
+    CNavDTD* dtd = static_cast<CNavDTD*>
+                              (static_cast<nsIDTD*>
+                                          (mParserContext->mDTD));
     NS_ASSERTION(dtd, "How did we parse anything without a dtd?");
 
     CStartToken bodyToken(NS_LITERAL_STRING("BODY"), eHTMLTag_body);
@@ -2118,7 +2118,7 @@ ParserWriteFunc(nsIInputStream* in,
                 PRUint32 *writeCount)
 {
   nsresult result;
-  ParserWriteStruct* pws = NS_STATIC_CAST(ParserWriteStruct*, closure);
+  ParserWriteStruct* pws = static_cast<ParserWriteStruct*>(closure);
   const char* buf = fromRawSegment;
   PRUint32 theNumRead = count;
 
diff --git a/mozilla/parser/htmlparser/src/nsParserNode.cpp b/mozilla/parser/htmlparser/src/nsParserNode.cpp
index a59bba07907..493f561cff3 100644
--- a/mozilla/parser/htmlparser/src/nsParserNode.cpp
+++ b/mozilla/parser/htmlparser/src/nsParserNode.cpp
@@ -326,7 +326,7 @@ nsCParserStartNode::GetKeyAt(PRUint32 anIndex) const
 {
   if ((PRInt32)anIndex < mAttributes.GetSize()) {
     CAttributeToken* attr = 
-      NS_STATIC_CAST(CAttributeToken*, mAttributes.ObjectAt(anIndex));
+      static_cast<CAttributeToken*>(mAttributes.ObjectAt(anIndex));
     if (attr) {
       return attr->GetKey();
     }
@@ -339,7 +339,7 @@ nsCParserStartNode::GetValueAt(PRUint32 anIndex) const
 {
   if (PRInt32(anIndex) < mAttributes.GetSize()) {
     CAttributeToken* attr = 
-      NS_STATIC_CAST(CAttributeToken*, mAttributes.ObjectAt(anIndex));
+      static_cast<CAttributeToken*>(mAttributes.ObjectAt(anIndex));
     if (attr) {
       return attr->GetValue();
     }
@@ -350,7 +350,7 @@ nsCParserStartNode::GetValueAt(PRUint32 anIndex) const
 CToken* 
 nsCParserStartNode::PopAttributeToken() 
 {
-  return NS_STATIC_CAST(CToken*, mAttributes.Pop());
+  return static_cast<CToken*>(mAttributes.Pop());
 }
 
 void nsCParserStartNode::GetSource(nsString& aString) const
@@ -365,7 +365,7 @@ void nsCParserStartNode::GetSource(nsString& aString) const
   PRInt32 size = mAttributes.GetSize();
   for (index = 0 ; index < size; ++index) {
     CAttributeToken *theToken = 
-      NS_STATIC_CAST(CAttributeToken*, mAttributes.ObjectAt(index));
+      static_cast<CAttributeToken*>(mAttributes.ObjectAt(index));
     if (theToken) {
       theToken->AppendSourceTo(aString);
       aString.Append(PRUnichar(' ')); //this will get removed...
@@ -378,7 +378,7 @@ nsresult nsCParserStartNode::ReleaseAll()
 {
   NS_ASSERTION(0!=mTokenAllocator, "Error: no token allocator");
   CToken* theAttrToken;
-  while ((theAttrToken = NS_STATIC_CAST(CToken*, mAttributes.Pop()))) {
+  while ((theAttrToken = static_cast<CToken*>(mAttributes.Pop()))) {
     IF_FREE(theAttrToken, mTokenAllocator);
   }
   nsCParserNode::ReleaseAll();
diff --git a/mozilla/parser/htmlparser/src/nsParserNode.h b/mozilla/parser/htmlparser/src/nsParserNode.h
index 36d6145296e..0353cd3d215 100644
--- a/mozilla/parser/htmlparser/src/nsParserNode.h
+++ b/mozilla/parser/htmlparser/src/nsParserNode.h
@@ -301,7 +301,7 @@ public:
       NS_ASSERTION(mTokenAllocator || mAttributes.GetSize() == 0,
                    "Error: no token allocator");
       CToken* theAttrToken = 0;
-      while ((theAttrToken = NS_STATIC_CAST(CToken*, mAttributes.Pop()))) {
+      while ((theAttrToken = static_cast<CToken*>(mAttributes.Pop()))) {
         IF_FREE(theAttrToken, mTokenAllocator);
       }
     }
diff --git a/mozilla/parser/htmlparser/src/nsParserService.cpp b/mozilla/parser/htmlparser/src/nsParserService.cpp
index 1eddf18d3d9..ea78fb6bd88 100644
--- a/mozilla/parser/htmlparser/src/nsParserService.cpp
+++ b/mozilla/parser/htmlparser/src/nsParserService.cpp
@@ -55,7 +55,7 @@ nsParserService::nsParserService() : mEntries(0)
 nsParserService::~nsParserService()
 {
   nsObserverEntry *entry = nsnull;
-  while( (entry = NS_STATIC_CAST(nsObserverEntry*,mEntries.Pop())) ) {
+  while( (entry = static_cast<nsObserverEntry*>(mEntries.Pop())) ) {
     NS_RELEASE(entry);
   }
 }
@@ -171,7 +171,7 @@ nsParserService::UnregisterObserver(nsIElementObserver* aObserver,
   PRInt32 count = mEntries.GetSize();
 
   for (PRInt32 i=0; i < count; ++i) {
-    nsObserverEntry* entry = NS_STATIC_CAST(nsObserverEntry*,mEntries.ObjectAt(i));
+    nsObserverEntry* entry = static_cast<nsObserverEntry*>(mEntries.ObjectAt(i));
     if (entry && entry->Matches(aTopic)) {
       entry->RemoveObserver(aObserver);
     }
@@ -204,10 +204,10 @@ nsParserService::CheckQName(const nsAString& aQName,
   const PRUnichar *begin, *end;
   begin = aQName.BeginReading();
   end = aQName.EndReading();
-  int result = MOZ_XMLCheckQName(NS_REINTERPRET_CAST(const char*, begin),
-                                 NS_REINTERPRET_CAST(const char*, end),
+  int result = MOZ_XMLCheckQName(reinterpret_cast<const char*>(begin),
+                                 reinterpret_cast<const char*>(end),
                                  aNamespaceAware, &colon);
-  *aColon = NS_REINTERPRET_CAST(const PRUnichar*, colon);
+  *aColon = reinterpret_cast<const PRUnichar*>(colon);
 
   if (result == 0) {
     return NS_OK;
@@ -228,7 +228,7 @@ public:
   nsObserverEntry* entry;
   nsMatchesTopic(const nsAString& aString):mString(aString),matched(PR_FALSE){}
   virtual void* operator()(void* anObject){
-    entry=NS_STATIC_CAST(nsObserverEntry*, anObject);
+    entry=static_cast<nsObserverEntry*>(anObject);
     matched=mString.Equals(entry->mTopic);
     return matched ? nsnull : anObject;
   }
@@ -241,7 +241,7 @@ nsParserService::GetEntry(const nsAString& aTopic)
   if (!mHaveNotifiedCategoryObservers) {
     mHaveNotifiedCategoryObservers = PR_TRUE;
     NS_CreateServicesFromCategory("parser-service-category",
-                                  NS_STATIC_CAST(nsISupports*,NS_STATIC_CAST(void*,this)),
+                                  static_cast<nsISupports*>(static_cast<void*>(this)),
                                   "parser-service-start"); 
   }
 
diff --git a/mozilla/parser/htmlparser/src/nsParserService.h b/mozilla/parser/htmlparser/src/nsParserService.h
index 0612dac709c..7f69f2c1ee0 100644
--- a/mozilla/parser/htmlparser/src/nsParserService.h
+++ b/mozilla/parser/htmlparser/src/nsParserService.h
@@ -86,19 +86,19 @@ public:
 
   PRBool IsXMLLetter(PRUnichar aChar)
   {
-    return MOZ_XMLIsLetter(NS_REINTERPRET_CAST(const char*, &aChar));
+    return MOZ_XMLIsLetter(reinterpret_cast<const char*>(&aChar));
   }
   PRBool IsXMLNCNameChar(PRUnichar aChar)
   {
-    return MOZ_XMLIsNCNameChar(NS_REINTERPRET_CAST(const char*, &aChar));
+    return MOZ_XMLIsNCNameChar(reinterpret_cast<const char*>(&aChar));
   }
   PRUint32 DecodeEntity(const PRUnichar* aStart, const PRUnichar* aEnd,
                         const PRUnichar** aNext, PRUnichar* aResult)
   {
     *aNext = nsnull;
-    return MOZ_XMLTranslateEntity(NS_REINTERPRET_CAST(const char*, aStart),
-                                  NS_REINTERPRET_CAST(const char*, aEnd),
-                                  NS_REINTERPRET_CAST(const char**, aNext),
+    return MOZ_XMLTranslateEntity(reinterpret_cast<const char*>(aStart),
+                                  reinterpret_cast<const char*>(aEnd),
+                                  reinterpret_cast<const char**>(aNext),
                                   aResult);
   }
 
diff --git a/mozilla/parser/htmlparser/src/nsScannerString.cpp b/mozilla/parser/htmlparser/src/nsScannerString.cpp
index 29164f9ce37..f18925ed145 100644
--- a/mozilla/parser/htmlparser/src/nsScannerString.cpp
+++ b/mozilla/parser/htmlparser/src/nsScannerString.cpp
@@ -94,7 +94,7 @@ nsScannerBufferList::ReleaseAll()
         PRCList* node = PR_LIST_HEAD(&mBuffers);
         PR_REMOVE_LINK(node);
         //printf(">>> freeing buffer @%p\n", node);
-        free(NS_STATIC_CAST(Buffer*, node));
+        free(static_cast<Buffer*>(node));
       }
   }
 
@@ -240,7 +240,7 @@ nsScannerSubstring::AsString() const
   {
     if (mIsDirty)
       {
-        nsScannerSubstring* mutable_this = NS_CONST_CAST(nsScannerSubstring*, this);
+        nsScannerSubstring* mutable_this = const_cast<nsScannerSubstring*>(this);
 
         if (mStart.mBuffer == mEnd.mBuffer) {
           // We only have a single fragment to deal with, so just return it
@@ -299,7 +299,7 @@ nsScannerSubstring::GetNextFragment( nsScannerFragment& frag ) const
     if (frag.mBuffer == mEnd.mBuffer)
       return PR_FALSE;
 
-    frag.mBuffer = NS_STATIC_CAST(const Buffer*, PR_NEXT_LINK(frag.mBuffer));
+    frag.mBuffer = static_cast<const Buffer*>(PR_NEXT_LINK(frag.mBuffer));
 
     if (frag.mBuffer == mStart.mBuffer)
       frag.mFragmentStart = mStart.mPosition;
@@ -321,7 +321,7 @@ nsScannerSubstring::GetPrevFragment( nsScannerFragment& frag ) const
     if (frag.mBuffer == mStart.mBuffer)
       return PR_FALSE;
 
-    frag.mBuffer = NS_STATIC_CAST(const Buffer*, PR_PREV_LINK(frag.mBuffer));
+    frag.mBuffer = static_cast<const Buffer*>(PR_PREV_LINK(frag.mBuffer));
 
     if (frag.mBuffer == mStart.mBuffer)
       frag.mFragmentStart = mStart.mPosition;
@@ -414,7 +414,7 @@ nsScannerString::ReplaceCharacter(nsScannerIterator& aPosition, PRUnichar aChar)
     // XXX Casting a const to non-const. Unless the base class
     // provides support for writing iterators, this is the best
     // that can be done.
-    PRUnichar* pos = NS_CONST_CAST(PRUnichar*, aPosition.get());
+    PRUnichar* pos = const_cast<PRUnichar*>(aPosition.get());
     *pos = aChar;
 
     mIsDirty = PR_TRUE;
@@ -433,7 +433,7 @@ nsScannerSharedSubstring::Rebind(const nsScannerIterator &aStart,
   // acquire ownership of the buffer.  If not, we can optimize by not holding
   // onto it.
 
-  Buffer *buffer = NS_CONST_CAST(Buffer*, aStart.buffer());
+  Buffer *buffer = const_cast<Buffer*>(aStart.buffer());
   PRBool sameBuffer = buffer == aEnd.buffer();
 
   nsScannerBufferList *bufferList;
diff --git a/mozilla/parser/htmlparser/src/nsViewSourceHTML.cpp b/mozilla/parser/htmlparser/src/nsViewSourceHTML.cpp
index 23af1118ba0..d56cc2da41a 100644
--- a/mozilla/parser/htmlparser/src/nsViewSourceHTML.cpp
+++ b/mozilla/parser/htmlparser/src/nsViewSourceHTML.cpp
@@ -363,7 +363,7 @@ nsresult CViewSourceHTML::WillBuildModel(const CParserContext& aParserContext,
   //    document that way.
   // #1 doesn't seem worth it, and #2 is even more evil, since we plan to reset
   // the DTD mode right back to what it was before, let's risk this.
-  CParserContext& parserContext = NS_CONST_CAST(CParserContext&, aParserContext);
+  CParserContext& parserContext = const_cast<CParserContext&>(aParserContext);
   parserContext.mDTDMode = eDTDMode_full_standards;
   result = mSink->WillBuildModel();
   // And reset the DTD mode back to the right one
@@ -422,8 +422,8 @@ NS_IMETHODIMP CViewSourceHTML::BuildModel(nsIParser* aParser,nsITokenizer* aToke
 
       if (theAllocator) {
         CStartToken* theToken=
-          NS_STATIC_CAST(CStartToken*,
-                         theAllocator->CreateTokenOfType(eToken_start,
+          static_cast<CStartToken*>
+                     (theAllocator->CreateTokenOfType(eToken_start,
                                                          eHTMLTag_link,
                                                          NS_LITERAL_STRING("LINK")));
         if (theToken) {
@@ -453,8 +453,8 @@ NS_IMETHODIMP CViewSourceHTML::BuildModel(nsIParser* aParser,nsITokenizer* aToke
     if (NS_SUCCEEDED(result) && !mHasOpenBody) {
       if (theAllocator) {
         CStartToken* bodyToken=
-          NS_STATIC_CAST(CStartToken*,
-                         theAllocator->CreateTokenOfType(eToken_start,
+          static_cast<CStartToken*>
+                     (theAllocator->CreateTokenOfType(eToken_start,
                                                          eHTMLTag_body,
                                                          NS_LITERAL_STRING("BODY")));
         if (bodyToken) {
@@ -475,8 +475,8 @@ NS_IMETHODIMP CViewSourceHTML::BuildModel(nsIParser* aParser,nsITokenizer* aToke
         
         if (NS_SUCCEEDED(result)) {
           CStartToken* preToken =
-            NS_STATIC_CAST(CStartToken*,
-                           theAllocator->CreateTokenOfType(eToken_start,
+            static_cast<CStartToken*>
+                       (theAllocator->CreateTokenOfType(eToken_start,
                                                            eHTMLTag_pre,
                                                            NS_LITERAL_STRING("PRE")));
           if (preToken) {
@@ -533,8 +533,8 @@ void CViewSourceHTML::StartNewPreBlock(void){
   }
   
   CStartToken* theToken =
-    NS_STATIC_CAST(CStartToken*,
-                   theAllocator->CreateTokenOfType(eToken_start,
+    static_cast<CStartToken*>
+               (theAllocator->CreateTokenOfType(eToken_start,
                                                    eHTMLTag_pre,
                                                    NS_LITERAL_STRING("PRE")));
   if (!theToken) {
@@ -786,8 +786,8 @@ nsresult CViewSourceHTML::WriteTag(PRInt32 aTagType,const nsSubstring & aText,PR
   // Highlight all parts of all erroneous tags.
   if (mSyntaxHighlight && aTagInError) {
     CStartToken* theTagToken=
-      NS_STATIC_CAST(CStartToken*,
-                     theAllocator->CreateTokenOfType(eToken_start,
+      static_cast<CStartToken*>
+                 (theAllocator->CreateTokenOfType(eToken_start,
                                                      eHTMLTag_span,
                                                      NS_LITERAL_STRING("SPAN")));
     NS_ENSURE_TRUE(theTagToken, NS_ERROR_OUT_OF_MEMORY);
@@ -816,8 +816,8 @@ nsresult CViewSourceHTML::WriteTag(PRInt32 aTagType,const nsSubstring & aText,PR
   
   if (mSyntaxHighlight && aTagType != kText) {
     CStartToken* theTagToken=
-      NS_STATIC_CAST(CStartToken*,
-                     theAllocator->CreateTokenOfType(eToken_start,
+      static_cast<CStartToken*>
+                 (theAllocator->CreateTokenOfType(eToken_start,
                                                      eHTMLTag_span,
                                                      NS_LITERAL_STRING("SPAN")));
     NS_ENSURE_TRUE(theTagToken, NS_ERROR_OUT_OF_MEMORY);
diff --git a/mozilla/parser/htmlparser/tests/outsinks/Convert.cpp b/mozilla/parser/htmlparser/tests/outsinks/Convert.cpp
index 95472a183fe..8621c7563de 100644
--- a/mozilla/parser/htmlparser/tests/outsinks/Convert.cpp
+++ b/mozilla/parser/htmlparser/tests/outsinks/Convert.cpp
@@ -135,7 +135,7 @@ HTML2text(nsString& inString, nsString& inType, nsString& outType,
 
   // The syntax used here doesn't work
   nsCOMPtr<nsIContentSerializer> mSerializer;
-  mSerializer = do_CreateInstance(NS_STATIC_CAST(const char *, progId));
+  mSerializer = do_CreateInstance(static_cast<const char *>(progId));
   NS_ENSURE_TRUE(mSerializer, NS_ERROR_NOT_IMPLEMENTED);
 
   mSerializer->Init(flags, wrapCol);
diff --git a/mozilla/profile/dirserviceprovider/src/nsProfileLock.cpp b/mozilla/profile/dirserviceprovider/src/nsProfileLock.cpp
index b143d08efd7..3b5f7b97241 100644
--- a/mozilla/profile/dirserviceprovider/src/nsProfileLock.cpp
+++ b/mozilla/profile/dirserviceprovider/src/nsProfileLock.cpp
@@ -140,7 +140,7 @@ void nsProfileLock::RemovePidLockFiles()
 {
     while (!PR_CLIST_IS_EMPTY(&mPidLockList))
     {
-        nsProfileLock *lock = NS_STATIC_CAST(nsProfileLock*, mPidLockList.next);
+        nsProfileLock *lock = static_cast<nsProfileLock*>(mPidLockList.next);
         lock->Unlock();
     }
 }
diff --git a/mozilla/profile/src/nsProfile.cpp b/mozilla/profile/src/nsProfile.cpp
index 150f906d453..025ed36c97e 100644
--- a/mozilla/profile/src/nsProfile.cpp
+++ b/mozilla/profile/src/nsProfile.cpp
@@ -1503,7 +1503,7 @@ nsresult nsProfile::IsProfileDirSalted(nsIFile *profileDir, PRBool *isSalted)
         leafName.EndReading(stringEnd);
 
         nsReadingIterator<char> stringStart = stringEnd;
-        stringStart.advance( -(NS_STATIC_CAST(PRInt32, kSaltExtensionCString_Len)) );
+        stringStart.advance( -(static_cast<PRInt32>(kSaltExtensionCString_Len)) );
 
         endsWithSalt =
             Substring(stringStart, stringEnd).Equals(kSaltExtensionCString);
diff --git a/mozilla/profile/src/nsProfileAccess.cpp b/mozilla/profile/src/nsProfileAccess.cpp
index 5d9eace733e..79a98226fdd 100644
--- a/mozilla/profile/src/nsProfileAccess.cpp
+++ b/mozilla/profile/src/nsProfileAccess.cpp
@@ -289,7 +289,7 @@ nsProfileAccess::FillProfileInfo(nsIFile* regName)
         //    the first profile if profiles exist but no current profile is set
         //    an empty string if no profiles exist.
 
-        mCurrentProfile = NS_STATIC_CAST(const PRUnichar*, tmpCurrentProfile);
+        mCurrentProfile = static_cast<const PRUnichar*>(tmpCurrentProfile);
     }
 
     // Get the profile version
@@ -387,7 +387,7 @@ nsProfileAccess::FillProfileInfo(nsIFile* regName)
             return NS_ERROR_OUT_OF_MEMORY;
 
         profileItem->updateProfileEntry     = PR_TRUE;
-        profileItem->profileName      = NS_STATIC_CAST(const PRUnichar*, profile);
+        profileItem->profileName      = static_cast<const PRUnichar*>(profile);
 
         PRInt64 tmpLongLong;
         rv = registry->GetLongLong(profKey,
@@ -410,16 +410,16 @@ nsProfileAccess::FillProfileInfo(nsIFile* regName)
         profileItem->isMigrated       = isMigratedString.Equals(kRegistryYesString);
 
         if (NCProfileName)
-            profileItem->NCProfileName = NS_STATIC_CAST(const PRUnichar*, NCProfileName);
+            profileItem->NCProfileName = static_cast<const PRUnichar*>(NCProfileName);
 
         if (NCDeniedService)
-            profileItem->NCDeniedService = NS_STATIC_CAST(const PRUnichar*, NCDeniedService);
+            profileItem->NCDeniedService = static_cast<const PRUnichar*>(NCDeniedService);
 
         if (NCEmailAddress)
-            profileItem->NCEmailAddress = NS_STATIC_CAST(const PRUnichar*, NCEmailAddress);
+            profileItem->NCEmailAddress = static_cast<const PRUnichar*>(NCEmailAddress);
 
         if (NCHavePregInfo)
-            profileItem->NCHavePregInfo = NS_STATIC_CAST(const PRUnichar*, NCHavePregInfo);
+            profileItem->NCHavePregInfo = static_cast<const PRUnichar*>(NCHavePregInfo);
 
         profileItem->isImportType = PR_FALSE;
         if (!mProfiles) {
diff --git a/mozilla/rdf/base/src/nsInMemoryDataSource.cpp b/mozilla/rdf/base/src/nsInMemoryDataSource.cpp
index 7e3e85a0382..6680eea5c23 100644
--- a/mozilla/rdf/base/src/nsInMemoryDataSource.cpp
+++ b/mozilla/rdf/base/src/nsInMemoryDataSource.cpp
@@ -269,8 +269,8 @@ PLDHashOperator PR_CALLBACK
 Assertion::DeletePropertyHashEntry(PLDHashTable* aTable, PLDHashEntryHdr* aHdr,
                                            PRUint32 aNumber, void* aArg)
 {
-    Entry* entry = NS_REINTERPRET_CAST(Entry*, aHdr);
-    nsFixedSizeAllocator* allocator = NS_STATIC_CAST(nsFixedSizeAllocator*, aArg);
+    Entry* entry = reinterpret_cast<Entry*>(aHdr);
+    nsFixedSizeAllocator* allocator = static_cast<nsFixedSizeAllocator*>(aArg);
 
     Assertion* as = entry->mAssertions;
     while (as) {
@@ -377,14 +377,14 @@ public:
     GetForwardArcs(nsIRDFResource* u) {
         PLDHashEntryHdr* hdr = PL_DHashTableOperate(&mForwardArcs, u, PL_DHASH_LOOKUP);
         return PL_DHASH_ENTRY_IS_BUSY(hdr)
-            ? NS_REINTERPRET_CAST(Entry*, hdr)->mAssertions
+            ? reinterpret_cast<Entry*>(hdr)->mAssertions
             : nsnull; }
 
     Assertion*
     GetReverseArcs(nsIRDFNode* v) {
         PLDHashEntryHdr* hdr = PL_DHashTableOperate(&mReverseArcs, v, PL_DHASH_LOOKUP);
         return PL_DHASH_ENTRY_IS_BUSY(hdr)
-            ? NS_REINTERPRET_CAST(Entry*, hdr)->mAssertions
+            ? reinterpret_cast<Entry*>(hdr)->mAssertions
             : nsnull; }
 
     void
@@ -392,7 +392,7 @@ public:
         PLDHashEntryHdr* hdr = PL_DHashTableOperate(&mForwardArcs, u,
                                                     as ? PL_DHASH_ADD : PL_DHASH_REMOVE);
         if (as && hdr) {
-            Entry* entry = NS_REINTERPRET_CAST(Entry*, hdr);
+            Entry* entry = reinterpret_cast<Entry*>(hdr);
             entry->mNode = u;
             entry->mAssertions = as;
         } }
@@ -402,7 +402,7 @@ public:
         PLDHashEntryHdr* hdr = PL_DHashTableOperate(&mReverseArcs, v,
                                                     as ? PL_DHASH_ADD : PL_DHASH_REMOVE);
         if (as && hdr) {
-            Entry* entry = NS_REINTERPRET_CAST(Entry*, hdr);
+            Entry* entry = reinterpret_cast<Entry*>(hdr);
             entry->mNode = v;
             entry->mAssertions = as;
         } }
@@ -517,7 +517,7 @@ InMemoryAssertionEnumeratorImpl::InMemoryAssertionEnumeratorImpl(
             PLDHashEntryHdr* hdr = PL_DHashTableOperate(mNextAssertion->u.hash.mPropertyHash,
                 aProperty, PL_DHASH_LOOKUP);
             mNextAssertion = PL_DHASH_ENTRY_IS_BUSY(hdr)
-                ? NS_REINTERPRET_CAST(Entry*, hdr)->mAssertions
+                ? reinterpret_cast<Entry*>(hdr)->mAssertions
                 : nsnull;
         }
     }
@@ -689,8 +689,8 @@ InMemoryArcsEnumeratorImpl::ArcEnumerator(PLDHashTable* aTable,
                                        PLDHashEntryHdr* aHdr,
                                        PRUint32 aNumber, void* aArg)
 {
-    Entry* entry = NS_REINTERPRET_CAST(Entry*, aHdr);
-    nsISupportsArray* resources = NS_STATIC_CAST(nsISupportsArray*, aArg);
+    Entry* entry = reinterpret_cast<Entry*>(aHdr);
+    nsISupportsArray* resources = static_cast<nsISupportsArray*>(aArg);
 
     resources->AppendElement(entry->mNode);
     return PL_DHASH_NEXT;
@@ -768,8 +768,8 @@ InMemoryArcsEnumeratorImpl::HasMoreElements(PRBool* aResult)
         if (NS_FAILED(rv = mHashArcs->Count(&itemCount)))   return(rv);
         if (itemCount > 0) {
             --itemCount;
-            mCurrent = NS_STATIC_CAST(nsIRDFResource *,
-                                      mHashArcs->ElementAt(itemCount));
+            mCurrent = static_cast<nsIRDFResource *>
+                                  (mHashArcs->ElementAt(itemCount));
             mHashArcs->RemoveElementAt(itemCount);
             *aResult = PR_TRUE;
             return NS_OK;
@@ -957,8 +957,8 @@ PLDHashOperator PR_CALLBACK
 InMemoryDataSource::DeleteForwardArcsEntry(PLDHashTable* aTable, PLDHashEntryHdr* aHdr,
                                            PRUint32 aNumber, void* aArg)
 {
-    Entry* entry = NS_REINTERPRET_CAST(Entry*, aHdr);
-    nsFixedSizeAllocator* allocator = NS_STATIC_CAST(nsFixedSizeAllocator*, aArg);
+    Entry* entry = reinterpret_cast<Entry*>(aHdr);
+    nsFixedSizeAllocator* allocator = static_cast<nsFixedSizeAllocator*>(aArg);
 
     Assertion* as = entry->mAssertions;
     while (as) {
@@ -1110,7 +1110,7 @@ InMemoryDataSource::GetTarget(nsIRDFResource* source,
     if (as && as->mHashEntry) {
         PLDHashEntryHdr* hdr = PL_DHashTableOperate(as->u.hash.mPropertyHash, property, PL_DHASH_LOOKUP);
         Assertion* val = PL_DHASH_ENTRY_IS_BUSY(hdr)
-            ? NS_REINTERPRET_CAST(Entry*, hdr)->mAssertions
+            ? reinterpret_cast<Entry*>(hdr)->mAssertions
             : nsnull;
         while (val) {
             if (tv == val->u.as.mTruthValue) {
@@ -1156,7 +1156,7 @@ InMemoryDataSource::HasAssertion(nsIRDFResource* source,
     if (as && as->mHashEntry) {
         PLDHashEntryHdr* hdr = PL_DHashTableOperate(as->u.hash.mPropertyHash, property, PL_DHASH_LOOKUP);
         Assertion* val = PL_DHASH_ENTRY_IS_BUSY(hdr)
-            ? NS_REINTERPRET_CAST(Entry*, hdr)->mAssertions
+            ? reinterpret_cast<Entry*>(hdr)->mAssertions
             : nsnull;
         while (val) {
             if ((val->u.as.mTarget == target) && (tv == (val->u.as.mTruthValue))) {
@@ -1269,7 +1269,7 @@ InMemoryDataSource::LockedAssert(nsIRDFResource* aSource,
     if (haveHash) {
         PLDHashEntryHdr* hdr = PL_DHashTableOperate(next->u.hash.mPropertyHash, aProperty, PL_DHASH_LOOKUP);
         Assertion* val = PL_DHASH_ENTRY_IS_BUSY(hdr)
-            ? NS_REINTERPRET_CAST(Entry*, hdr)->mAssertions
+            ? reinterpret_cast<Entry*>(hdr)->mAssertions
             : nsnull;
         while (val) {
             if (val->u.as.mTarget == aTarget) {
@@ -1311,7 +1311,7 @@ InMemoryDataSource::LockedAssert(nsIRDFResource* aSource,
         PLDHashEntryHdr* hdr = PL_DHashTableOperate(next->u.hash.mPropertyHash,
             aProperty, PL_DHASH_LOOKUP);
         Assertion *asRef = PL_DHASH_ENTRY_IS_BUSY(hdr)
-            ? NS_REINTERPRET_CAST(Entry*, hdr)->mAssertions
+            ? reinterpret_cast<Entry*>(hdr)->mAssertions
             : nsnull;
         if (asRef)
         {
@@ -1324,7 +1324,7 @@ InMemoryDataSource::LockedAssert(nsIRDFResource* aSource,
                                             aProperty, PL_DHASH_ADD);
             if (hdr)
             {
-                Entry* entry = NS_REINTERPRET_CAST(Entry*, hdr);
+                Entry* entry = reinterpret_cast<Entry*>(hdr);
                 entry->mNode = aProperty;
                 entry->mAssertions = as;
             }
@@ -1413,7 +1413,7 @@ InMemoryDataSource::LockedUnassert(nsIRDFResource* aSource,
         PLDHashEntryHdr* hdr = PL_DHashTableOperate(next->u.hash.mPropertyHash,
             aProperty, PL_DHASH_LOOKUP);
         prev = next = PL_DHASH_ENTRY_IS_BUSY(hdr)
-            ? NS_REINTERPRET_CAST(Entry*, hdr)->mAssertions
+            ? reinterpret_cast<Entry*>(hdr)->mAssertions
             : nsnull;
         PRBool first = PR_TRUE;
         while (next) {
@@ -1437,7 +1437,7 @@ InMemoryDataSource::LockedUnassert(nsIRDFResource* aSource,
                 PLDHashEntryHdr* hdr = PL_DHashTableOperate(root->u.hash.mPropertyHash,
                                      aProperty, PL_DHASH_ADD);
                 if (hdr) {
-                    Entry* entry = NS_REINTERPRET_CAST(Entry*, hdr);
+                    Entry* entry = reinterpret_cast<Entry*>(hdr);
                     entry->mNode = aProperty;
                     entry->mAssertions = next->mNext;
                 }
@@ -1716,7 +1716,7 @@ InMemoryDataSource::HasArcOut(nsIRDFResource *aSource, nsIRDFResource *aArc, PRB
         PLDHashEntryHdr* hdr = PL_DHashTableOperate(ass->u.hash.mPropertyHash,
             aArc, PL_DHASH_LOOKUP);
         Assertion* val = PL_DHASH_ENTRY_IS_BUSY(hdr)
-            ? NS_REINTERPRET_CAST(Entry*, hdr)->mAssertions
+            ? reinterpret_cast<Entry*>(hdr)->mAssertions
             : nsnull;
         if (val) {
             *result = PR_TRUE;
@@ -1779,8 +1779,8 @@ InMemoryDataSource::ResourceEnumerator(PLDHashTable* aTable,
                                        PLDHashEntryHdr* aHdr,
                                        PRUint32 aNumber, void* aArg)
 {
-    Entry* entry = NS_REINTERPRET_CAST(Entry*, aHdr);
-    nsISupportsArray* resources = NS_STATIC_CAST(nsISupportsArray*, aArg);
+    Entry* entry = reinterpret_cast<Entry*>(aHdr);
+    nsISupportsArray* resources = static_cast<nsISupportsArray*>(aArg);
 
     resources->AppendElement(entry->mNode);
     return PL_DHASH_NEXT;
@@ -1882,7 +1882,7 @@ InMemoryDataSource::EnsureFastContainment(nsIRDFResource* aSource)
         PLDHashEntryHdr* hdr = PL_DHashTableOperate(table,
             prop, PL_DHASH_LOOKUP);
         Assertion* val = PL_DHASH_ENTRY_IS_BUSY(hdr)
-            ? NS_REINTERPRET_CAST(Entry*, hdr)->mAssertions
+            ? reinterpret_cast<Entry*>(hdr)->mAssertions
             : nsnull;
         if (val) {
             first->mNext = val->mNext;
@@ -1892,7 +1892,7 @@ InMemoryDataSource::EnsureFastContainment(nsIRDFResource* aSource)
             PLDHashEntryHdr* hdr = PL_DHashTableOperate(table,
                                             prop, PL_DHASH_ADD);
             if (hdr) {
-                Entry* entry = NS_REINTERPRET_CAST(Entry*, hdr);
+                Entry* entry = reinterpret_cast<Entry*>(hdr);
                 entry->mNode = prop;
                 entry->mAssertions = first;
                 first->mNext = nsnull;
@@ -1948,7 +1948,7 @@ InMemoryDataSource::Mark(nsIRDFResource* aSource,
         PLDHashEntryHdr* hdr = PL_DHashTableOperate(as->u.hash.mPropertyHash,
             aProperty, PL_DHASH_LOOKUP);
         Assertion* val = PL_DHASH_ENTRY_IS_BUSY(hdr)
-            ? NS_REINTERPRET_CAST(Entry*, hdr)->mAssertions
+            ? reinterpret_cast<Entry*>(hdr)->mAssertions
             : nsnull;
         while (val) {
             if ((val->u.as.mTarget == aTarget) &&
@@ -2043,8 +2043,8 @@ InMemoryDataSource::SweepForwardArcsEntries(PLDHashTable* aTable,
                                             PRUint32 aNumber, void* aArg)
 {
     PLDHashOperator result = PL_DHASH_NEXT;
-    Entry* entry = NS_REINTERPRET_CAST(Entry*, aHdr);
-    SweepInfo* info = NS_STATIC_CAST(SweepInfo*, aArg);
+    Entry* entry = reinterpret_cast<Entry*>(aHdr);
+    SweepInfo* info = static_cast<SweepInfo*>(aArg);
 
     Assertion* as = entry->mAssertions;
     if (as && (as->mHashEntry))
@@ -2085,7 +2085,7 @@ InMemoryDataSource::SweepForwardArcsEntries(PLDHashTable* aTable,
                 PL_DHashTableOperate(info->mReverseArcs, as->u.as.mTarget, PL_DHASH_LOOKUP);
             NS_ASSERTION(PL_DHASH_ENTRY_IS_BUSY(hdr), "no assertion in reverse arcs");
 
-            Entry* rentry = NS_REINTERPRET_CAST(Entry*, hdr);
+            Entry* rentry = reinterpret_cast<Entry*>(hdr);
             Assertion* ras = rentry->mAssertions;
             Assertion* rprev = nsnull;
             while (ras) {
@@ -2143,8 +2143,8 @@ public:
 PLDHashOperator PR_CALLBACK
 SubjectEnumerator(PLDHashTable* aTable, PLDHashEntryHdr* aHdr,
                   PRUint32 aNumber, void* aArg) {
-    Entry* entry = NS_REINTERPRET_CAST(Entry*, aHdr);
-    VisitorClosure* closure = NS_STATIC_CAST(VisitorClosure*, aArg);
+    Entry* entry = reinterpret_cast<Entry*>(aHdr);
+    VisitorClosure* closure = static_cast<VisitorClosure*>(aArg);
 
     nsresult rv;
     nsCOMPtr<nsIRDFNode> subject = do_QueryInterface(entry->mNode, &rv);
@@ -2185,10 +2185,10 @@ public:
 PLDHashOperator PR_CALLBACK
 TriplesInnerEnumerator(PLDHashTable* aTable, PLDHashEntryHdr* aHdr,
                   PRUint32 aNumber, void* aArg) {
-    Entry* entry = NS_REINTERPRET_CAST(Entry*, aHdr);
+    Entry* entry = reinterpret_cast<Entry*>(aHdr);
     Assertion* assertion = entry->mAssertions;
     TriplesInnerClosure* closure = 
-        NS_STATIC_CAST(TriplesInnerClosure*, aArg);
+        static_cast<TriplesInnerClosure*>(aArg);
     while (assertion) {
         NS_ASSERTION(!assertion->mHashEntry, "shouldn't have to hashes");
         VisitorClosure* cls = closure->mOuter;
@@ -2206,8 +2206,8 @@ TriplesInnerEnumerator(PLDHashTable* aTable, PLDHashEntryHdr* aHdr,
 PLDHashOperator PR_CALLBACK
 TriplesEnumerator(PLDHashTable* aTable, PLDHashEntryHdr* aHdr,
                   PRUint32 aNumber, void* aArg) {
-    Entry* entry = NS_REINTERPRET_CAST(Entry*, aHdr);
-    VisitorClosure* closure = NS_STATIC_CAST(VisitorClosure*, aArg);
+    Entry* entry = reinterpret_cast<Entry*>(aHdr);
+    VisitorClosure* closure = static_cast<VisitorClosure*>(aArg);
 
     nsresult rv;
     nsCOMPtr<nsIRDFNode> subject = do_QueryInterface(entry->mNode, &rv);
diff --git a/mozilla/rdf/base/src/nsRDFContentSink.cpp b/mozilla/rdf/base/src/nsRDFContentSink.cpp
index 568ad7acb0e..a741456d293 100644
--- a/mozilla/rdf/base/src/nsRDFContentSink.cpp
+++ b/mozilla/rdf/base/src/nsRDFContentSink.cpp
@@ -436,12 +436,12 @@ RDFContentSinkImpl::QueryInterface(REFNSIID iid, void** result)
         iid.Equals(kIXMLContentSinkIID) ||
         iid.Equals(kIContentSinkIID) ||
         iid.Equals(kISupportsIID)) {
-        *result = NS_STATIC_CAST(nsIXMLContentSink*, this);
+        *result = static_cast<nsIXMLContentSink*>(this);
         AddRef();
         return NS_OK;
     }
     else if (iid.Equals(kIExpatSinkIID)) {
-      *result = NS_STATIC_CAST(nsIExpatSink*, this);
+      *result = static_cast<nsIExpatSink*>(this);
        AddRef();
        return NS_OK;
     }
@@ -1490,7 +1490,7 @@ RDFContentSinkImpl::GetContextElement(PRInt32 ancestor /* = 0 */)
     }
 
     RDFContextStackElement* e =
-        NS_STATIC_CAST(RDFContextStackElement*, mContextStack->ElementAt(mContextStack->Count()-ancestor-1));
+        static_cast<RDFContextStackElement*>(mContextStack->ElementAt(mContextStack->Count()-ancestor-1));
 
     return e->mResource;
 }
@@ -1515,7 +1515,7 @@ RDFContentSinkImpl::PushContext(nsIRDFResource         *aResource,
     e->mState     = aState;
     e->mParseMode = aParseMode;
   
-    mContextStack->AppendElement(NS_STATIC_CAST(void*, e));
+    mContextStack->AppendElement(static_cast<void*>(e));
     return mContextStack->Count();
 }
  
@@ -1531,7 +1531,7 @@ RDFContentSinkImpl::PopContext(nsIRDFResource         *&aResource,
     }
 
     PRInt32 i = mContextStack->Count() - 1;
-    e = NS_STATIC_CAST(RDFContextStackElement*, mContextStack->ElementAt(i));
+    e = static_cast<RDFContextStackElement*>(mContextStack->ElementAt(i));
     mContextStack->RemoveElementAt(i);
 
     // don't bother Release()-ing: call it our implicit AddRef().
diff --git a/mozilla/rdf/base/src/nsRDFService.cpp b/mozilla/rdf/base/src/nsRDFService.cpp
index 10b0adf3e87..aeaa95604e4 100644
--- a/mozilla/rdf/base/src/nsRDFService.cpp
+++ b/mozilla/rdf/base/src/nsRDFService.cpp
@@ -170,7 +170,7 @@ struct ResourceHashEntry : public PLDHashEntryHdr {
     static PLDHashNumber PR_CALLBACK
     HashKey(PLDHashTable *table, const void *key)
     {
-        return nsCRT::HashCode(NS_STATIC_CAST(const char *, key));
+        return nsCRT::HashCode(static_cast<const char *>(key));
     }
 
     static PRBool PR_CALLBACK
@@ -178,9 +178,9 @@ struct ResourceHashEntry : public PLDHashEntryHdr {
                const void *key)
     {
         const ResourceHashEntry *entry =
-            NS_STATIC_CAST(const ResourceHashEntry *, hdr);
+            static_cast<const ResourceHashEntry *>(hdr);
 
-        return 0 == nsCRT::strcmp(NS_STATIC_CAST(const char *, key),
+        return 0 == nsCRT::strcmp(static_cast<const char *>(key),
                                   entry->mKey);
     }
 };
@@ -208,7 +208,7 @@ struct LiteralHashEntry : public PLDHashEntryHdr {
     static PLDHashNumber PR_CALLBACK
     HashKey(PLDHashTable *table, const void *key)
     {
-        return nsCRT::HashCode(NS_STATIC_CAST(const PRUnichar *, key));
+        return nsCRT::HashCode(static_cast<const PRUnichar *>(key));
     }
 
     static PRBool PR_CALLBACK
@@ -216,9 +216,9 @@ struct LiteralHashEntry : public PLDHashEntryHdr {
                const void *key)
     {
         const LiteralHashEntry *entry =
-            NS_STATIC_CAST(const LiteralHashEntry *, hdr);
+            static_cast<const LiteralHashEntry *>(hdr);
 
-        return 0 == nsCRT::strcmp(NS_STATIC_CAST(const PRUnichar *, key),
+        return 0 == nsCRT::strcmp(static_cast<const PRUnichar *>(key),
                                   entry->mKey);
     }
 };
@@ -246,7 +246,7 @@ struct IntHashEntry : public PLDHashEntryHdr {
     static PLDHashNumber PR_CALLBACK
     HashKey(PLDHashTable *table, const void *key)
     {
-        return PLDHashNumber(*NS_STATIC_CAST(const PRInt32 *, key));
+        return PLDHashNumber(*static_cast<const PRInt32 *>(key));
     }
 
     static PRBool PR_CALLBACK
@@ -254,9 +254,9 @@ struct IntHashEntry : public PLDHashEntryHdr {
                const void *key)
     {
         const IntHashEntry *entry =
-            NS_STATIC_CAST(const IntHashEntry *, hdr);
+            static_cast<const IntHashEntry *>(hdr);
 
-        return *NS_STATIC_CAST(const PRInt32 *, key) == entry->mKey;
+        return *static_cast<const PRInt32 *>(key) == entry->mKey;
     }
 };
 
@@ -284,7 +284,7 @@ struct DateHashEntry : public PLDHashEntryHdr {
     HashKey(PLDHashTable *table, const void *key)
     {
         // xor the low 32 bits with the high 32 bits.
-        PRTime t = *NS_STATIC_CAST(const PRTime *, key);
+        PRTime t = *static_cast<const PRTime *>(key);
         PRInt64 h64, l64;
         LL_USHR(h64, t, 32);
         l64 = LL_INIT(0, 0xffffffff);
@@ -300,9 +300,9 @@ struct DateHashEntry : public PLDHashEntryHdr {
                const void *key)
     {
         const DateHashEntry *entry =
-            NS_STATIC_CAST(const DateHashEntry *, hdr);
+            static_cast<const DateHashEntry *>(hdr);
 
-        return LL_EQ(*NS_STATIC_CAST(const PRTime *, key), entry->mKey);
+        return LL_EQ(*static_cast<const PRTime *>(key), entry->mKey);
     }
 };
 
@@ -403,7 +403,7 @@ struct BlobHashEntry : public PLDHashEntryHdr {
     HashKey(PLDHashTable *table, const void *key)
     {
         const BlobImpl::Data *data =
-            NS_STATIC_CAST(const BlobImpl::Data *, key);
+            static_cast<const BlobImpl::Data *>(key);
 
         const PRUint8 *p = data->mBytes, *limit = p + data->mLength;
         PLDHashNumber h = 0;
@@ -417,12 +417,12 @@ struct BlobHashEntry : public PLDHashEntryHdr {
                const void *key)
     {
         const BlobHashEntry *entry =
-            NS_STATIC_CAST(const BlobHashEntry *, hdr);
+            static_cast<const BlobHashEntry *>(hdr);
 
         const BlobImpl::Data *left = &entry->mBlob->mData;
 
         const BlobImpl::Data *right =
-            NS_STATIC_CAST(const BlobImpl::Data *, key);
+            static_cast<const BlobImpl::Data *>(key);
 
         return (left->mLength == right->mLength)
             && 0 == memcmp(left->mBytes, right->mBytes, right->mLength);
@@ -467,7 +467,7 @@ protected:
 
     const PRUnichar* GetValue() const {
         size_t objectSize = ((sizeof(LiteralImpl) + sizeof(PRUnichar) - 1) / sizeof(PRUnichar)) * sizeof(PRUnichar);
-        return NS_REINTERPRET_CAST(const PRUnichar*, NS_REINTERPRET_CAST(const unsigned char*, this) + objectSize);
+        return reinterpret_cast<const PRUnichar*>(reinterpret_cast<const unsigned char*>(this) + objectSize);
     }
 };
 
@@ -484,7 +484,7 @@ LiteralImpl::Create(const PRUnichar* aValue, nsIRDFLiteral** aResult)
     if (! objectPtr)
         return NS_ERROR_NULL_POINTER;
 
-    PRUnichar* buf = NS_REINTERPRET_CAST(PRUnichar*, NS_STATIC_CAST(unsigned char*, objectPtr) + objectSize);
+    PRUnichar* buf = reinterpret_cast<PRUnichar*>(static_cast<unsigned char*>(objectPtr) + objectSize);
     nsCharTraits<PRUnichar>::copy(buf, aValue, stringLen + 1);
 
     NS_ADDREF(*aResult = new (objectPtr) LiteralImpl(buf));
@@ -522,7 +522,7 @@ LiteralImpl::QueryInterface(REFNSIID iid, void** result)
     if (iid.Equals(kIRDFLiteralIID) ||
         iid.Equals(kIRDFNodeIID) ||
         iid.Equals(kISupportsIID)) {
-        *result = NS_STATIC_CAST(nsIRDFLiteral*, this);
+        *result = static_cast<nsIRDFLiteral*>(this);
         AddRef();
         return NS_OK;
     }
@@ -536,7 +536,7 @@ LiteralImpl::EqualsNode(nsIRDFNode* aNode, PRBool* aResult)
     nsIRDFLiteral* literal;
     rv = aNode->QueryInterface(kIRDFLiteralIID, (void**) &literal);
     if (NS_SUCCEEDED(rv)) {
-        *aResult = (NS_STATIC_CAST(nsIRDFLiteral*, this) == literal);
+        *aResult = (static_cast<nsIRDFLiteral*>(this) == literal);
         NS_RELEASE(literal);
         return NS_OK;
     }
@@ -624,7 +624,7 @@ DateImpl::QueryInterface(REFNSIID iid, void** result)
     if (iid.Equals(kIRDFDateIID) ||
         iid.Equals(kIRDFNodeIID) ||
         iid.Equals(kISupportsIID)) {
-        *result = NS_STATIC_CAST(nsIRDFDate*, this);
+        *result = static_cast<nsIRDFDate*>(this);
         AddRef();
         return NS_OK;
     }
@@ -730,7 +730,7 @@ IntImpl::QueryInterface(REFNSIID iid, void** result)
     if (iid.Equals(kIRDFIntIID) ||
         iid.Equals(kIRDFNodeIID) ||
         iid.Equals(kISupportsIID)) {
-        *result = NS_STATIC_CAST(nsIRDFInt*, this);
+        *result = static_cast<nsIRDFInt*>(this);
         AddRef();
         return NS_OK;
     }
@@ -951,7 +951,7 @@ RDFServiceImpl::GetResource(const nsACString& aURI, nsIRDFResource** aResource)
         PL_DHashTableOperate(&mResources, flatURI.get(), PL_DHASH_LOOKUP);
 
     if (PL_DHASH_ENTRY_IS_BUSY(hdr)) {
-        ResourceHashEntry *entry = NS_STATIC_CAST(ResourceHashEntry *, hdr);
+        ResourceHashEntry *entry = static_cast<ResourceHashEntry *>(hdr);
         NS_ADDREF(*aResource = entry->mResource);
         return NS_OK;
     }
@@ -1121,7 +1121,7 @@ RDFServiceImpl::GetLiteral(const PRUnichar* aValue, nsIRDFLiteral** aLiteral)
         PL_DHashTableOperate(&mLiterals, aValue, PL_DHASH_LOOKUP);
 
     if (PL_DHASH_ENTRY_IS_BUSY(hdr)) {
-        LiteralHashEntry *entry = NS_STATIC_CAST(LiteralHashEntry *, hdr);
+        LiteralHashEntry *entry = static_cast<LiteralHashEntry *>(hdr);
         NS_ADDREF(*aLiteral = entry->mLiteral);
         return NS_OK;
     }
@@ -1138,7 +1138,7 @@ RDFServiceImpl::GetDateLiteral(PRTime aTime, nsIRDFDate** aResult)
         PL_DHashTableOperate(&mDates, &aTime, PL_DHASH_LOOKUP);
 
     if (PL_DHASH_ENTRY_IS_BUSY(hdr)) {
-        DateHashEntry *entry = NS_STATIC_CAST(DateHashEntry *, hdr);
+        DateHashEntry *entry = static_cast<DateHashEntry *>(hdr);
         NS_ADDREF(*aResult = entry->mDate);
         return NS_OK;
     }
@@ -1159,7 +1159,7 @@ RDFServiceImpl::GetIntLiteral(PRInt32 aInt, nsIRDFInt** aResult)
         PL_DHashTableOperate(&mInts, &aInt, PL_DHASH_LOOKUP);
 
     if (PL_DHASH_ENTRY_IS_BUSY(hdr)) {
-        IntHashEntry *entry = NS_STATIC_CAST(IntHashEntry *, hdr);
+        IntHashEntry *entry = static_cast<IntHashEntry *>(hdr);
         NS_ADDREF(*aResult = entry->mInt);
         return NS_OK;
     }
@@ -1176,13 +1176,13 @@ NS_IMETHODIMP
 RDFServiceImpl::GetBlobLiteral(const PRUint8 *aBytes, PRInt32 aLength,
                                nsIRDFBlob **aResult)
 {
-    BlobImpl::Data key = { aLength, NS_CONST_CAST(PRUint8 *, aBytes) };
+    BlobImpl::Data key = { aLength, const_cast<PRUint8 *>(aBytes) };
 
     PLDHashEntryHdr *hdr =
         PL_DHashTableOperate(&mBlobs, &key, PL_DHASH_LOOKUP);
 
     if (PL_DHASH_ENTRY_IS_BUSY(hdr)) {
-        BlobHashEntry *entry = NS_STATIC_CAST(BlobHashEntry *, hdr);
+        BlobHashEntry *entry = static_cast<BlobHashEntry *>(hdr);
         NS_ADDREF(*aResult = entry->mBlob);
         return NS_OK;
     }
@@ -1256,7 +1256,7 @@ RDFServiceImpl::RegisterResource(nsIRDFResource* aResource, PRBool aReplace)
 
         PR_LOG(gLog, PR_LOG_DEBUG,
                ("rdfserv   replace-resource [%p] <-- [%p] %s",
-                NS_STATIC_CAST(ResourceHashEntry *, hdr)->mResource,
+                static_cast<ResourceHashEntry *>(hdr)->mResource,
                 aResource, (const char*) uri));
     }
     else {
@@ -1273,7 +1273,7 @@ RDFServiceImpl::RegisterResource(nsIRDFResource* aResource, PRBool aReplace)
     // the resource can be destroyed when the last refcount goes
     // away. The single addref that the CreateResource() call made
     // will be owned by the callee.
-    ResourceHashEntry *entry = NS_STATIC_CAST(ResourceHashEntry *, hdr);
+    ResourceHashEntry *entry = static_cast<ResourceHashEntry *>(hdr);
     entry->mResource = aResource;
     entry->mKey = uri;
 
@@ -1434,7 +1434,7 @@ RDFServiceImpl::GetDataSource(const char* aURI, PRBool aBlock, nsIRDFDataSource*
     // datasource loaded and initialized.
     {
         nsIRDFDataSource* cached =
-            NS_STATIC_CAST(nsIRDFDataSource*, PL_HashTableLookup(mNamedDataSources, spec.get()));
+            static_cast<nsIRDFDataSource*>(PL_HashTableLookup(mNamedDataSources, spec.get()));
 
         if (cached) {
             NS_ADDREF(cached);
@@ -1505,7 +1505,7 @@ RDFServiceImpl::RegisterLiteral(nsIRDFLiteral* aLiteral)
     if (! hdr)
         return NS_ERROR_OUT_OF_MEMORY;
 
-    LiteralHashEntry *entry = NS_STATIC_CAST(LiteralHashEntry *, hdr);
+    LiteralHashEntry *entry = static_cast<LiteralHashEntry *>(hdr);
 
     // N.B., we only hold a weak reference to the literal: that
     // way, the literal can be destroyed when the last refcount
@@ -1563,7 +1563,7 @@ RDFServiceImpl::RegisterInt(nsIRDFInt* aInt)
     if (! hdr)
         return NS_ERROR_OUT_OF_MEMORY;
 
-    IntHashEntry *entry = NS_STATIC_CAST(IntHashEntry *, hdr);
+    IntHashEntry *entry = static_cast<IntHashEntry *>(hdr);
 
     // N.B., we only hold a weak reference to the literal: that
     // way, the literal can be destroyed when the last refcount
@@ -1621,7 +1621,7 @@ RDFServiceImpl::RegisterDate(nsIRDFDate* aDate)
     if (! hdr)
         return NS_ERROR_OUT_OF_MEMORY;
 
-    DateHashEntry *entry = NS_STATIC_CAST(DateHashEntry *, hdr);
+    DateHashEntry *entry = static_cast<DateHashEntry *>(hdr);
 
     // N.B., we only hold a weak reference to the literal: that
     // way, the literal can be destroyed when the last refcount
@@ -1674,7 +1674,7 @@ RDFServiceImpl::RegisterBlob(BlobImpl *aBlob)
     if (! hdr)
         return NS_ERROR_OUT_OF_MEMORY;
 
-    BlobHashEntry *entry = NS_STATIC_CAST(BlobHashEntry *, hdr);
+    BlobHashEntry *entry = static_cast<BlobHashEntry *>(hdr);
 
     // N.B., we only hold a weak reference to the literal: that
     // way, the literal can be destroyed when the last refcount
diff --git a/mozilla/rdf/chrome/src/nsChromeRegistry.cpp b/mozilla/rdf/chrome/src/nsChromeRegistry.cpp
index df9dd6e9b97..9c203078693 100644
--- a/mozilla/rdf/chrome/src/nsChromeRegistry.cpp
+++ b/mozilla/rdf/chrome/src/nsChromeRegistry.cpp
@@ -1161,7 +1161,7 @@ nsChromeRegistry::LoadDataSource(const nsACString &aFileName,
   {
     nsCStringKey skey(key);
     nsCOMPtr<nsISupports> supports =
-      getter_AddRefs(NS_STATIC_CAST(nsISupports*, mDataSourceTable->Get(&skey)));
+      getter_AddRefs(static_cast<nsISupports*>(mDataSourceTable->Get(&skey)));
 
     if (supports)
     {
diff --git a/mozilla/rdf/datasource/src/nsLocalStore.cpp b/mozilla/rdf/datasource/src/nsLocalStore.cpp
index fa93f35dd1e..9ff8eae5fa2 100644
--- a/mozilla/rdf/datasource/src/nsLocalStore.cpp
+++ b/mozilla/rdf/datasource/src/nsLocalStore.cpp
@@ -281,19 +281,19 @@ static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
 
     if (aIID.Equals(kISupportsIID) ||
         aIID.Equals(NS_GET_IID(nsILocalStore))) {
-        *aResult = NS_STATIC_CAST(nsILocalStore*, this);
+        *aResult = static_cast<nsILocalStore*>(this);
     }
     else if (aIID.Equals(NS_GET_IID(nsIRDFDataSource))) {
-        *aResult = NS_STATIC_CAST(nsIRDFDataSource *, this);
+        *aResult = static_cast<nsIRDFDataSource *>(this);
     }
     else if (aIID.Equals(NS_GET_IID(nsIRDFRemoteDataSource))) {
-        *aResult = NS_STATIC_CAST(nsIRDFRemoteDataSource *, this);
+        *aResult = static_cast<nsIRDFRemoteDataSource *>(this);
     }
     else if (aIID.Equals(NS_GET_IID(nsIObserver))) {
-        *aResult = NS_STATIC_CAST(nsIObserver *, this);
+        *aResult = static_cast<nsIObserver *>(this);
     }
     else if (aIID.Equals(NS_GET_IID(nsISupportsWeakReference))) {
-        *aResult = NS_STATIC_CAST(nsISupportsWeakReference *, this);
+        *aResult = static_cast<nsISupportsWeakReference *>(this);
     }
     else {
         *aResult = nsnull;
diff --git a/mozilla/rdf/util/src/nsRDFResource.cpp b/mozilla/rdf/util/src/nsRDFResource.cpp
index 7991471f1df..c1c6d7b1b62 100644
--- a/mozilla/rdf/util/src/nsRDFResource.cpp
+++ b/mozilla/rdf/util/src/nsRDFResource.cpp
@@ -91,7 +91,7 @@ nsRDFResource::EqualsNode(nsIRDFNode* aNode, PRBool* aResult)
     nsIRDFResource* resource;
     rv = aNode->QueryInterface(NS_GET_IID(nsIRDFResource), (void**)&resource);
     if (NS_SUCCEEDED(rv)) {
-        *aResult = (NS_STATIC_CAST(nsIRDFResource*, this) == resource);
+        *aResult = (static_cast<nsIRDFResource*>(this) == resource);
         NS_RELEASE(resource);
         return NS_OK;
     }
@@ -203,17 +203,17 @@ nsRDFResource::GetDelegate(const char* aKey, REFNSIID aIID, void** aResult)
     // Okay, we've successfully created a delegate. Let's remember it.
     entry = new DelegateEntry;
     if (! entry) {
-        NS_RELEASE(*NS_REINTERPRET_CAST(nsISupports**, aResult));
+        NS_RELEASE(*reinterpret_cast<nsISupports**>(aResult));
         return NS_ERROR_OUT_OF_MEMORY;
     }
     
     entry->mKey      = aKey;
-    entry->mDelegate = do_QueryInterface(*NS_REINTERPRET_CAST(nsISupports**, aResult), &rv);
+    entry->mDelegate = do_QueryInterface(*reinterpret_cast<nsISupports**>(aResult), &rv);
     if (NS_FAILED(rv)) {
         NS_ERROR("nsRDFResource::GetDelegate(): can't QI to nsISupports!");
 
         delete entry;
-        NS_RELEASE(*NS_REINTERPRET_CAST(nsISupports**, aResult));
+        NS_RELEASE(*reinterpret_cast<nsISupports**>(aResult));
         return NS_ERROR_FAILURE;
     }
 
diff --git a/mozilla/security/manager/boot/src/nsSecureBrowserUIImpl.cpp b/mozilla/security/manager/boot/src/nsSecureBrowserUIImpl.cpp
index 7478df00101..0801f8002a6 100644
--- a/mozilla/security/manager/boot/src/nsSecureBrowserUIImpl.cpp
+++ b/mozilla/security/manager/boot/src/nsSecureBrowserUIImpl.cpp
@@ -108,7 +108,7 @@ PR_STATIC_CALLBACK(PRBool)
 RequestMapMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr,
                          const void *key)
 {
-  const RequestHashEntry *entry = NS_STATIC_CAST(const RequestHashEntry*, hdr);
+  const RequestHashEntry *entry = static_cast<const RequestHashEntry*>(hdr);
   return entry->r == key;
 }
 
@@ -116,7 +116,7 @@ PR_STATIC_CALLBACK(PRBool)
 RequestMapInitEntry(PLDHashTable *table, PLDHashEntryHdr *hdr,
                      const void *key)
 {
-  RequestHashEntry *entry = NS_STATIC_CAST(RequestHashEntry*, hdr);
+  RequestHashEntry *entry = static_cast<RequestHashEntry*>(hdr);
   entry->r = (void*)key;
   return PR_TRUE;
 }
@@ -219,7 +219,7 @@ nsSecureBrowserUIImpl::Init(nsIDOMWindow *window)
   if (!wp) return NS_ERROR_FAILURE;
   /* end GetWebProgress */
   
-  wp->AddProgressListener(NS_STATIC_CAST(nsIWebProgressListener*,this),
+  wp->AddProgressListener(static_cast<nsIWebProgressListener*>(this),
                           nsIWebProgress::NOTIFY_STATE_ALL | 
                           nsIWebProgress::NOTIFY_LOCATION  |
                           nsIWebProgress::NOTIFY_SECURITY);
diff --git a/mozilla/security/manager/ssl/src/nsCMS.cpp b/mozilla/security/manager/ssl/src/nsCMS.cpp
index 9ab99e3f864..1a8d9230706 100644
--- a/mozilla/security/manager/ssl/src/nsCMS.cpp
+++ b/mozilla/security/manager/ssl/src/nsCMS.cpp
@@ -877,7 +877,7 @@ NS_IMETHODIMP nsCMSEncoder::Start(nsICMSMessage *aMsg, NSSCMSContentCallback cb,
     return NS_ERROR_NOT_AVAILABLE;
 
   PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsCMSEncoder::Start\n"));
-  nsCMSMessage *cmsMsg = NS_STATIC_CAST(nsCMSMessage*, aMsg);
+  nsCMSMessage *cmsMsg = static_cast<nsCMSMessage*>(aMsg);
   m_ctx = new PipUIContext();
 
   m_ecx = NSS_CMSEncoder_Start(cmsMsg->getCMS(), cb, arg, 0, 0, 0, m_ctx, 0, 0, 0, 0);
diff --git a/mozilla/security/manager/ssl/src/nsCMSSecureMessage.cpp b/mozilla/security/manager/ssl/src/nsCMSSecureMessage.cpp
index a336f2672a3..46ec9593676 100644
--- a/mozilla/security/manager/ssl/src/nsCMSSecureMessage.cpp
+++ b/mozilla/security/manager/ssl/src/nsCMSSecureMessage.cpp
@@ -107,7 +107,7 @@ GetCertByPrefID(const char *certID, char **_retval)
   if (NS_FAILED(rv)) goto done;
 
   /* Find a good cert in the user's database */
-  cert = CERT_FindUserCertByUsage(CERT_GetDefaultCertDB(), NS_CONST_CAST(char*, nickname.get()), 
+  cert = CERT_FindUserCertByUsage(CERT_GetDefaultCertDB(), const_cast<char*>(nickname.get()), 
            certUsageEmailRecipient, PR_TRUE, ctx);
 
   if (!cert) { 
diff --git a/mozilla/security/manager/ssl/src/nsCRLManager.cpp b/mozilla/security/manager/ssl/src/nsCRLManager.cpp
index 90de70c73e9..1c3de426f59 100644
--- a/mozilla/security/manager/ssl/src/nsCRLManager.cpp
+++ b/mozilla/security/manager/ssl/src/nsCRLManager.cpp
@@ -134,7 +134,7 @@ nsCRLManager::ImportCrl (PRUint8 *aData, PRUint32 aLength, nsIURI * aURI, PRUint
     }
   }
   
-  crl = SEC_NewCrl(CERT_GetDefaultCertDB(), NS_CONST_CAST(char*, url.get()), &derCrl,
+  crl = SEC_NewCrl(CERT_GetDefaultCertDB(), const_cast<char*>(url.get()), &derCrl,
                    aType);
   
   if (!crl) {
diff --git a/mozilla/security/manager/ssl/src/nsCertTree.cpp b/mozilla/security/manager/ssl/src/nsCertTree.cpp
index a2372f1ea6f..4de3a477494 100644
--- a/mozilla/security/manager/ssl/src/nsCertTree.cpp
+++ b/mozilla/security/manager/ssl/src/nsCertTree.cpp
@@ -95,7 +95,7 @@ PR_STATIC_CALLBACK(PRBool)
 CompareCacheMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr,
                          const void *key)
 {
-  const CompareCacheHashEntryPtr *entryPtr = NS_STATIC_CAST(const CompareCacheHashEntryPtr*, hdr);
+  const CompareCacheHashEntryPtr *entryPtr = static_cast<const CompareCacheHashEntryPtr*>(hdr);
   return entryPtr->entry->key == key;
 }
 
@@ -104,7 +104,7 @@ CompareCacheInitEntry(PLDHashTable *table, PLDHashEntryHdr *hdr,
                      const void *key)
 {
   new (hdr) CompareCacheHashEntryPtr();
-  CompareCacheHashEntryPtr *entryPtr = NS_STATIC_CAST(CompareCacheHashEntryPtr*, hdr);
+  CompareCacheHashEntryPtr *entryPtr = static_cast<CompareCacheHashEntryPtr*>(hdr);
   if (!entryPtr->entry) {
     return PR_FALSE;
   }
@@ -115,7 +115,7 @@ CompareCacheInitEntry(PLDHashTable *table, PLDHashEntryHdr *hdr,
 PR_STATIC_CALLBACK(void)
 CompareCacheClearEntry(PLDHashTable *table, PLDHashEntryHdr *hdr)
 {
-  CompareCacheHashEntryPtr *entryPtr = NS_STATIC_CAST(CompareCacheHashEntryPtr*, hdr);
+  CompareCacheHashEntryPtr *entryPtr = static_cast<CompareCacheHashEntryPtr*>(hdr);
   entryPtr->~CompareCacheHashEntryPtr();
 }
 
@@ -188,10 +188,10 @@ nsCertTree::FreeCertArray()
 CompareCacheHashEntry *
 nsCertTree::getCacheEntry(void *cache, void *aCert)
 {
-  PLDHashTable &aCompareCache = *NS_REINTERPRET_CAST(PLDHashTable*, cache);
+  PLDHashTable &aCompareCache = *reinterpret_cast<PLDHashTable*>(cache);
   CompareCacheHashEntryPtr *entryPtr = 
-    NS_STATIC_CAST(CompareCacheHashEntryPtr*,
-                   PL_DHashTableOperate(&aCompareCache, aCert, PL_DHASH_ADD));
+    static_cast<CompareCacheHashEntryPtr*>
+               (PL_DHashTableOperate(&aCompareCache, aCert, PL_DHASH_ADD));
   return entryPtr ? entryPtr->entry : NULL;
 }
 
@@ -361,7 +361,7 @@ nsCertTree::GetCertsByTypeFromCache(nsINSSCertCache   *aCache,
                                     nsISupportsArray **_certs)
 {
   NS_ENSURE_ARG_POINTER(aCache);
-  CERTCertList *certList = NS_REINTERPRET_CAST(CERTCertList*, aCache->GetCachedCerts());
+  CERTCertList *certList = reinterpret_cast<CERTCertList*>(aCache->GetCachedCerts());
   if (!certList)
     return NS_ERROR_FAILURE;
   return GetCertsByTypeFromCertList(certList, aType, aCertCmpFn, aCertCmpFnArg, _certs);
diff --git a/mozilla/security/manager/ssl/src/nsCertVerificationThread.cpp b/mozilla/security/manager/ssl/src/nsCertVerificationThread.cpp
index ed4b4100fb9..1cdc2a1e27e 100644
--- a/mozilla/security/manager/ssl/src/nsCertVerificationThread.cpp
+++ b/mozilla/security/manager/ssl/src/nsCertVerificationThread.cpp
@@ -141,7 +141,7 @@ void nsCertVerificationThread::Run(void)
       if (mExitRequested)
         break;
       
-      job = NS_STATIC_CAST(nsBaseVerificationJob*, mJobQ.PopFront());
+      job = static_cast<nsBaseVerificationJob*>(mJobQ.PopFront());
     }
 
     if (job)
@@ -156,7 +156,7 @@ void nsCertVerificationThread::Run(void)
 
     while (verification_thread_singleton->mJobQ.GetSize()) {
       nsCertVerificationJob *job = 
-        NS_STATIC_CAST(nsCertVerificationJob*, mJobQ.PopFront());
+        static_cast<nsCertVerificationJob*>(mJobQ.PopFront());
       delete job;
     }
   }
diff --git a/mozilla/security/manager/ssl/src/nsCrypto.cpp b/mozilla/security/manager/ssl/src/nsCrypto.cpp
index c499bd6a8a2..4f1cc4483a5 100644
--- a/mozilla/security/manager/ssl/src/nsCrypto.cpp
+++ b/mozilla/security/manager/ssl/src/nsCrypto.cpp
@@ -321,7 +321,7 @@ cryptojs_GetScriptPrincipal(JSContext *cx, JSScript *script,
   if (!jsp) {
     return NS_ERROR_FAILURE;
   }
-  nsJSPrincipals *nsJSPrin = NS_STATIC_CAST(nsJSPrincipals *, jsp);
+  nsJSPrincipals *nsJSPrin = static_cast<nsJSPrincipals *>(jsp);
   *result = nsJSPrin->nsIPrincipalPtr;
   if (!*result) {
     return NS_ERROR_FAILURE;
@@ -614,8 +614,8 @@ nsConvertToActualKeyGenParams(PRUint32 keyGenMech, char *params,
       return nsnull;
 
     PK11RSAGenParams *rsaParams;
-    rsaParams = NS_STATIC_CAST(PK11RSAGenParams*,
-                               nsMemory::Alloc(sizeof(PK11RSAGenParams)));
+    rsaParams = static_cast<PK11RSAGenParams*>
+                           (nsMemory::Alloc(sizeof(PK11RSAGenParams)));
                               
     if (rsaParams == nsnull) {
       return nsnull;
@@ -793,10 +793,10 @@ nsFreeKeyGenParams(CK_MECHANISM_TYPE keyGenMechanism, void *params)
     nsMemory::Free(params);
     break;
   case CKM_EC_KEY_PAIR_GEN:
-    SECITEM_FreeItem(NS_REINTERPRET_CAST(SECItem*, params), PR_TRUE);
+    SECITEM_FreeItem(reinterpret_cast<SECItem*>(params), PR_TRUE);
     break;
   case CKM_DSA_KEY_PAIR_GEN:
-    PK11_PQG_DestroyParams(NS_STATIC_CAST(PQGParams*,params));
+    PK11_PQG_DestroyParams(static_cast<PQGParams*>(params));
     break;
   }
 }
@@ -1131,8 +1131,8 @@ nsSetDNForRequest(CRMFCertRequest *certReq, char *reqDN)
     return NS_ERROR_FAILURE;
   }
   SECStatus srv = CRMF_CertRequestSetTemplateField(certReq, crmfSubject,
-                                                   NS_STATIC_CAST(void*,
-                                                                  subjectName));
+                                                   static_cast<void*>
+                                                              (subjectName));
   CERT_DestroyName(subjectName);
   return (srv == SECSuccess) ? NS_OK : NS_ERROR_FAILURE;
 }
@@ -1911,7 +1911,7 @@ static nsISupports *
 GetISupportsFromContext(JSContext *cx)
 {
     if (JS_GetOptions(cx) & JSOPTION_PRIVATE_IS_NSISUPPORTS)
-        return NS_STATIC_CAST(nsISupports *, JS_GetContextPrivate(cx));
+        return static_cast<nsISupports *>(JS_GetContextPrivate(cx));
 
     return nsnull;
 }
@@ -1999,7 +1999,7 @@ nsCrypto::GenerateCRMFRequest(nsIDOMCRMFObject** aReturn)
 
 
   nrv = xpc->WrapNative(cx, ::JS_GetGlobalObject(cx),
-                        NS_STATIC_CAST(nsIDOMCrypto *, this),
+                        static_cast<nsIDOMCrypto *>(this),
                         NS_GET_IID(nsIDOMCrypto), getter_AddRefs(holder));
   NS_ENSURE_SUCCESS(nrv, nrv);
 
@@ -2489,8 +2489,8 @@ nsCrypto::ImportUserCertificates(const nsAString& aNickname,
       CERTCertListNode *node;
       SECItem *derCerts;
 
-      derCerts = NS_STATIC_CAST(SECItem*,
-                                nsMemory::Alloc(sizeof(SECItem)*numCAs));
+      derCerts = static_cast<SECItem*>
+                            (nsMemory::Alloc(sizeof(SECItem)*numCAs));
       if (!derCerts) {
         rv = NS_ERROR_OUT_OF_MEMORY;
         goto loser;
@@ -2800,8 +2800,8 @@ nsCrypto::SignText(const nsAString& aStringToSign, const nsAString& aCaOption,
     // of the selected cert.
     PRInt32 selectedIndex = -1;
     rv = proxied_fsd->ConfirmSignText(uiContext, utf16Host, aStringToSign,
-                                      NS_CONST_CAST(const PRUnichar**, certNicknameList.get()),
-                                      NS_CONST_CAST(const PRUnichar**, certDetailsList),
+                                      const_cast<const PRUnichar**>(certNicknameList.get()),
+                                      const_cast<const PRUnichar**>(certDetailsList),
                                       certsToUse, &selectedIndex, password,
                                       &canceled);
     if (NS_FAILED(rv) || canceled) {
@@ -2827,7 +2827,7 @@ nsCrypto::SignText(const nsAString& aStringToSign, const nsAString& aCaOption,
 
     tryAgain =
       PK11_CheckUserPassword(signingCert->slot,
-                             NS_CONST_CAST(char *, pwUtf8.get())) != SECSuccess;
+                             const_cast<char *>(pwUtf8.get())) != SECSuccess;
     // XXX we should show an error dialog before retrying
   } while (tryAgain);
 
@@ -2902,7 +2902,7 @@ nsCrypto::SignText(const nsAString& aStringToSign, const nsAString& aCaOption,
   digest.data = hash;
 
   HASH_Begin(hc);
-  HASH_Update(hc, NS_REINTERPRET_CAST(const unsigned char*, buffer.get()),
+  HASH_Update(hc, reinterpret_cast<const unsigned char*>(buffer.get()),
               buffer.Length());
   HASH_End(hc, digest.data, &digest.len, SHA1_LENGTH);
   HASH_Destroy(hc);
@@ -2934,8 +2934,8 @@ nsCrypto::SignText(const nsAString& aStringToSign, const nsAString& aCaOption,
   }
 
   SECItem binary_item;
-  binary_item.data = NS_REINTERPRET_CAST(unsigned char*,
-                                         NS_CONST_CAST(char*, p7.get()));
+  binary_item.data = reinterpret_cast<unsigned char*>
+                                     (const_cast<char*>(p7.get()));
   binary_item.len = p7.Length();
 
   char *result = NSSBase64_EncodeItem(nsnull, nsnull, 0, &binary_item);
diff --git a/mozilla/security/manager/ssl/src/nsKeyModule.cpp b/mozilla/security/manager/ssl/src/nsKeyModule.cpp
index 136c16dccd5..ee1267e1aac 100644
--- a/mozilla/security/manager/ssl/src/nsKeyModule.cpp
+++ b/mozilla/security/manager/ssl/src/nsKeyModule.cpp
@@ -87,7 +87,7 @@ nsKeyObject::InitKey(PRInt16 aAlgorithm, void * aKey)
 
   switch (aAlgorithm) {
     case nsIKeyObject::RC4:
-      mSymKey = NS_REINTERPRET_CAST(PK11SymKey*, aKey);
+      mSymKey = reinterpret_cast<PK11SymKey*>(aKey);
 
       if (!mSymKey) {
         NS_ERROR("no symkey");
diff --git a/mozilla/security/manager/ssl/src/nsKeygenHandler.cpp b/mozilla/security/manager/ssl/src/nsKeygenHandler.cpp
index b31467ded2f..c8a682540e5 100644
--- a/mozilla/security/manager/ssl/src/nsKeygenHandler.cpp
+++ b/mozilla/security/manager/ssl/src/nsKeygenHandler.cpp
@@ -132,7 +132,7 @@ decode_pqg_params(char *aStr)
     if (!arena)
         return nsnull;
 
-    params = NS_STATIC_CAST(PQGParams*, PORT_ArenaZAlloc(arena, sizeof(PQGParams)));
+    params = static_cast<PQGParams*>(PORT_ArenaZAlloc(arena, sizeof(PQGParams)));
     if (!params)
         goto loser;
     params->arena = arena;
@@ -438,7 +438,7 @@ GetSlotWithMechanism(PRUint32 aMechanism,
         }
 
         // Allocate the slot name buffer //
-        tokenNameList = NS_STATIC_CAST(PRUnichar**, nsMemory::Alloc(sizeof(PRUnichar *) * numSlots));
+        tokenNameList = static_cast<PRUnichar**>(nsMemory::Alloc(sizeof(PRUnichar *) * numSlots));
         if (!tokenNameList) {
             rv = NS_ERROR_OUT_OF_MEMORY;
             goto loser;
diff --git a/mozilla/security/manager/ssl/src/nsKeygenThread.cpp b/mozilla/security/manager/ssl/src/nsKeygenThread.cpp
index 1edcd7cb099..19d7844924f 100644
--- a/mozilla/security/manager/ssl/src/nsKeygenThread.cpp
+++ b/mozilla/security/manager/ssl/src/nsKeygenThread.cpp
@@ -138,7 +138,7 @@ nsresult nsKeygenThread::GetParams(
 
 static void PR_CALLBACK nsKeygenThreadRunner(void *arg)
 {
-  nsKeygenThread *self = NS_STATIC_CAST(nsKeygenThread *, arg);
+  nsKeygenThread *self = static_cast<nsKeygenThread *>(arg);
   self->Run();
 }
 
@@ -168,7 +168,7 @@ nsresult nsKeygenThread::StartKeyGeneration(nsIObserver* aObserver)
 
     iAmRunning = PR_TRUE;
 
-    threadHandle = PR_CreateThread(PR_USER_THREAD, nsKeygenThreadRunner, NS_STATIC_CAST(void*, this), 
+    threadHandle = PR_CreateThread(PR_USER_THREAD, nsKeygenThreadRunner, static_cast<void*>(this), 
       PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
 
     // bool thread_started_ok = (threadHandle != nsnull);
diff --git a/mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp b/mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp
index 90fe64fc6f3..e0292afb3d8 100644
--- a/mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp
+++ b/mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp
@@ -199,7 +199,7 @@ SECStatus nsNSSHttpRequestSession::createFcn(SEC_HTTP_SERVER_SESSION session,
       !http_request_method || !pRequest)
     return SECFailure;
 
-  nsNSSHttpServerSession* hss = NS_STATIC_CAST(nsNSSHttpServerSession*, session);
+  nsNSSHttpServerSession* hss = static_cast<nsNSSHttpServerSession*>(session);
   if (!hss)
     return SECFailure;
 
@@ -698,7 +698,7 @@ PK11PasswordPrompt(PK11SlotInfo* slot, PRBool retry, void* arg) {
   nsresult rv = NS_OK;
   PRUnichar *password = nsnull;
   PRBool value = PR_FALSE;
-  nsIInterfaceRequestor *ir = NS_STATIC_CAST(nsIInterfaceRequestor*, arg);
+  nsIInterfaceRequestor *ir = static_cast<nsIInterfaceRequestor*>(arg);
   nsCOMPtr<nsIPrompt> proxyPrompt;
 
   /* TODO: Retry should generate a different dialog message */
@@ -762,7 +762,7 @@ PK11PasswordPrompt(PK11SlotInfo* slot, PRBool retry, void* arg) {
   rv = nssComponent->PIPBundleFormatStringFromName("CertPassPrompt",
                                       formatStrings, 1,
                                       promptString);
-  nsMemory::Free(NS_CONST_CAST(PRUnichar*, formatStrings[0]));
+  nsMemory::Free(const_cast<PRUnichar*>(formatStrings[0]));
 
   if (NS_FAILED(rv))
     return nsnull;
@@ -832,7 +832,7 @@ void PR_CALLBACK HandshakeCallback(PRFileDesc* fd, void* client_data) {
                                                    formatStrings, 1,
                                                    shortDesc);
 
-    nsMemory::Free(NS_CONST_CAST(PRUnichar*, formatStrings[0]));
+    nsMemory::Free(const_cast<PRUnichar*>(formatStrings[0]));
 
     nsNSSSocketInfo* infoObject = (nsNSSSocketInfo*) fd->higher->secret;
     infoObject->SetSecurityState(secStatus);
diff --git a/mozilla/security/manager/ssl/src/nsNSSCallbacks.h b/mozilla/security/manager/ssl/src/nsNSSCallbacks.h
index 2c98dd2a3a8..68d5f358a0f 100644
--- a/mozilla/security/manager/ssl/src/nsNSSCallbacks.h
+++ b/mozilla/security/manager/ssl/src/nsNSSCallbacks.h
@@ -170,7 +170,7 @@ public:
 
   static SECStatus freeSessionFcn(SEC_HTTP_SERVER_SESSION session)
   {
-    delete NS_STATIC_CAST(nsNSSHttpServerSession*, session);
+    delete static_cast<nsNSSHttpServerSession*>(session);
     return SECSuccess;
   }
 
@@ -191,7 +191,7 @@ public:
                                   const PRUint32 http_data_len,
                                   const char *http_content_type)
   {
-    return NS_STATIC_CAST(nsNSSHttpRequestSession*, request)
+    return static_cast<nsNSSHttpRequestSession*>(request)
             ->setPostDataFcn(http_data, http_data_len, http_content_type);
   }
 
@@ -199,7 +199,7 @@ public:
                                 const char *http_header_name, 
                                 const char *http_header_value)
   {
-    return NS_STATIC_CAST(nsNSSHttpRequestSession*, request)
+    return static_cast<nsNSSHttpRequestSession*>(request)
             ->addHeaderFcn(http_header_name, http_header_value);
   }
 
@@ -211,20 +211,20 @@ public:
                                         const char **http_response_data, 
                                         PRUint32 *http_response_data_len)
   {
-    return NS_STATIC_CAST(nsNSSHttpRequestSession*, request)
+    return static_cast<nsNSSHttpRequestSession*>(request)
             ->trySendAndReceiveFcn(pPollDesc, http_response_code, http_response_content_type, 
                      http_response_headers, http_response_data, http_response_data_len);
   }
 
   static SECStatus cancelFcn(SEC_HTTP_REQUEST_SESSION request)
   {
-    return NS_STATIC_CAST(nsNSSHttpRequestSession*, request)
+    return static_cast<nsNSSHttpRequestSession*>(request)
             ->cancelFcn();
   }
 
   static SECStatus freeFcn(SEC_HTTP_REQUEST_SESSION request)
   {
-    return NS_STATIC_CAST(nsNSSHttpRequestSession*, request)
+    return static_cast<nsNSSHttpRequestSession*>(request)
             ->freeFcn();
   }
 
diff --git a/mozilla/security/manager/ssl/src/nsNSSCertHelper.cpp b/mozilla/security/manager/ssl/src/nsNSSCertHelper.cpp
index fa9a8d3348c..1cd434ac233 100644
--- a/mozilla/security/manager/ssl/src/nsNSSCertHelper.cpp
+++ b/mozilla/security/manager/ssl/src/nsNSSCertHelper.cpp
@@ -2170,7 +2170,7 @@ getNSSCertNicknamesFromCertList(CERTCertList *certList)
   NS_ConvertUTF16toUTF8 aUtf8NotYetValidString(notYetValidStringLeadingSpace);
 
   return CERT_NicknameStringsFromCertList(certList,
-                                          NS_CONST_CAST(char*, aUtf8ExpiredString.get()),
-                                          NS_CONST_CAST(char*, aUtf8NotYetValidString.get()));
+                                          const_cast<char*>(aUtf8ExpiredString.get()),
+                                          const_cast<char*>(aUtf8NotYetValidString.get()));
   
 }
diff --git a/mozilla/security/manager/ssl/src/nsNSSCertificate.cpp b/mozilla/security/manager/ssl/src/nsNSSCertificate.cpp
index 93db52376eb..1293ea140a2 100644
--- a/mozilla/security/manager/ssl/src/nsNSSCertificate.cpp
+++ b/mozilla/security/manager/ssl/src/nsNSSCertificate.cpp
@@ -308,7 +308,7 @@ nsNSSCertificate::FormatUIStrings(const nsAutoString &nickname, nsAutoString &ni
   nsCOMPtr<nsIX509Cert> x509Proxy;
   NS_GetProxyForObject( NS_PROXY_TO_MAIN_THREAD,
                         NS_GET_IID(nsIX509Cert),
-                        NS_STATIC_CAST(nsIX509Cert*, this),
+                        static_cast<nsIX509Cert*>(this),
                         NS_PROXY_SYNC | NS_PROXY_ALWAYS,
                         getter_AddRefs(x509Proxy));
 
@@ -997,7 +997,7 @@ nsNSSCertificate::GetValidity(nsIX509CertValidity **aValidity)
    return  NS_ERROR_OUT_OF_MEMORY; 
 
   NS_ADDREF(validity);
-  *aValidity = NS_STATIC_CAST(nsIX509CertValidity*, validity);
+  *aValidity = static_cast<nsIX509CertValidity*>(validity);
   return NS_OK;
 }
 
diff --git a/mozilla/security/manager/ssl/src/nsNSSCertificateDB.cpp b/mozilla/security/manager/ssl/src/nsNSSCertificateDB.cpp
index 9fb600ca048..43194cde2a1 100644
--- a/mozilla/security/manager/ssl/src/nsNSSCertificateDB.cpp
+++ b/mozilla/security/manager/ssl/src/nsNSSCertificateDB.cpp
@@ -106,7 +106,7 @@ nsNSSCertificateDB::FindCertByNickname(nsISupports *aToken,
   CERTCertificate *cert = NULL;
   char *asciiname = NULL;
   NS_ConvertUTF16toUTF8 aUtf8Nickname(nickname);
-  asciiname = NS_CONST_CAST(char*, aUtf8Nickname.get());
+  asciiname = const_cast<char*>(aUtf8Nickname.get());
   PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Getting \"%s\"\n", asciiname));
 #if 0
   // what it should be, but for now...
@@ -170,7 +170,7 @@ nsNSSCertificateDB::FindCertByDBKey(const char *aDBkey, nsISupports *aToken,
     if (nssCert == nsnull)
       return NS_ERROR_OUT_OF_MEMORY;
     NS_ADDREF(nssCert);
-    *_cert = NS_STATIC_CAST(nsIX509Cert*, nssCert);
+    *_cert = static_cast<nsIX509Cert*>(nssCert);
   }
   return NS_OK;
 }
@@ -253,7 +253,7 @@ nsNSSCertificateDB::getCertsFromPackage(PRArenaPool *arena, PRUint8 *data,
     return nsnull;
 
   collectArgs->arena = arena;
-  SECStatus sec_rv = CERT_DecodeCertPackage(NS_REINTERPRET_CAST(char *, data), 
+  SECStatus sec_rv = CERT_DecodeCertPackage(reinterpret_cast<char *>(data), 
                                             length, collect_certs, 
                                             (void *)collectArgs);
   if (sec_rv != SECSuccess)
@@ -403,7 +403,7 @@ nsNSSCertificateDB::handleCACertDownload(nsIArray *x509Certs,
                    trustBits & nsIX509CertDB::TRUSTED_OBJSIGN);
 
   SECStatus srv = CERT_AddTempCertToPerm(tmpCert, 
-                                         NS_CONST_CAST(char*,nickname.get()), 
+                                         const_cast<char*>(nickname.get()), 
                                          trust.GetTrust()); 
 
   if (srv != SECSuccess)
@@ -1198,7 +1198,7 @@ GetOCSPResponders (CERTCertificate *aCert,
                    SECItem         *aDBKey,
                    void            *aArg)
 {
-  nsIMutableArray *array = NS_STATIC_CAST(nsIMutableArray*, aArg);
+  nsIMutableArray *array = static_cast<nsIMutableArray*>(aArg);
   PRUnichar* nn = nsnull;
   PRUnichar* url = nsnull;
   char *serviceURL = nsnull;
@@ -1373,7 +1373,7 @@ nsNSSCertificateDB::FindEmailEncryptionCert(const nsAString &aNickname, nsIX509C
   nsNSSCertificate *nssCert = nsnull;
   char *asciiname = NULL;
   NS_ConvertUTF16toUTF8 aUtf8Nickname(aNickname);
-  asciiname = NS_CONST_CAST(char*, aUtf8Nickname.get());
+  asciiname = const_cast<char*>(aUtf8Nickname.get());
 
   /* Find a good cert in the user's database */
   cert = CERT_FindUserCertByUsage(CERT_GetDefaultCertDB(), asciiname, 
@@ -1387,7 +1387,7 @@ nsNSSCertificateDB::FindEmailEncryptionCert(const nsAString &aNickname, nsIX509C
   }
   NS_ADDREF(nssCert);
 
-  *_retval = NS_STATIC_CAST(nsIX509Cert*, nssCert);
+  *_retval = static_cast<nsIX509Cert*>(nssCert);
 
 loser:
   if (cert) CERT_DestroyCertificate(cert);
@@ -1413,7 +1413,7 @@ nsNSSCertificateDB::FindEmailSigningCert(const nsAString &aNickname, nsIX509Cert
   nsNSSCertificate *nssCert = nsnull;
   char *asciiname = NULL;
   NS_ConvertUTF16toUTF8 aUtf8Nickname(aNickname);
-  asciiname = NS_CONST_CAST(char*, aUtf8Nickname.get());
+  asciiname = const_cast<char*>(aUtf8Nickname.get());
 
   /* Find a good cert in the user's database */
   cert = CERT_FindUserCertByUsage(CERT_GetDefaultCertDB(), asciiname, 
@@ -1427,7 +1427,7 @@ nsNSSCertificateDB::FindEmailSigningCert(const nsAString &aNickname, nsIX509Cert
   }
   NS_ADDREF(nssCert);
 
-  *_retval = NS_STATIC_CAST(nsIX509Cert*, nssCert);
+  *_retval = static_cast<nsIX509Cert*>(nssCert);
 
 loser:
   if (cert) CERT_DestroyCertificate(cert);
@@ -1463,7 +1463,7 @@ nsNSSCertificateDB::FindCertByEmailAddress(nsISupports *aToken, const char *aEma
     return NS_ERROR_OUT_OF_MEMORY;
 
   NS_ADDREF(nssCert);
-  *_retval = NS_STATIC_CAST(nsIX509Cert*, nssCert);
+  *_retval = static_cast<nsIX509Cert*>(nssCert);
   return NS_OK;
 }
 
@@ -1715,7 +1715,7 @@ NS_IMETHODIMP nsNSSCertificateDB::AddCertFromBase64(const char *aBase64, const c
   PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Created nick \"%s\"\n", nickname.get()));
 
   SECStatus srv = CERT_AddTempCertToPerm(tmpCert, 
-                                         NS_CONST_CAST(char*,nickname.get()), 
+                                         const_cast<char*>(nickname.get()), 
                                          trust.GetTrust()); 
 
 
diff --git a/mozilla/security/manager/ssl/src/nsNSSComponent.cpp b/mozilla/security/manager/ssl/src/nsNSSComponent.cpp
index 129a12d0156..5f618882e66 100644
--- a/mozilla/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/mozilla/security/manager/ssl/src/nsNSSComponent.cpp
@@ -792,7 +792,7 @@ nsNSSComponent::InstallLoadableRoots()
     /* If a module exists with the same name, delete it. */
     NS_ConvertUTF16toUTF8 modNameUTF8(modName);
     int modType;
-    SECMOD_DeleteModule(NS_CONST_CAST(char*, modNameUTF8.get()), &modType);
+    SECMOD_DeleteModule(const_cast<char*>(modNameUTF8.get()), &modType);
 
     nsCString pkcs11moduleSpec;
     pkcs11moduleSpec.Append(NS_LITERAL_CSTRING("name=\""));
@@ -805,7 +805,7 @@ nsNSSComponent::InstallLoadableRoots()
     PORT_Free(escaped_fullLibraryPath);
 
     RootsModule =
-      SECMOD_LoadUserModule(NS_CONST_CAST(char*, pkcs11moduleSpec.get()), 
+      SECMOD_LoadUserModule(const_cast<char*>(pkcs11moduleSpec.get()), 
                             nsnull, // no parent 
                             PR_FALSE); // do not recurse
 
@@ -1258,7 +1258,7 @@ nsNSSComponent::DefineNextTimer()
     interval = primaryDelay;
   }
   
-  mTimer->InitWithCallback(NS_STATIC_CAST(nsITimerCallback*, this), 
+  mTimer->InitWithCallback(static_cast<nsITimerCallback*>(this), 
                            interval,
                            nsITimer::TYPE_ONE_SHOT);
   crlDownloadTimerOn = PR_TRUE;
diff --git a/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp b/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp
index 18b6bbf7be5..4772b2ba2f6 100644
--- a/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp
+++ b/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp
@@ -318,7 +318,7 @@ nsNSSSocketInfo::SetNotificationCallbacks(nsIInterfaceRequestor* aCallbacks)
   nsCOMPtr<nsIInterfaceRequestor> proxiedCallbacks;
   NS_GetProxyForObject(NS_PROXY_TO_MAIN_THREAD,
                        NS_GET_IID(nsIInterfaceRequestor),
-                       NS_STATIC_CAST(nsIInterfaceRequestor*,aCallbacks),
+                       static_cast<nsIInterfaceRequestor*>(aCallbacks),
                        NS_PROXY_SYNC,
                        getter_AddRefs(proxiedCallbacks));
 
@@ -631,7 +631,7 @@ displayAlert(nsAFlatString &formattedString, nsNSSSocketInfo *infoObject)
   nsCOMPtr<nsIInterfaceRequestor> proxiedCallbacks;
   NS_GetProxyForObject(NS_PROXY_TO_MAIN_THREAD,
                        NS_GET_IID(nsIInterfaceRequestor),
-                       NS_STATIC_CAST(nsIInterfaceRequestor*, infoObject),
+                       static_cast<nsIInterfaceRequestor*>(infoObject),
                        NS_PROXY_SYNC,
                        getter_AddRefs(proxiedCallbacks));
 
@@ -1427,9 +1427,9 @@ nsContinueDespiteCertError(nsNSSSocketInfo  *infoObject,
     if (NS_FAILED(rv)) 
       return PR_FALSE;
   }
-  nsIInterfaceRequestor *csi = NS_STATIC_CAST(nsIInterfaceRequestor*,
-                                                 infoObject);
-  nsIX509Cert *callBackCert = NS_STATIC_CAST(nsIX509Cert*, nssCert);
+  nsIInterfaceRequestor *csi = static_cast<nsIInterfaceRequestor*>
+                                          (infoObject);
+  nsIX509Cert *callBackCert = static_cast<nsIX509Cert*>(nssCert);
   CERTCertificate *peerCert = nssCert->GetCert();
   NS_ASSERTION(peerCert, "Got nsnull cert back from nsNSSCertificate");
   switch (error) {
diff --git a/mozilla/security/manager/ssl/src/nsNSSShutDown.cpp b/mozilla/security/manager/ssl/src/nsNSSShutDown.cpp
index 6112f7af2c5..70e93a62e48 100644
--- a/mozilla/security/manager/ssl/src/nsNSSShutDown.cpp
+++ b/mozilla/security/manager/ssl/src/nsNSSShutDown.cpp
@@ -50,16 +50,16 @@ PR_STATIC_CALLBACK(PRBool)
 ObjectSetMatchEntry(PLDHashTable *table, const PLDHashEntryHdr *hdr,
                          const void *key)
 {
-  const ObjectHashEntry *entry = NS_STATIC_CAST(const ObjectHashEntry*, hdr);
-  return entry->obj == NS_STATIC_CAST(const nsNSSShutDownObject*, key);
+  const ObjectHashEntry *entry = static_cast<const ObjectHashEntry*>(hdr);
+  return entry->obj == static_cast<const nsNSSShutDownObject*>(key);
 }
 
 PR_STATIC_CALLBACK(PRBool)
 ObjectSetInitEntry(PLDHashTable *table, PLDHashEntryHdr *hdr,
                      const void *key)
 {
-  ObjectHashEntry *entry = NS_STATIC_CAST(ObjectHashEntry*, hdr);
-  entry->obj = NS_CONST_CAST(nsNSSShutDownObject*, NS_STATIC_CAST(const nsNSSShutDownObject*, key));
+  ObjectHashEntry *entry = static_cast<ObjectHashEntry*>(hdr);
+  entry->obj = const_cast<nsNSSShutDownObject*>(static_cast<const nsNSSShutDownObject*>(key));
   return PR_TRUE;
 }
 
@@ -207,10 +207,10 @@ PLDHashOperator PR_CALLBACK
 nsNSSShutDownList::doPK11LogoutHelper(PLDHashTable *table, 
   PLDHashEntryHdr *hdr, PRUint32 number, void *arg)
 {
-  ObjectHashEntry *entry = NS_STATIC_CAST(ObjectHashEntry*, hdr);
+  ObjectHashEntry *entry = static_cast<ObjectHashEntry*>(hdr);
 
   nsOnPK11LogoutCancelObject *pklco = 
-    NS_REINTERPRET_CAST(nsOnPK11LogoutCancelObject*, entry->obj);
+    reinterpret_cast<nsOnPK11LogoutCancelObject*>(entry->obj);
 
   if (pklco) {
     pklco->logout();
@@ -260,7 +260,7 @@ PLDHashOperator PR_CALLBACK
 nsNSSShutDownList::evaporateAllNSSResourcesHelper(PLDHashTable *table, 
   PLDHashEntryHdr *hdr, PRUint32 number, void *arg)
 {
-    ObjectHashEntry *entry = NS_STATIC_CAST(ObjectHashEntry*, hdr);
+    ObjectHashEntry *entry = static_cast<ObjectHashEntry*>(hdr);
     PR_Unlock(singleton->mListLock);
 
   entry->obj->shutdown(nsNSSShutDownObject::calledFromList);
diff --git a/mozilla/security/manager/ssl/src/nsPK11TokenDB.cpp b/mozilla/security/manager/ssl/src/nsPK11TokenDB.cpp
index 7122b1f370e..5d299833a5c 100644
--- a/mozilla/security/manager/ssl/src/nsPK11TokenDB.cpp
+++ b/mozilla/security/manager/ssl/src/nsPK11TokenDB.cpp
@@ -320,7 +320,7 @@ NS_IMETHODIMP nsPK11Token::CheckPassword(const PRUnichar *password, PRBool *_ret
   PRInt32 prerr;
   NS_ConvertUTF16toUTF8 aUtf8Password(password);
   srv = PK11_CheckUserPassword(mSlot, 
-                  NS_CONST_CAST(char *, aUtf8Password.get()));
+                  const_cast<char *>(aUtf8Password.get()));
   if (srv != SECSuccess) {
     *_retval =  PR_FALSE;
     prerr = PR_GetError();
@@ -345,7 +345,7 @@ NS_IMETHODIMP nsPK11Token::InitPassword(const PRUnichar *initialPassword)
     SECStatus status;
 
     NS_ConvertUTF16toUTF8 aUtf8InitialPassword(initialPassword);
-    status = PK11_InitPin(mSlot, "", NS_CONST_CAST(char*, aUtf8InitialPassword.get()));
+    status = PK11_InitPin(mSlot, "", const_cast<char*>(aUtf8InitialPassword.get()));
     if (status == SECFailure) { rv = NS_ERROR_FAILURE; goto done; }
 
 done:
@@ -406,8 +406,8 @@ NS_IMETHODIMP nsPK11Token::ChangePassword(const PRUnichar *oldPassword, const PR
   NS_ConvertUTF16toUTF8 aUtf8OldPassword(oldPassword);
   NS_ConvertUTF16toUTF8 aUtf8NewPassword(newPassword);
   rv = PK11_ChangePW(mSlot, 
-               NS_CONST_CAST(char *, aUtf8OldPassword.get()), 
-               NS_CONST_CAST(char *, aUtf8NewPassword.get()));
+               const_cast<char *>(aUtf8OldPassword.get()), 
+               const_cast<char *>(aUtf8NewPassword.get()));
   return (rv == SECSuccess) ? NS_OK : NS_ERROR_FAILURE;
 }
 
@@ -497,7 +497,7 @@ FindTokenByName(const PRUnichar* tokenName, nsIPK11Token **_retval)
   nsresult rv = NS_OK;
   PK11SlotInfo *slot = 0;
   NS_ConvertUTF16toUTF8 aUtf8TokenName(tokenName);
-  slot = PK11_FindSlotByName(NS_CONST_CAST(char*, aUtf8TokenName.get()));
+  slot = PK11_FindSlotByName(const_cast<char*>(aUtf8TokenName.get()));
   if (!slot) { rv = NS_ERROR_FAILURE; goto done; }
 
   *_retval = new nsPK11Token(slot);
diff --git a/mozilla/security/manager/ssl/src/nsPKCS11Slot.cpp b/mozilla/security/manager/ssl/src/nsPKCS11Slot.cpp
index 1f1bc4b6652..7bae04c80b8 100644
--- a/mozilla/security/manager/ssl/src/nsPKCS11Slot.cpp
+++ b/mozilla/security/manager/ssl/src/nsPKCS11Slot.cpp
@@ -456,7 +456,7 @@ nsPKCS11ModuleDB::FindModuleByName(const PRUnichar *aName,
   nsNSSShutDownPreventionLock locker;
   NS_ConvertUTF16toUTF8 aUtf8Name(aName);
   SECMODModule *mod =
-    SECMOD_FindModule(NS_CONST_CAST(char *, aUtf8Name.get()));
+    SECMOD_FindModule(const_cast<char *>(aUtf8Name.get()));
   if (!mod)
     return NS_ERROR_FAILURE;
   nsCOMPtr<nsIPKCS11Module> module = new nsPKCS11Module(mod);
@@ -479,7 +479,7 @@ nsPKCS11ModuleDB::FindSlotByName(const PRUnichar *aName,
   nsNSSShutDownPreventionLock locker;
   NS_ConvertUTF16toUTF8 aUtf8Name(aName);
   PK11SlotInfo *slotinfo =
-   PK11_FindSlotByName(NS_CONST_CAST(char*, aUtf8Name.get()));
+   PK11_FindSlotByName(const_cast<char*>(aUtf8Name.get()));
   if (!slotinfo)
     return NS_ERROR_FAILURE;
   nsCOMPtr<nsIPKCS11Slot> slot = new nsPKCS11Slot(slotinfo);
diff --git a/mozilla/security/manager/ssl/src/nsPKCS12Blob.cpp b/mozilla/security/manager/ssl/src/nsPKCS12Blob.cpp
index 5cd4f0851bb..5416a427091 100644
--- a/mozilla/security/manager/ssl/src/nsPKCS12Blob.cpp
+++ b/mozilla/security/manager/ssl/src/nsPKCS12Blob.cpp
@@ -34,7 +34,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: nsPKCS12Blob.cpp,v 1.47 2006-05-10 17:29:56 darin%meer.net Exp $ */
+/* $Id: nsPKCS12Blob.cpp,v 1.48 2007-07-08 07:08:42 jwalden%mit.edu Exp $ */
 
 #include "prmem.h"
 #include "prprf.h"
@@ -649,7 +649,7 @@ OSErr ConvertMacPathToUnixPath(const char *macPath, char **unixPath)
 SECStatus PR_CALLBACK
 nsPKCS12Blob::digest_open(void *arg, PRBool reading)
 {
-  nsPKCS12Blob *cx = NS_REINTERPRET_POINTER_CAST(nsPKCS12Blob *, arg);
+  nsPKCS12Blob *cx = reinterpret_cast<nsPKCS12Blob *>(arg);
   NS_ENSURE_TRUE(cx, SECFailure);
   
   if (reading) {
@@ -684,7 +684,7 @@ nsPKCS12Blob::digest_open(void *arg, PRBool reading)
 SECStatus PR_CALLBACK
 nsPKCS12Blob::digest_close(void *arg, PRBool remove_it)
 {
-  nsPKCS12Blob *cx = NS_REINTERPRET_POINTER_CAST(nsPKCS12Blob *, arg);
+  nsPKCS12Blob *cx = reinterpret_cast<nsPKCS12Blob *>(arg);
   NS_ENSURE_TRUE(cx, SECFailure);
 
   delete cx->mDigestIterator;
@@ -703,7 +703,7 @@ nsPKCS12Blob::digest_close(void *arg, PRBool remove_it)
 int PR_CALLBACK
 nsPKCS12Blob::digest_read(void *arg, unsigned char *buf, unsigned long len)
 {
-  nsPKCS12Blob *cx = NS_REINTERPRET_POINTER_CAST(nsPKCS12Blob *, arg);
+  nsPKCS12Blob *cx = reinterpret_cast<nsPKCS12Blob *>(arg);
   NS_ENSURE_TRUE(cx, SECFailure);
   NS_ENSURE_TRUE(cx->mDigest, SECFailure);
 
@@ -726,15 +726,15 @@ nsPKCS12Blob::digest_read(void *arg, unsigned char *buf, unsigned long len)
 int PR_CALLBACK
 nsPKCS12Blob::digest_write(void *arg, unsigned char *buf, unsigned long len)
 {
-  nsPKCS12Blob *cx = NS_REINTERPRET_POINTER_CAST(nsPKCS12Blob *, arg);
+  nsPKCS12Blob *cx = reinterpret_cast<nsPKCS12Blob *>(arg);
   NS_ENSURE_TRUE(cx, SECFailure);
   NS_ENSURE_TRUE(cx->mDigest, SECFailure);
 
   // make sure we are in write mode, read iterator has not yet been allocated
   NS_ENSURE_FALSE(cx->mDigestIterator, SECFailure);
   
-  cx->mDigest->Append(NS_REINTERPRET_CAST(char *, buf),
-                     NS_STATIC_CAST(PRUint32, len));
+  cx->mDigest->Append(reinterpret_cast<char *>(buf),
+                     static_cast<PRUint32>(len));
   
   return len;
 }
@@ -785,7 +785,7 @@ nsPKCS12Blob::nickname_collision(SECItem *oldNick, PRBool *cancel, void *wincx)
       nickname = nickFromPropC;
     }
     CERTCertificate *cert = CERT_FindCertByNickname(CERT_GetDefaultCertDB(),
-                                           NS_CONST_CAST(char*,nickname.get()));
+                                           const_cast<char*>(nickname.get()));
     if (!cert) {
       break;
     }
diff --git a/mozilla/security/manager/ssl/src/nsPSMBackgroundThread.cpp b/mozilla/security/manager/ssl/src/nsPSMBackgroundThread.cpp
index c0fd971f393..7addf371e02 100644
--- a/mozilla/security/manager/ssl/src/nsPSMBackgroundThread.cpp
+++ b/mozilla/security/manager/ssl/src/nsPSMBackgroundThread.cpp
@@ -40,7 +40,7 @@
 
 void PR_CALLBACK nsPSMBackgroundThread::nsThreadRunner(void *arg)
 {
-  nsPSMBackgroundThread *self = NS_STATIC_CAST(nsPSMBackgroundThread *, arg);
+  nsPSMBackgroundThread *self = static_cast<nsPSMBackgroundThread *>(arg);
   self->Run();
 }
 
@@ -59,7 +59,7 @@ nsresult nsPSMBackgroundThread::startThread()
   if (!mMutex || !mCond)
     return NS_ERROR_OUT_OF_MEMORY;
 
-  mThreadHandle = PR_CreateThread(PR_USER_THREAD, nsThreadRunner, NS_STATIC_CAST(void*, this), 
+  mThreadHandle = PR_CreateThread(PR_USER_THREAD, nsThreadRunner, static_cast<void*>(this), 
     PR_PRIORITY_NORMAL, PR_LOCAL_THREAD, PR_JOINABLE_THREAD, 0);
 
   NS_ASSERTION(mThreadHandle, "Could not create nsPSMBackgroundThread\n");
diff --git a/mozilla/security/manager/ssl/src/nsStreamCipher.cpp b/mozilla/security/manager/ssl/src/nsStreamCipher.cpp
index 738d30886f9..668a3a57b91 100644
--- a/mozilla/security/manager/ssl/src/nsStreamCipher.cpp
+++ b/mozilla/security/manager/ssl/src/nsStreamCipher.cpp
@@ -72,7 +72,7 @@ nsStreamCipher::InitWithIV_(nsIKeyObject *aKey, SECItem* aIV)
   rv = aKey->GetKeyObj(&keyObj);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  PK11SymKey *symkey = NS_REINTERPRET_CAST(PK11SymKey*, keyObj);
+  PK11SymKey *symkey = reinterpret_cast<PK11SymKey*>(keyObj);
   if (!symkey)
     return NS_ERROR_FAILURE;
 
diff --git a/mozilla/storage/src/mozStorageAsyncIO.cpp b/mozilla/storage/src/mozStorageAsyncIO.cpp
index 967d02e984d..6ba79016a52 100644
--- a/mozilla/storage/src/mozStorageAsyncIO.cpp
+++ b/mozilla/storage/src/mozStorageAsyncIO.cpp
@@ -706,7 +706,7 @@ AsyncOpenFile(const char* aName, AsyncOsFile** aFile,
       goto error_out;
   }
 
-  *aFile = NS_STATIC_CAST(AsyncOsFile*, nsMemory::Alloc(sizeof(AsyncOsFile)));
+  *aFile = static_cast<AsyncOsFile*>(nsMemory::Alloc(sizeof(AsyncOsFile)));
   if (! *aFile) {
     rc = SQLITE_NOMEM;
     goto error_out;
@@ -784,8 +784,8 @@ AppendNewAsyncMessage(AsyncOsFile* aFile, PRUint32 aOp,
                                          const char *aData)
 {
   // allocate one buffer, we will put the buffer immediately after our struct
-  AsyncMessage* p = NS_STATIC_CAST(AsyncMessage*,
-      nsMemory::Alloc(sizeof(AsyncMessage) + (aData ? aDataSize : 0)));
+  AsyncMessage* p = static_cast<AsyncMessage*>
+                               (nsMemory::Alloc(sizeof(AsyncMessage) + (aData ? aDataSize : 0)));
   if (! p)
     return SQLITE_NOMEM;
 
@@ -968,7 +968,7 @@ AsyncClose(OsFile** aFile)
 {
   if (AsyncWriteError != SQLITE_OK)
     return AsyncWriteError;
-  AsyncOsFile* asyncfile = NS_STATIC_CAST(AsyncOsFile*, *aFile);
+  AsyncOsFile* asyncfile = static_cast<AsyncOsFile*>(*aFile);
   if (! asyncfile->mOpen) {
     NS_NOTREACHED("Attempting to write to a file with a close pending!");
     return SQLITE_INTERNAL;
@@ -990,13 +990,13 @@ AsyncWrite(OsFile* aFile, const void* aBuf, int aCount)
 {
   if (AsyncWriteError != SQLITE_OK)
     return AsyncWriteError;
-  AsyncOsFile* asyncfile = NS_STATIC_CAST(AsyncOsFile*, aFile);
+  AsyncOsFile* asyncfile = static_cast<AsyncOsFile*>(aFile);
   if (! asyncfile->mOpen) {
     NS_NOTREACHED("Attempting to write to a file with a close pending!");
     return SQLITE_INTERNAL;
   }
   int rc = AppendNewAsyncMessage(asyncfile, ASYNC_WRITE, asyncfile->mOffset,
-                                 aCount, NS_STATIC_CAST(const char*, aBuf));
+                                 aCount, static_cast<const char*>(aBuf));
   asyncfile->mOffset += aCount;
   return rc;
 }
@@ -1012,7 +1012,7 @@ AsyncTruncate(OsFile* aFile, sqlite_int64 aNumBytes)
 {
   if (AsyncWriteError != SQLITE_OK)
     return AsyncWriteError;
-  AsyncOsFile* asyncfile = NS_STATIC_CAST(AsyncOsFile*, aFile);
+  AsyncOsFile* asyncfile = static_cast<AsyncOsFile*>(aFile);
   if (! asyncfile->mOpen) {
     NS_NOTREACHED("Attempting to write to a file with a close pending!");
     return SQLITE_INTERNAL;
@@ -1032,7 +1032,7 @@ AsyncOpenDirectory(OsFile* aFile, const char* aName)
 {
   if (AsyncWriteError != SQLITE_OK)
     return AsyncWriteError;
-  AsyncOsFile* asyncfile = NS_STATIC_CAST(AsyncOsFile*, aFile);
+  AsyncOsFile* asyncfile = static_cast<AsyncOsFile*>(aFile);
   if (! asyncfile->mOpen) {
     NS_NOTREACHED("Attempting to write to a file with a close pending!");
     return SQLITE_INTERNAL;
@@ -1052,7 +1052,7 @@ AsyncSync(OsFile* aFile, int aFullsync)
 {
   if (AsyncWriteError != SQLITE_OK)
     return AsyncWriteError;
-  AsyncOsFile* asyncfile = NS_STATIC_CAST(AsyncOsFile*, aFile);
+  AsyncOsFile* asyncfile = static_cast<AsyncOsFile*>(aFile);
   if (! asyncfile->mOpen) {
     NS_NOTREACHED("Attempting to write to a file with a close pending!");
     return SQLITE_INTERNAL;
@@ -1071,7 +1071,7 @@ AsyncSetFullSync(OsFile* aFile, int aValue)
 {
   if (AsyncWriteError != SQLITE_OK)
     return;
-  AsyncOsFile* asyncfile = NS_STATIC_CAST(AsyncOsFile*, aFile);
+  AsyncOsFile* asyncfile = static_cast<AsyncOsFile*>(aFile);
   if (! asyncfile->mOpen) {
     NS_NOTREACHED("Attempting to write to a file with a close pending!");
     return;
@@ -1101,7 +1101,7 @@ AsyncRead(OsFile* aFile, void *aBuffer, int aCount)
   // any messages while we do this. Open exclusive may also change mBaseRead.
   nsAutoLock lock(AsyncQueueLock);
 
-  AsyncOsFile* asyncfile = NS_STATIC_CAST(AsyncOsFile*, aFile);
+  AsyncOsFile* asyncfile = static_cast<AsyncOsFile*>(aFile);
   if (! asyncfile->mOpen) {
     NS_NOTREACHED("Attempting to write to a file with a close pending!");
     return SQLITE_INTERNAL;
@@ -1168,7 +1168,7 @@ AsyncRead(OsFile* aFile, void *aBuffer, int aCount)
         PRInt32 copycount = PR_MIN(p->mBytes - beginIn, aCount - beginOut);
 
         if (copycount > 0) {
-          memcpy(&NS_STATIC_CAST(char*, aBuffer)[beginOut],
+          memcpy(&static_cast<char*>(aBuffer)[beginOut],
                  &p->mBuf[beginIn], copycount);
         }
       }
@@ -1194,7 +1194,7 @@ AsyncSeek(OsFile* aFile, sqlite_int64 aOffset)
 {
   if (AsyncWriteError != SQLITE_OK)
     return AsyncWriteError;
-  AsyncOsFile* asyncfile = NS_STATIC_CAST(AsyncOsFile*, aFile);
+  AsyncOsFile* asyncfile = static_cast<AsyncOsFile*>(aFile);
   if (! asyncfile->mOpen) {
     NS_NOTREACHED("Attempting to write to a file with a close pending!");
     return SQLITE_INTERNAL;
@@ -1221,7 +1221,7 @@ AsyncFileSize(OsFile* aFile, sqlite_int64* aSize)
   if (AsyncWriteError != SQLITE_OK)
     return AsyncWriteError;
 
-  AsyncOsFile* asyncfile = NS_STATIC_CAST(AsyncOsFile*, aFile);
+  AsyncOsFile* asyncfile = static_cast<AsyncOsFile*>(aFile);
   if (! asyncfile->mOpen) {
     NS_NOTREACHED("Attempting to write to a file with a close pending!");
     return SQLITE_INTERNAL;
@@ -1273,7 +1273,7 @@ AsyncFileHandle(OsFile* aFile)
   return SQLITE_OK;
 
   // If you actually wanted the file handle you would do this:
-  //AsyncOsFile* asyncfile = NS_STATIC_CAST(AsyncOsFile*, aFile);
+  //AsyncOsFile* asyncfile = static_cast<AsyncOsFile*>(aFile);
   //return sqlite3OsFileHandle(asyncfile->mBaseRead);
 }
 
diff --git a/mozilla/storage/src/mozStorageStatement.cpp b/mozilla/storage/src/mozStorageStatement.cpp
index c8ac2efaf55..400b885b5c6 100644
--- a/mozilla/storage/src/mozStorageStatement.cpp
+++ b/mozilla/storage/src/mozStorageStatement.cpp
@@ -104,7 +104,7 @@ mozStorageStatement::Initialize(mozIStorageConnection *aDBConnection, const nsAC
     sqlite3 *db = nsnull;
     // XXX - need to implement a private iid to QI for here, to make sure
     // we have a real mozStorageConnection
-    mozStorageConnection *msc = NS_STATIC_CAST(mozStorageConnection*, aDBConnection);
+    mozStorageConnection *msc = static_cast<mozStorageConnection*>(aDBConnection);
     db = msc->GetNativeConnection();
     NS_ENSURE_TRUE(db != nsnull, NS_ERROR_NULL_POINTER);
 
@@ -143,7 +143,7 @@ mozStorageStatement::Initialize(mozIStorageConnection *aDBConnection, const nsAC
     for (unsigned int i = 0; i < mResultColumnCount; i++) {
         const void *name = sqlite3_column_name16 (mDBStatement, i);
         mColumnNames.AppendString(
-            nsDependentString(NS_STATIC_CAST(const PRUnichar*, name)));
+            nsDependentString(static_cast<const PRUnichar*>(name)));
     }
 
     // doing a sqlite3_prepare sets up the execution engine
@@ -650,7 +650,7 @@ mozStorageStatement::GetString(PRUint32 aIndex, nsAString & _retval)
     } else {
         int slen = sqlite3_column_bytes16 (mDBStatement, aIndex);
         const void *text = sqlite3_column_text16 (mDBStatement, aIndex);
-        const PRUnichar *wstr = NS_STATIC_CAST(const PRUnichar *, text);
+        const PRUnichar *wstr = static_cast<const PRUnichar *>(text);
         _retval.Assign (wstr, slen/2);
     }
     return NS_OK;
diff --git a/mozilla/storage/src/mozStorageStatementWrapper.cpp b/mozilla/storage/src/mozStorageStatementWrapper.cpp
index 97a81113141..661ab25ec99 100644
--- a/mozilla/storage/src/mozStorageStatementWrapper.cpp
+++ b/mozilla/storage/src/mozStorageStatementWrapper.cpp
@@ -110,7 +110,7 @@ JSValStorageStatementBinder (JSContext *cx,
         (void)aStatement->BindDoubleParameter(aIdx, d);
     } else if (JSVAL_IS_STRING(val)) {
         JSString *str = JSVAL_TO_STRING(val);
-        (void)aStatement->BindStringParameter(aIdx, nsDependentString(NS_REINTERPRET_CAST(PRUnichar*, JS_GetStringChars(str)), JS_GetStringLength(str)));
+        (void)aStatement->BindStringParameter(aIdx, nsDependentString(reinterpret_cast<PRUnichar*>(JS_GetStringChars(str)), JS_GetStringLength(str)));
     } else if (JSVAL_IS_BOOLEAN(val)) {
         (void)aStatement->BindInt32Parameter(aIdx, (val == JSVAL_TRUE) ? 1 : 0);
     } else if (JSVAL_IS_NULL(val)) {
@@ -168,7 +168,7 @@ mozStorageStatementWrapper::Initialize(mozIStorageStatement *aStatement)
 
     for (unsigned int i = 0; i < mResultColumnCount; i++) {
         const void *name = sqlite3_column_name16 (NativeStatement(), i);
-        mColumnNames.AppendString(nsDependentString(NS_STATIC_CAST(const PRUnichar*, name)));
+        mColumnNames.AppendString(nsDependentString(static_cast<const PRUnichar*>(name)));
     }
 
     return NS_OK;
diff --git a/mozilla/toolkit/components/alerts/src/mac/mozGrowlDelegate.mm b/mozilla/toolkit/components/alerts/src/mac/mozGrowlDelegate.mm
index 97e9a8e10b8..e22ec7f424a 100644
--- a/mozilla/toolkit/components/alerts/src/mac/mozGrowlDelegate.mm
+++ b/mozilla/toolkit/components/alerts/src/mac/mozGrowlDelegate.mm
@@ -174,8 +174,8 @@
   NS_ASSERTION([clickContext valueForKey: COOKIE_KEY] != nil,
                "COOKIE_KEY not found!");
 
-  nsIObserver* observer = NS_STATIC_CAST(nsIObserver*,
-    [[mDict objectForKey: [clickContext valueForKey: OBSERVER_KEY]]
+  nsIObserver* observer = static_cast<nsIObserver*>
+                                     ([[mDict objectForKey: [clickContext valueForKey: OBSERVER_KEY]]
       pointerValue]);
   [mDict removeObjectForKey: [clickContext valueForKey: OBSERVER_KEY]];
   NSString* cookie = [[clickContext valueForKey: COOKIE_KEY] objectAtIndex: 0];
@@ -198,8 +198,8 @@
   NS_ASSERTION([clickContext valueForKey: COOKIE_KEY] != nil,
                "COOKIE_KEY not found!");
 
-  nsIObserver* observer = NS_STATIC_CAST(nsIObserver*,
-    [[mDict objectForKey: [clickContext valueForKey: OBSERVER_KEY]]
+  nsIObserver* observer = static_cast<nsIObserver*>
+                                     ([[mDict objectForKey: [clickContext valueForKey: OBSERVER_KEY]]
       pointerValue]);
   [mDict removeObjectForKey: [clickContext valueForKey: OBSERVER_KEY]];
   NSString* cookie = [[clickContext valueForKey: COOKIE_KEY] objectAtIndex: 0];
diff --git a/mozilla/toolkit/components/autocomplete/src/nsAutoCompleteController.cpp b/mozilla/toolkit/components/autocomplete/src/nsAutoCompleteController.cpp
index dc37531f1e6..ad6a2508c4d 100644
--- a/mozilla/toolkit/components/autocomplete/src/nsAutoCompleteController.cpp
+++ b/mozilla/toolkit/components/autocomplete/src/nsAutoCompleteController.cpp
@@ -977,7 +977,7 @@ nsAutoCompleteController::StartSearch()
     if (NS_FAILED(rv))
         return rv;
     
-    rv = search->StartSearch(mSearchString, searchParam, result, NS_STATIC_CAST(nsIAutoCompleteObserver *, this));
+    rv = search->StartSearch(mSearchString, searchParam, result, static_cast<nsIAutoCompleteObserver *>(this));
     if (NS_FAILED(rv)) {
       ++searchesFailed;
       --mSearchesOngoing;
diff --git a/mozilla/toolkit/components/commandlines/src/nsCommandLine.cpp b/mozilla/toolkit/components/commandlines/src/nsCommandLine.cpp
index b42b806cb40..9f360de1324 100644
--- a/mozilla/toolkit/components/commandlines/src/nsCommandLine.cpp
+++ b/mozilla/toolkit/components/commandlines/src/nsCommandLine.cpp
@@ -139,8 +139,8 @@ nsCommandLine::FindFlag(const nsAString& aFlag, PRBool aCaseSensitive, PRInt32 *
   nsDefaultStringComparator caseCmp;
   nsCaseInsensitiveStringComparator caseICmp;
   nsStringComparator& c = aCaseSensitive ?
-    NS_STATIC_CAST(nsStringComparator&, caseCmp) :
-    NS_STATIC_CAST(nsStringComparator&, caseICmp);
+    static_cast<nsStringComparator&>(caseCmp) :
+    static_cast<nsStringComparator&>(caseICmp);
 
   for (f = 0; f < mArgs.Count(); ++f) {
     const nsString &arg = *mArgs[f];
@@ -608,7 +608,7 @@ EnumHelp(nsICommandLineHandler* aHandler, nsICommandLine* aThis, void* aClosure)
     NS_ASSERTION(text.Length() == 0 || text.Last() == '\n',
                  "Help text from command line handlers should end in a newline.");
 
-    nsACString* totalText = NS_REINTERPRET_CAST(nsACString*, aClosure);
+    nsACString* totalText = reinterpret_cast<nsACString*>(aClosure);
     totalText->Append(text);
   }
 
diff --git a/mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp b/mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp
index bf6022c92d5..24fdb19ac02 100644
--- a/mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp
+++ b/mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp
@@ -932,7 +932,7 @@ nsDownloadManager::Open(nsIDOMWindow* aParent, PRUint32 aID)
 void
 nsDownloadManager::OpenTimerCallback(nsITimer* aTimer, void* aClosure)
 {
-  TimerParams* params = NS_STATIC_CAST(TimerParams*, aClosure);
+  TimerParams* params = static_cast<TimerParams*>(aClosure);
   
   PRInt32 complete;
   params->download->GetPercentComplete(&complete);
diff --git a/mozilla/toolkit/components/downloads/src/old.cpp b/mozilla/toolkit/components/downloads/src/old.cpp
index 89251123b0c..2baba3a3e73 100644
--- a/mozilla/toolkit/components/downloads/src/old.cpp
+++ b/mozilla/toolkit/components/downloads/src/old.cpp
@@ -18,7 +18,7 @@ nsDownloadManager::OpenProgressDialogFor(const PRUnichar* aPath, nsIDOMWindow* a
     return NS_ERROR_FAILURE;
 
   nsCOMPtr<nsIDownload> download;
-  nsDownload* internalDownload = NS_STATIC_CAST(nsDownload*, mCurrDownloads.Get(&key));
+  nsDownload* internalDownload = static_cast<nsDownload*>(mCurrDownloads.Get(&key));
   internalDownload->QueryInterface(NS_GET_IID(nsIDownload), (void**) getter_AddRefs(download));
   if (!download)
     return NS_ERROR_FAILURE;
diff --git a/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp b/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp
index 5caeb445dc1..859163bc817 100644
--- a/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp
+++ b/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp
@@ -1840,7 +1840,7 @@ nsGlobalHistory::GetTarget(nsIRDFResource* aSource,
         nsCOMPtr<nsIRDFLiteral> literal; 
 
         for (PRInt32 i = 0; i < tokenList.Count(); ++i) {
-          tokenPair* token = NS_STATIC_CAST(tokenPair*, tokenList[i]);
+          tokenPair* token = static_cast<tokenPair*>(tokenList[i]);
 
           if (!strncmp(token->tokenName, "text", token->tokenNameLength)) {
             rv = gRDFService->GetLiteral(NS_ConvertUTF8toUTF16(Substring(token->tokenValue, token->tokenValue + token->tokenValueLength)).get(),
@@ -4215,8 +4215,8 @@ nsGlobalHistory::StartSearch(const nsAString &aSearchString,
     
     // perform the actual search here
     nsresult rv = AutoCompleteSearch(filtered, &exclude,
-                                     NS_STATIC_CAST(nsIAutoCompleteMdbResult2 *,
-                                                    aPreviousResult),
+                                     static_cast<nsIAutoCompleteMdbResult2 *>
+                                                (aPreviousResult),
                                      getter_AddRefs(result));
     NS_ENSURE_SUCCESS(rv, rv);
   }
@@ -4375,7 +4375,7 @@ nsGlobalHistory::AutoCompleteSearch(const nsAString &aSearchString,
     closure.prefixes[5] = &prefixFStr;
 
     // sort it
-    resultArray.Sort(AutoCompleteSortComparison, NS_STATIC_CAST(void*, &closure));
+    resultArray.Sort(AutoCompleteSortComparison, static_cast<void*>(&closure));
 
     // place the sorted array into the autocomplete results
     PRUint32 count = resultArray.Count();
@@ -4509,7 +4509,7 @@ nsGlobalHistory::AutoCompleteSortComparison(nsIMdbRow *row1, nsIMdbRow *row2,
   //
   // cast our function parameters back into their real form
   AutoCompleteSortClosure* closure = 
-      NS_STATIC_CAST(AutoCompleteSortClosure*, closureVoid);
+      static_cast<AutoCompleteSortClosure*>(closureVoid);
 
   // get visit counts - we're ignoring all errors from GetRowValue(), 
   // and relying on default values
diff --git a/mozilla/toolkit/components/history/src/nsMdbPtr.h b/mozilla/toolkit/components/history/src/nsMdbPtr.h
index 7d3b7f81c63..7465e3b38b1 100644
--- a/mozilla/toolkit/components/history/src/nsMdbPtr.h
+++ b/mozilla/toolkit/components/history/src/nsMdbPtr.h
@@ -123,7 +123,7 @@ public:
     nsMdbDerivedSafe<T>*
     get() const
     {
-        return NS_REINTERPRET_CAST(nsMdbDerivedSafe<T>*, mRawPtr);
+        return reinterpret_cast<nsMdbDerivedSafe<T>*>(mRawPtr);
     }
 
     nsMdbDerivedSafe<T>*
@@ -161,7 +161,7 @@ inline
 PRBool
 operator==(const nsMdbPtr<T>& lhs, const nsMdbPtr<U>& rhs)
 {
-    return NS_STATIC_CAST(const void*, lhs.get()) == NS_STATIC_CAST(const void*, rhs.get());
+    return static_cast<const void*>(lhs.get()) == static_cast<const void*>(rhs.get());
 }
 
 template <class T, class U>
@@ -169,7 +169,7 @@ inline
 PRBool
 operator==(const nsMdbPtr<T>& lhs, const U* rhs)
 {
-    return NS_STATIC_CAST(const void*, lhs.get()) == NS_STATIC_CAST(const void*, rhs);
+    return static_cast<const void*>(lhs.get()) == static_cast<const void*>(rhs);
 }
 
 
@@ -178,7 +178,7 @@ inline
 PRBool
 operator==(const U* lhs, const nsMdbPtr<T>& rhs)
 {
-    return NS_STATIC_CAST(const void*, lhs) == NS_STATIC_CAST(const void*, rhs.get());
+    return static_cast<const void*>(lhs) == static_cast<const void*>(rhs.get());
 }
 
 
@@ -189,7 +189,7 @@ inline
 PRBool
 operator!=(const nsMdbPtr<T>& lhs, const nsMdbPtr<U>& rhs)
 {
-    return NS_STATIC_CAST(const void*, lhs.get()) != NS_STATIC_CAST(const void*, rhs.get());
+    return static_cast<const void*>(lhs.get()) != static_cast<const void*>(rhs.get());
 }
 
 template <class T, class U>
@@ -197,7 +197,7 @@ inline
 PRBool
 operator!=(const nsMdbPtr<T>& lhs, const U* rhs)
 {
-    return NS_STATIC_CAST(const void*, lhs.get()) != NS_STATIC_CAST(const void*, rhs);
+    return static_cast<const void*>(lhs.get()) != static_cast<const void*>(rhs);
 }
 
 
@@ -206,7 +206,7 @@ inline
 PRBool
 operator!=(const U* lhs, const nsMdbPtr<T>& rhs)
 {
-    return NS_STATIC_CAST(const void*, lhs) != NS_STATIC_CAST(const void*, rhs.get());
+    return static_cast<const void*>(lhs) != static_cast<const void*>(rhs.get());
 }
 
 
diff --git a/mozilla/toolkit/components/places/src/nsAnnotationService.cpp b/mozilla/toolkit/components/places/src/nsAnnotationService.cpp
index 417a5a6de2c..5dd6e1a8eba 100644
--- a/mozilla/toolkit/components/places/src/nsAnnotationService.cpp
+++ b/mozilla/toolkit/components/places/src/nsAnnotationService.cpp
@@ -952,8 +952,8 @@ nsAnnotationService::GetPagesWithAnnotation(const nsACString& aName,
   // convert to raw array
   if (results.Count() == 0)
     return NS_OK;
-  *aResults = NS_STATIC_CAST(nsIURI**,
-                             nsMemory::Alloc(results.Count() * sizeof(nsIURI*)));
+  *aResults = static_cast<nsIURI**>
+                         (nsMemory::Alloc(results.Count() * sizeof(nsIURI*)));
   if (! *aResults)
     return NS_ERROR_OUT_OF_MEMORY;
   *aResultCount = results.Count();
@@ -1023,8 +1023,8 @@ nsAnnotationService::GetItemsWithAnnotation(const nsACString& aName,
   if (results.Length() == 0)
     return NS_OK;
 
-  *aResults = NS_STATIC_CAST(PRInt64*,
-                             nsMemory::Alloc(results.Length() * sizeof(PRInt64)));
+  *aResults = static_cast<PRInt64*>
+                         (nsMemory::Alloc(results.Length() * sizeof(PRInt64)));
   if (! *aResults)
     return NS_ERROR_OUT_OF_MEMORY;
 
@@ -1078,8 +1078,8 @@ nsAnnotationService::GetPageAnnotationNames(nsIURI* aURI, PRUint32* aCount,
   if (names.Length() == 0)
     return NS_OK;
 
-  *_result = NS_STATIC_CAST(nsIVariant**,
-      nsMemory::Alloc(sizeof(nsIVariant*) * names.Length()));
+  *_result = static_cast<nsIVariant**>
+                        (nsMemory::Alloc(sizeof(nsIVariant*) * names.Length()));
   NS_ENSURE_TRUE(*_result, NS_ERROR_OUT_OF_MEMORY);
 
   for (PRUint32 i = 0; i < names.Length(); i ++) {
@@ -1144,8 +1144,8 @@ nsAnnotationService::GetItemAnnotationNames(PRInt64 aItemId, PRUint32* aCount,
   if (names.Length() == 0)
     return NS_OK;
 
-  *_result = NS_STATIC_CAST(nsIVariant**,
-      nsMemory::Alloc(sizeof(nsIVariant*) * names.Length()));
+  *_result = static_cast<nsIVariant**>
+                        (nsMemory::Alloc(sizeof(nsIVariant*) * names.Length()));
   NS_ENSURE_TRUE(*_result, NS_ERROR_OUT_OF_MEMORY);
 
   for (PRUint32 i = 0; i < names.Length(); i ++) {
diff --git a/mozilla/toolkit/components/places/src/nsFaviconService.cpp b/mozilla/toolkit/components/places/src/nsFaviconService.cpp
index 4607658d5b5..52e9bd7aa9d 100644
--- a/mozilla/toolkit/components/places/src/nsFaviconService.cpp
+++ b/mozilla/toolkit/components/places/src/nsFaviconService.cpp
@@ -689,7 +689,7 @@ ExpireFailedFaviconsCallback(nsCStringHashKey::KeyType aKey,
                              PRUint32& aData,
                              void* userArg)
 {
-  PRUint32* threshold = NS_REINTERPRET_CAST(PRUint32*, userArg);
+  PRUint32* threshold = reinterpret_cast<PRUint32*>(userArg);
   if (aData < *threshold)
     return PL_DHASH_REMOVE;
   return PL_DHASH_NEXT;
@@ -876,7 +876,7 @@ FaviconLoadListener::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext,
 #ifndef MOZILLA_1_8_BRANCH
                aRequest,
 #endif
-               NS_REINTERPRET_CAST(PRUint8*, NS_CONST_CAST(char*, mData.get())),
+               reinterpret_cast<PRUint8*>(const_cast<char*>(mData.get())),
                mData.Length(), mimeType);
     // ignore errors: mime type will be left empty and we'll try the next sniffer
   }
@@ -899,7 +899,7 @@ FaviconLoadListener::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext,
 
   // save the favicon data
   rv = mFaviconService->SetFaviconData(mFaviconURI,
-               NS_REINTERPRET_CAST(PRUint8*, NS_CONST_CAST(char*, mData.get())),
+               reinterpret_cast<PRUint8*>(const_cast<char*>(mData.get())),
                mData.Length(), mimeType, expiration);
   NS_ENSURE_SUCCESS(rv, rv);
 
diff --git a/mozilla/toolkit/components/places/src/nsMaybeWeakPtr.cpp b/mozilla/toolkit/components/places/src/nsMaybeWeakPtr.cpp
index ec43c79346d..9fc94c3b680 100644
--- a/mozilla/toolkit/components/places/src/nsMaybeWeakPtr.cpp
+++ b/mozilla/toolkit/components/places/src/nsMaybeWeakPtr.cpp
@@ -69,12 +69,12 @@ nsMaybeWeakPtrArray_base::AppendWeakElementBase(nsTArray_base *aArray,
   if (aOwnsWeak) {
     nsCOMPtr<nsIWeakReference> weakRef;
     weakRef = do_GetWeakReference(aElement);
-    NS_REINTERPRET_CAST(nsCOMPtr<nsISupports>*, &weakRef)->swap(ref);
+    reinterpret_cast<nsCOMPtr<nsISupports>*>(&weakRef)->swap(ref);
   } else {
     ref = aElement;
   }
 
-  isupports_type *array = NS_STATIC_CAST(isupports_type*, aArray);
+  isupports_type *array = static_cast<isupports_type*>(aArray);
   if (array->IndexOf(ref) != isupports_type::NoIndex) {
     return NS_ERROR_INVALID_ARG; // already present
   }
@@ -88,7 +88,7 @@ nsMaybeWeakPtrArray_base::AppendWeakElementBase(nsTArray_base *aArray,
 nsMaybeWeakPtrArray_base::RemoveWeakElementBase(nsTArray_base *aArray,
                                                 nsISupports *aElement)
 {
-  isupports_type *array = NS_STATIC_CAST(isupports_type*, aArray);
+  isupports_type *array = static_cast<isupports_type*>(aArray);
   PRUint32 index = array->IndexOf(aElement);
   if (index != isupports_type::NoIndex) {
     array->RemoveElementAt(index);
diff --git a/mozilla/toolkit/components/places/src/nsMaybeWeakPtr.h b/mozilla/toolkit/components/places/src/nsMaybeWeakPtr.h
index 54d829093f4..0e4134374b9 100644
--- a/mozilla/toolkit/components/places/src/nsMaybeWeakPtr.h
+++ b/mozilla/toolkit/components/places/src/nsMaybeWeakPtr.h
@@ -75,8 +75,8 @@ public:
 
 protected:
   const nsCOMPtr<T> GetValue() const {
-    return nsCOMPtr<T>(dont_AddRef(NS_STATIC_CAST(T*,
-                                                  GetValueAs(NS_GET_TEMPLATE_IID(T)))));
+    return nsCOMPtr<T>(dont_AddRef(static_cast<T*>
+                                              (GetValueAs(NS_GET_TEMPLATE_IID(T)))));
   }
 };
 
diff --git a/mozilla/toolkit/components/places/src/nsMorkHistoryImporter.cpp b/mozilla/toolkit/components/places/src/nsMorkHistoryImporter.cpp
index 7de94c7c1cb..2aa6609c491 100644
--- a/mozilla/toolkit/components/places/src/nsMorkHistoryImporter.cpp
+++ b/mozilla/toolkit/components/places/src/nsMorkHistoryImporter.cpp
@@ -66,7 +66,7 @@ struct TableReadClosure
     : reader(aReader), history(aHistory), swapBytes(PR_FALSE),
       byteOrderColumn(-1)
   {
-    NS_CONST_CAST(nsString*, &voidString)->SetIsVoid(PR_TRUE);
+    const_cast<nsString*>(&voidString)->SetIsVoid(PR_TRUE);
     for (PRUint32 i = 0; i < kColumnCount; ++i) {
       columnIndexes[i] = -1;
     }
@@ -105,7 +105,7 @@ nsMorkHistoryImporter::AddToHistoryCB(const nsCSubstring &aRowID,
                                       const nsTArray<nsCString> *aValues,
                                       void *aData)
 {
-  TableReadClosure *data = NS_STATIC_CAST(TableReadClosure*, aData);
+  TableReadClosure *data = static_cast<TableReadClosure*>(aData);
   const nsMorkReader *reader = data->reader;
   nsCString values[kColumnCount];
   const PRInt32 *columnIndexes = data->columnIndexes;
@@ -134,12 +134,12 @@ nsMorkHistoryImporter::AddToHistoryCB(const nsCSubstring &aRowID,
 
     // Swap the bytes in the unicode characters if necessary.
     if (data->swapBytes) {
-      SwapBytes(NS_REINTERPRET_CAST(PRUnichar*, titleC.BeginWriting()));
+      SwapBytes(reinterpret_cast<PRUnichar*>(titleC.BeginWriting()));
     }
     titleBytes = titleC.get();
   }
 
-  const PRUnichar *title = NS_REINTERPRET_CAST(const PRUnichar*, titleBytes);
+  const PRUnichar *title = reinterpret_cast<const PRUnichar*>(titleBytes);
 
   PRInt32 err;
   PRInt32 count = values[kVisitCountColumn].ToInteger(&err);
@@ -197,7 +197,7 @@ nsMorkHistoryImporter::ImportHistory(nsIFile *aFile,
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Gather up the column ids so we don't need to find them on each row
-  nsNavHistory *history = NS_STATIC_CAST(nsNavHistory*, aHistory);
+  nsNavHistory *history = static_cast<nsNavHistory*>(aHistory);
   TableReadClosure data(&reader, history);
   const nsTArray<nsMorkReader::MorkColumn> &columns = reader.GetColumns();
   for (PRUint32 i = 0; i < columns.Length(); ++i) {
diff --git a/mozilla/toolkit/components/places/src/nsNavBookmarks.cpp b/mozilla/toolkit/components/places/src/nsNavBookmarks.cpp
index f442b4f25aa..d57497ad75b 100644
--- a/mozilla/toolkit/components/places/src/nsNavBookmarks.cpp
+++ b/mozilla/toolkit/components/places/src/nsNavBookmarks.cpp
@@ -332,7 +332,7 @@ struct RenumberItemsArray {
 RenumberItemsArray::~RenumberItemsArray()
 {
   for (PRInt32 i = 0; i < items.Count(); ++i) {
-    delete NS_STATIC_CAST(RenumberItem*, items[i]);
+    delete static_cast<RenumberItem*>(items[i]);
   }
 }
 
@@ -702,7 +702,7 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 RemoveBookmarkHashCallback(nsTrimInt64HashKey::KeyType aKey,
                            PRInt64& aBookmark, void* aUserArg)
 {
-  const PRInt64* removeThisOne = NS_REINTERPRET_CAST(const PRInt64*, aUserArg);
+  const PRInt64* removeThisOne = reinterpret_cast<const PRInt64*>(aUserArg);
   if (aBookmark == *removeThisOne)
     return PL_DHASH_REMOVE;
   return PL_DHASH_NEXT;
@@ -720,7 +720,7 @@ nsNavBookmarks::UpdateBookmarkHashOnRemove(PRInt64 aPlaceId)
 
   // remove it
   mBookmarksHash.Enumerate(RemoveBookmarkHashCallback,
-                           NS_REINTERPRET_CAST(void*, &aPlaceId));
+                           reinterpret_cast<void*>(&aPlaceId));
   return NS_OK;
 }
 
@@ -2139,8 +2139,8 @@ nsNavBookmarks::GetBookmarkIdsForURI(nsIURI *aURI, PRUint32 *aCount,
 
   // Copy the results into a new array for output
   if (bookmarks.Length()) {
-    *aBookmarks = NS_STATIC_CAST(PRInt64*,
-                           nsMemory::Alloc(sizeof(PRInt64) * bookmarks.Length()));
+    *aBookmarks = static_cast<PRInt64*>
+                             (nsMemory::Alloc(sizeof(PRInt64) * bookmarks.Length()));
     if (! *aBookmarks)
       return NS_ERROR_OUT_OF_MEMORY;
     for (PRUint32 i = 0; i < bookmarks.Length(); i ++)
diff --git a/mozilla/toolkit/components/places/src/nsNavHistory.cpp b/mozilla/toolkit/components/places/src/nsNavHistory.cpp
index 477c7d5fcd8..04b8b051429 100644
--- a/mozilla/toolkit/components/places/src/nsNavHistory.cpp
+++ b/mozilla/toolkit/components/places/src/nsNavHistory.cpp
@@ -1261,7 +1261,7 @@ nsNavHistory::GetNow()
 
 void nsNavHistory::expireNowTimerCallback(nsITimer* aTimer, void* aClosure)
 {
-  nsNavHistory* history = NS_STATIC_CAST(nsNavHistory*, aClosure);
+  nsNavHistory* history = static_cast<nsNavHistory*>(aClosure);
   history->mNowValid = PR_FALSE;
   history->mExpireNowTimer = nsnull;
 }
@@ -2983,7 +2983,7 @@ nsNavHistory::SetURIGeckoFlags(nsIURI* aURI, PRUint32 aFlags)
 PLDHashOperator PR_CALLBACK nsNavHistory::ExpireNonrecentRedirects(
     nsCStringHashKey::KeyType aKey, RedirectInfo& aData, void* aUserArg)
 {
-  PRInt64* threshold = NS_REINTERPRET_CAST(PRInt64*, aUserArg);
+  PRInt64* threshold = reinterpret_cast<PRInt64*>(aUserArg);
   if (aData.mTimeCreated < *threshold)
     return PL_DHASH_REMOVE;
   return PL_DHASH_NEXT;
@@ -3011,7 +3011,7 @@ nsNavHistory::AddDocumentRedirect(nsIChannel *aOldChannel,
     // expire out-of-date ones
     PRInt64 threshold = PR_Now() - RECENT_EVENT_THRESHOLD;
     mRecentRedirects.Enumerate(ExpireNonrecentRedirects,
-                               NS_REINTERPRET_CAST(void*, &threshold));
+                               reinterpret_cast<void*>(&threshold));
   }
 
   RedirectInfo info;
@@ -3149,7 +3149,7 @@ nsNavHistory::AddLazyMessage(const LazyMessage& aMessage)
 void // static
 nsNavHistory::LazyTimerCallback(nsITimer* aTimer, void* aClosure)
 {
-  nsNavHistory* that = NS_STATIC_CAST(nsNavHistory*, aClosure);
+  nsNavHistory* that = static_cast<nsNavHistory*>(aClosure);
   that->mLazyTimerSet = PR_FALSE;
   that->mLazyTimerDeferments = 0;
   that->CommitLazyMessages();
@@ -3856,7 +3856,7 @@ ExpireNonrecentEventsCallback(nsCStringHashKey::KeyType aKey,
                               PRInt64& aData,
                               void* userArg)
 {
-  PRInt64* threshold = NS_REINTERPRET_CAST(PRInt64*, userArg);
+  PRInt64* threshold = reinterpret_cast<PRInt64*>(userArg);
   if (aData < *threshold)
     return PL_DHASH_REMOVE;
   return PL_DHASH_NEXT;
@@ -3866,7 +3866,7 @@ nsNavHistory::ExpireNonrecentEvents(RecentEventHash* hashTable)
 {
   PRInt64 threshold = GetNow() - RECENT_EVENT_THRESHOLD;
   hashTable->Enumerate(ExpireNonrecentEventsCallback,
-                       NS_REINTERPRET_CAST(void*, &threshold));
+                       reinterpret_cast<void*>(&threshold));
 }
 
 
diff --git a/mozilla/toolkit/components/places/src/nsNavHistoryAutoComplete.cpp b/mozilla/toolkit/components/places/src/nsNavHistoryAutoComplete.cpp
index 7b56ac1d0a3..db610d4e506 100644
--- a/mozilla/toolkit/components/places/src/nsNavHistoryAutoComplete.cpp
+++ b/mozilla/toolkit/components/places/src/nsNavHistoryAutoComplete.cpp
@@ -551,7 +551,7 @@ nsNavHistory::AutoCompleteQueryOnePrefix(const nsString& aSearchString,
     return NS_OK;
   nsCAutoString endQuery = beginQuery;
   unsigned char maxChar[6] = { 0xfd, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf };
-  endQuery.Append(NS_REINTERPRET_CAST(const char*, maxChar), 6);
+  endQuery.Append(reinterpret_cast<const char*>(maxChar), 6);
 
   nsTArray<nsCString> ranges;
   if (aExcludePrefixes.Length() > 0) {
@@ -561,7 +561,7 @@ nsNavHistory::AutoCompleteQueryOnePrefix(const nsString& aSearchString,
       nsCAutoString thisPrefix = NS_ConvertUTF16toUTF8(
           mAutoCompletePrefixes[aExcludePrefixes[i]].prefix);
       ranges.AppendElement(thisPrefix);
-      thisPrefix.Append(NS_REINTERPRET_CAST(const char*, maxChar), 6);
+      thisPrefix.Append(reinterpret_cast<const char*>(maxChar), 6);
       ranges.AppendElement(thisPrefix);
     }
     ranges.AppendElement(endQuery);
diff --git a/mozilla/toolkit/components/places/src/nsNavHistoryExpire.cpp b/mozilla/toolkit/components/places/src/nsNavHistoryExpire.cpp
index 2a2594e6286..9472408d259 100644
--- a/mozilla/toolkit/components/places/src/nsNavHistoryExpire.cpp
+++ b/mozilla/toolkit/components/places/src/nsNavHistoryExpire.cpp
@@ -624,7 +624,7 @@ nsNavHistoryExpire::StartTimer(PRUint32 aMilleseconds)
 void // static
 nsNavHistoryExpire::TimerCallback(nsITimer* aTimer, void* aClosure)
 {
-  nsNavHistoryExpire* that = NS_STATIC_CAST(nsNavHistoryExpire*, aClosure);
+  nsNavHistoryExpire* that = static_cast<nsNavHistoryExpire*>(aClosure);
   that->mTimerSet = PR_FALSE;
   that->DoPartialExpiration();
 }
diff --git a/mozilla/toolkit/components/places/src/nsNavHistoryQuery.cpp b/mozilla/toolkit/components/places/src/nsNavHistoryQuery.cpp
index aa084da8f97..a80a88a2208 100644
--- a/mozilla/toolkit/components/places/src/nsNavHistoryQuery.cpp
+++ b/mozilla/toolkit/components/places/src/nsNavHistoryQuery.cpp
@@ -216,8 +216,8 @@ nsNavHistory::QueryStringToQueries(const nsACString& aQueryString,
   *aResultCount = queries.Count();
   if (queries.Count() > 0) {
     // convert COM array to raw
-    *aQueries = NS_STATIC_CAST(nsINavHistoryQuery**,
-                  nsMemory::Alloc(sizeof(nsINavHistoryQuery*) * queries.Count()));
+    *aQueries = static_cast<nsINavHistoryQuery**>
+                           (nsMemory::Alloc(sizeof(nsINavHistoryQuery*) * queries.Count()));
     NS_ENSURE_TRUE(*aQueries, NS_ERROR_OUT_OF_MEMORY);
     for (PRInt32 i = 0; i < queries.Count(); i ++) {
       (*aQueries)[i] = queries[i];
@@ -1021,8 +1021,8 @@ NS_IMETHODIMP nsNavHistoryQuery::GetFolders(PRUint32 *aCount,
   PRUint32 count = mFolders.Length();
   PRInt64 *folders = nsnull;
   if (count > 0) {
-    folders = NS_STATIC_CAST(PRInt64*,
-                             nsMemory::Alloc(count * sizeof(PRInt64)));
+    folders = static_cast<PRInt64*>
+                         (nsMemory::Alloc(count * sizeof(PRInt64)));
     NS_ENSURE_TRUE(folders, NS_ERROR_OUT_OF_MEMORY);
 
     for (PRUint32 i = 0; i < count; ++i) {
@@ -1076,8 +1076,8 @@ nsNavHistoryQueryOptions::GetGroupingMode(PRUint32 *aGroupCount,
     *aGroupingMode = nsnull;
     return NS_OK;
   }
-  *aGroupingMode = NS_STATIC_CAST(PRUint16*,
-                                  nsMemory::Alloc(sizeof(PRUint16) * mGroupCount));
+  *aGroupingMode = static_cast<PRUint16*>
+                              (nsMemory::Alloc(sizeof(PRUint16) * mGroupCount));
   if (! *aGroupingMode)
     return NS_ERROR_OUT_OF_MEMORY;
   for(PRUint32 i = 0; i < mGroupCount; i ++)
@@ -1418,7 +1418,7 @@ SetQueryKeyUint32(const nsCString& aValue, nsINavHistoryQuery* aQuery,
                   Uint32QuerySetter setter)
 {
   nsresult rv;
-  PRUint32 value = aValue.ToInteger(NS_REINTERPRET_CAST(PRInt32*, &rv));
+  PRUint32 value = aValue.ToInteger(reinterpret_cast<PRInt32*>(&rv));
   if (NS_SUCCEEDED(rv)) {
     rv = (aQuery->*setter)(value);
     if (NS_FAILED(rv)) {
@@ -1433,7 +1433,7 @@ SetOptionsKeyUint32(const nsCString& aValue, nsINavHistoryQueryOptions* aOptions
                   Uint32OptionsSetter setter)
 {
   nsresult rv;
-  PRUint32 value = aValue.ToInteger(NS_REINTERPRET_CAST(PRInt32*, &rv));
+  PRUint32 value = aValue.ToInteger(reinterpret_cast<PRInt32*>(&rv));
   if (NS_SUCCEEDED(rv)) {
     rv = (aOptions->*setter)(value);
     if (NS_FAILED(rv)) {
@@ -1449,8 +1449,8 @@ SetOptionsKeyUint16(const nsCString& aValue, nsINavHistoryQueryOptions* aOptions
                     Uint16OptionsSetter setter)
 {
   nsresult rv;
-  PRUint16 value = NS_STATIC_CAST(PRUint16,
-                                  aValue.ToInteger(NS_REINTERPRET_CAST(PRInt32*, &rv)));
+  PRUint16 value = static_cast<PRUint16>
+                              (aValue.ToInteger(reinterpret_cast<PRInt32*>(&rv)));
   if (NS_SUCCEEDED(rv)) {
     rv = (aOptions->*setter)(value);
     if (NS_FAILED(rv)) {
diff --git a/mozilla/toolkit/components/places/src/nsNavHistoryResult.cpp b/mozilla/toolkit/components/places/src/nsNavHistoryResult.cpp
index 4cbfe7aad33..9fa1b734a8f 100644
--- a/mozilla/toolkit/components/places/src/nsNavHistoryResult.cpp
+++ b/mozilla/toolkit/components/places/src/nsNavHistoryResult.cpp
@@ -176,7 +176,7 @@ nsNavHistoryResultNode::GetResult()
   do {
     if (node->IsContainer()) {
       nsNavHistoryContainerResultNode* container =
-        NS_STATIC_CAST(nsNavHistoryContainerResultNode*, node);
+        static_cast<nsNavHistoryContainerResultNode*>(node);
       NS_ASSERTION(container->mResult, "Containers must have valid results");
       return container->mResult;
     }
@@ -522,8 +522,7 @@ nsNavHistoryContainerResultNode::ReverseUpdateStats(PRInt32 aAccessCountChange)
       // repaint visible rows
       nsNavHistoryResult* result = GetResult();
       if (result && result->GetView()) {
-        result->GetView()->ItemChanged(NS_STATIC_CAST(
-            nsINavHistoryContainerResultNode*, mParent));
+        result->GetView()->ItemChanged(static_cast<nsINavHistoryContainerResultNode*>(mParent));
       }
     }
 
@@ -624,7 +623,7 @@ void
 nsNavHistoryContainerResultNode::RecursiveSort(
     const char* aData, SortComparator aComparator)
 {
-  void* data = NS_CONST_CAST(void*, NS_STATIC_CAST(const void*, aData));
+  void* data = const_cast<void*>(static_cast<const void*>(aData));
 
   mChildren.Sort(aComparator, data);
   for (PRInt32 i = 0; i < mChildren.Count(); i ++) {
@@ -647,7 +646,7 @@ nsNavHistoryContainerResultNode::FindInsertionPoint(
   if (mChildren.Count() == 0)
     return 0;
 
-  void* data = NS_CONST_CAST(void*, NS_STATIC_CAST(const void*, aData));
+  void* data = const_cast<void*>(static_cast<const void*>(aData));
 
   // The common case is the beginning or the end because this is used to insert
   // new items that are added to history, which is usually sorted by date.
@@ -685,7 +684,7 @@ nsNavHistoryContainerResultNode::DoesChildNeedResorting(PRUint32 aIndex,
   if (mChildren.Count() == 1)
     return PR_FALSE;
 
-  void* data = NS_CONST_CAST(void*, NS_STATIC_CAST(const void*, aData));
+  void* data = const_cast<void*>(static_cast<const void*>(aData));
 
   if (aIndex > 0) {
     // compare to previous item
@@ -913,7 +912,7 @@ PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_KeywordGreat
 PRInt32 PR_CALLBACK nsNavHistoryContainerResultNode::SortComparison_AnnotationLess(
     nsNavHistoryResultNode* a, nsNavHistoryResultNode* b, void* closure)
 {
-  nsCAutoString annoName(NS_STATIC_CAST(char*, closure));
+  nsCAutoString annoName(static_cast<char*>(closure));
   NS_ENSURE_TRUE(!annoName.IsEmpty(), 0);
   
   nsNavBookmarks* bookmarks = nsNavBookmarks::GetBookmarksService();
@@ -1180,7 +1179,7 @@ nsNavHistoryContainerResultNode::InsertChildAt(nsNavHistoryResultNode* aNode,
       mTime = aNode->mTime;
     if (result->GetView())
       result->GetView()->ItemChanged(
-          NS_STATIC_CAST(nsINavHistoryContainerResultNode*, this));
+          static_cast<nsINavHistoryContainerResultNode*>(this));
     ReverseUpdateStats(aNode->mAccessCount);
   }
 
@@ -1501,7 +1500,7 @@ nsNavHistoryContainerResultNode::UpdateURIs(PRBool aRecursive, PRBool aOnlyOne,
         parent->mTime = node->mTime;
       if (result->GetView())
         result->GetView()->ItemChanged(
-            NS_STATIC_CAST(nsINavHistoryContainerResultNode*, parent));
+            static_cast<nsINavHistoryContainerResultNode*>(parent));
       parent->ReverseUpdateStats(node->mAccessCount - oldAccessCount);
     }
 
@@ -1534,7 +1533,7 @@ nsNavHistoryContainerResultNode::UpdateURIs(PRBool aRecursive, PRBool aOnlyOne,
 static void PR_CALLBACK setTitleCallback(
     nsNavHistoryResultNode* aNode, void* aClosure)
 {
-  const nsACString* newTitle = NS_REINTERPRET_CAST(nsACString*, aClosure);
+  const nsACString* newTitle = reinterpret_cast<nsACString*>(aClosure);
   aNode->mTitle = *newTitle;
 }
 nsresult
@@ -1561,7 +1560,7 @@ nsNavHistoryContainerResultNode::ChangeTitles(nsIURI* aURI,
 
   UpdateURIs(aRecursive, aOnlyOne, updateSorting, uriString,
              setTitleCallback,
-             NS_CONST_CAST(void*, NS_REINTERPRET_CAST(const void*, &aNewTitle)));
+             const_cast<void*>(reinterpret_cast<const void*>(&aNewTitle)));
   return NS_OK;
 }
 
@@ -1970,7 +1969,7 @@ nsNavHistoryQueryResultNode::OpenContainer()
   NS_ENSURE_TRUE(result, NS_ERROR_FAILURE);
   if (result->GetView())
     result->GetView()->ContainerOpened(
-        NS_STATIC_CAST(nsNavHistoryContainerResultNode*, this));
+        static_cast<nsNavHistoryContainerResultNode*>(this));
   return NS_OK;
 }
 
@@ -2023,8 +2022,8 @@ nsNavHistoryQueryResultNode::GetQueries(PRUint32* queryCount,
   NS_ENSURE_SUCCESS(rv, rv);
   NS_ASSERTION(mQueries.Count() > 0, "Must have >= 1 query");
 
-  *queries = NS_STATIC_CAST(nsINavHistoryQuery**,
-               nsMemory::Alloc(mQueries.Count() * sizeof(nsINavHistoryQuery*)));
+  *queries = static_cast<nsINavHistoryQuery**>
+                        (nsMemory::Alloc(mQueries.Count() * sizeof(nsINavHistoryQuery*)));
   NS_ENSURE_TRUE(*queries, NS_ERROR_OUT_OF_MEMORY);
 
   for (PRInt32 i = 0; i < mQueries.Count(); ++i)
@@ -2089,8 +2088,8 @@ nsNavHistoryQueryResultNode::VerifyQueriesSerialized()
   nsTArray<nsINavHistoryQuery*> flatQueries;
   flatQueries.SetCapacity(mQueries.Count());
   for (PRInt32 i = 0; i < mQueries.Count(); i ++)
-    flatQueries.AppendElement(NS_STATIC_CAST(nsINavHistoryQuery*,
-                                             mQueries.ObjectAt(i)));
+    flatQueries.AppendElement(static_cast<nsINavHistoryQuery*>
+                                         (mQueries.ObjectAt(i)));
 
   nsNavHistory* history = nsNavHistory::GetHistoryService();
   NS_ENSURE_TRUE(history, NS_ERROR_OUT_OF_MEMORY);
@@ -2217,7 +2216,7 @@ nsNavHistoryQueryResultNode::Refresh()
   NS_ENSURE_TRUE(result, NS_ERROR_FAILURE);
   if (result->GetView())
     return result->GetView()->InvalidateContainer(
-        NS_STATIC_CAST(nsNavHistoryContainerResultNode*, this));
+        static_cast<nsNavHistoryContainerResultNode*>(this));
   return NS_OK;
 }
 
@@ -2509,7 +2508,7 @@ nsNavHistoryQueryResultNode::OnClearHistory()
 static void PR_CALLBACK setFaviconCallback(
    nsNavHistoryResultNode* aNode, void* aClosure)
 {
-  const nsCString* newFavicon = NS_STATIC_CAST(nsCString*, aClosure);
+  const nsCString* newFavicon = static_cast<nsCString*>(aClosure);
   aNode->mFaviconURI = *newFavicon;
 }
 NS_IMETHODIMP
@@ -2721,7 +2720,7 @@ nsNavHistoryFolderResultNode::OpenContainer()
     // remote container API may want to change the bookmarks for this folder.
     nsCOMPtr<nsIRemoteContainer> remote = do_GetService(mRemoteContainerType.get(), &rv);
     if (NS_SUCCEEDED(rv)) {
-      remote->OnContainerOpening(NS_STATIC_CAST(nsINavHistoryFolderResultNode*, this),
+      remote->OnContainerOpening(static_cast<nsINavHistoryFolderResultNode*>(this),
                                  mOptions);
     } else {
       NS_WARNING("Unable to get remote container for ");
@@ -2739,7 +2738,7 @@ nsNavHistoryFolderResultNode::OpenContainer()
   NS_ENSURE_TRUE(result, NS_ERROR_FAILURE);
   if (result->GetView())
     result->GetView()->ContainerOpened(
-        NS_STATIC_CAST(nsNavHistoryContainerResultNode*, this));
+        static_cast<nsNavHistoryContainerResultNode*>(this));
   return NS_OK;
 }
 
@@ -2832,8 +2831,8 @@ nsNavHistoryFolderResultNode::GetQueries(PRUint32* queryCount,
   NS_ENSURE_SUCCESS(rv, rv);
 
   // make array of our 1 query
-  *queries = NS_STATIC_CAST(nsINavHistoryQuery**,
-                            nsMemory::Alloc(sizeof(nsINavHistoryQuery*)));
+  *queries = static_cast<nsINavHistoryQuery**>
+                        (nsMemory::Alloc(sizeof(nsINavHistoryQuery*)));
   if (! *queries)
     return NS_ERROR_OUT_OF_MEMORY;
   NS_ADDREF((*queries)[0] = query);
@@ -2951,7 +2950,7 @@ nsNavHistoryFolderResultNode::Refresh()
   NS_ENSURE_TRUE(result, NS_ERROR_FAILURE);
   if (result->GetView())
     return result->GetView()->InvalidateContainer(
-        NS_STATIC_CAST(nsNavHistoryContainerResultNode*, this));
+        static_cast<nsNavHistoryContainerResultNode*>(this));
   return NS_OK;
 }
 
@@ -3705,7 +3704,7 @@ nsNavHistoryResult::GetRoot(nsINavHistoryQueryResultNode** aRoot)
     return NS_ERROR_FAILURE;
   }
   return mRootNode->QueryInterface(NS_GET_IID(nsINavHistoryQueryResultNode),
-                                   NS_REINTERPRET_CAST(void**, aRoot));
+                                   reinterpret_cast<void**>(aRoot));
 }
 
 
diff --git a/mozilla/toolkit/components/places/src/nsNavHistoryResult.h b/mozilla/toolkit/components/places/src/nsNavHistoryResult.h
index 7f7c5f6fd02..a56ebf7bd5c 100644
--- a/mozilla/toolkit/components/places/src/nsNavHistoryResult.h
+++ b/mozilla/toolkit/components/places/src/nsNavHistoryResult.h
@@ -83,7 +83,7 @@ public:
 
   static KeyTypePointer KeyToPointer(KeyType aKey) { return &aKey; }
   static PLDHashNumber HashKey(KeyTypePointer aKey)
-    { return NS_STATIC_CAST(PRUint32, (*aKey) & PR_UINT32_MAX); }
+    { return static_cast<PRUint32>((*aKey) & PR_UINT32_MAX); }
   enum { ALLOW_MEMMOVE = PR_TRUE };
 
 private:
@@ -359,19 +359,19 @@ public:
   }
   nsNavHistoryContainerResultNode* GetAsContainer() {
     NS_ASSERTION(IsContainer(), "Not a container");
-    return NS_REINTERPRET_CAST(nsNavHistoryContainerResultNode*, this);
+    return reinterpret_cast<nsNavHistoryContainerResultNode*>(this);
   }
   nsNavHistoryVisitResultNode* GetAsVisit() {
     NS_ASSERTION(IsVisit(), "Not a visit");
-    return NS_REINTERPRET_CAST(nsNavHistoryVisitResultNode*, this);
+    return reinterpret_cast<nsNavHistoryVisitResultNode*>(this);
   }
   nsNavHistoryFolderResultNode* GetAsFolder() {
     NS_ASSERTION(IsFolder(), "Not a folder");
-    return NS_REINTERPRET_CAST(nsNavHistoryFolderResultNode*, this);
+    return reinterpret_cast<nsNavHistoryFolderResultNode*>(this);
   }
   nsNavHistoryQueryResultNode* GetAsQuery() {
     NS_ASSERTION(IsQuery(), "Not a query");
-    return NS_REINTERPRET_CAST(nsNavHistoryQueryResultNode*, this);
+    return reinterpret_cast<nsNavHistoryQueryResultNode*>(this);
   }
 
   nsNavHistoryContainerResultNode* mParent;
diff --git a/mozilla/toolkit/components/remote/nsGTKRemoteService.cpp b/mozilla/toolkit/components/remote/nsGTKRemoteService.cpp
index 8151ea4d426..50dae38fc92 100644
--- a/mozilla/toolkit/components/remote/nsGTKRemoteService.cpp
+++ b/mozilla/toolkit/components/remote/nsGTKRemoteService.cpp
@@ -179,7 +179,7 @@ static nsGTKToolkit* GetGTKToolkit()
   nsIToolkit* toolkit = widget->GetToolkit();
   if (!toolkit)
     return nsnull;
-  return NS_STATIC_CAST(nsGTKToolkit*, toolkit);
+  return static_cast<nsGTKToolkit*>(toolkit);
 }
 #endif
 
@@ -425,7 +425,7 @@ nsGTKRemoteService::HandleCommandLine(char* aBuffer, nsIDOMWindow* aWindow,
   // [argc][offsetargv0][offsetargv1...]<workingdir>\0<argv[0]>\0argv[1]...\0
   // (offset is from the beginning of the buffer)
 
-  PRInt32 argc = TO_LITTLE_ENDIAN32(*NS_REINTERPRET_CAST(PRInt32*, aBuffer));
+  PRInt32 argc = TO_LITTLE_ENDIAN32(*reinterpret_cast<PRInt32*>(aBuffer));
   char *wd   = aBuffer + ((argc + 1) * sizeof(PRInt32));
 
 #ifdef DEBUG_bsmedberg
@@ -446,7 +446,7 @@ nsGTKRemoteService::HandleCommandLine(char* aBuffer, nsIDOMWindow* aWindow,
   char **argv = (char**) malloc(sizeof(char*) * argc);
   if (!argv) return "509 internal error";
 
-  PRInt32  *offset = NS_REINTERPRET_CAST(PRInt32*, aBuffer) + 1;
+  PRInt32  *offset = reinterpret_cast<PRInt32*>(aBuffer) + 1;
 
   for (int i = 0; i < argc; ++i) {
     argv[i] = aBuffer + TO_LITTLE_ENDIAN32(offset[i]);
@@ -570,7 +570,7 @@ nsGTKRemoteService::HandlePropertyChange(GtkWidget *aWidget,
       return FALSE;
 
     // Failed to get the data off the window or it was the wrong type?
-    if (!data || !TO_LITTLE_ENDIAN32(*NS_REINTERPRET_CAST(PRInt32*, data)))
+    if (!data || !TO_LITTLE_ENDIAN32(*reinterpret_cast<PRInt32*>(data)))
       return FALSE;
 
     // cool, we got the property data.
@@ -615,7 +615,7 @@ nsGTKRemoteService::HandlePropertyChange(GtkWidget *aWidget,
       return FALSE;
 
     // Failed to get the data off the window or it was the wrong type?
-    if (!data || !TO_LITTLE_ENDIAN32(*NS_REINTERPRET_CAST(PRInt32*, data)))
+    if (!data || !TO_LITTLE_ENDIAN32(*reinterpret_cast<PRInt32*>(data)))
       return FALSE;
 
     // cool, we got the property data.
diff --git a/mozilla/toolkit/components/satchel/src/nsFormFillController.cpp b/mozilla/toolkit/components/satchel/src/nsFormFillController.cpp
index 02dee2b6ae3..7280d9fc5fe 100644
--- a/mozilla/toolkit/components/satchel/src/nsFormFillController.cpp
+++ b/mozilla/toolkit/components/satchel/src/nsFormFillController.cpp
@@ -575,7 +575,7 @@ nsFormFillController::RemoveForDOMDocumentEnumerator(nsISupports* aKey,
                                                   PRInt32& aEntry,
                                                   void* aUserData)
 {
-  nsIDOMDocument* domDoc = NS_STATIC_CAST(nsIDOMDocument*, aUserData);
+  nsIDOMDocument* domDoc = static_cast<nsIDOMDocument*>(aUserData);
   nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(aKey);
   nsCOMPtr<nsIDOMDocument> elementDoc;
   element->GetOwnerDocument(getter_AddRefs(elementDoc));
@@ -958,43 +958,43 @@ nsFormFillController::AddWindowListeners(nsIDOMWindow *aWindow)
     return;
 
   target->AddEventListener(NS_LITERAL_STRING("focus"),
-                           NS_STATIC_CAST(nsIDOMFocusListener *, this),
+                           static_cast<nsIDOMFocusListener *>(this),
                            PR_TRUE);
 
   target->AddEventListener(NS_LITERAL_STRING("blur"),
-                           NS_STATIC_CAST(nsIDOMFocusListener *, this),
+                           static_cast<nsIDOMFocusListener *>(this),
                            PR_TRUE);
 
   target->AddEventListener(NS_LITERAL_STRING("pagehide"),
-                           NS_STATIC_CAST(nsIDOMFocusListener *, this),
+                           static_cast<nsIDOMFocusListener *>(this),
                            PR_TRUE);
 
   target->AddEventListener(NS_LITERAL_STRING("mousedown"),
-                           NS_STATIC_CAST(nsIDOMMouseListener *, this),
+                           static_cast<nsIDOMMouseListener *>(this),
                            PR_TRUE);
 
   target->AddEventListener(NS_LITERAL_STRING("click"),
-                           NS_STATIC_CAST(nsIDOMMouseListener *, this),
+                           static_cast<nsIDOMMouseListener *>(this),
                            PR_TRUE);
 
   target->AddEventListener(NS_LITERAL_STRING("input"),
-                           NS_STATIC_CAST(nsIDOMFormListener *, this),
+                           static_cast<nsIDOMFormListener *>(this),
                            PR_TRUE);
 
   target->AddEventListener(NS_LITERAL_STRING("unload"),
-                           NS_STATIC_CAST(nsIDOMLoadListener *, this),
+                           static_cast<nsIDOMLoadListener *>(this),
                            PR_TRUE);
 
   target->AddEventListener(NS_LITERAL_STRING("compositionstart"),
-                           NS_STATIC_CAST(nsIDOMCompositionListener *, this),
+                           static_cast<nsIDOMCompositionListener *>(this),
                            PR_TRUE);
 
   target->AddEventListener(NS_LITERAL_STRING("compositionend"),
-                           NS_STATIC_CAST(nsIDOMCompositionListener *, this),
+                           static_cast<nsIDOMCompositionListener *>(this),
                            PR_TRUE);
 
   target->AddEventListener(NS_LITERAL_STRING("contextmenu"),
-                           NS_STATIC_CAST(nsIDOMContextMenuListener *, this),
+                           static_cast<nsIDOMContextMenuListener *>(this),
                            PR_TRUE);
 }
 
@@ -1017,43 +1017,43 @@ nsFormFillController::RemoveWindowListeners(nsIDOMWindow *aWindow)
     return;
 
   target->RemoveEventListener(NS_LITERAL_STRING("focus"),
-                              NS_STATIC_CAST(nsIDOMFocusListener *, this),
+                              static_cast<nsIDOMFocusListener *>(this),
                               PR_TRUE);
 
   target->RemoveEventListener(NS_LITERAL_STRING("blur"),
-                              NS_STATIC_CAST(nsIDOMFocusListener *, this),
+                              static_cast<nsIDOMFocusListener *>(this),
                               PR_TRUE);
 
   target->RemoveEventListener(NS_LITERAL_STRING("pagehide"),
-                              NS_STATIC_CAST(nsIDOMFocusListener *, this),
+                              static_cast<nsIDOMFocusListener *>(this),
                               PR_TRUE);
 
   target->RemoveEventListener(NS_LITERAL_STRING("mousedown"),
-                              NS_STATIC_CAST(nsIDOMMouseListener *, this),
+                              static_cast<nsIDOMMouseListener *>(this),
                               PR_TRUE);
 
   target->RemoveEventListener(NS_LITERAL_STRING("click"),
-                              NS_STATIC_CAST(nsIDOMMouseListener *, this),
+                              static_cast<nsIDOMMouseListener *>(this),
                               PR_TRUE);
 
   target->RemoveEventListener(NS_LITERAL_STRING("input"),
-                              NS_STATIC_CAST(nsIDOMFormListener *, this),
+                              static_cast<nsIDOMFormListener *>(this),
                               PR_TRUE);
 
   target->RemoveEventListener(NS_LITERAL_STRING("unload"),
-                              NS_STATIC_CAST(nsIDOMLoadListener *, this),
+                              static_cast<nsIDOMLoadListener *>(this),
                               PR_TRUE);
 
   target->RemoveEventListener(NS_LITERAL_STRING("compositionstart"),
-                              NS_STATIC_CAST(nsIDOMCompositionListener *, this),
+                              static_cast<nsIDOMCompositionListener *>(this),
                               PR_TRUE);
 
   target->RemoveEventListener(NS_LITERAL_STRING("compositionend"),
-                              NS_STATIC_CAST(nsIDOMCompositionListener *, this),
+                              static_cast<nsIDOMCompositionListener *>(this),
                               PR_TRUE);
 
   target->RemoveEventListener(NS_LITERAL_STRING("contextmenu"),
-                              NS_STATIC_CAST(nsIDOMContextMenuListener *, this),
+                              static_cast<nsIDOMContextMenuListener *>(this),
                               PR_TRUE);
 }
 
@@ -1066,7 +1066,7 @@ nsFormFillController::AddKeyListener(nsIDOMHTMLInputElement *aInput)
     nsCOMPtr<nsIDOMEventTarget> target = do_QueryInterface(aInput);
 
     target->AddEventListener(NS_LITERAL_STRING("keypress"),
-                             NS_STATIC_CAST(nsIDOMKeyListener *, this),
+                             static_cast<nsIDOMKeyListener *>(this),
                              PR_TRUE);
   }
 
@@ -1079,7 +1079,7 @@ nsFormFillController::RemoveKeyListener()
     nsCOMPtr<nsIDOMEventTarget> target = do_QueryInterface(mFocusedInput);
 
     target->RemoveEventListener(NS_LITERAL_STRING("keypress"),
-                                NS_STATIC_CAST(nsIDOMKeyListener *, this),
+                                static_cast<nsIDOMKeyListener *>(this),
                                 PR_TRUE);
 }
 
diff --git a/mozilla/toolkit/components/satchel/src/nsStorageFormHistory.cpp b/mozilla/toolkit/components/satchel/src/nsStorageFormHistory.cpp
index 65c05c3a69e..34a5a480ccb 100644
--- a/mozilla/toolkit/components/satchel/src/nsStorageFormHistory.cpp
+++ b/mozilla/toolkit/components/satchel/src/nsStorageFormHistory.cpp
@@ -602,7 +602,7 @@ nsFormHistory::AutoCompleteSearch(const nsAString &aInputName,
     NS_ENSURE_TRUE(fhResult, NS_ERROR_OUT_OF_MEMORY);
     nsresult rv = fhResult->Init();
     NS_ENSURE_SUCCESS(rv, rv);
-    NS_REINTERPRET_CAST(nsCOMPtr<nsIAutoCompleteSimpleResult>*, &fhResult)->swap(result);
+    reinterpret_cast<nsCOMPtr<nsIAutoCompleteSimpleResult>*>(&fhResult)->swap(result);
 
     result->SetSearchString(aInputValue);
 
@@ -692,8 +692,8 @@ nsFormHistoryImporter::AddToFormHistoryCB(const nsCSubstring &aRowID,
                                           const nsTArray<nsCString> *aValues,
                                           void *aData)
 {
-  FormHistoryImportClosure *data = NS_STATIC_CAST(FormHistoryImportClosure*,
-                                                  aData);
+  FormHistoryImportClosure *data = static_cast<FormHistoryImportClosure*>
+                                              (aData);
   const nsMorkReader *reader = data->reader;
   nsCString values[kColumnCount];
   const PRUnichar* valueStrings[kColumnCount];
@@ -726,11 +726,11 @@ nsFormHistoryImporter::AddToFormHistoryCB(const nsCSubstring &aRowID,
 
       // Swap the bytes in the unicode characters if necessary.
       if (data->swapBytes) {
-        SwapBytes(NS_REINTERPRET_CAST(PRUnichar*, values[i].BeginWriting()));
+        SwapBytes(reinterpret_cast<PRUnichar*>(values[i].BeginWriting()));
       }
       bytes = values[i].get();
     }
-    valueStrings[i] = NS_REINTERPRET_CAST(const PRUnichar*, bytes);
+    valueStrings[i] = reinterpret_cast<const PRUnichar*>(bytes);
     valueLengths[i] = length;
   }
 
diff --git a/mozilla/toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp b/mozilla/toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp
index e94e42b012f..d12c934af4e 100755
--- a/mozilla/toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp
+++ b/mozilla/toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp
@@ -1190,7 +1190,7 @@ nsTypeAheadFind::IsRangeVisible(nsIPresShell *aPresShell,
     frameTraversal->Next();
     nsISupports* currentItem;
     frameTraversal->CurrentItem(&currentItem);
-    frame = NS_STATIC_CAST(nsIFrame*, currentItem);
+    frame = static_cast<nsIFrame*>(currentItem);
     if (!frame)
       return PR_FALSE;
 
diff --git a/mozilla/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp b/mozilla/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp
index dc011b56ac5..9a90729c3e0 100644
--- a/mozilla/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp
+++ b/mozilla/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp
@@ -109,7 +109,7 @@ Rot13Line(nsCString &line)
   line.BeginWriting(start);
   line.EndWriting(end);
   while (start != end) {
-    *start = kRot13Table[NS_STATIC_CAST(PRInt32, *start)];
+    *start = kRot13Table[static_cast<PRInt32>(*start)];
     ++start;
   }
 }
diff --git a/mozilla/toolkit/components/url-classifier/src/nsUrlClassifierUtils.cpp b/mozilla/toolkit/components/url-classifier/src/nsUrlClassifierUtils.cpp
index 5d4a20a2676..01e62271365 100644
--- a/mozilla/toolkit/components/url-classifier/src/nsUrlClassifierUtils.cpp
+++ b/mozilla/toolkit/components/url-classifier/src/nsUrlClassifierUtils.cpp
@@ -41,7 +41,7 @@
 static char int_to_hex_digit(PRInt32 i)
 {
   NS_ASSERTION((i >= 0) && (i <= 15), "int too big in int_to_hex_digit");
-  return NS_STATIC_CAST(char, ((i < 10) ? (i + '0') : ((i - 10) + 'A')));
+  return static_cast<char>(((i < 10) ? (i + '0') : ((i - 10) + 'A')));
 }
 
 nsUrlClassifierUtils::nsUrlClassifierUtils() : mEscapeCharmap(nsnull)
@@ -85,7 +85,7 @@ nsUrlClassifierUtils::EscapeHostname(const nsACString & hostname,
   const char* curChar = hostname.BeginReading();
   const char* end = hostname.EndReading();
   while (curChar != end) {
-    unsigned char c = NS_STATIC_CAST(unsigned char, *curChar);
+    unsigned char c = static_cast<unsigned char>(*curChar);
     if (mEscapeCharmap->Contains(c)) {
       _retval.Append('%');
       _retval.Append(int_to_hex_digit(c / 16));
@@ -113,7 +113,7 @@ nsUrlClassifierUtils::SpecialEncode(const nsACString & url, nsACString & _retval
   const char* end = url.EndReading();
 
   while (curChar != end) {
-    unsigned char c = NS_STATIC_CAST(unsigned char, *curChar);
+    unsigned char c = static_cast<unsigned char>(*curChar);
     if (ShouldURLEscape(c)) {
       // We don't want to deal with 0, as it can break certain strings, just
       // encode as one.
diff --git a/mozilla/toolkit/components/url-classifier/tests/TestUrlClassifierUtils.cpp b/mozilla/toolkit/components/url-classifier/tests/TestUrlClassifierUtils.cpp
index 73190b76af0..ff6e8c07273 100644
--- a/mozilla/toolkit/components/url-classifier/tests/TestUrlClassifierUtils.cpp
+++ b/mozilla/toolkit/components/url-classifier/tests/TestUrlClassifierUtils.cpp
@@ -45,7 +45,7 @@ static int gPassedTests = 0;
 
 static char int_to_hex_digit(PRInt32 i) {
   NS_ASSERTION((i >= 0) && (i <= 15), "int too big in int_to_hex_digit");
-  return NS_STATIC_CAST(char, ((i < 10) ? (i + '0') : ((i - 10) + 'A')));
+  return static_cast<char>(((i < 10) ? (i + '0') : ((i - 10) + 'A')));
 }
 
 static void CheckEquals(nsCString & expected, nsCString & actual)
@@ -85,7 +85,7 @@ void TestUnescape()
     allCharsEncodedLowercase.Append(tolower(int_to_hex_digit(i / 16)));
     allCharsEncodedLowercase.Append(tolower(int_to_hex_digit(i % 16)));
     
-    allCharsAsString.Append(NS_STATIC_CAST(char, i));
+    allCharsAsString.Append(static_cast<char>(i));
   }
   
   nsUrlClassifierUtils utils;
@@ -131,7 +131,7 @@ void TestEnc()
   nsCString noenc;
   for (PRInt32 i = 33; i < 127; i++) {
     if (i != 37) {                      // skip %
-      noenc.Append(NS_STATIC_CAST(char, i));
+      noenc.Append(static_cast<char>(i));
     }
   }
   nsUrlClassifierUtils utils;
@@ -143,7 +143,7 @@ void TestEnc()
   nsCString yesAsString, yesExpectedString;
   for (PRInt32 i = 1; i < 256; i++) {
     if (i < 33 || i == 37 || i > 126) {
-      yesAsString.Append(NS_STATIC_CAST(char, i));
+      yesAsString.Append(static_cast<char>(i));
       yesExpectedString.Append('%');
       yesExpectedString.Append(int_to_hex_digit(i / 16));
       yesExpectedString.Append(int_to_hex_digit(i % 16));
diff --git a/mozilla/toolkit/profile/src/nsToolkitProfileService.cpp b/mozilla/toolkit/profile/src/nsToolkitProfileService.cpp
index bca0d49df75..a6e4ce13b18 100644
--- a/mozilla/toolkit/profile/src/nsToolkitProfileService.cpp
+++ b/mozilla/toolkit/profile/src/nsToolkitProfileService.cpp
@@ -555,7 +555,7 @@ nsToolkitProfileService::SetSelectedProfile(nsIToolkitProfile* aProfile)
 {
     if (mChosen != aProfile) {
         // XXXbz Why is this cast OK?
-        mChosen = NS_STATIC_CAST(nsToolkitProfile*, aProfile);
+        mChosen = static_cast<nsToolkitProfile*>(aProfile);
         mDirty = PR_TRUE;
     }
     return NS_OK;
diff --git a/mozilla/toolkit/system/dbus/nsDBusService.cpp b/mozilla/toolkit/system/dbus/nsDBusService.cpp
index 06b6abce015..200400bb88a 100644
--- a/mozilla/toolkit/system/dbus/nsDBusService.cpp
+++ b/mozilla/toolkit/system/dbus/nsDBusService.cpp
@@ -116,7 +116,7 @@ PRBool nsDBusService::HandleMessage(DBusMessage* message) {
 static DBusHandlerResult dbus_filter(DBusConnection* connection,
                                      DBusMessage* message,
                                      void* user_data) {
-  return NS_STATIC_CAST(nsDBusService*, user_data)->HandleMessage(message)
+  return static_cast<nsDBusService*>(user_data)->HandleMessage(message)
     ? DBUS_HANDLER_RESULT_HANDLED : DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
@@ -131,7 +131,7 @@ void nsDBusService::DoTimerCallback(nsITimer *aTimer) {
 }
 
 static void TimerCallback(nsITimer *aTimer, void *aClosure) {
-  NS_STATIC_CAST(nsDBusService*, aClosure)->DoTimerCallback(aTimer);
+  static_cast<nsDBusService*>(aClosure)->DoTimerCallback(aTimer);
 }
 
 void nsDBusService::DropConnection() {
diff --git a/mozilla/toolkit/system/dbus/nsNetworkManagerListener.cpp b/mozilla/toolkit/system/dbus/nsNetworkManagerListener.cpp
index f4bcd56daa8..12b18fff5d2 100644
--- a/mozilla/toolkit/system/dbus/nsNetworkManagerListener.cpp
+++ b/mozilla/toolkit/system/dbus/nsNetworkManagerListener.cpp
@@ -108,7 +108,7 @@ NetworkStatusNotify(DBusPendingCall *pending, void* user_data) {
   if (!msg)
     return;
   if (dbus_message_get_type(msg) == DBUS_MESSAGE_TYPE_METHOD_RETURN) {
-    NS_STATIC_CAST(nsNetworkManagerListener*, user_data)->UpdateNetworkStatus(msg);
+    static_cast<nsNetworkManagerListener*>(user_data)->UpdateNetworkStatus(msg);
   }
   dbus_message_unref(msg);
 }
@@ -161,7 +161,7 @@ nsNetworkManagerListener::NotifyNetworkStatusObservers() {
     status = NS_LITERAL_STRING(NS_NETWORK_LINK_DATA_UNKNOWN).get();
   }
 
-  observerService->NotifyObservers(NS_STATIC_CAST(nsISupports*, this),
+  observerService->NotifyObservers(static_cast<nsISupports*>(this),
                                    NS_NETWORK_LINK_TOPIC, status);
 }
 
diff --git a/mozilla/toolkit/xre/nsAppData.cpp b/mozilla/toolkit/xre/nsAppData.cpp
index 77f3585ea17..492b705ae42 100644
--- a/mozilla/toolkit/xre/nsAppData.cpp
+++ b/mozilla/toolkit/xre/nsAppData.cpp
@@ -44,7 +44,7 @@
 void
 SetAllocatedString(const char *&str, const char *newvalue)
 {
-  NS_Free(NS_CONST_CAST(char*, str));
+  NS_Free(const_cast<char*>(str));
   if (newvalue) {
     str = NS_strdup(newvalue);
   }
@@ -56,7 +56,7 @@ SetAllocatedString(const char *&str, const char *newvalue)
 void
 SetAllocatedString(const char *&str, const nsACString &newvalue)
 {
-  NS_Free(NS_CONST_CAST(char*, str));
+  NS_Free(const_cast<char*>(str));
   if (newvalue.IsEmpty()) {
     str = nsnull;
   }
@@ -243,6 +243,6 @@ XRE_FreeAppData(nsXREAppData *aAppData)
     return;
   }
 
-  ScopedAppData* sad = NS_STATIC_CAST(ScopedAppData*, aAppData);
+  ScopedAppData* sad = static_cast<ScopedAppData*>(aAppData);
   delete sad;
 }
diff --git a/mozilla/toolkit/xre/nsAppRunner.cpp b/mozilla/toolkit/xre/nsAppRunner.cpp
index a1ff71f6829..5475b7c3ac3 100644
--- a/mozilla/toolkit/xre/nsAppRunner.cpp
+++ b/mozilla/toolkit/xre/nsAppRunner.cpp
@@ -753,7 +753,7 @@ static NS_METHOD AppInfoConstructor(nsISupports* aOuter,
 {
   NS_ENSURE_NO_AGGREGATION(aOuter);
 
-  return NS_CONST_CAST(nsXULAppInfo*, &kAppInfo)->
+  return const_cast<nsXULAppInfo*>(&kAppInfo)->
     QueryInterface(aIID, aResult);
 }
 
@@ -2196,7 +2196,7 @@ static nsGTKToolkit* GetGTKToolkit()
   nsIToolkit* toolkit = widget->GetToolkit();
   if (!toolkit)
     return nsnull;
-  return NS_STATIC_CAST(nsGTKToolkit*, toolkit);
+  return static_cast<nsGTKToolkit*>(toolkit);
 }
 
 #endif
diff --git a/mozilla/toolkit/xre/nsNativeAppSupportWin.cpp b/mozilla/toolkit/xre/nsNativeAppSupportWin.cpp
index 81ccd9ed522..d1b8b633c25 100644
--- a/mozilla/toolkit/xre/nsNativeAppSupportWin.cpp
+++ b/mozilla/toolkit/xre/nsNativeAppSupportWin.cpp
@@ -709,7 +709,7 @@ nsNativeAppSupportWin::Start( PRBool *aResult ) {
 PRBool
 nsNativeAppSupportWin::InitTopicStrings() {
     for ( int i = 0; i < topicCount; i++ ) {
-        if ( !( mTopics[ i ] = DdeCreateStringHandle( mInstance, NS_CONST_CAST(char *,topicNames[ i ]), CP_WINANSI ) ) ) {
+        if ( !( mTopics[ i ] = DdeCreateStringHandle( mInstance, const_cast<char *>(topicNames[ i ]), CP_WINANSI ) ) ) {
             return PR_FALSE;
         }
     }
diff --git a/mozilla/uriloader/base/nsDocLoader.cpp b/mozilla/uriloader/base/nsDocLoader.cpp
index 93a36f65928..6ceccc2108e 100644
--- a/mozilla/uriloader/base/nsDocLoader.cpp
+++ b/mozilla/uriloader/base/nsDocLoader.cpp
@@ -234,7 +234,7 @@ NS_INTERFACE_MAP_BEGIN(nsDocLoader)
    NS_INTERFACE_MAP_ENTRY(nsISecurityEventSink)
    NS_INTERFACE_MAP_ENTRY(nsISupportsPriority)
    if (aIID.Equals(kThisImplCID))
-     foundInterface = NS_STATIC_CAST(nsIDocumentLoader *, this);
+     foundInterface = static_cast<nsIDocumentLoader *>(this);
    else
 NS_INTERFACE_MAP_END
 
@@ -375,7 +375,7 @@ nsDocLoader::IsBusy()
 
     // This is a safe cast, because we only put nsDocLoader objects into the
     // array
-    if (loader && NS_STATIC_CAST(nsDocLoader*, loader)->IsBusy())
+    if (loader && static_cast<nsDocLoader*>(loader)->IsBusy())
       return PR_TRUE;
   }
 
@@ -385,7 +385,7 @@ nsDocLoader::IsBusy()
 NS_IMETHODIMP
 nsDocLoader::GetContainer(nsISupports** aResult)
 {
-   NS_ADDREF(*aResult = NS_STATIC_CAST(nsIDocumentLoader*, this));
+   NS_ADDREF(*aResult = static_cast<nsIDocumentLoader*>(this));
 
    return NS_OK;
 }
@@ -422,7 +422,7 @@ nsDocLoader::Destroy()
   PRInt32 count = mListenerInfoList.Count();
   for(PRInt32 i = 0; i < count; i++) {
     nsListenerInfo *info =
-      NS_STATIC_CAST(nsListenerInfo*, mListenerInfoList.ElementAt(i));
+      static_cast<nsListenerInfo*>(mListenerInfoList.ElementAt(i));
 
     delete info;
   }
@@ -454,7 +454,7 @@ nsDocLoader::DestroyChildren()
     if (loader) {
       // This is a safe cast, as we only put nsDocLoader objects into the
       // array
-      NS_STATIC_CAST(nsDocLoader*, loader)->SetDocLoaderParent(nsnull);
+      static_cast<nsDocLoader*>(loader)->SetDocLoaderParent(nsnull);
     }
   }
   mChildList.Clear();
@@ -1143,7 +1143,7 @@ void nsDocLoader::FireOnProgressChange(nsDocLoader *aLoadInitiator,
   while (--count >= 0) {
     nsListenerInfo *info;
 
-    info = NS_STATIC_CAST(nsListenerInfo*,mListenerInfoList.SafeElementAt(count));
+    info = static_cast<nsListenerInfo*>(mListenerInfoList.SafeElementAt(count));
     if (!info || !(info->mNotifyMask & nsIWebProgress::NOTIFY_PROGRESS)) {
       continue;
     }
@@ -1219,7 +1219,7 @@ void nsDocLoader::FireOnStateChange(nsIWebProgress *aProgress,
   while (--count >= 0) {
     nsListenerInfo *info;
 
-    info = NS_STATIC_CAST(nsListenerInfo*,mListenerInfoList.SafeElementAt(count));
+    info = static_cast<nsListenerInfo*>(mListenerInfoList.SafeElementAt(count));
     if (!info || !(info->mNotifyMask & (aStateFlags >>16))) {
       continue;
     }
@@ -1262,7 +1262,7 @@ nsDocLoader::FireOnLocationChange(nsIWebProgress* aWebProgress,
   while (--count >= 0) {
     nsListenerInfo *info;
 
-    info = NS_STATIC_CAST(nsListenerInfo*,mListenerInfoList.SafeElementAt(count));
+    info = static_cast<nsListenerInfo*>(mListenerInfoList.SafeElementAt(count));
     if (!info || !(info->mNotifyMask & nsIWebProgress::NOTIFY_LOCATION)) {
       continue;
     }
@@ -1304,7 +1304,7 @@ nsDocLoader::FireOnStatusChange(nsIWebProgress* aWebProgress,
   while (--count >= 0) {
     nsListenerInfo *info;
 
-    info = NS_STATIC_CAST(nsListenerInfo*,mListenerInfoList.SafeElementAt(count));
+    info = static_cast<nsListenerInfo*>(mListenerInfoList.SafeElementAt(count));
     if (!info || !(info->mNotifyMask & nsIWebProgress::NOTIFY_STATUS)) {
       continue;
     }
@@ -1348,7 +1348,7 @@ nsDocLoader::RefreshAttempted(nsIWebProgress* aWebProgress,
   while (--count >= 0) {
     nsListenerInfo *info;
 
-    info = NS_STATIC_CAST(nsListenerInfo*,mListenerInfoList.SafeElementAt(count));
+    info = static_cast<nsListenerInfo*>(mListenerInfoList.SafeElementAt(count));
     if (!info || !(info->mNotifyMask & nsIWebProgress::NOTIFY_REFRESH)) {
       continue;
     }
@@ -1396,7 +1396,7 @@ nsDocLoader::GetListenerInfo(nsIWebProgressListener *aListener)
   nsCOMPtr<nsISupports> listener1 = do_QueryInterface(aListener);
   count = mListenerInfoList.Count();
   for (i=0; i<count; i++) {
-    info = NS_STATIC_CAST(nsListenerInfo* ,mListenerInfoList.SafeElementAt(i));
+    info = static_cast<nsListenerInfo*>(mListenerInfoList.SafeElementAt(i));
 
     NS_ASSERTION(info, "There should NEVER be a null listener in the list");
     if (info) {
@@ -1420,8 +1420,8 @@ nsresult nsDocLoader::AddRequestInfo(nsIRequest *aRequest)
 nsRequestInfo * nsDocLoader::GetRequestInfo(nsIRequest *aRequest)
 {
   nsRequestInfo *info =
-    NS_STATIC_CAST(nsRequestInfo *,
-                   PL_DHashTableOperate(&mRequestInfoHash, aRequest,
+    static_cast<nsRequestInfo *>
+               (PL_DHashTableOperate(&mRequestInfoHash, aRequest,
                                         PL_DHASH_LOOKUP));
 
   if (PL_DHASH_ENTRY_IS_FREE(info)) {
@@ -1460,8 +1460,8 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 CalcMaxProgressCallback(PLDHashTable *table, PLDHashEntryHdr *hdr,
                         PRUint32 number, void *arg)
 {
-  const nsRequestInfo *info = NS_STATIC_CAST(const nsRequestInfo *, hdr);
-  nsInt64 *max = NS_STATIC_CAST(nsInt64 *, arg);
+  const nsRequestInfo *info = static_cast<const nsRequestInfo *>(hdr);
+  nsInt64 *max = static_cast<nsInt64 *>(arg);
 
   if (info->mMaxProgress < info->mCurrentProgress) {
     *max = nsInt64(-1);
@@ -1532,7 +1532,7 @@ NS_IMETHODIMP nsDocLoader::OnSecurityChange(nsISupports * aContext,
   //
   
   nsCOMPtr<nsIRequest> request = do_QueryInterface(aContext);
-  nsIWebProgress* webProgress = NS_STATIC_CAST(nsIWebProgress*, this);
+  nsIWebProgress* webProgress = static_cast<nsIWebProgress*>(this);
 
   /*                                                                           
    * First notify any listeners of the new state info...
@@ -1546,7 +1546,7 @@ NS_IMETHODIMP nsDocLoader::OnSecurityChange(nsISupports * aContext,
   while (--count >= 0) {
     nsListenerInfo *info;
 
-    info = NS_STATIC_CAST(nsListenerInfo*,mListenerInfoList.SafeElementAt(count));
+    info = static_cast<nsListenerInfo*>(mListenerInfoList.SafeElementAt(count));
     if (!info || !(info->mNotifyMask & nsIWebProgress::NOTIFY_SECURITY)) {
       continue;
     }
@@ -1603,7 +1603,7 @@ NS_IMETHODIMP nsDocLoader::SetPriority(PRInt32 aPriority)
 
   nsDocLoader *loader;
   for (PRInt32 i=0; i < count; i++) {
-    loader = NS_STATIC_CAST(nsDocLoader*, ChildAt(i));
+    loader = static_cast<nsDocLoader*>(ChildAt(i));
     if (loader) {
       loader->SetPriority(aPriority);
     }
@@ -1625,7 +1625,7 @@ NS_IMETHODIMP nsDocLoader::AdjustPriority(PRInt32 aDelta)
 
   nsDocLoader *loader;
   for (PRInt32 i=0; i < count; i++) {
-    loader = NS_STATIC_CAST(nsDocLoader*, ChildAt(i));
+    loader = static_cast<nsDocLoader*>(ChildAt(i));
     if (loader) {
       loader->AdjustPriority(aDelta);
     }
diff --git a/mozilla/uriloader/base/nsDocLoader.h b/mozilla/uriloader/base/nsDocLoader.h
index acbb6f852d9..66cb2a14a58 100644
--- a/mozilla/uriloader/base/nsDocLoader.h
+++ b/mozilla/uriloader/base/nsDocLoader.h
@@ -96,7 +96,7 @@ public:
     static already_AddRefed<nsDocLoader> GetAsDocLoader(nsISupports* aSupports);
     // Needed to deal with ambiguous inheritance from nsISupports...
     static nsISupports* GetAsSupports(nsDocLoader* aDocLoader) {
-        return NS_STATIC_CAST(nsIDocumentLoader*, aDocLoader);
+        return static_cast<nsIDocumentLoader*>(aDocLoader);
     }
 
     // Add aDocLoader as a child to the docloader service.
@@ -139,11 +139,11 @@ protected:
     virtual void DestroyChildren();
 
     nsIDocumentLoader* ChildAt(PRInt32 i) {
-        return NS_STATIC_CAST(nsDocLoader*, mChildList[i]);
+        return static_cast<nsDocLoader*>(mChildList[i]);
     }
 
     nsIDocumentLoader* SafeChildAt(PRInt32 i) {
-        return NS_STATIC_CAST(nsDocLoader*, mChildList.SafeElementAt(i));
+        return static_cast<nsDocLoader*>(mChildList.SafeElementAt(i));
     }
 
     void FireOnProgressChange(nsDocLoader* aLoadInitiator,
diff --git a/mozilla/uriloader/exthandler/mac/nsOSHelperAppService.cpp b/mozilla/uriloader/exthandler/mac/nsOSHelperAppService.cpp
index 1d69c3247a5..049ffcbd625 100644
--- a/mozilla/uriloader/exthandler/mac/nsOSHelperAppService.cpp
+++ b/mozilla/uriloader/exthandler/mac/nsOSHelperAppService.cpp
@@ -285,7 +285,7 @@ nsOSHelperAppService::GetMIMEInfoFromOS(const nsACString& aMIMEType,
       if (miByExt && !aMIMEType.IsEmpty()) {
         // XXX see XXX comment below
         nsIMIMEInfo* pByExt = miByExt.get();
-        nsMIMEInfoBase* byExt = NS_STATIC_CAST(nsMIMEInfoBase*, pByExt);
+        nsMIMEInfoBase* byExt = static_cast<nsMIMEInfoBase*>(pByExt);
         byExt->SetMIMEType(aMIMEType);
       }
     }
@@ -302,8 +302,8 @@ nsOSHelperAppService::GetMIMEInfoFromOS(const nsACString& aMIMEType,
       // nsDerivedSafe thingy that can't be cast to nsMIMEInfoBase*
       nsIMIMEInfo* pByType = miByType.get();
       nsIMIMEInfo* pByExt = miByExt.get();
-      nsMIMEInfoBase* byType = NS_STATIC_CAST(nsMIMEInfoBase*, pByType);
-      nsMIMEInfoBase* byExt = NS_STATIC_CAST(nsMIMEInfoBase*, pByExt);
+      nsMIMEInfoBase* byType = static_cast<nsMIMEInfoBase*>(pByType);
+      nsMIMEInfoBase* byExt = static_cast<nsMIMEInfoBase*>(pByExt);
       if (!byType || !byExt) {
         NS_ERROR("IC gave us an nsIMIMEInfo that's no nsMIMEInfoBase! Fix nsOSHelperAppService.");
         return nsnull;
diff --git a/mozilla/uriloader/prefetch/nsPrefetchService.cpp b/mozilla/uriloader/prefetch/nsPrefetchService.cpp
index 70573dca704..01e09b42e09 100644
--- a/mozilla/uriloader/prefetch/nsPrefetchService.cpp
+++ b/mozilla/uriloader/prefetch/nsPrefetchService.cpp
@@ -219,7 +219,7 @@ nsPrefetchListener::GetInterface(const nsIID &aIID, void **aResult)
 {
     if (aIID.Equals(NS_GET_IID(nsIChannelEventSink))) {
         NS_ADDREF_THIS();
-        *aResult = NS_STATIC_CAST(nsIChannelEventSink *, this);
+        *aResult = static_cast<nsIChannelEventSink *>(this);
         return NS_OK;
     }
 
diff --git a/mozilla/view/public/nsIView.h b/mozilla/view/public/nsIView.h
index 5a2933e5ddc..25fd94f7fee 100644
--- a/mozilla/view/public/nsIView.h
+++ b/mozilla/view/public/nsIView.h
@@ -131,7 +131,7 @@ public:
    * @result the view manager
    */
   nsIViewManager* GetViewManager() const
-  { return NS_REINTERPRET_CAST(nsIViewManager*, mViewManager); }
+  { return reinterpret_cast<nsIViewManager*>(mViewManager); }
 
   /**
    * Destroy the view.
@@ -224,19 +224,19 @@ public:
    * Called to query the parent of the view.
    * @result view's parent
    */
-  nsIView* GetParent() const { return NS_REINTERPRET_CAST(nsIView*, mParent); }
+  nsIView* GetParent() const { return reinterpret_cast<nsIView*>(mParent); }
 
   /**
    * The view's first child is the child which is earliest in document order.
    * @result first child
    */
-  nsIView* GetFirstChild() const { return NS_REINTERPRET_CAST(nsIView*, mFirstChild); }
+  nsIView* GetFirstChild() const { return reinterpret_cast<nsIView*>(mFirstChild); }
 
   /**
    * Called to query the next sibling of the view.
    * @result view's next sibling
    */
-  nsIView* GetNextSibling() const { return NS_REINTERPRET_CAST(nsIView*, mNextSibling); }
+  nsIView* GetNextSibling() const { return reinterpret_cast<nsIView*>(mNextSibling); }
 
   /**
    * Set the view's link to client owned data.
diff --git a/mozilla/view/src/nsScrollPortView.cpp b/mozilla/view/src/nsScrollPortView.cpp
index a90977717a2..c3744a68854 100644
--- a/mozilla/view/src/nsScrollPortView.cpp
+++ b/mozilla/view/src/nsScrollPortView.cpp
@@ -714,7 +714,7 @@ PRBool nsScrollPortView::IsSmoothScrollingEnabled() {
 void
 nsScrollPortView::SmoothScrollAnimationCallback (nsITimer *aTimer, void* anInstance) 
 {
-  nsScrollPortView* self = NS_STATIC_CAST(nsScrollPortView*, anInstance);
+  nsScrollPortView* self = static_cast<nsScrollPortView*>(anInstance);
   if (self) {
     self->IncrementalScroll();
   }
diff --git a/mozilla/view/src/nsView.cpp b/mozilla/view/src/nsView.cpp
index 7d1790f02e6..ddba3570710 100644
--- a/mozilla/view/src/nsView.cpp
+++ b/mozilla/view/src/nsView.cpp
@@ -96,7 +96,7 @@ NS_IMETHODIMP ViewWrapper::QueryInterface(REFNSIID aIID, void** aInstancePtr)
   *aInstancePtr = nsnull;
   
   if (aIID.Equals(NS_GET_IID(nsISupports))) {
-    *aInstancePtr = NS_STATIC_CAST(nsISupports*, this);
+    *aInstancePtr = static_cast<nsISupports*>(this);
   }
   else if (aIID.Equals(NS_GET_IID(ViewWrapper))) {
     *aInstancePtr = this;
@@ -609,7 +609,7 @@ nsresult nsIView::CreateWidget(const nsIID &aWindowIID,
     NS_RELEASE(mWindow);
   }
 
-  nsView* v = NS_STATIC_CAST(nsView*, this);
+  nsView* v = static_cast<nsView*>(this);
 
   nsRect trect = v->CalcWidgetBounds(aWidgetInitData
                                      ? aWidgetInitData->mWindowType
@@ -745,7 +745,7 @@ void nsIView::List(FILE* out, PRInt32 aIndent) const
   nsRect brect = GetBounds();
   fprintf(out, "{%d,%d,%d,%d}",
           brect.x, brect.y, brect.width, brect.height);
-  const nsView* v = NS_STATIC_CAST(const nsView*, this);
+  const nsView* v = static_cast<const nsView*>(this);
   fprintf(out, " z=%d vis=%d clientData=%p <\n",
           mZIndex, mVis, mClientData);
   for (nsView* kid = mFirstChild; kid; kid = kid->GetNextSibling()) {
@@ -801,7 +801,7 @@ nsIWidget* nsIView::GetNearestWidget(nsPoint* aOffset) const
 {
   nsPoint pt(0, 0);
   const nsView* v;
-  for (v = NS_STATIC_CAST(const nsView*, this);
+  for (v = static_cast<const nsView*>(this);
        v && !v->HasWidget(); v = v->GetParent()) {
     pt += v->GetPosition();
   }
@@ -809,7 +809,7 @@ nsIWidget* nsIView::GetNearestWidget(nsPoint* aOffset) const
     if (aOffset) {
       *aOffset = pt;
     }
-    return NS_STATIC_CAST(const nsView*, this)->GetViewManager()->GetWidget();
+    return static_cast<const nsView*>(this)->GetViewManager()->GetWidget();
   }
 
   // pt is now the offset from v's origin to this's origin
diff --git a/mozilla/view/src/nsView.h b/mozilla/view/src/nsView.h
index 5ffbd93a002..4c03be7eed3 100644
--- a/mozilla/view/src/nsView.h
+++ b/mozilla/view/src/nsView.h
@@ -109,7 +109,7 @@ public:
 
   // Helper function to get the view that's associated with a widget
   static nsView* GetViewFor(nsIWidget* aWidget) {
-    return NS_STATIC_CAST(nsView*, nsIView::GetViewFor(aWidget));
+    return static_cast<nsView*>(nsIView::GetViewFor(aWidget));
   }
 
   // Helper function to get mouse grabbing off this view (by moving it to the
diff --git a/mozilla/view/src/nsViewManager.cpp b/mozilla/view/src/nsViewManager.cpp
index b6146051564..c89ce7d9be1 100644
--- a/mozilla/view/src/nsViewManager.cpp
+++ b/mozilla/view/src/nsViewManager.cpp
@@ -283,7 +283,7 @@ nsViewManager::CreateView(const nsRect& aBounds,
     v->SetPosition(aBounds.x, aBounds.y);
     nsRect dim(0, 0, aBounds.width, aBounds.height);
     v->SetDimensions(dim, PR_FALSE);
-    v->SetParent(NS_STATIC_CAST(nsView*, NS_CONST_CAST(nsIView*, aParent)));
+    v->SetParent(static_cast<nsView*>(const_cast<nsIView*>(aParent)));
   }
   return v;
 }
@@ -297,7 +297,7 @@ nsViewManager::CreateScrollableView(const nsRect& aBounds,
     v->SetPosition(aBounds.x, aBounds.y);
     nsRect dim(0, 0, aBounds.width, aBounds.height);
     v->SetDimensions(dim, PR_FALSE);
-    v->SetParent(NS_STATIC_CAST(nsView*, NS_CONST_CAST(nsIView*, aParent)));
+    v->SetParent(static_cast<nsView*>(const_cast<nsIView*>(aParent)));
   }
   return v;
 }
@@ -310,7 +310,7 @@ NS_IMETHODIMP nsViewManager::GetRootView(nsIView *&aView)
 
 NS_IMETHODIMP nsViewManager::SetRootView(nsIView *aView)
 {
-  nsView* view = NS_STATIC_CAST(nsView*, aView);
+  nsView* view = static_cast<nsView*>(aView);
 
   NS_PRECONDITION(!view || view->GetViewManager() == this,
                   "Unexpected viewmanager on root view");
@@ -655,7 +655,7 @@ NS_IMETHODIMP nsViewManager::Composite()
 NS_IMETHODIMP nsViewManager::UpdateView(nsIView *aView, PRUint32 aUpdateFlags)
 {
   // Mark the entire view as damaged
-  nsView* view = NS_STATIC_CAST(nsView*, aView);
+  nsView* view = static_cast<nsView*>(aView);
 
   nsRect bounds = view->GetBounds();
   view->ConvertFromParentCoords(&bounds.x, &bounds.y);
@@ -858,7 +858,7 @@ NS_IMETHODIMP nsViewManager::UpdateView(nsIView *aView, const nsRect &aRect, PRU
 {
   NS_PRECONDITION(nsnull != aView, "null view");
 
-  nsView* view = NS_STATIC_CAST(nsView*, aView);
+  nsView* view = static_cast<nsView*>(aView);
 
   nsRect damagedRect(aRect);
 
@@ -967,7 +967,7 @@ NS_IMETHODIMP nsViewManager::DispatchEvent(nsGUIEvent *aEvent, nsEventStatus *aS
 
     case NS_PAINT:
       {
-        nsPaintEvent *event = NS_STATIC_CAST(nsPaintEvent*, aEvent);
+        nsPaintEvent *event = static_cast<nsPaintEvent*>(aEvent);
         nsView *view = nsView::GetViewFor(aEvent->widget);
 
         if (!view || !mContext)
@@ -1138,7 +1138,7 @@ NS_IMETHODIMP nsViewManager::DispatchEvent(nsGUIEvent *aEvent, nsEventStatus *aS
       {
         if ((NS_IS_MOUSE_EVENT(aEvent) &&
              // Ignore moves that we synthesize.
-             NS_STATIC_CAST(nsMouseEvent*,aEvent)->reason ==
+             static_cast<nsMouseEvent*>(aEvent)->reason ==
                nsMouseEvent::eReal &&
              // Ignore mouse exit and enter (we'll get moves if the user
              // is really moving the mouse) since we get them when we
@@ -1182,7 +1182,7 @@ NS_IMETHODIMP nsViewManager::DispatchEvent(nsGUIEvent *aEvent, nsEventStatus *aS
           PRInt32 p2a = mContext->AppUnitsPerDevPixel();
 
           if ((aEvent->message == NS_MOUSE_MOVE &&
-               NS_STATIC_CAST(nsMouseEvent*,aEvent)->reason ==
+               static_cast<nsMouseEvent*>(aEvent)->reason ==
                  nsMouseEvent::eReal) ||
               aEvent->message == NS_MOUSE_ENTER) {
             // aEvent->point is relative to the widget, i.e. the view top-left,
@@ -1303,7 +1303,7 @@ NS_IMETHODIMP nsViewManager::GrabMouseEvents(nsIView *aView, PRBool &aResult)
 
   // Along with nsView::SetVisibility, we enforce that the mouse grabber
   // can never be a hidden view.
-  if (aView && NS_STATIC_CAST(nsView*, aView)->GetVisibility()
+  if (aView && static_cast<nsView*>(aView)->GetVisibility()
                == nsViewVisibility_kHide) {
     aView = nsnull;
   }
@@ -1316,7 +1316,7 @@ NS_IMETHODIMP nsViewManager::GrabMouseEvents(nsIView *aView, PRBool &aResult)
   printf("removing mouse capture from view %x\n",mMouseGrabber);
 #endif
 
-  mMouseGrabber = NS_STATIC_CAST(nsView*, aView);
+  mMouseGrabber = static_cast<nsView*>(aView);
   aResult = PR_TRUE;
   return NS_OK;
 }
@@ -1351,7 +1351,7 @@ void nsViewManager::ReparentChildWidgets(nsIView* aView, nsIWidget *aNewWidget)
   // Need to check each of the views children to see
   // if they have a widget and reparent it.
 
-  nsView* view = NS_STATIC_CAST(nsView*, aView);
+  nsView* view = static_cast<nsView*>(aView);
   for (nsView *kid = view->GetFirstChild(); kid; kid = kid->GetNextSibling()) {
     ReparentChildWidgets(kid, aNewWidget);
   }
@@ -1371,7 +1371,7 @@ void nsViewManager::ReparentWidgets(nsIView* aView, nsIView *aParent)
   // a reinserting it into a new location in the view hierarchy do we
   // have to consider reparenting the existing widgets for the view and
   // it's descendants.
-  nsView* view = NS_STATIC_CAST(nsView*, aView);
+  nsView* view = static_cast<nsView*>(aView);
   if (view->HasWidget() || view->GetFirstChild()) {
     nsIWidget* parentWidget = aParent->GetNearestWidget(nsnull);
     if (parentWidget) {
@@ -1385,9 +1385,9 @@ void nsViewManager::ReparentWidgets(nsIView* aView, nsIView *aParent)
 NS_IMETHODIMP nsViewManager::InsertChild(nsIView *aParent, nsIView *aChild, nsIView *aSibling,
                                          PRBool aAfter)
 {
-  nsView* parent = NS_STATIC_CAST(nsView*, aParent);
-  nsView* child = NS_STATIC_CAST(nsView*, aChild);
-  nsView* sibling = NS_STATIC_CAST(nsView*, aSibling);
+  nsView* parent = static_cast<nsView*>(aParent);
+  nsView* child = static_cast<nsView*>(aChild);
+  nsView* sibling = static_cast<nsView*>(aSibling);
   
   NS_PRECONDITION(nsnull != parent, "null ptr");
   NS_PRECONDITION(nsnull != child, "null ptr");
@@ -1480,7 +1480,7 @@ NS_IMETHODIMP nsViewManager::InsertChild(nsIView *aParent, nsIView *aChild, PRIn
 
 NS_IMETHODIMP nsViewManager::RemoveChild(nsIView *aChild)
 {
-  nsView* child = NS_STATIC_CAST(nsView*, aChild);
+  nsView* child = static_cast<nsView*>(aChild);
   NS_ENSURE_ARG_POINTER(child);
 
   nsView* parent = child->GetParent();
@@ -1496,7 +1496,7 @@ NS_IMETHODIMP nsViewManager::RemoveChild(nsIView *aChild)
 
 NS_IMETHODIMP nsViewManager::MoveViewBy(nsIView *aView, nscoord aX, nscoord aY)
 {
-  nsView* view = NS_STATIC_CAST(nsView*, aView);
+  nsView* view = static_cast<nsView*>(aView);
 
   nsPoint pt = view->GetPosition();
   MoveViewTo(view, aX + pt.x, aY + pt.y);
@@ -1505,7 +1505,7 @@ NS_IMETHODIMP nsViewManager::MoveViewBy(nsIView *aView, nscoord aX, nscoord aY)
 
 NS_IMETHODIMP nsViewManager::MoveViewTo(nsIView *aView, nscoord aX, nscoord aY)
 {
-  nsView* view = NS_STATIC_CAST(nsView*, aView);
+  nsView* view = static_cast<nsView*>(aView);
   nsPoint oldPt = view->GetPosition();
   nsRect oldArea = view->GetBounds();
   view->SetPosition(aX, aY);
@@ -1554,7 +1554,7 @@ void nsViewManager::InvalidateRectDifference(nsView *aView, const nsRect& aRect,
 
 NS_IMETHODIMP nsViewManager::ResizeView(nsIView *aView, const nsRect &aRect, PRBool aRepaintExposedAreaOnly)
 {
-  nsView* view = NS_STATIC_CAST(nsView*, aView);
+  nsView* view = static_cast<nsView*>(aView);
   nsRect oldDimensions;
 
   view->GetDimensions(oldDimensions);
@@ -1628,7 +1628,7 @@ PRBool nsViewManager::CanScrollWithBitBlt(nsView* aView, nsPoint aDelta,
 
 NS_IMETHODIMP nsViewManager::SetViewFloating(nsIView *aView, PRBool aFloating)
 {
-  nsView* view = NS_STATIC_CAST(nsView*, aView);
+  nsView* view = static_cast<nsView*>(aView);
 
   NS_ASSERTION(!(nsnull == view), "no view");
 
@@ -1639,7 +1639,7 @@ NS_IMETHODIMP nsViewManager::SetViewFloating(nsIView *aView, PRBool aFloating)
 
 NS_IMETHODIMP nsViewManager::SetViewVisibility(nsIView *aView, nsViewVisibility aVisible)
 {
-  nsView* view = NS_STATIC_CAST(nsView*, aView);
+  nsView* view = static_cast<nsView*>(aView);
 
   if (aVisible != view->GetVisibility()) {
     view->SetVisibility(aVisible);
@@ -1706,7 +1706,7 @@ PRBool nsViewManager::IsViewInserted(nsView *aView)
 
 NS_IMETHODIMP nsViewManager::SetViewZIndex(nsIView *aView, PRBool aAutoZIndex, PRInt32 aZIndex, PRBool aTopMost)
 {
-  nsView* view = NS_STATIC_CAST(nsView*, aView);
+  nsView* view = static_cast<nsView*>(aView);
   nsresult  rv = NS_OK;
 
   NS_ASSERTION((view != nsnull), "no view");
@@ -1971,7 +1971,7 @@ nsresult nsViewManager::GetVisibleRect(nsRect& aVisibleRect)
   if (scrollingView) {   
     // Determine the visible rect in the scrolled view's coordinate space.
     // The size of the visible area is the clip view size
-    nsScrollPortView* clipView = NS_STATIC_CAST(nsScrollPortView*, scrollingView);
+    nsScrollPortView* clipView = static_cast<nsScrollPortView*>(scrollingView);
     clipView->GetDimensions(aVisibleRect);
 
     scrollingView->GetScrollPosition(aVisibleRect.x, aVisibleRect.y);
@@ -1994,7 +1994,7 @@ nsresult nsViewManager::GetAbsoluteRect(nsView *aView, const nsRect &aRect,
   nsIView* scrolledIView = nsnull;
   scrollingView->GetScrolledView(scrolledIView);
   
-  nsView* scrolledView = NS_STATIC_CAST(nsView*, scrolledIView);
+  nsView* scrolledView = static_cast<nsView*>(scrolledIView);
 
   // Calculate the absolute coordinates of the aRect passed in.
   // aRects values are relative to aView
@@ -2018,7 +2018,7 @@ NS_IMETHODIMP nsViewManager::GetRectVisibility(nsIView *aView,
                                                PRUint16 aMinTwips, 
                                                nsRectVisibility *aRectVisibility)
 {
-  nsView* view = NS_STATIC_CAST(nsView*, aView);
+  nsView* view = static_cast<nsView*>(aView);
 
   // The parameter aMinTwips determines how many rows/cols of pixels must be visible on each side of the element,
   // in order to be counted as visible
diff --git a/mozilla/widget/public/nsGUIEvent.h b/mozilla/widget/public/nsGUIEvent.h
index 87699f0031c..2746d6b5052 100644
--- a/mozilla/widget/public/nsGUIEvent.h
+++ b/mozilla/widget/public/nsGUIEvent.h
@@ -976,12 +976,12 @@ enum nsDragDropEventStatus {
 #define NS_IS_MOUSE_LEFT_CLICK(evnt) \
        ((evnt)->eventStructType == NS_MOUSE_EVENT && \
         (evnt)->message == NS_MOUSE_CLICK && \
-        NS_STATIC_CAST(nsMouseEvent*, (evnt))->button == nsMouseEvent::eLeftButton)
+        static_cast<nsMouseEvent*>((evnt))->button == nsMouseEvent::eLeftButton)
 
 #define NS_IS_CONTEXT_MENU_KEY(evnt) \
        ((evnt)->eventStructType == NS_MOUSE_EVENT && \
         (evnt)->message == NS_CONTEXTMENU && \
-        NS_STATIC_CAST(nsMouseEvent*, (evnt))->context == nsMouseEvent::eContextMenuKey)
+        static_cast<nsMouseEvent*>((evnt))->context == nsMouseEvent::eContextMenuKey)
 
 #define NS_IS_DRAG_EVENT(evnt) \
        (((evnt)->message == NS_DRAGDROP_ENTER) || \
diff --git a/mozilla/widget/src/beos/nsWindow.cpp b/mozilla/widget/src/beos/nsWindow.cpp
index b09cd5e1f9d..dbccd001863 100644
--- a/mozilla/widget/src/beos/nsWindow.cpp
+++ b/mozilla/widget/src/beos/nsWindow.cpp
@@ -1010,7 +1010,7 @@ void nsWindow::HideKids(PRBool state)
 {
 	for (nsIWidget* kid = mFirstChild; kid; kid = kid->GetNextSibling()) 
 	{
-		nsWindow *childWidget = NS_STATIC_CAST(nsWindow*, kid);
+		nsWindow *childWidget = static_cast<nsWindow*>(kid);
 		nsRect kidrect = ((nsWindow *)kid)->mBounds;
 		//Don't bother about invisible
 		if (mBounds.Intersects(kidrect))
@@ -1739,7 +1739,7 @@ NS_METHOD nsWindow::Scroll(PRInt32 aDx, PRInt32 aDy, nsRect *aClipRect)
 		// Time to silently move now invisible children
 		for (nsIWidget* kid = mFirstChild; kid; kid = kid->GetNextSibling()) 
 		{
-			nsWindow *childWidget = NS_STATIC_CAST(nsWindow*, kid);
+			nsWindow *childWidget = static_cast<nsWindow*>(kid);
 			// No need to Lock/UnlockLooper with GetBounds() and Move() methods
 			// using cached values and native MoveBy() instead
 			nsRect bounds = childWidget->mBounds;
@@ -1786,7 +1786,7 @@ bool nsWindow::CallMethod(MethodInfo *info)
 
 			for (nsIWidget* kid = mFirstChild; kid; kid = kid->GetNextSibling()) 
 			{
-				nsWindow *childWidget = NS_STATIC_CAST(nsWindow*, kid);
+				nsWindow *childWidget = static_cast<nsWindow*>(kid);
 				BWindow* kidwindow = (BWindow *)kid->GetNativeData(NS_NATIVE_WINDOW);
 				if (kidwindow)
 				{
diff --git a/mozilla/widget/src/cocoa/nsAppShell.mm b/mozilla/widget/src/cocoa/nsAppShell.mm
index 2b602925bc9..e431e7f01bd 100644
--- a/mozilla/widget/src/cocoa/nsAppShell.mm
+++ b/mozilla/widget/src/cocoa/nsAppShell.mm
@@ -252,7 +252,7 @@ nsAppShell::ScheduleNativeEventCallback()
 {
   NS_ADDREF(this);
 
-  void* self = NS_STATIC_CAST(void*, this);
+  void* self = static_cast<void*>(this);
   NSData* data = [[NSData alloc] initWithBytes:&self length:sizeof(this)];
   NSArray* components = [[NSArray alloc] initWithObjects:&data count:1];
 
@@ -387,8 +387,8 @@ nsAppShell::AfterProcessNextEvent(nsIThreadInternal *aThread,
   NS_ASSERTION(mAutoreleasePools && count,
                "Processed an event, but there's no autorelease pool?");
 
-  NSAutoreleasePool* pool = NS_STATIC_CAST(const NSAutoreleasePool*,
-                               ::CFArrayGetValueAtIndex(mAutoreleasePools,
+  NSAutoreleasePool* pool = static_cast<const NSAutoreleasePool*>
+                                       (::CFArrayGetValueAtIndex(mAutoreleasePools,
                                                         count - 1));
   ::CFArrayRemoveValueAtIndex(mAutoreleasePools, count - 1);
   [pool release];
@@ -432,7 +432,7 @@ nsAppShell::AfterProcessNextEvent(nsIThreadInternal *aThread,
 - (void)handlePortMessage:(NSPortMessage*)aPortMessage
 {
   NSData* data = [[aPortMessage components] objectAtIndex:0];
-  nsAppShell* appShell = *NS_STATIC_CAST(nsAppShell* const*,[data bytes]);
+  nsAppShell* appShell = *static_cast<nsAppShell* const*>([data bytes]);
   appShell->ProcessGeckoEvents();
 
   NS_RELEASE(appShell);
diff --git a/mozilla/widget/src/cocoa/nsChildView.mm b/mozilla/widget/src/cocoa/nsChildView.mm
index 3d725896bf1..d54aff86d1b 100644
--- a/mozilla/widget/src/cocoa/nsChildView.mm
+++ b/mozilla/widget/src/cocoa/nsChildView.mm
@@ -176,10 +176,10 @@ GeckoRectToNSRect(const nsRect & inGeckoRect, NSRect & outCocoaRect)
 static inline void
 NSRectToGeckoRect(const NSRect & inCocoaRect, nsRect & outGeckoRect)
 {
-  outGeckoRect.x = NS_STATIC_CAST(nscoord, inCocoaRect.origin.x);
-  outGeckoRect.y = NS_STATIC_CAST(nscoord, inCocoaRect.origin.y);
-  outGeckoRect.width = NS_STATIC_CAST(nscoord, inCocoaRect.size.width);
-  outGeckoRect.height = NS_STATIC_CAST(nscoord, inCocoaRect.size.height);
+  outGeckoRect.x = static_cast<nscoord>(inCocoaRect.origin.x);
+  outGeckoRect.y = static_cast<nscoord>(inCocoaRect.origin.y);
+  outGeckoRect.width = static_cast<nscoord>(inCocoaRect.size.width);
+  outGeckoRect.height = static_cast<nscoord>(inCocoaRect.size.height);
 }
 
 
@@ -335,7 +335,7 @@ nsChildView::~nsChildView()
 {
   // notify the children that we're gone
   for (nsIWidget* kid = mFirstChild; kid; kid = kid->GetNextSibling()) {
-    nsChildView* childView = NS_STATIC_CAST(nsChildView*, kid);
+    nsChildView* childView = static_cast<nsChildView*>(kid);
     childView->mParentWidget = nsnull;
   }
 
@@ -381,7 +381,7 @@ nsresult nsChildView::StandardCreate(nsIWidget *aParent,
     mParentWidget = aParent;   
   }
   else
-    mParentView = NS_REINTERPRET_CAST(NSView*,aNativeParent);
+    mParentView = reinterpret_cast<NSView*>(aNativeParent);
   
   // create our parallel NSView and hook it up to our parent. Recall
   // that NS_NATIVE_WIDGET is the NSView.
@@ -1145,7 +1145,7 @@ NS_IMETHODIMP nsChildView::InvalidateRegion(const nsIRegion *aRegion, PRBool aIs
   // FIXME rewrite to use a Cocoa region when nsIRegion isn't a QD Region
   NSRect r;
   nsRect bounds;
-  nsIRegion* region = NS_CONST_CAST(nsIRegion*, aRegion);     // ugh. this method should be const
+  nsIRegion* region = const_cast<nsIRegion*>(aRegion);     // ugh. this method should be const
   region->GetBoundingBox ( &bounds.x, &bounds.y, &bounds.width, &bounds.height );
   GeckoRectToNSRect(bounds, r);
   
@@ -1456,8 +1456,8 @@ NS_IMETHODIMP nsChildView::CalcOffset(PRInt32 &aX,PRInt32 &aY)
   aX = aY = 0;
   NSRect bounds = {{0, 0}, {0, 0}};
   bounds = [mView convertRect:bounds toView:nil];
-  aX += NS_STATIC_CAST(PRInt32, bounds.origin.x);
-  aY += NS_STATIC_CAST(PRInt32, bounds.origin.y);
+  aX += static_cast<PRInt32>(bounds.origin.x);
+  aY += static_cast<PRInt32>(bounds.origin.y);
 
   return NS_OK;
 }
@@ -1754,8 +1754,8 @@ nsChildView::DragEvent(PRUint32 aMessage, PRInt16 aMouseGlobalX, PRInt16 aMouseG
   FlipCocoaScreenCoordinate(localPoint);
   localPoint = [[mView window] convertScreenToBase:localPoint];
   localPoint = [mView convertPoint:localPoint fromView:nil];
-  geckoEvent.refPoint.x = NS_STATIC_CAST(nscoord, localPoint.x);
-  geckoEvent.refPoint.y = NS_STATIC_CAST(nscoord, localPoint.y);
+  geckoEvent.refPoint.x = static_cast<nscoord>(localPoint.x);
+  geckoEvent.refPoint.y = static_cast<nscoord>(localPoint.y);
 
   DispatchWindowEvent(geckoEvent);
 
@@ -1894,7 +1894,7 @@ NSEvent* globalDragEvent = nil;
 // mozView method, return our gecko child view widget. Note this does not AddRef.
 - (nsIWidget*) widget
 {
-  return NS_STATIC_CAST(nsIWidget*, mGeckoChild);
+  return static_cast<nsIWidget*>(mGeckoChild);
 }
 
 
@@ -3246,8 +3246,8 @@ static PRBool IsSpecialGeckoKey(UInt32 macKeyCode)
 
   // convert point to view coordinate system
   NSPoint localPoint = [self convertPoint:[aMouseEvent locationInWindow] fromView:nil];
-  outGeckoEvent->refPoint.x = NS_STATIC_CAST(nscoord, localPoint.x);
-  outGeckoEvent->refPoint.y = NS_STATIC_CAST(nscoord, localPoint.y);
+  outGeckoEvent->refPoint.x = static_cast<nscoord>(localPoint.x);
+  outGeckoEvent->refPoint.y = static_cast<nscoord>(localPoint.y);
 }
 
 
diff --git a/mozilla/widget/src/cocoa/nsCocoaWindow.mm b/mozilla/widget/src/cocoa/nsCocoaWindow.mm
index f4c9c50c31b..da8f6701790 100644
--- a/mozilla/widget/src/cocoa/nsCocoaWindow.mm
+++ b/mozilla/widget/src/cocoa/nsCocoaWindow.mm
@@ -106,7 +106,7 @@ nsCocoaWindow::~nsCocoaWindow()
 {
   // notify the children that we're gone
   for (nsIWidget* kid = mFirstChild; kid; kid = kid->GetNextSibling()) {
-    nsCocoaWindow* childWindow = NS_STATIC_CAST(nsCocoaWindow*, kid);
+    nsCocoaWindow* childWindow = static_cast<nsCocoaWindow*>(kid);
     childWindow->mParent = nsnull;
   }
 
@@ -151,7 +151,7 @@ static nsIMenuBar* GetHiddenWindowMenuBar()
   }
   
   nsIWidget* hiddenWindowWidgetNoCOMPtr = hiddenWindowWidget;
-  return NS_STATIC_CAST(nsCocoaWindow*, hiddenWindowWidgetNoCOMPtr)->GetMenuBar();  
+  return static_cast<nsCocoaWindow*>(hiddenWindowWidgetNoCOMPtr)->GetMenuBar();  
 }
 
 
@@ -324,7 +324,7 @@ nsresult nsCocoaWindow::StandardCreate(nsIWidget *aParent,
       if (mPopupContentView) {
         NS_ADDREF(mPopupContentView);
 
-        nsIWidget* thisAsWidget = NS_STATIC_CAST(nsIWidget*, this);
+        nsIWidget* thisAsWidget = static_cast<nsIWidget*>(this);
         mPopupContentView->StandardCreate(thisAsWidget, aRect, aHandleEventFunction,
                                           aContext, aAppShell, aToolkit, nsnull, nsnull);
 
@@ -848,12 +848,12 @@ NS_IMETHODIMP nsCocoaWindow::GetChildSheet(PRBool aShown, nsCocoaWindow** _retva
     nsCOMPtr<nsPIWidgetCocoa> piChildWidget(do_QueryInterface(child));
     if (piChildWidget) {
       // if it implements nsPIWidgetCocoa, it must be an nsCocoaWindow
-      nsCocoaWindow* window = NS_STATIC_CAST(nsCocoaWindow*, child);
+      nsCocoaWindow* window = static_cast<nsCocoaWindow*>(child);
       nsWindowType type;
       if (NS_SUCCEEDED(window->GetWindowType(type)) &&
           type == eWindowType_sheet) {
         // if it's a sheet, it must be an nsCocoaWindow
-        nsCocoaWindow* cocoaWindow = NS_STATIC_CAST(nsCocoaWindow*, window);
+        nsCocoaWindow* cocoaWindow = static_cast<nsCocoaWindow*>(window);
         if ((aShown && cocoaWindow->mVisible) ||
             (!aShown && cocoaWindow->mSheetNeedsShow)) {
           *_retval = cocoaWindow;
@@ -1111,8 +1111,8 @@ NS_IMETHODIMP nsCocoaWindow::GetAnimatedResize(PRUint16* aAnimation)
   
   // Gecko already compensates for the title bar, so we have to strip it out here.
   NSRect frameRect = [[[aNotification object] contentView] frame];
-  mGeckoWindow->Resize(NS_STATIC_CAST(PRInt32,frameRect.size.width),
-                       NS_STATIC_CAST(PRInt32,frameRect.size.height), PR_TRUE);
+  mGeckoWindow->Resize(static_cast<PRInt32>(frameRect.size.width),
+                       static_cast<PRInt32>(frameRect.size.height), PR_TRUE);
 }
 
 
diff --git a/mozilla/widget/src/cocoa/nsIdleServiceX.mm b/mozilla/widget/src/cocoa/nsIdleServiceX.mm
index f77c1a9f9d5..32be38abc34 100644
--- a/mozilla/widget/src/cocoa/nsIdleServiceX.mm
+++ b/mozilla/widget/src/cocoa/nsIdleServiceX.mm
@@ -91,7 +91,7 @@ nsIdleServiceX::GetIdleTime(PRUint32 *aTimeDiff)
   if (time > PR_UINT32_MAX) // Overflow will occur
     return NS_ERROR_CANNOT_CONVERT_DATA;
 
-  *aTimeDiff = NS_STATIC_CAST(PRUint32, time);
+  *aTimeDiff = static_cast<PRUint32>(time);
 
   return NS_OK;
 }
diff --git a/mozilla/widget/src/cocoa/nsMenuBarX.mm b/mozilla/widget/src/cocoa/nsMenuBarX.mm
index 484d0d8d19e..443bb099b30 100644
--- a/mozilla/widget/src/cocoa/nsMenuBarX.mm
+++ b/mozilla/widget/src/cocoa/nsMenuBarX.mm
@@ -292,7 +292,7 @@ OSStatus
 nsMenuBarX::InstallCommandEventHandler()
 {
    OSStatus err = noErr;
-   NSWindow* myWindow = NS_REINTERPRET_CAST(NSWindow*, mParent->GetNativeData(NS_NATIVE_WINDOW));
+   NSWindow* myWindow = reinterpret_cast<NSWindow*>(mParent->GetNativeData(NS_NATIVE_WINDOW));
    WindowRef myWindowRef = (WindowRef)[myWindow windowRef];
    NS_ASSERTION(myWindowRef, "Can't get WindowRef to install command handler!");
    if (myWindowRef && sCommandEventHandler) {
@@ -320,7 +320,7 @@ nsMenuBarX::CommandEventHandler(EventHandlerCallRef inHandlerChain, EventRef inE
   if (err1)
     return handled;
   
-  nsMenuBarX* self = NS_REINTERPRET_CAST(nsMenuBarX*, userData);
+  nsMenuBarX* self = reinterpret_cast<nsMenuBarX*>(userData);
 
   switch (command.commandID) {
     case eCommand_ID_About:
@@ -374,7 +374,7 @@ nsMenuBarX::CommandEventHandler(EventHandlerCallRef inHandlerChain, EventRef inE
       // that content node. Recall that we store weak pointers to the content
       // nodes in the hash table.
       nsPRUint32Key key(command.commandID);
-      nsIMenuItem* content = NS_REINTERPRET_CAST(nsIMenuItem*, self->mObserverTable.Get(&key));
+      nsIMenuItem* content = reinterpret_cast<nsIMenuItem*>(self->mObserverTable.Get(&key));
       if (content) {
         content->DoCommand();
         handled = noErr;
@@ -430,8 +430,8 @@ nsEventStatus
 nsMenuBarX::MenuConstruct(const nsMenuEvent & aMenuEvent, nsIWidget* aParentWindow, 
                           void * menubarNode, void * aDocShell)
 {
-  mDocShellWeakRef = do_GetWeakReference(NS_STATIC_CAST(nsIDocShell*, aDocShell));
-  nsIDOMNode* aDOMNode  = NS_STATIC_CAST(nsIDOMNode*, menubarNode);
+  mDocShellWeakRef = do_GetWeakReference(static_cast<nsIDocShell*>(aDocShell));
+  nsIDOMNode* aDOMNode  = static_cast<nsIDOMNode*>(menubarNode);
   mMenuBarContent = do_QueryInterface(aDOMNode); // strong ref
   NS_ASSERTION(mMenuBarContent, "No content specified for this menubar");
   if (!mMenuBarContent)
@@ -468,9 +468,9 @@ nsMenuBarX::MenuConstruct(const nsMenuEvent & aMenuEvent, nsIWidget* aParentWind
         // Create nsMenu, the menubar will own it
         nsCOMPtr<nsIMenu> pnsMenu(do_CreateInstance(kMenuCID));
         if (pnsMenu) {
-          pnsMenu->Create(NS_STATIC_CAST(nsIMenuBar*, this), menuName, menuAccessKey, 
-                          NS_STATIC_CAST(nsIChangeManager *, this), 
-                          NS_REINTERPRET_CAST(nsIDocShell*, aDocShell), menu);
+          pnsMenu->Create(static_cast<nsIMenuBar*>(this), menuName, menuAccessKey, 
+                          static_cast<nsIChangeManager *>(this), 
+                          reinterpret_cast<nsIDocShell*>(aDocShell), menu);
           
           // Make nsMenu a child of nsMenuBar. nsMenuBar takes ownership.
           AddMenu(pnsMenu);
@@ -999,7 +999,7 @@ nsMenuBarX::Lookup(nsIContent *aContent, nsIChangeObserver **_retval)
   *_retval = nsnull;
   
   nsVoidKey key (aContent);
-  *_retval = NS_REINTERPRET_CAST(nsIChangeObserver*, mObserverTable.Get(&key));
+  *_retval = reinterpret_cast<nsIChangeObserver*>(mObserverTable.Get(&key));
   NS_IF_ADDREF (*_retval);
   
   return NS_OK;
diff --git a/mozilla/widget/src/cocoa/nsMenuItemX.mm b/mozilla/widget/src/cocoa/nsMenuItemX.mm
index 55fd141562b..9de96feb36a 100644
--- a/mozilla/widget/src/cocoa/nsMenuItemX.mm
+++ b/mozilla/widget/src/cocoa/nsMenuItemX.mm
@@ -97,7 +97,7 @@ NS_METHOD nsMenuItemX::Create(nsIMenu* aParent, const nsString & aLabel, PRBool
   
   // register for AttributeChanged messages
   mManager = aManager;
-  nsCOMPtr<nsIChangeObserver> obs = do_QueryInterface(NS_STATIC_CAST(nsIChangeObserver*,this));
+  nsCOMPtr<nsIChangeObserver> obs = do_QueryInterface(static_cast<nsIChangeObserver*>(this));
   mManager->Register(mContent, obs); // does not addref this
   
   // if we have a command associated with this menu item, register for changes
@@ -143,7 +143,7 @@ NS_METHOD nsMenuItemX::Create(nsIMenu* aParent, const nsString & aLabel, PRBool
     [mNativeMenuItem setEnabled:(BOOL)mEnabled];
   }
 
-  mIcon = new nsMenuItemIconX(NS_STATIC_CAST(nsIMenuItem*, this), mMenuParent, mContent);
+  mIcon = new nsMenuItemIconX(static_cast<nsIMenuItem*>(this), mMenuParent, mContent);
   
   return NS_OK;
 }
diff --git a/mozilla/widget/src/cocoa/nsMenuX.mm b/mozilla/widget/src/cocoa/nsMenuX.mm
index d2b7a917612..518d0cf4635 100644
--- a/mozilla/widget/src/cocoa/nsMenuX.mm
+++ b/mozilla/widget/src/cocoa/nsMenuX.mm
@@ -139,7 +139,7 @@ nsMenuX::Create(nsISupports * aParent, const nsAString &aLabel, const nsAString
 
   // register this menu to be notified when changes are made to our content object
   mManager = aManager; // weak ref
-  nsCOMPtr<nsIChangeObserver> changeObs(do_QueryInterface(NS_STATIC_CAST(nsIChangeObserver*, this)));
+  nsCOMPtr<nsIChangeObserver> changeObs(do_QueryInterface(static_cast<nsIChangeObserver*>(this)));
   mManager->Register(mMenuContent, changeObs);
 
   NS_ASSERTION(mMenuContent, "Menu not given a dom node at creation time");
@@ -168,7 +168,7 @@ nsMenuX::Create(nsISupports * aParent, const nsAString &aLabel, const nsAString
   MenuConstruct(fake, nsnull, nsnull, nsnull);
   
   if (menu)
-    mIcon = new nsMenuItemIconX(NS_STATIC_CAST(nsIMenu*, this), menu, mMenuContent);
+    mIcon = new nsMenuItemIconX(static_cast<nsIMenu*>(this), menu, mMenuContent);
 
   return NS_OK;
 }
@@ -717,7 +717,7 @@ void nsMenuX::LoadSubMenu(nsIContent* inMenuContent)
   nsCOMPtr<nsIDocShell> docShell = do_QueryReferent(mDocShellWeakRef);
   if (!docShell)
     return;
-  pnsMenu->Create(NS_REINTERPRET_CAST(nsISupports*, this), menuName, EmptyString(), mManager, docShell, inMenuContent);
+  pnsMenu->Create(reinterpret_cast<nsISupports*>(this), menuName, EmptyString(), mManager, docShell, inMenuContent);
 
   // set if it's enabled or disabled
   if (inMenuContent->AttrValueIs(kNameSpaceID_None, nsWidgetAtoms::disabled,
@@ -979,7 +979,7 @@ nsresult nsMenuX::CountVisibleBefore(PRUint32* outVisibleBefore)
   for (PRUint32 i = 0; i < numMenus; i++) {
     nsCOMPtr<nsIMenu> currMenu;
     menubarParent->GetMenuAt(i, *getter_AddRefs(currMenu));
-    if (currMenu == NS_STATIC_CAST(nsIMenu*, this)) {
+    if (currMenu == static_cast<nsIMenu*>(this)) {
       // we found ourselves, break out
       gotThisMenu = PR_TRUE;
       break;
@@ -1187,7 +1187,7 @@ static pascal OSStatus MyMenuEventHandler(EventHandlerCallRef myHandler, EventRe
     // don't request a menu item that doesn't exist or we crash
     // this might happen just due to some random quirks in the event system
     PRUint32 itemCount;
-    nsIMenu* targetMenu = NS_REINTERPRET_CAST(nsIMenu*, userData);
+    nsIMenu* targetMenu = reinterpret_cast<nsIMenu*>(userData);
     targetMenu->GetItemCount(itemCount);
     if (aPos >= itemCount)
       return eventNotHandledErr;
diff --git a/mozilla/widget/src/cocoa/nsPrintSettingsX.mm b/mozilla/widget/src/cocoa/nsPrintSettingsX.mm
index 3adb6a55ca9..44abfa0f27e 100644
--- a/mozilla/widget/src/cocoa/nsPrintSettingsX.mm
+++ b/mozilla/widget/src/cocoa/nsPrintSettingsX.mm
@@ -433,7 +433,7 @@ nsresult nsPrintSettingsX::_Clone(nsIPrintSettings **_retval)
 //-------------------------------------------
 NS_IMETHODIMP nsPrintSettingsX::_Assign(nsIPrintSettings *aPS)
 {
-  nsPrintSettingsX *printSettingsX = NS_STATIC_CAST(nsPrintSettingsX*, aPS);
+  nsPrintSettingsX *printSettingsX = static_cast<nsPrintSettingsX*>(aPS);
   if (!printSettingsX)
     return NS_ERROR_UNEXPECTED;
   *this = *printSettingsX;
diff --git a/mozilla/widget/src/cocoa/nsScreenManagerCocoa.mm b/mozilla/widget/src/cocoa/nsScreenManagerCocoa.mm
index 20ebaa0a993..e6a5664e602 100644
--- a/mozilla/widget/src/cocoa/nsScreenManagerCocoa.mm
+++ b/mozilla/widget/src/cocoa/nsScreenManagerCocoa.mm
@@ -55,7 +55,7 @@ nsScreenCocoa*
 nsScreenManagerCocoa::ScreenForCocoaScreen (NSScreen *screen)
 {
     for (PRInt32 i = 0; i < mScreenList.Count(); i++) {
-        nsScreenCocoa* sc = NS_STATIC_CAST(nsScreenCocoa*, mScreenList.ObjectAt(i));
+        nsScreenCocoa* sc = static_cast<nsScreenCocoa*>(mScreenList.ObjectAt(i));
 
         if (sc->CocoaScreen() == screen) {
             // doesn't addref
diff --git a/mozilla/widget/src/gtk2/nsAppShell.cpp b/mozilla/widget/src/gtk2/nsAppShell.cpp
index 293dd1d0cf3..72710aeccd6 100644
--- a/mozilla/widget/src/gtk2/nsAppShell.cpp
+++ b/mozilla/widget/src/gtk2/nsAppShell.cpp
@@ -60,7 +60,7 @@ nsAppShell::EventProcessorCallback(GIOChannel *source,
                                    GIOCondition condition,
                                    gpointer data)
 {
-    nsAppShell *self = NS_STATIC_CAST(nsAppShell *, data);
+    nsAppShell *self = static_cast<nsAppShell *>(data);
 
     unsigned char c;
     read(self->mPipeFDs[0], &c, 1);
diff --git a/mozilla/widget/src/gtk2/nsClipboard.cpp b/mozilla/widget/src/gtk2/nsClipboard.cpp
index 98acd0145c7..3e2156ec07a 100644
--- a/mozilla/widget/src/gtk2/nsClipboard.cpp
+++ b/mozilla/widget/src/gtk2/nsClipboard.cpp
@@ -622,8 +622,8 @@ void ConvertHTMLtoUCS2(guchar * data, PRInt32 dataLength,
     GetHTMLCharset(data, dataLength, charset);// get charset of HTML
     if (charset.EqualsLiteral("UTF-16")) {//current mozilla
         outUnicodeLen = (dataLength / 2) - 1;
-        *unicodeData = NS_REINTERPRET_CAST(PRUnichar*,
-                       nsMemory::Alloc((outUnicodeLen + sizeof('\0')) *
+        *unicodeData = reinterpret_cast<PRUnichar*>
+                                       (nsMemory::Alloc((outUnicodeLen + sizeof('\0')) *
                        sizeof(PRUnichar)));
         if (*unicodeData) {
             memcpy(*unicodeData, data + sizeof(PRUnichar),
@@ -659,8 +659,8 @@ void ConvertHTMLtoUCS2(guchar * data, PRInt32 dataLength,
         decoder->GetMaxLength((const char *)data, dataLength, &outUnicodeLen);
         // |outUnicodeLen| is number of chars
         if (outUnicodeLen) {
-            *unicodeData = NS_REINTERPRET_CAST(PRUnichar*,
-                           nsMemory::Alloc((outUnicodeLen + sizeof('\0')) *
+            *unicodeData = reinterpret_cast<PRUnichar*>
+                                           (nsMemory::Alloc((outUnicodeLen + sizeof('\0')) *
                            sizeof(PRUnichar)));
             if (*unicodeData) {
                 PRInt32 numberTmp = dataLength;
@@ -855,7 +855,7 @@ clipboard_contents_received(GtkClipboard     *clipboard,
                             GtkSelectionData *selection_data,
                             gpointer          data)
 {
-    retrieval_context *context = NS_STATIC_CAST(retrieval_context *, data);
+    retrieval_context *context = static_cast<retrieval_context *>(data);
     context->completed = PR_TRUE;
 
     if (selection_data->length >= 0)
@@ -872,7 +872,7 @@ wait_for_contents(GtkClipboard *clipboard, GdkAtom target)
                                    &context);
 
     wait_for_retrieval(clipboard, &context);
-    return NS_STATIC_CAST(GtkSelectionData *, context.data);
+    return static_cast<GtkSelectionData *>(context.data);
 }
 
 static void
@@ -880,7 +880,7 @@ clipboard_text_received(GtkClipboard *clipboard,
                         const gchar  *text,
                         gpointer      data)
 {
-    retrieval_context *context = NS_STATIC_CAST(retrieval_context *, data);
+    retrieval_context *context = static_cast<retrieval_context *>(data);
     context->completed = PR_TRUE;
     context->data = g_strdup(text);
 }
@@ -892,5 +892,5 @@ wait_for_text(GtkClipboard *clipboard)
     gtk_clipboard_request_text(clipboard, clipboard_text_received, &context);
 
     wait_for_retrieval(clipboard, &context);
-    return NS_STATIC_CAST(gchar *, context.data);
+    return static_cast<gchar *>(context.data);
 }
diff --git a/mozilla/widget/src/gtk2/nsDragService.cpp b/mozilla/widget/src/gtk2/nsDragService.cpp
index 7197b1bdcd7..1b14919c957 100644
--- a/mozilla/widget/src/gtk2/nsDragService.cpp
+++ b/mozilla/widget/src/gtk2/nsDragService.cpp
@@ -338,7 +338,7 @@ nsDragService::GetNumDropItems(PRUint32 * aNumItems)
         GdkAtom gdkFlavor = gdk_atom_intern(gTextUriListType, FALSE);
         GetTargetDragData(gdkFlavor);
         if (mTargetDragData) {
-            const char *data = NS_REINTERPRET_CAST(char*, mTargetDragData);
+            const char *data = reinterpret_cast<char*>(mTargetDragData);
             *aNumItems = CountTextUriListItems(data, mTargetDragDataLen);
         } else
             *aNumItems = 1;
@@ -438,7 +438,7 @@ nsDragService::GetData(nsITransferable * aTransferable,
             GdkAtom gdkFlavor = gdk_atom_intern(flavorStr, FALSE);
             PR_LOG(sDragLm, PR_LOG_DEBUG,
                    ("looking for data in type %s, gdk flavor %ld\n",
-                   NS_STATIC_CAST(const char*,flavorStr), gdkFlavor));
+                   static_cast<const char*>(flavorStr), gdkFlavor));
             PRBool dataFound = PR_FALSE;
             if (gdkFlavor) {
                 GetTargetDragData(gdkFlavor);
@@ -461,7 +461,7 @@ nsDragService::GetData(nsITransferable * aTransferable,
                     if (mTargetDragData) {
                         PR_LOG(sDragLm, PR_LOG_DEBUG, ("Got textplain data\n"));
                         const char* castedText =
-                                    NS_REINTERPRET_CAST(char*, mTargetDragData);
+                                    reinterpret_cast<char*>(mTargetDragData);
                         PRUnichar* convertedText = nsnull;
                         PRInt32 convertedTextLen = 0;
                         nsPrimitiveHelpers::ConvertPlatformPlainTextToUnicode(
@@ -493,7 +493,7 @@ nsDragService::GetData(nsITransferable * aTransferable,
                         PR_LOG(sDragLm, PR_LOG_DEBUG,
                                ("Got text/uri-list data\n"));
                         const char *data =
-                                   NS_REINTERPRET_CAST(char*, mTargetDragData);
+                                   reinterpret_cast<char*>(mTargetDragData);
                         PRUnichar* convertedText = nsnull;
                         PRInt32 convertedTextLen = 0;
 
@@ -525,7 +525,7 @@ nsDragService::GetData(nsITransferable * aTransferable,
                             PR_LOG(sDragLm, PR_LOG_DEBUG,
                                    ("Got _NETSCAPE_URL data\n"));
                             const char* castedText =
-                                  NS_REINTERPRET_CAST(char*, mTargetDragData);
+                                  reinterpret_cast<char*>(mTargetDragData);
                             PRUnichar* convertedText = nsnull;
                             PRInt32 convertedTextLen = 0;
                             nsPrimitiveHelpers::ConvertPlatformPlainTextToUnicode(castedText, mTargetDragDataLen, &convertedText, &convertedTextLen);
@@ -556,7 +556,7 @@ nsDragService::GetData(nsITransferable * aTransferable,
                 nsLinebreakHelpers::ConvertPlatformToDOMLinebreaks(
                              flavorStr,
                              &mTargetDragData,
-                             NS_REINTERPRET_CAST(int*, &mTargetDragDataLen));
+                             reinterpret_cast<int*>(&mTargetDragDataLen));
         
                 // put it into the transferable.
                 nsCOMPtr<nsISupports> genericDataWrapper;
@@ -1063,8 +1063,8 @@ CreateUriList(nsISupportsArray *items, gchar **text, gint *length)
                                                             &tmpData,
                                                             tmpDataLen);
                 char* plainTextData = nsnull;
-                PRUnichar* castedUnicode = NS_REINTERPRET_CAST(PRUnichar*,
-                                                               tmpData);
+                PRUnichar* castedUnicode = reinterpret_cast<PRUnichar*>
+                                                           (tmpData);
                 PRInt32 plainTextLen = 0;
                 nsPrimitiveHelpers::ConvertUnicodeToPlatformPlainText(
                                     castedUnicode,
@@ -1169,8 +1169,8 @@ nsDragService::SourceDataGet(GtkWidget        *aWidget,
             // text and replace the output values with the plain text.
             if (needToDoConversionToPlainText) {
                 char* plainTextData = nsnull;
-                PRUnichar* castedUnicode = NS_REINTERPRET_CAST(PRUnichar*,
-                                                               tmpData);
+                PRUnichar* castedUnicode = reinterpret_cast<PRUnichar*>
+                                                           (tmpData);
                 PRInt32 plainTextLen = 0;
                 nsPrimitiveHelpers::ConvertUnicodeToPlatformPlainText(
                                     castedUnicode,
diff --git a/mozilla/widget/src/gtk2/nsFilePicker.cpp b/mozilla/widget/src/gtk2/nsFilePicker.cpp
index dfb4cbb9a5d..a0a6bc26d24 100644
--- a/mozilla/widget/src/gtk2/nsFilePicker.cpp
+++ b/mozilla/widget/src/gtk2/nsFilePicker.cpp
@@ -265,11 +265,11 @@ void
 ReadMultipleFiles(gpointer filename, gpointer array)
 {
   nsCOMPtr<nsILocalFile> localfile;
-  nsresult rv = NS_NewNativeLocalFile(nsDependentCString(NS_STATIC_CAST(char*, filename)),
+  nsresult rv = NS_NewNativeLocalFile(nsDependentCString(static_cast<char*>(filename)),
                                       PR_FALSE,
                                       getter_AddRefs(localfile));
   if (NS_SUCCEEDED(rv)) {
-    nsCOMArray<nsILocalFile>& files = *NS_STATIC_CAST(nsCOMArray<nsILocalFile>*, array);
+    nsCOMArray<nsILocalFile>& files = *static_cast<nsCOMArray<nsILocalFile>*>(array);
     files.AppendObject(localfile);
   }
 
@@ -285,7 +285,7 @@ nsFilePicker::ReadValuesFromFileChooser(GtkWidget *file_chooser)
     mFile.Truncate();
 
     GSList *list = _gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER(file_chooser));
-    g_slist_foreach(list, ReadMultipleFiles, NS_STATIC_CAST(gpointer, &mFiles));
+    g_slist_foreach(list, ReadMultipleFiles, static_cast<gpointer>(&mFiles));
     g_slist_free(list);
   } else {
     gchar *filename = _gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(file_chooser));
@@ -296,7 +296,7 @@ nsFilePicker::ReadValuesFromFileChooser(GtkWidget *file_chooser)
   GtkFileFilter *filter = _gtk_file_chooser_get_filter (GTK_FILE_CHOOSER(file_chooser));
   GSList *filter_list = _gtk_file_chooser_list_filters (GTK_FILE_CHOOSER(file_chooser));
 
-  mSelectedType = NS_STATIC_CAST(PRInt16, g_slist_index (filter_list, filter));
+  mSelectedType = static_cast<PRInt16>(g_slist_index (filter_list, filter));
   g_slist_free(filter_list);
 
   // Remember last used directory.
@@ -522,7 +522,7 @@ nsFilePicker::Show(PRInt16 *aReturn)
   } else if (mMode == nsIFilePicker::modeSave) {
     char *default_filename = ToNewUTF8String(mDefault);
     _gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(file_chooser),
-                                       NS_STATIC_CAST(const gchar*, default_filename));
+                                       static_cast<const gchar*>(default_filename));
     nsMemory::Free(default_filename);
   }
 
diff --git a/mozilla/widget/src/gtk2/nsImageToPixbuf.cpp b/mozilla/widget/src/gtk2/nsImageToPixbuf.cpp
index 2b4dc45f57e..8e591b2e709 100644
--- a/mozilla/widget/src/gtk2/nsImageToPixbuf.cpp
+++ b/mozilla/widget/src/gtk2/nsImageToPixbuf.cpp
@@ -87,8 +87,8 @@ nsImageToPixbuf::SurfaceToPixbuf(gfxASurface* aSurface, PRInt32 aWidth, PRInt32
 
     nsRefPtr<gfxImageSurface> imgSurface;
     if (aSurface->GetType() == gfxASurface::SurfaceTypeImage) {
-        imgSurface = NS_STATIC_CAST(gfxImageSurface*,
-                                    NS_STATIC_CAST(gfxASurface*, aSurface));
+        imgSurface = static_cast<gfxImageSurface*>
+                                (static_cast<gfxASurface*>(aSurface));
     } else {
         imgSurface = new gfxImageSurface(gfxIntSize(aWidth, aHeight),
 					 gfxImageSurface::ImageFormatARGB32);
@@ -122,8 +122,8 @@ nsImageToPixbuf::SurfaceToPixbuf(gfxASurface* aSurface, PRInt32 aWidth, PRInt32
         for (PRInt32 col = 0; col < aWidth; ++col) {
             guchar* pixel = pixels + row * rowstride + 4 * col;
 
-            PRUint32* cairoPixel = NS_REINTERPRET_CAST(PRUint32*,
-                                   (cairoData + row * cairoStride + 4 * col));
+            PRUint32* cairoPixel = reinterpret_cast<PRUint32*>
+                                                   ((cairoData + row * cairoStride + 4 * col));
 
             if (format == gfxASurface::ImageFormatARGB32) {
                 const PRUint8 a = (*cairoPixel >> 24) & 0xFF;
diff --git a/mozilla/widget/src/gtk2/nsScreenGtk.cpp b/mozilla/widget/src/gtk2/nsScreenGtk.cpp
index a8a3db80514..014d7ba124b 100644
--- a/mozilla/widget/src/gtk2/nsScreenGtk.cpp
+++ b/mozilla/widget/src/gtk2/nsScreenGtk.cpp
@@ -46,8 +46,8 @@ static GdkFilterReturn
 root_window_event_filter(GdkXEvent *aGdkXEvent, GdkEvent *aGdkEvent,
                          gpointer aClosure)
 {
-  XEvent *xevent = NS_STATIC_CAST(XEvent*, aGdkXEvent);
-  nsScreenGtk *ourScreen = NS_STATIC_CAST(nsScreenGtk*, aClosure);
+  XEvent *xevent = static_cast<XEvent*>(aGdkXEvent);
+  nsScreenGtk *ourScreen = static_cast<nsScreenGtk*>(aClosure);
 
   // See comments in nsScreenGtk::Init below.
   switch (xevent->type) {
diff --git a/mozilla/widget/src/gtk2/nsWindow.cpp b/mozilla/widget/src/gtk2/nsWindow.cpp
index f3ac1d94c4f..0a22fcda98b 100644
--- a/mozilla/widget/src/gtk2/nsWindow.cpp
+++ b/mozilla/widget/src/gtk2/nsWindow.cpp
@@ -429,7 +429,7 @@ nsWindow::Destroy(void)
 
     // ungrab if required
     nsCOMPtr<nsIWidget> rollupWidget = do_QueryReferent(gRollupWindow);
-    if (NS_STATIC_CAST(nsIWidget *, this) == rollupWidget.get()) {
+    if (static_cast<nsIWidget *>(this) == rollupWidget.get()) {
         if (gRollupListener)
             gRollupListener->Rollup();
         gRollupWindow = nsnull;
@@ -509,7 +509,7 @@ nsWindow::SetParent(nsIWidget *aNewParent)
     NS_ENSURE_ARG_POINTER(aNewParent);
 
     GdkWindow* newParentWindow =
-        NS_STATIC_CAST(GdkWindow*, aNewParent->GetNativeData(NS_NATIVE_WINDOW));
+        static_cast<GdkWindow*>(aNewParent->GetNativeData(NS_NATIVE_WINDOW));
     NS_ASSERTION(newParentWindow, "Parent widget has a null native window handle");
 
     if (!mShell && mDrawingarea) {
@@ -653,7 +653,7 @@ nsWindow::SetZIndex(PRInt32 aZIndex)
     } else {
         // All the siblings before us need to be below our widget. 
         for (nsWindow* w = this; w;
-             w = NS_STATIC_CAST(nsWindow*, w->GetPrevSibling())) {
+             w = static_cast<nsWindow*>(w->GetPrevSibling())) {
             if (w->mDrawingarea)
                 gdk_window_lower(w->mDrawingarea->clip_window);
         }
@@ -716,8 +716,8 @@ SetUserTimeAndStartupIDForActivatedWindow(GtkWidget* aWindow)
     if (!toolkit)
         return;
 
-    nsGTKToolkit* GTKToolkit = NS_STATIC_CAST(nsGTKToolkit*,
-        NS_STATIC_CAST(nsIToolkit*, toolkit));
+    nsGTKToolkit* GTKToolkit = static_cast<nsGTKToolkit*>
+                                          (static_cast<nsIToolkit*>(toolkit));
     nsCAutoString desktopStartupID;
     GTKToolkit->GetDesktopStartupID(&desktopStartupID);
     if (desktopStartupID.IsEmpty()) {
@@ -1241,7 +1241,7 @@ nsWindow::Scroll(PRInt32  aDx,
         kid->GetBounds(bounds);
         bounds.x += aDx;
         bounds.y += aDy;
-        NS_STATIC_CAST(nsBaseWidget*, kid)->SetBounds(bounds);
+        static_cast<nsBaseWidget*>(kid)->SetBounds(bounds);
     }
 
     // Process all updates so that everything is drawn.
@@ -1291,7 +1291,7 @@ nsWindow::GetNativeData(PRUint32 aDataType)
 
     case NS_NATIVE_GRAPHIC: {
         NS_ASSERTION(nsnull != mToolkit, "NULL toolkit, unable to get a GC");
-        return (void *)NS_STATIC_CAST(nsGTKToolkit *, mToolkit)->GetSharedGC();
+        return (void *)static_cast<nsGTKToolkit *>(mToolkit)->GetSharedGC();
         break;
     }
 
@@ -1480,8 +1480,8 @@ nsWindow::CaptureRollupEvents(nsIRollupListener *aListener,
 
     if (aDoCapture) {
         gRollupListener = aListener;
-        gRollupWindow = do_GetWeakReference(NS_STATIC_CAST(nsIWidget*,
-                                                           this));
+        gRollupWindow = do_GetWeakReference(static_cast<nsIWidget*>
+                                                       (this));
         // real grab is only done when there is no dragging
         if (!nsWindow::DragInProgress()) {
             gtk_grab_add(widget);
@@ -4062,7 +4062,7 @@ get_window_for_gtk_widget(GtkWidget *widget)
     if (!user_data)
         return nsnull;
 
-    return NS_STATIC_CAST(nsWindow *, user_data);
+    return static_cast<nsWindow *>(user_data);
 }
 
 /* static */
@@ -4075,7 +4075,7 @@ get_window_for_gdk_window(GdkWindow *window)
     if (!user_data)
         return nsnull;
 
-    return NS_STATIC_CAST(nsWindow *, user_data);
+    return static_cast<nsWindow *>(user_data);
 }
 
 /* static */
@@ -4807,7 +4807,7 @@ nsWindow::FireDragLeaveTimer(void)
 guint
 nsWindow::DragMotionTimerCallback(gpointer aClosure)
 {
-    nsRefPtr<nsWindow> window = NS_STATIC_CAST(nsWindow *, aClosure);
+    nsRefPtr<nsWindow> window = static_cast<nsWindow *>(aClosure);
     window->FireDragMotionTimer();
     return FALSE;
 }
@@ -4816,7 +4816,7 @@ nsWindow::DragMotionTimerCallback(gpointer aClosure)
 void
 nsWindow::DragLeaveTimerCallback(nsITimer *aTimer, void *aClosure)
 {
-    nsRefPtr<nsWindow> window = NS_STATIC_CAST(nsWindow *, aClosure);
+    nsRefPtr<nsWindow> window = static_cast<nsWindow *>(aClosure);
     window->FireDragLeaveTimer();
 }
 
@@ -5584,7 +5584,7 @@ IM_preedit_changed_cb(GtkIMContext *aContext,
     }
 
     if (uniStrLen) {
-        window->IMEComposeText(NS_STATIC_CAST(const PRUnichar *, uniStr),
+        window->IMEComposeText(static_cast<const PRUnichar *>(uniStr),
                                uniStrLen, preedit_string, cursor_pos, feedback_list);
     }
 
@@ -5685,7 +5685,7 @@ IM_set_text_range(const PRInt32 aLen,
 
     PangoAttrIterator * aFeedbackIterator;
     aFeedbackIterator = pango_attr_list_get_iterator((PangoAttrList*)aFeedback);
-    //(NS_REINTERPRET_CAST(PangoAttrList*, aFeedback));
+    //(reinterpret_cast<PangoAttrList*>(aFeedback));
     // Since some compilers don't permit this casting -- from const to un-const
     if (aFeedbackIterator == NULL) return;
 
diff --git a/mozilla/widget/src/mac/nsAppShell.cpp b/mozilla/widget/src/mac/nsAppShell.cpp
index 5b5a80f1c49..a2c25218dca 100644
--- a/mozilla/widget/src/mac/nsAppShell.cpp
+++ b/mozilla/widget/src/mac/nsAppShell.cpp
@@ -106,7 +106,7 @@ nsAppShell::Init()
     return rv;
 
   nsIToolkit *toolkit = mToolkit.get();
-  mMacPump = new nsMacMessagePump(NS_STATIC_CAST(nsToolkit*, toolkit));
+  mMacPump = new nsMacMessagePump(static_cast<nsToolkit*>(toolkit));
   if (!mMacPump.get())
     return NS_ERROR_OUT_OF_MEMORY;
 
@@ -197,7 +197,7 @@ nsAppShell::ProcessNextNativeEvent(PRBool aMayWait)
 void
 nsAppShell::ProcessGeckoEvents(void* aInfo)
 {
-  nsAppShell* self = NS_STATIC_CAST(nsAppShell*, aInfo);
+  nsAppShell* self = static_cast<nsAppShell*>(aInfo);
 
   if (self->mRunningEventLoop) {
     self->mRunningEventLoop = PR_FALSE;
diff --git a/mozilla/widget/src/mac/nsChildWindow.cpp b/mozilla/widget/src/mac/nsChildWindow.cpp
index a2b8e84a1a0..548477d2c24 100644
--- a/mozilla/widget/src/mac/nsChildWindow.cpp
+++ b/mozilla/widget/src/mac/nsChildWindow.cpp
@@ -97,7 +97,7 @@ void nsChildWindow::CalcWindowRegions()
   // clip the siblings out of the window region and visRegion 
   if (mClipSiblings && mParent && !mIsTopWidgetWindow) {
     // need to walk the siblings backwards, to get clipping right.
-    nsWindow* sibling = NS_STATIC_CAST(nsWindow*, mParent->GetLastChild());
+    nsWindow* sibling = static_cast<nsWindow*>(mParent->GetLastChild());
     if (!sibling)
       return;
 
@@ -106,7 +106,7 @@ void nsChildWindow::CalcWindowRegions()
       return;
 
     do {
-      if (sibling == NS_STATIC_CAST(nsWindow*, this))
+      if (sibling == static_cast<nsWindow*>(this))
         break;
 
       PRBool visible;
@@ -127,7 +127,7 @@ void nsChildWindow::CalcWindowRegions()
         ::DiffRgn(mWindowRegion, siblingRgn, mWindowRegion);
         ::DiffRgn(mVisRegion, siblingRgn, mVisRegion);
       }
-      sibling = NS_STATIC_CAST(nsWindow*, sibling->GetPrevSibling());
+      sibling = static_cast<nsWindow*>(sibling->GetPrevSibling());
     } while (sibling);
   }
 }
diff --git a/mozilla/widget/src/mac/nsClipboard.cpp b/mozilla/widget/src/mac/nsClipboard.cpp
index e82d07250eb..5b2d1bf4e78 100644
--- a/mozilla/widget/src/mac/nsClipboard.cpp
+++ b/mozilla/widget/src/mac/nsClipboard.cpp
@@ -159,7 +159,7 @@ nsClipboard :: SetNativeClipboardData ( PRInt32 aWhichClipboard )
 
         // Convert unix to mac linebreaks, since mac linebreaks are required for clipboard compatibility.
 
-        PRUnichar* castedData = NS_REINTERPRET_CAST(PRUnichar*, data);
+        PRUnichar* castedData = reinterpret_cast<PRUnichar*>(data);
         PRUnichar* linebreakConvertedUnicode = castedData;
         nsLinebreakConverter::ConvertUnicharLineBreaksInSitu(&linebreakConvertedUnicode,
                                                              nsLinebreakConverter::eLinebreakUnix,
@@ -192,8 +192,8 @@ nsClipboard :: SetNativeClipboardData ( PRInt32 aWhichClipboard )
           }
           else if (NS_SUCCEEDED(errCode)) {
             // create a single run with the default system script
-            scriptCodeRuns = NS_REINTERPRET_CAST(ScriptCodeRun*,
-                                                 nsMemory::Alloc(sizeof(ScriptCodeRun)));
+            scriptCodeRuns = reinterpret_cast<ScriptCodeRun*>
+                                             (nsMemory::Alloc(sizeof(ScriptCodeRun)));
             if (scriptCodeRuns) {
               scriptCodeRuns[0].offset = 0;
               scriptCodeRuns[0].script = (ScriptCode) ::GetScriptManagerVariable(smSysScript);
@@ -270,7 +270,7 @@ nsClipboard :: SetNativeClipboardData ( PRInt32 aWhichClipboard )
 
           // Transform the line break format from Unix-style '\n' to
           // classic Mac-style '\r', as expected on the clipboard.
-          PRUnichar* castedData = NS_REINTERPRET_CAST(PRUnichar*, data);
+          PRUnichar* castedData = reinterpret_cast<PRUnichar*>(data);
           PRUnichar* linebreakConvertedUnicode = castedData;
           nsLinebreakConverter::ConvertUnicharLineBreaksInSitu(
                                           &linebreakConvertedUnicode,
@@ -317,7 +317,7 @@ nsClipboard :: SetNativeClipboardData ( PRInt32 aWhichClipboard )
   const char* mapping = theMapper.ExportMapping(&mappingLen);
   if ( mapping && mappingLen ) {
     errCode = PutOnClipboard ( nsMimeMapperMac::MappingFlavor(), mapping, mappingLen );
-    nsMemory::Free ( NS_CONST_CAST(char*, mapping) );
+    nsMemory::Free ( const_cast<char*>(mapping) );
   }
   
   return errCode;
@@ -458,7 +458,7 @@ nsClipboard :: GetNativeClipboardData ( nsITransferable * aTransferable, PRInt32
           if (!dataFound) {
             loadResult = GetDataOffClipboard ( 'TEXT', &clipboardData, &dataSize );
             if ( NS_SUCCEEDED(loadResult) && clipboardData ) {
-              const char* castedText = NS_REINTERPRET_CAST(char*, clipboardData);          
+              const char* castedText = reinterpret_cast<char*>(clipboardData);          
               PRUnichar* convertedText = nsnull;
               PRInt32 convertedTextLen = 0;
               nsPrimitiveHelpers::ConvertPlatformPlainTextToUnicode ( castedText, dataSize, 
@@ -496,7 +496,7 @@ nsClipboard :: GetNativeClipboardData ( nsITransferable * aTransferable, PRInt32
             // URLs carrying a description, are also treated to the same
             // conversion because it's used when the data is copied to the
             // clipboard.
-            nsDependentCString utf8(NS_REINTERPRET_CAST(char*, clipboardData));
+            nsDependentCString utf8(reinterpret_cast<char*>(clipboardData));
             NS_ConvertUTF8toUTF16 utf16(utf8);
 
             // Replace clipboardData with the new wide-char version.
diff --git a/mozilla/widget/src/mac/nsDeviceContextMac.cpp b/mozilla/widget/src/mac/nsDeviceContextMac.cpp
index d244b9bf5ef..d380a5914f9 100644
--- a/mozilla/widget/src/mac/nsDeviceContextMac.cpp
+++ b/mozilla/widget/src/mac/nsDeviceContextMac.cpp
@@ -351,7 +351,7 @@ NS_IMETHODIMP nsDeviceContextMac::GetDepth(PRUint32& aDepth)
   if ( screen ) {
     PRInt32 depth;
     screen->GetPixelDepth ( &depth );
-    aDepth = NS_STATIC_CAST ( PRUint32, depth );
+    aDepth = static_cast<PRUint32>(depth);
   }
   else 
     aDepth = 1;
@@ -373,7 +373,7 @@ NS_IMETHODIMP nsDeviceContextMac::GetDepth(PRUint32& aDepth)
    
   PRInt32 depth;
   mPrimaryScreen->GetPixelDepth ( &depth );
-  aDepth = NS_STATIC_CAST ( PRUint32, depth );
+  aDepth = static_cast<PRUint32>(depth);
     
   return NS_OK;
 }
@@ -467,8 +467,8 @@ NS_IMETHODIMP nsDeviceContextMac::GetDeviceSurfaceDimensions(PRInt32 & outWidth,
 
 	if( mSpec ) {
 	  // we have a printer device
-		outWidth = NS_STATIC_CAST(PRInt32, (mPageRect.right-mPageRect.left)*mDevUnitsToAppUnits);
-		outHeight = NS_STATIC_CAST(PRInt32, (mPageRect.bottom-mPageRect.top)*mDevUnitsToAppUnits);
+		outWidth = static_cast<PRInt32>((mPageRect.right-mPageRect.left)*mDevUnitsToAppUnits);
+		outHeight = static_cast<PRInt32>((mPageRect.bottom-mPageRect.top)*mDevUnitsToAppUnits);
 	}
 	else {
     // we have a screen device. find the screen that the window is on and
@@ -503,8 +503,8 @@ nsDeviceContextMac::GetRect(nsRect &aRect)
 	  // we have a printer device
 	  aRect.x = 0;
 	  aRect.y = 0;
-		aRect.width = NS_STATIC_CAST(nscoord, (mPageRect.right-mPageRect.left)*mDevUnitsToAppUnits);
-		aRect.height = NS_STATIC_CAST(nscoord, (mPageRect.bottom-mPageRect.top)*mDevUnitsToAppUnits);
+		aRect.width = static_cast<nscoord>((mPageRect.right-mPageRect.left)*mDevUnitsToAppUnits);
+		aRect.height = static_cast<nscoord>((mPageRect.bottom-mPageRect.top)*mDevUnitsToAppUnits);
 	}
 	else {
     // we have a screen device. find the screen that the window is on and
@@ -539,8 +539,8 @@ NS_IMETHODIMP nsDeviceContextMac::GetClientRect(nsRect &aRect)
 	if( mSpec ) {
 	  // we have a printer device
 	  aRect.x = aRect.y = 0;
-		aRect.width = NS_STATIC_CAST(nscoord, (mPageRect.right-mPageRect.left)*mDevUnitsToAppUnits);
-		aRect.height = NS_STATIC_CAST(nscoord, (mPageRect.bottom-mPageRect.top)*mDevUnitsToAppUnits);
+		aRect.width = static_cast<nscoord>((mPageRect.right-mPageRect.left)*mDevUnitsToAppUnits);
+		aRect.height = static_cast<nscoord>((mPageRect.bottom-mPageRect.top)*mDevUnitsToAppUnits);
 	}
 	else {
     // we have a screen device. find the screen that the window is on and
diff --git a/mozilla/widget/src/mac/nsDragHelperService.cpp b/mozilla/widget/src/mac/nsDragHelperService.cpp
index d94be9f175d..2b90ce377a3 100644
--- a/mozilla/widget/src/mac/nsDragHelperService.cpp
+++ b/mozilla/widget/src/mac/nsDragHelperService.cpp
@@ -358,7 +358,7 @@ void
 nsDragHelperService::DragOverTimerHandler(EventLoopTimerRef aTimer,
                                           void* aUserData)
 {
-  nsDragHelperService* self = NS_STATIC_CAST(nsDragHelperService*, aUserData);
+  nsDragHelperService* self = static_cast<nsDragHelperService*>(aUserData);
 
   self->DoDragAction(NS_DRAGDROP_OVER,
                      self->mDragOverDragRef, self->mDragOverSink);
diff --git a/mozilla/widget/src/mac/nsDragService.cpp b/mozilla/widget/src/mac/nsDragService.cpp
index d35921f8f29..0d4e88d1a7d 100644
--- a/mozilla/widget/src/mac/nsDragService.cpp
+++ b/mozilla/widget/src/mac/nsDragService.cpp
@@ -602,7 +602,7 @@ nsDragService::GetData ( nsITransferable * aTransferable, PRUint32 aItemIndex )
             if (!dataFound) {
               loadResult = ExtractDataFromOS(mDragRef, itemRef, 'TEXT', &dataBuff, &dataSize);
               if ( NS_SUCCEEDED(loadResult) && dataBuff ) {
-                const char* castedText = NS_REINTERPRET_CAST(char*, dataBuff);          
+                const char* castedText = reinterpret_cast<char*>(dataBuff);          
                 PRUnichar* convertedText = nsnull;
                 PRInt32 convertedTextLen = 0;
                 nsPrimitiveHelpers::ConvertPlatformPlainTextToUnicode ( castedText, dataSize, 
@@ -625,7 +625,7 @@ nsDragService::GetData ( nsITransferable * aTransferable, PRUint32 aItemIndex )
 
 	    if ( strcmp(flavorStr.get(), kFileMime) == 0 ) {
 	      // we have a HFSFlavor struct in |dataBuff|. Create an nsLocalFileMac object.
-	      HFSFlavor* fileData = NS_REINTERPRET_CAST(HFSFlavor*, dataBuff);
+	      HFSFlavor* fileData = reinterpret_cast<HFSFlavor*>(dataBuff);
 	      NS_ASSERTION ( sizeof(HFSFlavor) == dataSize, "Ooops, we really don't have a HFSFlavor" );
 	      nsCOMPtr<nsILocalFileMac> file;
 	      if ( NS_SUCCEEDED(NS_NewLocalFileWithFSSpec(&fileData->fileSpec, PR_TRUE, getter_AddRefs(file))) )
@@ -633,7 +633,7 @@ nsDragService::GetData ( nsITransferable * aTransferable, PRUint32 aItemIndex )
 	    }
       else if ((strcmp(flavorStr.get(), kURLDataMime) == 0) || (strcmp(flavorStr.get(), kURLDescriptionMime) == 0)) {
         // need to convert platform data to unicode
-        const char* castedText        = NS_REINTERPRET_CAST(char*, dataBuff);          
+        const char* castedText        = reinterpret_cast<char*>(dataBuff);          
         PRUnichar*  convertedText     = nsnull;
         PRInt32     convertedTextLen  = 0;
         nsPrimitiveHelpers::ConvertPlatformPlainTextToUnicode(castedText, dataSize, 
@@ -649,7 +649,7 @@ nsDragService::GetData ( nsITransferable * aTransferable, PRUint32 aItemIndex )
 	    else {
           // we probably have some form of text. The DOM only wants LF, so convert k
           // from MacOS line endings to DOM line endings.
-          nsLinebreakHelpers::ConvertPlatformToDOMLinebreaks(flavorStr.get(), &dataBuff, NS_REINTERPRET_CAST(int*, &dataSize));
+          nsLinebreakHelpers::ConvertPlatformToDOMLinebreaks(flavorStr.get(), &dataBuff, reinterpret_cast<int*>(&dataSize));
 
           unsigned char *dataPtr = (unsigned char *) dataBuff;
           // skip BOM (Byte Order Mark to distinguish little or big endian) in 'utxt'
@@ -796,7 +796,7 @@ nsDragService::DragSendDataProc(FlavorType inFlavor, void* inRefCon, ItemReferen
 									DragReference inDragRef)
 {
   OSErr retVal = noErr;
-  nsDragService* dragService = NS_STATIC_CAST(nsDragService*, inRefCon);
+  nsDragService* dragService = static_cast<nsDragService*>(inRefCon);
   NS_ASSERTION ( dragService, "Refcon not set correctly for DragSendDataProc" );
   if (dragService) {
     void* data = nsnull;
@@ -982,7 +982,7 @@ nsDragService::GetDataForFlavor(nsISupportsArray* inDragItems, DragReference inD
     // Convert unix to mac linebreaks, since mac linebreaks are required for clipboard compatibility.
     // I'm making the assumption here that the substitution will be entirely in-place, since both
     // types of line breaks are 1-byte.
-    PRUnichar* castedUnicode = NS_REINTERPRET_CAST(PRUnichar*, *outData);
+    PRUnichar* castedUnicode = reinterpret_cast<PRUnichar*>(*outData);
     nsLinebreakConverter::ConvertUnicharLineBreaksInSitu(&castedUnicode,
                                                          nsLinebreakConverter::eLinebreakUnix,
                                                          nsLinebreakConverter::eLinebreakMac,
@@ -1015,8 +1015,8 @@ nsDragService::GetDataForFlavor(nsISupportsArray* inDragItems, DragReference inD
       }
       else if (NS_SUCCEEDED(rv)) {
         // create a single run with the default system script
-        scriptCodeRuns = NS_REINTERPRET_CAST(ScriptCodeRun*,
-                                             nsMemory::Alloc(sizeof(ScriptCodeRun)));
+        scriptCodeRuns = reinterpret_cast<ScriptCodeRun*>
+                                         (nsMemory::Alloc(sizeof(ScriptCodeRun)));
         if (scriptCodeRuns) {
           scriptCodeRuns[0].offset = 0;
           scriptCodeRuns[0].script = (ScriptCode) ::GetScriptManagerVariable(smSysScript);
@@ -1084,7 +1084,7 @@ nsDragService::LookupMimeMappingsForItem ( DragReference inDragRef, ItemReferenc
 #if 0 
   OSErr err = ::GetFlavorDataSize ( inDragRef, itemRef, nsMimeMapperMac::MappingFlavor(), &mapperSize );
   if ( !err && mapperSize > 0 ) {
-    mapperData = NS_REINTERPRET_CAST(char*, nsMemory::Alloc(mapperSize + 1));
+    mapperData = reinterpret_cast<char*>(nsMemory::Alloc(mapperSize + 1));
     if ( !mapperData )
       return nsnull;
 	          
@@ -1122,7 +1122,7 @@ nsDragService::ExtractDataFromOS ( DragReference inDragRef, ItemReference inItem
   Size buffSize = 0;
   OSErr err = ::GetFlavorDataSize ( inDragRef, inItemRef, inFlavor, &buffSize );
   if ( !err && buffSize > 0 ) {
-    buff = NS_REINTERPRET_CAST(char*, nsMemory::Alloc(buffSize + 1));
+    buff = reinterpret_cast<char*>(nsMemory::Alloc(buffSize + 1));
     if ( buff ) {	     
       err = ::GetFlavorData ( inDragRef, inItemRef, inFlavor, buff, &buffSize, 0 );
       if (err == noErr) {
diff --git a/mozilla/widget/src/mac/nsFilePicker.cpp b/mozilla/widget/src/mac/nsFilePicker.cpp
index 6078a933261..e54b9c860ef 100644
--- a/mozilla/widget/src/mac/nsFilePicker.cpp
+++ b/mozilla/widget/src/mac/nsFilePicker.cpp
@@ -226,7 +226,7 @@ void nsFilePicker::HandleShowPopupMenuSelect(NavCBRecPtr callBackParms)
 //
 pascal void nsFilePicker::FileDialogEventHandlerProc(NavEventCallbackMessage msg, NavCBRecPtr cbRec, NavCallBackUserData callbackUD)
 {
-  nsFilePicker* self = NS_REINTERPRET_CAST(nsFilePicker*, callbackUD);
+  nsFilePicker* self = reinterpret_cast<nsFilePicker*>(callbackUD);
   switch (msg)
   {
     case kNavCBEvent:
@@ -341,10 +341,10 @@ nsFilePicker::FileDialogFilterProc(AEDesc* theItem, void* theInfo,
                                         NavCallBackUserData callbackUD, NavFilterModes filterMode)
 {
   Boolean shouldDisplay = true;
-  nsFilePicker* self = NS_REINTERPRET_CAST(nsFilePicker*, callbackUD);
+  nsFilePicker* self = reinterpret_cast<nsFilePicker*>(callbackUD);
   if ( self && !self->mAllFilesDisplayed ) {
     if ( theItem->descriptorType == typeFSS ) {
-      NavFileOrFolderInfo* info = NS_REINTERPRET_CAST ( NavFileOrFolderInfo*, theInfo );
+      NavFileOrFolderInfo* info = reinterpret_cast<NavFileOrFolderInfo*>(theInfo);
       if ( !info->isFolder ) {
         // check it against our list. If that fails, check the extension directly
         if ( ! self->IsTypeInFilterList(info->fileAndFolder.fileInfo.finderInfo.fdType) ) {
@@ -752,7 +752,7 @@ nsFilePicker::MapFilterToFileTypes ( )
               {
                 bool addToList = true;
                 OSType tempOSType;
-                icEntry->GetMacType(NS_REINTERPRET_CAST(PRUint32*, (&tempOSType)));
+                icEntry->GetMacType(reinterpret_cast<PRUint32*>((&tempOSType)));
                 for (PRUint32 typeIndex = 0; typeIndex < typesInThisFilter; typeIndex++)
                 {
                   if (mTypeLists[loop1]->osType[typeIndex] == tempOSType)
@@ -783,7 +783,7 @@ nsFilePicker::MapFilterToFileTypes ( )
         // Set how many OSTypes we actually found
         mTypeLists[loop1]->osTypeCount = typesInThisFilter;
         
-        nsMemory::Free ( NS_REINTERPRET_CAST(void*, filter) );
+        nsMemory::Free ( reinterpret_cast<void*>(filter) );
       }
     }
   }
diff --git a/mozilla/widget/src/mac/nsMacControl.cpp b/mozilla/widget/src/mac/nsMacControl.cpp
index 401d2673805..7699861c0d6 100644
--- a/mozilla/widget/src/mac/nsMacControl.cpp
+++ b/mozilla/widget/src/mac/nsMacControl.cpp
@@ -684,7 +684,7 @@ nsMacControl::ControlEventHandler(EventHandlerCallRef aHandlerCallRef,
                                   EventRef            aEvent,
                                   void*               aUserData)
 {
-  nsMacControl* self = NS_STATIC_CAST(nsMacControl*, aUserData);
+  nsMacControl* self = static_cast<nsMacControl*>(aUserData);
 
   PRBool wasDrawing = self->IsDrawing();
 
@@ -766,7 +766,7 @@ nsMacControl::WindowEventHandler(EventHandlerCallRef aHandlerCallRef,
                                  EventRef            aEvent,
                                  void*               aUserData)
 {
-  nsMacControl* self = NS_STATIC_CAST(nsMacControl*, aUserData);
+  nsMacControl* self = static_cast<nsMacControl*>(aUserData);
 
   // HiliteControl will cause the control to draw, so take care to only
   // call SetupControlHiliteState if the control is supposed to be visible.
diff --git a/mozilla/widget/src/mac/nsMacEventHandler.cpp b/mozilla/widget/src/mac/nsMacEventHandler.cpp
index dd49ba99333..ac11ab9ff51 100644
--- a/mozilla/widget/src/mac/nsMacEventHandler.cpp
+++ b/mozilla/widget/src/mac/nsMacEventHandler.cpp
@@ -233,7 +233,7 @@ void nsMacEventDispatchHandler::SetDeactivated(nsWindow *aDeactivatedWidget)
     // clear out mActiveWidget.
 
     if (mActiveWidget) {
-      nsCOMPtr<nsIWidget> curWin = do_QueryInterface(NS_STATIC_CAST(nsIWidget*, mActiveWidget));
+      nsCOMPtr<nsIWidget> curWin = do_QueryInterface(static_cast<nsIWidget*>(mActiveWidget));
       for (;;) {
         nsIWidget* parent = curWin->GetParent();
         if (!parent)
@@ -241,7 +241,7 @@ void nsMacEventDispatchHandler::SetDeactivated(nsWindow *aDeactivatedWidget)
         curWin = parent;
       }
 
-      if (NS_STATIC_CAST(nsWindow*, NS_STATIC_CAST(nsIWidget*, curWin)) == aDeactivatedWidget) {
+      if (static_cast<nsWindow*>(static_cast<nsIWidget*>(curWin)) == aDeactivatedWidget) {
         //printf("   nsMacEventDispatchHandler::SetDeactivated sends NS_DEACTIVATE\n");
         mActiveWidget->RemoveDeleteObserver(this);
         mActiveWidget = nsnull;
@@ -532,7 +532,7 @@ PRBool nsMacEventHandler::DragEvent(unsigned int aMessage,
   // origin stuff just in case it has been changed.
   Point hitPointLocal = aMouseGlobal;
   WindowRef wind =
-   NS_STATIC_CAST(WindowRef, mTopLevelWidget->GetNativeData(NS_NATIVE_DISPLAY));
+   static_cast<WindowRef>(mTopLevelWidget->GetNativeData(NS_NATIVE_DISPLAY));
   nsGraphicsUtils::SafeSetPortWindowPort(wind);
   {
     StOriginSetter  originSetter(wind);
@@ -1005,7 +1005,7 @@ PRUint32 nsMacEventHandler::ConvertKeyEventToUnicode(EventRecord& aOSEvent)
 									kUnicodeLooseMappingsMask,
 									0,NULL,NULL,NULL,
 									sizeof(PRUnichar)*UNICODE_BUFFER_SIZE_FOR_KEY,&source_read,
-									&result_size,NS_REINTERPRET_CAST(PRUint16*, unicharResult));
+									&result_size,reinterpret_cast<PRUint16*>(unicharResult));
 	::DisposeTextToUnicodeInfo(&textToUnicodeInfo);
 	NS_ASSERTION(err == noErr, "nsMacEventHandler::ConvertKeyEventToUnicode: ConverFromTextToUnicode failed.");
 	// if we got the following result, then it mean we got more than one Unichar from it.
@@ -1174,8 +1174,8 @@ void nsMacEventHandler::HandleActivateEvent(EventRef aEvent)
 	if (isActive && sLastActive != this)
 	{
 		if (sLastActive) {
-			WindowRef oldWindow = NS_STATIC_CAST(WindowRef,
-			 sLastActive->mTopLevelWidget->GetNativeData(NS_NATIVE_DISPLAY));
+			WindowRef oldWindow = static_cast<WindowRef>
+                                    (sLastActive->mTopLevelWidget->GetNativeData(NS_NATIVE_DISPLAY));
 			// Deactivating also causes HandleActivateEvent to
 			// be called on sLastActive with isActive = PR_FALSE,
 			// so sLastActive will be nsnull after this call.
@@ -1322,8 +1322,8 @@ nsMacEventHandler::ScrollAxis(nsMouseScrollEvent::nsMouseScrollFlags aAxis,
                               PRUint32 aModifiers)
 {
   // Only scroll active windows.  Treat popups as active.
-  WindowRef windowRef = NS_STATIC_CAST(WindowRef,
-                         mTopLevelWidget->GetNativeData(NS_NATIVE_DISPLAY));
+  WindowRef windowRef = static_cast<WindowRef>
+                                   (mTopLevelWidget->GetNativeData(NS_NATIVE_DISPLAY));
   nsWindowType windowType;
   mTopLevelWidget->GetWindowType(windowType);
   if (!::IsWindowActive(windowRef) && windowType != eWindowType_popup)
@@ -1447,7 +1447,7 @@ PRBool nsMacEventHandler::HandleMouseDownEvent(EventRecord&	aOSEvent)
             widgetChain->GetElementAt ( i, getter_AddRefs(genericWidget) );
             nsCOMPtr<nsIWidget> widget ( do_QueryInterface(genericWidget) );
             if ( widget ) {
-              if ( NS_REINTERPRET_CAST(WindowPtr,widget->GetNativeData(NS_NATIVE_DISPLAY)) == whichWindow )
+              if ( reinterpret_cast<WindowPtr>(widget->GetNativeData(NS_NATIVE_DISPLAY)) == whichWindow )
                  rollup = PR_FALSE;
             }         
           } // foreach parent menu widget
@@ -1518,7 +1518,7 @@ PRBool nsMacEventHandler::HandleMouseDownEvent(EventRecord&	aOSEvent)
 			ConvertOSEventToMouseEvent(aOSEvent, mouseEvent);
 
 			nsCOMPtr<nsIWidget> kungFuDeathGrip ( mouseEvent.widget );            // ensure widget doesn't go away
-			nsWindow* widgetHit = NS_STATIC_CAST(nsWindow*, mouseEvent.widget);   //   while we're processing event
+			nsWindow* widgetHit = static_cast<nsWindow*>(mouseEvent.widget);   //   while we're processing event
 			if (widgetHit)
 			{        
 				// set the activation and focus on the widget hit, if it accepts it
diff --git a/mozilla/widget/src/mac/nsMacMessagePump.cpp b/mozilla/widget/src/mac/nsMacMessagePump.cpp
index 977f8e1bac5..a166155b5a9 100644
--- a/mozilla/widget/src/mac/nsMacMessagePump.cpp
+++ b/mozilla/widget/src/mac/nsMacMessagePump.cpp
@@ -94,7 +94,7 @@ nsMacMessagePump::nsMacMessagePump(nsToolkit *aToolkit)
    ::InstallApplicationEventHandler(sWNETransitionEventHandlerUPP,
                                     GetEventTypeCount(kWNETransitionEventList),
                                     kWNETransitionEventList,
-                                    NS_STATIC_CAST(void*, this),
+                                    static_cast<void*>(this),
                                     &mWNETransitionEventHandler);
 
   NS_ASSERTION(err == noErr, "Could not install WNETransitionEventHandler");
@@ -116,7 +116,7 @@ nsMacMessagePump::nsMacMessagePump(nsToolkit *aToolkit)
    ::InstallApplicationEventHandler(sMouseClickEventHandlerUPP,
                                     GetEventTypeCount(kMouseClickEventList),
                                     kMouseClickEventList,
-                                    NS_STATIC_CAST(void*, this),
+                                    static_cast<void*>(this),
                                     &mMouseClickEventHandler);
   NS_ASSERTION(err == noErr, "Could not install MouseClickEventHandler");
 
@@ -243,7 +243,7 @@ PRBool nsMacMessagePump::DoMouseDown(EventRecord &anEvent)
                 
                 EventRecord updateEvent = anEvent;
                 updateEvent.what = updateEvt;
-                updateEvent.message = NS_REINTERPRET_CAST(UInt32, whichWindow);
+                updateEvent.message = reinterpret_cast<UInt32>(whichWindow);
                 sink->DispatchEvent ( &updateEvent, &handled );
                 
                 sink->DragEvent ( NS_DRAGDROP_GESTURE, anEvent.where.h, anEvent.where.v, 0L, &handled );                
@@ -457,10 +457,10 @@ nsMacMessagePump::MouseClickEventHandler(EventHandlerCallRef aHandlerCallRef,
   // Classic mouse events don't record the button specifier. The message
   // parameter is unused in mouse click events, so let's stuff it there.
   // We'll pick it up in nsMacEventHandler::HandleMouseDownEvent().
-  eventRecord.message = NS_STATIC_CAST(UInt32, button);
+  eventRecord.message = static_cast<UInt32>(button);
 
   // Process the modified event internally
-  nsMacMessagePump* self = NS_STATIC_CAST(nsMacMessagePump*, aUserData);
+  nsMacMessagePump* self = static_cast<nsMacMessagePump*>(aUserData);
   PRBool handled = self->DispatchEvent(&eventRecord);
 
   if (handled)
@@ -482,7 +482,7 @@ nsMacMessagePump::WNETransitionEventHandler(EventHandlerCallRef aHandlerCallRef,
                                             EventRef            aEvent,
                                             void*               aUserData)
 {
-  nsMacMessagePump* self = NS_STATIC_CAST(nsMacMessagePump*, aUserData);
+  nsMacMessagePump* self = static_cast<nsMacMessagePump*>(aUserData);
 
   EventRecord eventRecord;
   ::ConvertEventRefToEventRecord(aEvent, &eventRecord);
diff --git a/mozilla/widget/src/mac/nsMacNativeUnicodeConverter.cpp b/mozilla/widget/src/mac/nsMacNativeUnicodeConverter.cpp
index e7f7b19f8d2..cf335b32103 100644
--- a/mozilla/widget/src/mac/nsMacNativeUnicodeConverter.cpp
+++ b/mozilla/widget/src/mac/nsMacNativeUnicodeConverter.cpp
@@ -150,8 +150,8 @@ nsresult nsMacNativeUnicodeConverter::ConvertUnicodetoScript(const PRUnichar *aU
                                               
   ByteCount inputRead;
   ItemCount scriptRunOutLen;
-  ScriptCodeRun *scriptCodeRuns = NS_REINTERPRET_CAST(ScriptCodeRun*,
-                                                      nsMemory::Alloc(sizeof(ScriptCodeRun) * 
+  ScriptCodeRun *scriptCodeRuns = reinterpret_cast<ScriptCodeRun*>
+                                                  (nsMemory::Alloc(sizeof(ScriptCodeRun) * 
                                                       aUnicodeStrLen));
   if (!scriptCodeRuns) {
     ::DisposeUnicodeToTextRunInfo(&unicodeToTextInfo);
diff --git a/mozilla/widget/src/mac/nsMacWindow.cpp b/mozilla/widget/src/mac/nsMacWindow.cpp
index f64afdc82c4..03ecfc06e54 100644
--- a/mozilla/widget/src/mac/nsMacWindow.cpp
+++ b/mozilla/widget/src/mac/nsMacWindow.cpp
@@ -314,7 +314,7 @@ nsresult nsMacWindow::StandardCreate(nsIWidget *aParent,
     // When creating a popup window, aNativeParent is not a WindowPtr but
     // an nsIWidget, so walk up that tree to the top-level window and get
     // the dispatch handler.
-    nsIWidget* widget = NS_STATIC_CAST(nsIWidget*, aNativeParent);
+    nsIWidget* widget = static_cast<nsIWidget*>(aNativeParent);
     nsIWidget* topWidget = nsnull;
 
     while (widget && (widget = widget->GetParent()))
@@ -563,7 +563,7 @@ nsresult nsMacWindow::StandardCreate(nsIWidget *aParent,
   // ourselves off a property of the window. This allows places like
   // event handlers to get our widget or event sink when all they have
   // is a native WindowPtr.
-  nsIWidget* temp = NS_STATIC_CAST(nsIWidget*, this);
+  nsIWidget* temp = static_cast<nsIWidget*>(this);
   OSStatus err = ::SetWindowProperty ( mWindowPtr,
                           kTopLevelWidgetPropertyCreator, kTopLevelWidgetRefPropertyTag,
                           sizeof(nsIWidget*), &temp );
@@ -666,7 +666,7 @@ nsresult nsMacWindow::StandardCreate(nsIWidget *aParent,
                                       sKeyEventHandlerUPP,
                                       GetEventTypeCount(kKeyEventList),
                                       kKeyEventList,
-                                      NS_STATIC_CAST(void*, this),
+                                      static_cast<void*>(this),
                                       NULL);
     NS_ASSERTION(err == noErr, "Couldn't install key event handler");
 
@@ -720,7 +720,7 @@ nsMacWindow::ScrollEventHandler(EventHandlerCallRef aHandlerCallRef,
   SInt32 deltaY = 0, deltaX = 0;
   PRBool isPixels = PR_FALSE;
 
-  nsMacWindow* self = NS_REINTERPRET_CAST(nsMacWindow*, aUserData);
+  nsMacWindow* self = reinterpret_cast<nsMacWindow*>(aUserData);
 
   EventKind kind = ::GetEventKind(aEvent);
 
@@ -822,7 +822,7 @@ pascal OSStatus
 nsMacWindow::WindowEventHandler ( EventHandlerCallRef inHandlerChain, EventRef inEvent, void* userData )
 {
   OSStatus retVal = eventNotHandledErr;  // Presume we won't consume the event
-  nsMacWindow* self = NS_REINTERPRET_CAST(nsMacWindow*, userData);
+  nsMacWindow* self = reinterpret_cast<nsMacWindow*>(userData);
   if (self) {
     UInt32 what = ::GetEventKind(inEvent);
     switch (what) {
@@ -1979,7 +1979,7 @@ nsMacWindow::DispatchEvent ( void* anEvent, PRBool *_retval )
 {
   *_retval = PR_FALSE;
   NS_ENSURE_TRUE(mMacEventHandler.get(), NS_ERROR_FAILURE);
-  *_retval = mMacEventHandler->HandleOSEvent(*NS_REINTERPRET_CAST(EventRecord*,anEvent));
+  *_retval = mMacEventHandler->HandleOSEvent(*reinterpret_cast<EventRecord*>(anEvent));
 
   return NS_OK;
 }
@@ -1996,7 +1996,7 @@ nsMacWindow::DispatchMenuEvent ( void* anEvent, PRInt32 aNativeResult, PRBool *_
 #if USE_MENUSELECT
   *_retval = PR_FALSE;
   NS_ENSURE_TRUE(mMacEventHandler.get(), NS_ERROR_FAILURE);
-  *_retval = mMacEventHandler->HandleMenuCommand(*NS_REINTERPRET_CAST(EventRecord*,anEvent), aNativeResult);
+  *_retval = mMacEventHandler->HandleMenuCommand(*reinterpret_cast<EventRecord*>(anEvent), aNativeResult);
 #endif
 
   return NS_OK;
@@ -2308,13 +2308,13 @@ NS_IMETHODIMP nsMacWindow::GetChildSheet(PRBool aShown, nsMacWindow** _retval)
 
   while (child) {
     // nsWindow is the base widget in the Carbon widget library, this is safe
-    nsWindow* window = NS_STATIC_CAST(nsWindow*, child);
+    nsWindow* window = static_cast<nsWindow*>(child);
 
     nsWindowType type;
     if (NS_SUCCEEDED(window->GetWindowType(type)) &&
         type == eWindowType_sheet) {
       // if it's a sheet, it must be an nsMacWindow
-      nsMacWindow* macWindow = NS_STATIC_CAST(nsMacWindow*, window);
+      nsMacWindow* macWindow = static_cast<nsMacWindow*>(window);
 
       if ((aShown && macWindow->mShown) ||
           (!aShown && macWindow->mSheetNeedsShow)) {
@@ -2355,7 +2355,7 @@ nsMacWindow::KeyEventHandler(EventHandlerCallRef aHandlerCallRef,
                              EventRef            aEvent,
                              void*               aUserData)
 {
-  nsMacWindow* self = NS_STATIC_CAST(nsMacWindow*, aUserData);
+  nsMacWindow* self = static_cast<nsMacWindow*>(aUserData);
   NS_ASSERTION(self, "No self?");
   NS_ASSERTION(self->mMacEventHandler.get(), "No mMacEventHandler?");
 
diff --git a/mozilla/widget/src/mac/nsMenuBarX.cpp b/mozilla/widget/src/mac/nsMenuBarX.cpp
index 65ed3a78749..7cb9e72cecc 100644
--- a/mozilla/widget/src/mac/nsMenuBarX.cpp
+++ b/mozilla/widget/src/mac/nsMenuBarX.cpp
@@ -256,7 +256,7 @@ nsMenuBarX :: InstallCommandEventHandler ( )
 {
   OSStatus err = noErr;
   
-  WindowRef myWindow = NS_REINTERPRET_CAST(WindowRef, mParent->GetNativeData(NS_NATIVE_DISPLAY));
+  WindowRef myWindow = reinterpret_cast<WindowRef>(mParent->GetNativeData(NS_NATIVE_DISPLAY));
   NS_ASSERTION ( myWindow, "Can't get WindowRef to install command handler!" );
   if ( myWindow && sCommandEventHandler ) {
     const EventTypeSpec commandEventList[] = {
@@ -295,7 +295,7 @@ nsMenuBarX :: CommandEventHandler ( EventHandlerCallRef inHandlerChain, EventRef
   NS_ASSERTION(::GetEventKind(inEvent) == kEventCommandProcess,
                "CommandEventHandler asked to handle unknown event kind");
 
-  nsMenuBarX* self = NS_REINTERPRET_CAST(nsMenuBarX*, userData);
+  nsMenuBarX* self = reinterpret_cast<nsMenuBarX*>(userData);
   switch (command.commandID) {
     case kHICommandPreferences: {
       nsEventStatus status = self->ExecuteCommand(self->mPrefItemContent);
@@ -337,8 +337,8 @@ nsMenuBarX :: CommandEventHandler ( EventHandlerCallRef inHandlerChain, EventRef
       // that content node. Recall that we store weak pointers to the content
       // nodes in the hash table.
       nsPRUint32Key key(command.commandID);
-      nsIMenuItem* content = NS_REINTERPRET_CAST(nsIMenuItem*,
-                                               self->mObserverTable.Get(&key));
+      nsIMenuItem* content = reinterpret_cast<nsIMenuItem*>
+                                             (self->mObserverTable.Get(&key));
       if (content) {
         content->DoCommand();
         handled = noErr;
@@ -396,8 +396,8 @@ nsEventStatus
 nsMenuBarX::MenuConstruct( const nsMenuEvent & aMenuEvent, nsIWidget* aParentWindow, 
                             void * menubarNode, void * aDocShell )
 {
-  mDocShellWeakRef = do_GetWeakReference(NS_STATIC_CAST(nsIDocShell*, aDocShell));
-  nsIDOMNode* aDOMNode  = NS_STATIC_CAST(nsIDOMNode*, menubarNode);
+  mDocShellWeakRef = do_GetWeakReference(static_cast<nsIDocShell*>(aDocShell));
+  nsIDOMNode* aDOMNode  = static_cast<nsIDOMNode*>(menubarNode);
   mMenuBarContent = do_QueryInterface(aDOMNode);           // strong ref
   NS_ASSERTION ( mMenuBarContent, "No content specified for this menubar" );
   if ( !mMenuBarContent )
@@ -434,9 +434,9 @@ nsMenuBarX::MenuConstruct( const nsMenuEvent & aMenuEvent, nsIWidget* aParentWin
         // Create nsMenu, the menubar will own it
         nsCOMPtr<nsIMenu> pnsMenu ( do_CreateInstance(kMenuCID) );
         if ( pnsMenu ) {
-          pnsMenu->Create(NS_STATIC_CAST(nsIMenuBar*, this), menuName, menuAccessKey, 
-                          NS_STATIC_CAST(nsIChangeManager *, this), 
-                          NS_REINTERPRET_CAST(nsIDocShell*, aDocShell), menu);
+          pnsMenu->Create(static_cast<nsIMenuBar*>(this), menuName, menuAccessKey, 
+                          static_cast<nsIChangeManager *>(this), 
+                          reinterpret_cast<nsIDocShell*>(aDocShell), menu);
 
           // Make nsMenu a child of nsMenuBar. nsMenuBar takes ownership
           AddMenu(pnsMenu); 
@@ -780,7 +780,7 @@ nsMenuBarX :: Lookup ( nsIContent *aContent, nsIChangeObserver **_retval )
   *_retval = nsnull;
   
   nsVoidKey key ( aContent );
-  *_retval = NS_REINTERPRET_CAST(nsIChangeObserver*, mObserverTable.Get(&key));
+  *_retval = reinterpret_cast<nsIChangeObserver*>(mObserverTable.Get(&key));
   NS_IF_ADDREF ( *_retval );
   
   return NS_OK;
diff --git a/mozilla/widget/src/mac/nsMenuItemX.cpp b/mozilla/widget/src/mac/nsMenuItemX.cpp
index c918595bc50..9cc80a9f238 100644
--- a/mozilla/widget/src/mac/nsMenuItemX.cpp
+++ b/mozilla/widget/src/mac/nsMenuItemX.cpp
@@ -117,7 +117,7 @@ NS_METHOD nsMenuItemX::Create(nsIMenu* aParent, const nsString & aLabel, PRBool
   
   // register for AttributeChanged messages
   mManager = aManager;
-  nsCOMPtr<nsIChangeObserver> obs = do_QueryInterface(NS_STATIC_CAST(nsIChangeObserver*,this));
+  nsCOMPtr<nsIChangeObserver> obs = do_QueryInterface(static_cast<nsIChangeObserver*>(this));
   mManager->Register(mContent, obs);   // does not addref this
   
   mEnabled = !mContent->AttrValueIs(kNameSpaceID_None, nsWidgetAtoms::disabled, nsWidgetAtoms::_true, eCaseMatters);
@@ -141,7 +141,7 @@ NS_METHOD nsMenuItemX::Create(nsIMenu* aParent, const nsString & aLabel, PRBool
     }
   }
 
-  mIcon = new nsMenuItemIcon(NS_STATIC_CAST(nsIMenuItem*, this),
+  mIcon = new nsMenuItemIcon(static_cast<nsIMenuItem*>(this),
                              mMenuParent, mContent);
 
   return NS_OK;
diff --git a/mozilla/widget/src/mac/nsMenuX.cpp b/mozilla/widget/src/mac/nsMenuX.cpp
index a9c36f27d36..c8c044d708d 100644
--- a/mozilla/widget/src/mac/nsMenuX.cpp
+++ b/mozilla/widget/src/mac/nsMenuX.cpp
@@ -155,7 +155,7 @@ nsMenuX::Create(nsISupports * aParent, const nsAString &aLabel, const nsAString
 
   // register this menu to be notified when changes are made to our content object
   mManager = aManager;			// weak ref
-  nsCOMPtr<nsIChangeObserver> changeObs ( do_QueryInterface(NS_STATIC_CAST(nsIChangeObserver*, this)) );
+  nsCOMPtr<nsIChangeObserver> changeObs ( do_QueryInterface(static_cast<nsIChangeObserver*>(this)) );
   mManager->Register(mMenuContent, changeObs);
 
   NS_ASSERTION ( mMenuContent, "Menu not given a dom node at creation time" );
@@ -187,7 +187,7 @@ nsMenuX::Create(nsISupports * aParent, const nsAString &aLabel, const nsAString
   MenuConstruct(fake, nsnull, nsnull, nsnull);
 
   if (menu)
-    mIcon = new nsMenuItemIcon(NS_STATIC_CAST(nsIMenu*, this),
+    mIcon = new nsMenuItemIcon(static_cast<nsIMenu*>(this),
                                menu, mMenuContent);
 
   return NS_OK;
@@ -1191,7 +1191,7 @@ nsMenuX :: CountVisibleBefore ( PRUint32* outVisibleBefore )
     menubarParent->GetMenuAt(i, *getter_AddRefs(currMenu));
     
     // we found ourselves, break out
-    if ( currMenu == NS_STATIC_CAST(nsIMenu*, this) ) {
+    if ( currMenu == static_cast<nsIMenu*>(this) ) {
       gotThisMenu = PR_TRUE;
       break;
     }
diff --git a/mozilla/widget/src/mac/nsMimeMapper.cpp b/mozilla/widget/src/mac/nsMimeMapper.cpp
index 00b3de76eec..0fb1171dd10 100644
--- a/mozilla/widget/src/mac/nsMimeMapper.cpp
+++ b/mozilla/widget/src/mac/nsMimeMapper.cpp
@@ -273,7 +273,7 @@ nsMimeMapperMac::ExportMapping ( short * outLength ) const
   // create a string of that length and fill it in with each mapping. We have to
   // consider the possibility that there aren't any generic (internal mozilla) flavors
   // so the map could be empty.
-  exportBuffer = NS_STATIC_CAST(char*, nsMemory::Alloc(len + 1));      // don't forget the NULL
+  exportBuffer = static_cast<char*>(nsMemory::Alloc(len + 1));      // don't forget the NULL
   if ( !exportBuffer )
     return nsnull;
   *exportBuffer = '\0';                          // null terminate at the start for strcat()
diff --git a/mozilla/widget/src/mac/nsPrintSettingsX.cpp b/mozilla/widget/src/mac/nsPrintSettingsX.cpp
index ffb2b9f6968..7563f0838b5 100644
--- a/mozilla/widget/src/mac/nsPrintSettingsX.cpp
+++ b/mozilla/widget/src/mac/nsPrintSettingsX.cpp
@@ -433,7 +433,7 @@ nsresult nsPrintSettingsX::_Clone(nsIPrintSettings **_retval)
 //-------------------------------------------
 NS_IMETHODIMP nsPrintSettingsX::_Assign(nsIPrintSettings *aPS)
 {
-  nsPrintSettingsX *printSettingsX = NS_STATIC_CAST(nsPrintSettingsX*, aPS);
+  nsPrintSettingsX *printSettingsX = static_cast<nsPrintSettingsX*>(aPS);
   if (!printSettingsX)
     return NS_ERROR_UNEXPECTED;
   *this = *printSettingsX;
diff --git a/mozilla/widget/src/mac/nsScreenManagerMac.cpp b/mozilla/widget/src/mac/nsScreenManagerMac.cpp
index 6a73e9b3cc4..8590ba0ebb7 100644
--- a/mozilla/widget/src/mac/nsScreenManagerMac.cpp
+++ b/mozilla/widget/src/mac/nsScreenManagerMac.cpp
@@ -63,7 +63,7 @@ nsScreenManagerMac :: ~nsScreenManagerMac()
 {
   // walk our list of cached screens and delete them.
   for ( int i = 0; i < mScreenList.Count(); ++i ) {
-    ScreenListItem* item = NS_REINTERPRET_CAST(ScreenListItem*, mScreenList[i]);
+    ScreenListItem* item = reinterpret_cast<ScreenListItem*>(mScreenList[i]);
     delete item;
   }
 }
@@ -86,7 +86,7 @@ nsScreenManagerMac :: CreateNewScreenObject ( GDHandle inDevice )
   // look through our screen list, hoping to find it. If it's not there,
   // add it and return the new one.
   for ( int i = 0; i < mScreenList.Count(); ++i ) {
-    ScreenListItem* curr = NS_REINTERPRET_CAST(ScreenListItem*, mScreenList[i]);
+    ScreenListItem* curr = reinterpret_cast<ScreenListItem*>(mScreenList[i]);
     if ( inDevice == curr->mGD ) {
       NS_IF_ADDREF(retScreen = curr->mScreen.get());
       return retScreen;
diff --git a/mozilla/widget/src/mac/nsSound.cpp b/mozilla/widget/src/mac/nsSound.cpp
index deee2b82ce8..75d3060c7d4 100644
--- a/mozilla/widget/src/mac/nsSound.cpp
+++ b/mozilla/widget/src/mac/nsSound.cpp
@@ -239,7 +239,7 @@ nsSound::PlaySystemSound(const nsAString &aSoundName)
   if (!soundRequest)
     return NS_ERROR_OUT_OF_MEMORY;
 
-  requestSupports = NS_STATIC_CAST(nsITimerCallback*, soundRequest);
+  requestSupports = static_cast<nsITimerCallback*>(soundRequest);
   
   Str255  soundResource;
   nsresult rv = GetSoundResourceName(NS_ConvertUTF16toUTF8(aSoundName).get(),
@@ -272,11 +272,11 @@ nsSound::Play(nsIURL *aURL)
 
   // try to get from cache
   nsCOMPtr<nsISupports>   requestSupports;
-  (void)GetSoundFromCache(NS_STATIC_CAST(nsIURI*,aURL), getter_AddRefs(requestSupports));
+  (void)GetSoundFromCache(static_cast<nsIURI*>(aURL), getter_AddRefs(requestSupports));
   if (requestSupports)
   {
     nsSoundRequest* cachedRequest = nsSoundRequest::GetFromISupports(requestSupports);
-    nsMovieSoundRequest* movieRequest = NS_STATIC_CAST(nsMovieSoundRequest*, cachedRequest);
+    nsMovieSoundRequest* movieRequest = static_cast<nsMovieSoundRequest*>(cachedRequest);
     // if it was cached, start playing right away
     movieRequest->PlaySound();
   }
@@ -287,7 +287,7 @@ nsSound::Play(nsIURL *aURL)
     if (!soundRequest)
       return NS_ERROR_OUT_OF_MEMORY;
 
-    requestSupports = NS_STATIC_CAST(nsITimerCallback*, soundRequest);
+    requestSupports = static_cast<nsITimerCallback*>(soundRequest);
     nsresult  rv = soundRequest->Init(this, aURL);
     if (NS_FAILED(rv))
       return rv;
@@ -478,7 +478,7 @@ nsSoundRequest::GetFromISupports(nsISupports* inSupports)
   nsCOMPtr<nsITimerCallback>  timerCallback = do_QueryInterface(inSupports);
   if (!timerCallback) return nsnull;
   
-  return NS_REINTERPRET_CAST(nsSoundRequest*, inSupports);
+  return reinterpret_cast<nsSoundRequest*>(inSupports);
 }
 
 
@@ -502,8 +502,8 @@ nsSoundRequest::Cleanup()
   nsCOMPtr<nsISupports>   deathGrip(this);
   if (mSound.get())
   {
-    nsSound*    macSound = NS_REINTERPRET_CAST(nsSound*, mSound.get());
-    rv = macSound->RemoveRequest(NS_STATIC_CAST(nsITimerCallback*, this));
+    nsSound*    macSound = reinterpret_cast<nsSound*>(mSound.get());
+    rv = macSound->RemoveRequest(static_cast<nsITimerCallback*>(this));
     mSound = nsnull;
   }
   
@@ -605,7 +605,7 @@ nsSystemSoundRequest::PlaySound()
   }
   
   const PRInt32   kSoundTimerInterval = 250;      // 250 milliseconds
-  rv = mTimer->InitWithCallback(NS_STATIC_CAST(nsITimerCallback*, this), kSoundTimerInterval,
+  rv = mTimer->InitWithCallback(static_cast<nsITimerCallback*>(this), kSoundTimerInterval,
                                 nsITimer::TYPE_REPEATING_PRECISE);
   if (NS_FAILED(rv)) {
     Cleanup();
@@ -637,7 +637,7 @@ nsSystemSoundRequest::DonePlaying()
 pascal void
 nsSystemSoundRequest::SoundCallback(SndChannelPtr chan, SndCommand *theCmd)
 {
-  nsSystemSoundRequest*   soundRequest = NS_REINTERPRET_CAST(nsSystemSoundRequest*, theCmd->param2);
+  nsSystemSoundRequest*   soundRequest = reinterpret_cast<nsSystemSoundRequest*>(theCmd->param2);
   if (soundRequest)
     soundRequest->DonePlaying();
 }
@@ -735,7 +735,7 @@ nsMovieSoundRequest::Init(nsISound* aSound, nsIURL *aURL)
   NS_ASSERTION(mMovie == nsnull, "nsSound being played twice");
   
   nsCOMPtr<nsIStreamLoader> streamLoader;
-  return NS_NewStreamLoader(getter_AddRefs(streamLoader), aURL, NS_STATIC_CAST(nsIStreamLoaderObserver*, this));
+  return NS_NewStreamLoader(getter_AddRefs(streamLoader), aURL, static_cast<nsIStreamLoaderObserver*>(this));
 }
 
 NS_IMETHODIMP
@@ -774,13 +774,13 @@ nsMovieSoundRequest::OnStreamComplete(nsIStreamLoader *aLoader,
     return NS_ERROR_FAILURE;
   }
 
-  nsSound*    macSound = NS_REINTERPRET_CAST(nsSound*, mSound.get());
+  nsSound*    macSound = reinterpret_cast<nsSound*>(mSound.get());
   NS_ASSERTION(macSound, "Should have nsSound here");
   
   // put it in the cache. Not vital that this succeeds.
   // for the data size we just use the string data, since the movie simply wraps this
   // (we have to keep the handle around until the movies are done playing)
-  nsresult rv = macSound->PutSoundInCache(channel, dataLen, NS_STATIC_CAST(nsITimerCallback*, this));
+  nsresult rv = macSound->PutSoundInCache(channel, dataLen, static_cast<nsITimerCallback*>(this));
   NS_ASSERTION(NS_SUCCEEDED(rv), "Failed to put sound in cache");
   
   return PlaySound();
@@ -864,7 +864,7 @@ nsMovieSoundRequest::PlaySound()
     }
     
     const PRInt32   kMovieTimerInterval = 250;      // 250 milliseconds
-    rv = mTimer->InitWithCallback(NS_STATIC_CAST(nsITimerCallback*, this), kMovieTimerInterval,
+    rv = mTimer->InitWithCallback(static_cast<nsITimerCallback*>(this), kMovieTimerInterval,
                                   nsITimer::TYPE_REPEATING_PRECISE);
     if (NS_FAILED(rv)) {
       Cleanup();
diff --git a/mozilla/widget/src/mac/nsStylClipboardUtils.cpp b/mozilla/widget/src/mac/nsStylClipboardUtils.cpp
index 802a904c5a6..b19b8ee4f81 100644
--- a/mozilla/widget/src/mac/nsStylClipboardUtils.cpp
+++ b/mozilla/widget/src/mac/nsStylClipboardUtils.cpp
@@ -46,8 +46,7 @@ nsresult CreateStylFromScriptRuns(ScriptCodeRun *scriptCodeRuns,
                                   PRInt32 *stylLen)
 {
   PRInt32 scrpRecLen = sizeof(short) + sizeof(ScrpSTElement) * scriptRunOutLen;
-  StScrpRec *scrpRec = NS_REINTERPRET_CAST(StScrpRec*, 
-                                           nsMemory::Alloc(scrpRecLen));
+  StScrpRec *scrpRec = reinterpret_cast<StScrpRec*>(nsMemory::Alloc(scrpRecLen));
   NS_ENSURE_TRUE(scrpRec, NS_ERROR_OUT_OF_MEMORY);
   
   OSErr err = noErr;    
@@ -109,7 +108,7 @@ nsresult CreateStylFromScriptRuns(ScriptCodeRun *scriptCodeRuns,
     return NS_ERROR_FAILURE;
   }
 
-  *stylData = NS_REINTERPRET_CAST(char*, scrpRec);
+  *stylData = reinterpret_cast<char*>(scrpRec);
   *stylLen = scrpRecLen;
          
   return NS_OK;
diff --git a/mozilla/widget/src/mac/nsWindow.cpp b/mozilla/widget/src/mac/nsWindow.cpp
index a6a73657bb5..e8e2885999c 100644
--- a/mozilla/widget/src/mac/nsWindow.cpp
+++ b/mozilla/widget/src/mac/nsWindow.cpp
@@ -286,7 +286,7 @@ nsWindow::~nsWindow()
 {
 	// notify the children that we're gone
 	for (nsIWidget* kid = mFirstChild; kid; kid = kid->GetNextSibling()) {
-		nsWindow* childWindow = NS_STATIC_CAST(nsWindow*, kid);
+		nsWindow* childWindow = static_cast<nsWindow*>(kid);
 		childWindow->mParent = nsnull;
 	}
 
@@ -1307,7 +1307,7 @@ nsWindow::AddRectToArrayProc(UInt16 message, RgnHandle rgn,
 {
   if (message == kQDRegionToRectsMsgParse) {
     NS_ASSERTION(inArray, "You better pass an array!");
-    TRectArray* rectArray = NS_REINTERPRET_CAST(TRectArray*, inArray);
+    TRectArray* rectArray = reinterpret_cast<TRectArray*>(inArray);
 
     if (rectArray->mNumRects == rectArray->mCapacity) {
       // This should not happen - returning memFullErr below should have
@@ -1338,7 +1338,7 @@ nsWindow::AddRectToArrayProc(UInt16 message, RgnHandle rgn,
 void 
 nsWindow::PaintUpdateRect(Rect *inDirtyRect, void* inData)
 {
-  nsWindow* self = NS_REINTERPRET_CAST(nsWindow*, inData);
+  nsWindow* self = reinterpret_cast<nsWindow*>(inData);
   Rect dirtyRect = *inDirtyRect;
    
 	nsCOMPtr<nsIRenderingContext> renderingContext ( dont_AddRef(self->GetRenderingContext()) );
@@ -1603,7 +1603,7 @@ void nsWindow::UpdateWidget(nsRect& aRect, nsIRenderingContext* aContext)
 
 	// recursively draw the children
 	for (nsIWidget* kid = FIRST_CHILD(); kid; kid = NEXT_CHILD(kid)) {
-		nsWindow* childWindow = NS_STATIC_CAST(nsWindow*, kid);
+		nsWindow* childWindow = static_cast<nsWindow*>(kid);
 
 		nsRect childBounds;
 		childWindow->GetBounds(childBounds);
@@ -1706,7 +1706,7 @@ scrollChildren:
   //--------
   // Scroll the children
   for (nsIWidget* kid = mFirstChild; kid; kid = kid->GetNextSibling()) {
-    nsWindow* childWindow = NS_STATIC_CAST(nsWindow*, kid);
+    nsWindow* childWindow = static_cast<nsWindow*>(kid);
 
     nsRect bounds;
     childWindow->GetBounds(bounds);
@@ -1936,7 +1936,7 @@ void nsWindow::CalcWindowRegions()
 			nsIWidget* child = mFirstChild;
 			do
 			{
-				nsWindow* childWindow = NS_STATIC_CAST(nsWindow*, child);
+				nsWindow* childWindow = static_cast<nsWindow*>(child);
 					
 				PRBool visible;
 				childWindow->IsVisible(visible);
@@ -2053,7 +2053,7 @@ nsWindow*  nsWindow::FindWidgetHit(Point aThePoint)
 
 	// traverse through all the nsWindows to find out who got hit, lowest level of course
 	for (nsIWidget* kid = mLastChild; kid; kid = kid->GetPrevSibling()) {
-		nsWindow* childWindow = NS_STATIC_CAST(nsWindow*, kid);
+		nsWindow* childWindow = static_cast<nsWindow*>(kid);
 		
 		nsWindow* deeperHit = childWindow->FindWidgetHit(aThePoint);
 		if (deeperHit)
diff --git a/mozilla/widget/src/os2/nsAppShell.cpp b/mozilla/widget/src/os2/nsAppShell.cpp
index 835de50fab2..38a0efec954 100644
--- a/mozilla/widget/src/os2/nsAppShell.cpp
+++ b/mozilla/widget/src/os2/nsAppShell.cpp
@@ -48,7 +48,7 @@ static UINT sMsgId;
 MRESULT EXPENTRY EventWindowProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
   if (msg == sMsgId) {
-    nsAppShell *as = NS_REINTERPRET_CAST(nsAppShell *, mp2);
+    nsAppShell *as = reinterpret_cast<nsAppShell *>(mp2);
     as->NativeEventCallback();
     NS_RELEASE(as);
     return (MRESULT)TRUE;
@@ -106,7 +106,7 @@ nsAppShell::ScheduleNativeEventCallback()
 {
   // post a message to the native event queue...
   NS_ADDREF_THIS();
-  WinPostMsg(mEventWnd, sMsgId, 0, NS_REINTERPRET_CAST(MPARAM, this));
+  WinPostMsg(mEventWnd, sMsgId, 0, reinterpret_cast<MPARAM>(this));
 }
 
 PRBool
diff --git a/mozilla/widget/src/os2/nsClipboard.cpp b/mozilla/widget/src/os2/nsClipboard.cpp
index cfe536d736b..0f054d5afa8 100644
--- a/mozilla/widget/src/os2/nsClipboard.cpp
+++ b/mozilla/widget/src/os2/nsClipboard.cpp
@@ -137,7 +137,7 @@ PRBool nsClipboard::GetClipboardDataByID(ULONG ulFormatID, const char *aFlavor)
   PRUint32 NumOfBytes;
   PRBool TempBufAllocated = PR_FALSE;
 
-  PVOID pClipboardData = NS_REINTERPRET_CAST(PVOID, WinQueryClipbrdData( 0, ulFormatID ));
+  PVOID pClipboardData = reinterpret_cast<PVOID>(WinQueryClipbrdData( 0, ulFormatID ));
 
   if (!pClipboardData) 
     return PR_FALSE;
@@ -148,14 +148,14 @@ PRBool nsClipboard::GetClipboardDataByID(ULONG ulFormatID, const char *aFlavor)
 
     if (ulFormatID == CF_TEXT)     // CF_TEXT is one byte character set
     {
-      PRUint32 NumOfChars = strlen( NS_STATIC_CAST (char*, pDataMem) );
+      PRUint32 NumOfChars = strlen( static_cast<char*>(pDataMem) );
       NumOfBytes = NumOfChars;
 
       if (!strcmp( aFlavor, kUnicodeMime ))  // Asked for unicode, but only plain text available.  Convert it!
       {
         nsAutoChar16Buffer buffer;
         PRInt32 bufLength;
-        MultiByteToWideChar(0, NS_STATIC_CAST(char*, pDataMem), NumOfChars,
+        MultiByteToWideChar(0, static_cast<char*>(pDataMem), NumOfChars,
                             buffer, bufLength);
         pDataMem = ToNewUnicode(nsDependentString(buffer.get()));
         TempBufAllocated = PR_TRUE;
@@ -165,7 +165,7 @@ PRBool nsClipboard::GetClipboardDataByID(ULONG ulFormatID, const char *aFlavor)
     }
     else                           // All other text/.. flavors are in unicode
     {
-      PRUint32 NumOfChars = UniStrlen( NS_STATIC_CAST(UniChar*, pDataMem) );
+      PRUint32 NumOfChars = UniStrlen( static_cast<UniChar*>(pDataMem) );
       NumOfBytes = NumOfChars * sizeof(UniChar);
       PVOID pTempBuf = nsMemory::Alloc(NumOfBytes);
       memcpy(pTempBuf, pDataMem, NumOfBytes);
@@ -175,7 +175,7 @@ PRBool nsClipboard::GetClipboardDataByID(ULONG ulFormatID, const char *aFlavor)
 
     // DOM wants LF only, so convert from CRLF
     nsLinebreakHelpers::ConvertPlatformToDOMLinebreaks( aFlavor, &pDataMem,   // pDataMem could be reallocated !!
-                                                        NS_REINTERPRET_CAST(PRInt32*, &NumOfBytes) );  // yuck
+                                                        reinterpret_cast<PRInt32*>(&NumOfBytes) );  // yuck
 
   }
   else                             // Assume rest of flavors are binary data
@@ -206,8 +206,8 @@ PRBool nsClipboard::GetClipboardDataByID(ULONG ulFormatID, const char *aFlavor)
     }
     else
     {
-      pDataMem = NS_STATIC_CAST(PBYTE, pClipboardData) + sizeof(PRUint32);
-      NumOfBytes = *(NS_STATIC_CAST(PRUint32*, pClipboardData));
+      pDataMem = static_cast<PBYTE>(pClipboardData) + sizeof(PRUint32);
+      NumOfBytes = *(static_cast<PRUint32*>(pClipboardData));
     }
   }
 
@@ -254,7 +254,7 @@ void nsClipboard::SetClipboardData(const char *aFlavor)
     {
       char* pByteMem = nsnull;
 
-      if (DosAllocSharedMem( NS_REINTERPRET_CAST(PPVOID, &pByteMem), nsnull, NumOfBytes + sizeof(char), 
+      if (DosAllocSharedMem( reinterpret_cast<PPVOID>(&pByteMem), nsnull, NumOfBytes + sizeof(char), 
                              PAG_WRITE | PAG_COMMIT | OBJ_GIVEABLE ) == NO_ERROR)
       {
         memcpy( pByteMem, pMozData, NumOfBytes );       // Copy text string
@@ -262,7 +262,7 @@ void nsClipboard::SetClipboardData(const char *aFlavor)
 
         // Don't copy text larger than 64K to the clipboard
         if (strlen(pByteMem) <= 0xFFFF) {
-          WinSetClipbrdData( 0, NS_REINTERPRET_CAST(ULONG, pByteMem), ulFormatID, CFI_POINTER );
+          WinSetClipbrdData( 0, reinterpret_cast<ULONG>(pByteMem), ulFormatID, CFI_POINTER );
         } else {
           WinAlarm(HWND_DESKTOP, WA_ERROR);
         }
@@ -273,13 +273,13 @@ void nsClipboard::SetClipboardData(const char *aFlavor)
       UniChar* pUnicodeMem = nsnull;
       PRUint32 NumOfChars = NumOfBytes / sizeof(UniChar);
    
-      if (DosAllocSharedMem( NS_REINTERPRET_CAST(PPVOID, &pUnicodeMem), nsnull, NumOfBytes + sizeof(UniChar), 
+      if (DosAllocSharedMem( reinterpret_cast<PPVOID>(&pUnicodeMem), nsnull, NumOfBytes + sizeof(UniChar), 
                              PAG_WRITE | PAG_COMMIT | OBJ_GIVEABLE ) == NO_ERROR) 
       {
         memcpy( pUnicodeMem, pMozData, NumOfBytes );    // Copy text string
         pUnicodeMem[NumOfChars] = L'\0';                // Append terminator
 
-        WinSetClipbrdData( 0, NS_REINTERPRET_CAST(ULONG, pUnicodeMem), ulFormatID, CFI_POINTER );
+        WinSetClipbrdData( 0, reinterpret_cast<ULONG>(pUnicodeMem), ulFormatID, CFI_POINTER );
       }
 
       // If the flavor is unicode, we also put it on the clipboard as CF_TEXT
@@ -289,7 +289,7 @@ void nsClipboard::SetClipboardData(const char *aFlavor)
       {
         char* pByteMem = nsnull;
 
-        if (DosAllocSharedMem(NS_REINTERPRET_CAST(PPVOID, &pByteMem), nsnull,
+        if (DosAllocSharedMem(reinterpret_cast<PPVOID>(&pByteMem), nsnull,
                               NumOfBytes + 1, 
                               PAG_WRITE | PAG_COMMIT | OBJ_GIVEABLE ) == NO_ERROR) 
         {
@@ -312,12 +312,12 @@ void nsClipboard::SetClipboardData(const char *aFlavor)
 
           nsAutoCharBuffer buffer;
           PRInt32 bufLength;
-          WideCharToMultiByte(0, NS_STATIC_CAST(PRUnichar*, pMozData),
+          WideCharToMultiByte(0, static_cast<PRUnichar*>(pMozData),
                               NumOfBytes, buffer, bufLength);
           memcpy(pByteMem, buffer.get(), NumOfBytes);
           // Don't copy text larger than 64K to the clipboard
           if (strlen(pByteMem) <= 0xFFFF) {
-            WinSetClipbrdData(0, NS_REINTERPRET_CAST(ULONG, pByteMem), CF_TEXT,
+            WinSetClipbrdData(0, reinterpret_cast<ULONG>(pByteMem), CF_TEXT,
                               CFI_POINTER);
           } else {
             WinAlarm(HWND_DESKTOP, WA_ERROR);
@@ -330,13 +330,13 @@ void nsClipboard::SetClipboardData(const char *aFlavor)
   {
     PBYTE pBinaryMem = nsnull;
 
-    if (DosAllocSharedMem( NS_REINTERPRET_CAST(PPVOID, &pBinaryMem), nsnull, NumOfBytes + sizeof(PRUint32), 
+    if (DosAllocSharedMem( reinterpret_cast<PPVOID>(&pBinaryMem), nsnull, NumOfBytes + sizeof(PRUint32), 
                            PAG_WRITE | PAG_COMMIT | OBJ_GIVEABLE ) == NO_ERROR) 
     {
-      *(NS_REINTERPRET_CAST(PRUint32*, pBinaryMem)) = NumOfBytes;          // First DWORD contains data length
+      *(reinterpret_cast<PRUint32*>(pBinaryMem)) = NumOfBytes;          // First DWORD contains data length
       memcpy( pBinaryMem + sizeof(PRUint32), pMozData, NumOfBytes );  // Copy binary data
 
-      WinSetClipbrdData( 0, NS_REINTERPRET_CAST(ULONG, pBinaryMem), ulFormatID, CFI_POINTER );
+      WinSetClipbrdData( 0, reinterpret_cast<ULONG>(pBinaryMem), ulFormatID, CFI_POINTER );
     }
 
     // If the flavor is image, we also put it on clipboard as CF_BITMAP
diff --git a/mozilla/widget/src/os2/nsFilePicker.cpp b/mozilla/widget/src/os2/nsFilePicker.cpp
index 18fcc715f7a..42103631297 100644
--- a/mozilla/widget/src/os2/nsFilePicker.cpp
+++ b/mozilla/widget/src/os2/nsFilePicker.cpp
@@ -563,7 +563,7 @@ char * nsFilePicker::ConvertToFileSystemCharset(const nsAString& inString)
     rv = mUnicodeEncoder->GetMaxLength(flatInString.get(), inLength,
                                        &outLength);
     if (NS_SUCCEEDED(rv)) {
-      outString = NS_STATIC_CAST( char*, nsMemory::Alloc( outLength+1 ) );
+      outString = static_cast<char*>(nsMemory::Alloc( outLength+1 ));
       if (nsnull == outString) {
         return nsnull;
       }
@@ -602,7 +602,7 @@ PRUnichar * nsFilePicker::ConvertFromFileSystemCharset(const char *inString)
     PRInt32 outLength;
     rv = mUnicodeDecoder->GetMaxLength(inString, inLength, &outLength);
     if (NS_SUCCEEDED(rv)) {
-      outString = NS_STATIC_CAST( PRUnichar*, nsMemory::Alloc( (outLength+1) * sizeof( PRUnichar ) ) );
+      outString = static_cast<PRUnichar*>(nsMemory::Alloc( (outLength+1) * sizeof( PRUnichar ) ));
       if (nsnull == outString) {
         return nsnull;
       }
diff --git a/mozilla/widget/src/os2/nsWindow.cpp b/mozilla/widget/src/os2/nsWindow.cpp
index 5f32d85a636..d9ea5451b65 100644
--- a/mozilla/widget/src/os2/nsWindow.cpp
+++ b/mozilla/widget/src/os2/nsWindow.cpp
@@ -2016,7 +2016,7 @@ HBITMAP nsWindow::DataToBitmap(PRUint8* aImageData, PRUint32 aWidth,
 
   // create a bitmap from the image data
   HBITMAP hBmp = GpiCreateBitmap(hps, &bi.head, CBM_INIT,
-                 NS_REINTERPRET_CAST(BYTE*, aImageData),
+                 reinterpret_cast<BYTE*>(aImageData),
                  (BITMAPINFO2*)&bi);
 
   // free the hps, then return the bitmap
diff --git a/mozilla/widget/src/photon/nsClipboard.cpp b/mozilla/widget/src/photon/nsClipboard.cpp
index a9c71669e20..563ed1ba1c1 100644
--- a/mozilla/widget/src/photon/nsClipboard.cpp
+++ b/mozilla/widget/src/photon/nsClipboard.cpp
@@ -272,9 +272,9 @@ NS_IMETHODIMP nsClipboard::SetNativeClipboardData(PRInt32 aWhichClipboard)
 					!strcmp(cliphdr[index].type, Ph_CLIPBOARD_TYPE_HTML) ||
 					!strcmp(cliphdr[index].type, Ph_CLIPBOARD_TYPE_MOZ_BOOKMARK) )
 			{
-				PRUnichar* castedUnicode = NS_REINTERPRET_CAST(PRUnichar*, data);
+				PRUnichar* castedUnicode = reinterpret_cast<PRUnichar*>(data);
 				char *utf8String = ToNewUTF8String(nsDependentString(castedUnicode, dataLen/2));
-				nsMemory::Free(NS_REINTERPRET_CAST(char*, data));
+				nsMemory::Free(reinterpret_cast<char*>(data));
 
 				if( !strcmp(cliphdr[index].type, Ph_CLIPBOARD_TYPE_TEXT) )
 				{
@@ -286,7 +286,7 @@ NS_IMETHODIMP nsClipboard::SetNativeClipboardData(PRInt32 aWhichClipboard)
 					char *temp = ( char * ) nsMemory::Alloc( len + 1 );
 					memcpy( temp, utf8String, len );
 					temp[len] = 0;
-					nsMemory::Free(NS_REINTERPRET_CAST(char*, utf8String));
+					nsMemory::Free(reinterpret_cast<char*>(utf8String));
 
         	cliphdr[index].length = len+1;
         	cliphdr[index].data = temp;
@@ -302,7 +302,7 @@ NS_IMETHODIMP nsClipboard::SetNativeClipboardData(PRInt32 aWhichClipboard)
 
 	PhClipboardCopy( mInputGroup, index, cliphdr );
 	for( PRUint32 k=0; k<index; k++)
-		nsMemory::Free(NS_REINTERPRET_CAST(char*, cliphdr[k].data));
+		nsMemory::Free(reinterpret_cast<char*>(cliphdr[k].data));
 
 	free( cliphdr );
 
@@ -443,7 +443,7 @@ nsClipboard::GetNativeClipboardData(nsITransferable * aTransferable,
 
     					decoder->GetMaxLength(data, dataLen, &outUnicodeLen);   // |outUnicodeLen| is number of chars
     					if (outUnicodeLen) {
-      					unicodeData = NS_REINTERPRET_CAST(PRUnichar*, nsMemory::Alloc((outUnicodeLen + 1) * sizeof(PRUnichar)));
+      					unicodeData = reinterpret_cast<PRUnichar*>(nsMemory::Alloc((outUnicodeLen + 1) * sizeof(PRUnichar)));
       					if ( unicodeData ) {
         					PRInt32 numberTmp = dataLen;
         					rv = decoder->Convert(data, &numberTmp, unicodeData, &outUnicodeLen);
@@ -457,7 +457,7 @@ nsClipboard::GetNativeClipboardData(nsITransferable * aTransferable,
 								} // if valid length
 
 
-    					data = NS_REINTERPRET_CAST(char*,unicodeData);
+    					data = reinterpret_cast<char*>(unicodeData);
     					dataLen = outUnicodeLen * 2;
 
 							nsCOMPtr<nsISupports> genericDataWrapper;
diff --git a/mozilla/widget/src/photon/nsWidget.cpp b/mozilla/widget/src/photon/nsWidget.cpp
index c06b7a80c6b..ee92960b2de 100644
--- a/mozilla/widget/src/photon/nsWidget.cpp
+++ b/mozilla/widget/src/photon/nsWidget.cpp
@@ -703,7 +703,7 @@ NS_IMETHODIMP nsWidget::DispatchEvent( nsGUIEvent *aEvent, nsEventStatus &aStatu
 
   if( nsnull != mMenuListener ) {
     if( NS_MENU_EVENT == aEvent->eventStructType )
-      aStatus = mMenuListener->MenuSelected(NS_STATIC_CAST(nsMenuEvent&, *aEvent));
+      aStatus = mMenuListener->MenuSelected(static_cast<nsMenuEvent&>(*aEvent));
   	}
 
   aStatus = nsEventStatus_eIgnore;
diff --git a/mozilla/widget/src/photon/nsWindow.cpp b/mozilla/widget/src/photon/nsWindow.cpp
index 9cdcd2d7efa..81e58153209 100644
--- a/mozilla/widget/src/photon/nsWindow.cpp
+++ b/mozilla/widget/src/photon/nsWindow.cpp
@@ -166,7 +166,7 @@ void nsWindow::DestroyNativeChildren(void)
   for(PtWidget_t *w=PtWidgetChildFront( mWidget ); w; w=PtWidgetBrotherBehind( w )) 
   {
 	  if( w->flags & Pt_DESTROYED ) continue;
-	  nsWindow *childWindow = NS_STATIC_CAST(nsWindow *, GetInstance(w) );
+	  nsWindow *childWindow = static_cast<nsWindow *>(GetInstance(w));
 		if( childWindow && !childWindow->mIsDestroying) childWindow->Destroy();
   }
 }
@@ -726,7 +726,7 @@ void nsWindow::RawDrawFunc( PtWidget_t * pWidget, PhTile_t * damage )
 			if( pev.renderingContext ) {
 				nsIRegion *ClipRegion = pWin->GetRegion( );
 				ClipRegion->SetTo( nsDmg.x, nsDmg.y, nsDmg.width, nsDmg.height );
-				pev.renderingContext->SetClipRegion( NS_STATIC_CAST(const nsIRegion &, *(ClipRegion)), nsClipCombine_kReplace );
+				pev.renderingContext->SetClipRegion( static_cast<const nsIRegion &>(*(ClipRegion)), nsClipCombine_kReplace );
 
 				NS_RELEASE( ClipRegion );
 				
diff --git a/mozilla/widget/src/windows/nsAppShell.cpp b/mozilla/widget/src/windows/nsAppShell.cpp
index 17b5640e618..9b81af7060f 100644
--- a/mozilla/widget/src/windows/nsAppShell.cpp
+++ b/mozilla/widget/src/windows/nsAppShell.cpp
@@ -71,7 +71,7 @@ static BOOL PeekKeyAndIMEMessage(LPMSG msg, HWND hwnd)
 nsAppShell::EventWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
   if (uMsg == sMsgId) {
-    nsAppShell *as = NS_REINTERPRET_CAST(nsAppShell *, lParam);
+    nsAppShell *as = reinterpret_cast<nsAppShell *>(lParam);
     as->NativeEventCallback();
     NS_RELEASE(as);
     return TRUE;
@@ -125,7 +125,7 @@ nsAppShell::ScheduleNativeEventCallback()
 {
   // post a message to the native event queue...
   NS_ADDREF_THIS();
-  ::PostMessage(mEventWnd, sMsgId, 0, NS_REINTERPRET_CAST(LPARAM, this));
+  ::PostMessage(mEventWnd, sMsgId, 0, reinterpret_cast<LPARAM>(this));
 }
 
 PRBool
diff --git a/mozilla/widget/src/windows/nsClipboard.cpp b/mozilla/widget/src/windows/nsClipboard.cpp
index 901f7cdebe9..24fa875d2b5 100644
--- a/mozilla/widget/src/windows/nsClipboard.cpp
+++ b/mozilla/widget/src/windows/nsClipboard.cpp
@@ -160,7 +160,7 @@ nsresult nsClipboard::SetupNativeDataObject(nsITransferable * aTransferable, IDa
     return NS_ERROR_FAILURE;
   }
 
-  nsDataObj * dObj = NS_STATIC_CAST(nsDataObj *, aDataObj);
+  nsDataObj * dObj = static_cast<nsDataObj *>(aDataObj);
 
   // Now give the Transferable to the DataObject 
   // for getting the data out of it
@@ -297,7 +297,7 @@ nsresult nsClipboard::GetGlobalData(HGLOBAL aHGBL, void ** aData, PRUint32 * aLe
   if (aHGBL != NULL) {
     LPSTR lpStr = (LPSTR) GlobalLock(aHGBL);
     DWORD allocSize = GlobalSize(aHGBL);
-    char* data = NS_STATIC_CAST(char*, nsMemory::Alloc(allocSize + sizeof(PRUnichar)));
+    char* data = static_cast<char*>(nsMemory::Alloc(allocSize + sizeof(PRUnichar)));
     if ( data ) {    
       memcpy ( data, lpStr, allocSize );
       data[allocSize] = data[allocSize + 1] = '\0';     // null terminate for safety
@@ -451,7 +451,7 @@ nsresult nsClipboard::GetNativeDataOffClipboard(IDataObject * aDataObject, UINT
                 // (on 98, these are not the same) so we can't use that.
                 PRUint32 allocLen = 0;
                 if ( NS_SUCCEEDED(GetGlobalData(stm.hGlobal, aData, &allocLen)) ) {
-                  *aLen = strlen ( NS_REINTERPRET_CAST(char*, *aData) );
+                  *aLen = strlen ( reinterpret_cast<char*>(*aData) );
                   result = NS_OK;
                 }
               } break;
@@ -466,7 +466,7 @@ nsresult nsClipboard::GetNativeDataOffClipboard(IDataObject * aDataObject, UINT
                 // (on 98, these are not the same) so we can't use that.
                 PRUint32 allocLen = 0;
                 if ( NS_SUCCEEDED(GetGlobalData(stm.hGlobal, aData, &allocLen)) ) {
-                  *aLen = nsCRT::strlen(NS_REINTERPRET_CAST(PRUnichar*, *aData)) * 2;
+                  *aLen = nsCRT::strlen(reinterpret_cast<PRUnichar*>(*aData)) * 2;
                   result = NS_OK;
                 }
               } break;
@@ -503,7 +503,7 @@ nsresult nsClipboard::GetNativeDataOffClipboard(IDataObject * aDataObject, UINT
                 NS_ASSERTION ( aIndex < numFiles, "Asked for a file index out of range of list" );
                 if (numFiles > 0) {
                   UINT fileNameLen = ::DragQueryFileW(dropFiles, aIndex, nsnull, 0);
-                  PRUnichar* buffer = NS_REINTERPRET_CAST(PRUnichar*, nsMemory::Alloc((fileNameLen + 1) * sizeof(PRUnichar)));
+                  PRUnichar* buffer = reinterpret_cast<PRUnichar*>(nsMemory::Alloc((fileNameLen + 1) * sizeof(PRUnichar)));
                   if ( buffer ) {
                     ::DragQueryFileW(dropFiles, aIndex, buffer, fileNameLen + 1);
                     *aData = buffer;
@@ -546,7 +546,7 @@ nsresult nsClipboard::GetNativeDataOffClipboard(IDataObject * aDataObject, UINT
                     *aLen = allocLen;
                   }
                   else
-                    *aLen = nsCRT::strlen(NS_REINTERPRET_CAST(PRUnichar*, *aData)) * sizeof(PRUnichar);
+                    *aLen = nsCRT::strlen(reinterpret_cast<PRUnichar*>(*aData)) * sizeof(PRUnichar);
                   result = NS_OK;
                 }
               }
@@ -633,7 +633,7 @@ nsresult nsClipboard::GetDataFromDataObject(IDataObject     * aDataObject,
         nsCOMPtr<nsISupports> genericDataWrapper;
           if ( strcmp(flavorStr, kFileMime) == 0 ) {
             // we have a file path in |data|. Create an nsLocalFile object.
-            nsDependentString filepath(NS_REINTERPRET_CAST(PRUnichar*, data));
+            nsDependentString filepath(reinterpret_cast<PRUnichar*>(data));
             nsCOMPtr<nsILocalFile> file;
             if ( NS_SUCCEEDED(NS_NewLocalFile(filepath, PR_FALSE, getter_AddRefs(file))) )
               genericDataWrapper = do_QueryInterface(file);
@@ -653,14 +653,14 @@ nsresult nsClipboard::GetDataFromDataObject(IDataObject     * aDataObject,
           nsMemory::Free(data);
         }
         else if ( strcmp(flavorStr, kJPEGImageMime) == 0) {
-          nsIInputStream * imageStream = NS_REINTERPRET_CAST(nsIInputStream*, data);
+          nsIInputStream * imageStream = reinterpret_cast<nsIInputStream*>(data);
           genericDataWrapper = do_QueryInterface(imageStream);
           NS_IF_RELEASE(imageStream);
         }
         else {
           // we probably have some form of text. The DOM only wants LF, so convert from Win32 line 
           // endings to DOM line endings.
-          PRInt32 signedLen = NS_STATIC_CAST(PRInt32, dataLen);
+          PRInt32 signedLen = static_cast<PRInt32>(dataLen);
           nsLinebreakHelpers::ConvertPlatformToDOMLinebreaks ( flavorStr, &data, &signedLen );
           dataLen = signedLen;
 
@@ -728,7 +728,7 @@ nsClipboard :: FindUnicodeFromPlainText ( IDataObject* inDataObject, UINT inInde
   // try again with text/plain. If that is present, convert it to unicode.
   nsresult loadResult = GetNativeDataOffClipboard(inDataObject, inIndex, GetFormat(kTextMime), outData, outDataLen);
   if ( NS_SUCCEEDED(loadResult) && *outData ) {
-    const char* castedText = NS_REINTERPRET_CAST(char*, *outData);          
+    const char* castedText = reinterpret_cast<char*>(*outData);          
     PRUnichar* convertedText = nsnull;
     PRInt32 convertedTextLen = 0;
     nsPrimitiveHelpers::ConvertPlatformPlainTextToUnicode ( castedText, *outDataLen, 
@@ -763,7 +763,7 @@ nsClipboard :: FindURLFromLocalFile ( IDataObject* inDataObject, UINT inIndex, v
   nsresult loadResult = GetNativeDataOffClipboard(inDataObject, inIndex, GetFormat(kFileMime), outData, outDataLen);
   if ( NS_SUCCEEDED(loadResult) && *outData ) {
     // we have a file path in |data|. Is it an internet shortcut or a normal file?
-    const nsDependentString filepath(NS_STATIC_CAST(PRUnichar*, *outData));
+    const nsDependentString filepath(static_cast<PRUnichar*>(*outData));
     nsCOMPtr<nsILocalFile> file;
     nsresult rv = NS_NewLocalFile(filepath, PR_TRUE, getter_AddRefs(file));
     if (NS_FAILED(rv))
@@ -776,7 +776,7 @@ nsClipboard :: FindURLFromLocalFile ( IDataObject* inDataObject, UINT inIndex, v
         // convert it to unicode and pass it out
         nsMemory::Free(*outData);
         *outData = UTF8ToNewUnicode(url);
-        *outDataLen = nsCRT::strlen(NS_STATIC_CAST(PRUnichar*, *outData)) * sizeof(PRUnichar);
+        *outDataLen = nsCRT::strlen(static_cast<PRUnichar*>(*outData)) * sizeof(PRUnichar);
 
         dataFound = PR_TRUE;
       }
@@ -789,7 +789,7 @@ nsClipboard :: FindURLFromLocalFile ( IDataObject* inDataObject, UINT inIndex, v
       // convert it to unicode and pass it out
       nsMemory::Free(*outData);
       *outData = UTF8ToNewUnicode(urlSpec);
-      *outDataLen = nsCRT::strlen(NS_STATIC_CAST(PRUnichar*, *outData)) * sizeof(PRUnichar);
+      *outDataLen = nsCRT::strlen(static_cast<PRUnichar*>(*outData)) * sizeof(PRUnichar);
       dataFound = PR_TRUE;
     } // else regular file
   }
diff --git a/mozilla/widget/src/windows/nsDataObj.cpp b/mozilla/widget/src/windows/nsDataObj.cpp
index 4e04edb4645..5923c2a59d4 100644
--- a/mozilla/widget/src/windows/nsDataObj.cpp
+++ b/mozilla/widget/src/windows/nsDataObj.cpp
@@ -313,7 +313,7 @@ nsDataObj::~nsDataObj()
   NS_IF_RELEASE(mTransferable);
   PRInt32 i;
   for (i=0;i<mDataFlavors->Count();i++) {
-    nsCAutoString* df = NS_REINTERPRET_CAST(nsCAutoString *, mDataFlavors->ElementAt(i));
+    nsCAutoString* df = reinterpret_cast<nsCAutoString *>(mDataFlavors->ElementAt(i));
     delete df;
   }
 
@@ -409,7 +409,7 @@ STDMETHODIMP nsDataObj::GetData(LPFORMATETC pFE, LPSTGMEDIUM pSTM)
   FORMATETC fe;
   m_enumFE->Reset();
   while (NOERROR == m_enumFE->Next(1, &fe, &count)) {
-    nsCAutoString * df = NS_REINTERPRET_CAST(nsCAutoString*, mDataFlavors->SafeElementAt(dfInx));
+    nsCAutoString * df = reinterpret_cast<nsCAutoString*>(mDataFlavors->SafeElementAt(dfInx));
     if ( df ) {
       if (FormatsMatch(fe, *pFE)) {
         pSTM->pUnkForRelease = NULL;        // caller is responsible for deleting this data
@@ -889,8 +889,7 @@ nsDataObj :: GetFileDescriptorInternetShortcutA ( FORMATETC& aFE, STGMEDIUM& aST
   if (!fileGroupDescHandle)
     return E_OUTOFMEMORY;
 
-  LPFILEGROUPDESCRIPTORA fileGroupDescA = NS_REINTERPRET_CAST(LPFILEGROUPDESCRIPTORA, 
-      ::GlobalLock(fileGroupDescHandle));
+  LPFILEGROUPDESCRIPTORA fileGroupDescA = reinterpret_cast<LPFILEGROUPDESCRIPTORA>(::GlobalLock(fileGroupDescHandle));
   if (!fileGroupDescA) {
     ::GlobalFree(fileGroupDescHandle);
     return E_OUTOFMEMORY;
@@ -935,8 +934,7 @@ nsDataObj :: GetFileDescriptorInternetShortcutW ( FORMATETC& aFE, STGMEDIUM& aST
   if (!fileGroupDescHandle)
     return E_OUTOFMEMORY;
 
-  LPFILEGROUPDESCRIPTORW fileGroupDescW = NS_REINTERPRET_CAST(LPFILEGROUPDESCRIPTORW, 
-      ::GlobalLock(fileGroupDescHandle));
+  LPFILEGROUPDESCRIPTORW fileGroupDescW = reinterpret_cast<LPFILEGROUPDESCRIPTORW>(::GlobalLock(fileGroupDescHandle));
   if (!fileGroupDescW) {
     ::GlobalFree(fileGroupDescHandle);
     return E_OUTOFMEMORY;
@@ -996,7 +994,7 @@ nsDataObj :: GetFileContentsInternetShortcut ( FORMATETC& aFE, STGMEDIUM& aSTG )
   if ( !hGlobalMemory )
     return E_OUTOFMEMORY;
 
-  char* contents = NS_REINTERPRET_CAST(char*, ::GlobalLock(hGlobalMemory));
+  char* contents = reinterpret_cast<char*>(::GlobalLock(hGlobalMemory));
   if ( !contents ) {
     ::GlobalFree( hGlobalMemory );
     return E_OUTOFMEMORY;
@@ -1114,7 +1112,7 @@ HRESULT nsDataObj::GetText(const nsACString & aDataFlavor, FORMATETC& aFE, STGME
     // Someone is asking for text/plain; convert the unicode (assuming it's present)
     // to text with the correct platform encoding.
     char* plainTextData = nsnull;
-    PRUnichar* castedUnicode = NS_REINTERPRET_CAST(PRUnichar*, data);
+    PRUnichar* castedUnicode = reinterpret_cast<PRUnichar*>(data);
     PRInt32 plainTextLen = 0;
     nsPrimitiveHelpers::ConvertUnicodeToPlatformPlainText ( castedUnicode, len / 2, &plainTextData, &plainTextLen );
    
@@ -1133,7 +1131,7 @@ HRESULT nsDataObj::GetText(const nsACString & aDataFlavor, FORMATETC& aFE, STGME
   else if ( aFE.cfFormat == nsClipboard::CF_HTML ) {
     // Someone is asking for win32's HTML flavor. Convert our html fragment
     // from unicode to UTF-8 then put it into a format specified by msft.
-    NS_ConvertUTF16toUTF8 converter ( NS_REINTERPRET_CAST(PRUnichar*, data) );
+    NS_ConvertUTF16toUTF8 converter ( reinterpret_cast<PRUnichar*>(data) );
     char* utf8HTML = nsnull;
     nsresult rv = BuildPlatformHTML ( converter.get(), &utf8HTML );      // null terminates
     
@@ -1158,8 +1156,8 @@ HRESULT nsDataObj::GetText(const nsACString & aDataFlavor, FORMATETC& aFE, STGME
 
   // Copy text to Global Memory Area
   if ( hGlobalMemory ) {
-    char* dest = NS_REINTERPRET_CAST(char*, GlobalLock(hGlobalMemory));
-    char* source = NS_REINTERPRET_CAST(char*, data);
+    char* dest = reinterpret_cast<char*>(GlobalLock(hGlobalMemory));
+    char* source = reinterpret_cast<char*>(data);
     memcpy ( dest, source, allocLen );                         // copies the null as well
     GlobalUnlock(hGlobalMemory);
   }
@@ -1488,7 +1486,7 @@ nsDataObj::ExtractUniformResourceLocatorA(FORMATETC& aFE, STGMEDIUM& aSTG )
   if (!hGlobalMemory)
     return E_OUTOFMEMORY;
 
-  char* contents = NS_REINTERPRET_CAST(char*, GlobalLock(hGlobalMemory));
+  char* contents = reinterpret_cast<char*>(GlobalLock(hGlobalMemory));
   if (!contents) {
     GlobalFree(hGlobalMemory);
     return E_OUTOFMEMORY;
@@ -1516,7 +1514,7 @@ nsDataObj::ExtractUniformResourceLocatorW(FORMATETC& aFE, STGMEDIUM& aSTG )
   if (!hGlobalMemory)
     return E_OUTOFMEMORY;
 
-  wchar_t* contents = NS_REINTERPRET_CAST(wchar_t*, GlobalLock(hGlobalMemory));
+  wchar_t* contents = reinterpret_cast<wchar_t*>(GlobalLock(hGlobalMemory));
   if (!contents) {
     GlobalFree(hGlobalMemory);
     return E_OUTOFMEMORY;
@@ -1588,8 +1586,7 @@ HRESULT nsDataObj::GetFileDescriptor_IStreamA(FORMATETC& aFE, STGMEDIUM& aSTG)
   HGLOBAL fileGroupDescHandle = ::GlobalAlloc(GMEM_ZEROINIT|GMEM_SHARE,sizeof(FILEGROUPDESCRIPTORW));
   NS_ENSURE_TRUE(fileGroupDescHandle, E_OUTOFMEMORY);
 
-  LPFILEGROUPDESCRIPTORA fileGroupDescA = NS_REINTERPRET_CAST(LPFILEGROUPDESCRIPTORA, 
-                                                              ::GlobalLock(fileGroupDescHandle));
+  LPFILEGROUPDESCRIPTORA fileGroupDescA = reinterpret_cast<LPFILEGROUPDESCRIPTORA>(::GlobalLock(fileGroupDescHandle));
   if (!fileGroupDescA) {
     ::GlobalFree(fileGroupDescHandle);
     return E_OUTOFMEMORY;
@@ -1628,8 +1625,7 @@ HRESULT nsDataObj::GetFileDescriptor_IStreamW(FORMATETC& aFE, STGMEDIUM& aSTG)
   HGLOBAL fileGroupDescHandle = ::GlobalAlloc(GMEM_ZEROINIT|GMEM_SHARE,sizeof(FILEGROUPDESCRIPTORW));
   NS_ENSURE_TRUE(fileGroupDescHandle, E_OUTOFMEMORY);
 
-  LPFILEGROUPDESCRIPTORW fileGroupDescW = NS_REINTERPRET_CAST(LPFILEGROUPDESCRIPTORW, 
-                                                              ::GlobalLock(fileGroupDescHandle));
+  LPFILEGROUPDESCRIPTORW fileGroupDescW = reinterpret_cast<LPFILEGROUPDESCRIPTORW>(::GlobalLock(fileGroupDescHandle));
   if (!fileGroupDescW) {
     ::GlobalFree(fileGroupDescHandle);
     return E_OUTOFMEMORY;
diff --git a/mozilla/widget/src/windows/nsDeviceContextSpecWin.cpp b/mozilla/widget/src/windows/nsDeviceContextSpecWin.cpp
index 509d7b35297..98083fd1e5d 100644
--- a/mozilla/widget/src/windows/nsDeviceContextSpecWin.cpp
+++ b/mozilla/widget/src/windows/nsDeviceContextSpecWin.cpp
@@ -389,7 +389,7 @@ CheckForPrintToFile(nsIPrintSettings* aPS, LPTSTR aPrinterName, PRUnichar* aUPri
   } else {
     nsCAutoString nativeName;
     NS_CopyUnicodeToNative(nsDependentString(aUPrinterName), nativeName);
-    CheckForPrintToFileWithName(NS_CONST_CAST(char*, nativeName.get()), toFile);
+    CheckForPrintToFileWithName(const_cast<char*>(nativeName.get()), toFile);
   }
 #endif
   // Since the driver wasn't a "Print To File" Driver, check to see
@@ -750,7 +750,7 @@ nsDeviceContextSpecWin::GetDataFromPrinter(const PRUnichar * aName, nsIPrintSett
   HANDLE hPrinter = NULL;
   nsCAutoString nativeName;
   NS_CopyUnicodeToNative(nsDependentString(aName), nativeName);
-  BOOL status = ::OpenPrinter(NS_CONST_CAST(char*, nativeName.get()),
+  BOOL status = ::OpenPrinter(const_cast<char*>(nativeName.get()),
                               &hPrinter, NULL);
   if (status) {
 
@@ -759,7 +759,7 @@ nsDeviceContextSpecWin::GetDataFromPrinter(const PRUnichar * aName, nsIPrintSett
 
     // Allocate a buffer of the correct size.
     dwNeeded = ::DocumentProperties(NULL, hPrinter,
-                                    NS_CONST_CAST(char*, nativeName.get()),
+                                    const_cast<char*>(nativeName.get()),
                                     NULL, NULL, 0);
 
     pDevMode = (LPDEVMODE)::HeapAlloc (::GetProcessHeap(), HEAP_ZERO_MEMORY, dwNeeded);
@@ -767,14 +767,14 @@ nsDeviceContextSpecWin::GetDataFromPrinter(const PRUnichar * aName, nsIPrintSett
 
     // Get the default DevMode for the printer and modify it for our needs.
     dwRet = DocumentProperties(NULL, hPrinter, 
-                               NS_CONST_CAST(char*, nativeName.get()),
+                               const_cast<char*>(nativeName.get()),
                                pDevMode, NULL, DM_OUT_BUFFER);
 
     if (dwRet == IDOK && aPS) {
       SetupDevModeFromSettings(pDevMode, aPS);
       // Sets back the changes we made to the DevMode into the Printer Driver
       dwRet = ::DocumentProperties(NULL, hPrinter,
-                                   NS_CONST_CAST(char*, nativeName.get()),
+                                   const_cast<char*>(nativeName.get()),
                                    pDevMode, pDevMode,
                                    DM_IN_BUFFER | DM_OUT_BUFFER);
     }
@@ -789,7 +789,7 @@ nsDeviceContextSpecWin::GetDataFromPrinter(const PRUnichar * aName, nsIPrintSett
 
     SetDevMode(pDevMode); // cache the pointer and takes responsibility for the memory
 
-    SetDeviceName(NS_CONST_CAST(char*, nativeName.get()));
+    SetDeviceName(const_cast<char*>(nativeName.get()));
 
     SetDriverName("WINSPOOL");
 
diff --git a/mozilla/widget/src/windows/nsDragService.cpp b/mozilla/widget/src/windows/nsDragService.cpp
index f5efacdc07b..3c53856e1f7 100644
--- a/mozilla/widget/src/windows/nsDragService.cpp
+++ b/mozilla/widget/src/windows/nsDragService.cpp
@@ -267,7 +267,7 @@ nsDragService::GetDataObjCollection(IDataObject* aDataObj)
     nsIDataObjCollection* dataObj;
     if (aDataObj->QueryInterface(IID_IDataObjCollection,
                                  (void**)&dataObj) == S_OK) {
-      dataObjCol = NS_STATIC_CAST(nsDataObjCollection*, aDataObj);
+      dataObjCol = static_cast<nsDataObjCollection*>(aDataObj);
       dataObj->Release();
     }
   }
diff --git a/mozilla/widget/src/windows/nsFilePicker.cpp b/mozilla/widget/src/windows/nsFilePicker.cpp
index c651d11caf6..831e8e99929 100644
--- a/mozilla/widget/src/windows/nsFilePicker.cpp
+++ b/mozilla/widget/src/windows/nsFilePicker.cpp
@@ -129,7 +129,7 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
   // suppress blur events
   if (mParentWidget) {
     nsIWidget *tmp = mParentWidget;
-    nsWindow *parent = NS_STATIC_CAST(nsWindow *, tmp);
+    nsWindow *parent = static_cast<nsWindow *>(tmp);
     parent->SuppressBlurEvents(PR_TRUE);
   }
 
@@ -391,7 +391,7 @@ NS_IMETHODIMP nsFilePicker::ShowW(PRInt16 *aReturnVal)
   }
   if (mParentWidget) {
     nsIWidget *tmp = mParentWidget;
-    nsWindow *parent = NS_STATIC_CAST(nsWindow *, tmp);
+    nsWindow *parent = static_cast<nsWindow *>(tmp);
     parent->SuppressBlurEvents(PR_FALSE);
   }
 
diff --git a/mozilla/widget/src/windows/nsImageClipboard.cpp b/mozilla/widget/src/windows/nsImageClipboard.cpp
index d13931e5f38..5c094f237fe 100644
--- a/mozilla/widget/src/windows/nsImageClipboard.cpp
+++ b/mozilla/widget/src/windows/nsImageClipboard.cpp
@@ -245,7 +245,7 @@ nsImageToClipboard::CreateFromImage ( nsIImage* inImage, HANDLE* outBitmap )
 
   inImage->LockImagePixels ( PR_FALSE );
   if ( inImage->GetBits() ) {
-    BITMAPINFOHEADER* imageHeader = NS_REINTERPRET_CAST(BITMAPINFOHEADER*, inImage->GetBitInfo());
+    BITMAPINFOHEADER* imageHeader = reinterpret_cast<BITMAPINFOHEADER*>(inImage->GetBitInfo());
     NS_ASSERTION ( imageHeader, "Can't get header for image" );
     if ( !imageHeader )
       return NS_ERROR_FAILURE;
diff --git a/mozilla/widget/src/windows/nsKeyboardLayout.cpp b/mozilla/widget/src/windows/nsKeyboardLayout.cpp
index 268dc2981fc..997aaba01f1 100644
--- a/mozilla/widget/src/windows/nsKeyboardLayout.cpp
+++ b/mozilla/widget/src/windows/nsKeyboardLayout.cpp
@@ -521,8 +521,8 @@ inline PRInt32 KeyboardLayout::GetKeyIndex (PRUint8 aVirtualKey)
 
 int PR_CALLBACK KeyboardLayout::CompareDeadKeyEntries (const void* aArg1, const void* aArg2, void*)
 {
-  const DeadKeyEntry* arg1 = NS_STATIC_CAST (const DeadKeyEntry*, aArg1);
-  const DeadKeyEntry* arg2 = NS_STATIC_CAST (const DeadKeyEntry*, aArg2);
+  const DeadKeyEntry* arg1 = static_cast<const DeadKeyEntry*>(aArg1);
+  const DeadKeyEntry* arg2 = static_cast<const DeadKeyEntry*>(aArg2);
 
   return arg1->BaseChar - arg2->BaseChar;
 }
@@ -534,10 +534,10 @@ const DeadKeyTable* KeyboardLayout::AddDeadKeyTable (const DeadKeyEntry* aDeadKe
   const size_t bytes = offsetof (DeadKeyTableListEntry, data) + DeadKeyTable::SizeInBytes (aEntries);
   PRUint8* p = new PRUint8 [bytes];
 
-  mDeadKeyTableListHead = NS_REINTERPRET_CAST (DeadKeyTableListEntry*, p);
+  mDeadKeyTableListHead = reinterpret_cast<DeadKeyTableListEntry*>(p);
   mDeadKeyTableListHead->next = next;
 
-  DeadKeyTable* dkt = NS_REINTERPRET_CAST (DeadKeyTable*, mDeadKeyTableListHead->data);
+  DeadKeyTable* dkt = reinterpret_cast<DeadKeyTable*>(mDeadKeyTableListHead->data);
   
   dkt->Init (aDeadKeyArray, aEntries);
 
@@ -548,7 +548,7 @@ void KeyboardLayout::ReleaseDeadKeyTables ()
 {
   while (mDeadKeyTableListHead)
   {
-    PRUint8* p = NS_REINTERPRET_CAST (PRUint8*, mDeadKeyTableListHead);
+    PRUint8* p = reinterpret_cast<PRUint8*>(mDeadKeyTableListHead);
     mDeadKeyTableListHead = mDeadKeyTableListHead->next;
 
     delete [] p;
diff --git a/mozilla/widget/src/windows/nsNativeDragTarget.cpp b/mozilla/widget/src/windows/nsNativeDragTarget.cpp
index 4cf85245028..80e283fc84d 100644
--- a/mozilla/widget/src/windows/nsNativeDragTarget.cpp
+++ b/mozilla/widget/src/windows/nsNativeDragTarget.cpp
@@ -186,7 +186,7 @@ nsNativeDragTarget::DispatchDragDropEvent(PRUint32 aEventType, POINTL aPT)
   nsEventStatus status;
   nsMouseEvent event(PR_TRUE, aEventType, mWindow, nsMouseEvent::eReal);
 
-  nsWindow * win = NS_STATIC_CAST(nsWindow *, mWindow);
+  nsWindow * win = static_cast<nsWindow *>(mWindow);
   win->InitEvent(event);
   POINT cpos;
 
@@ -273,7 +273,7 @@ nsNativeDragTarget::DragEnter(LPDATAOBJECT pIDataSource,
   // the actual implementation we wanted, so we know this is
   // a nsDragService. It should be a private interface, though.
   nsDragService * winDragService =
-    NS_STATIC_CAST(nsDragService *, mDragService);
+    static_cast<nsDragService *>(mDragService);
   winDragService->SetIDataObject(pIDataSource);
 
   // Now process the native drag state and then dispatch the event
@@ -352,7 +352,7 @@ nsNativeDragTarget::Drop(LPDATAOBJECT pData,
   // the actual implementation we wanted, so we know this is
   // a nsDragService (but it should still be a private interface)
   nsDragService * winDragService =
-    NS_STATIC_CAST(nsDragService *, mDragService);
+    static_cast<nsDragService *>(mDragService);
   winDragService->SetIDataObject(pData);
 
   // Note: Calling ProcessDrag can destroy us; don't touch members after that.
diff --git a/mozilla/widget/src/windows/nsPrintSettingsWin.cpp b/mozilla/widget/src/windows/nsPrintSettingsWin.cpp
index 28d2928349a..625330355d9 100644
--- a/mozilla/widget/src/windows/nsPrintSettingsWin.cpp
+++ b/mozilla/widget/src/windows/nsPrintSettingsWin.cpp
@@ -193,7 +193,7 @@ nsPrintSettingsWin& nsPrintSettingsWin::operator=(const nsPrintSettingsWin& rhs)
 nsresult 
 nsPrintSettingsWin::_Assign(nsIPrintSettings *aPS)
 {
-  nsPrintSettingsWin *psWin = NS_STATIC_CAST(nsPrintSettingsWin*, aPS);
+  nsPrintSettingsWin *psWin = static_cast<nsPrintSettingsWin*>(aPS);
   *this = *psWin;
   return NS_OK;
 }
diff --git a/mozilla/widget/src/windows/nsScreenManagerWin.cpp b/mozilla/widget/src/windows/nsScreenManagerWin.cpp
index f6159a7e9cc..734194c4d30 100644
--- a/mozilla/widget/src/windows/nsScreenManagerWin.cpp
+++ b/mozilla/widget/src/windows/nsScreenManagerWin.cpp
@@ -76,7 +76,7 @@ nsScreenManagerWin :: ~nsScreenManagerWin()
 {
   // walk our list of cached screens and delete them.
   for ( int i = 0; i < mScreenList.Count(); ++i ) {
-    ScreenListItem* item = NS_REINTERPRET_CAST(ScreenListItem*, mScreenList[i]);
+    ScreenListItem* item = reinterpret_cast<ScreenListItem*>(mScreenList[i]);
     delete item;
   }
 }
@@ -102,7 +102,7 @@ nsScreenManagerWin :: CreateNewScreenObject ( void* inScreen )
   // look through our screen list, hoping to find it. If it's not there,
   // add it and return the new one.
   for ( int i = 0; i < mScreenList.Count(); ++i ) {
-    ScreenListItem* curr = NS_REINTERPRET_CAST(ScreenListItem*, mScreenList[i]);
+    ScreenListItem* curr = reinterpret_cast<ScreenListItem*>(mScreenList[i]);
     if ( inScreen == curr->mMon ) {
       NS_IF_ADDREF(retScreen = curr->mScreen.get());
       return retScreen;
@@ -172,7 +172,7 @@ nsScreenManagerWin :: GetPrimaryScreen(nsIScreen** aPrimaryScreen)
 BOOL CALLBACK
 CountMonitors ( HMONITOR, HDC, LPRECT, LPARAM ioParam )
 {
-  PRUint32* countPtr = NS_REINTERPRET_CAST(PRUint32*, ioParam);
+  PRUint32* countPtr = reinterpret_cast<PRUint32*>(ioParam);
   ++(*countPtr);
 
   return TRUE; // continue the enumeration
diff --git a/mozilla/widget/src/windows/nsSound.cpp b/mozilla/widget/src/windows/nsSound.cpp
index 4be07cf16dd..552171cb9ff 100644
--- a/mozilla/widget/src/windows/nsSound.cpp
+++ b/mozilla/widget/src/windows/nsSound.cpp
@@ -125,7 +125,7 @@ NS_IMETHODIMP nsSound::OnStreamComplete(nsIStreamLoader *aLoader,
       flags |= SND_ASYNC;
     }
 
-    ::PlaySound(NS_REINTERPRET_CAST(const char*, data), 0, flags);
+    ::PlaySound(reinterpret_cast<const char*>(data), 0, flags);
   }
 
   return NS_OK;
diff --git a/mozilla/widget/src/windows/nsWindow.cpp b/mozilla/widget/src/windows/nsWindow.cpp
index 75c8e5a873f..69d74058d63 100644
--- a/mozilla/widget/src/windows/nsWindow.cpp
+++ b/mozilla/widget/src/windows/nsWindow.cpp
@@ -762,8 +762,8 @@ nsWindow::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   NS_PRECONDITION(aInstancePtr, "null out param");
 
   if (aIID.Equals(NS_GET_IID(nsIKBStateControl))) {
-    *aInstancePtr = NS_STATIC_CAST(nsIKBStateControl*, this);
-    NS_ADDREF(NS_STATIC_CAST(nsBaseWidget*, this));
+    *aInstancePtr = static_cast<nsIKBStateControl*>(this);
+    NS_ADDREF(static_cast<nsBaseWidget*>(this));
     return NS_OK;
   }
 
@@ -2709,10 +2709,10 @@ HBITMAP nsWindow::DataToBitmap(PRUint8* aImageData,
     head.bV4AlphaMask = 0xFF000000;
 
     HBITMAP bmp = ::CreateDIBitmap(dc,
-                                   NS_REINTERPRET_CAST(CONST BITMAPINFOHEADER*, &head),
+                                   reinterpret_cast<CONST BITMAPINFOHEADER*>(&head),
                                    CBM_INIT,
                                    aImageData,
-                                   NS_REINTERPRET_CAST(CONST BITMAPINFO*, &head),
+                                   reinterpret_cast<CONST BITMAPINFO*>(&head),
                                    DIB_RGB_COLORS);
 
     ::SelectObject(dc, oldbits);
diff --git a/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp b/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
index ae3b82a576b..3996f038b1d 100644
--- a/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
+++ b/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
@@ -345,7 +345,7 @@ NS_IMETHODIMP nsBaseWidget::SetZIndex(PRInt32 aZIndex)
   mZIndex = aZIndex;
 
   // reorder this child in its parent's list.
-  nsBaseWidget* parent = NS_STATIC_CAST(nsBaseWidget*, GetParent());
+  nsBaseWidget* parent = static_cast<nsBaseWidget*>(GetParent());
   if (parent) {
     parent->RemoveChild(this);
     // Scope sib outside the for loop so we can check it afterward
diff --git a/mozilla/widget/src/xpwidgets/nsIdleService.cpp b/mozilla/widget/src/xpwidgets/nsIdleService.cpp
index f8c99dce9a8..eb47ce36b58 100644
--- a/mozilla/widget/src/xpwidgets/nsIdleService.cpp
+++ b/mozilla/widget/src/xpwidgets/nsIdleService.cpp
@@ -128,7 +128,7 @@ nsIdleService::RemoveIdleObserver(nsIObserver* aObserver, PRUint32 aTime)
 void
 nsIdleService::IdleTimerCallback(nsITimer* aTimer, void* aClosure)
 {
-    NS_STATIC_CAST(nsIdleService*, aClosure)->CheckAwayState();
+    static_cast<nsIdleService*>(aClosure)->CheckAwayState();
 }
 
 void
diff --git a/mozilla/widget/src/xpwidgets/nsPrimitiveHelpers.cpp b/mozilla/widget/src/xpwidgets/nsPrimitiveHelpers.cpp
index 82e775bcf30..e84382e928d 100644
--- a/mozilla/widget/src/xpwidgets/nsPrimitiveHelpers.cpp
+++ b/mozilla/widget/src/xpwidgets/nsPrimitiveHelpers.cpp
@@ -232,7 +232,7 @@ nsPrimitiveHelpers :: ConvertPlatformPlainTextToUnicode ( const char* inText, PR
   // the conversion. 
   decoder->GetMaxLength(inText, inTextLen, outUnicodeLen);   // |outUnicodeLen| is number of chars
   if ( *outUnicodeLen ) {
-    *outUnicode = NS_REINTERPRET_CAST(PRUnichar*, nsMemory::Alloc((*outUnicodeLen + 1) * sizeof(PRUnichar)));
+    *outUnicode = reinterpret_cast<PRUnichar*>(nsMemory::Alloc((*outUnicodeLen + 1) * sizeof(PRUnichar)));
     if ( *outUnicode ) {
       rv = decoder->Convert(inText, &inTextLen, *outUnicode, outUnicodeLen);
       (*outUnicode)[*outUnicodeLen] = '\0';                   // null terminate. Convert() doesn't do it for us
@@ -271,7 +271,7 @@ nsLinebreakHelpers :: ConvertPlatformToDOMLinebreaks ( const char* inFlavor, voi
   nsresult retVal = NS_OK;
   
   if ( strcmp(inFlavor, "text/plain") == 0 ) {
-    char* buffAsChars = NS_REINTERPRET_CAST(char*, *ioData);
+    char* buffAsChars = reinterpret_cast<char*>(*ioData);
     char* oldBuffer = buffAsChars;
     retVal = nsLinebreakConverter::ConvertLineBreaksInSitu ( &buffAsChars, nsLinebreakConverter::eLinebreakAny, 
                                                               nsLinebreakConverter::eLinebreakContent, 
@@ -286,7 +286,7 @@ nsLinebreakHelpers :: ConvertPlatformToDOMLinebreaks ( const char* inFlavor, voi
     // I'd assume we don't want to do anything for binary data....
   }
   else {       
-    PRUnichar* buffAsUnichar = NS_REINTERPRET_CAST(PRUnichar*, *ioData);
+    PRUnichar* buffAsUnichar = reinterpret_cast<PRUnichar*>(*ioData);
     PRUnichar* oldBuffer = buffAsUnichar;
     PRInt32 newLengthInChars;
     retVal = nsLinebreakConverter::ConvertUnicharLineBreaksInSitu ( &buffAsUnichar, nsLinebreakConverter::eLinebreakAny, 
diff --git a/mozilla/widget/src/xpwidgets/nsPrintSettingsImpl.cpp b/mozilla/widget/src/xpwidgets/nsPrintSettingsImpl.cpp
index 1b68fb8c513..00805c71db9 100644
--- a/mozilla/widget/src/xpwidgets/nsPrintSettingsImpl.cpp
+++ b/mozilla/widget/src/xpwidgets/nsPrintSettingsImpl.cpp
@@ -954,7 +954,7 @@ nsPrintSettings::Clone(nsIPrintSettings **_retval)
 nsresult 
 nsPrintSettings::_Assign(nsIPrintSettings *aPS)
 {
-  nsPrintSettings *ps = NS_STATIC_CAST(nsPrintSettings*, aPS);
+  nsPrintSettings *ps = static_cast<nsPrintSettings*>(aPS);
   *this = *ps;
   return NS_OK;
 }
diff --git a/mozilla/widget/src/xpwidgets/nsTransferable.cpp b/mozilla/widget/src/xpwidgets/nsTransferable.cpp
index 814420e329b..1bcce086dc6 100644
--- a/mozilla/widget/src/xpwidgets/nsTransferable.cpp
+++ b/mozilla/widget/src/xpwidgets/nsTransferable.cpp
@@ -224,7 +224,7 @@ DataStruct::WriteCache(nsISupports* aData, PRUint32 aDataLen)
     nsPrimitiveHelpers::CreateDataFromPrimitive ( mFlavor.get(), aData, &buff, aDataLen );
     if ( buff ) {
       PRUint32 ignored;
-      outStr->Write(NS_REINTERPRET_CAST(char*, buff), aDataLen, &ignored);
+      outStr->Write(reinterpret_cast<char*>(buff), aDataLen, &ignored);
       nsMemory::Free(buff);
       return NS_OK;
     }
diff --git a/mozilla/xpcom/base/nsAgg.h b/mozilla/xpcom/base/nsAgg.h
index ca607d99e00..1e10f8b48b0 100644
--- a/mozilla/xpcom/base/nsAgg.h
+++ b/mozilla/xpcom/base/nsAgg.h
@@ -300,10 +300,10 @@ _class::AggregatedQueryInterface(REFNSIID aIID, void** aInstancePtr)        \
                          (void *p,                                          \
                           nsCycleCollectionTraversalCallback &cb)           \
   {                                                                         \
-    nsISupports *s = NS_STATIC_CAST(nsISupports*, p);                       \
+    nsISupports *s = static_cast<nsISupports*>(p);                       \
     NS_ASSERTION(CheckForRightISupports(s),                                 \
                  "not the nsISupports pointer we expect");                  \
-    _class *tmp = NS_STATIC_CAST(_class*, Downcast(s));                     \
+    _class *tmp = static_cast<_class*>(Downcast(s));                     \
     if (!tmp->IsPartOfAggregated())                                         \
         NS_IMPL_CYCLE_COLLECTION_DESCRIBE(_class)
 
diff --git a/mozilla/xpcom/base/nsAutoPtr.h b/mozilla/xpcom/base/nsAutoPtr.h
index be64b081acb..dec49428a15 100644
--- a/mozilla/xpcom/base/nsAutoPtr.h
+++ b/mozilla/xpcom/base/nsAutoPtr.h
@@ -60,7 +60,7 @@ class nsAutoPtr
       begin_assignment()
         {
           assign(0);
-          return NS_REINTERPRET_CAST(void**, &mRawPtr);
+          return reinterpret_cast<void**>(&mRawPtr);
         }
 
       void
@@ -192,7 +192,7 @@ class nsAutoPtr
           // This is not intended to be used by clients.  See |address_of|
           // below.
         {
-          return NS_CONST_CAST(nsAutoPtr<T>*, this);
+          return const_cast<nsAutoPtr<T>*>(this);
         }
 
 #else // CANT_RESOLVE_CPP_CONST_AMBIGUITY
@@ -227,10 +227,10 @@ class nsAutoPtr
       StartAssignment()
         {
 #ifndef NSCAP_FEATURE_INLINE_STARTASSIGNMENT
-          return NS_REINTERPRET_CAST(T**, begin_assignment());
+          return reinterpret_cast<T**>(begin_assignment());
 #else
           assign(0);
-          return NS_REINTERPRET_CAST(T**, &mRawPtr);
+          return reinterpret_cast<T**>(&mRawPtr);
 #endif
         }
   };
@@ -297,7 +297,7 @@ class nsAutoPtrGetterTransfers
 
       operator void**()
         {
-          return NS_REINTERPRET_CAST(void**, mTargetSmartPtr.StartAssignment());
+          return reinterpret_cast<void**>(mTargetSmartPtr.StartAssignment());
         }
 
       operator T**()
@@ -336,7 +336,7 @@ inline
 NSCAP_BOOL
 operator==( const nsAutoPtr<T>& lhs, const nsAutoPtr<U>& rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) == NS_STATIC_CAST(const U*, rhs.get());
+    return static_cast<const T*>(lhs.get()) == static_cast<const U*>(rhs.get());
   }
 
 
@@ -345,7 +345,7 @@ inline
 NSCAP_BOOL
 operator!=( const nsAutoPtr<T>& lhs, const nsAutoPtr<U>& rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) != NS_STATIC_CAST(const U*, rhs.get());
+    return static_cast<const T*>(lhs.get()) != static_cast<const U*>(rhs.get());
   }
 
 
@@ -356,7 +356,7 @@ inline
 NSCAP_BOOL
 operator==( const nsAutoPtr<T>& lhs, const U* rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) == NS_STATIC_CAST(const U*, rhs);
+    return static_cast<const T*>(lhs.get()) == static_cast<const U*>(rhs);
   }
 
 template <class T, class U>
@@ -364,7 +364,7 @@ inline
 NSCAP_BOOL
 operator==( const U* lhs, const nsAutoPtr<T>& rhs )
   {
-    return NS_STATIC_CAST(const U*, lhs) == NS_STATIC_CAST(const T*, rhs.get());
+    return static_cast<const U*>(lhs) == static_cast<const T*>(rhs.get());
   }
 
 template <class T, class U>
@@ -372,7 +372,7 @@ inline
 NSCAP_BOOL
 operator!=( const nsAutoPtr<T>& lhs, const U* rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) != NS_STATIC_CAST(const U*, rhs);
+    return static_cast<const T*>(lhs.get()) != static_cast<const U*>(rhs);
   }
 
 template <class T, class U>
@@ -380,7 +380,7 @@ inline
 NSCAP_BOOL
 operator!=( const U* lhs, const nsAutoPtr<T>& rhs )
   {
-    return NS_STATIC_CAST(const U*, lhs) != NS_STATIC_CAST(const T*, rhs.get());
+    return static_cast<const U*>(lhs) != static_cast<const T*>(rhs.get());
   }
 
   // To avoid ambiguities caused by the presence of builtin |operator==|s
@@ -396,7 +396,7 @@ inline
 NSCAP_BOOL
 operator==( const nsAutoPtr<T>& lhs, U* rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) == NS_CONST_CAST(const U*, rhs);
+    return static_cast<const T*>(lhs.get()) == const_cast<const U*>(rhs);
   }
 
 template <class T, class U>
@@ -404,7 +404,7 @@ inline
 NSCAP_BOOL
 operator==( U* lhs, const nsAutoPtr<T>& rhs )
   {
-    return NS_CONST_CAST(const U*, lhs) == NS_STATIC_CAST(const T*, rhs.get());
+    return const_cast<const U*>(lhs) == static_cast<const T*>(rhs.get());
   }
 
 template <class T, class U>
@@ -412,7 +412,7 @@ inline
 NSCAP_BOOL
 operator!=( const nsAutoPtr<T>& lhs, U* rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) != NS_CONST_CAST(const U*, rhs);
+    return static_cast<const T*>(lhs.get()) != const_cast<const U*>(rhs);
   }
 
 template <class T, class U>
@@ -420,7 +420,7 @@ inline
 NSCAP_BOOL
 operator!=( U* lhs, const nsAutoPtr<T>& rhs )
   {
-    return NS_CONST_CAST(const U*, lhs) != NS_STATIC_CAST(const T*, rhs.get());
+    return const_cast<const U*>(lhs) != static_cast<const T*>(rhs.get());
   }
 #endif
 
@@ -434,7 +434,7 @@ NSCAP_BOOL
 operator==( const nsAutoPtr<T>& lhs, NSCAP_Zero* rhs )
     // specifically to allow |smartPtr == 0|
   {
-    return NS_STATIC_CAST(const void*, lhs.get()) == NS_REINTERPRET_CAST(const void*, rhs);
+    return static_cast<const void*>(lhs.get()) == reinterpret_cast<const void*>(rhs);
   }
 
 template <class T>
@@ -443,7 +443,7 @@ NSCAP_BOOL
 operator==( NSCAP_Zero* lhs, const nsAutoPtr<T>& rhs )
     // specifically to allow |0 == smartPtr|
   {
-    return NS_REINTERPRET_CAST(const void*, lhs) == NS_STATIC_CAST(const void*, rhs.get());
+    return reinterpret_cast<const void*>(lhs) == static_cast<const void*>(rhs.get());
   }
 
 template <class T>
@@ -452,7 +452,7 @@ NSCAP_BOOL
 operator!=( const nsAutoPtr<T>& lhs, NSCAP_Zero* rhs )
     // specifically to allow |smartPtr != 0|
   {
-    return NS_STATIC_CAST(const void*, lhs.get()) != NS_REINTERPRET_CAST(const void*, rhs);
+    return static_cast<const void*>(lhs.get()) != reinterpret_cast<const void*>(rhs);
   }
 
 template <class T>
@@ -461,7 +461,7 @@ NSCAP_BOOL
 operator!=( NSCAP_Zero* lhs, const nsAutoPtr<T>& rhs )
     // specifically to allow |0 != smartPtr|
   {
-    return NS_REINTERPRET_CAST(const void*, lhs) != NS_STATIC_CAST(const void*, rhs.get());
+    return reinterpret_cast<const void*>(lhs) != static_cast<const void*>(rhs.get());
   }
 
 
@@ -476,7 +476,7 @@ NSCAP_BOOL
 operator==( const nsAutoPtr<T>& lhs, int rhs )
     // specifically to allow |smartPtr == 0|
   {
-    return NS_STATIC_CAST(const void*, lhs.get()) == NS_REINTERPRET_CAST(const void*, rhs);
+    return static_cast<const void*>(lhs.get()) == reinterpret_cast<const void*>(rhs);
   }
 
 template <class T>
@@ -485,7 +485,7 @@ NSCAP_BOOL
 operator==( int lhs, const nsAutoPtr<T>& rhs )
     // specifically to allow |0 == smartPtr|
   {
-    return NS_REINTERPRET_CAST(const void*, lhs) == NS_STATIC_CAST(const void*, rhs.get());
+    return reinterpret_cast<const void*>(lhs) == static_cast<const void*>(rhs.get());
   }
 
 #endif // !defined(HAVE_CPP_TROUBLE_COMPARING_TO_ZERO)
@@ -502,7 +502,7 @@ class nsAutoArrayPtr
       begin_assignment()
         {
           assign(0);
-          return NS_REINTERPRET_CAST(void**, &mRawPtr);
+          return reinterpret_cast<void**>(&mRawPtr);
         }
 
       void
@@ -612,7 +612,7 @@ class nsAutoArrayPtr
           // This is not intended to be used by clients.  See |address_of|
           // below.
         {
-          return NS_CONST_CAST(nsAutoArrayPtr<T>*, this);
+          return const_cast<nsAutoArrayPtr<T>*>(this);
         }
 
 #else // CANT_RESOLVE_CPP_CONST_AMBIGUITY
@@ -647,10 +647,10 @@ class nsAutoArrayPtr
       StartAssignment()
         {
 #ifndef NSCAP_FEATURE_INLINE_STARTASSIGNMENT
-          return NS_REINTERPRET_CAST(T**, begin_assignment());
+          return reinterpret_cast<T**>(begin_assignment());
 #else
           assign(0);
-          return NS_REINTERPRET_CAST(T**, &mRawPtr);
+          return reinterpret_cast<T**>(&mRawPtr);
 #endif
         }
   };
@@ -717,7 +717,7 @@ class nsAutoArrayPtrGetterTransfers
 
       operator void**()
         {
-          return NS_REINTERPRET_CAST(void**, mTargetSmartPtr.StartAssignment());
+          return reinterpret_cast<void**>(mTargetSmartPtr.StartAssignment());
         }
 
       operator T**()
@@ -756,7 +756,7 @@ inline
 NSCAP_BOOL
 operator==( const nsAutoArrayPtr<T>& lhs, const nsAutoArrayPtr<U>& rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) == NS_STATIC_CAST(const U*, rhs.get());
+    return static_cast<const T*>(lhs.get()) == static_cast<const U*>(rhs.get());
   }
 
 
@@ -765,7 +765,7 @@ inline
 NSCAP_BOOL
 operator!=( const nsAutoArrayPtr<T>& lhs, const nsAutoArrayPtr<U>& rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) != NS_STATIC_CAST(const U*, rhs.get());
+    return static_cast<const T*>(lhs.get()) != static_cast<const U*>(rhs.get());
   }
 
 
@@ -776,7 +776,7 @@ inline
 NSCAP_BOOL
 operator==( const nsAutoArrayPtr<T>& lhs, const U* rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) == NS_STATIC_CAST(const U*, rhs);
+    return static_cast<const T*>(lhs.get()) == static_cast<const U*>(rhs);
   }
 
 template <class T, class U>
@@ -784,7 +784,7 @@ inline
 NSCAP_BOOL
 operator==( const U* lhs, const nsAutoArrayPtr<T>& rhs )
   {
-    return NS_STATIC_CAST(const U*, lhs) == NS_STATIC_CAST(const T*, rhs.get());
+    return static_cast<const U*>(lhs) == static_cast<const T*>(rhs.get());
   }
 
 template <class T, class U>
@@ -792,7 +792,7 @@ inline
 NSCAP_BOOL
 operator!=( const nsAutoArrayPtr<T>& lhs, const U* rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) != NS_STATIC_CAST(const U*, rhs);
+    return static_cast<const T*>(lhs.get()) != static_cast<const U*>(rhs);
   }
 
 template <class T, class U>
@@ -800,7 +800,7 @@ inline
 NSCAP_BOOL
 operator!=( const U* lhs, const nsAutoArrayPtr<T>& rhs )
   {
-    return NS_STATIC_CAST(const U*, lhs) != NS_STATIC_CAST(const T*, rhs.get());
+    return static_cast<const U*>(lhs) != static_cast<const T*>(rhs.get());
   }
 
   // To avoid ambiguities caused by the presence of builtin |operator==|s
@@ -816,7 +816,7 @@ inline
 NSCAP_BOOL
 operator==( const nsAutoArrayPtr<T>& lhs, U* rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) == NS_CONST_CAST(const U*, rhs);
+    return static_cast<const T*>(lhs.get()) == const_cast<const U*>(rhs);
   }
 
 template <class T, class U>
@@ -824,7 +824,7 @@ inline
 NSCAP_BOOL
 operator==( U* lhs, const nsAutoArrayPtr<T>& rhs )
   {
-    return NS_CONST_CAST(const U*, lhs) == NS_STATIC_CAST(const T*, rhs.get());
+    return const_cast<const U*>(lhs) == static_cast<const T*>(rhs.get());
   }
 
 template <class T, class U>
@@ -832,7 +832,7 @@ inline
 NSCAP_BOOL
 operator!=( const nsAutoArrayPtr<T>& lhs, U* rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) != NS_CONST_CAST(const U*, rhs);
+    return static_cast<const T*>(lhs.get()) != const_cast<const U*>(rhs);
   }
 
 template <class T, class U>
@@ -840,7 +840,7 @@ inline
 NSCAP_BOOL
 operator!=( U* lhs, const nsAutoArrayPtr<T>& rhs )
   {
-    return NS_CONST_CAST(const U*, lhs) != NS_STATIC_CAST(const T*, rhs.get());
+    return const_cast<const U*>(lhs) != static_cast<const T*>(rhs.get());
   }
 #endif
 
@@ -854,7 +854,7 @@ NSCAP_BOOL
 operator==( const nsAutoArrayPtr<T>& lhs, NSCAP_Zero* rhs )
     // specifically to allow |smartPtr == 0|
   {
-    return NS_STATIC_CAST(const void*, lhs.get()) == NS_REINTERPRET_CAST(const void*, rhs);
+    return static_cast<const void*>(lhs.get()) == reinterpret_cast<const void*>(rhs);
   }
 
 template <class T>
@@ -863,7 +863,7 @@ NSCAP_BOOL
 operator==( NSCAP_Zero* lhs, const nsAutoArrayPtr<T>& rhs )
     // specifically to allow |0 == smartPtr|
   {
-    return NS_REINTERPRET_CAST(const void*, lhs) == NS_STATIC_CAST(const void*, rhs.get());
+    return reinterpret_cast<const void*>(lhs) == static_cast<const void*>(rhs.get());
   }
 
 template <class T>
@@ -872,7 +872,7 @@ NSCAP_BOOL
 operator!=( const nsAutoArrayPtr<T>& lhs, NSCAP_Zero* rhs )
     // specifically to allow |smartPtr != 0|
   {
-    return NS_STATIC_CAST(const void*, lhs.get()) != NS_REINTERPRET_CAST(const void*, rhs);
+    return static_cast<const void*>(lhs.get()) != reinterpret_cast<const void*>(rhs);
   }
 
 template <class T>
@@ -881,7 +881,7 @@ NSCAP_BOOL
 operator!=( NSCAP_Zero* lhs, const nsAutoArrayPtr<T>& rhs )
     // specifically to allow |0 != smartPtr|
   {
-    return NS_REINTERPRET_CAST(const void*, lhs) != NS_STATIC_CAST(const void*, rhs.get());
+    return reinterpret_cast<const void*>(lhs) != static_cast<const void*>(rhs.get());
   }
 
 
@@ -896,7 +896,7 @@ NSCAP_BOOL
 operator==( const nsAutoArrayPtr<T>& lhs, int rhs )
     // specifically to allow |smartPtr == 0|
   {
-    return NS_STATIC_CAST(const void*, lhs.get()) == NS_REINTERPRET_CAST(const void*, rhs);
+    return static_cast<const void*>(lhs.get()) == reinterpret_cast<const void*>(rhs);
   }
 
 template <class T>
@@ -905,7 +905,7 @@ NSCAP_BOOL
 operator==( int lhs, const nsAutoArrayPtr<T>& rhs )
     // specifically to allow |0 == smartPtr|
   {
-    return NS_REINTERPRET_CAST(const void*, lhs) == NS_STATIC_CAST(const void*, rhs.get());
+    return reinterpret_cast<const void*>(lhs) == static_cast<const void*>(rhs.get());
   }
 
 #endif // !defined(HAVE_CPP_TROUBLE_COMPARING_TO_ZERO)
@@ -932,7 +932,7 @@ class nsRefPtr
       begin_assignment()
         {
           assign_assuming_AddRef(0);
-          return NS_REINTERPRET_CAST(void**, &mRawPtr);
+          return reinterpret_cast<void**>(&mRawPtr);
         }
 
       void
@@ -1041,7 +1041,7 @@ class nsRefPtr
             Returns a |nsDerivedSafe<T>*| to deny clients the use of |AddRef| and |Release|.
           */
         {
-          return NS_CONST_CAST(T*, mRawPtr);
+          return const_cast<T*>(mRawPtr);
         }
 
       operator nsDerivedSafe<T>*() const
@@ -1071,7 +1071,7 @@ class nsRefPtr
           // This is not intended to be used by clients.  See |address_of|
           // below.
         {
-          return NS_CONST_CAST(nsRefPtr<T>*, this);
+          return const_cast<nsRefPtr<T>*>(this);
         }
 
 #else // CANT_RESOLVE_CPP_CONST_AMBIGUITY
@@ -1106,10 +1106,10 @@ class nsRefPtr
       StartAssignment()
         {
 #ifndef NSCAP_FEATURE_INLINE_STARTASSIGNMENT
-          return NS_REINTERPRET_CAST(T**, begin_assignment());
+          return reinterpret_cast<T**>(begin_assignment());
 #else
           assign_assuming_AddRef(0);
-          return NS_REINTERPRET_CAST(T**, &mRawPtr);
+          return reinterpret_cast<T**>(&mRawPtr);
 #endif
         }
 
@@ -1117,8 +1117,8 @@ class nsRefPtr
       nsDerivedSafe<T>*
       get_DerivedSafe() const
         {
-          return NS_CONST_CAST(nsDerivedSafe<T>*,
-                        NS_REINTERPRET_CAST(const nsDerivedSafe<T>*, mRawPtr));
+          return const_cast<nsDerivedSafe<T>*>
+                           (reinterpret_cast<const nsDerivedSafe<T>*>(mRawPtr));
         }
       
   };
@@ -1185,7 +1185,7 @@ class nsRefPtrGetterAddRefs
 
       operator void**()
         {
-          return NS_REINTERPRET_CAST(void**, mTargetSmartPtr.StartAssignment());
+          return reinterpret_cast<void**>(mTargetSmartPtr.StartAssignment());
         }
 
       operator T**()
@@ -1224,7 +1224,7 @@ inline
 NSCAP_BOOL
 operator==( const nsRefPtr<T>& lhs, const nsRefPtr<U>& rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) == NS_STATIC_CAST(const U*, rhs.get());
+    return static_cast<const T*>(lhs.get()) == static_cast<const U*>(rhs.get());
   }
 
 
@@ -1233,7 +1233,7 @@ inline
 NSCAP_BOOL
 operator!=( const nsRefPtr<T>& lhs, const nsRefPtr<U>& rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) != NS_STATIC_CAST(const U*, rhs.get());
+    return static_cast<const T*>(lhs.get()) != static_cast<const U*>(rhs.get());
   }
 
 
@@ -1244,7 +1244,7 @@ inline
 NSCAP_BOOL
 operator==( const nsRefPtr<T>& lhs, const U* rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) == NS_STATIC_CAST(const U*, rhs);
+    return static_cast<const T*>(lhs.get()) == static_cast<const U*>(rhs);
   }
 
 template <class T, class U>
@@ -1252,7 +1252,7 @@ inline
 NSCAP_BOOL
 operator==( const U* lhs, const nsRefPtr<T>& rhs )
   {
-    return NS_STATIC_CAST(const U*, lhs) == NS_STATIC_CAST(const T*, rhs.get());
+    return static_cast<const U*>(lhs) == static_cast<const T*>(rhs.get());
   }
 
 template <class T, class U>
@@ -1260,7 +1260,7 @@ inline
 NSCAP_BOOL
 operator!=( const nsRefPtr<T>& lhs, const U* rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) != NS_STATIC_CAST(const U*, rhs);
+    return static_cast<const T*>(lhs.get()) != static_cast<const U*>(rhs);
   }
 
 template <class T, class U>
@@ -1268,7 +1268,7 @@ inline
 NSCAP_BOOL
 operator!=( const U* lhs, const nsRefPtr<T>& rhs )
   {
-    return NS_STATIC_CAST(const U*, lhs) != NS_STATIC_CAST(const T*, rhs.get());
+    return static_cast<const U*>(lhs) != static_cast<const T*>(rhs.get());
   }
 
   // To avoid ambiguities caused by the presence of builtin |operator==|s
@@ -1284,7 +1284,7 @@ inline
 NSCAP_BOOL
 operator==( const nsRefPtr<T>& lhs, U* rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) == NS_CONST_CAST(const U*, rhs);
+    return static_cast<const T*>(lhs.get()) == const_cast<const U*>(rhs);
   }
 
 template <class T, class U>
@@ -1292,7 +1292,7 @@ inline
 NSCAP_BOOL
 operator==( U* lhs, const nsRefPtr<T>& rhs )
   {
-    return NS_CONST_CAST(const U*, lhs) == NS_STATIC_CAST(const T*, rhs.get());
+    return const_cast<const U*>(lhs) == static_cast<const T*>(rhs.get());
   }
 
 template <class T, class U>
@@ -1300,7 +1300,7 @@ inline
 NSCAP_BOOL
 operator!=( const nsRefPtr<T>& lhs, U* rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) != NS_CONST_CAST(const U*, rhs);
+    return static_cast<const T*>(lhs.get()) != const_cast<const U*>(rhs);
   }
 
 template <class T, class U>
@@ -1308,7 +1308,7 @@ inline
 NSCAP_BOOL
 operator!=( U* lhs, const nsRefPtr<T>& rhs )
   {
-    return NS_CONST_CAST(const U*, lhs) != NS_STATIC_CAST(const T*, rhs.get());
+    return const_cast<const U*>(lhs) != static_cast<const T*>(rhs.get());
   }
 #endif
 
@@ -1322,7 +1322,7 @@ NSCAP_BOOL
 operator==( const nsRefPtr<T>& lhs, NSCAP_Zero* rhs )
     // specifically to allow |smartPtr == 0|
   {
-    return NS_STATIC_CAST(const void*, lhs.get()) == NS_REINTERPRET_CAST(const void*, rhs);
+    return static_cast<const void*>(lhs.get()) == reinterpret_cast<const void*>(rhs);
   }
 
 template <class T>
@@ -1331,7 +1331,7 @@ NSCAP_BOOL
 operator==( NSCAP_Zero* lhs, const nsRefPtr<T>& rhs )
     // specifically to allow |0 == smartPtr|
   {
-    return NS_REINTERPRET_CAST(const void*, lhs) == NS_STATIC_CAST(const void*, rhs.get());
+    return reinterpret_cast<const void*>(lhs) == static_cast<const void*>(rhs.get());
   }
 
 template <class T>
@@ -1340,7 +1340,7 @@ NSCAP_BOOL
 operator!=( const nsRefPtr<T>& lhs, NSCAP_Zero* rhs )
     // specifically to allow |smartPtr != 0|
   {
-    return NS_STATIC_CAST(const void*, lhs.get()) != NS_REINTERPRET_CAST(const void*, rhs);
+    return static_cast<const void*>(lhs.get()) != reinterpret_cast<const void*>(rhs);
   }
 
 template <class T>
@@ -1349,7 +1349,7 @@ NSCAP_BOOL
 operator!=( NSCAP_Zero* lhs, const nsRefPtr<T>& rhs )
     // specifically to allow |0 != smartPtr|
   {
-    return NS_REINTERPRET_CAST(const void*, lhs) != NS_STATIC_CAST(const void*, rhs.get());
+    return reinterpret_cast<const void*>(lhs) != static_cast<const void*>(rhs.get());
   }
 
 
@@ -1364,7 +1364,7 @@ NSCAP_BOOL
 operator==( const nsRefPtr<T>& lhs, int rhs )
     // specifically to allow |smartPtr == 0|
   {
-    return NS_STATIC_CAST(const void*, lhs.get()) == NS_REINTERPRET_CAST(const void*, rhs);
+    return static_cast<const void*>(lhs.get()) == reinterpret_cast<const void*>(rhs);
   }
 
 template <class T>
@@ -1373,7 +1373,7 @@ NSCAP_BOOL
 operator==( int lhs, const nsRefPtr<T>& rhs )
     // specifically to allow |0 == smartPtr|
   {
-    return NS_REINTERPRET_CAST(const void*, lhs) == NS_STATIC_CAST(const void*, rhs.get());
+    return reinterpret_cast<const void*>(lhs) == static_cast<const void*>(rhs.get());
   }
 
 #endif // !defined(HAVE_CPP_TROUBLE_COMPARING_TO_ZERO)
diff --git a/mozilla/xpcom/base/nsCycleCollectionParticipant.cpp b/mozilla/xpcom/base/nsCycleCollectionParticipant.cpp
index 68b8b2d6709..8d9c8445cae 100644
--- a/mozilla/xpcom/base/nsCycleCollectionParticipant.cpp
+++ b/mozilla/xpcom/base/nsCycleCollectionParticipant.cpp
@@ -41,7 +41,7 @@
 NS_IMETHODIMP
 nsXPCOMCycleCollectionParticipant::Root(void *p)
 {
-    nsISupports *s = NS_STATIC_CAST(nsISupports*, p);
+    nsISupports *s = static_cast<nsISupports*>(p);
     NS_ADDREF(s);
     return NS_OK;
 }
@@ -55,7 +55,7 @@ nsXPCOMCycleCollectionParticipant::Unlink(void *p)
 NS_IMETHODIMP
 nsXPCOMCycleCollectionParticipant::Unroot(void *p)
 {
-    nsISupports *s = NS_STATIC_CAST(nsISupports*, p);
+    nsISupports *s = static_cast<nsISupports*>(p);
     NS_RELEASE(s);
     return NS_OK;
 }
diff --git a/mozilla/xpcom/base/nsCycleCollectionParticipant.h b/mozilla/xpcom/base/nsCycleCollectionParticipant.h
index 67d088deb91..53c665987b8 100644
--- a/mozilla/xpcom/base/nsCycleCollectionParticipant.h
+++ b/mozilla/xpcom/base/nsCycleCollectionParticipant.h
@@ -184,7 +184,7 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsXPCOMCycleCollectionParticipant,
   NS_IMETHODIMP                                                                \
   NS_CYCLE_COLLECTION_CLASSNAME(_class)::Unlink(void *p)                       \
   {                                                                            \
-    nsISupports *s = NS_STATIC_CAST(nsISupports*, p);                          \
+    nsISupports *s = static_cast<nsISupports*>(p);                          \
     NS_ASSERTION(CheckForRightISupports(s),                                    \
                  "not the nsISupports pointer we expect");                     \
     _class *tmp = Downcast(s);
@@ -193,17 +193,17 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsXPCOMCycleCollectionParticipant,
   NS_IMETHODIMP                                                                \
   NS_CYCLE_COLLECTION_CLASSNAME(_class)::Unlink(void *p)                       \
   {                                                                            \
-    nsISupports *s = NS_STATIC_CAST(nsISupports*, p);                          \
+    nsISupports *s = static_cast<nsISupports*>(p);                          \
     NS_ASSERTION(CheckForRightISupports(s),                                    \
                  "not the nsISupports pointer we expect");                     \
-    _class *tmp = NS_STATIC_CAST(_class*, Downcast(s));                        \
+    _class *tmp = static_cast<_class*>(Downcast(s));                        \
     NS_CYCLE_COLLECTION_CLASSNAME(_base_class)::Unlink(s);
 
 #define NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_NATIVE(_class)                   \
   NS_IMETHODIMP                                                                \
   NS_CYCLE_COLLECTION_CLASSNAME(_class)::Unlink(void *p)                       \
   {                                                                            \
-    _class *tmp = NS_STATIC_CAST(_class*, p);
+    _class *tmp = static_cast<_class*>(p);
 
 #define NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(_field)                       \
     tmp->_field = NULL;    
@@ -222,7 +222,7 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsXPCOMCycleCollectionParticipant,
   NS_IMETHODIMP                                                                \
   NS_CYCLE_COLLECTION_CLASSNAME(_class)::Unlink(void *p)                       \
   {                                                                            \
-    NS_ASSERTION(CheckForRightISupports(NS_STATIC_CAST(nsISupports*, p)),      \
+    NS_ASSERTION(CheckForRightISupports(static_cast<nsISupports*>(p)),      \
                  "not the nsISupports pointer we expect");                     \
     return NS_OK;                                                              \
   }
@@ -253,7 +253,7 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsXPCOMCycleCollectionParticipant,
                          (void *p,                                             \
                           nsCycleCollectionTraversalCallback &cb)              \
   {                                                                            \
-    nsISupports *s = NS_STATIC_CAST(nsISupports*, p);                          \
+    nsISupports *s = static_cast<nsISupports*>(p);                          \
     NS_ASSERTION(CheckForRightISupports(s),                                    \
                  "not the nsISupports pointer we expect");                     \
     _class *tmp = Downcast(s);                                                 \
@@ -265,10 +265,10 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsXPCOMCycleCollectionParticipant,
                          (void *p,                                             \
                           nsCycleCollectionTraversalCallback &cb)              \
   {                                                                            \
-    nsISupports *s = NS_STATIC_CAST(nsISupports*, p);                          \
+    nsISupports *s = static_cast<nsISupports*>(p);                          \
     NS_ASSERTION(CheckForRightISupports(s),                                    \
                  "not the nsISupports pointer we expect");                     \
-    _class *tmp = NS_STATIC_CAST(_class*, Downcast(s));                        \
+    _class *tmp = static_cast<_class*>(Downcast(s));                        \
     NS_CYCLE_COLLECTION_CLASSNAME(_base_class)::Traverse(s, cb);
 
 #define NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NATIVE_BEGIN(_class)                 \
@@ -277,7 +277,7 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsXPCOMCycleCollectionParticipant,
                          (void *p,                                             \
                           nsCycleCollectionTraversalCallback &cb)              \
   {                                                                            \
-    _class *tmp = NS_STATIC_CAST(_class*, p);                                  \
+    _class *tmp = static_cast<_class*>(p);                                  \
     NS_IMPL_CYCLE_COLLECTION_DESCRIBE(_class)
 
 #define NS_IMPL_CYCLE_COLLECTION_TRAVERSE_RAWPTR(_field)                       \
@@ -336,7 +336,7 @@ public:                                                                        \
   }                                                                            \
   static _class* Downcast(nsISupports* s)                                      \
   {                                                                            \
-    return NS_STATIC_CAST(_class*, NS_STATIC_CAST(_base*, s));                 \
+    return static_cast<_class*>(static_cast<_base*>(s));                 \
   }                                                                            \
   static nsISupports* Upcast(_class *p)                                        \
   {                                                                            \
@@ -357,7 +357,7 @@ public:                                                                        \
                       nsCycleCollectionTraversalCallback &cb);                 \
   static _class* Downcast(nsISupports* s)                                      \
   {                                                                            \
-    return NS_STATIC_CAST(_class*, NS_STATIC_CAST(_base_class*,                \
+    return static_cast<_class*>(static_cast<_base_class*>(\
       NS_CYCLE_COLLECTION_CLASSNAME(_base_class)::Downcast(s)));               \
   }                                                                            \
 };
@@ -372,7 +372,7 @@ public:                                                                        \
                       nsCycleCollectionTraversalCallback &cb);                 \
   static _class* Downcast(nsISupports* s)                                      \
   {                                                                            \
-    return NS_STATIC_CAST(_class*, NS_STATIC_CAST(_base_class*,                \
+    return static_cast<_class*>(static_cast<_base_class*>(\
       NS_CYCLE_COLLECTION_CLASSNAME(_base_class)::Downcast(s)));               \
   }                                                                            \
 };
@@ -419,7 +419,7 @@ public:                                                                        \
   NS_IMETHODIMP                                                                \
   NS_CYCLE_COLLECTION_CLASSNAME(_class)::Root(void *p)                         \
   {                                                                            \
-    _class *tmp = NS_STATIC_CAST(_class*, p);                                  \
+    _class *tmp = static_cast<_class*>(p);                                  \
     tmp->_root_function();                                                     \
     return NS_OK;                                                              \
   }
@@ -428,7 +428,7 @@ public:                                                                        \
   NS_IMETHODIMP                                                                \
   NS_CYCLE_COLLECTION_CLASSNAME(_class)::Unroot(void *p)                       \
   {                                                                            \
-    _class *tmp = NS_STATIC_CAST(_class*, p);                                  \
+    _class *tmp = static_cast<_class*>(p);                                  \
     tmp->_unroot_function();                                                   \
     return NS_OK;                                                              \
   }
diff --git a/mozilla/xpcom/base/nsCycleCollector.cpp b/mozilla/xpcom/base/nsCycleCollector.cpp
index ee88f3ea614..c504654a27c 100644
--- a/mozilla/xpcom/base/nsCycleCollector.cpp
+++ b/mozilla/xpcom/base/nsCycleCollector.cpp
@@ -747,7 +747,7 @@ zeroGenerationCallback(const void*  ptr,
                        void*        userArg)
 {
 #ifdef DEBUG_CC
-    nsPurpleBuffer *purp = NS_STATIC_CAST(nsPurpleBuffer*, userArg);
+    nsPurpleBuffer *purp = static_cast<nsPurpleBuffer*>(userArg);
     purp->mStats.mZeroGeneration++;
 #endif
     generation = 0;
@@ -779,10 +779,9 @@ ageSelectionCallback(const void*  ptr,
                      PRUint32&    generation,
                      void*        userArg)
 {
-    nsPurpleBuffer *purp = NS_STATIC_CAST(nsPurpleBuffer*, userArg);
+    nsPurpleBuffer *purp = static_cast<nsPurpleBuffer*>(userArg);
     if (SufficientlyAged(generation, purp)) {
-        nsISupports *root = NS_STATIC_CAST(nsISupports *, 
-                                           NS_CONST_CAST(void*, ptr));
+        nsISupports *root = static_cast<nsISupports *>(const_cast<void*>(ptr));
         purp->mTransferBuffer->Push(root);
     }
     return PL_DHASH_NEXT;
@@ -1011,7 +1010,7 @@ nsCycleCollectionParticipant *
 nsCycleCollectionXPCOMRuntime::ToParticipant(void *p)
 {
     nsXPCOMCycleCollectionParticipant *cp;
-    ::ToParticipant(NS_STATIC_CAST(nsISupports*, p), &cp);
+    ::ToParticipant(static_cast<nsISupports*>(p), &cp);
     return cp;
 }
 
@@ -1041,7 +1040,7 @@ GraphWalker::DoWalk(nsDeque &aQueue)
     // Use a aQueue to match the breadth-first traversal used when we
     // built the graph, for hopefully-better locality.
     while (aQueue.GetSize() > 0) {
-        PtrInfo *pi = NS_STATIC_CAST(PtrInfo*, aQueue.PopFront());
+        PtrInfo *pi = static_cast<PtrInfo*>(aQueue.PopFront());
 
         if (this->ShouldVisitNode(pi)) {
             this->VisitNode(pi);
@@ -1074,7 +1073,7 @@ PtrToNodeMatchEntry(PLDHashTable *table,
                     const PLDHashEntryHdr *entry,
                     const void *key)
 {
-    const PtrToNodeEntry *n = NS_STATIC_CAST(const PtrToNodeEntry*, entry);
+    const PtrToNodeEntry *n = static_cast<const PtrToNodeEntry*>(entry);
     return n->mNode->mPointer == key;
 }
 
@@ -1141,8 +1140,7 @@ GCGraphBuilder::~GCGraphBuilder()
 PtrInfo*
 GCGraphBuilder::AddNode(void *s, nsCycleCollectionParticipant *aParticipant)
 {
-    PtrToNodeEntry *e = NS_STATIC_CAST(PtrToNodeEntry*, 
-        PL_DHashTableOperate(&mPtrToNodeMap, s, PL_DHASH_ADD));
+    PtrToNodeEntry *e = static_cast<PtrToNodeEntry*>(PL_DHashTableOperate(&mPtrToNodeMap, s, PL_DHASH_ADD));
     PtrInfo *result;
     if (!e->mNode) {
         // New entry.
@@ -1281,7 +1279,7 @@ nsCycleCollector::MarkRoots(GCGraph &graph)
 
     int i;
     for (i = 0; i < mBuf.GetSize(); ++i) {
-        nsISupports *s = NS_STATIC_CAST(nsISupports *, mBuf.ObjectAt(i));
+        nsISupports *s = static_cast<nsISupports *>(mBuf.ObjectAt(i));
         nsXPCOMCycleCollectionParticipant *cp;
         ToParticipant(s, &cp);
         if (cp) {
@@ -1415,16 +1413,16 @@ nsCycleCollector::CollectWhite(GCGraph &graph)
             mBuf.Push(pinfo);
 
             if (pinfo->mWasPurple) {
-                nsISupports* s = NS_STATIC_CAST(nsISupports*, p);
+                nsISupports* s = static_cast<nsISupports*>(p);
                 PRBool forgetResult = Forget(s);
                 NS_ASSERTION(forgetResult, "Forget failed");
             }
         }
         else if (pinfo->mWasPurple) {
-            nsISupports* s = NS_STATIC_CAST(nsISupports*, p);
+            nsISupports* s = static_cast<nsISupports*>(p);
             nsXPCOMCycleCollectionParticipant* cp =
-                NS_STATIC_CAST(nsXPCOMCycleCollectionParticipant*,
-                               pinfo->mParticipant);
+                static_cast<nsXPCOMCycleCollectionParticipant*>
+                           (pinfo->mParticipant);
 #ifdef DEBUG
             nsXPCOMCycleCollectionParticipant* checkcp;
             CallQueryInterface(s, &checkcp);
@@ -1439,14 +1437,14 @@ nsCycleCollector::CollectWhite(GCGraph &graph)
 
     PRUint32 i, count = mBuf.GetSize();
     for (i = 0; i < count; ++i) {
-        PtrInfo *pinfo = NS_STATIC_CAST(PtrInfo*, mBuf.ObjectAt(i));
+        PtrInfo *pinfo = static_cast<PtrInfo*>(mBuf.ObjectAt(i));
         rv = pinfo->mParticipant->Root(pinfo->mPointer);
         if (NS_FAILED(rv))
             Fault("Failed root call while unlinking", pinfo);
     }
 
     for (i = 0; i < count; ++i) {
-        PtrInfo *pinfo = NS_STATIC_CAST(PtrInfo*, mBuf.ObjectAt(i));
+        PtrInfo *pinfo = static_cast<PtrInfo*>(mBuf.ObjectAt(i));
         rv = pinfo->mParticipant->Unlink(pinfo->mPointer);
         if (NS_FAILED(rv)) {
             Fault("Failed unlink call while unlinking", pinfo);
@@ -1462,7 +1460,7 @@ nsCycleCollector::CollectWhite(GCGraph &graph)
     }
 
     for (i = 0; i < count; ++i) {
-        PtrInfo *pinfo = NS_STATIC_CAST(PtrInfo*, mBuf.ObjectAt(i));
+        PtrInfo *pinfo = static_cast<PtrInfo*>(mBuf.ObjectAt(i));
         rv = pinfo->mParticipant->Unroot(pinfo->mPointer);
         if (NS_FAILED(rv))
             Fault("Failed unroot call while unlinking", pinfo);
@@ -1915,7 +1913,7 @@ nsCycleCollector::Suspect(nsISupports *n, PRBool current)
     if (mParams.mLogPointers) {
         if (!mPtrLog)
             mPtrLog = fopen("pointer_log", "w");
-        fprintf(mPtrLog, "S %p\n", NS_STATIC_CAST(void*, n));
+        fprintf(mPtrLog, "S %p\n", static_cast<void*>(n));
     }
 #endif
 
@@ -1954,7 +1952,7 @@ nsCycleCollector::Forget(nsISupports *n)
     if (mParams.mLogPointers) {
         if (!mPtrLog)
             mPtrLog = fopen("pointer_log", "w");
-        fprintf(mPtrLog, "F %p\n", NS_STATIC_CAST(void*, n));
+        fprintf(mPtrLog, "F %p\n", static_cast<void*>(n));
     }
 #endif
 
@@ -2193,8 +2191,8 @@ nsCycleCollector::Shutdown()
 PR_STATIC_CALLBACK(PLDHashOperator)
 AddExpectedGarbage(nsVoidPtrHashKey *p, void *arg)
 {
-    nsCycleCollector *c = NS_STATIC_CAST(nsCycleCollector*, arg);
-    c->mBuf.Push(NS_CONST_CAST(void*, p->GetKey()));
+    nsCycleCollector *c = static_cast<nsCycleCollector*>(arg);
+    c->mBuf.Push(const_cast<void*>(p->GetKey()));
     return PL_DHASH_NEXT;
 }
 
diff --git a/mozilla/xpcom/base/nsDebugImpl.cpp b/mozilla/xpcom/base/nsDebugImpl.cpp
index 482f88b0f1a..367281809d6 100644
--- a/mozilla/xpcom/base/nsDebugImpl.cpp
+++ b/mozilla/xpcom/base/nsDebugImpl.cpp
@@ -478,7 +478,7 @@ nsDebugImpl::Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr)
 {
   NS_ENSURE_NO_AGGREGATION(outer);
 
-  return NS_CONST_CAST(nsDebugImpl*, &kImpl)->
+  return const_cast<nsDebugImpl*>(&kImpl)->
     QueryInterface(aIID, aInstancePtr);
 }
 
diff --git a/mozilla/xpcom/base/nsTraceRefcntImpl.cpp b/mozilla/xpcom/base/nsTraceRefcntImpl.cpp
index 920d3e404be..a666c4755d8 100644
--- a/mozilla/xpcom/base/nsTraceRefcntImpl.cpp
+++ b/mozilla/xpcom/base/nsTraceRefcntImpl.cpp
@@ -176,7 +176,7 @@ static void PR_CALLBACK
 SerialNumberFreeEntry(void *pool, PLHashEntry *he, PRUintn flag)
 {
     if (flag == HT_FREE_ENTRY) {
-        PR_Free(NS_REINTERPRET_CAST(serialNumberRecord*,he->value));
+        PR_Free(reinterpret_cast<serialNumberRecord*>(he->value));
         PR_Free(he);
     }
 }
@@ -185,8 +185,8 @@ static void PR_CALLBACK
 TypesToLogFreeEntry(void *pool, PLHashEntry *he, PRUintn flag)
 {
     if (flag == HT_FREE_ENTRY) {
-        nsCRT::free(NS_CONST_CAST(char*,
-                     NS_REINTERPRET_CAST(const char*, he->key)));
+        nsCRT::free(const_cast<char*>
+                              (reinterpret_cast<const char*>(he->key)));
         PR_Free(he);
     }
 }
@@ -285,7 +285,7 @@ public:
     BloatEntry* entry = (BloatEntry*)he->value;
     if (entry) {
       entry->Accumulate();
-      NS_STATIC_CAST(nsVoidArray*, arg)->AppendElement(entry);
+      static_cast<nsVoidArray*>(arg)->AppendElement(entry);
     }
     return HT_ENUMERATE_NEXT;
   }
@@ -389,7 +389,7 @@ static void PR_CALLBACK
 BloatViewFreeEntry(void *pool, PLHashEntry *he, PRUintn flag)
 {
     if (flag == HT_FREE_ENTRY) {
-        BloatEntry* entry = NS_REINTERPRET_CAST(BloatEntry*,he->value);
+        BloatEntry* entry = reinterpret_cast<BloatEntry*>(he->value);
         delete entry;
         PR_Free(he);
     }
@@ -438,7 +438,7 @@ GetBloatEntry(const char* aTypeName, PRUint32 aInstanceSize)
 
 static PRIntn PR_CALLBACK DumpSerialNumbers(PLHashEntry* aHashEntry, PRIntn aIndex, void* aClosure)
 {
-  serialNumberRecord* record = NS_REINTERPRET_CAST(serialNumberRecord *,aHashEntry->value);
+  serialNumberRecord* record = reinterpret_cast<serialNumberRecord *>(aHashEntry->value);
 #ifdef HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR
   fprintf((FILE*) aClosure, "%d @%p (%d references; %d from COMPtrs)\n",
                             record->serialNumber,
@@ -505,8 +505,8 @@ nsTraceRefcntImpl::DumpStatistics(StatisticsType type, FILE* out)
     PRInt32 i, j;
     for (i = entries.Count() - 1; i >= 1; --i) {
       for (j = i - 1; j >= 0; --j) {
-        BloatEntry* left  = NS_STATIC_CAST(BloatEntry*, entries[i]);
-        BloatEntry* right = NS_STATIC_CAST(BloatEntry*, entries[j]);
+        BloatEntry* left  = static_cast<BloatEntry*>(entries[i]);
+        BloatEntry* right = static_cast<BloatEntry*>(entries[j]);
 
         if (PL_strcmp(left->GetClassName(), right->GetClassName()) < 0) {
           entries.ReplaceElementAt(right, i);
@@ -517,7 +517,7 @@ nsTraceRefcntImpl::DumpStatistics(StatisticsType type, FILE* out)
 
     // Enumerate from back-to-front, so things come out in alpha order
     for (i = 0; i < entries.Count(); ++i) {
-      BloatEntry* entry = NS_STATIC_CAST(BloatEntry*, entries[i]);
+      BloatEntry* entry = static_cast<BloatEntry*>(entries[i]);
       entry->Dump(i, out, type);
     }
   }
@@ -562,14 +562,14 @@ static PRInt32 GetSerialNumber(void* aPtr, PRBool aCreate)
 #endif
   PLHashEntry** hep = PL_HashTableRawLookup(gSerialNumbers, PLHashNumber(NS_PTR_TO_INT32(aPtr)), aPtr);
   if (hep && *hep) {
-    return PRInt32((NS_REINTERPRET_CAST(serialNumberRecord*,(*hep)->value))->serialNumber);
+    return PRInt32((reinterpret_cast<serialNumberRecord*>((*hep)->value))->serialNumber);
   }
   else if (aCreate) {
     serialNumberRecord *record = PR_NEW(serialNumberRecord);
     record->serialNumber = ++gNextSerialNumber;
     record->refCount = 0;
     record->COMPtrCount = 0;
-    PL_HashTableRawAdd(gSerialNumbers, hep, PLHashNumber(NS_PTR_TO_INT32(aPtr)), aPtr, NS_REINTERPRET_CAST(void*,record));
+    PL_HashTableRawAdd(gSerialNumbers, hep, PLHashNumber(NS_PTR_TO_INT32(aPtr)), aPtr, reinterpret_cast<void*>(record));
     return gNextSerialNumber;
   }
   else {
@@ -585,7 +585,7 @@ static PRInt32* GetRefCount(void* aPtr)
 #endif
   PLHashEntry** hep = PL_HashTableRawLookup(gSerialNumbers, PLHashNumber(NS_PTR_TO_INT32(aPtr)), aPtr);
   if (hep && *hep) {
-    return &((NS_REINTERPRET_CAST(serialNumberRecord*,(*hep)->value))->refCount);
+    return &((reinterpret_cast<serialNumberRecord*>((*hep)->value))->refCount);
   } else {
     return nsnull;
   }
@@ -599,7 +599,7 @@ static PRInt32* GetCOMPtrCount(void* aPtr)
 #endif
   PLHashEntry** hep = PL_HashTableRawLookup(gSerialNumbers, PLHashNumber(NS_PTR_TO_INT32(aPtr)), aPtr);
   if (hep && *hep) {
-    return &((NS_REINTERPRET_CAST(serialNumberRecord*,(*hep)->value))->COMPtrCount);
+    return &((reinterpret_cast<serialNumberRecord*>((*hep)->value))->COMPtrCount);
   } else {
     return nsnull;
   }
@@ -1350,6 +1350,6 @@ static const nsTraceRefcntImpl kTraceRefcntImpl;
 NS_METHOD
 nsTraceRefcntImpl::Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr)
 {
-  return NS_CONST_CAST(nsTraceRefcntImpl*, &kTraceRefcntImpl)->
+  return const_cast<nsTraceRefcntImpl*>(&kTraceRefcntImpl)->
     QueryInterface(aIID, aInstancePtr);
 }
diff --git a/mozilla/xpcom/base/nsUUIDGenerator.cpp b/mozilla/xpcom/base/nsUUIDGenerator.cpp
index 0fac623ba75..2ace53dcc87 100644
--- a/mozilla/xpcom/base/nsUUIDGenerator.cpp
+++ b/mozilla/xpcom/base/nsUUIDGenerator.cpp
@@ -117,7 +117,7 @@ nsUUIDGenerator::Init()
 NS_IMETHODIMP
 nsUUIDGenerator::GenerateUUID(nsID** ret)
 {
-    nsID *id = NS_STATIC_CAST(nsID*, NS_Alloc(sizeof(nsID)));
+    nsID *id = static_cast<nsID*>(NS_Alloc(sizeof(nsID)));
     if (id == nsnull)
         return NS_ERROR_OUT_OF_MEMORY;
 
diff --git a/mozilla/xpcom/base/nscore.h b/mozilla/xpcom/base/nscore.h
index 5b8b469cc57..c6e62eeb48e 100644
--- a/mozilla/xpcom/base/nscore.h
+++ b/mozilla/xpcom/base/nscore.h
@@ -396,7 +396,7 @@ typedef PRUint32 nsrefcnt;
 #define __PRUNICHAR__
   /* For now, don't use wchar_t on Unix because it breaks the Netscape
    * commercial build.  When this is fixed there will be no need for the
-   * |NS_REINTERPRET_CAST| in nsLiteralString.h either.
+   * |reinterpret_cast| in nsLiteralString.h either.
    */
   #if defined(HAVE_CPP_2BYTE_WCHAR_T) && defined(NS_WIN32)
     typedef wchar_t PRUnichar;
diff --git a/mozilla/xpcom/build/nsOS2VACLegacy.cpp b/mozilla/xpcom/build/nsOS2VACLegacy.cpp
index e899a0f47f1..8b608db25de 100644
--- a/mozilla/xpcom/build/nsOS2VACLegacy.cpp
+++ b/mozilla/xpcom/build/nsOS2VACLegacy.cpp
@@ -689,7 +689,7 @@ assign_from_helper__13nsCOMPtr_baseFRC15nsCOMPtr_helperRC4nsID	proc
 	mov	[ebp+0ch],edx;	helper
 	mov	[ebp+010h],ecx;	iid
 
-; 80 		if ( NS_FAILED( helper(iid, NS_REINTERPRET_CAST(void**, &newRawPtr)) ) )
+; 80 		if ( NS_FAILED( helper(iid, reinterpret_cast<void**>(&newRawPtr)) ) )
 	lea	ecx,[ebp-04h];	newRawPtr
 	mov	edx,[ebp+010h];	iid
 	mov	ebx,[ebp+0ch];	helper
@@ -723,7 +723,7 @@ void
 nsCOMPtr_base::assign_from_helper( const nsCOMPtr_helper& helper, const nsIID& iid )
 	{
 		nsISupports* newRawPtr;
-		if ( NS_FAILED( helper(iid, NS_REINTERPRET_CAST(void**, &newRawPtr)) ) )
+		if ( NS_FAILED( helper(iid, reinterpret_cast<void**>(&newRawPtr)) ) )
 			newRawPtr = 0;
     assign_assuming_AddRef(newRawPtr);
 	}
@@ -739,7 +739,7 @@ extern "C" void VFTCALL assign_from_helper__13nsCOMPtr_baseFRC15nsCOMPtr_helperR
     /* this may or may not be correct but the layout is the same. */
     obj_nsQueryInterface_nsCOMPtr_helper  * pHelper = (obj_nsQueryInterface_nsCOMPtr_helper*)helper;
 
-    /* if ( NS_FAILED( helper(iid, NS_REINTERPRET_CAST(void**, &newRawPtr)) ) ) */
+    /* if ( NS_FAILED( helper(iid, reinterpret_cast<void**>(&newRawPtr)) ) ) */
     status = pHelper->pVFT->__operator_paratheses((char*)pHelper + pHelper->pVFT->uDelta__operator_paratheses, 
                                                    iid, (void**)&newRawPtr);
     if (NS_FAILED(status))
diff --git a/mozilla/xpcom/build/nsXPCOMStrings.cpp b/mozilla/xpcom/build/nsXPCOMStrings.cpp
index 70f69af87e7..83a4fb0e41a 100644
--- a/mozilla/xpcom/build/nsXPCOMStrings.cpp
+++ b/mozilla/xpcom/build/nsXPCOMStrings.cpp
@@ -88,7 +88,7 @@ NS_StringContainerInit2(nsStringContainer &aContainer,
       if (aFlags & NS_STRING_CONTAINER_INIT_ADOPT)
         flags |= nsSubstring::F_OWNED;
 
-      new (&aContainer) nsSubstring(NS_CONST_CAST(PRUnichar *, aData),
+      new (&aContainer) nsSubstring(const_cast<PRUnichar *>(aData),
                                     aDataLength, flags);
     }
     else
@@ -104,7 +104,7 @@ XPCOM_API(void)
 NS_StringContainerFinish(nsStringContainer &aContainer)
 {
   // call the nsString dtor
-  NS_REINTERPRET_CAST(nsString *, &aContainer)->~nsString();
+  reinterpret_cast<nsString *>(&aContainer)->~nsString();
 }
 
 /* ------------------------------------------------------------------------- */
@@ -236,7 +236,7 @@ NS_CStringContainerInit2(nsCStringContainer &aContainer,
       if (aFlags & NS_CSTRING_CONTAINER_INIT_ADOPT)
         flags |= nsCSubstring::F_OWNED;
 
-      new (&aContainer) nsCSubstring(NS_CONST_CAST(char *, aData),
+      new (&aContainer) nsCSubstring(const_cast<char *>(aData),
                                      aDataLength, flags);
     }
     else
@@ -252,7 +252,7 @@ XPCOM_API(void)
 NS_CStringContainerFinish(nsCStringContainer &aContainer)
 {
   // call the nsCString dtor
-  NS_REINTERPRET_CAST(nsCString *, &aContainer)->~nsCString();
+  reinterpret_cast<nsCString *>(&aContainer)->~nsCString();
 }
 
 /* ------------------------------------------------------------------------- */
diff --git a/mozilla/xpcom/build/nsXPComInit.cpp b/mozilla/xpcom/build/nsXPComInit.cpp
index fdb2be567c7..de773b861bd 100644
--- a/mozilla/xpcom/build/nsXPComInit.cpp
+++ b/mozilla/xpcom/build/nsXPComInit.cpp
@@ -578,7 +578,7 @@ NS_InitXPCOM3(nsIServiceManager* *result,
 
     if (result) {
         nsIServiceManager *serviceManager =
-            NS_STATIC_CAST(nsIServiceManager*, compMgr);
+            static_cast<nsIServiceManager*>(compMgr);
 
         NS_ADDREF(*result = serviceManager);
     }
@@ -588,7 +588,7 @@ NS_InitXPCOM3(nsIServiceManager* *result,
     rv = compMgr->RegisterService(kMemoryCID, memory);
     if (NS_FAILED(rv)) return rv;
 
-    rv = compMgr->RegisterService(kComponentManagerCID, NS_STATIC_CAST(nsIComponentManager*, compMgr));
+    rv = compMgr->RegisterService(kComponentManagerCID, static_cast<nsIComponentManager*>(compMgr));
     if (NS_FAILED(rv)) return rv;
 
 #ifdef GC_LEAK_DETECTOR
@@ -619,7 +619,7 @@ NS_InitXPCOM3(nsIServiceManager* *result,
     }
 
     nsCOMPtr<nsIComponentRegistrar> registrar = do_QueryInterface(
-        NS_STATIC_CAST(nsIComponentManager*,compMgr), &rv);
+        static_cast<nsIComponentManager*>(compMgr), &rv);
     if (registrar) {
         for (int i = 0; i < components_length; i++)
             RegisterGenericFactory(registrar, &components[i]);
diff --git a/mozilla/xpcom/components/nsCategoryManager.cpp b/mozilla/xpcom/components/nsCategoryManager.cpp
index 4e2946e5100..8e36191f486 100644
--- a/mozilla/xpcom/components/nsCategoryManager.cpp
+++ b/mozilla/xpcom/components/nsCategoryManager.cpp
@@ -168,8 +168,8 @@ int
 BaseStringEnumerator::SortCallback(const void *e1, const void *e2,
                                    void * /*unused*/)
 {
-  char const *const *s1 = NS_REINTERPRET_CAST(char const *const *, e1);
-  char const *const *s2 = NS_REINTERPRET_CAST(char const *const *, e2);
+  char const *const *s1 = reinterpret_cast<char const *const *>(e1);
+  char const *const *s2 = reinterpret_cast<char const *const *>(e2);
 
   return strcmp(*s1, *s2);
 }
@@ -198,7 +198,7 @@ private:
 PLDHashOperator PR_CALLBACK
 EntryEnumerator::enumfunc_createenumerator(CategoryLeaf* aLeaf, void* userArg)
 {
-  EntryEnumerator* mythis = NS_STATIC_CAST(EntryEnumerator*, userArg);
+  EntryEnumerator* mythis = static_cast<EntryEnumerator*>(userArg);
   if (aLeaf->nonpValue)
     mythis->mArray[mythis->mCount++] = aLeaf->GetKey();
 
@@ -396,7 +396,7 @@ PLDHashOperator PR_CALLBACK
 enumfunc_pentries(CategoryLeaf* aLeaf, void* userArg)
 {
   persistent_userstruct* args =
-    NS_STATIC_CAST(persistent_userstruct*, userArg);
+    static_cast<persistent_userstruct*>(userArg);
 
   PLDHashOperator status = PL_DHASH_NEXT;
 
@@ -469,7 +469,7 @@ CategoryEnumerator::Create(nsClassHashtable<nsDepCharHashKey, CategoryNode>& aTa
 PLDHashOperator PR_CALLBACK
 CategoryEnumerator::enumfunc_createenumerator(const char* aStr, CategoryNode* aNode, void* userArg)
 {
-  CategoryEnumerator* mythis = NS_STATIC_CAST(CategoryEnumerator*, userArg);
+  CategoryEnumerator* mythis = static_cast<CategoryEnumerator*>(userArg);
 
   // if a category has no entries, we pretend it doesn't exist
   if (aNode->Count())
@@ -748,7 +748,7 @@ struct writecat_struct {
 PLDHashOperator PR_CALLBACK
 enumfunc_categories(const char* aKey, CategoryNode* aCategory, void* userArg)
 {
-  writecat_struct* args = NS_STATIC_CAST(writecat_struct*, userArg);
+  writecat_struct* args = static_cast<writecat_struct*>(userArg);
 
   PLDHashOperator result = PL_DHASH_NEXT;
 
@@ -835,7 +835,7 @@ NS_CategoryManagerGetFactory( nsIFactory** aFactory )
     nsresult status;
 
     *aFactory = 0;
-    nsIFactory* new_factory = NS_STATIC_CAST(nsIFactory*, new nsCategoryManagerFactory);
+    nsIFactory* new_factory = static_cast<nsIFactory*>(new nsCategoryManagerFactory);
     if (new_factory)
       {
         *aFactory = new_factory;
diff --git a/mozilla/xpcom/components/nsComponentManager.cpp b/mozilla/xpcom/components/nsComponentManager.cpp
index 47bd2bbe9e4..1008abc67b9 100644
--- a/mozilla/xpcom/components/nsComponentManager.cpp
+++ b/mozilla/xpcom/components/nsComponentManager.cpp
@@ -262,7 +262,7 @@ ArenaStrndup(const char *s, PRUint32 len, PLArenaPool *arena)
     PL_ARENA_ALLOCATE(mem, arena, len+1);
     if (mem)
         memcpy(mem, s, len+1);
-    return NS_STATIC_CAST(char *, mem);
+    return static_cast<char *>(mem);
 }
 
 char*
@@ -281,7 +281,7 @@ nsFactoryEntry_Destroy(nsHashKey *aKey, void *aData, void* closure);
 PR_STATIC_CALLBACK(PLDHashNumber)
 factory_HashKey(PLDHashTable *aTable, const void *aKey)
 {
-    const nsCID *cidp = NS_REINTERPRET_CAST(const nsCID*, aKey);
+    const nsCID *cidp = reinterpret_cast<const nsCID*>(aKey);
 
     return cidp->m0;
 }
@@ -291,8 +291,8 @@ factory_MatchEntry(PLDHashTable *aTable, const PLDHashEntryHdr *aHdr,
                    const void *aKey)
 {
     const nsFactoryTableEntry* entry =
-        NS_STATIC_CAST(const nsFactoryTableEntry*, aHdr);
-    const nsCID *cidp = NS_REINTERPRET_CAST(const nsCID*, aKey);
+        static_cast<const nsFactoryTableEntry*>(aHdr);
+    const nsCID *cidp = reinterpret_cast<const nsCID*>(aKey);
 
     return (entry->mFactoryEntry->mCid).Equals(*cidp);
 }
@@ -300,7 +300,7 @@ factory_MatchEntry(PLDHashTable *aTable, const PLDHashEntryHdr *aHdr,
 PR_STATIC_CALLBACK(void)
 factory_ClearEntry(PLDHashTable *aTable, PLDHashEntryHdr *aHdr)
 {
-    nsFactoryTableEntry* entry = NS_STATIC_CAST(nsFactoryTableEntry*, aHdr);
+    nsFactoryTableEntry* entry = static_cast<nsFactoryTableEntry*>(aHdr);
     // nsFactoryEntry is arena allocated. So we don't delete it.
     // We call the destructor by hand.
     entry->mFactoryEntry->~nsFactoryEntry();
@@ -320,7 +320,7 @@ static const PLDHashTableOps factory_DHashTableOps = {
 PR_STATIC_CALLBACK(void)
 contractID_ClearEntry(PLDHashTable *aTable, PLDHashEntryHdr *aHdr)
 {
-    nsContractIDTableEntry* entry = NS_STATIC_CAST(nsContractIDTableEntry*, aHdr);
+    nsContractIDTableEntry* entry = static_cast<nsContractIDTableEntry*>(aHdr);
     if (entry->mFactoryEntry->mLoaderType == NS_LOADER_TYPE_INVALID &&
         entry->mFactoryEntry->mCid.Equals(kEmptyCID)) {
         // this object is owned by the hash.
@@ -395,7 +395,7 @@ PLDHashTableEnumeratorImpl::Enumerator(PLDHashTable *table,
                                        PRUint32 number,
                                        void *data)
 {
-    Closure *c = NS_REINTERPRET_CAST(Closure *, data);
+    Closure *c = reinterpret_cast<Closure *>(data);
     nsISupports *converted;
     if (NS_FAILED(c->converter(table, hdr, c->data, &converted)) ||
         !c->impl->mElements.AppendElement(converted)) {
@@ -443,8 +443,8 @@ void
 PLDHashTableEnumeratorImpl::ReleaseElements()
 {
     for (PRInt32 i = 0; i < mCount; i++) {
-        nsISupports *supports = NS_REINTERPRET_CAST(nsISupports *,
-                                                    mElements[i]);
+        nsISupports *supports = reinterpret_cast<nsISupports *>
+                                                (mElements[i]);
         NS_IF_RELEASE(supports);
     }
 }
@@ -518,7 +518,7 @@ PLDHashTableEnumeratorImpl::CurrentItem(nsISupports **retval)
     if (!mCount || mCurrent == mCount)
         return NS_ERROR_FAILURE;
 
-    *retval = NS_REINTERPRET_CAST(nsISupports *, mElements[mCurrent]);
+    *retval = reinterpret_cast<nsISupports *>(mElements[mCurrent]);
     if (*retval)
         NS_ADDREF(*retval);
 
@@ -562,7 +562,7 @@ ConvertFactoryEntryToCID(PLDHashTable *table,
     nsresult rv;
     nsCOMPtr<nsISupportsID> wrapper;
 
-    nsComponentManagerImpl *cm = NS_STATIC_CAST(nsComponentManagerImpl *, data);
+    nsComponentManagerImpl *cm = static_cast<nsComponentManagerImpl *>(data);
 
     rv = cm->CreateInstanceByContractID(NS_SUPPORTS_ID_CONTRACTID, nsnull,
            NS_GET_IID(nsISupportsID), getter_AddRefs(wrapper));
@@ -570,7 +570,7 @@ ConvertFactoryEntryToCID(PLDHashTable *table,
     NS_ENSURE_SUCCESS(rv, rv);
 
     const nsFactoryTableEntry *entry =
-        NS_REINTERPRET_CAST(const nsFactoryTableEntry *, hdr);
+        reinterpret_cast<const nsFactoryTableEntry *>(hdr);
     if (entry) {
         nsFactoryEntry *fe = entry->mFactoryEntry;
 
@@ -592,7 +592,7 @@ ConvertContractIDKeyToString(PLDHashTable *table,
     nsresult rv;
     nsCOMPtr<nsISupportsCString> wrapper;
 
-    nsComponentManagerImpl *cm = NS_STATIC_CAST(nsComponentManagerImpl *, data);
+    nsComponentManagerImpl *cm = static_cast<nsComponentManagerImpl *>(data);
 
     rv = cm->CreateInstanceByContractID(NS_SUPPORTS_CSTRING_CONTRACTID, nsnull,
                 NS_GET_IID(nsISupportsCString), getter_AddRefs(wrapper));
@@ -600,7 +600,7 @@ ConvertContractIDKeyToString(PLDHashTable *table,
     NS_ENSURE_SUCCESS(rv, rv);
 
     const nsContractIDTableEntry *entry =
-        NS_REINTERPRET_CAST(const nsContractIDTableEntry *, hdr);
+        reinterpret_cast<const nsContractIDTableEntry *>(hdr);
 
     wrapper->SetData(nsDependentCString(entry->mContractID,
                                         entry->mContractIDLen));
@@ -1025,8 +1025,8 @@ nsComponentManagerImpl::ReadPersistentRegistry()
         }
 
         nsFactoryTableEntry* factoryTableEntry =
-            NS_STATIC_CAST(nsFactoryTableEntry*,
-                           PL_DHashTableOperate(&mFactories,
+            static_cast<nsFactoryTableEntry*>
+                       (PL_DHashTableOperate(&mFactories,
                                                 &aClass,
                                                 PL_DHASH_ADD));
 
@@ -1061,8 +1061,8 @@ nsComponentManagerImpl::ReadPersistentRegistry()
             continue; //what should we really do?
 
         nsContractIDTableEntry* contractIDTableEntry =
-                NS_STATIC_CAST(nsContractIDTableEntry*,
-                               PL_DHashTableOperate(&mContractIDs,
+                static_cast<nsContractIDTableEntry*>
+                           (PL_DHashTableOperate(&mContractIDs,
                                                     values[0],
                                                     PL_DHASH_ADD));
         if (!contractIDTableEntry) {
@@ -1110,8 +1110,8 @@ nsComponentManagerImpl::ReadPersistentRegistry()
         for (int i=0; abusedContracts[i] && *abusedContracts[i]; i++) {
             nsFactoryEntry *entry = nsnull;
             nsContractIDTableEntry* contractIDTableEntry =
-                NS_STATIC_CAST(nsContractIDTableEntry*,
-                               PL_DHashTableOperate(&mContractIDs, abusedContracts[i],
+                static_cast<nsContractIDTableEntry*>
+                           (PL_DHashTableOperate(&mContractIDs, abusedContracts[i],
                                                     PL_DHASH_LOOKUP));
 
             if (PL_DHASH_ENTRY_IS_BUSY(contractIDTableEntry)) {
@@ -1381,8 +1381,8 @@ nsComponentManagerImpl::HashContractID(const char *aContractID,
     nsAutoMonitor mon(mMon);
 
     nsContractIDTableEntry* contractIDTableEntry =
-        NS_STATIC_CAST(nsContractIDTableEntry*,
-                       PL_DHashTableOperate(&mContractIDs, aContractID,
+        static_cast<nsContractIDTableEntry*>
+                   (PL_DHashTableOperate(&mContractIDs, aContractID,
                                             PL_DHASH_ADD));
     if (!contractIDTableEntry)
         return NS_ERROR_OUT_OF_MEMORY;
@@ -1412,8 +1412,8 @@ nsComponentManagerImpl::GetFactoryEntry(const char *aContractID,
         nsAutoMonitor mon(mMon);
 
         nsContractIDTableEntry* contractIDTableEntry =
-            NS_STATIC_CAST(nsContractIDTableEntry*,
-                           PL_DHashTableOperate(&mContractIDs, aContractID,
+            static_cast<nsContractIDTableEntry*>
+                       (PL_DHashTableOperate(&mContractIDs, aContractID,
                                                 PL_DHASH_LOOKUP));
 
 
@@ -1434,8 +1434,8 @@ nsComponentManagerImpl::GetFactoryEntry(const nsCID &aClass)
         nsAutoMonitor mon(mMon);
 
         nsFactoryTableEntry* factoryTableEntry =
-            NS_STATIC_CAST(nsFactoryTableEntry*,
-                           PL_DHashTableOperate(&mFactories, &aClass,
+            static_cast<nsFactoryTableEntry*>
+                       (PL_DHashTableOperate(&mFactories, &aClass,
                                                 PL_DHASH_LOOKUP));
 
         if (PL_DHASH_ENTRY_IS_BUSY(factoryTableEntry)) {
@@ -1825,7 +1825,7 @@ FreeServiceFactoryEntryEnumerate(PLDHashTable *aTable,
                                  PRUint32 aNumber,
                                  void *aData)
 {
-    nsFactoryTableEntry* entry = NS_STATIC_CAST(nsFactoryTableEntry*, aHdr);
+    nsFactoryTableEntry* entry = static_cast<nsFactoryTableEntry*>(aHdr);
 
     if (!entry->mFactoryEntry)
         return PL_DHASH_NEXT;
@@ -1842,7 +1842,7 @@ FreeServiceContractIDEntryEnumerate(PLDHashTable *aTable,
                                     PRUint32 aNumber,
                                     void *aData)
 {
-    nsContractIDTableEntry* entry = NS_STATIC_CAST(nsContractIDTableEntry*, aHdr);
+    nsContractIDTableEntry* entry = static_cast<nsContractIDTableEntry*>(aHdr);
 
     if (!entry->mFactoryEntry)
         return PL_DHASH_NEXT;
@@ -1898,8 +1898,8 @@ nsComponentManagerImpl::GetService(const nsCID& aClass,
     nsIDKey key(aClass);
     nsFactoryEntry* entry = nsnull;
     nsFactoryTableEntry* factoryTableEntry =
-        NS_STATIC_CAST(nsFactoryTableEntry*,
-                       PL_DHashTableOperate(&mFactories, &aClass,
+        static_cast<nsFactoryTableEntry*>
+                   (PL_DHashTableOperate(&mFactories, &aClass,
                                             PL_DHASH_LOOKUP));
 
     if (PL_DHASH_ENTRY_IS_BUSY(factoryTableEntry)) {
@@ -1936,8 +1936,8 @@ nsComponentManagerImpl::GetService(const nsCID& aClass,
 
     if (!entry) { // second hash lookup for GetService
         nsFactoryTableEntry* factoryTableEntry =
-            NS_STATIC_CAST(nsFactoryTableEntry*,
-                           PL_DHashTableOperate(&mFactories, &aClass,
+            static_cast<nsFactoryTableEntry*>
+                       (PL_DHashTableOperate(&mFactories, &aClass,
                                                 PL_DHASH_LOOKUP));
         if (PL_DHASH_ENTRY_IS_BUSY(factoryTableEntry)) {
             entry = factoryTableEntry->mFactoryEntry;
@@ -1952,7 +1952,7 @@ nsComponentManagerImpl::GetService(const nsCID& aClass,
         NS_ERROR("Factory did not return an object but returned success!");
         return NS_ERROR_SERVICE_NOT_FOUND;
     }
-    NS_ADDREF(NS_STATIC_CAST(nsISupports*, (*result)));
+    NS_ADDREF(static_cast<nsISupports*>((*result)));
     return rv;
 }
 
@@ -1972,8 +1972,8 @@ nsComponentManagerImpl::RegisterService(const nsCID& aClass, nsISupports* aServi
         entry = new (mem) nsFactoryEntry(aClass, (nsIFactory*) nsnull);
 
         nsFactoryTableEntry* factoryTableEntry =
-            NS_STATIC_CAST(nsFactoryTableEntry*,
-                           PL_DHashTableOperate(&mFactories, &aClass,
+            static_cast<nsFactoryTableEntry*>
+                       (PL_DHashTableOperate(&mFactories, &aClass,
                                                 PL_DHASH_ADD));
         if (!factoryTableEntry)
             return NS_ERROR_OUT_OF_MEMORY;
@@ -1999,8 +1999,8 @@ nsComponentManagerImpl::UnregisterService(const nsCID& aClass)
     nsAutoMonitor mon(mMon);
 
     nsFactoryTableEntry* factoryTableEntry =
-        NS_STATIC_CAST(nsFactoryTableEntry*,
-                       PL_DHashTableOperate(&mFactories, &aClass,
+        static_cast<nsFactoryTableEntry*>
+                   (PL_DHashTableOperate(&mFactories, &aClass,
                                             PL_DHASH_LOOKUP));
 
     if (PL_DHASH_ENTRY_IS_BUSY(factoryTableEntry)) {
@@ -2033,8 +2033,8 @@ nsComponentManagerImpl::RegisterService(const char* aContractID,
         entry = new (mem) nsFactoryEntry(kEmptyCID, (nsIFactory*) nsnull);
 
         nsContractIDTableEntry* contractIDTableEntry =
-            NS_STATIC_CAST(nsContractIDTableEntry*,
-                           PL_DHashTableOperate(&mContractIDs, aContractID,
+            static_cast<nsContractIDTableEntry*>
+                       (PL_DHashTableOperate(&mContractIDs, aContractID,
                                                 PL_DHASH_ADD));
         if (!contractIDTableEntry) {
             delete entry;
@@ -2088,8 +2088,8 @@ nsComponentManagerImpl::IsServiceInstantiated(const nsCID & aClass,
     nsresult rv = NS_ERROR_SERVICE_NOT_AVAILABLE;
     nsFactoryEntry* entry = nsnull;
     nsFactoryTableEntry* factoryTableEntry =
-        NS_STATIC_CAST(nsFactoryTableEntry*,
-                       PL_DHashTableOperate(&mFactories, &aClass,
+        static_cast<nsFactoryTableEntry*>
+                   (PL_DHashTableOperate(&mFactories, &aClass,
                                             PL_DHASH_LOOKUP));
 
     if (PL_DHASH_ENTRY_IS_BUSY(factoryTableEntry)) {
@@ -2132,8 +2132,8 @@ NS_IMETHODIMP nsComponentManagerImpl::IsServiceInstantiatedByContractID(const ch
         nsAutoMonitor mon(mMon);
 
         nsContractIDTableEntry* contractIDTableEntry =
-            NS_STATIC_CAST(nsContractIDTableEntry*,
-                           PL_DHashTableOperate(&mContractIDs, aContractID,
+            static_cast<nsContractIDTableEntry*>
+                       (PL_DHashTableOperate(&mContractIDs, aContractID,
                                                 PL_DHASH_LOOKUP));
 
         if (PL_DHASH_ENTRY_IS_BUSY(contractIDTableEntry)) {
@@ -2159,8 +2159,8 @@ nsComponentManagerImpl::UnregisterService(const char* aContractID)
 
     nsFactoryEntry *entry = nsnull;
     nsContractIDTableEntry* contractIDTableEntry =
-       NS_STATIC_CAST(nsContractIDTableEntry*,
-                      PL_DHashTableOperate(&mContractIDs, aContractID,
+       static_cast<nsContractIDTableEntry*>
+                  (PL_DHashTableOperate(&mContractIDs, aContractID,
                                            PL_DHASH_LOOKUP));
 
    if (PL_DHASH_ENTRY_IS_BUSY(contractIDTableEntry)) {
@@ -2198,8 +2198,8 @@ nsComponentManagerImpl::GetServiceByContractID(const char* aContractID,
     nsresult rv = NS_OK;
     nsFactoryEntry *entry = nsnull;
     nsContractIDTableEntry* contractIDTableEntry =
-        NS_STATIC_CAST(nsContractIDTableEntry*,
-                       PL_DHashTableOperate(&mContractIDs, aContractID,
+        static_cast<nsContractIDTableEntry*>
+                   (PL_DHashTableOperate(&mContractIDs, aContractID,
                                             PL_DHASH_LOOKUP));
 
     if (PL_DHASH_ENTRY_IS_BUSY(contractIDTableEntry)) {
@@ -2244,8 +2244,8 @@ nsComponentManagerImpl::GetServiceByContractID(const char* aContractID,
 
     if (!entry) { // second hash lookup for GetService
         nsContractIDTableEntry* contractIDTableEntry =
-            NS_STATIC_CAST(nsContractIDTableEntry*,
-                           PL_DHashTableOperate(&mContractIDs, aContractID,
+            static_cast<nsContractIDTableEntry*>
+                       (PL_DHashTableOperate(&mContractIDs, aContractID,
                                                 PL_DHASH_LOOKUP));
 
         if (PL_DHASH_ENTRY_IS_BUSY(contractIDTableEntry)) {
@@ -2257,7 +2257,7 @@ nsComponentManagerImpl::GetServiceByContractID(const char* aContractID,
 
     entry->mServiceObject = service;
     *result = service.get();
-    NS_ADDREF(NS_STATIC_CAST(nsISupports*, *result));
+    NS_ADDREF(static_cast<nsISupports*>(*result));
     return rv;
 }
 
@@ -2459,8 +2459,8 @@ nsComponentManagerImpl::RegisterFactory(const nsCID &aClass,
     }
 #endif
     nsFactoryEntry *entry = nsnull;
-    nsFactoryTableEntry* factoryTableEntry = NS_STATIC_CAST(nsFactoryTableEntry*,
-                                                            PL_DHashTableOperate(&mFactories,
+    nsFactoryTableEntry* factoryTableEntry = static_cast<nsFactoryTableEntry*>
+                                                        (PL_DHashTableOperate(&mFactories,
                                                                                  &aClass,
                                                                                  PL_DHASH_ADD));
 
@@ -2653,8 +2653,8 @@ nsComponentManagerImpl::RegisterComponentCommon(const nsCID &aClass,
             return NS_ERROR_OUT_OF_MEMORY;
 
         nsFactoryTableEntry* factoryTableEntry =
-            NS_STATIC_CAST(nsFactoryTableEntry*,
-                           PL_DHashTableOperate(&mFactories, &aClass,
+            static_cast<nsFactoryTableEntry*>
+                       (PL_DHashTableOperate(&mFactories, &aClass,
                                                 PL_DHASH_ADD));
 
         if (!factoryTableEntry)
@@ -2784,7 +2784,7 @@ DeleteFoundCIDs(PLDHashTable *aTable,
                 PRUint32 aNumber,
                 void *aData)
 {
-    nsContractIDTableEntry* entry = NS_STATIC_CAST(nsContractIDTableEntry*, aHdr);
+    nsContractIDTableEntry* entry = static_cast<nsContractIDTableEntry*>(aHdr);
 
     if (!entry->mFactoryEntry)
         return PL_DHASH_NEXT;
@@ -3201,7 +3201,7 @@ nsComponentManagerImpl::EnumerateCLSIDs(nsIEnumerator** aEnumerator)
     if (NS_FAILED(rv))
         return rv;
 
-    *aEnumerator = NS_STATIC_CAST(nsIEnumerator*, aEnum);
+    *aEnumerator = static_cast<nsIEnumerator*>(aEnum);
     return NS_OK;
 }
 
@@ -3225,7 +3225,7 @@ nsComponentManagerImpl::EnumerateContractIDs(nsIEnumerator** aEnumerator)
     if (NS_FAILED(rv))
         return rv;
 
-    *aEnumerator = NS_STATIC_CAST(nsIEnumerator*, aEnum);
+    *aEnumerator = static_cast<nsIEnumerator*>(aEnum);
     return NS_OK;
 }
 
@@ -3463,7 +3463,7 @@ nsComponentManagerImpl::EnumerateCIDs(nsISimpleEnumerator **aEnumerator)
     if (NS_FAILED(rv))
         return rv;
 
-    *aEnumerator = NS_STATIC_CAST(nsISimpleEnumerator*, aEnum);
+    *aEnumerator = static_cast<nsISimpleEnumerator*>(aEnum);
     return NS_OK;
 }
 
@@ -3485,7 +3485,7 @@ nsComponentManagerImpl::EnumerateContractIDs(nsISimpleEnumerator **aEnumerator)
     if (NS_FAILED(rv))
         return rv;
 
-    *aEnumerator = NS_STATIC_CAST(nsISimpleEnumerator*, aEnum);
+    *aEnumerator = static_cast<nsISimpleEnumerator*>(aEnum);
     return NS_OK;
 }
 
@@ -3628,8 +3628,8 @@ NS_GetComponentManager(nsIComponentManager* *result)
             return rv;
     }
 
-    *result = NS_STATIC_CAST(nsIComponentManager*,
-                             nsComponentManagerImpl::gComponentManager);
+    *result = static_cast<nsIComponentManager*>
+                         (nsComponentManagerImpl::gComponentManager);
     NS_IF_ADDREF(*result);
     return NS_OK;
 }
@@ -3648,8 +3648,8 @@ NS_GetServiceManager(nsIServiceManager* *result)
     if (NS_FAILED(rv))
         return rv;
 
-    *result = NS_STATIC_CAST(nsIServiceManager*,
-                             nsComponentManagerImpl::gComponentManager);
+    *result = static_cast<nsIServiceManager*>
+                         (nsComponentManagerImpl::gComponentManager);
     NS_IF_ADDREF(*result);
     return NS_OK;
 }
@@ -3669,8 +3669,8 @@ NS_GetComponentRegistrar(nsIComponentRegistrar* *result)
     if (NS_FAILED(rv))
         return rv;
 
-    *result = NS_STATIC_CAST(nsIComponentRegistrar*,
-                             nsComponentManagerImpl::gComponentManager);
+    *result = static_cast<nsIComponentRegistrar*>
+                         (nsComponentManagerImpl::gComponentManager);
     NS_IF_ADDREF(*result);
     return NS_OK;
 }
diff --git a/mozilla/xpcom/components/nsServiceManagerObsolete.cpp b/mozilla/xpcom/components/nsServiceManagerObsolete.cpp
index 7b35b3f8ed6..55d7ee8a4ce 100644
--- a/mozilla/xpcom/components/nsServiceManagerObsolete.cpp
+++ b/mozilla/xpcom/components/nsServiceManagerObsolete.cpp
@@ -55,8 +55,7 @@ nsServiceManager::GetGlobalServiceManager(nsIServiceManager* *result)
         
     // this method does not addref for historical reasons.
     // we return the nsIServiceManagerObsolete interface via a cast.
-    *result =  (nsIServiceManager*) NS_STATIC_CAST(nsIServiceManagerObsolete*, 
-                                                   nsComponentManagerImpl::gComponentManager);
+    *result =  (nsIServiceManager*) static_cast<nsIServiceManagerObsolete*>(nsComponentManagerImpl::gComponentManager);
     return NS_OK;
 }
 
diff --git a/mozilla/xpcom/components/nsStaticComponentLoader.cpp b/mozilla/xpcom/components/nsStaticComponentLoader.cpp
index 15049e4f83d..fd41c6a2ca1 100644
--- a/mozilla/xpcom/components/nsStaticComponentLoader.cpp
+++ b/mozilla/xpcom/components/nsStaticComponentLoader.cpp
@@ -66,7 +66,7 @@ struct StaticModuleInfo : public PLDHashEntryHdr {
 PR_STATIC_CALLBACK(void)
 info_ClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry)
 {
-    StaticModuleInfo *info = NS_STATIC_CAST(StaticModuleInfo *, entry);
+    StaticModuleInfo *info = static_cast<StaticModuleInfo *>(entry);
     info->module = 0;
     info->~StaticModuleInfo();
 }
@@ -75,7 +75,7 @@ PR_STATIC_CALLBACK(PRBool)
 info_InitEntry(PLDHashTable *table, PLDHashEntryHdr *entry, const void *key)
 {
     // Construct so that our nsCOMPtr is zeroed, etc.
-    new (NS_STATIC_CAST(void *, entry)) StaticModuleInfo();
+    new (static_cast<void *>(entry)) StaticModuleInfo();
     return PR_TRUE;
 }
 
@@ -107,8 +107,8 @@ nsStaticModuleLoader::Init(nsStaticModuleInfo const *aStaticModules,
 
     for (PRUint32 i = 0; i < aModuleCount; ++i) {
         StaticModuleInfo *info =
-            NS_STATIC_CAST(StaticModuleInfo *,
-                           PL_DHashTableOperate(&mInfoHash, aStaticModules[i].name,
+            static_cast<StaticModuleInfo *>
+                       (PL_DHashTableOperate(&mInfoHash, aStaticModules[i].name,
                                                 PL_DHASH_ADD));
         if (!info)
             return NS_ERROR_OUT_OF_MEMORY;
@@ -148,8 +148,8 @@ nsStaticModuleLoader::GetModuleFor(const char *aLocation,
 {
     nsresult rv;
     StaticModuleInfo *info = 
-        NS_STATIC_CAST(StaticModuleInfo *,
-                       PL_DHashTableOperate(&mInfoHash, aLocation,
+        static_cast<StaticModuleInfo *>
+                   (PL_DHashTableOperate(&mInfoHash, aLocation,
                                             PL_DHASH_LOOKUP));
 
     if (PL_DHASH_ENTRY_IS_FREE(info))
diff --git a/mozilla/xpcom/ds/nsArray.cpp b/mozilla/xpcom/ds/nsArray.cpp
index 3efedfc9191..c1292927d9a 100644
--- a/mozilla/xpcom/ds/nsArray.cpp
+++ b/mozilla/xpcom/ds/nsArray.cpp
@@ -102,7 +102,7 @@ nsArray::IndexOf(PRUint32 aStartIndex, nsISupports* aElement,
 NS_IMETHODIMP
 nsArray::Enumerate(nsISimpleEnumerator **aResult)
 {
-    return NS_NewArrayEnumerator(aResult, NS_STATIC_CAST(nsIArray*, this));
+    return NS_NewArrayEnumerator(aResult, static_cast<nsIArray*>(this));
 }
 
 // nsIMutableArray implementation
@@ -113,8 +113,8 @@ nsArray::AppendElement(nsISupports* aElement, PRBool aWeak)
     PRBool result;
     if (aWeak) {
         nsCOMPtr<nsISupports> elementRef =
-            getter_AddRefs(NS_STATIC_CAST(nsISupports*,
-                                          NS_GetWeakReference(aElement)));
+            getter_AddRefs(static_cast<nsISupports*>
+                                      (NS_GetWeakReference(aElement)));
         NS_ASSERTION(elementRef, "AppendElement: Trying to use weak references on an object that doesn't support it");
         if (!elementRef)
             return NS_ERROR_FAILURE;
@@ -141,8 +141,8 @@ nsArray::InsertElementAt(nsISupports* aElement, PRUint32 aIndex, PRBool aWeak)
     nsCOMPtr<nsISupports> elementRef;
     if (aWeak) {
         elementRef =
-            getter_AddRefs(NS_STATIC_CAST(nsISupports*,
-                                          NS_GetWeakReference(aElement)));
+            getter_AddRefs(static_cast<nsISupports*>
+                                      (NS_GetWeakReference(aElement)));
         NS_ASSERTION(elementRef, "InsertElementAt: Trying to use weak references on an object that doesn't support it");
         if (!elementRef)
             return NS_ERROR_FAILURE;
@@ -159,8 +159,8 @@ nsArray::ReplaceElementAt(nsISupports* aElement, PRUint32 aIndex, PRBool aWeak)
     nsCOMPtr<nsISupports> elementRef;
     if (aWeak) {
         elementRef =
-            getter_AddRefs(NS_STATIC_CAST(nsISupports*,
-                                          NS_GetWeakReference(aElement)));
+            getter_AddRefs(static_cast<nsISupports*>
+                                      (NS_GetWeakReference(aElement)));
         NS_ASSERTION(elementRef, "ReplaceElementAt: Trying to use weak references on an object that doesn't support it");
         if (!elementRef)
             return NS_ERROR_FAILURE;
@@ -185,10 +185,10 @@ PRBool
 FindElementCallback(void *aElement, void* aClosure)
 {
     findIndexOfClosure* closure =
-        NS_STATIC_CAST(findIndexOfClosure*, aClosure);
+        static_cast<findIndexOfClosure*>(aClosure);
 
     nsISupports* element =
-        NS_STATIC_CAST(nsISupports*, aElement);
+        static_cast<nsISupports*>(aElement);
     
     // don't start searching until we're past the startIndex
     if (closure->resultIndex >= closure->startIndex &&
diff --git a/mozilla/xpcom/ds/nsAtomTable.cpp b/mozilla/xpcom/ds/nsAtomTable.cpp
index 293396c93ac..3a4190da026 100644
--- a/mozilla/xpcom/ds/nsAtomTable.cpp
+++ b/mozilla/xpcom/ds/nsAtomTable.cpp
@@ -245,7 +245,7 @@ struct AtomTableEntry : public PLDHashEntryHdr {
 PR_STATIC_CALLBACK(PLDHashNumber)
 AtomTableGetHash(PLDHashTable *table, const void *key)
 {
-  const AtomTableEntry *e = NS_STATIC_CAST(const AtomTableEntry*, key);
+  const AtomTableEntry *e = static_cast<const AtomTableEntry*>(key);
 
   if (e->IsUTF16String()) {
     return nsCRT::HashCodeAsUTF8(e->getUTF16String());
@@ -261,8 +261,8 @@ PR_STATIC_CALLBACK(PRBool)
 AtomTableMatchKey(PLDHashTable *table, const PLDHashEntryHdr *entry,
                   const void *key)
 {
-  const AtomTableEntry *he = NS_STATIC_CAST(const AtomTableEntry*, entry);
-  const AtomTableEntry *strKey = NS_STATIC_CAST(const AtomTableEntry*, key);
+  const AtomTableEntry *he = static_cast<const AtomTableEntry*>(entry);
+  const AtomTableEntry *strKey = static_cast<const AtomTableEntry*>(key);
 
   const char *atomString = he->getAtomString();
 
@@ -282,7 +282,7 @@ AtomTableMatchKey(PLDHashTable *table, const PLDHashEntryHdr *entry,
 PR_STATIC_CALLBACK(void)
 AtomTableClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry)
 {
-  AtomTableEntry *he = NS_STATIC_CAST(AtomTableEntry*, entry);
+  AtomTableEntry *he = static_cast<AtomTableEntry*>(entry);
   
   if (!he->IsStaticAtom()) {
     AtomImpl *atom = he->GetAtomImpl();
@@ -295,7 +295,7 @@ AtomTableClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry)
     if (atom->IsPermanent()) {
       he->keyHash = 0;
 
-      delete NS_STATIC_CAST(PermanentAtomImpl*, atom);
+      delete static_cast<PermanentAtomImpl*>(atom);
     }
   }
   else {
@@ -323,14 +323,14 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 DumpAtomLeaks(PLDHashTable *table, PLDHashEntryHdr *he,
               PRUint32 index, void *arg)
 {
-  AtomTableEntry *entry = NS_STATIC_CAST(AtomTableEntry*, he);
+  AtomTableEntry *entry = static_cast<AtomTableEntry*>(he);
   
   if (entry->IsStaticAtom())
     return PL_DHASH_NEXT;
   
   AtomImpl* atom = entry->GetAtomImpl();
   if (!atom->IsPermanent()) {
-    ++*NS_STATIC_CAST(PRUint32*, arg);
+    ++*static_cast<PRUint32*>(arg);
     const char *str;
     atom->GetUTF8String(&str);
     fputs(str, stdout);
@@ -448,7 +448,7 @@ void* AtomImpl::operator new ( size_t size, const nsACString& aString ) CPP_THRO
         http://lxr.mozilla.org/seamonkey/source/xpcom/ds/nsSharedString.h#174
      */
   size += aString.Length() * sizeof(char);
-  AtomImpl* ii = NS_STATIC_CAST(AtomImpl*, ::operator new(size));
+  AtomImpl* ii = static_cast<AtomImpl*>(::operator new(size));
   NS_ENSURE_TRUE(ii, nsnull);
 
   char* toBegin = &ii->mString[0];
@@ -592,8 +592,8 @@ GetAtomHashEntry(const char* aString)
   }
 
   AtomTableEntry key(aString);
-  return NS_STATIC_CAST(AtomTableEntry*,
-                        PL_DHashTableOperate(&gAtomTable, &key, PL_DHASH_ADD));
+  return static_cast<AtomTableEntry*>
+                    (PL_DHashTableOperate(&gAtomTable, &key, PL_DHASH_ADD));
 }
 
 static inline AtomTableEntry*
@@ -607,8 +607,8 @@ GetAtomHashEntry(const PRUnichar* aString)
   }
 
   AtomTableEntry key(aString);
-  return NS_STATIC_CAST(AtomTableEntry*,
-                        PL_DHashTableOperate(&gAtomTable, &key, PL_DHASH_ADD));
+  return static_cast<AtomTableEntry*>
+                    (PL_DHashTableOperate(&gAtomTable, &key, PL_DHASH_ADD));
 }
 
 NS_COM nsresult
diff --git a/mozilla/xpcom/ds/nsCRT.cpp b/mozilla/xpcom/ds/nsCRT.cpp
index b757c143ed9..101a9ed5b57 100644
--- a/mozilla/xpcom/ds/nsCRT.cpp
+++ b/mozilla/xpcom/ds/nsCRT.cpp
@@ -81,19 +81,19 @@ char* nsCRT::strtok(char* string, const char* delims, char* *newStr)
     delimTable[i] = '\0';
 
   for (i = 0; delims[i]; i++) {
-    SET_DELIM(delimTable, NS_STATIC_CAST(PRUint8, delims[i]));
+    SET_DELIM(delimTable, static_cast<PRUint8>(delims[i]));
   }
   NS_ASSERTION(delims[i] == '\0', "too many delimiters");
 
   // skip to beginning
-  while (*str && IS_DELIM(delimTable, NS_STATIC_CAST(PRUint8, *str))) {
+  while (*str && IS_DELIM(delimTable, static_cast<PRUint8>(*str))) {
     str++;
   }
   result = str;
 
   // fix up the end of the token
   while (*str) {
-    if (IS_DELIM(delimTable, NS_STATIC_CAST(PRUint8, *str))) {
+    if (IS_DELIM(delimTable, static_cast<PRUint8>(*str))) {
       *str++ = '\0';
       break;
     }
diff --git a/mozilla/xpcom/ds/nsCppSharedAllocator.h b/mozilla/xpcom/ds/nsCppSharedAllocator.h
index 55f3e19db64..d40facdaeb3 100644
--- a/mozilla/xpcom/ds/nsCppSharedAllocator.h
+++ b/mozilla/xpcom/ds/nsCppSharedAllocator.h
@@ -69,7 +69,7 @@ class nsCppSharedAllocator
       pointer
       allocate( size_type n, const void* /*hint*/=0 )
         {
-          return NS_REINTERPRET_CAST(pointer, nsMemory::Alloc(NS_STATIC_CAST(PRUint32, n*sizeof(T))));
+          return reinterpret_cast<pointer>(nsMemory::Alloc(static_cast<PRUint32>(n*sizeof(T))));
         }
 
       void
diff --git a/mozilla/xpcom/ds/nsDoubleHashtable.h b/mozilla/xpcom/ds/nsDoubleHashtable.h
index 8f4ff9b0e0b..510eed099e3 100644
--- a/mozilla/xpcom/ds/nsDoubleHashtable.h
+++ b/mozilla/xpcom/ds/nsDoubleHashtable.h
@@ -211,13 +211,13 @@ PR_STATIC_CALLBACK(PRBool)                                                    \
 ENTRY_CLASS##MatchEntry(PLDHashTable *table, const PLDHashEntryHdr *entry,    \
                         const void *key)                                      \
 {                                                                             \
-  const ENTRY_CLASS* e = NS_STATIC_CAST(const ENTRY_CLASS*, entry);           \
+  const ENTRY_CLASS* e = static_cast<const ENTRY_CLASS*>(entry);           \
   return e->MatchEntry(key);                                                  \
 }                                                                             \
 PR_STATIC_CALLBACK(void)                                                      \
 ENTRY_CLASS##ClearEntry(PLDHashTable *table, PLDHashEntryHdr *entry)          \
 {                                                                             \
-  ENTRY_CLASS* e = NS_STATIC_CAST(ENTRY_CLASS *, entry);                      \
+  ENTRY_CLASS* e = static_cast<ENTRY_CLASS *>(entry);                      \
   e->~ENTRY_CLASS();                                                          \
 }                                                                             \
 PR_STATIC_CALLBACK(PRBool)                                                    \
@@ -353,13 +353,13 @@ nsresult CLASSNAME::Init(PRUint32 aNumInitialEntries) {                       \
   return NS_OK;                                                               \
 }                                                                             \
 ENTRY_CLASS* CLASSNAME::GetEntry(const KEY_TYPE aKey) {                       \
-  ENTRY_CLASS* e = NS_STATIC_CAST(ENTRY_CLASS*,                               \
+  ENTRY_CLASS* e = static_cast<ENTRY_CLASS*>(\
                                   PL_DHashTableOperate(&mHashTable, &aKey,    \
                                                        PL_DHASH_LOOKUP));     \
   return PL_DHASH_ENTRY_IS_BUSY(e) ? e : nsnull;                              \
 }                                                                             \
 ENTRY_CLASS* CLASSNAME::AddEntry(const KEY_TYPE aKey) {                       \
-  return NS_STATIC_CAST(ENTRY_CLASS*,                                         \
+  return static_cast<ENTRY_CLASS*>(\
                         PL_DHashTableOperate(&mHashTable, &aKey,              \
                                              PL_DHASH_ADD));                  \
 }                                                                             \
@@ -402,14 +402,14 @@ class NS_COM PLDHashStringEntry : public PLDHashEntryHdr
 {
 public:
   PLDHashStringEntry(const void* aKey) :
-    mKey(*NS_STATIC_CAST(const nsAString*, aKey)) { }
+    mKey(*static_cast<const nsAString*>(aKey)) { }
   ~PLDHashStringEntry() { }
 
   static PLDHashNumber HashKey(const void* key) {
-    return HashString(*NS_STATIC_CAST(const nsAString*, key));
+    return HashString(*static_cast<const nsAString*>(key));
   }
   PRBool MatchEntry(const void* key) const {
-    return NS_STATIC_CAST(const nsAString*, key)->Equals(mKey);
+    return static_cast<const nsAString*>(key)->Equals(mKey);
   }
 
   const nsString mKey;
@@ -422,14 +422,14 @@ class NS_COM PLDHashCStringEntry : public PLDHashEntryHdr
 {
 public:
   PLDHashCStringEntry(const void* aKey) :
-    mKey(*NS_STATIC_CAST(const nsACString*, aKey)) { }
+    mKey(*static_cast<const nsACString*>(aKey)) { }
   ~PLDHashCStringEntry() { }
 
   static PLDHashNumber HashKey(const void* key) {
-    return HashString(*NS_STATIC_CAST(const nsACString*, key));
+    return HashString(*static_cast<const nsACString*>(key));
   }
   PRBool MatchEntry(const void* key) const {
-    return NS_STATIC_CAST(const nsACString*, key)->Equals(mKey);
+    return static_cast<const nsACString*>(key)->Equals(mKey);
   }
 
   const nsCString mKey;
@@ -442,14 +442,14 @@ class NS_COM PLDHashInt32Entry : public PLDHashEntryHdr
 {
 public:
   PLDHashInt32Entry(const void* aKey) :
-    mKey(*(NS_STATIC_CAST(const PRInt32*, aKey))) { }
+    mKey(*(static_cast<const PRInt32*>(aKey))) { }
   ~PLDHashInt32Entry() { }
 
   static PLDHashNumber HashKey(const void* key) {
-    return *NS_STATIC_CAST(const PRInt32*, key);
+    return *static_cast<const PRInt32*>(key);
   }
   PRBool MatchEntry(const void* key) const {
-    return *(NS_STATIC_CAST(const PRInt32*, key)) == mKey;
+    return *(static_cast<const PRInt32*>(key)) == mKey;
   }
 
   const PRInt32 mKey;
diff --git a/mozilla/xpcom/ds/nsExpirationTracker.h b/mozilla/xpcom/ds/nsExpirationTracker.h
index 2918a9b0bfe..0c88a391232 100644
--- a/mozilla/xpcom/ds/nsExpirationTracker.h
+++ b/mozilla/xpcom/ds/nsExpirationTracker.h
@@ -271,7 +271,7 @@ template <class T, PRUint32 K> class nsExpirationTracker {
     PRPackedBool       mInAgeOneGeneration;
 
     static void TimerCallback(nsITimer* aTimer, void* aThis) {
-      nsExpirationTracker* tracker = NS_STATIC_CAST(nsExpirationTracker*, aThis);
+      nsExpirationTracker* tracker = static_cast<nsExpirationTracker*>(aThis);
       tracker->AgeOneGeneration();
       // Cancel the timer if we have no objects to track
       PRUint32 i;
diff --git a/mozilla/xpcom/ds/nsFixedSizeAllocator.cpp b/mozilla/xpcom/ds/nsFixedSizeAllocator.cpp
index 1b6232f99ad..838ea5efe58 100644
--- a/mozilla/xpcom/ds/nsFixedSizeAllocator.cpp
+++ b/mozilla/xpcom/ds/nsFixedSizeAllocator.cpp
@@ -53,7 +53,7 @@ nsFixedSizeAllocator::AddBucket(size_t aSize)
     if (! p)
         return nsnull;
 
-    Bucket* bucket = NS_STATIC_CAST(Bucket*, p);
+    Bucket* bucket = static_cast<Bucket*>(p);
     bucket->mSize  = aSize;
     bucket->mFirst = nsnull;
     bucket->mNext  = mBuckets;
@@ -140,7 +140,7 @@ nsFixedSizeAllocator::Alloc(size_t aSize)
 void
 nsFixedSizeAllocator::Free(void* aPtr, size_t aSize)
 {
-    FreeEntry* entry = NS_REINTERPRET_CAST(FreeEntry*, aPtr);
+    FreeEntry* entry = reinterpret_cast<FreeEntry*>(aPtr);
     Bucket* bucket = FindBucket(aSize);
 
 #ifdef DEBUG
diff --git a/mozilla/xpcom/ds/nsHashPropertyBag.cpp b/mozilla/xpcom/ds/nsHashPropertyBag.cpp
index 7fbdd3e0c2c..980b07f185b 100755
--- a/mozilla/xpcom/ds/nsHashPropertyBag.cpp
+++ b/mozilla/xpcom/ds/nsHashPropertyBag.cpp
@@ -184,7 +184,7 @@ PropertyHashToArrayFunc (const nsAString &aKey,
                          void *userArg)
 {
     nsIMutableArray *propertyArray =
-        NS_STATIC_CAST(nsIMutableArray *, userArg);
+        static_cast<nsIMutableArray *>(userArg);
     nsSimpleProperty *sprop = new nsSimpleProperty(aKey, aData);
     propertyArray->AppendElement(sprop, PR_FALSE);
     return PL_DHASH_NEXT;
diff --git a/mozilla/xpcom/ds/nsHashtable.cpp b/mozilla/xpcom/ds/nsHashtable.cpp
index 5f42d9a6aff..7afddf4a2b0 100644
--- a/mozilla/xpcom/ds/nsHashtable.cpp
+++ b/mozilla/xpcom/ds/nsHashtable.cpp
@@ -70,19 +70,19 @@ matchKeyEntry(PLDHashTable*, const PLDHashEntryHdr* entry,
               const void* key)
 {
     const HTEntry* hashEntry =
-        NS_STATIC_CAST(const HTEntry*, entry);
+        static_cast<const HTEntry*>(entry);
 
     if (hashEntry->key == key)
         return PR_TRUE;
 
-    const nsHashKey* otherKey = NS_REINTERPRET_CAST(const nsHashKey*, key);
+    const nsHashKey* otherKey = reinterpret_cast<const nsHashKey*>(key);
     return otherKey->Equals(hashEntry->key);
 }
 
 PR_STATIC_CALLBACK(PLDHashNumber)
 hashKey(PLDHashTable* table, const void* key)
 {
-    const nsHashKey* hashKey = NS_STATIC_CAST(const nsHashKey*, key);
+    const nsHashKey* hashKey = static_cast<const nsHashKey*>(key);
 
     return hashKey->HashCode();
 }
@@ -90,7 +90,7 @@ hashKey(PLDHashTable* table, const void* key)
 PR_STATIC_CALLBACK(void)
 clearHashEntry(PLDHashTable* table, PLDHashEntryHdr* entry)
 {
-    HTEntry* hashEntry = NS_STATIC_CAST(HTEntry*, entry);
+    HTEntry* hashEntry = static_cast<HTEntry*>(entry);
 
     // leave it up to the nsHashKey destructor to free the "value"
     delete hashEntry->key;
@@ -125,7 +125,7 @@ PR_STATIC_CALLBACK(PLDHashOperator)
 hashEnumerate(PLDHashTable* table, PLDHashEntryHdr* hdr, PRUint32 i, void *arg)
 {
     _HashEnumerateArgs* thunk = (_HashEnumerateArgs*)arg;
-    HTEntry* entry = NS_STATIC_CAST(HTEntry*, hdr);
+    HTEntry* entry = static_cast<HTEntry*>(hdr);
     
     switch (thunk->fn(entry->key, entry->value, thunk->arg)) {
       case kHashEnumerateNext:
@@ -213,8 +213,8 @@ void *nsHashtable::Put(nsHashKey *aKey, void *aData)
     PR_ASSERT(!mEnumerating);
     
     HTEntry* entry =
-        NS_STATIC_CAST(HTEntry*,
-                       PL_DHashTableOperate(&mHashtable, aKey, PL_DHASH_ADD));
+        static_cast<HTEntry*>
+                   (PL_DHashTableOperate(&mHashtable, aKey, PL_DHASH_ADD));
     
     if (entry) {                // don't return early, or you'll be locked!
         if (entry->key) {
@@ -240,8 +240,8 @@ void *nsHashtable::Get(nsHashKey *aKey)
     if (mLock) PR_Lock(mLock);
 
     HTEntry* entry =
-        NS_STATIC_CAST(HTEntry*,
-                       PL_DHashTableOperate(&mHashtable, aKey, PL_DHASH_LOOKUP));
+        static_cast<HTEntry*>
+                   (PL_DHashTableOperate(&mHashtable, aKey, PL_DHASH_LOOKUP));
     void *ret = PL_DHASH_ENTRY_IS_BUSY(entry) ? entry->value : nsnull;
     
     if (mLock) PR_Unlock(mLock);
@@ -262,8 +262,8 @@ void *nsHashtable::Remove(nsHashKey *aKey)
     // need to see if the entry is actually there, in order to get the
     // old value for the result
     HTEntry* entry =
-        NS_STATIC_CAST(HTEntry*,
-                       PL_DHashTableOperate(&mHashtable, aKey, PL_DHASH_LOOKUP));
+        static_cast<HTEntry*>
+                   (PL_DHashTableOperate(&mHashtable, aKey, PL_DHASH_LOOKUP));
     void *res;
     
     if (PL_DHASH_ENTRY_IS_FREE(entry)) {
@@ -287,7 +287,7 @@ hashEnumerateShare(PLDHashTable *table, PLDHashEntryHdr *hdr,
                    PRUint32 i, void *arg)
 {
     nsHashtable *newHashtable = (nsHashtable *)arg;
-    HTEntry * entry = NS_STATIC_CAST(HTEntry*, hdr);
+    HTEntry * entry = static_cast<HTEntry*>(hdr);
     
     newHashtable->Put(entry->key, entry->value);
     return PL_DHASH_NEXT;
@@ -320,7 +320,7 @@ void nsHashtable::Enumerate(nsHashtableEnumFunc aEnumFunc, void* aClosure)
 PR_STATIC_CALLBACK(PLDHashOperator)
 hashEnumerateRemove(PLDHashTable*, PLDHashEntryHdr* hdr, PRUint32 i, void *arg)
 {
-    HTEntry* entry = NS_STATIC_CAST(HTEntry*, hdr);
+    HTEntry* entry = static_cast<HTEntry*>(hdr);
     _HashEnumerateArgs* thunk = (_HashEnumerateArgs*)arg;
     if (thunk) {
         return thunk->fn(entry->key, entry->value, thunk->arg)
@@ -442,7 +442,7 @@ nsHashtable::Write(nsIObjectOutputStream* aStream,
 
     // Write all key/value pairs in the table.
     WriteEntryArgs args = {aStream, aWriteDataFunc};
-    NS_CONST_CAST(nsHashtable*, this)->Enumerate(WriteEntry, (void*) &args);
+    const_cast<nsHashtable*>(this)->Enumerate(WriteEntry, (void*) &args);
     return args.mRetVal;
 }
 
@@ -489,7 +489,7 @@ nsCStringKey::nsCStringKey(const nsCStringKey& aKey)
 {
     if (mOwnership != NEVER_OWN) {
       PRUint32 len = mStrLen * sizeof(char);
-      char* str = NS_REINTERPRET_CAST(char*, nsMemory::Alloc(len + sizeof(char)));
+      char* str = reinterpret_cast<char*>(nsMemory::Alloc(len + sizeof(char)));
       if (!str) {
         // Pray we don't dangle!
         mOwnership = NEVER_OWN;
@@ -508,7 +508,7 @@ nsCStringKey::nsCStringKey(const nsCStringKey& aKey)
 }
 
 nsCStringKey::nsCStringKey(const nsAFlatCString& str)
-    : mStr(NS_CONST_CAST(char*, str.get())),
+    : mStr(const_cast<char*>(str.get())),
       mStrLen(str.Length()),
       mOwnership(OWN_CLONE)
 {
@@ -616,7 +616,7 @@ nsStringKey::nsStringKey(const nsStringKey& aKey)
 {
     if (mOwnership != NEVER_OWN) {
         PRUint32 len = mStrLen * sizeof(PRUnichar);
-        PRUnichar* str = NS_REINTERPRET_CAST(PRUnichar*, nsMemory::Alloc(len + sizeof(PRUnichar)));
+        PRUnichar* str = reinterpret_cast<PRUnichar*>(nsMemory::Alloc(len + sizeof(PRUnichar)));
         if (!str) {
             // Pray we don't dangle!
             mOwnership = NEVER_OWN;
@@ -635,7 +635,7 @@ nsStringKey::nsStringKey(const nsStringKey& aKey)
 }
 
 nsStringKey::nsStringKey(const nsAFlatString& str)
-    : mStr(NS_CONST_CAST(PRUnichar*, str.get())),
+    : mStr(const_cast<PRUnichar*>(str.get())),
       mStrLen(str.Length()),
       mOwnership(OWN_CLONE)
 {
@@ -756,7 +756,7 @@ nsObjectHashtable::CopyElement(PLDHashTable* table,
                                PRUint32 i, void *arg)
 {
     nsObjectHashtable *newHashtable = (nsObjectHashtable *)arg;
-    HTEntry *entry = NS_STATIC_CAST(HTEntry*, hdr);
+    HTEntry *entry = static_cast<HTEntry*>(hdr);
     
     void* newElement =
         newHashtable->mCloneElementFun(entry->key, entry->value,
@@ -805,7 +805,7 @@ nsObjectHashtable::RemoveAndDelete(nsHashKey *aKey)
 PRBool PR_CALLBACK
 nsSupportsHashtable::ReleaseElement(nsHashKey *aKey, void *aData, void* aClosure)
 {
-    nsISupports* element = NS_STATIC_CAST(nsISupports*, aData);
+    nsISupports* element = static_cast<nsISupports*>(aData);
     NS_IF_RELEASE(element);
     return PR_TRUE;
 }
@@ -822,7 +822,7 @@ nsSupportsHashtable::Put(nsHashKey *aKey, nsISupports* aData, nsISupports **valu
 {
     NS_IF_ADDREF(aData);
     void *prev = nsHashtable::Put(aKey, aData);
-    nsISupports *old = NS_REINTERPRET_CAST(nsISupports *, prev);
+    nsISupports *old = reinterpret_cast<nsISupports *>(prev);
     if (value)  // pass own the ownership to the caller
         *value = old;
     else        // the caller doesn't care, we do
@@ -836,7 +836,7 @@ nsSupportsHashtable::Get(nsHashKey *aKey)
     void* data = nsHashtable::Get(aKey);
     if (!data)
         return nsnull;
-    nsISupports* element = NS_REINTERPRET_CAST(nsISupports*, data);
+    nsISupports* element = reinterpret_cast<nsISupports*>(data);
     NS_IF_ADDREF(element);
     return element;
 }
@@ -847,7 +847,7 @@ PRBool
 nsSupportsHashtable::Remove(nsHashKey *aKey, nsISupports **value)
 {
     void* data = nsHashtable::Remove(aKey);
-    nsISupports* element = NS_STATIC_CAST(nsISupports*, data);
+    nsISupports* element = static_cast<nsISupports*>(data);
     if (value)            // caller wants it
         *value = element;
     else                  // caller doesn't care, we do
@@ -861,9 +861,9 @@ nsSupportsHashtable::EnumerateCopy(PLDHashTable*,
                                    PRUint32 i, void *arg)
 {
     nsHashtable *newHashtable = (nsHashtable *)arg;
-    HTEntry* entry = NS_STATIC_CAST(HTEntry*, hdr);
+    HTEntry* entry = static_cast<HTEntry*>(hdr);
     
-    nsISupports* element = NS_STATIC_CAST(nsISupports*, entry->value);
+    nsISupports* element = static_cast<nsISupports*>(entry->value);
     NS_IF_ADDREF(element);
     newHashtable->Put(entry->key, entry->value);
     return PL_DHASH_NEXT;
diff --git a/mozilla/xpcom/ds/nsINIParserImpl.cpp b/mozilla/xpcom/ds/nsINIParserImpl.cpp
index 04c3ba180a6..612b936718f 100644
--- a/mozilla/xpcom/ds/nsINIParserImpl.cpp
+++ b/mozilla/xpcom/ds/nsINIParserImpl.cpp
@@ -103,7 +103,7 @@ NS_IMPL_ISUPPORTS1(nsINIParserImpl,
 static PRBool
 SectionCB(const char* aSection, void *aClosure)
 {
-  nsCStringArray *strings = NS_STATIC_CAST(nsCStringArray*, aClosure);
+  nsCStringArray *strings = static_cast<nsCStringArray*>(aClosure);
 
   strings->AppendCString(nsDependentCString(aSection));
   return PR_TRUE;
@@ -129,7 +129,7 @@ nsINIParserImpl::GetSections(nsIUTF8StringEnumerator* *aResult)
 static PRBool
 KeyCB(const char* aKey, const char *aValue, void *aClosure)
 {
-  nsCStringArray *strings = NS_STATIC_CAST(nsCStringArray*, aClosure);
+  nsCStringArray *strings = static_cast<nsCStringArray*>(aClosure);
 
   strings->AppendCString(nsDependentCString(aKey));
   return PR_TRUE;
diff --git a/mozilla/xpcom/ds/nsObserverList.cpp b/mozilla/xpcom/ds/nsObserverList.cpp
index 7f6e5799aca..697ab89556b 100644
--- a/mozilla/xpcom/ds/nsObserverList.cpp
+++ b/mozilla/xpcom/ds/nsObserverList.cpp
@@ -70,7 +70,7 @@ nsObserverList::RemoveObserver(nsIObserver* anObserver)
 {
     NS_ASSERTION(anObserver, "Null input");
 
-    if (mObservers.RemoveElement(NS_STATIC_CAST(nsISupports*, anObserver)))
+    if (mObservers.RemoveElement(static_cast<nsISupports*>(anObserver)))
         return NS_OK;
 
     nsCOMPtr<nsIWeakReference> observerRef = do_GetWeakReference(anObserver);
diff --git a/mozilla/xpcom/ds/nsObserverList.h b/mozilla/xpcom/ds/nsObserverList.h
index e55ce236743..017985da6e2 100644
--- a/mozilla/xpcom/ds/nsObserverList.h
+++ b/mozilla/xpcom/ds/nsObserverList.h
@@ -60,12 +60,12 @@ struct ObserverRef
 
   nsIObserver* asObserver() {
     NS_ASSERTION(!isWeakRef, "Isn't a strong ref.");
-    return NS_STATIC_CAST(nsIObserver*, (nsISupports*) ref);
+    return static_cast<nsIObserver*>((nsISupports*) ref);
   }
 
   nsIWeakReference* asWeak() {
     NS_ASSERTION(isWeakRef, "Isn't a weak ref.");
-    return NS_STATIC_CAST(nsIWeakReference*, (nsISupports*) ref);
+    return static_cast<nsIWeakReference*>((nsISupports*) ref);
   }
 
   PRBool operator==(nsISupports* b) const { return ref == b; }
diff --git a/mozilla/xpcom/ds/nsPersistentProperties.cpp b/mozilla/xpcom/ds/nsPersistentProperties.cpp
index 2ebff55b82f..b0e209fdc27 100644
--- a/mozilla/xpcom/ds/nsPersistentProperties.cpp
+++ b/mozilla/xpcom/ds/nsPersistentProperties.cpp
@@ -70,7 +70,7 @@ ArenaStrdup(const nsAFlatString& aString, PLArenaPool* aArena)
   if (mem) {
     memcpy(mem, aString.get(), len);
   }
-  return NS_STATIC_CAST(PRUnichar*, mem);
+  return static_cast<PRUnichar*>(mem);
 }
 
 static char*
@@ -83,7 +83,7 @@ ArenaStrdup(const nsAFlatCString& aString, PLArenaPool* aArena)
   NS_ASSERTION(mem, "Couldn't allocate space!\n");
   if (mem)
     memcpy(mem, aString.get(), len);
-  return NS_STATIC_CAST(char*, mem);
+  return static_cast<char*>(mem);
 }
 
 static const struct PLDHashTableOps property_HashTableOps = {
@@ -100,7 +100,7 @@ static const struct PLDHashTableOps property_HashTableOps = {
 nsPersistentProperties::nsPersistentProperties()
 : mIn(nsnull)
 {
-  mSubclass = NS_STATIC_CAST(nsIPersistentProperties*, this);
+  mSubclass = static_cast<nsIPersistentProperties*>(this);
   mTable.ops = nsnull;
   PL_INIT_ARENA_POOL(&mArena, "PersistentPropertyArena", 2048);
 }
@@ -291,8 +291,8 @@ nsPersistentProperties::SetStringProperty(const nsACString& aKey,
 
   const nsAFlatCString&  flatKey = PromiseFlatCString(aKey);
   PropertyTableEntry *entry =
-    NS_STATIC_CAST(PropertyTableEntry*,
-                   PL_DHashTableOperate(&mTable, flatKey.get(), PL_DHASH_ADD));
+    static_cast<PropertyTableEntry*>
+               (PL_DHashTableOperate(&mTable, flatKey.get(), PL_DHASH_ADD));
 
   if (entry->mKey) {
     aOldValue = entry->mValue;
@@ -330,8 +330,8 @@ nsPersistentProperties::GetStringProperty(const nsACString& aKey,
   const nsAFlatCString&  flatKey = PromiseFlatCString(aKey);
 
   PropertyTableEntry *entry =
-    NS_STATIC_CAST(PropertyTableEntry*,
-                   PL_DHashTableOperate(&mTable, flatKey.get(), PL_DHASH_LOOKUP));
+    static_cast<PropertyTableEntry*>
+               (PL_DHashTableOperate(&mTable, flatKey.get(), PL_DHASH_LOOKUP));
 
   if (PL_DHASH_ENTRY_IS_FREE(entry))
     return NS_ERROR_FAILURE;
@@ -346,7 +346,7 @@ AddElemToArray(PLDHashTable* table, PLDHashEntryHdr *hdr,
 {
   nsISupportsArray  *propArray = (nsISupportsArray *) arg;
   PropertyTableEntry* entry =
-    NS_STATIC_CAST(PropertyTableEntry*, hdr);
+    static_cast<PropertyTableEntry*>(hdr);
 
   nsPropertyElement *element =
     new nsPropertyElement(nsDependentCString(entry->mKey),
diff --git a/mozilla/xpcom/ds/nsStaticNameTable.cpp b/mozilla/xpcom/ds/nsStaticNameTable.cpp
index f5d37d10295..44cdc528816 100644
--- a/mozilla/xpcom/ds/nsStaticNameTable.cpp
+++ b/mozilla/xpcom/ds/nsStaticNameTable.cpp
@@ -81,8 +81,8 @@ matchNameKeysCaseInsensitive(PLDHashTable*, const PLDHashEntryHdr* aHdr,
                              const void* key)
 {
     const NameTableEntry* entry =
-        NS_STATIC_CAST(const NameTableEntry *, aHdr);
-    const NameTableKey *keyValue = NS_STATIC_CAST(const NameTableKey*, key);
+        static_cast<const NameTableEntry *>(aHdr);
+    const NameTableKey *keyValue = static_cast<const NameTableKey*>(key);
 
     const nsAFlatCString* entryKey = entry->mString;
     
@@ -107,7 +107,7 @@ PR_STATIC_CALLBACK(PLDHashNumber)
 caseInsensitiveStringHashKey(PLDHashTable *table, const void *key)
 {
     PLDHashNumber h = 0;
-    const NameTableKey* tableKey = NS_STATIC_CAST(const NameTableKey*, key);
+    const NameTableKey* tableKey = static_cast<const NameTableKey*>(key);
     if (tableKey->mIsUnichar) {
         for (const PRUnichar* s = tableKey->mKeyStr.m2b->get();
              *s != '\0';
@@ -115,8 +115,8 @@ caseInsensitiveStringHashKey(PLDHashTable *table, const void *key)
             h = (h >> (PL_DHASH_BITS - 4)) ^ (h << 4) ^ (*s & ~0x20);
     } else {
         for (const unsigned char* s =
-                 NS_REINTERPRET_CAST(const unsigned char*,
-                                     tableKey->mKeyStr.m1b->get());
+                 reinterpret_cast<const unsigned char*>
+                                 (tableKey->mKeyStr.m1b->get());
              *s != '\0';
              s++)
             h = (h >> (PL_DHASH_BITS - 4)) ^ (h << 4) ^ (*s & ~0x20);
@@ -197,8 +197,8 @@ nsStaticCaseInsensitiveNameTable::Init(const char* const aNames[], PRInt32 Count
         NameTableKey key(strPtr);
 
         NameTableEntry *entry =
-          NS_STATIC_CAST(NameTableEntry*,
-                         PL_DHashTableOperate(&mNameTable, &key,
+          static_cast<NameTableEntry*>
+                     (PL_DHashTableOperate(&mNameTable, &key,
                                               PL_DHASH_ADD));
 
         if (!entry) continue;
@@ -221,8 +221,8 @@ nsStaticCaseInsensitiveNameTable::Lookup(const nsACString& aName)
 
     NameTableKey key(&str);
     NameTableEntry *entry =
-        NS_STATIC_CAST(NameTableEntry*,
-                       PL_DHashTableOperate(&mNameTable, &key,
+        static_cast<NameTableEntry*>
+                   (PL_DHashTableOperate(&mNameTable, &key,
                                             PL_DHASH_LOOKUP));
 
     if (PL_DHASH_ENTRY_IS_FREE(entry))
@@ -241,8 +241,8 @@ nsStaticCaseInsensitiveNameTable::Lookup(const nsAString& aName)
 
     NameTableKey key(&str);
     NameTableEntry *entry =
-        NS_STATIC_CAST(NameTableEntry*,
-                       PL_DHashTableOperate(&mNameTable, &key,
+        static_cast<NameTableEntry*>
+                   (PL_DHashTableOperate(&mNameTable, &key,
                                             PL_DHASH_LOOKUP));
 
     if (PL_DHASH_ENTRY_IS_FREE(entry))
diff --git a/mozilla/xpcom/ds/nsStringEnumerator.cpp b/mozilla/xpcom/ds/nsStringEnumerator.cpp
index 8a10b18cca7..76960c8fac3 100644
--- a/mozilla/xpcom/ds/nsStringEnumerator.cpp
+++ b/mozilla/xpcom/ds/nsStringEnumerator.cpp
@@ -85,9 +85,9 @@ private:
             // constructors make sure mOwnsArray is consistent with
             // the constness of the objects
             if (mIsUnicode)
-                delete NS_CONST_CAST(nsStringArray*,mArray);
+                delete const_cast<nsStringArray*>(mArray);
             else
-                delete NS_CONST_CAST(nsCStringArray*,mCArray);
+                delete const_cast<nsCStringArray*>(mCArray);
         }
     }
 
diff --git a/mozilla/xpcom/ds/nsSupportsArray.cpp b/mozilla/xpcom/ds/nsSupportsArray.cpp
index 3e2553f435d..f1b092537de 100644
--- a/mozilla/xpcom/ds/nsSupportsArray.cpp
+++ b/mozilla/xpcom/ds/nsSupportsArray.cpp
@@ -299,7 +299,7 @@ nsSupportsArray::Equals(const nsISupportsArray* aOther)
 {
   if (aOther) {
     PRUint32 countOther;
-    nsISupportsArray* other = NS_CONST_CAST(nsISupportsArray*, aOther);
+    nsISupportsArray* other = const_cast<nsISupportsArray*>(aOther);
     nsresult rv = other->Count(&countOther);
     if (NS_FAILED( rv ))
       return PR_FALSE;
diff --git a/mozilla/xpcom/ds/nsTextFormatter.cpp b/mozilla/xpcom/ds/nsTextFormatter.cpp
index e5c1938ce46..60f94abcd81 100644
--- a/mozilla/xpcom/ds/nsTextFormatter.cpp
+++ b/mozilla/xpcom/ds/nsTextFormatter.cpp
@@ -1184,7 +1184,7 @@ StringStuff(SprintfState* ss, const PRUnichar* sp, PRUint32 len)
 {
     ptrdiff_t off = ss->cur - ss->base;
     
-    nsAString* str = NS_STATIC_CAST(nsAString*,ss->stuffclosure);
+    nsAString* str = static_cast<nsAString*>(ss->stuffclosure);
     str->Append(sp, len);
 
     // we can assume contiguous storage
diff --git a/mozilla/xpcom/glue/nsArrayEnumerator.cpp b/mozilla/xpcom/glue/nsArrayEnumerator.cpp
index 41086082954..9dc8274f7b8 100644
--- a/mozilla/xpcom/glue/nsArrayEnumerator.cpp
+++ b/mozilla/xpcom/glue/nsArrayEnumerator.cpp
@@ -210,7 +210,7 @@ nsCOMArrayEnumerator::operator new (size_t size, const nsCOMArray_base& aArray)
 
     // do the actual allocation
     nsCOMArrayEnumerator * result =
-        NS_STATIC_CAST(nsCOMArrayEnumerator*, ::operator new(size));
+        static_cast<nsCOMArrayEnumerator*>(::operator new(size));
     NS_ENSURE_TRUE(result, nsnull);
 
     // now need to copy over the values, and addref each one
diff --git a/mozilla/xpcom/glue/nsBaseHashtable.h b/mozilla/xpcom/glue/nsBaseHashtable.h
index b05687eb5c4..566dcb92fe1 100644
--- a/mozilla/xpcom/glue/nsBaseHashtable.h
+++ b/mozilla/xpcom/glue/nsBaseHashtable.h
@@ -183,7 +183,7 @@ public:
                  "nsBaseHashtable was not initialized properly.");
 
     s_EnumReadArgs enumData = { enumFunc, userArg };
-    return PL_DHashTableEnumerate(NS_CONST_CAST(PLDHashTable*, &this->mTable),
+    return PL_DHashTableEnumerate(const_cast<PLDHashTable*>(&this->mTable),
                                   s_EnumReadStub,
                                   &enumData);
   }
@@ -321,7 +321,7 @@ PLDHashOperator
 nsBaseHashtable<KeyClass,DataType,UserDataType>::s_EnumReadStub
   (PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void* arg)
 {
-  EntryType* ent = NS_STATIC_CAST(EntryType*, hdr);
+  EntryType* ent = static_cast<EntryType*>(hdr);
   s_EnumReadArgs* eargs = (s_EnumReadArgs*) arg;
 
   PLDHashOperator res = (eargs->func)(ent->GetKey(), ent->mData, eargs->userArg);
@@ -340,7 +340,7 @@ PLDHashOperator
 nsBaseHashtable<KeyClass,DataType,UserDataType>::s_EnumStub
   (PLDHashTable *table, PLDHashEntryHdr *hdr, PRUint32 number, void* arg)
 {
-  EntryType* ent = NS_STATIC_CAST(EntryType*, hdr);
+  EntryType* ent = static_cast<EntryType*>(hdr);
   s_EnumArgs* eargs = (s_EnumArgs*) arg;
 
   return (eargs->func)(ent->GetKey(), ent->mData, eargs->userArg);
diff --git a/mozilla/xpcom/glue/nsCOMArray.cpp b/mozilla/xpcom/glue/nsCOMArray.cpp
index f870d626bd4..444b9b03f34 100644
--- a/mozilla/xpcom/glue/nsCOMArray.cpp
+++ b/mozilla/xpcom/glue/nsCOMArray.cpp
@@ -72,7 +72,7 @@ nsCOMArray_base::IndexOfObject(nsISupports* aObject) const {
     count = mArray.Count();
     for (i = 0; i < count; ++i) {
         nsCOMPtr<nsISupports> arrayItem =
-            do_QueryInterface(NS_REINTERPRET_CAST(nsISupports*,mArray.ElementAt(i)));
+            do_QueryInterface(reinterpret_cast<nsISupports*>(mArray.ElementAt(i)));
         if (arrayItem == supports) {
             retval = i;
             break;
@@ -107,7 +107,7 @@ nsCOMArray_base::ReplaceObjectAt(nsISupports* aObject, PRInt32 aIndex)
 {
     // its ok if oldObject is null here
     nsISupports *oldObject =
-        NS_REINTERPRET_CAST(nsISupports*, mArray.SafeElementAt(aIndex));
+        reinterpret_cast<nsISupports*>(mArray.SafeElementAt(aIndex));
 
     PRBool result = mArray.ReplaceElementAt(aObject, aIndex);
 
@@ -147,7 +147,7 @@ nsCOMArray_base::RemoveObjectAt(PRInt32 aIndex)
 PRBool
 ReleaseObjects(void* aElement, void*)
 {
-    nsISupports* element = NS_STATIC_CAST(nsISupports*, aElement);
+    nsISupports* element = static_cast<nsISupports*>(aElement);
     NS_IF_RELEASE(element);
     return PR_TRUE;
 }
diff --git a/mozilla/xpcom/glue/nsCOMArray.h b/mozilla/xpcom/glue/nsCOMArray.h
index 94eec157dd1..c83a7ec267f 100644
--- a/mozilla/xpcom/glue/nsCOMArray.h
+++ b/mozilla/xpcom/glue/nsCOMArray.h
@@ -97,11 +97,11 @@ public:
     }
 
     nsISupports* ObjectAt(PRInt32 aIndex) const {
-        return NS_STATIC_CAST(nsISupports*, mArray.FastElementAt(aIndex));
+        return static_cast<nsISupports*>(mArray.FastElementAt(aIndex));
     }
     
     nsISupports* SafeObjectAt(PRInt32 aIndex) const {
-        return NS_STATIC_CAST(nsISupports*, mArray.SafeElementAt(aIndex));
+        return static_cast<nsISupports*>(mArray.SafeElementAt(aIndex));
     }
 
     nsISupports* operator[](PRInt32 aIndex) const {
@@ -111,7 +111,7 @@ public:
     // Ensures there is enough space to store a total of aCapacity objects.
     // This method never deletes any objects.
     PRBool SetCapacity(PRUint32 aCapacity) {
-      return aCapacity > 0 ? mArray.SizeTo(NS_STATIC_CAST(PRInt32, aCapacity))
+      return aCapacity > 0 ? mArray.SizeTo(static_cast<PRInt32>(aCapacity))
                            : PR_TRUE;
     }
 
@@ -157,12 +157,12 @@ class nsCOMArray : public nsCOMArray_base
 
     // these do NOT refcount on the way out, for speed
     T* ObjectAt(PRInt32 aIndex) const {
-        return NS_STATIC_CAST(T*,nsCOMArray_base::ObjectAt(aIndex));
+        return static_cast<T*>(nsCOMArray_base::ObjectAt(aIndex));
     }
 
     // these do NOT refcount on the way out, for speed
     T* SafeObjectAt(PRInt32 aIndex) const {
-        return NS_STATIC_CAST(T*,nsCOMArray_base::SafeObjectAt(aIndex));
+        return static_cast<T*>(nsCOMArray_base::SafeObjectAt(aIndex));
     }
 
     // indexing operator for syntactic sugar
@@ -174,7 +174,7 @@ class nsCOMArray : public nsCOMArray_base
     // note: this does not check COM object identity. Use
     // IndexOfObject() for that purpose
     PRInt32 IndexOf(T* aObject) const {
-        return nsCOMArray_base::IndexOf(NS_STATIC_CAST(nsISupports*, aObject));
+        return nsCOMArray_base::IndexOf(static_cast<nsISupports*>(aObject));
     }
 
     // index of the element in question.. be careful!
@@ -183,13 +183,13 @@ class nsCOMArray : public nsCOMArray_base
     // if you need to do this frequently then consider enforcing
     // COM object identity before adding/comparing elements
     PRInt32 IndexOfObject(T* aObject) const {
-        return nsCOMArray_base::IndexOfObject(NS_STATIC_CAST(nsISupports*, aObject));
+        return nsCOMArray_base::IndexOfObject(static_cast<nsISupports*>(aObject));
     }
 
     // inserts aObject at aIndex, shifting the objects at aIndex and
     // later to make space
     PRBool InsertObjectAt(T* aObject, PRInt32 aIndex) {
-        return nsCOMArray_base::InsertObjectAt(NS_STATIC_CAST(nsISupports*, aObject), aIndex);
+        return nsCOMArray_base::InsertObjectAt(static_cast<nsISupports*>(aObject), aIndex);
     }
 
     // inserts the objects from aObject at aIndex, shifting the
@@ -201,7 +201,7 @@ class nsCOMArray : public nsCOMArray_base
     // replaces an existing element. Warning: if the array grows,
     // the newly created entries will all be null
     PRBool ReplaceObjectAt(T* aObject, PRInt32 aIndex) {
-        return nsCOMArray_base::ReplaceObjectAt(NS_STATIC_CAST(nsISupports*, aObject), aIndex);
+        return nsCOMArray_base::ReplaceObjectAt(static_cast<nsISupports*>(aObject), aIndex);
     }
 
     // override nsVoidArray stuff so that they can be accessed by
@@ -243,7 +243,7 @@ class nsCOMArray : public nsCOMArray_base
 
     // append an object, growing the array as necessary
     PRBool AppendObject(T *aObject) {
-        return nsCOMArray_base::AppendObject(NS_STATIC_CAST(nsISupports*, aObject));
+        return nsCOMArray_base::AppendObject(static_cast<nsISupports*>(aObject));
     }
 
     // append objects, growing the array as necessary
@@ -255,7 +255,7 @@ class nsCOMArray : public nsCOMArray_base
     // array as necessary
     // Warning: if you pass null here, it will remove the first null element
     PRBool RemoveObject(T *aObject) {
-        return nsCOMArray_base::RemoveObject(NS_STATIC_CAST(nsISupports*, aObject));
+        return nsCOMArray_base::RemoveObject(static_cast<nsISupports*>(aObject));
     }
 
     // remove an element at a specific position, shrinking the array
diff --git a/mozilla/xpcom/glue/nsCOMPtr.cpp b/mozilla/xpcom/glue/nsCOMPtr.cpp
index bce7e976d54..2e85a548b5a 100644
--- a/mozilla/xpcom/glue/nsCOMPtr.cpp
+++ b/mozilla/xpcom/glue/nsCOMPtr.cpp
@@ -95,7 +95,7 @@ nsCOMPtr_base::assign_from_qi( const nsQueryInterface qi, const nsIID& iid )
     void* newRawPtr;
     if ( NS_FAILED( qi(iid, &newRawPtr) ) )
       newRawPtr = 0;
-    assign_assuming_AddRef(NS_STATIC_CAST(nsISupports*, newRawPtr));
+    assign_assuming_AddRef(static_cast<nsISupports*>(newRawPtr));
   }
 
 void
@@ -104,7 +104,7 @@ nsCOMPtr_base::assign_from_qi_with_error( const nsQueryInterfaceWithError& qi, c
     void* newRawPtr;
     if ( NS_FAILED( qi(iid, &newRawPtr) ) )
       newRawPtr = 0;
-    assign_assuming_AddRef(NS_STATIC_CAST(nsISupports*, newRawPtr));
+    assign_assuming_AddRef(static_cast<nsISupports*>(newRawPtr));
   }
 
 void
@@ -113,7 +113,7 @@ nsCOMPtr_base::assign_from_gs_cid( const nsGetServiceByCID gs, const nsIID& iid
     void* newRawPtr;
     if ( NS_FAILED( gs(iid, &newRawPtr) ) )
       newRawPtr = 0;
-    assign_assuming_AddRef(NS_STATIC_CAST(nsISupports*, newRawPtr));
+    assign_assuming_AddRef(static_cast<nsISupports*>(newRawPtr));
   }
 
 void
@@ -122,7 +122,7 @@ nsCOMPtr_base::assign_from_gs_cid_with_error( const nsGetServiceByCIDWithError&
     void* newRawPtr;
     if ( NS_FAILED( gs(iid, &newRawPtr) ) )
       newRawPtr = 0;
-    assign_assuming_AddRef(NS_STATIC_CAST(nsISupports*, newRawPtr));
+    assign_assuming_AddRef(static_cast<nsISupports*>(newRawPtr));
   }
 
 void
@@ -131,7 +131,7 @@ nsCOMPtr_base::assign_from_gs_contractid( const nsGetServiceByContractID gs, con
     void* newRawPtr;
     if ( NS_FAILED( gs(iid, &newRawPtr) ) )
       newRawPtr = 0;
-    assign_assuming_AddRef(NS_STATIC_CAST(nsISupports*, newRawPtr));
+    assign_assuming_AddRef(static_cast<nsISupports*>(newRawPtr));
   }
 
 void
@@ -140,7 +140,7 @@ nsCOMPtr_base::assign_from_gs_contractid_with_error( const nsGetServiceByContrac
     void* newRawPtr;
     if ( NS_FAILED( gs(iid, &newRawPtr) ) )
       newRawPtr = 0;
-    assign_assuming_AddRef(NS_STATIC_CAST(nsISupports*, newRawPtr));
+    assign_assuming_AddRef(static_cast<nsISupports*>(newRawPtr));
   }
 
 void
@@ -149,12 +149,12 @@ nsCOMPtr_base::assign_from_helper( const nsCOMPtr_helper& helper, const nsIID& i
     void* newRawPtr;
     if ( NS_FAILED( helper(iid, &newRawPtr) ) )
       newRawPtr = 0;
-    assign_assuming_AddRef(NS_STATIC_CAST(nsISupports*, newRawPtr));
+    assign_assuming_AddRef(static_cast<nsISupports*>(newRawPtr));
   }
 
 void**
 nsCOMPtr_base::begin_assignment()
   {
     assign_assuming_AddRef(0);
-    return NS_REINTERPRET_CAST(void**, &mRawPtr);
+    return reinterpret_cast<void**>(&mRawPtr);
   }
diff --git a/mozilla/xpcom/glue/nsCOMPtr.h b/mozilla/xpcom/glue/nsCOMPtr.h
index 938d0adf882..2f290c3a493 100644
--- a/mozilla/xpcom/glue/nsCOMPtr.h
+++ b/mozilla/xpcom/glue/nsCOMPtr.h
@@ -811,7 +811,7 @@ class nsCOMPtr
 #endif
           NSCAP_LOG_ASSIGNMENT(this, temp);
           NSCAP_LOG_RELEASE(this, mRawPtr);
-          rhs = NS_REINTERPRET_CAST(T*, mRawPtr);
+          rhs = reinterpret_cast<T*>(mRawPtr);
           mRawPtr = temp;
           NSCAP_ASSERT_NO_QUERY_NEEDED();
         }
@@ -826,7 +826,7 @@ class nsCOMPtr
              Use |get()| to resolve ambiguity or to get a castable pointer.
           */
         {
-          return NS_REINTERPRET_CAST(T*, mRawPtr);
+          return reinterpret_cast<T*>(mRawPtr);
         }
 
       operator nsDerivedSafe<T>*() const
@@ -856,7 +856,7 @@ class nsCOMPtr
           // This is not intended to be used by clients.  See |address_of|
           // below.
         {
-          return NS_CONST_CAST(nsCOMPtr<T>*, this);
+          return const_cast<nsCOMPtr<T>*>(this);
         }
 
 #else // CANT_RESOLVE_CPP_CONST_AMBIGUITY
@@ -896,10 +896,10 @@ class nsCOMPtr
       StartAssignment()
         {
 #ifndef NSCAP_FEATURE_INLINE_STARTASSIGNMENT
-          return NS_REINTERPRET_CAST(T**, begin_assignment());
+          return reinterpret_cast<T**>(begin_assignment());
 #else
           assign_assuming_AddRef(0);
-          return NS_REINTERPRET_CAST(T**, &mRawPtr);
+          return reinterpret_cast<T**>(&mRawPtr);
 #endif
         }
 
@@ -907,7 +907,7 @@ class nsCOMPtr
       nsDerivedSafe<T>*
       get_DerivedSafe() const
         {
-          return NS_REINTERPRET_CAST(nsDerivedSafe<T>*, mRawPtr);
+          return reinterpret_cast<nsDerivedSafe<T>*>(mRawPtr);
         }
 
   };
@@ -1139,7 +1139,7 @@ class nsCOMPtr<nsISupports>
              Use |get()| to resolve ambiguity or to get a castable pointer.
           */
         {
-          return NS_REINTERPRET_CAST(nsISupports*, mRawPtr);
+          return reinterpret_cast<nsISupports*>(mRawPtr);
         }
 
       operator nsDerivedSafe<nsISupports>*() const
@@ -1169,7 +1169,7 @@ class nsCOMPtr<nsISupports>
           // This is not intended to be used by clients.  See |address_of|
           // below.
         {
-          return NS_CONST_CAST(nsCOMPtr<nsISupports>*, this);
+          return const_cast<nsCOMPtr<nsISupports>*>(this);
         }
 
 #else // CANT_RESOLVE_CPP_CONST_AMBIGUITY
@@ -1210,10 +1210,10 @@ class nsCOMPtr<nsISupports>
       StartAssignment()
         {
 #ifndef NSCAP_FEATURE_INLINE_STARTASSIGNMENT
-          return NS_REINTERPRET_CAST(nsISupports**, begin_assignment());
+          return reinterpret_cast<nsISupports**>(begin_assignment());
 #else
           assign_assuming_AddRef(0);
-          return NS_REINTERPRET_CAST(nsISupports**, &mRawPtr);
+          return reinterpret_cast<nsISupports**>(&mRawPtr);
 #endif
         }
 
@@ -1221,7 +1221,7 @@ class nsCOMPtr<nsISupports>
       nsDerivedSafe<nsISupports>*
       get_DerivedSafe() const
         {
-          return NS_REINTERPRET_CAST(nsDerivedSafe<nsISupports>*, mRawPtr);
+          return reinterpret_cast<nsDerivedSafe<nsISupports>*>(mRawPtr);
         }
 
   };
@@ -1233,7 +1233,7 @@ nsCOMPtr<T>::assign_with_AddRef( nsISupports* rawPtr )
   {
     if ( rawPtr )
       NSCAP_ADDREF(this, rawPtr);
-    assign_assuming_AddRef(NS_REINTERPRET_CAST(T*, rawPtr));
+    assign_assuming_AddRef(reinterpret_cast<T*>(rawPtr));
   }
 
 template <class T>
@@ -1243,7 +1243,7 @@ nsCOMPtr<T>::assign_from_qi( const nsQueryInterface qi, const nsIID& aIID )
     void* newRawPtr;
     if ( NS_FAILED( qi(aIID, &newRawPtr) ) )
       newRawPtr = 0;
-    assign_assuming_AddRef(NS_STATIC_CAST(T*, newRawPtr));
+    assign_assuming_AddRef(static_cast<T*>(newRawPtr));
   }
 
 template <class T>
@@ -1253,7 +1253,7 @@ nsCOMPtr<T>::assign_from_qi_with_error( const nsQueryInterfaceWithError& qi, con
     void* newRawPtr;
     if ( NS_FAILED( qi(aIID, &newRawPtr) ) )
       newRawPtr = 0;
-    assign_assuming_AddRef(NS_STATIC_CAST(T*, newRawPtr));
+    assign_assuming_AddRef(static_cast<T*>(newRawPtr));
   }
 
 template <class T>
@@ -1263,7 +1263,7 @@ nsCOMPtr<T>::assign_from_gs_cid( const nsGetServiceByCID gs, const nsIID& aIID )
     void* newRawPtr;
     if ( NS_FAILED( gs(aIID, &newRawPtr) ) )
       newRawPtr = 0;
-    assign_assuming_AddRef(NS_STATIC_CAST(T*, newRawPtr));
+    assign_assuming_AddRef(static_cast<T*>(newRawPtr));
   }
 
 template <class T>
@@ -1273,7 +1273,7 @@ nsCOMPtr<T>::assign_from_gs_cid_with_error( const nsGetServiceByCIDWithError& gs
     void* newRawPtr;
     if ( NS_FAILED( gs(aIID, &newRawPtr) ) )
       newRawPtr = 0;
-    assign_assuming_AddRef(NS_STATIC_CAST(T*, newRawPtr));
+    assign_assuming_AddRef(static_cast<T*>(newRawPtr));
   }
 
 template <class T>
@@ -1283,7 +1283,7 @@ nsCOMPtr<T>::assign_from_gs_contractid( const nsGetServiceByContractID gs, const
     void* newRawPtr;
     if ( NS_FAILED( gs(aIID, &newRawPtr) ) )
       newRawPtr = 0;
-    assign_assuming_AddRef(NS_STATIC_CAST(T*, newRawPtr));
+    assign_assuming_AddRef(static_cast<T*>(newRawPtr));
   }
 
 template <class T>
@@ -1293,7 +1293,7 @@ nsCOMPtr<T>::assign_from_gs_contractid_with_error( const nsGetServiceByContractI
     void* newRawPtr;
     if ( NS_FAILED( gs(aIID, &newRawPtr) ) )
       newRawPtr = 0;
-    assign_assuming_AddRef(NS_STATIC_CAST(T*, newRawPtr));
+    assign_assuming_AddRef(static_cast<T*>(newRawPtr));
   }
 
 template <class T>
@@ -1303,7 +1303,7 @@ nsCOMPtr<T>::assign_from_helper( const nsCOMPtr_helper& helper, const nsIID& aII
     void* newRawPtr;
     if ( NS_FAILED( helper(aIID, &newRawPtr) ) )
       newRawPtr = 0;
-    assign_assuming_AddRef(NS_STATIC_CAST(T*, newRawPtr));
+    assign_assuming_AddRef(static_cast<T*>(newRawPtr));
   }
 
 template <class T>
@@ -1381,7 +1381,7 @@ class nsGetterAddRefs
      ~nsGetterAddRefs()
         {
 #ifdef NSCAP_LOG_EXTERNAL_ASSIGNMENT
-          NSCAP_LOG_ASSIGNMENT(NS_REINTERPRET_CAST(void *, address_of(mTargetSmartPtr)), mTargetSmartPtr.get());
+          NSCAP_LOG_ASSIGNMENT(reinterpret_cast<void *>(address_of(mTargetSmartPtr)), mTargetSmartPtr.get());
 #endif
 
 #ifdef NSCAP_FEATURE_TEST_DONTQUERY_CASES
@@ -1392,12 +1392,12 @@ class nsGetterAddRefs
 
       operator void**()
         {
-          return NS_REINTERPRET_CAST(void**, mTargetSmartPtr.StartAssignment());
+          return reinterpret_cast<void**>(mTargetSmartPtr.StartAssignment());
         }
 
       operator nsISupports**()
         {
-          return NS_REINTERPRET_CAST(nsISupports**, mTargetSmartPtr.StartAssignment());
+          return reinterpret_cast<nsISupports**>(mTargetSmartPtr.StartAssignment());
         }
 
       operator T**()
@@ -1430,13 +1430,13 @@ class nsGetterAddRefs<nsISupports>
 #ifdef NSCAP_LOG_EXTERNAL_ASSIGNMENT
      ~nsGetterAddRefs()
         {
-          NSCAP_LOG_ASSIGNMENT(NS_REINTERPRET_CAST(void *, address_of(mTargetSmartPtr)), mTargetSmartPtr.get());
+          NSCAP_LOG_ASSIGNMENT(reinterpret_cast<void *>(address_of(mTargetSmartPtr)), mTargetSmartPtr.get());
         }
 #endif
 
       operator void**()
         {
-          return NS_REINTERPRET_CAST(void**, mTargetSmartPtr.StartAssignment());
+          return reinterpret_cast<void**>(mTargetSmartPtr.StartAssignment());
         }
 
       operator nsISupports**()
@@ -1476,7 +1476,7 @@ inline
 NSCAP_BOOL
 operator==( const nsCOMPtr<T>& lhs, const nsCOMPtr<U>& rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) == NS_STATIC_CAST(const U*, rhs.get());
+    return static_cast<const T*>(lhs.get()) == static_cast<const U*>(rhs.get());
   }
 
 
@@ -1485,7 +1485,7 @@ inline
 NSCAP_BOOL
 operator!=( const nsCOMPtr<T>& lhs, const nsCOMPtr<U>& rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) != NS_STATIC_CAST(const U*, rhs.get());
+    return static_cast<const T*>(lhs.get()) != static_cast<const U*>(rhs.get());
   }
 
 
@@ -1496,7 +1496,7 @@ inline
 NSCAP_BOOL
 operator==( const nsCOMPtr<T>& lhs, const U* rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) == rhs;
+    return static_cast<const T*>(lhs.get()) == rhs;
   }
 
 template <class T, class U>
@@ -1504,7 +1504,7 @@ inline
 NSCAP_BOOL
 operator==( const U* lhs, const nsCOMPtr<T>& rhs )
   {
-    return lhs == NS_STATIC_CAST(const T*, rhs.get());
+    return lhs == static_cast<const T*>(rhs.get());
   }
 
 template <class T, class U>
@@ -1512,7 +1512,7 @@ inline
 NSCAP_BOOL
 operator!=( const nsCOMPtr<T>& lhs, const U* rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) != rhs;
+    return static_cast<const T*>(lhs.get()) != rhs;
   }
 
 template <class T, class U>
@@ -1520,7 +1520,7 @@ inline
 NSCAP_BOOL
 operator!=( const U* lhs, const nsCOMPtr<T>& rhs )
   {
-    return lhs != NS_STATIC_CAST(const T*, rhs.get());
+    return lhs != static_cast<const T*>(rhs.get());
   }
 
   // To avoid ambiguities caused by the presence of builtin |operator==|s
@@ -1545,7 +1545,7 @@ inline
 NSCAP_BOOL
 operator==( const nsCOMPtr<T>& lhs, U* rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) == NS_CONST_CAST(const U*, rhs);
+    return static_cast<const T*>(lhs.get()) == const_cast<const U*>(rhs);
   }
 
 template <class T, class U>
@@ -1553,7 +1553,7 @@ inline
 NSCAP_BOOL
 operator==( U* lhs, const nsCOMPtr<T>& rhs )
   {
-    return NS_CONST_CAST(const U*, lhs) == NS_STATIC_CAST(const T*, rhs.get());
+    return const_cast<const U*>(lhs) == static_cast<const T*>(rhs.get());
   }
 
 template <class T, class U>
@@ -1561,7 +1561,7 @@ inline
 NSCAP_BOOL
 operator!=( const nsCOMPtr<T>& lhs, U* rhs )
   {
-    return NS_STATIC_CAST(const T*, lhs.get()) != NS_CONST_CAST(const U*, rhs);
+    return static_cast<const T*>(lhs.get()) != const_cast<const U*>(rhs);
   }
 
 template <class T, class U>
@@ -1569,7 +1569,7 @@ inline
 NSCAP_BOOL
 operator!=( U* lhs, const nsCOMPtr<T>& rhs )
   {
-    return NS_CONST_CAST(const U*, lhs) != NS_STATIC_CAST(const T*, rhs.get());
+    return const_cast<const U*>(lhs) != static_cast<const T*>(rhs.get());
   }
 #endif
 
@@ -1585,7 +1585,7 @@ NSCAP_BOOL
 operator==( const nsCOMPtr<T>& lhs, NSCAP_Zero* rhs )
     // specifically to allow |smartPtr == 0|
   {
-    return NS_STATIC_CAST(const void*, lhs.get()) == NS_REINTERPRET_CAST(const void*, rhs);
+    return static_cast<const void*>(lhs.get()) == reinterpret_cast<const void*>(rhs);
   }
 
 template <class T>
@@ -1594,7 +1594,7 @@ NSCAP_BOOL
 operator==( NSCAP_Zero* lhs, const nsCOMPtr<T>& rhs )
     // specifically to allow |0 == smartPtr|
   {
-    return NS_REINTERPRET_CAST(const void*, lhs) == NS_STATIC_CAST(const void*, rhs.get());
+    return reinterpret_cast<const void*>(lhs) == static_cast<const void*>(rhs.get());
   }
 
 template <class T>
@@ -1603,7 +1603,7 @@ NSCAP_BOOL
 operator!=( const nsCOMPtr<T>& lhs, NSCAP_Zero* rhs )
     // specifically to allow |smartPtr != 0|
   {
-    return NS_STATIC_CAST(const void*, lhs.get()) != NS_REINTERPRET_CAST(const void*, rhs);
+    return static_cast<const void*>(lhs.get()) != reinterpret_cast<const void*>(rhs);
   }
 
 template <class T>
@@ -1612,7 +1612,7 @@ NSCAP_BOOL
 operator!=( NSCAP_Zero* lhs, const nsCOMPtr<T>& rhs )
     // specifically to allow |0 != smartPtr|
   {
-    return NS_REINTERPRET_CAST(const void*, lhs) != NS_STATIC_CAST(const void*, rhs.get());
+    return reinterpret_cast<const void*>(lhs) != static_cast<const void*>(rhs.get());
   }
 
 
@@ -1627,7 +1627,7 @@ NSCAP_BOOL
 operator==( const nsCOMPtr<T>& lhs, int rhs )
     // specifically to allow |smartPtr == 0|
   {
-    return NS_STATIC_CAST(const void*, lhs.get()) == NS_REINTERPRET_CAST(const void*, rhs);
+    return static_cast<const void*>(lhs.get()) == reinterpret_cast<const void*>(rhs);
   }
 
 template <class T>
@@ -1636,7 +1636,7 @@ NSCAP_BOOL
 operator==( int lhs, const nsCOMPtr<T>& rhs )
     // specifically to allow |0 == smartPtr|
   {
-    return NS_REINTERPRET_CAST(const void*, lhs) == NS_STATIC_CAST(const void*, rhs.get());
+    return reinterpret_cast<const void*>(lhs) == static_cast<const void*>(rhs.get());
   }
 
 #endif // !defined(HAVE_CPP_TROUBLE_COMPARING_TO_ZERO)
diff --git a/mozilla/xpcom/glue/nsComponentManagerUtils.h b/mozilla/xpcom/glue/nsComponentManagerUtils.h
index 54386e39d37..068648b0636 100644
--- a/mozilla/xpcom/glue/nsComponentManagerUtils.h
+++ b/mozilla/xpcom/glue/nsComponentManagerUtils.h
@@ -234,7 +234,7 @@ CallCreateInstance( const nsCID &aClass,
     
     return CallCreateInstance(aClass, aDelegate,
                               NS_GET_TEMPLATE_IID(DestinationType),
-                              NS_REINTERPRET_CAST(void**, aDestination));
+                              reinterpret_cast<void**>(aDestination));
 }
 
 template <class DestinationType>
@@ -247,7 +247,7 @@ CallCreateInstance( const nsCID &aClass,
     
     return CallCreateInstance(aClass, nsnull,
                               NS_GET_TEMPLATE_IID(DestinationType),
-                              NS_REINTERPRET_CAST(void**, aDestination));
+                              reinterpret_cast<void**>(aDestination));
 }
 
 template <class DestinationType>
@@ -263,7 +263,7 @@ CallCreateInstance( const char *aContractID,
     return CallCreateInstance(aContractID, 
                               aDelegate,
                               NS_GET_TEMPLATE_IID(DestinationType),
-                              NS_REINTERPRET_CAST(void**, aDestination));
+                              reinterpret_cast<void**>(aDestination));
 }
 
 template <class DestinationType>
@@ -277,7 +277,7 @@ CallCreateInstance( const char *aContractID,
     
     return CallCreateInstance(aContractID, nsnull,
                               NS_GET_TEMPLATE_IID(DestinationType),
-                              NS_REINTERPRET_CAST(void**, aDestination));
+                              reinterpret_cast<void**>(aDestination));
 }
 
 template <class DestinationType>
@@ -292,7 +292,7 @@ CallCreateInstance( nsIFactory *aFactory,
     
     return aFactory->CreateInstance(aDelegate,
                                     NS_GET_TEMPLATE_IID(DestinationType),
-                                    NS_REINTERPRET_CAST(void**, aDestination));
+                                    reinterpret_cast<void**>(aDestination));
 }
 
 template <class DestinationType>
@@ -306,7 +306,7 @@ CallCreateInstance( nsIFactory *aFactory,
     
     return aFactory->CreateInstance(nsnull,
                                     NS_GET_TEMPLATE_IID(DestinationType),
-                                    NS_REINTERPRET_CAST(void**, aDestination));
+                                    reinterpret_cast<void**>(aDestination));
 }
 
 template <class DestinationType>
@@ -318,7 +318,7 @@ CallGetClassObject( const nsCID &aClass,
     NS_PRECONDITION(aDestination, "null parameter");
     
     return CallGetClassObject(aClass,
-        NS_GET_TEMPLATE_IID(DestinationType), NS_REINTERPRET_CAST(void**, aDestination));
+        NS_GET_TEMPLATE_IID(DestinationType), reinterpret_cast<void**>(aDestination));
 }
 
 template <class DestinationType>
@@ -330,7 +330,7 @@ CallGetClassObject( const char* aContractID,
     NS_PRECONDITION(aDestination, "null parameter");
     
     return CallGetClassObject(aContractID,
-        NS_GET_TEMPLATE_IID(DestinationType), NS_REINTERPRET_CAST(void**, aDestination));
+        NS_GET_TEMPLATE_IID(DestinationType), reinterpret_cast<void**>(aDestination));
 }
 
 #endif /* nsComponentManagerUtils_h__ */
diff --git a/mozilla/xpcom/glue/nsEnumeratorUtils.cpp b/mozilla/xpcom/glue/nsEnumeratorUtils.cpp
index 66aa1aa0cd5..6b4fcfe9ab7 100644
--- a/mozilla/xpcom/glue/nsEnumeratorUtils.cpp
+++ b/mozilla/xpcom/glue/nsEnumeratorUtils.cpp
@@ -63,7 +63,7 @@ public:
     NS_IMETHOD GetNext(nsAString& aResult);
 
     static EmptyEnumeratorImpl* GetInstance() {
-        return NS_CONST_CAST(EmptyEnumeratorImpl*, &kInstance);
+        return const_cast<EmptyEnumeratorImpl*>(&kInstance);
     }
 
 private:
diff --git a/mozilla/xpcom/glue/nsGREGlue.cpp b/mozilla/xpcom/glue/nsGREGlue.cpp
index 51b148d6a87..c9bddc6de67 100755
--- a/mozilla/xpcom/glue/nsGREGlue.cpp
+++ b/mozilla/xpcom/glue/nsGREGlue.cpp
@@ -560,7 +560,7 @@ CheckINIHeader(const char *aHeader, void *aClosure)
 {
   nsresult rv;
 
-  INIClosure *c = NS_REINTERPRET_CAST(INIClosure *, aClosure);
+  INIClosure *c = reinterpret_cast<INIClosure *>(aClosure);
 
   if (!CheckVersion(aHeader, c->versions, c->versionsLength))
     return PR_TRUE;
diff --git a/mozilla/xpcom/glue/nsGenericFactory.cpp b/mozilla/xpcom/glue/nsGenericFactory.cpp
index 3feb64e47b3..60c0f578338 100644
--- a/mozilla/xpcom/glue/nsGenericFactory.cpp
+++ b/mozilla/xpcom/glue/nsGenericFactory.cpp
@@ -55,7 +55,7 @@ nsGenericFactory::nsGenericFactory(const nsModuleComponentInfo *info)
     : mInfo(info)
 {
     if (mInfo && mInfo->mClassInfoGlobal)
-        *mInfo->mClassInfoGlobal = NS_STATIC_CAST(nsIClassInfo *, this);
+        *mInfo->mClassInfoGlobal = static_cast<nsIClassInfo *>(this);
 }
 
 nsGenericFactory::~nsGenericFactory()
@@ -139,8 +139,8 @@ NS_IMETHODIMP nsGenericFactory::GetClassDescription(char * *aClassDescription)
 NS_IMETHODIMP nsGenericFactory::GetClassID(nsCID * *aClassID)
 {
     *aClassID =
-        NS_REINTERPRET_CAST(nsCID*,
-                            nsMemory::Clone(&mInfo->mCID, sizeof mInfo->mCID));
+        reinterpret_cast<nsCID*>
+                        (nsMemory::Clone(&mInfo->mCID, sizeof mInfo->mCID));
     if (! *aClassID)
         return NS_ERROR_OUT_OF_MEMORY;
     return NS_OK;
@@ -171,7 +171,7 @@ NS_IMETHODIMP nsGenericFactory::SetComponentInfo(const nsModuleComponentInfo *in
         *mInfo->mClassInfoGlobal = 0;
     mInfo = info;
     if (mInfo && mInfo->mClassInfoGlobal)
-        *mInfo->mClassInfoGlobal = NS_STATIC_CAST(nsIClassInfo *, this);
+        *mInfo->mClassInfoGlobal = static_cast<nsIClassInfo *>(this);
     return NS_OK;
 }
 
diff --git a/mozilla/xpcom/glue/nsHashKeys.h b/mozilla/xpcom/glue/nsHashKeys.h
index dc9381b490c..c214c1f80ce 100644
--- a/mozilla/xpcom/glue/nsHashKeys.h
+++ b/mozilla/xpcom/glue/nsHashKeys.h
@@ -174,7 +174,7 @@ public:
   typedef const nsISupports* KeyTypePointer;
 
   nsISupportsHashKey(const nsISupports* key) :
-    mSupports(NS_CONST_CAST(nsISupports*,key)) { }
+    mSupports(const_cast<nsISupports*>(key)) { }
   nsISupportsHashKey(const nsISupportsHashKey& toCopy) :
     mSupports(toCopy.mSupports) { }
   ~nsISupportsHashKey() { }
@@ -335,7 +335,7 @@ public:
 
   nsCharPtrHashKey(const char* aKey) : mKey(strdup(aKey)) { }
   nsCharPtrHashKey(const nsCharPtrHashKey& toCopy) : mKey(strdup(toCopy.mKey)) { }
-  ~nsCharPtrHashKey() { if (mKey) free(NS_CONST_CAST(char *, mKey)); }
+  ~nsCharPtrHashKey() { if (mKey) free(const_cast<char *>(mKey)); }
 
   const char* GetKey() const { return mKey; }
   PRBool KeyEquals(KeyTypePointer aKey) const
@@ -365,7 +365,7 @@ public:
 
   nsUnicharPtrHashKey(const PRUnichar* aKey) : mKey(NS_strdup(aKey)) { }
   nsUnicharPtrHashKey(const nsUnicharPtrHashKey& toCopy) : mKey(NS_strdup(toCopy.mKey)) { }
-  ~nsUnicharPtrHashKey() { if (mKey) NS_Free(NS_CONST_CAST(PRUnichar *, mKey)); }
+  ~nsUnicharPtrHashKey() { if (mKey) NS_Free(const_cast<PRUnichar *>(mKey)); }
 
   const PRUnichar* GetKey() const { return mKey; }
   PRBool KeyEquals(KeyTypePointer aKey) const
@@ -392,7 +392,7 @@ public:
     typedef const nsIHashable* KeyTypePointer;
 
     nsHashableHashKey(const nsIHashable* aKey) :
-        mKey(NS_CONST_CAST(nsIHashable*, aKey)) { }
+        mKey(const_cast<nsIHashable*>(aKey)) { }
     nsHashableHashKey(const nsHashableHashKey& toCopy) :
         mKey(toCopy.mKey) { }
     ~nsHashableHashKey() { }
@@ -401,7 +401,7 @@ public:
 
     PRBool KeyEquals(const nsIHashable* aKey) const {
         PRBool eq;
-        if (NS_SUCCEEDED(mKey->Equals(NS_CONST_CAST(nsIHashable*,aKey), &eq))) {
+        if (NS_SUCCEEDED(mKey->Equals(const_cast<nsIHashable*>(aKey), &eq))) {
             return eq;
         }
         return PR_FALSE;
@@ -413,7 +413,7 @@ public:
 #ifdef NS_DEBUG
         nsresult rv =
 #endif
-        NS_CONST_CAST(nsIHashable*,aKey)->GetHashCode(&code);
+        const_cast<nsIHashable*>(aKey)->GetHashCode(&code);
         NS_ASSERTION(NS_SUCCEEDED(rv), "GetHashCode should not throw!");
         return code;
     }
diff --git a/mozilla/xpcom/glue/nsIClassInfoImpl.h b/mozilla/xpcom/glue/nsIClassInfoImpl.h
index 5cca2eda271..a69adb6c419 100644
--- a/mozilla/xpcom/glue/nsIClassInfoImpl.h
+++ b/mozilla/xpcom/glue/nsIClassInfoImpl.h
@@ -52,7 +52,7 @@
 #define NS_IMPL_QUERY_CLASSINFO(_class)                                       \
   if ( aIID.Equals(NS_GET_IID(nsIClassInfo)) ) {                              \
     extern nsIClassInfo *NS_CLASSINFO_NAME(_class);                           \
-    foundInterface = NS_STATIC_CAST(nsIClassInfo*, NS_CLASSINFO_NAME(_class));\
+    foundInterface = static_cast<nsIClassInfo*>(NS_CLASSINFO_NAME(_class));\
   } else
 
 #define NS_CLASSINFO_HELPER_BEGIN(_class, _c)                                 \
diff --git a/mozilla/xpcom/glue/nsIInterfaceRequestorUtils.h b/mozilla/xpcom/glue/nsIInterfaceRequestorUtils.h
index 86dea74711d..ccab7066eee 100644
--- a/mozilla/xpcom/glue/nsIInterfaceRequestorUtils.h
+++ b/mozilla/xpcom/glue/nsIInterfaceRequestorUtils.h
@@ -52,7 +52,7 @@ CallGetInterface( T* aSource, DestinationType** aDestination )
     NS_PRECONDITION(aDestination, "null parameter");
 
     return aSource->GetInterface(NS_GET_TEMPLATE_IID(DestinationType),
-                                 NS_REINTERPRET_CAST(void**, aDestination));
+                                 reinterpret_cast<void**>(aDestination));
   }
 
 class NS_COM_GLUE nsGetInterface : public nsCOMPtr_helper
diff --git a/mozilla/xpcom/glue/nsINIParser.cpp b/mozilla/xpcom/glue/nsINIParser.cpp
index 9b12aefb2ca..f0a15c80519 100644
--- a/mozilla/xpcom/glue/nsINIParser.cpp
+++ b/mozilla/xpcom/glue/nsINIParser.cpp
@@ -255,7 +255,7 @@ PLDHashOperator
 nsINIParser::GetSectionsCB(const char *aKey, INIValue *aData,
                            void *aClosure)
 {
-    GSClosureStruct *cs = NS_REINTERPRET_CAST(GSClosureStruct*, aClosure);
+    GSClosureStruct *cs = reinterpret_cast<GSClosureStruct*>(aClosure);
 
     return cs->usercb(aKey, cs->userclosure) ? PL_DHASH_NEXT : PL_DHASH_STOP;
 }
diff --git a/mozilla/xpcom/glue/nsISupportsImpl.cpp b/mozilla/xpcom/glue/nsISupportsImpl.cpp
index 4a81ece576a..c603c6d7090 100644
--- a/mozilla/xpcom/glue/nsISupportsImpl.cpp
+++ b/mozilla/xpcom/glue/nsISupportsImpl.cpp
@@ -44,8 +44,8 @@ NS_TableDrivenQI(void* aThis, const QITableEntry* entries,
   while (entries->iid) {
     if (aIID.Equals(*entries->iid)) {
       nsISupports* r =
-        NS_REINTERPRET_CAST(nsISupports*,
-          NS_REINTERPRET_CAST(char*, aThis) + entries->offset);
+        reinterpret_cast<nsISupports*>
+                        (reinterpret_cast<char*>(aThis) + entries->offset);
       NS_ADDREF(r);
       *aInstancePtr = r;
       return NS_OK;
diff --git a/mozilla/xpcom/glue/nsISupportsImpl.h b/mozilla/xpcom/glue/nsISupportsImpl.h
index 19d91ddd29e..9feca393e13 100644
--- a/mozilla/xpcom/glue/nsISupportsImpl.h
+++ b/mozilla/xpcom/glue/nsISupportsImpl.h
@@ -126,7 +126,7 @@ public:
     }
 
     nsrefcnt tmp = get();
-    PRBool purple = NS_STATIC_CAST(PRBool, NS_PURPLE_BIT_SET(mValue));
+    PRBool purple = static_cast<PRBool>(NS_PURPLE_BIT_SET(mValue));
 
     if (NS_UNLIKELY(purple)) {
       NS_ASSERTION(tmp != 0, "purple ISupports pointer with zero refcnt");
@@ -151,7 +151,7 @@ public:
     nsrefcnt tmp = get();
     NS_ASSERTION(tmp >= 1, "decr() called with zero refcnt");
 
-    PRBool purple = NS_STATIC_CAST(PRBool, NS_PURPLE_BIT_SET(mValue));
+    PRBool purple = static_cast<PRBool>(NS_PURPLE_BIT_SET(mValue));
     PRBool shouldBePurple = tmp > 1;
 
     if (NS_UNLIKELY(shouldBePurple && !purple)) {
@@ -438,23 +438,23 @@ NS_IMETHODIMP _class::QueryInterface(REFNSIID aIID, void** aInstancePtr)      \
 
 #define NS_INTERFACE_TABLE_ENTRY(_class, _interface)                          \
   { &_interface::COMTypeInfo<int>::kIID,                                      \
-    NS_REINTERPRET_CAST(char*,                                                \
-                        NS_STATIC_CAST(_interface*, (_class*) 0x1000)) -      \
-    NS_REINTERPRET_CAST(char*, (_class*) 0x1000)                              \
+    reinterpret_cast<char*>(\
+                        static_cast<_interface*>((_class*) 0x1000)) -      \
+    reinterpret_cast<char*>((_class*) 0x1000)                              \
   },
 
 #define NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, _interface, _implClass)    \
   { &_interface::COMTypeInfo<int>::kIID,                                      \
-    NS_REINTERPRET_CAST(char*,                                                \
-                        NS_STATIC_CAST(_interface*,                           \
-                                       NS_STATIC_CAST(_implClass*,            \
+    reinterpret_cast<char*>(\
+                        static_cast<_interface*>(\
+                                       static_cast<_implClass*>(\
                                                       (_class*) 0x1000))) -   \
-    NS_REINTERPRET_CAST(char*, (_class*) 0x1000)                              \
+    reinterpret_cast<char*>((_class*) 0x1000)                              \
   },
 
 #define NS_INTERFACE_TABLE_END                                                \
   { nsnull, 0 } };                                                            \
-  rv = NS_TableDrivenQI(NS_STATIC_CAST(void*, this),                          \
+  rv = NS_TableDrivenQI(static_cast<void*>(this),                          \
                         table, aIID, aInstancePtr);
 
 #define NS_INTERFACE_TABLE_TAIL                                               \
@@ -494,23 +494,23 @@ NS_IMETHODIMP _class::QueryInterface(REFNSIID aIID, void** aInstancePtr)      \
 
 #define NS_IMPL_QUERY_BODY(_interface)                                        \
   if ( aIID.Equals(NS_GET_IID(_interface)) )                                  \
-    foundInterface = NS_STATIC_CAST(_interface*, this);                       \
+    foundInterface = static_cast<_interface*>(this);                       \
   else
 
 #define NS_IMPL_QUERY_BODY_CONDITIONAL(_interface, condition)                 \
   if ( (condition) && aIID.Equals(NS_GET_IID(_interface)))                    \
-    foundInterface = NS_STATIC_CAST(_interface*, this);                       \
+    foundInterface = static_cast<_interface*>(this);                       \
   else
 
 #define NS_IMPL_QUERY_BODY_AMBIGUOUS(_interface, _implClass)                  \
   if ( aIID.Equals(NS_GET_IID(_interface)) )                                  \
-    foundInterface = NS_STATIC_CAST(_interface*,                              \
-                                    NS_STATIC_CAST(_implClass*, this));       \
+    foundInterface = static_cast<_interface*>(\
+                                    static_cast<_implClass*>(this));       \
   else
 
 #define NS_IMPL_QUERY_BODY_AGGREGATED(_interface, _aggregate)                 \
   if ( aIID.Equals(NS_GET_IID(_interface)) )                                  \
-    foundInterface = NS_STATIC_CAST(_interface*, _aggregate);                 \
+    foundInterface = static_cast<_interface*>(_aggregate);                 \
   else
 
 #define NS_IMPL_QUERY_TAIL_GUTS                                               \
@@ -1127,7 +1127,7 @@ NS_IMETHODIMP_(nsrefcnt) _class::Release(void)                                \
 #define NS_IMPL_QUERY_CLASSINFO(_class)                                       \
   if ( aIID.Equals(NS_GET_IID(nsIClassInfo)) ) {                              \
     extern nsIClassInfo *NS_CLASSINFO_NAME(_class);                           \
-    foundInterface = NS_STATIC_CAST(nsIClassInfo*, NS_CLASSINFO_NAME(_class));\
+    foundInterface = static_cast<nsIClassInfo*>(NS_CLASSINFO_NAME(_class));\
   } else
 
 #define NS_CLASSINFO_HELPER_BEGIN(_class, _c)                                 \
diff --git a/mozilla/xpcom/glue/nsISupportsUtils.h b/mozilla/xpcom/glue/nsISupportsUtils.h
index a3f564b25cb..e20aa5e3ece 100644
--- a/mozilla/xpcom/glue/nsISupportsUtils.h
+++ b/mozilla/xpcom/glue/nsISupportsUtils.h
@@ -178,17 +178,17 @@ ns_if_addref( T expr )
  * Often you have to cast an implementation pointer, e.g., |this|, to an
  * |nsISupports*|, but because you have multiple inheritance, a simple cast
  * is ambiguous.  One could simply say, e.g., (given a base |nsIBase|),
- * |NS_STATIC_CAST(nsIBase*, this)|; but that disguises the fact that what
+ * |static_cast<nsIBase*>(this)|; but that disguises the fact that what
  * you are really doing is disambiguating the |nsISupports|.  You could make
- * that more obvious with a double cast, e.g., |NS_STATIC_CAST(nsISupports*,
- * NS_STATIC_CAST(nsIBase*, this))|, but that is bulky and harder to read...
+ * that more obvious with a double cast, e.g., |static_cast<nsISupports*>
+                                                           (* static_cast<nsIBase*>(this))|, but that is bulky and harder to read...
  *
  * The following macro is clean, short, and obvious.  In the example above,
  * you would use it like this: |NS_ISUPPORTS_CAST(nsIBase*, this)|.
  */
 
 #define NS_ISUPPORTS_CAST(__unambiguousBase, __expr) \
-  NS_STATIC_CAST(nsISupports*, NS_STATIC_CAST(__unambiguousBase, __expr))
+  static_cast<nsISupports*>(static_cast<__unambiguousBase>(__expr))
 
 // a type-safe shortcut for calling the |QueryInterface()| member function
 template <class T, class DestinationType>
@@ -200,7 +200,7 @@ CallQueryInterface( T* aSource, DestinationType** aDestination )
     NS_PRECONDITION(aDestination, "null parameter");
     
     return aSource->QueryInterface(NS_GET_TEMPLATE_IID(DestinationType),
-                                   NS_REINTERPRET_CAST(void**, aDestination));
+                                   reinterpret_cast<void**>(aDestination));
 }
 
 #endif /* __nsISupportsUtils_h */
diff --git a/mozilla/xpcom/glue/nsIWeakReferenceUtils.h b/mozilla/xpcom/glue/nsIWeakReferenceUtils.h
index 82486bcf5cd..4b85c5b5279 100644
--- a/mozilla/xpcom/glue/nsIWeakReferenceUtils.h
+++ b/mozilla/xpcom/glue/nsIWeakReferenceUtils.h
@@ -60,7 +60,7 @@ CallQueryReferent( T* aSource, DestinationType** aDestination )
     NS_PRECONDITION(aDestination, "null parameter");
 
     return aSource->QueryReferent(NS_GET_TEMPLATE_IID(DestinationType),
-                                  NS_REINTERPRET_CAST(void**, aDestination));
+                                  reinterpret_cast<void**>(aDestination));
   }
 
 
diff --git a/mozilla/xpcom/glue/nsServiceManagerUtils.h b/mozilla/xpcom/glue/nsServiceManagerUtils.h
index ab84675fa41..3bd8ec94c4c 100644
--- a/mozilla/xpcom/glue/nsServiceManagerUtils.h
+++ b/mozilla/xpcom/glue/nsServiceManagerUtils.h
@@ -113,7 +113,7 @@ CallGetService( const nsCID &aClass,
     
     return CallGetService(aClass,
                           NS_GET_TEMPLATE_IID(DestinationType),
-                          NS_REINTERPRET_CAST(void**, aDestination));
+                          reinterpret_cast<void**>(aDestination));
 }
 
 template <class DestinationType>
@@ -127,7 +127,7 @@ CallGetService( const char *aContractID,
     
     return CallGetService(aContractID,
                           NS_GET_TEMPLATE_IID(DestinationType),
-                          NS_REINTERPRET_CAST(void**, aDestination));
+                          reinterpret_cast<void**>(aDestination));
 }
 
 #endif
diff --git a/mozilla/xpcom/glue/nsStringAPI.h b/mozilla/xpcom/glue/nsStringAPI.h
index 176dbc11057..fa077c3e29c 100644
--- a/mozilla/xpcom/glue/nsStringAPI.h
+++ b/mozilla/xpcom/glue/nsStringAPI.h
@@ -952,9 +952,9 @@ private:
 #ifdef HAVE_CPP_2BYTE_WCHAR_T
   PR_STATIC_ASSERT(sizeof(wchar_t) == 2);
   #define NS_LL(s)                                L##s
-  #define NS_MULTILINE_LITERAL_STRING(s)          nsDependentString(NS_REINTERPRET_CAST(const nsAString::char_type*, s), PRUint32((sizeof(s)/sizeof(wchar_t))-1))
-  #define NS_MULTILINE_LITERAL_STRING_INIT(n,s)   n(NS_REINTERPRET_CAST(const nsAString::char_type*, s), PRUint32((sizeof(s)/sizeof(wchar_t))-1))
-  #define NS_NAMED_MULTILINE_LITERAL_STRING(n,s)  const nsDependentString n(NS_REINTERPRET_CAST(const nsAString::char_type*, s), PRUint32((sizeof(s)/sizeof(wchar_t))-1))
+  #define NS_MULTILINE_LITERAL_STRING(s)          nsDependentString(reinterpret_cast<const nsAString::char_type*>(s), PRUint32((sizeof(s)/sizeof(wchar_t))-1))
+  #define NS_MULTILINE_LITERAL_STRING_INIT(n,s)   n(reinterpret_cast<const nsAString::char_type*>(s), PRUint32((sizeof(s)/sizeof(wchar_t))-1))
+  #define NS_NAMED_MULTILINE_LITERAL_STRING(n,s)  const nsDependentString n(reinterpret_cast<const nsAString::char_type*>(s), PRUint32((sizeof(s)/sizeof(wchar_t))-1))
   typedef nsDependentString nsLiteralString;
 #else
   #define NS_LL(s)                                s
@@ -978,11 +978,11 @@ PR_STATIC_ASSERT(PRUnichar(-1) > PRUnichar(0));
 
 #define NS_L(s)                                   NS_LL(s)
 
-#define NS_LITERAL_STRING(s)                      NS_STATIC_CAST(const nsString&, NS_MULTILINE_LITERAL_STRING(NS_LL(s)))
+#define NS_LITERAL_STRING(s)                      static_cast<const nsString&>(NS_MULTILINE_LITERAL_STRING(NS_LL(s)))
 #define NS_LITERAL_STRING_INIT(n,s)               NS_MULTILINE_LITERAL_STRING_INIT(n, NS_LL(s))
 #define NS_NAMED_LITERAL_STRING(n,s)              NS_NAMED_MULTILINE_LITERAL_STRING(n, NS_LL(s))
 
-#define NS_LITERAL_CSTRING(s)                     NS_STATIC_CAST(const nsDependentCString&, nsDependentCString(s, PRUint32(sizeof(s)-1)))
+#define NS_LITERAL_CSTRING(s)                     static_cast<const nsDependentCString&>(nsDependentCString(s, PRUint32(sizeof(s)-1)))
 #define NS_LITERAL_CSTRING_INIT(n,s)              n(s, PRUint32(sizeof(s)-1))
 #define NS_NAMED_LITERAL_CSTRING(n,s)             const nsDependentCString n(s, PRUint32(sizeof(s)-1))
 
diff --git a/mozilla/xpcom/glue/nsTArray.cpp b/mozilla/xpcom/glue/nsTArray.cpp
index 75ae49b7ad4..f54849f6043 100644
--- a/mozilla/xpcom/glue/nsTArray.cpp
+++ b/mozilla/xpcom/glue/nsTArray.cpp
@@ -71,8 +71,8 @@ nsTArray_base::EnsureCapacity(size_type capacity, size_type elemSize) {
 
   if (mHdr == &sEmptyHdr) {
     // NS_Alloc new data
-    Header *header = NS_STATIC_CAST(Header*,
-                         NS_Alloc(sizeof(Header) + capacity * elemSize));
+    Header *header = static_cast<Header*>
+                                (NS_Alloc(sizeof(Header) + capacity * elemSize));
     if (!header)
       return PR_FALSE;
     header->mLength = 0;
@@ -93,8 +93,8 @@ nsTArray_base::EnsureCapacity(size_type capacity, size_type elemSize) {
   Header *header;
   if (UsesAutoArrayBuffer()) {
     // NS_Alloc and copy
-    header = NS_STATIC_CAST(Header*,
-                            NS_Alloc(sizeof(Header) + capacity * elemSize));
+    header = static_cast<Header*>
+                        (NS_Alloc(sizeof(Header) + capacity * elemSize));
     if (!header)
       return PR_FALSE;
 
@@ -102,7 +102,7 @@ nsTArray_base::EnsureCapacity(size_type capacity, size_type elemSize) {
   } else {
     // NS_Realloc existing data
     size_type size = sizeof(Header) + capacity * elemSize;
-    header = NS_STATIC_CAST(Header*, NS_Realloc(mHdr, size));
+    header = static_cast<Header*>(NS_Realloc(mHdr, size));
     if (!header)
       return PR_FALSE;
   }
@@ -146,7 +146,7 @@ nsTArray_base::ShrinkCapacity(size_type elemSize) {
   void *ptr = NS_Realloc(mHdr, size);
   if (!ptr)
     return;
-  mHdr = NS_STATIC_CAST(Header*, ptr);
+  mHdr = static_cast<Header*>(ptr);
   mHdr->mCapacity = length;
 }
 
@@ -172,7 +172,7 @@ nsTArray_base::ShiftData(index_type start, size_type oldLen, size_type newLen,
     newLen *= elemSize;
     oldLen *= elemSize;
     num *= elemSize;
-    char *base = NS_REINTERPRET_CAST(char*, mHdr + 1) + start;
+    char *base = reinterpret_cast<char*>(mHdr + 1) + start;
     memmove(base + newLen, base + oldLen, num);
   }
 }
@@ -267,7 +267,7 @@ nsTArray_base::EnsureNotUsingAutoArrayBuffer(size_type elemSize)
   if (UsesAutoArrayBuffer()) {
     size_type size = sizeof(Header) + Length() * elemSize;
 
-    Header* header = NS_STATIC_CAST(Header*, NS_Alloc(size));
+    Header* header = static_cast<Header*>(NS_Alloc(size));
     if (!header)
       return PR_FALSE;
 
diff --git a/mozilla/xpcom/glue/nsTArray.h b/mozilla/xpcom/glue/nsTArray.h
index 71df9a2ed11..b5996980129 100644
--- a/mozilla/xpcom/glue/nsTArray.h
+++ b/mozilla/xpcom/glue/nsTArray.h
@@ -158,7 +158,7 @@ class NS_COM_GLUE nsTArray_base {
     Header* GetAutoArrayBuffer() {
       NS_ASSERTION(IsAutoArray(), "Should be an auto array to call this");
 
-      return NS_REINTERPRET_CAST(Header*, &mHdr + 1);
+      return reinterpret_cast<Header*>(&mHdr + 1);
     }
 
     // Returns true if this is an nsAutoTArray and it currently uses the
@@ -186,12 +186,12 @@ class nsTArrayElementTraits {
   public:
     // Invoke the default constructor in place.
     static inline void Construct(E *e) {
-      new (NS_STATIC_CAST(void *, e)) E();
+      new (static_cast<void *>(e)) E();
     }
     // Invoke the copy-constructor in place.
     template<class A>
     static inline void Construct(E *e, const A &arg) {
-      new (NS_STATIC_CAST(void *, e)) E(arg);
+      new (static_cast<void *>(e)) E(arg);
     }
     // Invoke the destructor in place.
     static inline void Destruct(E *e) {
@@ -209,9 +209,9 @@ class nsQuickSortComparator {
     // maps the callback API expected by NS_QuickSort to the Comparator API
     // used by nsTArray.  See nsTArray::Sort.
     static int Compare(const void* e1, const void* e2, void *data) {
-      const Comparator* c = NS_REINTERPRET_CAST(const Comparator*, data);
-      const elem_type* a = NS_STATIC_CAST(const elem_type*, e1);
-      const elem_type* b = NS_STATIC_CAST(const elem_type*, e2);
+      const Comparator* c = reinterpret_cast<const Comparator*>(data);
+      const elem_type* a = static_cast<const elem_type*>(e1);
+      const elem_type* b = static_cast<const elem_type*>(e2);
       return c->LessThan(*a, *b) ? -1 : (c->Equals(*a, *b) ? 0 : 1);
     }
 };
@@ -300,14 +300,14 @@ class nsTArray : public nsTArray_base {
     // @return A pointer to the first element of the array.  If the array is
     // empty, then this pointer must not be dereferenced.
     elem_type* Elements() {
-      return NS_REINTERPRET_CAST(elem_type *, mHdr + 1);
+      return reinterpret_cast<elem_type *>(mHdr + 1);
     }
 
     // This method provides direct, readonly access to the array elements.
     // @return A pointer to the first element of the array.  If the array is
     // empty, then this pointer must not be dereferenced.
     const elem_type* Elements() const {
-      return NS_REINTERPRET_CAST(const elem_type *, mHdr + 1);
+      return reinterpret_cast<const elem_type *>(mHdr + 1);
     }
     
     // This method provides direct access to the i'th element of the array.
@@ -679,7 +679,7 @@ class nsTArray : public nsTArray_base {
     void Sort(const Comparator& comp) {
       NS_QuickSort(Elements(), Length(), sizeof(elem_type),
                    nsQuickSortComparator<elem_type, Comparator>::Compare,
-                   NS_CONST_CAST(Comparator*, &comp));
+                   const_cast<Comparator*>(&comp));
     }
 
     // A variation on the Sort method defined above that assumes that
@@ -722,13 +722,13 @@ class nsAutoTArray : public nsTArray<E> {
     typedef typename base_type::elem_type elem_type;
 
     nsAutoTArray() {
-      base_type::mHdr = NS_REINTERPRET_CAST(Header*, &mAutoBuf);
+      base_type::mHdr = reinterpret_cast<Header*>(&mAutoBuf);
       base_type::mHdr->mLength = 0;
       base_type::mHdr->mCapacity = N;
       base_type::mHdr->mIsAutoArray = 1;
 
       NS_ASSERTION(base_type::GetAutoArrayBuffer() ==
-                   NS_REINTERPRET_CAST(Header*, &mAutoBuf),
+                   reinterpret_cast<Header*>(&mAutoBuf),
                    "GetAutoArrayBuffer needs to be fixed");
     }
 
diff --git a/mozilla/xpcom/glue/nsTHashtable.h b/mozilla/xpcom/glue/nsTHashtable.h
index 566dedc353b..fd4ee26c0df 100644
--- a/mozilla/xpcom/glue/nsTHashtable.h
+++ b/mozilla/xpcom/glue/nsTHashtable.h
@@ -157,9 +157,9 @@ public:
     NS_ASSERTION(mTable.entrySize, "nsTHashtable was not initialized properly.");
   
     EntryType* entry =
-      NS_REINTERPRET_CAST(EntryType*,
-                          PL_DHashTableOperate(
-                            NS_CONST_CAST(PLDHashTable*,&mTable),
+      reinterpret_cast<EntryType*>
+                      (PL_DHashTableOperate(
+                            const_cast<PLDHashTable*>(&mTable),
                             EntryType::KeyToPointer(aKey),
                             PL_DHASH_LOOKUP));
     return PL_DHASH_ENTRY_IS_BUSY(entry) ? entry : nsnull;
@@ -175,8 +175,8 @@ public:
   {
     NS_ASSERTION(mTable.entrySize, "nsTHashtable was not initialized properly.");
     
-    return NS_STATIC_CAST(EntryType*,
-                          PL_DHashTableOperate(
+    return static_cast<EntryType*>
+                      (PL_DHashTableOperate(
                             &mTable,
                             EntryType::KeyToPointer(aKey),
                             PL_DHASH_ADD));
@@ -356,7 +356,7 @@ PLDHashNumber
 nsTHashtable<EntryType>::s_HashKey(PLDHashTable  *table,
                                    const void    *key)
 {
-  return EntryType::HashKey(NS_REINTERPRET_CAST(const KeyTypePointer, key));
+  return EntryType::HashKey(reinterpret_cast<const KeyTypePointer>(key));
 }
 
 template<class EntryType>
@@ -366,7 +366,7 @@ nsTHashtable<EntryType>::s_MatchEntry(PLDHashTable          *table,
                                       const void            *key)
 {
   return ((const EntryType*) entry)->KeyEquals(
-    NS_REINTERPRET_CAST(const KeyTypePointer, key));
+    reinterpret_cast<const KeyTypePointer>(key));
 }
 
 template<class EntryType>
@@ -376,7 +376,7 @@ nsTHashtable<EntryType>::s_CopyEntry(PLDHashTable          *table,
                                      PLDHashEntryHdr       *to)
 {
   EntryType* fromEntry =
-    NS_CONST_CAST(EntryType*, NS_REINTERPRET_CAST(const EntryType*, from));
+    const_cast<EntryType*>(reinterpret_cast<const EntryType*>(from));
 
   new(to) EntryType(*fromEntry);
 
@@ -388,7 +388,7 @@ void
 nsTHashtable<EntryType>::s_ClearEntry(PLDHashTable    *table,
                                       PLDHashEntryHdr *entry)
 {
-  NS_REINTERPRET_CAST(EntryType*,entry)->~EntryType();
+  reinterpret_cast<EntryType*>(entry)->~EntryType();
 }
 
 template<class EntryType>
@@ -397,7 +397,7 @@ nsTHashtable<EntryType>::s_InitEntry(PLDHashTable    *table,
                                      PLDHashEntryHdr *entry,
                                      const void      *key)
 {
-  new(entry) EntryType(NS_REINTERPRET_CAST(KeyTypePointer,key));
+  new(entry) EntryType(reinterpret_cast<KeyTypePointer>(key));
   return PR_TRUE;
 }
 
@@ -409,9 +409,9 @@ nsTHashtable<EntryType>::s_EnumStub(PLDHashTable    *table,
                                     void            *arg)
 {
   // dereferences the function-pointer to the user's enumeration function
-  return (* NS_REINTERPRET_CAST(s_EnumArgs*,arg)->userFunc)(
-    NS_REINTERPRET_CAST(EntryType*,entry),
-    NS_REINTERPRET_CAST(s_EnumArgs*,arg)->userArg);
+  return (* reinterpret_cast<s_EnumArgs*>(arg)->userFunc)(
+    reinterpret_cast<EntryType*>(entry),
+    reinterpret_cast<s_EnumArgs*>(arg)->userArg);
 }
 
 #endif // nsTHashtable_h__
diff --git a/mozilla/xpcom/glue/nsTObserverArray.h b/mozilla/xpcom/glue/nsTObserverArray.h
index 2a8bcbd46c7..e40de4e5030 100644
--- a/mozilla/xpcom/glue/nsTObserverArray.h
+++ b/mozilla/xpcom/glue/nsTObserverArray.h
@@ -170,7 +170,7 @@ class nsTObserverArray : public nsTObserverArray_base {
     }
 
     T* SafeObserverAt(PRInt32 aIndex) const {
-      return NS_STATIC_CAST(T*, mObservers.SafeElementAt(aIndex));
+      return static_cast<T*>(mObservers.SafeElementAt(aIndex));
     }
 
     /**
@@ -193,7 +193,7 @@ class nsTObserverArray : public nsTObserverArray_base {
          * @return The next observer.
          */
         T* GetNext() {
-          return NS_STATIC_CAST(T*, GetSafeElementAt(mPosition++));
+          return static_cast<T*>(GetSafeElementAt(mPosition++));
         }
     };
 };
diff --git a/mozilla/xpcom/glue/nsTPtrArray.h b/mozilla/xpcom/glue/nsTPtrArray.h
index 82ac8f638b6..afe3999281f 100755
--- a/mozilla/xpcom/glue/nsTPtrArray.h
+++ b/mozilla/xpcom/glue/nsTPtrArray.h
@@ -102,13 +102,13 @@ class nsAutoTPtrArray : public nsTPtrArray<E> {
     typedef typename base_type::elem_type elem_type;
 
     nsAutoTPtrArray() {
-      base_type::mHdr = NS_REINTERPRET_CAST(Header*, &mAutoBuf);
+      base_type::mHdr = reinterpret_cast<Header*>(&mAutoBuf);
       base_type::mHdr->mLength = 0;
       base_type::mHdr->mCapacity = N;
       base_type::mHdr->mIsAutoArray = 1;
 
       NS_ASSERTION(base_type::GetAutoArrayBuffer() ==
-                   NS_REINTERPRET_CAST(Header*, &mAutoBuf),
+                   reinterpret_cast<Header*>(&mAutoBuf),
                    "GetAutoArrayBuffer needs to be fixed");
     }
 
diff --git a/mozilla/xpcom/glue/nsTraceRefcnt.h b/mozilla/xpcom/glue/nsTraceRefcnt.h
index 4828804941c..9d37e9c8900 100644
--- a/mozilla/xpcom/glue/nsTraceRefcnt.h
+++ b/mozilla/xpcom/glue/nsTraceRefcnt.h
@@ -81,11 +81,11 @@ PR_END_MACRO
  * do anything useful if we don't have dynamic_cast<void*>. */
 #define NSCAP_LOG_ASSIGNMENT(_c, _p)                                \
   if (_p)                                                           \
-    NS_LogCOMPtrAddRef((_c),NS_STATIC_CAST(nsISupports*,_p))
+    NS_LogCOMPtrAddRef((_c),static_cast<nsISupports*>(_p))
 
 #define NSCAP_LOG_RELEASE(_c, _p)                                   \
   if (_p)                                                           \
-    NS_LogCOMPtrRelease((_c), NS_STATIC_CAST(nsISupports*,_p))
+    NS_LogCOMPtrRelease((_c), static_cast<nsISupports*>(_p))
 
 #else /* !NS_BUILD_REFCNT_LOGGING */
 
diff --git a/mozilla/xpcom/glue/nsVersionComparator.cpp b/mozilla/xpcom/glue/nsVersionComparator.cpp
index 6dcc3890675..fdbcc6b8887 100755
--- a/mozilla/xpcom/glue/nsVersionComparator.cpp
+++ b/mozilla/xpcom/glue/nsVersionComparator.cpp
@@ -79,7 +79,7 @@ ParseVP(char *part, VersionPart &result)
     result.strB = "";
   }
   else {
-    result.numA = strtol(part, NS_CONST_CAST(char**, &result.strB), 10);
+    result.numA = strtol(part, const_cast<char**>(&result.strB), 10);
   }
 
   if (!*result.strB) {
diff --git a/mozilla/xpcom/glue/nsVoidArray.cpp b/mozilla/xpcom/glue/nsVoidArray.cpp
index 19ef838707a..f053f879152 100644
--- a/mozilla/xpcom/glue/nsVoidArray.cpp
+++ b/mozilla/xpcom/glue/nsVoidArray.cpp
@@ -146,7 +146,7 @@ nsVoidArray::SetArray(Impl *newImpl, PRInt32 aSize, PRInt32 aCount,
   NS_PRECONDITION(newImpl, "can't set size");
   mImpl = newImpl;
   mImpl->mCount = aCount;
-  mImpl->mBits = NS_STATIC_CAST(PRUint32, aSize & kArraySizeMask) |
+  mImpl->mBits = static_cast<PRUint32>(aSize & kArraySizeMask) |
                  (aOwner ? kArrayOwnerMask : 0) |
                  (aHasAuto ? kArrayHasAutoBufferMask : 0);
 }
@@ -170,9 +170,9 @@ PRBool nsVoidArray::SizeTo(PRInt32 aSize)
     {
       if (isOwner)
       {
-        free(NS_REINTERPRET_CAST(char *, mImpl));
+        free(reinterpret_cast<char *>(mImpl));
         if (hasAuto) {
-          NS_STATIC_CAST(nsAutoVoidArray*, this)->ResetToAutoBuffer();
+          static_cast<nsAutoVoidArray*>(this)->ResetToAutoBuffer();
         }
         else {
           mImpl = nsnull;
@@ -196,7 +196,7 @@ PRBool nsVoidArray::SizeTo(PRInt32 aSize)
     }
 
     char* bytes = (char *) realloc(mImpl,SIZEOF_IMPL(aSize));
-    Impl* newImpl = NS_REINTERPRET_CAST(Impl*, bytes);
+    Impl* newImpl = reinterpret_cast<Impl*>(bytes);
     if (!newImpl)
       return PR_FALSE;
 
@@ -229,7 +229,7 @@ PRBool nsVoidArray::SizeTo(PRInt32 aSize)
   // just allocate an array
   // allocate the exact size requested
   char* bytes = (char *) malloc(SIZEOF_IMPL(aSize));
-  Impl* newImpl = NS_REINTERPRET_CAST(Impl*, bytes);
+  Impl* newImpl = reinterpret_cast<Impl*>(bytes);
   if (!newImpl)
     return PR_FALSE;
 
@@ -373,7 +373,7 @@ nsVoidArray::~nsVoidArray()
 {
   MOZ_COUNT_DTOR(nsVoidArray);
   if (mImpl && IsArrayOwner())
-    free(NS_REINTERPRET_CAST(char*, mImpl));
+    free(reinterpret_cast<char*>(mImpl));
 }
 
 PRInt32 nsVoidArray::IndexOf(void* aPossibleElement) const
@@ -628,10 +628,10 @@ void nsVoidArray::Compact()
     if (HasAutoBuffer() && count <= kAutoBufSize)
     {
       Impl* oldImpl = mImpl;
-      NS_STATIC_CAST(nsAutoVoidArray*, this)->ResetToAutoBuffer();
+      static_cast<nsAutoVoidArray*>(this)->ResetToAutoBuffer();
       memcpy(mImpl->mArray, oldImpl->mArray,
              count * sizeof(mImpl->mArray[0]));
-      free(NS_REINTERPRET_CAST(char *, oldImpl));
+      free(reinterpret_cast<char *>(oldImpl));
     }
     else if (GetArraySize() > count)
     {
@@ -650,9 +650,9 @@ struct VoidArrayComparatorContext {
 PR_STATIC_CALLBACK(int)
 VoidArrayComparator(const void* aElement1, const void* aElement2, void* aData)
 {
-  VoidArrayComparatorContext* ctx = NS_STATIC_CAST(VoidArrayComparatorContext*, aData);
-  return (*ctx->mComparatorFunc)(*NS_STATIC_CAST(void* const*, aElement1),
-                                 *NS_STATIC_CAST(void* const*, aElement2),
+  VoidArrayComparatorContext* ctx = static_cast<VoidArrayComparatorContext*>(aData);
+  return (*ctx->mComparatorFunc)(*static_cast<void* const*>(aElement1),
+                                 *static_cast<void* const*>(aElement2),
                                   ctx->mData);
 }
 
@@ -738,7 +738,7 @@ nsStringArray::operator=(const nsStringArray& other)
   // Now copy the strings
   for (PRInt32 i = Count() - 1; i >= 0; --i)
   {
-    nsString* oldString = NS_STATIC_CAST(nsString*, other.ElementAt(i));
+    nsString* oldString = static_cast<nsString*>(other.ElementAt(i));
     mImpl->mArray[i] = new nsString(*oldString);
   }
 
@@ -748,7 +748,7 @@ nsStringArray::operator=(const nsStringArray& other)
 void 
 nsStringArray::StringAt(PRInt32 aIndex, nsAString& aString) const
 {
-  nsString* string = NS_STATIC_CAST(nsString*, nsVoidArray::ElementAt(aIndex));
+  nsString* string = static_cast<nsString*>(nsVoidArray::ElementAt(aIndex));
   if (nsnull != string)
   {
     aString.Assign(*string);
@@ -762,7 +762,7 @@ nsStringArray::StringAt(PRInt32 aIndex, nsAString& aString) const
 nsString*
 nsStringArray::StringAt(PRInt32 aIndex) const
 {
-  return NS_STATIC_CAST(nsString*, nsVoidArray::ElementAt(aIndex));
+  return static_cast<nsString*>(nsVoidArray::ElementAt(aIndex));
 }
 
 PRInt32 
@@ -774,7 +774,7 @@ nsStringArray::IndexOf(const nsAString& aPossibleString) const
     void** end = ap + mImpl->mCount;
     while (ap < end)
     {
-      nsString* string = NS_STATIC_CAST(nsString*, *ap);
+      nsString* string = static_cast<nsString*>(*ap);
       if (string->Equals(aPossibleString))
       {
         return ap - mImpl->mArray;
@@ -801,7 +801,7 @@ PRBool
 nsStringArray::ReplaceStringAt(const nsAString& aString,
                                PRInt32 aIndex)
 {
-  nsString* string = NS_STATIC_CAST(nsString*, nsVoidArray::ElementAt(aIndex));
+  nsString* string = static_cast<nsString*>(nsVoidArray::ElementAt(aIndex));
   if (nsnull != string)
   {
     *string = aString;
@@ -839,7 +839,7 @@ nsStringArray::Clear(void)
   PRInt32 index = Count();
   while (0 <= --index)
   {
-    nsString* string = NS_STATIC_CAST(nsString*, mImpl->mArray[index]);
+    nsString* string = static_cast<nsString*>(mImpl->mArray[index]);
     delete string;
   }
   nsVoidArray::Clear();
@@ -876,7 +876,7 @@ void nsStringArray::Sort(void)
 
 void nsStringArray::Sort(nsStringArrayComparatorFunc aFunc, void* aData)
 {
-  nsVoidArray::Sort(NS_REINTERPRET_CAST(nsVoidArrayComparatorFunc, aFunc), aData);
+  nsVoidArray::Sort(reinterpret_cast<nsVoidArrayComparatorFunc>(aFunc), aData);
 }
 
 PRBool 
@@ -889,7 +889,7 @@ nsStringArray::EnumerateForwards(nsStringArrayEnumFunc aFunc, void* aData)
   {
     while (running && (++index < mImpl->mCount))
     {
-      running = (*aFunc)(*NS_STATIC_CAST(nsString*, mImpl->mArray[index]), aData);
+      running = (*aFunc)(*static_cast<nsString*>(mImpl->mArray[index]), aData);
     }
   }
   return running;
@@ -905,7 +905,7 @@ nsStringArray::EnumerateBackwards(nsStringArrayEnumFunc aFunc, void* aData)
   {
     while (running && (0 <= --index))
     {
-      running = (*aFunc)(*NS_STATIC_CAST(nsString*, mImpl->mArray[index]), aData);
+      running = (*aFunc)(*static_cast<nsString*>(mImpl->mArray[index]), aData);
     }
   }
   return running;
@@ -961,7 +961,7 @@ nsCStringArray::operator=(const nsCStringArray& other)
   // Now copy the strings
   for (PRInt32 i = Count() - 1; i >= 0; --i)
   {
-    nsCString* oldString = NS_STATIC_CAST(nsCString*, other.ElementAt(i));
+    nsCString* oldString = static_cast<nsCString*>(other.ElementAt(i));
     mImpl->mArray[i] = new nsCString(*oldString);
   }
 
@@ -971,7 +971,7 @@ nsCStringArray::operator=(const nsCStringArray& other)
 void 
 nsCStringArray::CStringAt(PRInt32 aIndex, nsACString& aCString) const
 {
-  nsCString* string = NS_STATIC_CAST(nsCString*, nsVoidArray::ElementAt(aIndex));
+  nsCString* string = static_cast<nsCString*>(nsVoidArray::ElementAt(aIndex));
   if (nsnull != string)
   {
     aCString = *string;
@@ -985,7 +985,7 @@ nsCStringArray::CStringAt(PRInt32 aIndex, nsACString& aCString) const
 nsCString*
 nsCStringArray::CStringAt(PRInt32 aIndex) const
 {
-  return NS_STATIC_CAST(nsCString*, nsVoidArray::ElementAt(aIndex));
+  return static_cast<nsCString*>(nsVoidArray::ElementAt(aIndex));
 }
 
 PRInt32 
@@ -997,7 +997,7 @@ nsCStringArray::IndexOf(const nsACString& aPossibleString) const
     void** end = ap + mImpl->mCount;
     while (ap < end)
     {
-      nsCString* string = NS_STATIC_CAST(nsCString*, *ap);
+      nsCString* string = static_cast<nsCString*>(*ap);
       if (string->Equals(aPossibleString))
       {
         return ap - mImpl->mArray;
@@ -1018,7 +1018,7 @@ nsCStringArray::IndexOfIgnoreCase(const nsACString& aPossibleString) const
     void** end = ap + mImpl->mCount;
     while (ap < end)
     {
-      nsCString* string = NS_STATIC_CAST(nsCString*, *ap);
+      nsCString* string = static_cast<nsCString*>(*ap);
       if (string->Equals(aPossibleString, nsCaseInsensitiveCStringComparator()))
       {
         return ap - mImpl->mArray;
@@ -1045,7 +1045,7 @@ nsCStringArray::InsertCStringAt(const nsACString& aCString, PRInt32 aIndex)
 PRBool
 nsCStringArray::ReplaceCStringAt(const nsACString& aCString, PRInt32 aIndex)
 {
-  nsCString* string = NS_STATIC_CAST(nsCString*, nsVoidArray::ElementAt(aIndex));
+  nsCString* string = static_cast<nsCString*>(nsVoidArray::ElementAt(aIndex));
   if (nsnull != string)
   {
     *string = aCString;
@@ -1096,7 +1096,7 @@ nsCStringArray::Clear(void)
   PRInt32 index = Count();
   while (0 <= --index)
   {
-    nsCString* string = NS_STATIC_CAST(nsCString*, mImpl->mArray[index]);
+    nsCString* string = static_cast<nsCString*>(mImpl->mArray[index]);
     delete string;
   }
   nsVoidArray::Clear();
@@ -1148,7 +1148,7 @@ void nsCStringArray::SortIgnoreCase(void)
 
 void nsCStringArray::Sort(nsCStringArrayComparatorFunc aFunc, void* aData)
 {
-  nsVoidArray::Sort(NS_REINTERPRET_CAST(nsVoidArrayComparatorFunc, aFunc), aData);
+  nsVoidArray::Sort(reinterpret_cast<nsVoidArrayComparatorFunc>(aFunc), aData);
 }
 
 PRBool 
@@ -1161,7 +1161,7 @@ nsCStringArray::EnumerateForwards(nsCStringArrayEnumFunc aFunc, void* aData)
     PRInt32 index = -1;
     while (running && (++index < mImpl->mCount))
     {
-      running = (*aFunc)(*NS_STATIC_CAST(nsCString*, mImpl->mArray[index]), aData);
+      running = (*aFunc)(*static_cast<nsCString*>(mImpl->mArray[index]), aData);
     }
   }
   return running;
@@ -1177,7 +1177,7 @@ nsCStringArray::EnumerateBackwards(nsCStringArrayEnumFunc aFunc, void* aData)
     PRInt32 index = Count();
     while (running && (0 <= --index))
     {
-      running = (*aFunc)(*NS_STATIC_CAST(nsCString*, mImpl->mArray[index]), aData);
+      running = (*aFunc)(*static_cast<nsCString*>(mImpl->mArray[index]), aData);
     }
   }
   return running;
diff --git a/mozilla/xpcom/glue/nsVoidArray.h b/mozilla/xpcom/glue/nsVoidArray.h
index 5b8104eaa8d..8c9dbd26548 100644
--- a/mozilla/xpcom/glue/nsVoidArray.h
+++ b/mozilla/xpcom/glue/nsVoidArray.h
@@ -190,7 +190,7 @@ public:
 
   void ResetToAutoBuffer()
   {
-    SetArray(NS_REINTERPRET_CAST(Impl*, mAutoBuf), kAutoBufSize, 0, PR_FALSE,
+    SetArray(reinterpret_cast<Impl*>(mAutoBuf), kAutoBufSize, 0, PR_FALSE,
              PR_TRUE);
   }
   
@@ -406,19 +406,19 @@ private:
 
   PRBool HasSingle() const
   {
-    return NS_REINTERPRET_CAST(PRWord, mImpl) & 0x1;
+    return reinterpret_cast<PRWord>(mImpl) & 0x1;
   }
   void* GetSingle() const
   {
     NS_ASSERTION(HasSingle(), "wrong type");
-    return NS_REINTERPRET_CAST(void*,
-                               NS_REINTERPRET_CAST(PRWord, mImpl) & ~0x1);
+    return reinterpret_cast<void*>
+                           (reinterpret_cast<PRWord>(mImpl) & ~0x1);
   }
   void SetSingle(void *aChild)
   {
     NS_ASSERTION(HasSingle() || !mImpl, "overwriting array");
-    mImpl = NS_REINTERPRET_CAST(Impl*,
-                                NS_REINTERPRET_CAST(PRWord, aChild) | 0x1);
+    mImpl = reinterpret_cast<Impl*>
+                            (reinterpret_cast<PRWord>(aChild) | 0x1);
   }
   PRBool IsEmpty() const
   {
diff --git a/mozilla/xpcom/io/nsBinaryStream.cpp b/mozilla/xpcom/io/nsBinaryStream.cpp
index bb7b99136f1..a19b6924c15 100644
--- a/mozilla/xpcom/io/nsBinaryStream.cpp
+++ b/mozilla/xpcom/io/nsBinaryStream.cpp
@@ -160,7 +160,7 @@ nsBinaryOutputStream::Write64(PRUint64 a64)
     PRUint32 bytesWritten;
 
     a64 = NS_SWAP64(a64);
-    rv = Write(NS_REINTERPRET_CAST(char*, &a64), sizeof a64, &bytesWritten);
+    rv = Write(reinterpret_cast<char*>(&a64), sizeof a64, &bytesWritten);
     if (NS_FAILED(rv)) return rv;
     if (bytesWritten != sizeof a64)
         return NS_ERROR_FAILURE;
@@ -172,7 +172,7 @@ nsBinaryOutputStream::WriteFloat(float aFloat)
 {
     NS_ASSERTION(sizeof(float) == sizeof (PRUint32),
                  "False assumption about sizeof(float)");
-    return Write32(*NS_REINTERPRET_CAST(PRUint32*, &aFloat));
+    return Write32(*reinterpret_cast<PRUint32*>(&aFloat));
 }
 
 NS_IMETHODIMP
@@ -180,7 +180,7 @@ nsBinaryOutputStream::WriteDouble(double aDouble)
 {
     NS_ASSERTION(sizeof(double) == sizeof(PRUint64),
                  "False assumption about sizeof(double)");
-    return Write64(*NS_REINTERPRET_CAST(PRUint64*, &aDouble));
+    return Write64(*reinterpret_cast<PRUint64*>(&aDouble));
 }
 
 NS_IMETHODIMP
@@ -210,21 +210,21 @@ nsBinaryOutputStream::WriteWStringZ(const PRUnichar* aString)
     byteCount = length * sizeof(PRUnichar);
 
 #ifdef IS_BIG_ENDIAN
-    rv = WriteBytes(NS_REINTERPRET_CAST(const char*, aString), byteCount);
+    rv = WriteBytes(reinterpret_cast<const char*>(aString), byteCount);
 #else
     // XXX use WriteSegments here to avoid copy!
     PRUnichar *copy, temp[64];
     if (length <= 64) {
         copy = temp;
     } else {
-        copy = NS_REINTERPRET_CAST(PRUnichar*, nsMemory::Alloc(byteCount));
+        copy = reinterpret_cast<PRUnichar*>(nsMemory::Alloc(byteCount));
         if (!copy)
             return NS_ERROR_OUT_OF_MEMORY;
     }
     NS_ASSERTION((PRUptrdiff(aString) & 0x1) == 0, "aString not properly aligned");
     for (PRUint32 i = 0; i < length; i++)
         copy[i] = NS_SWAP16(aString[i]);
-    rv = WriteBytes(NS_REINTERPRET_CAST(const char*, copy), byteCount);
+    rv = WriteBytes(reinterpret_cast<const char*>(copy), byteCount);
     if (copy != temp)
         nsMemory::Free(copy);
 #endif
@@ -254,7 +254,7 @@ nsBinaryOutputStream::WriteBytes(const char *aString, PRUint32 aLength)
 NS_IMETHODIMP
 nsBinaryOutputStream::WriteByteArray(PRUint8 *aBytes, PRUint32 aLength)
 {
-    return WriteBytes(NS_REINTERPRET_CAST(char *, aBytes), aLength);
+    return WriteBytes(reinterpret_cast<char *>(aBytes), aLength);
 }
 
 NS_IMETHODIMP
@@ -340,7 +340,7 @@ ReadSegmentForwardingThunk(nsIInputStream* aStream,
                            PRUint32 *aWriteCount)
 {
     ReadSegmentsClosure* thunkClosure =
-        NS_REINTERPRET_CAST(ReadSegmentsClosure*, aClosure);
+        reinterpret_cast<ReadSegmentsClosure*>(aClosure);
 
     return thunkClosure->mRealWriter(thunkClosure->mRealInputStream,
                                      thunkClosure->mRealClosure,
@@ -397,7 +397,7 @@ nsBinaryInputStream::Read8(PRUint8* aByte)
     nsresult rv;
     PRUint32 bytesRead;
 
-    rv = Read(NS_REINTERPRET_CAST(char*, aByte), sizeof(*aByte), &bytesRead);
+    rv = Read(reinterpret_cast<char*>(aByte), sizeof(*aByte), &bytesRead);
     if (NS_FAILED(rv)) return rv;
     if (bytesRead != 1)
         return NS_ERROR_FAILURE;
@@ -410,7 +410,7 @@ nsBinaryInputStream::Read16(PRUint16* a16)
     nsresult rv;
     PRUint32 bytesRead;
 
-    rv = Read(NS_REINTERPRET_CAST(char*, a16), sizeof *a16, &bytesRead);
+    rv = Read(reinterpret_cast<char*>(a16), sizeof *a16, &bytesRead);
     if (NS_FAILED(rv)) return rv;
     if (bytesRead != sizeof *a16)
         return NS_ERROR_FAILURE;
@@ -424,7 +424,7 @@ nsBinaryInputStream::Read32(PRUint32* a32)
     nsresult rv;
     PRUint32 bytesRead;
 
-    rv = Read(NS_REINTERPRET_CAST(char*, a32), sizeof *a32, &bytesRead);
+    rv = Read(reinterpret_cast<char*>(a32), sizeof *a32, &bytesRead);
     if (NS_FAILED(rv)) return rv;
     if (bytesRead != sizeof *a32)
         return NS_ERROR_FAILURE;
@@ -438,7 +438,7 @@ nsBinaryInputStream::Read64(PRUint64* a64)
     nsresult rv;
     PRUint32 bytesRead;
 
-    rv = Read(NS_REINTERPRET_CAST(char*, a64), sizeof *a64, &bytesRead);
+    rv = Read(reinterpret_cast<char*>(a64), sizeof *a64, &bytesRead);
     if (NS_FAILED(rv)) return rv;
     if (bytesRead != sizeof *a64)
         return NS_ERROR_FAILURE;
@@ -451,7 +451,7 @@ nsBinaryInputStream::ReadFloat(float* aFloat)
 {
     NS_ASSERTION(sizeof(float) == sizeof (PRUint32),
                  "False assumption about sizeof(float)");
-    return Read32(NS_REINTERPRET_CAST(PRUint32*, aFloat));
+    return Read32(reinterpret_cast<PRUint32*>(aFloat));
 }
 
 NS_IMETHODIMP
@@ -459,7 +459,7 @@ nsBinaryInputStream::ReadDouble(double* aDouble)
 {
     NS_ASSERTION(sizeof(double) == sizeof(PRUint64),
                  "False assumption about sizeof(double)");
-    return Read64(NS_REINTERPRET_CAST(PRUint64*, aDouble));
+    return Read64(reinterpret_cast<PRUint64*>(aDouble));
 }
 
 static NS_METHOD
@@ -470,7 +470,7 @@ WriteSegmentToCString(nsIInputStream* aStream,
                       PRUint32 aCount,
                       PRUint32 *aWriteCount)
 {
-    nsACString* outString = NS_STATIC_CAST(nsACString*,aClosure);
+    nsACString* outString = static_cast<nsACString*>(aClosure);
 
     outString->Append(aFromSegment, aCount);
 
@@ -534,7 +534,7 @@ WriteSegmentToString(nsIInputStream* aStream,
     NS_PRECONDITION(aCount > 0, "Why are we being told to write 0 bytes?");
     NS_PRECONDITION(sizeof(PRUnichar) == 2, "We can't handle other sizes!");
 
-    WriteStringClosure* closure = NS_STATIC_CAST(WriteStringClosure*,aClosure);
+    WriteStringClosure* closure = static_cast<WriteStringClosure*>(aClosure);
     PRUnichar *cursor = closure->mWriteCursor;
 
     // we're always going to consume the whole buffer no matter what
@@ -564,7 +564,7 @@ WriteSegmentToString(nsIInputStream* aStream,
     
     // this array is possibly unaligned... be careful how we access it!
     const PRUnichar *unicodeSegment =
-        NS_REINTERPRET_CAST(const PRUnichar*, aFromSegment);
+        reinterpret_cast<const PRUnichar*>(aFromSegment);
 
     // calculate number of full characters in segment (aCount could be odd!)
     PRUint32 segmentLength = aCount / sizeof(PRUnichar);
@@ -631,7 +631,7 @@ nsBinaryInputStream::ReadBytes(PRUint32 aLength, char* *_rval)
     PRUint32 bytesRead;
     char* s;
 
-    s = NS_REINTERPRET_CAST(char*, nsMemory::Alloc(aLength));
+    s = reinterpret_cast<char*>(nsMemory::Alloc(aLength));
     if (!s)
         return NS_ERROR_OUT_OF_MEMORY;
 
@@ -652,7 +652,7 @@ nsBinaryInputStream::ReadBytes(PRUint32 aLength, char* *_rval)
 NS_IMETHODIMP
 nsBinaryInputStream::ReadByteArray(PRUint32 aLength, PRUint8* *_rval)
 {
-    return ReadBytes(aLength, NS_REINTERPRET_CAST(char **, _rval));
+    return ReadBytes(aLength, reinterpret_cast<char **>(_rval));
 }
 
 NS_IMETHODIMP
diff --git a/mozilla/xpcom/io/nsDirectoryService.cpp b/mozilla/xpcom/io/nsDirectoryService.cpp
index 1512d7c6dc8..d99f8a4a0cd 100644
--- a/mozilla/xpcom/io/nsDirectoryService.cpp
+++ b/mozilla/xpcom/io/nsDirectoryService.cpp
@@ -635,19 +635,19 @@ nsDirectoryService::Get(const char* prop, const nsIID & uuid, void* *result)
     {
         if (fileData.persistent)
         {
-            Set(prop, NS_STATIC_CAST(nsIFile*, fileData.data));
+            Set(prop, static_cast<nsIFile*>(fileData.data));
         }
         nsresult rv = (fileData.data)->QueryInterface(uuid, result);
         NS_RELEASE(fileData.data);  // addref occurs in FindProviderFile()
         return rv;
     }
 
-    FindProviderFile(NS_STATIC_CAST(nsIDirectoryServiceProvider*, this), &fileData);
+    FindProviderFile(static_cast<nsIDirectoryServiceProvider*>(this), &fileData);
     if (fileData.data)
     {
         if (fileData.persistent)
         {
-            Set(prop, NS_STATIC_CAST(nsIFile*, fileData.data));
+            Set(prop, static_cast<nsIFile*>(fileData.data));
         }
         nsresult rv = (fileData.data)->QueryInterface(uuid, result);
         NS_RELEASE(fileData.data);  // addref occurs in FindProviderFile()
diff --git a/mozilla/xpcom/io/nsDirectoryServiceUtils.h b/mozilla/xpcom/io/nsDirectoryServiceUtils.h
index 66b14ff00eb..edf82ec0433 100644
--- a/mozilla/xpcom/io/nsDirectoryServiceUtils.h
+++ b/mozilla/xpcom/io/nsDirectoryServiceUtils.h
@@ -55,7 +55,7 @@ NS_GetSpecialDirectory(const char* specialDirName, nsIFile* *result)
         return rv;
 
     return serv->Get(specialDirName, NS_GET_IID(nsIFile),
-                     NS_REINTERPRET_CAST(void**, result));
+                     reinterpret_cast<void**>(result));
 }
 
 #endif
diff --git a/mozilla/xpcom/io/nsFastLoadFile.cpp b/mozilla/xpcom/io/nsFastLoadFile.cpp
index ff44098a6c8..4861106c21e 100644
--- a/mozilla/xpcom/io/nsFastLoadFile.cpp
+++ b/mozilla/xpcom/io/nsFastLoadFile.cpp
@@ -143,7 +143,7 @@ NS_AccumulateFastLoadChecksum(PRUint32 *aChecksum,
         PRUint32 W;
         if (odd) {
             while (aLength > 3) {
-                W = *NS_REINTERPRET_CAST(const PRUint32*, aBuffer);
+                W = *reinterpret_cast<const PRUint32*>(aBuffer);
                 U <<= 8;
 #ifdef IS_BIG_ENDIAN
                 U |= W >> 24;
@@ -166,7 +166,7 @@ NS_AccumulateFastLoadChecksum(PRUint32 *aChecksum,
             aLength++;
         } else {
             while (aLength > 3) {
-                W = *NS_REINTERPRET_CAST(const PRUint32*, aBuffer);
+                W = *reinterpret_cast<const PRUint32*>(aBuffer);
 #ifdef IS_BIG_ENDIAN
                 U = W >> 16;
                 FLETCHER_ACCUMULATE(A, B, U);
@@ -273,7 +273,7 @@ nsFastLoadFileReader::ReadHeader(nsFastLoadHeader *aHeader)
     nsresult rv;
     PRUint32 bytesRead;
 
-    rv = Read(NS_REINTERPRET_CAST(char*, aHeader), sizeof *aHeader, &bytesRead);
+    rv = Read(reinterpret_cast<char*>(aHeader), sizeof *aHeader, &bytesRead);
     if (NS_FAILED(rv))
         return rv;
 
@@ -329,7 +329,7 @@ struct nsDocumentMapReadEntry : public nsDocumentMapEntry {
 PR_STATIC_CALLBACK(void)
 strmap_ClearEntry(PLDHashTable *aTable, PLDHashEntryHdr *aHdr)
 {
-    nsStringMapEntry* entry = NS_STATIC_CAST(nsStringMapEntry*, aHdr);
+    nsStringMapEntry* entry = static_cast<nsStringMapEntry*>(aHdr);
 
     if (entry->mString)
         nsMemory::Free((void*) entry->mString);
@@ -363,7 +363,7 @@ struct nsURIMapReadEntry : public nsObjectMapEntry {
 PR_STATIC_CALLBACK(void)
 objmap_ClearEntry(PLDHashTable *aTable, PLDHashEntryHdr *aHdr)
 {
-    nsObjectMapEntry* entry = NS_STATIC_CAST(nsObjectMapEntry*, aHdr);
+    nsObjectMapEntry* entry = static_cast<nsObjectMapEntry*>(aHdr);
 
     // Ignore tagged object ids stored as object pointer keys (the updater
     // code does this).
@@ -387,8 +387,8 @@ NS_IMETHODIMP
 nsFastLoadFileReader::HasMuxedDocument(const char* aURISpec, PRBool *aResult)
 {
     nsDocumentMapReadEntry* docMapEntry =
-        NS_STATIC_CAST(nsDocumentMapReadEntry*,
-                       PL_DHashTableOperate(&mFooter.mDocumentMap, aURISpec,
+        static_cast<nsDocumentMapReadEntry*>
+                   (PL_DHashTableOperate(&mFooter.mDocumentMap, aURISpec,
                                             PL_DHASH_LOOKUP));
 
     *aResult = PL_DHASH_ENTRY_IS_BUSY(docMapEntry);
@@ -399,8 +399,8 @@ NS_IMETHODIMP
 nsFastLoadFileReader::StartMuxedDocument(nsISupports* aURI, const char* aURISpec)
 {
     nsDocumentMapReadEntry* docMapEntry =
-        NS_STATIC_CAST(nsDocumentMapReadEntry*,
-                       PL_DHashTableOperate(&mFooter.mDocumentMap, aURISpec,
+        static_cast<nsDocumentMapReadEntry*>
+                   (PL_DHashTableOperate(&mFooter.mDocumentMap, aURISpec,
                                             PL_DHASH_LOOKUP));
 
     // If the spec isn't in the map, return NS_ERROR_NOT_AVAILABLE so the
@@ -410,8 +410,8 @@ nsFastLoadFileReader::StartMuxedDocument(nsISupports* aURI, const char* aURISpec
 
     nsCOMPtr<nsISupports> key(do_QueryInterface(aURI));
     nsURIMapReadEntry* uriMapEntry =
-        NS_STATIC_CAST(nsURIMapReadEntry*,
-                       PL_DHashTableOperate(&mFooter.mURIMap, key,
+        static_cast<nsURIMapReadEntry*>
+                   (PL_DHashTableOperate(&mFooter.mURIMap, key,
                                             PL_DHASH_ADD));
     if (!uriMapEntry)
         return NS_ERROR_OUT_OF_MEMORY;
@@ -439,8 +439,8 @@ nsFastLoadFileReader::SelectMuxedDocument(nsISupports* aURI,
     // Find the given URI's entry and select it for more reading.
     nsCOMPtr<nsISupports> key(do_QueryInterface(aURI));
     nsURIMapReadEntry* uriMapEntry =
-        NS_STATIC_CAST(nsURIMapReadEntry*,
-                       PL_DHashTableOperate(&mFooter.mURIMap, key,
+        static_cast<nsURIMapReadEntry*>
+                   (PL_DHashTableOperate(&mFooter.mURIMap, key,
                                             PL_DHASH_LOOKUP));
 
     // If the URI isn't in the map, return NS_ERROR_NOT_AVAILABLE so the
@@ -502,8 +502,8 @@ nsFastLoadFileReader::EndMuxedDocument(nsISupports* aURI)
 {
     nsCOMPtr<nsISupports> key(do_QueryInterface(aURI));
     nsURIMapReadEntry* uriMapEntry =
-        NS_STATIC_CAST(nsURIMapReadEntry*,
-                       PL_DHashTableOperate(&mFooter.mURIMap, key,
+        static_cast<nsURIMapReadEntry*>
+                   (PL_DHashTableOperate(&mFooter.mURIMap, key,
                                             PL_DHASH_LOOKUP));
 
     // If the URI isn't in the map, return NS_ERROR_NOT_AVAILABLE so the
@@ -680,7 +680,7 @@ nsFastLoadFileReader::ComputeChecksum(PRUint32 *aResult)
            len) {
         len += rem;
         rem = NS_AccumulateFastLoadChecksum(&checksum,
-                                            NS_REINTERPRET_CAST(PRUint8*, buf),
+                                            reinterpret_cast<PRUint8*>(buf),
                                             len,
                                             PR_FALSE);
         if (rem)
@@ -691,7 +691,7 @@ nsFastLoadFileReader::ComputeChecksum(PRUint32 *aResult)
 
     if (rem) {
         NS_AccumulateFastLoadChecksum(&checksum,
-                                      NS_REINTERPRET_CAST(PRUint8*, buf),
+                                      reinterpret_cast<PRUint8*>(buf),
                                       rem,
                                       PR_TRUE);
     }
@@ -769,8 +769,8 @@ nsFastLoadFileReader::ReadFooter(nsFastLoadFooter *aFooter)
             return rv;
 
         nsDocumentMapReadEntry* entry =
-            NS_STATIC_CAST(nsDocumentMapReadEntry*,
-                           PL_DHashTableOperate(&aFooter->mDocumentMap,
+            static_cast<nsDocumentMapReadEntry*>
+                       (PL_DHashTableOperate(&aFooter->mDocumentMap,
                                                 info.mURISpec,
                                                 PL_DHASH_ADD));
         if (!entry) {
@@ -800,7 +800,7 @@ nsFastLoadFileReader::ReadFooter(nsFastLoadFooter *aFooter)
             return rv;
 
         PRInt64 fastLoadMtime;
-        rv = Read64(NS_REINTERPRET_CAST(PRUint64*, &fastLoadMtime));
+        rv = Read64(reinterpret_cast<PRUint64*>(&fastLoadMtime));
         if (NS_FAILED(rv))
             return rv;
 
@@ -875,7 +875,7 @@ nsFastLoadFileReader::ReadSlowID(nsID *aID)
         return rv;
 
     PRUint32 bytesRead;
-    rv = Read(NS_REINTERPRET_CAST(char*, aID->m3), sizeof aID->m3, &bytesRead);
+    rv = Read(reinterpret_cast<char*>(aID->m3), sizeof aID->m3, &bytesRead);
     if (NS_FAILED(rv))
         return rv;
 
@@ -1167,7 +1167,7 @@ nsFastLoadFileReader::ReadObject(PRBool aIsStrongRef, nsISupports* *aObject)
             return rv;
 
         rv = object->QueryInterface(mFooter.GetID(iid),
-                                    NS_REINTERPRET_CAST(void**, aObject));
+                                    reinterpret_cast<void**>(aObject));
         if (NS_FAILED(rv))
             return rv;
     } else {
@@ -1248,7 +1248,7 @@ struct nsIDMapEntry : public PLDHashEntryHdr {
 PR_STATIC_CALLBACK(PLDHashNumber)
 idmap_HashKey(PLDHashTable *aTable, const void *aKey)
 {
-    const nsID *idp = NS_REINTERPRET_CAST(const nsID*, aKey);
+    const nsID *idp = reinterpret_cast<const nsID*>(aKey);
 
     return idp->m0;
 }
@@ -1258,8 +1258,8 @@ idmap_MatchEntry(PLDHashTable *aTable,
                 const PLDHashEntryHdr *aHdr,
                 const void *aKey)
 {
-    const nsIDMapEntry* entry = NS_STATIC_CAST(const nsIDMapEntry*, aHdr);
-    const nsID *idp = NS_REINTERPRET_CAST(const nsID*, aKey);
+    const nsIDMapEntry* entry = static_cast<const nsIDMapEntry*>(aHdr);
+    const nsID *idp = reinterpret_cast<const nsID*>(aKey);
 
     return memcmp(&entry->mSlowID, idp, sizeof(nsID)) == 0;
 }
@@ -1279,8 +1279,8 @@ nsresult
 nsFastLoadFileWriter::MapID(const nsID& aSlowID, NSFastLoadID *aResult)
 {
     nsIDMapEntry* entry =
-        NS_STATIC_CAST(nsIDMapEntry*,
-                       PL_DHashTableOperate(&mIDMap, &aSlowID, PL_DHASH_ADD));
+        static_cast<nsIDMapEntry*>
+                   (PL_DHashTableOperate(&mIDMap, &aSlowID, PL_DHASH_ADD));
     if (!entry)
         return NS_ERROR_OUT_OF_MEMORY;
 
@@ -1361,8 +1361,8 @@ NS_IMETHODIMP
 nsFastLoadFileWriter::HasMuxedDocument(const char* aURISpec, PRBool *aResult)
 {
     nsDocumentMapWriteEntry* docMapEntry =
-        NS_STATIC_CAST(nsDocumentMapWriteEntry*,
-                       PL_DHashTableOperate(&mDocumentMap, aURISpec,
+        static_cast<nsDocumentMapWriteEntry*>
+                   (PL_DHashTableOperate(&mDocumentMap, aURISpec,
                                             PL_DHASH_LOOKUP));
 
     *aResult = PL_DHASH_ENTRY_IS_BUSY(docMapEntry);
@@ -1381,8 +1381,8 @@ nsFastLoadFileWriter::StartMuxedDocument(nsISupports* aURI,
                               : nsnull;
 
     nsDocumentMapWriteEntry* docMapEntry =
-        NS_STATIC_CAST(nsDocumentMapWriteEntry*,
-                       PL_DHashTableOperate(&mDocumentMap, aURISpec,
+        static_cast<nsDocumentMapWriteEntry*>
+                   (PL_DHashTableOperate(&mDocumentMap, aURISpec,
                                             PL_DHASH_ADD));
     if (!docMapEntry)
         return NS_ERROR_OUT_OF_MEMORY;
@@ -1390,8 +1390,8 @@ nsFastLoadFileWriter::StartMuxedDocument(nsISupports* aURI,
     // If the generation number changed, refresh mCurrentDocumentMapEntry.
     if (mCurrentDocumentMapEntry && mDocumentMap.generation != saveGeneration) {
         mCurrentDocumentMapEntry =
-            NS_STATIC_CAST(nsDocumentMapWriteEntry*,
-                           PL_DHashTableOperate(&mDocumentMap, saveURISpec,
+            static_cast<nsDocumentMapWriteEntry*>
+                       (PL_DHashTableOperate(&mDocumentMap, saveURISpec,
                                                 PL_DHASH_LOOKUP));
         NS_ASSERTION(PL_DHASH_ENTRY_IS_BUSY(mCurrentDocumentMapEntry),
                      "mCurrentDocumentMapEntry lost during table growth?!");
@@ -1408,14 +1408,14 @@ nsFastLoadFileWriter::StartMuxedDocument(nsISupports* aURI,
     void* spec = nsMemory::Clone(aURISpec, strlen(aURISpec) + 1);
     if (!spec)
         return NS_ERROR_OUT_OF_MEMORY;
-    docMapEntry->mString = NS_REINTERPRET_CAST(const char*, spec);
+    docMapEntry->mString = reinterpret_cast<const char*>(spec);
     docMapEntry->mURI = aURI;
     NS_ADDREF(docMapEntry->mURI);
 
     nsCOMPtr<nsISupports> key(do_QueryInterface(aURI));
     nsURIMapWriteEntry* uriMapEntry =
-        NS_STATIC_CAST(nsURIMapWriteEntry*,
-                       PL_DHashTableOperate(&mURIMap, key, PL_DHASH_ADD));
+        static_cast<nsURIMapWriteEntry*>
+                   (PL_DHashTableOperate(&mURIMap, key, PL_DHASH_ADD));
     if (!uriMapEntry)
         return NS_ERROR_OUT_OF_MEMORY;
 
@@ -1428,7 +1428,7 @@ nsFastLoadFileWriter::StartMuxedDocument(nsISupports* aURI,
     NS_ADDREF(uriMapEntry->mObject);
     uriMapEntry->mDocMapEntry = docMapEntry;
     uriMapEntry->mGeneration = saveGeneration;
-    uriMapEntry->mURISpec = NS_REINTERPRET_CAST(const char*, spec);
+    uriMapEntry->mURISpec = reinterpret_cast<const char*>(spec);
     TRACE_MUX(('w', "start %p (%p) %s\n", aURI, key.get(), aURISpec));
     return NS_OK;
 }
@@ -1448,8 +1448,8 @@ nsFastLoadFileWriter::SelectMuxedDocument(nsISupports* aURI,
     // Look for an existing entry keyed by aURI, added by StartMuxedDocument.
     nsCOMPtr<nsISupports> key(do_QueryInterface(aURI));
     nsURIMapWriteEntry* uriMapEntry =
-        NS_STATIC_CAST(nsURIMapWriteEntry*,
-                       PL_DHashTableOperate(&mURIMap, key, PL_DHASH_LOOKUP));
+        static_cast<nsURIMapWriteEntry*>
+                   (PL_DHashTableOperate(&mURIMap, key, PL_DHASH_LOOKUP));
     NS_ASSERTION(PL_DHASH_ENTRY_IS_BUSY(uriMapEntry),
                  "SelectMuxedDocument without prior StartMuxedDocument?");
     if (PL_DHASH_ENTRY_IS_FREE(uriMapEntry))
@@ -1463,8 +1463,8 @@ nsFastLoadFileWriter::SelectMuxedDocument(nsISupports* aURI,
     nsDocumentMapWriteEntry* docMapEntry = uriMapEntry->mDocMapEntry;
     if (uriMapEntry->mGeneration != mDocumentMap.generation) {
         docMapEntry =
-            NS_STATIC_CAST(nsDocumentMapWriteEntry*,
-                           PL_DHashTableOperate(&mDocumentMap,
+            static_cast<nsDocumentMapWriteEntry*>
+                       (PL_DHashTableOperate(&mDocumentMap,
                                                 uriMapEntry->mURISpec,
                                                 PL_DHASH_LOOKUP));
         NS_ASSERTION(PL_DHASH_ENTRY_IS_BUSY(docMapEntry), "lost mDocMapEntry!?");
@@ -1558,8 +1558,8 @@ nsFastLoadFileWriter::EndMuxedDocument(nsISupports* aURI)
 {
     nsCOMPtr<nsISupports> key(do_QueryInterface(aURI));
     nsURIMapWriteEntry* uriMapEntry =
-        NS_STATIC_CAST(nsURIMapWriteEntry*,
-                       PL_DHashTableOperate(&mURIMap, key, PL_DHASH_LOOKUP));
+        static_cast<nsURIMapWriteEntry*>
+                   (PL_DHashTableOperate(&mURIMap, key, PL_DHASH_LOOKUP));
 
     // If the URI isn't in the map, nsFastLoadFileWriter::StartMuxedDocument
     // must have been called with a redundant URI, *and* its caller must have
@@ -1598,8 +1598,8 @@ nsFastLoadFileWriter::AddDependency(nsIFile* aFile)
         return rv;
 
     nsDependencyMapEntry* entry =
-        NS_STATIC_CAST(nsDependencyMapEntry*,
-                       PL_DHashTableOperate(&mDependencyMap, path.get(),
+        static_cast<nsDependencyMapEntry*>
+                   (PL_DHashTableOperate(&mDependencyMap, path.get(),
                                             PL_DHASH_ADD));
     if (!entry)
         return NS_ERROR_OUT_OF_MEMORY;
@@ -1668,7 +1668,7 @@ nsFastLoadFileWriter::WriteSlowID(const nsID& aID)
         return rv;
 
     PRUint32 bytesWritten;
-    rv = Write(NS_REINTERPRET_CAST(const char*, aID.m3), sizeof aID.m3,
+    rv = Write(reinterpret_cast<const char*>(aID.m3), sizeof aID.m3,
                &bytesWritten);
     if (NS_FAILED(rv))
         return rv;
@@ -1729,9 +1729,9 @@ nsFastLoadFileWriter::IDMapEnumerate(PLDHashTable *aTable,
                                      PRUint32 aNumber,
                                      void *aData)
 {
-    nsIDMapEntry* entry = NS_STATIC_CAST(nsIDMapEntry*, aHdr);
+    nsIDMapEntry* entry = static_cast<nsIDMapEntry*>(aHdr);
     PRUint32 index = entry->mFastID - 1;
-    nsID* vector = NS_REINTERPRET_CAST(nsID*, aData);
+    nsID* vector = reinterpret_cast<nsID*>(aData);
 
     NS_ASSERTION(index < aTable->entryCount, "bad nsIDMap index!");
     vector[index] = entry->mSlowID;
@@ -1749,10 +1749,10 @@ nsFastLoadFileWriter::ObjectMapEnumerate(PLDHashTable *aTable,
                                          PRUint32 aNumber,
                                          void *aData)
 {
-    nsSharpObjectMapEntry* entry = NS_STATIC_CAST(nsSharpObjectMapEntry*, aHdr);
+    nsSharpObjectMapEntry* entry = static_cast<nsSharpObjectMapEntry*>(aHdr);
     PRUint32 index = MFL_OID_TO_SHARP_INDEX(entry->mOID);
     nsFastLoadSharpObjectInfo* vector =
-        NS_REINTERPRET_CAST(nsFastLoadSharpObjectInfo*, aData);
+        reinterpret_cast<nsFastLoadSharpObjectInfo*>(aData);
 
     NS_ASSERTION(index < aTable->entryCount, "bad nsObjectMap index!");
     vector[index] = entry->mInfo;
@@ -1774,10 +1774,10 @@ nsFastLoadFileWriter::DocumentMapEnumerate(PLDHashTable *aTable,
                                            void *aData)
 {
     nsFastLoadFileWriter* writer =
-        NS_REINTERPRET_CAST(nsFastLoadFileWriter*, aTable->data);
+        reinterpret_cast<nsFastLoadFileWriter*>(aTable->data);
     nsDocumentMapWriteEntry* entry =
-        NS_STATIC_CAST(nsDocumentMapWriteEntry*, aHdr);
-    nsresult* rvp = NS_REINTERPRET_CAST(nsresult*, aData);
+        static_cast<nsDocumentMapWriteEntry*>(aHdr);
+    nsresult* rvp = reinterpret_cast<nsresult*>(aData);
 
     nsFastLoadMuxedDocumentInfo info;
     info.mURISpec = entry->mString;
@@ -1794,9 +1794,9 @@ nsFastLoadFileWriter::DependencyMapEnumerate(PLDHashTable *aTable,
                                              void *aData)
 {
     nsFastLoadFileWriter* writer =
-        NS_REINTERPRET_CAST(nsFastLoadFileWriter*, aTable->data);
-    nsDependencyMapEntry* entry = NS_STATIC_CAST(nsDependencyMapEntry*, aHdr);
-    nsresult* rvp = NS_REINTERPRET_CAST(nsresult*, aData);
+        reinterpret_cast<nsFastLoadFileWriter*>(aTable->data);
+    nsDependencyMapEntry* entry = static_cast<nsDependencyMapEntry*>(aHdr);
+    nsresult* rvp = reinterpret_cast<nsresult*>(aData);
 
     *rvp = writer->WriteStringZ(entry->mString);
     if (NS_SUCCEEDED(*rvp))
@@ -2023,8 +2023,8 @@ nsFastLoadFileWriter::Close()
                len) {
             len += rem;
             rem = NS_AccumulateFastLoadChecksum(&checksum,
-                                                NS_REINTERPRET_CAST(PRUint8*,
-                                                                    buf),
+                                                reinterpret_cast<PRUint8*>
+                                                                (buf),
                                                 len,
                                                 PR_FALSE);
             if (rem)
@@ -2035,7 +2035,7 @@ nsFastLoadFileWriter::Close()
 
         if (rem) {
             NS_AccumulateFastLoadChecksum(&checksum,
-                                          NS_REINTERPRET_CAST(PRUint8*, buf),
+                                          reinterpret_cast<PRUint8*>(buf),
                                           rem,
                                           PR_TRUE);
         }
@@ -2051,7 +2051,7 @@ nsFastLoadFileWriter::Close()
         mHeader.mChecksum = checksum;
         checksum = NS_SWAP32(checksum);
         PRUint32 bytesWritten;
-        rv = output->Write(NS_REINTERPRET_CAST(char*, &checksum),
+        rv = output->Write(reinterpret_cast<char*>(&checksum),
                            sizeof checksum,
                            &bytesWritten);
         if (NS_FAILED(rv))
@@ -2095,8 +2095,8 @@ nsFastLoadFileWriter::WriteObjectCommon(nsISupports* aObject,
         // Object is presumed to be multiply connected through some combo of
         // strong and weak refs.  Hold onto it via mObjectMap.
         nsSharpObjectMapEntry* entry =
-            NS_STATIC_CAST(nsSharpObjectMapEntry*,
-                           PL_DHashTableOperate(&mObjectMap, aObject,
+            static_cast<nsSharpObjectMapEntry*>
+                       (PL_DHashTableOperate(&mObjectMap, aObject,
                                                 PL_DHASH_ADD));
         if (!entry) {
             aObject->Release();
@@ -2343,9 +2343,9 @@ nsFastLoadFileUpdater::CopyReadDocumentMapEntryToUpdater(PLDHashTable *aTable,
                                                          void *aData)
 {
     nsDocumentMapReadEntry* readEntry =
-        NS_STATIC_CAST(nsDocumentMapReadEntry*, aHdr);
+        static_cast<nsDocumentMapReadEntry*>(aHdr);
     nsFastLoadFileUpdater* updater =
-        NS_REINTERPRET_CAST(nsFastLoadFileUpdater*, aData);
+        reinterpret_cast<nsFastLoadFileUpdater*>(aData);
 
     void* spec = nsMemory::Clone(readEntry->mString,
                                  strlen(readEntry->mString) + 1);
@@ -2353,15 +2353,15 @@ nsFastLoadFileUpdater::CopyReadDocumentMapEntryToUpdater(PLDHashTable *aTable,
         return PL_DHASH_STOP;
 
     nsDocumentMapWriteEntry* writeEntry =
-        NS_STATIC_CAST(nsDocumentMapWriteEntry*,
-                       PL_DHashTableOperate(&updater->mDocumentMap, spec,
+        static_cast<nsDocumentMapWriteEntry*>
+                   (PL_DHashTableOperate(&updater->mDocumentMap, spec,
                                             PL_DHASH_ADD));
     if (!writeEntry) {
         nsMemory::Free(spec);
         return PL_DHASH_STOP;
     }
 
-    writeEntry->mString = NS_REINTERPRET_CAST(const char*, spec);
+    writeEntry->mString = reinterpret_cast<const char*>(spec);
     writeEntry->mURI = nsnull;
     writeEntry->mInitialSegmentOffset = readEntry->mInitialSegmentOffset;
     writeEntry->mCurrentSegmentOffset = 0;
@@ -2457,12 +2457,12 @@ nsFastLoadFileUpdater::Open(nsFastLoadFileReader* aReader)
 
         NSFastLoadOID oid = MFL_SHARP_INDEX_TO_OID(i);
         void* key = obj
-                    ? NS_REINTERPRET_CAST(void*, obj)
-                    : NS_REINTERPRET_CAST(void*, (oid | MFL_OBJECT_DEF_TAG));
+                    ? reinterpret_cast<void*>(obj)
+                    : reinterpret_cast<void*>((oid | MFL_OBJECT_DEF_TAG));
 
         nsSharpObjectMapEntry* writeEntry =
-            NS_STATIC_CAST(nsSharpObjectMapEntry*,
-                           PL_DHashTableOperate(&mObjectMap, key,
+            static_cast<nsSharpObjectMapEntry*>
+                       (PL_DHashTableOperate(&mObjectMap, key,
                                                 PL_DHASH_ADD));
         if (!writeEntry)
             return NS_ERROR_OUT_OF_MEMORY;
@@ -2470,7 +2470,7 @@ nsFastLoadFileUpdater::Open(nsFastLoadFileReader* aReader)
         // Hold the object if there is one, so that objmap_ClearEntry can
         // release the reference.
         NS_IF_ADDREF(obj);
-        writeEntry->mObject = NS_REINTERPRET_CAST(nsISupports*, key);
+        writeEntry->mObject = reinterpret_cast<nsISupports*>(key);
         writeEntry->mOID = oid;
         writeEntry->mInfo.mCIDOffset = readEntry->mCIDOffset;
         writeEntry->mInfo.mStrongRefCnt = readEntry->mSaveStrongRefCnt;
@@ -2568,8 +2568,8 @@ NS_NewFastLoadFileUpdater(nsIObjectOutputStream* *aResult,
     // Stabilize updater's refcnt.
     nsCOMPtr<nsIObjectOutputStream> stream(updater);
 
-    nsresult rv = updater->Open(NS_STATIC_CAST(nsFastLoadFileReader*,
-                                               aReaderAsStream));
+    nsresult rv = updater->Open(static_cast<nsFastLoadFileReader*>
+                                           (aReaderAsStream));
     if (NS_FAILED(rv))
         return rv;
 
diff --git a/mozilla/xpcom/io/nsFastLoadFile.h b/mozilla/xpcom/io/nsFastLoadFile.h
index 008fbd4ffbb..377c3725bd4 100644
--- a/mozilla/xpcom/io/nsFastLoadFile.h
+++ b/mozilla/xpcom/io/nsFastLoadFile.h
@@ -163,7 +163,7 @@ typedef PRUint32 NSFastLoadOID;         // nsFastLoadFooter::mObjectMap index
  *  while (NS_SUCCEEDED(rv = Read(buf + rem, sizeof buf - rem, &len)) && len) {
  *      len += rem;
  *      rem = NS_AccumulateFastLoadChecksum(&checksum,
- *                                          NS_REINTERPRET_CAST(PRUint8*, buf),
+ *                                          reinterpret_cast<PRUint8*>(buf),
  *                                          len,
  *                                          PR_FALSE);
  *      if (rem)
@@ -172,7 +172,7 @@ typedef PRUint32 NSFastLoadOID;         // nsFastLoadFooter::mObjectMap index
  *
  *  if (rem) {
  *      NS_AccumulateFastLoadChecksum(&checksum,
- *                                    NS_REINTERPRET_CAST(PRUint8*, buf),
+ *                                    reinterpret_cast<PRUint8*>(buf),
  *                                    rem,
  *                                    PR_TRUE);
  *  }
diff --git a/mozilla/xpcom/io/nsFastLoadService.cpp b/mozilla/xpcom/io/nsFastLoadService.cpp
index ea19ada661f..4ad093dab6f 100644
--- a/mozilla/xpcom/io/nsFastLoadService.cpp
+++ b/mozilla/xpcom/io/nsFastLoadService.cpp
@@ -445,8 +445,8 @@ nsFastLoadService::GetFastLoadReferent(nsISupports* *aPtrAddr)
         return NS_OK;
 
     nsFastLoadPtrEntry* entry =
-        NS_STATIC_CAST(nsFastLoadPtrEntry*,
-                       PL_DHashTableOperate(mFastLoadPtrMap, aPtrAddr,
+        static_cast<nsFastLoadPtrEntry*>
+                   (PL_DHashTableOperate(mFastLoadPtrMap, aPtrAddr,
                                             PL_DHASH_LOOKUP));
     if (PL_DHASH_ENTRY_IS_FREE(entry))
         return NS_OK;
@@ -511,8 +511,8 @@ nsFastLoadService::ReadFastLoadPtr(nsIObjectInputStream* aInputStream,
     }
 
     nsFastLoadPtrEntry* entry =
-        NS_STATIC_CAST(nsFastLoadPtrEntry*,
-                       PL_DHashTableOperate(mFastLoadPtrMap, aPtrAddr,
+        static_cast<nsFastLoadPtrEntry*>
+                   (PL_DHashTableOperate(mFastLoadPtrMap, aPtrAddr,
                                             PL_DHASH_ADD));
     NS_ASSERTION(entry->mPtrAddr == nsnull, "duplicate nsFastLoadPtr?!");
 
diff --git a/mozilla/xpcom/io/nsInputStreamTee.cpp b/mozilla/xpcom/io/nsInputStreamTee.cpp
index b0651ad191a..53b5ff87ca7 100644
--- a/mozilla/xpcom/io/nsInputStreamTee.cpp
+++ b/mozilla/xpcom/io/nsInputStreamTee.cpp
@@ -97,7 +97,7 @@ NS_METHOD
 nsInputStreamTee::WriteSegmentFun(nsIInputStream *in, void *closure, const char *fromSegment,
                                   PRUint32 offset, PRUint32 count, PRUint32 *writeCount)
 {
-    nsInputStreamTee *tee = NS_REINTERPRET_CAST(nsInputStreamTee *, closure);
+    nsInputStreamTee *tee = reinterpret_cast<nsInputStreamTee *>(closure);
 
     nsresult rv = tee->mWriter(in, tee->mClosure, fromSegment, offset, count, writeCount);
     if (NS_FAILED(rv) || (*writeCount == 0)) {
diff --git a/mozilla/xpcom/io/nsLocalFileOS2.cpp b/mozilla/xpcom/io/nsLocalFileOS2.cpp
index 58f74d22ceb..ec84c9838e1 100644
--- a/mozilla/xpcom/io/nsLocalFileOS2.cpp
+++ b/mozilla/xpcom/io/nsLocalFileOS2.cpp
@@ -810,7 +810,7 @@ nsLocalFile::Create(PRUint32 type, PRUint32 attributes)
         {
             *slash = '\0';
 
-            rv = CreateDirectoryA(NS_CONST_CAST(char*, mWorkingPath.get()), NULL);
+            rv = CreateDirectoryA(const_cast<char*>(mWorkingPath.get()), NULL);
             if (rv) {
                 rv = ConvertOS2Error(rv);
                 if (rv != NS_ERROR_FILE_ALREADY_EXISTS)
@@ -833,7 +833,7 @@ nsLocalFile::Create(PRUint32 type, PRUint32 attributes)
 
     if (type == DIRECTORY_TYPE)
     {
-        rv = CreateDirectoryA(NS_CONST_CAST(char*, mWorkingPath.get()), NULL);
+        rv = CreateDirectoryA(const_cast<char*>(mWorkingPath.get()), NULL);
         if (rv)
             return ConvertOS2Error(rv);
         else
@@ -1401,7 +1401,7 @@ nsLocalFile::CopySingleFile(nsIFile *sourceFile, nsIFile *destParent,
     APIRET rc = NO_ERROR;
 
     if (move)
-        rc = DosMove(filePath.get(), (PSZ)NS_CONST_CAST(char*, destPath.get()));
+        rc = DosMove(filePath.get(), (PSZ)const_cast<char*>(destPath.get()));
 
     if (!move || rc == ERROR_NOT_SAME_DEVICE || rc == ERROR_ACCESS_DENIED)
     {
@@ -1410,7 +1410,7 @@ nsLocalFile::CopySingleFile(nsIFile *sourceFile, nsIFile *destParent,
         // the file without error, so we need to do the same   IBM-AKR
 
         do {
-            rc = DosCopy(filePath.get(), (PSZ)NS_CONST_CAST(char*, destPath.get()), DCPY_EXISTING);
+            rc = DosCopy(filePath.get(), (PSZ)const_cast<char*>(destPath.get()), DCPY_EXISTING);
             if (rc == ERROR_TOO_MANY_OPEN_FILES) {
                 ULONG CurMaxFH = 0;
                 LONG ReqCount = 20;
@@ -1431,7 +1431,7 @@ nsLocalFile::CopySingleFile(nsIFile *sourceFile, nsIFile *destParent,
             strcat(achProgram, """COPY ");
             strcat(achProgram, filePath.get());
             strcat(achProgram, " ");
-            strcat(achProgram, (PSZ)NS_CONST_CAST(char*, destPath.get()));
+            strcat(achProgram, (PSZ)const_cast<char*>(destPath.get()));
             strcat(achProgram, """");
             achProgram[strlen(achProgram) + 1] = '\0';
             achProgram[7] = '\0';
diff --git a/mozilla/xpcom/io/nsLocalFileOSX.cpp b/mozilla/xpcom/io/nsLocalFileOSX.cpp
index b9de5bfbead..392cd21350f 100644
--- a/mozilla/xpcom/io/nsLocalFileOSX.cpp
+++ b/mozilla/xpcom/io/nsLocalFileOSX.cpp
@@ -1184,7 +1184,7 @@ nsLocalFile::EqualsInternal(nsISupports* inFile, PRBool aUpdateCache,
     return NS_OK;
     
   nsLocalFile* inLF =
-      NS_STATIC_CAST(nsLocalFile*, (nsILocalFileMac*) inMacFile);
+      static_cast<nsLocalFile*>((nsILocalFileMac*) inMacFile);
 
   // If both exist, compare FSRefs
   FSRef thisFSRef, inFSRef;
diff --git a/mozilla/xpcom/io/nsLocalFileWin.cpp b/mozilla/xpcom/io/nsLocalFileWin.cpp
index 0d28156e653..eb8098cc233 100644
--- a/mozilla/xpcom/io/nsLocalFileWin.cpp
+++ b/mozilla/xpcom/io/nsLocalFileWin.cpp
@@ -1324,7 +1324,7 @@ nsLocalFile::GetVersionInfoField(const char* aField, nsAString& _retval)
 
     // Cast away const-ness here because WinAPI functions don't understand it, 
     // the path is used for [in] parameters only however so it's safe. 
-    WCHAR *path = NS_CONST_CAST(WCHAR*, mFollowSymlinks ? mResolvedPath.get() 
+    WCHAR *path = const_cast<WCHAR*>(mFollowSymlinks ? mResolvedPath.get() 
                                                         : mWorkingPath.get());
 
     DWORD dummy;
@@ -1360,7 +1360,7 @@ nsLocalFile::GetVersionInfoField(const char* aField, nsAString& _retval)
                 queryResult = ::VerQueryValueW(ver, subBlock, &value, &size);
                 if (queryResult && value)
                 {
-                    _retval.Assign(NS_STATIC_CAST(PRUnichar*, value));
+                    _retval.Assign(static_cast<PRUnichar*>(value));
                     if (!_retval.IsEmpty()) 
                     {
                         rv = NS_OK;
diff --git a/mozilla/xpcom/io/nsNativeCharsetUtils.cpp b/mozilla/xpcom/io/nsNativeCharsetUtils.cpp
index 79a1288b28a..eabcc8c9be5 100644
--- a/mozilla/xpcom/io/nsNativeCharsetUtils.cpp
+++ b/mozilla/xpcom/io/nsNativeCharsetUtils.cpp
@@ -1068,7 +1068,7 @@ NS_CopyUnicodeToNative(const nsAString &input, nsACString &output)
 
     nsAString::const_iterator iter;
     input.BeginReading(iter);
-    UniChar* inputStr = (UniChar*) NS_CONST_CAST(PRUnichar*, iter.get());
+    UniChar* inputStr = (UniChar*) const_cast<PRUnichar*>(iter.get());
 
     // maximum length of unicode string of length x converted to native
     // codepage is x*2
diff --git a/mozilla/xpcom/io/nsStorageStream.cpp b/mozilla/xpcom/io/nsStorageStream.cpp
index 2ab286e4704..a8ce0248036 100644
--- a/mozilla/xpcom/io/nsStorageStream.cpp
+++ b/mozilla/xpcom/io/nsStorageStream.cpp
@@ -131,7 +131,7 @@ nsStorageStream::GetOutputStream(PRInt32 aStartingOffset,
     if (NS_FAILED(rv)) return rv;
 
     NS_ADDREF(this);
-    *aOutputStream = NS_STATIC_CAST(nsIOutputStream*, this);
+    *aOutputStream = static_cast<nsIOutputStream*>(this);
     mWriteInProgress = PR_TRUE;
     return NS_OK;
 }
diff --git a/mozilla/xpcom/io/nsStreamUtils.cpp b/mozilla/xpcom/io/nsStreamUtils.cpp
index cfef8636bce..442ac3a2ad7 100644
--- a/mozilla/xpcom/io/nsStreamUtils.cpp
+++ b/mozilla/xpcom/io/nsStreamUtils.cpp
@@ -598,7 +598,7 @@ TestInputStream(nsIInputStream *inStr,
                 PRUint32 count,
                 PRUint32 *countWritten)
 {
-    PRBool *result = NS_STATIC_CAST(PRBool *, closure);
+    PRBool *result = static_cast<PRBool *>(closure);
     *result = PR_TRUE;
     return NS_ERROR_ABORT;  // don't call me anymore
 }
@@ -621,7 +621,7 @@ TestOutputStream(nsIOutputStream *outStr,
                  PRUint32 count,
                  PRUint32 *countRead)
 {
-    PRBool *result = NS_STATIC_CAST(PRBool *, closure);
+    PRBool *result = static_cast<PRBool *>(closure);
     *result = PR_TRUE;
     return NS_ERROR_ABORT;  // don't call me anymore
 }
@@ -645,7 +645,7 @@ NS_CopySegmentToStream(nsIInputStream *inStr,
                        PRUint32 count,
                        PRUint32 *countWritten)
 {
-    nsIOutputStream *outStr = NS_STATIC_CAST(nsIOutputStream *, closure);
+    nsIOutputStream *outStr = static_cast<nsIOutputStream *>(closure);
     *countWritten = 0;
     while (count) {
         PRUint32 n;
@@ -667,7 +667,7 @@ NS_CopySegmentToBuffer(nsIInputStream *inStr,
                        PRUint32 count,
                        PRUint32 *countWritten)
 {
-    char *toBuf = NS_STATIC_CAST(char *, closure);
+    char *toBuf = static_cast<char *>(closure);
     memcpy(&toBuf[offset], buffer, count);
     *countWritten = count;
     return NS_OK;
@@ -695,7 +695,7 @@ NS_WriteSegmentThunk(nsIInputStream *inStr,
                      PRUint32 count,
                      PRUint32 *countWritten)
 {
-    nsWriteSegmentThunk *thunk = NS_STATIC_CAST(nsWriteSegmentThunk *, closure);
+    nsWriteSegmentThunk *thunk = static_cast<nsWriteSegmentThunk *>(closure);
     return thunk->mFun(thunk->mStream, thunk->mClosure, buffer, offset, count,
                        countWritten);
 }
diff --git a/mozilla/xpcom/io/nsStringStream.cpp b/mozilla/xpcom/io/nsStringStream.cpp
index 3c1ff382490..4a437efc1a3 100644
--- a/mozilla/xpcom/io/nsStringStream.cpp
+++ b/mozilla/xpcom/io/nsStringStream.cpp
@@ -102,7 +102,7 @@ private:
     {
         NS_ASSERTION(mData || !mOwned, "bad state");
         if (mOwned)
-            NS_Free(NS_CONST_CAST(char*, mData));
+            NS_Free(const_cast<char*>(mData));
 
         // We're about to get a new string; reset the offset.
         mOffset = 0;
@@ -183,7 +183,7 @@ nsStringInputStream::SetData(const char *data, PRInt32 dataLen)
     // NOTE: We do not use nsCRT::strndup here because that does not handle
     // null bytes in the middle of the given data.
  
-    char *copy = NS_STATIC_CAST(char *, NS_Alloc(dataLen));
+    char *copy = static_cast<char *>(NS_Alloc(dataLen));
     if (!copy)
         return NS_ERROR_OUT_OF_MEMORY;
     memcpy(copy, data, dataLen);
@@ -369,7 +369,7 @@ NS_NewByteInputStream(nsIInputStream** aStreamResult,
         rv = stream->ShareData(aStringToRead, aLength);
         break;
     case NS_ASSIGNMENT_ADOPT:
-        rv = stream->AdoptData(NS_CONST_CAST(char*, aStringToRead), aLength);
+        rv = stream->AdoptData(const_cast<char*>(aStringToRead), aLength);
         break;
     default:
         NS_ERROR("invalid assignment type");
diff --git a/mozilla/xpcom/io/nsUnicharInputStream.cpp b/mozilla/xpcom/io/nsUnicharInputStream.cpp
index 8f99e9642b2..61030cebe2a 100644
--- a/mozilla/xpcom/io/nsUnicharInputStream.cpp
+++ b/mozilla/xpcom/io/nsUnicharInputStream.cpp
@@ -301,8 +301,7 @@ UTF8InputStream::ReadString(PRUint32 aCount, nsAString& aString,
   if (readCount > aCount) {
     readCount = aCount;
   }
-  const PRUnichar* buf = NS_REINTERPRET_CAST(const PRUnichar*, 
-                                             mUnicharData->GetBuffer() +
+  const PRUnichar* buf = reinterpret_cast<const PRUnichar*>(mUnicharData->GetBuffer() +
                                              mUnicharDataOffset);
   aString.Assign(buf, readCount);
 
@@ -455,7 +454,7 @@ nsSimpleUnicharStreamFactory::CreateInstanceFromUTF8Stream(nsIInputStream* aStre
 nsSimpleUnicharStreamFactory*
 nsSimpleUnicharStreamFactory::GetInstance()
 {
-  return NS_CONST_CAST(nsSimpleUnicharStreamFactory*, &kInstance);
+  return const_cast<nsSimpleUnicharStreamFactory*>(&kInstance);
 }
 
 const nsSimpleUnicharStreamFactory
diff --git a/mozilla/xpcom/obsolete/component/nsRegistry.cpp b/mozilla/xpcom/obsolete/component/nsRegistry.cpp
index ce1dd74b7f1..8ed867f288c 100644
--- a/mozilla/xpcom/obsolete/component/nsRegistry.cpp
+++ b/mozilla/xpcom/obsolete/component/nsRegistry.cpp
@@ -444,7 +444,7 @@ NS_IMETHODIMP nsRegistry::Open( nsIFile *regFile ) {
 
     // Open specified registry.
     PR_Lock(mregLock);
-    err = NR_RegOpen(NS_CONST_CAST(char*,regPath.get()), &mReg);
+    err = NR_RegOpen(const_cast<char*>(regPath.get()), &mReg);
     PR_Unlock(mregLock);
 
     mCurRegID = nsIRegistry::ApplicationCustomRegistry;
@@ -572,7 +572,7 @@ NS_IMETHODIMP nsRegistry::OpenWellKnownRegistry( nsWellKnownRegistry regid )
 #endif /* DEBUG_dp */
 
     PR_Lock(mregLock);
-    err = NR_RegOpen(NS_CONST_CAST(char*, regFile.get()), &mReg );
+    err = NR_RegOpen(const_cast<char*>(regFile.get()), &mReg );
     PR_Unlock(mregLock);
 
     // Store the registry that was opened for optimizing future opens.
@@ -832,7 +832,7 @@ NS_IMETHODIMP nsRegistry::GetBytesUTF8( nsRegistryKey baseKey, const char *path,
             // Attempt to get string into our fixed buffer
             PR_Lock(mregLock);
             uint32 length2 = sizeof regStr;
-            err = NR_RegGetEntry( mReg,(RKEY)baseKey,NS_CONST_CAST(char*,path), regStr, &length2);
+            err = NR_RegGetEntry( mReg,(RKEY)baseKey,const_cast<char*>(path), regStr, &length2);
             PR_Unlock(mregLock);
 
             if ( err == REGERR_OK )
@@ -856,13 +856,13 @@ NS_IMETHODIMP nsRegistry::GetBytesUTF8( nsRegistryKey baseKey, const char *path,
                 // See if that worked.
                 if( rv == NS_OK ) 
                 {
-                    *result = NS_REINTERPRET_CAST(PRUint8*,nsMemory::Alloc( *length ));
+                    *result = reinterpret_cast<PRUint8*>(nsMemory::Alloc( *length ));
                     if( *result ) 
                     {
                         // Get bytes from registry into result field.
                         PR_Lock(mregLock);
                         length2 = *length;
-                        err = NR_RegGetEntry( mReg,(RKEY)baseKey,NS_CONST_CAST(char*,path), *result, &length2);
+                        err = NR_RegGetEntry( mReg,(RKEY)baseKey,const_cast<char*>(path), *result, &length2);
                         *length = length2;
                         PR_Unlock(mregLock);
                         // Convert status.
@@ -870,7 +870,7 @@ NS_IMETHODIMP nsRegistry::GetBytesUTF8( nsRegistryKey baseKey, const char *path,
                         if ( rv != NS_OK )
                         {
                             // Didn't get result, free buffer
-                            nsCRT::free( NS_REINTERPRET_CAST(char*, *result) );
+                            nsCRT::free( reinterpret_cast<char*>(*result) );
                             *result = 0;
                             *length = 0;
                         }
@@ -909,7 +909,7 @@ nsRegistry::GetBytesUTF8IntoBuffer( nsRegistryKey baseKey, const char *path,
 
     // Attempt to get bytes into our fixed buffer
     PR_Lock(mregLock);
-    err = NR_RegGetEntry( mReg,(RKEY)baseKey,NS_CONST_CAST(char*,path),
+    err = NR_RegGetEntry( mReg,(RKEY)baseKey,const_cast<char*>(path),
                           buf, (uint32 *)length );
     PR_Unlock(mregLock);
 
diff --git a/mozilla/xpcom/proxy/src/nsProxyEvent.cpp b/mozilla/xpcom/proxy/src/nsProxyEvent.cpp
index 9fbc309cd7a..5fa94bed182 100644
--- a/mozilla/xpcom/proxy/src/nsProxyEvent.cpp
+++ b/mozilla/xpcom/proxy/src/nsProxyEvent.cpp
@@ -390,7 +390,7 @@ nsProxyObject::QueryInterface(REFNSIID aIID, void **aResult)
     }
 
     if (aIID.Equals(NS_GET_IID(nsISupports))) {
-        *aResult = NS_STATIC_CAST(nsISupports*, this);
+        *aResult = static_cast<nsISupports*>(this);
         AddRef();
         return NS_OK;
     }
@@ -413,7 +413,7 @@ nsProxyObject::LockedFind(REFNSIID aIID, void **aResult)
 
     for (peo = mFirst; peo; peo = peo->mNext) {
         if (peo->GetClass()->GetProxiedIID().Equals(aIID)) {
-            *aResult = NS_STATIC_CAST(nsISupports*, peo->mXPTCStub);
+            *aResult = static_cast<nsISupports*>(peo->mXPTCStub);
             peo->AddRef();
             return NS_OK;
         }
@@ -446,7 +446,7 @@ nsProxyObject::LockedFind(REFNSIID aIID, void **aResult)
 
     NS_ADDREF(peo);
 
-    *aResult = NS_STATIC_CAST(nsISupports*, peo->mXPTCStub);
+    *aResult = static_cast<nsISupports*>(peo->mXPTCStub);
     return NS_OK;
 }
 
diff --git a/mozilla/xpcom/proxy/src/nsProxyEventObject.cpp b/mozilla/xpcom/proxy/src/nsProxyEventObject.cpp
index 69981ded313..3933c830457 100644
--- a/mozilla/xpcom/proxy/src/nsProxyEventObject.cpp
+++ b/mozilla/xpcom/proxy/src/nsProxyEventObject.cpp
@@ -113,7 +113,7 @@ nsProxyEventObject::QueryInterface(REFNSIID aIID, void** aInstancePtr)
 {
     if( aIID.Equals(GetClass()->GetProxiedIID()) )
     {
-        *aInstancePtr = NS_STATIC_CAST(nsISupports*, mXPTCStub);
+        *aInstancePtr = static_cast<nsISupports*>(mXPTCStub);
         NS_ADDREF_THIS();
         return NS_OK;
     }
diff --git a/mozilla/xpcom/reflect/xptcall/src/xptcall.cpp b/mozilla/xpcom/reflect/xptcall/src/xptcall.cpp
index 0d08ecedbff..08fef70b19f 100644
--- a/mozilla/xpcom/reflect/xptcall/src/xptcall.cpp
+++ b/mozilla/xpcom/reflect/xptcall/src/xptcall.cpp
@@ -46,7 +46,7 @@ nsXPTCStubBase::QueryInterface(REFNSIID aIID,
 {
     if (aIID.Equals(mEntry->mIID)) {
         NS_ADDREF_THIS();
-        *aInstancePtr = NS_STATIC_CAST(nsISupports*, this);
+        *aInstancePtr = static_cast<nsISupports*>(this);
         return NS_OK;
     }
 
@@ -90,6 +90,6 @@ NS_GetXPTCallStub(REFNSIID aIID, nsIXPTCProxy* aOuter,
 EXPORT_XPCOM_API(void)
 NS_DestroyXPTCallStub(nsISomeInterface* aStub)
 {
-    nsXPTCStubBase* stub = NS_STATIC_CAST(nsXPTCStubBase*, aStub);
+    nsXPTCStubBase* stub = static_cast<nsXPTCStubBase*>(aStub);
     delete(stub);
 }
diff --git a/mozilla/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp b/mozilla/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp
index 224416a0529..92ebaef0761 100644
--- a/mozilla/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp
+++ b/mozilla/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp
@@ -1068,19 +1068,19 @@ FooBarImpl::QueryInterface(REFNSIID aIID, void** aInstancePtr)
 
 
   if (aIID.Equals(NS_GET_IID(nsIFoo))) {
-    *aInstancePtr = (void*) NS_STATIC_CAST(nsIFoo*,this);
+    *aInstancePtr = (void*) static_cast<nsIFoo*>(this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(NS_GET_IID(nsIBar))) {
-    *aInstancePtr = (void*) NS_STATIC_CAST(nsIBar*,this);
+    *aInstancePtr = (void*) static_cast<nsIBar*>(this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
 
   if (aIID.Equals(NS_GET_IID(nsISupports))) {
-    *aInstancePtr = (void*) NS_STATIC_CAST(nsISupports*,
-                                           NS_STATIC_CAST(nsIFoo*,this));
+    *aInstancePtr = (void*) static_cast<nsISupports*>
+                                       (static_cast<nsIFoo*>(this));
     NS_ADDREF_THIS();
     return NS_OK;
   }
@@ -1239,19 +1239,19 @@ FooBarImpl2::QueryInterface(REFNSIID aIID, void** aInstancePtr)
 
 
   if (aIID.Equals(NS_GET_IID(nsIFoo))) {
-    *aInstancePtr = (void*) NS_STATIC_CAST(nsIFoo2*,this);
+    *aInstancePtr = (void*) static_cast<nsIFoo2*>(this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(NS_GET_IID(nsIBar))) {
-    *aInstancePtr = (void*) NS_STATIC_CAST(nsIBar2*,this);
+    *aInstancePtr = (void*) static_cast<nsIBar2*>(this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
 
   if (aIID.Equals(NS_GET_IID(nsISupports))) {
-    *aInstancePtr = (void*) NS_STATIC_CAST(nsISupports*,
-                                           NS_STATIC_CAST(nsIFoo2*,this));
+    *aInstancePtr = (void*) static_cast<nsISupports*>
+                                       (static_cast<nsIFoo2*>(this));
     NS_ADDREF_THIS();
     return NS_OK;
   }
diff --git a/mozilla/xpcom/reflect/xptcall/tests/eVC4/TestXPTCInvokeInIDE.cpp b/mozilla/xpcom/reflect/xptcall/tests/eVC4/TestXPTCInvokeInIDE.cpp
index 744b24a0eb1..8694bf4c945 100755
--- a/mozilla/xpcom/reflect/xptcall/tests/eVC4/TestXPTCInvokeInIDE.cpp
+++ b/mozilla/xpcom/reflect/xptcall/tests/eVC4/TestXPTCInvokeInIDE.cpp
@@ -86,14 +86,13 @@ InvokeTestTarget::QueryInterface(REFNSIID aIID, void** aInstancePtr)
 
 
   if (aIID.Equals(kTheCID)) {
-    *aInstancePtr = (void*) NS_STATIC_CAST(InvokeTestTargetInterface*,this);
+    *aInstancePtr = (void*) static_cast<InvokeTestTargetInterface*>(this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
 
   if (aIID.Equals(NS_GET_IID(nsISupports))) {
-    *aInstancePtr = (void*) NS_STATIC_CAST(nsISupports*,
-                                           NS_STATIC_CAST(InvokeTestTargetInterface*,this));
+    *aInstancePtr = (void*) static_cast<nsISupports*>(static_cast<InvokeTestTargetInterface*>(this));
     NS_ADDREF_THIS();
     return NS_OK;
   }
@@ -1051,19 +1050,18 @@ FooBarImpl::QueryInterface(REFNSIID aIID, void** aInstancePtr)
 
 
   if (aIID.Equals(NS_GET_IID(nsIFoo))) {
-    *aInstancePtr = (void*) NS_STATIC_CAST(nsIFoo*,this);
+    *aInstancePtr = (void*) static_cast<nsIFoo*>(this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(NS_GET_IID(nsIBar))) {
-    *aInstancePtr = (void*) NS_STATIC_CAST(nsIBar*,this);
+    *aInstancePtr = (void*) static_cast<nsIBar*>(this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
 
   if (aIID.Equals(NS_GET_IID(nsISupports))) {
-    *aInstancePtr = (void*) NS_STATIC_CAST(nsISupports*,
-                                           NS_STATIC_CAST(nsIFoo*,this));
+    *aInstancePtr = (void*) static_cast<nsISupports*>(static_cast<nsIFoo*>(this));
     NS_ADDREF_THIS();
     return NS_OK;
   }
@@ -1222,19 +1220,18 @@ FooBarImpl2::QueryInterface(REFNSIID aIID, void** aInstancePtr)
 
 
   if (aIID.Equals(NS_GET_IID(nsIFoo))) {
-    *aInstancePtr = (void*) NS_STATIC_CAST(nsIFoo2*,this);
+    *aInstancePtr = (void*) static_cast<nsIFoo2*>(this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(NS_GET_IID(nsIBar))) {
-    *aInstancePtr = (void*) NS_STATIC_CAST(nsIBar2*,this);
+    *aInstancePtr = (void*) static_cast<nsIBar2*>(this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
 
   if (aIID.Equals(NS_GET_IID(nsISupports))) {
-    *aInstancePtr = (void*) NS_STATIC_CAST(nsISupports*,
-                                           NS_STATIC_CAST(nsIFoo2*,this));
+    *aInstancePtr = (void*) static_cast<nsISupports*>(static_cast<nsIFoo2*>(this));
     NS_ADDREF_THIS();
     return NS_OK;
   }
diff --git a/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp b/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp
index 69bf86df3ad..cfcc6bada1b 100644
--- a/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp
+++ b/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp
@@ -329,8 +329,8 @@ xptiInterfaceEntry::GetMethodInfo(uint16 index, const nsXPTMethodInfo** info)
     }
 
     // else...
-    *info = NS_REINTERPRET_CAST(nsXPTMethodInfo*,
-                                &mInterface->mDescriptor->
+    *info = reinterpret_cast<nsXPTMethodInfo*>
+                            (&mInterface->mDescriptor->
                                     method_descriptors[index - 
                                         mInterface->mMethodBaseIndex]);
     return NS_OK;
@@ -347,8 +347,8 @@ xptiInterfaceEntry::GetMethodInfoForName(const char* methodName, uint16 *index,
     for(uint16 i = 0; i < mInterface->mDescriptor->num_methods; ++i)
     {
         const nsXPTMethodInfo* info;
-        info = NS_REINTERPRET_CAST(nsXPTMethodInfo*,
-                                   &mInterface->mDescriptor->
+        info = reinterpret_cast<nsXPTMethodInfo*>
+                               (&mInterface->mDescriptor->
                                         method_descriptors[i]);
         if (PL_strcmp(methodName, info->GetName()) == 0) {
             *index = i + mInterface->mMethodBaseIndex;
@@ -386,8 +386,8 @@ xptiInterfaceEntry::GetConstant(uint16 index, const nsXPTConstant** constant)
 
     // else...
     *constant =
-        NS_REINTERPRET_CAST(nsXPTConstant*,
-                            &mInterface->mDescriptor->
+        reinterpret_cast<nsXPTConstant*>
+                        (&mInterface->mDescriptor->
                                 const_descriptors[index -
                                     mInterface->mConstantBaseIndex]);
     return NS_OK;
@@ -455,7 +455,7 @@ xptiInterfaceEntry::GetInfoForParam(uint16 methodIndex,
     if(NS_FAILED(rv))
         return rv;
 
-    *info = NS_STATIC_CAST(nsIInterfaceInfo*, theInfo);
+    *info = static_cast<nsIInterfaceInfo*>(theInfo);
     return NS_OK;
 }
 
diff --git a/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp b/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
index 92c17ec6a7b..c5aa80017f7 100644
--- a/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
+++ b/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
@@ -1720,7 +1720,7 @@ EntryToInfo(xptiInterfaceEntry* entry, nsIInterfaceInfo **_retval)
         return rv;
 
     // Transfer the AddRef done by GetInterfaceInfo.
-    *_retval = NS_STATIC_CAST(nsIInterfaceInfo*, info);
+    *_retval = static_cast<nsIInterfaceInfo*>(info);
     return NS_OK;    
 }
 
@@ -1983,7 +1983,7 @@ xptiAdditionalManagersEnumerator::xptiAdditionalManagersEnumerator()
 
 PRBool xptiAdditionalManagersEnumerator::AppendElement(nsIInterfaceInfoManager* element)
 {
-    if(!mArray.AppendElement(NS_STATIC_CAST(nsISupports*, element)))
+    if(!mArray.AppendElement(static_cast<nsISupports*>(element)))
         return PR_FALSE;
     mCount++;
     return PR_TRUE;
@@ -2016,8 +2016,8 @@ NS_IMETHODIMP xptiInterfaceInfoManager::AddAdditionalManager(nsIInterfaceInfoMan
 {
     nsCOMPtr<nsIWeakReference> weakRef = do_GetWeakReference(manager);
     nsISupports* ptrToAdd = weakRef ? 
-                    NS_STATIC_CAST(nsISupports*, weakRef) :
-                    NS_STATIC_CAST(nsISupports*, manager);
+                    static_cast<nsISupports*>(weakRef) :
+                    static_cast<nsISupports*>(manager);
     { // scoped lock...
         nsAutoLock lock(mAdditionalManagersLock);
         PRInt32 index;
@@ -2035,8 +2035,8 @@ NS_IMETHODIMP xptiInterfaceInfoManager::RemoveAdditionalManager(nsIInterfaceInfo
 {
     nsCOMPtr<nsIWeakReference> weakRef = do_GetWeakReference(manager);
     nsISupports* ptrToRemove = weakRef ? 
-                    NS_STATIC_CAST(nsISupports*, weakRef) :
-                    NS_STATIC_CAST(nsISupports*, manager);
+                    static_cast<nsISupports*>(weakRef) :
+                    static_cast<nsISupports*>(manager);
     { // scoped lock...
         nsAutoLock lock(mAdditionalManagersLock);
         if(!mAdditionalManagers.RemoveElement(ptrToRemove))
@@ -2101,7 +2101,7 @@ NS_IMETHODIMP xptiInterfaceInfoManager::EnumerateAdditionalManagers(nsISimpleEnu
             // an nsIInterfaceInfoManager into the array, so we can avoid an
             // extra QI here and just do a cast.
             if(!enumerator->AppendElement(
-                    NS_REINTERPRET_CAST(nsIInterfaceInfoManager*, raw.get())))
+                    reinterpret_cast<nsIInterfaceInfoManager*>(raw.get())))
                 return NS_ERROR_FAILURE;
         }
     }
diff --git a/mozilla/xpcom/string/public/nsCharTraits.h b/mozilla/xpcom/string/public/nsCharTraits.h
index a0d8bd0f698..09eca36d82a 100644
--- a/mozilla/xpcom/string/public/nsCharTraits.h
+++ b/mozilla/xpcom/string/public/nsCharTraits.h
@@ -170,7 +170,7 @@ struct nsCharTraits<PRUnichar>
     int_type
     to_int_type( char_type c )
       {
-        return int_type( NS_STATIC_CAST(unsigned_char_type, c) );
+        return int_type( static_cast<unsigned_char_type>(c) );
       }
 
     static
@@ -204,14 +204,14 @@ struct nsCharTraits<PRUnichar>
     char_type*
     move( char_type* s1, const char_type* s2, size_t n )
       {
-        return NS_STATIC_CAST(char_type*, memmove(s1, s2, n * sizeof(char_type)));
+        return static_cast<char_type*>(memmove(s1, s2, n * sizeof(char_type)));
       }
 
     static
     char_type*
     copy( char_type* s1, const char_type* s2, size_t n )
       {
-        return NS_STATIC_CAST(char_type*, memcpy(s1, s2, n * sizeof(char_type)));
+        return static_cast<char_type*>(memcpy(s1, s2, n * sizeof(char_type)));
       }
 
     static
@@ -230,7 +230,7 @@ struct nsCharTraits<PRUnichar>
     assign( char_type* s, size_t n, char_type c )
       {
 #ifdef USE_CPP_WCHAR_FUNCS
-        return NS_STATIC_CAST(char_type*, wmemset(s, to_int_type(c), n));
+        return static_cast<char_type*>(wmemset(s, to_int_type(c), n));
 #else
         char_type* result = s;
         while ( n-- )
@@ -377,7 +377,7 @@ struct nsCharTraits<PRUnichar>
     find( const char_type* s, size_t n, char_type c )
       {
 #ifdef USE_CPP_WCHAR_FUNCS
-        return NS_REINTERPRET_CAST(const char_type*, wmemchr(s, to_int_type(c), n));
+        return reinterpret_cast<const char_type*>(wmemchr(s, to_int_type(c), n));
 #else
         while ( n-- )
           {
@@ -451,7 +451,7 @@ struct nsCharTraits<char>
     int_type
     to_int_type( char_type c )
       {
-        return int_type( NS_STATIC_CAST(unsigned_char_type, c) );
+        return int_type( static_cast<unsigned_char_type>(c) );
       }
 
     static
@@ -485,14 +485,14 @@ struct nsCharTraits<char>
     char_type*
     move( char_type* s1, const char_type* s2, size_t n )
       {
-        return NS_STATIC_CAST(char_type*, memmove(s1, s2, n * sizeof(char_type)));
+        return static_cast<char_type*>(memmove(s1, s2, n * sizeof(char_type)));
       }
 
     static
     char_type*
     copy( char_type* s1, const char_type* s2, size_t n )
       {
-        return NS_STATIC_CAST(char_type*, memcpy(s1, s2, n * sizeof(char_type)));
+        return static_cast<char_type*>(memcpy(s1, s2, n * sizeof(char_type)));
       }
 
     static
@@ -506,7 +506,7 @@ struct nsCharTraits<char>
     char_type*
     assign( char_type* s, size_t n, char_type c )
       {
-        return NS_STATIC_CAST(char_type*, memset(s, to_int_type(c), n));
+        return static_cast<char_type*>(memset(s, to_int_type(c), n));
       }
 
     static
@@ -615,7 +615,7 @@ struct nsCharTraits<char>
     const char_type*
     find( const char_type* s, size_t n, char_type c )
       {
-        return NS_REINTERPRET_CAST(const char_type*, memchr(s, to_int_type(c), n));
+        return reinterpret_cast<const char_type*>(memchr(s, to_int_type(c), n));
       }
 
 #if 0
diff --git a/mozilla/xpcom/string/public/nsLiteralString.h b/mozilla/xpcom/string/public/nsLiteralString.h
index ba536297a28..d504a02b2d8 100644
--- a/mozilla/xpcom/string/public/nsLiteralString.h
+++ b/mozilla/xpcom/string/public/nsLiteralString.h
@@ -80,9 +80,9 @@ literal_string( const nsACString::char_type* aPtr, PRUint32 aLength )
 
 #ifdef HAVE_CPP_2BYTE_WCHAR_T
   #define NS_LL(s)                                L##s
-  #define NS_MULTILINE_LITERAL_STRING(s)          nsDependentString(NS_REINTERPRET_CAST(const nsAString::char_type*, s), PRUint32((sizeof(s)/sizeof(wchar_t))-1))
-  #define NS_MULTILINE_LITERAL_STRING_INIT(n,s)   n(NS_REINTERPRET_CAST(const nsAString::char_type*, s), PRUint32((sizeof(s)/sizeof(wchar_t))-1))
-  #define NS_NAMED_MULTILINE_LITERAL_STRING(n,s)  const nsDependentString n(NS_REINTERPRET_CAST(const nsAString::char_type*, s), PRUint32((sizeof(s)/sizeof(wchar_t))-1))
+  #define NS_MULTILINE_LITERAL_STRING(s)          nsDependentString(reinterpret_cast<const nsAString::char_type*>(s), PRUint32((sizeof(s)/sizeof(wchar_t))-1))
+  #define NS_MULTILINE_LITERAL_STRING_INIT(n,s)   n(reinterpret_cast<const nsAString::char_type*>(s), PRUint32((sizeof(s)/sizeof(wchar_t))-1))
+  #define NS_NAMED_MULTILINE_LITERAL_STRING(n,s)  const nsDependentString n(reinterpret_cast<const nsAString::char_type*>(s), PRUint32((sizeof(s)/sizeof(wchar_t))-1))
   typedef nsDependentString nsLiteralString;
 #else
   #define NS_LL(s)                                s
@@ -103,11 +103,11 @@ literal_string( const nsACString::char_type* aPtr, PRUint32 aLength )
 
 #define NS_L(s)                                   NS_LL(s)
 
-#define NS_LITERAL_STRING(s)                      NS_STATIC_CAST(const nsAFlatString&, NS_MULTILINE_LITERAL_STRING(NS_LL(s)))
+#define NS_LITERAL_STRING(s)                      static_cast<const nsAFlatString&>(NS_MULTILINE_LITERAL_STRING(NS_LL(s)))
 #define NS_LITERAL_STRING_INIT(n,s)               NS_MULTILINE_LITERAL_STRING_INIT(n, NS_LL(s))
 #define NS_NAMED_LITERAL_STRING(n,s)              NS_NAMED_MULTILINE_LITERAL_STRING(n, NS_LL(s))
 
-#define NS_LITERAL_CSTRING(s)                     NS_STATIC_CAST(const nsDependentCString&, nsDependentCString(s, PRUint32(sizeof(s)-1)))
+#define NS_LITERAL_CSTRING(s)                     static_cast<const nsDependentCString&>(nsDependentCString(s, PRUint32(sizeof(s)-1)))
 #define NS_LITERAL_CSTRING_INIT(n,s)              n(s, PRUint32(sizeof(s)-1))
 #define NS_NAMED_LITERAL_CSTRING(n,s)             const nsDependentCString n(s, PRUint32(sizeof(s)-1))
 
diff --git a/mozilla/xpcom/string/public/nsTAString.h b/mozilla/xpcom/string/public/nsTAString.h
index 6da898e97a0..9952437340c 100644
--- a/mozilla/xpcom/string/public/nsTAString.h
+++ b/mozilla/xpcom/string/public/nsTAString.h
@@ -593,22 +593,22 @@ class nsTAString_CharT
 
       const obsolete_string_type* AsObsoleteString() const
         {
-          return NS_REINTERPRET_CAST(const obsolete_string_type*, this);
+          return reinterpret_cast<const obsolete_string_type*>(this);
         }
 
       obsolete_string_type* AsObsoleteString()
         {
-          return NS_REINTERPRET_CAST(obsolete_string_type*, this);
+          return reinterpret_cast<obsolete_string_type*>(this);
         }
 
       const substring_type* AsSubstring() const
         {
-          return NS_REINTERPRET_CAST(const substring_type*, this);
+          return reinterpret_cast<const substring_type*>(this);
         }
 
       substring_type* AsSubstring()
         {
-          return NS_REINTERPRET_CAST(substring_type*, this);
+          return reinterpret_cast<substring_type*>(this);
         }
 
     private:
diff --git a/mozilla/xpcom/string/public/nsTDependentString.h b/mozilla/xpcom/string/public/nsTDependentString.h
index 3b83b1c810b..7789988692e 100644
--- a/mozilla/xpcom/string/public/nsTDependentString.h
+++ b/mozilla/xpcom/string/public/nsTDependentString.h
@@ -73,27 +73,27 @@ class nsTDependentString_CharT : public nsTString_CharT
          */
 
       nsTDependentString_CharT( const char_type* start, const char_type* end )
-        : string_type(NS_CONST_CAST(char_type*, start), end - start, F_TERMINATED)
+        : string_type(const_cast<char_type*>(start), end - start, F_TERMINATED)
         {
           AssertValid();
         }
 
       nsTDependentString_CharT( const char_type* data, PRUint32 length )
-        : string_type(NS_CONST_CAST(char_type*, data), length, F_TERMINATED)
+        : string_type(const_cast<char_type*>(data), length, F_TERMINATED)
         {
           AssertValid();
         }
 
       explicit
       nsTDependentString_CharT( const char_type* data )
-        : string_type(NS_CONST_CAST(char_type*, data), char_traits::length(data), F_TERMINATED)
+        : string_type(const_cast<char_type*>(data), char_traits::length(data), F_TERMINATED)
         {
           AssertValid();
         }
 
       explicit
       nsTDependentString_CharT( const substring_type& str )
-        : string_type(NS_CONST_CAST(char_type*, str.Data()), str.Length(), F_TERMINATED)
+        : string_type(const_cast<char_type*>(str.Data()), str.Length(), F_TERMINATED)
         {
           AssertValid();
         }
diff --git a/mozilla/xpcom/string/public/nsTDependentSubstring.h b/mozilla/xpcom/string/public/nsTDependentSubstring.h
index 57d62f737f3..1a3f136e521 100644
--- a/mozilla/xpcom/string/public/nsTDependentSubstring.h
+++ b/mozilla/xpcom/string/public/nsTDependentSubstring.h
@@ -71,10 +71,10 @@ class nsTDependentSubstring_CharT : public nsTSubstring_CharT
         }
 
       nsTDependentSubstring_CharT( const char_type* start, const char_type* end )
-        : substring_type(NS_CONST_CAST(char_type*, start), end - start, F_NONE) {}
+        : substring_type(const_cast<char_type*>(start), end - start, F_NONE) {}
 
       nsTDependentSubstring_CharT( const const_iterator& start, const const_iterator& end )
-        : substring_type(NS_CONST_CAST(char_type*, start.get()), end.get() - start.get(), F_NONE) {}
+        : substring_type(const_cast<char_type*>(start.get()), end.get() - start.get(), F_NONE) {}
 
       // Create a nsTDependentSubstring to be bound later
       nsTDependentSubstring_CharT()
diff --git a/mozilla/xpcom/string/public/nsTString.h b/mozilla/xpcom/string/public/nsTString.h
index c964ee8465a..7ce960d55e0 100644
--- a/mozilla/xpcom/string/public/nsTString.h
+++ b/mozilla/xpcom/string/public/nsTString.h
@@ -579,11 +579,11 @@ class nsTXPIDLString_CharT : public nsTString_CharT
     public:
 
       nsTXPIDLString_CharT()
-        : string_type(NS_CONST_CAST(char_type*, char_traits::sEmptyBuffer), 0, F_TERMINATED | F_VOIDED) {}
+        : string_type(const_cast<char_type*>(char_traits::sEmptyBuffer), 0, F_TERMINATED | F_VOIDED) {}
 
         // copy-constructor required to avoid default
       nsTXPIDLString_CharT( const self_type& str )
-        : string_type(NS_CONST_CAST(char_type*, char_traits::sEmptyBuffer), 0, F_TERMINATED | F_VOIDED)
+        : string_type(const_cast<char_type*>(char_traits::sEmptyBuffer), 0, F_TERMINATED | F_VOIDED)
         {
           Assign(str);
         }
diff --git a/mozilla/xpcom/string/public/nsTSubstring.h b/mozilla/xpcom/string/public/nsTSubstring.h
index b03394705e0..808b74ac22c 100644
--- a/mozilla/xpcom/string/public/nsTSubstring.h
+++ b/mozilla/xpcom/string/public/nsTSubstring.h
@@ -522,9 +522,9 @@ class nsTSubstring_CharT : public nsTAString_CharT
       nsTSubstring_CharT()
 #ifdef MOZ_V1_STRING_ABI
         : abstract_string_type(
-              NS_CONST_CAST(char_type*, char_traits::sEmptyBuffer), 0, F_TERMINATED) {}
+              const_cast<char_type*>(char_traits::sEmptyBuffer), 0, F_TERMINATED) {}
 #else
-        : mData(NS_CONST_CAST(char_type*, char_traits::sEmptyBuffer)),
+        : mData(const_cast<char_type*>(char_traits::sEmptyBuffer)),
           mLength(0),
           mFlags(F_TERMINATED) {}
 #endif
diff --git a/mozilla/xpcom/string/src/nsReadableUtils.cpp b/mozilla/xpcom/string/src/nsReadableUtils.cpp
index 5f0e6859518..6583c08b598 100755
--- a/mozilla/xpcom/string/src/nsReadableUtils.cpp
+++ b/mozilla/xpcom/string/src/nsReadableUtils.cpp
@@ -332,7 +332,7 @@ inline
 ToCharT*
 AllocateStringCopy( const FromStringT& aSource, ToCharT* )
   {
-    return NS_STATIC_CAST(ToCharT*, nsMemory::Alloc((aSource.Length()+1) * sizeof(ToCharT)));
+    return static_cast<ToCharT*>(nsMemory::Alloc((aSource.Length()+1) * sizeof(ToCharT)));
   }
 
 
@@ -362,8 +362,8 @@ ToNewUTF8String( const nsAString& aSource, PRUint32 *aUTF8Count )
     if (aUTF8Count)
       *aUTF8Count = calculator.Size();
 
-    char *result = NS_STATIC_CAST(char*,
-        nsMemory::Alloc(calculator.Size() + 1));
+    char *result = static_cast<char*>
+                              (nsMemory::Alloc(calculator.Size() + 1));
     if (!result)
       return nsnull;
 
@@ -433,8 +433,8 @@ UTF8ToNewUnicode( const nsACString& aSource, PRUint32 *aUTF16Count )
     if (aUTF16Count)
       *aUTF16Count = calculator.Length();
 
-    PRUnichar *result = NS_STATIC_CAST(PRUnichar*,
-        nsMemory::Alloc(sizeof(PRUnichar) * (calculator.Length() + 1)));
+    PRUnichar *result = static_cast<PRUnichar*>
+                                   (nsMemory::Alloc(sizeof(PRUnichar) * (calculator.Length() + 1)));
     if (!result)
       return nsnull;
 
@@ -657,7 +657,7 @@ class ConvertToUpperCase
       PRUint32
       write( const char* aSource, PRUint32 aSourceLength )
         {
-          char* cp = NS_CONST_CAST(char*,aSource);
+          char* cp = const_cast<char*>(aSource);
           const char* end = aSource + aSourceLength;
           while (cp != end) {
             char ch = *cp;
@@ -749,7 +749,7 @@ class ConvertToLowerCase
       PRUint32
       write( const char* aSource, PRUint32 aSourceLength )
         {
-          char* cp = NS_CONST_CAST(char*,aSource);
+          char* cp = const_cast<char*>(aSource);
           const char* end = aSource + aSourceLength;
           while (cp != end) {
             char ch = *cp;
diff --git a/mozilla/xpcom/string/src/nsSubstring.cpp b/mozilla/xpcom/string/src/nsSubstring.cpp
index d4b74ed757f..06f5bddf2b8 100644
--- a/mozilla/xpcom/string/src/nsSubstring.cpp
+++ b/mozilla/xpcom/string/src/nsSubstring.cpp
@@ -247,7 +247,7 @@ nsStringBuffer*
 nsStringBuffer::FromString(const nsAString& str)
   {
     const nsAStringAccessor* accessor =
-        NS_STATIC_CAST(const nsAStringAccessor*, &str);
+        static_cast<const nsAStringAccessor*>(&str);
 
 #ifdef MOZ_V1_STRING_ABI
     if (accessor->vtable() != nsObsoleteAString::sCanonicalVTable)
@@ -263,7 +263,7 @@ nsStringBuffer*
 nsStringBuffer::FromString(const nsACString& str)
   {
     const nsACStringAccessor* accessor =
-        NS_STATIC_CAST(const nsACStringAccessor*, &str);
+        static_cast<const nsACStringAccessor*>(&str);
 
 #ifdef MOZ_V1_STRING_ABI
     if (accessor->vtable() != nsObsoleteACString::sCanonicalVTable)
@@ -278,9 +278,9 @@ nsStringBuffer::FromString(const nsACString& str)
 void
 nsStringBuffer::ToString(PRUint32 len, nsAString &str)
   {
-    PRUnichar* data = NS_STATIC_CAST(PRUnichar*, Data());
+    PRUnichar* data = static_cast<PRUnichar*>(Data());
 
-    nsAStringAccessor* accessor = NS_STATIC_CAST(nsAStringAccessor*, &str);
+    nsAStringAccessor* accessor = static_cast<nsAStringAccessor*>(&str);
 #ifdef MOZ_V1_STRING_ABI
     if (accessor->vtable() != nsObsoleteAString::sCanonicalVTable)
       {
@@ -301,9 +301,9 @@ nsStringBuffer::ToString(PRUint32 len, nsAString &str)
 void
 nsStringBuffer::ToString(PRUint32 len, nsACString &str)
   {
-    char* data = NS_STATIC_CAST(char*, Data());
+    char* data = static_cast<char*>(Data());
 
-    nsACStringAccessor* accessor = NS_STATIC_CAST(nsACStringAccessor*, &str);
+    nsACStringAccessor* accessor = static_cast<nsACStringAccessor*>(&str);
 #ifdef MOZ_V1_STRING_ABI
     if (accessor->vtable() != nsObsoleteACString::sCanonicalVTable)
       {
diff --git a/mozilla/xpcom/string/src/nsSubstringTuple.cpp b/mozilla/xpcom/string/src/nsSubstringTuple.cpp
index 590f0681f17..b58ff849ffd 100644
--- a/mozilla/xpcom/string/src/nsSubstringTuple.cpp
+++ b/mozilla/xpcom/string/src/nsSubstringTuple.cpp
@@ -42,9 +42,9 @@
   // convert fragment to |const string_base_type&|
 #define TO_SUBSTRING(_v)                                        \
     ( (ptrdiff_t(_v) & 0x1)                                     \
-        ? NS_REINTERPRET_CAST(const abstract_string_type*,      \
+        ? reinterpret_cast<const abstract_string_type*>(\
             ((unsigned long)_v & ~0x1))->ToSubstring()          \
-        : *NS_REINTERPRET_CAST(const substring_type*, (_v)) )
+        : *reinterpret_cast<const substring_type*>((_v)) )
 #endif
 
   // convert fragment to |const substring_type&|
diff --git a/mozilla/xpcom/string/src/nsTAString.cpp b/mozilla/xpcom/string/src/nsTAString.cpp
index 9bb826b8cb0..bcef4e801ca 100644
--- a/mozilla/xpcom/string/src/nsTAString.cpp
+++ b/mozilla/xpcom/string/src/nsTAString.cpp
@@ -520,5 +520,5 @@ nsTAString_CharT::ToSubstring() const
   {
     const char_type* data;
     size_type length = GetReadableBuffer(&data);
-    return substring_type(NS_CONST_CAST(char_type*, data), length, 0);
+    return substring_type(const_cast<char_type*>(data), length, 0);
   }
diff --git a/mozilla/xpcom/string/src/nsTDependentString.cpp b/mozilla/xpcom/string/src/nsTDependentString.cpp
index ac5b83a4236..f1dd21cc926 100755
--- a/mozilla/xpcom/string/src/nsTDependentString.cpp
+++ b/mozilla/xpcom/string/src/nsTDependentString.cpp
@@ -43,7 +43,7 @@ nsTDependentString_CharT::Rebind( const char_type* data, size_type length )
     // If we currently own a buffer, release it.
     Finalize();
 
-    mData = NS_CONST_CAST(char_type*, data);
+    mData = const_cast<char_type*>(data);
     mLength = length;
     SetDataFlags(F_TERMINATED);
     AssertValid();
diff --git a/mozilla/xpcom/string/src/nsTDependentSubstring.cpp b/mozilla/xpcom/string/src/nsTDependentSubstring.cpp
index 978848815e3..489225df22a 100644
--- a/mozilla/xpcom/string/src/nsTDependentSubstring.cpp
+++ b/mozilla/xpcom/string/src/nsTDependentSubstring.cpp
@@ -66,7 +66,7 @@ nsTDependentSubstring_CharT::Rebind( const substring_type& str, PRUint32 startPo
     if (startPos > strLength)
       startPos = strLength;
 
-    mData = NS_CONST_CAST(char_type*, str.Data()) + startPos;
+    mData = const_cast<char_type*>(str.Data()) + startPos;
     mLength = NS_MIN(length, strLength - startPos);
 
     SetDataFlags(F_NONE);
@@ -80,7 +80,7 @@ nsTDependentSubstring_CharT::Rebind( const char_type* start, const char_type* en
     // If we currently own a buffer, release it.
     Finalize();
 
-    mData = NS_CONST_CAST(char_type*, start);
+    mData = const_cast<char_type*>(start);
     mLength = end - start;
     SetDataFlags(F_NONE);
   }
diff --git a/mozilla/xpcom/string/src/nsTObsoleteAStringThunk.cpp b/mozilla/xpcom/string/src/nsTObsoleteAStringThunk.cpp
index 3d1590a8d29..ab18296ff5e 100644
--- a/mozilla/xpcom/string/src/nsTObsoleteAStringThunk.cpp
+++ b/mozilla/xpcom/string/src/nsTObsoleteAStringThunk.cpp
@@ -60,8 +60,8 @@ class nsTObsoleteAStringThunk_CharT : public nsTObsoleteAString_CharT
          * we are a nsTSubstring in disguise!
          */
 
-            substring_type* concrete_self()       { return NS_REINTERPRET_CAST(      substring_type*, this); }
-      const substring_type* concrete_self() const { return NS_REINTERPRET_CAST(const substring_type*, this); }
+            substring_type* concrete_self()       { return reinterpret_cast<substring_type*>(this); }
+      const substring_type* concrete_self() const { return reinterpret_cast<const substring_type*>(this); }
 
 
         /**
diff --git a/mozilla/xpcom/string/src/nsTPromiseFlatString.cpp b/mozilla/xpcom/string/src/nsTPromiseFlatString.cpp
index 164f45fa1df..fe629cdb4c9 100644
--- a/mozilla/xpcom/string/src/nsTPromiseFlatString.cpp
+++ b/mozilla/xpcom/string/src/nsTPromiseFlatString.cpp
@@ -47,7 +47,7 @@ nsTPromiseFlatString_CharT::Init(const substring_type& str)
 
     if (str.IsTerminated())
       {
-        mData = NS_CONST_CAST(char_type*, str.Data());
+        mData = const_cast<char_type*>(str.Data());
         mLength = str.Length();
         mFlags = F_TERMINATED; // does not promote F_VOIDED
       }
diff --git a/mozilla/xpcom/string/src/nsTString.cpp b/mozilla/xpcom/string/src/nsTString.cpp
index 585a78aa85d..0bbf3b54ff2 100644
--- a/mozilla/xpcom/string/src/nsTString.cpp
+++ b/mozilla/xpcom/string/src/nsTString.cpp
@@ -42,7 +42,7 @@ nsTAdoptingString_CharT::operator=( const self_type& str )
   {
     // This'll violate the constness of this argument, that's just
     // the nature of this class...
-    self_type* mutable_str = NS_CONST_CAST(self_type*, &str);
+    self_type* mutable_str = const_cast<self_type*>(&str);
 
     if (str.mFlags & F_OWNED)
       {
diff --git a/mozilla/xpcom/string/src/nsTSubstring.cpp b/mozilla/xpcom/string/src/nsTSubstring.cpp
index 9302fb708d5..de54e59f50e 100644
--- a/mozilla/xpcom/string/src/nsTSubstring.cpp
+++ b/mozilla/xpcom/string/src/nsTSubstring.cpp
@@ -60,7 +60,7 @@ nsTSubstring_CharT::nsTSubstring_CharT( char_type *data, size_type length,
 inline const nsTFixedString_CharT*
 AsFixedString( const nsTSubstring_CharT* s )
   {
-    return NS_STATIC_CAST(const nsTFixedString_CharT*, s);
+    return static_cast<const nsTFixedString_CharT*>(s);
   }
 
 
@@ -561,7 +561,7 @@ nsTSubstring_CharT::SetCapacity( size_type capacity )
     if (capacity == 0)
       {
         ::ReleaseData(mData, mFlags);
-        mData = NS_CONST_CAST(char_type*, char_traits::sEmptyBuffer);
+        mData = const_cast<char_type*>(char_traits::sEmptyBuffer);
         mLength = 0;
         SetDataFlags(F_TERMINATED);
       }
diff --git a/mozilla/xpcom/stub/nsOS2VACLegacy.cpp b/mozilla/xpcom/stub/nsOS2VACLegacy.cpp
index e899a0f47f1..8b608db25de 100644
--- a/mozilla/xpcom/stub/nsOS2VACLegacy.cpp
+++ b/mozilla/xpcom/stub/nsOS2VACLegacy.cpp
@@ -689,7 +689,7 @@ assign_from_helper__13nsCOMPtr_baseFRC15nsCOMPtr_helperRC4nsID	proc
 	mov	[ebp+0ch],edx;	helper
 	mov	[ebp+010h],ecx;	iid
 
-; 80 		if ( NS_FAILED( helper(iid, NS_REINTERPRET_CAST(void**, &newRawPtr)) ) )
+; 80 		if ( NS_FAILED( helper(iid, reinterpret_cast<void**>(&newRawPtr)) ) )
 	lea	ecx,[ebp-04h];	newRawPtr
 	mov	edx,[ebp+010h];	iid
 	mov	ebx,[ebp+0ch];	helper
@@ -723,7 +723,7 @@ void
 nsCOMPtr_base::assign_from_helper( const nsCOMPtr_helper& helper, const nsIID& iid )
 	{
 		nsISupports* newRawPtr;
-		if ( NS_FAILED( helper(iid, NS_REINTERPRET_CAST(void**, &newRawPtr)) ) )
+		if ( NS_FAILED( helper(iid, reinterpret_cast<void**>(&newRawPtr)) ) )
 			newRawPtr = 0;
     assign_assuming_AddRef(newRawPtr);
 	}
@@ -739,7 +739,7 @@ extern "C" void VFTCALL assign_from_helper__13nsCOMPtr_baseFRC15nsCOMPtr_helperR
     /* this may or may not be correct but the layout is the same. */
     obj_nsQueryInterface_nsCOMPtr_helper  * pHelper = (obj_nsQueryInterface_nsCOMPtr_helper*)helper;
 
-    /* if ( NS_FAILED( helper(iid, NS_REINTERPRET_CAST(void**, &newRawPtr)) ) ) */
+    /* if ( NS_FAILED( helper(iid, reinterpret_cast<void**>(&newRawPtr)) ) ) */
     status = pHelper->pVFT->__operator_paratheses((char*)pHelper + pHelper->pVFT->uDelta__operator_paratheses, 
                                                    iid, (void**)&newRawPtr);
     if (NS_FAILED(status))
diff --git a/mozilla/xpcom/tests/StringFactoringTests/nsStdStringWrapper.h b/mozilla/xpcom/tests/StringFactoringTests/nsStdStringWrapper.h
index 6e43b528ed3..06505f118d9 100644
--- a/mozilla/xpcom/tests/StringFactoringTests/nsStdStringWrapper.h
+++ b/mozilla/xpcom/tests/StringFactoringTests/nsStdStringWrapper.h
@@ -204,7 +204,7 @@ basic_nsStdStringWrapper<CharT, TraitsT, AllocatorT>::GetWritableFragment( nsWri
         case kFirstFragment:
         case kLastFragment:
         case kFragmentAt:
-          aFragment.mEnd = (aFragment.mStart = NS_CONST_CAST(CharT*, mRawString.data())) + mRawString.length();
+          aFragment.mEnd = (aFragment.mStart = const_cast<CharT*>(mRawString.data())) + mRawString.length();
           return aFragment.mStart + aOffset;
         
         case kPrevFragment:
@@ -221,7 +221,7 @@ basic_nsStdStringWrapper<CharT, TraitsT, AllocatorT>::do_AssignFromReadable( con
     typedef basic_nsStdStringWrapper<CharT, TraitsT, AllocatorT> this_t;
 
     if ( SameImplementation(*this, rhs) )
-      mRawString = NS_STATIC_CAST(this_t, rhs).mRawString;
+      mRawString = static_cast<this_t>(rhs).mRawString;
     else
       basic_nsAString<CharT>::do_AssignFromReadable(rhs);
   }
diff --git a/mozilla/xpcom/tests/StringFactoringTests/profile_main.cpp b/mozilla/xpcom/tests/StringFactoringTests/profile_main.cpp
index d7c14621839..63e47d0dc37 100644
--- a/mozilla/xpcom/tests/StringFactoringTests/profile_main.cpp
+++ b/mozilla/xpcom/tests/StringFactoringTests/profile_main.cpp
@@ -82,9 +82,9 @@ class TestTimer
           nsInt64 stopTime = GetTime();
 	        nsInt64 totalTime = stopTime - mStartTime;
 #ifdef HAVE_LONG_LONG
-          cout << setw(10) << NS_STATIC_CAST(PRInt64, totalTime) << " µs : ";
+          cout << setw(10) << static_cast<PRInt64>(totalTime) << " µs : ";
 #else
-          cout << setw(10) << NS_STATIC_CAST(PRInt32, totalTime) << "µs : ";
+          cout << setw(10) << static_cast<PRInt32>(totalTime) << "µs : ";
 #endif
         }
 
diff --git a/mozilla/xpcom/tests/TestAutoPtr.cpp b/mozilla/xpcom/tests/TestAutoPtr.cpp
index c48134a43a9..157048e7707 100644
--- a/mozilla/xpcom/tests/TestAutoPtr.cpp
+++ b/mozilla/xpcom/tests/TestAutoPtr.cpp
@@ -60,14 +60,14 @@ class TestObject : public TestObjectBaseA, public TestObjectBaseB {
         TestObject()
         {
             printf("  Creating TestObject %p.\n",
-                   NS_STATIC_CAST(void*, this));
+                   static_cast<void*>(this));
         }
 
         // Virtual dtor for deleting through base class pointer
         virtual ~TestObject()
         {
             printf("  Destroying TestObject %p.\n",
-                   NS_STATIC_CAST(void*, this));
+                   static_cast<void*>(this));
         }
 };
 
@@ -92,20 +92,20 @@ class TestRefObject : public TestRefObjectBaseA, public TestRefObjectBaseB {
             : mRefCount(0)
         {
             printf("  Creating TestRefObject %p.\n",
-                   NS_STATIC_CAST(void*, this));
+                   static_cast<void*>(this));
         }
 
         ~TestRefObject()
         {
             printf("  Destroying TestRefObject %p.\n",
-                   NS_STATIC_CAST(void*, this));
+                   static_cast<void*>(this));
         }
 
         nsrefcnt AddRef()
         {
             ++mRefCount;
             printf("  AddRef to %d on TestRefObject %p.\n",
-                   mRefCount, NS_STATIC_CAST(void*, this));
+                   mRefCount, static_cast<void*>(this));
             return mRefCount;
         }
 
@@ -113,9 +113,9 @@ class TestRefObject : public TestRefObjectBaseA, public TestRefObjectBaseB {
         {
             --mRefCount;
             printf("  Release to %d on TestRefObject %p.\n",
-                   mRefCount, NS_STATIC_CAST(void*, this));
+                   mRefCount, static_cast<void*>(this));
             if (mRefCount == 0) {
-                delete NS_CONST_CAST(TestRefObject*, this);
+                delete const_cast<TestRefObject*>(this);
                 return 0;
             }
             return mRefCount;
@@ -139,49 +139,49 @@ static void CreateTestRefObject(TestRefObject **aResult)
 static void DoSomethingWithTestObject(TestObject *aIn)
 {
     printf("  Doing something with |TestObject| %p.\n",
-           NS_STATIC_CAST(void*, aIn));
+           static_cast<void*>(aIn));
 }
 
 static void DoSomethingWithConstTestObject(const TestObject *aIn)
 {
     printf("  Doing something with |const TestObject| %p.\n",
-           NS_STATIC_CAST(const void*, aIn));
+           static_cast<const void*>(aIn));
 }
 
 static void DoSomethingWithTestRefObject(TestRefObject *aIn)
 {
     printf("  Doing something with |TestRefObject| %p.\n",
-           NS_STATIC_CAST(void*, aIn));
+           static_cast<void*>(aIn));
 }
 
 static void DoSomethingWithConstTestRefObject(const TestRefObject *aIn)
 {
     printf("  Doing something with |const TestRefObject| %p.\n",
-           NS_STATIC_CAST(const void*, aIn));
+           static_cast<const void*>(aIn));
 }
 
 static void DoSomethingWithTestObjectBaseB(TestObjectBaseB *aIn)
 {
     printf("  Doing something with |TestObjectBaseB| %p.\n",
-           NS_STATIC_CAST(void*, aIn));
+           static_cast<void*>(aIn));
 }
 
 static void DoSomethingWithConstTestObjectBaseB(const TestObjectBaseB *aIn)
 {
     printf("  Doing something with |const TestObjectBaseB| %p.\n",
-           NS_STATIC_CAST(const void*, aIn));
+           static_cast<const void*>(aIn));
 }
 
 static void DoSomethingWithTestRefObjectBaseB(TestRefObjectBaseB *aIn)
 {
     printf("  Doing something with |TestRefObjectBaseB| %p.\n",
-           NS_STATIC_CAST(void*, aIn));
+           static_cast<void*>(aIn));
 }
 
 static void DoSomethingWithConstTestRefObjectBaseB(const TestRefObjectBaseB *aIn)
 {
     printf("  Doing something with |const TestRefObjectBaseB| %p.\n",
-           NS_STATIC_CAST(const void*, aIn));
+           static_cast<const void*>(aIn));
 }
 
 int main()
@@ -344,7 +344,7 @@ int main()
         nsAutoPtr<TestObject> p1(new TestObject());
         TestObjectBaseB *p2 = p1;
         printf("equality %s.\n",
-               ((NS_STATIC_CAST(void*, p1) != NS_STATIC_CAST(void*, p2)) &&
+               ((static_cast<void*>(p1) != static_cast<void*>(p2)) &&
                 (p1 == p2) && !(p1 != p2) && (p2 == p1) && !(p2 != p1))
                ? "OK" : "broken");
     }
@@ -353,7 +353,7 @@ int main()
         TestObject *p1 = new TestObject();
         nsAutoPtr<TestObjectBaseB> p2(p1);
         printf("equality %s.\n",
-               ((NS_STATIC_CAST(void*, p1) != NS_STATIC_CAST(void*, p2)) &&
+               ((static_cast<void*>(p1) != static_cast<void*>(p2)) &&
                 (p1 == p2) && !(p1 != p2) && (p2 == p1) && !(p2 != p1))
                ? "OK" : "broken");
     }
@@ -363,7 +363,7 @@ int main()
         // nsCOMPtr requires a |get| for something like this as well
         nsRefPtr<TestRefObjectBaseB> p2 = p1.get();
         printf("equality %s.\n",
-               ((NS_STATIC_CAST(void*, p1) != NS_STATIC_CAST(void*, p2)) &&
+               ((static_cast<void*>(p1) != static_cast<void*>(p2)) &&
                 (p1 == p2) && !(p1 != p2) && (p2 == p1) && !(p2 != p1))
                ? "OK" : "broken");
     }
@@ -372,7 +372,7 @@ int main()
         nsRefPtr<TestRefObject> p1 = new TestRefObject();
         TestRefObjectBaseB *p2 = p1;
         printf("equality %s.\n",
-               ((NS_STATIC_CAST(void*, p1) != NS_STATIC_CAST(void*, p2)) &&
+               ((static_cast<void*>(p1) != static_cast<void*>(p2)) &&
                 (p1 == p2) && !(p1 != p2) && (p2 == p1) && !(p2 != p1))
                ? "OK" : "broken");
     }
@@ -381,7 +381,7 @@ int main()
         TestRefObject *p1 = new TestRefObject();
         nsRefPtr<TestRefObjectBaseB> p2 = p1;
         printf("equality %s.\n",
-               ((NS_STATIC_CAST(void*, p1) != NS_STATIC_CAST(void*, p2)) &&
+               ((static_cast<void*>(p1) != static_cast<void*>(p2)) &&
                 (p1 == p2) && !(p1 != p2) && (p2 == p1) && !(p2 != p1))
                ? "OK" : "broken");
     }
diff --git a/mozilla/xpcom/tests/TestCallTemplates.cpp b/mozilla/xpcom/tests/TestCallTemplates.cpp
index a851ba35d22..5dfa9f1c7e2 100644
--- a/mozilla/xpcom/tests/TestCallTemplates.cpp
+++ b/mozilla/xpcom/tests/TestCallTemplates.cpp
@@ -92,20 +92,20 @@ int main()
 
     /* Test CallQueryInterface */
 
-    nsISupports *mySupportsPtr = NS_REINTERPRET_CAST(nsISupports*, 0x1000);
+    nsISupports *mySupportsPtr = reinterpret_cast<nsISupports*>(0x1000);
 
     nsITestService *myITestService = nsnull;
     CallQueryInterface(mySupportsPtr, &myITestService);
 
     nsTestService *myTestService =
-        NS_REINTERPRET_CAST(nsTestService*, mySupportsPtr);
+        reinterpret_cast<nsTestService*>(mySupportsPtr);
     nsISupportsWeakReference *mySupportsWeakRef;
     CallQueryInterface(myTestService, &mySupportsWeakRef);
 
     /* Test CallQueryReferent */
 
     nsIWeakReference *myWeakRef =
-        NS_STATIC_CAST(nsIWeakReference*, mySupportsPtr);
+        static_cast<nsIWeakReference*>(mySupportsPtr);
     CallQueryReferent(myWeakRef, &myITestService);
 
     /* Test CallCreateInstance */
@@ -122,7 +122,7 @@ int main()
 
     /* Test CallGetInterface */
     nsIInterfaceRequestor *myInterfaceRequestor =
-        NS_STATIC_CAST(nsIInterfaceRequestor*, mySupportsPtr);
+        static_cast<nsIInterfaceRequestor*>(mySupportsPtr);
     CallGetInterface(myInterfaceRequestor, &myITestService);
 
     return 0;
diff --git a/mozilla/xpcom/tests/TestHashtables.cpp b/mozilla/xpcom/tests/TestHashtables.cpp
index c284cc21161..f701d5b2410 100644
--- a/mozilla/xpcom/tests/TestHashtables.cpp
+++ b/mozilla/xpcom/tests/TestHashtables.cpp
@@ -265,14 +265,14 @@ IFoo::IFoo()
   {
     ++total_constructions_;
     printf("  new IFoo@%p [#%d]\n",
-           NS_STATIC_CAST(void*, this), total_constructions_);
+           static_cast<void*>(this), total_constructions_);
   }
 
 IFoo::~IFoo()
   {
     ++total_destructions_;
     printf("IFoo@%p::~IFoo() [#%d]\n",
-           NS_STATIC_CAST(void*, this), total_destructions_);
+           static_cast<void*>(this), total_destructions_);
   }
 
 nsrefcnt
@@ -280,7 +280,7 @@ IFoo::AddRef()
   {
     ++refcount_;
     printf("IFoo@%p::AddRef(), refcount --> %d\n", 
-           NS_STATIC_CAST(void*, this), refcount_);
+           static_cast<void*>(this), refcount_);
     return refcount_;
   }
 
@@ -292,12 +292,12 @@ IFoo::Release()
       printf(">>");
 
     printf("IFoo@%p::Release(), refcount --> %d\n",
-           NS_STATIC_CAST(void*, this), refcount_);
+           static_cast<void*>(this), refcount_);
 
     if ( newcount == 0 )
       {
-        printf("  delete IFoo@%p\n", NS_STATIC_CAST(void*, this));
-        printf("<<IFoo@%p::Release()\n", NS_STATIC_CAST(void*, this));
+        printf("  delete IFoo@%p\n", static_cast<void*>(this));
+        printf("<<IFoo@%p::Release()\n", static_cast<void*>(this));
         delete this;
       }
 
@@ -307,7 +307,7 @@ IFoo::Release()
 nsresult
 IFoo::QueryInterface( const nsIID& aIID, void** aResult )
   {
-    printf("IFoo@%p::QueryInterface()\n", NS_STATIC_CAST(void*, this));
+    printf("IFoo@%p::QueryInterface()\n", static_cast<void*>(this));
     nsISupports* rawPtr = 0;
     nsresult status = NS_OK;
 
@@ -317,7 +317,7 @@ IFoo::QueryInterface( const nsIID& aIID, void** aResult )
       {
         nsID iid_of_ISupports = NS_ISUPPORTS_IID;
         if ( aIID.Equals(iid_of_ISupports) )
-          rawPtr = NS_STATIC_CAST(nsISupports*, this);
+          rawPtr = static_cast<nsISupports*>(this);
         else
           status = NS_ERROR_NO_INTERFACE;
       }
@@ -348,7 +348,7 @@ CreateIFoo( IFoo** result )
   {
     printf("    >>CreateIFoo() --> ");
     IFoo* foop = new IFoo();
-    printf("IFoo@%p\n", NS_STATIC_CAST(void*, foop));
+    printf("IFoo@%p\n", static_cast<void*>(foop));
 
     foop->AddRef();
     *result = foop;
diff --git a/mozilla/xpcom/tests/TestINIParser.cpp b/mozilla/xpcom/tests/TestINIParser.cpp
index 296cd3c3c5b..274a0f2fa40 100644
--- a/mozilla/xpcom/tests/TestINIParser.cpp
+++ b/mozilla/xpcom/tests/TestINIParser.cpp
@@ -52,7 +52,7 @@ StringCB(const char *aKey, const char *aValue, void* aClosure)
 static PRBool
 SectionCB(const char *aSection, void* aClosure)
 {
-  nsINIParser *ini = NS_REINTERPRET_CAST(nsINIParser*, aClosure);
+  nsINIParser *ini = reinterpret_cast<nsINIParser*>(aClosure);
 
   printf("[%s]\n", aSection);
 
diff --git a/mozilla/xpcom/tests/TestObserverService.cpp b/mozilla/xpcom/tests/TestObserverService.cpp
index a79d1ace039..7b9f5a770da 100644
--- a/mozilla/xpcom/tests/TestObserverService.cpp
+++ b/mozilla/xpcom/tests/TestObserverService.cpp
@@ -91,7 +91,7 @@ TestObserver::Observe( nsISupports     *aSubject,
     printString(mName);
     printf(" has observed something: subject@%p", (void*)aSubject);
     printf(" name=");
-    printString(NS_REINTERPRET_CAST(TestObserver*, NS_REINTERPRET_CAST(void*, aSubject))->mName);
+    printString(reinterpret_cast<TestObserver*>(reinterpret_cast<void*>(aSubject))->mName);
     printf(" aTopic=%s", topic.get());
     printf(" someData=");
     printString(data);
@@ -152,8 +152,8 @@ int main(int argc, char *argv[])
           {
               e->GetNext(getter_AddRefs(observer));
               printf("Calling observe on enumerated observer ");
-              printString(NS_REINTERPRET_CAST(TestObserver*,
-                                              NS_REINTERPRET_CAST(void*, observer.get()))->mName);
+              printString(reinterpret_cast<TestObserver*>
+                                          (reinterpret_cast<void*>(observer.get()))->mName);
               printf("...\n");
               rv = observer->Observe( observer, 
                                       topicA.get(), 
diff --git a/mozilla/xpcom/tests/TestPermanentAtoms.cpp b/mozilla/xpcom/tests/TestPermanentAtoms.cpp
index 09b0b2e9fea..0fd4d7cd511 100644
--- a/mozilla/xpcom/tests/TestPermanentAtoms.cpp
+++ b/mozilla/xpcom/tests/TestPermanentAtoms.cpp
@@ -52,13 +52,13 @@ static void Assert(PRBool aCondition, const char* aStatement)
 static void AssertString(nsIAtom *aAtom, const nsACString& aString)
 {
     const char *str;
-    NS_STATIC_CAST(AtomImpl*,aAtom)->GetUTF8String(&str);
+    static_cast<AtomImpl*>(aAtom)->GetUTF8String(&str);
     Assert(nsDependentCString(str) == aString, "string is correct");
 }
 
 static void AssertPermanence(nsIAtom *aAtom, PRBool aPermanence)
 {
-    Assert(NS_STATIC_CAST(AtomImpl*,aAtom)->IsPermanent() == aPermanence,
+    Assert(static_cast<AtomImpl*>(aAtom)->IsPermanent() == aPermanence,
            aPermanence ? "atom is permanent" : "atom is not permanent");
 }
 
diff --git a/mozilla/xpcom/tests/TestTArray.cpp b/mozilla/xpcom/tests/TestTArray.cpp
index 41442886aab..e19ca2deba4 100644
--- a/mozilla/xpcom/tests/TestTArray.cpp
+++ b/mozilla/xpcom/tests/TestTArray.cpp
@@ -140,7 +140,7 @@ static PRBool test_basic_array(ElementType *data,
 
   // These shouldn't crash!
   nsTArray<ElementType> empty;
-  ary.AppendElements(NS_REINTERPRET_CAST(ElementType *, 0), 0);
+  ary.AppendElements(reinterpret_cast<ElementType *>(0), 0);
   ary.AppendElements(empty);
 
   // See bug 324981
diff --git a/mozilla/xpcom/tests/TestVoidBTree.cpp b/mozilla/xpcom/tests/TestVoidBTree.cpp
index 956f179fdb1..efd9713e6f8 100644
--- a/mozilla/xpcom/tests/TestVoidBTree.cpp
+++ b/mozilla/xpcom/tests/TestVoidBTree.cpp
@@ -41,7 +41,7 @@
 #include "nsVoidArray.h"
 
 #define COUNT 1024
-#define POINTER(i) NS_REINTERPRET_CAST(void*, 4 + 4 * (i))
+#define POINTER(i) reinterpret_cast<void*>(4 + 4 * (i))
 
 static PRBool
 Equal(const nsVoidArray& aControl, const nsVoidBTree& aTest)
@@ -112,7 +112,7 @@ int main(int argc, char* argv[])
     //----------------------------------------
     // Tail fill
     for (i = 0; i < COUNT; ++i)
-        btree.InsertElementAt(NS_REINTERPRET_CAST(void*, POINTER(i)), i);
+        btree.InsertElementAt(reinterpret_cast<void*>(POINTER(i)), i);
 
     for (i = 0; i < COUNT; ++i) {
         if (btree[i] != POINTER(i)) {
diff --git a/mozilla/xpcom/threads/TimerThread.cpp b/mozilla/xpcom/threads/TimerThread.cpp
index 7dedd8aa759..70ee4b32872 100644
--- a/mozilla/xpcom/threads/TimerThread.cpp
+++ b/mozilla/xpcom/threads/TimerThread.cpp
@@ -76,7 +76,7 @@ TimerThread::~TimerThread()
 
   PRInt32 n = mTimers.Count();
   while (--n >= 0) {
-    nsTimerImpl *timer = NS_STATIC_CAST(nsTimerImpl *, mTimers[n]);
+    nsTimerImpl *timer = static_cast<nsTimerImpl *>(mTimers[n]);
     NS_RELEASE(timer);
   }
 }
@@ -169,7 +169,7 @@ nsresult TimerThread::Shutdown()
 
     nsTimerImpl *timer;
     for (PRInt32 i = mTimers.Count() - 1; i >= 0; i--) {
-      timer = NS_STATIC_CAST(nsTimerImpl*, mTimers[i]);
+      timer = static_cast<nsTimerImpl*>(mTimers[i]);
       RemoveTimerInternal(timer);
     }
   }
@@ -250,7 +250,7 @@ NS_IMETHODIMP TimerThread::Run()
       nsTimerImpl *timer = nsnull;
 
       if (mTimers.Count() > 0) {
-        timer = NS_STATIC_CAST(nsTimerImpl*, mTimers[0]);
+        timer = static_cast<nsTimerImpl*>(mTimers[0]);
 
         if (!TIMER_LESS_THAN(now, timer->mTimeout + mTimeoutAdjustment)) {
     next:
@@ -294,7 +294,7 @@ NS_IMETHODIMP TimerThread::Run()
       }
 
       if (mTimers.Count() > 0) {
-        timer = NS_STATIC_CAST(nsTimerImpl *, mTimers[0]);
+        timer = static_cast<nsTimerImpl *>(mTimers[0]);
 
         PRIntervalTime timeout = timer->mTimeout + mTimeoutAdjustment;
 
@@ -388,7 +388,7 @@ PRInt32 TimerThread::AddTimerInternal(nsTimerImpl *aTimer)
   PRInt32 count = mTimers.Count();
   PRInt32 i = 0;
   for (; i < count; i++) {
-    nsTimerImpl *timer = NS_STATIC_CAST(nsTimerImpl *, mTimers[i]);
+    nsTimerImpl *timer = static_cast<nsTimerImpl *>(mTimers[i]);
 
     // Don't break till we have skipped any overdue timers.  Do not include
     // mTimeoutAdjustment here, because we are really trying to avoid calling
@@ -433,7 +433,7 @@ void TimerThread::DoAfterSleep()
 {
   mSleeping = PR_TRUE; // wake may be notified without preceding sleep notification
   for (PRInt32 i = 0; i < mTimers.Count(); i ++) {
-    nsTimerImpl *timer = NS_STATIC_CAST(nsTimerImpl*, mTimers[i]);
+    nsTimerImpl *timer = static_cast<nsTimerImpl*>(mTimers[i]);
     // get and set the delay to cause its timeout to be recomputed
     PRUint32 delay;
     timer->GetDelay(&delay);
diff --git a/mozilla/xpcom/threads/nsEventQueue.h b/mozilla/xpcom/threads/nsEventQueue.h
index 4f019aa3345..7b89577416b 100644
--- a/mozilla/xpcom/threads/nsEventQueue.h
+++ b/mozilla/xpcom/threads/nsEventQueue.h
@@ -104,7 +104,7 @@ private:
   };
 
   static Page *NewPage() {
-    return NS_STATIC_CAST(Page *, calloc(1, sizeof(Page)));
+    return static_cast<Page *>(calloc(1, sizeof(Page)));
   }
 
   static void FreePage(Page *p) {
diff --git a/mozilla/xpcom/threads/nsProcessCommon.cpp b/mozilla/xpcom/threads/nsProcessCommon.cpp
index 57b0b271c14..21d45e1698e 100644
--- a/mozilla/xpcom/threads/nsProcessCommon.cpp
+++ b/mozilla/xpcom/threads/nsProcessCommon.cpp
@@ -229,7 +229,7 @@ nsProcess::Run(PRBool blocking, const char **args, PRUint32 count,
     // copy the args
     PRUint32 i;
     for (i=0; i < count; i++) {
-        my_argv[i+1] = NS_CONST_CAST(char*, args[i]);
+        my_argv[i+1] = const_cast<char*>(args[i]);
     }
     // we need to set argv[0] to the program name.
     my_argv[0] = mTargetPath.BeginWriting();
@@ -251,7 +251,7 @@ nsProcess::Run(PRBool blocking, const char **args, PRUint32 count,
     startupInfo.cb = sizeof(startupInfo);
 
     retVal = CreateProcess(NULL,
-                           // NS_CONST_CAST(char*, mTargetPath.get()),
+                           // const_cast<char*>(mTargetPath.get()),
                            cmdLine,
                            NULL,  /* security attributes for the new
                                    * process */
diff --git a/mozilla/xpcom/threads/nsThread.cpp b/mozilla/xpcom/threads/nsThread.cpp
index e208f925b5f..761f42a334b 100644
--- a/mozilla/xpcom/threads/nsThread.cpp
+++ b/mozilla/xpcom/threads/nsThread.cpp
@@ -135,7 +135,7 @@ NS_INTERFACE_MAP_BEGIN(nsThread)
   NS_INTERFACE_MAP_ENTRY(nsISupportsPriority)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIThread)
   if (aIID.Equals(NS_GET_IID(nsIClassInfo))) {
-    foundInterface = NS_STATIC_CAST(nsIClassInfo*, &sThreadClassInfo);
+    foundInterface = static_cast<nsIClassInfo*>(&sThreadClassInfo);
   } else
 NS_INTERFACE_MAP_END
 NS_IMPL_CI_INTERFACE_GETTER4(nsThread, nsIThread, nsIThreadInternal,
@@ -231,7 +231,7 @@ private:
 /*static*/ void
 nsThread::ThreadFunc(void *arg)
 {
-  nsThread *self = NS_STATIC_CAST(nsThread *, arg);  // strong reference
+  nsThread *self = static_cast<nsThread *>(arg);  // strong reference
   self->mThread = PR_GetCurrentThread();
 
   // Inform the ThreadManager
diff --git a/mozilla/xpcom/threads/nsThreadManager.cpp b/mozilla/xpcom/threads/nsThreadManager.cpp
index 0bc18ae8b55..8bb78154e78 100644
--- a/mozilla/xpcom/threads/nsThreadManager.cpp
+++ b/mozilla/xpcom/threads/nsThreadManager.cpp
@@ -50,13 +50,13 @@ typedef nsTArray< nsRefPtr<nsThread> > nsThreadArray;
 PR_STATIC_CALLBACK(void)
 ReleaseObject(void *data)
 {
-  NS_STATIC_CAST(nsISupports *, data)->Release();
+  static_cast<nsISupports *>(data)->Release();
 }
 
 PR_STATIC_CALLBACK(PLDHashOperator)
 AppendAndRemoveThread(const void *key, nsRefPtr<nsThread> &thread, void *arg)
 {
-  nsThreadArray *threads = NS_STATIC_CAST(nsThreadArray *, arg);
+  nsThreadArray *threads = static_cast<nsThreadArray *>(arg);
   threads->AppendElement(thread);
   return PL_DHASH_REMOVE;
 }
@@ -198,7 +198,7 @@ nsThreadManager::GetCurrentThread()
   // read thread local storage
   void *data = PR_GetThreadPrivate(mCurThreadIndex);
   if (data)
-    return NS_STATIC_CAST(nsThread *, data);
+    return static_cast<nsThread *>(data);
 
   // OK, that's fine.  We'll dynamically create one :-)
   nsRefPtr<nsThread> thread = new nsThread();
diff --git a/mozilla/xpcom/threads/nsTimerImpl.cpp b/mozilla/xpcom/threads/nsTimerImpl.cpp
index 2cf0b29e0f7..de92b2ab076 100644
--- a/mozilla/xpcom/threads/nsTimerImpl.cpp
+++ b/mozilla/xpcom/threads/nsTimerImpl.cpp
@@ -386,7 +386,7 @@ void nsTimerImpl::Fire()
       mCallback.i->Notify(this);
       break;
     case CALLBACK_TYPE_OBSERVER:
-      mCallback.o->Observe(NS_STATIC_CAST(nsITimer*,this),
+      mCallback.o->Observe(static_cast<nsITimer*>(this),
                            NS_TIMER_CALLBACK_TOPIC,
                            nsnull);
       break;
diff --git a/mozilla/xpfe/appshell/src/nsAppShellService.cpp b/mozilla/xpfe/appshell/src/nsAppShellService.cpp
index 465252fcd8c..6b0bdf0b07c 100644
--- a/mozilla/xpfe/appshell/src/nsAppShellService.cpp
+++ b/mozilla/xpfe/appshell/src/nsAppShellService.cpp
@@ -327,23 +327,23 @@ nsAppShellService::JustCreateTopWindow(nsIXULWindow *aParent,
   else {
     widgetInitData.mBorderStyle = eBorderStyle_none; // assumes none == 0x00
     if (aChromeMask & nsIWebBrowserChrome::CHROME_WINDOW_BORDERS)
-      widgetInitData.mBorderStyle = NS_STATIC_CAST(enum nsBorderStyle, widgetInitData.mBorderStyle | eBorderStyle_border);
+      widgetInitData.mBorderStyle = static_cast<enum nsBorderStyle>(widgetInitData.mBorderStyle | eBorderStyle_border);
     if (aChromeMask & nsIWebBrowserChrome::CHROME_TITLEBAR)
-      widgetInitData.mBorderStyle = NS_STATIC_CAST(enum nsBorderStyle, widgetInitData.mBorderStyle | eBorderStyle_title);
+      widgetInitData.mBorderStyle = static_cast<enum nsBorderStyle>(widgetInitData.mBorderStyle | eBorderStyle_title);
     if (aChromeMask & nsIWebBrowserChrome::CHROME_WINDOW_CLOSE)
-      widgetInitData.mBorderStyle = NS_STATIC_CAST(enum nsBorderStyle, widgetInitData.mBorderStyle | eBorderStyle_close);
+      widgetInitData.mBorderStyle = static_cast<enum nsBorderStyle>(widgetInitData.mBorderStyle | eBorderStyle_close);
     if (aChromeMask & nsIWebBrowserChrome::CHROME_WINDOW_RESIZE) {
-      widgetInitData.mBorderStyle = NS_STATIC_CAST(enum nsBorderStyle, widgetInitData.mBorderStyle | eBorderStyle_resizeh);
+      widgetInitData.mBorderStyle = static_cast<enum nsBorderStyle>(widgetInitData.mBorderStyle | eBorderStyle_resizeh);
       // only resizable windows get the maximize button (but not dialogs)
       if (!(aChromeMask & nsIWebBrowserChrome::CHROME_OPENAS_DIALOG))
-        widgetInitData.mBorderStyle = NS_STATIC_CAST(enum nsBorderStyle, widgetInitData.mBorderStyle | eBorderStyle_maximize);
+        widgetInitData.mBorderStyle = static_cast<enum nsBorderStyle>(widgetInitData.mBorderStyle | eBorderStyle_maximize);
     }
     // all windows (except dialogs) get minimize buttons and the system menu
     if (!(aChromeMask & nsIWebBrowserChrome::CHROME_OPENAS_DIALOG))
-      widgetInitData.mBorderStyle = NS_STATIC_CAST(enum nsBorderStyle, widgetInitData.mBorderStyle | eBorderStyle_minimize | eBorderStyle_menu);
+      widgetInitData.mBorderStyle = static_cast<enum nsBorderStyle>(widgetInitData.mBorderStyle | eBorderStyle_minimize | eBorderStyle_menu);
     // but anyone can explicitly ask for a minimize button
     if (aChromeMask & nsIWebBrowserChrome::CHROME_WINDOW_MIN) {
-      widgetInitData.mBorderStyle = NS_STATIC_CAST(enum nsBorderStyle, widgetInitData.mBorderStyle | eBorderStyle_minimize );
+      widgetInitData.mBorderStyle = static_cast<enum nsBorderStyle>(widgetInitData.mBorderStyle | eBorderStyle_minimize);
     }  
   }
 
diff --git a/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp b/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp
index 51663ddaaa0..8cab6d4db1b 100644
--- a/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp
+++ b/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp
@@ -471,7 +471,7 @@ NS_IMETHODIMP nsContentTreeOwner::SetStatus(PRUint32 aStatusType,
                                             const PRUnichar* aStatus)
 {
   return SetStatusWithContext(aStatusType,
-      aStatus ? NS_STATIC_CAST(const nsString &, nsDependentString(aStatus))
+      aStatus ? static_cast<const nsString &>(nsDependentString(aStatus))
               : EmptyString(),
       nsnull);
 }
@@ -804,7 +804,7 @@ nsContentTreeOwner::ProvideWindow(nsIDOMWindow* aParent,
   nsCOMPtr<nsIWebNavigation> parentNav = do_GetInterface(aParent);
   nsCOMPtr<nsIDocShellTreeOwner> parentOwner = do_GetInterface(parentNav);
   NS_ASSERTION(SameCOMIdentity(parentOwner,
-                               NS_STATIC_CAST(nsIDocShellTreeOwner*, this)),
+                               static_cast<nsIDocShellTreeOwner*>(this)),
                "Parent from wrong docshell tree?");
 #endif
 
diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
index 7e25b7169cf..9ab19cc1353 100644
--- a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
+++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
@@ -295,7 +295,7 @@ nsWebShellWindow::HandleEvent(nsGUIEvent *aEvent)
 
     aEvent->widget->GetClientData(data);
     if (data != nsnull) {
-      eventWindow = NS_REINTERPRET_CAST(nsWebShellWindow *, data);
+      eventWindow = reinterpret_cast<nsWebShellWindow *>(data);
       docShell = eventWindow->mDocShell;
     }
   }
@@ -549,7 +549,7 @@ nsWebShellWindow::SetPersistenceTimer(PRUint32 aDirtyFlags)
 void
 nsWebShellWindow::FirePersistenceTimer(nsITimer *aTimer, void *aClosure)
 {
-  nsWebShellWindow *win = NS_STATIC_CAST(nsWebShellWindow *, aClosure);
+  nsWebShellWindow *win = static_cast<nsWebShellWindow *>(aClosure);
   if (!win->mSPTimerLock)
     return;
   PR_Lock(win->mSPTimerLock);
diff --git a/mozilla/xpfe/appshell/src/nsWindowMediator.cpp b/mozilla/xpfe/appshell/src/nsWindowMediator.cpp
index db8f7f82e64..e3c17a433a0 100644
--- a/mozilla/xpfe/appshell/src/nsWindowMediator.cpp
+++ b/mozilla/xpfe/appshell/src/nsWindowMediator.cpp
@@ -839,7 +839,7 @@ nsWindowMediator::RemoveListener(nsIWindowMediatorListener* aListener)
 PRBool notifyOpenWindow(nsISupports *aElement, void* aData)
 {
   nsIWindowMediatorListener* listener =
-    NS_REINTERPRET_CAST(nsIWindowMediatorListener*, aElement);
+    reinterpret_cast<nsIWindowMediatorListener*>(aElement);
   windowData* winData = (windowData*) aData;
 
   listener->OnOpenWindow(winData->mWindow);
@@ -849,7 +849,7 @@ PRBool notifyOpenWindow(nsISupports *aElement, void* aData)
 PRBool notifyCloseWindow(nsISupports *aElement, void* aData)
 {
   nsIWindowMediatorListener* listener =
-    NS_REINTERPRET_CAST(nsIWindowMediatorListener*, aElement);
+    reinterpret_cast<nsIWindowMediatorListener*>(aElement);
   windowData* winData = (windowData*) aData;
   
   listener->OnCloseWindow(winData->mWindow);
@@ -859,10 +859,10 @@ PRBool notifyCloseWindow(nsISupports *aElement, void* aData)
 PRBool notifyWindowTitleChange(nsISupports *aElement, void* aData)
 {
   nsIWindowMediatorListener* listener =
-    NS_REINTERPRET_CAST(nsIWindowMediatorListener*, aElement);
+    reinterpret_cast<nsIWindowMediatorListener*>(aElement);
 
   windowData* titleData =
-    NS_REINTERPRET_CAST(windowData*, aData);
+    reinterpret_cast<windowData*>(aData);
   listener->OnWindowTitleChange(titleData->mWindow,
                                 titleData->mTitle);
 
diff --git a/mozilla/xpfe/appshell/src/nsXULWindow.cpp b/mozilla/xpfe/appshell/src/nsXULWindow.cpp
index 16b993c90d6..43c3a816176 100644
--- a/mozilla/xpfe/appshell/src/nsXULWindow.cpp
+++ b/mozilla/xpfe/appshell/src/nsXULWindow.cpp
@@ -156,7 +156,7 @@ NS_INTERFACE_MAP_BEGIN(nsXULWindow)
   NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor)
   NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
   if (aIID.Equals(NS_GET_IID(nsXULWindow)))
-    foundInterface = NS_REINTERPRET_CAST(nsISupports*, this);
+    foundInterface = reinterpret_cast<nsISupports*>(this);
   else
 NS_INTERFACE_MAP_END
 
@@ -393,7 +393,7 @@ NS_IMETHODIMP nsXULWindow::ShowModal()
   nsCOMPtr<nsIAppShellService> appShellService(do_GetService(NS_APPSHELLSERVICE_CONTRACTID));
   if (appShellService)
       appShellService->TopLevelWindowIsModal(
-                         NS_STATIC_CAST(nsIXULWindow*, this), PR_TRUE);
+                         static_cast<nsIXULWindow*>(this), PR_TRUE);
 
   nsCOMPtr<nsIJSContextStack> stack(do_GetService("@mozilla.org/js/xpc/ContextStack;1"));
   if (stack && NS_SUCCEEDED(stack->Push(nsnull))) {
@@ -411,7 +411,7 @@ NS_IMETHODIMP nsXULWindow::ShowModal()
   window->SetModal(PR_FALSE);
   if (appShellService)
       appShellService->TopLevelWindowIsModal(
-                         NS_STATIC_CAST(nsIXULWindow*, this), PR_FALSE);
+                         static_cast<nsIXULWindow*>(this), PR_FALSE);
   /*   Note there's no EnableParent(PR_TRUE) here to match the PR_FALSE one
      above. That's done in ExitModalLoop. It's important that the parent
      be re-enabled before this window is made invisible; to do otherwise
@@ -454,7 +454,7 @@ NS_IMETHODIMP nsXULWindow::Destroy()
   nsCOMPtr<nsIAppShellService> appShell(do_GetService(NS_APPSHELLSERVICE_CONTRACTID));
   NS_ASSERTION(appShell, "Couldn't get appShell... xpcom shutdown?");
   if (appShell)
-    appShell->UnregisterTopLevelWindow(NS_STATIC_CAST(nsIXULWindow*, this));
+    appShell->UnregisterTopLevelWindow(static_cast<nsIXULWindow*>(this));
 
   nsCOMPtr<nsIXULWindow> parentWindow(do_QueryReferent(mParentWindow));
   if (parentWindow)
@@ -512,7 +512,7 @@ NS_IMETHODIMP nsXULWindow::Destroy()
   count = mContentShells.Count();
   for (PRInt32 i = 0; i < count; i++) {
     nsContentShellInfo* shellInfo =
-        NS_STATIC_CAST(nsContentShellInfo *, mContentShells.ElementAt(i));
+        static_cast<nsContentShellInfo *>(mContentShells.ElementAt(i));
     delete shellInfo;
   }
   mContentShells.Clear();
@@ -767,7 +767,7 @@ NS_IMETHODIMP nsXULWindow::SetVisibility(PRBool aVisibility)
 
   nsCOMPtr<nsIWindowMediator> windowMediator(do_GetService(kWindowMediatorCID));
   if (windowMediator)
-     windowMediator->UpdateWindowTimeStamp(NS_STATIC_CAST(nsIXULWindow*, this));
+     windowMediator->UpdateWindowTimeStamp(static_cast<nsIXULWindow*>(this));
 
   // notify observers so that we can hide the splash screen if possible
   nsCOMPtr<nsIObserverService> obssvc
@@ -863,7 +863,7 @@ NS_IMETHODIMP nsXULWindow::SetTitle(const PRUnichar* aTitle)
   if(!windowMediator)
     return NS_OK;
 
-  windowMediator->UpdateWindowTitle(NS_STATIC_CAST(nsIXULWindow*, this), aTitle);
+  windowMediator->UpdateWindowTitle(static_cast<nsIXULWindow*>(this), aTitle);
 
   return NS_OK;
 }
@@ -1794,9 +1794,9 @@ NS_IMETHODIMP nsXULWindow::CreateNewContentWindow(PRInt32 aChromeFlags,
   newWindow->SetChromeFlags(aChromeFlags);
 
   // Specify that we want the window to remain locked until the chrome has loaded.
-  nsXULWindow *xulWin = NS_STATIC_CAST(nsXULWindow*,
-                                      NS_STATIC_CAST(nsIXULWindow*,
-                                                     newWindow));
+  nsXULWindow *xulWin = static_cast<nsXULWindow*>
+                                   (static_cast<nsIXULWindow*>
+                                               (newWindow));
 
   xulWin->LockUntilChromeLoad();
 
@@ -1895,7 +1895,7 @@ PRBool nsXULWindow::ConstrainToZLevel(
         *aPlacement = nsWindowZRelative;
 
       if (aImmediate) {
-        nsCOMPtr<nsIBaseWindow> ourBase = do_QueryInterface(NS_STATIC_CAST(nsIXULWindow *,this));
+        nsCOMPtr<nsIBaseWindow> ourBase = do_QueryInterface(static_cast<nsIXULWindow *>(this));
         if (ourBase) {
           nsCOMPtr<nsIWidget> ourWidget;
           ourBase->GetMainWidget(getter_AddRefs(ourWidget));
@@ -1915,7 +1915,7 @@ PRBool nsXULWindow::ConstrainToZLevel(
       void *data;
       (*aActualBelow)->GetClientData(data);
       if (data) {
-        windowAbove = NS_REINTERPRET_CAST(nsWebShellWindow*, data);
+        windowAbove = reinterpret_cast<nsWebShellWindow*>(data);
       }
     }
 
diff --git a/mozilla/xpfe/browser/src/nsBrowserStatusFilter.cpp b/mozilla/xpfe/browser/src/nsBrowserStatusFilter.cpp
index f2b7551701f..5140c725947 100644
--- a/mozilla/xpfe/browser/src/nsBrowserStatusFilter.cpp
+++ b/mozilla/xpfe/browser/src/nsBrowserStatusFilter.cpp
@@ -347,7 +347,7 @@ nsBrowserStatusFilter::ProcessTimeout()
 void
 nsBrowserStatusFilter::TimeoutHandler(nsITimer *aTimer, void *aClosure)
 {
-    nsBrowserStatusFilter *self = NS_REINTERPRET_CAST(nsBrowserStatusFilter *, aClosure);
+    nsBrowserStatusFilter *self = reinterpret_cast<nsBrowserStatusFilter *>(aClosure);
     if (!self) {
         NS_ERROR("no self");
         return;
diff --git a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp
index 917f74dc40c..dae75413e7b 100644
--- a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp
+++ b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp
@@ -1556,7 +1556,7 @@ public:
   virtual ~ElementArray();
 
   ElementInfo* ElementAt(PRInt32 aIndex) const {
-    return NS_STATIC_CAST(ElementInfo*, nsAutoVoidArray::ElementAt(aIndex));
+    return static_cast<ElementInfo*>(nsAutoVoidArray::ElementAt(aIndex));
   }
 
   ElementInfo* operator[](PRInt32 aIndex) const {
@@ -2006,7 +2006,7 @@ nsBookmarksService::GetBookmarkToPing(nsIRDFResource **theBookmark)
 void
 nsBookmarksService::FireTimer(nsITimer* aTimer, void* aClosure)
 {
-    nsBookmarksService *bmks = NS_STATIC_CAST(nsBookmarksService *, aClosure);
+    nsBookmarksService *bmks = static_cast<nsBookmarksService *>(aClosure);
     if (!bmks)  return;
     nsresult            rv;
 
@@ -2669,9 +2669,9 @@ int
 nsBookmarksService::Compare(const void* aElement1, const void* aElement2, void* aData)
 {
     const ElementInfo* elementInfo1 =
-      NS_STATIC_CAST(ElementInfo*, NS_CONST_CAST(void*, aElement1));
+      static_cast<ElementInfo*>(const_cast<void*>(aElement1));
     const ElementInfo* elementInfo2 =
-      NS_STATIC_CAST(ElementInfo*, NS_CONST_CAST(void*, aElement2));
+      static_cast<ElementInfo*>(const_cast<void*>(aElement2));
     SortInfo* sortInfo = (SortInfo*)aData;
 
     if (sortInfo->mFoldersFirst) {
diff --git a/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp b/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp
index 9ee4a3e5b55..3b4edd53829 100644
--- a/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp
+++ b/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp
@@ -133,7 +133,7 @@ nsHTTPIndex::GetInterface(const nsIID &anIID, void **aResult )
 
         if (!mRequestor)
           return NS_ERROR_NO_INTERFACE;
-        *aResult = NS_STATIC_CAST(nsIFTPEventSink*, this);
+        *aResult = static_cast<nsIFTPEventSink*>(this);
         NS_ADDREF(this);
         return NS_OK;
     }
@@ -194,8 +194,8 @@ nsHTTPIndex::OnFTPControlLog(PRBool server, const char *msg)
     nsIScriptContext *context = scriptGlobal->GetContext();
     NS_ENSURE_TRUE(context, NS_OK);
 
-    JSContext* jscontext = NS_REINTERPRET_CAST(JSContext*,
-                                               context->GetNativeContext());
+    JSContext* jscontext = reinterpret_cast<JSContext*>
+                                           (context->GetNativeContext());
     NS_ENSURE_TRUE(jscontext, NS_OK);
 
     JSObject* global = JS_GetGlobalObject(jscontext);
@@ -271,8 +271,8 @@ nsHTTPIndex::OnStartRequest(nsIRequest *request, nsISupports* aContext)
     nsIScriptContext *context = scriptGlobal->GetContext();
     NS_ENSURE_TRUE(context, NS_ERROR_FAILURE);
 
-    JSContext* jscontext = NS_REINTERPRET_CAST(JSContext*,
-                                               context->GetNativeContext());
+    JSContext* jscontext = reinterpret_cast<JSContext*>
+                                           (context->GetNativeContext());
     JSObject* global = JS_GetGlobalObject(jscontext);
 
     // Using XPConnect, wrap the HTTP index object...
@@ -283,7 +283,7 @@ nsHTTPIndex::OnStartRequest(nsIRequest *request, nsISupports* aContext)
     nsCOMPtr<nsIXPConnectJSObjectHolder> wrapper;
     rv = xpc->WrapNative(jscontext,
                          global,
-                         NS_STATIC_CAST(nsIHTTPIndex*, this),
+                         static_cast<nsIHTTPIndex*>(this),
                          NS_GET_IID(nsIHTTPIndex),
                          getter_AddRefs(wrapper));
 
@@ -1001,7 +1001,7 @@ nsHTTPIndex::AddElement(nsIRDFResource *parent, nsIRDFResource *prop, nsIRDFNode
 void
 nsHTTPIndex::FireTimer(nsITimer* aTimer, void* aClosure)
 {
-  nsHTTPIndex *httpIndex = NS_STATIC_CAST(nsHTTPIndex *, aClosure);
+  nsHTTPIndex *httpIndex = static_cast<nsHTTPIndex *>(aClosure);
   if (!httpIndex)	return;
   
   // don't return out of this loop as mTimer may need to be cancelled afterwards
diff --git a/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp b/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp
index 9de08e8839e..7b1a500b030 100644
--- a/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp
+++ b/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp
@@ -567,7 +567,7 @@ NS_IMETHODIMP
 nsDownloadManager::PauseDownload(nsIDownload* aDownload)
 {
   NS_ENSURE_ARG_POINTER(aDownload);
-  return NS_STATIC_CAST(nsDownload*, aDownload)->Suspend();
+  return static_cast<nsDownload*>(aDownload)->Suspend();
 }
 
 NS_IMETHODIMP
@@ -732,7 +732,7 @@ nsDownloadManager::OpenProgressDialogFor(nsIDownload* aDownload, nsIDOMWindow* a
 {
   NS_ENSURE_ARG_POINTER(aDownload);
   nsresult rv;
-  nsDownload* internalDownload = NS_STATIC_CAST(nsDownload*, aDownload);
+  nsDownload* internalDownload = static_cast<nsDownload*>(aDownload);
   nsIProgressDialog* oldDialog = internalDownload->GetDialog();
   
   if (oldDialog) {
@@ -961,7 +961,7 @@ nsDownload::Cancel()
   // we have to notify it that we're cancelling
   nsCOMPtr<nsIObserver> observer = do_QueryInterface(GetDialog());
   if (observer) {
-    rv = observer->Observe(NS_STATIC_CAST(nsIDownload*, this), "oncancel", nsnull);
+    rv = observer->Observe(static_cast<nsIDownload*>(this), "oncancel", nsnull);
   }
   
   return rv;
diff --git a/mozilla/xpfe/components/filepicker/src/nsFileView.cpp b/mozilla/xpfe/components/filepicker/src/nsFileView.cpp
index 37fe5a21c8f..68e6fb7b834 100644
--- a/mozilla/xpfe/components/filepicker/src/nsFileView.cpp
+++ b/mozilla/xpfe/components/filepicker/src/nsFileView.cpp
@@ -872,8 +872,8 @@ nsFileView::ReverseArray(nsISupportsArray* aArray)
 PR_STATIC_CALLBACK(int)
 SortNameCallback(const void* aElement1, const void* aElement2, void* aContext)
 {
-  nsIFile* file1 = *NS_STATIC_CAST(nsIFile* const *, aElement1);
-  nsIFile* file2 = *NS_STATIC_CAST(nsIFile* const *, aElement2);
+  nsIFile* file1 = *static_cast<nsIFile* const *>(aElement1);
+  nsIFile* file2 = *static_cast<nsIFile* const *>(aElement2);
   
   nsAutoString leafName1, leafName2;
   file1->GetLeafName(leafName1);
@@ -885,8 +885,8 @@ SortNameCallback(const void* aElement1, const void* aElement2, void* aContext)
 PR_STATIC_CALLBACK(int)
 SortSizeCallback(const void* aElement1, const void* aElement2, void* aContext)
 {
-  nsIFile* file1 = *NS_STATIC_CAST(nsIFile* const *, aElement1);
-  nsIFile* file2 = *NS_STATIC_CAST(nsIFile* const *, aElement2);
+  nsIFile* file1 = *static_cast<nsIFile* const *>(aElement1);
+  nsIFile* file2 = *static_cast<nsIFile* const *>(aElement2);
 
   PRInt64 size1, size2;
   file1->GetFileSize(&size1);
@@ -901,8 +901,8 @@ SortSizeCallback(const void* aElement1, const void* aElement2, void* aContext)
 PR_STATIC_CALLBACK(int)
 SortDateCallback(const void* aElement1, const void* aElement2, void* aContext)
 {
-  nsIFile* file1 = *NS_STATIC_CAST(nsIFile* const *, aElement1);
-  nsIFile* file2 = *NS_STATIC_CAST(nsIFile* const *, aElement2);
+  nsIFile* file1 = *static_cast<nsIFile* const *>(aElement1);
+  nsIFile* file2 = *static_cast<nsIFile* const *>(aElement2);
 
   PRInt64 time1, time2;
   file1->GetLastModifiedTime(&time1);
diff --git a/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp b/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp
index e279082d069..53ccc87d33e 100644
--- a/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp
+++ b/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp
@@ -2405,7 +2405,7 @@ nsGlobalHistory::BeginUpdateBatch()
     if (NS_FAILED(rv)) return rv;
 
     for (PRInt32 i = 0; i < PRInt32(count); ++i) {
-      nsIRDFObserver* observer = NS_STATIC_CAST(nsIRDFObserver*, mObservers->ElementAt(i));
+      nsIRDFObserver* observer = static_cast<nsIRDFObserver*>(mObservers->ElementAt(i));
 
       NS_ASSERTION(observer != nsnull, "null ptr");
       if (! observer)
@@ -2435,7 +2435,7 @@ nsGlobalHistory::EndUpdateBatch()
     if (NS_FAILED(rv)) return rv;
 
     for (PRInt32 i = 0; i < PRInt32(count); ++i) {
-      nsIRDFObserver* observer = NS_STATIC_CAST(nsIRDFObserver*, mObservers->ElementAt(i));
+      nsIRDFObserver* observer = static_cast<nsIRDFObserver*>(mObservers->ElementAt(i));
 
       NS_ASSERTION(observer != nsnull, "null ptr");
       if (! observer)
@@ -3139,7 +3139,7 @@ nsGlobalHistory::NotifyAssert(nsIRDFResource* aSource,
     if (NS_FAILED(rv)) return rv;
 
     for (PRInt32 i = 0; i < PRInt32(count); ++i) {
-      nsIRDFObserver* observer = NS_STATIC_CAST(nsIRDFObserver*, mObservers->ElementAt(i));
+      nsIRDFObserver* observer = static_cast<nsIRDFObserver*>(mObservers->ElementAt(i));
 
       NS_ASSERTION(observer != nsnull, "null ptr");
       if (! observer)
@@ -3167,7 +3167,7 @@ nsGlobalHistory::NotifyUnassert(nsIRDFResource* aSource,
     if (NS_FAILED(rv)) return rv;
 
     for (PRInt32 i = 0; i < PRInt32(count); ++i) {
-      nsIRDFObserver* observer = NS_STATIC_CAST(nsIRDFObserver*, mObservers->ElementAt(i));
+      nsIRDFObserver* observer = static_cast<nsIRDFObserver*>(mObservers->ElementAt(i));
 
       NS_ASSERTION(observer != nsnull, "null ptr");
       if (! observer)
@@ -3197,7 +3197,7 @@ nsGlobalHistory::NotifyChange(nsIRDFResource* aSource,
     if (NS_FAILED(rv)) return rv;
 
     for (PRInt32 i = 0; i < PRInt32(count); ++i) {
-      nsIRDFObserver* observer = NS_STATIC_CAST(nsIRDFObserver*, mObservers->ElementAt(i));
+      nsIRDFObserver* observer = static_cast<nsIRDFObserver*>(mObservers->ElementAt(i));
 
       NS_ASSERTION(observer != nsnull, "null ptr");
       if (! observer)
@@ -4406,7 +4406,7 @@ nsGlobalHistory::AutoCompleteSortComparison(nsIMdbRow* row1, nsIMdbRow* row2,
                                             void* closureVoid)
 {
   AutoCompleteSortClosure* closure = 
-      NS_STATIC_CAST(AutoCompleteSortClosure*, closureVoid);
+      static_cast<AutoCompleteSortClosure*>(closureVoid);
 
   // get visit counts - we're ignoring all errors from GetRowValue(), 
   // and relying on default values
diff --git a/mozilla/xpfe/components/history/src/nsMdbPtr.h b/mozilla/xpfe/components/history/src/nsMdbPtr.h
index 46f3e138706..f2a5ed7055d 100644
--- a/mozilla/xpfe/components/history/src/nsMdbPtr.h
+++ b/mozilla/xpfe/components/history/src/nsMdbPtr.h
@@ -124,7 +124,7 @@ public:
     nsMdbDerivedSafe<T>*
     get() const
     {
-        return NS_REINTERPRET_CAST(nsMdbDerivedSafe<T>*, mRawPtr);
+        return reinterpret_cast<nsMdbDerivedSafe<T>*>(mRawPtr);
     }
 
     nsMdbDerivedSafe<T>*
@@ -162,7 +162,7 @@ inline
 PRBool
 operator==(const nsMdbPtr<T>& lhs, const nsMdbPtr<U>& rhs)
 {
-    return NS_STATIC_CAST(const void*, lhs.get()) == NS_STATIC_CAST(const void*, rhs.get());
+    return static_cast<const void*>(lhs.get()) == static_cast<const void*>(rhs.get());
 }
 
 template <class T, class U>
@@ -170,7 +170,7 @@ inline
 PRBool
 operator==(const nsMdbPtr<T>& lhs, const U* rhs)
 {
-    return NS_STATIC_CAST(const void*, lhs.get()) == NS_STATIC_CAST(const void*, rhs);
+    return static_cast<const void*>(lhs.get()) == static_cast<const void*>(rhs);
 }
 
 
@@ -179,7 +179,7 @@ inline
 PRBool
 operator==(const U* lhs, const nsMdbPtr<T>& rhs)
 {
-    return NS_STATIC_CAST(const void*, lhs) == NS_STATIC_CAST(const void*, rhs.get());
+    return static_cast<const void*>(lhs) == static_cast<const void*>(rhs.get());
 }
 
 
@@ -190,7 +190,7 @@ inline
 PRBool
 operator!=(const nsMdbPtr<T>& lhs, const nsMdbPtr<U>& rhs)
 {
-    return NS_STATIC_CAST(const void*, lhs.get()) != NS_STATIC_CAST(const void*, rhs.get());
+    return static_cast<const void*>(lhs.get()) != static_cast<const void*>(rhs.get());
 }
 
 template <class T, class U>
@@ -198,7 +198,7 @@ inline
 PRBool
 operator!=(const nsMdbPtr<T>& lhs, const U* rhs)
 {
-    return NS_STATIC_CAST(const void*, lhs.get()) != NS_STATIC_CAST(const void*, rhs);
+    return static_cast<const void*>(lhs.get()) != static_cast<const void*>(rhs);
 }
 
 
@@ -207,7 +207,7 @@ inline
 PRBool
 operator!=(const U* lhs, const nsMdbPtr<T>& rhs)
 {
-    return NS_STATIC_CAST(const void*, lhs) != NS_STATIC_CAST(const void*, rhs.get());
+    return static_cast<const void*>(lhs) != static_cast<const void*>(rhs.get());
 }
 
 
diff --git a/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp b/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp
index 0d8f732e925..7f9c2659654 100755
--- a/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp
+++ b/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp
@@ -336,7 +336,7 @@ static const char   kSearchProtocol[] = "internetsearch:";
 int PR_CALLBACK
 searchModePrefCallback(const char *pref, void *aClosure)
 {
-  InternetSearchDataSource *searchDS = NS_STATIC_CAST(InternetSearchDataSource *, aClosure);
+  InternetSearchDataSource *searchDS = static_cast<InternetSearchDataSource *>(aClosure);
   NS_ASSERTION(searchDS, "No closure?");
 
   nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
@@ -559,7 +559,7 @@ InternetSearchDataSource::GetSearchEngineToPing(nsIRDFResource **theEngine, nsCS
 void
 InternetSearchDataSource::FireTimer(nsITimer* aTimer, void* aClosure)
 {
-  InternetSearchDataSource *search = NS_STATIC_CAST(InternetSearchDataSource *, aClosure);
+  InternetSearchDataSource *search = static_cast<InternetSearchDataSource *>(aClosure);
   if (!search)  return;
 
   if (!search->busySchedule)
@@ -3323,7 +3323,7 @@ InternetSearchDataSource::DecodeData(const char *aCharset, const PRUnichar *aInS
   rv = unicodeDecoder->GetMaxLength(value.get(), srcLength, &outUnicodeLen);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  *aOutString = NS_REINTERPRET_CAST(PRUnichar*, nsMemory::Alloc((outUnicodeLen + 1) * sizeof(PRUnichar)));
+  *aOutString = reinterpret_cast<PRUnichar*>(nsMemory::Alloc((outUnicodeLen + 1) * sizeof(PRUnichar)));
   NS_ENSURE_TRUE(*aOutString, NS_ERROR_OUT_OF_MEMORY);
 
   rv = unicodeDecoder->Convert(value.get(), &srcLength, *aOutString, &outUnicodeLen);
diff --git a/mozilla/xpfe/components/search/src/nsLocalSearchService.cpp b/mozilla/xpfe/components/search/src/nsLocalSearchService.cpp
index 07336b2a7d5..9e165d1d8c1 100755
--- a/mozilla/xpfe/components/search/src/nsLocalSearchService.cpp
+++ b/mozilla/xpfe/components/search/src/nsLocalSearchService.cpp
@@ -465,7 +465,7 @@ LocalSearchDataSource::parseDate(const nsAString& aDate,
 {
     // date is in the form of msec since epoch, but use NSPR to
     // parse the time
-    PRTime *outTime = NS_STATIC_CAST(PRTime*,aResult);
+    PRTime *outTime = static_cast<PRTime*>(aResult);
     PRStatus err;
     err = PR_ParseTimeString(NS_ConvertUTF16toUTF8(aDate).get(),
                              PR_FALSE, // PR_FALSE == use current timezone
diff --git a/mozilla/xpfe/components/startup/src/nsCommandLineService.cpp b/mozilla/xpfe/components/startup/src/nsCommandLineService.cpp
index 84bff285f62..17bc2241e4c 100644
--- a/mozilla/xpfe/components/startup/src/nsCommandLineService.cpp
+++ b/mozilla/xpfe/components/startup/src/nsCommandLineService.cpp
@@ -81,13 +81,13 @@ static void* ProcessURLArg(char* str)
           nsCAutoString fileurl;
           rv = NS_GetURLSpecFromFile(file, fileurl);
           if (NS_SUCCEEDED(rv))
-            return NS_REINTERPRET_CAST(void*, ToNewCString(fileurl));
+            return reinterpret_cast<void*>(ToNewCString(fileurl));
         }
       }
     }
   }
 
-  return NS_REINTERPRET_CAST(void*, nsCRT::strdup(str));
+  return reinterpret_cast<void*>(nsCRT::strdup(str));
 }
 
 NS_IMETHODIMP
@@ -112,8 +112,8 @@ nsCmdLineService::Initialize(int aArgc, char ** aArgv)
   //Insert the program name 
   if (aArgc > 0 && aArgv[0])
   {
-    mArgList.AppendElement(NS_REINTERPRET_CAST(void*, nsCRT::strdup("-progname")));
-    mArgValueList.AppendElement(NS_REINTERPRET_CAST(void*, nsCRT::strdup(aArgv[0])));
+    mArgList.AppendElement(reinterpret_cast<void*>(nsCRT::strdup("-progname")));
+    mArgValueList.AppendElement(reinterpret_cast<void*>(nsCRT::strdup(aArgv[0])));
     mArgCount++;
     i++;
   }
@@ -128,7 +128,7 @@ nsCmdLineService::Initialize(int aArgc, char ** aArgv)
        /* An option that starts with -. May or may not
 	    * have a value after it. 
 	    */
-	   mArgList.AppendElement(NS_REINTERPRET_CAST(void*, nsCRT::strdup(aArgv[i])));
+	   mArgList.AppendElement(reinterpret_cast<void*>(nsCRT::strdup(aArgv[i])));
 	   //Increment the index to look ahead at the next option.
        i++;
 
@@ -139,7 +139,7 @@ nsCmdLineService::Initialize(int aArgc, char ** aArgv)
 	     /* All args have been parsed. Append a PR_TRUE for the
 	      * previous option in the mArgValueList
 	      */
-	     mArgValueList.AppendElement(NS_REINTERPRET_CAST(void*, nsCRT::strdup("1")));
+	     mArgValueList.AppendElement(reinterpret_cast<void*>(nsCRT::strdup("1")));
 	     mArgCount++;
 	     break;
 	   }
@@ -153,7 +153,7 @@ nsCmdLineService::Initialize(int aArgc, char ** aArgv)
 	     * mArgValue array and retract the index so that this option 
 	     * will get stored in the next iteration
 	     */
-        mArgValueList.AppendElement(NS_REINTERPRET_CAST(void*, nsCRT::strdup("1")));
+        mArgValueList.AppendElement(reinterpret_cast<void*>(nsCRT::strdup("1")));
    	    mArgCount++;
         i--;
         continue;
@@ -179,7 +179,7 @@ nsCmdLineService::Initialize(int aArgc, char ** aArgv)
 	         /* This is a value to the previous option.
 	          * Store it in the mArgValue array 
 	          */
-             mArgValueList.AppendElement(NS_REINTERPRET_CAST(void*, nsCRT::strdup(aArgv[i])));
+             mArgValueList.AppendElement(reinterpret_cast<void*>(nsCRT::strdup(aArgv[i])));
 	         mArgCount++;
 	      }
 	   }
@@ -189,7 +189,7 @@ nsCmdLineService::Initialize(int aArgc, char ** aArgv)
 	      /* This must be the  URL at the end 
 	       * Append the url to the arrays
            */
-           mArgList.AppendElement(NS_REINTERPRET_CAST(void*, nsCRT::strdup("-url")));
+           mArgList.AppendElement(reinterpret_cast<void*>(nsCRT::strdup("-url")));
 	         mArgValueList.AppendElement(ProcessURLArg(aArgv[i]));
 	         mArgCount++;
 	     }
@@ -308,7 +308,7 @@ nsCmdLineService::~nsCmdLineService()
 {
   PRInt32 curr = mArgList.Count();
   while ( curr ) {
-    char* str = NS_REINTERPRET_CAST(char*, mArgList[curr-1]);
+    char* str = reinterpret_cast<char*>(mArgList[curr-1]);
     if ( str )
       nsMemory::Free(str);
     --curr;
@@ -316,7 +316,7 @@ nsCmdLineService::~nsCmdLineService()
   
   curr = mArgValueList.Count();
   while ( curr ) {
-    char* str = NS_REINTERPRET_CAST(char*, mArgValueList[curr-1]);
+    char* str = reinterpret_cast<char*>(mArgValueList[curr-1]);
     if ( str )
       nsMemory::Free(str);
     --curr;
diff --git a/mozilla/xpfe/components/windowds/nsWindowDataSource.cpp b/mozilla/xpfe/components/windowds/nsWindowDataSource.cpp
index e35347a1c83..c5f0824e7f4 100644
--- a/mozilla/xpfe/components/windowds/nsWindowDataSource.cpp
+++ b/mozilla/xpfe/components/windowds/nsWindowDataSource.cpp
@@ -315,18 +315,18 @@ struct findWindowClosure {
 PR_STATIC_CALLBACK(PRBool)
 findWindow(nsHashKey* aKey, void *aData, void* aClosure)
 {
-    nsVoidKey *thisKey = NS_STATIC_CAST(nsVoidKey*, aKey);
+    nsVoidKey *thisKey = static_cast<nsVoidKey*>(aKey);
 
     nsIRDFResource *resource =
-        NS_STATIC_CAST(nsIRDFResource*, aData);
+        static_cast<nsIRDFResource*>(aData);
     
     findWindowClosure* closure =
-        NS_STATIC_CAST(findWindowClosure*, aClosure);
+        static_cast<findWindowClosure*>(aClosure);
 
     if (resource == closure->targetResource) {
         closure->resultWindow =
-            NS_STATIC_CAST(nsIXULWindow*,
-                           thisKey->GetValue());
+            static_cast<nsIXULWindow*>
+                       (thisKey->GetValue());
         return PR_FALSE;         // stop enumerating
     }
     return PR_TRUE;
diff --git a/mozilla/xpfe/components/xremote/src/XRemoteService.cpp b/mozilla/xpfe/components/xremote/src/XRemoteService.cpp
index baf0a41111e..c5eeeed46d2 100644
--- a/mozilla/xpfe/components/xremote/src/XRemoteService.cpp
+++ b/mozilla/xpfe/components/xremote/src/XRemoteService.cpp
@@ -530,8 +530,8 @@ XRemoteService::OpenURL(nsCString &aArgument,
     // we own it
     NS_ADDREF(listener);
     nsCOMPtr<nsISupports> listenerRef;
-    listenerRef = do_QueryInterface(NS_STATIC_CAST(nsIURIContentListener *,
-						   listener));
+    listenerRef = do_QueryInterface(static_cast<nsIURIContentListener *>
+                                               (listener));
     // now the listenerref is the only reference
     NS_RELEASE(listener);
 
diff --git a/mozilla/xpinstall/src/ScheduledTasks.cpp b/mozilla/xpinstall/src/ScheduledTasks.cpp
index 5820fe887d8..8554e14faa7 100644
--- a/mozilla/xpinstall/src/ScheduledTasks.cpp
+++ b/mozilla/xpinstall/src/ScheduledTasks.cpp
@@ -192,7 +192,7 @@ PRInt32 ScheduleFileForDeletion(nsIFile *filename)
 
     nsCAutoString path;
     GetRegFilePath(path);
-    err = NR_RegOpen(NS_CONST_CAST(char*, path.get()), &reg);
+    err = NR_RegOpen(const_cast<char*>(path.get()), &reg);
 
     if ( err == REGERR_OK )
     {
@@ -409,7 +409,7 @@ PRInt32 ReplaceFileNowOrSchedule(nsIFile* aReplacementFile, nsIFile* aDoomedFile
 
         nsCAutoString regFilePath;
         GetRegFilePath(regFilePath);
-        if ( REGERR_OK == NR_RegOpen(NS_CONST_CAST(char*, regFilePath.get()), &reg) ) 
+        if ( REGERR_OK == NR_RegOpen(const_cast<char*>(regFilePath.get()), &reg) ) 
         {
             err = NR_RegAddKey( reg, ROOTKEY_PRIVATE, REG_REPLACE_LIST_KEY, &listkey );
             if ( err == REGERR_OK ) 
diff --git a/mozilla/xpinstall/src/nsInstall.cpp b/mozilla/xpinstall/src/nsInstall.cpp
index 1f4596f307a..71fa606d163 100644
--- a/mozilla/xpinstall/src/nsInstall.cpp
+++ b/mozilla/xpinstall/src/nsInstall.cpp
@@ -852,8 +852,8 @@ nsInstall::FinalizeInstall(PRInt32* aReturn)
     {
         if ( mUninstallPackage )
         {
-            VR_UninstallCreateNode( NS_CONST_CAST(char *, NS_ConvertUTF16toUTF8(mRegistryPackageName).get()),
-                                    NS_CONST_CAST(char *, NS_ConvertUTF16toUTF8(mUIName).get()));
+            VR_UninstallCreateNode( const_cast<char *>(NS_ConvertUTF16toUTF8(mRegistryPackageName).get()),
+                                    const_cast<char *>(NS_ConvertUTF16toUTF8(mUIName).get()));
         }
 
         // Install the Component into the Version Registry.
@@ -869,9 +869,9 @@ nsInstall::FinalizeInstall(PRInt32* aReturn)
             if (mPackageFolder)
                 mPackageFolder->GetDirectoryPath(path);
 
-            VR_Install( NS_CONST_CAST(char *, NS_ConvertUTF16toUTF8(mRegistryPackageName).get()),
-                        NS_CONST_CAST(char *, path.get()),
-                        NS_CONST_CAST(char *, versionCString.get()),
+            VR_Install( const_cast<char *>(NS_ConvertUTF16toUTF8(mRegistryPackageName).get()),
+                        const_cast<char *>(path.get()),
+                        const_cast<char *>(versionCString.get()),
                         PR_TRUE );
         }
 
@@ -1020,11 +1020,11 @@ nsInstall::GetComponentFolder(const nsString& aComponentName, const nsString& aS
 
     NS_ConvertUTF16toUTF8 componentCString(tempString);
 
-    if((err = VR_GetDefaultDirectory( NS_CONST_CAST(char *, componentCString.get()), sizeof(dir), dir )) != REGERR_OK)
+    if((err = VR_GetDefaultDirectory( const_cast<char *>(componentCString.get()), sizeof(dir), dir )) != REGERR_OK)
     {
         // if there's not a default directory, try to see if the component
         // // is registered as a file and then strip the filename off the path
-        if((err = VR_GetPath( NS_CONST_CAST(char *, componentCString.get()), sizeof(dir), dir )) != REGERR_OK)
+        if((err = VR_GetPath( const_cast<char *>(componentCString.get()), sizeof(dir), dir )) != REGERR_OK)
         {
           // no path, either
           *dir = '\0';
@@ -1286,7 +1286,7 @@ nsInstall::LoadResources(JSContext* cx, const nsString& aBaseName, jsval* aRetur
 
         if (!pKey.IsEmpty() && !pVal.IsEmpty())
         {
-            JSString* propValJSStr = JS_NewUCStringCopyZ(cx, NS_REINTERPRET_CAST(const jschar*, pVal.get()));
+            JSString* propValJSStr = JS_NewUCStringCopyZ(cx, reinterpret_cast<const jschar*>(pVal.get()));
             jsval propValJSVal = STRING_TO_JSVAL(propValJSStr);
             NS_ConvertUTF8toUTF16 UCKey(pKey);
             JS_SetUCProperty(cx, res, (jschar*)UCKey.get(), UCKey.Length(), &propValJSVal);
@@ -1497,7 +1497,7 @@ nsInstall::StartInstall(const nsString& aUserPackageName, const nsString& aRegis
 
     mPackageFolder = nsnull;
     if(REGERR_OK == VR_GetDefaultDirectory(
-                        NS_CONST_CAST(char *, NS_ConvertUTF16toUTF8(mRegistryPackageName).get()),
+                        const_cast<char *>(NS_ConvertUTF16toUTF8(mRegistryPackageName).get()),
                         sizeof(szRegPackagePath), szRegPackagePath))
     {
         // found one saved in the registry
diff --git a/mozilla/xpinstall/src/nsInstallFile.cpp b/mozilla/xpinstall/src/nsInstallFile.cpp
index 61309cf001f..1c186631707 100644
--- a/mozilla/xpinstall/src/nsInstallFile.cpp
+++ b/mozilla/xpinstall/src/nsInstallFile.cpp
@@ -315,9 +315,9 @@ PRInt32 nsInstallFile::Complete()
     {
         nsCAutoString path;
         mFinalFile->GetNativePath(path);
-        VR_Install( NS_CONST_CAST(char*, NS_ConvertUTF16toUTF8(*mVersionRegistryName).get()),
-                    NS_CONST_CAST(char*, path.get()),
-                    NS_CONST_CAST(char*, NS_ConvertUTF16toUTF8(*mVersionInfo).get()),
+        VR_Install( const_cast<char*>(NS_ConvertUTF16toUTF8(*mVersionRegistryName).get()),
+                    const_cast<char*>(path.get()),
+                    const_cast<char*>(NS_ConvertUTF16toUTF8(*mVersionInfo).get()),
                     PR_FALSE );
     }
     
diff --git a/mozilla/xpinstall/src/nsInstallPatch.cpp b/mozilla/xpinstall/src/nsInstallPatch.cpp
index df2679a0d52..d86b23b357b 100644
--- a/mozilla/xpinstall/src/nsInstallPatch.cpp
+++ b/mozilla/xpinstall/src/nsInstallPatch.cpp
@@ -100,7 +100,7 @@ nsInstallPatch::nsInstallPatch( nsInstall* inInstall,
 
     char tempTargetFile[MAXREGPATHLEN];
 
-    PRInt32 err = VR_GetPath( NS_CONST_CAST(char *, NS_ConvertUTF16toUTF8(inVRName).get()),
+    PRInt32 err = VR_GetPath( const_cast<char *>(NS_ConvertUTF16toUTF8(inVRName).get()),
                               sizeof(tempTargetFile), tempTargetFile );
     
     if (err != REGERR_OK)
@@ -328,9 +328,9 @@ PRInt32 nsInstallPatch::Complete()
             // DO NOT propagate version registry errors, it will abort 
             // FinalizeInstall() leaving things hosed. These piddly errors
             // aren't worth that.
-            VR_Install( NS_CONST_CAST(char *, NS_ConvertUTF16toUTF8(*mRegistryName).get()),
-                        NS_CONST_CAST(char *, tempPath.get()),
-                        NS_CONST_CAST(char *, NS_ConvertUTF16toUTF8(tempVersionString).get()),
+            VR_Install( const_cast<char *>(NS_ConvertUTF16toUTF8(*mRegistryName).get()),
+                        const_cast<char *>(tempPath.get()),
+                        const_cast<char *>(NS_ConvertUTF16toUTF8(tempVersionString).get()),
                         PR_FALSE );
         }
         else
@@ -491,7 +491,7 @@ nsInstallPatch::NativePatch(nsIFile *sourceFile, nsIFile *patchFile, nsIFile **n
         nsCAutoString unboundFile;
         uniqueSrcFile->GetNativePath(unboundFile);
 
-        if (su_unbind(NS_CONST_CAST(char*, realfile.get()), NS_CONST_CAST(char*,unboundFile.get())))  //
+        if (su_unbind(const_cast<char*>(realfile.get()), const_cast<char*>(unboundFile.get())))  //
         {
             // un-binding worked, save the tmp name for later
             uniqueSrcFile->GetNativePath(realfile);
diff --git a/mozilla/xpinstall/src/nsInstallTrigger.cpp b/mozilla/xpinstall/src/nsInstallTrigger.cpp
index c2a4ca5db33..d5b90742299 100644
--- a/mozilla/xpinstall/src/nsInstallTrigger.cpp
+++ b/mozilla/xpinstall/src/nsInstallTrigger.cpp
@@ -539,11 +539,11 @@ nsInstallTrigger::CompareVersion(const nsString& aRegName, nsIDOMInstallVersion*
     REGERR               status;
     nsInstallVersion     regNameVersion;
 
-    status = VR_GetVersion( NS_CONST_CAST(char *, regName.get()), &cVersion );
+    status = VR_GetVersion( const_cast<char *>(regName.get()), &cVersion );
     if ( status == REGERR_OK )
     {
         // we found the version
-        if ( VR_ValidateComponent( NS_CONST_CAST(char *, regName.get()) ) != REGERR_NOFILE )
+        if ( VR_ValidateComponent( const_cast<char *>(regName.get()) ) != REGERR_NOFILE )
         {
             // and the installed file was not missing:  do the compare
             regNameVersion.Init(cVersion.major,
@@ -565,7 +565,7 @@ nsInstallTrigger::GetVersion(const nsString& component, nsString& version)
     NS_ConvertUTF16toUTF8 regName(component);
     REGERR               status;
 
-    status = VR_GetVersion( NS_CONST_CAST(char *, regName.get()), &cVersion );
+    status = VR_GetVersion( const_cast<char *>(regName.get()), &cVersion );
 
     version.Truncate();
 
diff --git a/mozilla/xpinstall/src/nsInstallUninstall.cpp b/mozilla/xpinstall/src/nsInstallUninstall.cpp
index 193f9e7c971..5bdf924d44f 100644
--- a/mozilla/xpinstall/src/nsInstallUninstall.cpp
+++ b/mozilla/xpinstall/src/nsInstallUninstall.cpp
@@ -68,7 +68,7 @@ nsInstallUninstall::nsInstallUninstall( nsInstall* inInstall,
     mRegName.Assign(regName);
 
     char* userName = (char*)PR_Malloc(MAXREGPATHLEN);
-    PRInt32 err = VR_GetUninstallUserName( NS_CONST_CAST(char*, NS_ConvertUTF16toUTF8(regName).get()),
+    PRInt32 err = VR_GetUninstallUserName( const_cast<char*>(NS_ConvertUTF16toUTF8(regName).get()),
                                            userName, 
                                            MAXREGPATHLEN );
     
@@ -102,7 +102,7 @@ PRInt32 nsInstallUninstall::Complete()
     if (mInstall == NULL) 
        return nsInstall::INVALID_ARGUMENTS;
 
-    err = SU_Uninstall( NS_CONST_CAST(char*, NS_ConvertUTF16toUTF8(mRegName).get()) );
+    err = SU_Uninstall( const_cast<char*>(NS_ConvertUTF16toUTF8(mRegName).get()) );
     
     return err;
 }
diff --git a/mozilla/xpinstall/src/nsJSFile.cpp b/mozilla/xpinstall/src/nsJSFile.cpp
index d62632a4d55..3ea20782c8f 100644
--- a/mozilla/xpinstall/src/nsJSFile.cpp
+++ b/mozilla/xpinstall/src/nsJSFile.cpp
@@ -601,7 +601,7 @@ InstallFileOpFileGetNativeVersion(JSContext *cx, JSObject *obj, uintN argc, jsva
     return JS_TRUE;
   }
 
-  *rval = STRING_TO_JSVAL(JS_NewUCStringCopyN(cx, NS_REINTERPRET_CAST(const jschar*, nativeRet.get()), nativeRet.Length()));
+  *rval = STRING_TO_JSVAL(JS_NewUCStringCopyN(cx, reinterpret_cast<const jschar*>(nativeRet.get()), nativeRet.Length()));
 
   return JS_TRUE;
 }
@@ -1106,7 +1106,7 @@ InstallFileOpFileWindowsGetShortName(JSContext *cx, JSObject *obj, uintN argc, j
   }
 
   if(!shortPathName.IsEmpty())
-    *rval = STRING_TO_JSVAL(JS_NewUCStringCopyN(cx, NS_REINTERPRET_CAST(const jschar*, shortPathName.get()), shortPathName.Length()));
+    *rval = STRING_TO_JSVAL(JS_NewUCStringCopyN(cx, reinterpret_cast<const jschar*>(shortPathName.get()), shortPathName.Length()));
 
   return JS_TRUE;
 }
diff --git a/mozilla/xpinstall/src/nsJSFileSpecObj.cpp b/mozilla/xpinstall/src/nsJSFileSpecObj.cpp
index ca31ba9bbd3..3f425bd1342 100644
--- a/mozilla/xpinstall/src/nsJSFileSpecObj.cpp
+++ b/mozilla/xpinstall/src/nsJSFileSpecObj.cpp
@@ -103,8 +103,8 @@ fso_ToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 
 
   JSString *jsstring =
-    JS_NewUCStringCopyN(cx, NS_REINTERPRET_CAST(const jschar*,
-                                                stringReturned.get()),
+    JS_NewUCStringCopyN(cx, reinterpret_cast<const jschar*>
+                                            (stringReturned.get()),
                         stringReturned.Length());
 
   // set the return value
diff --git a/mozilla/xpinstall/src/nsJSInstall.cpp b/mozilla/xpinstall/src/nsJSInstall.cpp
index a3f87687b0e..caedf7aaf4e 100644
--- a/mozilla/xpinstall/src/nsJSInstall.cpp
+++ b/mozilla/xpinstall/src/nsJSInstall.cpp
@@ -166,7 +166,7 @@ GetInstallProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
         nsAutoString prop;
 
         a->GetInstallArguments(prop);
-        *vp = STRING_TO_JSVAL( JS_NewUCStringCopyN(cx, NS_REINTERPRET_CAST(const jschar*, prop.get()), prop.Length()) );
+        *vp = STRING_TO_JSVAL( JS_NewUCStringCopyN(cx, reinterpret_cast<const jschar*>(prop.get()), prop.Length()) );
 
         break;
       }
@@ -176,7 +176,7 @@ GetInstallProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
         nsString prop;
 
         a->GetInstallURL(prop);
-        *vp = STRING_TO_JSVAL( JS_NewUCStringCopyN(cx, NS_REINTERPRET_CAST(const jschar*, prop.get()), prop.Length()) );
+        *vp = STRING_TO_JSVAL( JS_NewUCStringCopyN(cx, reinterpret_cast<const jschar*>(prop.get()), prop.Length()) );
 
         break;
       }
@@ -255,7 +255,7 @@ void ConvertJSValToStr(nsString&  aString,
   if ( !JSVAL_IS_NULL(aValue) &&
        (jsstring = JS_ValueToString(aContext, aValue)) != nsnull)
   {
-    aString.Assign(NS_REINTERPRET_CAST(const PRUnichar*, JS_GetStringChars(jsstring)));
+    aString.Assign(reinterpret_cast<const PRUnichar*>(JS_GetStringChars(jsstring)));
   }
   else
   {
@@ -267,7 +267,7 @@ void ConvertStrToJSVal(const nsString& aProp,
                       JSContext* aContext,
                       jsval* aReturn)
 {
-  JSString *jsstring = JS_NewUCStringCopyN(aContext, NS_REINTERPRET_CAST(const jschar*, aProp.get()), aProp.Length());
+  JSString *jsstring = JS_NewUCStringCopyN(aContext, reinterpret_cast<const jschar*>(aProp.get()), aProp.Length());
   // set the return value
   *aReturn = STRING_TO_JSVAL(jsstring);
 }
diff --git a/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp b/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp
index cdafac33df3..51c8159c35a 100644
--- a/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp
+++ b/mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp
@@ -311,26 +311,26 @@ InstallTriggerGlobalInstall(JSContext *cx, JSObject *obj, uintN argc, jsval *arg
           break;
         }
 
-        name = NS_REINTERPRET_CAST(const PRUnichar*, JS_GetStringChars( str ));
+        name = reinterpret_cast<const PRUnichar*>(JS_GetStringChars( str ));
 
         URL = iconURL = nsnull;
         hash = nsnull;
-        JS_GetUCProperty( cx, JSVAL_TO_OBJECT(argv[0]), NS_REINTERPRET_CAST(const jschar*, name), nsCRT::strlen(name), &v );
+        JS_GetUCProperty( cx, JSVAL_TO_OBJECT(argv[0]), reinterpret_cast<const jschar*>(name), nsCRT::strlen(name), &v );
         if ( JSVAL_IS_OBJECT(v) && JSVAL_TO_OBJECT(v) ) 
         {
           jsval v2;
           if (JS_GetProperty( cx, JSVAL_TO_OBJECT(v), "URL", &v2 ) && !JSVAL_IS_VOID(v2))
-            URL = NS_REINTERPRET_CAST(const PRUnichar*, JS_GetStringChars( JS_ValueToString( cx, v2 ) ));
+            URL = reinterpret_cast<const PRUnichar*>(JS_GetStringChars( JS_ValueToString( cx, v2 ) ));
 
           if (JS_GetProperty( cx, JSVAL_TO_OBJECT(v), "IconURL", &v2 ) && !JSVAL_IS_VOID(v2))
-            iconURL = NS_REINTERPRET_CAST(const PRUnichar*, JS_GetStringChars( JS_ValueToString( cx, v2 ) ));
+            iconURL = reinterpret_cast<const PRUnichar*>(JS_GetStringChars( JS_ValueToString( cx, v2 ) ));
 
           if (JS_GetProperty( cx, JSVAL_TO_OBJECT(v), "Hash", &v2) && !JSVAL_IS_VOID(v2))
-            hash = NS_REINTERPRET_CAST(const char*, JS_GetStringBytes( JS_ValueToString( cx, v2 ) ));
+            hash = reinterpret_cast<const char*>(JS_GetStringBytes( JS_ValueToString( cx, v2 ) ));
         }
         else
         {
-          URL = NS_REINTERPRET_CAST(const PRUnichar*, JS_GetStringChars( JS_ValueToString( cx, v ) ));
+          URL = reinterpret_cast<const PRUnichar*>(JS_GetStringChars( JS_ValueToString( cx, v ) ));
         }
 
         if ( URL )
diff --git a/mozilla/xpinstall/src/nsJSInstallVersion.cpp b/mozilla/xpinstall/src/nsJSInstallVersion.cpp
index 3881bcf5fa7..0192791be9c 100644
--- a/mozilla/xpinstall/src/nsJSInstallVersion.cpp
+++ b/mozilla/xpinstall/src/nsJSInstallVersion.cpp
@@ -335,8 +335,8 @@ InstallVersionInit(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval
   {
     JSString *jsstring;
     if ((jsstring = JS_ValueToString(cx, argv[0])) != nsnull) {
-      b0.Assign(NS_REINTERPRET_CAST(const PRUnichar*,
-                                    JS_GetStringChars(jsstring)));
+      b0.Assign(reinterpret_cast<const PRUnichar*>
+                                (JS_GetStringChars(jsstring)));
     }
   }
   else 
@@ -379,8 +379,8 @@ InstallVersionToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js
   }
 
   JSString *jsstring =
-    JS_NewUCStringCopyN(cx, NS_REINTERPRET_CAST(const jschar*,
-                                                nativeRet.get()),
+    JS_NewUCStringCopyN(cx, reinterpret_cast<const jschar*>
+                                            (nativeRet.get()),
                         nativeRet.Length());
 
   // set the return value
diff --git a/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp b/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp
index e65762d5405..6a3aa3b5dbb 100644
--- a/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp
+++ b/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp
@@ -179,9 +179,9 @@ XPInstallErrorReporter(JSContext *cx, const char *message, JSErrorReport *report
 
         PRUint32 column = report->uctokenptr - report->uclinebuf;
 
-        rv = errorObject->Init(NS_REINTERPRET_CAST(const PRUnichar*, report->ucmessage),
+        rv = errorObject->Init(reinterpret_cast<const PRUnichar*>(report->ucmessage),
                                NS_ConvertASCIItoUTF16(report->filename).get(),
-                               NS_REINTERPRET_CAST(const PRUnichar*, report->uclinebuf),
+                               reinterpret_cast<const PRUnichar*>(report->uclinebuf),
                                report->lineno, column, report->flags,
                                "XPInstall JavaScript");
         if (NS_SUCCEEDED(rv)) {
@@ -216,7 +216,7 @@ XPInstallErrorReporter(JSContext *cx, const char *message, JSErrorReport *report
             logMessage.AppendInt(report->lineno, 10);
             logMessage.AppendLiteral("\t");
             if (report->ucmessage)
-                logMessage.Append( NS_REINTERPRET_CAST(const PRUnichar*, report->ucmessage) );
+                logMessage.Append( reinterpret_cast<const PRUnichar*>(report->ucmessage) );
             else
                 logMessage.AppendWithConversion( message );
         }
diff --git a/mozilla/xpinstall/src/nsWinReg.cpp b/mozilla/xpinstall/src/nsWinReg.cpp
index 9de2ad24615..9a8be894045 100644
--- a/mozilla/xpinstall/src/nsWinReg.cpp
+++ b/mozilla/xpinstall/src/nsWinReg.cpp
@@ -639,7 +639,7 @@ nsWinReg::NativeCreateKey(const nsString& aSubkey, const nsString& aClassname)
         return nsInstall::UNEXPECTED_ERROR;
 
     root   = (HKEY)mRootKey;
-    result = RegCreateKeyEx(root, subkey.get(), 0, NS_CONST_CAST(char*, classname.get()),
+    result = RegCreateKeyEx(root, subkey.get(), 0, const_cast<char*>(classname.get()),
                 REG_OPTION_NON_VOLATILE, KEY_WRITE, nsnull, &newkey, &disposition);
 
     if(ERROR_SUCCESS == result)
@@ -759,7 +759,7 @@ nsWinReg::NativeGetValueString(const nsString& aSubkey, const nsString& aValname
             // this cast is ok until mozilla is compiled in UNICODE, then this
             // will break.
             nsAutoString value;
-            if (NS_SUCCEEDED( NS_CopyNativeToUnicode(nsDependentCString(NS_REINTERPRET_CAST(const char *, valbuf)), value) ) )
+            if (NS_SUCCEEDED( NS_CopyNativeToUnicode(nsDependentCString(reinterpret_cast<const char *>(valbuf)), value) ) )
               aReturn->Assign(value);
             else
               result = nsInstall::UNEXPECTED_ERROR;
diff --git a/mozilla/xpinstall/src/nsXPInstallManager.cpp b/mozilla/xpinstall/src/nsXPInstallManager.cpp
index 20f4728712a..8ee6c86f126 100644
--- a/mozilla/xpinstall/src/nsXPInstallManager.cpp
+++ b/mozilla/xpinstall/src/nsXPInstallManager.cpp
@@ -860,7 +860,7 @@ void nsXPInstallManager::Shutdown()
         {
             for (PRUint32 i = 0; i < mTriggers->Size(); i++ )
             {
-                item = NS_STATIC_CAST(nsXPITriggerItem*, mTriggers->Get(i));
+                item = static_cast<nsXPITriggerItem*>(mTriggers->Get(i));
                 if ( item && item->mFile && !item->IsFileURL() )
                     item->mFile->Remove(PR_FALSE);
             }