diff --git a/mozilla/xpcom/reflect/xptinfo/src/xptiFile.cpp b/mozilla/xpcom/reflect/xptinfo/src/xptiFile.cpp
index a21400e9b8f..a042ef448d2 100644
--- a/mozilla/xpcom/reflect/xptinfo/src/xptiFile.cpp
+++ b/mozilla/xpcom/reflect/xptinfo/src/xptiFile.cpp
@@ -24,6 +24,7 @@
 
 #include "xptiprivate.h"
 
+MOZ_DECL_CTOR_COUNTER(xptiFile);
 
 xptiFile::xptiFile()
     :   mSize(),
@@ -32,6 +33,7 @@ xptiFile::xptiFile()
         mGuts(nsnull)
 {
     // empty
+    MOZ_COUNT_CTOR(xptiFile);
 }
 
 xptiFile::xptiFile(const nsInt64&  aSize,
@@ -50,6 +52,8 @@ xptiFile::xptiFile(const nsInt64&  aSize,
 
     if(aHeader)
         SetHeader(aHeader);
+
+    MOZ_COUNT_CTOR(xptiFile);
 }
 
 xptiFile::xptiFile(const xptiFile& r, xptiWorkingSet* aWorkingSet,
@@ -64,12 +68,16 @@ xptiFile::xptiFile(const xptiFile& r, xptiWorkingSet* aWorkingSet,
 
     if(cloneGuts && r.mGuts)
         mGuts = r.mGuts->Clone();
+
+    MOZ_COUNT_CTOR(xptiFile);
 }
 
 xptiFile::~xptiFile()
 {
     if(mGuts)
         delete mGuts;
+
+    MOZ_COUNT_DTOR(xptiFile);
 }
 
 PRBool 
diff --git a/mozilla/xpcom/reflect/xptinfo/src/xptiMisc.cpp b/mozilla/xpcom/reflect/xptinfo/src/xptiMisc.cpp
index f170696020d..ee05519e109 100644
--- a/mozilla/xpcom/reflect/xptinfo/src/xptiMisc.cpp
+++ b/mozilla/xpcom/reflect/xptinfo/src/xptiMisc.cpp
@@ -54,10 +54,14 @@ xptiFileType::Type xptiFileType::GetType(const char* name)
 
 /***************************************************************************/
 
+MOZ_DECL_CTOR_COUNTER(xptiAutoLog);
+
 xptiAutoLog::xptiAutoLog(xptiInterfaceInfoManager* mgr, 
                          nsILocalFile* logfile, PRBool append)
     : mMgr(nsnull), mOldFileDesc(nsnull)
 {
+    MOZ_COUNT_CTOR(xptiAutoLog);
+
     if(mgr && logfile)
     {
         PRFileDesc* fd;
@@ -87,6 +91,8 @@ xptiAutoLog::xptiAutoLog(xptiInterfaceInfoManager* mgr,
 
 xptiAutoLog::~xptiAutoLog()
 {
+    MOZ_COUNT_DTOR(xptiAutoLog);
+
     if(mMgr)
     {
         PRFileDesc* fd = mMgr->SetOpenLogFile(mOldFileDesc);
diff --git a/mozilla/xpcom/reflect/xptinfo/src/xptiTypelibGuts.cpp b/mozilla/xpcom/reflect/xptinfo/src/xptiTypelibGuts.cpp
index 366fbb88944..630311ec7c2 100644
--- a/mozilla/xpcom/reflect/xptinfo/src/xptiTypelibGuts.cpp
+++ b/mozilla/xpcom/reflect/xptinfo/src/xptiTypelibGuts.cpp
@@ -24,10 +24,14 @@
 
 #include "xptiprivate.h"
 
+MOZ_DECL_CTOR_COUNTER(xptiTypelibGuts);
+
 xptiTypelibGuts::xptiTypelibGuts(XPTHeader* aHeader)
      :  mHeader(aHeader), 
         mInfoArray(nsnull)
 {
+    MOZ_COUNT_CTOR(xptiTypelibGuts);
+
     NS_ASSERTION(mHeader, "bad param");
 
     if(mHeader->num_interfaces)
@@ -42,6 +46,8 @@ xptiTypelibGuts::xptiTypelibGuts(XPTHeader* aHeader)
 
 xptiTypelibGuts::~xptiTypelibGuts()
 {
+    MOZ_COUNT_DTOR(xptiTypelibGuts);
+
     if(mHeader && mInfoArray)
         for(PRUint16 i = 0; i < GetInfoCount(); ++i)
             NS_IF_RELEASE(mInfoArray[i]);
diff --git a/mozilla/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp b/mozilla/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp
index ac566bb15b3..b0cad5f0362 100644
--- a/mozilla/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp
+++ b/mozilla/xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp
@@ -40,6 +40,8 @@ xpti_CompareIIDs(const void *v1, const void *v2)
     return (PRIntn) ((const nsID*)v1)->Equals(*((const nsID*)v2));        
 }         
 
+MOZ_DECL_CTOR_COUNTER(xptiWorkingSet);
+
 xptiWorkingSet::xptiWorkingSet()
     : mFileCount(0),
       mMaxFileCount(0),
@@ -60,6 +62,7 @@ xptiWorkingSet::xptiWorkingSet()
     mFileMergeOffsetMap(nsnull),
     mZipItemMergeOffsetMap(nsnull)
 {
+    MOZ_COUNT_CTOR(xptiWorkingSet);
     // do nothing else...            
 }        
 
@@ -135,6 +138,8 @@ xptiWorkingSet::ClearZipItems()
 
 xptiWorkingSet::~xptiWorkingSet()
 {
+    MOZ_COUNT_DTOR(xptiWorkingSet);
+
     ClearFiles();
     ClearZipItems();
     ClearHashTables();
diff --git a/mozilla/xpcom/reflect/xptinfo/src/xptiZipItem.cpp b/mozilla/xpcom/reflect/xptinfo/src/xptiZipItem.cpp
index 3c6a94f4f88..3567e6c6901 100644
--- a/mozilla/xpcom/reflect/xptinfo/src/xptiZipItem.cpp
+++ b/mozilla/xpcom/reflect/xptinfo/src/xptiZipItem.cpp
@@ -24,11 +24,13 @@
 
 #include "xptiprivate.h"
 
+MOZ_DECL_CTOR_COUNTER(xptiZipItem);
 
 xptiZipItem::xptiZipItem()
     :   mName(nsnull),
         mGuts(nsnull)
 {
+    MOZ_COUNT_CTOR(xptiZipItem);
     // empty
 }
 
@@ -39,6 +41,8 @@ xptiZipItem::xptiZipItem(const char*     aName,
     :   mName(aName),
         mGuts(nsnull)
 {
+    MOZ_COUNT_CTOR(xptiZipItem);
+
     NS_ASSERTION(aWorkingSet,"bad param");
     mName = XPT_STRDUP(aWorkingSet->GetStringArena(), aName);
 
@@ -51,6 +55,8 @@ xptiZipItem::xptiZipItem(const xptiZipItem& r, xptiWorkingSet* aWorkingSet,
     :   mName(nsnull),
         mGuts(nsnull)
 {
+    MOZ_COUNT_CTOR(xptiZipItem);
+
     NS_ASSERTION(aWorkingSet,"bad param");
     mName = XPT_STRDUP(aWorkingSet->GetStringArena(), r.mName);
 
@@ -60,6 +66,8 @@ xptiZipItem::xptiZipItem(const xptiZipItem& r, xptiWorkingSet* aWorkingSet,
 
 xptiZipItem::~xptiZipItem()
 {
+    MOZ_COUNT_DTOR(xptiZipItem);
+
     if(mGuts)
         delete mGuts;
 }