diff --git a/dlls/ole32/ifs.h b/dlls/ole32/ifs.h
index 72a1b71924a..2a399407746 100644
--- a/dlls/ole32/ifs.h
+++ b/dlls/ole32/ifs.h
@@ -64,5 +64,65 @@ typedef struct ILockBytes16 *LPLOCKBYTES16, ILockBytes16;
 ICOM_DEFINE(ILockBytes16,IUnknown)
 #undef INTERFACE
 
+/**********************************************************************/
+
+typedef struct tagSTATSTG16
+{
+    LPOLESTR16 pwcsName;
+    DWORD type;
+    ULARGE_INTEGER cbSize;
+    FILETIME mtime;
+    FILETIME ctime;
+    FILETIME atime;
+    DWORD grfMode;
+    DWORD grfLocksSupported;
+    CLSID clsid;
+    DWORD grfStateBits;
+    DWORD reserved;
+} STATSTG16;
+
+typedef struct IStream16 IStream16, *LPSTREAM16;
+
+#define INTERFACE IStream16
+#define IStream16_METHODS \
+    ISequentialStream_METHODS \
+    STDMETHOD(Seek)(THIS_ LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition) PURE; \
+    STDMETHOD(SetSize)(THIS_ ULARGE_INTEGER libNewSize) PURE; \
+    STDMETHOD(CopyTo)(THIS_ IStream16* pstm, ULARGE_INTEGER cb, ULARGE_INTEGER* pcbRead, ULARGE_INTEGER* pcbWritten) PURE; \
+    STDMETHOD(Commit)(THIS_ DWORD grfCommitFlags) PURE; \
+    STDMETHOD(Revert)(THIS) PURE; \
+    STDMETHOD(LockRegion)(THIS_ ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) PURE; \
+    STDMETHOD(UnlockRegion)(THIS_ ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) PURE; \
+    STDMETHOD(Stat)(THIS_ STATSTG* pstatstg, DWORD grfStatFlag) PURE; \
+    STDMETHOD(Clone)(THIS_ IStream16** ppstm) PURE;
+ICOM_DEFINE(IStream16,ISequentialStream)
+#undef INTERFACE
+
+/**********************************************************************/
+
+typedef OLECHAR16 **SNB16;
+
+typedef struct IStorage16 IStorage16, *LPSTORAGE16;
+
+#define INTERFACE IStorage16
+#define IStorage16_METHODS \
+    IUnknown_METHODS \
+    STDMETHOD_(HRESULT,CreateStream)(THIS_ LPCOLESTR16 pwcsName, DWORD grfMode, DWORD reserved1, DWORD reserved2, IStream16** ppstm) PURE; \
+    STDMETHOD_(HRESULT,OpenStream)(THIS_ LPCOLESTR16 pwcsName, void* reserved1, DWORD grfMode, DWORD reserved2, IStream16** ppstm) PURE; \
+    STDMETHOD_(HRESULT,CreateStorage)(THIS_ LPCOLESTR16 pwcsName, DWORD grfMode, DWORD dwStgFmt, DWORD reserved2, IStorage16** ppstg) PURE; \
+    STDMETHOD_(HRESULT,OpenStorage)(THIS_ LPCOLESTR16 pwcsName, IStorage16* pstgPriority, DWORD grfMode, SNB16 snbExclude, DWORD reserved, IStorage16** ppstg) PURE; \
+    STDMETHOD_(HRESULT,CopyTo)(THIS_ DWORD ciidExclude, const IID* rgiidExclude, SNB16 snbExclude, IStorage16* pstgDest) PURE; \
+    STDMETHOD_(HRESULT,MoveElementTo)(THIS_ LPCOLESTR16 pwcsName, IStorage16* pstgDest, LPCOLESTR16 pwcsNewName, DWORD grfFlags) PURE; \
+    STDMETHOD_(HRESULT,Commit)(THIS_ DWORD grfCommitFlags) PURE; \
+    STDMETHOD_(HRESULT,Revert)(THIS) PURE; \
+    STDMETHOD_(HRESULT,EnumElements)(THIS_ DWORD reserved1, void* reserved2, DWORD reserved3, IEnumSTATSTG** ppenum) PURE; \
+    STDMETHOD_(HRESULT,DestroyElement)(THIS_ LPCOLESTR16 pwcsName) PURE; \
+    STDMETHOD_(HRESULT,RenameElement)(THIS_ LPCOLESTR16 pwcsOldName, LPCOLESTR16 pwcsNewName) PURE; \
+    STDMETHOD_(HRESULT,SetElementTimes)(THIS_ LPCOLESTR16 pwcsName, const FILETIME* pctime, const FILETIME* patime, const FILETIME* pmtime) PURE; \
+    STDMETHOD_(HRESULT,SetClass)(THIS_ REFCLSID clsid) PURE; \
+    STDMETHOD_(HRESULT,SetStateBits)(THIS_ DWORD grfStateBits, DWORD grfMask) PURE; \
+    STDMETHOD_(HRESULT,Stat)(THIS_ STATSTG* pstatstg, DWORD grfStatFlag) PURE;
+ICOM_DEFINE(IStorage16,IUnknown)
+#undef INTERFACE
 
 #endif /* __WINE_OLE_IFS_H */
