diff --git a/dom/public/base/nsIDOMAbstractView.h b/dom/public/base/nsIDOMAbstractView.h
index eec7e0689d0..8075c1d3c33 100644
--- a/dom/public/base/nsIDOMAbstractView.h
+++ b/dom/public/base/nsIDOMAbstractView.h
@@ -34,7 +34,7 @@ class nsIDOMDocumentView;
  { 0xf51ebade, 0x8b1a, 0x11d3, \
   { 0xaa, 0xe7, 0x00, 0x10, 0x83, 0x01, 0x23, 0xb4 } } 
 
-class nsIDOMAbstractView : public nsISupports {
+class NS_NO_VTABLE nsIDOMAbstractView : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMABSTRACTVIEW_IID; return iid; }
 
diff --git a/dom/public/base/nsIDOMBarProp.h b/dom/public/base/nsIDOMBarProp.h
index 1b18ad431d4..643975052e6 100644
--- a/dom/public/base/nsIDOMBarProp.h
+++ b/dom/public/base/nsIDOMBarProp.h
@@ -33,7 +33,7 @@
  { 0x9eb2c150, 0x1d56, 0x11d3, \
   { 0x82, 0x21, 0x00, 0x60, 0x08, 0x3a, 0x0b, 0xcf } } 
 
-class nsIDOMBarProp : public nsISupports {
+class NS_NO_VTABLE nsIDOMBarProp : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMBARPROP_IID; return iid; }
 
diff --git a/dom/public/base/nsIDOMCRMFObject.h b/dom/public/base/nsIDOMCRMFObject.h
index d40713d37ad..1d9258cb317 100644
--- a/dom/public/base/nsIDOMCRMFObject.h
+++ b/dom/public/base/nsIDOMCRMFObject.h
@@ -33,7 +33,7 @@
  {0x16da46c0, 0x208d, 0x11d4, \
        {0x8a, 0x7c, 0x00, 0x60, 0x08, 0xc8, 0x44, 0xc3}} 
 
-class nsIDOMCRMFObject : public nsISupports {
+class NS_NO_VTABLE nsIDOMCRMFObject : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMCRMFOBJECT_IID; return iid; }
 
diff --git a/dom/public/base/nsIDOMCrypto.h b/dom/public/base/nsIDOMCrypto.h
index f49181d953e..73c7d37f247 100644
--- a/dom/public/base/nsIDOMCrypto.h
+++ b/dom/public/base/nsIDOMCrypto.h
@@ -35,7 +35,7 @@ class nsIDOMCRMFObject;
  {0xf45efbe0, 0x1d52, 0x11d4, \
          {0x8a, 0x7c, 0x00, 0x60, 0x08, 0xc8, 0x44, 0xc3}} 
 
-class nsIDOMCrypto : public nsISupports {
+class NS_NO_VTABLE nsIDOMCrypto : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMCRYPTO_IID; return iid; }
 
