Don't define COBJMACROS in objbase.h.

Update the Wine sources accordingly.

dlls/amstream/amstream.c

@@ -24,6 +24,8 @@
 #include "config.h"
 #include "wine/debug.h"
 
+#define COBJMACROS
+
 #include "winbase.h"
 #include "wingdi.h"
 

dlls/amstream/main.c

@@ -21,11 +21,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define COM_NO_WINDOWS_H
-
 #include <stdarg.h>
 #include <string.h>
 
+#define COBJMACROS
+#define COM_NO_WINDOWS_H
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/atl/atl_main.c

@@ -21,6 +21,8 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/avifil32/api.c

@@ -17,10 +17,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <assert.h>
 #include <stdarg.h>
 
+#define COBJMACROS
+#define COM_NO_WINDOWS_H
+
 #include "windef.h"
 #include "winbase.h"
 #include "winnls.h"

dlls/avifil32/factory.c

@@ -16,10 +16,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <assert.h>
 #include <stdarg.h>
 
+#define COBJMACROS
+#define COM_NO_WINDOWS_H
+
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/comcat/comcat_private.h

@@ -18,9 +18,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <stdarg.h>
 
+#define COBJMACROS
+#define COM_NO_WINDOWS_H
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/comctl32/comctl32undoc.c

@@ -34,8 +34,10 @@
 #include <ctype.h>
 #include <limits.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/comctl32/imagelist.c

@@ -39,6 +39,9 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+
+#define COBJMACROS
+
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"

dlls/commdlg/filedlg.c

@@ -55,8 +55,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"

dlls/commdlg/filedlgbrowser.c

@@ -23,8 +23,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winnls.h"

dlls/d3d8/surface.c

@@ -25,8 +25,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/d3d8/volume.c

@@ -23,8 +23,10 @@
 
 #include <stdarg.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/d3d9/surface.c

@@ -24,8 +24,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/d3d9/volume.c

@@ -21,9 +21,11 @@
 
 #include "config.h"
 
+#include <stdarg.h>
+
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
-#include <stdarg.h>
 
 #include "windef.h"
 #include "winbase.h"

dlls/d3dxof/d3dxof.c

@@ -24,6 +24,8 @@
 #include "config.h"
 #include "wine/debug.h"
 
+#define COBJMACROS
+
 #include "winbase.h"
 #include "wingdi.h"
 

dlls/d3dxof/main.c

@@ -21,11 +21,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define COM_NO_WINDOWS_H
-
 #include <stdarg.h>
 #include <string.h>
 
+#define COBJMACROS
+#define COM_NO_WINDOWS_H
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/ddraw/dsurface/main.c

@@ -23,8 +23,10 @@
 #include <assert.h>
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "winerror.h"
 #include "mesa_private.h"
 #include "wine/debug.h"

dlls/ddraw/main.c

@@ -32,6 +32,8 @@
 #include <string.h>
 #include <stdlib.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winnls.h"

dlls/devenum/devenum_private.h

@@ -30,7 +30,9 @@
 #include "winreg.h"
 #include "winerror.h"
 
+#define COBJMACROS
 #define COM_NO_WINDOWS_H
+
 #include "ole2.h"
 #include "strmif.h"
 #include "olectl.h"

dlls/dinput/dinput_main.c

@@ -34,6 +34,8 @@
 #include <stdarg.h>
 #include <string.h>
 
+#define COBJMACROS
+
 #include "wine/debug.h"
 #include "wine/unicode.h"
 #include "windef.h"

dlls/dplayx/dpclassfactory.c

@@ -19,6 +19,9 @@
 
 #include <stdarg.h>
 #include <string.h>
+
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "objbase.h"

dlls/dsound/dsound_main.c

@@ -51,8 +51,10 @@
 #include <string.h>
 #include <math.h>
 
+#define COBJMACROS
 #define NONAMELESSSTRUCT
 #define NONAMELESSUNION
+
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"

dlls/itss/itss.c

@@ -26,6 +26,8 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/itss/moniker.c

@@ -25,6 +25,8 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/itss/storage.c

@@ -25,6 +25,8 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/mapi32/util.c

@@ -20,8 +20,10 @@
 
 #include <stdarg.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"

dlls/mlang/mlang.c

@@ -25,6 +25,8 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/msdmo/dmort.c

@@ -16,9 +16,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <stdarg.h>
 
+#define COBJMACROS
+#define COM_NO_WINDOWS_H
+
 #include "windef.h"
 #include "winbase.h"
 #include "objbase.h"

dlls/msi/action.c

