diff --git a/mozilla/chrome/src/nsChromeFactory.cpp b/mozilla/chrome/src/nsChromeFactory.cpp
index bb011283e4e..084956d9028 100644
--- a/mozilla/chrome/src/nsChromeFactory.cpp
+++ b/mozilla/chrome/src/nsChromeFactory.cpp
@@ -65,5 +65,5 @@ static const nsModuleComponentInfo components[] =
     }
 };
 
-NS_IMPL_NSGETMODULE(nsChromeModule, components);
+NS_IMPL_NSGETMODULE(nsChromeModule, components)
 
diff --git a/mozilla/chrome/src/nsChromeProtocolHandler.cpp b/mozilla/chrome/src/nsChromeProtocolHandler.cpp
index b562377260e..a2196e423e0 100644
--- a/mozilla/chrome/src/nsChromeProtocolHandler.cpp
+++ b/mozilla/chrome/src/nsChromeProtocolHandler.cpp
@@ -512,7 +512,7 @@ nsChromeProtocolHandler::~nsChromeProtocolHandler()
 {
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS2(nsChromeProtocolHandler, nsIProtocolHandler, nsISupportsWeakReference);
+NS_IMPL_THREADSAFE_ISUPPORTS2(nsChromeProtocolHandler, nsIProtocolHandler, nsISupportsWeakReference)
 
 NS_METHOD
 nsChromeProtocolHandler::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
diff --git a/mozilla/chrome/src/nsChromeRegistry.cpp b/mozilla/chrome/src/nsChromeRegistry.cpp
index ac19d75a7c2..3847db8ca8d 100644
--- a/mozilla/chrome/src/nsChromeRegistry.cpp
+++ b/mozilla/chrome/src/nsChromeRegistry.cpp
@@ -309,7 +309,7 @@ nsChromeRegistry::~nsChromeRegistry()
 
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS4(nsChromeRegistry, nsIChromeRegistry, nsIXULChromeRegistry, nsIObserver, nsISupportsWeakReference);
+NS_IMPL_THREADSAFE_ISUPPORTS4(nsChromeRegistry, nsIChromeRegistry, nsIXULChromeRegistry, nsIObserver, nsISupportsWeakReference)
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsIChromeRegistry methods:
diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp
index 6d24834dec7..3fbb9e9dae2 100644
--- a/mozilla/content/base/src/nsDocument.cpp
+++ b/mozilla/content/base/src/nsDocument.cpp
@@ -321,8 +321,8 @@ NS_INTERFACE_MAP_BEGIN(nsDOMImplementation)
 NS_INTERFACE_MAP_END
 
 
-NS_IMPL_ADDREF(nsDOMImplementation);
-NS_IMPL_RELEASE(nsDOMImplementation);
+NS_IMPL_ADDREF(nsDOMImplementation)
+NS_IMPL_RELEASE(nsDOMImplementation)
 
 
 NS_IMETHODIMP
diff --git a/mozilla/content/base/src/nsDocumentViewer.cpp b/mozilla/content/base/src/nsDocumentViewer.cpp
index 650842bed76..5b0c3b7f5ba 100644
--- a/mozilla/content/base/src/nsDocumentViewer.cpp
+++ b/mozilla/content/base/src/nsDocumentViewer.cpp
@@ -2711,7 +2711,7 @@ NS_IMETHODIMP DocumentViewerImpl::SizeToContent()
 #pragma mark -
 #endif
 
-NS_IMPL_ISUPPORTS1(nsDocViewerSelectionListener, nsISelectionListener);
+NS_IMPL_ISUPPORTS1(nsDocViewerSelectionListener, nsISelectionListener)
 
 nsresult nsDocViewerSelectionListener::Init(DocumentViewerImpl *aDocViewer)
 {
@@ -2950,7 +2950,7 @@ NS_IMETHODIMP nsDocViewerSelectionListener::NotifySelectionChanged(nsIDOMDocumen
 }
 
 //nsDocViewerFocusListener
-NS_IMPL_ISUPPORTS1(nsDocViewerFocusListener, nsIDOMFocusListener);
+NS_IMPL_ISUPPORTS1(nsDocViewerFocusListener, nsIDOMFocusListener)
 
 nsDocViewerFocusListener::nsDocViewerFocusListener()
 :mDocViewer(nsnull)
diff --git a/mozilla/content/base/src/nsFrameLoader.cpp b/mozilla/content/base/src/nsFrameLoader.cpp
index 7ee7994e823..38a97455aca 100644
--- a/mozilla/content/base/src/nsFrameLoader.cpp
+++ b/mozilla/content/base/src/nsFrameLoader.cpp
@@ -139,8 +139,8 @@ NS_INTERFACE_MAP_BEGIN(nsFrameLoader)
 NS_INTERFACE_MAP_END
 
 
-NS_IMPL_ADDREF(nsFrameLoader);
-NS_IMPL_RELEASE(nsFrameLoader);
+NS_IMPL_ADDREF(nsFrameLoader)
+NS_IMPL_RELEASE(nsFrameLoader)
 
 NS_IMETHODIMP
 nsFrameLoader::Init(nsIContent *aOwner)
diff --git a/mozilla/content/base/src/nsGenericElement.cpp b/mozilla/content/base/src/nsGenericElement.cpp
index e3c83a26925..f220b70fd92 100644
--- a/mozilla/content/base/src/nsGenericElement.cpp
+++ b/mozilla/content/base/src/nsGenericElement.cpp
@@ -523,7 +523,7 @@ nsDOMEventRTTearoff::nsDOMEventRTTearoff(nsIContent *aContent)
 
 nsDOMEventRTTearoff::~nsDOMEventRTTearoff()
 {
-};
+}
 
 
 NS_IMETHODIMP
diff --git a/mozilla/content/base/src/nsNodeInfo.cpp b/mozilla/content/base/src/nsNodeInfo.cpp
index 810cca96551..d74964b68f9 100644
--- a/mozilla/content/base/src/nsNodeInfo.cpp
+++ b/mozilla/content/base/src/nsNodeInfo.cpp
@@ -91,7 +91,7 @@ nsNodeInfo::Init(nsIAtom *aName, nsIAtom *aPrefix, PRInt32 aNamespaceID,
 
 // nsISupports
 
-NS_IMPL_ISUPPORTS1(nsNodeInfo, nsINodeInfo);
+NS_IMPL_ISUPPORTS1(nsNodeInfo, nsINodeInfo)
 
 
 // nsINodeInfo
diff --git a/mozilla/content/base/src/nsNodeInfoManager.cpp b/mozilla/content/base/src/nsNodeInfoManager.cpp
index 57bb093f030..0f3ea6fdeec 100644
--- a/mozilla/content/base/src/nsNodeInfoManager.cpp
+++ b/mozilla/content/base/src/nsNodeInfoManager.cpp
@@ -142,7 +142,7 @@ nsNodeInfoManager::~nsNodeInfoManager()
 }
 
 
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsNodeInfoManager, nsINodeInfoManager);
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsNodeInfoManager, nsINodeInfoManager)
 
 
 // nsINodeInfoManager
diff --git a/mozilla/content/base/src/nsTextContentChangeData.cpp b/mozilla/content/base/src/nsTextContentChangeData.cpp
index a9ddb82af91..bfbe4811487 100644
--- a/mozilla/content/base/src/nsTextContentChangeData.cpp
+++ b/mozilla/content/base/src/nsTextContentChangeData.cpp
@@ -63,7 +63,7 @@ nsTextContentChangeData::~nsTextContentChangeData()
 {
 }
 
-NS_IMPL_ISUPPORTS1(nsTextContentChangeData, nsITextContentChangeData);
+NS_IMPL_ISUPPORTS1(nsTextContentChangeData, nsITextContentChangeData)
 
 
 NS_IMETHODIMP
diff --git a/mozilla/content/events/src/nsDOMMutationEvent.cpp b/mozilla/content/events/src/nsDOMMutationEvent.cpp
index 6af511c7012..96015adf900 100644
--- a/mozilla/content/events/src/nsDOMMutationEvent.cpp
+++ b/mozilla/content/events/src/nsDOMMutationEvent.cpp
@@ -168,7 +168,7 @@ nsDOMMutationEvent::InitMutationEvent(const nsAString& aTypeArg, PRBool aCanBubb
   }
     
   return NS_OK;
-};
+}
 
 nsresult NS_NewDOMMutationEvent(nsIDOMEvent** aInstancePtrResult,
                                 nsIPresContext* aPresContext,
diff --git a/mozilla/content/html/content/src/nsHTMLButtonElement.cpp b/mozilla/content/html/content/src/nsHTMLButtonElement.cpp
index 163b5084d3c..fdd9a96b0b9 100644
--- a/mozilla/content/html/content/src/nsHTMLButtonElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLButtonElement.cpp
@@ -163,8 +163,8 @@ nsHTMLButtonElement::~nsHTMLButtonElement()
 
 // nsISupports
 
-NS_IMPL_ADDREF_INHERITED(nsHTMLButtonElement, nsGenericElement);
-NS_IMPL_RELEASE_INHERITED(nsHTMLButtonElement, nsGenericElement);
+NS_IMPL_ADDREF_INHERITED(nsHTMLButtonElement, nsGenericElement)
+NS_IMPL_RELEASE_INHERITED(nsHTMLButtonElement, nsGenericElement)
 
 
 // QueryInterface implementation for nsHTMLButtonElement
diff --git a/mozilla/content/html/content/src/nsHTMLDListElement.cpp b/mozilla/content/html/content/src/nsHTMLDListElement.cpp
index ff39645033f..fe4cfcb8bed 100644
--- a/mozilla/content/html/content/src/nsHTMLDListElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLDListElement.cpp
@@ -111,8 +111,8 @@ nsHTMLDListElement::~nsHTMLDListElement()
 }
 
 
-NS_IMPL_ADDREF(nsHTMLDListElement);
-NS_IMPL_RELEASE(nsHTMLDListElement);
+NS_IMPL_ADDREF(nsHTMLDListElement)
+NS_IMPL_RELEASE(nsHTMLDListElement)
 
 
 // QueryInterface implementation for nsHTMLDListElement
diff --git a/mozilla/content/html/content/src/nsHTMLDelElement.cpp b/mozilla/content/html/content/src/nsHTMLDelElement.cpp
index 7b6f70d6259..4b915d72c9f 100644
--- a/mozilla/content/html/content/src/nsHTMLDelElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLDelElement.cpp
@@ -103,8 +103,8 @@ nsHTMLDelElement::~nsHTMLDelElement()
 }
 
 
-NS_IMPL_ADDREF_INHERITED(nsHTMLDelElement, nsGenericElement);
-NS_IMPL_RELEASE_INHERITED(nsHTMLDelElement, nsGenericElement);
+NS_IMPL_ADDREF_INHERITED(nsHTMLDelElement, nsGenericElement)
+NS_IMPL_RELEASE_INHERITED(nsHTMLDelElement, nsGenericElement)
 
 
 // QueryInterface implementation for nsHTMLDelElement
diff --git a/mozilla/content/html/content/src/nsHTMLDirectoryElement.cpp b/mozilla/content/html/content/src/nsHTMLDirectoryElement.cpp
index f68444fbb43..26adb31ceae 100644
--- a/mozilla/content/html/content/src/nsHTMLDirectoryElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLDirectoryElement.cpp
@@ -117,8 +117,8 @@ nsHTMLDirectoryElement::~nsHTMLDirectoryElement()
 {
 }
 
-NS_IMPL_ADDREF_INHERITED(nsHTMLDirectoryElement, nsGenericElement);
-NS_IMPL_RELEASE_INHERITED(nsHTMLDirectoryElement, nsGenericElement);
+NS_IMPL_ADDREF_INHERITED(nsHTMLDirectoryElement, nsGenericElement)
+NS_IMPL_RELEASE_INHERITED(nsHTMLDirectoryElement, nsGenericElement)
 
 
 // QueryInterface implementation for nsHTMLDirectoryElement
diff --git a/mozilla/content/html/content/src/nsHTMLFieldSetElement.cpp b/mozilla/content/html/content/src/nsHTMLFieldSetElement.cpp
index 889162e3d12..b13db8fa8dc 100644
--- a/mozilla/content/html/content/src/nsHTMLFieldSetElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLFieldSetElement.cpp
@@ -115,8 +115,8 @@ nsHTMLFieldSetElement::~nsHTMLFieldSetElement()
 
 // nsISupports
 
-NS_IMPL_ADDREF_INHERITED(nsHTMLFieldSetElement, nsGenericElement);
-NS_IMPL_RELEASE_INHERITED(nsHTMLFieldSetElement, nsGenericElement);
+NS_IMPL_ADDREF_INHERITED(nsHTMLFieldSetElement, nsGenericElement)
+NS_IMPL_RELEASE_INHERITED(nsHTMLFieldSetElement, nsGenericElement)
 
 
 // QueryInterface implementation for nsHTMLFieldSetElement
