diff --git a/mozilla/extensions/psm-glue/src/nsKeygenHandler.cpp b/mozilla/extensions/psm-glue/src/nsKeygenHandler.cpp
index 5f1a5509b80..36a4b1811b7 100644
--- a/mozilla/extensions/psm-glue/src/nsKeygenHandler.cpp
+++ b/mozilla/extensions/psm-glue/src/nsKeygenHandler.cpp
@@ -50,7 +50,7 @@ NS_IMPL_ADDREF(nsKeygenFormProcessor);
 NS_IMPL_RELEASE(nsKeygenFormProcessor); 
 NS_IMPL_QUERY_INTERFACE(nsKeygenFormProcessor, kFormProcessorIID); 
 
-MOZ_DECL_CTOR_COUNTER(nsKeygenFormProcessor);
+MOZ_DECL_CTOR_COUNTER(nsKeygenFormProcessor)
 
 nsKeygenFormProcessor::nsKeygenFormProcessor()
 	:	mPSM(0)
diff --git a/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp b/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp
index dfa45ca4498..2ad64281550 100644
--- a/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp
+++ b/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp
@@ -1691,7 +1691,7 @@ nsFontGTK::GetGDKFontIs10646(void)
   return ((PRBool) (mCharSetInfo == &ISO106461));
 }
 
