corrected C headers

8 files changed, 113 insertions, 114 deletions

diff --git a/cppu/inc/typelib/typedescription.h b/cppu/inc/typelib/typedescription.h
index f7678954e412..206f3973b18a 100644
--- a/cppu/inc/typelib/typedescription.h
+++ b/cppu/inc/typelib/typedescription.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: typedescription.h,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-30 13:37:44 $
+ *  last change: $Author: dbo $ $Date: 2001-04-17 13:29:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,7 +79,7 @@ extern "C"
 {
 #endif
 
-typedef struct _typelib_TypeDescription typelib_TypeDescription;
+struct _typelib_TypeDescription;
 
 #ifdef SAL_W32
 #pragma pack(push, 8)
@@ -114,7 +114,7 @@ typedef struct _typelib_TypeDescriptionReference
     /** pointer to full typedescription; this value is only valid if
         the type is never swapped out<br>
     */
-    typelib_TypeDescription *           pType;
+    struct _typelib_TypeDescription *   pType;
     /** pointer to optimize the runtime; not for public use<br>
     */
     void *                              pUniqueIdentifier;
@@ -152,7 +152,7 @@ typedef struct _typelib_TypeDescription
     /** pointer to self to distinguish reference from description;
         for internal use only<br>
     */
-    typelib_TypeDescription *           pSelf;
+    struct _typelib_TypeDescription *   pSelf;
     /** pointer to optimize the runtime; not for public use<br>
     */
     void *                              pUniqueIdentifier;
@@ -182,8 +182,6 @@ typedef struct _typelib_TypeDescription
     sal_Bool                            bOnDemand;
 } typelib_TypeDescription;
 
-typedef struct _typelib_CompoundTypeDescription typelib_CompoundTypeDescription;
-
 /** Type description of a struct or exception.
     <br>
 */
@@ -195,7 +193,7 @@ typedef struct _typelib_CompoundTypeDescription
 
     /** pointer to base type description, else 0<br>
     */
-    typelib_CompoundTypeDescription *   pBaseTypeDescription;
+    struct _typelib_CompoundTypeDescription * pBaseTypeDescription;
 
     /** number of members<br>
     */
@@ -397,8 +395,6 @@ typedef struct _typelib_InterfaceAttributeTypeDescription
     typelib_TypeDescriptionReference *          pAttributeTypeRef;
 } typelib_InterfaceAttributeTypeDescription;
 
-typedef struct _typelib_InterfaceTypeDescription typelib_InterfaceTypeDescription;
-
 /** Type description of an interface.
     <br>
 */
@@ -410,7 +406,7 @@ typedef struct _typelib_InterfaceTypeDescription
 
     /** pointer to base type description, else 0<br>
     */
-    typelib_InterfaceTypeDescription *          pBaseTypeDescription;
+    struct _typelib_InterfaceTypeDescription *  pBaseTypeDescription;
     /** unique identifier of interface<br>
     */
     typelib_Uik                                 aUik;
diff --git a/cppu/inc/uno/any2.h b/cppu/inc/uno/any2.h
index 12f959759912..a72ef5fff160 100644
--- a/cppu/inc/uno/any2.h
+++ b/cppu/inc/uno/any2.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: any2.h,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: dbo $ $Date: 2001-03-28 10:46:06 $
+ *  last change: $Author: dbo $ $Date: 2001-04-17 13:29:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,7 +79,9 @@ extern "C"
 #pragma pack(8)
 #endif
 
-typedef struct _typelib_TypeDescription typelib_TypeDescription;
+struct _typelib_TypeDescriptionReference;
+struct _typelib_TypeDescription;
+struct _uno_Mapping;
 
 /** This is the binary specification of an UNO any.
     <br>
@@ -88,10 +90,10 @@ typedef struct _uno_Any
 {
     /** type of value<br>
     */
-    typelib_TypeDescriptionReference *  pType;
+    struct _typelib_TypeDescriptionReference * pType;
     /** pointer to value<br>
     */
-    void *                              pData;
+    void * pData;
 } uno_Any;
 
 #ifdef SAL_W32