diff --git a/mozilla/content/html/content/src/nsHTMLFontElement.cpp b/mozilla/content/html/content/src/nsHTMLFontElement.cpp
index b66441fede5..14636b6bfcc 100644
--- a/mozilla/content/html/content/src/nsHTMLFontElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLFontElement.cpp
@@ -116,8 +116,8 @@ nsHTMLFontElement::~nsHTMLFontElement()
 {
 }
 
-NS_IMPL_ADDREF_INHERITED(nsHTMLFontElement, nsGenericElement);
-NS_IMPL_RELEASE_INHERITED(nsHTMLFontElement, nsGenericElement);
+NS_IMPL_ADDREF_INHERITED(nsHTMLFontElement, nsGenericElement)
+NS_IMPL_RELEASE_INHERITED(nsHTMLFontElement, nsGenericElement)
 
 
 // QueryInterface implementation for nsHTMLFontElement
diff --git a/mozilla/content/html/content/src/nsHTMLFormElement.cpp b/mozilla/content/html/content/src/nsHTMLFormElement.cpp
index 80a12173646..43868c20d38 100644
--- a/mozilla/content/html/content/src/nsHTMLFormElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLFormElement.cpp
@@ -1849,7 +1849,7 @@ nsFormControlList::RemoveElementFromTable(nsIFormControl* aChild,
 }
 
 // nsFormControlEnumerator
-NS_IMPL_ISUPPORTS1(nsFormControlEnumerator, nsISimpleEnumerator);
+NS_IMPL_ISUPPORTS1(nsFormControlEnumerator, nsISimpleEnumerator)
 
 nsFormControlEnumerator::nsFormControlEnumerator(nsHTMLFormElement* aForm)
   : mForm(aForm), mElementsIndex(0), mNotInElementsIndex(0)
diff --git a/mozilla/content/html/content/src/nsHTMLFrameElement.cpp b/mozilla/content/html/content/src/nsHTMLFrameElement.cpp
index 501aba7d3d8..c9744bcc1b4 100644
--- a/mozilla/content/html/content/src/nsHTMLFrameElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLFrameElement.cpp
@@ -126,8 +126,8 @@ nsHTMLFrameElement::~nsHTMLFrameElement()
 }
 
 
-NS_IMPL_ADDREF_INHERITED(nsHTMLFrameElement, nsGenericElement);
-NS_IMPL_RELEASE_INHERITED(nsHTMLFrameElement, nsGenericElement);
+NS_IMPL_ADDREF_INHERITED(nsHTMLFrameElement, nsGenericElement)
+NS_IMPL_RELEASE_INHERITED(nsHTMLFrameElement, nsGenericElement)
 
 
 // QueryInterface implementation for nsHTMLFrameElement
diff --git a/mozilla/content/html/content/src/nsHTMLHeadElement.cpp b/mozilla/content/html/content/src/nsHTMLHeadElement.cpp
index e1d73f20e1d..3f51d166498 100644
--- a/mozilla/content/html/content/src/nsHTMLHeadElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLHeadElement.cpp
@@ -103,8 +103,8 @@ nsHTMLHeadElement::~nsHTMLHeadElement()
 }
 
 
-NS_IMPL_ADDREF_INHERITED(nsHTMLHeadElement, nsGenericElement);
-NS_IMPL_RELEASE_INHERITED(nsHTMLHeadElement, nsGenericElement);
+NS_IMPL_ADDREF_INHERITED(nsHTMLHeadElement, nsGenericElement)
+NS_IMPL_RELEASE_INHERITED(nsHTMLHeadElement, nsGenericElement)
 
 
 // QueryInterface implementation for nsHTMLHeadElement
diff --git a/mozilla/content/html/content/src/nsHTMLIFrameElement.cpp b/mozilla/content/html/content/src/nsHTMLIFrameElement.cpp
index ec660680455..88ee9c8db1e 100644
--- a/mozilla/content/html/content/src/nsHTMLIFrameElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLIFrameElement.cpp
@@ -170,8 +170,8 @@ nsHTMLIFrameElement::~nsHTMLIFrameElement()
 }
 
 
-NS_IMPL_ADDREF(nsHTMLIFrameElement);
-NS_IMPL_RELEASE(nsHTMLIFrameElement);
+NS_IMPL_ADDREF(nsHTMLIFrameElement)
+NS_IMPL_RELEASE(nsHTMLIFrameElement)
 
 // QueryInterface implementation for nsHTMLIFrameElement
 NS_HTML_CONTENT_INTERFACE_MAP_BEGIN(nsHTMLIFrameElement,
diff --git a/mozilla/content/html/content/src/nsHTMLInsElement.cpp b/mozilla/content/html/content/src/nsHTMLInsElement.cpp
index fcc9dda08af..b566002bf13 100644
--- a/mozilla/content/html/content/src/nsHTMLInsElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLInsElement.cpp
@@ -103,8 +103,8 @@ nsHTMLInsElement::~nsHTMLInsElement()
 }
 
 
-NS_IMPL_ADDREF_INHERITED(nsHTMLInsElement, nsGenericElement);
-NS_IMPL_RELEASE_INHERITED(nsHTMLInsElement, nsGenericElement);
+NS_IMPL_ADDREF_INHERITED(nsHTMLInsElement, nsGenericElement)
+NS_IMPL_RELEASE_INHERITED(nsHTMLInsElement, nsGenericElement)
 
 
 // QueryInterface implementation for nsHTMLInsElement
diff --git a/mozilla/content/html/content/src/nsHTMLLIElement.cpp b/mozilla/content/html/content/src/nsHTMLLIElement.cpp
index 6b699ca6813..59c32dd8cf2 100644
--- a/mozilla/content/html/content/src/nsHTMLLIElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLLIElement.cpp
@@ -113,8 +113,8 @@ nsHTMLLIElement::~nsHTMLLIElement()
 }
 
 
-NS_IMPL_ADDREF_INHERITED(nsHTMLLIElement, nsGenericElement);
-NS_IMPL_RELEASE_INHERITED(nsHTMLLIElement, nsGenericElement);
+NS_IMPL_ADDREF_INHERITED(nsHTMLLIElement, nsGenericElement)
+NS_IMPL_RELEASE_INHERITED(nsHTMLLIElement, nsGenericElement)
 
 
 // QueryInterface implementation for nsHTMLLIElement
diff --git a/mozilla/content/html/content/src/nsHTMLMenuElement.cpp b/mozilla/content/html/content/src/nsHTMLMenuElement.cpp
index 5793f2c7d4a..700abf672cf 100644
--- a/mozilla/content/html/content/src/nsHTMLMenuElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLMenuElement.cpp
@@ -119,8 +119,8 @@ nsHTMLMenuElement::~nsHTMLMenuElement()
 }
 
 
-NS_IMPL_ADDREF_INHERITED(nsHTMLMenuElement, nsGenericElement);
-NS_IMPL_RELEASE_INHERITED(nsHTMLMenuElement, nsGenericElement);
+NS_IMPL_ADDREF_INHERITED(nsHTMLMenuElement, nsGenericElement)
+NS_IMPL_RELEASE_INHERITED(nsHTMLMenuElement, nsGenericElement)
 
 
 // QueryInterface implementation for nsHTMLMenuElement
diff --git a/mozilla/content/html/content/src/nsHTMLOptGroupElement.cpp b/mozilla/content/html/content/src/nsHTMLOptGroupElement.cpp
index cf83709e0d5..08334036efd 100644
--- a/mozilla/content/html/content/src/nsHTMLOptGroupElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLOptGroupElement.cpp
@@ -132,8 +132,8 @@ nsHTMLOptGroupElement::~nsHTMLOptGroupElement()
 }
 
 
-NS_IMPL_ADDREF_INHERITED(nsHTMLOptGroupElement, nsGenericElement);
-NS_IMPL_RELEASE_INHERITED(nsHTMLOptGroupElement, nsGenericElement);
+NS_IMPL_ADDREF_INHERITED(nsHTMLOptGroupElement, nsGenericElement)
+NS_IMPL_RELEASE_INHERITED(nsHTMLOptGroupElement, nsGenericElement)
 
 
 // QueryInterface implementation for nsHTMLOptGroupElement
diff --git a/mozilla/content/html/content/src/nsHTMLOptionElement.cpp b/mozilla/content/html/content/src/nsHTMLOptionElement.cpp
index 2c1accea6b3..d5a82def529 100644
--- a/mozilla/content/html/content/src/nsHTMLOptionElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLOptionElement.cpp
@@ -213,8 +213,8 @@ nsHTMLOptionElement::~nsHTMLOptionElement()
 // ISupports
 
 
-NS_IMPL_ADDREF_INHERITED(nsHTMLOptionElement, nsGenericElement);
-NS_IMPL_RELEASE_INHERITED(nsHTMLOptionElement, nsGenericElement);
+NS_IMPL_ADDREF_INHERITED(nsHTMLOptionElement, nsGenericElement)
+NS_IMPL_RELEASE_INHERITED(nsHTMLOptionElement, nsGenericElement)
 
 
 // QueryInterface implementation for nsHTMLOptionElement
diff --git a/mozilla/content/html/content/src/nsHTMLParagraphElement.cpp b/mozilla/content/html/content/src/nsHTMLParagraphElement.cpp
index a76d279725a..7c353d448bd 100644
--- a/mozilla/content/html/content/src/nsHTMLParagraphElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLParagraphElement.cpp
@@ -116,8 +116,8 @@ nsHTMLParagraphElement::~nsHTMLParagraphElement()
 }
 
 
-NS_IMPL_ADDREF_INHERITED(nsHTMLParagraphElement, nsGenericElement);
-NS_IMPL_RELEASE_INHERITED(nsHTMLParagraphElement, nsGenericElement);
+NS_IMPL_ADDREF_INHERITED(nsHTMLParagraphElement, nsGenericElement)
+NS_IMPL_RELEASE_INHERITED(nsHTMLParagraphElement, nsGenericElement)
 
 
 // QueryInterface implementation for nsHTMLParagraphElement
diff --git a/mozilla/content/html/content/src/nsHTMLPreElement.cpp b/mozilla/content/html/content/src/nsHTMLPreElement.cpp
index d0500ca7fac..02a743df491 100644
--- a/mozilla/content/html/content/src/nsHTMLPreElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLPreElement.cpp
@@ -118,8 +118,8 @@ nsHTMLPreElement::~nsHTMLPreElement()
 }
 
 
-NS_IMPL_ADDREF_INHERITED(nsHTMLPreElement, nsGenericElement);
-NS_IMPL_RELEASE_INHERITED(nsHTMLPreElement, nsGenericElement);
+NS_IMPL_ADDREF_INHERITED(nsHTMLPreElement, nsGenericElement)
+NS_IMPL_RELEASE_INHERITED(nsHTMLPreElement, nsGenericElement)
 
 
 // QueryInterface implementation for nsHTMLPreElement
diff --git a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp
index 09712be1a18..868e90bf2a5 100644
--- a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp
@@ -486,8 +486,8 @@ nsHTMLSelectElement::~nsHTMLSelectElement()
 
 // ISupports
 
-NS_IMPL_ADDREF_INHERITED(nsHTMLSelectElement, nsGenericElement);
-NS_IMPL_RELEASE_INHERITED(nsHTMLSelectElement, nsGenericElement);
+NS_IMPL_ADDREF_INHERITED(nsHTMLSelectElement, nsGenericElement)
+NS_IMPL_RELEASE_INHERITED(nsHTMLSelectElement, nsGenericElement)
 
 
 // QueryInterface implementation for nsHTMLSelectElement
diff --git a/mozilla/content/html/content/src/nsHTMLSharedContainerElem.cpp b/mozilla/content/html/content/src/nsHTMLSharedContainerElem.cpp
index a2ad24f84aa..543f360468d 100644
--- a/mozilla/content/html/content/src/nsHTMLSharedContainerElem.cpp
+++ b/mozilla/content/html/content/src/nsHTMLSharedContainerElem.cpp
@@ -135,8 +135,8 @@ nsHTMLSharedContainerElement::~nsHTMLSharedContainerElement()
 }
 
 
-NS_IMPL_ADDREF_INHERITED(nsHTMLSharedContainerElement, nsGenericElement);
-NS_IMPL_RELEASE_INHERITED(nsHTMLSharedContainerElement, nsGenericElement);
+NS_IMPL_ADDREF_INHERITED(nsHTMLSharedContainerElement, nsGenericElement)
+NS_IMPL_RELEASE_INHERITED(nsHTMLSharedContainerElement, nsGenericElement)
 
 
 // QueryInterface implementation for nsHTMLSharedContainerElement