diff --git a/include/objbase.h b/include/objbase.h
index 783952fe944..10848d32ff7 100644
--- a/include/objbase.h
+++ b/include/objbase.h
@@ -505,14 +505,9 @@ HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPRUNNINGOBJECTTABLE *ppr
 #define STGM_NOSCRATCH		0x00100000
 #define STGM_NOSNAPSHOT		0x00200000
 
-HRESULT WINAPI StgCreateDocFile16(LPCOLESTR16 pwcsName,DWORD grfMode,DWORD reserved,IStorage16 **ppstgOpen);
 HRESULT WINAPI StgCreateDocfile(LPCOLESTR pwcsName,DWORD grfMode,DWORD reserved,IStorage **ppstgOpen);
-
-HRESULT WINAPI StgIsStorageFile16(LPCOLESTR16 fn);
 HRESULT WINAPI StgIsStorageFile(LPCOLESTR fn);
 HRESULT WINAPI StgIsStorageILockBytes(ILockBytes *plkbyt);
-
-HRESULT WINAPI StgOpenStorage16(const OLECHAR16* pwcsName,IStorage16* pstgPriority,DWORD grfMode,SNB16 snbExclude,DWORD reserved,IStorage16**ppstgOpen);
 HRESULT WINAPI StgOpenStorage(const OLECHAR* pwcsName,IStorage* pstgPriority,DWORD grfMode,SNB snbExclude,DWORD reserved,IStorage**ppstgOpen);
 
 HRESULT WINAPI WriteClassStg(IStorage* pStg, REFCLSID rclsid);
