diff --git a/mozilla/modules/libjar/nsJARProtocolModule.cpp b/mozilla/modules/libjar/nsJARProtocolModule.cpp
index d871cc35021..2ccffe46dd5 100644
--- a/mozilla/modules/libjar/nsJARProtocolModule.cpp
+++ b/mozilla/modules/libjar/nsJARProtocolModule.cpp
@@ -48,6 +48,6 @@ static const nsModuleComponentInfo components[] =
     },
 };
 
-NS_IMPL_NSGETMODULE(nsJarProtocolModule, components);
+NS_IMPL_NSGETMODULE(nsJarProtocolModule, components)
 
 
diff --git a/mozilla/netwerk/base/src/nsAsyncStreamListener.cpp b/mozilla/netwerk/base/src/nsAsyncStreamListener.cpp
index 3bf2eb75e6d..e82c0e50448 100644
--- a/mozilla/netwerk/base/src/nsAsyncStreamListener.cpp
+++ b/mozilla/netwerk/base/src/nsAsyncStreamListener.cpp
@@ -151,8 +151,8 @@ nsStreamListenerEvent::Fire(nsIEventQueue* aEventQueue)
 NS_IMPL_THREADSAFE_ISUPPORTS1(nsAsyncStreamObserver,
                               nsIRequestObserver)
 
-NS_IMPL_ADDREF_INHERITED(nsAsyncStreamListener, nsAsyncStreamObserver);
-NS_IMPL_RELEASE_INHERITED(nsAsyncStreamListener, nsAsyncStreamObserver);
+NS_IMPL_ADDREF_INHERITED(nsAsyncStreamListener, nsAsyncStreamObserver)
+NS_IMPL_RELEASE_INHERITED(nsAsyncStreamListener, nsAsyncStreamObserver)
 
 NS_IMETHODIMP 
 nsAsyncStreamListener::QueryInterface(REFNSIID aIID, void** aInstancePtr)
diff --git a/mozilla/netwerk/base/src/nsBufferedStreams.cpp b/mozilla/netwerk/base/src/nsBufferedStreams.cpp
index d3f7c481f52..53369c971eb 100644
--- a/mozilla/netwerk/base/src/nsBufferedStreams.cpp
+++ b/mozilla/netwerk/base/src/nsBufferedStreams.cpp
@@ -81,7 +81,7 @@ nsBufferedStream::~nsBufferedStream()
     Close();
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsBufferedStream, nsISeekableStream);
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsBufferedStream, nsISeekableStream)
 
 nsresult
 nsBufferedStream::Init(nsISupports* stream, PRUint32 bufferSize)
diff --git a/mozilla/netwerk/base/src/nsIOService.cpp b/mozilla/netwerk/base/src/nsIOService.cpp
index 7a06785c00c..18b9d6601fc 100644
--- a/mozilla/netwerk/base/src/nsIOService.cpp
+++ b/mozilla/netwerk/base/src/nsIOService.cpp
@@ -256,7 +256,7 @@ nsIOService::~nsIOService()
 NS_IMPL_THREADSAFE_ISUPPORTS3(nsIOService,
                               nsIIOService,
                               nsIObserver,
-                              nsISupportsWeakReference);
+                              nsISupportsWeakReference)
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/mozilla/netwerk/base/src/nsLoadGroup.cpp b/mozilla/netwerk/base/src/nsLoadGroup.cpp
index 0a43dbfc3b4..fdd1b41f125 100644
--- a/mozilla/netwerk/base/src/nsLoadGroup.cpp
+++ b/mozilla/netwerk/base/src/nsLoadGroup.cpp
@@ -214,7 +214,7 @@ nsLoadGroup::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
 ////////////////////////////////////////////////////////////////////////////////
 // nsISupports methods:
 
-NS_IMPL_AGGREGATED(nsLoadGroup);
+NS_IMPL_AGGREGATED(nsLoadGroup)
 
 NS_IMETHODIMP
 nsLoadGroup::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr)
diff --git a/mozilla/netwerk/base/src/nsMIMEInputStream.cpp b/mozilla/netwerk/base/src/nsMIMEInputStream.cpp
index d3c2eac045b..507a3360fa1 100644
--- a/mozilla/netwerk/base/src/nsMIMEInputStream.cpp
+++ b/mozilla/netwerk/base/src/nsMIMEInputStream.cpp
@@ -90,7 +90,7 @@ private:
 NS_IMPL_THREADSAFE_ISUPPORTS3(nsMIMEInputStream,
                               nsIMIMEInputStream,
                               nsIInputStream,
-                              nsISeekableStream);
+                              nsISeekableStream)
 
 nsMIMEInputStream::nsMIMEInputStream() : mAddContentLength(PR_FALSE),
                                          mStartedReading(PR_FALSE)
diff --git a/mozilla/netwerk/base/src/nsNetModRegEntry.cpp b/mozilla/netwerk/base/src/nsNetModRegEntry.cpp
index 117ccfc45be..5bfc62917ee 100644
--- a/mozilla/netwerk/base/src/nsNetModRegEntry.cpp
+++ b/mozilla/netwerk/base/src/nsNetModRegEntry.cpp
@@ -52,7 +52,7 @@ static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
 //////////////////////////////
 //// nsISupports
 //////////////////////////////
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsNetModRegEntry, nsINetModRegEntry);
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsNetModRegEntry, nsINetModRegEntry)
 
 
 //////////////////////////////
diff --git a/mozilla/netwerk/base/src/nsNetModuleMgr.cpp b/mozilla/netwerk/base/src/nsNetModuleMgr.cpp
index e1619e56e71..dfec4ca33b6 100644
--- a/mozilla/netwerk/base/src/nsNetModuleMgr.cpp
+++ b/mozilla/netwerk/base/src/nsNetModuleMgr.cpp
@@ -49,7 +49,7 @@ nsNetModuleMgr* nsNetModuleMgr::gManager;
 //// nsISupports
 ///////////////////////////////////
 
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsNetModuleMgr, nsINetModuleMgr);
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsNetModuleMgr, nsINetModuleMgr)
 
 
 ///////////////////////////////////