diff --git a/mozilla/content/html/content/src/nsHTMLSpanElement.cpp b/mozilla/content/html/content/src/nsHTMLSpanElement.cpp
index 702e99ee8b5..3bb32271bc4 100644
--- a/mozilla/content/html/content/src/nsHTMLSpanElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLSpanElement.cpp
@@ -103,8 +103,8 @@ nsHTMLSpanElement::~nsHTMLSpanElement()
 }
 
 
-NS_IMPL_ADDREF_INHERITED(nsHTMLSpanElement, nsGenericElement);
-NS_IMPL_RELEASE_INHERITED(nsHTMLSpanElement, nsGenericElement);
+NS_IMPL_ADDREF_INHERITED(nsHTMLSpanElement, nsGenericElement)
+NS_IMPL_RELEASE_INHERITED(nsHTMLSpanElement, nsGenericElement)
 
 
 // QueryInterface implementation for nsHTMLSpanElement
diff --git a/mozilla/content/html/content/src/nsHTMLTableCaptionElement.cpp b/mozilla/content/html/content/src/nsHTMLTableCaptionElement.cpp
index 8e31a0f38ce..d0613c0207a 100644
--- a/mozilla/content/html/content/src/nsHTMLTableCaptionElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLTableCaptionElement.cpp
@@ -113,8 +113,8 @@ nsHTMLTableCaptionElement::~nsHTMLTableCaptionElement()
 }
 
 
-NS_IMPL_ADDREF_INHERITED(nsHTMLTableCaptionElement, nsGenericElement);
-NS_IMPL_RELEASE_INHERITED(nsHTMLTableCaptionElement, nsGenericElement);
+NS_IMPL_ADDREF_INHERITED(nsHTMLTableCaptionElement, nsGenericElement)
+NS_IMPL_RELEASE_INHERITED(nsHTMLTableCaptionElement, nsGenericElement)
 
 
 // QueryInterface implementation for nsHTMLTableCaptionElement
diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
index 28b5a144110..83f760d4fd1 100644
--- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp
+++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
@@ -690,9 +690,9 @@ public:
 PRInt32 DummyParserRequest::gRefCnt;
 nsIURI* DummyParserRequest::gURI;
 
-NS_IMPL_ADDREF(DummyParserRequest);
-NS_IMPL_RELEASE(DummyParserRequest);
-NS_IMPL_QUERY_INTERFACE2(DummyParserRequest, nsIRequest, nsIChannel);
+NS_IMPL_ADDREF(DummyParserRequest)
+NS_IMPL_RELEASE(DummyParserRequest)
+NS_IMPL_QUERY_INTERFACE2(DummyParserRequest, nsIRequest, nsIChannel)
 
 nsresult
 DummyParserRequest::Create(nsIRequest** aResult, nsIHTMLContentSink* aSink)
@@ -1097,7 +1097,7 @@ nsHTMLElementFactory::~nsHTMLElementFactory()
 }
 
 NS_IMPL_ISUPPORTS2(nsHTMLElementFactory, nsIElementFactory,
-                   nsISupportsWeakReference);
+                   nsISupportsWeakReference)
 
 NS_IMETHODIMP
 nsHTMLElementFactory::CreateInstanceByTag(nsINodeInfo *aNodeInfo,
diff --git a/mozilla/content/html/document/src/nsImageDocument.cpp b/mozilla/content/html/document/src/nsImageDocument.cpp
index 7ef7d8ca78d..affa47044dc 100644
--- a/mozilla/content/html/document/src/nsImageDocument.cpp
+++ b/mozilla/content/html/document/src/nsImageDocument.cpp
@@ -145,7 +145,7 @@ ImageListener::ImageListener(nsImageDocument* aDocument)
 
 ImageListener::~ImageListener()
 {
-};
+}
 
 NS_IMETHODIMP
 ImageListener::OnStartRequest(nsIRequest* request, nsISupports *ctxt)
diff --git a/mozilla/content/html/document/src/nsWyciwygProtocolHandler.cpp b/mozilla/content/html/document/src/nsWyciwygProtocolHandler.cpp
index f11a92013c9..885442fd7ef 100644
--- a/mozilla/content/html/document/src/nsWyciwygProtocolHandler.cpp
+++ b/mozilla/content/html/document/src/nsWyciwygProtocolHandler.cpp
@@ -42,7 +42,7 @@ nsWyciwygProtocolHandler::~nsWyciwygProtocolHandler()
 {
 }
 
-NS_IMPL_ISUPPORTS1(nsWyciwygProtocolHandler, nsIProtocolHandler);
+NS_IMPL_ISUPPORTS1(nsWyciwygProtocolHandler, nsIProtocolHandler)
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsIProtocolHandler methods:
diff --git a/mozilla/content/html/style/src/nsCSSLoader.cpp b/mozilla/content/html/style/src/nsCSSLoader.cpp
index 5b8e16c5192..e6afdfb625d 100644
--- a/mozilla/content/html/style/src/nsCSSLoader.cpp
+++ b/mozilla/content/html/style/src/nsCSSLoader.cpp
@@ -113,7 +113,7 @@ static const char* const gStateStrings[] = {
 /********************************
  * SheetLoadData implementation *
  ********************************/
-NS_IMPL_ISUPPORTS1(SheetLoadData, nsIUnicharStreamLoaderObserver);
+NS_IMPL_ISUPPORTS1(SheetLoadData, nsIUnicharStreamLoaderObserver)
 
 SheetLoadData::SheetLoadData(CSSLoaderImpl* aLoader,
                              const nsAString& aTitle,
diff --git a/mozilla/content/html/style/src/nsCSSRules.cpp b/mozilla/content/html/style/src/nsCSSRules.cpp
index b666afe719f..60d67c30d34 100644
--- a/mozilla/content/html/style/src/nsCSSRules.cpp
+++ b/mozilla/content/html/style/src/nsCSSRules.cpp
@@ -126,8 +126,8 @@ NS_INTERFACE_MAP_BEGIN(CSSGroupRuleRuleListImpl)
 NS_INTERFACE_MAP_END
 
 
-NS_IMPL_ADDREF(CSSGroupRuleRuleListImpl);
-NS_IMPL_RELEASE(CSSGroupRuleRuleListImpl);
+NS_IMPL_ADDREF(CSSGroupRuleRuleListImpl)
+NS_IMPL_RELEASE(CSSGroupRuleRuleListImpl)
 
 NS_IMETHODIMP    
 CSSGroupRuleRuleListImpl::GetLength(PRUint32* aLength)
@@ -215,8 +215,8 @@ CSSCharsetRuleImpl::~CSSCharsetRuleImpl(void)
 {
 }
 
-NS_IMPL_ADDREF_INHERITED(CSSCharsetRuleImpl, nsCSSRule);
-NS_IMPL_RELEASE_INHERITED(CSSCharsetRuleImpl, nsCSSRule);
+NS_IMPL_ADDREF_INHERITED(CSSCharsetRuleImpl, nsCSSRule)
+NS_IMPL_RELEASE_INHERITED(CSSCharsetRuleImpl, nsCSSRule)
 
 // QueryInterface implementation for CSSCharsetRuleImpl
 NS_INTERFACE_MAP_BEGIN(CSSCharsetRuleImpl)
@@ -228,7 +228,7 @@ NS_INTERFACE_MAP_BEGIN(CSSCharsetRuleImpl)
   NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSCharsetRule)
 NS_INTERFACE_MAP_END
 
-IMPL_STYLE_RULE_INHERIT(CSSCharsetRuleImpl, nsCSSRule);
+IMPL_STYLE_RULE_INHERIT(CSSCharsetRuleImpl, nsCSSRule)
 
 #ifdef DEBUG
 NS_IMETHODIMP
@@ -417,8 +417,8 @@ CSSImportRuleImpl::~CSSImportRuleImpl(void)
   }
 }
 
-NS_IMPL_ADDREF_INHERITED(CSSImportRuleImpl, nsCSSRule);
-NS_IMPL_RELEASE_INHERITED(CSSImportRuleImpl, nsCSSRule);
+NS_IMPL_ADDREF_INHERITED(CSSImportRuleImpl, nsCSSRule)
+NS_IMPL_RELEASE_INHERITED(CSSImportRuleImpl, nsCSSRule)
 
 // QueryInterface implementation for CSSImportRuleImpl
 NS_INTERFACE_MAP_BEGIN(CSSImportRuleImpl)
@@ -431,7 +431,7 @@ NS_INTERFACE_MAP_BEGIN(CSSImportRuleImpl)
   NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSImportRule)
 NS_INTERFACE_MAP_END
 
-IMPL_STYLE_RULE_INHERIT(CSSImportRuleImpl, nsCSSRule);
+IMPL_STYLE_RULE_INHERIT(CSSImportRuleImpl, nsCSSRule)
 
 #ifdef DEBUG
 NS_IMETHODIMP
@@ -744,8 +744,8 @@ CSSMediaRuleImpl::~CSSMediaRuleImpl(void)
   }
 }
 
-NS_IMPL_ADDREF_INHERITED(CSSMediaRuleImpl, nsCSSRule);
-NS_IMPL_RELEASE_INHERITED(CSSMediaRuleImpl, nsCSSRule);
+NS_IMPL_ADDREF_INHERITED(CSSMediaRuleImpl, nsCSSRule)
+NS_IMPL_RELEASE_INHERITED(CSSMediaRuleImpl, nsCSSRule)
 
 // QueryInterface implementation for CSSMediaRuleImpl
 NS_INTERFACE_MAP_BEGIN(CSSMediaRuleImpl)
@@ -758,7 +758,7 @@ NS_INTERFACE_MAP_BEGIN(CSSMediaRuleImpl)
   NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSMediaRule)
 NS_INTERFACE_MAP_END
 
-IMPL_STYLE_RULE_INHERIT2(CSSMediaRuleImpl, nsCSSRule);
+IMPL_STYLE_RULE_INHERIT2(CSSMediaRuleImpl, nsCSSRule)
 
 static PRBool
 SetStyleSheetReference(nsISupports* aRule, void* aSheet)
@@ -1189,8 +1189,8 @@ CSSNameSpaceRuleImpl::~CSSNameSpaceRuleImpl(void)
   NS_IF_RELEASE(mPrefix);
 }
 
-NS_IMPL_ADDREF_INHERITED(CSSNameSpaceRuleImpl, nsCSSRule);
-NS_IMPL_RELEASE_INHERITED(CSSNameSpaceRuleImpl, nsCSSRule);
+NS_IMPL_ADDREF_INHERITED(CSSNameSpaceRuleImpl, nsCSSRule)
+NS_IMPL_RELEASE_INHERITED(CSSNameSpaceRuleImpl, nsCSSRule)
 
 // QueryInterface implementation for CSSNameSpaceRuleImpl
 NS_INTERFACE_MAP_BEGIN(CSSNameSpaceRuleImpl)
@@ -1202,7 +1202,7 @@ NS_INTERFACE_MAP_BEGIN(CSSNameSpaceRuleImpl)
   NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSNameSpaceRule)
 NS_INTERFACE_MAP_END
 
-IMPL_STYLE_RULE_INHERIT(CSSNameSpaceRuleImpl, nsCSSRule);
+IMPL_STYLE_RULE_INHERIT(CSSNameSpaceRuleImpl, nsCSSRule)
 
 #ifdef DEBUG
 NS_IMETHODIMP
diff --git a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
index 4a3a45101c3..da054e9380f 100644
--- a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
+++ b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
@@ -968,8 +968,8 @@ NS_INTERFACE_MAP_BEGIN(CSSRuleListImpl)
 NS_INTERFACE_MAP_END
 
 
-NS_IMPL_ADDREF(CSSRuleListImpl);
-NS_IMPL_RELEASE(CSSRuleListImpl);
+NS_IMPL_ADDREF(CSSRuleListImpl)
+NS_IMPL_RELEASE(CSSRuleListImpl)
 
 
 NS_IMETHODIMP    
@@ -1060,8 +1060,8 @@ NS_INTERFACE_MAP_BEGIN(DOMMediaListImpl)
 NS_INTERFACE_MAP_END
 
 
-NS_IMPL_ADDREF(DOMMediaListImpl);
-NS_IMPL_RELEASE(DOMMediaListImpl);
+NS_IMPL_ADDREF(DOMMediaListImpl)
+NS_IMPL_RELEASE(DOMMediaListImpl)
 
 
 DOMMediaListImpl::DOMMediaListImpl(nsISupportsArray *aArray,
@@ -1406,8 +1406,8 @@ NS_INTERFACE_MAP_BEGIN(CSSImportsCollectionImpl)
 NS_INTERFACE_MAP_END
 
 
-NS_IMPL_ADDREF(CSSImportsCollectionImpl);
-NS_IMPL_RELEASE(CSSImportsCollectionImpl);
+NS_IMPL_ADDREF(CSSImportsCollectionImpl)
+NS_IMPL_RELEASE(CSSImportsCollectionImpl)
 
 
 NS_IMETHODIMP
@@ -3109,8 +3109,8 @@ CSSRuleProcessor::~CSSRuleProcessor(void)
   ClearRuleCascades();
 }
 
