Replaced references to interfaces.h by wine/obj_xxx.h headers instead
since these headers already provide the necessary definitions.
diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c
index 9b2dfb1..8c81ed4 100644
--- a/dlls/shell32/brsfolder.c
+++ b/dlls/shell32/brsfolder.c
@@ -16,7 +16,7 @@
#include "commctrl.h"
#include "spy.h"
-#include "interfaces.h"
+#include "wine/obj_base.h"
#include "shell.h"
#include "pidl.h"
#include "shlobj.h"
diff --git a/graphics/d3dcommon.c b/graphics/d3dcommon.c
index e6e86ba..4a46eb3 100644
--- a/graphics/d3dcommon.c
+++ b/graphics/d3dcommon.c
@@ -7,7 +7,7 @@
#include "config.h"
#include "windows.h"
#include "wintypes.h"
-#include "interfaces.h"
+#include "wine/obj_base.h"
#include "ddraw.h"
#include "d3d.h"
#include "debug.h"
diff --git a/graphics/d3ddevices.c b/graphics/d3ddevices.c
index 5d15b2c..e78474d 100644
--- a/graphics/d3ddevices.c
+++ b/graphics/d3ddevices.c
@@ -8,7 +8,7 @@
#include "windows.h"
#include "wintypes.h"
#include "winerror.h"
-#include "interfaces.h"
+#include "wine/obj_base.h"
#include "heap.h"
#include "ddraw.h"
#include "d3d.h"
diff --git a/graphics/d3dexecutebuffer.c b/graphics/d3dexecutebuffer.c
index 32c5fff..7334522 100644
--- a/graphics/d3dexecutebuffer.c
+++ b/graphics/d3dexecutebuffer.c
@@ -8,7 +8,7 @@
#include "windows.h"
#include "wintypes.h"
#include "winerror.h"
-#include "interfaces.h"
+#include "wine/obj_base.h"
#include "heap.h"
#include "ddraw.h"
#include "d3d.h"
diff --git a/graphics/d3dlight.c b/graphics/d3dlight.c
index 7b19124..b2c3702 100644
--- a/graphics/d3dlight.c
+++ b/graphics/d3dlight.c
@@ -8,7 +8,7 @@
#include "windows.h"
#include "wintypes.h"
#include "winerror.h"
-#include "interfaces.h"
+#include "wine/obj_base.h"
#include "heap.h"
#include "ddraw.h"
#include "d3d.h"
diff --git a/graphics/d3dmaterial.c b/graphics/d3dmaterial.c
index 35c0160..649181e 100644
--- a/graphics/d3dmaterial.c
+++ b/graphics/d3dmaterial.c
@@ -7,7 +7,7 @@
#include "windows.h"
#include "wintypes.h"
#include "winerror.h"
-#include "interfaces.h"
+#include "wine/obj_base.h"
#include "heap.h"
#include "ddraw.h"
#include "d3d.h"
diff --git a/graphics/d3dtexture.c b/graphics/d3dtexture.c
index beba37e..038eb9e 100644
--- a/graphics/d3dtexture.c
+++ b/graphics/d3dtexture.c
@@ -8,7 +8,7 @@
#include "windows.h"
#include "wintypes.h"
#include "winerror.h"
-#include "interfaces.h"
+#include "wine/obj_base.h"
#include "heap.h"
#include "ddraw.h"
#include "d3d.h"
diff --git a/graphics/d3dviewport.c b/graphics/d3dviewport.c
index 77f4810..f1a95dc 100644
--- a/graphics/d3dviewport.c
+++ b/graphics/d3dviewport.c
@@ -7,7 +7,7 @@
#include "windows.h"
#include "wintypes.h"
#include "winerror.h"
-#include "interfaces.h"
+#include "wine/obj_base.h"
#include "heap.h"
#include "ddraw.h"
#include "d3d.h"
diff --git a/include/interfaces.h b/include/interfaces.h
index c0768d1..6ea8f8f 100644
--- a/include/interfaces.h
+++ b/include/interfaces.h
@@ -1,17 +1,13 @@
#ifndef _WINE_INTERFACES_H
#define _WINE_INTERFACES_H
+/* FIXME: This is not a standard Windows header. Move the contents of this file to the right place and then delete it. */
+
#include "ole.h"
#include "ole2.h"
#include "compobj.h"
-#define STDMETHOD(xfn) HRESULT (CALLBACK *fn##xfn)
-#define STDMETHOD_(ret,xfn) ret (CALLBACK *fn##xfn)
-#define PURE
-#define FAR
-#define THIS_ THIS,
-
-/* fixme move to wine/obj_*.h */
+/* FIXME: move to the right place. Some belong to aoidl.h some to oleauto.h */
DEFINE_OLEGUID(IID_IDispatch, 0x00020400,0,0);
DEFINE_OLEGUID(IID_ITypeInfo, 0x00020401,0,0);
DEFINE_OLEGUID(IID_ITypeLib, 0x00020402,0,0);
@@ -33,61 +29,5 @@
#include "objbase.h"
-#define THIS LPCLASSFACTORY this
-typedef struct {
- STDMETHOD(QueryInterface) (THIS_ REFIID riid,LPVOID FAR* ppvObj) PURE;
- STDMETHOD_(ULONG,AddRef) (THIS) PURE;
- STDMETHOD_(ULONG,Release) (THIS) PURE;
- STDMETHOD(CreateInstance) (THIS_ LPUNKNOWN pUnkOuter, REFIID riid, LPVOID FAR* ppvObject) PURE;
- STDMETHOD(LockServer) (THIS_ BOOL32) PURE;
-} *LPCLASSFACTORY_VTABLE,IClassFactory_VTable;
-#undef THIS
-
-#define THIS LPMALLOC32 this
-typedef struct {
- STDMETHOD(QueryInterface) (THIS_ REFIID riid,LPVOID FAR* ppvObj) PURE;
- STDMETHOD_(ULONG,AddRef) (THIS) PURE;
- STDMETHOD_(ULONG,Release) (THIS) PURE;
-
- STDMETHOD_(LPVOID,Alloc) ( THIS_ DWORD cb);
- STDMETHOD_(LPVOID,Realloc) ( THIS_ LPVOID pv,DWORD cb);
- STDMETHOD_(VOID,Free) ( THIS_ LPVOID pv);
- STDMETHOD_(DWORD,GetSize) ( THIS_ LPVOID pv);
- STDMETHOD_(INT32,DidAlloc) ( THIS_ LPVOID pv);
- STDMETHOD_(LPVOID,HeapMinimize) ( THIS );
-} *LPMALLOC32_VTABLE,IMalloc32_VTable;
-
-#undef THIS
-
-#define THIS LPMALLOC16 this
-typedef struct {
- STDMETHOD(QueryInterface) (THIS_ REFIID riid,LPVOID FAR* ppvObj) PURE;
- STDMETHOD_(ULONG,AddRef) (THIS) PURE;
- STDMETHOD_(ULONG,Release) (THIS) PURE;
-
- STDMETHOD_(LPVOID,Alloc) ( THIS_ DWORD cb);
- STDMETHOD_(LPVOID,Realloc) ( THIS_ LPVOID pv,DWORD cb);
- STDMETHOD_(VOID,Free) ( THIS_ LPVOID pv);
- STDMETHOD_(DWORD,GetSize) ( THIS_ LPVOID pv);
- STDMETHOD_(INT16,DidAlloc) ( THIS_ LPVOID pv);
- STDMETHOD_(LPVOID,HeapMinimize) ( THIS );
-} *LPMALLOC16_VTABLE,IMalloc16_VTable;
-
-#undef THIS
-
-/* private prototypes for the constructors */
-#ifdef __WINE__
-LPUNKNOWN IUnknown_Constructor(void);
-LPMALLOC16 IMalloc16_Constructor(void);
-LPMALLOC32 IMalloc32_Constructor(void);
-#endif
-
-HRESULT WINAPI CoGetMalloc32(DWORD, LPMALLOC32*);
-
-#undef STDMETHOD
-#undef STDMETHOD_
-#undef PURE
-#undef FAR
-#undef THIS_
#endif /*_WINE_INTERFACES_H*/
diff --git a/ole/safearray.c b/ole/safearray.c
index e4cccc3..fe383e7 100644
--- a/ole/safearray.c
+++ b/ole/safearray.c
@@ -15,7 +15,7 @@
#include <strings.h>
#include <stdio.h>
#include <debug.h>
-#include <interfaces.h>
+#include "wine/obj_base.h"
/* Localy used methods */
static INT32
diff --git a/ole/stg_bigblockfile.c b/ole/stg_bigblockfile.c
index 39368bd..587c0f5 100644
--- a/ole/stg_bigblockfile.c
+++ b/ole/stg_bigblockfile.c
@@ -27,8 +27,8 @@
#include "winerror.h"
#include "ole.h"
#include "ole2.h"
-#include "compobj.h"
-#include "interfaces.h"
+#include "wine/obj_base.h"
+#include "wine/obj_storage.h"
#include "storage32.h"
diff --git a/ole/stg_stream.c b/ole/stg_stream.c
index b5fe9d8..606c9c2 100644
--- a/ole/stg_stream.c
+++ b/ole/stg_stream.c
@@ -17,8 +17,8 @@
#include "winerror.h"
#include "ole.h"
#include "ole2.h"
-#include "compobj.h"
-#include "interfaces.h"
+#include "wine/obj_base.h"
+#include "wine/obj_storage.h"
#include "storage32.h"
diff --git a/ole/storage32.c b/ole/storage32.c
index 98c8604..f42eed3 100644
--- a/ole/storage32.c
+++ b/ole/storage32.c
@@ -20,9 +20,8 @@
#include "file.h"
#include "ole.h"
#include "ole2.h"
-#include "compobj.h"
-#include "interfaces.h"
-#include "storage.h"
+#include "wine/obj_base.h"
+#include "wine/obj_storage.h"
#include "crtdll.h"
#include "tchar.h"
#include "heap.h"
