commit d2c034a8dc218bc00cbb93f76d07aea723ae9952
author Alexandre Julliard <julliard@winehq.org> Mon Dec 23 01:39:35 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Dec 23 01:39:35 2002 +0000
tree 43e8fe69e3b1d7cc9e97bb778f557a9047d1b420
parent 6e9ae17bf76a061afc44fef4165929cdecd186db

Removed some remaining references to wine/obj_base.h.

dlls/comcat/comcat_main.c

diff --git a/dlls/comcat/comcat_main.c b/dlls/comcat/comcat_main.c
index 48d7a4f..98def36 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"

dlls/comcat/comcat_private.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 e69f09d..2d8e3a2 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"
 
 /**********************************************************************

dlls/comcat/factory.c

diff --git a/dlls/comcat/factory.c b/dlls/comcat/factory.c
index 5e39e59..1a3f12c 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"
 

dlls/comcat/information.c

diff --git a/dlls/comcat/information.c b/dlls/comcat/information.c
index 81408c1..de0c010 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"
 

dlls/comcat/manager.c

diff --git a/dlls/comcat/manager.c b/dlls/comcat/manager.c
index 6cc9c9b..894529b 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"
 

dlls/comcat/register.c

diff --git a/dlls/comcat/register.c b/dlls/comcat/register.c
index 599c8f3..3b6dc57 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"
 

dlls/ole32/ifs.h

diff --git a/dlls/ole32/ifs.h b/dlls/ole32/ifs.h
index 8d6fe2c..8a6059b 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

dlls/shell32/enumidlist.c

diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c
index 23eee7b..e676834 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"