-NS_IMPL_ADDREF(CSSRuleProcessor);
-NS_IMPL_RELEASE(CSSRuleProcessor);
+NS_IMPL_ADDREF(CSSRuleProcessor)
+NS_IMPL_RELEASE(CSSRuleProcessor)
 
 nsresult 
 CSSRuleProcessor::QueryInterface(REFNSIID aIID, void** aInstancePtrResult)
diff --git a/mozilla/content/html/style/src/nsComputedDOMStyle.cpp b/mozilla/content/html/style/src/nsComputedDOMStyle.cpp
index 1a649299f36..7113e1befee 100644
--- a/mozilla/content/html/style/src/nsComputedDOMStyle.cpp
+++ b/mozilla/content/html/style/src/nsComputedDOMStyle.cpp
@@ -141,9 +141,9 @@ static void doDestroyComputedDOMStyle(nsComputedDOMStyle *aComputedStyle)
   }
 }
 
-NS_IMPL_ADDREF(nsComputedDOMStyle);
+NS_IMPL_ADDREF(nsComputedDOMStyle)
 NS_IMPL_RELEASE_WITH_DESTROY(nsComputedDOMStyle,
-                             doDestroyComputedDOMStyle(this));
+                             doDestroyComputedDOMStyle(this))
 
 
 NS_IMETHODIMP
diff --git a/mozilla/content/html/style/src/nsDOMCSSDeclaration.cpp b/mozilla/content/html/style/src/nsDOMCSSDeclaration.cpp
index a2332b6e3b1..deeb727d385 100644
--- a/mozilla/content/html/style/src/nsDOMCSSDeclaration.cpp
+++ b/mozilla/content/html/style/src/nsDOMCSSDeclaration.cpp
@@ -68,8 +68,8 @@ NS_INTERFACE_MAP_BEGIN(nsDOMCSSDeclaration)
   NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSStyleDeclaration)
 NS_INTERFACE_MAP_END
 
-NS_IMPL_ADDREF(nsDOMCSSDeclaration);
-NS_IMPL_RELEASE(nsDOMCSSDeclaration);
+NS_IMPL_ADDREF(nsDOMCSSDeclaration)
+NS_IMPL_RELEASE(nsDOMCSSDeclaration)
 
 
 NS_IMETHODIMP
diff --git a/mozilla/content/html/style/src/nsDOMCSSValueList.cpp b/mozilla/content/html/style/src/nsDOMCSSValueList.cpp
index 65a9e39c689..cac8ae7d1a4 100644
--- a/mozilla/content/html/style/src/nsDOMCSSValueList.cpp
+++ b/mozilla/content/html/style/src/nsDOMCSSValueList.cpp
@@ -50,8 +50,8 @@ nsDOMCSSValueList::~nsDOMCSSValueList()
 {
 }
 
-NS_IMPL_ADDREF(nsDOMCSSValueList);
-NS_IMPL_RELEASE(nsDOMCSSValueList);
+NS_IMPL_ADDREF(nsDOMCSSValueList)
+NS_IMPL_RELEASE(nsDOMCSSValueList)
 
 // QueryInterface implementation for nsDOMCSSValueList
 NS_INTERFACE_MAP_BEGIN(nsDOMCSSValueList)
diff --git a/mozilla/content/html/style/src/nsROCSSPrimitiveValue.cpp b/mozilla/content/html/style/src/nsROCSSPrimitiveValue.cpp
index a6f09c5ac16..75a1b521a10 100644
--- a/mozilla/content/html/style/src/nsROCSSPrimitiveValue.cpp
+++ b/mozilla/content/html/style/src/nsROCSSPrimitiveValue.cpp
@@ -91,8 +91,8 @@ nsROCSSPrimitiveValue::GetEscapedURI(PRUnichar *aURI, PRUnichar **aReturn)
 }
 
 
-NS_IMPL_ADDREF(nsROCSSPrimitiveValue);
-NS_IMPL_RELEASE(nsROCSSPrimitiveValue);
+NS_IMPL_ADDREF(nsROCSSPrimitiveValue)
+NS_IMPL_RELEASE(nsROCSSPrimitiveValue)
 
 
 // QueryInterface implementation for nsROCSSPrimitiveValue
diff --git a/mozilla/content/shared/public/nsStyleStruct.h b/mozilla/content/shared/public/nsStyleStruct.h
index 16911abeb93..d51e9a5600a 100644
--- a/mozilla/content/shared/public/nsStyleStruct.h
+++ b/mozilla/content/shared/public/nsStyleStruct.h
@@ -1203,7 +1203,7 @@ inline nsBorderEdge::nsBorderEdge()
   mColor=0;
   mSide=NS_SIDE_LEFT;
   mInsideNeighbor = nsnull;
-};
+}
 
 /** an encapsulation of a border defined by its edges 
   * owner of this struct is responsible for freeing any data stored in mEdges
@@ -1221,6 +1221,6 @@ inline nsBorderEdges::nsBorderEdges()
 {
   mMaxBorderWidth.SizeTo(0,0,0,0);
   mOutsideEdge = PR_TRUE;
-};
+}
 
 #endif /* nsStyleStruct_h___ */
diff --git a/mozilla/content/svg/content/src/nsSVGAttributes.cpp b/mozilla/content/svg/content/src/nsSVGAttributes.cpp
index 4d74cdc5d2d..a7d84caedbb 100644
--- a/mozilla/content/svg/content/src/nsSVGAttributes.cpp
+++ b/mozilla/content/svg/content/src/nsSVGAttributes.cpp
@@ -427,7 +427,7 @@ nsSVGAttributes::Create(nsIContent* aContent, nsSVGAttributes** aResult)
 
 //----------------------------------------------------------------------
 // nsISupports interface
-NS_IMPL_ISUPPORTS1(nsSVGAttributes,nsIDOMNamedNodeMap);
+NS_IMPL_ISUPPORTS1(nsSVGAttributes,nsIDOMNamedNodeMap)
 
 //----------------------------------------------------------------------
 // Implementation Helpers
diff --git a/mozilla/content/svg/content/src/nsSVGElementFactory.cpp b/mozilla/content/svg/content/src/nsSVGElementFactory.cpp
index d5f9c2c89c8..a036885321e 100644
--- a/mozilla/content/svg/content/src/nsSVGElementFactory.cpp
+++ b/mozilla/content/svg/content/src/nsSVGElementFactory.cpp
@@ -93,7 +93,7 @@ nsSVGElementFactory::~nsSVGElementFactory()
 }
 
 
-NS_IMPL_ISUPPORTS1(nsSVGElementFactory, nsIElementFactory);
+NS_IMPL_ISUPPORTS1(nsSVGElementFactory, nsIElementFactory)
 
 
 nsresult
diff --git a/mozilla/content/svg/content/src/nsSVGGenericStringValue.cpp b/mozilla/content/svg/content/src/nsSVGGenericStringValue.cpp
index 48a4bbf6c69..eba5efa0840 100644
--- a/mozilla/content/svg/content/src/nsSVGGenericStringValue.cpp
+++ b/mozilla/content/svg/content/src/nsSVGGenericStringValue.cpp
@@ -88,7 +88,7 @@ nsSVGGenericStringValue::~nsSVGGenericStringValue()
 
 // nsISupports methods:
 
-NS_IMPL_ISUPPORTS1(nsSVGGenericStringValue, nsISVGValue);
+NS_IMPL_ISUPPORTS1(nsSVGGenericStringValue, nsISVGValue)
 
 
 // nsISVGValue methods:
diff --git a/mozilla/content/svg/content/src/nsSVGPathSeg.cpp b/mozilla/content/svg/content/src/nsSVGPathSeg.cpp
index a73409edaca..330fb57f925 100644
--- a/mozilla/content/svg/content/src/nsSVGPathSeg.cpp
+++ b/mozilla/content/svg/content/src/nsSVGPathSeg.cpp
@@ -137,7 +137,7 @@ nsSVGPathSegClosePath::GetValueString(nsAString& aValue)
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSeg methods:
-NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegClosePath, PATHSEG_CLOSEPATH, "z");
+NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegClosePath, PATHSEG_CLOSEPATH, "z")
 
 ////////////////////////////////////////////////////////////////////////
 // nsSVGPathSegMovetoAbs
@@ -213,7 +213,7 @@ nsSVGPathSegMovetoAbs::GetValueString(nsAString& aValue)
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSeg methods:
-NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegMovetoAbs, PATHSEG_MOVETO_ABS, "M");
+NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegMovetoAbs, PATHSEG_MOVETO_ABS, "M")
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSegMovetoAbs methods:
@@ -321,7 +321,7 @@ nsSVGPathSegMovetoRel::GetValueString(nsAString& aValue)
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSeg methods:
-NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegMovetoRel, PATHSEG_MOVETO_REL, "m");
+NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegMovetoRel, PATHSEG_MOVETO_REL, "m")
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSegMovetoRel methods:
@@ -428,7 +428,7 @@ nsSVGPathSegLinetoAbs::GetValueString(nsAString& aValue)
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSeg methods:
-NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegLinetoAbs, PATHSEG_LINETO_ABS, "L");
+NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegLinetoAbs, PATHSEG_LINETO_ABS, "L")
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSegLinetoAbs methods:
@@ -536,7 +536,7 @@ nsSVGPathSegLinetoRel::GetValueString(nsAString& aValue)
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSeg methods:
-NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegLinetoRel, PATHSEG_LINETO_REL, "l");
+NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegLinetoRel, PATHSEG_LINETO_REL, "l")
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSegLinetoRel methods:
@@ -651,7 +651,7 @@ nsSVGPathSegCurvetoCubicAbs::GetValueString(nsAString& aValue)
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSeg methods:
-NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegCurvetoCubicAbs, PATHSEG_CURVETO_CUBIC_ABS, "C");
+NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegCurvetoCubicAbs, PATHSEG_CURVETO_CUBIC_ABS, "C")
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSegCurvetoCubicAbs methods:
@@ -822,7 +822,7 @@ nsSVGPathSegCurvetoCubicRel::GetValueString(nsAString& aValue)
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSeg methods:
-NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegCurvetoCubicRel, PATHSEG_CURVETO_CUBIC_REL, "c");
+NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegCurvetoCubicRel, PATHSEG_CURVETO_CUBIC_REL, "c")
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSegCurvetoCubicRel methods:
@@ -989,7 +989,7 @@ nsSVGPathSegCurvetoQuadraticAbs::GetValueString(nsAString& aValue)
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSeg methods:
-NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegCurvetoQuadraticAbs, PATHSEG_CURVETO_QUADRATIC_ABS, "Q");
+NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegCurvetoQuadraticAbs, PATHSEG_CURVETO_QUADRATIC_ABS, "Q")
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSegCurvetoQuadraticAbs methods:
@@ -1129,7 +1129,7 @@ nsSVGPathSegCurvetoQuadraticRel::GetValueString(nsAString& aValue)
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSeg methods:
-NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegCurvetoQuadraticRel, PATHSEG_CURVETO_QUADRATIC_REL, "q");
+NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegCurvetoQuadraticRel, PATHSEG_CURVETO_QUADRATIC_REL, "q")
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSegCurvetoQuadraticRel methods:
@@ -1275,7 +1275,7 @@ nsSVGPathSegArcAbs::GetValueString(nsAString& aValue)
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSeg methods:
-NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegArcAbs, PATHSEG_ARC_ABS, "A");
+NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegArcAbs, PATHSEG_ARC_ABS, "A")
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSegArcAbs methods:
@@ -1464,7 +1464,7 @@ nsSVGPathSegArcRel::GetValueString(nsAString& aValue)
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSeg methods:
-NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegArcRel, PATHSEG_ARC_REL, "a");
+NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegArcRel, PATHSEG_ARC_REL, "a")
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSegArcRel methods:
@@ -1641,7 +1641,7 @@ nsSVGPathSegLinetoHorizontalAbs::GetValueString(nsAString& aValue)
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSeg methods:
-NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegLinetoHorizontalAbs, PATHSEG_LINETO_HORIZONTAL_ABS, "H");
+NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegLinetoHorizontalAbs, PATHSEG_LINETO_HORIZONTAL_ABS, "H")
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSegLinetoHorizontalAbs methods:
@@ -1733,7 +1733,7 @@ nsSVGPathSegLinetoHorizontalRel::GetValueString(nsAString& aValue)
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSeg methods:
-NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegLinetoHorizontalRel, PATHSEG_LINETO_HORIZONTAL_REL, "h");
+NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegLinetoHorizontalRel, PATHSEG_LINETO_HORIZONTAL_REL, "h")
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSegLinetoHorizontalRel methods:
@@ -1825,7 +1825,7 @@ nsSVGPathSegLinetoVerticalAbs::GetValueString(nsAString& aValue)
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSeg methods:
-NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegLinetoVerticalAbs, PATHSEG_LINETO_VERTICAL_ABS, "V");
+NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegLinetoVerticalAbs, PATHSEG_LINETO_VERTICAL_ABS, "V")
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSegLinetoVerticalAbs methods:
@@ -1917,7 +1917,7 @@ nsSVGPathSegLinetoVerticalRel::GetValueString(nsAString& aValue)
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSeg methods:
-NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegLinetoVerticalRel, PATHSEG_LINETO_VERTICAL_REL, "v");
+NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegLinetoVerticalRel, PATHSEG_LINETO_VERTICAL_REL, "v")
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSegLinetoVerticalRel methods:
@@ -2014,7 +2014,7 @@ nsSVGPathSegCurvetoCubicSmoothAbs::GetValueString(nsAString& aValue)
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSeg methods:
-NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegCurvetoCubicSmoothAbs, PATHSEG_CURVETO_CUBIC_SMOOTH_ABS, "S");
+NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegCurvetoCubicSmoothAbs, PATHSEG_CURVETO_CUBIC_SMOOTH_ABS, "S")
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSegCurvetoCubicSmoothAbs methods:
@@ -2153,7 +2153,7 @@ nsSVGPathSegCurvetoCubicSmoothRel::GetValueString(nsAString& aValue)
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSeg methods:
-NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegCurvetoCubicSmoothRel, PATHSEG_CURVETO_CUBIC_SMOOTH_REL, "s");
+NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegCurvetoCubicSmoothRel, PATHSEG_CURVETO_CUBIC_SMOOTH_REL, "s")
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSegCurvetoCubicSmoothRel methods:
@@ -2288,7 +2288,7 @@ nsSVGPathSegCurvetoQuadraticSmoothAbs::GetValueString(nsAString& aValue)
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSeg methods:
-NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegCurvetoQuadraticSmoothAbs, PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS, "T");
+NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegCurvetoQuadraticSmoothAbs, PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS, "T")
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSegCurvetoQuadraticSmoothAbs methods:
@@ -2395,7 +2395,7 @@ nsSVGPathSegCurvetoQuadraticSmoothRel::GetValueString(nsAString& aValue)
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSeg methods:
-NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegCurvetoQuadraticSmoothRel, PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL, "t");
+NS_IMPL_NSIDOMSVGPATHSEG(nsSVGPathSegCurvetoQuadraticSmoothRel, PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL, "t")
 
 //----------------------------------------------------------------------
 // nsIDOMSVGPathSegCurvetoQuadraticSmoothRel methods:
