Avoid including wine/obj_*.h files directly from C files.

dlls/commdlg/filedlg95.c

@@ -72,9 +72,9 @@
 #include "cderr.h"
 #include "shellapi.h"
 #include "shlguid.h"
+#include "shlobj.h"
 #include "filedlgbrowser.h"
 #include "shlwapi.h"
-#include "wine/obj_contextmenu.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 

dlls/commdlg/filedlgbrowser.c

@@ -36,7 +36,7 @@
 #include "filedlgbrowser.h"
 #include "cdlg.h"
 #include "shlguid.h"
-#include "wine/obj_serviceprovider.h"
+#include "servprov.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(commdlg);

dlls/devenum/devenum_private.h

@@ -31,7 +31,7 @@
 #define COM_NO_WINDOWS_H
 #include "ole2.h"
 #include "strmif.h"
-#include "wine/obj_property.h"
+#include "olectl.h"
 #include "wine/unicode.h"
 #include "uuids.h"
 

dlls/oleaut32/oleaut.c

@@ -29,7 +29,6 @@
 #include "ole2.h"
 #include "olectl.h"
 #include "oleauto.h"
-#include "wine/obj_olefont.h"
 
 #include "tmarshal.h"
 

dlls/oleaut32/olepicture.c

@@ -59,8 +59,6 @@
 #include "ole2.h"
 #include "olectl.h"
 #include "oleauto.h"
-#include "wine/obj_picture.h"
-#include "wine/obj_connection.h"
 #include "connpt.h"
 #include "wine/debug.h"
 

dlls/quartz/filtermapper.c

@@ -30,8 +30,8 @@
 
 #define COM_NO_WINDOWS_H
 #include "ole2.h"
+#include "olectl.h"
 #include "strmif.h"
-#include "wine/obj_property.h"
 #include "wine/unicode.h"
 #include "uuids.h"
 

dlls/shell32/shell32_main.h

@@ -25,11 +25,7 @@
 #include "commctrl.h"
 #include "docobj.h"
 #include "undocshell.h"
-#include "wine/obj_shellfolder.h"
-#include "wine/obj_contextmenu.h"
-#include "wine/obj_shellview.h"
-#include "wine/obj_shelllink.h"
-#include "wine/obj_extracticon.h"
+#include "shlobj.h"
 #include "wine/windef16.h"
 
 /*******************************************

dlls/shlwapi/ordinal.c

@@ -36,14 +36,12 @@
 #include "winbase.h"
 #include "ddeml.h"
 #include "shlobj.h"
+#include "olectl.h"
 #include "shellapi.h"
 #include "commdlg.h"
 #include "wine/unicode.h"
 #include "wine/obj_webbrowser.h"
-#include "wine/obj_serviceprovider.h"
-#include "wine/obj_control.h"
-#include "wine/obj_connection.h"
-#include "wine/obj_property.h"
+#include "servprov.h"
 #include "wingdi.h"
 #include "winreg.h"
 #include "winuser.h"

include/Makefile.in

@@ -260,7 +260,6 @@ WINE_INCLUDES = \
 	obj_oleview.h \
 	obj_picture.h \
 	obj_property.h \
-	obj_serviceprovider.h \
 	obj_shellbrowser.h \
 	obj_shellextinit.h \
 	obj_shellfolder.h \

include/wine/obj_serviceprovider.h

-/*
- * Defines the COM interfaces and APIs related to IServiceProvider
- *
- * Depends on 'obj_base.h'.
- *
- * Copyright (C) 2000 Juergen Schmied
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __WINE_WINE_OBJ_SERVICEPROVIDER_H
-#define __WINE_WINE_OBJ_SERVICEPROVIDER_H
-
-#include <objbase.h>
-#include <winbase.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* defined(__cplusplus) */
-
-/*****************************************************************************
- * Predeclare the interfaces
- */
-DEFINE_GUID(IID_IServiceProvider, 0x6d5140c1, 0x7436, 0x11ce, 0x80, 0x34, 0x00, 0xaa, 0x00, 0x60, 0x09, 0xfa);
-typedef struct IServiceProvider IServiceProvider, *LPSERVICEPROVIDER;
-
-
-/*****************************************************************************
- * IServiceProvider interface
- */
-#define INTERFACE IServiceProvider
-#define IServiceProvider_METHODS \
-    IUnknown_METHODS \
-    STDMETHOD(QueryService)(THIS_ REFGUID  guidService, REFIID  riid, void ** ppv) PURE;
-ICOM_DEFINE(IServiceProvider,IUnknown)
-#undef INTERFACE
-
-#ifdef COBJMACROS
-/*** IUnknown methods ***/
-#define IServiceProvider_QueryInterface(p,a,b)          (p)->lpVtbl->QueryInterface(p,a,b)
-#define IServiceProvider_AddRef(p)                      (p)->lpVtbl->AddRef(p)
-#define IServiceProvider_Release(p)                     (p)->lpVtbl->Release(p)
-/*** IServiceProvider methods ***/
-#define IServiceProvider_QueryService(p,a,b,c)          (p)->lpVtbl->QueryService(p,a,b,c)
-#endif
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* defined(__cplusplus) */
-
-#endif /* __WINE_WINE_OBJ_SERVICEPROVIDER_H */