diff --git a/mozilla/netwerk/base/src/nsProtocolProxyService.cpp b/mozilla/netwerk/base/src/nsProtocolProxyService.cpp
index 4f10d9bc2ff..d2fc2ae6325 100644
--- a/mozilla/netwerk/base/src/nsProtocolProxyService.cpp
+++ b/mozilla/netwerk/base/src/nsProtocolProxyService.cpp
@@ -120,9 +120,9 @@ proxy_GetIntPref(nsIPrefBranch *aPrefBranch,
 
 NS_IMPL_THREADSAFE_ISUPPORTS2(nsProtocolProxyService,
                               nsIProtocolProxyService,
-                              nsIObserver);
+                              nsIObserver)
 NS_IMPL_THREADSAFE_ISUPPORTS1(nsProtocolProxyService::nsProxyInfo,
-                              nsIProxyInfo);
+                              nsIProxyInfo)
 
 nsProtocolProxyService::nsProtocolProxyService()
     : mUseProxy(0)
diff --git a/mozilla/netwerk/base/src/nsSimpleURI.cpp b/mozilla/netwerk/base/src/nsSimpleURI.cpp
index 519fdab45be..525f02c4e02 100644
--- a/mozilla/netwerk/base/src/nsSimpleURI.cpp
+++ b/mozilla/netwerk/base/src/nsSimpleURI.cpp
@@ -69,7 +69,7 @@ nsSimpleURI::~nsSimpleURI()
 {
 }
 
-NS_IMPL_AGGREGATED(nsSimpleURI);
+NS_IMPL_AGGREGATED(nsSimpleURI)
 
 NS_IMETHODIMP
 nsSimpleURI::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr)
diff --git a/mozilla/netwerk/base/src/nsURIChecker.cpp b/mozilla/netwerk/base/src/nsURIChecker.cpp
index 914b76b5bbd..d26a73c7974 100644
--- a/mozilla/netwerk/base/src/nsURIChecker.cpp
+++ b/mozilla/netwerk/base/src/nsURIChecker.cpp
@@ -49,7 +49,7 @@
 //Interfaces for addref, release and queryinterface
 NS_IMPL_ISUPPORTS5(nsURIChecker, nsIURIChecker,
                    nsIRequest, nsIStreamListener,
-                   nsIHttpEventSink, nsIInterfaceRequestor);
+                   nsIHttpEventSink, nsIInterfaceRequestor)
 
 nsURIChecker::nsURIChecker()
 {
diff --git a/mozilla/netwerk/build/nsNetModule.cpp b/mozilla/netwerk/build/nsNetModule.cpp
index f832d3e53ab..44f6c2296b5 100644
--- a/mozilla/netwerk/build/nsNetModule.cpp
+++ b/mozilla/netwerk/build/nsNetModule.cpp
@@ -160,7 +160,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsFileProtocolHandler, Init)
 #ifdef NECKO_PROTOCOL_ftp
 // ftp
 #include "nsFtpProtocolHandler.h"
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsFtpProtocolHandler, Init);
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsFtpProtocolHandler, Init)
 #endif
 
 #ifdef NECKO_PROTOCOL_http
@@ -337,7 +337,7 @@ UnregisterStreamConverters(nsIComponentManager *aCompMgr, nsIFile *aPath,
 }
 
 #ifdef BUILD_BINHEX_DECODER
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsBinHexDecoder);
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsBinHexDecoder)
 #endif
 
 static NS_IMETHODIMP                 
diff --git a/mozilla/netwerk/cache/src/nsCacheEntry.cpp b/mozilla/netwerk/cache/src/nsCacheEntry.cpp
index e570554de70..d74adc2e5bf 100644
--- a/mozilla/netwerk/cache/src/nsCacheEntry.cpp
+++ b/mozilla/netwerk/cache/src/nsCacheEntry.cpp
@@ -297,7 +297,7 @@ nsCacheEntry::DetachDescriptors(void)
  * nsCacheEntryInfo - for implementing about:cache
  *****************************************************************************/
 
-NS_IMPL_ISUPPORTS1(nsCacheEntryInfo, nsICacheEntryInfo);
+NS_IMPL_ISUPPORTS1(nsCacheEntryInfo, nsICacheEntryInfo)
 
 
 NS_IMETHODIMP
diff --git a/mozilla/netwerk/cache/src/nsCacheService.cpp b/mozilla/netwerk/cache/src/nsCacheService.cpp
index 0d28ad80be4..add9a81593c 100644
--- a/mozilla/netwerk/cache/src/nsCacheService.cpp
+++ b/mozilla/netwerk/cache/src/nsCacheService.cpp
@@ -107,7 +107,7 @@ private:
     PRInt32                 mMemoryCacheCapacity;
 };
 
-NS_IMPL_ISUPPORTS1(nsCacheProfilePrefObserver, nsIObserver);
+NS_IMPL_ISUPPORTS1(nsCacheProfilePrefObserver, nsIObserver)
 
 
 nsresult
@@ -384,7 +384,7 @@ nsCacheProfilePrefObserver::MemoryCacheEnabled()
 
 nsCacheService *   nsCacheService::gService = nsnull;
 
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsCacheService, nsICacheService);
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsCacheService, nsICacheService)
 
 nsCacheService::nsCacheService()
     : mCacheServiceLock(nsnull),
diff --git a/mozilla/netwerk/cache/src/nsDiskCacheBinding.cpp b/mozilla/netwerk/cache/src/nsDiskCacheBinding.cpp
index ce9fd09ec3a..3eaf7d1d34e 100644
--- a/mozilla/netwerk/cache/src/nsDiskCacheBinding.cpp
+++ b/mozilla/netwerk/cache/src/nsDiskCacheBinding.cpp
@@ -106,7 +106,7 @@ GetCacheEntryBinding(nsCacheEntry * entry)
  *  nsDiskCacheBinding
  *****************************************************************************/
 
-NS_IMPL_THREADSAFE_ISUPPORTS0(nsDiskCacheBinding);
+NS_IMPL_THREADSAFE_ISUPPORTS0(nsDiskCacheBinding)
 
 nsDiskCacheBinding::nsDiskCacheBinding(nsCacheEntry* entry, nsDiskCacheRecord * record)
     :   mCacheEntry(entry)
diff --git a/mozilla/netwerk/cache/src/nsDiskCacheDevice.cpp b/mozilla/netwerk/cache/src/nsDiskCacheDevice.cpp
index 1ce24824ab7..38aa06faa58 100644
--- a/mozilla/netwerk/cache/src/nsDiskCacheDevice.cpp
+++ b/mozilla/netwerk/cache/src/nsDiskCacheDevice.cpp
@@ -183,7 +183,7 @@ private:
     nsDiskCacheDevice* mDevice;
 };
 