@@ -29,6 +29,8 @@ http://msdn.microsoft.com/library/default.asp?url=/library/en-us/msi/setup/stand
 #include <stdarg.h>
 #include <stdio.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/msi/msi.c

@@ -18,10 +18,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define NONAMELESSUNION
-
 #include <stdarg.h>
 
+#define COBJMACROS
+#define NONAMELESSUNION
+
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"

dlls/msi/msiquery.c

@@ -20,6 +20,8 @@
 
 #include <stdarg.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/msi/suminfo.c

@@ -18,10 +18,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define NONAMELESSUNION
-
 #include <stdarg.h>
 
+#define COBJMACROS
+#define NONAMELESSUNION
+
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"

dlls/msi/table.c

@@ -18,11 +18,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <stdarg.h>
+
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 
-#include <stdarg.h>
-
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/ole32/antimoniker.c

@@ -22,8 +22,10 @@
 #include <stdarg.h>
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/ole32/bindctx.c

@@ -21,6 +21,9 @@
 #include <stdarg.h>
 #include <string.h>
 #include <assert.h>
+
+#define COBJMACROS
+
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"

dlls/ole32/clipboard.c

@@ -62,8 +62,10 @@
 #include <stdarg.h>
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/ole32/compobj.c

@@ -31,8 +31,10 @@
 #include <string.h>
 #include <assert.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/ole32/compositemoniker.c

@@ -22,8 +22,10 @@
 #include <stdarg.h>
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/ole32/datacache.c

@@ -47,8 +47,10 @@
 #include <stdarg.h>
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/ole32/defaulthandler.c

@@ -49,6 +49,8 @@
 #include <stdarg.h>
 #include <string.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/ole32/filemoniker.c

@@ -22,8 +22,10 @@
 #include <stdarg.h>
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/ole32/ftmarshal.c

@@ -26,6 +26,8 @@
 #include <string.h>
 #include <assert.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "objbase.h"

dlls/ole32/git.c

@@ -26,14 +26,16 @@
 
 #include "config.h"
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
 #include <assert.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/ole32/hglobalstream.c

@@ -29,8 +29,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/ole32/ifs.c

@@ -26,6 +26,8 @@
 #include <string.h>
 #include <assert.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/ole32/itemmoniker.c

@@ -22,8 +22,10 @@
 #include <stdarg.h>
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"

dlls/ole32/marshal.c

@@ -26,6 +26,8 @@
 #include <string.h>
 #include <assert.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/ole32/memlockbytes.c

@@ -25,8 +25,10 @@
 #include <stdarg.h>
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/ole32/moniker.c

@@ -31,6 +31,8 @@
 #include <stdarg.h>
 #include <string.h>
 
+#define COBJMACROS
+
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"

dlls/ole32/ole2.c

@@ -28,8 +28,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/ole32/ole2impl.c

@@ -21,8 +21,10 @@
 #include <stdarg.h>
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/ole32/oleobj.c

@@ -22,6 +22,9 @@
 
 #include <stdarg.h>
 #include <string.h>
+
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/ole32/oleproxy.c

@@ -41,8 +41,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/ole32/rpc.c

@@ -26,8 +26,10 @@
 #include <string.h>
 #include <assert.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/ole32/stg_bigblockfile.c

@@ -38,8 +38,10 @@
 #include <string.h>
 #include <limits.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/ole32/stg_stream.c

@@ -29,8 +29,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/ole32/storage32.c

@@ -30,8 +30,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winnls.h"

dlls/oleaut32/connpt.c

@@ -25,6 +25,9 @@
 #include <assert.h>
 #include <stdarg.h>
 #include <string.h>
+
+#define COBJMACROS
+
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"

dlls/oleaut32/dispatch.c

@@ -28,6 +28,8 @@
 #include <stdio.h>
 #include <ctype.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "objbase.h"

dlls/oleaut32/oaidl_p.c

@@ -28,6 +28,8 @@
 
 #include <stdarg.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "objbase.h"

dlls/oleaut32/oleaut.c

@@ -21,6 +21,8 @@
 #include <stdarg.h>
 #include <string.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/oleaut32/olepicture.c

@@ -58,8 +58,10 @@
 # endif
 #endif
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"

dlls/oleaut32/tmarshal.c

@@ -30,8 +30,10 @@
 #include <stdio.h>
 #include <ctype.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"

dlls/oleaut32/typelib.c

@@ -61,8 +61,10 @@
 #include <stdio.h>
 #include <ctype.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"

dlls/oleaut32/typelib2.c