diff --git a/dom/public/base/nsIDOMDOMException.h b/dom/public/base/nsIDOMDOMException.h
index 6f2dd27e5f6..b2787534ae5 100644
--- a/dom/public/base/nsIDOMDOMException.h
+++ b/dom/public/base/nsIDOMDOMException.h
@@ -33,7 +33,7 @@
  { 0xa6cf910a, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMDOMException : public nsISupports {
+class NS_NO_VTABLE nsIDOMDOMException : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMDOMEXCEPTION_IID; return iid; }
   enum {
diff --git a/dom/public/base/nsIDOMHistory.h b/dom/public/base/nsIDOMHistory.h
index 8d8a6fb1be2..80acba39c42 100644
--- a/dom/public/base/nsIDOMHistory.h
+++ b/dom/public/base/nsIDOMHistory.h
@@ -34,7 +34,7 @@
  { 0x896d1d20, 0xb4c4, 0x11d2, \
   { 0xbd, 0x93, 0x00, 0x80, 0x5f, 0x8a, 0xe3, 0xf4 } } 
 
-class nsIDOMHistory : public nsISupports {
+class NS_NO_VTABLE nsIDOMHistory : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHISTORY_IID; return iid; }
 
diff --git a/dom/public/base/nsIDOMLocation.h b/dom/public/base/nsIDOMLocation.h
index 1cf230de15a..0e0c0529480 100644
--- a/dom/public/base/nsIDOMLocation.h
+++ b/dom/public/base/nsIDOMLocation.h
@@ -33,7 +33,7 @@
  { 0xa6cf906d, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMLocation : public nsISupports {
+class NS_NO_VTABLE nsIDOMLocation : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMLOCATION_IID; return iid; }
 
diff --git a/dom/public/base/nsIDOMMimeType.h b/dom/public/base/nsIDOMMimeType.h
index 3a04c2fa1f6..c63a7351424 100644
--- a/dom/public/base/nsIDOMMimeType.h
+++ b/dom/public/base/nsIDOMMimeType.h
@@ -33,7 +33,7 @@ class nsIDOMPlugin;
 #define NS_IDOMMIMETYPE_IID \
  { 0xf6134682, 0xf28b, 0x11d2, { 0x83, 0x60, 0xc9, 0x08, 0x99, 0x04, 0x9c, 0x3c } } 
 
-class nsIDOMMimeType : public nsISupports {
+class NS_NO_VTABLE nsIDOMMimeType : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMMIMETYPE_IID; return iid; }
 
diff --git a/dom/public/base/nsIDOMMimeTypeArray.h b/dom/public/base/nsIDOMMimeTypeArray.h
index d75e15acec4..f9129326d3b 100644
--- a/dom/public/base/nsIDOMMimeTypeArray.h
+++ b/dom/public/base/nsIDOMMimeTypeArray.h
@@ -33,7 +33,7 @@ class nsIDOMMimeType;
 #define NS_IDOMMIMETYPEARRAY_IID \
  { 0xf6134683, 0xf28b, 0x11d2, { 0x83, 0x60, 0xc9, 0x08, 0x99, 0x04, 0x9c, 0x3c } } 
 
-class nsIDOMMimeTypeArray : public nsISupports {
+class NS_NO_VTABLE nsIDOMMimeTypeArray : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMMIMETYPEARRAY_IID; return iid; }
 
diff --git a/dom/public/base/nsIDOMNSLocation.h b/dom/public/base/nsIDOMNSLocation.h
index 4fa69dc6fea..47619d68480 100644
--- a/dom/public/base/nsIDOMNSLocation.h
+++ b/dom/public/base/nsIDOMNSLocation.h
@@ -34,7 +34,7 @@
  { 0xa6cf9108, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMNSLocation : public nsISupports {
+class NS_NO_VTABLE nsIDOMNSLocation : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMNSLOCATION_IID; return iid; }
 
diff --git a/dom/public/base/nsIDOMNavigator.h b/dom/public/base/nsIDOMNavigator.h
index 4137f69874a..ad732a9e79c 100644
--- a/dom/public/base/nsIDOMNavigator.h
+++ b/dom/public/base/nsIDOMNavigator.h
@@ -36,7 +36,7 @@ class nsIDOMMimeTypeArray;
  { 0xa6cf906e, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMNavigator : public nsISupports {
+class NS_NO_VTABLE nsIDOMNavigator : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMNAVIGATOR_IID; return iid; }
 
diff --git a/dom/public/base/nsIDOMPkcs11.h b/dom/public/base/nsIDOMPkcs11.h
index 2074ba076de..da8acd73643 100644
--- a/dom/public/base/nsIDOMPkcs11.h
+++ b/dom/public/base/nsIDOMPkcs11.h
@@ -33,7 +33,7 @@
  {0x9fd42950, 0x25e7, 0x11d4, \
        {0x8a, 0x7d, 0x00, 0x60, 0x08, 0xc8, 0x44, 0xc3}} 
 
-class nsIDOMPkcs11 : public nsISupports {
+class NS_NO_VTABLE nsIDOMPkcs11 : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMPKCS11_IID; return iid; }
 
diff --git a/dom/public/base/nsIDOMPlugin.h b/dom/public/base/nsIDOMPlugin.h
index f8cea791af9..9c51bbfc39f 100644
--- a/dom/public/base/nsIDOMPlugin.h
+++ b/dom/public/base/nsIDOMPlugin.h
@@ -33,7 +33,7 @@ class nsIDOMMimeType;
 #define NS_IDOMPLUGIN_IID \
  { 0xf6134681, 0xf28b, 0x11d2, { 0x83, 0x60, 0xc9, 0x08, 0x99, 0x04, 0x9c, 0x3c } } 
 
-class nsIDOMPlugin : public nsISupports {
+class NS_NO_VTABLE nsIDOMPlugin : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMPLUGIN_IID; return iid; }
 
diff --git a/dom/public/base/nsIDOMPluginArray.h b/dom/public/base/nsIDOMPluginArray.h
index 1b73b519018..43e4d720c3d 100644
--- a/dom/public/base/nsIDOMPluginArray.h
+++ b/dom/public/base/nsIDOMPluginArray.h
@@ -33,7 +33,7 @@ class nsIDOMPlugin;
 #define NS_IDOMPLUGINARRAY_IID \
  { 0xf6134680, 0xf28b, 0x11d2, { 0x83, 0x60, 0xc9, 0x08, 0x99, 0x04, 0x9c, 0x3c } } 
 
-class nsIDOMPluginArray : public nsISupports {
+class NS_NO_VTABLE nsIDOMPluginArray : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMPLUGINARRAY_IID; return iid; }
 
diff --git a/dom/public/base/nsIDOMScreen.h b/dom/public/base/nsIDOMScreen.h
index 042ca721b2d..0b5ff24fdb8 100644
--- a/dom/public/base/nsIDOMScreen.h
+++ b/dom/public/base/nsIDOMScreen.h
@@ -33,7 +33,7 @@
  { 0x77947960, 0xb4af, 0x11d2, \
   { 0xbd, 0x93, 0x00, 0x80, 0x5f, 0x8a, 0xe3, 0xf4 } } 
 
-class nsIDOMScreen : public nsISupports {
+class NS_NO_VTABLE nsIDOMScreen : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMSCREEN_IID; return iid; }
 
diff --git a/dom/public/base/nsIDOMViewCSS.h b/dom/public/base/nsIDOMViewCSS.h
index b43bffdce6d..d69eb4d0ffb 100644
--- a/dom/public/base/nsIDOMViewCSS.h
+++ b/dom/public/base/nsIDOMViewCSS.h
@@ -36,7 +36,7 @@ class nsIDOMCSSStyleDeclaration;
  { 0x0b9341f3, 0x95d4, 0x4fa4, \
   { 0xad, 0xcd, 0xe1, 0x19, 0xe0, 0xdb, 0x28, 0x89 } } 
 
-class nsIDOMViewCSS : public nsIDOMAbstractView {
+class NS_NO_VTABLE nsIDOMViewCSS : public nsIDOMAbstractView {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMVIEWCSS_IID; return iid; }
 
diff --git a/dom/public/base/nsIDOMWindow.h b/dom/public/base/nsIDOMWindow.h
index c3c036ad95d..37a3dcb17c3 100644
--- a/dom/public/base/nsIDOMWindow.h
+++ b/dom/public/base/nsIDOMWindow.h
@@ -38,7 +38,7 @@ class nsIDOMWindow;
  { 0xa6cf906b, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMWindow : public nsISupports {
+class NS_NO_VTABLE nsIDOMWindow : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMWINDOW_IID; return iid; }
 
diff --git a/dom/public/base/nsIDOMWindowCollection.h b/dom/public/base/nsIDOMWindowCollection.h
index 5fc06033fa8..b5c480bb8df 100644
--- a/dom/public/base/nsIDOMWindowCollection.h
+++ b/dom/public/base/nsIDOMWindowCollection.h
@@ -34,7 +34,7 @@ class nsIDOMWindow;
  { 0xa6cf906f, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMWindowCollection : public nsISupports {
+class NS_NO_VTABLE nsIDOMWindowCollection : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMWINDOWCOLLECTION_IID; return iid; }
 
diff --git a/dom/public/base/nsIDOMWindowEventOwner.h b/dom/public/base/nsIDOMWindowEventOwner.h
index dbc4a55ea8e..de6461f3206 100644
--- a/dom/public/base/nsIDOMWindowEventOwner.h
+++ b/dom/public/base/nsIDOMWindowEventOwner.h
@@ -34,7 +34,7 @@
  { 0xef1876f0, 0x7881, 0x11d4, \
    { 0x9a, 0x80, 0x00, 0x00, 0x64, 0x65, 0x73, 0x74 } } 
 
-class nsIDOMWindowEventOwner : public nsISupports {
+class NS_NO_VTABLE nsIDOMWindowEventOwner : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMWINDOWEVENTOWNER_IID; return iid; }
 
diff --git a/dom/public/base/nsIDOMWindowInternal.h b/dom/public/base/nsIDOMWindowInternal.h
index 7f1af6fccce..c8a4bca8ad7 100755
--- a/dom/public/base/nsIDOMWindowInternal.h
+++ b/dom/public/base/nsIDOMWindowInternal.h
@@ -46,7 +46,7 @@ class nsIControllers;
  { 0x9c911860, 0x7dd9, 0x11d4, \
   { 0x9a, 0x83, 0x00, 0x00, 0x64, 0x65, 0x73, 0x74 } } 
 
-class nsIDOMWindowInternal : public nsIDOMWindow {
+class NS_NO_VTABLE nsIDOMWindowInternal : public nsIDOMWindow {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMWINDOWINTERNAL_IID; return iid; }
 
diff --git a/dom/public/coreDom/nsIDOMAttr.h b/dom/public/coreDom/nsIDOMAttr.h
index 166283aa45f..e1547025ec0 100644
--- a/dom/public/coreDom/nsIDOMAttr.h
+++ b/dom/public/coreDom/nsIDOMAttr.h
@@ -35,7 +35,7 @@ class nsIDOMElement;
  { 0xa6cf9070, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMAttr : public nsIDOMNode {
+class NS_NO_VTABLE nsIDOMAttr : public nsIDOMNode {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMATTR_IID; return iid; }
 
diff --git a/dom/public/coreDom/nsIDOMCDATASection.h b/dom/public/coreDom/nsIDOMCDATASection.h
index 277bfe2fd9f..b3ce453a333 100644
--- a/dom/public/coreDom/nsIDOMCDATASection.h
+++ b/dom/public/coreDom/nsIDOMCDATASection.h
@@ -34,7 +34,7 @@
  { 0xa6cf9071, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMCDATASection : public nsIDOMText {
+class NS_NO_VTABLE nsIDOMCDATASection : public nsIDOMText {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMCDATASECTION_IID; return iid; }
 };
diff --git a/dom/public/coreDom/nsIDOMCharacterData.h b/dom/public/coreDom/nsIDOMCharacterData.h
index 74548ec7152..e049a3c2195 100644
--- a/dom/public/coreDom/nsIDOMCharacterData.h
+++ b/dom/public/coreDom/nsIDOMCharacterData.h
@@ -34,7 +34,7 @@
  { 0xa6cf9072, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMCharacterData : public nsIDOMNode {
+class NS_NO_VTABLE nsIDOMCharacterData : public nsIDOMNode {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMCHARACTERDATA_IID; return iid; }
 
diff --git a/dom/public/coreDom/nsIDOMComment.h b/dom/public/coreDom/nsIDOMComment.h
index 0a8dedb81ae..662cec08841 100644
--- a/dom/public/coreDom/nsIDOMComment.h
+++ b/dom/public/coreDom/nsIDOMComment.h
@@ -34,7 +34,7 @@
  { 0xa6cf9073, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMComment : public nsIDOMCharacterData {
+class NS_NO_VTABLE nsIDOMComment : public nsIDOMCharacterData {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMCOMMENT_IID; return iid; }
 };
diff --git a/dom/public/coreDom/nsIDOMDOMImplementation.h b/dom/public/coreDom/nsIDOMDOMImplementation.h
index 311ee2b81a0..eafb0b28548 100644
--- a/dom/public/coreDom/nsIDOMDOMImplementation.h
+++ b/dom/public/coreDom/nsIDOMDOMImplementation.h
@@ -35,7 +35,7 @@ class nsIDOMDocumentType;
  { 0xa6cf9074, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMDOMImplementation : public nsISupports {
+class NS_NO_VTABLE nsIDOMDOMImplementation : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMDOMIMPLEMENTATION_IID; return iid; }
 
diff --git a/dom/public/coreDom/nsIDOMDocument.h b/dom/public/coreDom/nsIDOMDocument.h
index 89ae52af3f1..9918a6a4370 100644
--- a/dom/public/coreDom/nsIDOMDocument.h
+++ b/dom/public/coreDom/nsIDOMDocument.h
@@ -46,7 +46,7 @@ class nsIDOMNodeList;
  { 0xa6cf9075, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMDocument : public nsIDOMNode {
+class NS_NO_VTABLE nsIDOMDocument : public nsIDOMNode {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMDOCUMENT_IID; return iid; }
 
diff --git a/dom/public/coreDom/nsIDOMDocumentCSS.h b/dom/public/coreDom/nsIDOMDocumentCSS.h
index a7c0280398a..94471b5f040 100644
--- a/dom/public/coreDom/nsIDOMDocumentCSS.h
+++ b/dom/public/coreDom/nsIDOMDocumentCSS.h
@@ -36,7 +36,7 @@ class nsIDOMCSSStyleDeclaration;
  { 0x39f76c23, 0x45b2, 0x428a, \
   { 0x92, 0x40, 0xa9, 0x81, 0xe5, 0xab, 0xf1, 0x48 } } 
 
-class nsIDOMDocumentCSS : public nsIDOMDocumentStyle {
+class NS_NO_VTABLE nsIDOMDocumentCSS : public nsIDOMDocumentStyle {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMDOCUMENTCSS_IID; return iid; }
 
diff --git a/dom/public/coreDom/nsIDOMDocumentEvent.h b/dom/public/coreDom/nsIDOMDocumentEvent.h
index c5182c6f28a..d8c528e8ce0 100644
--- a/dom/public/coreDom/nsIDOMDocumentEvent.h
+++ b/dom/public/coreDom/nsIDOMDocumentEvent.h
@@ -34,7 +34,7 @@ class nsIDOMEvent;
  { 0x46b91d66, 0x28e2, 0x11d4, \
   { 0xab, 0x1e, 0x00, 0x10, 0x83, 0x01, 0x23, 0xb4 } } 
 
-class nsIDOMDocumentEvent : public nsISupports {
+class NS_NO_VTABLE nsIDOMDocumentEvent : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMDOCUMENTEVENT_IID; return iid; }
 
diff --git a/dom/public/coreDom/nsIDOMDocumentFragment.h b/dom/public/coreDom/nsIDOMDocumentFragment.h
index f8d542e2bce..63c3e9ac270 100644
--- a/dom/public/coreDom/nsIDOMDocumentFragment.h
+++ b/dom/public/coreDom/nsIDOMDocumentFragment.h
@@ -34,7 +34,7 @@
  { 0xa6cf9076, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMDocumentFragment : public nsIDOMNode {
+class NS_NO_VTABLE nsIDOMDocumentFragment : public nsIDOMNode {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMDOCUMENTFRAGMENT_IID; return iid; }
 };
diff --git a/dom/public/coreDom/nsIDOMDocumentStyle.h b/dom/public/coreDom/nsIDOMDocumentStyle.h
index 4586a9325d6..4bc1d1957c3 100644
--- a/dom/public/coreDom/nsIDOMDocumentStyle.h
+++ b/dom/public/coreDom/nsIDOMDocumentStyle.h
@@ -34,7 +34,7 @@ class nsIDOMStyleSheetList;
  { 0x3d9f4973, 0xdd2e, 0x48f5, \
   { 0xb5, 0xf7, 0x26, 0x34, 0xe0, 0x9e, 0xad, 0xd9 } } 
 
-class nsIDOMDocumentStyle : public nsISupports {
+class NS_NO_VTABLE nsIDOMDocumentStyle : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMDOCUMENTSTYLE_IID; return iid; }
 
diff --git a/dom/public/coreDom/nsIDOMDocumentType.h b/dom/public/coreDom/nsIDOMDocumentType.h
index d3040e55dd5..116ebff0c03 100644
--- a/dom/public/coreDom/nsIDOMDocumentType.h
+++ b/dom/public/coreDom/nsIDOMDocumentType.h
@@ -35,7 +35,7 @@ class nsIDOMNamedNodeMap;
  { 0xa6cf9077, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMDocumentType : public nsIDOMNode {
+class NS_NO_VTABLE nsIDOMDocumentType : public nsIDOMNode {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMDOCUMENTTYPE_IID; return iid; }
 
diff --git a/dom/public/coreDom/nsIDOMDocumentView.h b/dom/public/coreDom/nsIDOMDocumentView.h
index 944bf6bc21b..6295e03fe96 100644
--- a/dom/public/coreDom/nsIDOMDocumentView.h
+++ b/dom/public/coreDom/nsIDOMDocumentView.h
@@ -34,7 +34,7 @@ class nsIDOMAbstractView;
  { 0x1acdb2ba, 0x1dd2, 0x11b2, \
   { 0x95, 0xbc, 0x95, 0x42, 0x49, 0x5d, 0x25, 0x69 } } 
 
-class nsIDOMDocumentView : public nsISupports {
+class NS_NO_VTABLE nsIDOMDocumentView : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMDOCUMENTVIEW_IID; return iid; }
 
diff --git a/dom/public/coreDom/nsIDOMDocumentXBL.h b/dom/public/coreDom/nsIDOMDocumentXBL.h
index 8d76473ef06..63f7f1c2f31 100644
--- a/dom/public/coreDom/nsIDOMDocumentXBL.h
+++ b/dom/public/coreDom/nsIDOMDocumentXBL.h
@@ -37,7 +37,7 @@ class nsIDOMNodeList;
  { 0xc7c0ae9b, 0xa0ba, 0x4f4e, \
   { 0x9f, 0x2c, 0xc1, 0x8d, 0xeb, 0x62, 0xee, 0x8b } } 
 
-class nsIDOMDocumentXBL : public nsISupports {
+class NS_NO_VTABLE nsIDOMDocumentXBL : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMDOCUMENTXBL_IID; return iid; }
 
diff --git a/dom/public/coreDom/nsIDOMElement.h b/dom/public/coreDom/nsIDOMElement.h
index fbd04eb5f1f..449be6cdadc 100644
--- a/dom/public/coreDom/nsIDOMElement.h
+++ b/dom/public/coreDom/nsIDOMElement.h
@@ -36,7 +36,7 @@ class nsIDOMNodeList;
  { 0xa6cf9078, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMElement : public nsIDOMNode {
+class NS_NO_VTABLE nsIDOMElement : public nsIDOMNode {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMELEMENT_IID; return iid; }
 
diff --git a/dom/public/coreDom/nsIDOMEntity.h b/dom/public/coreDom/nsIDOMEntity.h
index ed41eafbb9e..20bf9caf989 100644
--- a/dom/public/coreDom/nsIDOMEntity.h
+++ b/dom/public/coreDom/nsIDOMEntity.h
@@ -34,7 +34,7 @@
  { 0xa6cf9079, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMEntity : public nsIDOMNode {
+class NS_NO_VTABLE nsIDOMEntity : public nsIDOMNode {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMENTITY_IID; return iid; }
 
diff --git a/dom/public/coreDom/nsIDOMEntityReference.h b/dom/public/coreDom/nsIDOMEntityReference.h
index ec7485290d0..6b3c78bcfed 100644
--- a/dom/public/coreDom/nsIDOMEntityReference.h
+++ b/dom/public/coreDom/nsIDOMEntityReference.h
@@ -34,7 +34,7 @@
  { 0xa6cf907a, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMEntityReference : public nsIDOMNode {
+class NS_NO_VTABLE nsIDOMEntityReference : public nsIDOMNode {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMENTITYREFERENCE_IID; return iid; }
 };
diff --git a/dom/public/coreDom/nsIDOMLinkStyle.h b/dom/public/coreDom/nsIDOMLinkStyle.h
index 02daba433c1..fed7729d1bf 100644
--- a/dom/public/coreDom/nsIDOMLinkStyle.h
+++ b/dom/public/coreDom/nsIDOMLinkStyle.h
@@ -34,7 +34,7 @@ class nsIDOMStyleSheet;
  { 0x24d89a65, 0xf598, 0x481e, \
   { 0xa2, 0x97, 0x23, 0xcc, 0x02, 0x59, 0x9b, 0xbd } } 
 
-class nsIDOMLinkStyle : public nsISupports {
+class NS_NO_VTABLE nsIDOMLinkStyle : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMLINKSTYLE_IID; return iid; }
 
diff --git a/dom/public/coreDom/nsIDOMMediaList.h b/dom/public/coreDom/nsIDOMMediaList.h
index 7fd2e71c850..e59037a75a3 100644
--- a/dom/public/coreDom/nsIDOMMediaList.h
+++ b/dom/public/coreDom/nsIDOMMediaList.h
@@ -33,7 +33,7 @@
  { 0x9b0c2ed7, 0x111c, 0x4824, \
   { 0xad, 0xf9, 0xef, 0x0d, 0xa6, 0xda, 0xd3, 0x71 } } 
 
-class nsIDOMMediaList : public nsISupports {
+class NS_NO_VTABLE nsIDOMMediaList : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMMEDIALIST_IID; return iid; }
 
diff --git a/dom/public/coreDom/nsIDOMNSDocument.h b/dom/public/coreDom/nsIDOMNSDocument.h
index a2318f2bb67..f68a68eaa5c 100644
--- a/dom/public/coreDom/nsIDOMNSDocument.h
+++ b/dom/public/coreDom/nsIDOMNSDocument.h
@@ -38,7 +38,7 @@ class nsIDOMRange;
  { 0xa6cf90cd, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} } 
 
-class nsIDOMNSDocument : public nsISupports {
+class NS_NO_VTABLE nsIDOMNSDocument : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMNSDOCUMENT_IID; return iid; }
 
diff --git a/dom/public/coreDom/nsIDOMNamedNodeMap.h b/dom/public/coreDom/nsIDOMNamedNodeMap.h
index fc19874c44a..c30657e64e0 100644
--- a/dom/public/coreDom/nsIDOMNamedNodeMap.h
+++ b/dom/public/coreDom/nsIDOMNamedNodeMap.h
@@ -34,7 +34,7 @@ class nsIDOMNode;
  { 0xa6cf907b, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMNamedNodeMap : public nsISupports {
+class NS_NO_VTABLE nsIDOMNamedNodeMap : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMNAMEDNODEMAP_IID; return iid; }
 
diff --git a/dom/public/coreDom/nsIDOMNode.h b/dom/public/coreDom/nsIDOMNode.h
index 44f052e5250..37b79c7da07 100644
--- a/dom/public/coreDom/nsIDOMNode.h
+++ b/dom/public/coreDom/nsIDOMNode.h
@@ -37,7 +37,7 @@ class nsIDOMNodeList;
  { 0xa6cf907c, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMNode : public nsISupports {
+class NS_NO_VTABLE nsIDOMNode : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMNODE_IID; return iid; }
   enum {
diff --git a/dom/public/coreDom/nsIDOMNodeList.h b/dom/public/coreDom/nsIDOMNodeList.h
index 52d43283206..b9e03b8638c 100644
--- a/dom/public/coreDom/nsIDOMNodeList.h
+++ b/dom/public/coreDom/nsIDOMNodeList.h
@@ -34,7 +34,7 @@ class nsIDOMNode;
  { 0xa6cf907d, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMNodeList : public nsISupports {
+class NS_NO_VTABLE nsIDOMNodeList : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMNODELIST_IID; return iid; }
 
diff --git a/dom/public/coreDom/nsIDOMNotation.h b/dom/public/coreDom/nsIDOMNotation.h
index f86b14cd729..6977b40959e 100644
--- a/dom/public/coreDom/nsIDOMNotation.h
+++ b/dom/public/coreDom/nsIDOMNotation.h
@@ -34,7 +34,7 @@
  { 0xa6cf907e, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMNotation : public nsIDOMNode {
+class NS_NO_VTABLE nsIDOMNotation : public nsIDOMNode {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMNOTATION_IID; return iid; }
 
diff --git a/dom/public/coreDom/nsIDOMProcessingInstruction.h b/dom/public/coreDom/nsIDOMProcessingInstruction.h
index 97b36d734ce..9960abd0221 100644
--- a/dom/public/coreDom/nsIDOMProcessingInstruction.h
+++ b/dom/public/coreDom/nsIDOMProcessingInstruction.h
@@ -34,7 +34,7 @@
  { 0xa6cf907f, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMProcessingInstruction : public nsIDOMNode {
+class NS_NO_VTABLE nsIDOMProcessingInstruction : public nsIDOMNode {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMPROCESSINGINSTRUCTION_IID; return iid; }
 
diff --git a/dom/public/coreDom/nsIDOMStyleSheet.h b/dom/public/coreDom/nsIDOMStyleSheet.h
index 44b29b4eae6..debb58bf1df 100644
--- a/dom/public/coreDom/nsIDOMStyleSheet.h
+++ b/dom/public/coreDom/nsIDOMStyleSheet.h
@@ -36,7 +36,7 @@ class nsIDOMMediaList;
  { 0xa6cf9080, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMStyleSheet : public nsISupports {
+class NS_NO_VTABLE nsIDOMStyleSheet : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMSTYLESHEET_IID; return iid; }
 
diff --git a/dom/public/coreDom/nsIDOMStyleSheetList.h b/dom/public/coreDom/nsIDOMStyleSheetList.h
index aec855cbe83..872d4de479f 100644
--- a/dom/public/coreDom/nsIDOMStyleSheetList.h
+++ b/dom/public/coreDom/nsIDOMStyleSheetList.h
@@ -34,7 +34,7 @@ class nsIDOMStyleSheet;
  { 0xa6cf9081, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMStyleSheetList : public nsISupports {
+class NS_NO_VTABLE nsIDOMStyleSheetList : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMSTYLESHEETLIST_IID; return iid; }
 
diff --git a/dom/public/coreDom/nsIDOMText.h b/dom/public/coreDom/nsIDOMText.h
index fa6e69ef86f..02de0227c69 100644
--- a/dom/public/coreDom/nsIDOMText.h
+++ b/dom/public/coreDom/nsIDOMText.h
@@ -35,7 +35,7 @@ class nsIDOMText;
  { 0xa6cf9082, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMText : public nsIDOMCharacterData {
+class NS_NO_VTABLE nsIDOMText : public nsIDOMCharacterData {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMTEXT_IID; return iid; }
 
diff --git a/dom/public/coreEvents/nsIDOMEvent.h b/dom/public/coreEvents/nsIDOMEvent.h
index e592ad6d269..32f3f14a324 100644
--- a/dom/public/coreEvents/nsIDOMEvent.h
+++ b/dom/public/coreEvents/nsIDOMEvent.h
@@ -34,7 +34,7 @@ class nsIDOMEventTarget;
  { 0xa66b7b80, 0xff46, 0xbd97, \
   { 0x00, 0x80, 0x5f, 0x8a, 0xe3, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMEvent : public nsISupports {
+class NS_NO_VTABLE nsIDOMEvent : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMEVENT_IID; return iid; }
   enum {
diff --git a/dom/public/coreEvents/nsIDOMEventTarget.h b/dom/public/coreEvents/nsIDOMEventTarget.h
index 8a8a478d64a..1826c1b0711 100644
--- a/dom/public/coreEvents/nsIDOMEventTarget.h
+++ b/dom/public/coreEvents/nsIDOMEventTarget.h
@@ -35,7 +35,7 @@ class nsIDOMEvent;
  { 0x1c773b30, 0xd1cf, 0x11d2, \
   { 0xbd, 0x95, 0x00, 0x80, 0x5f, 0x8a, 0xe3, 0xf4 } } 
 
-class nsIDOMEventTarget : public nsISupports {
+class NS_NO_VTABLE nsIDOMEventTarget : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMEVENTTARGET_IID; return iid; }
 
diff --git a/dom/public/coreEvents/nsIDOMKeyEvent.h b/dom/public/coreEvents/nsIDOMKeyEvent.h
index 1f73d2a9fd2..d95dd0d0fc3 100644
--- a/dom/public/coreEvents/nsIDOMKeyEvent.h
+++ b/dom/public/coreEvents/nsIDOMKeyEvent.h
@@ -35,7 +35,7 @@ class nsIDOMAbstractView;
  { 0x028e0e6e, 0x8b01, 0x11d3, \
   { 0xaa, 0xe7, 0x00, 0x10, 0x83, 0x8a, 0x31, 0x23 } } 
 
-class nsIDOMKeyEvent : public nsIDOMUIEvent {
+class NS_NO_VTABLE nsIDOMKeyEvent : public nsIDOMUIEvent {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMKEYEVENT_IID; return iid; }
   enum {
diff --git a/dom/public/coreEvents/nsIDOMMouseEvent.h b/dom/public/coreEvents/nsIDOMMouseEvent.h
index 1084038b509..c7c228fe457 100644
--- a/dom/public/coreEvents/nsIDOMMouseEvent.h
+++ b/dom/public/coreEvents/nsIDOMMouseEvent.h
@@ -35,7 +35,7 @@ class nsIDOMEventTarget;
  { 0xff751edc, 0x8b02, 0xaae7, \
   { 0x00, 0x10, 0x83, 0x01, 0x83, 0x8a, 0x31, 0x23 } } 
 
-class nsIDOMMouseEvent : public nsIDOMUIEvent {
+class NS_NO_VTABLE nsIDOMMouseEvent : public nsIDOMUIEvent {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMMOUSEEVENT_IID; return iid; }
 
diff --git a/dom/public/coreEvents/nsIDOMMutationEvent.h b/dom/public/coreEvents/nsIDOMMutationEvent.h
index 0600d4e0396..d228c4690c5 100644
--- a/dom/public/coreEvents/nsIDOMMutationEvent.h
+++ b/dom/public/coreEvents/nsIDOMMutationEvent.h
@@ -34,7 +34,7 @@ class nsIDOMNode;
 #define NS_IDOMMUTATIONEVENT_IID \
  { 0x8e440d86, 0x886a, 0x4e76, { 0x9e, 0x59, 0xc1, 0x3b, 0x93, 0x9c, 0x9a, 0x4b } } 
 
-class nsIDOMMutationEvent : public nsIDOMEvent {
+class NS_NO_VTABLE nsIDOMMutationEvent : public nsIDOMEvent {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMMUTATIONEVENT_IID; return iid; }
   enum {
diff --git a/dom/public/coreEvents/nsIDOMNSUIEvent.h b/dom/public/coreEvents/nsIDOMNSUIEvent.h
index 9d26afa9db2..17147af4bb9 100644
--- a/dom/public/coreEvents/nsIDOMNSUIEvent.h
+++ b/dom/public/coreEvents/nsIDOMNSUIEvent.h
@@ -34,7 +34,7 @@ class nsIDOMNode;
  { 0xa6cf90c4, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMNSUIEvent : public nsISupports {
+class NS_NO_VTABLE nsIDOMNSUIEvent : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMNSUIEVENT_IID; return iid; }
 
diff --git a/dom/public/coreEvents/nsIDOMUIEvent.h b/dom/public/coreEvents/nsIDOMUIEvent.h
index ecfa07deb15..0ea82b9a532 100644
--- a/dom/public/coreEvents/nsIDOMUIEvent.h
+++ b/dom/public/coreEvents/nsIDOMUIEvent.h
@@ -35,7 +35,7 @@ class nsIDOMAbstractView;
  { 0xa6cf90c3, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMUIEvent : public nsIDOMEvent {
+class NS_NO_VTABLE nsIDOMUIEvent : public nsIDOMEvent {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMUIEVENT_IID; return iid; }
 
diff --git a/dom/public/css/nsIDOMCSS2Properties.h b/dom/public/css/nsIDOMCSS2Properties.h
index 6e16b583589..148763e220a 100644
--- a/dom/public/css/nsIDOMCSS2Properties.h
+++ b/dom/public/css/nsIDOMCSS2Properties.h
@@ -34,7 +34,7 @@
  { 0xa6cf90d1, 0x15b3, 0x11d2, \
     {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMCSS2Properties : public nsIDOMCSSStyleDeclaration {
+class NS_NO_VTABLE nsIDOMCSS2Properties : public nsIDOMCSSStyleDeclaration {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSS2PROPERTIES_IID; return iid; }
 
diff --git a/dom/public/css/nsIDOMCSSFontFaceRule.h b/dom/public/css/nsIDOMCSSFontFaceRule.h
index 16c39e100b8..4e22b3ee498 100644
--- a/dom/public/css/nsIDOMCSSFontFaceRule.h
+++ b/dom/public/css/nsIDOMCSSFontFaceRule.h
@@ -35,7 +35,7 @@ class nsIDOMCSSStyleDeclaration;
  { 0xa6cf90bb, 0x15b3, 0x11d2, \
    { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMCSSFontFaceRule : public nsIDOMCSSRule {
+class NS_NO_VTABLE nsIDOMCSSFontFaceRule : public nsIDOMCSSRule {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSFONTFACERULE_IID; return iid; }
 
diff --git a/dom/public/css/nsIDOMCSSImportRule.h b/dom/public/css/nsIDOMCSSImportRule.h
index 3793c3376c4..573facc6659 100644
--- a/dom/public/css/nsIDOMCSSImportRule.h
+++ b/dom/public/css/nsIDOMCSSImportRule.h
@@ -36,7 +36,7 @@ class nsIDOMCSSStyleSheet;
  { 0xa6cf90cf, 0x15b3, 0x11d2, \
     {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} } 
 
-class nsIDOMCSSImportRule : public nsIDOMCSSRule {
+class NS_NO_VTABLE nsIDOMCSSImportRule : public nsIDOMCSSRule {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSIMPORTRULE_IID; return iid; }
 
diff --git a/dom/public/css/nsIDOMCSSMediaRule.h b/dom/public/css/nsIDOMCSSMediaRule.h
index e66b8b49c11..f7f2000a454 100644
--- a/dom/public/css/nsIDOMCSSMediaRule.h
+++ b/dom/public/css/nsIDOMCSSMediaRule.h
@@ -36,7 +36,7 @@ class nsIDOMCSSRuleList;
  { 0xa6cf90bc, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMCSSMediaRule : public nsIDOMCSSRule {
+class NS_NO_VTABLE nsIDOMCSSMediaRule : public nsIDOMCSSRule {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSMEDIARULE_IID; return iid; }
 
diff --git a/dom/public/css/nsIDOMCSSPageRule.h b/dom/public/css/nsIDOMCSSPageRule.h
index 7e91a6ad392..d4bd4863fc7 100644
--- a/dom/public/css/nsIDOMCSSPageRule.h
+++ b/dom/public/css/nsIDOMCSSPageRule.h
@@ -35,7 +35,7 @@ class nsIDOMCSSStyleDeclaration;
  { 0xa6cf90bd, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMCSSPageRule : public nsIDOMCSSRule {
+class NS_NO_VTABLE nsIDOMCSSPageRule : public nsIDOMCSSRule {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSPAGERULE_IID; return iid; }
 
diff --git a/dom/public/css/nsIDOMCSSPrimitiveValue.h b/dom/public/css/nsIDOMCSSPrimitiveValue.h
index 852c7e85f9c..23402dcb7a9 100644
--- a/dom/public/css/nsIDOMCSSPrimitiveValue.h
+++ b/dom/public/css/nsIDOMCSSPrimitiveValue.h
@@ -37,7 +37,7 @@ class nsIDOMRect;
  { 0xe249031f, 0x8df9, 0x4e7a, \
   { 0xb6, 0x44, 0x18, 0x94, 0x6d, 0xce, 0x00, 0x19 } } 
 
-class nsIDOMCSSPrimitiveValue : public nsIDOMCSSValue {
+class NS_NO_VTABLE nsIDOMCSSPrimitiveValue : public nsIDOMCSSValue {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSPRIMITIVEVALUE_IID; return iid; }
   enum {
diff --git a/dom/public/css/nsIDOMCSSRule.h b/dom/public/css/nsIDOMCSSRule.h
index 18562f2d13c..1800373c781 100644
--- a/dom/public/css/nsIDOMCSSRule.h
+++ b/dom/public/css/nsIDOMCSSRule.h
@@ -35,7 +35,7 @@ class nsIDOMCSSStyleSheet;
  { 0xa6cf90c1, 0x15b3, 0x11d2, \
     {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} } 
 
-class nsIDOMCSSRule : public nsISupports {
+class NS_NO_VTABLE nsIDOMCSSRule : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSRULE_IID; return iid; }
   enum {
diff --git a/dom/public/css/nsIDOMCSSRuleList.h b/dom/public/css/nsIDOMCSSRuleList.h
index c169dce13e5..98acbd8043c 100644
--- a/dom/public/css/nsIDOMCSSRuleList.h
+++ b/dom/public/css/nsIDOMCSSRuleList.h
@@ -34,7 +34,7 @@ class nsIDOMCSSRule;
  { 0xa6cf90c0, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMCSSRuleList : public nsISupports {
+class NS_NO_VTABLE nsIDOMCSSRuleList : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSRULELIST_IID; return iid; }
 
diff --git a/dom/public/css/nsIDOMCSSStyleDeclaration.h b/dom/public/css/nsIDOMCSSStyleDeclaration.h
index 81ef5ab2a65..b69a705a9e2 100644
--- a/dom/public/css/nsIDOMCSSStyleDeclaration.h
+++ b/dom/public/css/nsIDOMCSSStyleDeclaration.h
@@ -35,7 +35,7 @@ class nsIDOMCSSValue;
  { 0xa6cf90be, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMCSSStyleDeclaration : public nsISupports {
+class NS_NO_VTABLE nsIDOMCSSStyleDeclaration : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSSTYLEDECLARATION_IID; return iid; }
 
diff --git a/dom/public/css/nsIDOMCSSStyleRule.h b/dom/public/css/nsIDOMCSSStyleRule.h
index 02651b04324..672e4af7f04 100644
--- a/dom/public/css/nsIDOMCSSStyleRule.h
+++ b/dom/public/css/nsIDOMCSSStyleRule.h
@@ -35,7 +35,7 @@ class nsIDOMCSSStyleDeclaration;
  { 0xa6cf90bf, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMCSSStyleRule : public nsIDOMCSSRule {
+class NS_NO_VTABLE nsIDOMCSSStyleRule : public nsIDOMCSSRule {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSSTYLERULE_IID; return iid; }
 
diff --git a/dom/public/css/nsIDOMCSSStyleSheet.h b/dom/public/css/nsIDOMCSSStyleSheet.h
index 8939f79c624..22d79a958ed 100644
--- a/dom/public/css/nsIDOMCSSStyleSheet.h
+++ b/dom/public/css/nsIDOMCSSStyleSheet.h
@@ -36,7 +36,7 @@ class nsIDOMCSSRuleList;
  { 0xa6cf90c2, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMCSSStyleSheet : public nsIDOMStyleSheet {
+class NS_NO_VTABLE nsIDOMCSSStyleSheet : public nsIDOMStyleSheet {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSSTYLESHEET_IID; return iid; }
 
diff --git a/dom/public/css/nsIDOMCSSUnknownRule.h b/dom/public/css/nsIDOMCSSUnknownRule.h
index 4d16b0b53d6..99910999b4a 100644
--- a/dom/public/css/nsIDOMCSSUnknownRule.h
+++ b/dom/public/css/nsIDOMCSSUnknownRule.h
@@ -34,7 +34,7 @@
  { 0xa6cf90d0, 0x15b3, 0x11d2, \
     {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMCSSUnknownRule : public nsIDOMCSSRule {
+class NS_NO_VTABLE nsIDOMCSSUnknownRule : public nsIDOMCSSRule {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSUNKNOWNRULE_IID; return iid; }
 };
diff --git a/dom/public/css/nsIDOMCSSValue.h b/dom/public/css/nsIDOMCSSValue.h
index 75d2e59958e..60468a1216d 100644
--- a/dom/public/css/nsIDOMCSSValue.h
+++ b/dom/public/css/nsIDOMCSSValue.h
@@ -33,7 +33,7 @@
  { 0x009f7ea5, 0x9e80, 0x41be, \
   { 0xb0, 0x08, 0xdb, 0x62, 0xf1, 0x08, 0x23, 0xf2 } } 
 
-class nsIDOMCSSValue : public nsISupports {
+class NS_NO_VTABLE nsIDOMCSSValue : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSVALUE_IID; return iid; }
   enum {
diff --git a/dom/public/css/nsIDOMCounter.h b/dom/public/css/nsIDOMCounter.h
index cfdb7123be5..886f3a9fade 100644
--- a/dom/public/css/nsIDOMCounter.h
+++ b/dom/public/css/nsIDOMCounter.h
@@ -33,7 +33,7 @@
  { 0x31adb439, 0x0055, 0x402d, \
   { 0x9b, 0x1d, 0xd5, 0xca, 0x94, 0xf3, 0xf5, 0x5b } } 
 
-class nsIDOMCounter : public nsISupports {
+class NS_NO_VTABLE nsIDOMCounter : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMCOUNTER_IID; return iid; }
 
diff --git a/dom/public/css/nsIDOMRGBColor.h b/dom/public/css/nsIDOMRGBColor.h
index 35fe5d817d1..faa23166d82 100644
--- a/dom/public/css/nsIDOMRGBColor.h
+++ b/dom/public/css/nsIDOMRGBColor.h
@@ -34,7 +34,7 @@ class nsIDOMCSSPrimitiveValue;
  { 0x6aff3102, 0x320d, 0x4986, \
   { 0x97, 0x90, 0x12, 0x31, 0x6b, 0xb8, 0x7c, 0xf9 } } 
 
-class nsIDOMRGBColor : public nsISupports {
+class NS_NO_VTABLE nsIDOMRGBColor : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMRGBCOLOR_IID; return iid; }
 
diff --git a/dom/public/css/nsIDOMRect.h b/dom/public/css/nsIDOMRect.h
index d0b457d9d0b..ff722a11116 100644
--- a/dom/public/css/nsIDOMRect.h
+++ b/dom/public/css/nsIDOMRect.h
@@ -34,7 +34,7 @@ class nsIDOMCSSPrimitiveValue;
  { 0x71735f62, 0xac5c, 0x4236, \
   { 0x9a, 0x1f, 0x5f, 0xfb, 0x28, 0x0d, 0x53, 0x1c } } 
 
-class nsIDOMRect : public nsISupports {
+class NS_NO_VTABLE nsIDOMRect : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMRECT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLAnchorElement.h b/dom/public/html/nsIDOMHTMLAnchorElement.h
index 07403798c1c..dc6e830a7ab 100644
--- a/dom/public/html/nsIDOMHTMLAnchorElement.h
+++ b/dom/public/html/nsIDOMHTMLAnchorElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf90aa, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLAnchorElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLAnchorElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLANCHORELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLAppletElement.h b/dom/public/html/nsIDOMHTMLAppletElement.h
index d31795160b4..6c6cc1253f7 100644
--- a/dom/public/html/nsIDOMHTMLAppletElement.h
+++ b/dom/public/html/nsIDOMHTMLAppletElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf90ae, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLAppletElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLAppletElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLAPPLETELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLAreaElement.h b/dom/public/html/nsIDOMHTMLAreaElement.h
index e21cabed075..1500602be47 100644
--- a/dom/public/html/nsIDOMHTMLAreaElement.h
+++ b/dom/public/html/nsIDOMHTMLAreaElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf90b0, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLAreaElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLAreaElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLAREAELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLBRElement.h b/dom/public/html/nsIDOMHTMLBRElement.h
index bd87eef0939..234b05e1a22 100644
--- a/dom/public/html/nsIDOMHTMLBRElement.h
+++ b/dom/public/html/nsIDOMHTMLBRElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf90a5, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLBRElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLBRElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLBRELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLBaseElement.h b/dom/public/html/nsIDOMHTMLBaseElement.h
index 712f0d217b2..bdd6b8eae51 100644
--- a/dom/public/html/nsIDOMHTMLBaseElement.h
+++ b/dom/public/html/nsIDOMHTMLBaseElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf908b, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLBaseElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLBaseElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLBASEELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLBaseFontElement.h b/dom/public/html/nsIDOMHTMLBaseFontElement.h
index 4a65836fce0..bd0672dfb79 100644
--- a/dom/public/html/nsIDOMHTMLBaseFontElement.h
+++ b/dom/public/html/nsIDOMHTMLBaseFontElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf90a6, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLBaseFontElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLBaseFontElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLBASEFONTELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLBodyElement.h b/dom/public/html/nsIDOMHTMLBodyElement.h
index f5821ad856a..362ecaa3742 100644
--- a/dom/public/html/nsIDOMHTMLBodyElement.h
+++ b/dom/public/html/nsIDOMHTMLBodyElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf908e, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLBodyElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLBodyElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLBODYELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLButtonElement.h b/dom/public/html/nsIDOMHTMLButtonElement.h
index 10208782050..f5bd7e7d69b 100644
--- a/dom/public/html/nsIDOMHTMLButtonElement.h
+++ b/dom/public/html/nsIDOMHTMLButtonElement.h
@@ -35,7 +35,7 @@ class nsIDOMHTMLFormElement;
  { 0xa6cf9095, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLButtonElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLButtonElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLBUTTONELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLCollection.h b/dom/public/html/nsIDOMHTMLCollection.h
index 2847814c308..348461d0676 100644
--- a/dom/public/html/nsIDOMHTMLCollection.h
+++ b/dom/public/html/nsIDOMHTMLCollection.h
@@ -34,7 +34,7 @@ class nsIDOMNode;
  { 0xa6cf9083, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLCollection : public nsISupports {
+class NS_NO_VTABLE nsIDOMHTMLCollection : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLCOLLECTION_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLDListElement.h b/dom/public/html/nsIDOMHTMLDListElement.h
index 01f0dd4d3db..c0ae6b5ca38 100644
--- a/dom/public/html/nsIDOMHTMLDListElement.h
+++ b/dom/public/html/nsIDOMHTMLDListElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf909b, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLDListElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLDListElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLDLISTELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLDirectoryElement.h b/dom/public/html/nsIDOMHTMLDirectoryElement.h
index a1ddde4a438..81430ca3a0f 100644
--- a/dom/public/html/nsIDOMHTMLDirectoryElement.h
+++ b/dom/public/html/nsIDOMHTMLDirectoryElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf909c, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLDirectoryElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLDirectoryElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLDIRECTORYELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLDivElement.h b/dom/public/html/nsIDOMHTMLDivElement.h
index 2dac8e54c84..ca63371d692 100644
--- a/dom/public/html/nsIDOMHTMLDivElement.h
+++ b/dom/public/html/nsIDOMHTMLDivElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf90a0, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLDivElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLDivElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLDIVELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLDocument.h b/dom/public/html/nsIDOMHTMLDocument.h
index 6a1c5e9ac43..e671cf957ff 100644
--- a/dom/public/html/nsIDOMHTMLDocument.h
+++ b/dom/public/html/nsIDOMHTMLDocument.h
@@ -37,7 +37,7 @@ class nsIDOMNodeList;
  { 0xa6cf9084, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLDocument : public nsIDOMDocument {
+class NS_NO_VTABLE nsIDOMHTMLDocument : public nsIDOMDocument {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLDOCUMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLElement.h b/dom/public/html/nsIDOMHTMLElement.h
index 61dbf93354d..b11c83c6c7e 100644
--- a/dom/public/html/nsIDOMHTMLElement.h
+++ b/dom/public/html/nsIDOMHTMLElement.h
@@ -36,7 +36,7 @@ class nsIDOMCSSStyleDeclaration;
  { 0xa6cf9085, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLElement : public nsIDOMElement {
+class NS_NO_VTABLE nsIDOMHTMLElement : public nsIDOMElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLEmbedElement.h b/dom/public/html/nsIDOMHTMLEmbedElement.h
index a719fed220f..35e04250238 100644
--- a/dom/public/html/nsIDOMHTMLEmbedElement.h
+++ b/dom/public/html/nsIDOMHTMLEmbedElement.h
@@ -34,7 +34,7 @@
  { 0x123f90ab, 0x15b3, 0x11d2, \
   { 0x45, 0x6e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLEmbedElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLEmbedElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLEMBEDELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLFieldSetElement.h b/dom/public/html/nsIDOMHTMLFieldSetElement.h
index b6788369fe8..10ae95988f4 100644
--- a/dom/public/html/nsIDOMHTMLFieldSetElement.h
+++ b/dom/public/html/nsIDOMHTMLFieldSetElement.h
@@ -35,7 +35,7 @@ class nsIDOMHTMLFormElement;
  { 0xa6cf9097, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLFieldSetElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLFieldSetElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLFIELDSETELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLFontElement.h b/dom/public/html/nsIDOMHTMLFontElement.h
index 72927b42425..2bee6801caa 100644
--- a/dom/public/html/nsIDOMHTMLFontElement.h
+++ b/dom/public/html/nsIDOMHTMLFontElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf90a7, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLFontElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLFontElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLFONTELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLFormControlList.h b/dom/public/html/nsIDOMHTMLFormControlList.h
index 20ea1fda647..4007bfc83d9 100644
--- a/dom/public/html/nsIDOMHTMLFormControlList.h
+++ b/dom/public/html/nsIDOMHTMLFormControlList.h
@@ -35,7 +35,7 @@
  { 0xa6cf911a, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLFormControlList : public nsIDOMHTMLCollection {
+class NS_NO_VTABLE nsIDOMHTMLFormControlList : public nsIDOMHTMLCollection {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLFORMCONTROLLIST_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLFormElement.h b/dom/public/html/nsIDOMHTMLFormElement.h
index 924450c54ba..c6b7ec844a5 100644
--- a/dom/public/html/nsIDOMHTMLFormElement.h
+++ b/dom/public/html/nsIDOMHTMLFormElement.h
@@ -35,7 +35,7 @@ class nsIDOMHTMLCollection;
  { 0xa6cf908f, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLFormElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLFormElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLFORMELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLFrameElement.h b/dom/public/html/nsIDOMHTMLFrameElement.h
index f70d7023dbe..1740fc0b35a 100644
--- a/dom/public/html/nsIDOMHTMLFrameElement.h
+++ b/dom/public/html/nsIDOMHTMLFrameElement.h
@@ -35,7 +35,7 @@ class nsIDOMDocument;
  { 0xa6cf90b9, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLFrameElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLFrameElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLFRAMEELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLFrameSetElement.h b/dom/public/html/nsIDOMHTMLFrameSetElement.h
index bd3ee1da3d1..de81201c7d8 100644
--- a/dom/public/html/nsIDOMHTMLFrameSetElement.h
+++ b/dom/public/html/nsIDOMHTMLFrameSetElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf90b8, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLFrameSetElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLFrameSetElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLFRAMESETELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLHRElement.h b/dom/public/html/nsIDOMHTMLHRElement.h
index af7d166b6a9..a8f705926e5 100644
--- a/dom/public/html/nsIDOMHTMLHRElement.h
+++ b/dom/public/html/nsIDOMHTMLHRElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf90a8, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLHRElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLHRElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLHRELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLHeadElement.h b/dom/public/html/nsIDOMHTMLHeadElement.h
index bd7a0e7f510..c7fb7a1ddc0 100644
--- a/dom/public/html/nsIDOMHTMLHeadElement.h
+++ b/dom/public/html/nsIDOMHTMLHeadElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf9087, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLHeadElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLHeadElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLHEADELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLHeadingElement.h b/dom/public/html/nsIDOMHTMLHeadingElement.h
index 6636ed1040b..fed01eb7ca9 100644
--- a/dom/public/html/nsIDOMHTMLHeadingElement.h
+++ b/dom/public/html/nsIDOMHTMLHeadingElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf90a2, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLHeadingElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLHeadingElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLHEADINGELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLHtmlElement.h b/dom/public/html/nsIDOMHTMLHtmlElement.h
index d14ca78bdee..65c8e5dd325 100644
--- a/dom/public/html/nsIDOMHTMLHtmlElement.h
+++ b/dom/public/html/nsIDOMHTMLHtmlElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf9086, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLHtmlElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLHtmlElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLHTMLELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLIFrameElement.h b/dom/public/html/nsIDOMHTMLIFrameElement.h
index dc7e48180cf..6f60f2c075e 100644
--- a/dom/public/html/nsIDOMHTMLIFrameElement.h
+++ b/dom/public/html/nsIDOMHTMLIFrameElement.h
@@ -35,7 +35,7 @@ class nsIDOMDocument;
  { 0xa6cf90ba, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLIFrameElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLIFrameElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLIFRAMEELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLImageElement.h b/dom/public/html/nsIDOMHTMLImageElement.h
index 02c775237de..c034c8e0cc2 100644
--- a/dom/public/html/nsIDOMHTMLImageElement.h
+++ b/dom/public/html/nsIDOMHTMLImageElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf90ab, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLImageElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLImageElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLIMAGEELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLInputElement.h b/dom/public/html/nsIDOMHTMLInputElement.h
index dd80becf6e8..e698d35a921 100644
--- a/dom/public/html/nsIDOMHTMLInputElement.h
+++ b/dom/public/html/nsIDOMHTMLInputElement.h
@@ -35,7 +35,7 @@ class nsIDOMHTMLFormElement;
  { 0xa6cf9093, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLInputElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLInputElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLINPUTELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLIsIndexElement.h b/dom/public/html/nsIDOMHTMLIsIndexElement.h
index 1604b633cb1..9952221fdc5 100644
--- a/dom/public/html/nsIDOMHTMLIsIndexElement.h
+++ b/dom/public/html/nsIDOMHTMLIsIndexElement.h
@@ -35,7 +35,7 @@ class nsIDOMHTMLFormElement;
  { 0xa6cf908c, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLIsIndexElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLIsIndexElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLISINDEXELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLLIElement.h b/dom/public/html/nsIDOMHTMLLIElement.h
index dea6088c9a4..ff1ef9968fe 100644
--- a/dom/public/html/nsIDOMHTMLLIElement.h
+++ b/dom/public/html/nsIDOMHTMLLIElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf909e, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLLIElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLLIElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLLIELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLLabelElement.h b/dom/public/html/nsIDOMHTMLLabelElement.h
index 714ea9ea17f..c540448aa4b 100644
--- a/dom/public/html/nsIDOMHTMLLabelElement.h
+++ b/dom/public/html/nsIDOMHTMLLabelElement.h
@@ -35,7 +35,7 @@ class nsIDOMHTMLFormElement;
  { 0xa6cf9096, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLLabelElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLLabelElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLLABELELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLLayerElement.h b/dom/public/html/nsIDOMHTMLLayerElement.h
index a5a09b68ee2..0a55fcc9761 100644
--- a/dom/public/html/nsIDOMHTMLLayerElement.h
+++ b/dom/public/html/nsIDOMHTMLLayerElement.h
@@ -35,7 +35,7 @@ class nsIDOMDocument;
  { 0xa6cf9100, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLLayerElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLLayerElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLLAYERELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLLegendElement.h b/dom/public/html/nsIDOMHTMLLegendElement.h
index 77d1799c089..6e02d388c32 100644
--- a/dom/public/html/nsIDOMHTMLLegendElement.h
+++ b/dom/public/html/nsIDOMHTMLLegendElement.h
@@ -35,7 +35,7 @@ class nsIDOMHTMLFormElement;
  { 0xa6cf9098, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLLegendElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLLegendElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLLEGENDELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLLinkElement.h b/dom/public/html/nsIDOMHTMLLinkElement.h
index c62afee1e8a..84ba61fc29c 100644
--- a/dom/public/html/nsIDOMHTMLLinkElement.h
+++ b/dom/public/html/nsIDOMHTMLLinkElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf9088, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLLinkElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLLinkElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLLINKELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLMapElement.h b/dom/public/html/nsIDOMHTMLMapElement.h
index f1775cb7024..1b73094072c 100644
--- a/dom/public/html/nsIDOMHTMLMapElement.h
+++ b/dom/public/html/nsIDOMHTMLMapElement.h
@@ -35,7 +35,7 @@ class nsIDOMHTMLCollection;
  { 0xa6cf90af, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLMapElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLMapElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLMAPELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLMenuElement.h b/dom/public/html/nsIDOMHTMLMenuElement.h
index 77a5948a799..dd28aeb3649 100644
--- a/dom/public/html/nsIDOMHTMLMenuElement.h
+++ b/dom/public/html/nsIDOMHTMLMenuElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf909d, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLMenuElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLMenuElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLMENUELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLMetaElement.h b/dom/public/html/nsIDOMHTMLMetaElement.h
index 66cc1d3d3b6..8e573a4263c 100644
--- a/dom/public/html/nsIDOMHTMLMetaElement.h
+++ b/dom/public/html/nsIDOMHTMLMetaElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf908a, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLMetaElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLMetaElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLMETAELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLModElement.h b/dom/public/html/nsIDOMHTMLModElement.h
index 3d7816da9dd..d12ab3e5914 100644
--- a/dom/public/html/nsIDOMHTMLModElement.h
+++ b/dom/public/html/nsIDOMHTMLModElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf90a9, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLModElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLModElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLMODELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLOListElement.h b/dom/public/html/nsIDOMHTMLOListElement.h
index 9023e77562c..3d92aa82243 100644
--- a/dom/public/html/nsIDOMHTMLOListElement.h
+++ b/dom/public/html/nsIDOMHTMLOListElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf909a, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLOListElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLOListElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLOLISTELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLObjectElement.h b/dom/public/html/nsIDOMHTMLObjectElement.h
index 339c02e632c..878b92674d1 100644
--- a/dom/public/html/nsIDOMHTMLObjectElement.h
+++ b/dom/public/html/nsIDOMHTMLObjectElement.h
@@ -36,7 +36,7 @@ class nsIDOMDocument;
  { 0xa6cf90ac, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLObjectElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLObjectElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLOBJECTELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLOptGroupElement.h b/dom/public/html/nsIDOMHTMLOptGroupElement.h
index c97fed629f7..cb40829f19f 100644
--- a/dom/public/html/nsIDOMHTMLOptGroupElement.h
+++ b/dom/public/html/nsIDOMHTMLOptGroupElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf9091, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLOptGroupElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLOptGroupElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLOPTGROUPELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLOptionElement.h b/dom/public/html/nsIDOMHTMLOptionElement.h
index 36fba7b9162..b10c609dfb7 100644
--- a/dom/public/html/nsIDOMHTMLOptionElement.h
+++ b/dom/public/html/nsIDOMHTMLOptionElement.h
@@ -35,7 +35,7 @@ class nsIDOMHTMLFormElement;
  { 0xa6cf9092, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLOptionElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLOptionElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLOPTIONELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLParagraphElement.h b/dom/public/html/nsIDOMHTMLParagraphElement.h
index a93ecbd6baf..723a85f65e3 100644
--- a/dom/public/html/nsIDOMHTMLParagraphElement.h
+++ b/dom/public/html/nsIDOMHTMLParagraphElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf90a1, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLParagraphElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLParagraphElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLPARAGRAPHELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLParamElement.h b/dom/public/html/nsIDOMHTMLParamElement.h
index d0dfa7b81c6..ef1510e2245 100644
--- a/dom/public/html/nsIDOMHTMLParamElement.h
+++ b/dom/public/html/nsIDOMHTMLParamElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf90ad, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLParamElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLParamElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLPARAMELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLPreElement.h b/dom/public/html/nsIDOMHTMLPreElement.h
index 76ef4439839..0982769ff21 100644
--- a/dom/public/html/nsIDOMHTMLPreElement.h
+++ b/dom/public/html/nsIDOMHTMLPreElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf90a4, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLPreElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLPreElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLPREELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLQuoteElement.h b/dom/public/html/nsIDOMHTMLQuoteElement.h
index 35821ace73b..553e3f7f0c3 100644
--- a/dom/public/html/nsIDOMHTMLQuoteElement.h
+++ b/dom/public/html/nsIDOMHTMLQuoteElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf90a3, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLQuoteElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLQuoteElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLQUOTEELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLScriptElement.h b/dom/public/html/nsIDOMHTMLScriptElement.h
index 5650f4c703c..6bef3913699 100644
--- a/dom/public/html/nsIDOMHTMLScriptElement.h
+++ b/dom/public/html/nsIDOMHTMLScriptElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf90b1, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLScriptElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLScriptElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLSCRIPTELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLSelectElement.h b/dom/public/html/nsIDOMHTMLSelectElement.h
index bb729aa30df..2b1d93d9231 100644
--- a/dom/public/html/nsIDOMHTMLSelectElement.h
+++ b/dom/public/html/nsIDOMHTMLSelectElement.h
@@ -37,7 +37,7 @@ class nsIDOMHTMLFormElement;
  { 0xa6cf9090, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLSelectElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLSelectElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLSELECTELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLStyleElement.h b/dom/public/html/nsIDOMHTMLStyleElement.h
index 81d6cd18059..04ef44fce91 100644
--- a/dom/public/html/nsIDOMHTMLStyleElement.h
+++ b/dom/public/html/nsIDOMHTMLStyleElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf908d, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLStyleElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLStyleElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLSTYLEELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLTableCaptionElement.h b/dom/public/html/nsIDOMHTMLTableCaptionElement.h
index fbf7b80289d..df297216066 100644
--- a/dom/public/html/nsIDOMHTMLTableCaptionElement.h
+++ b/dom/public/html/nsIDOMHTMLTableCaptionElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf90b3, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLTableCaptionElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLTableCaptionElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLTABLECAPTIONELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLTableCellElement.h b/dom/public/html/nsIDOMHTMLTableCellElement.h
index 66574316c65..a53c681b883 100644
--- a/dom/public/html/nsIDOMHTMLTableCellElement.h
+++ b/dom/public/html/nsIDOMHTMLTableCellElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf90b7, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLTableCellElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLTableCellElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLTABLECELLELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLTableColElement.h b/dom/public/html/nsIDOMHTMLTableColElement.h
index 78796946c94..d93d1eeee75 100644
--- a/dom/public/html/nsIDOMHTMLTableColElement.h
+++ b/dom/public/html/nsIDOMHTMLTableColElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf90b4, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLTableColElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLTableColElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLTABLECOLELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLTableElement.h b/dom/public/html/nsIDOMHTMLTableElement.h
index 16765e6b3c1..c53afcda0df 100644
--- a/dom/public/html/nsIDOMHTMLTableElement.h
+++ b/dom/public/html/nsIDOMHTMLTableElement.h
@@ -38,7 +38,7 @@ class nsIDOMHTMLCollection;
  { 0xa6cf90b2, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLTableElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLTableElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLTABLEELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLTableRowElement.h b/dom/public/html/nsIDOMHTMLTableRowElement.h
index 68d272c6885..9232bee0318 100644
--- a/dom/public/html/nsIDOMHTMLTableRowElement.h
+++ b/dom/public/html/nsIDOMHTMLTableRowElement.h
@@ -36,7 +36,7 @@ class nsIDOMHTMLCollection;
  { 0xa6cf90b6, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLTableRowElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLTableRowElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLTABLEROWELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLTableSectionElement.h b/dom/public/html/nsIDOMHTMLTableSectionElement.h
index 306c907532f..f237bf0d67b 100644
--- a/dom/public/html/nsIDOMHTMLTableSectionElement.h
+++ b/dom/public/html/nsIDOMHTMLTableSectionElement.h
@@ -36,7 +36,7 @@ class nsIDOMHTMLCollection;
  { 0xa6cf90b5, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLTableSectionElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLTableSectionElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLTABLESECTIONELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLTextAreaElement.h b/dom/public/html/nsIDOMHTMLTextAreaElement.h
index 432b40f715e..3baa7673844 100644
--- a/dom/public/html/nsIDOMHTMLTextAreaElement.h
+++ b/dom/public/html/nsIDOMHTMLTextAreaElement.h
@@ -35,7 +35,7 @@ class nsIDOMHTMLFormElement;
  { 0xa6cf9094, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLTextAreaElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLTextAreaElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLTEXTAREAELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLTitleElement.h b/dom/public/html/nsIDOMHTMLTitleElement.h
index 89fd701a448..bd47c7cf6e8 100644
--- a/dom/public/html/nsIDOMHTMLTitleElement.h
+++ b/dom/public/html/nsIDOMHTMLTitleElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf9089, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLTitleElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLTitleElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLTITLEELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMHTMLUListElement.h b/dom/public/html/nsIDOMHTMLUListElement.h
index b57c48f8d30..b3fd959d9fa 100644
--- a/dom/public/html/nsIDOMHTMLUListElement.h
+++ b/dom/public/html/nsIDOMHTMLUListElement.h
@@ -34,7 +34,7 @@
  { 0xa6cf9099, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMHTMLUListElement : public nsIDOMHTMLElement {
+class NS_NO_VTABLE nsIDOMHTMLUListElement : public nsIDOMHTMLElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLULISTELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMImage.h b/dom/public/html/nsIDOMImage.h
index 615989422ad..191bac763c6 100644
--- a/dom/public/html/nsIDOMImage.h
+++ b/dom/public/html/nsIDOMImage.h
@@ -33,7 +33,7 @@
  { 0xa6cf90c7, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMImage : public nsISupports {
+class NS_NO_VTABLE nsIDOMImage : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMIMAGE_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMNSHTMLAnchorElement.h b/dom/public/html/nsIDOMNSHTMLAnchorElement.h
index 10c7528b824..22e8f942867 100644
--- a/dom/public/html/nsIDOMNSHTMLAnchorElement.h
+++ b/dom/public/html/nsIDOMNSHTMLAnchorElement.h
@@ -33,7 +33,7 @@
  { 0xa6cf911c, 0x15b3, 0x11d2,  \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMNSHTMLAnchorElement : public nsISupports {
+class NS_NO_VTABLE nsIDOMNSHTMLAnchorElement : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMNSHTMLANCHORELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMNSHTMLAreaElement.h b/dom/public/html/nsIDOMNSHTMLAreaElement.h
index cbd1fdcda88..363c165d806 100644
--- a/dom/public/html/nsIDOMNSHTMLAreaElement.h
+++ b/dom/public/html/nsIDOMNSHTMLAreaElement.h
@@ -33,7 +33,7 @@
  { 0xa6cf911b, 0x15b3, 0x11d2,  \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMNSHTMLAreaElement : public nsISupports {
+class NS_NO_VTABLE nsIDOMNSHTMLAreaElement : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMNSHTMLAREAELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMNSHTMLButtonElement.h b/dom/public/html/nsIDOMNSHTMLButtonElement.h
index 31489bdbae4..ef8cfe1e43e 100644
--- a/dom/public/html/nsIDOMNSHTMLButtonElement.h
+++ b/dom/public/html/nsIDOMNSHTMLButtonElement.h
@@ -33,7 +33,7 @@
  { 0x6fd344d0, 0x7e5f, 0x11d2, \
   { 0xbd, 0x91, 0x00, 0x80, 0x5f, 0x8a, 0xe3, 0xf4 } } 
 
-class nsIDOMNSHTMLButtonElement : public nsISupports {
+class NS_NO_VTABLE nsIDOMNSHTMLButtonElement : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMNSHTMLBUTTONELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMNSHTMLDocument.h b/dom/public/html/nsIDOMNSHTMLDocument.h
index 4785fc3c125..81ba9a776b3 100644
--- a/dom/public/html/nsIDOMNSHTMLDocument.h
+++ b/dom/public/html/nsIDOMNSHTMLDocument.h
@@ -36,7 +36,7 @@ class nsIDOMHTMLCollection;
  { 0xa6cf90c5, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMNSHTMLDocument : public nsISupports {
+class NS_NO_VTABLE nsIDOMNSHTMLDocument : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMNSHTMLDOCUMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMNSHTMLFormElement.h b/dom/public/html/nsIDOMNSHTMLFormElement.h
index cecd1d31cde..3ac109235ec 100644
--- a/dom/public/html/nsIDOMNSHTMLFormElement.h
+++ b/dom/public/html/nsIDOMNSHTMLFormElement.h
@@ -35,7 +35,7 @@ class nsIDOMElement;
  { 0xa6cf90c6, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMNSHTMLFormElement : public nsISupports {
+class NS_NO_VTABLE nsIDOMNSHTMLFormElement : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMNSHTMLFORMELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMNSHTMLOptionCollection.h b/dom/public/html/nsIDOMNSHTMLOptionCollection.h
index 43d1e30d0fe..3ee1336ef81 100755
--- a/dom/public/html/nsIDOMNSHTMLOptionCollection.h
+++ b/dom/public/html/nsIDOMNSHTMLOptionCollection.h
@@ -35,7 +35,7 @@ class nsIDOMNode;
  { 0xa6cf9114, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMNSHTMLOptionCollection : public nsIDOMHTMLCollection {
+class NS_NO_VTABLE nsIDOMNSHTMLOptionCollection : public nsIDOMHTMLCollection {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMNSHTMLOPTIONCOLLECTION_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMNSHTMLSelectElement.h b/dom/public/html/nsIDOMNSHTMLSelectElement.h
index aab6282f831..e48181d8cff 100644
--- a/dom/public/html/nsIDOMNSHTMLSelectElement.h
+++ b/dom/public/html/nsIDOMNSHTMLSelectElement.h
@@ -34,7 +34,7 @@ class nsIDOMNode;
  { 0xa6cf9105, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMNSHTMLSelectElement : public nsISupports {
+class NS_NO_VTABLE nsIDOMNSHTMLSelectElement : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMNSHTMLSELECTELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMNSHTMLTextAreaElement.h b/dom/public/html/nsIDOMNSHTMLTextAreaElement.h
index 2a1dc27fba6..77af315e560 100644
--- a/dom/public/html/nsIDOMNSHTMLTextAreaElement.h
+++ b/dom/public/html/nsIDOMNSHTMLTextAreaElement.h
@@ -34,7 +34,7 @@ class nsIControllers;
  { 0xca066b44, 0x9ddf, 0x11d3, \
   { 0xbc, 0xcc, 0x00, 0x60, 0xb0, 0xfc, 0x76, 0xbd } } 
 
-class nsIDOMNSHTMLTextAreaElement : public nsISupports {
+class NS_NO_VTABLE nsIDOMNSHTMLTextAreaElement : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMNSHTMLTEXTAREAELEMENT_IID; return iid; }
 
diff --git a/dom/public/html/nsIDOMOption.h b/dom/public/html/nsIDOMOption.h
index 37edd658f0c..1df3b1bcf81 100644
--- a/dom/public/html/nsIDOMOption.h
+++ b/dom/public/html/nsIDOMOption.h
@@ -33,7 +33,7 @@
  { 0xa6cf90f3, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMOption : public nsISupports {
+class NS_NO_VTABLE nsIDOMOption : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMOPTION_IID; return iid; }
 };
diff --git a/dom/public/range/nsIDOMNSRange.h b/dom/public/range/nsIDOMNSRange.h
index efb02cc86e2..9dbb641151d 100644
--- a/dom/public/range/nsIDOMNSRange.h
+++ b/dom/public/range/nsIDOMNSRange.h
@@ -35,7 +35,7 @@ class nsIDOMDocumentFragment;
  { 0xa6cf90f2, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMNSRange : public nsISupports {
+class NS_NO_VTABLE nsIDOMNSRange : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMNSRANGE_IID; return iid; }
   enum {
diff --git a/dom/public/range/nsIDOMRange.h b/dom/public/range/nsIDOMRange.h
index 1cbb71de101..d0f6b2599e2 100644
--- a/dom/public/range/nsIDOMRange.h
+++ b/dom/public/range/nsIDOMRange.h
@@ -36,7 +36,7 @@ class nsIDOMRange;
  { 0xa6cf90ce, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMRange : public nsISupports {
+class NS_NO_VTABLE nsIDOMRange : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMRANGE_IID; return iid; }
   enum {
diff --git a/dom/public/xul/nsIDOMXULCommandDispatcher.h b/dom/public/xul/nsIDOMXULCommandDispatcher.h
index 6fbedb13750..b54be9238a2 100644
--- a/dom/public/xul/nsIDOMXULCommandDispatcher.h
+++ b/dom/public/xul/nsIDOMXULCommandDispatcher.h
@@ -37,7 +37,7 @@ class nsIControllers;
  { 0xf3c50361, 0x14fe, 0x11d3, \
 		{ 0xbf, 0x87, 0x0, 0x10, 0x5a, 0x1b, 0x6, 0x27 } } 
 
-class nsIDOMXULCommandDispatcher : public nsISupports {
+class NS_NO_VTABLE nsIDOMXULCommandDispatcher : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMXULCOMMANDDISPATCHER_IID; return iid; }
 
diff --git a/dom/public/xul/nsIDOMXULDocument.h b/dom/public/xul/nsIDOMXULDocument.h
index b0225fc6aec..e5c49ab208b 100644
--- a/dom/public/xul/nsIDOMXULDocument.h
+++ b/dom/public/xul/nsIDOMXULDocument.h
@@ -38,7 +38,7 @@ class nsIDOMNodeList;
  { 0x17ddd8c0, 0xc5f8, 0x11d2, \
         { 0xa6, 0xae, 0x0, 0x10, 0x4b, 0xde, 0x60, 0x48 } } 
 
-class nsIDOMXULDocument : public nsIDOMDocument {
+class NS_NO_VTABLE nsIDOMXULDocument : public nsIDOMDocument {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMXULDOCUMENT_IID; return iid; }
 
diff --git a/dom/public/xul/nsIDOMXULElement.h b/dom/public/xul/nsIDOMXULElement.h
index 7c5190e3c6e..86fa5b98596 100644
--- a/dom/public/xul/nsIDOMXULElement.h
+++ b/dom/public/xul/nsIDOMXULElement.h
@@ -42,7 +42,7 @@ class nsIDOMNodeList;
  { 0x574ed81, 0xc088, 0x11d2, \
   { 0x96, 0xed, 0x0, 0x10, 0x4b, 0x7b, 0x7d, 0xeb } } 
 
-class nsIDOMXULElement : public nsIDOMElement {
+class NS_NO_VTABLE nsIDOMXULElement : public nsIDOMElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMXULELEMENT_IID; return iid; }
 
diff --git a/dom/public/xul/nsIDOMXULTreeElement.h b/dom/public/xul/nsIDOMXULTreeElement.h
index c18bf6b77bc..4ffd637f2a0 100644
--- a/dom/public/xul/nsIDOMXULTreeElement.h
+++ b/dom/public/xul/nsIDOMXULTreeElement.h
@@ -36,7 +36,7 @@ class nsIDOMNodeList;
  { 0xa6cf90ec, 0x15b3, 0x11d2, \
     {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} } 
 
-class nsIDOMXULTreeElement : public nsIDOMXULElement {
+class NS_NO_VTABLE nsIDOMXULTreeElement : public nsIDOMXULElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMXULTREEELEMENT_IID; return iid; }
 
diff --git a/dom/tools/XPCOMGen.cpp b/dom/tools/XPCOMGen.cpp
index 8f1df1ca49e..51022eb2452 100644
--- a/dom/tools/XPCOMGen.cpp
+++ b/dom/tools/XPCOMGen.cpp
@@ -62,7 +62,7 @@ static const char *kUuidStr =
 "%s\n\n";
 static const char *kNoUuidStr = 
 "--- IID GOES HERE ---\n\n";
-static const char *kClassDeclStr = "class nsIDOM%s : ";
+static const char *kClassDeclStr = "class NS_NO_VTABLE nsIDOM%s : ";
 static const char *kBaseClassStr = "public nsIDOM%s";
 static const char *kNoBaseClassStr = "public nsISupports";
 static const char *kClassPrologStr = " {\npublic:\n";
diff --git a/rdf/content/public/nsIDOMXULCommandDispatcher.h b/rdf/content/public/nsIDOMXULCommandDispatcher.h
index 6fbedb13750..b54be9238a2 100644
--- a/rdf/content/public/nsIDOMXULCommandDispatcher.h
+++ b/rdf/content/public/nsIDOMXULCommandDispatcher.h
@@ -37,7 +37,7 @@ class nsIControllers;
  { 0xf3c50361, 0x14fe, 0x11d3, \
 		{ 0xbf, 0x87, 0x0, 0x10, 0x5a, 0x1b, 0x6, 0x27 } } 
 
-class nsIDOMXULCommandDispatcher : public nsISupports {
+class NS_NO_VTABLE nsIDOMXULCommandDispatcher : public nsISupports {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMXULCOMMANDDISPATCHER_IID; return iid; }
 
diff --git a/rdf/content/public/nsIDOMXULDocument.h b/rdf/content/public/nsIDOMXULDocument.h
index b0225fc6aec..e5c49ab208b 100644
--- a/rdf/content/public/nsIDOMXULDocument.h
+++ b/rdf/content/public/nsIDOMXULDocument.h
@@ -38,7 +38,7 @@ class nsIDOMNodeList;
  { 0x17ddd8c0, 0xc5f8, 0x11d2, \
         { 0xa6, 0xae, 0x0, 0x10, 0x4b, 0xde, 0x60, 0x48 } } 
 
-class nsIDOMXULDocument : public nsIDOMDocument {
+class NS_NO_VTABLE nsIDOMXULDocument : public nsIDOMDocument {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMXULDOCUMENT_IID; return iid; }
 
diff --git a/rdf/content/public/nsIDOMXULElement.h b/rdf/content/public/nsIDOMXULElement.h
index 7c5190e3c6e..86fa5b98596 100644
--- a/rdf/content/public/nsIDOMXULElement.h
+++ b/rdf/content/public/nsIDOMXULElement.h
@@ -42,7 +42,7 @@ class nsIDOMNodeList;
  { 0x574ed81, 0xc088, 0x11d2, \
   { 0x96, 0xed, 0x0, 0x10, 0x4b, 0x7b, 0x7d, 0xeb } } 
 
-class nsIDOMXULElement : public nsIDOMElement {
+class NS_NO_VTABLE nsIDOMXULElement : public nsIDOMElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMXULELEMENT_IID; return iid; }
 
diff --git a/rdf/content/public/nsIDOMXULTreeElement.h b/rdf/content/public/nsIDOMXULTreeElement.h
index c18bf6b77bc..4ffd637f2a0 100644
--- a/rdf/content/public/nsIDOMXULTreeElement.h
+++ b/rdf/content/public/nsIDOMXULTreeElement.h
@@ -36,7 +36,7 @@ class nsIDOMNodeList;
  { 0xa6cf90ec, 0x15b3, 0x11d2, \
     {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} } 
 
-class nsIDOMXULTreeElement : public nsIDOMXULElement {
+class NS_NO_VTABLE nsIDOMXULTreeElement : public nsIDOMXULElement {
 public:
   static const nsIID& GetIID() { static nsIID iid = NS_IDOMXULTREEELEMENT_IID; return iid; }