8 files changed, 10 insertions, 7 deletions
diff --git a/src/md/compiler/classfactory.h b/src/md/compiler/classfactory.h
index 636af7713f..13a1481994 100644
--- a/src/md/compiler/classfactory.h
+++ b/src/md/compiler/classfactory.h
@@ -49,6 +49,7 @@ public:
 		: m_cRef(1), m_pCoClass(pCoClass)
 	{ }
 
+	virtual ~MDClassFactory() {}
 	
 	//
 	// IUnknown methods.
diff --git a/src/md/compiler/disp.h b/src/md/compiler/disp.h
index 66bd02465f..39fed7cb95 100644
--- a/src/md/compiler/disp.h
+++ b/src/md/compiler/disp.h
@@ -24,7 +24,7 @@ class Disp :
 {
 public:
     Disp();
-    ~Disp();
+    virtual ~Disp();
 
     // *** IUnknown methods ***
     STDMETHODIMP    QueryInterface(REFIID riid, void** ppv);
diff --git a/src/md/compiler/regmeta.h b/src/md/compiler/regmeta.h
index eca31fd498..d2ca0fa0ca 100644
--- a/src/md/compiler/regmeta.h
+++ b/src/md/compiler/regmeta.h
@@ -1560,7 +1560,7 @@ public:
 //*****************************************************************************
 
     RegMeta();
-    ~RegMeta();
+    virtual ~RegMeta();
 
     HRESULT SetOption(OptionValue *pOptionValue);
 
diff --git a/src/md/inc/mdinternalrw.h b/src/md/inc/mdinternalrw.h
index 968d0232a9..256a7971ad 100644
--- a/src/md/inc/mdinternalrw.h
+++ b/src/md/inc/mdinternalrw.h
@@ -26,7 +26,7 @@ public:
 
 
     MDInternalRW();
-    ~MDInternalRW();
+    virtual ~MDInternalRW();
     __checkReturn 
     HRESULT Init(LPVOID pData, ULONG cbData, int bReadOnly);
     __checkReturn 
diff --git a/src/md/inc/rwutil.h b/src/md/inc/rwutil.h
index 61dc487f0b..ceada1e6f3 100644
--- a/src/md/inc/rwutil.h
+++ b/src/md/inc/rwutil.h
@@ -195,7 +195,7 @@ public:
     STDMETHODIMP_(ULONG) Release();
     STDMETHODIMP Map(mdToken tkImp, mdToken tkEmit);
     MergeTokenManager(MDTOKENMAP *pTkMapList, IUnknown *pHandler);
-	~MergeTokenManager();
+    virtual ~MergeTokenManager();
 private:
     LONG        m_cRef;
     MDTOKENMAP  *m_pTkMapList;
@@ -222,7 +222,7 @@ public:
     STDMETHODIMP Map(mdToken tkImp, mdToken tkEmit);
     bool Find(mdToken tkFrom, TOKENREC **pRecTo);
     CMapToken();
-	~CMapToken();
+    virtual ~CMapToken();
     MDTOKENMAP  *m_pTKMap;
 private:
     LONG        m_cRef;
diff --git a/src/md/inc/stgtiggerstorage.h b/src/md/inc/stgtiggerstorage.h
index d00b6a49b1..f0b1b59c19 100644
--- a/src/md/inc/stgtiggerstorage.h
+++ b/src/md/inc/stgtiggerstorage.h
@@ -67,7 +67,7 @@ class TiggerStorage :
 friend class TiggerStream;
 public:
     TiggerStorage();
-	~TiggerStorage();
+    virtual ~TiggerStorage();
 
 // IUnknown so you can ref count this thing.
     virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, PVOID *pp)
diff --git a/src/md/inc/stgtiggerstream.h b/src/md/inc/stgtiggerstream.h
index f28d9659dc..e272610b7c 100644
--- a/src/md/inc/stgtiggerstream.h
+++ b/src/md/inc/stgtiggerstream.h
@@ -36,6 +36,8 @@ public:
 		m_cRef(1)
 	{}
 
+    virtual ~TiggerStream() {}
+
 	virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, PVOID *pp)
 	{ return (BadError(E_NOTIMPL)); }
 	virtual ULONG STDMETHODCALLTYPE AddRef()
diff --git a/src/md/runtime/mdinternalro.h b/src/md/runtime/mdinternalro.h
index 70e1df4f04..3095c43a07 100644
--- a/src/md/runtime/mdinternalro.h
+++ b/src/md/runtime/mdinternalro.h
@@ -22,7 +22,7 @@ class MDInternalRO : public IMDInternalImport, IMDCommon
 public:
 
     MDInternalRO();
-    ~MDInternalRO();
+    virtual ~MDInternalRO();
     __checkReturn 
     HRESULT Init(LPVOID pData, ULONG cbData);