diff --git a/mozilla/content/xbl/src/nsXBLProtoImplMethod.cpp b/mozilla/content/xbl/src/nsXBLProtoImplMethod.cpp
index 4ab682f19a7..06dc16b7443 100644
--- a/mozilla/content/xbl/src/nsXBLProtoImplMethod.cpp
+++ b/mozilla/content/xbl/src/nsXBLProtoImplMethod.cpp
@@ -97,7 +97,7 @@ RemoveJSGCRoot(void* aScriptObjectRef)
   return NS_OK;
 }
 
-MOZ_DECL_CTOR_COUNTER(nsXBLProtoImplMethod);
+MOZ_DECL_CTOR_COUNTER(nsXBLProtoImplMethod)
 
 nsXBLProtoImplMethod::nsXBLProtoImplMethod(const PRUnichar* aName) :
   nsXBLProtoImplMember(aName), 
diff --git a/mozilla/content/xbl/src/nsXBLProtoImplProperty.cpp b/mozilla/content/xbl/src/nsXBLProtoImplProperty.cpp
index 734f0e3e5bd..c1992bdd731 100644
--- a/mozilla/content/xbl/src/nsXBLProtoImplProperty.cpp
+++ b/mozilla/content/xbl/src/nsXBLProtoImplProperty.cpp
@@ -97,7 +97,7 @@ RemoveJSGCRoot(void* aScriptObjectRef)
   return NS_OK;
 }
 
-MOZ_DECL_CTOR_COUNTER(nsXBLProtoImplProperty);
+MOZ_DECL_CTOR_COUNTER(nsXBLProtoImplProperty)
 
 nsXBLProtoImplProperty::nsXBLProtoImplProperty(const PRUnichar* aName,
                                                const PRUnichar* aGetter, 
diff --git a/mozilla/content/xml/document/src/nsXMLContentSink.cpp b/mozilla/content/xml/document/src/nsXMLContentSink.cpp
index 1323b9efffc..948ee1c706b 100644
--- a/mozilla/content/xml/document/src/nsXMLContentSink.cpp
+++ b/mozilla/content/xml/document/src/nsXMLContentSink.cpp
@@ -128,7 +128,7 @@ public:
   nsWeakPtr mInner;
 };
 
-NS_IMPL_ISUPPORTS1(nsScriptLoaderObserverProxy, nsIScriptLoaderObserver);
+NS_IMPL_ISUPPORTS1(nsScriptLoaderObserverProxy, nsIScriptLoaderObserver)
 
 NS_IMETHODIMP
 nsScriptLoaderObserverProxy::ScriptAvailable(nsresult aResult,
diff --git a/mozilla/content/xul/content/src/nsRDFDOMNodeList.cpp b/mozilla/content/xul/content/src/nsRDFDOMNodeList.cpp
index 60f7a547c63..417fc24422e 100644
--- a/mozilla/content/xul/content/src/nsRDFDOMNodeList.cpp
+++ b/mozilla/content/xul/content/src/nsRDFDOMNodeList.cpp
@@ -123,8 +123,8 @@ NS_INTERFACE_MAP_BEGIN(nsRDFDOMNodeList)
 NS_INTERFACE_MAP_END
 
 
-NS_IMPL_ADDREF(nsRDFDOMNodeList);
-NS_IMPL_RELEASE(nsRDFDOMNodeList);
+NS_IMPL_ADDREF(nsRDFDOMNodeList)
+NS_IMPL_RELEASE(nsRDFDOMNodeList)
 
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/mozilla/content/xul/content/src/nsXULAttributes.cpp b/mozilla/content/xul/content/src/nsXULAttributes.cpp
index 1f32c276208..f927a9f2322 100644
--- a/mozilla/content/xul/content/src/nsXULAttributes.cpp
+++ b/mozilla/content/xul/content/src/nsXULAttributes.cpp
@@ -198,8 +198,8 @@ NS_INTERFACE_MAP_BEGIN(nsXULAttribute)
 NS_INTERFACE_MAP_END
 
 
-NS_IMPL_ADDREF(nsXULAttribute);
-NS_IMPL_RELEASE(nsXULAttribute);
+NS_IMPL_ADDREF(nsXULAttribute)
+NS_IMPL_RELEASE(nsXULAttribute)
 
 
 // nsIDOMNode interface
@@ -559,7 +559,7 @@ NS_INTERFACE_MAP_BEGIN(nsXULAttributes)
     NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(XULNamedNodeMap)
 NS_INTERFACE_MAP_END
 
-NS_IMPL_ADDREF(nsXULAttributes);
+NS_IMPL_ADDREF(nsXULAttributes)
 
 // Custom release method to go through the fixed-size allocator
 nsrefcnt
diff --git a/mozilla/content/xul/content/src/nsXULElement.cpp b/mozilla/content/xul/content/src/nsXULElement.cpp
index d7319b6bba1..ae9771834f3 100644
--- a/mozilla/content/xul/content/src/nsXULElement.cpp
+++ b/mozilla/content/xul/content/src/nsXULElement.cpp
@@ -568,8 +568,8 @@ nsXULElement::Create(nsINodeInfo *aNodeInfo, nsIContent** aResult)
 //----------------------------------------------------------------------
 // nsISupports interface
 
-NS_IMPL_ADDREF(nsXULElement);
-NS_IMPL_RELEASE(nsXULElement);
+NS_IMPL_ADDREF(nsXULElement)
+NS_IMPL_RELEASE(nsXULElement)
 
 NS_IMETHODIMP
 nsXULElement::QueryInterface(REFNSIID iid, void** result)
diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp
index d2820318a30..eccb7362e51 100644
--- a/mozilla/content/xul/document/src/nsXULDocument.cpp
+++ b/mozilla/content/xul/document/src/nsXULDocument.cpp
@@ -236,7 +236,7 @@ public:
     }
 };
 
-NS_IMPL_ISUPPORTS1(nsProxyLoadStream, nsIInputStream);
+NS_IMPL_ISUPPORTS1(nsProxyLoadStream, nsIInputStream)
 
 //----------------------------------------------------------------------
 //
@@ -302,9 +302,9 @@ public:
 PRInt32 PlaceHolderRequest::gRefCnt;
 nsIURI* PlaceHolderRequest::gURI;
 
-NS_IMPL_ADDREF(PlaceHolderRequest);
-NS_IMPL_RELEASE(PlaceHolderRequest);
-NS_IMPL_QUERY_INTERFACE2(PlaceHolderRequest, nsIRequest, nsIChannel);
+NS_IMPL_ADDREF(PlaceHolderRequest)
+NS_IMPL_RELEASE(PlaceHolderRequest)
+NS_IMPL_QUERY_INTERFACE2(PlaceHolderRequest, nsIRequest, nsIChannel)
 
 nsresult
 PlaceHolderRequest::Create(nsIRequest** aResult)
@@ -4341,7 +4341,7 @@ nsXULDocument::CachedChromeStreamListener::~CachedChromeStreamListener()
 
 
 NS_IMPL_ISUPPORTS2(nsXULDocument::CachedChromeStreamListener,
-                   nsIRequestObserver, nsIStreamListener);
+                   nsIRequestObserver, nsIStreamListener)
 
 NS_IMETHODIMP
 nsXULDocument::CachedChromeStreamListener::OnStartRequest(nsIRequest *request,
@@ -4395,7 +4395,7 @@ nsXULDocument::ParserObserver::~ParserObserver()
     NS_IF_RELEASE(mDocument);
 }
 
-NS_IMPL_ISUPPORTS1(nsXULDocument::ParserObserver, nsIRequestObserver);
+NS_IMPL_ISUPPORTS1(nsXULDocument::ParserObserver, nsIRequestObserver)
 
 NS_IMETHODIMP
 nsXULDocument::ParserObserver::OnStartRequest(nsIRequest *request,
diff --git a/mozilla/content/xul/document/src/nsXULPrototypeCache.cpp b/mozilla/content/xul/document/src/nsXULPrototypeCache.cpp
index 2c94690a98b..7267f887133 100644
--- a/mozilla/content/xul/document/src/nsXULPrototypeCache.cpp
+++ b/mozilla/content/xul/document/src/nsXULPrototypeCache.cpp
@@ -175,7 +175,7 @@ nsXULPrototypeCache::~nsXULPrototypeCache()
 }
 
 
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsXULPrototypeCache, nsIXULPrototypeCache);
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsXULPrototypeCache, nsIXULPrototypeCache)
 
 
 NS_IMETHODIMP
diff --git a/mozilla/db/mork/build/nsMorkFactory.cpp b/mozilla/db/mork/build/nsMorkFactory.cpp
index 599f6ffbab2..7900ab0a174 100644
--- a/mozilla/db/mork/build/nsMorkFactory.cpp
+++ b/mozilla/db/mork/build/nsMorkFactory.cpp
@@ -67,7 +67,7 @@ static const nsModuleComponentInfo components[] =
     }
 };
 
-NS_IMPL_NSGETMODULE(nsMorkModule, components);
+NS_IMPL_NSGETMODULE(nsMorkModule, components)
 
 
 
diff --git a/mozilla/db/mork/src/morkCellObject.cpp b/mozilla/db/mork/src/morkCellObject.cpp
index 539ded6fbad..daa65e7de1e 100644
--- a/mozilla/db/mork/src/morkCellObject.cpp
+++ b/mozilla/db/mork/src/morkCellObject.cpp
@@ -144,7 +144,7 @@ morkCellObject::morkCellObject(morkEnv* ev, const morkUsage& inUsage,
   }
 }
 
-NS_IMPL_ISUPPORTS_INHERITED1(morkCellObject, morkObject, nsIMdbCell);
+NS_IMPL_ISUPPORTS_INHERITED1(morkCellObject, morkObject, nsIMdbCell)
 
 /*public non-poly*/ void
 morkCellObject::CloseCellObject(morkEnv* ev) // called by CloseMorkNode();