@@ -111,7 +113,7 @@ typedef struct _uno_Any
 */
 void SAL_CALL uno_any_assign(
     uno_Any * pDest, void * pSource,
-    typelib_TypeDescription * pTypeDescr,
+    struct _typelib_TypeDescription * pTypeDescr,
     uno_AcquireFunc acquire, uno_ReleaseFunc release )
     SAL_THROW_EXTERN_C();
 /** Assign an any with a given value.
@@ -125,7 +127,7 @@ void SAL_CALL uno_any_assign(
 */
 void SAL_CALL uno_type_any_assign(
     uno_Any * pDest, void * pSource,
-    typelib_TypeDescriptionReference * pType,
+    struct _typelib_TypeDescriptionReference * pType,
     uno_AcquireFunc acquire, uno_ReleaseFunc release )
     SAL_THROW_EXTERN_C();
 
@@ -139,7 +141,7 @@ void SAL_CALL uno_type_any_assign(
 */
 void SAL_CALL uno_any_construct(
     uno_Any * pDest, void * pSource,
-    typelib_TypeDescription * pTypeDescr,
+    struct _typelib_TypeDescription * pTypeDescr,
     uno_AcquireFunc acquire )
     SAL_THROW_EXTERN_C();
 /** Constructs an any with a given value.
@@ -152,7 +154,7 @@ void SAL_CALL uno_any_construct(
 */
 void SAL_CALL uno_type_any_construct(
     uno_Any * pDest, void * pSource,
-    typelib_TypeDescriptionReference * pType,
+    struct _typelib_TypeDescriptionReference * pType,
     uno_AcquireFunc acquire )
     SAL_THROW_EXTERN_C();
 
@@ -165,8 +167,8 @@ void SAL_CALL uno_type_any_construct(
 */
 void SAL_CALL uno_any_constructAndConvert(
     uno_Any * pDest, void * pSource,
-    typelib_TypeDescription * pTypeDescr,
-    uno_Mapping * mapping )
+    struct _typelib_TypeDescription * pTypeDescr,
+    struct _uno_Mapping * mapping )
     SAL_THROW_EXTERN_C();
 /** Constructs an any with a given value and converts/ maps interfaces.
     <br>
@@ -177,8 +179,8 @@ void SAL_CALL uno_any_constructAndConvert(
 */
 void SAL_CALL uno_type_any_constructAndConvert(
     uno_Any * pDest, void * pSource,
-    typelib_TypeDescriptionReference * pType,
-    uno_Mapping * mapping )
+    struct _typelib_TypeDescriptionReference * pType,
+    struct _uno_Mapping * mapping )
     SAL_THROW_EXTERN_C();
 
 /** Destructs an any.
diff --git a/cppu/inc/uno/data.h b/cppu/inc/uno/data.h
index 6a7c0da5ba07..c5e8026f68f4 100644
--- a/cppu/inc/uno/data.h
+++ b/cppu/inc/uno/data.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: data.h,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: dbo $ $Date: 2001-03-28 10:46:06 $
+ *  last change: $Author: dbo $ $Date: 2001-04-17 13:29:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,10 +70,10 @@ extern "C"
 {
 #endif
 
-typedef struct _uno_Mapping uno_Mapping;
-typedef struct _typelib_TypeDescription typelib_TypeDescription;
-typedef struct _typelib_TypeDescriptionReference typelib_TypeDescriptionReference;
-typedef struct _typelib_InterfaceTypeDescription typelib_InterfaceTypeDescription;
+struct _typelib_TypeDescriptionReference;
+struct _typelib_TypeDescription;
+struct _typelib_InterfaceTypeDescription;
+struct _uno_Mapping;
 
 /** Generic function pointer declaration to query for an interface.
     <br>
@@ -82,7 +82,7 @@ typedef struct _typelib_InterfaceTypeDescription typelib_InterfaceTypeDescriptio
     @return interface pointer
 */
 typedef void * (SAL_CALL * uno_QueryInterfaceFunc)(
-    void * pInterface, typelib_TypeDescriptionReference * pType );
+    void * pInterface, struct _typelib_TypeDescriptionReference * pType );
 /** Generic function pointer declaration to acquire an interface.
     <br>
     @param pInterface interface to be acquired
@@ -108,8 +108,8 @@ typedef void (SAL_CALL * uno_ReleaseFunc)(
     @return true if values are equal
 */
 sal_Bool SAL_CALL uno_equalData(
-    void * pVal1, typelib_TypeDescription * pVal1TypeDescr,
-    void * pVal2, typelib_TypeDescription * pVal2TypeDescr,
+    void * pVal1, struct _typelib_TypeDescription * pVal1TypeDescr,
+    void * pVal2, struct _typelib_TypeDescription * pVal2TypeDescr,
     uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
     SAL_THROW_EXTERN_C();
 /** Tests if two values are equal. May compare different types (e.g., short to long).
@@ -124,8 +124,8 @@ sal_Bool SAL_CALL uno_equalData(
     @return true if values are equal
 */
 sal_Bool SAL_CALL uno_type_equalData(
-    void * pVal1, typelib_TypeDescriptionReference * pVal1Type,
-    void * pVal2, typelib_TypeDescriptionReference * pVal2Type,
+    void * pVal1, struct _typelib_TypeDescriptionReference * pVal1Type,
+    void * pVal2, struct _typelib_TypeDescriptionReference * pVal2Type,
     uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
     SAL_THROW_EXTERN_C();
 
@@ -139,7 +139,7 @@ sal_Bool SAL_CALL uno_type_equalData(
 */
 void SAL_CALL uno_copyData(
     void * pDest, void * pSource,
-    typelib_TypeDescription * pTypeDescr, uno_AcquireFunc acquire )
+    struct _typelib_TypeDescription * pTypeDescr, uno_AcquireFunc acquire )
     SAL_THROW_EXTERN_C();
 /** Copy construct memory with given value.
     The size of the destination value must be larger or equal to the size of the source value.
@@ -151,7 +151,7 @@ void SAL_CALL uno_copyData(
 */
 void SAL_CALL uno_type_copyData(
     void * pDest, void * pSource,
-    typelib_TypeDescriptionReference * pType, uno_AcquireFunc acquire )
+    struct _typelib_TypeDescriptionReference * pType, uno_AcquireFunc acquire )
     SAL_THROW_EXTERN_C();
 
 /** Copy construct memory with given value.
@@ -165,7 +165,7 @@ void SAL_CALL uno_type_copyData(
 */
 void SAL_CALL uno_copyAndConvertData(
     void * pDest, void * pSource,
-    typelib_TypeDescription * pTypeDescr, uno_Mapping * mapping )
+    struct _typelib_TypeDescription * pTypeDescr, struct _uno_Mapping * mapping )
     SAL_THROW_EXTERN_C();
 /** Copy construct memory with given value.
     The size of the destination value must be larger or equal to the size of the source value.<br>
@@ -178,7 +178,7 @@ void SAL_CALL uno_copyAndConvertData(
 */
 void SAL_CALL uno_type_copyAndConvertData(
     void * pDest, void * pSource,
-    typelib_TypeDescriptionReference * pType, uno_Mapping * mapping )
+    struct _typelib_TypeDescriptionReference * pType, struct _uno_Mapping * mapping )
     SAL_THROW_EXTERN_C();
 
 /** Destructs a given value; does <b>not</b> free its memory!
@@ -188,7 +188,7 @@ void SAL_CALL uno_type_copyAndConvertData(
     @param release          function called each time an interface pointer needs to be released; defaults (0) to uno
 */
 void SAL_CALL uno_destructData(
-    void * pValue, typelib_TypeDescription * pTypeDescr, uno_ReleaseFunc release )
+    void * pValue, struct _typelib_TypeDescription * pTypeDescr, uno_ReleaseFunc release )
     SAL_THROW_EXTERN_C();
 /** Destructs a given value; does <b>not</b> free its memory!
     <br>
@@ -197,7 +197,7 @@ void SAL_CALL uno_destructData(
     @param release          function called each time an interface pointer needs to be released; defaults (0) to uno
 */
 void SAL_CALL uno_type_destructData(
-    void * pValue, typelib_TypeDescriptionReference * pType, uno_ReleaseFunc release )
+    void * pValue, struct _typelib_TypeDescriptionReference * pType, uno_ReleaseFunc release )
     SAL_THROW_EXTERN_C();
 
 /** Default constructs a value. All simple types are set to 0, enums are set to their default
@@ -207,7 +207,7 @@ void SAL_CALL uno_type_destructData(
     @param pTypeDescr       type description of value to be constructed
 */
 void SAL_CALL uno_constructData(
-    void * pMem, typelib_TypeDescription * pTypeDescr )
+    void * pMem, struct _typelib_TypeDescription * pTypeDescr )
     SAL_THROW_EXTERN_C();
 /** Default constructs a value. All simple types are set to 0, enums are set to their default
     value.
@@ -216,7 +216,7 @@ void SAL_CALL uno_constructData(
     @param pType            type of value to be constructed
 */
 void SAL_CALL uno_type_constructData(
-    void * pMem, typelib_TypeDescriptionReference * pType )
+    void * pMem, struct _typelib_TypeDescriptionReference * pType )
     SAL_THROW_EXTERN_C();
 
 /** Assigns a destination value with a source value. Widening conversion
@@ -233,8 +233,8 @@ void SAL_CALL uno_type_constructData(
     @return true if destination has been successfully assigned
 */
 sal_Bool SAL_CALL uno_assignData(
-    void * pDest, typelib_TypeDescription * pDestTypeDescr,
-    void * pSource, typelib_TypeDescription * pSourceTypeDescr,
+    void * pDest, struct _typelib_TypeDescription * pDestTypeDescr,
+    void * pSource, struct _typelib_TypeDescription * pSourceTypeDescr,
     uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
     SAL_THROW_EXTERN_C();
 /** Assigns a destination value with a source value. Widening conversion
@@ -251,8 +251,8 @@ sal_Bool SAL_CALL uno_assignData(
     @return true if destination has been successfully assigned
 */
 sal_Bool SAL_CALL uno_type_assignData(
-    void * pDest, typelib_TypeDescriptionReference * pDestType,
-    void * pSource, typelib_TypeDescriptionReference * pSourceType,
+    void * pDest, struct _typelib_TypeDescriptionReference * pDestType,
+    void * pSource, struct _typelib_TypeDescriptionReference * pSourceType,
     uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
     SAL_THROW_EXTERN_C();
 
diff --git a/cppu/inc/uno/dispatcher.h b/cppu/inc/uno/dispatcher.h
index 8142b2423ff4..85a37d498ebf 100644
--- a/cppu/inc/uno/dispatcher.h
+++ b/cppu/inc/uno/dispatcher.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dispatcher.h,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dbo $ $Date: 2000-12-21 14:35:28 $
+ *  last change: $Author: dbo $ $Date: 2001-04-17 13:29:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,9 +77,8 @@ extern "C"
 {
 #endif
 
-typedef struct _typelib_TypeDescription typelib_TypeDescription;
-typedef struct _typelib_InterfaceTypeDescription typelib_InterfaceTypeDescription;
-typedef struct _uno_Interface uno_Interface;
+struct _typelib_TypeDescription;
+struct _uno_Interface;
 
 /** Function pointer declaration for the binary C uno dispatch function.<br>
     Any pure out or return value will be constructed by the callee, iff
@@ -98,8 +97,8 @@ typedef struct _uno_Interface uno_Interface;
     @param ppException   pointer to pointer to unconstructed any to signal an exception.
 */
 typedef void (SAL_CALL * uno_DispatchMethod)(
-    uno_Interface * pUnoI,
-    const typelib_TypeDescription * pMemberType,
+    struct _uno_Interface * pUnoI,
+    const struct _typelib_TypeDescription * pMemberType,
     void * pReturn,
     void * pArgs[],
     uno_Any ** ppException );
@@ -119,12 +118,12 @@ typedef struct _uno_Interface
         <br>
         @param pInterface uno interface
     */
-    void (SAL_CALL * acquire)( uno_Interface * pInterface );
+    void (SAL_CALL * acquire)( struct _uno_Interface * pInterface );
     /** Releases uno interface.
         <br>
         @param pInterface uno interface
     */
-    void (SAL_CALL * release)( uno_Interface * pInterface );
+    void (SAL_CALL * release)( struct _uno_Interface * pInterface );
     /** dispatch function
     */
     uno_DispatchMethod pDispatcher;
diff --git a/cppu/inc/uno/environment.h b/cppu/inc/uno/environment.h
index 8a073a5b8419..8025ad43178b 100644
--- a/cppu/inc/uno/environment.h
+++ b/cppu/inc/uno/environment.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: environment.h,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: dbo $ $Date: 2001-03-28 10:46:06 $
+ *  last change: $Author: dbo $ $Date: 2001-04-17 13:29:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,9 +73,8 @@ extern "C"
 {
 #endif
 
-typedef struct _uno_Environment uno_Environment;
-typedef struct _uno_ExtEnvironment uno_ExtEnvironment;
-typedef struct _typelib_InterfaceTypeDescription typelib_InterfaceTypeDescription;
+struct _uno_ExtEnvironment;
+struct _typelib_InterfaceTypeDescription;
 
 #ifdef SAL_W32
 #pragma pack(push, 8)
@@ -103,20 +102,20 @@ typedef struct _uno_Environment
 
     /** pointer to extended environment (interface registration functionality), if supported<br>
     */
-    uno_ExtEnvironment * pExtEnv;
+    struct _uno_ExtEnvironment * pExtEnv;
 
     /** Acquires this environment.
         <br>
         @param pEnv this environment
     */
-    void (SAL_CALL * acquire)( uno_Environment * pEnv );
+    void (SAL_CALL * acquire)( struct _uno_Environment * pEnv );
 
     /** Releases this environment;
         last release of environment will revoke the environment from runtime.
         <br>
         @param pEnv this environment
     */
-    void (SAL_CALL * release)( uno_Environment * pEnv );
+    void (SAL_CALL * release)( struct _uno_Environment * pEnv );
 
     /** Call this function to <b>explicitly</b> dispose this environment
         (e.g., release all interfaces).<br>
@@ -124,7 +123,7 @@ typedef struct _uno_Environment
         <br>
         @param pEnv this environment
     */
-    void (SAL_CALL * dispose)( uno_Environment * pEnv );
+    void (SAL_CALL * dispose)( struct _uno_Environment * pEnv );
 
     /* ===== the following part will be late initialized by a matching bridge ===== *
      * ===== and is NOT for public use.                                       ===== */
@@ -135,7 +134,7 @@ typedef struct _uno_Environment
         <br>
         @param pEnv environment that is being disposed
     */
-    void (SAL_CALL * environmentDisposing)( uno_Environment * pEnv );
+    void (SAL_CALL * environmentDisposing)( struct _uno_Environment * pEnv );
 } uno_Environment;
 
 /** Generic function pointer declaration to free a proxy object if it is not needed
@@ -148,7 +147,7 @@ typedef struct _uno_Environment
     @param pEnv environment
     @param pProxy proxy pointer
 */
-typedef void (SAL_CALL * uno_freeProxyFunc)( uno_ExtEnvironment * pEnv, void * pProxy );
+typedef void (SAL_CALL * uno_freeProxyFunc)( struct _uno_ExtEnvironment * pEnv, void * pProxy );
 
 /** Generic function pointer declaration to allocate memory. Used with getRegisteredInterfaces().
     <br>
@@ -174,10 +173,10 @@ typedef struct _uno_ExtEnvironment
         @param pTypeDescr   type description of interface
     */
     void (SAL_CALL * registerInterface)(
-        uno_ExtEnvironment * pEnv,
+        struct _uno_ExtEnvironment * pEnv,
         void ** ppInterface,
         rtl_uString * pOId,
-        typelib_InterfaceTypeDescription * pTypeDescr );
+        struct _typelib_InterfaceTypeDescription * pTypeDescr );
 
     /** Registers a proxy interface of this environment that can be reanimated and is
         freed <b>explicitly</b> by this environment.
@@ -189,11 +188,11 @@ typedef struct _uno_ExtEnvironment
         @param pTypeDescr   type description of interface
     */
     void (SAL_CALL * registerProxyInterface)(
-        uno_ExtEnvironment * pEnv,
+        struct _uno_ExtEnvironment * pEnv,
         void ** ppProxy,
         uno_freeProxyFunc freeProxy,
         rtl_uString * pOId,
-        typelib_InterfaceTypeDescription * pTypeDescr );
+        struct _typelib_InterfaceTypeDescription * pTypeDescr );
 
     /** Revokes an interface from this environment.<br>
         You have to revoke <b>any</b> interface that has been registered via this method.
@@ -202,7 +201,7 @@ typedef struct _uno_ExtEnvironment
         @param pInterface   interface to be revoked
     */
     void (SAL_CALL * revokeInterface)(
-        uno_ExtEnvironment * pEnv,
+        struct _uno_ExtEnvironment * pEnv,
         void * pInterface );
 
     /** Provides the object id of a given interface.
@@ -211,7 +210,7 @@ typedef struct _uno_ExtEnvironment
         @param pInterface   interface of object
     */
     void (SAL_CALL * getObjectIdentifier)(
-        uno_ExtEnvironment * pEnv,
+        struct _uno_ExtEnvironment * pEnv,
         rtl_uString ** ppOId,
         void * pInterface );
 
@@ -224,10 +223,10 @@ typedef struct _uno_ExtEnvironment
         @param pTypeDescr   type description of interface to be retrieved
     */
     void (SAL_CALL * getRegisteredInterface)(
-        uno_ExtEnvironment * pEnv,
+        struct _uno_ExtEnvironment * pEnv,
         void ** ppInterface,
         rtl_uString * pOId,
-        typelib_InterfaceTypeDescription * pTypeDescr );
+        struct _typelib_InterfaceTypeDescription * pTypeDescr );
 
     /** Returns all currently registered interfaces of this environment.
         The memory block allocated might be slightly larger than (*pnLen * sizeof(void *)).
@@ -238,7 +237,7 @@ typedef struct _uno_ExtEnvironment
         @param memAlloc     function for allocating memory that is passed back
     */
     void (SAL_CALL * getRegisteredInterfaces)(
-        uno_ExtEnvironment * pEnv,
+        struct _uno_ExtEnvironment * pEnv,
         void *** pppInterfaces,
         sal_Int32 * pnLen,
         uno_memAlloc memAlloc );
