From d2c034a8dc218bc00cbb93f76d07aea723ae9952 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 23 Dec 2002 01:39:35 +0000
Subject: [PATCH] Removed some remaining references to wine/obj_base.h.

---
 dlls/comcat/comcat_main.c                  | 2 +-
 dlls/comcat/{comcat.h => comcat_private.h} | 4 +---
 dlls/comcat/factory.c                      | 2 +-
 dlls/comcat/information.c                  | 2 +-
 dlls/comcat/manager.c                      | 2 +-
 dlls/comcat/register.c                     | 2 +-
 dlls/ole32/ifs.h                           | 2 +-
 dlls/shell32/enumidlist.c                  | 3 +--
 include/comcat.h                           | 2 +-
 9 files changed, 9 insertions(+), 12 deletions(-)
 rename dlls/comcat/{comcat.h => comcat_private.h} (95%)

diff --git a/dlls/comcat/comcat_main.c b/dlls/comcat/comcat_main.c
index 48d7a4f3f4c..98def36f5a0 100644
--- a/dlls/comcat/comcat_main.c
+++ b/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"
diff --git a/dlls/comcat/comcat.h b/dlls/comcat/comcat_private.h
similarity index 95%
rename from dlls/comcat/comcat.h
rename to dlls/comcat/comcat_private.h
index e69f09d66ce..2d8e3a227fd 100644
--- a/dlls/comcat/comcat.h
+++ b/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"
 
 /**********************************************************************
diff --git a/dlls/comcat/factory.c b/dlls/comcat/factory.c
index 5e39e5946d9..1a3f12cc5c0 100644
--- a/dlls/comcat/factory.c
+++ b/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"
 
diff --git a/dlls/comcat/information.c b/dlls/comcat/information.c
index 81408c19223..de0c0103f98 100644
--- a/dlls/comcat/information.c
+++ b/dlls/comcat/information.c
@@ -19,7 +19,7 @@
  */
 
 #include <string.h>
-#include "comcat.h"
+#include "comcat_private.h"
 
 #include "wine/debug.h"
 
diff --git a/dlls/comcat/manager.c b/dlls/comcat/manager.c
index 6cc9c9ba0b0..894529bad4b 100644
--- a/dlls/comcat/manager.c
+++ b/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"
 
diff --git a/dlls/comcat/register.c b/dlls/comcat/register.c
index 599c8f39b5e..3b6dc57f5f2 100644
--- a/dlls/comcat/register.c
+++ b/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"
 
diff --git a/dlls/ole32/ifs.h b/dlls/ole32/ifs.h
index 8d6fe2cd054..8a6059b10c6 100644
--- a/dlls/ole32/ifs.h
+++ b/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
diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c
index 23eee7b5fcd..e6768344133 100644
--- a/dlls/shell32/enumidlist.c
+++ b/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"
diff --git a/include/comcat.h b/include/comcat.h
index 113003e4b61..7f238edec0a 100644
--- a/include/comcat.h
+++ b/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"