Removed some remaining references to wine/obj_base.h.

dlls/comcat/comcat_main.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "comcat.h"
+#include "comcat_private.h"
 #include "regsvr.h"
 
 #include "wine/debug.h"

dlls/comcat/comcat.h → dlls/comcat/comcat_private.h

@@ -25,9 +25,7 @@
 #include "winerror.h"
 
 #include "ole2.h"
-#include "wine/obj_base.h"
-#include "wine/obj_enumguid.h"
-#include "wine/obj_comcat.h"
+#include "comcat.h"
 #include "wine/unicode.h"
 
 /**********************************************************************

dlls/comcat/factory.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "comcat.h"
+#include "comcat_private.h"
 
 #include "wine/debug.h"
 

dlls/comcat/information.c

@@ -19,7 +19,7 @@
  */
 
 #include <string.h>
-#include "comcat.h"
+#include "comcat_private.h"
 
 #include "wine/debug.h"
 

dlls/comcat/manager.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "comcat.h"
+#include "comcat_private.h"
 
 #include "wine/debug.h"
 

dlls/comcat/register.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "comcat.h"
+#include "comcat_private.h"
 
 #include "wine/debug.h"
 

dlls/ole32/ifs.h

@@ -19,7 +19,7 @@
 #ifndef __WINE_OLE_IFS_H
 #define __WINE_OLE_IFS_H
 
-#include "wine/obj_base.h"
+#include "objbase.h"
 
 /***********************************************************************
  * IMalloc16 interface

dlls/shell32/enumidlist.c

@@ -25,8 +25,7 @@
 #include "undocshell.h"
 #include "shlwapi.h"
 #include "winerror.h"
-#include "wine/obj_base.h"
-#include "wine/obj_enumidlist.h"
+#include "objbase.h"
 
 #include "pidl.h"
 #include "shlguid.h"

include/comcat.h

@@ -28,7 +28,7 @@
 #ifndef __WINE_COMCAT_H
 #define __WINE_COMCAT_H
 
-#include "wine/obj_base.h"
+#include "unknwn.h"
 #include "wine/obj_enumguid.h"
 #include "wine/obj_comcat.h"