From 3116bd9f457d3553f82f4cf256d0bba7b031a944 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@codeweavers.com>
Date: Sat, 25 Nov 2000 03:08:23 +0000
Subject: [PATCH] compobj.h is a synonym for objbase.h Moved all the other
 contents to dlls/ole32/compobj_private.h

---
 dlls/ole32/compobj.c         |  2 +-
 dlls/ole32/compobj_private.h | 17 +++++++++++++++++
 dlls/ole32/filemoniker.c     |  2 ++
 dlls/ole32/moniker.c         |  2 ++
 include/compobj.h            | 14 ++------------
 5 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100644 dlls/ole32/compobj_private.h

diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index 3d0b3a4b6bb..88a4b212965 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -34,7 +34,7 @@
 
 #include "ole.h"
 #include "ifs.h"
-#include "compobj.h"
+#include "compobj_private.h"
 
 DEFAULT_DEBUG_CHANNEL(ole);
 
diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h
new file mode 100644
index 00000000000..e22057d5def
--- /dev/null
+++ b/dlls/ole32/compobj_private.h
@@ -0,0 +1,17 @@
+#ifndef __WINE_OLE_COMPOBJ_H
+#define __WINE_OLE_COMPOBJ_H
+
+/* All private prototype functions used by OLE will be added to this header file */
+
+#include "wtypes.h"
+
+/* This function initialize the Running Object Table */
+HRESULT WINAPI RunningObjectTableImpl_Initialize();
+
+/* This function uninitialize the Running Object Table */
+HRESULT WINAPI RunningObjectTableImpl_UnInitialize();
+
+/* This function decomposes a String path to a String Table containing all the elements ("\" or "subDirectory" or "Directory" or "FileName") of the path */
+int WINAPI FileMonikerImpl_DecomposePath(LPOLESTR str, LPOLESTR** stringTable);
+
+#endif /* __WINE_OLE_COMPOBJ_H */
diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c
index 7aa9f9f4c36..32f70ba469b 100644
--- a/dlls/ole32/filemoniker.c
+++ b/dlls/ole32/filemoniker.c
@@ -15,6 +15,8 @@
 #include "wine/obj_moniker.h"
 #include "wine/obj_base.h"
 
+#include "compobj_private.h"
+
 DEFAULT_DEBUG_CHANNEL(ole);
 
 /* filemoniker data structure */
diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c
index e868c283433..c8871f33699 100644
--- a/dlls/ole32/moniker.c
+++ b/dlls/ole32/moniker.c
@@ -18,6 +18,8 @@
 #include "heap.h"
 #include "ole2.h"
 
+#include "compobj_private.h"
+
 DEFAULT_DEBUG_CHANNEL(ole)
 
 #define  BLOCK_TAB_SIZE 20 /* represent the first size table and it's increment block size */
diff --git a/include/compobj.h b/include/compobj.h
index 779b3192f83..d42ac8fad37 100644
--- a/include/compobj.h
+++ b/include/compobj.h
@@ -1,17 +1,7 @@
 #ifndef __WINE_COMPOBJ_H
 #define __WINE_COMPOBJ_H
 
-/* All private prototye functions used by OLE will be added to this header file */
-
-#include "wtypes.h"
-
-/* This function initialize the Running Object Table */
-HRESULT WINAPI RunningObjectTableImpl_Initialize();
-
-/* This function uninitialize the Running Object Table */
-HRESULT WINAPI RunningObjectTableImpl_UnInitialize();
-
-/* This function decompose a String path to a String Table containing all the elements ("\" or "subDirectory" or "Directoy" or "FileName") of the path */
-int WINAPI FileMonikerImpl_DecomposePath(LPOLESTR str, LPOLESTR** stringTable);
+/* compobj.h is just a synonym for objbase.h */
+#include "objbase.h"
 
 #endif /* __WINE_COMPOBJ_H */