Get rid of the non-standard Ixxx_METHODS macro definitions, declare
the interfaces explicitly instead.
diff --git a/include/commctrl.h b/include/commctrl.h
index e7fe39f..ec6cd49 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -590,9 +590,6 @@
COLORREF,UINT,UINT);
#define ImageList_LoadImage WINELIB_NAME_AW(ImageList_LoadImage)
HIMAGELIST WINAPI ImageList_Merge(HIMAGELIST,INT,HIMAGELIST,INT,INT,INT);
-#ifdef IStream_METHODS
-HIMAGELIST WINAPI ImageList_Read(LPSTREAM);
-#endif
BOOL WINAPI ImageList_Remove(HIMAGELIST,INT);
BOOL WINAPI ImageList_Replace(HIMAGELIST,INT,HBITMAP,HBITMAP);
INT WINAPI ImageList_ReplaceIcon(HIMAGELIST,INT,HICON);
@@ -602,7 +599,9 @@
BOOL WINAPI ImageList_SetIconSize(HIMAGELIST,INT,INT);
BOOL WINAPI ImageList_SetImageCount(HIMAGELIST,UINT);
BOOL WINAPI ImageList_SetOverlayImage(HIMAGELIST,INT,INT);
-#ifdef IStream_METHODS
+
+#ifdef __IStream_INTERFACE_DEFINED__
+HIMAGELIST WINAPI ImageList_Read(LPSTREAM);
BOOL WINAPI ImageList_Write(HIMAGELIST, LPSTREAM);
#endif