-MOZ_DECL_CTOR_COUNTER(nsFontGTK);
+MOZ_DECL_CTOR_COUNTER(nsFontGTK)
 
 nsFontGTK::nsFontGTK()
 {
diff --git a/mozilla/gfx/src/nsDeviceContext.cpp b/mozilla/gfx/src/nsDeviceContext.cpp
index 01335b16055..1cac44aa539 100644
--- a/mozilla/gfx/src/nsDeviceContext.cpp
+++ b/mozilla/gfx/src/nsDeviceContext.cpp
@@ -677,7 +677,7 @@ NS_IMETHODIMP DeviceContextImpl::GetPaletteInfo(nsPaletteInfo& aPaletteInfo)
 
 /////////////////////////////////////////////////////////////
 
-MOZ_DECL_CTOR_COUNTER(nsFontCache);
+MOZ_DECL_CTOR_COUNTER(nsFontCache)
 
 nsFontCache :: nsFontCache()
 {
diff --git a/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp b/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp
index 0e65a61d871..527551640eb 100644
--- a/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp
+++ b/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp
@@ -1615,7 +1615,7 @@ GetMapFor10646Font(XFontStruct* aFont)
 
 // nsFontXlib Class Implementation
 
-MOZ_DECL_CTOR_COUNTER(nsFontXlib);
+MOZ_DECL_CTOR_COUNTER(nsFontXlib)
 
 nsFontXlib::nsFontXlib()
 {
diff --git a/mozilla/mailnews/base/src/nsMsgCopyService.cpp b/mozilla/mailnews/base/src/nsMsgCopyService.cpp
index acbd67d7416..928c21eb46d 100644
--- a/mozilla/mailnews/base/src/nsMsgCopyService.cpp
+++ b/mozilla/mailnews/base/src/nsMsgCopyService.cpp
@@ -29,7 +29,7 @@
 // ******************** nsCopySource ******************
 // 
 
-MOZ_DECL_CTOR_COUNTER(nsCopySource);
+MOZ_DECL_CTOR_COUNTER(nsCopySource)
 
 nsCopySource::nsCopySource() : m_processed(PR_FALSE)
 {
@@ -62,7 +62,7 @@ void nsCopySource::AddMessage(nsIMessage* aMsg)
 // ************ nsCopyRequest *****************
 // 
 
-MOZ_DECL_CTOR_COUNTER(nsCopyRequest);
+MOZ_DECL_CTOR_COUNTER(nsCopyRequest)
 
 nsCopyRequest::nsCopyRequest() :
     m_requestType(nsCopyMessagesType),
diff --git a/mozilla/mailnews/base/src/nsSubscribableServer.cpp b/mozilla/mailnews/base/src/nsSubscribableServer.cpp
index 09cd385bb49..1b6eafd297f 100644
--- a/mozilla/mailnews/base/src/nsSubscribableServer.cpp
+++ b/mozilla/mailnews/base/src/nsSubscribableServer.cpp
@@ -41,7 +41,7 @@
 static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
 static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
 
-MOZ_DECL_CTOR_COUNTER(nsSubscribableServer);
+MOZ_DECL_CTOR_COUNTER(nsSubscribableServer)
 
 nsSubscribableServer::nsSubscribableServer(void)
 {
diff --git a/mozilla/mailnews/base/util/nsLocalFolderSummarySpec.cpp b/mozilla/mailnews/base/util/nsLocalFolderSummarySpec.cpp
index 26e6d6928a8..89d3f9c058f 100644
--- a/mozilla/mailnews/base/util/nsLocalFolderSummarySpec.cpp
+++ b/mozilla/mailnews/base/util/nsLocalFolderSummarySpec.cpp
@@ -24,7 +24,7 @@
 #include "plstr.h"
 #include "nsString.h"
 
-MOZ_DECL_CTOR_COUNTER(nsLocalFolderSummarySpec);
+MOZ_DECL_CTOR_COUNTER(nsLocalFolderSummarySpec)
 
 nsLocalFolderSummarySpec::~nsLocalFolderSummarySpec()
 {
diff --git a/mozilla/mailnews/base/util/nsMsgGroupRecord.cpp b/mozilla/mailnews/base/util/nsMsgGroupRecord.cpp
index 4f8f7838791..d5bfd26a3e8 100644
--- a/mozilla/mailnews/base/util/nsMsgGroupRecord.cpp
+++ b/mozilla/mailnews/base/util/nsMsgGroupRecord.cpp
@@ -94,7 +94,7 @@ nsMsgGroupRecord::Create(nsMsgGroupRecord* parent, const char* partname,
 	return result;
 }
 
-MOZ_DECL_CTOR_COUNTER(nsMsgGroupRecord);
+MOZ_DECL_CTOR_COUNTER(nsMsgGroupRecord)
 
 nsMsgGroupRecord::nsMsgGroupRecord(nsMsgGroupRecord* parent, const char* partname,
 								 PRInt64 aTime, PRInt32 uniqueid, PRInt32 fileoffset,
diff --git a/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp b/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp
index de195f448dd..9b3f2dd1d33 100644
--- a/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp
+++ b/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp
@@ -66,7 +66,7 @@ static NS_DEFINE_CID(kMsgFilterServiceCID, NS_MSGFILTERSERVICE_CID);
 
 #define PORT_NOT_SET -1
 
-MOZ_DECL_CTOR_COUNTER(nsMsgIncomingServer);
+MOZ_DECL_CTOR_COUNTER(nsMsgIncomingServer)
 
 nsMsgIncomingServer::nsMsgIncomingServer():
     m_prefs(0),
diff --git a/mozilla/mailnews/base/util/nsMsgKeySet.cpp b/mozilla/mailnews/base/util/nsMsgKeySet.cpp
index a70aff76f1e..c7ff39fc064 100644
--- a/mozilla/mailnews/base/util/nsMsgKeySet.cpp
+++ b/mozilla/mailnews/base/util/nsMsgKeySet.cpp
@@ -77,7 +77,7 @@
    set holds a cache of the last value asked for, and can simply resume the
    search from there.  */
 
-MOZ_DECL_CTOR_COUNTER(nsMsgKeySet);
+MOZ_DECL_CTOR_COUNTER(nsMsgKeySet)
 
 
 nsMsgKeySet::nsMsgKeySet(/* MSG_NewsHost* host*/)
diff --git a/mozilla/mailnews/base/util/nsMsgLineBuffer.cpp b/mozilla/mailnews/base/util/nsMsgLineBuffer.cpp
index 1a6b50109c7..87730168edb 100644
--- a/mozilla/mailnews/base/util/nsMsgLineBuffer.cpp
+++ b/mozilla/mailnews/base/util/nsMsgLineBuffer.cpp
@@ -26,7 +26,7 @@
 
 #include "nsIInputStream.h" // used by nsMsgLineStreamBuffer
 
-MOZ_DECL_CTOR_COUNTER(nsByteArray);
+MOZ_DECL_CTOR_COUNTER(nsByteArray)
 
 nsByteArray::nsByteArray()
 {
@@ -83,7 +83,7 @@ nsresult nsByteArray::AppendBuffer(const char *buffer, PRUint32 length)
 	return ret;
 }
 
-MOZ_DECL_CTOR_COUNTER(nsMsgLineBuffer);
+MOZ_DECL_CTOR_COUNTER(nsMsgLineBuffer)
 
 nsMsgLineBuffer::nsMsgLineBuffer(nsMsgLineBufferHandler *handler, PRBool convertNewlinesP)
 {
diff --git a/mozilla/mailnews/base/util/nsNewsSummarySpec.cpp b/mozilla/mailnews/base/util/nsNewsSummarySpec.cpp
index 5261b80dd77..5857a0cc392 100644
--- a/mozilla/mailnews/base/util/nsNewsSummarySpec.cpp
+++ b/mozilla/mailnews/base/util/nsNewsSummarySpec.cpp
@@ -24,7 +24,7 @@
 #include "plstr.h"
 #include "nsString.h"
 
-MOZ_DECL_CTOR_COUNTER(nsNewsSummarySpec);
+MOZ_DECL_CTOR_COUNTER(nsNewsSummarySpec)
 
 nsNewsSummarySpec::~nsNewsSummarySpec()
 {
diff --git a/mozilla/mailnews/base/util/nsUInt32Array.cpp b/mozilla/mailnews/base/util/nsUInt32Array.cpp
index fbd4504d07d..1cc5766466e 100644
--- a/mozilla/mailnews/base/util/nsUInt32Array.cpp
+++ b/mozilla/mailnews/base/util/nsUInt32Array.cpp
@@ -33,7 +33,7 @@
 #include "nsUInt32Array.h"
 #include "nsQuickSort.h"
 
-MOZ_DECL_CTOR_COUNTER(nsUInt32Array);
+MOZ_DECL_CTOR_COUNTER(nsUInt32Array)
 
 nsUInt32Array::nsUInt32Array()
 {
diff --git a/mozilla/modules/libjar/nsZipArchive.cpp b/mozilla/modules/libjar/nsZipArchive.cpp
index 6390eeffc1a..b3c49c5ad3a 100644
--- a/mozilla/modules/libjar/nsZipArchive.cpp
+++ b/mozilla/modules/libjar/nsZipArchive.cpp
@@ -1439,7 +1439,7 @@ cleanup:
 //------------------------------------------
 
 #ifndef STANDALONE
-MOZ_DECL_CTOR_COUNTER(nsZipArchive);
+MOZ_DECL_CTOR_COUNTER(nsZipArchive)
 #endif
 
 nsZipArchive::nsZipArchive()
@@ -1473,7 +1473,7 @@ nsZipArchive::~nsZipArchive()
 //------------------------------------------
 
 #ifndef STANDALONE
-MOZ_DECL_CTOR_COUNTER(nsZipItem);
+MOZ_DECL_CTOR_COUNTER(nsZipItem)
 #endif
 
 nsZipItem::nsZipItem() : name(0), next(0) 
@@ -1501,7 +1501,7 @@ nsZipItem::~nsZipItem()
 //------------------------------------------
 
 #ifndef STANDALONE
-MOZ_DECL_CTOR_COUNTER(nsZipRead);
+MOZ_DECL_CTOR_COUNTER(nsZipRead)
 #endif
 
 nsZipRead::nsZipRead( nsZipArchive* aZipArchive, nsZipItem* aZipItem )
@@ -1529,7 +1529,7 @@ nsZipRead::~nsZipRead()
 //------------------------------------------
 
 #ifndef STANDALONE
-MOZ_DECL_CTOR_COUNTER(nsZipFind);
+MOZ_DECL_CTOR_COUNTER(nsZipFind)
 #endif
 
 nsZipFind::nsZipFind( nsZipArchive* aZip, char* aPattern, PRBool aRegExp )
diff --git a/mozilla/view/src/nsView.cpp b/mozilla/view/src/nsView.cpp
index 078526b63da..cf6bfc86eed 100644
--- a/mozilla/view/src/nsView.cpp
+++ b/mozilla/view/src/nsView.cpp
@@ -71,7 +71,7 @@ nsEventStatus PR_CALLBACK HandleEvent(nsGUIEvent *aEvent)
   return result;
 }
 
-MOZ_DECL_CTOR_COUNTER(nsView);
+MOZ_DECL_CTOR_COUNTER(nsView)
 
 nsView :: nsView()
 {
diff --git a/mozilla/widget/src/gtk/nsGtkIMEHelper.cpp b/mozilla/widget/src/gtk/nsGtkIMEHelper.cpp
index 79270beb1e6..b7e8fafc836 100644
--- a/mozilla/widget/src/gtk/nsGtkIMEHelper.cpp
+++ b/mozilla/widget/src/gtk/nsGtkIMEHelper.cpp
@@ -62,7 +62,7 @@ nsGtkIMEHelper* nsGtkIMEHelper::GetSingleton()
   }
 }
 //-----------------------------------------------------------------------
-MOZ_DECL_CTOR_COUNTER(nsGtkIMEHelper);
+MOZ_DECL_CTOR_COUNTER(nsGtkIMEHelper)
 
 nsGtkIMEHelper::nsGtkIMEHelper()
 {