@@ -254,7 +253,7 @@ typedef struct _uno_ExtEnvironment
         @param pInterface   an interface
     */
     void (SAL_CALL * computeObjectIdentifier)(
-        uno_ExtEnvironment * pEnv,
+        struct _uno_ExtEnvironment * pEnv,
         rtl_uString ** ppOId, void * pInterface );
 
     /** Function to acquire an interface.
@@ -263,7 +262,7 @@ typedef struct _uno_ExtEnvironment
         @param pInterface   an interface
     */
     void (SAL_CALL * acquireInterface)(
-        uno_ExtEnvironment * pEnv,
+        struct _uno_ExtEnvironment * pEnv,
         void * pInterface );
 
     /** Function to release an interface.
@@ -272,7 +271,7 @@ typedef struct _uno_ExtEnvironment
         @param pInterface   an interface
     */
     void (SAL_CALL * releaseInterface)(
-        uno_ExtEnvironment * pEnv,
+        struct _uno_ExtEnvironment * pEnv,
         void * pInterface );
 
 } uno_ExtEnvironment;
diff --git a/cppu/inc/uno/mapping.h b/cppu/inc/uno/mapping.h
index ec4bd4a2c026..6fa1aa7a58fe 100644
--- a/cppu/inc/uno/mapping.h
+++ b/cppu/inc/uno/mapping.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: mapping.h,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: dbo $ $Date: 2001-03-28 10:46:06 $
+ *  last change: $Author: dbo $ $Date: 2001-04-17 13:29:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,9 +74,9 @@ extern "C"
 {
 #endif
 
-typedef struct _typelib_InterfaceTypeDescription typelib_InterfaceTypeDescription;
-typedef struct _uno_Mapping uno_Mapping;
-typedef struct _uno_Environment uno_Environment;
+struct _typelib_InterfaceTypeDescription;
+struct _uno_Mapping;
+struct _uno_Environment;
 
 /** Function pointer declaration to map an interface from one environment to another.
     <br>
@@ -86,9 +86,9 @@ typedef struct _uno_Environment uno_Environment;
     @param pInterfaceTypeDescr type description of the interface
 */
 typedef void (SAL_CALL * uno_MapInterfaceFunc)(
-    uno_Mapping * pMapping,
+    struct _uno_Mapping * pMapping,
     void ** ppOut, void * pInterface,
-    typelib_InterfaceTypeDescription * pInterfaceTypeDescr );
+    struct _typelib_InterfaceTypeDescription * pInterfaceTypeDescr );
 
 
 #ifdef SAL_W32