-NS_IMPL_ISUPPORTS1(nsDiskCacheDeviceInfo, nsICacheDeviceInfo);
+NS_IMPL_ISUPPORTS1(nsDiskCacheDeviceInfo, nsICacheDeviceInfo)
 
 /* readonly attribute string description; */
 NS_IMETHODIMP nsDiskCacheDeviceInfo::GetDescription(char ** aDescription)
diff --git a/mozilla/netwerk/cache/src/nsDiskCacheEntry.cpp b/mozilla/netwerk/cache/src/nsDiskCacheEntry.cpp
index 34c25708601..9e3d3e831af 100644
--- a/mozilla/netwerk/cache/src/nsDiskCacheEntry.cpp
+++ b/mozilla/netwerk/cache/src/nsDiskCacheEntry.cpp
@@ -143,7 +143,7 @@ CreateDiskCacheEntry(nsDiskCacheBinding *  binding)
  *  nsDiskCacheEntryInfo
  *****************************************************************************/
 
-NS_IMPL_ISUPPORTS1(nsDiskCacheEntryInfo, nsICacheEntryInfo);
+NS_IMPL_ISUPPORTS1(nsDiskCacheEntryInfo, nsICacheEntryInfo)
 
 NS_IMETHODIMP nsDiskCacheEntryInfo::GetClientID(char ** clientID)
 {
diff --git a/mozilla/netwerk/cache/src/nsMemoryCacheDevice.cpp b/mozilla/netwerk/cache/src/nsMemoryCacheDevice.cpp
index 2f7de628f40..f4044978f45 100644
--- a/mozilla/netwerk/cache/src/nsMemoryCacheDevice.cpp
+++ b/mozilla/netwerk/cache/src/nsMemoryCacheDevice.cpp
@@ -503,7 +503,7 @@ nsMemoryCacheDevice::CheckEntryCount()
  *****************************************************************************/
 
 
-NS_IMPL_ISUPPORTS1(nsMemoryCacheDeviceInfo, nsICacheDeviceInfo);
+NS_IMPL_ISUPPORTS1(nsMemoryCacheDeviceInfo, nsICacheDeviceInfo)
 
 
 NS_IMETHODIMP
diff --git a/mozilla/netwerk/dns/src/nsDnsService.cpp b/mozilla/netwerk/dns/src/nsDnsService.cpp
index a03e49f2dda..d52ea383e95 100644
--- a/mozilla/netwerk/dns/src/nsDnsService.cpp
+++ b/mozilla/netwerk/dns/src/nsDnsService.cpp
@@ -371,7 +371,7 @@ ClearEntry(PLDHashTable *      /* table */,
  *  nsDNSRequest methods:
  *****************************************************************************/
 
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsDNSRequest, nsIRequest);
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsDNSRequest, nsIRequest)
 
 
 nsresult
@@ -527,7 +527,7 @@ nsDNSRequest::SetLoadFlags(nsLoadFlags  loadFlags)
 #pragma mark nsDNSLookup
 #endif
 
-NS_IMPL_THREADSAFE_ISUPPORTS0(nsDNSLookup);
+NS_IMPL_THREADSAFE_ISUPPORTS0(nsDNSLookup)
 
 nsDNSLookup::nsDNSLookup()
     : mHostName(nsnull)
@@ -1135,7 +1135,7 @@ nsDNSService::~nsDNSService()
 }
 
 
-NS_IMPL_THREADSAFE_ISUPPORTS3(nsDNSService, nsIDNSService, nsIRunnable, nsIObserver);
+NS_IMPL_THREADSAFE_ISUPPORTS3(nsDNSService, nsIDNSService, nsIRunnable, nsIObserver)
 
 NS_METHOD
 nsDNSService::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult)
@@ -1821,7 +1821,7 @@ static unsigned long convert_addr(const char* ip)
         PL_strfree(buf);
     }
     return htonl(addr);
-};
+}
 
 
 NS_IMETHODIMP
diff --git a/mozilla/netwerk/dns/src/nsIDNService.cpp b/mozilla/netwerk/dns/src/nsIDNService.cpp
index ea8684fe6a9..cb4854748cd 100644
--- a/mozilla/netwerk/dns/src/nsIDNService.cpp
+++ b/mozilla/netwerk/dns/src/nsIDNService.cpp
@@ -65,7 +65,7 @@ static const PRUint32 kMaxDNSNodeLen = 63;
 NS_IMPL_THREADSAFE_ISUPPORTS3(nsIDNService,
                               nsIIDNService,
                               nsIObserver,
-                              nsISupportsWeakReference);
+                              nsISupportsWeakReference)
 
 nsresult nsIDNService::Init()
 {
diff --git a/mozilla/netwerk/mime/src/nsMIMEInfoImpl.cpp b/mozilla/netwerk/mime/src/nsMIMEInfoImpl.cpp
index cc67ddce4a9..4c20a420ec5 100644
--- a/mozilla/netwerk/mime/src/nsMIMEInfoImpl.cpp
+++ b/mozilla/netwerk/mime/src/nsMIMEInfoImpl.cpp
@@ -41,7 +41,7 @@
 #include "nsStringEnumerator.h"
 
 // nsISupports methods
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsMIMEInfoImpl, nsIMIMEInfo);
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsMIMEInfoImpl, nsIMIMEInfo)
 
 // nsMIMEInfoImpl methods
 nsMIMEInfoImpl::nsMIMEInfoImpl() {
diff --git a/mozilla/netwerk/protocol/about/src/nsAboutBlank.cpp b/mozilla/netwerk/protocol/about/src/nsAboutBlank.cpp
index 9d3f9c27a4b..ecde1c25cc1 100644
--- a/mozilla/netwerk/protocol/about/src/nsAboutBlank.cpp
+++ b/mozilla/netwerk/protocol/about/src/nsAboutBlank.cpp
@@ -41,7 +41,7 @@
 #include "nsIStringStream.h"
 #include "nsNetUtil.h"
 
-NS_IMPL_ISUPPORTS1(nsAboutBlank, nsIAboutModule);
+NS_IMPL_ISUPPORTS1(nsAboutBlank, nsIAboutModule)
 
 static const char kBlankPage[] = "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">"
 "<html><head><title></title></head><body></body></html>";
diff --git a/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp b/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp
index 7cfa541f895..aa203de1123 100644
--- a/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp
+++ b/mozilla/netwerk/protocol/file/src/nsFileProtocolHandler.cpp
@@ -70,7 +70,7 @@ nsFileProtocolHandler::Init()
 NS_IMPL_THREADSAFE_ISUPPORTS3(nsFileProtocolHandler,
                               nsIFileProtocolHandler,
                               nsIProtocolHandler,
-                              nsISupportsWeakReference);
+                              nsISupportsWeakReference)
 
 //-----------------------------------------------------------------------------
 // nsIProtocolHandler methods:
