Generate BEGIN_INTERFACE,END_INTERFACE macros instead of
ICOM_MSVTABLE_COMPAT_FIELDS.

diff --git a/include/pstore.h b/include/pstore.h
index 6ed38d5..79242cc 100644
--- a/include/pstore.h
+++ b/include/pstore.h
@@ -101,7 +101,7 @@
     const IEnumPStoreItemsVtbl* lpVtbl;
 };
 struct IEnumPStoreItemsVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
+    BEGIN_INTERFACE
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
@@ -133,6 +133,7 @@
         IEnumPStoreItems* This,
         DWORD celt);
 
+    END_INTERFACE
 };
 
 #ifdef COBJMACROS
@@ -232,7 +233,7 @@
     const IEnumPStoreTypesVtbl* lpVtbl;
 };
 struct IEnumPStoreTypesVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
+    BEGIN_INTERFACE
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
@@ -264,6 +265,7 @@
         IEnumPStoreTypes* This,
         DWORD celt);
 
+    END_INTERFACE
 };
 
 #ifdef COBJMACROS
@@ -481,7 +483,7 @@
     const IPStoreVtbl* lpVtbl;
 };
 struct IPStoreVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
+    BEGIN_INTERFACE
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
@@ -647,6 +649,7 @@
         DWORD dwFlags,
         IEnumPStoreItems** ppenum);
 
+    END_INTERFACE
 };
 
 #ifdef COBJMACROS