@@ -106,13 +106,13 @@ typedef struct _uno_Mapping
         <br>
         @param pMapping     mapping
     */
-    void (SAL_CALL * acquire)( uno_Mapping * pMapping );
+    void (SAL_CALL * acquire)( struct _uno_Mapping * pMapping );
     /** Releases mapping.
         The last release may unload bridges.
         <br>
         @param pMapping     mapping
     */
-    void (SAL_CALL * release)( uno_Mapping * pMapping );
+    void (SAL_CALL * release)( struct _uno_Mapping * pMapping );
 
     /** mapping function<br>
     */
@@ -135,9 +135,9 @@ typedef struct _uno_Mapping
     @param pAddPurpose  additional purpose of mapping (e.g., protocolling); defaults to 0 (none)
 */
 void SAL_CALL uno_getMapping(
-    uno_Mapping ** ppMapping,
-    uno_Environment * pFrom,
-    uno_Environment * pTo,
+    struct _uno_Mapping ** ppMapping,
+    struct _uno_Environment * pFrom,
+    struct _uno_Environment * pTo,
     rtl_uString * pAddPurpose )
     SAL_THROW_EXTERN_C();
 
@@ -149,9 +149,9 @@ void SAL_CALL uno_getMapping(
     @param pAddPurpose  additional purpose
 */
 typedef void (SAL_CALL * uno_getMappingFunc)(
-    uno_Mapping ** ppMapping,
-    uno_Environment * pFrom,
-    uno_Environment * pTo,
+    struct _uno_Mapping ** ppMapping,
+    struct _uno_Environment * pFrom,
+    struct _uno_Environment * pTo,
     rtl_uString * pAddPurpose );
 
 /** Registers a callback being called each time a mapping is demanded.
@@ -174,7 +174,7 @@ void SAL_CALL uno_revokeMappingCallback(
     <br>
     @param pMapping     mapping to be freed
 */
-typedef void (SAL_CALL * uno_freeMappingFunc)( uno_Mapping * pMapping );
+typedef void (SAL_CALL * uno_freeMappingFunc)( struct _uno_Mapping * pMapping );
 
 /** Registers a mapping.<br>
     A mapping registers itself on first acquire and revokes itself on last release.
@@ -188,8 +188,8 @@ typedef void (SAL_CALL * uno_freeMappingFunc)( uno_Mapping * pMapping );
     @param pAddPurpose  additional purpose string; defaults to 0
 */
 void SAL_CALL uno_registerMapping(
-    uno_Mapping ** ppMapping, uno_freeMappingFunc freeMapping,
-    uno_Environment * pFrom, uno_Environment * pTo, rtl_uString * pAddPurpose )
+    struct _uno_Mapping ** ppMapping, uno_freeMappingFunc freeMapping,
+    struct _uno_Environment * pFrom, struct _uno_Environment * pTo, rtl_uString * pAddPurpose )
     SAL_THROW_EXTERN_C();
 
 /** Revokes a mapping.<br>
@@ -198,7 +198,7 @@ void SAL_CALL uno_registerMapping(
     @param pMapping     mapping to be revoked
 */
 void SAL_CALL uno_revokeMapping(
-    uno_Mapping * pMapping )
+    struct _uno_Mapping * pMapping )
     SAL_THROW_EXTERN_C();
 
 /** Gets an interface mapping from one language environment to another by
@@ -212,7 +212,7 @@ void SAL_CALL uno_revokeMapping(
     @param pAddPurpose  additional purpose of mapping (e.g., protocolling); defaults to 0 (none)
 */
 void SAL_CALL uno_getMappingByName(
-    uno_Mapping ** ppMapping,
+    struct _uno_Mapping ** ppMapping,
     rtl_uString * pFrom,
     rtl_uString * pTo,
     rtl_uString * pAddPurpose )