diff --git a/mozilla/netwerk/protocol/file/src/nsFileProtocolModule.cpp b/mozilla/netwerk/protocol/file/src/nsFileProtocolModule.cpp
index de32277fafb..d0437967acf 100644
--- a/mozilla/netwerk/protocol/file/src/nsFileProtocolModule.cpp
+++ b/mozilla/netwerk/protocol/file/src/nsFileProtocolModule.cpp
@@ -54,4 +54,4 @@ static const nsModuleComponentInfo components[] =
     }
 };
 
-NS_IMPL_NSGETMODULE(nsFileProtocolModule, components);
+NS_IMPL_NSGETMODULE(nsFileProtocolModule, components)
diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp
index db9a2f291c7..3e3f621f0c9 100644
--- a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp
+++ b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp
@@ -359,7 +359,7 @@ DataRequestForwarder::OnTransportStatus(nsITransport *transport, nsresult status
 NS_IMPL_THREADSAFE_ISUPPORTS3(nsFtpState,
                               nsIStreamListener, 
                               nsIRequestObserver, 
-                              nsIRequest);
+                              nsIRequest)
 
 nsFtpState::nsFtpState()
 {
diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpControlConnection.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpControlConnection.cpp
index 623e00eb845..23c88a32b1b 100644
--- a/mozilla/netwerk/protocol/ftp/src/nsFtpControlConnection.cpp
+++ b/mozilla/netwerk/protocol/ftp/src/nsFtpControlConnection.cpp
@@ -58,7 +58,7 @@ static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
 
 NS_IMPL_THREADSAFE_ISUPPORTS2(nsFtpControlConnection, 
                               nsIStreamListener, 
-                              nsIRequestObserver);
+                              nsIRequestObserver)
 
 nsFtpControlConnection::nsFtpControlConnection(const char* host, 
                                                PRUint32 port) 
diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp
index 783574d19e2..f4d7961cd71 100644
--- a/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp
+++ b/mozilla/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp
@@ -104,7 +104,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS4(nsFtpProtocolHandler,
                               nsIProtocolHandler,
                               nsIProxiedProtocolHandler,
                               nsIObserver,
-                              nsISupportsWeakReference);
+                              nsISupportsWeakReference)
 
 nsresult
 nsFtpProtocolHandler::Init()
diff --git a/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.cpp b/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.cpp
index 486f068f110..9c7a81e193e 100644
--- a/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.cpp
+++ b/mozilla/netwerk/protocol/gopher/src/nsGopherChannel.cpp
@@ -80,7 +80,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS6(nsGopherChannel,
                               nsIStreamListener,
                               nsIRequestObserver,
                               nsIDirectoryListing,
-                              nsITransportEventSink);
+                              nsITransportEventSink)
 
 nsresult
 nsGopherChannel::Init(nsIURI* uri, nsIProxyInfo* proxyInfo)
diff --git a/mozilla/netwerk/protocol/gopher/src/nsGopherHandler.cpp b/mozilla/netwerk/protocol/gopher/src/nsGopherHandler.cpp
index 7fe04a33532..4a727ef74ea 100644
--- a/mozilla/netwerk/protocol/gopher/src/nsGopherHandler.cpp
+++ b/mozilla/netwerk/protocol/gopher/src/nsGopherHandler.cpp
@@ -59,7 +59,7 @@ nsGopherHandler::~nsGopherHandler() {
 
 NS_IMPL_THREADSAFE_ISUPPORTS2(nsGopherHandler,
                               nsIProxiedProtocolHandler,
-                              nsIProtocolHandler);
+                              nsIProtocolHandler)
 
 NS_METHOD
 nsGopherHandler::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult) {
diff --git a/mozilla/netwerk/protocol/http/src/nsHttpBasicAuth.cpp b/mozilla/netwerk/protocol/http/src/nsHttpBasicAuth.cpp
index 99a54b1da2c..a769109f4cc 100644
--- a/mozilla/netwerk/protocol/http/src/nsHttpBasicAuth.cpp
+++ b/mozilla/netwerk/protocol/http/src/nsHttpBasicAuth.cpp
@@ -63,7 +63,7 @@ nsHttpBasicAuth::~nsHttpBasicAuth()
 // nsHttpBasicAuth::nsISupports
 //-----------------------------------------------------------------------------
 
-NS_IMPL_ISUPPORTS1(nsHttpBasicAuth, nsIHttpAuthenticator);
+NS_IMPL_ISUPPORTS1(nsHttpBasicAuth, nsIHttpAuthenticator)
 
 //-----------------------------------------------------------------------------
 // nsHttpBasicAuth::nsIHttpAuthenticator
diff --git a/mozilla/netwerk/protocol/http/src/nsHttpDigestAuth.cpp b/mozilla/netwerk/protocol/http/src/nsHttpDigestAuth.cpp
index 64c9545714b..472fecdf009 100644
--- a/mozilla/netwerk/protocol/http/src/nsHttpDigestAuth.cpp
+++ b/mozilla/netwerk/protocol/http/src/nsHttpDigestAuth.cpp
@@ -62,7 +62,7 @@ nsHttpDigestAuth::nsHttpDigestAuth()
 // nsHttpDigestAuth::nsISupports
 //-----------------------------------------------------------------------------
 
-NS_IMPL_ISUPPORTS1(nsHttpDigestAuth, nsIHttpAuthenticator);
+NS_IMPL_ISUPPORTS1(nsHttpDigestAuth, nsIHttpAuthenticator)
 
 //-----------------------------------------------------------------------------
 // nsHttpDigestAuth <protected>
diff --git a/mozilla/netwerk/protocol/http/src/nsHttpNTLMAuth.cpp b/mozilla/netwerk/protocol/http/src/nsHttpNTLMAuth.cpp
index aa30627669c..d403afcdb8b 100644
--- a/mozilla/netwerk/protocol/http/src/nsHttpNTLMAuth.cpp
+++ b/mozilla/netwerk/protocol/http/src/nsHttpNTLMAuth.cpp
@@ -200,7 +200,7 @@ nsHttpNTLMAuth::Init()
     return NS_OK;
 }
 
