--- a/xpcom/components/nsComponentManager.cpp
+++ b/xpcom/components/nsComponentManager.cpp
@@ -1319,16 +1319,17 @@ nsComponentManagerImpl::CreateInstanceBy
 
 static PLDHashOperator
 FreeFactoryEntries(const nsID& aCID,
                    nsFactoryEntry* aEntry,
                    void* arg)
 {
     aEntry->mFactory = NULL;
     aEntry->mServiceObject = NULL;
+    delete aEntry;
     return PL_DHASH_NEXT;
 }
 
 nsresult
 nsComponentManagerImpl::FreeServices()
 {
     NS_ASSERTION(gXPCOMShuttingDown, "Must be shutting down in order to free all services");
 
@@ -1792,16 +1793,17 @@ nsComponentManagerImpl::UnregisterFactor
 
         mFactories.Remove(aClass);
 
         // This might leave a stale contractid -> factory mapping in
         // place, so null out the factory entry (see
         // nsFactoryEntry::GetFactory)
         f->mFactory.swap(dyingFactory);
         f->mServiceObject.swap(dyingServiceObject);
+        delete f;
     }
 
     return NS_OK;
 }
 
 NS_IMETHODIMP
 nsComponentManagerImpl::AutoRegister(nsIFile* aLocation)
 {
@@ -1936,37 +1938,40 @@ nsComponentManagerImpl::ContractIDToCID(
 // nsFactoryEntry
 ////////////////////////////////////////////////////////////////////////////////
 
 nsFactoryEntry::nsFactoryEntry(const mozilla::Module::CIDEntry* entry,
                                nsComponentManagerImpl::KnownModule* module)
     : mCIDEntry(entry)
     , mModule(module)
 {
+    MOZ_COUNT_CTOR(nsFactoryEntry);
 }
 
 nsFactoryEntry::nsFactoryEntry(const nsCID& aCID, nsIFactory* factory)
     : mCIDEntry(NULL)
     , mModule(NULL)
     , mFactory(factory)
 {
+    MOZ_COUNT_CTOR(nsFactoryEntry);
     mozilla::Module::CIDEntry* e = new mozilla::Module::CIDEntry();
     nsCID* cid = new nsCID;
     *cid = aCID;
     e->cid = cid;
     mCIDEntry = e;
 }        
 
 nsFactoryEntry::~nsFactoryEntry()
 {
     // If this was a RegisterFactory entry, we own the CIDEntry/CID
     if (!mModule) {
         delete mCIDEntry->cid;
         delete mCIDEntry;
     }
+    MOZ_COUNT_DTOR(nsFactoryEntry);
 }
 
 already_AddRefed<nsIFactory>
 nsFactoryEntry::GetFactory()
 {
     if (!mFactory) {
         // RegisterFactory then UnregisterFactory can leave an entry in mContractIDs
         // pointing to an unusable nsFactoryEntry.