@@ -229,9 +229,9 @@ void SAL_CALL uno_getMappingByName(
     @pTo                destination environment
 */
 typedef void (SAL_CALL * uno_ext_getMappingFunc)(
-    uno_Mapping ** ppMapping,
-    uno_Environment * pFrom,
-    uno_Environment * pTo );
+    struct _uno_Mapping ** ppMapping,
+    struct _uno_Environment * pFrom,
+    struct _uno_Environment * pTo );
 
 #ifdef __cplusplus
 }
diff --git a/cppu/inc/uno/mapping.hxx b/cppu/inc/uno/mapping.hxx
index f161cd9d975f..562fd1f2762a 100644
--- a/cppu/inc/uno/mapping.hxx
+++ b/cppu/inc/uno/mapping.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: mapping.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: dbo $ $Date: 2001-03-09 12:10:56 $
+ *  last change: $Author: dbo $ $Date: 2001-04-17 13:29:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,6 +80,7 @@
 typedef struct _typelib_TypeDescription typelib_TypeDescription;
 typedef struct _typelib_InterfaceTypeDescription typelib_InterfaceTypeDescription;
 typedef struct _uno_Interface uno_Interface;
+typedef struct _uno_Environment uno_Environment;
 
 /** */ //for docpp
 namespace com