-NS_IMPL_ISUPPORTS1(nsHttpNTLMAuth, nsIHttpAuthenticator);
+NS_IMPL_ISUPPORTS1(nsHttpNTLMAuth, nsIHttpAuthenticator)
 
 NS_IMETHODIMP
 nsHttpNTLMAuth::ChallengeReceived(nsIHttpChannel *channel,
diff --git a/mozilla/netwerk/protocol/jar/src/nsJARProtocolModule.cpp b/mozilla/netwerk/protocol/jar/src/nsJARProtocolModule.cpp
index d871cc35021..2ccffe46dd5 100644
--- a/mozilla/netwerk/protocol/jar/src/nsJARProtocolModule.cpp
+++ b/mozilla/netwerk/protocol/jar/src/nsJARProtocolModule.cpp
@@ -48,6 +48,6 @@ static const nsModuleComponentInfo components[] =
     },
 };
 
-NS_IMPL_NSGETMODULE(nsJarProtocolModule, components);
+NS_IMPL_NSGETMODULE(nsJarProtocolModule, components)
 
 
diff --git a/mozilla/netwerk/socket/base/nsSOCKS4SocketProvider.cpp b/mozilla/netwerk/socket/base/nsSOCKS4SocketProvider.cpp
index 591c01e0b4c..e1f65d146d8 100644
--- a/mozilla/netwerk/socket/base/nsSOCKS4SocketProvider.cpp
+++ b/mozilla/netwerk/socket/base/nsSOCKS4SocketProvider.cpp
@@ -43,7 +43,7 @@ nsSOCKS4SocketProvider::~nsSOCKS4SocketProvider()
 {
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS2(nsSOCKS4SocketProvider, nsISocketProvider, nsISOCKS4SocketProvider);
+NS_IMPL_THREADSAFE_ISUPPORTS2(nsSOCKS4SocketProvider, nsISocketProvider, nsISOCKS4SocketProvider)
 
 NS_METHOD
 nsSOCKS4SocketProvider::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
diff --git a/mozilla/netwerk/socket/base/nsSOCKSIOLayer.cpp b/mozilla/netwerk/socket/base/nsSOCKSIOLayer.cpp
index d51aefe0844..8c0d0e33532 100644
--- a/mozilla/netwerk/socket/base/nsSOCKSIOLayer.cpp
+++ b/mozilla/netwerk/socket/base/nsSOCKSIOLayer.cpp
@@ -90,7 +90,7 @@ nsSOCKSSocketInfo::~nsSOCKSSocketInfo()
     PR_FREEIF(mProxyHost);
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsSOCKSSocketInfo, nsISOCKSSocketInfo);
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsSOCKSSocketInfo, nsISOCKSSocketInfo)
 
 NS_IMETHODIMP 
 nsSOCKSSocketInfo::GetProxyHost(char * *aProxyHost)
diff --git a/mozilla/netwerk/socket/base/nsSOCKSSocketProvider.cpp b/mozilla/netwerk/socket/base/nsSOCKSSocketProvider.cpp
index 7b84b7d4698..374c04c69e4 100644
--- a/mozilla/netwerk/socket/base/nsSOCKSSocketProvider.cpp
+++ b/mozilla/netwerk/socket/base/nsSOCKSSocketProvider.cpp
@@ -43,7 +43,7 @@ nsSOCKSSocketProvider::~nsSOCKSSocketProvider()
 {
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS2(nsSOCKSSocketProvider, nsISocketProvider, nsISOCKSSocketProvider);
+NS_IMPL_THREADSAFE_ISUPPORTS2(nsSOCKSSocketProvider, nsISocketProvider, nsISOCKSSocketProvider)
 
 NS_METHOD
 nsSOCKSSocketProvider::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
diff --git a/mozilla/netwerk/socket/base/nsSocketProviderService.cpp b/mozilla/netwerk/socket/base/nsSocketProviderService.cpp
index ae33bf7cd7d..3e93a25cad6 100644
--- a/mozilla/netwerk/socket/base/nsSocketProviderService.cpp
+++ b/mozilla/netwerk/socket/base/nsSocketProviderService.cpp
@@ -82,7 +82,7 @@ nsSocketProviderService::Create(nsISupports *aOuter, REFNSIID aIID, void **aResu
   return rv;
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsSocketProviderService, nsISocketProviderService);
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsSocketProviderService, nsISocketProviderService)
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/mozilla/netwerk/streamconv/converters/nsBinHexDecoder.cpp b/mozilla/netwerk/streamconv/converters/nsBinHexDecoder.cpp
index 9a6d4a52187..5e3509919d0 100644
--- a/mozilla/netwerk/streamconv/converters/nsBinHexDecoder.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsBinHexDecoder.cpp
@@ -85,8 +85,8 @@ nsBinHexDecoder::~nsBinHexDecoder()
     nsMemory::Free(mOutgoingBuffer);
 }
 
-NS_IMPL_ADDREF(nsBinHexDecoder);
-NS_IMPL_RELEASE(nsBinHexDecoder);
+NS_IMPL_ADDREF(nsBinHexDecoder)
+NS_IMPL_RELEASE(nsBinHexDecoder)
 
 NS_INTERFACE_MAP_BEGIN(nsBinHexDecoder)
    NS_INTERFACE_MAP_ENTRY(nsIStreamConverter)
diff --git a/mozilla/netwerk/streamconv/converters/nsDirIndex.cpp b/mozilla/netwerk/streamconv/converters/nsDirIndex.cpp
index 21e022540ce..92e17868172 100644
--- a/mozilla/netwerk/streamconv/converters/nsDirIndex.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsDirIndex.cpp
@@ -41,16 +41,16 @@
 #include "nsISupportsObsolete.h"
 
 NS_IMPL_THREADSAFE_ISUPPORTS1(nsDirIndex,
-                              nsIDirIndex);
+                              nsIDirIndex)
 
 nsDirIndex::nsDirIndex() : mType(TYPE_UNKNOWN),
                            mSize((PRUint32)(-1)),
                            mLastModified(-1) {
-};
+}
 
-nsDirIndex::~nsDirIndex() {};
+nsDirIndex::~nsDirIndex() {}
 
-NS_IMPL_GETSET(nsDirIndex, Type, PRUint32, mType);
+NS_IMPL_GETSET(nsDirIndex, Type, PRUint32, mType)
 
 // GETSET macros for modern strings would be nice...
 
@@ -99,6 +99,6 @@ nsDirIndex::SetDescription(const PRUnichar* aDescription) {
   return NS_OK;
 }
 