@@ -35,8 +35,10 @@
 #include <stdio.h>
 #include <ctype.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"

dlls/oleaut32/usrmarshal.c

@@ -22,8 +22,10 @@
 #include <stdarg.h>
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/quartz/enummoniker.c

@@ -21,9 +21,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define COM_NO_WINDOWS_H
 #include <stdarg.h>
 
+#define COBJMACROS
+#define COM_NO_WINDOWS_H
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/quartz/filtergraph.c

@@ -24,6 +24,8 @@
 #include "config.h"
 #include <stdarg.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/quartz/quartz_private.h

@@ -25,6 +25,8 @@
 
 #include <stdarg.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "wtypes.h"

dlls/rpcrt4/cproxy.c

@@ -23,6 +23,8 @@
 
 #include <stdarg.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/rpcrt4/cpsf.c

@@ -22,6 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/rpcrt4/cstub.c

@@ -20,6 +20,8 @@
 
 #include <stdarg.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/rpcrt4/ndr_midl.c

@@ -27,6 +27,8 @@
 #include <string.h>
 #include <assert.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/rpcrt4/ndr_ole.c

@@ -28,8 +28,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/shdocvw/shdocvw_main.c

@@ -20,10 +20,13 @@
 
 #include "config.h"
 
-#define COM_NO_WINDOWS_H
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
+
+#define COBJMACROS
+#define COM_NO_WINDOWS_H
+
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"

dlls/shell32/autocomplete.c

@@ -38,6 +38,9 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+
+#define COBJMACROS
+
 #include "wine/debug.h"
 #include "windef.h"
 #include "winbase.h"

dlls/shell32/brsfolder.c

@@ -23,8 +23,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "wine/debug.h"
 #include "undocshell.h"
 #include "shlguid.h"

dlls/shell32/cpanelfolder.c

@@ -26,8 +26,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"

dlls/shell32/dataobject.c

@@ -21,8 +21,10 @@
  */
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "wingdi.h"
 #include "pidl.h"

dlls/shell32/dragdrophelper.c

@@ -25,6 +25,8 @@
 #include <stdarg.h>
 #include <string.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"

dlls/shell32/enumidlist.c

@@ -21,6 +21,9 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+
+#define COBJMACROS
+
 #include "wine/debug.h"
 #include "windef.h"
 #include "winbase.h"

dlls/shell32/folders.c

@@ -25,6 +25,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/shell32/iconcache.c

@@ -27,6 +27,9 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/shell32/memorystream.c

@@ -29,6 +29,8 @@
 #include <stdarg.h>
 #include <string.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/shell32/pidl.c

@@ -30,8 +30,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"

dlls/shell32/shell32_main.c

@@ -26,6 +26,8 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/shell32/shelllink.c

@@ -38,6 +38,9 @@
 #ifdef HAVE_SYS_WAIT_H
 # include <sys/wait.h>
 #endif
+
+#define COBJMACROS
+
 #include "wine/debug.h"
 #include "winerror.h"
 #include "windef.h"

dlls/shell32/shellole.c

@@ -25,6 +25,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "shellapi.h"

dlls/shell32/shellord.c

@@ -24,6 +24,9 @@
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
+
+#define COBJMACROS
+
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"

dlls/shell32/shfldr_desktop.c

@@ -28,8 +28,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"

dlls/shell32/shfldr_fs.c

@@ -28,8 +28,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"

dlls/shell32/shfldr_mycomp.c

@@ -28,8 +28,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"

dlls/shell32/shlexec.c

@@ -32,6 +32,8 @@
 #include <ctype.h>
 #include <assert.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/shell32/shlfolder.c

@@ -30,6 +30,8 @@
 #include <stdarg.h>
 #include <stdio.h>
 
+#define COBJMACROS
+
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"

dlls/shell32/shlfsbind.c

@@ -24,6 +24,8 @@
 
 #include <stdarg.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"

dlls/shell32/shlmenu.c

@@ -21,6 +21,8 @@
 #include <stdarg.h>
 #include <string.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"

dlls/shell32/shv_bg_cmenu.c

@@ -20,8 +20,10 @@
  */
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "wine/debug.h"
 
 #include "windef.h"

dlls/shell32/shv_item_cmenu.c

@@ -20,8 +20,10 @@
 
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "winerror.h"
 #include "wine/debug.h"
 

dlls/shlwapi/clist.c

@@ -20,6 +20,8 @@
 #include <stdarg.h>
 #include <string.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "objbase.h"

dlls/shlwapi/istream.c

@@ -20,8 +20,10 @@
 #include <stdarg.h>
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"