diff --git a/cppu/inc/uno/sequence2.h b/cppu/inc/uno/sequence2.h
index 01ffbd3509bf..2eadf8fb3f42 100644
--- a/cppu/inc/uno/sequence2.h
+++ b/cppu/inc/uno/sequence2.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sequence2.h,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: dbo $ $Date: 2001-03-28 10:46:06 $
+ *  last change: $Author: dbo $ $Date: 2001-04-17 13:29:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,6 +73,8 @@ extern "C"
 {
 #endif
 
+struct _typelib_TypeDescriptionReference;
+struct _typelib_TypeDescription;
 typedef sal_Sequence uno_Sequence;
 
 /** Assign a sequence.
@@ -85,7 +87,7 @@ typedef sal_Sequence uno_Sequence;
 void SAL_CALL uno_sequence_assign(
     uno_Sequence ** ppDest,
     uno_Sequence * pSource,
-    typelib_TypeDescription * pTypeDescr,
+    struct _typelib_TypeDescription * pTypeDescr,
     uno_ReleaseFunc release )
     SAL_THROW_EXTERN_C();
 /** Assign a sequence.
@@ -98,7 +100,7 @@ void SAL_CALL uno_sequence_assign(
 void SAL_CALL uno_type_sequence_assign(
     uno_Sequence ** ppDest,
     uno_Sequence * pSource,
-    typelib_TypeDescriptionReference * pType,
+    struct _typelib_TypeDescriptionReference * pType,
     uno_ReleaseFunc release )
     SAL_THROW_EXTERN_C();
 
@@ -112,7 +114,7 @@ void SAL_CALL uno_type_sequence_assign(
 */
 void SAL_CALL uno_sequence_construct(
     uno_Sequence ** ppSequence,
-    typelib_TypeDescription * pTypeDescr,
+    struct _typelib_TypeDescription * pTypeDescr,
     void * pElements, sal_Int32 len,
     uno_AcquireFunc acquire )
     SAL_THROW_EXTERN_C();
@@ -126,7 +128,7 @@ void SAL_CALL uno_sequence_construct(
 */
 void SAL_CALL uno_type_sequence_construct(
     uno_Sequence ** ppSequence,
-    typelib_TypeDescriptionReference * pType,
+    struct _typelib_TypeDescriptionReference * pType,
     void * pElements, sal_Int32 len,
     uno_AcquireFunc acquire )
     SAL_THROW_EXTERN_C();
@@ -141,7 +143,7 @@ void SAL_CALL uno_type_sequence_construct(
 */
 void SAL_CALL uno_sequence_reference2One(
     uno_Sequence ** ppSequence,
-    typelib_TypeDescription * pTypeDescr,
+    struct _typelib_TypeDescription * pTypeDescr,
     uno_AcquireFunc acquire,
     uno_ReleaseFunc release )
     SAL_THROW_EXTERN_C();
@@ -155,7 +157,7 @@ void SAL_CALL uno_sequence_reference2One(
 */
 void SAL_CALL uno_type_sequence_reference2One(
     uno_Sequence ** ppSequence,
-    typelib_TypeDescriptionReference * pType,
+    struct _typelib_TypeDescriptionReference * pType,
     uno_AcquireFunc acquire,
     uno_ReleaseFunc release )
     SAL_THROW_EXTERN_C();
@@ -171,7 +173,7 @@ void SAL_CALL uno_type_sequence_reference2One(
 */
 void SAL_CALL uno_sequence_realloc(
     uno_Sequence ** ppSequence,
-    typelib_TypeDescription * pTypeDescr,
+    struct _typelib_TypeDescription * pTypeDescr,
     sal_Int32 nSize,
     uno_AcquireFunc acquire,
     uno_ReleaseFunc release )
@@ -187,7 +189,7 @@ void SAL_CALL uno_sequence_realloc(
 */
 void SAL_CALL uno_type_sequence_realloc(
     uno_Sequence ** ppSequence,
-    typelib_TypeDescriptionReference * pType,
+    struct _typelib_TypeDescriptionReference * pType,
     sal_Int32 nSize,
     uno_AcquireFunc acquire,
     uno_ReleaseFunc release )