-NS_IMPL_GETSET(nsDirIndex, Size, PRUint32, mSize);
-NS_IMPL_GETSET(nsDirIndex, LastModified, PRInt64, mLastModified);
+NS_IMPL_GETSET(nsDirIndex, Size, PRUint32, mSize)
+NS_IMPL_GETSET(nsDirIndex, LastModified, PRInt64, mLastModified)
 
diff --git a/mozilla/netwerk/streamconv/converters/nsDirIndexParser.cpp b/mozilla/netwerk/streamconv/converters/nsDirIndexParser.cpp
index 95e2766e2ea..c1f28f26678 100644
--- a/mozilla/netwerk/streamconv/converters/nsDirIndexParser.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsDirIndexParser.cpp
@@ -105,7 +105,7 @@ nsDirIndexParser::~nsDirIndexParser() {
   if (--gRefCntParser == 0) {
     NS_IF_RELEASE(gTextToSubURI);
   }
-};
+}
 
 NS_IMETHODIMP
 nsDirIndexParser::SetListener(nsIDirIndexListener* aListener) {
diff --git a/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp b/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp
index 2618da3a9fe..84bd7f30369 100644
--- a/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp
@@ -77,7 +77,7 @@ PRLogModuleInfo* gFTPDirListConvLog = nsnull;
 NS_IMPL_THREADSAFE_ISUPPORTS3(nsFTPDirListingConv,
                               nsIStreamConverter,
                               nsIStreamListener, 
-                              nsIRequestObserver);
+                              nsIRequestObserver)
 
 
 // nsIStreamConverter implementation
diff --git a/mozilla/netwerk/streamconv/converters/nsGopherDirListingConv.cpp b/mozilla/netwerk/streamconv/converters/nsGopherDirListingConv.cpp
index fcf45c2ca40..85e23e3657e 100644
--- a/mozilla/netwerk/streamconv/converters/nsGopherDirListingConv.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsGopherDirListingConv.cpp
@@ -45,7 +45,7 @@
 NS_IMPL_THREADSAFE_ISUPPORTS3(nsGopherDirListingConv,
                               nsIStreamConverter,
                               nsIStreamListener,
-                              nsIRequestObserver);
+                              nsIRequestObserver)
 
 // nsIStreamConverter implementation
 
diff --git a/mozilla/netwerk/streamconv/converters/nsMultiMixedConv.cpp b/mozilla/netwerk/streamconv/converters/nsMultiMixedConv.cpp
index 448540ab464..f8c0290acde 100644
--- a/mozilla/netwerk/streamconv/converters/nsMultiMixedConv.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsMultiMixedConv.cpp
@@ -406,7 +406,7 @@ nsPartChannel::GetBaseChannel(nsIChannel ** aReturn)
 NS_IMPL_THREADSAFE_ISUPPORTS3(nsMultiMixedConv,
                               nsIStreamConverter, 
                               nsIStreamListener,
-                              nsIRequestObserver);
+                              nsIRequestObserver)
 
 
 // nsIStreamConverter implementation
diff --git a/mozilla/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp b/mozilla/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp
index cf78478df11..e62e02e396d 100644
--- a/mozilla/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsTXTToHTMLConv.cpp
@@ -46,7 +46,7 @@ NS_IMPL_THREADSAFE_ISUPPORTS4(nsTXTToHTMLConv,
                               nsIStreamConverter,
                               nsITXTToHTMLConv,
                               nsIRequestObserver,
-                              nsIStreamListener);
+                              nsIStreamListener)
 
 
 // nsIStreamConverter methods
diff --git a/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp b/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp
index 4270df031ba..23c69b23408 100644
--- a/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp
+++ b/mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp
@@ -92,8 +92,8 @@ nsUnknownDecoder::~nsUnknownDecoder()
 //
 // ----
 
-NS_IMPL_ADDREF(nsUnknownDecoder);
-NS_IMPL_RELEASE(nsUnknownDecoder);
+NS_IMPL_ADDREF(nsUnknownDecoder)
+NS_IMPL_RELEASE(nsUnknownDecoder)
 
 NS_INTERFACE_MAP_BEGIN(nsUnknownDecoder)
    NS_INTERFACE_MAP_ENTRY(nsIStreamConverter)
diff --git a/mozilla/netwerk/streamconv/src/nsAppleFileDecoder.cpp b/mozilla/netwerk/streamconv/src/nsAppleFileDecoder.cpp
index 2fd28db5dd3..a80b716c36e 100644
--- a/mozilla/netwerk/streamconv/src/nsAppleFileDecoder.cpp
+++ b/mozilla/netwerk/streamconv/src/nsAppleFileDecoder.cpp
@@ -41,7 +41,7 @@
 #include "nsCRT.h"
 
 
-NS_IMPL_THREADSAFE_ISUPPORTS2(nsAppleFileDecoder, nsIAppleFileDecoder, nsIOutputStream);
+NS_IMPL_THREADSAFE_ISUPPORTS2(nsAppleFileDecoder, nsIAppleFileDecoder, nsIOutputStream)
 
 nsAppleFileDecoder::nsAppleFileDecoder()
 {
diff --git a/mozilla/netwerk/streamconv/src/nsStreamConvServiceFactory.cpp b/mozilla/netwerk/streamconv/src/nsStreamConvServiceFactory.cpp
index a6445956967..021594f97e2 100644
--- a/mozilla/netwerk/streamconv/src/nsStreamConvServiceFactory.cpp
+++ b/mozilla/netwerk/streamconv/src/nsStreamConvServiceFactory.cpp
@@ -103,4 +103,4 @@ static const nsModuleComponentInfo components[] =
     },
 };
 
-NS_IMPL_NSGETMODULE(nsStreamConvModule, components);
+NS_IMPL_NSGETMODULE(nsStreamConvModule, components)
diff --git a/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp b/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp
index dd8d24108ad..7f9151859f7 100644
--- a/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp
+++ b/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp
@@ -50,7 +50,7 @@
 
 ////////////////////////////////////////////////////////////
 // nsISupports methods
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsStreamConverterService, nsIStreamConverterService);
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsStreamConverterService, nsIStreamConverterService)
 
 
 ////////////////////////////////////////////////////////////
