8 files changed, 19 insertions, 4 deletions
diff --git a/src/inc/ceegen.h b/src/inc/ceegen.h
index 13e1524601..8846780278 100644
--- a/src/inc/ceegen.h
+++ b/src/inc/ceegen.h
@@ -215,6 +215,9 @@ class CCeeGen : public ICeeGen, ICeeGenInternal {
     CCeeGen();
 
   public:
+
+    virtual ~CCeeGen() {}
+
     static HRESULT CreateNewInstance(CCeeGen* & pCeeFileGen); // call this to instantiate
 
     virtual HRESULT Cleanup();
diff --git a/src/inc/ceegentokenmapper.h b/src/inc/ceegentokenmapper.h
index 67ec17a1a9..bc8e604100 100644
--- a/src/inc/ceegentokenmapper.h
+++ b/src/inc/ceegentokenmapper.h
@@ -51,6 +51,7 @@ public:
     static int IndexForType(mdToken tk);
     
     CeeGenTokenMapper() : m_pIImport(0), m_cRefs(1), m_pIMapToken(NULL)  { LIMITED_METHOD_CONTRACT; }
+    virtual ~CeeGenTokenMapper() {}
 
 //*****************************************************************************
 // IUnknown implementation.  
diff --git a/src/inc/corhost.h b/src/inc/corhost.h
index 133fb9c340..8eb56b1565 100644
--- a/src/inc/corhost.h
+++ b/src/inc/corhost.h
@@ -753,6 +753,7 @@ class CorHost2 :
 
 public:
     CorHost2();
+    virtual ~CorHost2() {}
 
     // *** IUnknown methods ***
     STDMETHODIMP    QueryInterface(REFIID riid, void** ppv);
diff --git a/src/inc/factory.h b/src/inc/factory.h
index f22722202c..c319c82ea1 100644
--- a/src/inc/factory.h
+++ b/src/inc/factory.h
@@ -12,6 +12,7 @@ class Factory
 {
 public:
     virtual PRODUCT* Create() = 0;
+    virtual ~Factory() {}
 };
 
 template<typename PRODUCT, DWORD MAX_FACTORY_PRODUCT = 64>
diff --git a/src/inc/loaderheap.h b/src/inc/loaderheap.h
index 8b72ac2b00..7e9bee66db 100644
--- a/src/inc/loaderheap.h
+++ b/src/inc/loaderheap.h
@@ -486,16 +486,19 @@ public:
         m_fExplicitControl = FALSE;
     }
 
-    ~LoaderHeap()
+#endif // DACCESS_COMPILE
+
+    virtual ~LoaderHeap()
     {
         WRAPPER_NO_CONTRACT;
 
+#ifndef DACCESS_COMPILE
         if (m_CriticalSection != NULL)
         {
             ClrDeleteCriticalSection(m_CriticalSection);
         }
-    }
 #endif // DACCESS_COMPILE
+    }
 
 
 
diff --git a/src/inc/pesectionman.h b/src/inc/pesectionman.h
index ad5daf60f2..5f767b964b 100644
--- a/src/inc/pesectionman.h
+++ b/src/inc/pesectionman.h
@@ -22,6 +22,9 @@ struct _IMAGE_SECTION_HEADER;
 class PESectionMan
 {
 public:
+
+    virtual ~PESectionMan() {}
+
     HRESULT Init();
     HRESULT Cleanup();
 
@@ -147,7 +150,7 @@ class PESection : public CeeSectionImpl {
     // Cause the section to allocate memory in smaller chunks
     void SetInitialGrowth(unsigned growth);
 
-    ~PESection();
+    virtual ~PESection();
 private:
 
     // purposely not defined, 
diff --git a/src/inc/stgpool.h b/src/inc/stgpool.h
index 7426b0e521..153a5b7e04 100644
--- a/src/inc/stgpool.h
+++ b/src/inc/stgpool.h
@@ -1247,6 +1247,8 @@ public:
         m_dataCopy(NULL)
     { LIMITED_METHOD_CONTRACT; }
 
+    virtual ~CInMemoryStream() {}
+
     void InitNew(
         void        *pMem,
         ULONG       cbSize)
@@ -1405,7 +1407,7 @@ public:
     CGrowableStream(float multiplicativeGrowthRate = 2.0, DWORD additiveGrowthRate = 4096);
 
 #ifndef DACCESS_COMPILE  
-    ~CGrowableStream();
+    virtual ~CGrowableStream();
 #endif
 
     // Expose the total raw buffer.
diff --git a/src/inc/testhook.h b/src/inc/testhook.h
index fa28b81eeb..16773a7f3e 100644
--- a/src/inc/testhook.h
+++ b/src/inc/testhook.h
@@ -104,6 +104,7 @@ public:
     {
         m_cRef=0;
     }
+    virtual ~CLRTestHook() {}
     STDMETHOD(AppDomainStageChanged)(DWORD adid,DWORD oldstage,DWORD newstage){ return S_OK;};
     STDMETHOD(NextFileLoadLevel)(DWORD adid, LPVOID domainfile,DWORD newlevel){ return S_OK;};
     STDMETHOD(CompletingFileLoadLevel)(DWORD adid, LPVOID domainfile,DWORD newlevel){ return S_OK;};