diff --git a/include/objidl.h b/include/objidl.h
index 8eb440cc449..4495ddb2117 100644
--- a/include/objidl.h
+++ b/include/objidl.h
@@ -13,11 +13,6 @@ extern "C" {
 typedef struct IStream IStream;
 #endif
 
-#ifndef __IStream16_FWD_DEFINED__
-#define __IStream16_FWD_DEFINED__
-typedef struct IStream16 IStream16;
-#endif
-
 #ifndef __IEnumString_FWD_DEFINED__
 #define __IEnumString_FWD_DEFINED__
 typedef struct IEnumString IEnumString;
@@ -3519,296 +3514,6 @@ void __RPC_STUB IStream_Clone_Stub(
 
 #endif  /* __IStream_INTERFACE_DEFINED__ */
 
-typedef IStream16 *LPSTREAM16;
-
-typedef struct tagSTATSTG16 {
-    LPOLESTR16 pwcsName;
-    DWORD type;
-    ULARGE_INTEGER cbSize;
-    FILETIME mtime;
-    FILETIME ctime;
-    FILETIME atime;
-    DWORD grfMode;
-    DWORD grfLocksSupported;
-    CLSID clsid;
-    DWORD grfStateBits;
-    DWORD reserved;
-} STATSTG16;
-
-/*****************************************************************************
- * IStream16 interface
- */
-#ifndef __IStream16_INTERFACE_DEFINED__
-#define __IStream16_INTERFACE_DEFINED__
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IStream16 : public ISequentialStream
-{
-    virtual HRESULT STDMETHODCALLTYPE Seek(
-        LARGE_INTEGER dlibMove,
-        DWORD dwOrigin,
-        ULARGE_INTEGER* plibNewPosition) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetSize(
-        ULARGE_INTEGER libNewSize) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE CopyTo(
-        IStream16* pstm,
-        ULARGE_INTEGER cb,
-        ULARGE_INTEGER* pcbRead,
-        ULARGE_INTEGER* pcbWritten) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE Commit(
-        DWORD grfCommitFlags) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE Revert(
-        ) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE LockRegion(
-        ULARGE_INTEGER libOffset,
-        ULARGE_INTEGER cb,
-        DWORD dwLockType) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE UnlockRegion(
-        ULARGE_INTEGER libOffset,
-        ULARGE_INTEGER cb,
-        DWORD dwLockType) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE Stat(
-        STATSTG* pstatstg,
-        DWORD grfStatFlag) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE Clone(
-        IStream16** ppstm) = 0;
-
-};
-#else
-typedef struct IStream16Vtbl IStream16Vtbl;
-struct IStream16 {
-    const IStream16Vtbl* lpVtbl;
-};
-struct IStream16Vtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IStream16* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IStream16* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IStream16* This);
-
-    /*** ISequentialStream methods ***/
-    HRESULT (STDMETHODCALLTYPE *Read)(
-        IStream16* This,
-        void* pv,
-        ULONG cb,
-        ULONG* pcbRead);
-
-    HRESULT (STDMETHODCALLTYPE *Write)(
-        IStream16* This,
-        const void* pv,
-        ULONG cb,
-        ULONG* pcbWritten);
-
-    /*** IStream16 methods ***/
-    HRESULT (STDMETHODCALLTYPE *Seek)(
-        IStream16* This,
-        LARGE_INTEGER dlibMove,
-        DWORD dwOrigin,
-        ULARGE_INTEGER* plibNewPosition);
-
-    HRESULT (STDMETHODCALLTYPE *SetSize)(
-        IStream16* This,
-        ULARGE_INTEGER libNewSize);
-
-    HRESULT (STDMETHODCALLTYPE *CopyTo)(
-        IStream16* This,
-        IStream16* pstm,
-        ULARGE_INTEGER cb,
-        ULARGE_INTEGER* pcbRead,
-        ULARGE_INTEGER* pcbWritten);
-
-    HRESULT (STDMETHODCALLTYPE *Commit)(
-        IStream16* This,
-        DWORD grfCommitFlags);
-
-    HRESULT (STDMETHODCALLTYPE *Revert)(
-        IStream16* This);
-
-    HRESULT (STDMETHODCALLTYPE *LockRegion)(
-        IStream16* This,
-        ULARGE_INTEGER libOffset,
-        ULARGE_INTEGER cb,
-        DWORD dwLockType);
-
-    HRESULT (STDMETHODCALLTYPE *UnlockRegion)(
-        IStream16* This,
-        ULARGE_INTEGER libOffset,
-        ULARGE_INTEGER cb,
-        DWORD dwLockType);
-
-    HRESULT (STDMETHODCALLTYPE *Stat)(
-        IStream16* This,
-        STATSTG* pstatstg,
-        DWORD grfStatFlag);
-
-    HRESULT (STDMETHODCALLTYPE *Clone)(
-        IStream16* This,
-        IStream16** ppstm);
-
-};
-
-/*** IUnknown methods ***/
-#define IStream16_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IStream16_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IStream16_Release(p) (p)->lpVtbl->Release(p)
-/*** ISequentialStream methods ***/
-#define IStream16_Read(p,a,b,c) (p)->lpVtbl->Read(p,a,b,c)
-#define IStream16_Write(p,a,b,c) (p)->lpVtbl->Write(p,a,b,c)
-/*** IStream16 methods ***/
-#define IStream16_Seek(p,a,b,c) (p)->lpVtbl->Seek(p,a,b,c)
-#define IStream16_SetSize(p,a) (p)->lpVtbl->SetSize(p,a)
-#define IStream16_CopyTo(p,a,b,c,d) (p)->lpVtbl->CopyTo(p,a,b,c,d)
-#define IStream16_Commit(p,a) (p)->lpVtbl->Commit(p,a)
-#define IStream16_Revert(p) (p)->lpVtbl->Revert(p)
-#define IStream16_LockRegion(p,a,b,c) (p)->lpVtbl->LockRegion(p,a,b,c)
-#define IStream16_UnlockRegion(p,a,b,c) (p)->lpVtbl->UnlockRegion(p,a,b,c)
-#define IStream16_Stat(p,a,b) (p)->lpVtbl->Stat(p,a,b)
-#define IStream16_Clone(p,a) (p)->lpVtbl->Clone(p,a)
-
-#endif
-
-#define IStream16_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** ISequentialStream methods ***/ \
-    STDMETHOD_(HRESULT,Read)(THIS_ void* pv, ULONG cb, ULONG* pcbRead) PURE; \
-    STDMETHOD_(HRESULT,Write)(THIS_ const void* pv, ULONG cb, ULONG* pcbWritten) PURE; \
-    /*** IStream16 methods ***/ \
-    STDMETHOD_(HRESULT,Seek)(THIS_ LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition) PURE; \
-    STDMETHOD_(HRESULT,SetSize)(THIS_ ULARGE_INTEGER libNewSize) PURE; \
-    STDMETHOD_(HRESULT,CopyTo)(THIS_ IStream16* pstm, ULARGE_INTEGER cb, ULARGE_INTEGER* pcbRead, ULARGE_INTEGER* pcbWritten) PURE; \
-    STDMETHOD_(HRESULT,Commit)(THIS_ DWORD grfCommitFlags) PURE; \
-    STDMETHOD_(HRESULT,Revert)(THIS) PURE; \
-    STDMETHOD_(HRESULT,LockRegion)(THIS_ ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) PURE; \
-    STDMETHOD_(HRESULT,UnlockRegion)(THIS_ ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) PURE; \
-    STDMETHOD_(HRESULT,Stat)(THIS_ STATSTG* pstatstg, DWORD grfStatFlag) PURE; \
-    STDMETHOD_(HRESULT,Clone)(THIS_ IStream16** ppstm) PURE;
-
-HRESULT CALLBACK IStream16_RemoteSeek_Proxy(
-    IStream16* This,
-    LARGE_INTEGER dlibMove,
-    DWORD dwOrigin,
-    ULARGE_INTEGER* plibNewPosition);
-void __RPC_STUB IStream16_RemoteSeek_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IStream16_Seek_Proxy(
-    IStream16* This,
-    LARGE_INTEGER dlibMove,
-    DWORD dwOrigin,
-    ULARGE_INTEGER* plibNewPosition);
-HRESULT __RPC_STUB IStream16_Seek_Stub(
-    IStream16* This,
-    LARGE_INTEGER dlibMove,
-    DWORD dwOrigin,
-    ULARGE_INTEGER* plibNewPosition);
-HRESULT CALLBACK IStream16_SetSize_Proxy(
-    IStream16* This,
-    ULARGE_INTEGER libNewSize);
-void __RPC_STUB IStream16_SetSize_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IStream16_RemoteCopyTo_Proxy(
-    IStream16* This,
-    IStream16* pstm,
-    ULARGE_INTEGER cb,
-    ULARGE_INTEGER* pcbRead,
-    ULARGE_INTEGER* pcbWritten);
-void __RPC_STUB IStream16_RemoteCopyTo_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IStream16_CopyTo_Proxy(
-    IStream16* This,
-    IStream16* pstm,
-    ULARGE_INTEGER cb,
-    ULARGE_INTEGER* pcbRead,
-    ULARGE_INTEGER* pcbWritten);
-HRESULT __RPC_STUB IStream16_CopyTo_Stub(
-    IStream16* This,
-    IStream16* pstm,
-    ULARGE_INTEGER cb,
-    ULARGE_INTEGER* pcbRead,
-    ULARGE_INTEGER* pcbWritten);
-HRESULT CALLBACK IStream16_Commit_Proxy(
-    IStream16* This,
-    DWORD grfCommitFlags);
-void __RPC_STUB IStream16_Commit_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IStream16_Revert_Proxy(
-    IStream16* This);
-void __RPC_STUB IStream16_Revert_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IStream16_LockRegion_Proxy(
-    IStream16* This,
-    ULARGE_INTEGER libOffset,
-    ULARGE_INTEGER cb,
-    DWORD dwLockType);
-void __RPC_STUB IStream16_LockRegion_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IStream16_UnlockRegion_Proxy(
-    IStream16* This,
-    ULARGE_INTEGER libOffset,
-    ULARGE_INTEGER cb,
-    DWORD dwLockType);
-void __RPC_STUB IStream16_UnlockRegion_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IStream16_Stat_Proxy(
-    IStream16* This,
-    STATSTG* pstatstg,
-    DWORD grfStatFlag);
-void __RPC_STUB IStream16_Stat_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IStream16_Clone_Proxy(
-    IStream16* This,
-    IStream16** ppstm);
-void __RPC_STUB IStream16_Clone_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IStream16_INTERFACE_DEFINED__ */
-
 #ifndef __IEnumSTATSTG_FWD_DEFINED__
 #define __IEnumSTATSTG_FWD_DEFINED__
 typedef struct IEnumSTATSTG IEnumSTATSTG;