diff --git a/mozilla/db/mork/src/morkCursor.cpp b/mozilla/db/mork/src/morkCursor.cpp
index 62e2fb6e387..702d91df4ce 100644
--- a/mozilla/db/mork/src/morkCursor.cpp
+++ b/mozilla/db/mork/src/morkCursor.cpp
@@ -93,7 +93,7 @@ morkCursor::morkCursor(morkEnv* ev,
     mNode_Derived = morkDerived_kCursor;
 }
 
-NS_IMPL_ISUPPORTS_INHERITED1(morkCursor, morkObject, nsIMdbCursor);
+NS_IMPL_ISUPPORTS_INHERITED1(morkCursor, morkObject, nsIMdbCursor)
 
 /*public non-poly*/ void
 morkCursor::CloseCursor(morkEnv* ev) // called by CloseMorkNode();
diff --git a/mozilla/db/mork/src/morkEnv.cpp b/mozilla/db/mork/src/morkEnv.cpp
index 8ea18f118f9..e099dc5e9c5 100644
--- a/mozilla/db/mork/src/morkEnv.cpp
+++ b/mozilla/db/mork/src/morkEnv.cpp
@@ -192,7 +192,7 @@ morkEnv::morkEnv(morkEnv* ev, /*i*/
     ev->NilPointerError();
 }
 
-NS_IMPL_ISUPPORTS_INHERITED1(morkEnv, morkObject, nsIMdbEnv);
+NS_IMPL_ISUPPORTS_INHERITED1(morkEnv, morkObject, nsIMdbEnv)
 /*public non-poly*/ void
 morkEnv::CloseEnv(morkEnv* ev) /*i*/ // called by CloseMorkNode();
 {
diff --git a/mozilla/db/mork/src/morkFactory.cpp b/mozilla/db/mork/src/morkFactory.cpp
index 00fd4c81ac2..382bd8ad435 100644
--- a/mozilla/db/mork/src/morkFactory.cpp
+++ b/mozilla/db/mork/src/morkFactory.cpp
@@ -144,7 +144,7 @@ morkFactory::morkFactory(morkEnv* ev, /*i*/
   }
 }
 
-NS_IMPL_ISUPPORTS_INHERITED1(morkFactory, morkObject, nsIMdbFactory);
+NS_IMPL_ISUPPORTS_INHERITED1(morkFactory, morkObject, nsIMdbFactory)
 
 extern "C" nsIMdbFactory* MakeMdbFactory() 
 {
diff --git a/mozilla/db/mork/src/morkFile.cpp b/mozilla/db/mork/src/morkFile.cpp
index a1e2f6d0045..79913cbd076 100644
--- a/mozilla/db/mork/src/morkFile.cpp
+++ b/mozilla/db/mork/src/morkFile.cpp
@@ -116,7 +116,7 @@ morkFile::morkFile(morkEnv* ev, const morkUsage& inUsage,
   }
 }
 
-NS_IMPL_ISUPPORTS_INHERITED1(morkFile, morkObject, nsIMdbFile);
+NS_IMPL_ISUPPORTS_INHERITED1(morkFile, morkObject, nsIMdbFile)
 /*public non-poly*/ void
 morkFile::CloseFile(morkEnv* ev) // called by CloseMorkNode();
 {
diff --git a/mozilla/db/mork/src/morkObject.cpp b/mozilla/db/mork/src/morkObject.cpp
index 070b20aa56a..3160bbc407c 100644
--- a/mozilla/db/mork/src/morkObject.cpp
+++ b/mozilla/db/mork/src/morkObject.cpp
@@ -65,7 +65,7 @@
 
 //3456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789
 
-NS_IMPL_ISUPPORTS1(morkObject, nsIMdbObject);
+NS_IMPL_ISUPPORTS1(morkObject, nsIMdbObject)
 
 // ````` ````` ````` ````` ````` 
 // { ===== begin morkNode interface =====
diff --git a/mozilla/db/mork/src/morkPortTableCursor.cpp b/mozilla/db/mork/src/morkPortTableCursor.cpp
index ab73dd02ae5..41b0e83a4df 100644
--- a/mozilla/db/mork/src/morkPortTableCursor.cpp
+++ b/mozilla/db/mork/src/morkPortTableCursor.cpp
@@ -119,7 +119,7 @@ morkPortTableCursor::morkPortTableCursor(morkEnv* ev,
   }
 }
 
-NS_IMPL_ISUPPORTS_INHERITED1(morkPortTableCursor, morkCursor, nsIMdbPortTableCursor);
+NS_IMPL_ISUPPORTS_INHERITED1(morkPortTableCursor, morkCursor, nsIMdbPortTableCursor)
 
 morkEnv*
 morkPortTableCursor::CanUsePortTableCursor(nsIMdbEnv* mev,
diff --git a/mozilla/db/mork/src/morkRowCellCursor.cpp b/mozilla/db/mork/src/morkRowCellCursor.cpp
index d5fb72c91b0..ea70e604f37 100644
--- a/mozilla/db/mork/src/morkRowCellCursor.cpp
+++ b/mozilla/db/mork/src/morkRowCellCursor.cpp
@@ -135,7 +135,7 @@ morkRowCellCursor::morkRowCellCursor(morkEnv* ev,
   }
 }
 
-NS_IMPL_ISUPPORTS_INHERITED1(morkRowCellCursor, morkCursor, nsIMdbRowCellCursor);
+NS_IMPL_ISUPPORTS_INHERITED1(morkRowCellCursor, morkCursor, nsIMdbRowCellCursor)
 
 /*public non-poly*/ void
 morkRowCellCursor::CloseRowCellCursor(morkEnv* ev) 
diff --git a/mozilla/db/mork/src/morkRowObject.cpp b/mozilla/db/mork/src/morkRowObject.cpp
index 78a3d8dde13..f24f509cbfa 100644
--- a/mozilla/db/mork/src/morkRowObject.cpp
+++ b/mozilla/db/mork/src/morkRowObject.cpp
@@ -118,7 +118,7 @@ morkRowObject::morkRowObject(morkEnv* ev,
   }
 }
 
-NS_IMPL_ISUPPORTS_INHERITED1(morkRowObject, morkObject, nsIMdbRow);
+NS_IMPL_ISUPPORTS_INHERITED1(morkRowObject, morkObject, nsIMdbRow)
 // { ===== begin nsIMdbCollection methods =====
 
 // { ----- begin attribute methods -----
diff --git a/mozilla/db/mork/src/morkStore.cpp b/mozilla/db/mork/src/morkStore.cpp
index b54b282b688..6232ddf6000 100644
--- a/mozilla/db/mork/src/morkStore.cpp
+++ b/mozilla/db/mork/src/morkStore.cpp
@@ -236,7 +236,7 @@ morkStore::morkStore(morkEnv* ev, const morkUsage& inUsage,
   }
 }
 
-NS_IMPL_ISUPPORTS_INHERITED1(morkStore, morkObject, nsIMdbStore);
+NS_IMPL_ISUPPORTS_INHERITED1(morkStore, morkObject, nsIMdbStore)
 
 /*public non-poly*/ void
 morkStore::CloseStore(morkEnv* ev) // called by CloseMorkNode();
diff --git a/mozilla/db/mork/src/morkTable.cpp b/mozilla/db/mork/src/morkTable.cpp
index 21faa78fc16..3063545679f 100644
--- a/mozilla/db/mork/src/morkTable.cpp
+++ b/mozilla/db/mork/src/morkTable.cpp
@@ -175,7 +175,7 @@ morkTable::morkTable(morkEnv* ev, /*i*/
   }
 }
 
-NS_IMPL_ISUPPORTS_INHERITED1(morkTable, morkObject, nsIMdbTable);
+NS_IMPL_ISUPPORTS_INHERITED1(morkTable, morkObject, nsIMdbTable)
 
 /*public non-poly*/ void
 morkTable::CloseTable(morkEnv* ev) /*i*/ // called by CloseMorkNode();
diff --git a/mozilla/db/mork/src/morkTableRowCursor.cpp b/mozilla/db/mork/src/morkTableRowCursor.cpp
index 30d01cd35b0..4484fbe1d3d 100644
--- a/mozilla/db/mork/src/morkTableRowCursor.cpp
+++ b/mozilla/db/mork/src/morkTableRowCursor.cpp
@@ -121,7 +121,7 @@ morkTableRowCursor::morkTableRowCursor(morkEnv* ev,
   }
 }
 
-NS_IMPL_ISUPPORTS_INHERITED1(morkTableRowCursor, morkCursor, nsIMdbTableRowCursor);
+NS_IMPL_ISUPPORTS_INHERITED1(morkTableRowCursor, morkCursor, nsIMdbTableRowCursor)
 /*public non-poly*/ void
 morkTableRowCursor::CloseTableRowCursor(morkEnv* ev) 
 {
diff --git a/mozilla/db/mork/src/morkThumb.cpp b/mozilla/db/mork/src/morkThumb.cpp
index 1b8734a1223..b4926a749fb 100644
--- a/mozilla/db/mork/src/morkThumb.cpp
+++ b/mozilla/db/mork/src/morkThumb.cpp
@@ -138,7 +138,7 @@ morkThumb::morkThumb(morkEnv* ev,
   }
 }
 
-NS_IMPL_ISUPPORTS_INHERITED1(morkThumb, morkObject, nsIMdbThumb);
+NS_IMPL_ISUPPORTS_INHERITED1(morkThumb, morkObject, nsIMdbThumb)
 
 /*public non-poly*/ void
 morkThumb::CloseThumb(morkEnv* ev) // called by CloseMorkNode();
diff --git a/mozilla/db/mork/src/orkinCell.cpp b/mozilla/db/mork/src/orkinCell.cpp
index df97910be95..9e8be1e9474 100644
--- a/mozilla/db/mork/src/orkinCell.cpp
+++ b/mozilla/db/mork/src/orkinCell.cpp
@@ -214,7 +214,7 @@ orkinCell::CanUseCell(nsIMdbEnv* mev, mork_bool inMutable,
 }
 
 // { ===== begin nsIMdbISupports methods =====
-NS_IMPL_QUERY_INTERFACE0(orkinCell);
+NS_IMPL_QUERY_INTERFACE0(orkinCell)
 
 /*virtual*/ nsrefcnt
 orkinCell::AddRef() // add strong ref with no
diff --git a/mozilla/db/mork/src/orkinEnv.cpp b/mozilla/db/mork/src/orkinEnv.cpp
index 0916624bd6a..c20983377b6 100644
--- a/mozilla/db/mork/src/orkinEnv.cpp
+++ b/mozilla/db/mork/src/orkinEnv.cpp
@@ -150,7 +150,7 @@ orkinEnv::CanUseEnv(mork_bool inMutable, mdb_err* outErr) const
 
 
 // { ===== begin nsIMdbISupports methods =====
-NS_IMPL_QUERY_INTERFACE0(orkinEnv);
+NS_IMPL_QUERY_INTERFACE0(orkinEnv)
 
 /*virtual*/ nsrefcnt
 orkinEnv::AddRef() // add strong ref with no
diff --git a/mozilla/db/mork/src/orkinFactory.cpp b/mozilla/db/mork/src/orkinFactory.cpp
index 3243f2bb727..9943da08773 100644
--- a/mozilla/db/mork/src/orkinFactory.cpp
+++ b/mozilla/db/mork/src/orkinFactory.cpp
@@ -209,7 +209,7 @@ morkEnv* orkinFactory::GetInternalFactoryEnv(mdb_err* outErr)
 }
 
 // { ===== begin nsIMdbISupports methods =====
-NS_IMPL_QUERY_INTERFACE0(orkinFactory);
+NS_IMPL_QUERY_INTERFACE0(orkinFactory)
 
 /*virtual*/ nsrefcnt
 orkinFactory::AddRef() // add strong ref with no
