Get rid of the ICOM_MSVTABLE_COMPAT support, g++ no longer requires

this.

Get rid of the ICOM_MSVTABLE_COMPAT support, g++ no longer requires
20486e1c · Alexandre Julliard · 342adc93 · 20486e1c · 20486e1c · 20486e1c
Commit 20486e1c authored Aug 23, 2004 by Alexandre Julliard
28 changed files
--- a/dlls/ole32/dcom.h
+++ b/dlls/ole32/dcom.h
@@ -277,7 +277,6 @@ struct IRemUnknownVtbl {
 #endif
 #define IRemUnknown_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -414,7 +413,6 @@ struct IRemUnknown2Vtbl {
 #endif
 #define IRemUnknown2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/activscp.h
+++ b/include/activscp.h
@@ -149,7 +149,6 @@ struct IActiveScriptErrorVtbl {
 #endif
 #define IActiveScriptError_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -309,7 +308,6 @@ struct IActiveScriptSiteVtbl {
 #endif
 #define IActiveScriptSite_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -461,7 +459,6 @@ struct IActiveScriptSiteWindowVtbl {
 #endif
 #define IActiveScriptSiteWindow_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -547,7 +544,6 @@ struct IActiveScriptSiteInterruptPollVtbl {
 #endif
 #define IActiveScriptSiteInterruptPoll_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -739,7 +735,6 @@ struct IActiveScriptVtbl {
 #endif
 #define IActiveScript_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -986,7 +981,6 @@ struct IActiveScriptParseVtbl {
 #endif
 #define IActiveScriptParse_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1116,7 +1110,6 @@ struct IActiveScriptParseProcedureOldVtbl {
 #endif
 #define IActiveScriptParseProcedureOld_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1220,7 +1213,6 @@ struct IActiveScriptParseProcedureVtbl {
 #endif
 #define IActiveScriptParseProcedure_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1309,7 +1301,6 @@ struct IBindEventHandlerVtbl {
 #endif
 #define IBindEventHandler_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1411,7 +1402,6 @@ struct IActiveScriptStatsVtbl {
 #endif
 #define IActiveScriptStats_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/amstream.h
+++ b/include/amstream.h
@@ -244,7 +244,6 @@ struct IAMMultiMediaStreamVtbl {
 #endif
 #define IAMMultiMediaStream_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -464,7 +463,6 @@ struct IAMMediaStreamVtbl {
 #endif
 #define IAMMediaStream_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -717,7 +715,6 @@ struct IMediaStreamFilterVtbl {
 #endif
 #define IMediaStreamFilter_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -883,7 +880,6 @@ struct IDirectDrawMediaSampleAllocatorVtbl {
 #endif
 #define IDirectDrawMediaSampleAllocator_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -970,7 +966,6 @@ struct IDirectDrawMediaSampleVtbl {
 #endif
 #define IDirectDrawMediaSample_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1133,7 +1128,6 @@ struct IAMMediaTypeStreamVtbl {
 #endif
 #define IAMMediaTypeStream_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1422,7 +1416,6 @@ struct IAMMediaTypeSampleVtbl {
 #endif
 #define IAMMediaTypeSample_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/amvideo.h
+++ b/include/amvideo.h
@@ -226,7 +226,6 @@ struct IDirectDrawVideoVtbl {
 #endif
 #define IDirectDrawVideo_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -478,7 +477,6 @@ struct IQualPropVtbl {
 #endif
 #define IQualProp_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -734,7 +732,6 @@ struct IFullScreenVideoVtbl {
 #endif
 #define IFullScreenVideo_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1074,7 +1071,6 @@ struct IFullScreenVideoExVtbl {
 #endif
 #define IFullScreenVideoEx_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1246,7 +1242,6 @@ struct IBaseVideoMixerVtbl {
 #endif
 #define IBaseVideoMixer_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/austream.h
+++ b/include/austream.h
@@ -144,7 +144,6 @@ struct IAudioMediaStreamVtbl {
 #endif
 #define IAudioMediaStream_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -278,7 +277,6 @@ struct IAudioStreamSampleVtbl {
 #endif
 #define IAudioStreamSample_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -381,7 +379,6 @@ struct IMemoryDataVtbl {
 #endif
 #define IMemoryData_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -505,7 +502,6 @@ struct IAudioDataVtbl {
 #endif
 #define IAudioData_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/comcat.h
+++ b/include/comcat.h
@@ -108,7 +108,6 @@ struct IEnumGUIDVtbl {
 #endif
 #define IEnumGUID_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -249,7 +248,6 @@ struct IEnumCATEGORYINFOVtbl {
 #endif
 #define IEnumCATEGORYINFO_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -423,7 +421,6 @@ struct ICatInformationVtbl {
 #endif
 #define ICatInformation_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -649,7 +646,6 @@ struct ICatRegisterVtbl {
 #endif
 #define ICatRegister_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/ddstream.h
+++ b/include/ddstream.h
@@ -190,7 +190,6 @@ struct IDirectDrawMediaStreamVtbl {
 #endif
 #define IDirectDrawMediaStream_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -366,7 +365,6 @@ struct IDirectDrawStreamSampleVtbl {
 #endif
 #define IDirectDrawStreamSample_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/dispex.h
+++ b/include/dispex.h
@@ -224,7 +224,6 @@ struct IDispatchExVtbl {
 #endif
 #define IDispatchEx_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -452,7 +451,6 @@ struct IDispErrorVtbl {
 #endif
 #define IDispError_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -583,7 +581,6 @@ struct IVariantChangeTypeVtbl {
 #endif
 #define IVariantChangeType_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -664,7 +661,6 @@ struct IObjectIdentityVtbl {
 #endif
 #define IObjectIdentity_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/docobj.h
+++ b/include/docobj.h
@@ -114,7 +114,6 @@ struct IOleDocumentVtbl {
 #endif
 #define IOleDocument_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -216,7 +215,6 @@ struct IOleDocumentSiteVtbl {
 #endif
 #define IOleDocumentSite_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -394,7 +392,6 @@ struct IOleDocumentViewVtbl {
 #endif
 #define IOleDocumentView_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -607,7 +604,6 @@ struct IEnumOleDocumentViewsVtbl {
 #endif
 #define IEnumOleDocumentViews_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -836,7 +832,6 @@ struct IOleCommandTargetVtbl {
 #endif
 #define IOleCommandTarget_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -943,7 +938,6 @@ struct IContinueCallbackVtbl {
 #endif
 #define IContinueCallback_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1088,7 +1082,6 @@ struct IPrintVtbl {
 #endif
 #define IPrint_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/exdisp.h
+++ b/include/exdisp.h
@@ -314,7 +314,6 @@ struct IWebBrowserVtbl {
 #endif
 #define IWebBrowser_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -928,7 +927,6 @@ struct IWebBrowserAppVtbl {
 #endif
 #define IWebBrowserApp_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1357,7 +1355,6 @@ struct IShellWindowsVtbl {
 #endif
 #define IShellWindows_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/mlang.h
+++ b/include/mlang.h
@@ -115,7 +115,6 @@ struct IMLangCodePagesVtbl {
 #endif
 #define IMLangCodePages_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -290,7 +289,6 @@ struct IMLangFontLinkVtbl {
 #endif
 #define IMLangFontLink_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -506,7 +504,6 @@ struct IEnumScriptVtbl {
 #endif
 #define IEnumScript_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -677,7 +674,6 @@ struct IEnumCodePageVtbl {
 #endif
 #define IEnumCodePage_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -852,7 +848,6 @@ struct IMLangConvertCharsetVtbl {
 #endif
 #define IMLangConvertCharset_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1027,7 +1022,6 @@ struct IEnumRfc1766Vtbl {
 #endif
 #define IEnumRfc1766_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1297,7 +1291,6 @@ struct IMultiLanguageVtbl {
 #endif
 #define IMultiLanguage_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1876,7 +1869,6 @@ struct IMultiLanguage2Vtbl {
 #endif
 #define IMultiLanguage2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/mmstream.h
+++ b/include/mmstream.h
@@ -202,7 +202,6 @@ struct IMultiMediaStreamVtbl {
 #endif
 #define IMultiMediaStream_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -400,7 +399,6 @@ struct IMediaStreamVtbl {
 #endif
 #define IMediaStream_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -569,7 +567,6 @@ struct IStreamSampleVtbl {
 #endif
 #define IStreamSample_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/oaidl.h
+++ b/include/oaidl.h
@@ -704,7 +704,6 @@ struct IDispatchVtbl {
 #endif
 #define IDispatch_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -877,7 +876,6 @@ struct IEnumVARIANTVtbl {
 #endif
 #define IEnumVARIANT_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1034,7 +1032,6 @@ struct ITypeCompVtbl {
 #endif
 #define ITypeComp_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1362,7 +1359,6 @@ struct ITypeInfoVtbl {
 #endif
 #define ITypeInfo_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2029,7 +2025,6 @@ struct ITypeInfo2Vtbl {
 #endif
 #define ITypeInfo2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2407,7 +2402,6 @@ struct ITypeLibVtbl {
 #endif
 #define ITypeLib_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2742,7 +2736,6 @@ struct ITypeLib2Vtbl {
 #endif
 #define ITypeLib2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2919,7 +2912,6 @@ struct ITypeChangeEventsVtbl {
 #endif
 #define ITypeChangeEvents_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3045,7 +3037,6 @@ struct IErrorInfoVtbl {
 #endif
 #define IErrorInfo_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3193,7 +3184,6 @@ struct ICreateErrorInfoVtbl {
 #endif
 #define ICreateErrorInfo_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3309,7 +3299,6 @@ struct ISupportErrorInfoVtbl {
 #endif
 #define ISupportErrorInfo_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3391,7 +3380,6 @@ struct ITypeFactoryVtbl {
 #endif
 #define ITypeFactory_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3519,7 +3507,6 @@ struct ITypeMarshalVtbl {
 #endif
 #define ITypeMarshal_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3780,7 +3767,6 @@ struct IRecordInfoVtbl {
 #endif
 #define IRecordInfo_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4215,7 +4201,6 @@ struct ICreateTypeInfoVtbl {
 #endif
 #define ICreateTypeInfo_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4777,7 +4762,6 @@ struct ICreateTypeInfo2Vtbl {
 #endif
 #define ICreateTypeInfo2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5096,7 +5080,6 @@ struct ICreateTypeLibVtbl {
 #endif
 #define ICreateTypeLib_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5339,7 +5322,6 @@ struct ICreateTypeLib2Vtbl {
 #endif
 #define ICreateTypeLib2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5460,7 +5442,6 @@ struct IErrorLogVtbl {
 #endif
 #define IErrorLog_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5555,7 +5536,6 @@ struct IPropertyBagVtbl {
 #endif
 #define IPropertyBag_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/objbase.h
+++ b/include/objbase.h
@@ -23,29 +23,6 @@
 #define _OBJBASE_H_
 /*****************************************************************************
- * define ICOM_MSVTABLE_COMPAT
- * to implement the microsoft com vtable compatibility workaround for g++.
- *
- * NOTE: Turning this option on will produce a winelib that is incompatible
- * with the binary emulator.
- *
- * If the compiler supports the com_interface attribute, leave this off, and
- * define the ICOM_USE_COM_INTERFACE_ATTRIBUTE macro below. This may also
- * require the addition of the -vtable-thunks option for g++.
- *
- * If you aren't interested in Winelib C++ compatibility at all, leave both
- * options off.
- *
- * The preferable method for using ICOM_USE_COM_INTERFACE_ATTRIBUTE macro
- * would be to define it only for your Winelib application. This allows you
- * to have both binary and Winelib compatibility for C and C++ at the same
- * time :)
- */
-/* #define ICOM_MSVTABLE_COMPAT 1 */
-/* #define ICOM_USE_COM_INTERFACE_ATTRIBUTE 1 */
-/*****************************************************************************
 * Macros to define a COM interface
 */
 /*
@@ -213,7 +190,6 @@
 *    // ...
 *
 *    static IDirect3DVtbl d3dvt = {
- *        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
 *        IDirect3D_QueryInterface,
 *        IDirect3D_Add,
 *        IDirect3D_Add2,
@@ -246,11 +222,7 @@
 #define THIS   void
 #define interface struct
-#ifdef ICOM_USE_COM_INTERFACE_ATTRIBUTE
-#define DECLARE_INTERFACE(iface)        interface __attribute__((com_interface)) iface
-#else
 #define DECLARE_INTERFACE(iface)        interface iface
-#endif
 #define DECLARE_INTERFACE_(iface,ibase) interface iface : public ibase
 #define BEGIN_INTERFACE
@@ -290,11 +262,7 @@
 #endif
 #define DECLARE_INTERFACE_(iface,ibase) DECLARE_INTERFACE(iface)
-#ifdef ICOM_MSVTABLE_COMPAT
+#define BEGIN_INTERFACE
-# define BEGIN_INTERFACE long dummyRTTI1, dummyRTTI2;
-#else
-# define BEGIN_INTERFACE
-#endif
 #define END_INTERFACE
 #endif  /* __cplusplus && !CINTERFACE */
@@ -302,6 +270,7 @@
 /* Wine-specific macros */
 #define ICOM_THIS(impl,iface)    impl* const This=(impl*)(iface)
+#define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE  /* no longer used */
 #include <objidl.h>

--- a/include/objidl.h
+++ b/include/objidl.h
@@ -173,7 +173,6 @@ struct IMarshalVtbl {
 #endif
 #define IMarshal_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -319,7 +318,6 @@ struct IStdMarshalInfoVtbl {
 #endif
 #define IStdMarshalInfo_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -421,7 +419,6 @@ struct IExternalConnectionVtbl {
 #endif
 #define IExternalConnection_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -521,7 +518,6 @@ struct IMultiQIVtbl {
 #endif
 #define IMultiQI_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -643,7 +639,6 @@ struct IMallocVtbl {
 #endif
 #define IMalloc_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -874,7 +869,6 @@ struct IMallocSpyVtbl {
 #endif
 #define IMallocSpy_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1088,7 +1082,6 @@ struct IEnumUnknownVtbl {
 #endif
 #define IEnumUnknown_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1213,7 +1206,6 @@ struct ISurrogateVtbl {
 #endif
 #define ISurrogate_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1325,7 +1317,6 @@ struct IGlobalInterfaceTableVtbl {
 #endif
 #define IGlobalInterfaceTable_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1527,7 +1518,6 @@ struct IBindCtxVtbl {
 #endif
 #define IBindCtx_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1728,7 +1718,6 @@ struct IEnumMonikerVtbl {
 #endif
 #define IEnumMoniker_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1879,7 +1868,6 @@ struct IRunnableObjectVtbl {
 #endif
 #define IRunnableObject_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2057,7 +2045,6 @@ struct IRunningObjectTableVtbl {
 #endif
 #define IRunningObjectTable_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2197,7 +2184,6 @@ struct IPersistVtbl {
 #endif
 #define IPersist_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2309,7 +2295,6 @@ struct IPersistStreamVtbl {
 #endif
 #define IPersistStream_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2619,7 +2604,6 @@ struct IMonikerVtbl {
 #endif
 #define IMoniker_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2882,7 +2866,6 @@ struct IROTDataVtbl {
 #endif
 #define IROTData_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2986,7 +2969,6 @@ struct IEnumStringVtbl {
 #endif
 #define IEnumString_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3110,7 +3092,6 @@ struct IClassActivatorVtbl {
 #endif
 #define IClassActivator_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3208,7 +3189,6 @@ struct ISequentialStreamVtbl {
 #endif
 #define ISequentialStream_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3452,7 +3432,6 @@ struct IStreamVtbl {
 #endif
 #define IStream_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3665,7 +3644,6 @@ struct IEnumSTATSTGVtbl {
 #endif
 #define IEnumSTATSTG_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3972,7 +3950,6 @@ struct IStorageVtbl {
 #endif
 #define IStorage_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4281,7 +4258,6 @@ struct IPersistFileVtbl {
 #endif
 #define IPersistFile_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4447,7 +4423,6 @@ struct IPersistStorageVtbl {
 #endif
 #define IPersistStorage_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4573,7 +4548,6 @@ struct IRootStorageVtbl {
 #endif
 #define IRootStorage_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4722,7 +4696,6 @@ struct ILockBytesVtbl {
 #endif
 #define ILockBytes_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4922,7 +4895,6 @@ struct IFillLockBytesVtbl {
 #endif
 #define IFillLockBytes_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5060,7 +5032,6 @@ struct IProgressNotifyVtbl {
 #endif
 #define IProgressNotify_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5182,7 +5153,6 @@ struct ILayoutStorageVtbl {
 #endif
 #define ILayoutStorage_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5344,7 +5314,6 @@ struct IEnumFORMATETCVtbl {
 #endif
 #define IEnumFORMATETC_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5506,7 +5475,6 @@ struct IEnumSTATDATAVtbl {
 #endif
 #define IEnumSTATDATA_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5748,7 +5716,6 @@ struct IAdviseSinkVtbl {
 #endif
 #define IAdviseSink_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5929,7 +5896,6 @@ struct IAdviseSink2Vtbl {
 #endif
 #define IAdviseSink2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -6110,7 +6076,6 @@ struct IDataObjectVtbl {
 #endif
 #define IDataObject_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -6333,7 +6298,6 @@ struct IDataAdviseHolderVtbl {
 #endif
 #define IDataAdviseHolder_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -6507,7 +6471,6 @@ struct IMessageFilterVtbl {
 #endif
 #define IMessageFilter_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -6663,7 +6626,6 @@ struct IRpcChannelBufferVtbl {
 #endif
 #define IRpcChannelBuffer_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -6810,7 +6772,6 @@ struct IRpcChannelBuffer2Vtbl {
 #endif
 #define IRpcChannelBuffer2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -6998,7 +6959,6 @@ struct IRpcChannelBuffer3Vtbl {
 #endif
 #define IRpcChannelBuffer3_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -7156,7 +7116,6 @@ struct IRpcProxyBufferVtbl {
 #endif
 #define IRpcProxyBuffer_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -7292,7 +7251,6 @@ struct IRpcStubBufferVtbl {
 #endif
 #define IRpcStubBuffer_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -7443,7 +7401,6 @@ struct IPSFactoryBufferVtbl {
 #endif
 #define IPSFactoryBuffer_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -7628,7 +7585,6 @@ struct IChannelHookVtbl {
 #endif
 #define IChannelHook_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -8104,7 +8060,6 @@ struct IPropertyStorageVtbl {
 #endif
 #define IPropertyStorage_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -8331,7 +8286,6 @@ struct IPropertySetStorageVtbl {
 #endif
 #define IPropertySetStorage_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -8466,7 +8420,6 @@ struct IEnumSTATPROPSTGVtbl {
 #endif
 #define IEnumSTATPROPSTG_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -8606,7 +8559,6 @@ struct IEnumSTATPROPSETSTGVtbl {
 #endif
 #define IEnumSTATPROPSETSTG_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -8786,7 +8738,6 @@ struct IClientSecurityVtbl {
 #endif
 #define IClientSecurity_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -8930,7 +8881,6 @@ struct IServerSecurityVtbl {
 #endif
 #define IServerSecurity_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -9046,7 +8996,6 @@ struct IAsyncSetupVtbl {
 #endif
 #define IAsyncSetup_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -9147,7 +9096,6 @@ struct IAsyncManagerVtbl {
 #endif
 #define IAsyncManager_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/ocidl.h
+++ b/include/ocidl.h
@@ -278,7 +278,6 @@ struct IFontVtbl {
 #endif
 #define IFont_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -591,7 +590,6 @@ struct IFontDispVtbl {
 #endif
 #define IFontDisp_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -810,7 +808,6 @@ struct IPictureVtbl {
 #endif
 #define IPicture_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1044,7 +1041,6 @@ struct IPictureDispVtbl {
 #endif
 #define IPictureDisp_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1155,7 +1151,6 @@ struct IOleControlVtbl {
 #endif
 #define IOleControl_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1327,7 +1322,6 @@ struct IOleControlSiteVtbl {
 #endif
 #define IOleControlSite_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1545,7 +1539,6 @@ struct IOleInPlaceSiteExVtbl {
 #endif
 #define IOleInPlaceSiteEx_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1847,7 +1840,6 @@ struct IOleInPlaceSiteWindowlessVtbl {
 #endif
 #define IOleInPlaceSiteWindowless_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2097,7 +2089,6 @@ struct IOleInPlaceObjectWindowlessVtbl {
 #endif
 #define IOleInPlaceObjectWindowless_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2243,7 +2234,6 @@ struct IClassFactory2Vtbl {
 #endif
 #define IClassFactory2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2518,7 +2508,6 @@ struct IViewObjectExVtbl {
 #endif
 #define IViewObjectEx_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2660,7 +2649,6 @@ struct IProvideClassInfoVtbl {
 #endif
 #define IProvideClassInfo_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2753,7 +2741,6 @@ struct IProvideClassInfo2Vtbl {
 #endif
 #define IProvideClassInfo2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2880,7 +2867,6 @@ struct IConnectionPointVtbl {
 #endif
 #define IConnectionPoint_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3007,7 +2993,6 @@ struct IConnectionPointContainerVtbl {
 #endif
 #define IConnectionPointContainer_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3124,7 +3109,6 @@ struct IEnumConnectionsVtbl {
 #endif
 #define IEnumConnections_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3264,7 +3248,6 @@ struct IEnumConnectionPointsVtbl {
 #endif
 #define IEnumConnectionPoints_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3479,7 +3462,6 @@ struct IPropertyPageVtbl {
 #endif
 #define IPropertyPage_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3706,7 +3688,6 @@ struct IPropertyPage2Vtbl {
 #endif
 #define IPropertyPage2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3823,7 +3804,6 @@ struct IPropertyPageSiteVtbl {
 #endif
 #define IPropertyPageSite_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3938,7 +3918,6 @@ struct IPropertyNotifySinkVtbl {
 #endif
 #define IPropertyNotifySink_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4055,7 +4034,6 @@ struct ISimpleFrameSiteVtbl {
 #endif
 #define ISimpleFrameSite_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4193,7 +4171,6 @@ struct IPersistStreamInitVtbl {
 #endif
 #define IPersistStreamInit_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4353,7 +4330,6 @@ struct IPersistMemoryVtbl {
 #endif
 #define IPersistMemory_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4518,7 +4494,6 @@ struct IPersistPropertyBagVtbl {
 #endif
 #define IPersistPropertyBag_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4695,7 +4670,6 @@ struct IPropertyBag2Vtbl {
 #endif
 #define IPropertyBag2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4858,7 +4832,6 @@ struct IPersistPropertyBag2Vtbl {
 #endif
 #define IPersistPropertyBag2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4973,7 +4946,6 @@ struct ISpecifyPropertyPagesVtbl {
 #endif
 #define ISpecifyPropertyPages_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5099,7 +5071,6 @@ struct IPerPropertyBrowsingVtbl {
 #endif
 #define IPerPropertyBrowsing_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5239,7 +5210,6 @@ struct IAdviseSinkExVtbl {
 #endif
 #define IAdviseSinkEx_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5361,7 +5331,6 @@ struct IPointerInactiveVtbl {
 #endif
 #define IPointerInactive_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5476,7 +5445,6 @@ struct IObjectWithSiteVtbl {
 #endif
 #define IObjectWithSite_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5596,7 +5564,6 @@ struct IOleUndoUnitVtbl {
 #endif
 #define IOleUndoUnit_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5759,7 +5726,6 @@ struct IOleParentUndoUnitVtbl {
 #endif
 #define IOleParentUndoUnit_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5908,7 +5874,6 @@ struct IEnumOleUndoUnitsVtbl {
 #endif
 #define IEnumOleUndoUnits_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -6111,7 +6076,6 @@ struct IOleUndoManagerVtbl {
 #endif
 #define IOleUndoManager_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -6350,7 +6314,6 @@ struct IQuickActivateVtbl {
 #endif
 #define IQuickActivate_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/oleidl.h
+++ b/include/oleidl.h
@@ -95,7 +95,6 @@ struct IOleWindowVtbl {
 #endif
 #define IOleWindow_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -219,7 +218,6 @@ struct IOleInPlaceObjectVtbl {
 #endif
 #define IOleInPlaceObject_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -383,7 +381,6 @@ struct IOleInPlaceActiveObjectVtbl {
 #endif
 #define IOleInPlaceActiveObject_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -559,7 +556,6 @@ struct IOleInPlaceUIWindowVtbl {
 #endif
 #define IOleInPlaceUIWindow_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -767,7 +763,6 @@ struct IOleInPlaceFrameVtbl {
 #endif
 #define IOleInPlaceFrame_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -990,7 +985,6 @@ struct IOleInPlaceSiteVtbl {
 #endif
 #define IOleInPlaceSite_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1158,7 +1152,6 @@ struct IParseDisplayNameVtbl {
 #endif
 #define IParseDisplayName_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1261,7 +1254,6 @@ struct IOleContainerVtbl {
 #endif
 #define IOleContainer_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1423,7 +1415,6 @@ struct IOleItemContainerVtbl {
 #endif
 #define IOleItemContainer_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1624,7 +1615,6 @@ struct IOleLinkVtbl {
 #endif
 #define IOleLink_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1835,7 +1825,6 @@ struct IOleClientSiteVtbl {
 #endif
 #define IOleClientSite_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1999,7 +1988,6 @@ struct IOleCacheVtbl {
 #endif
 #define IOleCache_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2185,7 +2173,6 @@ struct IOleCache2Vtbl {
 #endif
 #define IOleCache2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2299,7 +2286,6 @@ struct IOleCacheControlVtbl {
 #endif
 #define IOleCacheControl_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2426,7 +2412,6 @@ struct IEnumOLEVERBVtbl {
 #endif
 #define IEnumOLEVERB_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2786,7 +2771,6 @@ struct IOleObjectVtbl {
 #endif
 #define IOleObject_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3101,7 +3085,6 @@ struct IOleAdviseHolderVtbl {
 #endif
 #define IOleAdviseHolder_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3222,7 +3205,6 @@ struct IContinueVtbl {
 #endif
 #define IContinue_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3383,7 +3365,6 @@ struct IViewObjectVtbl {
 #endif
 #define IViewObject_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3648,7 +3629,6 @@ struct IViewObject2Vtbl {
 #endif
 #define IViewObject2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3748,7 +3728,6 @@ struct IDropSourceVtbl {
 #endif
 #define IDropSource_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3899,7 +3878,6 @@ struct IDropTargetVtbl {
 #endif
 #define IDropTarget_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/pstore.h
+++ b/include/pstore.h
@@ -151,7 +151,6 @@ struct IEnumPStoreItemsVtbl {
 #endif
 #define IEnumPStoreItems_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -283,7 +282,6 @@ struct IEnumPStoreTypesVtbl {
 #endif
 #define IEnumPStoreTypes_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -682,7 +680,6 @@ struct IPStoreVtbl {
 #endif
 #define IPStore_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/rpcproxy.h
+++ b/include/rpcproxy.h
@@ -139,7 +139,6 @@ void WINAPI
  CStdStubBuffer_DebugServerRelease( IRpcStubBuffer *This, void *pv );
 #define CStdStubBuffer_METHODS \
-  ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE \
  CStdStubBuffer_QueryInterface, \
  CStdStubBuffer_AddRef, \
  CStdStubBuffer_Release, \

--- a/include/servprov.h
+++ b/include/servprov.h
@@ -73,7 +73,6 @@ struct IServiceProviderVtbl {
 #endif
 #define IServiceProvider_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/shldisp.h
+++ b/include/shldisp.h
@@ -88,7 +88,6 @@ struct IAutoCompleteVtbl {
 #endif
 #define IAutoComplete_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -214,7 +213,6 @@ struct IAutoComplete2Vtbl {
 #endif
 #define IAutoComplete2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -339,7 +337,6 @@ struct IFolderViewOCVtbl {
 #endif
 #define IFolderViewOC_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -1090,7 +1090,6 @@ struct IFileSystemBindData {
    const IFileSystemBindDataVtbl* lpVtbl;
 };
 struct IFileSystemBindDataVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
    /*** IUnknown methods ***/
    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
@@ -1126,7 +1125,6 @@ struct IFileSystemBindDataVtbl {
 #endif
 #define IFileSystemBindData_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/shobjidl.h
+++ b/include/shobjidl.h
@@ -81,7 +81,6 @@ struct IPersistFolderVtbl {
 #endif
 #define IPersistFolder_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -177,7 +176,6 @@ struct IPersistFolder2Vtbl {
 #endif
 #define IPersistFolder2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -288,7 +286,6 @@ struct IEnumIDListVtbl {
 #endif
 #define IEnumIDList_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -578,7 +575,6 @@ struct IShellFolderVtbl {
 #endif
 #define IShellFolder_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -802,7 +798,6 @@ struct IEnumExtraSearchVtbl {
 #endif
 #define IEnumExtraSearch_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1076,7 +1071,6 @@ struct IShellFolder2Vtbl {
 #endif
 #define IShellFolder2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1420,7 +1414,6 @@ struct IShellViewVtbl {
 #endif
 #define IShellView_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1751,7 +1744,6 @@ struct IShellBrowserVtbl {
 #endif
 #define IShellBrowser_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2107,7 +2099,6 @@ struct IShellLinkAVtbl {
 #endif
 #define IShellLinkA_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2507,7 +2498,6 @@ struct IShellLinkWVtbl {
 #endif
 #define IShellLinkW_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2756,7 +2746,6 @@ struct IShellExtInitVtbl {
 #endif
 #define IShellExtInit_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2877,7 +2866,6 @@ struct IPersistFolder3Vtbl {
 #endif
 #define IPersistFolder3_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3008,7 +2996,6 @@ struct IExtractIconAVtbl {
 #endif
 #define IExtractIconA_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3129,7 +3116,6 @@ struct IExtractIconWVtbl {
 #endif
 #define IExtractIconW_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3253,7 +3239,6 @@ struct ICommDlgBrowserVtbl {
 #endif
 #define ICommDlgBrowser_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3392,7 +3377,6 @@ struct IDockingWindowFrameVtbl {
 #endif
 #define IDockingWindowFrame_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3517,7 +3501,6 @@ struct IDragSourceHelperVtbl {
 #endif
 #define IDragSourceHelper_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3650,7 +3633,6 @@ struct IDropTargetHelperVtbl {
 #endif
 #define IDropTargetHelper_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3886,7 +3868,6 @@ struct IContextMenuVtbl {
 #endif
 #define IContextMenu_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4021,7 +4002,6 @@ struct IContextMenu2Vtbl {
 #endif
 #define IContextMenu2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4147,7 +4127,6 @@ struct IContextMenu3Vtbl {
 #endif
 #define IContextMenu3_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4235,7 +4214,6 @@ struct IShellExecuteHookAVtbl {
 #endif
 #define IShellExecuteHookA_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4314,7 +4292,6 @@ struct IShellExecuteHookWVtbl {
 #endif
 #define IShellExecuteHookW_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/strmif.h
+++ b/include/strmif.h
@@ -76,7 +76,6 @@ struct ICreateDevEnumVtbl {
 #endif
 #define ICreateDevEnum_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -381,7 +380,6 @@ struct IPinVtbl {
 #endif
 #define IPin_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -610,7 +608,6 @@ struct IEnumPinsVtbl {
 #endif
 #define IEnumPins_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -740,7 +737,6 @@ struct IEnumMediaTypesVtbl {
 #endif
 #define IEnumMediaTypes_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -906,7 +902,6 @@ struct IFilterGraphVtbl {
 #endif
 #define IFilterGraph_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1074,7 +1069,6 @@ struct IEnumFiltersVtbl {
 #endif
 #define IEnumFilters_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1230,7 +1224,6 @@ struct IMediaFilterVtbl {
 #endif
 #define IMediaFilter_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1430,7 +1423,6 @@ struct IBaseFilterVtbl {
 #endif
 #define IBaseFilter_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1588,7 +1580,6 @@ struct IReferenceClockVtbl {
 #endif
 #define IReferenceClock_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1819,7 +1810,6 @@ struct IMediaSampleVtbl {
 #endif
 #define IMediaSample_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2153,7 +2143,6 @@ struct IMediaSample2Vtbl {
 #endif
 #define IMediaSample2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2305,7 +2294,6 @@ struct IMemAllocatorVtbl {
 #endif
 #define IMemAllocator_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2469,7 +2457,6 @@ struct IMemAllocatorCallbackTempVtbl {
 #endif
 #define IMemAllocatorCallbackTemp_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2557,7 +2544,6 @@ struct IMemAllocatorNotifyCallbackTempVtbl {
 #endif
 #define IMemAllocatorNotifyCallbackTemp_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2674,7 +2660,6 @@ struct IMemInputPinVtbl {
 #endif
 #define IMemInputPin_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -2802,7 +2787,6 @@ struct IAMovieSetupVtbl {
 #endif
 #define IAMovieSetup_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3057,7 +3041,6 @@ struct IMediaSeekingVtbl {
 #endif
 #define IMediaSeeking_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3580,7 +3563,6 @@ struct IEnumRegFiltersVtbl {
 #endif
 #define IEnumRegFilters_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -3794,7 +3776,6 @@ struct IFilterMapperVtbl {
 #endif
 #define IFilterMapper_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4078,7 +4059,6 @@ struct IFilterMapper2Vtbl {
 #endif
 #define IFilterMapper2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4251,7 +4231,6 @@ struct IFilterMapper3Vtbl {
 #endif
 #define IFilterMapper3_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4353,7 +4332,6 @@ struct IQualityControlVtbl {
 #endif
 #define IQualityControl_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4509,7 +4487,6 @@ struct IOverlayNotifyVtbl {
 #endif
 #define IOverlayNotify_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4645,7 +4622,6 @@ struct IOverlayNotify2Vtbl {
 #endif
 #define IOverlayNotify2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4808,7 +4784,6 @@ struct IOverlayVtbl {
 #endif
 #define IOverlay_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -4973,7 +4948,6 @@ struct IMediaEventSinkVtbl {
 #endif
 #define IMediaEventSink_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5062,7 +5036,6 @@ struct IFileSourceFilterVtbl {
 #endif
 #define IFileSourceFilter_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5160,7 +5133,6 @@ struct IFileSinkFilterVtbl {
 #endif
 #define IFileSinkFilter_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5268,7 +5240,6 @@ struct IFileSinkFilter2Vtbl {
 #endif
 #define IFileSinkFilter2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5458,7 +5429,6 @@ struct IGraphBuilderVtbl {
 #endif
 #define IGraphBuilder_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5688,7 +5658,6 @@ struct ICaptureGraphBuilderVtbl {
 #endif
 #define ICaptureGraphBuilder_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -5854,7 +5823,6 @@ struct IAMCopyCaptureFileProgressVtbl {
 #endif
 #define IAMCopyCaptureFileProgress_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -6045,7 +6013,6 @@ struct ICaptureGraphBuilder2Vtbl {
 #endif
 #define ICaptureGraphBuilder2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -6352,7 +6319,6 @@ struct IFilterGraph2Vtbl {
 #endif
 #define IFilterGraph2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -6483,7 +6449,6 @@ struct IStreamBuilderVtbl {
 #endif
 #define IStreamBuilder_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -6642,7 +6607,6 @@ struct IAsyncReaderVtbl {
 #endif
 #define IAsyncReader_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -6789,7 +6753,6 @@ struct IGraphVersionVtbl {
 #endif
 #define IGraphVersion_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -6875,7 +6838,6 @@ struct IResourceConsumerVtbl {
 #endif
 #define IResourceConsumer_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -7042,7 +7004,6 @@ struct IResourceManagerVtbl {
 #endif
 #define IResourceManager_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -7236,7 +7197,6 @@ struct IKsPropertySetVtbl {
 #endif
 #define IKsPropertySet_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -7383,7 +7343,6 @@ struct IPinConnectionVtbl {
 #endif
 #define IPinConnection_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -7483,7 +7442,6 @@ struct IPinFlowControlVtbl {
 #endif
 #define IPinFlowControl_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -7673,7 +7631,6 @@ struct IGraphConfigVtbl {
 #endif
 #define IGraphConfig_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -7842,7 +7799,6 @@ struct IGraphConfigCallbackVtbl {
 #endif
 #define IGraphConfigCallback_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -7953,7 +7909,6 @@ struct IFilterChainVtbl {
 #endif
 #define IFilterChain_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/unknwn.h
+++ b/include/unknwn.h
@@ -8,13 +8,6 @@
 extern "C" {
 #endif
 #include <wtypes.h>
-#if defined(ICOM_MSVTABLE_COMPAT) && (!defined(__cplusplus) || defined(CINTERFACE))
-# define ICOM_MSVTABLE_COMPAT_FIELDS long dummyRTTI1,dummyRTTI2;
-# define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE 0,0,
-#else
-# define ICOM_MSVTABLE_COMPAT_FIELDS
-# define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
-#endif
 #ifndef __IUnknown_FWD_DEFINED__
 #define __IUnknown_FWD_DEFINED__
 typedef struct IUnknown IUnknown;
@@ -30,11 +23,7 @@ typedef IUnknown *LPUNKNOWN;
 DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
 #if defined(__cplusplus) && !defined(CINTERFACE)
-#ifdef ICOM_USE_COM_INTERFACE_ATTRIBUTE
-struct __attribute__((com_interface)) IUnknown
-#else
 struct IUnknown
-#endif
 {
    BEGIN_INTERFACE
@@ -83,7 +72,6 @@ struct IUnknownVtbl {
 #endif
 #define IUnknown_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -188,7 +176,6 @@ struct IClassFactoryVtbl {
 #endif
 #define IClassFactory_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/include/unknwn.idl
+++ b/include/unknwn.idl
@@ -18,17 +18,6 @@
 import "wtypes.idl";
-/* COM vtable compatibility macros for g++ */
-/* Included here because the generated header needs them */
-cpp_quote("#if defined(ICOM_MSVTABLE_COMPAT) && (!defined(__cplusplus) || defined(CINTERFACE))")
-cpp_quote("# define ICOM_MSVTABLE_COMPAT_FIELDS long dummyRTTI1,dummyRTTI2;")
-cpp_quote("# define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE 0,0,")
-cpp_quote("#else")
-cpp_quote("# define ICOM_MSVTABLE_COMPAT_FIELDS")
-cpp_quote("# define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE")
-cpp_quote("#endif")
 /* Interfaces */
 [

--- a/include/urlmon.h
+++ b/include/urlmon.h
@@ -114,7 +114,6 @@ struct IBindingVtbl {
 #endif
 #define IBinding_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -460,7 +459,6 @@ struct IBindStatusCallbackVtbl {
 #endif
 #define IBindStatusCallback_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -675,7 +673,6 @@ struct IBindHostVtbl {
 #endif
 #define IBindHost_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -816,7 +813,6 @@ struct IWinInetInfoVtbl {
 #endif
 #define IWinInetInfo_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -925,7 +921,6 @@ struct IWinInetHttpInfoVtbl {
 #endif
 #define IWinInetHttpInfo_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1076,7 +1071,6 @@ struct IPersistMonikerVtbl {
 #endif
 #define IPersistMoniker_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1314,7 +1308,6 @@ struct IInternetProtocolInfoVtbl {
 #endif
 #define IInternetProtocolInfo_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1520,7 +1513,6 @@ struct IInternetSessionVtbl {
 #endif
 #define IInternetSession_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
    /*** IUnknown methods ***/ \
    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \

--- a/tools/widl/header.c
+++ b/tools/widl/header.c
@@ -755,11 +755,7 @@ void write_com_interface(type_t *iface)
  }
  else
  {
-      fprintf(header, "#ifdef ICOM_USE_COM_INTERFACE_ATTRIBUTE\n");
-      fprintf(header, "struct __attribute__((com_interface)) %s\n", iface->name);
-      fprintf(header, "#else\n");
      fprintf(header, "struct %s\n", iface->name);
-      fprintf(header, "#endif\n");
      fprintf(header, "{\n");
      fprintf(header, "    BEGIN_INTERFACE\n");
      fprintf(header, "\n");
@@ -791,8 +787,7 @@ void write_com_interface(type_t *iface)
  fprintf(header, "#endif\n");
  fprintf(header, "\n");
  if (compat_icom) {
-      fprintf(header, "#define %s_METHODS \\\n", iface->name);
+      fprintf(header, "#define %s_METHODS", iface->name);
-      fprintf(header, "    ICOM_MSVTABLE_COMPAT_FIELDS");
      write_icom_method_def(iface);
      fprintf(header, "\n\n");
  }