@@ -4404,458 +4109,6 @@ void __RPC_STUB IStorage_Stat_Stub(
 
 #endif  /* __IStorage_INTERFACE_DEFINED__ */
 
-#ifndef __IStorage16_FWD_DEFINED__
-#define __IStorage16_FWD_DEFINED__
-typedef struct IStorage16 IStorage16;
-#endif
-
-typedef IStorage16 *LPSTORAGE16;
-
-typedef struct tagRemSNB16 {
-    unsigned long ulCntStr;
-    unsigned long ulCntChar;
-    OLECHAR16 rgString[1];
-} RemSNB16;
-
-typedef RemSNB16 *wireSNB16;
-
-typedef OLECHAR16 **SNB16;
-unsigned long   __RPC_USER SNB16_UserSize     (unsigned long *, unsigned long,   SNB16 *);
-unsigned char * __RPC_USER SNB16_UserMarshal  (unsigned long *, unsigned char *, SNB16 *);
-unsigned char * __RPC_USER SNB16_UserUnmarshal(unsigned long *, unsigned char *, SNB16 *);
-void            __RPC_USER SNB16_UserFree     (unsigned long *, SNB16 *);
-
-/*****************************************************************************
- * IStorage16 interface
- */
-#ifndef __IStorage16_INTERFACE_DEFINED__
-#define __IStorage16_INTERFACE_DEFINED__
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IStorage16 : public IUnknown
-{
-    virtual HRESULT STDMETHODCALLTYPE CreateStream(
-        LPCOLESTR16 pwcsName,
-        DWORD grfMode,
-        DWORD reserved1,
-        DWORD reserved2,
-        IStream16** ppstm) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE OpenStream(
-        LPCOLESTR16 pwcsName,
-        void* reserved1,
-        DWORD grfMode,
-        DWORD reserved2,
-        IStream16** ppstm) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE CreateStorage(
-        LPCOLESTR16 pwcsName,
-        DWORD grfMode,
-        DWORD dwStgFmt,
-        DWORD reserved2,
-        IStorage16** ppstg) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE OpenStorage(
-        LPCOLESTR16 pwcsName,
-        IStorage16* pstgPriority,
-        DWORD grfMode,
-        SNB16 snbExclude,
-        DWORD reserved,
-        IStorage16** ppstg) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE CopyTo(
-        DWORD ciidExclude,
-        const IID* rgiidExclude,
-        SNB16 snbExclude,
-        IStorage16* pstgDest) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE MoveElementTo(
-        LPCOLESTR16 pwcsName,
-        IStorage16* pstgDest,
-        LPCOLESTR16 pwcsNewName,
-        DWORD grfFlags) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE Commit(
-        DWORD grfCommitFlags) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE Revert(
-        ) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE EnumElements(
-        DWORD reserved1,
-        void* reserved2,
-        DWORD reserved3,
-        IEnumSTATSTG** ppenum) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE DestroyElement(
-        LPCOLESTR16 pwcsName) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE RenameElement(
-        LPCOLESTR16 pwcsOldName,
-        LPCOLESTR16 pwcsNewName) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetElementTimes(
-        LPCOLESTR16 pwcsName,
-        const FILETIME* pctime,
-        const FILETIME* patime,
-        const FILETIME* pmtime) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetClass(
-        REFCLSID clsid) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE SetStateBits(
-        DWORD grfStateBits,
-        DWORD grfMask) = 0;
-
-    virtual HRESULT STDMETHODCALLTYPE Stat(
-        STATSTG* pstatstg,
-        DWORD grfStatFlag) = 0;
-
-};
-#else
-typedef struct IStorage16Vtbl IStorage16Vtbl;
-struct IStorage16 {
-    const IStorage16Vtbl* lpVtbl;
-};
-struct IStorage16Vtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
-    /*** IUnknown methods ***/
-    HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IStorage16* This,
-        REFIID riid,
-        void** ppvObject);
-
-    ULONG (STDMETHODCALLTYPE *AddRef)(
-        IStorage16* This);
-
-    ULONG (STDMETHODCALLTYPE *Release)(
-        IStorage16* This);
-
-    /*** IStorage16 methods ***/
-    HRESULT (STDMETHODCALLTYPE *CreateStream)(
-        IStorage16* This,
-        LPCOLESTR16 pwcsName,
-        DWORD grfMode,
-        DWORD reserved1,
-        DWORD reserved2,
-        IStream16** ppstm);
-
-    HRESULT (STDMETHODCALLTYPE *OpenStream)(
-        IStorage16* This,
-        LPCOLESTR16 pwcsName,
-        void* reserved1,
-        DWORD grfMode,
-        DWORD reserved2,
-        IStream16** ppstm);
-
-    HRESULT (STDMETHODCALLTYPE *CreateStorage)(
-        IStorage16* This,
-        LPCOLESTR16 pwcsName,
-        DWORD grfMode,
-        DWORD dwStgFmt,
-        DWORD reserved2,
-        IStorage16** ppstg);
-
-    HRESULT (STDMETHODCALLTYPE *OpenStorage)(
-        IStorage16* This,
-        LPCOLESTR16 pwcsName,
-        IStorage16* pstgPriority,
-        DWORD grfMode,
-        SNB16 snbExclude,
-        DWORD reserved,
-        IStorage16** ppstg);
-
-    HRESULT (STDMETHODCALLTYPE *CopyTo)(
-        IStorage16* This,
-        DWORD ciidExclude,
-        const IID* rgiidExclude,
-        SNB16 snbExclude,
-        IStorage16* pstgDest);
-
-    HRESULT (STDMETHODCALLTYPE *MoveElementTo)(
-        IStorage16* This,
-        LPCOLESTR16 pwcsName,
-        IStorage16* pstgDest,
-        LPCOLESTR16 pwcsNewName,
-        DWORD grfFlags);
-
-    HRESULT (STDMETHODCALLTYPE *Commit)(
-        IStorage16* This,
-        DWORD grfCommitFlags);
-
-    HRESULT (STDMETHODCALLTYPE *Revert)(
-        IStorage16* This);
-
-    HRESULT (STDMETHODCALLTYPE *EnumElements)(
-        IStorage16* This,
-        DWORD reserved1,
-        void* reserved2,
-        DWORD reserved3,
-        IEnumSTATSTG** ppenum);
-
-    HRESULT (STDMETHODCALLTYPE *DestroyElement)(
-        IStorage16* This,
-        LPCOLESTR16 pwcsName);
-
-    HRESULT (STDMETHODCALLTYPE *RenameElement)(
-        IStorage16* This,
-        LPCOLESTR16 pwcsOldName,
-        LPCOLESTR16 pwcsNewName);
-
-    HRESULT (STDMETHODCALLTYPE *SetElementTimes)(
-        IStorage16* This,
-        LPCOLESTR16 pwcsName,
-        const FILETIME* pctime,
-        const FILETIME* patime,
-        const FILETIME* pmtime);
-
-    HRESULT (STDMETHODCALLTYPE *SetClass)(
-        IStorage16* This,
-        REFCLSID clsid);
-
-    HRESULT (STDMETHODCALLTYPE *SetStateBits)(
-        IStorage16* This,
-        DWORD grfStateBits,
-        DWORD grfMask);
-
-    HRESULT (STDMETHODCALLTYPE *Stat)(
-        IStorage16* This,
-        STATSTG* pstatstg,
-        DWORD grfStatFlag);
-
-};
-
-/*** IUnknown methods ***/
-#define IStorage16_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IStorage16_AddRef(p) (p)->lpVtbl->AddRef(p)
-#define IStorage16_Release(p) (p)->lpVtbl->Release(p)
-/*** IStorage16 methods ***/
-#define IStorage16_CreateStream(p,a,b,c,d,e) (p)->lpVtbl->CreateStream(p,a,b,c,d,e)
-#define IStorage16_OpenStream(p,a,b,c,d,e) (p)->lpVtbl->OpenStream(p,a,b,c,d,e)
-#define IStorage16_CreateStorage(p,a,b,c,d,e) (p)->lpVtbl->CreateStorage(p,a,b,c,d,e)
-#define IStorage16_OpenStorage(p,a,b,c,d,e,f) (p)->lpVtbl->OpenStorage(p,a,b,c,d,e,f)
-#define IStorage16_CopyTo(p,a,b,c,d) (p)->lpVtbl->CopyTo(p,a,b,c,d)
-#define IStorage16_MoveElementTo(p,a,b,c,d) (p)->lpVtbl->MoveElementTo(p,a,b,c,d)
-#define IStorage16_Commit(p,a) (p)->lpVtbl->Commit(p,a)
-#define IStorage16_Revert(p) (p)->lpVtbl->Revert(p)
-#define IStorage16_EnumElements(p,a,b,c,d) (p)->lpVtbl->EnumElements(p,a,b,c,d)
-#define IStorage16_DestroyElement(p,a) (p)->lpVtbl->DestroyElement(p,a)
-#define IStorage16_RenameElement(p,a,b) (p)->lpVtbl->RenameElement(p,a,b)
-#define IStorage16_SetElementTimes(p,a,b,c,d) (p)->lpVtbl->SetElementTimes(p,a,b,c,d)
-#define IStorage16_SetClass(p,a) (p)->lpVtbl->SetClass(p,a)
-#define IStorage16_SetStateBits(p,a,b) (p)->lpVtbl->SetStateBits(p,a,b)
-#define IStorage16_Stat(p,a,b) (p)->lpVtbl->Stat(p,a,b)
-
-#endif
-
-#define IStorage16_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE; \
-    /*** IStorage16 methods ***/ \
-    STDMETHOD_(HRESULT,CreateStream)(THIS_ LPCOLESTR16 pwcsName, DWORD grfMode, DWORD reserved1, DWORD reserved2, IStream16** ppstm) PURE; \
-    STDMETHOD_(HRESULT,OpenStream)(THIS_ LPCOLESTR16 pwcsName, void* reserved1, DWORD grfMode, DWORD reserved2, IStream16** ppstm) PURE; \
-    STDMETHOD_(HRESULT,CreateStorage)(THIS_ LPCOLESTR16 pwcsName, DWORD grfMode, DWORD dwStgFmt, DWORD reserved2, IStorage16** ppstg) PURE; \
-    STDMETHOD_(HRESULT,OpenStorage)(THIS_ LPCOLESTR16 pwcsName, IStorage16* pstgPriority, DWORD grfMode, SNB16 snbExclude, DWORD reserved, IStorage16** ppstg) PURE; \
-    STDMETHOD_(HRESULT,CopyTo)(THIS_ DWORD ciidExclude, const IID* rgiidExclude, SNB16 snbExclude, IStorage16* pstgDest) PURE; \
-    STDMETHOD_(HRESULT,MoveElementTo)(THIS_ LPCOLESTR16 pwcsName, IStorage16* pstgDest, LPCOLESTR16 pwcsNewName, DWORD grfFlags) PURE; \
-    STDMETHOD_(HRESULT,Commit)(THIS_ DWORD grfCommitFlags) PURE; \
-    STDMETHOD_(HRESULT,Revert)(THIS) PURE; \
-    STDMETHOD_(HRESULT,EnumElements)(THIS_ DWORD reserved1, void* reserved2, DWORD reserved3, IEnumSTATSTG** ppenum) PURE; \
-    STDMETHOD_(HRESULT,DestroyElement)(THIS_ LPCOLESTR16 pwcsName) PURE; \
-    STDMETHOD_(HRESULT,RenameElement)(THIS_ LPCOLESTR16 pwcsOldName, LPCOLESTR16 pwcsNewName) PURE; \
-    STDMETHOD_(HRESULT,SetElementTimes)(THIS_ LPCOLESTR16 pwcsName, const FILETIME* pctime, const FILETIME* patime, const FILETIME* pmtime) PURE; \
-    STDMETHOD_(HRESULT,SetClass)(THIS_ REFCLSID clsid) PURE; \
-    STDMETHOD_(HRESULT,SetStateBits)(THIS_ DWORD grfStateBits, DWORD grfMask) PURE; \
-    STDMETHOD_(HRESULT,Stat)(THIS_ STATSTG* pstatstg, DWORD grfStatFlag) PURE;
-
-HRESULT CALLBACK IStorage16_CreateStream_Proxy(
-    IStorage16* This,
-    LPCOLESTR16 pwcsName,
-    DWORD grfMode,
-    DWORD reserved1,
-    DWORD reserved2,
-    IStream16** ppstm);
-void __RPC_STUB IStorage16_CreateStream_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IStorage16_RemoteOpenStream_Proxy(
-    IStorage16* This,
-    LPCOLESTR16 pwcsName,
-    unsigned long cbReserved1,
-    byte* reserved1,
-    DWORD grfMode,
-    DWORD reserved2,
-    IStream16** ppstm);
-void __RPC_STUB IStorage16_RemoteOpenStream_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IStorage16_OpenStream_Proxy(
-    IStorage16* This,
-    LPCOLESTR16 pwcsName,
-    void* reserved1,
-    DWORD grfMode,
-    DWORD reserved2,
-    IStream16** ppstm);
-HRESULT __RPC_STUB IStorage16_OpenStream_Stub(
-    IStorage16* This,
-    LPCOLESTR16 pwcsName,
-    unsigned long cbReserved1,
-    byte* reserved1,
-    DWORD grfMode,
-    DWORD reserved2,
-    IStream16** ppstm);
-HRESULT CALLBACK IStorage16_CreateStorage_Proxy(
-    IStorage16* This,
-    LPCOLESTR16 pwcsName,
-    DWORD grfMode,
-    DWORD dwStgFmt,
-    DWORD reserved2,
-    IStorage16** ppstg);
-void __RPC_STUB IStorage16_CreateStorage_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IStorage16_OpenStorage_Proxy(
-    IStorage16* This,
-    LPCOLESTR16 pwcsName,
-    IStorage16* pstgPriority,
-    DWORD grfMode,
-    SNB16 snbExclude,
-    DWORD reserved,
-    IStorage16** ppstg);
-void __RPC_STUB IStorage16_OpenStorage_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IStorage16_CopyTo_Proxy(
-    IStorage16* This,
-    DWORD ciidExclude,
-    const IID* rgiidExclude,
-    SNB16 snbExclude,
-    IStorage16* pstgDest);
-void __RPC_STUB IStorage16_CopyTo_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IStorage16_MoveElementTo_Proxy(
-    IStorage16* This,
-    LPCOLESTR16 pwcsName,
-    IStorage16* pstgDest,
-    LPCOLESTR16 pwcsNewName,
-    DWORD grfFlags);
-void __RPC_STUB IStorage16_MoveElementTo_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IStorage16_Commit_Proxy(
-    IStorage16* This,
-    DWORD grfCommitFlags);
-void __RPC_STUB IStorage16_Commit_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IStorage16_Revert_Proxy(
-    IStorage16* This);
-void __RPC_STUB IStorage16_Revert_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IStorage16_RemoteEnumElements_Proxy(
-    IStorage16* This,
-    DWORD reserved1,
-    unsigned long cbReserved2,
-    byte* reserved2,
-    DWORD reserved3,
-    IEnumSTATSTG** ppenum);
-void __RPC_STUB IStorage16_RemoteEnumElements_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IStorage16_EnumElements_Proxy(
-    IStorage16* This,
-    DWORD reserved1,
-    void* reserved2,
-    DWORD reserved3,
-    IEnumSTATSTG** ppenum);
-HRESULT __RPC_STUB IStorage16_EnumElements_Stub(
-    IStorage16* This,
-    DWORD reserved1,
-    unsigned long cbReserved2,
-    byte* reserved2,
-    DWORD reserved3,
-    IEnumSTATSTG** ppenum);
-HRESULT CALLBACK IStorage16_DestroyElement_Proxy(
-    IStorage16* This,
-    LPCOLESTR16 pwcsName);
-void __RPC_STUB IStorage16_DestroyElement_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IStorage16_RenameElement_Proxy(
-    IStorage16* This,
-    LPCOLESTR16 pwcsOldName,
-    LPCOLESTR16 pwcsNewName);
-void __RPC_STUB IStorage16_RenameElement_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IStorage16_SetElementTimes_Proxy(
-    IStorage16* This,
-    LPCOLESTR16 pwcsName,
-    const FILETIME* pctime,
-    const FILETIME* patime,
-    const FILETIME* pmtime);
-void __RPC_STUB IStorage16_SetElementTimes_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IStorage16_SetClass_Proxy(
-    IStorage16* This,
-    REFCLSID clsid);
-void __RPC_STUB IStorage16_SetClass_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IStorage16_SetStateBits_Proxy(
-    IStorage16* This,
-    DWORD grfStateBits,
-    DWORD grfMask);
-void __RPC_STUB IStorage16_SetStateBits_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT CALLBACK IStorage16_Stat_Proxy(
-    IStorage16* This,
-    STATSTG* pstatstg,
-    DWORD grfStatFlag);
-void __RPC_STUB IStorage16_Stat_Stub(
-    struct IRpcStubBuffer* This,
-    struct IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-
-#endif  /* __IStorage16_INTERFACE_DEFINED__ */
-
 #ifndef __IPersistFile_FWD_DEFINED__
 #define __IPersistFile_FWD_DEFINED__
 typedef struct IPersistFile IPersistFile;
diff --git a/include/objidl.idl b/include/objidl.idl
index bc87d4a74c2..39f8c541eda 100644
--- a/include/objidl.idl
+++ b/include/objidl.idl
@@ -19,7 +19,6 @@
 import "unknwn.idl";
 
 interface IStream;
-interface IStream16;
 interface IEnumString;
 interface IRunningObjectTable;
 interface IMoniker;
@@ -809,80 +808,6 @@ interface IStream : ISequentialStream
     [out] IStream **ppstm);
 }
 