@@ -74,7 +74,7 @@ static PRBool PR_CALLBACK DeleteAdjacencyEntry(nsHashKey *aKey, void *aData, voi
     delete entry->data.edges;
     delete entry;
     return PR_TRUE;   
-};
+}
 
 nsresult
 nsStreamConverterService::Init() {
@@ -263,7 +263,7 @@ static PRBool PR_CALLBACK InitBFSTable(nsHashKey *aKey, void *aData, void* closu
 
     BFSTable->Put(aKey, data);
     return PR_TRUE;   
-};
+}
 
 // cleans up the BFS state table
 static PRBool PR_CALLBACK DeleteBFSEntry(nsHashKey *aKey, void *aData, void *closure) {
diff --git a/mozilla/netwerk/streamconv/test/Converters.cpp b/mozilla/netwerk/streamconv/test/Converters.cpp
index 2261b2e8821..4ac344c30d1 100644
--- a/mozilla/netwerk/streamconv/test/Converters.cpp
+++ b/mozilla/netwerk/streamconv/test/Converters.cpp
@@ -7,7 +7,7 @@
 // TestConverter
 //////////////////////////////////////////////////
 
-NS_IMPL_ISUPPORTS2(TestConverter, nsIStreamConverter, nsIStreamListener);
+NS_IMPL_ISUPPORTS2(TestConverter, nsIStreamConverter, nsIStreamListener)
 
 TestConverter::TestConverter() {
 }
@@ -69,7 +69,7 @@ TestConverter::AsyncConvertData(const PRUnichar *aFromType,
     toType = aToType;
 
     return NS_OK; 
-};
+}
 
 // nsIStreamListener method
 /* This method handles asyncronous conversion of data. */
@@ -90,20 +90,20 @@ TestConverter::OnDataAvailable(nsIRequest* request,
     PRUint32 len;
     convertedStream->Available(&len);
     return mListener->OnDataAvailable(request, ctxt, convertedStream, sourceOffset, len);
-};
+}
 
 // nsIRequestObserver methods
 /* These methods just pass through directly to the mListener */
 NS_IMETHODIMP
 TestConverter::OnStartRequest(nsIRequest* request, nsISupports *ctxt) {
     return mListener->OnStartRequest(request, ctxt);
-};
+}
 
 NS_IMETHODIMP
 TestConverter::OnStopRequest(nsIRequest* request, nsISupports *ctxt, 
                              nsresult aStatus) {
     return mListener->OnStopRequest(request, ctxt, aStatus);
-};
+}
 
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/mozilla/netwerk/streamconv/test/TestStreamConv.cpp b/mozilla/netwerk/streamconv/test/TestStreamConv.cpp
index 038c994ddee..7f5a13f5d83 100644
--- a/mozilla/netwerk/streamconv/test/TestStreamConv.cpp
+++ b/mozilla/netwerk/streamconv/test/TestStreamConv.cpp
@@ -118,7 +118,7 @@ public:
                              nsresult aStatus) { return NS_OK; }
 };
 
-NS_IMPL_ISUPPORTS1(EndListener, nsIStreamListener);
+NS_IMPL_ISUPPORTS1(EndListener, nsIStreamListener)
 ////////////////////////////////////////////////////////////////////////
 // EndListener END
 ////////////////////////////////////////////////////////////////////////
diff --git a/mozilla/netwerk/test/TestCallbacks.cpp b/mozilla/netwerk/test/TestCallbacks.cpp
index dbbad7759d0..9537ef06fdb 100644
--- a/mozilla/netwerk/test/TestCallbacks.cpp
+++ b/mozilla/netwerk/test/TestCallbacks.cpp
@@ -88,7 +88,7 @@ public:
     };
 };
 
-NS_IMPL_THREADSAFE_ISUPPORTS1(ConsumerContext, nsIEquals);
+NS_IMPL_THREADSAFE_ISUPPORTS1(ConsumerContext, nsIEquals)
 
 class Consumer : public nsIStreamListener {
 public:
@@ -111,7 +111,7 @@ public:
 };
 
 // nsISupports implementation
-NS_IMPL_THREADSAFE_ISUPPORTS2(Consumer, nsIStreamListener, nsIRequestObserver);
+NS_IMPL_THREADSAFE_ISUPPORTS2(Consumer, nsIStreamListener, nsIRequestObserver)
 
 
 // nsIRequestObserver implementation
diff --git a/mozilla/netwerk/test/TestFileInput.cpp b/mozilla/netwerk/test/TestFileInput.cpp
index 945c3fdd249..e455ed6dca6 100644
--- a/mozilla/netwerk/test/TestFileInput.cpp
+++ b/mozilla/netwerk/test/TestFileInput.cpp
@@ -191,8 +191,8 @@ private:
     PRMonitor*          mMonitor;
 };
 
-NS_IMPL_ADDREF(nsReader);
-NS_IMPL_RELEASE(nsReader);
+NS_IMPL_ADDREF(nsReader)
+NS_IMPL_RELEASE(nsReader)
 
 NS_IMETHODIMP
 nsReader::QueryInterface(const nsIID& aIID, void* *aInstancePtr)
diff --git a/mozilla/netwerk/test/TestFileTransport.cpp b/mozilla/netwerk/test/TestFileTransport.cpp
index 3c3947e8af3..df0c1dd8b48 100644
--- a/mozilla/netwerk/test/TestFileTransport.cpp
+++ b/mozilla/netwerk/test/TestFileTransport.cpp
@@ -182,7 +182,7 @@ protected:
     PRUint32 mStopCount;
 };
 
-NS_IMPL_THREADSAFE_ISUPPORTS2(MyListener, nsIStreamListener, nsIRequestObserver);
+NS_IMPL_THREADSAFE_ISUPPORTS2(MyListener, nsIStreamListener, nsIRequestObserver)
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -332,7 +332,7 @@ public:
     virtual ~MyOpenObserver() {}
 };
 
-NS_IMPL_ISUPPORTS1(MyOpenObserver, nsIRequestObserver);
+NS_IMPL_ISUPPORTS1(MyOpenObserver, nsIRequestObserver)
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/mozilla/netwerk/test/TestProtocols.cpp b/mozilla/netwerk/test/TestProtocols.cpp
index 1e148542afe..97991f1bd3a 100644
--- a/mozilla/netwerk/test/TestProtocols.cpp
+++ b/mozilla/netwerk/test/TestProtocols.cpp
@@ -173,7 +173,7 @@ TestHttpEventSink::~TestHttpEventSink()
 }
 
 
-NS_IMPL_ISUPPORTS1(TestHttpEventSink, nsIHttpEventSink);
+NS_IMPL_ISUPPORTS1(TestHttpEventSink, nsIHttpEventSink)
 
 NS_IMETHODIMP
 TestHttpEventSink::OnRedirect(nsIHttpChannel *channel, nsIChannel *newChannel)
