--- orig/PS_ForwardC.h	2005-04-29 12:01:04.396555200 +0200
+++ PS_ForwardC.h	2005-05-25 15:19:21.321457600 +0200
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //

 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
@@ -61,11 +61,24 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */

+class TAO_ServantBase;
+class TAO_ServantBase_var;
+class TAO_Local_ServantBase;
+class TAO_Root_POA;
+class TAO_DynamicImplementation;
+
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48

 namespace PortableServer
 {
+    typedef TAO_ServantBase ServantBase;
+    struct RefCountServantBase {};
+    typedef TAO_ServantBase_var ServantBase_var;
+    typedef ServantBase *Servant;
+
+    typedef TAO_Local_ServantBase LocalServantBase;
+    typedef TAO_DynamicImplementation DynamicImplementation;

   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:472
@@ -113,27 +126,6 @@
 // Traits specializations.
 namespace TAO
 {
-
-#if !defined (_PORTABLESERVER_POA__TRAITS_CH_)
-#define _PORTABLESERVER_POA__TRAITS_CH_
-
-  template<>
-  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::POA>
-  {
-    static ::PortableServer::POA_ptr duplicate (
-        ::PortableServer::POA_ptr
-      );
-    static void release (
-        ::PortableServer::POA_ptr
-      );
-    static ::PortableServer::POA_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::PortableServer::POA_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
 }

 // TAO_IDL - Generated from