-[
-  object,
-  pointer_default(unique)
-]
-interface IStream16 : ISequentialStream
-{
-  typedef [unique] IStream16 *LPSTREAM16;
-
-  typedef struct tagSTATSTG16 {
-    LPOLESTR16 pwcsName;
-    DWORD type;
-    ULARGE_INTEGER cbSize;
-    FILETIME mtime;
-    FILETIME ctime;
-    FILETIME atime;
-    DWORD grfMode;
-    DWORD grfLocksSupported;
-    CLSID clsid;
-    DWORD grfStateBits;
-    DWORD reserved;
-  } STATSTG16;
-
-  [local]
-  HRESULT Seek(
-    [in] LARGE_INTEGER dlibMove,
-    [in] DWORD dwOrigin,
-    [out] ULARGE_INTEGER *plibNewPosition);
-
-  [call_as(Seek)]
-  HRESULT RemoteSeek(
-    [in] LARGE_INTEGER dlibMove,
-    [in] DWORD dwOrigin,
-    [out] ULARGE_INTEGER *plibNewPosition);
-
-  HRESULT SetSize(
-    [in] ULARGE_INTEGER libNewSize);
-
-  [local]
-  HRESULT CopyTo(
-    [in, unique] IStream16 *pstm,
-    [in] ULARGE_INTEGER cb,
-    [out] ULARGE_INTEGER *pcbRead,
-    [out] ULARGE_INTEGER *pcbWritten);
-
-  [call_as(CopyTo)]
-  HRESULT RemoteCopyTo(
-    [in, unique] IStream16 *pstm,
-    [in] ULARGE_INTEGER cb,
-    [out] ULARGE_INTEGER *pcbRead,
-    [out] ULARGE_INTEGER *pcbWritten);
-
-  HRESULT Commit(
-    [in] DWORD grfCommitFlags);
-
-  HRESULT Revert();
-
-  HRESULT LockRegion(
-    [in] ULARGE_INTEGER libOffset,
-    [in] ULARGE_INTEGER cb,
-    [in] DWORD dwLockType);
-
-  HRESULT UnlockRegion(
-    [in] ULARGE_INTEGER libOffset,
-    [in] ULARGE_INTEGER cb,
-    [in] DWORD dwLockType);
-
-  HRESULT Stat(
-    [out] STATSTG *pstatstg,
-    [in] DWORD grfStatFlag);
-
-  HRESULT Clone(
-    [out] IStream16 **ppstm);
-}
-
 [
   object,
   uuid(0000000d-0000-0000-C000-000000000046),
@@ -1029,119 +954,6 @@ interface IStorage : IUnknown
     [in] DWORD grfStatFlag);
 }
 