diff --git a/mozilla/netwerk/test/TestThreadedIO.cpp b/mozilla/netwerk/test/TestThreadedIO.cpp
index 8182068fb4e..548dce60ee8 100644
--- a/mozilla/netwerk/test/TestThreadedIO.cpp
+++ b/mozilla/netwerk/test/TestThreadedIO.cpp
@@ -125,7 +125,7 @@ TestListener::~TestListener() {
     printf( "TestListener dtor called on thread %d\n", mThreadNo );
 }
 
-NS_IMPL_ISUPPORTS2( TestListener, nsIStreamListener, nsIRequestObserver );
+NS_IMPL_ISUPPORTS2( TestListener, nsIStreamListener, nsIRequestObserver )
 
 NS_IMETHODIMP
 TestListener::OnStartRequest( nsIChannel *aChannel, nsISupports *aContext ) {
diff --git a/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp b/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp
index 5e78be1b61a..7fbb15d2769 100644
--- a/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp
+++ b/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp
@@ -2043,8 +2043,8 @@ CPluginManager::QueryInterface(const nsIID& iid, void** ptr)
     return NS_NOINTERFACE;                                                 
 }
 
-NS_IMPL_ADDREF(CPluginManager);
-NS_IMPL_RELEASE(CPluginManager);
+NS_IMPL_ADDREF(CPluginManager)
+NS_IMPL_RELEASE(CPluginManager)
 
 //////////////////////////////////////////////////////////////////////////////
 //
@@ -2324,8 +2324,8 @@ CPluginInstancePeer::SetWindowSize(PRUint32 width, PRUint32 height)
 // nsISupports functions
 //+++++++++++++++++++++++++++++++++++++++++++++++++
 
-NS_IMPL_ADDREF(CPluginInstancePeer);
-NS_IMPL_RELEASE(CPluginInstancePeer);
+NS_IMPL_ADDREF(CPluginInstancePeer)
+NS_IMPL_RELEASE(CPluginInstancePeer)
 
 NS_METHOD
 CPluginInstancePeer::QueryInterface(const nsIID& iid, void** ptr) 
diff --git a/mozilla/plugin/oji/MRJ/plugin/Source/CSecureEnv.cpp b/mozilla/plugin/oji/MRJ/plugin/Source/CSecureEnv.cpp
index 40c31334913..cbfaa8e9a30 100644
--- a/mozilla/plugin/oji/MRJ/plugin/Source/CSecureEnv.cpp
+++ b/mozilla/plugin/oji/MRJ/plugin/Source/CSecureEnv.cpp
@@ -302,7 +302,7 @@ void CSecureEnv::sendMessageFromJava(JNIEnv* javaEnv, JavaMessage* msg, Boolean
 // Thes macro expands to the aggregated query interface scheme.
 
 #if 0
-NS_IMPL_AGGREGATED(CSecureEnv);
+NS_IMPL_AGGREGATED(CSecureEnv)
 
 NS_METHOD
 CSecureEnv::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr)
diff --git a/mozilla/plugin/oji/MRJ/plugin/Source/MRJNetworking.cpp b/mozilla/plugin/oji/MRJ/plugin/Source/MRJNetworking.cpp
index b21c3bb549c..5a5c8af0b15 100644
--- a/mozilla/plugin/oji/MRJ/plugin/Source/MRJNetworking.cpp
+++ b/mozilla/plugin/oji/MRJ/plugin/Source/MRJNetworking.cpp
@@ -124,7 +124,7 @@ public:
 
     OSStatus read(void* buffer, SInt32 bufferSize, SInt32* bytesRead);
 };
-NS_IMPL_ISUPPORTS1(MRJInputStream, nsIPluginStreamListener);
+NS_IMPL_ISUPPORTS1(MRJInputStream, nsIPluginStreamListener)
 
 NS_IMETHODIMP
 MRJInputStream::OnDataAvailable(nsIPluginStreamInfo* pluginInfo, nsIInputStream* input, PRUint32 length)
diff --git a/mozilla/profile/build/nsProfileFactory.cpp b/mozilla/profile/build/nsProfileFactory.cpp
index 8c0515404bf..d0a0bf77d12 100644
--- a/mozilla/profile/build/nsProfileFactory.cpp
+++ b/mozilla/profile/build/nsProfileFactory.cpp
@@ -40,7 +40,7 @@
 #include "nsIModule.h"
 #include "nsIGenericFactory.h"
 
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsProfile, Init);
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsProfile, Init)
 
 static const nsModuleComponentInfo components[] =
 {
@@ -51,4 +51,4 @@ static const nsModuleComponentInfo components[] =
     },
 };
 
-NS_IMPL_NSGETMODULE(nsProfileModule, components);
+NS_IMPL_NSGETMODULE(nsProfileModule, components)
diff --git a/mozilla/profile/pref-migrator/src/nsPrefMigrationFactory.cpp b/mozilla/profile/pref-migrator/src/nsPrefMigrationFactory.cpp
index fe63e757b68..db91c7bb48c 100644
--- a/mozilla/profile/pref-migrator/src/nsPrefMigrationFactory.cpp
+++ b/mozilla/profile/pref-migrator/src/nsPrefMigrationFactory.cpp
@@ -76,4 +76,4 @@ static const nsModuleComponentInfo components[] =
       NS_PREFCONVERTER_CONTRACTID, nsPrefConverterConstructor}
 };
 
-NS_IMPL_NSGETMODULE(nsPrefMigrationModule, components);
+NS_IMPL_NSGETMODULE(nsPrefMigrationModule, components)
diff --git a/mozilla/uriloader/exthandler/nsMIMEInfoImpl.cpp b/mozilla/uriloader/exthandler/nsMIMEInfoImpl.cpp
index cc67ddce4a9..4c20a420ec5 100644
--- a/mozilla/uriloader/exthandler/nsMIMEInfoImpl.cpp
+++ b/mozilla/uriloader/exthandler/nsMIMEInfoImpl.cpp
@@ -41,7 +41,7 @@
 #include "nsStringEnumerator.h"
 
 // nsISupports methods
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsMIMEInfoImpl, nsIMIMEInfo);
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsMIMEInfoImpl, nsIMIMEInfo)
 
 // nsMIMEInfoImpl methods
 nsMIMEInfoImpl::nsMIMEInfoImpl() {