diff --git a/mozilla/db/mork/src/orkinFile.cpp b/mozilla/db/mork/src/orkinFile.cpp
index 37bf9bb7f95..eac955435fc 100644
--- a/mozilla/db/mork/src/orkinFile.cpp
+++ b/mozilla/db/mork/src/orkinFile.cpp
@@ -128,7 +128,7 @@ orkinFile::CanUseFile(nsIMdbEnv* mev,
 
 
 // { ===== begin nsIMdbISupports methods =====
-NS_IMPL_QUERY_INTERFACE1(orkinFile, nsIMdbFile);
+NS_IMPL_QUERY_INTERFACE1(orkinFile, nsIMdbFile)
 
 /*virtual*/ nsrefcnt
 orkinFile::AddRef() // add strong ref with no
diff --git a/mozilla/db/mork/src/orkinPortTableCursor.cpp b/mozilla/db/mork/src/orkinPortTableCursor.cpp
index cd4ac14a058..54f097b0697 100644
--- a/mozilla/db/mork/src/orkinPortTableCursor.cpp
+++ b/mozilla/db/mork/src/orkinPortTableCursor.cpp
@@ -133,7 +133,7 @@ orkinPortTableCursor::CanUsePortTableCursor(nsIMdbEnv* mev,
 }
 
 // { ===== begin nsIMdbISupports methods =====
-NS_IMPL_QUERY_INTERFACE0(orkinPortTableCursor);
+NS_IMPL_QUERY_INTERFACE0(orkinPortTableCursor)
 
 /*virtual*/ nsrefcnt
 orkinPortTableCursor::AddRef() // add strong ref with no
diff --git a/mozilla/db/mork/src/orkinRow.cpp b/mozilla/db/mork/src/orkinRow.cpp
index 56942d53ae9..bcf91b8a5fa 100644
--- a/mozilla/db/mork/src/orkinRow.cpp
+++ b/mozilla/db/mork/src/orkinRow.cpp
@@ -205,7 +205,7 @@ orkinRow::CanUseRowStore(morkEnv* ev) const
 
 
 // { ===== begin nsISupports methods =====
-NS_IMPL_QUERY_INTERFACE1(orkinRow, nsIMdbRow);
+NS_IMPL_QUERY_INTERFACE1(orkinRow, nsIMdbRow)
 
 /*virtual*/ nsrefcnt
 orkinRow::AddRef() // add strong ref with no
diff --git a/mozilla/db/mork/src/orkinRowCellCursor.cpp b/mozilla/db/mork/src/orkinRowCellCursor.cpp
index 944dec2089f..ec02e70677e 100644
--- a/mozilla/db/mork/src/orkinRowCellCursor.cpp
+++ b/mozilla/db/mork/src/orkinRowCellCursor.cpp
@@ -166,7 +166,7 @@ orkinRowCellCursor::CanUseRowCellCursor(nsIMdbEnv* mev, mork_bool inMutable,
 }
 
 // { ===== begin nsIMdbISupports methods =====
-NS_IMPL_QUERY_INTERFACE0(orkinRowCellCursor);
+NS_IMPL_QUERY_INTERFACE0(orkinRowCellCursor)
 
 /*virtual*/ nsrefcnt
 orkinRowCellCursor::AddRef() // add strong ref with no
diff --git a/mozilla/db/mork/src/orkinSorting.cpp b/mozilla/db/mork/src/orkinSorting.cpp
index 12e8bae500e..7f20c1c6c19 100644
--- a/mozilla/db/mork/src/orkinSorting.cpp
+++ b/mozilla/db/mork/src/orkinSorting.cpp
@@ -156,7 +156,7 @@ orkinSorting::CanUseSorting(nsIMdbEnv* mev,
 
 
 // { ===== begin nsIMdbISupports methods =====
-NS_IMPL_QUERY_INTERFACE0(orkinSorting);
+NS_IMPL_QUERY_INTERFACE0(orkinSorting)
 
 /*virtual*/ nsrefcnt
 orkinSorting::AddRef() // add strong ref with no
diff --git a/mozilla/db/mork/src/orkinStore.cpp b/mozilla/db/mork/src/orkinStore.cpp
index 7dd0587ca1d..aa270ab15c6 100644
--- a/mozilla/db/mork/src/orkinStore.cpp
+++ b/mozilla/db/mork/src/orkinStore.cpp
@@ -156,7 +156,7 @@ orkinStore::CanUseStore(nsIMdbEnv* mev,
 
 // { ===== begin nsIMdbISupports methods =====
 
-NS_IMPL_QUERY_INTERFACE0(orkinStore);
+NS_IMPL_QUERY_INTERFACE0(orkinStore)
 
 /*virtual*/ nsrefcnt
 orkinStore::AddRef() // add strong ref with no
diff --git a/mozilla/db/mork/src/orkinTable.cpp b/mozilla/db/mork/src/orkinTable.cpp
index dac48abbdd4..6d1469f8965 100644
--- a/mozilla/db/mork/src/orkinTable.cpp
+++ b/mozilla/db/mork/src/orkinTable.cpp
@@ -152,7 +152,7 @@ orkinTable::CanUseTable(nsIMdbEnv* mev,
 
 
 // { ===== begin nsIMdbISupports methods =====
-NS_IMPL_QUERY_INTERFACE0(orkinTable);
+NS_IMPL_QUERY_INTERFACE0(orkinTable)
 
 /*virtual*/ nsrefcnt
 orkinTable::AddRef() // add strong ref with no
diff --git a/mozilla/db/mork/src/orkinTableRowCursor.cpp b/mozilla/db/mork/src/orkinTableRowCursor.cpp
index ba0fd1b36ad..a2f07613a29 100644
--- a/mozilla/db/mork/src/orkinTableRowCursor.cpp
+++ b/mozilla/db/mork/src/orkinTableRowCursor.cpp
@@ -151,7 +151,7 @@ orkinTableRowCursor::CanUseTableRowCursor(nsIMdbEnv* mev,
 }
 
 // { ===== begin nsIMdbISupports methods =====
-NS_IMPL_QUERY_INTERFACE1(orkinTableRowCursor, nsIMdbTableRowCursor);
+NS_IMPL_QUERY_INTERFACE1(orkinTableRowCursor, nsIMdbTableRowCursor)
 
 /*virtual*/ nsrefcnt
 orkinTableRowCursor::AddRef() // add strong ref with no
diff --git a/mozilla/db/mork/src/orkinThumb.cpp b/mozilla/db/mork/src/orkinThumb.cpp
index f8598af5448..23880f1e10f 100644
--- a/mozilla/db/mork/src/orkinThumb.cpp
+++ b/mozilla/db/mork/src/orkinThumb.cpp
@@ -124,7 +124,7 @@ orkinThumb::CanUseThumb(nsIMdbEnv* mev,
 
 
 // { ===== begin nsIMdbISupports methods =====
-NS_IMPL_QUERY_INTERFACE1(orkinThumb, nsIMdbThumb);
+NS_IMPL_QUERY_INTERFACE1(orkinThumb, nsIMdbThumb)
 
 /*virtual*/ nsrefcnt
 orkinThumb::AddRef() // add strong ref with no
diff --git a/mozilla/directory/xpcom/base/src/nsLDAPConnection.cpp b/mozilla/directory/xpcom/base/src/nsLDAPConnection.cpp
index 4a6a4e9d572..1b80f2346ba 100644
--- a/mozilla/directory/xpcom/base/src/nsLDAPConnection.cpp
+++ b/mozilla/directory/xpcom/base/src/nsLDAPConnection.cpp
@@ -116,11 +116,11 @@ nsLDAPConnection::~nsLDAPConnection()
 // nsLDAPConnection gets destroyed while do_QueryReferent() is called,
 // since converting to the strong reference isn't MT safe.
 //
-NS_IMPL_THREADSAFE_ADDREF(nsLDAPConnection);
+NS_IMPL_THREADSAFE_ADDREF(nsLDAPConnection)
 NS_IMPL_THREADSAFE_QUERY_INTERFACE3(nsLDAPConnection,
                                     nsILDAPConnection,
                                     nsISupportsWeakReference,
-                                    nsIDNSListener);
+                                    nsIDNSListener)
 
 nsrefcnt
 nsLDAPConnection::Release(void)
@@ -548,7 +548,7 @@ nsLDAPConnectionLoop::~nsLDAPConnectionLoop()
         PR_DestroyLock(mLock);
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsLDAPConnectionLoop, nsIRunnable);
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsLDAPConnectionLoop, nsIRunnable)
 
 NS_IMETHODIMP
 nsLDAPConnectionLoop::Init()
diff --git a/mozilla/directory/xpcom/base/src/nsLDAPMessage.cpp b/mozilla/directory/xpcom/base/src/nsLDAPMessage.cpp
index 7b96f080498..32293ae73e1 100644
--- a/mozilla/directory/xpcom/base/src/nsLDAPMessage.cpp
+++ b/mozilla/directory/xpcom/base/src/nsLDAPMessage.cpp
@@ -42,7 +42,7 @@
 #include "nsISupportsUtils.h"
 #include "nsLDAPBERValue.h"
 
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsLDAPMessage, nsILDAPMessage);
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsLDAPMessage, nsILDAPMessage)
 
 // constructor
 //
diff --git a/mozilla/directory/xpcom/base/src/nsLDAPOperation.cpp b/mozilla/directory/xpcom/base/src/nsLDAPOperation.cpp
index f704d7bc3a7..8962ed5d060 100644
--- a/mozilla/directory/xpcom/base/src/nsLDAPOperation.cpp
+++ b/mozilla/directory/xpcom/base/src/nsLDAPOperation.cpp
@@ -50,7 +50,7 @@ nsLDAPOperation::~nsLDAPOperation()
 {
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsLDAPOperation, nsILDAPOperation);
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsLDAPOperation, nsILDAPOperation)
 
 /**
  * Initializes this operation.  Must be called prior to use. 
diff --git a/mozilla/directory/xpcom/base/src/nsLDAPProtocolModule.cpp b/mozilla/directory/xpcom/base/src/nsLDAPProtocolModule.cpp
index 0a203d16e78..9b72d21500d 100644
--- a/mozilla/directory/xpcom/base/src/nsLDAPProtocolModule.cpp
+++ b/mozilla/directory/xpcom/base/src/nsLDAPProtocolModule.cpp
@@ -50,16 +50,16 @@
 
 // use the default constructor
 //
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPConnection);
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPOperation);
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPMessage);
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPServer);
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsLDAPURL, Init);
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsLDAPService, Init);
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPBERValue);
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPConnection)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPOperation)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPMessage)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPServer)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsLDAPURL, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsLDAPService, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPBERValue)
 
 #ifdef MOZ_LDAP_XPCOM_EXPERIMENTAL
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPProtocolHandler);
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPProtocolHandler)
 #endif
 
 // a table of the CIDs implemented by this module
diff --git a/mozilla/directory/xpcom/base/src/nsLDAPService.cpp b/mozilla/directory/xpcom/base/src/nsLDAPService.cpp
index cc2304f7a58..cf4fa335fb2 100644
--- a/mozilla/directory/xpcom/base/src/nsLDAPService.cpp
+++ b/mozilla/directory/xpcom/base/src/nsLDAPService.cpp
@@ -214,7 +214,7 @@ PRBool nsLDAPServiceEntry::DeleteEntry()
 // 
 NS_IMPL_THREADSAFE_ISUPPORTS2(nsLDAPService,
                               nsILDAPService,
-                              nsILDAPMessageListener);
+                              nsILDAPMessageListener)
 
 
 // constructor
diff --git a/mozilla/layout/base/nsDocumentViewer.cpp b/mozilla/layout/base/nsDocumentViewer.cpp
index 650842bed76..5b0c3b7f5ba 100644
--- a/mozilla/layout/base/nsDocumentViewer.cpp
+++ b/mozilla/layout/base/nsDocumentViewer.cpp
@@ -2711,7 +2711,7 @@ NS_IMETHODIMP DocumentViewerImpl::SizeToContent()
 #pragma mark -
 #endif
 
-NS_IMPL_ISUPPORTS1(nsDocViewerSelectionListener, nsISelectionListener);
+NS_IMPL_ISUPPORTS1(nsDocViewerSelectionListener, nsISelectionListener)
 
 nsresult nsDocViewerSelectionListener::Init(DocumentViewerImpl *aDocViewer)
 {
@@ -2950,7 +2950,7 @@ NS_IMETHODIMP nsDocViewerSelectionListener::NotifySelectionChanged(nsIDOMDocumen
 }
 
 //nsDocViewerFocusListener
-NS_IMPL_ISUPPORTS1(nsDocViewerFocusListener, nsIDOMFocusListener);
+NS_IMPL_ISUPPORTS1(nsDocViewerFocusListener, nsIDOMFocusListener)
 
 nsDocViewerFocusListener::nsDocViewerFocusListener()
 :mDocViewer(nsnull)
diff --git a/mozilla/layout/style/nsCSSLoader.cpp b/mozilla/layout/style/nsCSSLoader.cpp
index 5b8e16c5192..e6afdfb625d 100644
--- a/mozilla/layout/style/nsCSSLoader.cpp
+++ b/mozilla/layout/style/nsCSSLoader.cpp
@@ -113,7 +113,7 @@ static const char* const gStateStrings[] = {
 /********************************
  * SheetLoadData implementation *
  ********************************/