-[
-  object,
-  pointer_default(unique)
-]
-interface IStorage16 : IUnknown
-{
-  typedef [unique] IStorage16 *LPSTORAGE16;
-
-  typedef struct tagRemSNB16 {
-    unsigned long ulCntStr;
-    unsigned long ulCntChar;
-    [size_is(ulCntChar)] OLECHAR16 rgString[];
-  } RemSNB16;
-
-  typedef [unique] RemSNB16 *wireSNB16;
-  typedef [wire_marshal(wireSNB16)] OLECHAR16 **SNB16;
-
-  HRESULT CreateStream(
-    [in] LPCOLESTR16 pwcsName,
-    [in] DWORD grfMode,
-    [in] DWORD reserved1,
-    [in] DWORD reserved2,
-    [out] IStream16 **ppstm);
-
-  [local]
-  HRESULT OpenStream(
-    [in] LPCOLESTR16 pwcsName,
-    [in, unique] void *reserved1,
-    [in] DWORD grfMode,
-    [in] DWORD reserved2,
-    [out] IStream16 **ppstm);
-
-  [call_as(OpenStream)]
-  HRESULT RemoteOpenStream(
-    [in] LPCOLESTR16 pwcsName,
-    [in] unsigned long cbReserved1,
-    [in, unique, size_is(cbReserved1)] byte *reserved1,
-    [in] DWORD grfMode,
-    [in] DWORD reserved2,
-    [out] IStream16 **ppstm);
-
-  HRESULT CreateStorage(
-    [in] LPCOLESTR16 pwcsName,
-    [in] DWORD grfMode,
-    [in] DWORD dwStgFmt,
-    [in] DWORD reserved2,
-    [out] IStorage16 **ppstg);
-
-  HRESULT OpenStorage(
-    [in, unique] LPCOLESTR16 pwcsName,
-    [in, unique] IStorage16 *pstgPriority,
-    [in] DWORD grfMode,
-    [in, unique] SNB16 snbExclude,
-    [in] DWORD reserved,
-    [out] IStorage16 **ppstg);
-
-  HRESULT CopyTo(
-    [in] DWORD ciidExclude,
-    [in, unique, size_is(ciidExclude)] const IID *rgiidExclude,
-    [in, unique] SNB16 snbExclude,
-    [in, unique] IStorage16 *pstgDest);
-
-  HRESULT MoveElementTo(
-    [in] LPCOLESTR16 pwcsName,
-    [in, unique] IStorage16 *pstgDest,
-    [in] LPCOLESTR16 pwcsNewName,
-    [in] DWORD grfFlags);
-
-  HRESULT Commit(
-    [in] DWORD grfCommitFlags);
-
-  HRESULT Revert();
-
-  [local]
-  HRESULT EnumElements(
-    [in] DWORD reserved1,
-    [in, unique, size_is(1)] void *reserved2,
-    [in] DWORD reserved3,
-    [out] IEnumSTATSTG **ppenum);
-
-  [call_as(EnumElements)]
-  HRESULT RemoteEnumElements(
-    [in] DWORD reserved1,
-    [in] unsigned long cbReserved2,
-    [in, unique, size_is(cbReserved2)] byte *reserved2,
-    [in] DWORD reserved3,
-    [out] IEnumSTATSTG **ppenum);
-
-  HRESULT DestroyElement(
-    [in] LPCOLESTR16 pwcsName);
-
-  HRESULT RenameElement(
-    [in] LPCOLESTR16 pwcsOldName,
-    [in] LPCOLESTR16 pwcsNewName);
-
-  HRESULT SetElementTimes(
-    [in, unique] LPCOLESTR16 pwcsName,
-    [in, unique] const FILETIME *pctime,
-    [in, unique] const FILETIME *patime,
-    [in, unique] const FILETIME *pmtime);
-
-  HRESULT SetClass(
-    [in] REFCLSID clsid);
-
-  HRESULT SetStateBits(
-    [in] DWORD grfStateBits,
-    [in] DWORD grfMask);
-
-  HRESULT Stat(
-    [out] STATSTG *pstatstg,
-    [in] DWORD grfStatFlag);
-}
-
 [
   object,
   uuid(0000010b-0000-0000-C000-000000000046),