-NS_IMPL_ISUPPORTS1(SheetLoadData, nsIUnicharStreamLoaderObserver);
+NS_IMPL_ISUPPORTS1(SheetLoadData, nsIUnicharStreamLoaderObserver)
 
 SheetLoadData::SheetLoadData(CSSLoaderImpl* aLoader,
                              const nsAString& aTitle,
diff --git a/mozilla/layout/style/nsCSSRules.cpp b/mozilla/layout/style/nsCSSRules.cpp
index b666afe719f..60d67c30d34 100644
--- a/mozilla/layout/style/nsCSSRules.cpp
+++ b/mozilla/layout/style/nsCSSRules.cpp
@@ -126,8 +126,8 @@ NS_INTERFACE_MAP_BEGIN(CSSGroupRuleRuleListImpl)
 NS_INTERFACE_MAP_END
 
 
-NS_IMPL_ADDREF(CSSGroupRuleRuleListImpl);
-NS_IMPL_RELEASE(CSSGroupRuleRuleListImpl);
+NS_IMPL_ADDREF(CSSGroupRuleRuleListImpl)
+NS_IMPL_RELEASE(CSSGroupRuleRuleListImpl)
 
 NS_IMETHODIMP    
 CSSGroupRuleRuleListImpl::GetLength(PRUint32* aLength)
@@ -215,8 +215,8 @@ CSSCharsetRuleImpl::~CSSCharsetRuleImpl(void)
 {
 }
 
-NS_IMPL_ADDREF_INHERITED(CSSCharsetRuleImpl, nsCSSRule);
-NS_IMPL_RELEASE_INHERITED(CSSCharsetRuleImpl, nsCSSRule);
+NS_IMPL_ADDREF_INHERITED(CSSCharsetRuleImpl, nsCSSRule)
+NS_IMPL_RELEASE_INHERITED(CSSCharsetRuleImpl, nsCSSRule)
 
 // QueryInterface implementation for CSSCharsetRuleImpl
 NS_INTERFACE_MAP_BEGIN(CSSCharsetRuleImpl)
@@ -228,7 +228,7 @@ NS_INTERFACE_MAP_BEGIN(CSSCharsetRuleImpl)
   NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSCharsetRule)
 NS_INTERFACE_MAP_END
 
-IMPL_STYLE_RULE_INHERIT(CSSCharsetRuleImpl, nsCSSRule);
+IMPL_STYLE_RULE_INHERIT(CSSCharsetRuleImpl, nsCSSRule)
 
 #ifdef DEBUG
 NS_IMETHODIMP
@@ -417,8 +417,8 @@ CSSImportRuleImpl::~CSSImportRuleImpl(void)
   }
 }
 
-NS_IMPL_ADDREF_INHERITED(CSSImportRuleImpl, nsCSSRule);
-NS_IMPL_RELEASE_INHERITED(CSSImportRuleImpl, nsCSSRule);
+NS_IMPL_ADDREF_INHERITED(CSSImportRuleImpl, nsCSSRule)
+NS_IMPL_RELEASE_INHERITED(CSSImportRuleImpl, nsCSSRule)
 
 // QueryInterface implementation for CSSImportRuleImpl
 NS_INTERFACE_MAP_BEGIN(CSSImportRuleImpl)
@@ -431,7 +431,7 @@ NS_INTERFACE_MAP_BEGIN(CSSImportRuleImpl)
   NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSImportRule)
 NS_INTERFACE_MAP_END
 
-IMPL_STYLE_RULE_INHERIT(CSSImportRuleImpl, nsCSSRule);
+IMPL_STYLE_RULE_INHERIT(CSSImportRuleImpl, nsCSSRule)
 
 #ifdef DEBUG
 NS_IMETHODIMP
@@ -744,8 +744,8 @@ CSSMediaRuleImpl::~CSSMediaRuleImpl(void)
   }
 }
 
-NS_IMPL_ADDREF_INHERITED(CSSMediaRuleImpl, nsCSSRule);
-NS_IMPL_RELEASE_INHERITED(CSSMediaRuleImpl, nsCSSRule);
+NS_IMPL_ADDREF_INHERITED(CSSMediaRuleImpl, nsCSSRule)
+NS_IMPL_RELEASE_INHERITED(CSSMediaRuleImpl, nsCSSRule)
 
 // QueryInterface implementation for CSSMediaRuleImpl
 NS_INTERFACE_MAP_BEGIN(CSSMediaRuleImpl)
@@ -758,7 +758,7 @@ NS_INTERFACE_MAP_BEGIN(CSSMediaRuleImpl)
   NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSMediaRule)
 NS_INTERFACE_MAP_END
 
-IMPL_STYLE_RULE_INHERIT2(CSSMediaRuleImpl, nsCSSRule);
+IMPL_STYLE_RULE_INHERIT2(CSSMediaRuleImpl, nsCSSRule)
 
 static PRBool
 SetStyleSheetReference(nsISupports* aRule, void* aSheet)
@@ -1189,8 +1189,8 @@ CSSNameSpaceRuleImpl::~CSSNameSpaceRuleImpl(void)
   NS_IF_RELEASE(mPrefix);
 }
 
-NS_IMPL_ADDREF_INHERITED(CSSNameSpaceRuleImpl, nsCSSRule);
-NS_IMPL_RELEASE_INHERITED(CSSNameSpaceRuleImpl, nsCSSRule);
+NS_IMPL_ADDREF_INHERITED(CSSNameSpaceRuleImpl, nsCSSRule)
+NS_IMPL_RELEASE_INHERITED(CSSNameSpaceRuleImpl, nsCSSRule)
 
 // QueryInterface implementation for CSSNameSpaceRuleImpl
 NS_INTERFACE_MAP_BEGIN(CSSNameSpaceRuleImpl)
@@ -1202,7 +1202,7 @@ NS_INTERFACE_MAP_BEGIN(CSSNameSpaceRuleImpl)
   NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSNameSpaceRule)
 NS_INTERFACE_MAP_END
 
-IMPL_STYLE_RULE_INHERIT(CSSNameSpaceRuleImpl, nsCSSRule);
+IMPL_STYLE_RULE_INHERIT(CSSNameSpaceRuleImpl, nsCSSRule)
 
 #ifdef DEBUG
 NS_IMETHODIMP
diff --git a/mozilla/layout/style/nsCSSStyleSheet.cpp b/mozilla/layout/style/nsCSSStyleSheet.cpp
index 4a3a45101c3..da054e9380f 100644
--- a/mozilla/layout/style/nsCSSStyleSheet.cpp
+++ b/mozilla/layout/style/nsCSSStyleSheet.cpp
@@ -968,8 +968,8 @@ NS_INTERFACE_MAP_BEGIN(CSSRuleListImpl)
 NS_INTERFACE_MAP_END
 
 
-NS_IMPL_ADDREF(CSSRuleListImpl);
-NS_IMPL_RELEASE(CSSRuleListImpl);
+NS_IMPL_ADDREF(CSSRuleListImpl)
+NS_IMPL_RELEASE(CSSRuleListImpl)
 
 
 NS_IMETHODIMP    
@@ -1060,8 +1060,8 @@ NS_INTERFACE_MAP_BEGIN(DOMMediaListImpl)
 NS_INTERFACE_MAP_END
 
 
-NS_IMPL_ADDREF(DOMMediaListImpl);
-NS_IMPL_RELEASE(DOMMediaListImpl);
+NS_IMPL_ADDREF(DOMMediaListImpl)
+NS_IMPL_RELEASE(DOMMediaListImpl)
 
 
 DOMMediaListImpl::DOMMediaListImpl(nsISupportsArray *aArray,
@@ -1406,8 +1406,8 @@ NS_INTERFACE_MAP_BEGIN(CSSImportsCollectionImpl)
 NS_INTERFACE_MAP_END
 
 
-NS_IMPL_ADDREF(CSSImportsCollectionImpl);
-NS_IMPL_RELEASE(CSSImportsCollectionImpl);
+NS_IMPL_ADDREF(CSSImportsCollectionImpl)
+NS_IMPL_RELEASE(CSSImportsCollectionImpl)
 
 
 NS_IMETHODIMP
@@ -3109,8 +3109,8 @@ CSSRuleProcessor::~CSSRuleProcessor(void)
   ClearRuleCascades();
 }
 
-NS_IMPL_ADDREF(CSSRuleProcessor);
-NS_IMPL_RELEASE(CSSRuleProcessor);
+NS_IMPL_ADDREF(CSSRuleProcessor)
+NS_IMPL_RELEASE(CSSRuleProcessor)
 
 nsresult 
 CSSRuleProcessor::QueryInterface(REFNSIID aIID, void** aInstancePtrResult)
diff --git a/mozilla/layout/style/nsComputedDOMStyle.cpp b/mozilla/layout/style/nsComputedDOMStyle.cpp
index 1a649299f36..7113e1befee 100644
--- a/mozilla/layout/style/nsComputedDOMStyle.cpp
+++ b/mozilla/layout/style/nsComputedDOMStyle.cpp
@@ -141,9 +141,9 @@ static void doDestroyComputedDOMStyle(nsComputedDOMStyle *aComputedStyle)
   }
 }
 
-NS_IMPL_ADDREF(nsComputedDOMStyle);
+NS_IMPL_ADDREF(nsComputedDOMStyle)
 NS_IMPL_RELEASE_WITH_DESTROY(nsComputedDOMStyle,
-                             doDestroyComputedDOMStyle(this));
+                             doDestroyComputedDOMStyle(this))
 
 
 NS_IMETHODIMP
diff --git a/mozilla/layout/style/nsDOMCSSDeclaration.cpp b/mozilla/layout/style/nsDOMCSSDeclaration.cpp
index a2332b6e3b1..deeb727d385 100644
--- a/mozilla/layout/style/nsDOMCSSDeclaration.cpp
+++ b/mozilla/layout/style/nsDOMCSSDeclaration.cpp
@@ -68,8 +68,8 @@ NS_INTERFACE_MAP_BEGIN(nsDOMCSSDeclaration)
   NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(CSSStyleDeclaration)
 NS_INTERFACE_MAP_END
 
-NS_IMPL_ADDREF(nsDOMCSSDeclaration);
-NS_IMPL_RELEASE(nsDOMCSSDeclaration);
+NS_IMPL_ADDREF(nsDOMCSSDeclaration)
+NS_IMPL_RELEASE(nsDOMCSSDeclaration)
 
 
 NS_IMETHODIMP
diff --git a/mozilla/layout/style/nsDOMCSSValueList.cpp b/mozilla/layout/style/nsDOMCSSValueList.cpp
index 65a9e39c689..cac8ae7d1a4 100644
--- a/mozilla/layout/style/nsDOMCSSValueList.cpp
+++ b/mozilla/layout/style/nsDOMCSSValueList.cpp
@@ -50,8 +50,8 @@ nsDOMCSSValueList::~nsDOMCSSValueList()
 {
 }
 
-NS_IMPL_ADDREF(nsDOMCSSValueList);
-NS_IMPL_RELEASE(nsDOMCSSValueList);
+NS_IMPL_ADDREF(nsDOMCSSValueList)
+NS_IMPL_RELEASE(nsDOMCSSValueList)
 
 // QueryInterface implementation for nsDOMCSSValueList
 NS_INTERFACE_MAP_BEGIN(nsDOMCSSValueList)
diff --git a/mozilla/layout/style/nsROCSSPrimitiveValue.cpp b/mozilla/layout/style/nsROCSSPrimitiveValue.cpp
index a6f09c5ac16..75a1b521a10 100644
--- a/mozilla/layout/style/nsROCSSPrimitiveValue.cpp
+++ b/mozilla/layout/style/nsROCSSPrimitiveValue.cpp
@@ -91,8 +91,8 @@ nsROCSSPrimitiveValue::GetEscapedURI(PRUnichar *aURI, PRUnichar **aReturn)
 }
 
 
-NS_IMPL_ADDREF(nsROCSSPrimitiveValue);
-NS_IMPL_RELEASE(nsROCSSPrimitiveValue);
+NS_IMPL_ADDREF(nsROCSSPrimitiveValue)
+NS_IMPL_RELEASE(nsROCSSPrimitiveValue)
 
 
 // QueryInterface implementation for nsROCSSPrimitiveValue
diff --git a/mozilla/layout/style/nsStyleStruct.h b/mozilla/layout/style/nsStyleStruct.h
index 16911abeb93..d51e9a5600a 100644
--- a/mozilla/layout/style/nsStyleStruct.h
+++ b/mozilla/layout/style/nsStyleStruct.h
@@ -1203,7 +1203,7 @@ inline nsBorderEdge::nsBorderEdge()
   mColor=0;
   mSide=NS_SIDE_LEFT;
   mInsideNeighbor = nsnull;
-};
+}
 
 /** an encapsulation of a border defined by its edges 
   * owner of this struct is responsible for freeing any data stored in mEdges
@@ -1221,6 +1221,6 @@ inline nsBorderEdges::nsBorderEdges()
 {
   mMaxBorderWidth.SizeTo(0,0,0,0);
   mOutsideEdge = PR_TRUE;
-};
+}
 
 #endif /* nsStyleStruct_h___ */