ChangeLogTag: Thu Apr 15 11:41:32 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

129 files changed, 7121 insertions, 6286 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 334cd4338ca..0fd7c504755 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,114 @@
+Thu Apr 15 11:41:32 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/BooleanSeqA.cpp:
+        * tao/BooleanSeqC.{h,cpp}:
+        * tao/BoundsA.cpp:
+        * tao/BoundsC.{h,cpp}:
+        * tao/CONV_FRAMEA.cpp:
+        * tao/CONV_FRAMEC.{h,cpp,i}:
+        * tao/CONV_FRAMES.i:
+        * tao/CONV_FRAMES_T.i:
+        * tao/CurrentA.cpp:
+        * tao/CurrentC.{h,cpp,i}:
+        * tao/DomainA.cpp:
+        * tao/DomainC.{h,cpp}:
+        * tao/DynamicParameterA.cpp:
+        * tao/DynamicParameterC.{h,cpp}:
+        * tao/DynamicA.cpp:
+        * tao/DynamicC.{h,cpp}:
+        * tao/FloatSeqA.cpp:
+        * tao/FloatSeqC.{h,cpp}:
+        * tao/IIOP_EndpointsA.cpp:
+        * tao/IIOP_EndpointsC.{h,cpp}:
+        * tao/IIOPA.cpp:
+        * tao/IIOPC.{h,cpp}:
+        * tao/IOP_CodecA.cpp:
+        * tao/IOP_CodecC.{h,cpp}:
+        * tao/IOP_IORA.cpp:
+        * tao/IOP_IORC.{h,cpp,i}:
+        * tao/IOPC.{h,cpp,i}:
+        * tao/IOPS_T.{h,cpp,i}:
+        * tao/Messaging_PolicyValueA.cpp:
+        * tao/Messaging_PolicyValueC.{h,cpp}:
+        * tao/Messaging_SyncScopeC.{h,cpp}:
+        * tao/Object_KeyC.cpp:
+        * tao/OctectSeqA.cpp:
+        * tao/OctectSeqC.{h,cpp,i}:
+        * tao/Policy_ForwardA.cpp:
+        * tao/Policy_ForwardC.{h,cpp}:
+        * tao/PolicyA.cpp:
+        * tao/PolicyC.{h,cpp}:
+        * tao/PolicyIntereceptorA.cpp:
+        * tao/PolicyIntereceptorC.{h,cpp}:
+        * tao/ServicesA.cpp:
+        * tao/ServicesC.{h,cpp,i}:
+        * tao/ServicesS.{h,cpp,i}:
+        * tao/ServicesS_T.{h,cpp,i}:
+        * tao/ShortSeqA.cpp:
+        * tao/ShortSeqC.{h,cpp}:
+        * tao/StringSeqA.cpp:
+        * tao/StringSeqA.{h,cpp}:
+        * tao/TAOA.cpp:
+        * tao/TAOC.{h,cpp,i}:
+        * tao/TimeBaseA.cpp:
+        * tao/TimeBaseC.{h,cpp,i}:
+        * tao/TimeBaseS.i:
+        * tao/TimeBaseS_T.{h,cpp,i}:
+        * tao/ULongSeqA.cpp:
+        * tao/ULongSeqC.{h,cpp}:
+        * tao/UShortSeqA.cpp:
+        * tao/UShortSeqC.{h,cpp}:
+        * tao/WrongTranstionA.cpp:
+        * tao/WrongTranstionC.{h,cpp}:
+          Regenerated these files. Typecodes are moved from the C.cpp to the
+          A.cpp file, tao/CDR.h is moved from the C.h to the C.cpp file.
+          Operator << and >> are moved from the C.i to the C.cpp file
+
+        * tao/Buffering_Constraint_Policy.cpp:
+          Include TAOC.h instead of TAOA.h because TAOA.h is removed
+
+        * tao/CONV_FRAMEA.h:
+        * tao/CurrentA.h:
+        * tao/IIOP_EndpointsA.h:
+        * tao/IIOP_EndpointsC.inl:
+        * tao/IIOPA.h:
+        * tao/IOP_IORA.h:
+        * tao/OctectSeqA.h:
+        * tao/ServicesA.h:
+        * tao/TAOA.h:
+        * tao/TimeBaseA.h:
+          Removed these files, these are obsolete
+
+        * tao/IIOP_Acceptor:
+        * tao/DynamicInterface/Request.h:
+        * tao/DynamicInterface/Server_Request.h:
+        * tao/PortableServer/PolicyS.cpp:
+        * tests/CDR/basic_types.cpp:
+        * tests/CDR/growth.cpp:
+        * tests/OctetSeq/OctetSeq.cpp:
+          Added include of tao/CDR.h
+
+        * tao/Incoming_Message_Queue.h:
+          Added include of ace/Message_Block.h
+
+        * tao/Makefile.tao:
+          Removed some files from the dependencies
+
+        * tao/Tagged_Profile.cpp:
+          Changed IOP::IOR::_profiles_seq to IOP::TaggedProfileSeq because
+          the classname generated by the idl compiler has been changed.
+
+        * tao/Transport.h:
+          Added include of ace/Time_Value.h
+
+        * tao/examples/Buffered_AMI/client.cpp:
+        * tao/examples/Buffered_Oneways/client.cpp:
+        * tao/tests/AMI_Buffering/client.cpp:
+        * tests/Oneway_Buffering/client.cpp:
+        * tests/Policies/Manipulation.cpp:
+        * tests/Timed_Buffered_Oneways/client.cpp:
+          Replaced include of tao/TAOA.h by tao/TAOC.h
+
 Thu Apr 15 07:11:21 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp
index 9ee04c74334..d28b3a8b7e5 100644
--- a/TAO/examples/Buffered_AMI/client.cpp
+++ b/TAO/examples/Buffered_AMI/client.cpp
@@ -15,12 +15,12 @@
 
 #include "testS.h"
 #include "tao/Messaging/Messaging.h"
-#include "tao/TAOA.h"
+#include "tao/TAOC.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 
-ACE_RCSID (Buffered_AMI, 
-           client, 
+ACE_RCSID (Buffered_AMI,
+           client,
            "$Id$")
 
 // Name of file contains ior.
diff --git a/TAO/examples/Buffered_Oneways/client.cpp b/TAO/examples/Buffered_Oneways/client.cpp
index b2115d05efd..dbf4cf89c7f 100644
--- a/TAO/examples/Buffered_Oneways/client.cpp
+++ b/TAO/examples/Buffered_Oneways/client.cpp
@@ -16,7 +16,6 @@
 #include "testC.h"
 #include "tao/Messaging/Messaging.h"
 #include "tao/TAOC.h"
-#include "tao/TAOA.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 
diff --git a/TAO/tao/BooleanSeqA.cpp b/TAO/tao/BooleanSeqA.cpp
index 3a8c880efe6..ea3718ffb63 100644
--- a/TAO/tao/BooleanSeqA.cpp
+++ b/TAO/tao/BooleanSeqA.cpp
@@ -30,6 +30,49 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_BooleanSeq[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f426f),
+  ACE_NTOHL (0x6f6c6561),
+  ACE_NTOHL (0x6e536571),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/BooleanSeq:1.0
+    11,
+  ACE_NTOHL (0x426f6f6c),
+  ACE_NTOHL (0x65616e53),
+  ACE_NTOHL (0x65710000),  // name = BooleanSeq
+    CORBA::tk_sequence, // typecode kind
+  12, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_boolean,
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_BooleanSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_BooleanSeq),
+    (char *) &_oc_CORBA_BooleanSeq,
+    0,
+    sizeof (CORBA::BooleanSeq)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_BooleanSeq =
+    &_tc_TAO_tc_CORBA_BooleanSeq;
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
diff --git a/TAO/tao/BooleanSeqC.cpp b/TAO/tao/BooleanSeqC.cpp
index c622dbeb513..c75130113a9 100644
--- a/TAO/tao/BooleanSeqC.cpp
+++ b/TAO/tao/BooleanSeqC.cpp
@@ -1,4 +1,4 @@
-    // -*- C++ -*-
+// -*- C++ -*-
 //
 // $Id$
 
@@ -30,6 +30,7 @@
 
 
 #include "BooleanSeqC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
@@ -49,7 +50,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_BOOLEANSEQ_CS_)
@@ -103,49 +104,6 @@ void CORBA::BooleanSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_BooleanSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f426f),
-  ACE_NTOHL (0x6f6c6561),
-  ACE_NTOHL (0x6e536571),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/BooleanSeq:1.0
-    11,
-  ACE_NTOHL (0x426f6f6c),
-  ACE_NTOHL (0x65616e53),
-  ACE_NTOHL (0x65710000),  // name = BooleanSeq
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_boolean,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_BooleanSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_BooleanSeq),
-    (char *) &_oc_CORBA_BooleanSeq,
-    0,
-    sizeof (CORBA::BooleanSeq)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_BooleanSeq =
-    &_tc_TAO_tc_CORBA_BooleanSeq;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_CORBA_BooleanSeq_CPP_
@@ -157,13 +115,13 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       return strm.write_boolean_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
-
+  
   return 0;
 }
 
@@ -173,7 +131,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -183,28 +141,28 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       return strm.read_boolean_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+    
     }
-
+  
   return 0;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_BooleanSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/BooleanSeqC.h b/TAO/tao/BooleanSeqC.h
index 4d3bfddc63d..8360886b3c3 100644
--- a/TAO/tao/BooleanSeqC.h
+++ b/TAO/tao/BooleanSeqC.h
@@ -40,7 +40,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
-#include "tao/CDR.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
diff --git a/TAO/tao/BoundsA.cpp b/TAO/tao/BoundsA.cpp
index 77b75bbe293..79fc72be634 100644
--- a/TAO/tao/BoundsA.cpp
+++ b/TAO/tao/BoundsA.cpp
@@ -30,6 +30,41 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_Bounds[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  29,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f426f),
+  ACE_NTOHL (0x756e6473),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Bounds:1.0
+    7,
+  ACE_NTOHL (0x426f756e),
+  ACE_NTOHL (0x64730000),  // name = Bounds
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_Bounds (
+    CORBA::tk_except,
+    sizeof (_oc_CORBA_Bounds),
+    (char *) &_oc_CORBA_Bounds,
+    0,
+    sizeof (CORBA::Bounds)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_Bounds =
+    &_tc_TAO_tc_CORBA_Bounds;
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp
index 34ab993ec43..30e960eb7e9 100644
--- a/TAO/tao/BoundsC.cpp
+++ b/TAO/tao/BoundsC.cpp
@@ -30,6 +30,7 @@
 
 
 #include "BoundsC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 #include "ace/OS_NS_string.h"
 
@@ -162,41 +163,6 @@ CORBA::TypeCode_ptr CORBA::Bounds::_type (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_Bounds[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  29,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f426f), 
-  ACE_NTOHL (0x756e6473), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Bounds:1.0
-    7,
-  ACE_NTOHL (0x426f756e), 
-  ACE_NTOHL (0x64730000),  // name = Bounds
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Bounds (
-    CORBA::tk_except,
-    sizeof (_oc_CORBA_Bounds),
-    (char *) &_oc_CORBA_Bounds,
-    0,
-    sizeof (CORBA::Bounds)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_Bounds =
-    &_tc_TAO_tc_CORBA_Bounds;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_exception/cdr_op_cs.cpp:60
 
 CORBA::Boolean operator<< (
@@ -224,7 +190,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/BoundsC.h b/TAO/tao/BoundsC.h
index 1aa1564b53e..87a84d49b3a 100644
--- a/TAO/tao/BoundsC.h
+++ b/TAO/tao/BoundsC.h
@@ -40,7 +40,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
-#include "tao/CDR.h"
 #include "tao/Environment.h"
 
 #if defined (TAO_EXPORT_MACRO)
diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp
index 3f145bc717d..cde985310cb 100644
--- a/TAO/tao/Buffering_Constraint_Policy.cpp
+++ b/TAO/tao/Buffering_Constraint_Policy.cpp
@@ -5,7 +5,7 @@
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
-#include "TAOA.h"
+#include "TAOC.h"
 
 ACE_RCSID(TAO, Buffering_Constraint_Policy, "$Id$")
 
diff --git a/TAO/tao/CONV_FRAMEA.cpp b/TAO/tao/CONV_FRAMEA.cpp
index d187c68384f..34dcdb62484 100644
--- a/TAO/tao/CONV_FRAMEA.cpp
+++ b/TAO/tao/CONV_FRAMEA.cpp
@@ -26,15 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "CONV_FRAMEC.h"
-#include "CONV_FRAMEA.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Dual_Impl_T.h"
-#include "tao/Typecode.h"
-
-// ==== Handcrafted
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_CONV_FRAME_CodeSetId[] =
 {
@@ -73,7 +69,71 @@ namespace CONV_FRAME
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CONV_FRAME_CodeSetIdSeq[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  40,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f4e56),
+  ACE_NTOHL (0x5f465241),
+  ACE_NTOHL (0x4d452f43),
+  ACE_NTOHL (0x6f646553),
+  ACE_NTOHL (0x65744964),
+  ACE_NTOHL (0x5365713a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetIdSeq:1.0
+    13,
+  ACE_NTOHL (0x436f6465),
+  ACE_NTOHL (0x53657449),
+  ACE_NTOHL (0x64536571),
+  ACE_NTOHL (0x0),  // name = CodeSetIdSeq
+    CORBA::tk_sequence, // typecode kind
+  84, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_alias, // typecode kind for typedefs
+    68, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      37,
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f4e56),
+      ACE_NTOHL (0x5f465241),
+      ACE_NTOHL (0x4d452f43),
+      ACE_NTOHL (0x6f646553),
+      ACE_NTOHL (0x65744964),
+      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
+            10,
+      ACE_NTOHL (0x436f6465),
+      ACE_NTOHL (0x53657449),
+      ACE_NTOHL (0x64000000),  // name = CodeSetId
+            CORBA::tk_ulong,
+
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CONV_FRAME_CodeSetIdSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CONV_FRAME_CodeSetIdSeq),
+    (char *) &_oc_CONV_FRAME_CodeSetIdSeq,
+    0,
+    sizeof (CONV_FRAME::CodeSetIdSeq)
+  );
+
+namespace CONV_FRAME
+{
+  ::CORBA::TypeCode_ptr _tc_CodeSetIdSeq =
+    &_tc_TAO_tc_CONV_FRAME_CodeSetIdSeq;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_CONV_FRAME_CodeSetComponent[] =
 {
@@ -130,31 +190,51 @@ static const CORBA::Long _oc_CONV_FRAME_CodeSetComponent[] =
   ACE_NTOHL (0x6f64655f),
   ACE_NTOHL (0x73657473),
   ACE_NTOHL (0x0),  // name = conversion_code_sets
-    CORBA::tk_sequence, // typecode kind
-  84, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
+  160, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    40,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f4e56),
+    ACE_NTOHL (0x5f465241),
+    ACE_NTOHL (0x4d452f43),
+    ACE_NTOHL (0x6f646553),
+    ACE_NTOHL (0x65744964),
+    ACE_NTOHL (0x5365713a),
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetIdSeq:1.0
+        13,
+    ACE_NTOHL (0x436f6465),
+    ACE_NTOHL (0x53657449),
+    ACE_NTOHL (0x64536571),
+    ACE_NTOHL (0x0),  // name = CodeSetIdSeq
+        CORBA::tk_sequence, // typecode kind
+    84, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      37,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f4e56),
-      ACE_NTOHL (0x5f465241),
-      ACE_NTOHL (0x4d452f43),
-      ACE_NTOHL (0x6f646553),
-      ACE_NTOHL (0x65744964),
-      ACE_NTOHL (0x3a312e30),
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-            10,
-      ACE_NTOHL (0x436f6465),
-      ACE_NTOHL (0x53657449),
-      ACE_NTOHL (0x64000000),  // name = CodeSetId
-            CORBA::tk_ulong,
+      CORBA::tk_alias, // typecode kind for typedefs
+      68, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        37,
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f4e56),
+        ACE_NTOHL (0x5f465241),
+        ACE_NTOHL (0x4d452f43),
+        ACE_NTOHL (0x6f646553),
+        ACE_NTOHL (0x65744964),
+        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
+                10,
+        ACE_NTOHL (0x436f6465),
+        ACE_NTOHL (0x53657449),
+        ACE_NTOHL (0x64000000),  // name = CodeSetId
+                CORBA::tk_ulong,
 
 
-    0U,
+      0U,
+
 
 };
 
@@ -173,7 +253,7 @@ namespace CONV_FRAME
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_CONV_FRAME_CodeSetComponentInfo[] =
 {
@@ -204,7 +284,7 @@ static const CORBA::Long _oc_CONV_FRAME_CodeSetComponentInfo[] =
   ACE_NTOHL (0x68617244),
   ACE_NTOHL (0x61746100),  // name = ForCharData
     CORBA::tk_struct, // typecode kind
-  296, // encapsulation length
+  372, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     44,
     ACE_NTOHL (0x49444c3a),
@@ -258,32 +338,52 @@ static const CORBA::Long _oc_CONV_FRAME_CodeSetComponentInfo[] =
     ACE_NTOHL (0x6f64655f),
     ACE_NTOHL (0x73657473),
     ACE_NTOHL (0x0),  // name = conversion_code_sets
-        CORBA::tk_sequence, // typecode kind
-    84, // encapsulation length
+        CORBA::tk_alias, // typecode kind for typedefs
+    160, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
+      40,
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f4e56),
+      ACE_NTOHL (0x5f465241),
+      ACE_NTOHL (0x4d452f43),
+      ACE_NTOHL (0x6f646553),
+      ACE_NTOHL (0x65744964),
+      ACE_NTOHL (0x5365713a),
+      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetIdSeq:1.0
+            13,
+      ACE_NTOHL (0x436f6465),
+      ACE_NTOHL (0x53657449),
+      ACE_NTOHL (0x64536571),
+      ACE_NTOHL (0x0),  // name = CodeSetIdSeq
+            CORBA::tk_sequence, // typecode kind
+      84, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
-        37,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f4e56),
-        ACE_NTOHL (0x5f465241),
-        ACE_NTOHL (0x4d452f43),
-        ACE_NTOHL (0x6f646553),
-        ACE_NTOHL (0x65744964),
-        ACE_NTOHL (0x3a312e30),
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-                10,
-        ACE_NTOHL (0x436f6465),
-        ACE_NTOHL (0x53657449),
-        ACE_NTOHL (0x64000000),  // name = CodeSetId
-                CORBA::tk_ulong,
+        CORBA::tk_alias, // typecode kind for typedefs
+        68, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          37,
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f4e56),
+          ACE_NTOHL (0x5f465241),
+          ACE_NTOHL (0x4d452f43),
+          ACE_NTOHL (0x6f646553),
+          ACE_NTOHL (0x65744964),
+          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
+                    10,
+          ACE_NTOHL (0x436f6465),
+          ACE_NTOHL (0x53657449),
+          ACE_NTOHL (0x64000000),  // name = CodeSetId
+                    CORBA::tk_ulong,
+
+
+        0U,
 
 
-      0U,
-
 
   13,
   ACE_NTOHL (0x466f7257),
@@ -291,7 +391,7 @@ static const CORBA::Long _oc_CONV_FRAME_CodeSetComponentInfo[] =
   ACE_NTOHL (0x44617461),
   ACE_NTOHL (0x0),  // name = ForWcharData
     CORBA::tk_struct, // typecode kind
-  296, // encapsulation length
+  372, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     44,
     ACE_NTOHL (0x49444c3a),
@@ -345,31 +445,51 @@ static const CORBA::Long _oc_CONV_FRAME_CodeSetComponentInfo[] =
     ACE_NTOHL (0x6f64655f),
     ACE_NTOHL (0x73657473),
     ACE_NTOHL (0x0),  // name = conversion_code_sets
-        CORBA::tk_sequence, // typecode kind
-    84, // encapsulation length
+        CORBA::tk_alias, // typecode kind for typedefs
+    160, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
+      40,
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f4e56),
+      ACE_NTOHL (0x5f465241),
+      ACE_NTOHL (0x4d452f43),
+      ACE_NTOHL (0x6f646553),
+      ACE_NTOHL (0x65744964),
+      ACE_NTOHL (0x5365713a),
+      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetIdSeq:1.0
+            13,
+      ACE_NTOHL (0x436f6465),
+      ACE_NTOHL (0x53657449),
+      ACE_NTOHL (0x64536571),
+      ACE_NTOHL (0x0),  // name = CodeSetIdSeq
+            CORBA::tk_sequence, // typecode kind
+      84, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
-        37,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f4e56),
-        ACE_NTOHL (0x5f465241),
-        ACE_NTOHL (0x4d452f43),
-        ACE_NTOHL (0x6f646553),
-        ACE_NTOHL (0x65744964),
-        ACE_NTOHL (0x3a312e30),
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
-                10,
-        ACE_NTOHL (0x436f6465),
-        ACE_NTOHL (0x53657449),
-        ACE_NTOHL (0x64000000),  // name = CodeSetId
-                CORBA::tk_ulong,
-
+        CORBA::tk_alias, // typecode kind for typedefs
+        68, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          37,
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f4e56),
+          ACE_NTOHL (0x5f465241),
+          ACE_NTOHL (0x4d452f43),
+          ACE_NTOHL (0x6f646553),
+          ACE_NTOHL (0x65744964),
+          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CONV_FRAME/CodeSetId:1.0
+                    10,
+          ACE_NTOHL (0x436f6465),
+          ACE_NTOHL (0x53657449),
+          ACE_NTOHL (0x64000000),  // name = CodeSetId
+                    CORBA::tk_ulong,
+
+
+        0U,
 
-      0U,
 
 
 };
@@ -389,7 +509,7 @@ namespace CONV_FRAME
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_CONV_FRAME_CodeSetContext[] =
 {
@@ -479,7 +599,65 @@ namespace CONV_FRAME
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CONV_FRAME::CodeSetIdSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetIdSeq>::insert_copy (
+      _tao_any,
+      CONV_FRAME::CodeSetIdSeq::_tao_any_destructor,
+      CONV_FRAME::_tc_CodeSetIdSeq,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CONV_FRAME::CodeSetIdSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetIdSeq>::insert (
+      _tao_any,
+      CONV_FRAME::CodeSetIdSeq::_tao_any_destructor,
+      CONV_FRAME::_tc_CodeSetIdSeq,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CONV_FRAME::CodeSetIdSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const CONV_FRAME::CodeSetIdSeq *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CONV_FRAME::CodeSetIdSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetIdSeq>::extract (
+        _tao_any,
+        CONV_FRAME::CodeSetIdSeq::_tao_any_destructor,
+        CONV_FRAME::_tc_CodeSetIdSeq,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -537,7 +715,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -595,7 +773,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -658,6 +836,11 @@ CORBA::Boolean operator>>= (
 
   template class
     TAO::Any_Dual_Impl_T<
+        CONV_FRAME::CodeSetIdSeq
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
         CONV_FRAME::CodeSetComponent
       >;
 
@@ -675,6 +858,11 @@ CORBA::Boolean operator>>= (
 
 # pragma instantiate \
     TAO::Any_Dual_Impl_T< \
+        CONV_FRAME::CodeSetIdSeq \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
         CONV_FRAME::CodeSetComponent \
       >
 
@@ -689,3 +877,4 @@ CORBA::Boolean operator>>= (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/CONV_FRAMEA.h b/TAO/tao/CONV_FRAMEA.h
deleted file mode 100644
index ee673eadc2b..00000000000
--- a/TAO/tao/CONV_FRAMEA.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:848
-
-#ifndef _TAO_IDL_ORIG_CONV_FRAMEA_ANYOP_H_
-#define _TAO_IDL_ORIG_CONV_FRAMEA_ANYOP_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-// ==== Handcrafted
-namespace CONV_FRAME
-{
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetId;
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponent;
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponentInfo;
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetContext;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetComponent &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetComponent*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetComponent *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetComponent *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetComponentInfo &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetComponentInfo*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetComponentInfo *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetComponentInfo *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetContext &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetContext*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetContext *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetContext *&);
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp
index 93cc0d304c8..75f6db7ecbf 100644
--- a/TAO/tao/CONV_FRAMEC.cpp
+++ b/TAO/tao/CONV_FRAMEC.cpp
@@ -26,9 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:338
+// be\be_codegen.cpp:323
+
 
 #include "CONV_FRAMEC.h"
+#include "tao/CDR.h"
+#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -39,36 +42,24 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:62
+// be\be_visitor_arg_traits.cpp:64
 
 // Arg traits specializations.
 namespace TAO
 {
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/structure_cs.cpp:66
 
-void
-CONV_FRAME::CodeSetComponent::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  CodeSetComponent *_tao_tmp_pointer =
-    ACE_static_cast (CodeSetComponent *, _tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CONV_FRAME_CODESETID__CS_)
-#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CONV_FRAME_CODESETID__CS_
+#if !defined (_CONV_FRAME_CODESETIDSEQ_CS_)
+#define _CONV_FRAME_CODESETIDSEQ_CS_
 
-CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_::_tao_seq_CONV_FRAME_CodeSetId_ (void)
+CONV_FRAME::CodeSetIdSeq::CodeSetIdSeq (void)
 {}
 
-CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_::_tao_seq_CONV_FRAME_CodeSetId_ (
+CONV_FRAME::CodeSetIdSeq::CodeSetIdSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
@@ -77,7 +68,7 @@ CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_::_tao_seq_CONV_FRAM
     (max)
 {}
 
-CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_::_tao_seq_CONV_FRAME_CodeSetId_ (
+CONV_FRAME::CodeSetIdSeq::CodeSetIdSeq (
     CORBA::ULong max,
     CORBA::ULong length,
     CORBA::ULong * buffer,
@@ -89,8 +80,8 @@ CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_::_tao_seq_CONV_FRAM
     (max, length, buffer, release)
 {}
 
-CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_::_tao_seq_CONV_FRAME_CodeSetId_ (
-    const _tao_seq_CONV_FRAME_CodeSetId_ &seq
+CONV_FRAME::CodeSetIdSeq::CodeSetIdSeq (
+    const CodeSetIdSeq &seq
   )
   : TAO_Unbounded_Sequence<
         CONV_FRAME::CodeSetId
@@ -98,17 +89,37 @@ CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_::_tao_seq_CONV_FRAM
     (seq)
 {}
 
-CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_::~_tao_seq_CONV_FRAME_CodeSetId_ (void)
+CONV_FRAME::CodeSetIdSeq::~CodeSetIdSeq (void)
 {}
 
+void CONV_FRAME::CodeSetIdSeq::_tao_any_destructor (
+    void * _tao_void_pointer
+  )
+{
+  CodeSetIdSeq * _tao_tmp_pointer =
+    ACE_static_cast (CodeSetIdSeq *, _tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/structure_cs.cpp:66
 
+void 
+CONV_FRAME::CodeSetComponent::_tao_any_destructor (
+    void *_tao_void_pointer
+  )
+{
+  CodeSetComponent *_tao_tmp_pointer =
+    ACE_static_cast (CodeSetComponent *, _tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/structure_cs.cpp:66
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -118,10 +129,10 @@ CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/structure_cs.cpp:66
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 CONV_FRAME::CodeSetContext::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -132,34 +143,34 @@ CONV_FRAME::CodeSetContext::_tao_any_destructor (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:95
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
-#if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CONV_FRAME_CodeSetId__CPP_
-#define _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CONV_FRAME_CodeSetId__CPP_
+#if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetIdSeq_CPP_
+#define _TAO_CDR_OP_CONV_FRAME_CodeSetIdSeq_CPP_
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_ &_tao_sequence
+    const CONV_FRAME::CodeSetIdSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
-
+  
   return 0;
 }
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_ &_tao_sequence
+    CONV_FRAME::CodeSetIdSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -169,32 +180,120 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+    
     }
-
+  
   return 0;
 }
 
-#endif /* _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CONV_FRAME_CodeSetId__CPP_ */
+#endif /* _TAO_CDR_OP_CONV_FRAME_CodeSetIdSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1725
+// be\be_visitor_structure/cdr_op_cs.cpp:61
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CONV_FRAME::CodeSetComponent &_tao_aggregate
+  )
+{
+  return
+    (strm << _tao_aggregate.native_code_set) &&
+    (strm << _tao_aggregate.conversion_code_sets);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CONV_FRAME::CodeSetComponent &_tao_aggregate
+  )
+{
+  return
+    (strm >> _tao_aggregate.native_code_set) &&
+    (strm >> _tao_aggregate.conversion_code_sets);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/cdr_op_cs.cpp:61
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CONV_FRAME::CodeSetComponentInfo &_tao_aggregate
+  )
+{
+  return
+    (strm << _tao_aggregate.ForCharData) &&
+    (strm << _tao_aggregate.ForWcharData);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CONV_FRAME::CodeSetComponentInfo &_tao_aggregate
+  )
+{
+  return
+    (strm >> _tao_aggregate.ForCharData) &&
+    (strm >> _tao_aggregate.ForWcharData);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/cdr_op_cs.cpp:61
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CONV_FRAME::CodeSetContext &_tao_aggregate
+  )
+{
+  return
+    (strm << _tao_aggregate.char_data) &&
+    (strm << _tao_aggregate.wchar_data);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CONV_FRAME::CodeSetContext &_tao_aggregate
+  )
+{
+  return
+    (strm >> _tao_aggregate.char_data) &&
+    (strm >> _tao_aggregate.wchar_data);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
+    TAO_FixedSeq_Var_T<
+        CONV_FRAME::CodeSetIdSeq,
+        CONV_FRAME::CodeSetId
+      >;
+
+  template class
+    TAO_Seq_Var_Base_T<
+        CONV_FRAME::CodeSetIdSeq,
+        CONV_FRAME::CodeSetId
+      >;
+
+  template class
+    TAO_Seq_Out_T<
+        CONV_FRAME::CodeSetIdSeq,
+        CONV_FRAME::CodeSetIdSeq_var,
+        CONV_FRAME::CodeSetId
+      >;
+
+  template class
     TAO_Var_Var_T<
         CONV_FRAME::CodeSetComponent
       >;
@@ -239,6 +338,25 @@ CORBA::Boolean operator>> (
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate \
+    TAO_FixedSeq_Var_T< \
+        CONV_FRAME::CodeSetIdSeq, \
+        CONV_FRAME::CodeSetId \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Var_Base_T< \
+        CONV_FRAME::CodeSetIdSeq, \
+        CONV_FRAME::CodeSetId \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Out_T< \
+        CONV_FRAME::CodeSetIdSeq, \
+        CONV_FRAME::CodeSetIdSeq_var, \
+        CONV_FRAME::CodeSetId \
+      >
+
+# pragma instantiate \
     TAO_Var_Var_T< \
         CONV_FRAME::CodeSetComponent \
       >
@@ -280,4 +398,5 @@ CORBA::Boolean operator>> (
         CONV_FRAME::CodeSetContext \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h
index 53ef6f72b0a..250170cfbcf 100644
--- a/TAO/tao/CONV_FRAMEC.h
+++ b/TAO/tao/CONV_FRAMEC.h
@@ -26,20 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:186
+// be\be_codegen.cpp:171
 
 #ifndef _TAO_IDL_ORIG_CONV_FRAMEC_H_
 #define _TAO_IDL_ORIG_CONV_FRAMEC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/CDR.h"
+#include "tao/Environment.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Sequence.h"
+#include "tao/TAO_Export.h"
+#include "tao/Sequence_T.h"
+#include "tao/Seq_Var_T.h"
+#include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -66,146 +69,184 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace CONV_FRAME
 {
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:342
-
+  // be\be_visitor_typedef/typedef_ch.cpp:342
+  
   typedef CORBA::ULong CodeSetId;
   typedef CORBA::ULong_out CodeSetId_out;
-
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetId;
+  
   // TAO_IDL - Generated from
-  // be/be_type.cpp:258
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
-  struct CodeSetComponent;
+#if !defined (_CONV_FRAME_CODESETIDSEQ_CH_)
+#define _CONV_FRAME_CODESETIDSEQ_CH_
+  
+  class CodeSetIdSeq;
+  
+  typedef
+    TAO_FixedSeq_Var_T<
+        CodeSetIdSeq,
+        CodeSetId
+      >
+    CodeSetIdSeq_var;
+  
+  typedef
+    TAO_Seq_Out_T<
+        CodeSetIdSeq,
+        CodeSetIdSeq_var,
+        CodeSetId
+      >
+    CodeSetIdSeq_out;
+  
+  class TAO_Export CodeSetIdSeq
+    : public
+        TAO_Unbounded_Sequence<
+            CodeSetId
+          >
+  {
+  public:
+    CodeSetIdSeq (void);
+    CodeSetIdSeq (CORBA::ULong max);
+    CodeSetIdSeq (
+        CORBA::ULong max,
+        CORBA::ULong length,
+        CORBA::ULong* buffer, 
+        CORBA::Boolean release = 0
+      );
+    CodeSetIdSeq (const CodeSetIdSeq &);
+    ~CodeSetIdSeq (void);
+    
+    static void _tao_any_destructor (void *);
+    
+    typedef CodeSetIdSeq_var _var_type;
+  };
 
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetIdSeq;
+  
+  // TAO_IDL - Generated from
+  // be\be_type.cpp:258
+  
+  struct CodeSetComponent;
+  
   typedef
     TAO_Var_Var_T<
         CodeSetComponent
       >
     CodeSetComponent_var;
-
+  
   typedef
     TAO_Out_T<
         CodeSetComponent,
         CodeSetComponent_var
       >
     CodeSetComponent_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
-
+  // be\be_visitor_structure/structure_ch.cpp:52
+  
   struct TAO_Export CodeSetComponent
   {
     typedef CodeSetComponent_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     CONV_FRAME::CodeSetId native_code_set;
-
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CONV_FRAME_CODESETID__CH_)
-#define _CONV_FRAME_CODESETCOMPONENT__TAO_SEQ_CONV_FRAME_CODESETID__CH_
-
-    class TAO_Export _tao_seq_CONV_FRAME_CodeSetId_
-      : public
-          TAO_Unbounded_Sequence<
-              ACE_NESTED_CLASS (CONV_FRAME, CodeSetId)
-            >
-    {
-    public:
-      _tao_seq_CONV_FRAME_CodeSetId_ (void);
-      _tao_seq_CONV_FRAME_CodeSetId_ (CORBA::ULong max);
-      _tao_seq_CONV_FRAME_CodeSetId_ (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          CORBA::ULong* buffer,
-          CORBA::Boolean release = 0
-        );
-      _tao_seq_CONV_FRAME_CodeSetId_ (const _tao_seq_CONV_FRAME_CodeSetId_ &);
-      ~_tao_seq_CONV_FRAME_CodeSetId_ (void);
-    };
-
-#endif /* end #if !defined */
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_field/field_ch.cpp:453
-
-    typedef _tao_seq_CONV_FRAME_CodeSetId_ _conversion_code_sets_seq;
-    _tao_seq_CONV_FRAME_CodeSetId_ conversion_code_sets;
+    CONV_FRAME::CodeSetIdSeq conversion_code_sets;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_type.cpp:258
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponent;
+  
+  // TAO_IDL - Generated from
+  // be\be_type.cpp:258
+  
   struct CodeSetComponentInfo;
-
+  
   typedef
     TAO_Var_Var_T<
         CodeSetComponentInfo
       >
     CodeSetComponentInfo_var;
-
+  
   typedef
     TAO_Out_T<
         CodeSetComponentInfo,
         CodeSetComponentInfo_var
       >
     CodeSetComponentInfo_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
-
+  // be\be_visitor_structure/structure_ch.cpp:52
+  
   struct TAO_Export CodeSetComponentInfo
   {
     typedef CodeSetComponentInfo_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     CONV_FRAME::CodeSetComponent ForCharData;
     CONV_FRAME::CodeSetComponent ForWcharData;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_type.cpp:258
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetComponentInfo;
+  
+  // TAO_IDL - Generated from
+  // be\be_type.cpp:258
+  
   struct CodeSetContext;
-
+  
   typedef
     TAO_Fixed_Var_T<
         CodeSetContext
       >
     CodeSetContext_var;
-
+  
   typedef
     CodeSetContext &
     CodeSetContext_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
-
+  // be\be_visitor_structure/structure_ch.cpp:52
+  
   struct TAO_Export CodeSetContext
   {
     typedef CodeSetContext_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     CONV_FRAME::CodeSetId char_data;
     CONV_FRAME::CodeSetId wchar_data;
   };
-
-
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodeSetContext;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module CONV_FRAME
 
 // TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -213,52 +254,74 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
-#ifndef __ACE_INLINE__
+TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetIdSeq &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetIdSeq*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetIdSeq *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetIdSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:53
+// be\be_visitor_structure/any_op_ch.cpp:52
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSetComponent &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetComponent &);
+TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetComponent &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetComponent*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetComponent *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetComponent *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:70
+// be\be_visitor_structure/any_op_ch.cpp:52
 
-#if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CONV_FRAME_CodeSetId__H_
-#define _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CONV_FRAME_CodeSetId__H_
+TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetComponentInfo &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetComponentInfo*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetComponentInfo *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetComponentInfo *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetContext &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetContext*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetContext *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetContext *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
+
+#if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetIdSeq_H_
+#define _TAO_CDR_OP_CONV_FRAME_CodeSetIdSeq_H_
 
 TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_ &
+    const CONV_FRAME::CodeSetIdSeq &
   );
 TAO_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_ &
+    CONV_FRAME::CodeSetIdSeq &
   );
 
-#endif /* _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CONV_FRAME_CodeSetId__H_ */
+#endif /* _TAO_CDR_OP_CONV_FRAME_CodeSetIdSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:53
+// be\be_visitor_structure/cdr_op_ch.cpp:54
+
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSetComponent &);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetComponent &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSetComponentInfo &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetComponentInfo &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:53
+// be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSetContext &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
-
-#endif /* __ACE_INLINE__ */
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1050
+// be\be_codegen.cpp:978
 
 #if defined (__ACE_INLINE__)
 #include "CONV_FRAMEC.i"
@@ -275,3 +338,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/CONV_FRAMEC.i b/TAO/tao/CONV_FRAMEC.i
index 6f4c248feeb..38aa32569ba 100644
--- a/TAO/tao/CONV_FRAMEC.i
+++ b/TAO/tao/CONV_FRAMEC.i
@@ -26,96 +26,3 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:81
-
-#if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CONV_FRAME_CodeSetId__I_
-#define _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CONV_FRAME_CodeSetId__I_
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_ &
-  );
-
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    CONV_FRAME::CodeSetComponent::_tao_seq_CONV_FRAME_CodeSetId_ &
-  );
-
-#endif /* _TAO_CDR_OP_CONV_FRAME_CodeSetComponent__tao_seq_CONV_FRAME_CodeSetId__I_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:70
-
-ACE_INLINE
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CONV_FRAME::CodeSetComponent &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.native_code_set) &&
-    (strm << _tao_aggregate.conversion_code_sets);
-}
-
-ACE_INLINE
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CONV_FRAME::CodeSetComponent &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.native_code_set) &&
-    (strm >> _tao_aggregate.conversion_code_sets);
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:70
-
-ACE_INLINE
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CONV_FRAME::CodeSetComponentInfo &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.ForCharData) &&
-    (strm << _tao_aggregate.ForWcharData);
-}
-
-ACE_INLINE
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CONV_FRAME::CodeSetComponentInfo &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.ForCharData) &&
-    (strm >> _tao_aggregate.ForWcharData);
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:70
-
-ACE_INLINE
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CONV_FRAME::CodeSetContext &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.char_data) &&
-    (strm << _tao_aggregate.wchar_data);
-}
-
-ACE_INLINE
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CONV_FRAME::CodeSetContext &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.char_data) &&
-    (strm >> _tao_aggregate.wchar_data);
-}
-
diff --git a/TAO/tao/CONV_FRAMES.i b/TAO/tao/CONV_FRAMES.i
index cfa1da318d3..1d2df31bd57 100644
--- a/TAO/tao/CONV_FRAMES.i
+++ b/TAO/tao/CONV_FRAMES.i
@@ -1 +1,26 @@
+// -*- C++ -*-
+//
 // $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
diff --git a/TAO/tao/CONV_FRAMES_T.i b/TAO/tao/CONV_FRAMES_T.i
index cfa1da318d3..38aa32569ba 100644
--- a/TAO/tao/CONV_FRAMES_T.i
+++ b/TAO/tao/CONV_FRAMES_T.i
@@ -1 +1,28 @@
+// -*- C++ -*-
+//
 // $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+
diff --git a/TAO/tao/CurrentA.cpp b/TAO/tao/CurrentA.cpp
index 943e5880f5e..fddfbcae045 100644
--- a/TAO/tao/CurrentA.cpp
+++ b/TAO/tao/CurrentA.cpp
@@ -26,14 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "CurrentC.h"
-#include "CurrentA.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Impl_T.h"
 
-
-// ======= Handcrafted
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
 static const CORBA::Long _oc_CORBA_Current[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
@@ -66,7 +64,7 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
@@ -151,3 +149,4 @@ operator>>= (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/CurrentA.h b/TAO/tao/CurrentA.h
deleted file mode 100644
index 30e99843ef6..00000000000
--- a/TAO/tao/CurrentA.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:848
-
-#ifndef _TAO_IDL_ORIG_CURRENTA_ANYOP_H_
-#define _TAO_IDL_ORIG_CURRENTA_ANYOP_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-// ======= Handcrafted
-namespace CORBA
-{
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Current_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Current_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current_ptr &);
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index 92a5e96a8f8..913d7394e52 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -26,10 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:338
+// be\be_codegen.cpp:323
 
 
 #include "CurrentC.h"
+#include "tao/CDR.h"
+#include "tao/Typecode.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -41,7 +43,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:62
+// be\be_visitor_arg_traits.cpp:64
 
 // Arg traits specializations.
 namespace TAO
@@ -50,7 +52,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::Current.
 
@@ -90,7 +92,7 @@ TAO::Objref_Traits<CORBA::Current>::tao_marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*CORBA__TAO_Current_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -101,7 +103,7 @@ CORBA::Current::Current (void)
 CORBA::Current::~Current (void)
 {}
 
-void
+void 
 CORBA::Current::_tao_any_destructor (void *_tao_void_pointer)
 {
   Current *_tao_tmp_pointer =
@@ -119,10 +121,10 @@ CORBA::Current::_narrow (
     {
       return Current::_nil ();
     }
-
+  
   Current_ptr proxy =
     dynamic_cast<Current_ptr> (_tao_objref);
-
+  
   return Current::_duplicate (proxy);
 }
 
@@ -136,10 +138,10 @@ CORBA::Current::_unchecked_narrow (
     {
       return Current::_nil ();
     }
-
+  
   Current_ptr proxy =
     dynamic_cast<Current_ptr> (_tao_objref);
-
+  
   return Current::_duplicate (proxy);
 }
 
@@ -150,7 +152,7 @@ CORBA::Current::_duplicate (Current_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -195,7 +197,7 @@ CORBA::Current::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1725
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -208,7 +210,7 @@ CORBA::Current::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T<
         CORBA::Current
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         CORBA::Current
@@ -225,10 +227,11 @@ CORBA::Current::marshal (TAO_OutputCDR &)
     TAO_Objref_Var_T< \
         CORBA::Current
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         CORBA::Current
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index c2738ff775c..efdb265e360 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:186
+// be\be_codegen.cpp:171
 
 #ifndef _TAO_IDL_ORIG_CURRENTC_H_
 #define _TAO_IDL_ORIG_CURRENTC_H_
@@ -39,6 +39,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
+#include "tao/Environment.h"
+#include "tao/Objref_VarOut_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -63,38 +66,38 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
-// be/be_visitor_root/root_ch.cpp:63
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:611
+  // be\be_interface.cpp:611
 
 #if !defined (_CORBA_CURRENT__VAR_OUT_CH_)
 #define _CORBA_CURRENT__VAR_OUT_CH_
-
+  
   class Current;
   typedef Current *Current_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Current
       >
     Current_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Current
@@ -102,75 +105,78 @@ namespace CORBA
     Current_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_CURRENT_CH_)
 #define _CORBA_CURRENT_CH_
-
+  
   class TAO_Export Current
     : public virtual CORBA::Object
   {
   public:
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
-
+    
     // The static operations.
     static Current_ptr _duplicate (Current_ptr obj);
-
+    
     static Current_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Current_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Current_ptr _nil (void)
     {
       return (Current_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:196
-
+    // be\be_visitor_interface/interface_ch.cpp:208
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     Current (void);
-
+    
     virtual ~Current (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Current (const Current &);
-
+    
     void operator= (const Current &);
   };
 
 #endif /* end #if !defined */
-
-
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module CORBA
 
 // TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -178,7 +184,7 @@ namespace TAO
 
 #if !defined (_CORBA_CURRENT__TRAITS_CH_)
 #define _CORBA_CURRENT__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   struct TAO_Export Objref_Traits<CORBA::Current>
   {
@@ -199,17 +205,14 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
+// be\be_visitor_interface/any_op_ch.cpp:52
 
-#ifndef __ACE_INLINE__
+TAO_Export void operator<<= (CORBA::Any &, CORBA::Current_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, CORBA::Current_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
-
-#endif /* __ACE_INLINE__ */
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1050
+// be\be_codegen.cpp:978
 
 #if defined (__ACE_INLINE__)
 #include "CurrentC.i"
@@ -226,3 +229,4 @@ namespace TAO
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/DomainA.cpp b/TAO/tao/DomainA.cpp
index 3941f9dfbac..3abd24cb750 100644
--- a/TAO/tao/DomainA.cpp
+++ b/TAO/tao/DomainA.cpp
@@ -31,6 +31,146 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_DomainManager[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  36,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f446f),
+  ACE_NTOHL (0x6d61696e),
+  ACE_NTOHL (0x4d616e61),
+  ACE_NTOHL (0x6765723a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManager:1.0
+    14,
+  ACE_NTOHL (0x446f6d61),
+  ACE_NTOHL (0x696e4d61),
+  ACE_NTOHL (0x6e616765),
+  ACE_NTOHL (0x72000000),  // name = DomainManager
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManager (
+    CORBA::tk_objref,
+    sizeof (_oc_CORBA_DomainManager),
+    (char *) &_oc_CORBA_DomainManager,
+    0,
+    sizeof (CORBA::DomainManager)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_DomainManager =
+    &_tc_TAO_tc_CORBA_DomainManager;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_ConstructionPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  41,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6e737472),
+  ACE_NTOHL (0x75637469),
+  ACE_NTOHL (0x6f6e506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ConstructionPolicy:1.0
+    19,
+  ACE_NTOHL (0x436f6e73),
+  ACE_NTOHL (0x74727563),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63790000),  // name = ConstructionPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstructionPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_CORBA_ConstructionPolicy),
+    (char *) &_oc_CORBA_ConstructionPolicy,
+    0,
+    sizeof (CORBA::ConstructionPolicy)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ConstructionPolicy =
+    &_tc_TAO_tc_CORBA_ConstructionPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_DomainManagerList[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  40,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f446f),
+  ACE_NTOHL (0x6d61696e),
+  ACE_NTOHL (0x4d616e61),
+  ACE_NTOHL (0x6765724c),
+  ACE_NTOHL (0x6973743a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManagerList:1.0
+    18,
+  ACE_NTOHL (0x446f6d61),
+  ACE_NTOHL (0x696e4d61),
+  ACE_NTOHL (0x6e616765),
+  ACE_NTOHL (0x724c6973),
+  ACE_NTOHL (0x74000000),  // name = DomainManagerList
+    CORBA::tk_sequence, // typecode kind
+  80, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_objref, // typecode kind
+    64, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      36,
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f5242),
+      ACE_NTOHL (0x412f446f),
+      ACE_NTOHL (0x6d61696e),
+      ACE_NTOHL (0x4d616e61),
+      ACE_NTOHL (0x6765723a),
+      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManager:1.0
+            14,
+      ACE_NTOHL (0x446f6d61),
+      ACE_NTOHL (0x696e4d61),
+      ACE_NTOHL (0x6e616765),
+      ACE_NTOHL (0x72000000),  // name = DomainManager
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManagerList (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_DomainManagerList),
+    (char *) &_oc_CORBA_DomainManagerList,
+    0,
+    sizeof (CORBA::DomainManagerList)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_DomainManagerList =
+    &_tc_TAO_tc_CORBA_DomainManagerList;
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index 125d813a326..4d5296c74ef 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -40,7 +40,6 @@
 #include "tao/Object_Argument_T.h"
 #include "tao/Special_Basic_Arguments.h"
 #include "ORB_Core.h"
-#include "Typecode.h"
 #include "ParameterMode.h"
 #include "DynamicC.h"
 #include "ace/Dynamic_Service.h"
@@ -332,43 +331,6 @@ CORBA::DomainManager::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_DomainManager[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f446f), 
-  ACE_NTOHL (0x6d61696e), 
-  ACE_NTOHL (0x4d616e61), 
-  ACE_NTOHL (0x6765723a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManager:1.0
-    14,
-  ACE_NTOHL (0x446f6d61), 
-  ACE_NTOHL (0x696e4d61), 
-  ACE_NTOHL (0x6e616765), 
-  ACE_NTOHL (0x72000000),  // name = DomainManager
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManager (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_DomainManager),
-    (char *) &_oc_CORBA_DomainManager,
-    0,
-    sizeof (CORBA::DomainManager)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_DomainManager =
-    &_tc_TAO_tc_CORBA_DomainManager;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ConstructionPolicy.
@@ -575,46 +537,6 @@ CORBA::ConstructionPolicy::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_ConstructionPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  41,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6e737472), 
-  ACE_NTOHL (0x75637469), 
-  ACE_NTOHL (0x6f6e506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ConstructionPolicy:1.0
-    19,
-  ACE_NTOHL (0x436f6e73), 
-  ACE_NTOHL (0x74727563), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63790000),  // name = ConstructionPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstructionPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_ConstructionPolicy),
-    (char *) &_oc_CORBA_ConstructionPolicy,
-    0,
-    sizeof (CORBA::ConstructionPolicy)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_ConstructionPolicy =
-    &_tc_TAO_tc_CORBA_ConstructionPolicy;
-}
-
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -672,69 +594,6 @@ void CORBA::DomainManagerList::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_DomainManagerList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f446f), 
-  ACE_NTOHL (0x6d61696e), 
-  ACE_NTOHL (0x4d616e61), 
-  ACE_NTOHL (0x6765724c), 
-  ACE_NTOHL (0x6973743a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManagerList:1.0
-    18,
-  ACE_NTOHL (0x446f6d61), 
-  ACE_NTOHL (0x696e4d61), 
-  ACE_NTOHL (0x6e616765), 
-  ACE_NTOHL (0x724c6973), 
-  ACE_NTOHL (0x74000000),  // name = DomainManagerList
-    CORBA::tk_sequence, // typecode kind
-  80, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    64, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      36,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f446f), 
-      ACE_NTOHL (0x6d61696e), 
-      ACE_NTOHL (0x4d616e61), 
-      ACE_NTOHL (0x6765723a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/DomainManager:1.0
-            14,
-      ACE_NTOHL (0x446f6d61), 
-      ACE_NTOHL (0x696e4d61), 
-      ACE_NTOHL (0x6e616765), 
-      ACE_NTOHL (0x72000000),  // name = DomainManager
-      
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManagerList (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_DomainManagerList),
-    (char *) &_oc_CORBA_DomainManagerList,
-    0,
-    sizeof (CORBA::DomainManagerList)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_DomainManagerList =
-    &_tc_TAO_tc_CORBA_DomainManagerList;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
@@ -880,7 +739,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_DomainManagerList_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/DynamicA.cpp b/TAO/tao/DynamicA.cpp
index d785f98f2cf..fccdb13a28c 100644
--- a/TAO/tao/DynamicA.cpp
+++ b/TAO/tao/DynamicA.cpp
@@ -30,6 +30,276 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_Dynamic_ParameterList[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  38,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x44796e61),
+  ACE_NTOHL (0x6d69632f),
+  ACE_NTOHL (0x50617261),
+  ACE_NTOHL (0x6d657465),
+  ACE_NTOHL (0x724c6973),
+  ACE_NTOHL (0x743a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/ParameterList:1.0
+    14,
+  ACE_NTOHL (0x50617261),
+  ACE_NTOHL (0x6d657465),
+  ACE_NTOHL (0x724c6973),
+  ACE_NTOHL (0x74000000),  // name = ParameterList
+    CORBA::tk_sequence, // typecode kind
+  236, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_struct, // typecode kind
+    220, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      34,
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x44796e61),
+      ACE_NTOHL (0x6d69632f),
+      ACE_NTOHL (0x50617261),
+      ACE_NTOHL (0x6d657465),
+      ACE_NTOHL (0x723a312e),
+      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/Parameter:1.0
+            10,
+      ACE_NTOHL (0x50617261),
+      ACE_NTOHL (0x6d657465),
+      ACE_NTOHL (0x72000000),  // name = Parameter
+      2, // member count
+            9,
+      ACE_NTOHL (0x61726775),
+      ACE_NTOHL (0x6d656e74),
+      ACE_NTOHL (0x0),  // name = argument
+            CORBA::tk_any,
+
+      5,
+      ACE_NTOHL (0x6d6f6465),
+      ACE_NTOHL (0x0),  // name = mode
+            CORBA::tk_enum, // typecode kind
+      116, // encapsulation length
+TAO_ENCAP_BYTE_ORDER, // byte order
+        36,
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5061),
+        ACE_NTOHL (0x72616d65),
+        ACE_NTOHL (0x7465724d),
+        ACE_NTOHL (0x6f64653a),
+        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
+        14,
+        ACE_NTOHL (0x50617261),
+        ACE_NTOHL (0x6d657465),
+        ACE_NTOHL (0x724d6f64),
+        ACE_NTOHL (0x65000000),  // name = ParameterMode
+        3, // member count
+        9,
+        ACE_NTOHL (0x50415241),
+        ACE_NTOHL (0x4d5f494e),
+        ACE_NTOHL (0x0),  // name = PARAM_IN
+        10,
+        ACE_NTOHL (0x50415241),
+        ACE_NTOHL (0x4d5f4f55),
+        ACE_NTOHL (0x54000000),  // name = PARAM_OUT
+        12,
+        ACE_NTOHL (0x50415241),
+        ACE_NTOHL (0x4d5f494e),
+        ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
+
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_Dynamic_ParameterList (
+    CORBA::tk_alias,
+    sizeof (_oc_Dynamic_ParameterList),
+    (char *) &_oc_Dynamic_ParameterList,
+    0,
+    sizeof (Dynamic::ParameterList)
+  );
+
+namespace Dynamic
+{
+  ::CORBA::TypeCode_ptr _tc_ParameterList =
+    &_tc_TAO_tc_Dynamic_ParameterList;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_Dynamic_ContextList[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  36,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x44796e61),
+  ACE_NTOHL (0x6d69632f),
+  ACE_NTOHL (0x436f6e74),
+  ACE_NTOHL (0x6578744c),
+  ACE_NTOHL (0x6973743a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Dynamic/ContextList:1.0
+    12,
+  ACE_NTOHL (0x436f6e74),
+  ACE_NTOHL (0x6578744c),
+  ACE_NTOHL (0x69737400),  // name = ContextList
+    CORBA::tk_alias, // typecode kind for typedefs
+  80, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    32,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5374),
+    ACE_NTOHL (0x72696e67),
+    ACE_NTOHL (0x5365713a),
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
+        10,
+    ACE_NTOHL (0x53747269),
+    ACE_NTOHL (0x6e675365),
+    ACE_NTOHL (0x71000000),  // name = StringSeq
+        CORBA::tk_sequence, // typecode kind
+    16, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_string,
+      0U, // string length
+      0U,
+
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_Dynamic_ContextList (
+    CORBA::tk_alias,
+    sizeof (_oc_Dynamic_ContextList),
+    (char *) &_oc_Dynamic_ContextList,
+    0,
+    sizeof (Dynamic::ContextList)
+  );
+
+namespace Dynamic
+{
+  ::CORBA::TypeCode_ptr _tc_ContextList =
+    &_tc_TAO_tc_Dynamic_ContextList;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_Dynamic_ExceptionList[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  38,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x44796e61),
+  ACE_NTOHL (0x6d69632f),
+  ACE_NTOHL (0x45786365),
+  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6e4c6973),
+  ACE_NTOHL (0x743a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/ExceptionList:1.0
+    14,
+  ACE_NTOHL (0x45786365),
+  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6e4c6973),
+  ACE_NTOHL (0x74000000),  // name = ExceptionList
+    CORBA::tk_sequence, // typecode kind
+  12, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_TypeCode,
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_Dynamic_ExceptionList (
+    CORBA::tk_alias,
+    sizeof (_oc_Dynamic_ExceptionList),
+    (char *) &_oc_Dynamic_ExceptionList,
+    0,
+    sizeof (Dynamic::ExceptionList)
+  );
+
+namespace Dynamic
+{
+  ::CORBA::TypeCode_ptr _tc_ExceptionList =
+    &_tc_TAO_tc_Dynamic_ExceptionList;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_Dynamic_RequestContext[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  39,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x44796e61),
+  ACE_NTOHL (0x6d69632f),
+  ACE_NTOHL (0x52657175),
+  ACE_NTOHL (0x65737443),
+  ACE_NTOHL (0x6f6e7465),
+  ACE_NTOHL (0x78743a31),
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Dynamic/RequestContext:1.0
+    15,
+  ACE_NTOHL (0x52657175),
+  ACE_NTOHL (0x65737443),
+  ACE_NTOHL (0x6f6e7465),
+  ACE_NTOHL (0x78740000),  // name = RequestContext
+    CORBA::tk_alias, // typecode kind for typedefs
+  80, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    32,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5374),
+    ACE_NTOHL (0x72696e67),
+    ACE_NTOHL (0x5365713a),
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
+        10,
+    ACE_NTOHL (0x53747269),
+    ACE_NTOHL (0x6e675365),
+    ACE_NTOHL (0x71000000),  // name = StringSeq
+        CORBA::tk_sequence, // typecode kind
+    16, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_string,
+      0U, // string length
+      0U,
+
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_Dynamic_RequestContext (
+    CORBA::tk_alias,
+    sizeof (_oc_Dynamic_RequestContext),
+    (char *) &_oc_Dynamic_RequestContext,
+    0,
+    sizeof (Dynamic::RequestContext)
+  );
+
+namespace Dynamic
+{
+  ::CORBA::TypeCode_ptr _tc_RequestContext =
+    &_tc_TAO_tc_Dynamic_RequestContext;
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp
index f0f2b9f13b2..e5a7d0eac32 100644
--- a/TAO/tao/DynamicC.cpp
+++ b/TAO/tao/DynamicC.cpp
@@ -30,6 +30,7 @@
 
 
 #include "DynamicC.h"
+#include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -101,169 +102,6 @@ void Dynamic::ParameterList::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_Dynamic_ParameterList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x44796e61), 
-  ACE_NTOHL (0x6d69632f), 
-  ACE_NTOHL (0x50617261), 
-  ACE_NTOHL (0x6d657465), 
-  ACE_NTOHL (0x724c6973), 
-  ACE_NTOHL (0x743a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/ParameterList:1.0
-    14,
-  ACE_NTOHL (0x50617261), 
-  ACE_NTOHL (0x6d657465), 
-  ACE_NTOHL (0x724c6973), 
-  ACE_NTOHL (0x74000000),  // name = ParameterList
-    CORBA::tk_sequence, // typecode kind
-  236, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    220, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      34,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x44796e61), 
-      ACE_NTOHL (0x6d69632f), 
-      ACE_NTOHL (0x50617261), 
-      ACE_NTOHL (0x6d657465), 
-      ACE_NTOHL (0x723a312e), 
-      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/Parameter:1.0
-            10,
-      ACE_NTOHL (0x50617261), 
-      ACE_NTOHL (0x6d657465), 
-      ACE_NTOHL (0x72000000),  // name = Parameter
-      2, // member count
-            9,
-      ACE_NTOHL (0x61726775), 
-      ACE_NTOHL (0x6d656e74), 
-      ACE_NTOHL (0x0),  // name = argument
-            CORBA::tk_any,
-
-      5,
-      ACE_NTOHL (0x6d6f6465), 
-      ACE_NTOHL (0x0),  // name = mode
-            CORBA::tk_enum, // typecode kind
-      116, // encapsulation length
-TAO_ENCAP_BYTE_ORDER, // byte order
-        36,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5061), 
-        ACE_NTOHL (0x72616d65), 
-        ACE_NTOHL (0x7465724d), 
-        ACE_NTOHL (0x6f64653a), 
-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-        14,
-        ACE_NTOHL (0x50617261), 
-        ACE_NTOHL (0x6d657465), 
-        ACE_NTOHL (0x724d6f64), 
-        ACE_NTOHL (0x65000000),  // name = ParameterMode
-        3, // member count
-        9,
-        ACE_NTOHL (0x50415241), 
-        ACE_NTOHL (0x4d5f494e), 
-        ACE_NTOHL (0x0),  // name = PARAM_IN
-        10,
-        ACE_NTOHL (0x50415241), 
-        ACE_NTOHL (0x4d5f4f55), 
-        ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-        12,
-        ACE_NTOHL (0x50415241), 
-        ACE_NTOHL (0x4d5f494e), 
-        ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-        
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Dynamic_ParameterList (
-    CORBA::tk_alias,
-    sizeof (_oc_Dynamic_ParameterList),
-    (char *) &_oc_Dynamic_ParameterList,
-    0,
-    sizeof (Dynamic::ParameterList)
-  );
-
-namespace Dynamic
-{
-  ::CORBA::TypeCode_ptr _tc_ParameterList =
-    &_tc_TAO_tc_Dynamic_ParameterList;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_Dynamic_ContextList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x44796e61), 
-  ACE_NTOHL (0x6d69632f), 
-  ACE_NTOHL (0x436f6e74), 
-  ACE_NTOHL (0x6578744c), 
-  ACE_NTOHL (0x6973743a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/Dynamic/ContextList:1.0
-    12,
-  ACE_NTOHL (0x436f6e74), 
-  ACE_NTOHL (0x6578744c), 
-  ACE_NTOHL (0x69737400),  // name = ContextList
-    CORBA::tk_alias, // typecode kind for typedefs
-  80, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5374), 
-    ACE_NTOHL (0x72696e67), 
-    ACE_NTOHL (0x5365713a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
-        10,
-    ACE_NTOHL (0x53747269), 
-    ACE_NTOHL (0x6e675365), 
-    ACE_NTOHL (0x71000000),  // name = StringSeq
-        CORBA::tk_sequence, // typecode kind
-    16, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_string, 
-      0U, // string length
-      0U,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Dynamic_ContextList (
-    CORBA::tk_alias,
-    sizeof (_oc_Dynamic_ContextList),
-    (char *) &_oc_Dynamic_ContextList,
-    0,
-    sizeof (Dynamic::ContextList)
-  );
-
-namespace Dynamic
-{
-  ::CORBA::TypeCode_ptr _tc_ContextList =
-    &_tc_TAO_tc_Dynamic_ContextList;
-}
-
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -318,113 +156,6 @@ void Dynamic::ExceptionList::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_Dynamic_ExceptionList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x44796e61), 
-  ACE_NTOHL (0x6d69632f), 
-  ACE_NTOHL (0x45786365), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e4c6973), 
-  ACE_NTOHL (0x743a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Dynamic/ExceptionList:1.0
-    14,
-  ACE_NTOHL (0x45786365), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e4c6973), 
-  ACE_NTOHL (0x74000000),  // name = ExceptionList
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_TypeCode,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Dynamic_ExceptionList (
-    CORBA::tk_alias,
-    sizeof (_oc_Dynamic_ExceptionList),
-    (char *) &_oc_Dynamic_ExceptionList,
-    0,
-    sizeof (Dynamic::ExceptionList)
-  );
-
-namespace Dynamic
-{
-  ::CORBA::TypeCode_ptr _tc_ExceptionList =
-    &_tc_TAO_tc_Dynamic_ExceptionList;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_Dynamic_RequestContext[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x44796e61), 
-  ACE_NTOHL (0x6d69632f), 
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737443), 
-  ACE_NTOHL (0x6f6e7465), 
-  ACE_NTOHL (0x78743a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Dynamic/RequestContext:1.0
-    15,
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737443), 
-  ACE_NTOHL (0x6f6e7465), 
-  ACE_NTOHL (0x78740000),  // name = RequestContext
-    CORBA::tk_alias, // typecode kind for typedefs
-  80, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5374), 
-    ACE_NTOHL (0x72696e67), 
-    ACE_NTOHL (0x5365713a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
-        10,
-    ACE_NTOHL (0x53747269), 
-    ACE_NTOHL (0x6e675365), 
-    ACE_NTOHL (0x71000000),  // name = StringSeq
-        CORBA::tk_sequence, // typecode kind
-    16, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_string, 
-      0U, // string length
-      0U,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Dynamic_RequestContext (
-    CORBA::tk_alias,
-    sizeof (_oc_Dynamic_RequestContext),
-    (char *) &_oc_Dynamic_RequestContext,
-    0,
-    sizeof (Dynamic::RequestContext)
-  );
-
-namespace Dynamic
-{
-  ::CORBA::TypeCode_ptr _tc_RequestContext =
-    &_tc_TAO_tc_Dynamic_RequestContext;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_Dynamic_ParameterList_CPP_
@@ -569,7 +300,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_Dynamic_ExceptionList_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/DynamicC.h b/TAO/tao/DynamicC.h
index b53ee0b13b4..db73e5925e8 100644
--- a/TAO/tao/DynamicC.h
+++ b/TAO/tao/DynamicC.h
@@ -40,7 +40,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
-#include "tao/CDR.h"
 #include "tao/Environment.h"
 #include "tao/Typecode.h"
 #include "tao/Sequence_T.h"
@@ -78,22 +77,22 @@
 
 namespace Dynamic
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_DYNAMIC_PARAMETERLIST_CH_)
 #define _DYNAMIC_PARAMETERLIST_CH_
-
+  
   class ParameterList;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         ParameterList,
         Parameter
       >
     ParameterList_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         ParameterList,
@@ -101,7 +100,7 @@ namespace Dynamic
         Parameter
       >
     ParameterList_out;
-
+  
   class TAO_Export ParameterList
     : public
         TAO_Unbounded_Sequence<
@@ -114,44 +113,44 @@ namespace Dynamic
     ParameterList (
         CORBA::ULong max,
         CORBA::ULong length,
-        Parameter* buffer,
+        Parameter* buffer, 
         CORBA::Boolean release = 0
       );
     ParameterList (const ParameterList &);
     ~ParameterList (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ParameterList_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ParameterList;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:435
-
+  
   typedef CORBA::StringSeq ContextList;
   typedef CORBA::StringSeq_var ContextList_var;
   typedef CORBA::StringSeq_out ContextList_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ContextList;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_DYNAMIC_EXCEPTIONLIST_CH_)
 #define _DYNAMIC_EXCEPTIONLIST_CH_
-
+  
   class ExceptionList;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         ExceptionList,
@@ -160,7 +159,7 @@ namespace Dynamic
           >
       >
     ExceptionList_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         ExceptionList,
@@ -170,7 +169,7 @@ namespace Dynamic
           >
       >
     ExceptionList_out;
-
+  
   class TAO_Export ExceptionList
     : public
         TAO_Unbounded_Pseudo_Sequence<
@@ -183,14 +182,14 @@ namespace Dynamic
     ExceptionList (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::TypeCode_ptr* buffer,
+        CORBA::TypeCode_ptr* buffer, 
         CORBA::Boolean release = 0
       );
     ExceptionList (const ExceptionList &);
     ~ExceptionList (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ExceptionList_var _var_type;
   };
 
diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h
index 81a8cdf665b..9507153856e 100644
--- a/TAO/tao/DynamicInterface/Request.h
+++ b/TAO/tao/DynamicInterface/Request.h
@@ -36,6 +36,7 @@
 #include "tao/NVList.h"
 #include "tao/Environment.h"
 #include "tao/Sequence.h"
+#include "tao/CDR.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h
index 29ddd2daa28..a2bbca66840 100644
--- a/TAO/tao/DynamicInterface/Server_Request.h
+++ b/TAO/tao/DynamicInterface/Server_Request.h
@@ -35,6 +35,7 @@
 #include "Dynamic_Adapter_Impl.h"
 
 #include "tao/TAO_Server_Request.h"
+#include "tao/CDR.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -68,13 +69,13 @@ namespace CORBA
 
     ~ServerRequest (void);
     // Destructor.
-    
+
     void arguments (CORBA::NVList_ptr &list
                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
     // Implementation uses this to provide the ORB with the operation's
     // parameter list ... on return, their values are available; the
     // list fed in has typecodes and (perhap) memory assigned.
-    
+
     void set_result (const CORBA::Any &value
                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
     // Implementation uses this to provide the operation result
@@ -82,7 +83,7 @@ namespace CORBA
     //
     // XXX Implementation should be able to assume response has been
     // sent when this returns, and reclaim memory it allocated.
-    
+
     void set_exception (const CORBA::Any &value
                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
     // Implementation uses this to provide the exception value which is
@@ -90,80 +91,80 @@ namespace CORBA
     //
     // XXX Implementation should be able to assume response has been
     // sent when this returns, and reclaim memory it allocated.
-    
+
     // = Get various universal call attributes.
-    
+
     // e.g., who made the call, the target of the call, what ORB and OA
     // that target object uses.
     //
     // NOTE: none of these report exceptions; unavailability of any of
     // this stuff is a catastrophic error since this is all part of the
     // basic CORBA Object Model.
-    
+
     void dsi_marshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
     // Marshal outgoing parameters.
-    
+
     CORBA::Context_ptr ctx (void) const;
     // Accessor for the Context member.
-    
+
     void ctx (CORBA::Context_ptr);
     // Mutator for the Context member.
-    
+
     const char *operation (void) const;
     // Get the operation name.
-    
+
     // Pseudo object methods.
     static ServerRequest_ptr _duplicate (ServerRequest_ptr);
     static ServerRequest_ptr _nil (void);
-    
+
     // = Reference counting.
     CORBA::ULong _incr_refcnt (void);
     CORBA::ULong _decr_refcnt (void);
-    
+
     void _tao_lazy_evaluation (bool lazy_evaluation);
     // Set the lazy evaluation flag.
-    
+
     int _tao_incoming_byte_order (void) const;
     // Get the byte order of the incoming CDR stream.
-    
+
     void _tao_reply_byte_order (int byte_order);
     // Set the byte order of the outgoing CDR stream.
-    
+
     /// Return a reference to the underlying TAO_ServerRequest object.
     TAO_ServerRequest & _tao_server_request (void);
-    
+
     void gateway_exception_reply (ACE_CString &raw_exception);
     // Returns a user exception through a TAO gateway without
     // knowing its type.
-    
+
     // Useful for template programming.
-    typedef CORBA::ServerRequest_ptr _ptr_type;    
-    
+    typedef CORBA::ServerRequest_ptr _ptr_type;
+
   private:
     bool lazy_evaluation_;
     // If zero then the NVList is evaluated ASAP.
-    
+
     CORBA::Context_ptr ctx_;
     // Context associated with this request.
-    
+
     CORBA::NVList_ptr params_;
     // Incoming parameters.
-    
+
     CORBA::Any_ptr retval_;
     // Return value.
-    
+
     CORBA::Any_ptr exception_;
     // Any exception which might be raised.
-    
+
     CORBA::ULong refcount_;
     // Reference counting.
-    
+
     TAO_SYNCH_MUTEX lock_;
     // Protect the refcount_ and response_receieved_.
 
     TAO_ServerRequest &orb_server_request_;
     // Request from the ORB.
-    
+
     int sent_gateway_exception_;
     // Have we sent a user exception obtained from a gateway?
   };
diff --git a/TAO/tao/Dynamic_ParameterA.cpp b/TAO/tao/Dynamic_ParameterA.cpp
index 0157ac2ec52..e6c2c3cc0c5 100644
--- a/TAO/tao/Dynamic_ParameterA.cpp
+++ b/TAO/tao/Dynamic_ParameterA.cpp
@@ -30,6 +30,82 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_Dynamic_Parameter[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  26,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x44796e61),
+  ACE_NTOHL (0x6d69632f),
+  ACE_NTOHL (0x50617261),
+  ACE_NTOHL (0x6d657465),
+  ACE_NTOHL (0x723a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/Parameter:1.0
+    10,
+  ACE_NTOHL (0x50617261),
+  ACE_NTOHL (0x6d657465),
+  ACE_NTOHL (0x72000000),  // name = Parameter
+  2, // member count
+    9,
+  ACE_NTOHL (0x61726775),
+  ACE_NTOHL (0x6d656e74),
+  ACE_NTOHL (0x0),  // name = argument
+    CORBA::tk_any,
+
+  5,
+  ACE_NTOHL (0x6d6f6465),
+  ACE_NTOHL (0x0),  // name = mode
+    CORBA::tk_enum, // typecode kind
+  116, // encapsulation length
+TAO_ENCAP_BYTE_ORDER, // byte order
+    36,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5061),
+    ACE_NTOHL (0x72616d65),
+    ACE_NTOHL (0x7465724d),
+    ACE_NTOHL (0x6f64653a),
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
+    14,
+    ACE_NTOHL (0x50617261),
+    ACE_NTOHL (0x6d657465),
+    ACE_NTOHL (0x724d6f64),
+    ACE_NTOHL (0x65000000),  // name = ParameterMode
+    3, // member count
+    9,
+    ACE_NTOHL (0x50415241),
+    ACE_NTOHL (0x4d5f494e),
+    ACE_NTOHL (0x0),  // name = PARAM_IN
+    10,
+    ACE_NTOHL (0x50415241),
+    ACE_NTOHL (0x4d5f4f55),
+    ACE_NTOHL (0x54000000),  // name = PARAM_OUT
+    12,
+    ACE_NTOHL (0x50415241),
+    ACE_NTOHL (0x4d5f494e),
+    ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_Dynamic_Parameter (
+    CORBA::tk_struct,
+    sizeof (_oc_Dynamic_Parameter),
+    (char *) &_oc_Dynamic_Parameter,
+    0,
+    sizeof (Dynamic::Parameter)
+  );
+
+namespace Dynamic
+{
+  ::CORBA::TypeCode_ptr _tc_Parameter =
+    &_tc_TAO_tc_Dynamic_Parameter;
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -104,3 +180,4 @@ CORBA::Boolean operator>>= (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/Dynamic_ParameterC.cpp b/TAO/tao/Dynamic_ParameterC.cpp
index 8988765a525..9929690a4f9 100644
--- a/TAO/tao/Dynamic_ParameterC.cpp
+++ b/TAO/tao/Dynamic_ParameterC.cpp
@@ -50,82 +50,6 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_Dynamic_Parameter[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  26,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x44796e61), 
-  ACE_NTOHL (0x6d69632f), 
-  ACE_NTOHL (0x50617261), 
-  ACE_NTOHL (0x6d657465), 
-  ACE_NTOHL (0x723a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:Dynamic/Parameter:1.0
-    10,
-  ACE_NTOHL (0x50617261), 
-  ACE_NTOHL (0x6d657465), 
-  ACE_NTOHL (0x72000000),  // name = Parameter
-  2, // member count
-    9,
-  ACE_NTOHL (0x61726775), 
-  ACE_NTOHL (0x6d656e74), 
-  ACE_NTOHL (0x0),  // name = argument
-    CORBA::tk_any,
-
-  5,
-  ACE_NTOHL (0x6d6f6465), 
-  ACE_NTOHL (0x0),  // name = mode
-    CORBA::tk_enum, // typecode kind
-  116, // encapsulation length
-TAO_ENCAP_BYTE_ORDER, // byte order
-    36,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5061), 
-    ACE_NTOHL (0x72616d65), 
-    ACE_NTOHL (0x7465724d), 
-    ACE_NTOHL (0x6f64653a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-    14,
-    ACE_NTOHL (0x50617261), 
-    ACE_NTOHL (0x6d657465), 
-    ACE_NTOHL (0x724d6f64), 
-    ACE_NTOHL (0x65000000),  // name = ParameterMode
-    3, // member count
-    9,
-    ACE_NTOHL (0x50415241), 
-    ACE_NTOHL (0x4d5f494e), 
-    ACE_NTOHL (0x0),  // name = PARAM_IN
-    10,
-    ACE_NTOHL (0x50415241), 
-    ACE_NTOHL (0x4d5f4f55), 
-    ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-    12,
-    ACE_NTOHL (0x50415241), 
-    ACE_NTOHL (0x4d5f494e), 
-    ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
-    
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Dynamic_Parameter (
-    CORBA::tk_struct,
-    sizeof (_oc_Dynamic_Parameter),
-    (char *) &_oc_Dynamic_Parameter,
-    0,
-    sizeof (Dynamic::Parameter)
-  );
-
-namespace Dynamic
-{
-  ::CORBA::TypeCode_ptr _tc_Parameter =
-    &_tc_TAO_tc_Dynamic_Parameter;
-}
-
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -163,7 +87,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/Dynamic_ParameterC.h b/TAO/tao/Dynamic_ParameterC.h
index f283f57d9c7..e740dbb6ca5 100644
--- a/TAO/tao/Dynamic_ParameterC.h
+++ b/TAO/tao/Dynamic_ParameterC.h
@@ -40,7 +40,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
-#include "tao/orbconf.h"
+#include "tao/Environment.h"
 #include "tao/Any.h"
 #include "tao/VarOut_T.h"
 
diff --git a/TAO/tao/FloatSeqA.cpp b/TAO/tao/FloatSeqA.cpp
index 23dce9da912..ba36fa52e1b 100644
--- a/TAO/tao/FloatSeqA.cpp
+++ b/TAO/tao/FloatSeqA.cpp
@@ -30,6 +30,48 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_FloatSeq[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  31,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f466c),
+  ACE_NTOHL (0x6f617453),
+  ACE_NTOHL (0x65713a31),
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/FloatSeq:1.0
+    9,
+  ACE_NTOHL (0x466c6f61),
+  ACE_NTOHL (0x74536571),
+  ACE_NTOHL (0x0),  // name = FloatSeq
+    CORBA::tk_sequence, // typecode kind
+  12, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_float,
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_FloatSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_FloatSeq),
+    (char *) &_oc_CORBA_FloatSeq,
+    0,
+    sizeof (CORBA::FloatSeq)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_FloatSeq =
+    &_tc_TAO_tc_CORBA_FloatSeq;
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
diff --git a/TAO/tao/FloatSeqC.cpp b/TAO/tao/FloatSeqC.cpp
index ce537072723..09cd1776e26 100644
--- a/TAO/tao/FloatSeqC.cpp
+++ b/TAO/tao/FloatSeqC.cpp
@@ -30,6 +30,7 @@
 
 
 #include "FloatSeqC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
@@ -103,48 +104,6 @@ void CORBA::FloatSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_FloatSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f466c), 
-  ACE_NTOHL (0x6f617453), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/FloatSeq:1.0
-    9,
-  ACE_NTOHL (0x466c6f61), 
-  ACE_NTOHL (0x74536571), 
-  ACE_NTOHL (0x0),  // name = FloatSeq
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_float,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_FloatSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_FloatSeq),
-    (char *) &_oc_CORBA_FloatSeq,
-    0,
-    sizeof (CORBA::FloatSeq)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_FloatSeq =
-    &_tc_TAO_tc_CORBA_FloatSeq;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_CORBA_FloatSeq_CPP_
@@ -203,7 +162,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_FloatSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/FloatSeqC.h b/TAO/tao/FloatSeqC.h
index bb49b5801a0..9f504dd44bc 100644
--- a/TAO/tao/FloatSeqC.h
+++ b/TAO/tao/FloatSeqC.h
@@ -40,7 +40,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
-#include "tao/CDR.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
diff --git a/TAO/tao/IIOPA.cpp b/TAO/tao/IIOPA.cpp
index 1916477725e..06eed52c444 100644
--- a/TAO/tao/IIOPA.cpp
+++ b/TAO/tao/IIOPA.cpp
@@ -26,13 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "IIOPC.h"
-#include "IIOPA.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Dual_Impl_T.h"
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_IIOP_ListenPoint[] =
 {
@@ -79,7 +77,7 @@ namespace IIOP
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_IIOP_ListenPointList[] =
 {
@@ -151,7 +149,7 @@ namespace IIOP
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_IIOP_BiDirIIOPServiceContext[] =
 {
@@ -252,9 +250,8 @@ namespace IIOP
     &_tc_TAO_tc_IIOP_BiDirIIOPServiceContext;
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -312,7 +309,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -370,7 +367,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -464,3 +461,4 @@ CORBA::Boolean operator>>= (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/IIOPA.h b/TAO/tao/IIOPA.h
deleted file mode 100644
index 40ff1e629de..00000000000
--- a/TAO/tao/IIOPA.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:848
-
-#ifndef _TAO_IDL_ORIG_IIOPA_ANYOP_H_
-#define _TAO_IDL_ORIG_IIOPA_ANYOP_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-// ==== Hancrafted
-namespace IIOP
-{
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ListenPoint;
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ListenPointList;
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BiDirIIOPServiceContext;
-}
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IIOP::ListenPoint &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IIOP::ListenPoint*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::ListenPoint *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::ListenPoint *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IIOP::ListenPointList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IIOP::ListenPointList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::ListenPointList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::ListenPointList *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IIOP::BiDirIIOPServiceContext &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IIOP::BiDirIIOPServiceContext*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::BiDirIIOPServiceContext *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::BiDirIIOPServiceContext *&);
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp
index 608e66ecfca..326745d27e9 100644
--- a/TAO/tao/IIOPC.cpp
+++ b/TAO/tao/IIOPC.cpp
@@ -26,10 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:338
+// be\be_codegen.cpp:323
 
 
 #include "IIOPC.h"
+#include "tao/CDR.h"
+#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -40,7 +42,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:62
+// be\be_visitor_arg_traits.cpp:64
 
 // Arg traits specializations.
 namespace TAO
@@ -48,9 +50,8 @@ namespace TAO
 }
 
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_structure/structure_cs.cpp:66
+// be\be_visitor_structure/structure_cs.cpp:66
 
 void
 IIOP::ListenPoint::_tao_any_destructor (
@@ -63,7 +64,7 @@ IIOP::ListenPoint::_tao_any_destructor (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:65
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IIOP_LISTENPOINTLIST_CS_)
 #define _IIOP_LISTENPOINTLIST_CS_
@@ -116,7 +117,7 @@ void IIOP::ListenPointList::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/structure_cs.cpp:66
+// be\be_visitor_structure/structure_cs.cpp:66
 
 void
 IIOP::BiDirIIOPServiceContext::_tao_any_destructor (
@@ -129,7 +130,30 @@ IIOP::BiDirIIOPServiceContext::_tao_any_destructor (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:95
+// be\be_visitor_structure/cdr_op_cs.cpp:61
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IIOP::ListenPoint &_tao_aggregate
+  )
+{
+  return
+    (strm << _tao_aggregate.host.in ()) &&
+    (strm << _tao_aggregate.port);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IIOP::ListenPoint &_tao_aggregate
+  )
+{
+  return
+    (strm >> _tao_aggregate.host.out ()) &&
+    (strm >> _tao_aggregate.port);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_IIOP_ListenPointList_CPP_
 #define _TAO_CDR_OP_IIOP_ListenPointList_CPP_
@@ -201,7 +225,28 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_IIOP_ListenPointList_CPP_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1725
+// be\be_visitor_structure/cdr_op_cs.cpp:61
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IIOP::BiDirIIOPServiceContext &_tao_aggregate
+  )
+{
+  return
+    (strm << _tao_aggregate.listen_points);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IIOP::BiDirIIOPServiceContext &_tao_aggregate
+  )
+{
+  return
+    (strm >> _tao_aggregate.listen_points);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -330,3 +375,4 @@ CORBA::Boolean operator>> (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/IIOPC.h b/TAO/tao/IIOPC.h
index c0dea03b212..be1d39ae63d 100644
--- a/TAO/tao/IIOPC.h
+++ b/TAO/tao/IIOPC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:186
+// be\be_codegen.cpp:171
 
 #ifndef _TAO_IDL_ORIG_IIOPC_H_
 #define _TAO_IDL_ORIG_IIOPC_H_
@@ -39,7 +39,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "CDR.h"
+#include "tao/TAO_Export.h"
+#include "tao/Environment.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
@@ -68,57 +69,61 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace IIOP
 {
-
+  
   // TAO_IDL - Generated from
-  // be/be_type.cpp:258
-
+  // be\be_type.cpp:258
+  
   struct ListenPoint;
-
+  
   typedef
     TAO_Var_Var_T<
         ListenPoint
       >
     ListenPoint_var;
-
+  
   typedef
     TAO_Out_T<
         ListenPoint,
         ListenPoint_var
       >
     ListenPoint_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
-
+  // be\be_visitor_structure/structure_ch.cpp:52
+  
   struct TAO_Export ListenPoint
   {
     typedef ListenPoint_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager host;
     CORBA::UShort port;
   };
-
-
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ListenPoint;
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IIOP_LISTENPOINTLIST_CH_)
 #define _IIOP_LISTENPOINTLIST_CH_
-
+  
   class ListenPointList;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         ListenPointList,
         ListenPoint
       >
     ListenPointList_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         ListenPointList,
@@ -126,7 +131,7 @@ namespace IIOP
         ListenPoint
       >
     ListenPointList_out;
-
+  
   class TAO_Export ListenPointList
     : public
         TAO_Unbounded_Sequence<
@@ -139,57 +144,65 @@ namespace IIOP
     ListenPointList (
         CORBA::ULong max,
         CORBA::ULong length,
-        ListenPoint* buffer,
+        ListenPoint* buffer, 
         CORBA::Boolean release = 0
       );
     ListenPointList (const ListenPointList &);
     ~ListenPointList (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ListenPointList_var _var_type;
   };
 
 #endif /* end #if !defined */
-
-
+  
   // TAO_IDL - Generated from
-  // be/be_type.cpp:258
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ListenPointList;
+  
+  // TAO_IDL - Generated from
+  // be\be_type.cpp:258
+  
   struct BiDirIIOPServiceContext;
-
+  
   typedef
     TAO_Var_Var_T<
         BiDirIIOPServiceContext
       >
     BiDirIIOPServiceContext_var;
-
+  
   typedef
     TAO_Out_T<
         BiDirIIOPServiceContext,
         BiDirIIOPServiceContext_var
       >
     BiDirIIOPServiceContext_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
-
+  // be\be_visitor_structure/structure_ch.cpp:52
+  
   struct TAO_Export BiDirIIOPServiceContext
   {
     typedef BiDirIIOPServiceContext_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     IIOP::ListenPointList listen_points;
   };
-
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BiDirIIOPServiceContext;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module IIOP
 
 // TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -197,18 +210,37 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
+// be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const IIOP::ListenPoint &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, IIOP::ListenPoint*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::ListenPoint *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::ListenPoint *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const IIOP::ListenPointList &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, IIOP::ListenPointList*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::ListenPointList *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::ListenPointList *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_ch.cpp:52
 
-#ifndef __ACE_INLINE__
+TAO_Export void operator<<= (CORBA::Any &, const IIOP::BiDirIIOPServiceContext &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, IIOP::BiDirIIOPServiceContext*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::BiDirIIOPServiceContext *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::BiDirIIOPServiceContext *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:53
+// be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IIOP::ListenPoint &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::ListenPoint &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:70
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_IIOP_ListenPointList_H_
 #define _TAO_CDR_OP_IIOP_ListenPointList_H_
@@ -225,18 +257,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_IIOP_ListenPointList_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:53
+// be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IIOP::BiDirIIOPServiceContext &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceContext &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
-
-#endif /* __ACE_INLINE__ */
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1050
+// be\be_codegen.cpp:978
 
 #if defined (__ACE_INLINE__)
 #include "IIOPC.i"
@@ -253,3 +280,4 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceCont
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/IIOPC.i b/TAO/tao/IIOPC.i
index d6bf0fe1f3c..38aa32569ba 100644
--- a/TAO/tao/IIOPC.i
+++ b/TAO/tao/IIOPC.i
@@ -26,69 +26,3 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:70
-
-ACE_INLINE
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IIOP::ListenPoint &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.host.in ()) &&
-    (strm << _tao_aggregate.port);
-}
-
-ACE_INLINE
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IIOP::ListenPoint &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.host.out ()) &&
-    (strm >> _tao_aggregate.port);
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:81
-
-#if !defined _TAO_CDR_OP_IIOP_ListenPointList_I_
-#define _TAO_CDR_OP_IIOP_ListenPointList_I_
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IIOP::ListenPointList &
-  );
-
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IIOP::ListenPointList &
-  );
-
-#endif /* _TAO_CDR_OP_IIOP_ListenPointList_I_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:70
-
-ACE_INLINE
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IIOP::BiDirIIOPServiceContext &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.listen_points);
-}
-
-ACE_INLINE
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IIOP::BiDirIIOPServiceContext &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.listen_points);
-}
-
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index e24e6d8ca50..d857085d9de 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -6,6 +6,7 @@
 #include "tao/Codeset_Manager.h"
 #include "tao/Transport.h"
 #include "tao/ORB_Core.h"
+#include "tao/CDR.h"
 
 #if !defined(__ACE_INLINE__)
 #include "tao/IIOP_Acceptor.i"
diff --git a/TAO/tao/IIOP_EndpointsA.cpp b/TAO/tao/IIOP_EndpointsA.cpp
index f1c51767ad8..a28f8a7f92d 100644
--- a/TAO/tao/IIOP_EndpointsA.cpp
+++ b/TAO/tao/IIOP_EndpointsA.cpp
@@ -26,13 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "IIOP_EndpointsC.h"
-#include "IIOP_EndpointsA.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Dual_Impl_T.h"
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_TAO_IIOP_Endpoint_Info[] =
 {
@@ -86,7 +84,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_TAO_IIOPEndpointSequence[] =
 {
@@ -166,7 +164,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -224,7 +222,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -308,3 +306,4 @@ CORBA::Boolean operator>>= (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/IIOP_EndpointsA.h b/TAO/tao/IIOP_EndpointsA.h
deleted file mode 100644
index 7089a944483..00000000000
--- a/TAO/tao/IIOP_EndpointsA.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:848
-
-#ifndef _TAO_IDL_ORIG_IIOP_ENDPOINTSA_ANYOP_H_
-#define _TAO_IDL_ORIG_IIOP_ENDPOINTSA_ANYOP_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-// ====== Handcrafted
-namespace TAO
-{
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IIOP_Endpoint_Info;
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IIOPEndpointSequence;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const TAO::IIOP_Endpoint_Info &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, TAO::IIOP_Endpoint_Info*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::IIOP_Endpoint_Info *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::IIOP_Endpoint_Info *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const TAO::IIOPEndpointSequence &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, TAO::IIOPEndpointSequence*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::IIOPEndpointSequence *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::IIOPEndpointSequence *&);
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/TAO/tao/IIOP_EndpointsC.cpp b/TAO/tao/IIOP_EndpointsC.cpp
index 29d33484b96..38f684d391d 100644
--- a/TAO/tao/IIOP_EndpointsC.cpp
+++ b/TAO/tao/IIOP_EndpointsC.cpp
@@ -26,10 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:338
+// be\be_codegen.cpp:323
 
 
 #include "IIOP_EndpointsC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
@@ -41,7 +42,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:62
+// be\be_visitor_arg_traits.cpp:64
 
 // Arg traits specializations.
 namespace TAO
@@ -49,10 +50,10 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/structure_cs.cpp:66
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 TAO::IIOP_Endpoint_Info::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -62,8 +63,8 @@ TAO::IIOP_Endpoint_Info::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:65
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_TAO_IIOPENDPOINTSEQUENCE_CS_)
 #define _TAO_IIOPENDPOINTSEQUENCE_CS_
@@ -116,7 +117,32 @@ void TAO::IIOPEndpointSequence::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:95
+// be\be_visitor_structure/cdr_op_cs.cpp:61
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const TAO::IIOP_Endpoint_Info &_tao_aggregate
+  )
+{
+  return
+    (strm << _tao_aggregate.host.in ()) &&
+    (strm << _tao_aggregate.port) &&
+    (strm << _tao_aggregate.priority);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    TAO::IIOP_Endpoint_Info &_tao_aggregate
+  )
+{
+  return
+    (strm >> _tao_aggregate.host.out ()) &&
+    (strm >> _tao_aggregate.port) &&
+    (strm >> _tao_aggregate.priority);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_TAO_IIOPEndpointSequence_CPP_
 #define _TAO_CDR_OP_TAO_IIOPEndpointSequence_CPP_
@@ -127,20 +153,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
@@ -150,7 +176,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -160,35 +186,35 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
-
+    
     }
-
+  
   return 0;
 }
 
 #endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_CPP_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1725
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -284,4 +310,5 @@ CORBA::Boolean operator>> (
 
 #endif /* end #if !defined */
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/IIOP_EndpointsC.h b/TAO/tao/IIOP_EndpointsC.h
index 50d8c9f2b72..9666b8691af 100644
--- a/TAO/tao/IIOP_EndpointsC.h
+++ b/TAO/tao/IIOP_EndpointsC.h
@@ -26,19 +26,20 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:186
+// be\be_codegen.cpp:171
 
 #ifndef _TAO_IDL_ORIG_IIOP_ENDPOINTSC_H_
 #define _TAO_IDL_ORIG_IIOP_ENDPOINTSC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/CDR.h"
+#include "tao/Environment.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
@@ -68,57 +69,62 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace TAO
 {
-
+  
   // TAO_IDL - Generated from
-  // be/be_type.cpp:258
-
+  // be\be_type.cpp:258
+  
   struct IIOP_Endpoint_Info;
-
+  
   typedef
     TAO_Var_Var_T<
         IIOP_Endpoint_Info
       >
     IIOP_Endpoint_Info_var;
-
+  
   typedef
     TAO_Out_T<
         IIOP_Endpoint_Info,
         IIOP_Endpoint_Info_var
       >
     IIOP_Endpoint_Info_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
-
+  // be\be_visitor_structure/structure_ch.cpp:52
+  
   struct TAO_Export IIOP_Endpoint_Info
   {
     typedef IIOP_Endpoint_Info_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager host;
     CORBA::Short port;
     CORBA::Short priority;
   };
-
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IIOP_Endpoint_Info;
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_TAO_IIOPENDPOINTSEQUENCE_CH_)
 #define _TAO_IIOPENDPOINTSEQUENCE_CH_
-
+  
   class IIOPEndpointSequence;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         IIOPEndpointSequence,
         IIOP_Endpoint_Info
       >
     IIOPEndpointSequence_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         IIOPEndpointSequence,
@@ -126,7 +132,7 @@ namespace TAO
         IIOP_Endpoint_Info
       >
     IIOPEndpointSequence_out;
-
+  
   class TAO_Export IIOPEndpointSequence
     : public
         TAO_Unbounded_Sequence<
@@ -139,26 +145,31 @@ namespace TAO
     IIOPEndpointSequence (
         CORBA::ULong max,
         CORBA::ULong length,
-        IIOP_Endpoint_Info* buffer,
+        IIOP_Endpoint_Info* buffer, 
         CORBA::Boolean release = 0
       );
     IIOPEndpointSequence (const IIOPEndpointSequence &);
     ~IIOPEndpointSequence (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef IIOPEndpointSequence_var _var_type;
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IIOPEndpointSequence;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module TAO
 
 // TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -166,18 +177,29 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
+// be\be_visitor_structure/any_op_ch.cpp:52
 
-#ifndef __ACE_INLINE__
+TAO_Export void operator<<= (CORBA::Any &, const TAO::IIOP_Endpoint_Info &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, TAO::IIOP_Endpoint_Info*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::IIOP_Endpoint_Info *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::IIOP_Endpoint_Info *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:53
+// be\be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const TAO::IIOPEndpointSequence &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, TAO::IIOPEndpointSequence*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::IIOPEndpointSequence *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::IIOPEndpointSequence *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::IIOP_Endpoint_Info &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::IIOP_Endpoint_Info &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:70
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_TAO_IIOPEndpointSequence_H_
 #define _TAO_CDR_OP_TAO_IIOPEndpointSequence_H_
@@ -194,12 +216,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
-
-#endif /* __ACE_INLINE__ */
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1050
+// be\be_codegen.cpp:978
 
 #if defined (__ACE_INLINE__)
 #include "IIOP_EndpointsC.i"
@@ -216,3 +233,4 @@ TAO_Export CORBA::Boolean operator>> (
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/IIOP_EndpointsC.i b/TAO/tao/IIOP_EndpointsC.i
index 7a6d636dd76..38aa32569ba 100644
--- a/TAO/tao/IIOP_EndpointsC.i
+++ b/TAO/tao/IIOP_EndpointsC.i
@@ -26,48 +26,3 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:70
-
-ACE_INLINE
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TAO::IIOP_Endpoint_Info &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.host.in ()) &&
-    (strm << _tao_aggregate.port) &&
-    (strm << _tao_aggregate.priority);
-}
-
-ACE_INLINE
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    TAO::IIOP_Endpoint_Info &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.host.out ()) &&
-    (strm >> _tao_aggregate.port) &&
-    (strm >> _tao_aggregate.priority);
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:81
-
-#if !defined _TAO_CDR_OP_TAO_IIOPEndpointSequence_I_
-#define _TAO_CDR_OP_TAO_IIOPEndpointSequence_I_
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const TAO::IIOPEndpointSequence &
-  );
-
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    TAO::IIOPEndpointSequence &
-  );
-
-#endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_I_ */
-
diff --git a/TAO/tao/IIOP_EndpointsC.inl b/TAO/tao/IIOP_EndpointsC.inl
deleted file mode 100644
index c06f2918a7e..00000000000
--- a/TAO/tao/IIOP_EndpointsC.inl
+++ /dev/null
@@ -1,73 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70
-
-ACE_INLINE
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TAO::IIOP_Endpoint_Info &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.host.in ()) &&
-    (strm << _tao_aggregate.port) &&
-    (strm << _tao_aggregate.priority);
-}
-
-ACE_INLINE
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    TAO::IIOP_Endpoint_Info &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.host.out ()) &&
-    (strm >> _tao_aggregate.port) &&
-    (strm >> _tao_aggregate.priority);
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81
-
-#if !defined _TAO_CDR_OP_TAO_IIOPEndpointSequence_I_
-#define _TAO_CDR_OP_TAO_IIOPEndpointSequence_I_
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const TAO::IIOPEndpointSequence &
-  );
-
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    TAO::IIOPEndpointSequence &
-  );
-
-#endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_I_ */
-
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
index 0c1b5606dcb..8a26cddce86 100644
--- a/TAO/tao/IOPC.cpp
+++ b/TAO/tao/IOPC.cpp
@@ -26,10 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301
+// be\be_codegen.cpp:323
 
 
 #include "IOPC.h"
+#include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -40,10 +41,11 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59
+// be\be_visitor_arg_traits.cpp:64
 
 // Arg traits specializations.
 namespace TAO
 {
 }
 
+
diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h
index 3c2ad3033d7..fb1bc775cf0 100644
--- a/TAO/tao/IOPC.h
+++ b/TAO/tao/IOPC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
+// be\be_codegen.cpp:171
 
 #ifndef _TAO_IDL_ORIG_IOPC_H_
 #define _TAO_IDL_ORIG_IOPC_H_
@@ -39,6 +39,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
+#include "tao/Environment.h"
+
 #include "IOP_CodecC.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -65,17 +68,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63
-
-namespace TAO
-{
-  class Collocation_Proxy_Broker;
-
-  template<typename T> class Narrow_Utils;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -83,17 +76,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
-
-#ifndef __ACE_INLINE__
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
-
-#endif /* __ACE_INLINE__ */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:969
+// be\be_codegen.cpp:978
 
 #if defined (__ACE_INLINE__)
 #include "IOPC.i"
@@ -108,5 +91,6 @@ namespace TAO
 #endif /* __BORLANDC__ */
 
 #include /**/ "ace/post.h"
+
 #endif /* ifndef */
 
diff --git a/TAO/tao/IOPS_T.cpp b/TAO/tao/IOPS_T.cpp
index 893f7801e9e..c97b14d8efa 100644
--- a/TAO/tao/IOPS_T.cpp
+++ b/TAO/tao/IOPS_T.cpp
@@ -15,15 +15,21 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:777
+// be\be_codegen.cpp:705
 
-#ifndef _TAO_IDL_IOPS_T_CPP_
-#define _TAO_IDL_IOPS_T_CPP_
+#ifndef _TAO_IDL_ORIG_IOPS_T_CPP_
+#define _TAO_IDL_ORIG_IOPS_T_CPP_
 
 #include "IOPS_T.h"
 
diff --git a/TAO/tao/IOPS_T.h b/TAO/tao/IOPS_T.h
index 920b9bcb488..9423b4ae0be 100644
--- a/TAO/tao/IOPS_T.h
+++ b/TAO/tao/IOPS_T.h
@@ -15,17 +15,23 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:604
-
-#ifndef _TAO_IDL_IOPS_T_H_
-#define _TAO_IDL_IOPS_T_H_
+// be\be_codegen.cpp:566
 
+#ifndef _TAO_IDL_ORIG_IOPS_T_H_
+#define _TAO_IDL_ORIG_IOPS_T_H_
 
+#include /**/ "ace/pre.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
@@ -35,18 +41,8 @@
 #endif /* _MSC_VER */
 
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
-
-#if defined (ACE_HAS_USING_KEYWORD)
-namespace POA_IOP
-{
-}
-// end module IOP
-#endif /* ACE_HAS_USING_KEYWORD */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1141
+// TAO_IDL - Generated from 
+// be\be_codegen.cpp:1111
 
 #if defined (__ACE_INLINE__)
 #include "IOPS_T.i"
@@ -64,4 +60,5 @@ namespace POA_IOP
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#include /**/ "ace/post.h"
 #endif /* ifndef */
diff --git a/TAO/tao/IOPS_T.i b/TAO/tao/IOPS_T.i
index e86a7e25a26..38aa32569ba 100644
--- a/TAO/tao/IOPS_T.i
+++ b/TAO/tao/IOPS_T.i
@@ -15,6 +15,12 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
diff --git a/TAO/tao/IOP_CodecA.cpp b/TAO/tao/IOP_CodecA.cpp
index 5772febf390..b481d41bd70 100644
--- a/TAO/tao/IOP_CodecA.cpp
+++ b/TAO/tao/IOP_CodecA.cpp
@@ -31,6 +31,342 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_IOP_Codec_InvalidTypeForEncoding[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  49,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x436f6465),
+  ACE_NTOHL (0x632f496e),
+  ACE_NTOHL (0x76616c69),
+  ACE_NTOHL (0x64547970),
+  ACE_NTOHL (0x65466f72),
+  ACE_NTOHL (0x456e636f),
+  ACE_NTOHL (0x64696e67),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0
+    23,
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c696454),
+  ACE_NTOHL (0x79706546),
+  ACE_NTOHL (0x6f72456e),
+  ACE_NTOHL (0x636f6469),
+  ACE_NTOHL (0x6e670000),  // name = InvalidTypeForEncoding
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding (
+    CORBA::tk_except,
+    sizeof (_oc_IOP_Codec_InvalidTypeForEncoding),
+    (char *) &_oc_IOP_Codec_InvalidTypeForEncoding,
+    0,
+    sizeof (IOP::Codec::InvalidTypeForEncoding)
+  );
+
+::CORBA::TypeCode_ptr IOP::Codec::_tc_InvalidTypeForEncoding =
+  &_tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_IOP_Codec_FormatMismatch[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  41,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x436f6465),
+  ACE_NTOHL (0x632f466f),
+  ACE_NTOHL (0x726d6174),
+  ACE_NTOHL (0x4d69736d),
+  ACE_NTOHL (0x61746368),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Codec/FormatMismatch:1.0
+    15,
+  ACE_NTOHL (0x466f726d),
+  ACE_NTOHL (0x61744d69),
+  ACE_NTOHL (0x736d6174),
+  ACE_NTOHL (0x63680000),  // name = FormatMismatch
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_FormatMismatch (
+    CORBA::tk_except,
+    sizeof (_oc_IOP_Codec_FormatMismatch),
+    (char *) &_oc_IOP_Codec_FormatMismatch,
+    0,
+    sizeof (IOP::Codec::FormatMismatch)
+  );
+
+::CORBA::TypeCode_ptr IOP::Codec::_tc_FormatMismatch =
+  &_tc_TAO_tc_IOP_Codec_FormatMismatch;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_IOP_Codec_TypeMismatch[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  39,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x436f6465),
+  ACE_NTOHL (0x632f5479),
+  ACE_NTOHL (0x70654d69),
+  ACE_NTOHL (0x736d6174),
+  ACE_NTOHL (0x63683a31),
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/Codec/TypeMismatch:1.0
+    13,
+  ACE_NTOHL (0x54797065),
+  ACE_NTOHL (0x4d69736d),
+  ACE_NTOHL (0x61746368),
+  ACE_NTOHL (0x0),  // name = TypeMismatch
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_TypeMismatch (
+    CORBA::tk_except,
+    sizeof (_oc_IOP_Codec_TypeMismatch),
+    (char *) &_oc_IOP_Codec_TypeMismatch,
+    0,
+    sizeof (IOP::Codec::TypeMismatch)
+  );
+
+::CORBA::TypeCode_ptr IOP::Codec::_tc_TypeMismatch =
+  &_tc_TAO_tc_IOP_Codec_TypeMismatch;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_IOP_Codec[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  26,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x436f6465),
+  ACE_NTOHL (0x633a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/Codec:1.0
+    6,
+  ACE_NTOHL (0x436f6465),
+  ACE_NTOHL (0x63000000),  // name = Codec
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_Codec (
+    CORBA::tk_objref,
+    sizeof (_oc_IOP_Codec),
+    (char *) &_oc_IOP_Codec,
+    0,
+    sizeof (IOP::Codec)
+  );
+
+namespace IOP
+{
+  ::CORBA::TypeCode_ptr _tc_Codec =
+    &_tc_TAO_tc_IOP_Codec;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_IOP_EncodingFormat[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  35,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x456e636f),
+  ACE_NTOHL (0x64696e67),
+  ACE_NTOHL (0x466f726d),
+  ACE_NTOHL (0x61743a31),
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
+    15,
+  ACE_NTOHL (0x456e636f),
+  ACE_NTOHL (0x64696e67),
+  ACE_NTOHL (0x466f726d),
+  ACE_NTOHL (0x61740000),  // name = EncodingFormat
+    CORBA::tk_short,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_EncodingFormat (
+    CORBA::tk_alias,
+    sizeof (_oc_IOP_EncodingFormat),
+    (char *) &_oc_IOP_EncodingFormat,
+    0,
+    sizeof (IOP::EncodingFormat)
+  );
+
+namespace IOP
+{
+  ::CORBA::TypeCode_ptr _tc_EncodingFormat =
+    &_tc_TAO_tc_IOP_EncodingFormat;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_IOP_Encoding[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  29,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x456e636f),
+  ACE_NTOHL (0x64696e67),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Encoding:1.0
+    9,
+  ACE_NTOHL (0x456e636f),
+  ACE_NTOHL (0x64696e67),
+  ACE_NTOHL (0x0),  // name = Encoding
+  3, // member count
+    7,
+  ACE_NTOHL (0x666f726d),
+  ACE_NTOHL (0x61740000),  // name = format
+    CORBA::tk_alias, // typecode kind for typedefs
+  68, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    35,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x494f502f),
+    ACE_NTOHL (0x456e636f),
+    ACE_NTOHL (0x64696e67),
+    ACE_NTOHL (0x466f726d),
+    ACE_NTOHL (0x61743a31),
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
+        15,
+    ACE_NTOHL (0x456e636f),
+    ACE_NTOHL (0x64696e67),
+    ACE_NTOHL (0x466f726d),
+    ACE_NTOHL (0x61740000),  // name = EncodingFormat
+        CORBA::tk_short,
+
+
+  14,
+  ACE_NTOHL (0x6d616a6f),
+  ACE_NTOHL (0x725f7665),
+  ACE_NTOHL (0x7273696f),
+  ACE_NTOHL (0x6e000000),  // name = major_version
+    CORBA::tk_octet,
+
+  14,
+  ACE_NTOHL (0x6d696e6f),
+  ACE_NTOHL (0x725f7665),
+  ACE_NTOHL (0x7273696f),
+  ACE_NTOHL (0x6e000000),  // name = minor_version
+    CORBA::tk_octet,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_Encoding (
+    CORBA::tk_struct,
+    sizeof (_oc_IOP_Encoding),
+    (char *) &_oc_IOP_Encoding,
+    0,
+    sizeof (IOP::Encoding)
+  );
+
+namespace IOP
+{
+  ::CORBA::TypeCode_ptr _tc_Encoding =
+    &_tc_TAO_tc_IOP_Encoding;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_IOP_CodecFactory_UnknownEncoding[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  49,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x436f6465),
+  ACE_NTOHL (0x63466163),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f556e6b),
+  ACE_NTOHL (0x6e6f776e),
+  ACE_NTOHL (0x456e636f),
+  ACE_NTOHL (0x64696e67),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0
+    16,
+  ACE_NTOHL (0x556e6b6e),
+  ACE_NTOHL (0x6f776e45),
+  ACE_NTOHL (0x6e636f64),
+  ACE_NTOHL (0x696e6700),  // name = UnknownEncoding
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory_UnknownEncoding (
+    CORBA::tk_except,
+    sizeof (_oc_IOP_CodecFactory_UnknownEncoding),
+    (char *) &_oc_IOP_CodecFactory_UnknownEncoding,
+    0,
+    sizeof (IOP::CodecFactory::UnknownEncoding)
+  );
+
+::CORBA::TypeCode_ptr IOP::CodecFactory::_tc_UnknownEncoding =
+  &_tc_TAO_tc_IOP_CodecFactory_UnknownEncoding;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_IOP_CodecFactory[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x436f6465),
+  ACE_NTOHL (0x63466163),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/CodecFactory:1.0
+    13,
+  ACE_NTOHL (0x436f6465),
+  ACE_NTOHL (0x63466163),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x0),  // name = CodecFactory
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory (
+    CORBA::tk_objref,
+    sizeof (_oc_IOP_CodecFactory),
+    (char *) &_oc_IOP_CodecFactory,
+    0,
+    sizeof (IOP::CodecFactory)
+  );
+
+namespace IOP
+{
+  ::CORBA::TypeCode_ptr _tc_CodecFactory =
+    &_tc_TAO_tc_IOP_CodecFactory;
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
diff --git a/TAO/tao/IOP_CodecC.cpp b/TAO/tao/IOP_CodecC.cpp
index 7b9d55368f9..26f565c6479 100644
--- a/TAO/tao/IOP_CodecC.cpp
+++ b/TAO/tao/IOP_CodecC.cpp
@@ -30,6 +30,7 @@
 
 
 #include "IOP_CodecC.h"
+#include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -196,47 +197,6 @@ CORBA::TypeCode_ptr IOP::Codec::InvalidTypeForEncoding::_type (void) const
   return ::IOP::Codec::_tc_InvalidTypeForEncoding;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IOP_Codec_InvalidTypeForEncoding[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  49,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x632f496e), 
-  ACE_NTOHL (0x76616c69), 
-  ACE_NTOHL (0x64547970), 
-  ACE_NTOHL (0x65466f72), 
-  ACE_NTOHL (0x456e636f), 
-  ACE_NTOHL (0x64696e67), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0
-    23,
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c696454), 
-  ACE_NTOHL (0x79706546), 
-  ACE_NTOHL (0x6f72456e), 
-  ACE_NTOHL (0x636f6469), 
-  ACE_NTOHL (0x6e670000),  // name = InvalidTypeForEncoding
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding (
-    CORBA::tk_except,
-    sizeof (_oc_IOP_Codec_InvalidTypeForEncoding),
-    (char *) &_oc_IOP_Codec_InvalidTypeForEncoding,
-    0,
-    sizeof (IOP::Codec::InvalidTypeForEncoding)
-  );
-
-::CORBA::TypeCode_ptr IOP::Codec::_tc_InvalidTypeForEncoding =
-  &_tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding;
-
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
@@ -338,43 +298,6 @@ CORBA::TypeCode_ptr IOP::Codec::FormatMismatch::_type (void) const
   return ::IOP::Codec::_tc_FormatMismatch;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IOP_Codec_FormatMismatch[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  41,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x632f466f), 
-  ACE_NTOHL (0x726d6174), 
-  ACE_NTOHL (0x4d69736d), 
-  ACE_NTOHL (0x61746368), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Codec/FormatMismatch:1.0
-    15,
-  ACE_NTOHL (0x466f726d), 
-  ACE_NTOHL (0x61744d69), 
-  ACE_NTOHL (0x736d6174), 
-  ACE_NTOHL (0x63680000),  // name = FormatMismatch
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_FormatMismatch (
-    CORBA::tk_except,
-    sizeof (_oc_IOP_Codec_FormatMismatch),
-    (char *) &_oc_IOP_Codec_FormatMismatch,
-    0,
-    sizeof (IOP::Codec::FormatMismatch)
-  );
-
-::CORBA::TypeCode_ptr IOP::Codec::_tc_FormatMismatch =
-  &_tc_TAO_tc_IOP_Codec_FormatMismatch;
-
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
@@ -476,42 +399,6 @@ CORBA::TypeCode_ptr IOP::Codec::TypeMismatch::_type (void) const
   return ::IOP::Codec::_tc_TypeMismatch;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IOP_Codec_TypeMismatch[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x632f5479), 
-  ACE_NTOHL (0x70654d69), 
-  ACE_NTOHL (0x736d6174), 
-  ACE_NTOHL (0x63683a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/Codec/TypeMismatch:1.0
-    13,
-  ACE_NTOHL (0x54797065), 
-  ACE_NTOHL (0x4d69736d), 
-  ACE_NTOHL (0x61746368), 
-  ACE_NTOHL (0x0),  // name = TypeMismatch
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_TypeMismatch (
-    CORBA::tk_except,
-    sizeof (_oc_IOP_Codec_TypeMismatch),
-    (char *) &_oc_IOP_Codec_TypeMismatch,
-    0,
-    sizeof (IOP::Codec::TypeMismatch)
-  );
-
-::CORBA::TypeCode_ptr IOP::Codec::_tc_TypeMismatch =
-  &_tc_TAO_tc_IOP_Codec_TypeMismatch;
-
 IOP::Codec::Codec (void)
 {}
 
@@ -611,152 +498,6 @@ IOP::Codec::marshal (TAO_OutputCDR &)
   return 0;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IOP_Codec[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  26,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x633a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/Codec:1.0
-    6,
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x63000000),  // name = Codec
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_Codec (
-    CORBA::tk_objref,
-    sizeof (_oc_IOP_Codec),
-    (char *) &_oc_IOP_Codec,
-    0,
-    sizeof (IOP::Codec)
-  );
-
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr _tc_Codec =
-    &_tc_TAO_tc_IOP_Codec;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IOP_EncodingFormat[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x456e636f), 
-  ACE_NTOHL (0x64696e67), 
-  ACE_NTOHL (0x466f726d), 
-  ACE_NTOHL (0x61743a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
-    15,
-  ACE_NTOHL (0x456e636f), 
-  ACE_NTOHL (0x64696e67), 
-  ACE_NTOHL (0x466f726d), 
-  ACE_NTOHL (0x61740000),  // name = EncodingFormat
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_EncodingFormat (
-    CORBA::tk_alias,
-    sizeof (_oc_IOP_EncodingFormat),
-    (char *) &_oc_IOP_EncodingFormat,
-    0,
-    sizeof (IOP::EncodingFormat)
-  );
-
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr _tc_EncodingFormat =
-    &_tc_TAO_tc_IOP_EncodingFormat;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IOP_Encoding[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  29,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x456e636f), 
-  ACE_NTOHL (0x64696e67), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Encoding:1.0
-    9,
-  ACE_NTOHL (0x456e636f), 
-  ACE_NTOHL (0x64696e67), 
-  ACE_NTOHL (0x0),  // name = Encoding
-  3, // member count
-    7,
-  ACE_NTOHL (0x666f726d), 
-  ACE_NTOHL (0x61740000),  // name = format
-    CORBA::tk_alias, // typecode kind for typedefs
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    35,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x494f502f), 
-    ACE_NTOHL (0x456e636f), 
-    ACE_NTOHL (0x64696e67), 
-    ACE_NTOHL (0x466f726d), 
-    ACE_NTOHL (0x61743a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
-        15,
-    ACE_NTOHL (0x456e636f), 
-    ACE_NTOHL (0x64696e67), 
-    ACE_NTOHL (0x466f726d), 
-    ACE_NTOHL (0x61740000),  // name = EncodingFormat
-        CORBA::tk_short,
-
-
-  14,
-  ACE_NTOHL (0x6d616a6f), 
-  ACE_NTOHL (0x725f7665), 
-  ACE_NTOHL (0x7273696f), 
-  ACE_NTOHL (0x6e000000),  // name = major_version
-    CORBA::tk_octet,
-
-  14,
-  ACE_NTOHL (0x6d696e6f), 
-  ACE_NTOHL (0x725f7665), 
-  ACE_NTOHL (0x7273696f), 
-  ACE_NTOHL (0x6e000000),  // name = minor_version
-    CORBA::tk_octet,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_Encoding (
-    CORBA::tk_struct,
-    sizeof (_oc_IOP_Encoding),
-    (char *) &_oc_IOP_Encoding,
-    0,
-    sizeof (IOP::Encoding)
-  );
-
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr _tc_Encoding =
-    &_tc_TAO_tc_IOP_Encoding;
-}
-
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -917,45 +658,6 @@ CORBA::TypeCode_ptr IOP::CodecFactory::UnknownEncoding::_type (void) const
   return ::IOP::CodecFactory::_tc_UnknownEncoding;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IOP_CodecFactory_UnknownEncoding[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  49,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x63466163), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f556e6b), 
-  ACE_NTOHL (0x6e6f776e), 
-  ACE_NTOHL (0x456e636f), 
-  ACE_NTOHL (0x64696e67), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0
-    16,
-  ACE_NTOHL (0x556e6b6e), 
-  ACE_NTOHL (0x6f776e45), 
-  ACE_NTOHL (0x6e636f64), 
-  ACE_NTOHL (0x696e6700),  // name = UnknownEncoding
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory_UnknownEncoding (
-    CORBA::tk_except,
-    sizeof (_oc_IOP_CodecFactory_UnknownEncoding),
-    (char *) &_oc_IOP_CodecFactory_UnknownEncoding,
-    0,
-    sizeof (IOP::CodecFactory::UnknownEncoding)
-  );
-
-::CORBA::TypeCode_ptr IOP::CodecFactory::_tc_UnknownEncoding =
-  &_tc_TAO_tc_IOP_CodecFactory_UnknownEncoding;
-
 IOP::CodecFactory::CodecFactory (void)
 {}
 
@@ -1056,43 +758,6 @@ IOP::CodecFactory::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_IOP_CodecFactory[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x63466163), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/CodecFactory:1.0
-    13,
-  ACE_NTOHL (0x436f6465), 
-  ACE_NTOHL (0x63466163), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x0),  // name = CodecFactory
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory (
-    CORBA::tk_objref,
-    sizeof (_oc_IOP_CodecFactory),
-    (char *) &_oc_IOP_CodecFactory,
-    0,
-    sizeof (IOP::CodecFactory)
-  );
-
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr _tc_CodecFactory =
-    &_tc_TAO_tc_IOP_CodecFactory;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_structure/cdr_op_cs.cpp:61
 
 CORBA::Boolean operator<< (
@@ -1118,7 +783,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/IOP_CodecC.h b/TAO/tao/IOP_CodecC.h
index a630f6914a8..3c05765c8d8 100644
--- a/TAO/tao/IOP_CodecC.h
+++ b/TAO/tao/IOP_CodecC.h
@@ -40,7 +40,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
-#include "tao/CDR.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Typecode.h"
@@ -71,13 +70,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -87,22 +86,22 @@ namespace TAO
 
 namespace IOP
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_IOP_CODEC__VAR_OUT_CH_)
 #define _IOP_CODEC__VAR_OUT_CH_
-
+  
   class Codec;
   typedef Codec *Codec_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Codec
       >
     Codec_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Codec
@@ -110,58 +109,58 @@ namespace IOP
     Codec_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IOP_CODEC_CH_)
 #define _IOP_CODEC_CH_
-
+  
   class TAO_Export Codec
     : public virtual CORBA::Object
   {
   public:
     typedef Codec_ptr _ptr_type;
     typedef Codec_var _var_type;
-
+    
     // The static operations.
     static Codec_ptr _duplicate (Codec_ptr obj);
-
+    
     static Codec_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Codec_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Codec_ptr _nil (void)
     {
       return (Codec_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IOP_CODEC_INVALIDTYPEFORENCODING_CH_)
 #define _IOP_CODEC_INVALIDTYPEFORENCODING_CH_
-
+    
     class TAO_Export InvalidTypeForEncoding : public CORBA::UserException
     {
     public:
-
+      
       InvalidTypeForEncoding (void);
       InvalidTypeForEncoding (const InvalidTypeForEncoding &);
       ~InvalidTypeForEncoding (void);
 
       InvalidTypeForEncoding &operator= (const InvalidTypeForEncoding &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static InvalidTypeForEncoding *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -173,25 +172,25 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:125
-
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_InvalidTypeForEncoding;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
diff --git a/TAO/tao/IOP_IORA.cpp b/TAO/tao/IOP_IORA.cpp
index 34da5a13aa3..111d3c7f604 100644
--- a/TAO/tao/IOP_IORA.cpp
+++ b/TAO/tao/IOP_IORA.cpp
@@ -26,13 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "IOP_IORC.h"
-#include "IOP_IORA.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Dual_Impl_T.h"
 
-//======= Handcrafted
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_IOP_ProfileId[] =
 {
@@ -69,7 +67,7 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_IOP_TaggedProfile[] =
 {
@@ -157,30 +155,28 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
-static const CORBA::Long _oc_IOP_IOR[] =
+static const CORBA::Long _oc_IOP_TaggedProfileSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
-  24,
+  37,
   ACE_NTOHL (0x49444c3a),
   ACE_NTOHL (0x6f6d672e),
   ACE_NTOHL (0x6f72672f),
   ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x494f523a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
-    4,
-  ACE_NTOHL (0x494f5200),  // name = IOR
-  2, // member count
-    8,
-  ACE_NTOHL (0x74797065),
-  ACE_NTOHL (0x5f696400),  // name = type_id
-    CORBA::tk_string,
-  0U, // string length
-  9,
-  ACE_NTOHL (0x70726f66),
-  ACE_NTOHL (0x696c6573),
-  ACE_NTOHL (0x0),  // name = profiles
+  ACE_NTOHL (0x54616767),
+  ACE_NTOHL (0x65645072),
+  ACE_NTOHL (0x6f66696c),
+  ACE_NTOHL (0x65536571),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/TaggedProfileSeq:1.0
+    17,
+  ACE_NTOHL (0x54616767),
+  ACE_NTOHL (0x65645072),
+  ACE_NTOHL (0x6f66696c),
+  ACE_NTOHL (0x65536571),
+  ACE_NTOHL (0x0),  // name = TaggedProfileSeq
     CORBA::tk_sequence, // typecode kind
   264, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
@@ -258,6 +254,143 @@ static const CORBA::Long _oc_IOP_IOR[] =
 
 };
 
+static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedProfileSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_IOP_TaggedProfileSeq),
+    (char *) &_oc_IOP_TaggedProfileSeq,
+    0,
+    sizeof (IOP::TaggedProfileSeq)
+  );
+
+namespace IOP
+{
+  ::CORBA::TypeCode_ptr _tc_TaggedProfileSeq =
+    &_tc_TAO_tc_IOP_TaggedProfileSeq;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_IOP_IOR[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  24,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x494f523a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
+    4,
+  ACE_NTOHL (0x494f5200),  // name = IOR
+  2, // member count
+    8,
+  ACE_NTOHL (0x74797065),
+  ACE_NTOHL (0x5f696400),  // name = type_id
+    CORBA::tk_string,
+  0U, // string length
+  9,
+  ACE_NTOHL (0x70726f66),
+  ACE_NTOHL (0x696c6573),
+  ACE_NTOHL (0x0),  // name = profiles
+    CORBA::tk_alias, // typecode kind for typedefs
+  344, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    37,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x494f502f),
+    ACE_NTOHL (0x54616767),
+    ACE_NTOHL (0x65645072),
+    ACE_NTOHL (0x6f66696c),
+    ACE_NTOHL (0x65536571),
+    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/TaggedProfileSeq:1.0
+        17,
+    ACE_NTOHL (0x54616767),
+    ACE_NTOHL (0x65645072),
+    ACE_NTOHL (0x6f66696c),
+    ACE_NTOHL (0x65536571),
+    ACE_NTOHL (0x0),  // name = TaggedProfileSeq
+        CORBA::tk_sequence, // typecode kind
+    264, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_struct, // typecode kind
+      248, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        34,
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x494f502f),
+        ACE_NTOHL (0x54616767),
+        ACE_NTOHL (0x65645072),
+        ACE_NTOHL (0x6f66696c),
+        ACE_NTOHL (0x653a312e),
+        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
+                14,
+        ACE_NTOHL (0x54616767),
+        ACE_NTOHL (0x65645072),
+        ACE_NTOHL (0x6f66696c),
+        ACE_NTOHL (0x65000000),  // name = TaggedProfile
+        2, // member count
+                4,
+        ACE_NTOHL (0x74616700),  // name = tag
+                CORBA::tk_alias, // typecode kind for typedefs
+        60, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          30,
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x494f502f),
+          ACE_NTOHL (0x50726f66),
+          ACE_NTOHL (0x696c6549),
+          ACE_NTOHL (0x643a312e),
+          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
+                    10,
+          ACE_NTOHL (0x50726f66),
+          ACE_NTOHL (0x696c6549),
+          ACE_NTOHL (0x64000000),  // name = ProfileId
+                    CORBA::tk_ulong,
+
+
+        13,
+        ACE_NTOHL (0x70726f66),
+        ACE_NTOHL (0x696c655f),
+        ACE_NTOHL (0x64617461),
+        ACE_NTOHL (0x0),  // name = profile_data
+                CORBA::tk_alias, // typecode kind for typedefs
+        76, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          31,
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4f63),
+          ACE_NTOHL (0x74657453),
+          ACE_NTOHL (0x65713a31),
+          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
+                    9,
+          ACE_NTOHL (0x4f637465),
+          ACE_NTOHL (0x74536571),
+          ACE_NTOHL (0x0),  // name = OctetSeq
+                    CORBA::tk_sequence, // typecode kind
+          12, // encapsulation length
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            CORBA::tk_octet,
+
+            0U,
+
+
+
+      0U,
+
+
+};
+
 static CORBA::TypeCode _tc_TAO_tc_IOP_IOR (
     CORBA::tk_struct,
     sizeof (_oc_IOP_IOR),
@@ -273,7 +406,7 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_IOP_ComponentId[] =
 {
@@ -310,7 +443,7 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_IOP_TaggedComponent[] =
 {
@@ -398,7 +531,7 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_IOP_MultipleComponentProfile[] =
 {
@@ -516,7 +649,7 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_IOP_TaggedComponentList[] =
 {
@@ -630,7 +763,7 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_IOP_TaggedComponentSeq[] =
 {
@@ -744,7 +877,7 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_IOP_ServiceId[] =
 {
@@ -781,7 +914,7 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_IOP_ServiceContext[] =
 {
@@ -870,9 +1003,8 @@ namespace IOP
     &_tc_TAO_tc_IOP_ServiceContext;
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_IOP_ServiceContextList[] =
 {
@@ -987,9 +1119,8 @@ namespace IOP
     &_tc_TAO_tc_IOP_ServiceContextList;
 }
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -1047,7 +1178,65 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const IOP::TaggedProfileSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<IOP::TaggedProfileSeq>::insert_copy (
+      _tao_any,
+      IOP::TaggedProfileSeq::_tao_any_destructor,
+      IOP::_tc_TaggedProfileSeq,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    IOP::TaggedProfileSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<IOP::TaggedProfileSeq>::insert (
+      _tao_any,
+      IOP::TaggedProfileSeq::_tao_any_destructor,
+      IOP::_tc_TaggedProfileSeq,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    IOP::TaggedProfileSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const IOP::TaggedProfileSeq *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const IOP::TaggedProfileSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<IOP::TaggedProfileSeq>::extract (
+        _tao_any,
+        IOP::TaggedProfileSeq::_tao_any_destructor,
+        IOP::_tc_TaggedProfileSeq,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -1105,7 +1294,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -1163,7 +1352,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -1221,7 +1410,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -1279,7 +1468,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -1337,7 +1526,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:54
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -1395,7 +1584,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -1463,6 +1652,11 @@ CORBA::Boolean operator>>= (
 
   template class
     TAO::Any_Dual_Impl_T<
+        IOP::TaggedProfileSeq
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
         IOP::IOR
       >;
 
@@ -1505,6 +1699,11 @@ CORBA::Boolean operator>>= (
 
 # pragma instantiate \
     TAO::Any_Dual_Impl_T< \
+        IOP::TaggedProfileSeq \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
         IOP::IOR \
       >
 
@@ -1539,3 +1738,4 @@ CORBA::Boolean operator>>= (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/IOP_IORA.h b/TAO/tao/IOP_IORA.h
deleted file mode 100644
index f9200973dd3..00000000000
--- a/TAO/tao/IOP_IORA.h
+++ /dev/null
@@ -1,136 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:848
-
-#ifndef _TAO_IDL_ORIG_IOP_IORA_ANYOP_H_
-#define _TAO_IDL_ORIG_IOP_IORA_ANYOP_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-//======= Handcrafted
-namespace IOP
-{
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProfileId;
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedProfile;
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IOR;
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ComponentId;
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponent;
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultipleComponentProfile;
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponentList;
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponentSeq;
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceId;
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceContext;
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceContextList;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedProfile &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedProfile*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedProfile *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedProfile *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::IOR &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::IOR*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::IOR *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::IOR *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedComponent &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedComponent*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedComponent *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedComponent *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::MultipleComponentProfile &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::MultipleComponentProfile*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::MultipleComponentProfile *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::MultipleComponentProfile *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedComponentList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedComponentList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedComponentList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedComponentList *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedComponentSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedComponentSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedComponentSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedComponentSeq *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::ServiceContext &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::ServiceContext*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::ServiceContext *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::ServiceContext *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::ServiceContextList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::ServiceContextList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::ServiceContextList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::ServiceContextList *&);
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/TAO/tao/IOP_IORC.cpp b/TAO/tao/IOP_IORC.cpp
index e8e3d77f9fd..b298f5c6d6e 100644
--- a/TAO/tao/IOP_IORC.cpp
+++ b/TAO/tao/IOP_IORC.cpp
@@ -26,9 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:338
+// be\be_codegen.cpp:323
+
 
 #include "IOP_IORC.h"
+#include "tao/CDR.h"
+#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -39,7 +42,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:62
+// be\be_visitor_arg_traits.cpp:64
 
 // Arg traits specializations.
 namespace TAO
@@ -47,10 +50,10 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/structure_cs.cpp:66
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 IOP::TaggedProfile::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -60,29 +63,16 @@ IOP::TaggedProfile::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/structure_cs.cpp:66
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
-void
-IOP::IOR::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  IOR *_tao_tmp_pointer =
-    ACE_static_cast (IOR *, _tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
+#if !defined (_IOP_TAGGEDPROFILESEQ_CS_)
+#define _IOP_TAGGEDPROFILESEQ_CS_
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_IOP_IOR__TAO_SEQ_IOP_TAGGEDPROFILE__CS_)
-#define _IOP_IOR__TAO_SEQ_IOP_TAGGEDPROFILE__CS_
-
-IOP::IOR::_tao_seq_IOP_TaggedProfile_::_tao_seq_IOP_TaggedProfile_ (void)
+IOP::TaggedProfileSeq::TaggedProfileSeq (void)
 {}
 
-IOP::IOR::_tao_seq_IOP_TaggedProfile_::_tao_seq_IOP_TaggedProfile_ (
+IOP::TaggedProfileSeq::TaggedProfileSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
@@ -91,7 +81,7 @@ IOP::IOR::_tao_seq_IOP_TaggedProfile_::_tao_seq_IOP_TaggedProfile_ (
     (max)
 {}
 
-IOP::IOR::_tao_seq_IOP_TaggedProfile_::_tao_seq_IOP_TaggedProfile_ (
+IOP::TaggedProfileSeq::TaggedProfileSeq (
     CORBA::ULong max,
     CORBA::ULong length,
     IOP::TaggedProfile * buffer,
@@ -103,8 +93,8 @@ IOP::IOR::_tao_seq_IOP_TaggedProfile_::_tao_seq_IOP_TaggedProfile_ (
     (max, length, buffer, release)
 {}
 
-IOP::IOR::_tao_seq_IOP_TaggedProfile_::_tao_seq_IOP_TaggedProfile_ (
-    const _tao_seq_IOP_TaggedProfile_ &seq
+IOP::TaggedProfileSeq::TaggedProfileSeq (
+    const TaggedProfileSeq &seq
   )
   : TAO_Unbounded_Sequence<
         IOP::TaggedProfile
@@ -112,15 +102,37 @@ IOP::IOR::_tao_seq_IOP_TaggedProfile_::_tao_seq_IOP_TaggedProfile_ (
     (seq)
 {}
 
-IOP::IOR::_tao_seq_IOP_TaggedProfile_::~_tao_seq_IOP_TaggedProfile_ (void)
+IOP::TaggedProfileSeq::~TaggedProfileSeq (void)
 {}
 
+void IOP::TaggedProfileSeq::_tao_any_destructor (
+    void * _tao_void_pointer
+  )
+{
+  TaggedProfileSeq * _tao_tmp_pointer =
+    ACE_static_cast (TaggedProfileSeq *, _tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/structure_cs.cpp:66
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/structure_cs.cpp:66
+
+void 
+IOP::IOR::_tao_any_destructor (
+    void *_tao_void_pointer
+  )
+{
+  IOR *_tao_tmp_pointer =
+    ACE_static_cast (IOR *, _tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 IOP::TaggedComponent::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -130,8 +142,8 @@ IOP::TaggedComponent::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:65
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CS_)
 #define _IOP_MULTIPLECOMPONENTPROFILE_CS_
@@ -183,8 +195,8 @@ void IOP::MultipleComponentProfile::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:65
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IOP_TAGGEDCOMPONENTLIST_CS_)
 #define _IOP_TAGGEDCOMPONENTLIST_CS_
@@ -236,8 +248,8 @@ void IOP::TaggedComponentList::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:65
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IOP_TAGGEDCOMPONENTSEQ_CS_)
 #define _IOP_TAGGEDCOMPONENTSEQ_CS_
@@ -289,10 +301,10 @@ void IOP::TaggedComponentSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/structure_cs.cpp:66
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 IOP::ServiceContext::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -302,8 +314,8 @@ IOP::ServiceContext::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:65
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IOP_SERVICECONTEXTLIST_CS_)
 #define _IOP_SERVICECONTEXTLIST_CS_
@@ -356,41 +368,64 @@ void IOP::ServiceContextList::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:95
+// be\be_visitor_structure/cdr_op_cs.cpp:61
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IOP::TaggedProfile &_tao_aggregate
+  )
+{
+  return
+    (strm << _tao_aggregate.tag) &&
+    (strm << _tao_aggregate.profile_data);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IOP::TaggedProfile &_tao_aggregate
+  )
+{
+  return
+    (strm >> _tao_aggregate.tag) &&
+    (strm >> _tao_aggregate.profile_data);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
-#if !defined _TAO_CDR_OP_IOP_IOR__tao_seq_IOP_TaggedProfile__CPP_
-#define _TAO_CDR_OP_IOP_IOR__tao_seq_IOP_TaggedProfile__CPP_
+#if !defined _TAO_CDR_OP_IOP_TaggedProfileSeq_CPP_
+#define _TAO_CDR_OP_IOP_TaggedProfileSeq_CPP_
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const IOP::IOR::_tao_seq_IOP_TaggedProfile_ &_tao_sequence
+    const IOP::TaggedProfileSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    IOP::IOR::_tao_seq_IOP_TaggedProfile_ &_tao_sequence
+    IOP::TaggedProfileSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -400,35 +435,81 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
-
+    
     }
-
+  
   return 0;
 }
 
-#endif /* _TAO_CDR_OP_IOP_IOR__tao_seq_IOP_TaggedProfile__CPP_ */
+#endif /* _TAO_CDR_OP_IOP_TaggedProfileSeq_CPP_ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/cdr_op_cs.cpp:61
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IOP::IOR &_tao_aggregate
+  )
+{
+  return
+    (strm << _tao_aggregate.type_id.in ()) &&
+    (strm << _tao_aggregate.profiles);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IOP::IOR &_tao_aggregate
+  )
+{
+  return
+    (strm >> _tao_aggregate.type_id.out ()) &&
+    (strm >> _tao_aggregate.profiles);
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:95
+// be\be_visitor_structure/cdr_op_cs.cpp:61
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IOP::TaggedComponent &_tao_aggregate
+  )
+{
+  return
+    (strm << _tao_aggregate.tag) &&
+    (strm << _tao_aggregate.component_data);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IOP::TaggedComponent &_tao_aggregate
+  )
+{
+  return
+    (strm >> _tao_aggregate.tag) &&
+    (strm >> _tao_aggregate.component_data);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_IOP_MultipleComponentProfile_CPP_
 #define _TAO_CDR_OP_IOP_MultipleComponentProfile_CPP_
@@ -439,20 +520,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
@@ -462,7 +543,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -472,35 +553,35 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
-
+    
     }
-
+  
   return 0;
 }
 
 #endif /* _TAO_CDR_OP_IOP_MultipleComponentProfile_CPP_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:95
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_IOP_TaggedComponentList_CPP_
 #define _TAO_CDR_OP_IOP_TaggedComponentList_CPP_
@@ -511,20 +592,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
@@ -534,7 +615,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -544,35 +625,35 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
-
+    
     }
-
+  
   return 0;
 }
 
 #endif /* _TAO_CDR_OP_IOP_TaggedComponentList_CPP_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:95
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_IOP_TaggedComponentSeq_CPP_
 #define _TAO_CDR_OP_IOP_TaggedComponentSeq_CPP_
@@ -583,20 +664,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
@@ -606,7 +687,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -616,35 +697,58 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
-
+    
     }
-
+  
   return 0;
 }
 
 #endif /* _TAO_CDR_OP_IOP_TaggedComponentSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:95
+// be\be_visitor_structure/cdr_op_cs.cpp:61
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IOP::ServiceContext &_tao_aggregate
+  )
+{
+  return
+    (strm << _tao_aggregate.context_id) &&
+    (strm << _tao_aggregate.context_data);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IOP::ServiceContext &_tao_aggregate
+  )
+{
+  return
+    (strm >> _tao_aggregate.context_id) &&
+    (strm >> _tao_aggregate.context_data);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_IOP_ServiceContextList_CPP_
 #define _TAO_CDR_OP_IOP_ServiceContextList_CPP_
@@ -655,20 +759,20 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
@@ -678,7 +782,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -688,35 +792,35 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
-
+    
     }
-
+  
   return 0;
 }
 
 #endif /* _TAO_CDR_OP_IOP_ServiceContextList_CPP_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1725
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -736,6 +840,25 @@ CORBA::Boolean operator>> (
         IOP::TaggedProfile_var
       >;
 
+  template class
+    TAO_VarSeq_Var_T<
+        IOP::TaggedProfileSeq,
+        IOP::TaggedProfile
+      >;
+
+  template class
+    TAO_Seq_Var_Base_T<
+        IOP::TaggedProfileSeq,
+        IOP::TaggedProfile
+      >;
+
+  template class
+    TAO_Seq_Out_T<
+        IOP::TaggedProfileSeq,
+        IOP::TaggedProfileSeq_var,
+        IOP::TaggedProfile
+      >;
+
 #if !defined (_IOP_TAGGEDPROFILE__EXPLICIT_CS_)
 #define _IOP_TAGGEDPROFILE__EXPLICIT_CS_
 
@@ -928,6 +1051,25 @@ CORBA::Boolean operator>> (
         IOP::TaggedProfile_var \
       >
 
+# pragma instantiate \
+    TAO_VarSeq_Var_T< \
+        IOP::TaggedProfileSeq, \
+        IOP::TaggedProfile \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Var_Base_T< \
+        IOP::TaggedProfileSeq, \
+        IOP::TaggedProfile \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Out_T< \
+        IOP::TaggedProfileSeq, \
+        IOP::TaggedProfileSeq_var, \
+        IOP::TaggedProfile \
+      >
+
 #if !defined (_IOP_TAGGEDPROFILE__EXPLICIT_CS_)
 #define _IOP_TAGGEDPROFILE__EXPLICIT_CS_
 
@@ -1102,4 +1244,5 @@ CORBA::Boolean operator>> (
 
 #endif /* end #if !defined */
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/IOP_IORC.h b/TAO/tao/IOP_IORC.h
index cdb23a53f84..ba824cf06d7 100644
--- a/TAO/tao/IOP_IORC.h
+++ b/TAO/tao/IOP_IORC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:186
+// be\be_codegen.cpp:171
 
 #ifndef _TAO_IDL_ORIG_IOP_IORC_H_
 #define _TAO_IDL_ORIG_IOP_IORC_H_
@@ -39,8 +39,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
+#include "tao/Environment.h"
+#include "tao/Sequence_T.h"
+#include "tao/Seq_Var_T.h"
+#include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
-#include "tao/CDR.h"
 
 
 #if defined (TAO_EXPORT_MACRO)
@@ -67,171 +71,216 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace IOP
 {
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:342
-
+  // be\be_visitor_typedef/typedef_ch.cpp:342
+  
   typedef CORBA::ULong ProfileId;
   typedef CORBA::ULong_out ProfileId_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProfileId;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ProfileId TAG_INTERNET_IOP = 0U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ProfileId TAG_MULTIPLE_COMPONENTS = 1U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_type.cpp:258
-
+  // be\be_type.cpp:258
+  
   struct TaggedProfile;
-
+  
   typedef
     TAO_Var_Var_T<
         TaggedProfile
       >
     TaggedProfile_var;
-
+  
   typedef
     TAO_Out_T<
         TaggedProfile,
         TaggedProfile_var
       >
     TaggedProfile_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
-
+  // be\be_visitor_structure/structure_ch.cpp:52
+  
   struct TAO_Export TaggedProfile
   {
     typedef TaggedProfile_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     IOP::ProfileId tag;
     CORBA::OctetSeq profile_data;
   };
-
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedProfile;
+  
   // TAO_IDL - Generated from
-  // be/be_type.cpp:258
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
-  struct IOR;
+#if !defined (_IOP_TAGGEDPROFILESEQ_CH_)
+#define _IOP_TAGGEDPROFILESEQ_CH_
+  
+  class TaggedProfileSeq;
+  
+  typedef
+    TAO_VarSeq_Var_T<
+        TaggedProfileSeq,
+        TaggedProfile
+      >
+    TaggedProfileSeq_var;
+  
+  typedef
+    TAO_Seq_Out_T<
+        TaggedProfileSeq,
+        TaggedProfileSeq_var,
+        TaggedProfile
+      >
+    TaggedProfileSeq_out;
+  
+  class TAO_Export TaggedProfileSeq
+    : public
+        TAO_Unbounded_Sequence<
+            TaggedProfile
+          >
+  {
+  public:
+    TaggedProfileSeq (void);
+    TaggedProfileSeq (CORBA::ULong max);
+    TaggedProfileSeq (
+        CORBA::ULong max,
+        CORBA::ULong length,
+        TaggedProfile* buffer, 
+        CORBA::Boolean release = 0
+      );
+    TaggedProfileSeq (const TaggedProfileSeq &);
+    ~TaggedProfileSeq (void);
+    
+    static void _tao_any_destructor (void *);
+    
+    typedef TaggedProfileSeq_var _var_type;
+  };
 
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedProfileSeq;
+  
+  // TAO_IDL - Generated from
+  // be\be_type.cpp:258
+  
+  struct IOR;
+  
   typedef
     TAO_Var_Var_T<
         IOR
       >
     IOR_var;
-
+  
   typedef
     TAO_Out_T<
         IOR,
         IOR_var
       >
     IOR_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
-
+  // be\be_visitor_structure/structure_ch.cpp:52
+  
   struct TAO_Export IOR
   {
     typedef IOR_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager type_id;
-
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_IOP_IOR__TAO_SEQ_IOP_TAGGEDPROFILE__CH_)
-#define _IOP_IOR__TAO_SEQ_IOP_TAGGEDPROFILE__CH_
-
-    class TAO_Export _tao_seq_IOP_TaggedProfile_
-      : public
-          TAO_Unbounded_Sequence<
-              ACE_NESTED_CLASS (IOP, TaggedProfile)
-            >
-    {
-    public:
-      _tao_seq_IOP_TaggedProfile_ (void);
-      _tao_seq_IOP_TaggedProfile_ (CORBA::ULong max);
-      _tao_seq_IOP_TaggedProfile_ (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          ACE_NESTED_CLASS (IOP, TaggedProfile)* buffer,
-          CORBA::Boolean release = 0
-        );
-      _tao_seq_IOP_TaggedProfile_ (const _tao_seq_IOP_TaggedProfile_ &);
-      ~_tao_seq_IOP_TaggedProfile_ (void);
-    };
-
-#endif /* end #if !defined */
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_field/field_ch.cpp:453
-
-    typedef _tao_seq_IOP_TaggedProfile_ _profiles_seq;
-    _tao_seq_IOP_TaggedProfile_ profiles;
+    IOP::TaggedProfileSeq profiles;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:342
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IOR;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typedef/typedef_ch.cpp:342
+  
   typedef CORBA::ULong ComponentId;
   typedef CORBA::ULong_out ComponentId_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_type.cpp:258
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ComponentId;
+  
+  // TAO_IDL - Generated from
+  // be\be_type.cpp:258
+  
   struct TaggedComponent;
-
+  
   typedef
     TAO_Var_Var_T<
         TaggedComponent
       >
     TaggedComponent_var;
-
+  
   typedef
     TAO_Out_T<
         TaggedComponent,
         TaggedComponent_var
       >
     TaggedComponent_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
-
+  // be\be_visitor_structure/structure_ch.cpp:52
+  
   struct TAO_Export TaggedComponent
   {
     typedef TaggedComponent_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     IOP::ComponentId tag;
     CORBA::OctetSeq component_data;
   };
-
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponent;
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CH_)
 #define _IOP_MULTIPLECOMPONENTPROFILE_CH_
-
+  
   class MultipleComponentProfile;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         MultipleComponentProfile,
         TaggedComponent
       >
     MultipleComponentProfile_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         MultipleComponentProfile,
@@ -239,7 +288,7 @@ namespace IOP
         TaggedComponent
       >
     MultipleComponentProfile_out;
-
+  
   class TAO_Export MultipleComponentProfile
     : public
         TAO_Unbounded_Sequence<
@@ -252,34 +301,39 @@ namespace IOP
     MultipleComponentProfile (
         CORBA::ULong max,
         CORBA::ULong length,
-        TaggedComponent* buffer,
+        TaggedComponent* buffer, 
         CORBA::Boolean release = 0
       );
     MultipleComponentProfile (const MultipleComponentProfile &);
     ~MultipleComponentProfile (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef MultipleComponentProfile_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultipleComponentProfile;
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IOP_TAGGEDCOMPONENTLIST_CH_)
 #define _IOP_TAGGEDCOMPONENTLIST_CH_
-
+  
   class TaggedComponentList;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         TaggedComponentList,
         TaggedComponent
       >
     TaggedComponentList_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         TaggedComponentList,
@@ -287,7 +341,7 @@ namespace IOP
         TaggedComponent
       >
     TaggedComponentList_out;
-
+  
   class TAO_Export TaggedComponentList
     : public
         TAO_Unbounded_Sequence<
@@ -300,34 +354,39 @@ namespace IOP
     TaggedComponentList (
         CORBA::ULong max,
         CORBA::ULong length,
-        TaggedComponent* buffer,
+        TaggedComponent* buffer, 
         CORBA::Boolean release = 0
       );
     TaggedComponentList (const TaggedComponentList &);
     ~TaggedComponentList (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef TaggedComponentList_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponentList;
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IOP_TAGGEDCOMPONENTSEQ_CH_)
 #define _IOP_TAGGEDCOMPONENTSEQ_CH_
-
+  
   class TaggedComponentSeq;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         TaggedComponentSeq,
         TaggedComponent
       >
     TaggedComponentSeq_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         TaggedComponentSeq,
@@ -335,7 +394,7 @@ namespace IOP
         TaggedComponent
       >
     TaggedComponentSeq_out;
-
+  
   class TAO_Export TaggedComponentSeq
     : public
         TAO_Unbounded_Sequence<
@@ -348,121 +407,135 @@ namespace IOP
     TaggedComponentSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        TaggedComponent* buffer,
+        TaggedComponent* buffer, 
         CORBA::Boolean release = 0
       );
     TaggedComponentSeq (const TaggedComponentSeq &);
     ~TaggedComponentSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef TaggedComponentSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponentSeq;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ComponentId TAG_ORB_TYPE = 0U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ComponentId TAG_CODE_SETS = 1U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ComponentId TAG_POLICIES = 2U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ComponentId TAG_ALTERNATE_IIOP_ADDRESS = 3U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ComponentId TAG_COMPLETE_OBJECT_KEY = 5U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ComponentId TAG_ENDPOINT_ID_POSITION = 6U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ComponentId TAG_LOCATION_POLICY = 12U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ComponentId TAG_DCE_STRING_BINDING = 100U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ComponentId TAG_DCE_BINDING_NAME = 101U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ComponentId TAG_DCE_NO_PIPES = 102U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:342
-
+  // be\be_visitor_typedef/typedef_ch.cpp:342
+  
   typedef CORBA::ULong ServiceId;
   typedef CORBA::ULong_out ServiceId_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_type.cpp:258
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceId;
+  
+  // TAO_IDL - Generated from
+  // be\be_type.cpp:258
+  
   struct ServiceContext;
-
+  
   typedef
     TAO_Var_Var_T<
         ServiceContext
       >
     ServiceContext_var;
-
+  
   typedef
     TAO_Out_T<
         ServiceContext,
         ServiceContext_var
       >
     ServiceContext_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
-
+  // be\be_visitor_structure/structure_ch.cpp:52
+  
   struct TAO_Export ServiceContext
   {
     typedef ServiceContext_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     IOP::ServiceId context_id;
     CORBA::OctetSeq context_data;
   };
-
-
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceContext;
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IOP_SERVICECONTEXTLIST_CH_)
 #define _IOP_SERVICECONTEXTLIST_CH_
-
+  
   class ServiceContextList;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         ServiceContextList,
         ServiceContext
       >
     ServiceContextList_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         ServiceContextList,
@@ -470,7 +543,7 @@ namespace IOP
         ServiceContext
       >
     ServiceContextList_out;
-
+  
   class TAO_Export ServiceContextList
     : public
         TAO_Unbounded_Sequence<
@@ -483,121 +556,126 @@ namespace IOP
     ServiceContextList (
         CORBA::ULong max,
         CORBA::ULong length,
-        ServiceContext* buffer,
+        ServiceContext* buffer, 
         CORBA::Boolean release = 0
       );
     ServiceContextList (const ServiceContextList &);
     ~ServiceContextList (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ServiceContextList_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceContextList;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ServiceId TransactionService = 0U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ServiceId CodeSets = 1U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ServiceId ChainBypassCheck = 2U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ServiceId ChainBypassInfo = 3U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ServiceId LogicalThreadId = 4U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ServiceId BI_DIR_IIOP = 5U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ServiceId SendingContextRunTime = 6U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ServiceId INVOCATION_POLICIES = 7U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ServiceId UnknownExceptionInfo = 9U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ServiceId RTCorbaPriority = 10U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ServiceId RTCorbaPriorityRange = 11U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ComponentId TAG_FT_GROUP = 27U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ComponentId TAG_FT_PRIMARY = 28U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ComponentId TAG_FT_HEARTBEAT_ENABLED = 29U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ServiceId FT_GROUP_VERSION = 12U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ServiceId FT_REQUEST = 13U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ProfileId TAG_UIPMC = 1413566220U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ComponentId TAG_GROUP = 1413566211U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const IOP::ComponentId TAG_GROUP_IIOP = 1413566212U;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module IOP
 
 // TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:58
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -605,47 +683,114 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
+// be\be_visitor_structure/any_op_ch.cpp:52
 
-#ifndef __ACE_INLINE__
+TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedProfile &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedProfile*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedProfile *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedProfile *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:53
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::TaggedProfile &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::TaggedProfile &);
+TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedProfileSeq &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedProfileSeq*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedProfileSeq *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedProfileSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:53
+// be\be_visitor_structure/any_op_ch.cpp:52
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::IOR &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::IOR &);
+TAO_Export void operator<<= (CORBA::Any &, const IOP::IOR &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, IOP::IOR*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::IOR *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::IOR *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedComponent &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedComponent*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedComponent *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedComponent *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const IOP::MultipleComponentProfile &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, IOP::MultipleComponentProfile*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::MultipleComponentProfile *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::MultipleComponentProfile *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedComponentList &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedComponentList*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedComponentList *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedComponentList *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:70
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
-#if !defined _TAO_CDR_OP_IOP_IOR__tao_seq_IOP_TaggedProfile__H_
-#define _TAO_CDR_OP_IOP_IOR__tao_seq_IOP_TaggedProfile__H_
+TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedComponentSeq &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedComponentSeq*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedComponentSeq *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedComponentSeq *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const IOP::ServiceContext &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, IOP::ServiceContext*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::ServiceContext *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::ServiceContext *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const IOP::ServiceContextList &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, IOP::ServiceContextList*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::ServiceContextList *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::ServiceContextList *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/cdr_op_ch.cpp:54
+
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::TaggedProfile &);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::TaggedProfile &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
+
+#if !defined _TAO_CDR_OP_IOP_TaggedProfileSeq_H_
+#define _TAO_CDR_OP_IOP_TaggedProfileSeq_H_
 
 TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const IOP::IOR::_tao_seq_IOP_TaggedProfile_ &
+    const IOP::TaggedProfileSeq &
   );
 TAO_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    IOP::IOR::_tao_seq_IOP_TaggedProfile_ &
+    IOP::TaggedProfileSeq &
   );
 
-#endif /* _TAO_CDR_OP_IOP_IOR__tao_seq_IOP_TaggedProfile__H_ */
+#endif /* _TAO_CDR_OP_IOP_TaggedProfileSeq_H_ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/cdr_op_ch.cpp:54
+
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::IOR &);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::IOR &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:53
+// be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::TaggedComponent &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::TaggedComponent &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:70
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_IOP_MultipleComponentProfile_H_
 #define _TAO_CDR_OP_IOP_MultipleComponentProfile_H_
@@ -662,7 +807,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_IOP_MultipleComponentProfile_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:70
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_IOP_TaggedComponentList_H_
 #define _TAO_CDR_OP_IOP_TaggedComponentList_H_
@@ -679,7 +824,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_IOP_TaggedComponentList_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:70
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_IOP_TaggedComponentSeq_H_
 #define _TAO_CDR_OP_IOP_TaggedComponentSeq_H_
@@ -696,13 +841,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_IOP_TaggedComponentSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:53
+// be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::ServiceContext &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::ServiceContext &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:70
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_IOP_ServiceContextList_H_
 #define _TAO_CDR_OP_IOP_ServiceContextList_H_
@@ -719,12 +864,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_IOP_ServiceContextList_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
-
-#endif /* __ACE_INLINE__ */
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1050
+// be\be_codegen.cpp:978
 
 #if defined (__ACE_INLINE__)
 #include "IOP_IORC.i"
@@ -741,3 +881,4 @@ TAO_Export CORBA::Boolean operator>> (
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/IOP_IORC.i b/TAO/tao/IOP_IORC.i
index 9206cd0da31..38aa32569ba 100644
--- a/TAO/tao/IOP_IORC.i
+++ b/TAO/tao/IOP_IORC.i
@@ -26,193 +26,3 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:70
-
-ACE_INLINE
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::TaggedProfile &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.tag) &&
-    (strm << _tao_aggregate.profile_data);
-}
-
-ACE_INLINE
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::TaggedProfile &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.tag) &&
-    (strm >> _tao_aggregate.profile_data);
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:81
-
-#if !defined _TAO_CDR_OP_IOP_IOR__tao_seq_IOP_TaggedProfile__I_
-#define _TAO_CDR_OP_IOP_IOR__tao_seq_IOP_TaggedProfile__I_
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::IOR::_tao_seq_IOP_TaggedProfile_ &
-  );
-
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::IOR::_tao_seq_IOP_TaggedProfile_ &
-  );
-
-#endif /* _TAO_CDR_OP_IOP_IOR__tao_seq_IOP_TaggedProfile__I_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:70
-
-ACE_INLINE
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::IOR &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.type_id.in ()) &&
-    (strm << _tao_aggregate.profiles);
-}
-
-ACE_INLINE
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::IOR &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.type_id.out ()) &&
-    (strm >> _tao_aggregate.profiles);
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:70
-
-ACE_INLINE
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::TaggedComponent &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.tag) &&
-    (strm << _tao_aggregate.component_data);
-}
-
-ACE_INLINE
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::TaggedComponent &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.tag) &&
-    (strm >> _tao_aggregate.component_data);
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:81
-
-#if !defined _TAO_CDR_OP_IOP_MultipleComponentProfile_I_
-#define _TAO_CDR_OP_IOP_MultipleComponentProfile_I_
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::MultipleComponentProfile &
-  );
-
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::MultipleComponentProfile &
-  );
-
-#endif /* _TAO_CDR_OP_IOP_MultipleComponentProfile_I_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:81
-
-#if !defined _TAO_CDR_OP_IOP_TaggedComponentList_I_
-#define _TAO_CDR_OP_IOP_TaggedComponentList_I_
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::TaggedComponentList &
-  );
-
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::TaggedComponentList &
-  );
-
-#endif /* _TAO_CDR_OP_IOP_TaggedComponentList_I_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:81
-
-#if !defined _TAO_CDR_OP_IOP_TaggedComponentSeq_I_
-#define _TAO_CDR_OP_IOP_TaggedComponentSeq_I_
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::TaggedComponentSeq &
-  );
-
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::TaggedComponentSeq &
-  );
-
-#endif /* _TAO_CDR_OP_IOP_TaggedComponentSeq_I_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:70
-
-ACE_INLINE
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::ServiceContext &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.context_id) &&
-    (strm << _tao_aggregate.context_data);
-}
-
-ACE_INLINE
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    IOP::ServiceContext &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.context_id) &&
-    (strm >> _tao_aggregate.context_data);
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:81
-
-#if !defined _TAO_CDR_OP_IOP_ServiceContextList_I_
-#define _TAO_CDR_OP_IOP_ServiceContextList_I_
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::ServiceContextList &
-  );
-
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::ServiceContextList &
-  );
-
-#endif /* _TAO_CDR_OP_IOP_ServiceContextList_I_ */
-
diff --git a/TAO/tao/Incoming_Message_Queue.h b/TAO/tao/Incoming_Message_Queue.h
index 3adfc3d24ac..6e1c0b74277 100644
--- a/TAO/tao/Incoming_Message_Queue.h
+++ b/TAO/tao/Incoming_Message_Queue.h
@@ -15,14 +15,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Pluggable_Messaging_Utils.h"
+#include "tao/Pluggable_Messaging_Utils.h"
+#include "ace/Message_Block.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 /// Forward declarations
-class ACE_Data_Block;
 class ACE_Allocator;
 class TAO_ORB_Core;
 class TAO_Queued_Data;
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index 42439cdc9fc..3359bf50857 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -1,30 +1,315 @@
 #----------------------------------------------------------------------------
-#       $Id$
+#       Borland Workspace
 #
-#       Makefile for the TAO library
+# $Id$
+#
+# This file was generated by MPC.  Any changes made directly to
+# this file will be lost the next time it is generated.
+#
+# MPC Command:
+# \ace\latest\ACE_wrappers\bin\mwc.pl -include \ace\latest\ACE_wrappers/MPC/config -include \ace\latest\ACE_wrappers/MPC/templates -type borland
 #----------------------------------------------------------------------------
 
-# This default rule is here so invoking make realclean will
-# work when recursing through subdirectories
-.DEFAULT:
-	@$(MAKE) -f Makefile.tao $@
-	@$(MAKE) -f Makefile.dirs SUBDIR_MAKEFILE=Makefile $@
+!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+
+all: TAO Strategies SmartProxies RTCORBA IORTable IORManipulation IFR_Client BiDir_GIOP TypeCodeFactory Valuetype DynamicAny ObjRefTemplate IORInterceptor PortableServer Messaging DynamicInterface RTScheduler RTPortableServer Domain Utils
+
+clean:
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f TAO.bor clean
+	@cd Strategies
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Strategies.bor clean
+	@cd ../
+	@cd SmartProxies
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f SmartProxies.bor clean
+	@cd ../
+	@cd RTCORBA
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f RTCORBA.bor clean
+	@cd ../
+	@cd IORTable
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f IORTable.bor clean
+	@cd ../
+	@cd IORManipulation
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f IORManipulation.bor clean
+	@cd ../
+	@cd IFR_Client
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f IFR_Client.bor clean
+	@cd ../
+	@cd BiDir_GIOP
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f BiDir_GIOP.bor clean
+	@cd ../
+	@cd TypeCodeFactory
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f TypeCodeFactory.bor clean
+	@cd ../
+	@cd Valuetype
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Valuetype.bor clean
+	@cd ../
+	@cd DynamicAny
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f DynamicAny.bor clean
+	@cd ../
+	@cd ObjRefTemplate
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f ObjRefTemplate.bor clean
+	@cd ../
+	@cd IORInterceptor
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f IORInterceptor.bor clean
+	@cd ../
+	@cd PortableServer
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f PortableServer.bor clean
+	@cd ../
+	@cd Messaging
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Messaging.bor clean
+	@cd ../
+	@cd DynamicInterface
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f DynamicInterface.bor clean
+	@cd ../
+	@cd RTScheduling
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f RTScheduler.bor clean
+	@cd ../
+	@cd RTPortableServer
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f RTPortableServer.bor clean
+	@cd ../
+	@cd Domain
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Domain.bor clean
+	@cd ../
+	@cd Utils
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Utils.bor clean
+	@cd ../
+
+realclean:
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f TAO.bor realclean
+	@cd Strategies
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Strategies.bor realclean
+	@cd ../
+	@cd SmartProxies
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f SmartProxies.bor realclean
+	@cd ../
+	@cd RTCORBA
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f RTCORBA.bor realclean
+	@cd ../
+	@cd IORTable
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f IORTable.bor realclean
+	@cd ../
+	@cd IORManipulation
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f IORManipulation.bor realclean
+	@cd ../
+	@cd IFR_Client
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f IFR_Client.bor realclean
+	@cd ../
+	@cd BiDir_GIOP
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f BiDir_GIOP.bor realclean
+	@cd ../
+	@cd TypeCodeFactory
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f TypeCodeFactory.bor realclean
+	@cd ../
+	@cd Valuetype
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Valuetype.bor realclean
+	@cd ../
+	@cd DynamicAny
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f DynamicAny.bor realclean
+	@cd ../
+	@cd ObjRefTemplate
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f ObjRefTemplate.bor realclean
+	@cd ../
+	@cd IORInterceptor
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f IORInterceptor.bor realclean
+	@cd ../
+	@cd PortableServer
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f PortableServer.bor realclean
+	@cd ../
+	@cd Messaging
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Messaging.bor realclean
+	@cd ../
+	@cd DynamicInterface
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f DynamicInterface.bor realclean
+	@cd ../
+	@cd RTScheduling
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f RTScheduler.bor realclean
+	@cd ../
+	@cd RTPortableServer
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f RTPortableServer.bor realclean
+	@cd ../
+	@cd Domain
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Domain.bor realclean
+	@cd ../
+	@cd Utils
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Utils.bor realclean
+	@cd ../
+
+install:
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f TAO.bor install
+	@cd Strategies
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Strategies.bor install
+	@cd ../
+	@cd SmartProxies
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f SmartProxies.bor install
+	@cd ../
+	@cd RTCORBA
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f RTCORBA.bor install
+	@cd ../
+	@cd IORTable
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f IORTable.bor install
+	@cd ../
+	@cd IORManipulation
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f IORManipulation.bor install
+	@cd ../
+	@cd IFR_Client
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f IFR_Client.bor install
+	@cd ../
+	@cd BiDir_GIOP
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f BiDir_GIOP.bor install
+	@cd ../
+	@cd TypeCodeFactory
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f TypeCodeFactory.bor install
+	@cd ../
+	@cd Valuetype
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Valuetype.bor install
+	@cd ../
+	@cd DynamicAny
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f DynamicAny.bor install
+	@cd ../
+	@cd ObjRefTemplate
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f ObjRefTemplate.bor install
+	@cd ../
+	@cd IORInterceptor
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f IORInterceptor.bor install
+	@cd ../
+	@cd PortableServer
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f PortableServer.bor install
+	@cd ../
+	@cd Messaging
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Messaging.bor install
+	@cd ../
+	@cd DynamicInterface
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f DynamicInterface.bor install
+	@cd ../
+	@cd RTScheduling
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f RTScheduler.bor install
+	@cd ../
+	@cd RTPortableServer
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f RTPortableServer.bor install
+	@cd ../
+	@cd Domain
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Domain.bor install
+	@cd ../
+	@cd Utils
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Utils.bor install
+	@cd ../
+
+TAO:
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f TAO.bor all
+
+Strategies: TAO
+	@cd Strategies
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Strategies.bor all
+	@cd ../
+
+SmartProxies: TAO
+	@cd SmartProxies
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f SmartProxies.bor all
+	@cd ../
+
+RTCORBA: TAO
+	@cd RTCORBA
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f RTCORBA.bor all
+	@cd ../
+
+IORTable: TAO
+	@cd IORTable
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f IORTable.bor all
+	@cd ../
+
+IORManipulation: TAO
+	@cd IORManipulation
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f IORManipulation.bor all
+	@cd ../
+
+IFR_Client: TAO
+	@cd IFR_Client
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f IFR_Client.bor all
+	@cd ../
+
+BiDir_GIOP: TAO
+	@cd BiDir_GIOP
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f BiDir_GIOP.bor all
+	@cd ../
+
+TypeCodeFactory: TAO IFR_Client
+	@cd TypeCodeFactory
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f TypeCodeFactory.bor all
+	@cd ../
+
+Valuetype: TAO
+	@cd Valuetype
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Valuetype.bor all
+	@cd ../
+
+DynamicAny: TAO Valuetype
+	@cd DynamicAny
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f DynamicAny.bor all
+	@cd ../
+
+ObjRefTemplate: TAO Valuetype
+	@cd ObjRefTemplate
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f ObjRefTemplate.bor all
+	@cd ../
+
+IORInterceptor: TAO Valuetype ObjRefTemplate
+	@cd IORInterceptor
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f IORInterceptor.bor all
+	@cd ../
+
+PortableServer: TAO Valuetype ObjRefTemplate IORInterceptor
+	@cd PortableServer
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f PortableServer.bor all
+	@cd ../
+
+Messaging: TAO Valuetype ObjRefTemplate IORInterceptor PortableServer
+	@cd Messaging
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Messaging.bor all
+	@cd ../
+
+DynamicInterface: TAO Valuetype ObjRefTemplate IORInterceptor PortableServer Messaging
+	@cd DynamicInterface
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f DynamicInterface.bor all
+	@cd ../
 
-# We need this rule, so that if parallel makes (-j) are invoked,
-# the tao target will be built before the dirs target (otherwise the
-# dirs targets may try to link libTAO before libTAO has been built).
-# Recursively invoked makes from this file will still be run in parallel.
-.NOTPARALLEL:
+RTScheduler: TAO RTCORBA Valuetype ObjRefTemplate IORInterceptor PortableServer
+	@cd RTScheduling
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f RTScheduler.bor all
+	@cd ../
 
-# Invoke Makefile.tao first to build libTAO, and then
-# invoke Makefile.dirs to recurse through subdirectories
-all: tao dirs
+RTPortableServer: TAO RTCORBA Valuetype ObjRefTemplate IORInterceptor PortableServer
+	@cd RTPortableServer
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f RTPortableServer.bor all
+	@cd ../
 
-tao:
-	@$(MAKE) -f Makefile.tao
+Domain: TAO IFR_Client Valuetype ObjRefTemplate IORInterceptor PortableServer
+	@cd Domain
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Domain.bor all
+	@cd ../
 
-dirs:
-	@$(MAKE) -f Makefile.dirs SUBDIR_MAKEFILE=Makefile
+Utils: TAO Valuetype ObjRefTemplate IORInterceptor PortableServer
+	@cd Utils
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Utils.bor all
+	@cd ../
 
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+project_name_list:
+	@echo BiDir_GIOP
+	@echo Domain
+	@echo DynamicAny
+	@echo DynamicInterface
+	@echo IFR_Client
+	@echo IORInterceptor
+	@echo IORManipulation
+	@echo IORTable
+	@echo Messaging
+	@echo ObjRefTemplate
+	@echo PortableServer
+	@echo RTCORBA
+	@echo RTPortableServer
+	@echo RTScheduler
+	@echo SmartProxies
+	@echo Strategies
+	@echo TAO
+	@echo TypeCodeFactory
+	@echo Utils
+	@echo Valuetype
diff --git a/TAO/tao/Makefile.tao b/TAO/tao/Makefile.tao
index 2ad6ea04d12..7de728fb5d4 100644
--- a/TAO/tao/Makefile.tao
+++ b/TAO/tao/Makefile.tao
@@ -8020,7 +8020,7 @@ realclean:
   Any.h \
   Arg_Traits_T.h \
   Object_Argument_T.inl \
-  CurrentA.h Typecode.h \
+  Typecode.h \
   $(ACE_ROOT)/ace/Thread_Mutex.h \
   $(ACE_ROOT)/ace/OS_NS_Thread.h \
   $(ACE_ROOT)/ace/os_include/os_pthread.h \
@@ -11212,7 +11212,7 @@ realclean:
   $(ACE_ROOT)/ace/Guard_T.cpp \
   $(ACE_ROOT)/ace/Guard_T.inl \
   $(ACE_ROOT)/ace/RW_Thread_Mutex.h \
-  $(ACE_ROOT)/ace/RW_Mutex.h TimeBaseA.h \
+  $(ACE_ROOT)/ace/RW_Mutex.h \
   Typecode.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor_T.h \
@@ -18217,7 +18217,7 @@ realclean:
   Seq_Var_T.inl \
   Seq_Out_T.h \
   Seq_Out_T.cpp \
-  Seq_Out_T.inl OctetSeqA.h \
+  Seq_Out_T.inl \
   Typecode.h \
   $(ACE_ROOT)/ace/Thread_Mutex.h \
   $(ACE_ROOT)/ace/OS_NS_Thread.h \
@@ -25809,7 +25809,7 @@ realclean:
   Seq_Out_T.inl \
   VarOut_T.h \
   VarOut_T.cpp \
-  VarOut_T.inl IOP_IORA.h \
+  VarOut_T.inl \
   Typecode.h \
   $(ACE_ROOT)/ace/Thread_Mutex.h \
   $(ACE_ROOT)/ace/OS_NS_Thread.h \
@@ -26542,7 +26542,7 @@ realclean:
   Sequence_T.i \
   VarOut_T.h \
   VarOut_T.cpp \
-  VarOut_T.inl CONV_FRAMEA.h \
+  VarOut_T.inl \
   Typecode.h \
   $(ACE_ROOT)/ace/Thread_Mutex.h \
   $(ACE_ROOT)/ace/OS_NS_Thread.h \
@@ -27524,7 +27524,7 @@ realclean:
   $(ACE_ROOT)/ace/Guard_T.inl \
   $(ACE_ROOT)/ace/RW_Thread_Mutex.h \
   $(ACE_ROOT)/ace/RW_Mutex.h \
-  Messaging_SyncScopeC.h TAOA.h \
+  Messaging_SyncScopeC.h \
   Typecode.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor_T.h \
@@ -35726,7 +35726,7 @@ realclean:
   Seq_Var_T.inl \
   Seq_Out_T.h \
   Seq_Out_T.cpp \
-  Seq_Out_T.inl ServicesA.h \
+  Seq_Out_T.inl \
   Typecode.h \
   $(ACE_ROOT)/ace/Thread_Mutex.h \
   $(ACE_ROOT)/ace/OS_NS_Thread.h \
@@ -36456,7 +36456,7 @@ realclean:
   $(ACE_ROOT)/ace/RW_Thread_Mutex.h \
   $(ACE_ROOT)/ace/RW_Mutex.h \
   Messaging_SyncScopeC.h \
-  LocalObject.h TAOA.h \
+  LocalObject.h \
   Buffering_Constraint_Policy.i
 
 .obj/Messaging_PolicyValueC.o .obj/Messaging_PolicyValueC.so .shobj/Messaging_PolicyValueC.o .shobj/Messaging_PolicyValueC.so: Messaging_PolicyValueC.cpp \
diff --git a/TAO/tao/Messaging_PolicyValueA.cpp b/TAO/tao/Messaging_PolicyValueA.cpp
index ac8007ad599..8646177cc0f 100644
--- a/TAO/tao/Messaging_PolicyValueA.cpp
+++ b/TAO/tao/Messaging_PolicyValueA.cpp
@@ -30,6 +30,208 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_Messaging_PolicyValue[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  38,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x653a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0
+    12,
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63795661),
+  ACE_NTOHL (0x6c756500),  // name = PolicyValue
+  2, // member count
+    6,
+  ACE_NTOHL (0x70747970),
+  ACE_NTOHL (0x65000000),  // name = ptype
+    CORBA::tk_alias, // typecode kind for typedefs
+  64, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    33,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f506f),
+    ACE_NTOHL (0x6c696379),
+    ACE_NTOHL (0x54797065),
+    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
+        11,
+    ACE_NTOHL (0x506f6c69),
+    ACE_NTOHL (0x63795479),
+    ACE_NTOHL (0x70650000),  // name = PolicyType
+        CORBA::tk_ulong,
+
+
+  7,
+  ACE_NTOHL (0x7076616c),
+  ACE_NTOHL (0x75650000),  // name = pvalue
+    CORBA::tk_alias, // typecode kind for typedefs
+  76, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    31,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4f63),
+    ACE_NTOHL (0x74657453),
+    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
+        9,
+    ACE_NTOHL (0x4f637465),
+    ACE_NTOHL (0x74536571),
+    ACE_NTOHL (0x0),  // name = OctetSeq
+        CORBA::tk_sequence, // typecode kind
+    12, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_octet,
+
+      0U,
+
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValue (
+    CORBA::tk_struct,
+    sizeof (_oc_Messaging_PolicyValue),
+    (char *) &_oc_Messaging_PolicyValue,
+    0,
+    sizeof (Messaging::PolicyValue)
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_PolicyValue =
+    &_tc_TAO_tc_Messaging_PolicyValue;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  41,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x4d657373),
+  ACE_NTOHL (0x6167696e),
+  ACE_NTOHL (0x672f506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x65536571),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/PolicyValueSeq:1.0
+    15,
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63795661),
+  ACE_NTOHL (0x6c756553),
+  ACE_NTOHL (0x65710000),  // name = PolicyValueSeq
+    CORBA::tk_sequence, // typecode kind
+  264, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_struct, // typecode kind
+    248, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      38,
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x4d657373),
+      ACE_NTOHL (0x6167696e),
+      ACE_NTOHL (0x672f506f),
+      ACE_NTOHL (0x6c696379),
+      ACE_NTOHL (0x56616c75),
+      ACE_NTOHL (0x653a312e),
+      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0
+            12,
+      ACE_NTOHL (0x506f6c69),
+      ACE_NTOHL (0x63795661),
+      ACE_NTOHL (0x6c756500),  // name = PolicyValue
+      2, // member count
+            6,
+      ACE_NTOHL (0x70747970),
+      ACE_NTOHL (0x65000000),  // name = ptype
+            CORBA::tk_alias, // typecode kind for typedefs
+      64, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        33,
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f506f),
+        ACE_NTOHL (0x6c696379),
+        ACE_NTOHL (0x54797065),
+        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
+                11,
+        ACE_NTOHL (0x506f6c69),
+        ACE_NTOHL (0x63795479),
+        ACE_NTOHL (0x70650000),  // name = PolicyType
+                CORBA::tk_ulong,
+
+
+      7,
+      ACE_NTOHL (0x7076616c),
+      ACE_NTOHL (0x75650000),  // name = pvalue
+            CORBA::tk_alias, // typecode kind for typedefs
+      76, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        31,
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4f63),
+        ACE_NTOHL (0x74657453),
+        ACE_NTOHL (0x65713a31),
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
+                9,
+        ACE_NTOHL (0x4f637465),
+        ACE_NTOHL (0x74536571),
+        ACE_NTOHL (0x0),  // name = OctetSeq
+                CORBA::tk_sequence, // typecode kind
+        12, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          CORBA::tk_octet,
+
+          0U,
+
+
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValueSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_Messaging_PolicyValueSeq),
+    (char *) &_oc_Messaging_PolicyValueSeq,
+    0,
+    sizeof (Messaging::PolicyValueSeq)
+  );
+
+namespace Messaging
+{
+  ::CORBA::TypeCode_ptr _tc_PolicyValueSeq =
+    &_tc_TAO_tc_Messaging_PolicyValueSeq;
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp
index 2d62e8b245e..40fb1733d5c 100644
--- a/TAO/tao/Messaging_PolicyValueC.cpp
+++ b/TAO/tao/Messaging_PolicyValueC.cpp
@@ -30,6 +30,7 @@
 
 
 #include "Messaging_PolicyValueC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
@@ -49,94 +50,6 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_Messaging_PolicyValue[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x56616c75), 
-  ACE_NTOHL (0x653a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0
-    12,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63795661), 
-  ACE_NTOHL (0x6c756500),  // name = PolicyValue
-  2, // member count
-    6,
-  ACE_NTOHL (0x70747970), 
-  ACE_NTOHL (0x65000000),  // name = ptype
-    CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f506f), 
-    ACE_NTOHL (0x6c696379), 
-    ACE_NTOHL (0x54797065), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
-        11,
-    ACE_NTOHL (0x506f6c69), 
-    ACE_NTOHL (0x63795479), 
-    ACE_NTOHL (0x70650000),  // name = PolicyType
-        CORBA::tk_ulong,
-
-
-  7,
-  ACE_NTOHL (0x7076616c), 
-  ACE_NTOHL (0x75650000),  // name = pvalue
-    CORBA::tk_alias, // typecode kind for typedefs
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f63), 
-    ACE_NTOHL (0x74657453), 
-    ACE_NTOHL (0x65713a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-        9,
-    ACE_NTOHL (0x4f637465), 
-    ACE_NTOHL (0x74536571), 
-    ACE_NTOHL (0x0),  // name = OctetSeq
-        CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_octet,
-
-      0U,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValue (
-    CORBA::tk_struct,
-    sizeof (_oc_Messaging_PolicyValue),
-    (char *) &_oc_Messaging_PolicyValue,
-    0,
-    sizeof (Messaging::PolicyValue)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_PolicyValue =
-    &_tc_TAO_tc_Messaging_PolicyValue;
-}
-
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -204,120 +117,6 @@ void Messaging::PolicyValueSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  41,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x4d657373), 
-  ACE_NTOHL (0x6167696e), 
-  ACE_NTOHL (0x672f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x56616c75), 
-  ACE_NTOHL (0x65536571), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/Messaging/PolicyValueSeq:1.0
-    15,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63795661), 
-  ACE_NTOHL (0x6c756553), 
-  ACE_NTOHL (0x65710000),  // name = PolicyValueSeq
-    CORBA::tk_sequence, // typecode kind
-  264, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    248, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      38,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x4d657373), 
-      ACE_NTOHL (0x6167696e), 
-      ACE_NTOHL (0x672f506f), 
-      ACE_NTOHL (0x6c696379), 
-      ACE_NTOHL (0x56616c75), 
-      ACE_NTOHL (0x653a312e), 
-      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/PolicyValue:1.0
-            12,
-      ACE_NTOHL (0x506f6c69), 
-      ACE_NTOHL (0x63795661), 
-      ACE_NTOHL (0x6c756500),  // name = PolicyValue
-      2, // member count
-            6,
-      ACE_NTOHL (0x70747970), 
-      ACE_NTOHL (0x65000000),  // name = ptype
-            CORBA::tk_alias, // typecode kind for typedefs
-      64, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f506f), 
-        ACE_NTOHL (0x6c696379), 
-        ACE_NTOHL (0x54797065), 
-        ACE_NTOHL (0x3a312e30), 
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
-                11,
-        ACE_NTOHL (0x506f6c69), 
-        ACE_NTOHL (0x63795479), 
-        ACE_NTOHL (0x70650000),  // name = PolicyType
-                CORBA::tk_ulong,
-
-
-      7,
-      ACE_NTOHL (0x7076616c), 
-      ACE_NTOHL (0x75650000),  // name = pvalue
-            CORBA::tk_alias, // typecode kind for typedefs
-      76, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        31,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4f63), 
-        ACE_NTOHL (0x74657453), 
-        ACE_NTOHL (0x65713a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-                9,
-        ACE_NTOHL (0x4f637465), 
-        ACE_NTOHL (0x74536571), 
-        ACE_NTOHL (0x0),  // name = OctetSeq
-                CORBA::tk_sequence, // typecode kind
-        12, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_octet,
-
-          0U,
-
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValueSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_Messaging_PolicyValueSeq),
-    (char *) &_oc_Messaging_PolicyValueSeq,
-    0,
-    sizeof (Messaging::PolicyValueSeq)
-  );
-
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr _tc_PolicyValueSeq =
-    &_tc_TAO_tc_Messaging_PolicyValueSeq;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_structure/cdr_op_cs.cpp:61
 
 CORBA::Boolean operator<< (
@@ -413,7 +212,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h
index 3554e901c14..87b0427442a 100644
--- a/TAO/tao/Messaging_PolicyValueC.h
+++ b/TAO/tao/Messaging_PolicyValueC.h
@@ -40,6 +40,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/Environment.h"
 
 #include "tao/PolicyC.h"
 
@@ -71,57 +72,57 @@
 
 namespace Messaging
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct PolicyValue;
-
+  
   typedef
     TAO_Var_Var_T<
         PolicyValue
       >
     PolicyValue_var;
-
+  
   typedef
     TAO_Out_T<
         PolicyValue,
         PolicyValue_var
       >
     PolicyValue_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_Export PolicyValue
   {
     typedef PolicyValue_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     CORBA::PolicyType ptype;
     CORBA::OctetSeq pvalue;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyValue;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_MESSAGING_POLICYVALUESEQ_CH_)
 #define _MESSAGING_POLICYVALUESEQ_CH_
-
+  
   class PolicyValueSeq;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         PolicyValueSeq,
         PolicyValue
       >
     PolicyValueSeq_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         PolicyValueSeq,
@@ -129,7 +130,7 @@ namespace Messaging
         PolicyValue
       >
     PolicyValueSeq_out;
-
+  
   class TAO_Export PolicyValueSeq
     : public
         TAO_Unbounded_Sequence<
@@ -142,32 +143,32 @@ namespace Messaging
     PolicyValueSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        PolicyValue* buffer,
+        PolicyValue* buffer, 
         CORBA::Boolean release = 0
       );
     PolicyValueSeq (const PolicyValueSeq &);
     ~PolicyValueSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef PolicyValueSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyValueSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const IOP::ComponentId TAG_POLICIES = 2U;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const IOP::ServiceId INVOCATION_POLICIES = 2U;
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/Messaging_SyncScopeC.cpp b/TAO/tao/Messaging_SyncScopeC.cpp
index 5c71c07145c..d421c1d3850 100644
--- a/TAO/tao/Messaging_SyncScopeC.cpp
+++ b/TAO/tao/Messaging_SyncScopeC.cpp
@@ -30,6 +30,7 @@
 
 
 #include "Messaging_SyncScopeC.h"
+#include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
diff --git a/TAO/tao/Messaging_SyncScopeC.h b/TAO/tao/Messaging_SyncScopeC.h
index 0bcbe8d2f24..4bbc538c50e 100644
--- a/TAO/tao/Messaging_SyncScopeC.h
+++ b/TAO/tao/Messaging_SyncScopeC.h
@@ -40,6 +40,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/Environment.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -69,31 +70,31 @@
 
 namespace Messaging
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:342
-
+  
   typedef CORBA::Short SyncScope;
   typedef CORBA::Short_out SyncScope_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const Messaging::SyncScope SYNC_NONE = 0;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const Messaging::SyncScope SYNC_WITH_TRANSPORT = 1;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const Messaging::SyncScope SYNC_WITH_SERVER = 2;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const Messaging::SyncScope SYNC_WITH_TARGET = 3;
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
index 240b236aa46..f0ffce87059 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -30,6 +30,7 @@
 
 
 #include "Object_KeyC.h"
+#include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 
 #if defined (__BORLANDC__)
@@ -53,7 +54,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_TAO_OBJECTKEY_CS_)
diff --git a/TAO/tao/OctetSeqA.cpp b/TAO/tao/OctetSeqA.cpp
index b8175247d8c..14ab3cbcf38 100644
--- a/TAO/tao/OctetSeqA.cpp
+++ b/TAO/tao/OctetSeqA.cpp
@@ -26,14 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "OctetSeqC.h"
-#include "OctetSeqA.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Dual_Impl_T.h"
 
-
-// ======== Handcrafted
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_typecode/typecode_defn.cpp:290
 
 static const CORBA::Long _oc_CORBA_OctetSeq[] =
 {
@@ -75,7 +72,7 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -149,3 +146,4 @@ CORBA::Boolean operator>>= (
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/OctetSeqA.h b/TAO/tao/OctetSeqA.h
deleted file mode 100644
index 887ef8a15c9..00000000000
--- a/TAO/tao/OctetSeqA.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:848
-
-#ifndef _TAO_IDL_ORIG_OCTETSEQA_ANYOP_H_
-#define _TAO_IDL_ORIG_OCTETSEQA_ANYOP_H_
-
-#include /**/ "ace/pre.h"
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp
index 0f591935457..b726135c647 100644
--- a/TAO/tao/OctetSeqC.cpp
+++ b/TAO/tao/OctetSeqC.cpp
@@ -26,10 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:338
+// be\be_codegen.cpp:323
 
 
 #include "OctetSeqC.h"
+#include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 #include "tao/Typecode.h"
 
@@ -42,7 +43,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:62
+// be\be_visitor_arg_traits.cpp:64
 
 // Arg traits specializations.
 namespace TAO
@@ -50,8 +51,8 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/sequence_cs.cpp:65
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_OCTETSEQ_CS_)
 #define _CORBA_OCTETSEQ_CS_
@@ -103,10 +104,8 @@ void CORBA::OctetSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
-
-
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:95
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_CORBA_OctetSeq_CPP_
 #define _TAO_CDR_OP_CORBA_OctetSeq_CPP_
@@ -117,27 +116,27 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-
+      
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       {
-        TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+        TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
           ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (CORBA::OctetSeq *)&_tao_sequence);
         if (oseq->mb ())
           return strm.write_octet_array_mb (oseq->mb ());
         else
           return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
       }
-
+      
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
       return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+    
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     }
-
+  
   return 0;
 }
 
@@ -147,7 +146,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -157,18 +156,18 @@ CORBA::Boolean operator>> (
         {
           return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
-
+      
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       if (ACE_BIT_DISABLED (strm.start ()->flags (),
       ACE_Message_Block::DONT_DELETE))
@@ -178,7 +177,7 @@ CORBA::Boolean operator>> (
         strm.orb_core ()->resource_factory ()->
         input_cdr_allocator_type_locked () == 1)
         {
-          TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+          TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
             ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
           oseq->replace (_tao_seq_len, strm.start ());
           oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
@@ -189,18 +188,18 @@ CORBA::Boolean operator>> (
       return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
       return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+    
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-
+    
     }
-
+  
   return 0;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_OctetSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1724
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -244,4 +243,5 @@ CORBA::Boolean operator>> (
         CORBA::Octet \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h
index e03e701b0e2..e6d48fbdad0 100644
--- a/TAO/tao/OctetSeqC.h
+++ b/TAO/tao/OctetSeqC.h
@@ -26,20 +26,21 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:186
+// be\be_codegen.cpp:171
 
 #ifndef _TAO_IDL_ORIG_OCTETSEQC_H_
 #define _TAO_IDL_ORIG_OCTETSEQC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Sequence.h"
+#include "tao/Sequence_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/CDR.h"
+#include "tao/TAO_Export.h"
+#include "tao/Environment.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 
@@ -67,26 +68,26 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_OCTETSEQ_CH_)
 #define _CORBA_OCTETSEQ_CH_
-
+  
   class OctetSeq;
-
+  
   typedef
     TAO_FixedSeq_Var_T<
         OctetSeq,
         CORBA::Octet
       >
     OctetSeq_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         OctetSeq,
@@ -94,7 +95,7 @@ namespace CORBA
         CORBA::Octet
       >
     OctetSeq_out;
-
+  
   class TAO_Export OctetSeq
     : public
         TAO_Unbounded_Sequence<
@@ -107,14 +108,14 @@ namespace CORBA
     OctetSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::Octet* buffer,
+        CORBA::Octet* buffer, 
         CORBA::Boolean release = 0
       );
     OctetSeq (const OctetSeq &);
     ~OctetSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef OctetSeq_var _var_type;
 
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
@@ -127,19 +128,19 @@ namespace CORBA
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_OctetSeq;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module CORBA
 
 // TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -147,7 +148,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_Export void operator<<= (CORBA::Any &, const CORBA::OctetSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA::OctetSeq*); // noncopying version
@@ -155,12 +156,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OctetSeq *&);
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
-
-#ifndef __ACE_INLINE__
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:70
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_OctetSeq_H_
 #define _TAO_CDR_OP_CORBA_OctetSeq_H_
@@ -177,12 +173,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_OctetSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
-
-#endif /* __ACE_INLINE__ */
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1060
+// be\be_codegen.cpp:978
 
 #if defined (__ACE_INLINE__)
 #include "OctetSeqC.i"
@@ -199,3 +190,4 @@ TAO_Export CORBA::Boolean operator>> (
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/OctetSeqC.i b/TAO/tao/OctetSeqC.i
index b9c03e3c99e..38aa32569ba 100644
--- a/TAO/tao/OctetSeqC.i
+++ b/TAO/tao/OctetSeqC.i
@@ -26,21 +26,3 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:81
-
-#if !defined _TAO_CDR_OP_CORBA_OctetSeq_I_
-#define _TAO_CDR_OP_CORBA_OctetSeq_I_
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const CORBA::OctetSeq &
-  );
-
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    CORBA::OctetSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_OctetSeq_I_ */
-
diff --git a/TAO/tao/PolicyA.cpp b/TAO/tao/PolicyA.cpp
index c0b0e008fc8..c6a420c9a29 100644
--- a/TAO/tao/PolicyA.cpp
+++ b/TAO/tao/PolicyA.cpp
@@ -31,6 +31,282 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_PolicyErrorCode[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  38,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x4572726f),
+  ACE_NTOHL (0x72436f64),
+  ACE_NTOHL (0x653a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/PolicyErrorCode:1.0
+    16,
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63794572),
+  ACE_NTOHL (0x726f7243),
+  ACE_NTOHL (0x6f646500),  // name = PolicyErrorCode
+    CORBA::tk_short,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyErrorCode (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_PolicyErrorCode),
+    (char *) &_oc_CORBA_PolicyErrorCode,
+    0,
+    sizeof (CORBA::PolicyErrorCode)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_PolicyErrorCode =
+    &_tc_TAO_tc_CORBA_PolicyErrorCode;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_PolicyError[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  34,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x4572726f),
+  ACE_NTOHL (0x723a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/PolicyError:1.0
+    12,
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63794572),
+  ACE_NTOHL (0x726f7200),  // name = PolicyError
+  1, // member count
+    7,
+  ACE_NTOHL (0x72656173),
+  ACE_NTOHL (0x6f6e0000),  // name = reason
+    CORBA::tk_alias, // typecode kind for typedefs
+  72, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    38,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f506f),
+    ACE_NTOHL (0x6c696379),
+    ACE_NTOHL (0x4572726f),
+    ACE_NTOHL (0x72436f64),
+    ACE_NTOHL (0x653a312e),
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/PolicyErrorCode:1.0
+        16,
+    ACE_NTOHL (0x506f6c69),
+    ACE_NTOHL (0x63794572),
+    ACE_NTOHL (0x726f7243),
+    ACE_NTOHL (0x6f646500),  // name = PolicyErrorCode
+        CORBA::tk_short,
+
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyError (
+    CORBA::tk_except,
+    sizeof (_oc_CORBA_PolicyError),
+    (char *) &_oc_CORBA_PolicyError,
+    0,
+    sizeof (CORBA::PolicyError)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_PolicyError =
+    &_tc_TAO_tc_CORBA_PolicyError;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_InvalidPolicies[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  38,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f496e),
+  ACE_NTOHL (0x76616c69),
+  ACE_NTOHL (0x64506f6c),
+  ACE_NTOHL (0x69636965),
+  ACE_NTOHL (0x733a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/InvalidPolicies:1.0
+    16,
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c696450),
+  ACE_NTOHL (0x6f6c6963),
+  ACE_NTOHL (0x69657300),  // name = InvalidPolicies
+  1, // member count
+    8,
+  ACE_NTOHL (0x696e6469),
+  ACE_NTOHL (0x63657300),  // name = indices
+    CORBA::tk_alias, // typecode kind for typedefs
+  76, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    32,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5553),
+    ACE_NTOHL (0x686f7274),
+    ACE_NTOHL (0x5365713a),
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/UShortSeq:1.0
+        10,
+    ACE_NTOHL (0x5553686f),
+    ACE_NTOHL (0x72745365),
+    ACE_NTOHL (0x71000000),  // name = UShortSeq
+        CORBA::tk_sequence, // typecode kind
+    12, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_ushort,
+
+      0U,
+
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_InvalidPolicies (
+    CORBA::tk_except,
+    sizeof (_oc_CORBA_InvalidPolicies),
+    (char *) &_oc_CORBA_InvalidPolicies,
+    0,
+    sizeof (CORBA::InvalidPolicies)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_InvalidPolicies =
+    &_tc_TAO_tc_CORBA_InvalidPolicies;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_Policy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  29,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Policy:1.0
+    7,
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63790000),  // name = Policy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_Policy (
+    CORBA::tk_objref,
+    sizeof (_oc_CORBA_Policy),
+    (char *) &_oc_CORBA_Policy,
+    0,
+    sizeof (CORBA::Policy)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_Policy =
+    &_tc_TAO_tc_CORBA_Policy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_PolicyManager[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  36,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x4d616e61),
+  ACE_NTOHL (0x6765723a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyManager:1.0
+    14,
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63794d61),
+  ACE_NTOHL (0x6e616765),
+  ACE_NTOHL (0x72000000),  // name = PolicyManager
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyManager (
+    CORBA::tk_objref,
+    sizeof (_oc_CORBA_PolicyManager),
+    (char *) &_oc_CORBA_PolicyManager,
+    0,
+    sizeof (CORBA::PolicyManager)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_PolicyManager =
+    &_tc_TAO_tc_CORBA_PolicyManager;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_PolicyCurrent[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  36,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x43757272),
+  ACE_NTOHL (0x656e743a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyCurrent:1.0
+    14,
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63794375),
+  ACE_NTOHL (0x7272656e),
+  ACE_NTOHL (0x74000000),  // name = PolicyCurrent
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyCurrent (
+    CORBA::tk_objref,
+    sizeof (_oc_CORBA_PolicyCurrent),
+    (char *) &_oc_CORBA_PolicyCurrent,
+    0,
+    sizeof (CORBA::PolicyCurrent)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_PolicyCurrent =
+    &_tc_TAO_tc_CORBA_PolicyCurrent;
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index ae0178dd785..9bca7b68ffc 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -73,46 +73,6 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_PolicyErrorCode[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x4572726f), 
-  ACE_NTOHL (0x72436f64), 
-  ACE_NTOHL (0x653a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/PolicyErrorCode:1.0
-    16,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63794572), 
-  ACE_NTOHL (0x726f7243), 
-  ACE_NTOHL (0x6f646500),  // name = PolicyErrorCode
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyErrorCode (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_PolicyErrorCode),
-    (char *) &_oc_CORBA_PolicyErrorCode,
-    0,
-    sizeof (CORBA::PolicyErrorCode)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_PolicyErrorCode =
-    &_tc_TAO_tc_CORBA_PolicyErrorCode;
-}
-
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
@@ -242,68 +202,6 @@ CORBA::TypeCode_ptr CORBA::PolicyError::_type (void) const
   return ::CORBA::_tc_PolicyError;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_PolicyError[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x4572726f), 
-  ACE_NTOHL (0x723a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/PolicyError:1.0
-    12,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63794572), 
-  ACE_NTOHL (0x726f7200),  // name = PolicyError
-  1, // member count
-    7,
-  ACE_NTOHL (0x72656173), 
-  ACE_NTOHL (0x6f6e0000),  // name = reason
-    CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f506f), 
-    ACE_NTOHL (0x6c696379), 
-    ACE_NTOHL (0x4572726f), 
-    ACE_NTOHL (0x72436f64), 
-    ACE_NTOHL (0x653a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/PolicyErrorCode:1.0
-        16,
-    ACE_NTOHL (0x506f6c69), 
-    ACE_NTOHL (0x63794572), 
-    ACE_NTOHL (0x726f7243), 
-    ACE_NTOHL (0x6f646500),  // name = PolicyErrorCode
-        CORBA::tk_short,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyError (
-    CORBA::tk_except,
-    sizeof (_oc_CORBA_PolicyError),
-    (char *) &_oc_CORBA_PolicyError,
-    0,
-    sizeof (CORBA::PolicyError)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_PolicyError =
-    &_tc_TAO_tc_CORBA_PolicyError;
-}
-
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
@@ -434,72 +332,6 @@ CORBA::TypeCode_ptr CORBA::InvalidPolicies::_type (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_InvalidPolicies[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f496e), 
-  ACE_NTOHL (0x76616c69), 
-  ACE_NTOHL (0x64506f6c), 
-  ACE_NTOHL (0x69636965), 
-  ACE_NTOHL (0x733a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/InvalidPolicies:1.0
-    16,
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c696450), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x69657300),  // name = InvalidPolicies
-  1, // member count
-    8,
-  ACE_NTOHL (0x696e6469), 
-  ACE_NTOHL (0x63657300),  // name = indices
-    CORBA::tk_alias, // typecode kind for typedefs
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5553), 
-    ACE_NTOHL (0x686f7274), 
-    ACE_NTOHL (0x5365713a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/UShortSeq:1.0
-        10,
-    ACE_NTOHL (0x5553686f), 
-    ACE_NTOHL (0x72745365), 
-    ACE_NTOHL (0x71000000),  // name = UShortSeq
-        CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_ushort,
-
-      0U,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_InvalidPolicies (
-    CORBA::tk_except,
-    sizeof (_oc_CORBA_InvalidPolicies),
-    (char *) &_oc_CORBA_InvalidPolicies,
-    0,
-    sizeof (CORBA::InvalidPolicies)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_InvalidPolicies =
-    &_tc_TAO_tc_CORBA_InvalidPolicies;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::Policy.
@@ -783,40 +615,6 @@ CORBA::Policy::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_Policy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  29,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Policy:1.0
-    7,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63790000),  // name = Policy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_Policy (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_Policy),
-    (char *) &_oc_CORBA_Policy,
-    0,
-    sizeof (CORBA::Policy)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_Policy =
-    &_tc_TAO_tc_CORBA_Policy;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::PolicyManager.
@@ -962,43 +760,6 @@ CORBA::PolicyManager::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_PolicyManager[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x4d616e61), 
-  ACE_NTOHL (0x6765723a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyManager:1.0
-    14,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63794d61), 
-  ACE_NTOHL (0x6e616765), 
-  ACE_NTOHL (0x72000000),  // name = PolicyManager
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyManager (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_PolicyManager),
-    (char *) &_oc_CORBA_PolicyManager,
-    0,
-    sizeof (CORBA::PolicyManager)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_PolicyManager =
-    &_tc_TAO_tc_CORBA_PolicyManager;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::PolicyCurrent.
@@ -1152,43 +913,6 @@ CORBA::PolicyCurrent::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_PolicyCurrent[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x43757272), 
-  ACE_NTOHL (0x656e743a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyCurrent:1.0
-    14,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63794375), 
-  ACE_NTOHL (0x7272656e), 
-  ACE_NTOHL (0x74000000),  // name = PolicyCurrent
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyCurrent (
-    CORBA::tk_objref,
-    sizeof (_oc_CORBA_PolicyCurrent),
-    (char *) &_oc_CORBA_PolicyCurrent,
-    0,
-    sizeof (CORBA::PolicyCurrent)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_PolicyCurrent =
-    &_tc_TAO_tc_CORBA_PolicyCurrent;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_exception/cdr_op_cs.cpp:60
 
 CORBA::Boolean operator<< (
@@ -1347,7 +1071,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index 308e9cb49bd..0b38cecfd0a 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -39,9 +39,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Environment.h"
+#include "tao/Object.h"
+#include "tao/Objref_VarOut_T.h"
+
 #include "UShortSeqC.h"
 #include "CurrentC.h"
-#include "tao/Exception.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -66,13 +69,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -82,62 +85,62 @@ namespace TAO
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:342
-
+  
   typedef CORBA::Short PolicyErrorCode;
   typedef CORBA::Short_out PolicyErrorCode_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyErrorCode;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyErrorCode BAD_POLICY = 0;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyErrorCode UNSUPPORTED_POLICY = 1;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyErrorCode BAD_POLICY_TYPE = 2;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyErrorCode BAD_POLICY_VALUE = 3;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyErrorCode UNSUPPORTED_POLICY_VALUE = 4;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_CORBA_POLICYERROR_CH_)
 #define _CORBA_POLICYERROR_CH_
-
+  
   class TAO_Export PolicyError : public CORBA::UserException
   {
   public:
-
+    
     CORBA::PolicyErrorCode reason;
     PolicyError (void);
     PolicyError (const PolicyError &);
     ~PolicyError (void);
 
     PolicyError &operator= (const PolicyError &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static PolicyError *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -149,51 +152,51 @@ namespace CORBA
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ctor.cpp:66
-
+    
     PolicyError (
         ACE_NESTED_CLASS (CORBA, PolicyErrorCode) _tao_reason
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:125
-
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyError;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_CORBA_INVALIDPOLICIES_CH_)
 #define _CORBA_INVALIDPOLICIES_CH_
-
+  
   class TAO_Export InvalidPolicies : public CORBA::UserException
   {
   public:
-
+    
     CORBA::UShortSeq indices;
     InvalidPolicies (void);
     InvalidPolicies (const InvalidPolicies &);
     ~InvalidPolicies (void);
 
     InvalidPolicies &operator= (const InvalidPolicies &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static InvalidPolicies *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -205,47 +208,47 @@ namespace CORBA
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ctor.cpp:66
-
+    
     InvalidPolicies (
         const ACE_NESTED_CLASS (CORBA, UShortSeq) & _tao_indices
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:125
-
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidPolicies;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_POLICY__VAR_OUT_CH_)
 #define _CORBA_POLICY__VAR_OUT_CH_
-
+  
   class Policy;
   typedef Policy *Policy_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Policy
       >
     Policy_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Policy
@@ -253,13 +256,13 @@ namespace CORBA
     Policy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLICY_CH_)
 #define _CORBA_POLICY_CH_
-
+  
   class TAO_Export Policy
     : public virtual CORBA::Object
   {
@@ -267,65 +270,65 @@ namespace CORBA
     friend class TAO::Narrow_Utils<Policy>;
     typedef Policy_ptr _ptr_type;
     typedef Policy_var _var_type;
-
+    
     // The static operations.
     static Policy_ptr _duplicate (Policy_ptr obj);
-
+    
     static Policy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Policy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Policy_ptr _nil (void)
     {
       return (Policy_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::PolicyType policy_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
@@ -339,21 +342,21 @@ namespace CORBA
 
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_Policy_Proxy_Broker_;
-
+  
   protected:
     // Concrete interface only.
     Policy (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_Policy_setup_collocation (int collocated);
-
+    
     // Concrete non-local interface only.
     Policy (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     // Non-local interface only.
     Policy (
         TAO_Stub *objref,
@@ -361,38 +364,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-
+    
     virtual ~Policy (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Policy (const Policy &);
-
+    
     void operator= (const Policy &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Policy;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_POLICYMANAGER__VAR_OUT_CH_)
 #define _CORBA_POLICYMANAGER__VAR_OUT_CH_
-
+  
   class PolicyManager;
   typedef PolicyManager *PolicyManager_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         PolicyManager
       >
     PolicyManager_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         PolicyManager
@@ -400,43 +403,43 @@ namespace CORBA
     PolicyManager_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLICYMANAGER_CH_)
 #define _CORBA_POLICYMANAGER_CH_
-
+  
   class TAO_Export PolicyManager
     : public virtual CORBA::Object
   {
   public:
     typedef PolicyManager_ptr _ptr_type;
     typedef PolicyManager_var _var_type;
-
+    
     // The static operations.
     static PolicyManager_ptr _duplicate (PolicyManager_ptr obj);
-
+    
     static PolicyManager_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PolicyManager_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PolicyManager_ptr _nil (void)
     {
       return (PolicyManager_ptr)0;
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::PolicyList * get_policy_overrides (
         const CORBA::PolicyTypeSeq & ts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -444,10 +447,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void set_policy_overrides (
         const CORBA::PolicyList & policies,
         CORBA::SetOverrideType set_add
@@ -457,44 +460,44 @@ namespace CORBA
         CORBA::SystemException
         , CORBA::InvalidPolicies
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     // Abstract or local interface only.
     PolicyManager (void);
-
+    
     virtual ~PolicyManager (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     PolicyManager (const PolicyManager &);
-
+    
     void operator= (const PolicyManager &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyManager;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:611
 
 #if !defined (_CORBA_POLICYCURRENT__VAR_OUT_CH_)
 #define _CORBA_POLICYCURRENT__VAR_OUT_CH_
-
+  
   class PolicyCurrent;
   typedef PolicyCurrent *PolicyCurrent_ptr;
   
diff --git a/TAO/tao/Policy_ForwardA.cpp b/TAO/tao/Policy_ForwardA.cpp
index f65725f88de..c6d45c86850 100644
--- a/TAO/tao/Policy_ForwardA.cpp
+++ b/TAO/tao/Policy_ForwardA.cpp
@@ -31,6 +31,212 @@
 #include "tao/Any_Basic_Impl_T.h"
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_PolicyType[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x54797065),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
+    11,
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63795479),
+  ACE_NTOHL (0x70650000),  // name = PolicyType
+    CORBA::tk_ulong,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyType (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_PolicyType),
+    (char *) &_oc_CORBA_PolicyType,
+    0,
+    sizeof (CORBA::PolicyType)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_PolicyType =
+    &_tc_TAO_tc_CORBA_PolicyType;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_PolicyList[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x4c697374),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyList:1.0
+    11,
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63794c69),
+  ACE_NTOHL (0x73740000),  // name = PolicyList
+    CORBA::tk_sequence, // typecode kind
+  68, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_objref, // typecode kind
+    52, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      29,
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f5242),
+      ACE_NTOHL (0x412f506f),
+      ACE_NTOHL (0x6c696379),
+      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Policy:1.0
+            7,
+      ACE_NTOHL (0x506f6c69),
+      ACE_NTOHL (0x63790000),  // name = Policy
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyList (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_PolicyList),
+    (char *) &_oc_CORBA_PolicyList,
+    0,
+    sizeof (CORBA::PolicyList)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_PolicyList =
+    &_tc_TAO_tc_CORBA_PolicyList;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  36,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f506f),
+  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x54797065),
+  ACE_NTOHL (0x5365713a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyTypeSeq:1.0
+    14,
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63795479),
+  ACE_NTOHL (0x70655365),
+  ACE_NTOHL (0x71000000),  // name = PolicyTypeSeq
+    CORBA::tk_sequence, // typecode kind
+  80, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_alias, // typecode kind for typedefs
+    64, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      33,
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f5242),
+      ACE_NTOHL (0x412f506f),
+      ACE_NTOHL (0x6c696379),
+      ACE_NTOHL (0x54797065),
+      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
+            11,
+      ACE_NTOHL (0x506f6c69),
+      ACE_NTOHL (0x63795479),
+      ACE_NTOHL (0x70650000),  // name = PolicyType
+            CORBA::tk_ulong,
+
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyTypeSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_PolicyTypeSeq),
+    (char *) &_oc_CORBA_PolicyTypeSeq,
+    0,
+    sizeof (CORBA::PolicyTypeSeq)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_PolicyTypeSeq =
+    &_tc_TAO_tc_CORBA_PolicyTypeSeq;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_SetOverrideType[] =
+{
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  38,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5365),
+  ACE_NTOHL (0x744f7665),
+  ACE_NTOHL (0x72726964),
+  ACE_NTOHL (0x65547970),
+  ACE_NTOHL (0x653a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/SetOverrideType:1.0
+  16,
+  ACE_NTOHL (0x5365744f),
+  ACE_NTOHL (0x76657272),
+  ACE_NTOHL (0x69646554),
+  ACE_NTOHL (0x79706500),  // name = SetOverrideType
+  2, // member count
+  13,
+  ACE_NTOHL (0x5345545f),
+  ACE_NTOHL (0x4f564552),
+  ACE_NTOHL (0x52494445),
+  ACE_NTOHL (0x0),  // name = SET_OVERRIDE
+  13,
+  ACE_NTOHL (0x4144445f),
+  ACE_NTOHL (0x4f564552),
+  ACE_NTOHL (0x52494445),
+  ACE_NTOHL (0x0),  // name = ADD_OVERRIDE
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_SetOverrideType (
+    CORBA::tk_enum,
+    sizeof (_oc_CORBA_SetOverrideType),
+    (char *) &_oc_CORBA_SetOverrideType,
+    0,
+    sizeof (CORBA::SetOverrideType)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_SetOverrideType =
+    &_tc_TAO_tc_CORBA_SetOverrideType;
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp
index cdfacfe122c..5b41eace926 100644
--- a/TAO/tao/Policy_ForwardC.cpp
+++ b/TAO/tao/Policy_ForwardC.cpp
@@ -50,44 +50,6 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_PolicyType[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x54797065), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
-    11,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63795479), 
-  ACE_NTOHL (0x70650000),  // name = PolicyType
-    CORBA::tk_ulong,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyType (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_PolicyType),
-    (char *) &_oc_CORBA_PolicyType,
-    0,
-    sizeof (CORBA::PolicyType)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_PolicyType =
-    &_tc_TAO_tc_CORBA_PolicyType;
-}
-
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -144,63 +106,6 @@ void CORBA::PolicyList::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_PolicyList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyList:1.0
-    11,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63794c69), 
-  ACE_NTOHL (0x73740000),  // name = PolicyList
-    CORBA::tk_sequence, // typecode kind
-  68, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_objref, // typecode kind
-    52, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      29,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f506f), 
-      ACE_NTOHL (0x6c696379), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Policy:1.0
-            7,
-      ACE_NTOHL (0x506f6c69), 
-      ACE_NTOHL (0x63790000),  // name = Policy
-      
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyList (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_PolicyList),
-    (char *) &_oc_CORBA_PolicyList,
-    0,
-    sizeof (CORBA::PolicyList)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_PolicyList =
-    &_tc_TAO_tc_CORBA_PolicyList;
-}
-
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -255,117 +160,6 @@ void CORBA::PolicyTypeSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x54797065), 
-  ACE_NTOHL (0x5365713a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PolicyTypeSeq:1.0
-    14,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63795479), 
-  ACE_NTOHL (0x70655365), 
-  ACE_NTOHL (0x71000000),  // name = PolicyTypeSeq
-    CORBA::tk_sequence, // typecode kind
-  80, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    64, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      33,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f506f), 
-      ACE_NTOHL (0x6c696379), 
-      ACE_NTOHL (0x54797065), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
-            11,
-      ACE_NTOHL (0x506f6c69), 
-      ACE_NTOHL (0x63795479), 
-      ACE_NTOHL (0x70650000),  // name = PolicyType
-            CORBA::tk_ulong,
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyTypeSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_PolicyTypeSeq),
-    (char *) &_oc_CORBA_PolicyTypeSeq,
-    0,
-    sizeof (CORBA::PolicyTypeSeq)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_PolicyTypeSeq =
-    &_tc_TAO_tc_CORBA_PolicyTypeSeq;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_SetOverrideType[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5365), 
-  ACE_NTOHL (0x744f7665), 
-  ACE_NTOHL (0x72726964), 
-  ACE_NTOHL (0x65547970), 
-  ACE_NTOHL (0x653a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/SetOverrideType:1.0
-  16,
-  ACE_NTOHL (0x5365744f), 
-  ACE_NTOHL (0x76657272), 
-  ACE_NTOHL (0x69646554), 
-  ACE_NTOHL (0x79706500),  // name = SetOverrideType
-  2, // member count
-  13,
-  ACE_NTOHL (0x5345545f), 
-  ACE_NTOHL (0x4f564552), 
-  ACE_NTOHL (0x52494445), 
-  ACE_NTOHL (0x0),  // name = SET_OVERRIDE
-  13,
-  ACE_NTOHL (0x4144445f), 
-  ACE_NTOHL (0x4f564552), 
-  ACE_NTOHL (0x52494445), 
-  ACE_NTOHL (0x0),  // name = ADD_OVERRIDE
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_SetOverrideType (
-    CORBA::tk_enum,
-    sizeof (_oc_CORBA_SetOverrideType),
-    (char *) &_oc_CORBA_SetOverrideType,
-    0,
-    sizeof (CORBA::SetOverrideType)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_SetOverrideType =
-    &_tc_TAO_tc_CORBA_SetOverrideType;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_CORBA_PolicyList_CPP_
@@ -521,7 +315,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_tao_enum
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h
index 8b95a04cac7..ff979fc2b4d 100644
--- a/TAO/tao/Policy_ForwardC.h
+++ b/TAO/tao/Policy_ForwardC.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Sequence.h"
+#include "tao/Sequence_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/PortableInterceptorA.cpp b/TAO/tao/PortableInterceptorA.cpp
index e7f33acdfb0..87ea2aa85c6 100644
--- a/TAO/tao/PortableInterceptorA.cpp
+++ b/TAO/tao/PortableInterceptorA.cpp
@@ -31,6 +31,737 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_PortableInterceptor_Interceptor[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f723a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/Interceptor:1.0
+    12,
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f7200),  // name = Interceptor
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_Interceptor (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_Interceptor),
+    (char *) &_oc_PortableInterceptor_Interceptor,
+    0,
+    sizeof (PortableInterceptor::Interceptor)
+  );
+
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr _tc_Interceptor =
+    &_tc_TAO_tc_PortableInterceptor_Interceptor;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_PortableInterceptor_ForwardRequest[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  51,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x466f7277),
+  ACE_NTOHL (0x61726452),
+  ACE_NTOHL (0x65717565),
+  ACE_NTOHL (0x73743a31),
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ForwardRequest:1.0
+    15,
+  ACE_NTOHL (0x466f7277),
+  ACE_NTOHL (0x61726452),
+  ACE_NTOHL (0x65717565),
+  ACE_NTOHL (0x73740000),  // name = ForwardRequest
+  2, // member count
+    8,
+  ACE_NTOHL (0x666f7277),
+  ACE_NTOHL (0x61726400),  // name = forward
+    CORBA::tk_objref,
+  52, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    29,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4f62),
+    ACE_NTOHL (0x6a656374),
+    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
+        7,
+    ACE_NTOHL (0x4f626a65),
+    ACE_NTOHL (0x63740000),  // name = Object
+
+  10,
+  ACE_NTOHL (0x7065726d),
+  ACE_NTOHL (0x616e656e),
+  ACE_NTOHL (0x74000000),  // name = permanent
+    CORBA::tk_boolean,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ForwardRequest (
+    CORBA::tk_except,
+    sizeof (_oc_PortableInterceptor_ForwardRequest),
+    (char *) &_oc_PortableInterceptor_ForwardRequest,
+    0,
+    sizeof (PortableInterceptor::ForwardRequest)
+  );
+
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr _tc_ForwardRequest =
+    &_tc_TAO_tc_PortableInterceptor_ForwardRequest;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_PortableInterceptor_ReplyStatus[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x5265706c),
+  ACE_NTOHL (0x79537461),
+  ACE_NTOHL (0x7475733a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ReplyStatus:1.0
+    12,
+  ACE_NTOHL (0x5265706c),
+  ACE_NTOHL (0x79537461),
+  ACE_NTOHL (0x74757300),  // name = ReplyStatus
+    CORBA::tk_short,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ReplyStatus (
+    CORBA::tk_alias,
+    sizeof (_oc_PortableInterceptor_ReplyStatus),
+    (char *) &_oc_PortableInterceptor_ReplyStatus,
+    0,
+    sizeof (PortableInterceptor::ReplyStatus)
+  );
+
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr _tc_ReplyStatus =
+    &_tc_TAO_tc_PortableInterceptor_ReplyStatus;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_PortableInterceptor_SlotId[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  43,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x536c6f74),
+  ACE_NTOHL (0x49643a31),
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/SlotId:1.0
+    7,
+  ACE_NTOHL (0x536c6f74),
+  ACE_NTOHL (0x49640000),  // name = SlotId
+    CORBA::tk_ulong,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_SlotId (
+    CORBA::tk_alias,
+    sizeof (_oc_PortableInterceptor_SlotId),
+    (char *) &_oc_PortableInterceptor_SlotId,
+    0,
+    sizeof (PortableInterceptor::SlotId)
+  );
+
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr _tc_SlotId =
+    &_tc_TAO_tc_PortableInterceptor_SlotId;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_PortableInterceptor_InvalidSlot[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c696453),
+  ACE_NTOHL (0x6c6f743a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/InvalidSlot:1.0
+    12,
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c696453),
+  ACE_NTOHL (0x6c6f7400),  // name = InvalidSlot
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_InvalidSlot (
+    CORBA::tk_except,
+    sizeof (_oc_PortableInterceptor_InvalidSlot),
+    (char *) &_oc_PortableInterceptor_InvalidSlot,
+    0,
+    sizeof (PortableInterceptor::InvalidSlot)
+  );
+
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr _tc_InvalidSlot =
+    &_tc_TAO_tc_PortableInterceptor_InvalidSlot;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_PortableInterceptor_Current[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  44,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x43757272),
+  ACE_NTOHL (0x656e743a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/Current:1.0
+    8,
+  ACE_NTOHL (0x43757272),
+  ACE_NTOHL (0x656e7400),  // name = Current
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_Current (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_Current),
+    (char *) &_oc_PortableInterceptor_Current,
+    0,
+    sizeof (PortableInterceptor::Current)
+  );
+
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr _tc_Current =
+    &_tc_TAO_tc_PortableInterceptor_Current;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_PortableInterceptor_RequestInfo[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x52657175),
+  ACE_NTOHL (0x65737449),
+  ACE_NTOHL (0x6e666f3a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/RequestInfo:1.0
+    12,
+  ACE_NTOHL (0x52657175),
+  ACE_NTOHL (0x65737449),
+  ACE_NTOHL (0x6e666f00),  // name = RequestInfo
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_RequestInfo (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_RequestInfo),
+    (char *) &_oc_PortableInterceptor_RequestInfo,
+    0,
+    sizeof (PortableInterceptor::RequestInfo)
+  );
+
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr _tc_RequestInfo =
+    &_tc_TAO_tc_PortableInterceptor_RequestInfo;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_PortableInterceptor_ClientRequestInfo[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  54,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x436c6965),
+  ACE_NTOHL (0x6e745265),
+  ACE_NTOHL (0x71756573),
+  ACE_NTOHL (0x74496e66),
+  ACE_NTOHL (0x6f3a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0
+    18,
+  ACE_NTOHL (0x436c6965),
+  ACE_NTOHL (0x6e745265),
+  ACE_NTOHL (0x71756573),
+  ACE_NTOHL (0x74496e66),
+  ACE_NTOHL (0x6f000000),  // name = ClientRequestInfo
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ClientRequestInfo (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_ClientRequestInfo),
+    (char *) &_oc_PortableInterceptor_ClientRequestInfo,
+    0,
+    sizeof (PortableInterceptor::ClientRequestInfo)
+  );
+
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr _tc_ClientRequestInfo =
+    &_tc_TAO_tc_PortableInterceptor_ClientRequestInfo;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_PortableInterceptor_ServerRequestInfo[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  54,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65725265),
+  ACE_NTOHL (0x71756573),
+  ACE_NTOHL (0x74496e66),
+  ACE_NTOHL (0x6f3a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0
+    18,
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65725265),
+  ACE_NTOHL (0x71756573),
+  ACE_NTOHL (0x74496e66),
+  ACE_NTOHL (0x6f000000),  // name = ServerRequestInfo
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerRequestInfo (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_ServerRequestInfo),
+    (char *) &_oc_PortableInterceptor_ServerRequestInfo,
+    0,
+    sizeof (PortableInterceptor::ServerRequestInfo)
+  );
+
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr _tc_ServerRequestInfo =
+    &_tc_TAO_tc_PortableInterceptor_ServerRequestInfo;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_PortableInterceptor_ClientRequestInterceptor[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  61,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x436c6965),
+  ACE_NTOHL (0x6e745265),
+  ACE_NTOHL (0x71756573),
+  ACE_NTOHL (0x74496e74),
+  ACE_NTOHL (0x65726365),
+  ACE_NTOHL (0x70746f72),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0
+    25,
+  ACE_NTOHL (0x436c6965),
+  ACE_NTOHL (0x6e745265),
+  ACE_NTOHL (0x71756573),
+  ACE_NTOHL (0x74496e74),
+  ACE_NTOHL (0x65726365),
+  ACE_NTOHL (0x70746f72),
+  ACE_NTOHL (0x0),  // name = ClientRequestInterceptor
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ClientRequestInterceptor (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_ClientRequestInterceptor),
+    (char *) &_oc_PortableInterceptor_ClientRequestInterceptor,
+    0,
+    sizeof (PortableInterceptor::ClientRequestInterceptor)
+  );
+
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr _tc_ClientRequestInterceptor =
+    &_tc_TAO_tc_PortableInterceptor_ClientRequestInterceptor;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_PortableInterceptor_ServerRequestInterceptor[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  61,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65725265),
+  ACE_NTOHL (0x71756573),
+  ACE_NTOHL (0x74496e74),
+  ACE_NTOHL (0x65726365),
+  ACE_NTOHL (0x70746f72),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0
+    25,
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65725265),
+  ACE_NTOHL (0x71756573),
+  ACE_NTOHL (0x74496e74),
+  ACE_NTOHL (0x65726365),
+  ACE_NTOHL (0x70746f72),
+  ACE_NTOHL (0x0),  // name = ServerRequestInterceptor
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerRequestInterceptor (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_ServerRequestInterceptor),
+    (char *) &_oc_PortableInterceptor_ServerRequestInterceptor,
+    0,
+    sizeof (PortableInterceptor::ServerRequestInterceptor)
+  );
+
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr _tc_ServerRequestInterceptor =
+    &_tc_TAO_tc_PortableInterceptor_ServerRequestInterceptor;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_PortableInterceptor_PolicyFactory[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  50,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63794661),
+  ACE_NTOHL (0x63746f72),
+  ACE_NTOHL (0x793a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/PolicyFactory:1.0
+    14,
+  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x63794661),
+  ACE_NTOHL (0x63746f72),
+  ACE_NTOHL (0x79000000),  // name = PolicyFactory
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_PolicyFactory (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_PolicyFactory),
+    (char *) &_oc_PortableInterceptor_PolicyFactory,
+    0,
+    sizeof (PortableInterceptor::PolicyFactory)
+  );
+
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr _tc_PolicyFactory =
+    &_tc_TAO_tc_PortableInterceptor_PolicyFactory;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_ObjectId[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  57,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x4f524249),
+  ACE_NTOHL (0x6e697449),
+  ACE_NTOHL (0x6e666f2f),
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63744964),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo/ObjectId:1.0
+    9,
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63744964),
+  ACE_NTOHL (0x0),  // name = ObjectId
+    CORBA::tk_string,
+  0U, // string length
+};
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_ObjectId (
+    CORBA::tk_alias,
+    sizeof (_oc_PortableInterceptor_ORBInitInfo_ObjectId),
+    (char *) &_oc_PortableInterceptor_ORBInitInfo_ObjectId,
+    0,
+    sizeof (PortableInterceptor::ORBInitInfo::ObjectId)
+  );
+
+::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_ObjectId =
+  &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_ObjectId;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_DuplicateName[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  62,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x4f524249),
+  ACE_NTOHL (0x6e697449),
+  ACE_NTOHL (0x6e666f2f),
+  ACE_NTOHL (0x4475706c),
+  ACE_NTOHL (0x69636174),
+  ACE_NTOHL (0x654e616d),
+  ACE_NTOHL (0x653a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0
+    14,
+  ACE_NTOHL (0x4475706c),
+  ACE_NTOHL (0x69636174),
+  ACE_NTOHL (0x654e616d),
+  ACE_NTOHL (0x65000000),  // name = DuplicateName
+  1, // member count
+    5,
+  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x0),  // name = name
+    CORBA::tk_string,
+  0U, // string length
+};
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_DuplicateName (
+    CORBA::tk_except,
+    sizeof (_oc_PortableInterceptor_ORBInitInfo_DuplicateName),
+    (char *) &_oc_PortableInterceptor_ORBInitInfo_DuplicateName,
+    0,
+    sizeof (PortableInterceptor::ORBInitInfo::DuplicateName)
+  );
+
+::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_DuplicateName =
+  &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_DuplicateName;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_InvalidName[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  60,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x4f524249),
+  ACE_NTOHL (0x6e697449),
+  ACE_NTOHL (0x6e666f2f),
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c69644e),
+  ACE_NTOHL (0x616d653a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0
+    12,
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c69644e),
+  ACE_NTOHL (0x616d6500),  // name = InvalidName
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_InvalidName (
+    CORBA::tk_except,
+    sizeof (_oc_PortableInterceptor_ORBInitInfo_InvalidName),
+    (char *) &_oc_PortableInterceptor_ORBInitInfo_InvalidName,
+    0,
+    sizeof (PortableInterceptor::ORBInitInfo::InvalidName)
+  );
+
+::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_InvalidName =
+  &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_InvalidName;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x4f524249),
+  ACE_NTOHL (0x6e697449),
+  ACE_NTOHL (0x6e666f3a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0
+    12,
+  ACE_NTOHL (0x4f524249),
+  ACE_NTOHL (0x6e697449),
+  ACE_NTOHL (0x6e666f00),  // name = ORBInitInfo
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_ORBInitInfo),
+    (char *) &_oc_PortableInterceptor_ORBInitInfo,
+    0,
+    sizeof (PortableInterceptor::ORBInitInfo)
+  );
+
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr _tc_ORBInitInfo =
+    &_tc_TAO_tc_PortableInterceptor_ORBInitInfo;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_PortableInterceptor_ORBInitializer[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  51,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x4f524249),
+  ACE_NTOHL (0x6e697469),
+  ACE_NTOHL (0x616c697a),
+  ACE_NTOHL (0x65723a31),
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitializer:1.0
+    15,
+  ACE_NTOHL (0x4f524249),
+  ACE_NTOHL (0x6e697469),
+  ACE_NTOHL (0x616c697a),
+  ACE_NTOHL (0x65720000),  // name = ORBInitializer
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitializer (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableInterceptor_ORBInitializer),
+    (char *) &_oc_PortableInterceptor_ORBInitializer,
+    0,
+    sizeof (PortableInterceptor::ORBInitializer)
+  );
+
+namespace PortableInterceptor
+{
+  ::CORBA::TypeCode_ptr _tc_ORBInitializer =
+    &_tc_TAO_tc_PortableInterceptor_ORBInitializer;
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index a9fc7aceecc..2f3677fc186 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -30,6 +30,7 @@
 
 
 #include "PortableInterceptorC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 #include "ace/OS_NS_string.h"
 
@@ -195,45 +196,6 @@ PortableInterceptor::Interceptor::marshal (TAO_OutputCDR &)
   return 0;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_PortableInterceptor_Interceptor[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f723a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/Interceptor:1.0
-    12,
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f7200),  // name = Interceptor
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_Interceptor (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_Interceptor),
-    (char *) &_oc_PortableInterceptor_Interceptor,
-    0,
-    sizeof (PortableInterceptor::Interceptor)
-  );
-
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr _tc_Interceptor =
-    &_tc_TAO_tc_PortableInterceptor_Interceptor;
-}
-
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
@@ -367,153 +329,6 @@ CORBA::TypeCode_ptr PortableInterceptor::ForwardRequest::_type (void) const
   return ::PortableInterceptor::_tc_ForwardRequest;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_PortableInterceptor_ForwardRequest[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  51,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x466f7277), 
-  ACE_NTOHL (0x61726452), 
-  ACE_NTOHL (0x65717565), 
-  ACE_NTOHL (0x73743a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ForwardRequest:1.0
-    15,
-  ACE_NTOHL (0x466f7277), 
-  ACE_NTOHL (0x61726452), 
-  ACE_NTOHL (0x65717565), 
-  ACE_NTOHL (0x73740000),  // name = ForwardRequest
-  2, // member count
-    8,
-  ACE_NTOHL (0x666f7277), 
-  ACE_NTOHL (0x61726400),  // name = forward
-    CORBA::tk_objref,
-  52, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    29,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f62), 
-    ACE_NTOHL (0x6a656374), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
-        7,
-    ACE_NTOHL (0x4f626a65), 
-    ACE_NTOHL (0x63740000),  // name = Object
-    
-  10,
-  ACE_NTOHL (0x7065726d), 
-  ACE_NTOHL (0x616e656e), 
-  ACE_NTOHL (0x74000000),  // name = permanent
-    CORBA::tk_boolean,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ForwardRequest (
-    CORBA::tk_except,
-    sizeof (_oc_PortableInterceptor_ForwardRequest),
-    (char *) &_oc_PortableInterceptor_ForwardRequest,
-    0,
-    sizeof (PortableInterceptor::ForwardRequest)
-  );
-
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr _tc_ForwardRequest =
-    &_tc_TAO_tc_PortableInterceptor_ForwardRequest;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_PortableInterceptor_ReplyStatus[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x79537461), 
-  ACE_NTOHL (0x7475733a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ReplyStatus:1.0
-    12,
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x79537461), 
-  ACE_NTOHL (0x74757300),  // name = ReplyStatus
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ReplyStatus (
-    CORBA::tk_alias,
-    sizeof (_oc_PortableInterceptor_ReplyStatus),
-    (char *) &_oc_PortableInterceptor_ReplyStatus,
-    0,
-    sizeof (PortableInterceptor::ReplyStatus)
-  );
-
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr _tc_ReplyStatus =
-    &_tc_TAO_tc_PortableInterceptor_ReplyStatus;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_PortableInterceptor_SlotId[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x536c6f74), 
-  ACE_NTOHL (0x49643a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/SlotId:1.0
-    7,
-  ACE_NTOHL (0x536c6f74), 
-  ACE_NTOHL (0x49640000),  // name = SlotId
-    CORBA::tk_ulong,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_SlotId (
-    CORBA::tk_alias,
-    sizeof (_oc_PortableInterceptor_SlotId),
-    (char *) &_oc_PortableInterceptor_SlotId,
-    0,
-    sizeof (PortableInterceptor::SlotId)
-  );
-
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr _tc_SlotId =
-    &_tc_TAO_tc_PortableInterceptor_SlotId;
-}
-
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
@@ -626,46 +441,6 @@ CORBA::TypeCode_ptr PortableInterceptor::InvalidSlot::_type (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_PortableInterceptor_InvalidSlot[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c696453), 
-  ACE_NTOHL (0x6c6f743a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/InvalidSlot:1.0
-    12,
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c696453), 
-  ACE_NTOHL (0x6c6f7400),  // name = InvalidSlot
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_InvalidSlot (
-    CORBA::tk_except,
-    sizeof (_oc_PortableInterceptor_InvalidSlot),
-    (char *) &_oc_PortableInterceptor_InvalidSlot,
-    0,
-    sizeof (PortableInterceptor::InvalidSlot)
-  );
-
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr _tc_InvalidSlot =
-    &_tc_TAO_tc_PortableInterceptor_InvalidSlot;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::Current.
@@ -815,43 +590,6 @@ PortableInterceptor::Current::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_PortableInterceptor_Current[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  44,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x43757272), 
-  ACE_NTOHL (0x656e743a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/Current:1.0
-    8,
-  ACE_NTOHL (0x43757272), 
-  ACE_NTOHL (0x656e7400),  // name = Current
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_Current (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_Current),
-    (char *) &_oc_PortableInterceptor_Current,
-    0,
-    sizeof (PortableInterceptor::Current)
-  );
-
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr _tc_Current =
-    &_tc_TAO_tc_PortableInterceptor_Current;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::RequestInfo.
@@ -997,45 +735,6 @@ PortableInterceptor::RequestInfo::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_PortableInterceptor_RequestInfo[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737449), 
-  ACE_NTOHL (0x6e666f3a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/RequestInfo:1.0
-    12,
-  ACE_NTOHL (0x52657175), 
-  ACE_NTOHL (0x65737449), 
-  ACE_NTOHL (0x6e666f00),  // name = RequestInfo
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_RequestInfo (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_RequestInfo),
-    (char *) &_oc_PortableInterceptor_RequestInfo,
-    0,
-    sizeof (PortableInterceptor::RequestInfo)
-  );
-
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr _tc_RequestInfo =
-    &_tc_TAO_tc_PortableInterceptor_RequestInfo;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::ClientRequestInfo.
@@ -1185,49 +884,6 @@ PortableInterceptor::ClientRequestInfo::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_PortableInterceptor_ClientRequestInfo[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  54,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x436c6965), 
-  ACE_NTOHL (0x6e745265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e66), 
-  ACE_NTOHL (0x6f3a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0
-    18,
-  ACE_NTOHL (0x436c6965), 
-  ACE_NTOHL (0x6e745265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e66), 
-  ACE_NTOHL (0x6f000000),  // name = ClientRequestInfo
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ClientRequestInfo (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_ClientRequestInfo),
-    (char *) &_oc_PortableInterceptor_ClientRequestInfo,
-    0,
-    sizeof (PortableInterceptor::ClientRequestInfo)
-  );
-
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr _tc_ClientRequestInfo =
-    &_tc_TAO_tc_PortableInterceptor_ClientRequestInfo;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::ServerRequestInfo.
@@ -1377,49 +1033,6 @@ PortableInterceptor::ServerRequestInfo::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_PortableInterceptor_ServerRequestInfo[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  54,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65725265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e66), 
-  ACE_NTOHL (0x6f3a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0
-    18,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65725265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e66), 
-  ACE_NTOHL (0x6f000000),  // name = ServerRequestInfo
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerRequestInfo (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_ServerRequestInfo),
-    (char *) &_oc_PortableInterceptor_ServerRequestInfo,
-    0,
-    sizeof (PortableInterceptor::ServerRequestInfo)
-  );
-
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr _tc_ServerRequestInfo =
-    &_tc_TAO_tc_PortableInterceptor_ServerRequestInfo;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::ClientRequestInterceptor.
@@ -1569,53 +1182,6 @@ PortableInterceptor::ClientRequestInterceptor::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_PortableInterceptor_ClientRequestInterceptor[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  61,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x436c6965), 
-  ACE_NTOHL (0x6e745265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e74), 
-  ACE_NTOHL (0x65726365), 
-  ACE_NTOHL (0x70746f72), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0
-    25,
-  ACE_NTOHL (0x436c6965), 
-  ACE_NTOHL (0x6e745265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e74), 
-  ACE_NTOHL (0x65726365), 
-  ACE_NTOHL (0x70746f72), 
-  ACE_NTOHL (0x0),  // name = ClientRequestInterceptor
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ClientRequestInterceptor (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_ClientRequestInterceptor),
-    (char *) &_oc_PortableInterceptor_ClientRequestInterceptor,
-    0,
-    sizeof (PortableInterceptor::ClientRequestInterceptor)
-  );
-
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr _tc_ClientRequestInterceptor =
-    &_tc_TAO_tc_PortableInterceptor_ClientRequestInterceptor;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::ServerRequestInterceptor.
@@ -1765,54 +1331,7 @@ PortableInterceptor::ServerRequestInterceptor::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_PortableInterceptor_ServerRequestInterceptor[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  61,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65725265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e74), 
-  ACE_NTOHL (0x65726365), 
-  ACE_NTOHL (0x70746f72), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0
-    25,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65725265), 
-  ACE_NTOHL (0x71756573), 
-  ACE_NTOHL (0x74496e74), 
-  ACE_NTOHL (0x65726365), 
-  ACE_NTOHL (0x70746f72), 
-  ACE_NTOHL (0x0),  // name = ServerRequestInterceptor
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerRequestInterceptor (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_ServerRequestInterceptor),
-    (char *) &_oc_PortableInterceptor_ServerRequestInterceptor,
-    0,
-    sizeof (PortableInterceptor::ServerRequestInterceptor)
-  );
-
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr _tc_ServerRequestInterceptor =
-    &_tc_TAO_tc_PortableInterceptor_ServerRequestInterceptor;
-}
-
 // Hand-crafted.
-
 ::CORBA::Policy_ptr
 PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
                                                     ACE_ENV_ARG_DECL)
@@ -1823,7 +1342,6 @@ PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
                     CORBA::Policy::_nil ());
 }
 
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::PolicyFactory.
@@ -1969,47 +1487,6 @@ PortableInterceptor::PolicyFactory::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_PortableInterceptor_PolicyFactory[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  50,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63794661), 
-  ACE_NTOHL (0x63746f72), 
-  ACE_NTOHL (0x793a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/PolicyFactory:1.0
-    14,
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63794661), 
-  ACE_NTOHL (0x63746f72), 
-  ACE_NTOHL (0x79000000),  // name = PolicyFactory
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_PolicyFactory (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_PolicyFactory),
-    (char *) &_oc_PortableInterceptor_PolicyFactory,
-    0,
-    sizeof (PortableInterceptor::PolicyFactory)
-  );
-
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr _tc_PolicyFactory =
-    &_tc_TAO_tc_PortableInterceptor_PolicyFactory;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::ORBInitInfo.
@@ -2055,47 +1532,6 @@ TAO::Collocation_Proxy_Broker *
     CORBA::Object_ptr obj
   ) = 0;
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_ObjectId[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  57,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f524249), 
-  ACE_NTOHL (0x6e697449), 
-  ACE_NTOHL (0x6e666f2f), 
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63744964), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo/ObjectId:1.0
-    9,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63744964), 
-  ACE_NTOHL (0x0),  // name = ObjectId
-    CORBA::tk_string, 
-  0U, // string length
-};
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_ObjectId (
-    CORBA::tk_alias,
-    sizeof (_oc_PortableInterceptor_ORBInitInfo_ObjectId),
-    (char *) &_oc_PortableInterceptor_ORBInitInfo_ObjectId,
-    0,
-    sizeof (PortableInterceptor::ORBInitInfo::ObjectId)
-  );
-
-::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_ObjectId =
-  &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_ObjectId;
-
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
@@ -2215,53 +1651,6 @@ CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::DuplicateName::_type (void
   return ::PortableInterceptor::ORBInitInfo::_tc_DuplicateName;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_DuplicateName[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  62,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f524249), 
-  ACE_NTOHL (0x6e697449), 
-  ACE_NTOHL (0x6e666f2f), 
-  ACE_NTOHL (0x4475706c), 
-  ACE_NTOHL (0x69636174), 
-  ACE_NTOHL (0x654e616d), 
-  ACE_NTOHL (0x653a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo/DuplicateName:1.0
-    14,
-  ACE_NTOHL (0x4475706c), 
-  ACE_NTOHL (0x69636174), 
-  ACE_NTOHL (0x654e616d), 
-  ACE_NTOHL (0x65000000),  // name = DuplicateName
-  1, // member count
-    5,
-  ACE_NTOHL (0x6e616d65), 
-  ACE_NTOHL (0x0),  // name = name
-    CORBA::tk_string, 
-  0U, // string length
-};
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_DuplicateName (
-    CORBA::tk_except,
-    sizeof (_oc_PortableInterceptor_ORBInitInfo_DuplicateName),
-    (char *) &_oc_PortableInterceptor_ORBInitInfo_DuplicateName,
-    0,
-    sizeof (PortableInterceptor::ORBInitInfo::DuplicateName)
-  );
-
-::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_DuplicateName =
-  &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_DuplicateName;
-
 // TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
@@ -2363,46 +1752,6 @@ CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::InvalidName::_type (void)
   return ::PortableInterceptor::ORBInitInfo::_tc_InvalidName;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo_InvalidName[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  60,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f524249), 
-  ACE_NTOHL (0x6e697449), 
-  ACE_NTOHL (0x6e666f2f), 
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c69644e), 
-  ACE_NTOHL (0x616d653a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo/InvalidName:1.0
-    12,
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c69644e), 
-  ACE_NTOHL (0x616d6500),  // name = InvalidName
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_InvalidName (
-    CORBA::tk_except,
-    sizeof (_oc_PortableInterceptor_ORBInitInfo_InvalidName),
-    (char *) &_oc_PortableInterceptor_ORBInitInfo_InvalidName,
-    0,
-    sizeof (PortableInterceptor::ORBInitInfo::InvalidName)
-  );
-
-::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_InvalidName =
-  &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_InvalidName;
-
 PortableInterceptor::ORBInitInfo::ORBInitInfo (void)
 {}
 
@@ -2503,45 +1852,6 @@ PortableInterceptor::ORBInitInfo::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_PortableInterceptor_ORBInitInfo[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f524249), 
-  ACE_NTOHL (0x6e697449), 
-  ACE_NTOHL (0x6e666f3a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0
-    12,
-  ACE_NTOHL (0x4f524249), 
-  ACE_NTOHL (0x6e697449), 
-  ACE_NTOHL (0x6e666f00),  // name = ORBInitInfo
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_ORBInitInfo),
-    (char *) &_oc_PortableInterceptor_ORBInitInfo,
-    0,
-    sizeof (PortableInterceptor::ORBInitInfo)
-  );
-
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr _tc_ORBInitInfo =
-    &_tc_TAO_tc_PortableInterceptor_ORBInitInfo;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::ORBInitializer.
@@ -2687,47 +1997,6 @@ PortableInterceptor::ORBInitializer::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_PortableInterceptor_ORBInitializer[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  51,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f524249), 
-  ACE_NTOHL (0x6e697469), 
-  ACE_NTOHL (0x616c697a), 
-  ACE_NTOHL (0x65723a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBInitializer:1.0
-    15,
-  ACE_NTOHL (0x4f524249), 
-  ACE_NTOHL (0x6e697469), 
-  ACE_NTOHL (0x616c697a), 
-  ACE_NTOHL (0x65720000),  // name = ORBInitializer
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitializer (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_ORBInitializer),
-    (char *) &_oc_PortableInterceptor_ORBInitializer,
-    0,
-    sizeof (PortableInterceptor::ORBInitializer)
-  );
-
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr _tc_ORBInitializer =
-    &_tc_TAO_tc_PortableInterceptor_ORBInitializer;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_exception/cdr_op_cs.cpp:60
 
 CORBA::Boolean operator<< (
@@ -2804,7 +2073,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index 7b19d2f2c0b..5f557bf0f77 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -33,19 +33,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "PI_ForwardC.h"
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/TAO_Export.h"
-#include "tao/CDR.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Any.h"
 #include "tao/Objref_VarOut_T.h"
 
+#include "PI_ForwardC.h"
 #include "tao/Messaging_SyncScopeC.h"
 #include "tao/IOP_CodecC.h"
 #include "tao/PolicyC.h"
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index 7540b6cddb1..dc2d8c1857b 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -45,6 +45,7 @@
 #include "tao/Typecode.h"
 #include "tao/DynamicC.h"
 #include "tao/Basic_Arguments.h"
+#include "tao/CDR.h"
 #include "tao/Object_Argument_T.h"
 #include "tao/PortableInterceptor.h"
 #if TAO_HAS_INTERCEPTORS == 1
diff --git a/TAO/tao/ServicesA.cpp b/TAO/tao/ServicesA.cpp
index 4a209eb20c4..564a5af65c2 100644
--- a/TAO/tao/ServicesA.cpp
+++ b/TAO/tao/ServicesA.cpp
@@ -26,12 +26,614 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ServicesC.h"
-#include "ServicesA.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Dual_Impl_T.h"
 
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_ServiceType[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  34,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5365),
+  ACE_NTOHL (0x72766963),
+  ACE_NTOHL (0x65547970),
+  ACE_NTOHL (0x653a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ServiceType:1.0
+    12,
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x69636554),
+  ACE_NTOHL (0x79706500),  // name = ServiceType
+    CORBA::tk_ushort,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceType (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ServiceType),
+    (char *) &_oc_CORBA_ServiceType,
+    0,
+    sizeof (CORBA::ServiceType)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ServiceType =
+    &_tc_TAO_tc_CORBA_ServiceType;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_ServiceOption[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  36,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5365),
+  ACE_NTOHL (0x72766963),
+  ACE_NTOHL (0x654f7074),
+  ACE_NTOHL (0x696f6e3a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0
+    14,
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x6963654f),
+  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6e000000),  // name = ServiceOption
+    CORBA::tk_ulong,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceOption (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ServiceOption),
+    (char *) &_oc_CORBA_ServiceOption,
+    0,
+    sizeof (CORBA::ServiceOption)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ServiceOption =
+    &_tc_TAO_tc_CORBA_ServiceOption;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_ServiceDetailType[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  40,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5365),
+  ACE_NTOHL (0x72766963),
+  ACE_NTOHL (0x65446574),
+  ACE_NTOHL (0x61696c54),
+  ACE_NTOHL (0x7970653a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
+    18,
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x69636544),
+  ACE_NTOHL (0x65746169),
+  ACE_NTOHL (0x6c547970),
+  ACE_NTOHL (0x65000000),  // name = ServiceDetailType
+    CORBA::tk_ulong,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetailType (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ServiceDetailType),
+    (char *) &_oc_CORBA_ServiceDetailType,
+    0,
+    sizeof (CORBA::ServiceDetailType)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ServiceDetailType =
+    &_tc_TAO_tc_CORBA_ServiceDetailType;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_ServiceDetail[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  36,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5365),
+  ACE_NTOHL (0x72766963),
+  ACE_NTOHL (0x65446574),
+  ACE_NTOHL (0x61696c3a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0
+    14,
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x69636544),
+  ACE_NTOHL (0x65746169),
+  ACE_NTOHL (0x6c000000),  // name = ServiceDetail
+  2, // member count
+    20,
+  ACE_NTOHL (0x73657276),
+  ACE_NTOHL (0x6963655f),
+  ACE_NTOHL (0x64657461),
+  ACE_NTOHL (0x696c5f74),
+  ACE_NTOHL (0x79706500),  // name = service_detail_type
+    CORBA::tk_alias, // typecode kind for typedefs
+  76, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    40,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5365),
+    ACE_NTOHL (0x72766963),
+    ACE_NTOHL (0x65446574),
+    ACE_NTOHL (0x61696c54),
+    ACE_NTOHL (0x7970653a),
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
+        18,
+    ACE_NTOHL (0x53657276),
+    ACE_NTOHL (0x69636544),
+    ACE_NTOHL (0x65746169),
+    ACE_NTOHL (0x6c547970),
+    ACE_NTOHL (0x65000000),  // name = ServiceDetailType
+        CORBA::tk_ulong,
+
+
+  15,
+  ACE_NTOHL (0x73657276),
+  ACE_NTOHL (0x6963655f),
+  ACE_NTOHL (0x64657461),
+  ACE_NTOHL (0x696c0000),  // name = service_detail
+    CORBA::tk_alias, // typecode kind for typedefs
+  76, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    31,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4f63),
+    ACE_NTOHL (0x74657453),
+    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
+        9,
+    ACE_NTOHL (0x4f637465),
+    ACE_NTOHL (0x74536571),
+    ACE_NTOHL (0x0),  // name = OctetSeq
+        CORBA::tk_sequence, // typecode kind
+    12, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_octet,
+
+      0U,
+
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetail (
+    CORBA::tk_struct,
+    sizeof (_oc_CORBA_ServiceDetail),
+    (char *) &_oc_CORBA_ServiceDetail,
+    0,
+    sizeof (CORBA::ServiceDetail)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ServiceDetail =
+    &_tc_TAO_tc_CORBA_ServiceDetail;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_ServiceOptionSeq[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  39,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5365),
+  ACE_NTOHL (0x72766963),
+  ACE_NTOHL (0x654f7074),
+  ACE_NTOHL (0x696f6e53),
+  ACE_NTOHL (0x65713a31),
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ServiceOptionSeq:1.0
+    17,
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x6963654f),
+  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x6e536571),
+  ACE_NTOHL (0x0),  // name = ServiceOptionSeq
+    CORBA::tk_sequence, // typecode kind
+  84, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_alias, // typecode kind for typedefs
+    68, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      36,
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f5242),
+      ACE_NTOHL (0x412f5365),
+      ACE_NTOHL (0x72766963),
+      ACE_NTOHL (0x654f7074),
+      ACE_NTOHL (0x696f6e3a),
+      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0
+            14,
+      ACE_NTOHL (0x53657276),
+      ACE_NTOHL (0x6963654f),
+      ACE_NTOHL (0x7074696f),
+      ACE_NTOHL (0x6e000000),  // name = ServiceOption
+            CORBA::tk_ulong,
+
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceOptionSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ServiceOptionSeq),
+    (char *) &_oc_CORBA_ServiceOptionSeq,
+    0,
+    sizeof (CORBA::ServiceOptionSeq)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ServiceOptionSeq =
+    &_tc_TAO_tc_CORBA_ServiceOptionSeq;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_ServiceDetailSeq[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  39,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5365),
+  ACE_NTOHL (0x72766963),
+  ACE_NTOHL (0x65446574),
+  ACE_NTOHL (0x61696c53),
+  ACE_NTOHL (0x65713a31),
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailSeq:1.0
+    17,
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x69636544),
+  ACE_NTOHL (0x65746169),
+  ACE_NTOHL (0x6c536571),
+  ACE_NTOHL (0x0),  // name = ServiceDetailSeq
+    CORBA::tk_sequence, // typecode kind
+  296, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_struct, // typecode kind
+    280, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      36,
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f5242),
+      ACE_NTOHL (0x412f5365),
+      ACE_NTOHL (0x72766963),
+      ACE_NTOHL (0x65446574),
+      ACE_NTOHL (0x61696c3a),
+      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0
+            14,
+      ACE_NTOHL (0x53657276),
+      ACE_NTOHL (0x69636544),
+      ACE_NTOHL (0x65746169),
+      ACE_NTOHL (0x6c000000),  // name = ServiceDetail
+      2, // member count
+            20,
+      ACE_NTOHL (0x73657276),
+      ACE_NTOHL (0x6963655f),
+      ACE_NTOHL (0x64657461),
+      ACE_NTOHL (0x696c5f74),
+      ACE_NTOHL (0x79706500),  // name = service_detail_type
+            CORBA::tk_alias, // typecode kind for typedefs
+      76, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        40,
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5365),
+        ACE_NTOHL (0x72766963),
+        ACE_NTOHL (0x65446574),
+        ACE_NTOHL (0x61696c54),
+        ACE_NTOHL (0x7970653a),
+        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
+                18,
+        ACE_NTOHL (0x53657276),
+        ACE_NTOHL (0x69636544),
+        ACE_NTOHL (0x65746169),
+        ACE_NTOHL (0x6c547970),
+        ACE_NTOHL (0x65000000),  // name = ServiceDetailType
+                CORBA::tk_ulong,
+
+
+      15,
+      ACE_NTOHL (0x73657276),
+      ACE_NTOHL (0x6963655f),
+      ACE_NTOHL (0x64657461),
+      ACE_NTOHL (0x696c0000),  // name = service_detail
+            CORBA::tk_alias, // typecode kind for typedefs
+      76, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        31,
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4f63),
+        ACE_NTOHL (0x74657453),
+        ACE_NTOHL (0x65713a31),
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
+                9,
+        ACE_NTOHL (0x4f637465),
+        ACE_NTOHL (0x74536571),
+        ACE_NTOHL (0x0),  // name = OctetSeq
+                CORBA::tk_sequence, // typecode kind
+        12, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          CORBA::tk_octet,
+
+          0U,
+
+
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetailSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ServiceDetailSeq),
+    (char *) &_oc_CORBA_ServiceDetailSeq,
+    0,
+    sizeof (CORBA::ServiceDetailSeq)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ServiceDetailSeq =
+    &_tc_TAO_tc_CORBA_ServiceDetailSeq;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_ServiceInformation[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  41,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5365),
+  ACE_NTOHL (0x72766963),
+  ACE_NTOHL (0x65496e66),
+  ACE_NTOHL (0x6f726d61),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ServiceInformation:1.0
+    19,
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x69636549),
+  ACE_NTOHL (0x6e666f72),
+  ACE_NTOHL (0x6d617469),
+  ACE_NTOHL (0x6f6e0000),  // name = ServiceInformation
+  2, // member count
+    16,
+  ACE_NTOHL (0x73657276),
+  ACE_NTOHL (0x6963655f),
+  ACE_NTOHL (0x6f707469),
+  ACE_NTOHL (0x6f6e7300),  // name = service_options
+    CORBA::tk_alias, // typecode kind for typedefs
+  164, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    39,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5365),
+    ACE_NTOHL (0x72766963),
+    ACE_NTOHL (0x654f7074),
+    ACE_NTOHL (0x696f6e53),
+    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ServiceOptionSeq:1.0
+        17,
+    ACE_NTOHL (0x53657276),
+    ACE_NTOHL (0x6963654f),
+    ACE_NTOHL (0x7074696f),
+    ACE_NTOHL (0x6e536571),
+    ACE_NTOHL (0x0),  // name = ServiceOptionSeq
+        CORBA::tk_sequence, // typecode kind
+    84, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_alias, // typecode kind for typedefs
+      68, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        36,
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5365),
+        ACE_NTOHL (0x72766963),
+        ACE_NTOHL (0x654f7074),
+        ACE_NTOHL (0x696f6e3a),
+        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0
+                14,
+        ACE_NTOHL (0x53657276),
+        ACE_NTOHL (0x6963654f),
+        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x6e000000),  // name = ServiceOption
+                CORBA::tk_ulong,
+
+
+      0U,
+
+
+  16,
+  ACE_NTOHL (0x73657276),
+  ACE_NTOHL (0x6963655f),
+  ACE_NTOHL (0x64657461),
+  ACE_NTOHL (0x696c7300),  // name = service_details
+    CORBA::tk_alias, // typecode kind for typedefs
+  376, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    39,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f5365),
+    ACE_NTOHL (0x72766963),
+    ACE_NTOHL (0x65446574),
+    ACE_NTOHL (0x61696c53),
+    ACE_NTOHL (0x65713a31),
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailSeq:1.0
+        17,
+    ACE_NTOHL (0x53657276),
+    ACE_NTOHL (0x69636544),
+    ACE_NTOHL (0x65746169),
+    ACE_NTOHL (0x6c536571),
+    ACE_NTOHL (0x0),  // name = ServiceDetailSeq
+        CORBA::tk_sequence, // typecode kind
+    296, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      CORBA::tk_struct, // typecode kind
+      280, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        36,
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f5365),
+        ACE_NTOHL (0x72766963),
+        ACE_NTOHL (0x65446574),
+        ACE_NTOHL (0x61696c3a),
+        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0
+                14,
+        ACE_NTOHL (0x53657276),
+        ACE_NTOHL (0x69636544),
+        ACE_NTOHL (0x65746169),
+        ACE_NTOHL (0x6c000000),  // name = ServiceDetail
+        2, // member count
+                20,
+        ACE_NTOHL (0x73657276),
+        ACE_NTOHL (0x6963655f),
+        ACE_NTOHL (0x64657461),
+        ACE_NTOHL (0x696c5f74),
+        ACE_NTOHL (0x79706500),  // name = service_detail_type
+                CORBA::tk_alias, // typecode kind for typedefs
+        76, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          40,
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f5365),
+          ACE_NTOHL (0x72766963),
+          ACE_NTOHL (0x65446574),
+          ACE_NTOHL (0x61696c54),
+          ACE_NTOHL (0x7970653a),
+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
+                    18,
+          ACE_NTOHL (0x53657276),
+          ACE_NTOHL (0x69636544),
+          ACE_NTOHL (0x65746169),
+          ACE_NTOHL (0x6c547970),
+          ACE_NTOHL (0x65000000),  // name = ServiceDetailType
+                    CORBA::tk_ulong,
+
+
+        15,
+        ACE_NTOHL (0x73657276),
+        ACE_NTOHL (0x6963655f),
+        ACE_NTOHL (0x64657461),
+        ACE_NTOHL (0x696c0000),  // name = service_detail
+                CORBA::tk_alias, // typecode kind for typedefs
+        76, // encapsulation length
+          TAO_ENCAP_BYTE_ORDER, // byte order
+          31,
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x6f6d672e),
+          ACE_NTOHL (0x6f72672f),
+          ACE_NTOHL (0x434f5242),
+          ACE_NTOHL (0x412f4f63),
+          ACE_NTOHL (0x74657453),
+          ACE_NTOHL (0x65713a31),
+          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
+                    9,
+          ACE_NTOHL (0x4f637465),
+          ACE_NTOHL (0x74536571),
+          ACE_NTOHL (0x0),  // name = OctetSeq
+                    CORBA::tk_sequence, // typecode kind
+          12, // encapsulation length
+            TAO_ENCAP_BYTE_ORDER, // byte order
+            CORBA::tk_octet,
+
+            0U,
+
+
+
+      0U,
+
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceInformation (
+    CORBA::tk_struct,
+    sizeof (_oc_CORBA_ServiceInformation),
+    (char *) &_oc_CORBA_ServiceInformation,
+    0,
+    sizeof (CORBA::ServiceInformation)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ServiceInformation =
+    &_tc_TAO_tc_CORBA_ServiceInformation;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -88,8 +690,124 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ServiceOptionSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ServiceOptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::ServiceOptionSeq::_tao_any_destructor,
+      CORBA::_tc_ServiceOptionSeq,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ServiceOptionSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ServiceOptionSeq>::insert (
+      _tao_any,
+      CORBA::ServiceOptionSeq::_tao_any_destructor,
+      CORBA::_tc_ServiceOptionSeq,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ServiceOptionSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ServiceOptionSeq *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ServiceOptionSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ServiceOptionSeq>::extract (
+        _tao_any,
+        CORBA::ServiceOptionSeq::_tao_any_destructor,
+        CORBA::_tc_ServiceOptionSeq,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ServiceDetailSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ServiceDetailSeq>::insert_copy (
+      _tao_any,
+      CORBA::ServiceDetailSeq::_tao_any_destructor,
+      CORBA::_tc_ServiceDetailSeq,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ServiceDetailSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ServiceDetailSeq>::insert (
+      _tao_any,
+      CORBA::ServiceDetailSeq::_tao_any_destructor,
+      CORBA::_tc_ServiceDetailSeq,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ServiceDetailSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= ACE_const_cast (
+      const CORBA::ServiceDetailSeq *&,
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ServiceDetailSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ServiceDetailSeq>::extract (
+        _tao_any,
+        CORBA::ServiceDetailSeq::_tao_any_destructor,
+        CORBA::_tc_ServiceDetailSeq,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -146,6 +864,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
+
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -155,12 +875,12 @@ CORBA::Boolean operator>>= (
 
   template class
     TAO::Any_Dual_Impl_T<
-        CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_
+        CORBA::ServiceOptionSeq
       >;
 
   template class
     TAO::Any_Dual_Impl_T<
-        CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_
+        CORBA::ServiceDetailSeq
       >;
 
   template class
@@ -177,12 +897,12 @@ CORBA::Boolean operator>>= (
 
 # pragma instantiate \
     TAO::Any_Dual_Impl_T< \
-        CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_ \
+        CORBA::ServiceOptionSeq \
       >
 
 # pragma instantiate \
     TAO::Any_Dual_Impl_T< \
-        CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_ \
+        CORBA::ServiceDetailSeq \
       >
 
 # pragma instantiate \
@@ -190,5 +910,5 @@ CORBA::Boolean operator>>= (
         CORBA::ServiceInformation \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/TAO/tao/ServicesA.h b/TAO/tao/ServicesA.h
deleted file mode 100644
index 495a2cacf27..00000000000
--- a/TAO/tao/ServicesA.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:848
-
-#ifndef _TAO_IDL_ORIG_SERVICESA_ANYOP_H_
-#define _TAO_IDL_ORIG_SERVICESA_ANYOP_H_
-
-#include /**/ "ace/pre.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceDetail &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceDetail*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceDetail *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceDetail *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceInformation &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceInformation*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceInformation *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceInformation *&);
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp
index 06843c5911d..0df850c41cf 100644
--- a/TAO/tao/ServicesC.cpp
+++ b/TAO/tao/ServicesC.cpp
@@ -26,10 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:338
+// be\be_codegen.cpp:323
 
 
 #include "ServicesC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
@@ -41,229 +42,16 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:62
+// be\be_visitor_arg_traits.cpp:64
 
 // Arg traits specializations.
 namespace TAO
 {
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_ServiceType[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5365),
-  ACE_NTOHL (0x72766963),
-  ACE_NTOHL (0x65547970),
-  ACE_NTOHL (0x653a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ServiceType:1.0
-    12,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x69636554),
-  ACE_NTOHL (0x79706500),  // name = ServiceType
-    CORBA::tk_ushort,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceType (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ServiceType),
-    (char *) &_oc_CORBA_ServiceType,
-    0,
-    sizeof (CORBA::ServiceType)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_ServiceType =
-    &_tc_TAO_tc_CORBA_ServiceType;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_ServiceOption[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5365),
-  ACE_NTOHL (0x72766963),
-  ACE_NTOHL (0x654f7074),
-  ACE_NTOHL (0x696f6e3a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0
-    14,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x6963654f),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e000000),  // name = ServiceOption
-    CORBA::tk_ulong,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceOption (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ServiceOption),
-    (char *) &_oc_CORBA_ServiceOption,
-    0,
-    sizeof (CORBA::ServiceOption)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_ServiceOption =
-    &_tc_TAO_tc_CORBA_ServiceOption;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_ServiceDetailType[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5365),
-  ACE_NTOHL (0x72766963),
-  ACE_NTOHL (0x65446574),
-  ACE_NTOHL (0x61696c54),
-  ACE_NTOHL (0x7970653a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
-    18,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x69636544),
-  ACE_NTOHL (0x65746169),
-  ACE_NTOHL (0x6c547970),
-  ACE_NTOHL (0x65000000),  // name = ServiceDetailType
-    CORBA::tk_ulong,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetailType (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ServiceDetailType),
-    (char *) &_oc_CORBA_ServiceDetailType,
-    0,
-    sizeof (CORBA::ServiceDetailType)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_ServiceDetailType =
-    &_tc_TAO_tc_CORBA_ServiceDetailType;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_ServiceDetail[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5365),
-  ACE_NTOHL (0x72766963),
-  ACE_NTOHL (0x65446574),
-  ACE_NTOHL (0x61696c3a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0
-    14,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x69636544),
-  ACE_NTOHL (0x65746169),
-  ACE_NTOHL (0x6c000000),  // name = ServiceDetail
-  2, // member count
-    20,
-  ACE_NTOHL (0x73657276),
-  ACE_NTOHL (0x6963655f),
-  ACE_NTOHL (0x64657461),
-  ACE_NTOHL (0x696c5f74),
-  ACE_NTOHL (0x79706500),  // name = service_detail_type
-    CORBA::tk_alias, // typecode kind for typedefs
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    40,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5365), 
-    ACE_NTOHL (0x72766963), 
-    ACE_NTOHL (0x65446574), 
-    ACE_NTOHL (0x61696c54), 
-    ACE_NTOHL (0x7970653a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
-        18,
-    ACE_NTOHL (0x53657276), 
-    ACE_NTOHL (0x69636544), 
-    ACE_NTOHL (0x65746169), 
-    ACE_NTOHL (0x6c547970), 
-    ACE_NTOHL (0x65000000),  // name = ServiceDetailType
-        CORBA::tk_ulong,
-
-
-  15,
-  ACE_NTOHL (0x73657276), 
-  ACE_NTOHL (0x6963655f), 
-  ACE_NTOHL (0x64657461), 
-  ACE_NTOHL (0x696c0000),  // name = service_detail
-    CORBA::tk_alias, // typecode kind for typedefs
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f63), 
-    ACE_NTOHL (0x74657453), 
-    ACE_NTOHL (0x65713a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-        9,
-    ACE_NTOHL (0x4f637465), 
-    ACE_NTOHL (0x74536571), 
-    ACE_NTOHL (0x0),  // name = OctetSeq
-        CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_octet,
-
-      0U,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetail (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_ServiceDetail),
-    (char *) &_oc_CORBA_ServiceDetail,
-    0,
-    sizeof (CORBA::ServiceDetail)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_ServiceDetail =
-    &_tc_TAO_tc_CORBA_ServiceDetail;
-}
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:66
+// be\be_visitor_structure/structure_cs.cpp:66
 
 void 
 CORBA::ServiceDetail::_tao_any_destructor (
@@ -275,189 +63,16 @@ CORBA::ServiceDetail::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_ServiceInformation[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  41,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5365), 
-  ACE_NTOHL (0x72766963), 
-  ACE_NTOHL (0x65496e66), 
-  ACE_NTOHL (0x6f726d61), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ServiceInformation:1.0
-    19,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x69636549), 
-  ACE_NTOHL (0x6e666f72), 
-  ACE_NTOHL (0x6d617469), 
-  ACE_NTOHL (0x6f6e0000),  // name = ServiceInformation
-  2, // member count
-    16,
-  ACE_NTOHL (0x73657276), 
-  ACE_NTOHL (0x6963655f), 
-  ACE_NTOHL (0x6f707469), 
-  ACE_NTOHL (0x6f6e7300),  // name = service_options
-    CORBA::tk_sequence, // typecode kind
-  84, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      36,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f5365), 
-      ACE_NTOHL (0x72766963), 
-      ACE_NTOHL (0x654f7074), 
-      ACE_NTOHL (0x696f6e3a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0
-            14,
-      ACE_NTOHL (0x53657276), 
-      ACE_NTOHL (0x6963654f), 
-      ACE_NTOHL (0x7074696f), 
-      ACE_NTOHL (0x6e000000),  // name = ServiceOption
-            CORBA::tk_ulong,
-
-
-    0U,
-
-  16,
-  ACE_NTOHL (0x73657276), 
-  ACE_NTOHL (0x6963655f), 
-  ACE_NTOHL (0x64657461), 
-  ACE_NTOHL (0x696c7300),  // name = service_details
-    CORBA::tk_sequence, // typecode kind
-  296, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    280, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      36,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f5365), 
-      ACE_NTOHL (0x72766963), 
-      ACE_NTOHL (0x65446574), 
-      ACE_NTOHL (0x61696c3a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0
-            14,
-      ACE_NTOHL (0x53657276), 
-      ACE_NTOHL (0x69636544), 
-      ACE_NTOHL (0x65746169), 
-      ACE_NTOHL (0x6c000000),  // name = ServiceDetail
-      2, // member count
-            20,
-      ACE_NTOHL (0x73657276), 
-      ACE_NTOHL (0x6963655f), 
-      ACE_NTOHL (0x64657461), 
-      ACE_NTOHL (0x696c5f74), 
-      ACE_NTOHL (0x79706500),  // name = service_detail_type
-            CORBA::tk_alias, // typecode kind for typedefs
-      76, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        40,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f5365), 
-        ACE_NTOHL (0x72766963), 
-        ACE_NTOHL (0x65446574), 
-        ACE_NTOHL (0x61696c54), 
-        ACE_NTOHL (0x7970653a), 
-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
-                18,
-        ACE_NTOHL (0x53657276), 
-        ACE_NTOHL (0x69636544), 
-        ACE_NTOHL (0x65746169), 
-        ACE_NTOHL (0x6c547970), 
-        ACE_NTOHL (0x65000000),  // name = ServiceDetailType
-                CORBA::tk_ulong,
-
-
-      15,
-      ACE_NTOHL (0x73657276), 
-      ACE_NTOHL (0x6963655f), 
-      ACE_NTOHL (0x64657461), 
-      ACE_NTOHL (0x696c0000),  // name = service_detail
-            CORBA::tk_alias, // typecode kind for typedefs
-      76, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        31,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4f63), 
-        ACE_NTOHL (0x74657453), 
-        ACE_NTOHL (0x65713a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-                9,
-        ACE_NTOHL (0x4f637465), 
-        ACE_NTOHL (0x74536571), 
-        ACE_NTOHL (0x0),  // name = OctetSeq
-                CORBA::tk_sequence, // typecode kind
-        12, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_octet,
-
-          0U,
-
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceInformation (
-    CORBA::tk_struct,
-    sizeof (_oc_CORBA_ServiceInformation),
-    (char *) &_oc_CORBA_ServiceInformation,
-    0,
-    sizeof (CORBA::ServiceInformation)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_ServiceInformation =
-    &_tc_TAO_tc_CORBA_ServiceInformation;
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:66
-
-void 
-CORBA::ServiceInformation::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  ServiceInformation *_tao_tmp_pointer =
-    ACE_static_cast (ServiceInformation *, _tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_cs.cpp:65
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEOPTION__CS_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEOPTION__CS_
+#if !defined (_CORBA_SERVICEOPTIONSEQ_CS_)
+#define _CORBA_SERVICEOPTIONSEQ_CS_
 
-CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_::_tao_seq_CORBA_ServiceOption_ (void)
+CORBA::ServiceOptionSeq::ServiceOptionSeq (void)
 {}
 
-CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_::_tao_seq_CORBA_ServiceOption_ (
+CORBA::ServiceOptionSeq::ServiceOptionSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
@@ -466,7 +81,7 @@ CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_::_tao_seq_CORBA_Service
     (max)
 {}
 
-CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_::_tao_seq_CORBA_ServiceOption_ (
+CORBA::ServiceOptionSeq::ServiceOptionSeq (
     CORBA::ULong max,
     CORBA::ULong length,
     CORBA::ULong * buffer,
@@ -478,8 +93,8 @@ CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_::_tao_seq_CORBA_Service
     (max, length, buffer, release)
 {}
 
-CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_::_tao_seq_CORBA_ServiceOption_ (
-    const _tao_seq_CORBA_ServiceOption_ &seq
+CORBA::ServiceOptionSeq::ServiceOptionSeq (
+    const ServiceOptionSeq &seq
   )
   : TAO_Unbounded_Sequence<
         CORBA::ServiceOption
@@ -487,30 +102,30 @@ CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_::_tao_seq_CORBA_Service
     (seq)
 {}
 
-CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_::~_tao_seq_CORBA_ServiceOption_ (void)
+CORBA::ServiceOptionSeq::~ServiceOptionSeq (void)
 {}
 
-void CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_::_tao_any_destructor (
+void CORBA::ServiceOptionSeq::_tao_any_destructor (
     void * _tao_void_pointer
   )
 {
-  _tao_seq_CORBA_ServiceOption_ * _tao_tmp_pointer =
-    ACE_static_cast (_tao_seq_CORBA_ServiceOption_ *, _tao_void_pointer);
+  ServiceOptionSeq * _tao_tmp_pointer =
+    ACE_static_cast (ServiceOptionSeq *, _tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_cs.cpp:65
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEDETAIL__CS_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEDETAIL__CS_
+#if !defined (_CORBA_SERVICEDETAILSEQ_CS_)
+#define _CORBA_SERVICEDETAILSEQ_CS_
 
-CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_::_tao_seq_CORBA_ServiceDetail_ (void)
+CORBA::ServiceDetailSeq::ServiceDetailSeq (void)
 {}
 
-CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_::_tao_seq_CORBA_ServiceDetail_ (
+CORBA::ServiceDetailSeq::ServiceDetailSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
@@ -519,7 +134,7 @@ CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_::_tao_seq_CORBA_Service
     (max)
 {}
 
-CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_::_tao_seq_CORBA_ServiceDetail_ (
+CORBA::ServiceDetailSeq::ServiceDetailSeq (
     CORBA::ULong max,
     CORBA::ULong length,
     CORBA::ServiceDetail * buffer,
@@ -531,8 +146,8 @@ CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_::_tao_seq_CORBA_Service
     (max, length, buffer, release)
 {}
 
-CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_::_tao_seq_CORBA_ServiceDetail_ (
-    const _tao_seq_CORBA_ServiceDetail_ &seq
+CORBA::ServiceDetailSeq::ServiceDetailSeq (
+    const ServiceDetailSeq &seq
   )
   : TAO_Unbounded_Sequence<
         CORBA::ServiceDetail
@@ -540,29 +155,65 @@ CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_::_tao_seq_CORBA_Service
     (seq)
 {}
 
-CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_::~_tao_seq_CORBA_ServiceDetail_ (void)
+CORBA::ServiceDetailSeq::~ServiceDetailSeq (void)
 {}
 
-void CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_::_tao_any_destructor (
+void CORBA::ServiceDetailSeq::_tao_any_destructor (
     void * _tao_void_pointer
   )
 {
-  _tao_seq_CORBA_ServiceDetail_ * _tao_tmp_pointer =
-    ACE_static_cast (_tao_seq_CORBA_ServiceDetail_ *, _tao_void_pointer);
+  ServiceDetailSeq * _tao_tmp_pointer =
+    ACE_static_cast (ServiceDetailSeq *, _tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/structure_cs.cpp:66
+
+void 
+CORBA::ServiceInformation::_tao_any_destructor (
+    void *_tao_void_pointer
+  )
+{
+  ServiceInformation *_tao_tmp_pointer =
+    ACE_static_cast (ServiceInformation *, _tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:95
+// be\be_visitor_structure/cdr_op_cs.cpp:61
 
-#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__CPP_
-#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__CPP_
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ServiceDetail &_tao_aggregate
+  )
+{
+  return
+    (strm << _tao_aggregate.service_detail_type) &&
+    (strm << _tao_aggregate.service_detail);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ServiceDetail &_tao_aggregate
+  )
+{
+  return
+    (strm >> _tao_aggregate.service_detail_type) &&
+    (strm >> _tao_aggregate.service_detail);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
+
+#if !defined _TAO_CDR_OP_CORBA_ServiceOptionSeq_CPP_
+#define _TAO_CDR_OP_CORBA_ServiceOptionSeq_CPP_
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_ &_tao_sequence
+    const CORBA::ServiceOptionSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
@@ -578,7 +229,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_ &_tao_sequence
+    CORBA::ServiceOptionSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -610,17 +261,17 @@ CORBA::Boolean operator>> (
   return 0;
 }
 
-#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__CPP_ */
+#endif /* _TAO_CDR_OP_CORBA_ServiceOptionSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:95
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
-#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__CPP_
-#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__CPP_
+#if !defined _TAO_CDR_OP_CORBA_ServiceDetailSeq_CPP_
+#define _TAO_CDR_OP_CORBA_ServiceDetailSeq_CPP_
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_ &_tao_sequence
+    const CORBA::ServiceDetailSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
@@ -643,7 +294,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_ &_tao_sequence
+    CORBA::ServiceDetailSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -682,10 +333,33 @@ CORBA::Boolean operator>> (
   return 0;
 }
 
-#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__CPP_ */
+#endif /* _TAO_CDR_OP_CORBA_ServiceDetailSeq_CPP_ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/cdr_op_cs.cpp:61
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA::ServiceInformation &_tao_aggregate
+  )
+{
+  return
+    (strm << _tao_aggregate.service_options) &&
+    (strm << _tao_aggregate.service_details);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::ServiceInformation &_tao_aggregate
+  )
+{
+  return
+    (strm >> _tao_aggregate.service_options) &&
+    (strm >> _tao_aggregate.service_details);
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1725
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -706,6 +380,54 @@ CORBA::Boolean operator>> (
       >;
 
   template class
+    TAO_FixedSeq_Var_T<
+        CORBA::ServiceOptionSeq,
+        CORBA::ServiceOption
+      >;
+
+  template class
+    TAO_Seq_Var_Base_T<
+        CORBA::ServiceOptionSeq,
+        CORBA::ServiceOption
+      >;
+
+  template class
+    TAO_Seq_Out_T<
+        CORBA::ServiceOptionSeq,
+        CORBA::ServiceOptionSeq_var,
+        CORBA::ServiceOption
+      >;
+
+  template class
+    TAO_VarSeq_Var_T<
+        CORBA::ServiceDetailSeq,
+        CORBA::ServiceDetail
+      >;
+
+  template class
+    TAO_Seq_Var_Base_T<
+        CORBA::ServiceDetailSeq,
+        CORBA::ServiceDetail
+      >;
+
+  template class
+    TAO_Seq_Out_T<
+        CORBA::ServiceDetailSeq,
+        CORBA::ServiceDetailSeq_var,
+        CORBA::ServiceDetail
+      >;
+
+#if !defined (_CORBA_SERVICEDETAIL__EXPLICIT_CS_)
+#define _CORBA_SERVICEDETAIL__EXPLICIT_CS_
+
+  template class
+    TAO_Unbounded_Sequence<
+        CORBA::ServiceDetail
+      >;
+
+#endif /* end #if !defined */
+
+  template class
     TAO_Var_Var_T<
         CORBA::ServiceInformation
       >;
@@ -740,6 +462,54 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
+    TAO_FixedSeq_Var_T< \
+        CORBA::ServiceOptionSeq, \
+        CORBA::ServiceOption \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Var_Base_T< \
+        CORBA::ServiceOptionSeq, \
+        CORBA::ServiceOption \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Out_T< \
+        CORBA::ServiceOptionSeq, \
+        CORBA::ServiceOptionSeq_var, \
+        CORBA::ServiceOption \
+      >
+
+# pragma instantiate \
+    TAO_VarSeq_Var_T< \
+        CORBA::ServiceDetailSeq, \
+        CORBA::ServiceDetail \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Var_Base_T< \
+        CORBA::ServiceDetailSeq, \
+        CORBA::ServiceDetail \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Out_T< \
+        CORBA::ServiceDetailSeq, \
+        CORBA::ServiceDetailSeq_var, \
+        CORBA::ServiceDetail \
+      >
+
+#if !defined (_CORBA_SERVICEDETAIL__EXPLICIT_CS_)
+#define _CORBA_SERVICEDETAIL__EXPLICIT_CS_
+
+# pragma instantiate \
+    TAO_Unbounded_Sequence< \
+        CORBA::ServiceDetail \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
     TAO_Var_Var_T< \
         CORBA::ServiceInformation \
       >
diff --git a/TAO/tao/ServicesC.h b/TAO/tao/ServicesC.h
index 70afc377885..4a5d08499e3 100644
--- a/TAO/tao/ServicesC.h
+++ b/TAO/tao/ServicesC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:186
+// be\be_codegen.cpp:171
 
 #ifndef _TAO_IDL_ORIG_SERVICESC_H_
 #define _TAO_IDL_ORIG_SERVICESC_H_
@@ -39,6 +39,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
+#include "tao/Environment.h"
+#include "tao/Sequence_T.h"
+#include "tao/Seq_Var_T.h"
+#include "tao/Seq_Out_T.h"
+#include "tao/VarOut_T.h"
+
 #include "OctetSeqC.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -65,200 +72,232 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:342
-
+  // be\be_visitor_typedef/typedef_ch.cpp:342
+  
   typedef CORBA::UShort ServiceType;
   typedef CORBA::UShort_out ServiceType_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceType;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:342
-
+  // be\be_visitor_typedef/typedef_ch.cpp:342
+  
   typedef CORBA::ULong ServiceOption;
   typedef CORBA::ULong_out ServiceOption_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceOption;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:342
-
+  // be\be_visitor_typedef/typedef_ch.cpp:342
+  
   typedef CORBA::ULong ServiceDetailType;
   typedef CORBA::ULong_out ServiceDetailType_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceDetailType;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
   const CORBA::ServiceType Security = 1U;
-
+  
   // TAO_IDL - Generated from
-  // be/be_type.cpp:258
-
+  // be\be_type.cpp:258
+  
   struct ServiceDetail;
-
+  
   typedef
     TAO_Var_Var_T<
         ServiceDetail
       >
     ServiceDetail_var;
-
+  
   typedef
     TAO_Out_T<
         ServiceDetail,
         ServiceDetail_var
       >
     ServiceDetail_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
-
+  // be\be_visitor_structure/structure_ch.cpp:52
+  
   struct TAO_Export ServiceDetail
   {
     typedef ServiceDetail_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     CORBA::ServiceDetailType service_detail_type;
     CORBA::OctetSeq service_detail;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceDetail;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_sequence/sequence_ch.cpp:101
+
+#if !defined (_CORBA_SERVICEOPTIONSEQ_CH_)
+#define _CORBA_SERVICEOPTIONSEQ_CH_
+  
+  class ServiceOptionSeq;
+  
+  typedef
+    TAO_FixedSeq_Var_T<
+        ServiceOptionSeq,
+        ServiceOption
+      >
+    ServiceOptionSeq_var;
+  
+  typedef
+    TAO_Seq_Out_T<
+        ServiceOptionSeq,
+        ServiceOptionSeq_var,
+        ServiceOption
+      >
+    ServiceOptionSeq_out;
+  
+  class TAO_Export ServiceOptionSeq
+    : public
+        TAO_Unbounded_Sequence<
+            ServiceOption
+          >
+  {
+  public:
+    ServiceOptionSeq (void);
+    ServiceOptionSeq (CORBA::ULong max);
+    ServiceOptionSeq (
+        CORBA::ULong max,
+        CORBA::ULong length,
+        CORBA::ULong* buffer, 
+        CORBA::Boolean release = 0
+      );
+    ServiceOptionSeq (const ServiceOptionSeq &);
+    ~ServiceOptionSeq (void);
+    
+    static void _tao_any_destructor (void *);
+    
+    typedef ServiceOptionSeq_var _var_type;
+  };
 
+#endif /* end #if !defined */
+  
   // TAO_IDL - Generated from
-  // be/be_type.cpp:258
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceOptionSeq;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
-  struct ServiceInformation;
+#if !defined (_CORBA_SERVICEDETAILSEQ_CH_)
+#define _CORBA_SERVICEDETAILSEQ_CH_
+  
+  class ServiceDetailSeq;
+  
+  typedef
+    TAO_VarSeq_Var_T<
+        ServiceDetailSeq,
+        ServiceDetail
+      >
+    ServiceDetailSeq_var;
+  
+  typedef
+    TAO_Seq_Out_T<
+        ServiceDetailSeq,
+        ServiceDetailSeq_var,
+        ServiceDetail
+      >
+    ServiceDetailSeq_out;
+  
+  class TAO_Export ServiceDetailSeq
+    : public
+        TAO_Unbounded_Sequence<
+            ServiceDetail
+          >
+  {
+  public:
+    ServiceDetailSeq (void);
+    ServiceDetailSeq (CORBA::ULong max);
+    ServiceDetailSeq (
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ServiceDetail* buffer, 
+        CORBA::Boolean release = 0
+      );
+    ServiceDetailSeq (const ServiceDetailSeq &);
+    ~ServiceDetailSeq (void);
+    
+    static void _tao_any_destructor (void *);
+    
+    typedef ServiceDetailSeq_var _var_type;
+  };
 
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceDetailSeq;
+  
+  // TAO_IDL - Generated from
+  // be\be_type.cpp:258
+  
+  struct ServiceInformation;
+  
   typedef
     TAO_Var_Var_T<
         ServiceInformation
       >
     ServiceInformation_var;
-
+  
   typedef
     TAO_Out_T<
         ServiceInformation,
         ServiceInformation_var
       >
     ServiceInformation_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
-
+  // be\be_visitor_structure/structure_ch.cpp:52
+  
   struct TAO_Export ServiceInformation
   {
     typedef ServiceInformation_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
-
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEOPTION__CH_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEOPTION__CH_
-
-    class TAO_Export _tao_seq_CORBA_ServiceOption_
-      : public
-          TAO_Unbounded_Sequence<
-              ACE_NESTED_CLASS (CORBA, ServiceOption)
-            >
-    {
-    public:
-      _tao_seq_CORBA_ServiceOption_ (void);
-      _tao_seq_CORBA_ServiceOption_ (CORBA::ULong max);
-      _tao_seq_CORBA_ServiceOption_ (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          CORBA::ULong* buffer,
-          CORBA::Boolean release = 0
-        );
-      _tao_seq_CORBA_ServiceOption_ (const _tao_seq_CORBA_ServiceOption_ &);
-      ~_tao_seq_CORBA_ServiceOption_ (void);
-
-      static void _tao_any_destructor (void *);
-
-
-    };
-
-#endif /* end #if !defined */
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_field/field_ch.cpp:453
-
-    typedef _tao_seq_CORBA_ServiceOption_ _service_options_seq;
-    _tao_seq_CORBA_ServiceOption_ service_options;
-
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEDETAIL__CH_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_CORBA_SERVICEDETAIL__CH_
-
-    class TAO_Export _tao_seq_CORBA_ServiceDetail_
-      : public
-          TAO_Unbounded_Sequence<
-              ACE_NESTED_CLASS (CORBA, ServiceDetail)
-            >
-    {
-    public:
-      _tao_seq_CORBA_ServiceDetail_ (void);
-      _tao_seq_CORBA_ServiceDetail_ (CORBA::ULong max);
-      _tao_seq_CORBA_ServiceDetail_ (
-          CORBA::ULong max,
-          CORBA::ULong length,
-          ACE_NESTED_CLASS (CORBA, ServiceDetail)* buffer,
-          CORBA::Boolean release = 0
-        );
-      _tao_seq_CORBA_ServiceDetail_ (const _tao_seq_CORBA_ServiceDetail_ &);
-      ~_tao_seq_CORBA_ServiceDetail_ (void);
-
-      static void _tao_any_destructor (void *);
-
-
-    };
-
-#endif /* end #if !defined */
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_field/field_ch.cpp:453
-
-    typedef _tao_seq_CORBA_ServiceDetail_ _service_details_seq;
-    _tao_seq_CORBA_ServiceDetail_ service_details;
+    CORBA::ServiceOptionSeq service_options;
+    CORBA::ServiceDetailSeq service_details;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceInformation;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module CORBA
 
 // TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:50
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -266,63 +305,85 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
+// be\be_visitor_structure/any_op_ch.cpp:52
 
-#ifndef __ACE_INLINE__
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceDetail &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceDetail*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceDetail *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceDetail *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:53
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ServiceDetail &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceDetail &);
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceOptionSeq &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceOptionSeq*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceOptionSeq *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceOptionSeq *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:53
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ServiceInformation &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceInformation &);
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceDetailSeq &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceDetailSeq*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceDetailSeq *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceDetailSeq *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceInformation &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceInformation*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceInformation *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceInformation *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:70
+// be\be_visitor_structure/cdr_op_ch.cpp:54
 
-#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__H_
-#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__H_
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ServiceDetail &);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceDetail &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
+
+#if !defined _TAO_CDR_OP_CORBA_ServiceOptionSeq_H_
+#define _TAO_CDR_OP_CORBA_ServiceOptionSeq_H_
 
 TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_ &
+    const CORBA::ServiceOptionSeq &
   );
 TAO_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_ &
+    CORBA::ServiceOptionSeq &
   );
 
-#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__H_ */
+#endif /* _TAO_CDR_OP_CORBA_ServiceOptionSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:70
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
-#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__H_
-#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__H_
+#if !defined _TAO_CDR_OP_CORBA_ServiceDetailSeq_H_
+#define _TAO_CDR_OP_CORBA_ServiceDetailSeq_H_
 
 TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_ &
+    const CORBA::ServiceDetailSeq &
   );
 TAO_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_ &
+    CORBA::ServiceDetailSeq &
   );
 
-#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__H_ */
+#endif /* _TAO_CDR_OP_CORBA_ServiceDetailSeq_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
+// be\be_visitor_structure/cdr_op_ch.cpp:54
 
-#endif /* __ACE_INLINE__ */
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ServiceInformation &);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceInformation &);
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:1050
+// be\be_codegen.cpp:978
 
 #if defined (__ACE_INLINE__)
 #include "ServicesC.i"
diff --git a/TAO/tao/ServicesC.i b/TAO/tao/ServicesC.i
index cdb10411ff4..38aa32569ba 100644
--- a/TAO/tao/ServicesC.i
+++ b/TAO/tao/ServicesC.i
@@ -26,89 +26,3 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:70
-
-ACE_INLINE
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ServiceDetail &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.service_detail_type) &&
-    (strm << _tao_aggregate.service_detail);
-}
-
-ACE_INLINE
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ServiceDetail &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.service_detail_type) &&
-    (strm >> _tao_aggregate.service_detail);
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:81
-
-#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__I_
-#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__I_
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_ &
-  );
-
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    CORBA::ServiceInformation::_tao_seq_CORBA_ServiceOption_ &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceOption__I_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:81
-
-#if !defined _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__I_
-#define _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__I_
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_ &
-  );
-
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    CORBA::ServiceInformation::_tao_seq_CORBA_ServiceDetail_ &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ServiceInformation__tao_seq_CORBA_ServiceDetail__I_ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:70
-
-ACE_INLINE
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ServiceInformation &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.service_options) &&
-    (strm << _tao_aggregate.service_details);
-}
-
-ACE_INLINE
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ServiceInformation &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.service_options) &&
-    (strm >> _tao_aggregate.service_details);
-}
-
diff --git a/TAO/tao/ServicesS.cpp b/TAO/tao/ServicesS.cpp
index b8a1c41a041..3dc704cad8c 100644
--- a/TAO/tao/ServicesS.cpp
+++ b/TAO/tao/ServicesS.cpp
@@ -26,8 +26,8 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:610
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:631
 
 #ifndef _TAO_IDL_ORIG_SERVICESS_CPP_
 #define _TAO_IDL_ORIG_SERVICESS_CPP_
@@ -47,12 +47,13 @@
 #include "tao/PortableInterceptor.h"
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
-#include "tao/PICurrent.h"
+#include "tao/PortableServer/PICurrent_Guard.h"
 #include "tao/PortableServer/ServerRequestInfo.h"
 #include "tao/PortableServer/ServerInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include "ace/Dynamic_Service.h"
+#include "ace/Malloc_Allocator.h"
 #include "ace/config-all.h"
 
 #if defined (__BORLANDC__)
@@ -63,23 +64,23 @@
 #include "ServicesS.i"
 #endif /* !defined INLINE */
 
-
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:60
+// be\be_visitor_arg_traits.cpp:64
 
 // Arg traits specializations.
 namespace TAO
 {
-};
+}
+
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1739
+// be\be_visitor_root/root.cpp:1680
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/ServicesS.h b/TAO/tao/ServicesS.h
index f29ed5764d7..920ebac9c08 100644
--- a/TAO/tao/ServicesS.h
+++ b/TAO/tao/ServicesS.h
@@ -26,12 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:390
+// be\be_codegen.cpp:411
 
 #ifndef _TAO_IDL_ORIG_SERVICESS_H_
 #define _TAO_IDL_ORIG_SERVICESS_H_
 
 #include /**/ "ace/pre.h"
+
 #include "OctetSeqS.h"
 #include "ServicesC.h"
 
@@ -55,19 +56,19 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
   
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:946
+// be\be_codegen.cpp:1014
 
 #include "ServicesS_T.h"
 
diff --git a/TAO/tao/ServicesS_T.cpp b/TAO/tao/ServicesS_T.cpp
index f2f13f18fa2..42772a3eb2c 100644
--- a/TAO/tao/ServicesS_T.cpp
+++ b/TAO/tao/ServicesS_T.cpp
@@ -25,8 +25,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:684
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:705
 
 #ifndef _TAO_IDL_ORIG_SERVICESS_T_CPP_
 #define _TAO_IDL_ORIG_SERVICESS_T_CPP_
@@ -39,3 +39,4 @@
 
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/ServicesS_T.h b/TAO/tao/ServicesS_T.h
index 0278b1765d3..d24670f6a4e 100644
--- a/TAO/tao/ServicesS_T.h
+++ b/TAO/tao/ServicesS_T.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:545
+// be\be_codegen.cpp:566
 
 #ifndef _TAO_IDL_ORIG_SERVICESS_T_H_
 #define _TAO_IDL_ORIG_SERVICESS_T_H_
@@ -42,7 +42,7 @@
 
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
+// be\be_visitor_root/root_sth.cpp:116
 
 #if defined (ACE_HAS_USING_KEYWORD)
 namespace POA_CORBA
@@ -51,7 +51,7 @@ namespace POA_CORBA
 #endif /* ACE_HAS_USING_KEYWORD */
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1043
+// be\be_codegen.cpp:1111
 
 #if defined (__ACE_INLINE__)
 #include "ServicesS_T.i"
diff --git a/TAO/tao/ShortSeqA.cpp b/TAO/tao/ShortSeqA.cpp
index 195b7ed9d92..92b62c6ba24 100644
--- a/TAO/tao/ShortSeqA.cpp
+++ b/TAO/tao/ShortSeqA.cpp
@@ -30,6 +30,48 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_ShortSeq[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  31,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5368),
+  ACE_NTOHL (0x6f727453),
+  ACE_NTOHL (0x65713a31),
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ShortSeq:1.0
+    9,
+  ACE_NTOHL (0x53686f72),
+  ACE_NTOHL (0x74536571),
+  ACE_NTOHL (0x0),  // name = ShortSeq
+    CORBA::tk_sequence, // typecode kind
+  12, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_short,
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ShortSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ShortSeq),
+    (char *) &_oc_CORBA_ShortSeq,
+    0,
+    sizeof (CORBA::ShortSeq)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ShortSeq =
+    &_tc_TAO_tc_CORBA_ShortSeq;
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
diff --git a/TAO/tao/ShortSeqC.cpp b/TAO/tao/ShortSeqC.cpp
index e5db86785b7..ad8535f8696 100644
--- a/TAO/tao/ShortSeqC.cpp
+++ b/TAO/tao/ShortSeqC.cpp
@@ -30,6 +30,7 @@
 
 
 #include "ShortSeqC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
@@ -103,48 +104,6 @@ void CORBA::ShortSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_ShortSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5368), 
-  ACE_NTOHL (0x6f727453), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ShortSeq:1.0
-    9,
-  ACE_NTOHL (0x53686f72), 
-  ACE_NTOHL (0x74536571), 
-  ACE_NTOHL (0x0),  // name = ShortSeq
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_short,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ShortSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ShortSeq),
-    (char *) &_oc_CORBA_ShortSeq,
-    0,
-    sizeof (CORBA::ShortSeq)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_ShortSeq =
-    &_tc_TAO_tc_CORBA_ShortSeq;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_CORBA_ShortSeq_CPP_
@@ -203,7 +162,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ShortSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/ShortSeqC.h b/TAO/tao/ShortSeqC.h
index f77e541fd83..ea3c5ee413f 100644
--- a/TAO/tao/ShortSeqC.h
+++ b/TAO/tao/ShortSeqC.h
@@ -40,7 +40,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
-#include "tao/CDR.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
diff --git a/TAO/tao/StringSeqA.cpp b/TAO/tao/StringSeqA.cpp
index 4b713ad6191..9c18619bc4a 100644
--- a/TAO/tao/StringSeqA.cpp
+++ b/TAO/tao/StringSeqA.cpp
@@ -30,6 +30,91 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_StringSeq[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  32,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5374),
+  ACE_NTOHL (0x72696e67),
+  ACE_NTOHL (0x5365713a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
+    10,
+  ACE_NTOHL (0x53747269),
+  ACE_NTOHL (0x6e675365),
+  ACE_NTOHL (0x71000000),  // name = StringSeq
+    CORBA::tk_sequence, // typecode kind
+  16, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_string,
+    0U, // string length
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_StringSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_StringSeq),
+    (char *) &_oc_CORBA_StringSeq,
+    0,
+    sizeof (CORBA::StringSeq)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_StringSeq =
+    &_tc_TAO_tc_CORBA_StringSeq;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_WStringSeq[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5753),
+  ACE_NTOHL (0x7472696e),
+  ACE_NTOHL (0x67536571),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/WStringSeq:1.0
+    11,
+  ACE_NTOHL (0x57537472),
+  ACE_NTOHL (0x696e6753),
+  ACE_NTOHL (0x65710000),  // name = WStringSeq
+    CORBA::tk_sequence, // typecode kind
+  16, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_wstring,
+    0U, // string length
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_WStringSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_WStringSeq),
+    (char *) &_oc_CORBA_WStringSeq,
+    0,
+    sizeof (CORBA::WStringSeq)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_WStringSeq =
+    &_tc_TAO_tc_CORBA_WStringSeq;
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp
index 4cdd3c0591f..b4666879270 100644
--- a/TAO/tao/StringSeqC.cpp
+++ b/TAO/tao/StringSeqC.cpp
@@ -30,6 +30,7 @@
 
 
 #include "StringSeqC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
@@ -96,48 +97,6 @@ void CORBA::StringSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_StringSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  32,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5374), 
-  ACE_NTOHL (0x72696e67), 
-  ACE_NTOHL (0x5365713a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
-    10,
-  ACE_NTOHL (0x53747269), 
-  ACE_NTOHL (0x6e675365), 
-  ACE_NTOHL (0x71000000),  // name = StringSeq
-    CORBA::tk_sequence, // typecode kind
-  16, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_string, 
-    0U, // string length
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_StringSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_StringSeq),
-    (char *) &_oc_CORBA_StringSeq,
-    0,
-    sizeof (CORBA::StringSeq)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_StringSeq =
-    &_tc_TAO_tc_CORBA_StringSeq;
-}
-
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -186,49 +145,6 @@ void CORBA::WStringSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_WStringSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5753), 
-  ACE_NTOHL (0x7472696e), 
-  ACE_NTOHL (0x67536571), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/WStringSeq:1.0
-    11,
-  ACE_NTOHL (0x57537472), 
-  ACE_NTOHL (0x696e6753), 
-  ACE_NTOHL (0x65710000),  // name = WStringSeq
-    CORBA::tk_sequence, // typecode kind
-  16, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_wstring, 
-    0U, // string length
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_WStringSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_WStringSeq),
-    (char *) &_oc_CORBA_WStringSeq,
-    0,
-    sizeof (CORBA::WStringSeq)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_WStringSeq =
-    &_tc_TAO_tc_CORBA_WStringSeq;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_CORBA_StringSeq_CPP_
@@ -375,7 +291,7 @@ return 0;
 #endif /* _TAO_CDR_OP_CORBA_WStringSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/StringSeqC.h b/TAO/tao/StringSeqC.h
index 94ea465ef56..cf5501a439c 100644
--- a/TAO/tao/StringSeqC.h
+++ b/TAO/tao/StringSeqC.h
@@ -33,14 +33,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Sequence.h"
+#include "tao/Environment.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
-#include "tao/CDR.h"
+#include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 
@@ -72,22 +72,22 @@
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_STRINGSEQ_CH_)
 #define _CORBA_STRINGSEQ_CH_
-
+  
   class StringSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         StringSeq,
         TAO_SeqElem_String_Manager
       >
     StringSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         StringSeq,
@@ -95,7 +95,7 @@ namespace CORBA
         TAO_SeqElem_String_Manager
       >
     StringSeq_out;
-
+  
   class TAO_Export StringSeq
     : public
         TAO_Unbounded_String_Sequence
@@ -106,39 +106,39 @@ namespace CORBA
     StringSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        char ** buffer,
+        char ** buffer, 
         CORBA::Boolean release = 0
       );
     StringSeq (const StringSeq &);
     ~StringSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef StringSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StringSeq;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_WSTRINGSEQ_CH_)
 #define _CORBA_WSTRINGSEQ_CH_
-
+  
   class WStringSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         WStringSeq,
         TAO_SeqElem_WString_Manager
       >
     WStringSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         WStringSeq,
@@ -146,7 +146,7 @@ namespace CORBA
         TAO_SeqElem_WString_Manager
       >
     WStringSeq_out;
-
+  
   class TAO_Export WStringSeq
     : public
         TAO_Unbounded_WString_Sequence
@@ -157,22 +157,22 @@ namespace CORBA
     WStringSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::WChar ** buffer,
+        CORBA::WChar ** buffer, 
         CORBA::Boolean release = 0
       );
     WStringSeq (const WStringSeq &);
     ~WStringSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef WStringSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_WStringSeq;
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/TAOA.cpp b/TAO/tao/TAOA.cpp
index dda09970564..425dec8231b 100644
--- a/TAO/tao/TAOA.cpp
+++ b/TAO/tao/TAOA.cpp
@@ -26,13 +26,197 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "TAOC.h"
-#include "TAOA.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
 
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_TAO_BufferingConstraintMode[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  40,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x74616f2f),
+  ACE_NTOHL (0x54414f2f),
+  ACE_NTOHL (0x42756666),
+  ACE_NTOHL (0x6572696e),
+  ACE_NTOHL (0x67436f6e),
+  ACE_NTOHL (0x73747261),
+  ACE_NTOHL (0x696e744d),
+  ACE_NTOHL (0x6f64653a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/BufferingConstraintMode:1.0
+    24,
+  ACE_NTOHL (0x42756666),
+  ACE_NTOHL (0x6572696e),
+  ACE_NTOHL (0x67436f6e),
+  ACE_NTOHL (0x73747261),
+  ACE_NTOHL (0x696e744d),
+  ACE_NTOHL (0x6f646500),  // name = BufferingConstraintMode
+    CORBA::tk_ushort,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraintMode (
+    CORBA::tk_alias,
+    sizeof (_oc_TAO_BufferingConstraintMode),
+    (char *) &_oc_TAO_BufferingConstraintMode,
+    0,
+    sizeof (TAO::BufferingConstraintMode)
+  );
+
+namespace TAO
+{
+  ::CORBA::TypeCode_ptr _tc_BufferingConstraintMode =
+    &_tc_TAO_tc_TAO_BufferingConstraintMode;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_TAO_BufferingConstraint[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  36,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x74616f2f),
+  ACE_NTOHL (0x54414f2f),
+  ACE_NTOHL (0x42756666),
+  ACE_NTOHL (0x6572696e),
+  ACE_NTOHL (0x67436f6e),
+  ACE_NTOHL (0x73747261),
+  ACE_NTOHL (0x696e743a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/BufferingConstraint:1.0
+    20,
+  ACE_NTOHL (0x42756666),
+  ACE_NTOHL (0x6572696e),
+  ACE_NTOHL (0x67436f6e),
+  ACE_NTOHL (0x73747261),
+  ACE_NTOHL (0x696e7400),  // name = BufferingConstraint
+  4, // member count
+    5,
+  ACE_NTOHL (0x6d6f6465),
+  ACE_NTOHL (0x0),  // name = mode
+    CORBA::tk_alias, // typecode kind for typedefs
+  80, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    40,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x74616f2f),
+    ACE_NTOHL (0x54414f2f),
+    ACE_NTOHL (0x42756666),
+    ACE_NTOHL (0x6572696e),
+    ACE_NTOHL (0x67436f6e),
+    ACE_NTOHL (0x73747261),
+    ACE_NTOHL (0x696e744d),
+    ACE_NTOHL (0x6f64653a),
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/BufferingConstraintMode:1.0
+        24,
+    ACE_NTOHL (0x42756666),
+    ACE_NTOHL (0x6572696e),
+    ACE_NTOHL (0x67436f6e),
+    ACE_NTOHL (0x73747261),
+    ACE_NTOHL (0x696e744d),
+    ACE_NTOHL (0x6f646500),  // name = BufferingConstraintMode
+        CORBA::tk_ushort,
+
+
+  8,
+  ACE_NTOHL (0x74696d65),
+  ACE_NTOHL (0x6f757400),  // name = timeout
+    CORBA::tk_alias, // typecode kind for typedefs
+  56, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    31,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x42617365),
+    ACE_NTOHL (0x2f54696d),
+    ACE_NTOHL (0x65543a31),
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
+        6,
+    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x54000000),  // name = TimeT
+        CORBA::tk_ulonglong,
+
+
+  14,
+  ACE_NTOHL (0x6d657373),
+  ACE_NTOHL (0x6167655f),
+  ACE_NTOHL (0x636f756e),
+  ACE_NTOHL (0x74000000),  // name = message_count
+    CORBA::tk_ulong,
+
+  14,
+  ACE_NTOHL (0x6d657373),
+  ACE_NTOHL (0x6167655f),
+  ACE_NTOHL (0x62797465),
+  ACE_NTOHL (0x73000000),  // name = message_bytes
+    CORBA::tk_ulong,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraint (
+    CORBA::tk_struct,
+    sizeof (_oc_TAO_BufferingConstraint),
+    (char *) &_oc_TAO_BufferingConstraint,
+    0,
+    sizeof (TAO::BufferingConstraint)
+  );
+
+namespace TAO
+{
+  ::CORBA::TypeCode_ptr _tc_BufferingConstraint =
+    &_tc_TAO_tc_TAO_BufferingConstraint;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_TAO_BufferingConstraintPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  42,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x74616f2f),
+  ACE_NTOHL (0x54414f2f),
+  ACE_NTOHL (0x42756666),
+  ACE_NTOHL (0x6572696e),
+  ACE_NTOHL (0x67436f6e),
+  ACE_NTOHL (0x73747261),
+  ACE_NTOHL (0x696e7450),
+  ACE_NTOHL (0x6f6c6963),
+  ACE_NTOHL (0x793a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:tao/TAO/BufferingConstraintPolicy:1.0
+    26,
+  ACE_NTOHL (0x42756666),
+  ACE_NTOHL (0x6572696e),
+  ACE_NTOHL (0x67436f6e),
+  ACE_NTOHL (0x73747261),
+  ACE_NTOHL (0x696e7450),
+  ACE_NTOHL (0x6f6c6963),
+  ACE_NTOHL (0x79000000),  // name = BufferingConstraintPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraintPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_TAO_BufferingConstraintPolicy),
+    (char *) &_oc_TAO_BufferingConstraintPolicy,
+    0,
+    sizeof (TAO::BufferingConstraintPolicy)
+  );
+
+namespace TAO
+{
+  ::CORBA::TypeCode_ptr _tc_BufferingConstraintPolicy =
+    &_tc_TAO_tc_TAO_BufferingConstraintPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -90,7 +274,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// be\be_visitor_interface/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
@@ -184,5 +368,5 @@ operator>>= (
         TAO::BufferingConstraintPolicy \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/TAO/tao/TAOA.h b/TAO/tao/TAOA.h
deleted file mode 100644
index 7eb3d0cc36a..00000000000
--- a/TAO/tao/TAOA.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:848
-
-#ifndef _TAO_IDL_ORIG_TAOA_ANYOP_H_
-#define _TAO_IDL_ORIG_TAOA_ANYOP_H_
-
-#include /**/ "ace/pre.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const TAO::BufferingConstraint &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraint*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraint *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::BufferingConstraint *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraintPolicy_ptr &);
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp
index 1c7e152b333..7dc1757e108 100644
--- a/TAO/tao/TAOC.cpp
+++ b/TAO/tao/TAOC.cpp
@@ -26,10 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:338
+// be\be_codegen.cpp:323
 
 
 #include "TAOC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 #include "ace/OS_NS_string.h"
 
@@ -42,7 +43,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:62
+// be\be_visitor_arg_traits.cpp:64
 
 // Arg traits specializations.
 namespace TAO
@@ -50,151 +51,8 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_TAO_BufferingConstraintMode[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x74616f2f), 
-  ACE_NTOHL (0x54414f2f), 
-  ACE_NTOHL (0x42756666), 
-  ACE_NTOHL (0x6572696e), 
-  ACE_NTOHL (0x67436f6e), 
-  ACE_NTOHL (0x73747261), 
-  ACE_NTOHL (0x696e744d), 
-  ACE_NTOHL (0x6f64653a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/BufferingConstraintMode:1.0
-    24,
-  ACE_NTOHL (0x42756666), 
-  ACE_NTOHL (0x6572696e), 
-  ACE_NTOHL (0x67436f6e), 
-  ACE_NTOHL (0x73747261), 
-  ACE_NTOHL (0x696e744d), 
-  ACE_NTOHL (0x6f646500),  // name = BufferingConstraintMode
-    CORBA::tk_ushort,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraintMode (
-    CORBA::tk_alias,
-    sizeof (_oc_TAO_BufferingConstraintMode),
-    (char *) &_oc_TAO_BufferingConstraintMode,
-    0,
-    sizeof (TAO::BufferingConstraintMode)
-  );
-
-namespace TAO
-{
-  ::CORBA::TypeCode_ptr _tc_BufferingConstraintMode =
-    &_tc_TAO_tc_TAO_BufferingConstraintMode;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_TAO_BufferingConstraint[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x74616f2f), 
-  ACE_NTOHL (0x54414f2f), 
-  ACE_NTOHL (0x42756666), 
-  ACE_NTOHL (0x6572696e), 
-  ACE_NTOHL (0x67436f6e), 
-  ACE_NTOHL (0x73747261), 
-  ACE_NTOHL (0x696e743a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/BufferingConstraint:1.0
-    20,
-  ACE_NTOHL (0x42756666), 
-  ACE_NTOHL (0x6572696e), 
-  ACE_NTOHL (0x67436f6e), 
-  ACE_NTOHL (0x73747261), 
-  ACE_NTOHL (0x696e7400),  // name = BufferingConstraint
-  4, // member count
-    5,
-  ACE_NTOHL (0x6d6f6465), 
-  ACE_NTOHL (0x0),  // name = mode
-    CORBA::tk_alias, // typecode kind for typedefs
-  80, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    40,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x74616f2f), 
-    ACE_NTOHL (0x54414f2f), 
-    ACE_NTOHL (0x42756666), 
-    ACE_NTOHL (0x6572696e), 
-    ACE_NTOHL (0x67436f6e), 
-    ACE_NTOHL (0x73747261), 
-    ACE_NTOHL (0x696e744d), 
-    ACE_NTOHL (0x6f64653a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:tao/TAO/BufferingConstraintMode:1.0
-        24,
-    ACE_NTOHL (0x42756666), 
-    ACE_NTOHL (0x6572696e), 
-    ACE_NTOHL (0x67436f6e), 
-    ACE_NTOHL (0x73747261), 
-    ACE_NTOHL (0x696e744d), 
-    ACE_NTOHL (0x6f646500),  // name = BufferingConstraintMode
-        CORBA::tk_ushort,
-
-
-  8,
-  ACE_NTOHL (0x74696d65), 
-  ACE_NTOHL (0x6f757400),  // name = timeout
-    CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f54696d), 
-    ACE_NTOHL (0x65543a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-        6,
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x54000000),  // name = TimeT
-        CORBA::tk_ulonglong,
-
-
-  14,
-  ACE_NTOHL (0x6d657373), 
-  ACE_NTOHL (0x6167655f), 
-  ACE_NTOHL (0x636f756e), 
-  ACE_NTOHL (0x74000000),  // name = message_count
-    CORBA::tk_ulong,
-
-  14,
-  ACE_NTOHL (0x6d657373), 
-  ACE_NTOHL (0x6167655f), 
-  ACE_NTOHL (0x62797465), 
-  ACE_NTOHL (0x73000000),  // name = message_bytes
-    CORBA::tk_ulong,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraint (
-    CORBA::tk_struct,
-    sizeof (_oc_TAO_BufferingConstraint),
-    (char *) &_oc_TAO_BufferingConstraint,
-    0,
-    sizeof (TAO::BufferingConstraint)
-  );
-
-namespace TAO
-{
-  ::CORBA::TypeCode_ptr _tc_BufferingConstraint =
-    &_tc_TAO_tc_TAO_BufferingConstraint;
-}
-
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:66
+// be\be_visitor_structure/structure_cs.cpp:66
 
 void 
 TAO::BufferingConstraint::_tao_any_destructor (
@@ -207,7 +65,7 @@ TAO::BufferingConstraint::_tao_any_destructor (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for TAO::BufferingConstraintPolicy.
 
@@ -356,49 +214,34 @@ TAO::BufferingConstraintPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_structure/cdr_op_cs.cpp:61
 
-static const CORBA::Long _oc_TAO_BufferingConstraintPolicy[] =
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const TAO::BufferingConstraint &_tao_aggregate
+  )
 {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  42,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x74616f2f), 
-  ACE_NTOHL (0x54414f2f), 
-  ACE_NTOHL (0x42756666), 
-  ACE_NTOHL (0x6572696e), 
-  ACE_NTOHL (0x67436f6e), 
-  ACE_NTOHL (0x73747261), 
-  ACE_NTOHL (0x696e7450), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x793a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:tao/TAO/BufferingConstraintPolicy:1.0
-    26,
-  ACE_NTOHL (0x42756666), 
-  ACE_NTOHL (0x6572696e), 
-  ACE_NTOHL (0x67436f6e), 
-  ACE_NTOHL (0x73747261), 
-  ACE_NTOHL (0x696e7450), 
-  ACE_NTOHL (0x6f6c6963), 
-  ACE_NTOHL (0x79000000),  // name = BufferingConstraintPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraintPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_TAO_BufferingConstraintPolicy),
-    (char *) &_oc_TAO_BufferingConstraintPolicy,
-    0,
-    sizeof (TAO::BufferingConstraintPolicy)
-  );
+  return
+    (strm << _tao_aggregate.mode) &&
+    (strm << _tao_aggregate.timeout) &&
+    (strm << _tao_aggregate.message_count) &&
+    (strm << _tao_aggregate.message_bytes);
+}
 
-namespace TAO
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    TAO::BufferingConstraint &_tao_aggregate
+  )
 {
-  ::CORBA::TypeCode_ptr _tc_BufferingConstraintPolicy =
-    &_tc_TAO_tc_TAO_BufferingConstraintPolicy;
+  return
+    (strm >> _tao_aggregate.mode) &&
+    (strm >> _tao_aggregate.timeout) &&
+    (strm >> _tao_aggregate.message_count) &&
+    (strm >> _tao_aggregate.message_bytes);
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1725
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h
index c62f8671241..392e48e7301 100644
--- a/TAO/tao/TAOC.h
+++ b/TAO/tao/TAOC.h
@@ -26,19 +26,25 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:186
+// be\be_codegen.cpp:171
 
 #ifndef _TAO_IDL_ORIG_TAOC_H_
 #define _TAO_IDL_ORIG_TAOC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "PolicyC.h"
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Environment.h"
+#include "tao/Object.h"
+#include "tao/Objref_VarOut_T.h"
+#include "tao/VarOut_T.h"
+
+#include "PolicyC.h"
 #include "TimeBaseC.h"
 #include "Messaging_SyncScopeC.h"
 
@@ -66,7 +72,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:63
 
 namespace TAO
 {
@@ -77,44 +83,44 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:342
   
   typedef CORBA::UShort BufferingConstraintMode;
   typedef CORBA::UShort_out BufferingConstraintMode_out;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraintMode;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
+  // be\be_visitor_constant/constant_ch.cpp:52
   
   const TAO::BufferingConstraintMode BUFFER_FLUSH = 0U;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
+  // be\be_visitor_constant/constant_ch.cpp:52
   
   const TAO::BufferingConstraintMode BUFFER_TIMEOUT = 1U;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
+  // be\be_visitor_constant/constant_ch.cpp:52
   
   const TAO::BufferingConstraintMode BUFFER_MESSAGE_COUNT = 2U;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
+  // be\be_visitor_constant/constant_ch.cpp:52
   
   const TAO::BufferingConstraintMode BUFFER_MESSAGE_BYTES = 4U;
   
   // TAO_IDL - Generated from
-  // be/be_type.cpp:258
+  // be\be_type.cpp:258
   
   struct BufferingConstraint;
   
@@ -129,7 +135,7 @@ namespace TAO
     BufferingConstraint_out;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_Export BufferingConstraint
   {
@@ -143,17 +149,17 @@ namespace TAO
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraint;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
+  // be\be_visitor_constant/constant_ch.cpp:52
   
   const CORBA::PolicyType BUFFERING_CONSTRAINT_POLICY_TYPE = 1413545985U;
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:611
+  // be\be_interface.cpp:611
 
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__VAR_OUT_CH_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY__VAR_OUT_CH_
@@ -176,7 +182,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY_CH_)
 #define _TAO_BUFFERINGCONSTRAINTPOLICY_CH_
@@ -209,7 +215,7 @@ namespace TAO
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::TAO::BufferingConstraint buffering_constraint (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -219,7 +225,27 @@ namespace TAO
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:196
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::Policy_ptr copy (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void destroy (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_interface/interface_ch.cpp:208
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -245,27 +271,27 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_BufferingConstraintPolicy;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
+  // be\be_visitor_constant/constant_ch.cpp:52
   
   const Messaging::SyncScope SYNC_EAGER_BUFFERING = 0;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
+  // be\be_visitor_constant/constant_ch.cpp:52
   
   const Messaging::SyncScope SYNC_DELAYED_BUFFERING = -2;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module TAO
 
 // TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -294,23 +320,28 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
+// be\be_visitor_structure/any_op_ch.cpp:52
 
-#ifndef __ACE_INLINE__
+TAO_Export void operator<<= (CORBA::Any &, const TAO::BufferingConstraint &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraint*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraint *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::BufferingConstraint *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:53
+// be\be_visitor_interface/any_op_ch.cpp:52
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::BufferingConstraint &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &);
+TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraintPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
+// be\be_visitor_structure/cdr_op_ch.cpp:54
 
-#endif /* __ACE_INLINE__ */
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::BufferingConstraint &);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &);
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:1050
+// be\be_codegen.cpp:978
 
 #if defined (__ACE_INLINE__)
 #include "TAOC.i"
diff --git a/TAO/tao/TAOC.i b/TAO/tao/TAOC.i
index 802772adae0..38aa32569ba 100644
--- a/TAO/tao/TAOC.i
+++ b/TAO/tao/TAOC.i
@@ -26,32 +26,3 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:70
-
-ACE_INLINE
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TAO::BufferingConstraint &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.mode) &&
-    (strm << _tao_aggregate.timeout) &&
-    (strm << _tao_aggregate.message_count) &&
-    (strm << _tao_aggregate.message_bytes);
-}
-
-ACE_INLINE
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    TAO::BufferingConstraint &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.mode) &&
-    (strm >> _tao_aggregate.timeout) &&
-    (strm >> _tao_aggregate.message_count) &&
-    (strm >> _tao_aggregate.message_bytes);
-}
-
diff --git a/TAO/tao/Tagged_Profile.cpp b/TAO/tao/Tagged_Profile.cpp
index 55313a086a3..cfe643f6066 100644
--- a/TAO/tao/Tagged_Profile.cpp
+++ b/TAO/tao/Tagged_Profile.cpp
@@ -1,19 +1,20 @@
 // $Id$
 
-#include "Tagged_Profile.h"
-#include "ORB_Core.h"
-#include "Acceptor_Registry.h"
-#include "Transport_Acceptor.h"
-#include "Thread_Lane_Resources.h"
-#include "debug.h"
-#include "target_specification.h"
+#include "tao/Tagged_Profile.h"
+#include "tao/ORB_Core.h"
+#include "tao/Acceptor_Registry.h"
+#include "tao/Transport_Acceptor.h"
+#include "tao/Thread_Lane_Resources.h"
+#include "tao/debug.h"
+#include "tao/target_specification.h"
+#include "tao/CDR.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Tagged_Profile.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (tao, 
-           Tagged_Profile, 
+ACE_RCSID (tao,
+           Tagged_Profile,
            "$Id$")
 
 CORBA::Boolean
@@ -179,7 +180,7 @@ TAO_Tagged_Profile::unmarshall_ref_addr_i (
     }
 
   // Unmarshall the sequnce of TaggedProfiles
-  IOP::IOR::_profiles_seq ior_profiles;
+  IOP::TaggedProfileSeq ior_profiles;
 
   hdr_status &= input >> ior_profiles;
 
diff --git a/TAO/tao/TimeBaseA.cpp b/TAO/tao/TimeBaseA.cpp
index e9215cfcaac..54a9df5c9a3 100644
--- a/TAO/tao/TimeBaseA.cpp
+++ b/TAO/tao/TimeBaseA.cpp
@@ -26,12 +26,305 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "TimeBaseC.h"
-#include "TimeBaseA.h"
 #include "tao/Typecode.h"
 #include "tao/Any_Dual_Impl_T.h"
 
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_TimeBase_TimeT[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  31,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x54696d65),
+  ACE_NTOHL (0x42617365),
+  ACE_NTOHL (0x2f54696d),
+  ACE_NTOHL (0x65543a31),
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
+    6,
+  ACE_NTOHL (0x54696d65),
+  ACE_NTOHL (0x54000000),  // name = TimeT
+    CORBA::tk_ulonglong,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_TimeBase_TimeT (
+    CORBA::tk_alias,
+    sizeof (_oc_TimeBase_TimeT),
+    (char *) &_oc_TimeBase_TimeT,
+    0,
+    sizeof (TimeBase::TimeT)
+  );
+
+namespace TimeBase
+{
+  ::CORBA::TypeCode_ptr _tc_TimeT =
+    &_tc_TAO_tc_TimeBase_TimeT;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_TimeBase_InaccuracyT[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  37,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x54696d65),
+  ACE_NTOHL (0x42617365),
+  ACE_NTOHL (0x2f496e61),
+  ACE_NTOHL (0x63637572),
+  ACE_NTOHL (0x61637954),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/TimeBase/InaccuracyT:1.0
+    12,
+  ACE_NTOHL (0x496e6163),
+  ACE_NTOHL (0x63757261),
+  ACE_NTOHL (0x63795400),  // name = InaccuracyT
+    CORBA::tk_alias, // typecode kind for typedefs
+  56, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    31,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x42617365),
+    ACE_NTOHL (0x2f54696d),
+    ACE_NTOHL (0x65543a31),
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
+        6,
+    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x54000000),  // name = TimeT
+        CORBA::tk_ulonglong,
+
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_TimeBase_InaccuracyT (
+    CORBA::tk_alias,
+    sizeof (_oc_TimeBase_InaccuracyT),
+    (char *) &_oc_TimeBase_InaccuracyT,
+    0,
+    sizeof (TimeBase::InaccuracyT)
+  );
+
+namespace TimeBase
+{
+  ::CORBA::TypeCode_ptr _tc_InaccuracyT =
+    &_tc_TAO_tc_TimeBase_InaccuracyT;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_TimeBase_TdfT[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  30,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x54696d65),
+  ACE_NTOHL (0x42617365),
+  ACE_NTOHL (0x2f546466),
+  ACE_NTOHL (0x543a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/TdfT:1.0
+    5,
+  ACE_NTOHL (0x54646654),
+  ACE_NTOHL (0x0),  // name = TdfT
+    CORBA::tk_short,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_TimeBase_TdfT (
+    CORBA::tk_alias,
+    sizeof (_oc_TimeBase_TdfT),
+    (char *) &_oc_TimeBase_TdfT,
+    0,
+    sizeof (TimeBase::TdfT)
+  );
+
+namespace TimeBase
+{
+  ::CORBA::TypeCode_ptr _tc_TdfT =
+    &_tc_TAO_tc_TimeBase_TdfT;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_TimeBase_UtcT[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  30,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x54696d65),
+  ACE_NTOHL (0x42617365),
+  ACE_NTOHL (0x2f557463),
+  ACE_NTOHL (0x543a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/UtcT:1.0
+    5,
+  ACE_NTOHL (0x55746354),
+  ACE_NTOHL (0x0),  // name = UtcT
+  4, // member count
+    5,
+  ACE_NTOHL (0x74696d65),
+  ACE_NTOHL (0x0),  // name = time
+    CORBA::tk_alias, // typecode kind for typedefs
+  56, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    31,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x42617365),
+    ACE_NTOHL (0x2f54696d),
+    ACE_NTOHL (0x65543a31),
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
+        6,
+    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x54000000),  // name = TimeT
+        CORBA::tk_ulonglong,
+
+
+  8,
+  ACE_NTOHL (0x696e6163),
+  ACE_NTOHL (0x636c6f00),  // name = inacclo
+    CORBA::tk_ulong,
+
+  8,
+  ACE_NTOHL (0x696e6163),
+  ACE_NTOHL (0x63686900),  // name = inacchi
+    CORBA::tk_ushort,
+
+  4,
+  ACE_NTOHL (0x74646600),  // name = tdf
+    CORBA::tk_alias, // typecode kind for typedefs
+  56, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    30,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x42617365),
+    ACE_NTOHL (0x2f546466),
+    ACE_NTOHL (0x543a312e),
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/TdfT:1.0
+        5,
+    ACE_NTOHL (0x54646654),
+    ACE_NTOHL (0x0),  // name = TdfT
+        CORBA::tk_short,
+
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_TimeBase_UtcT (
+    CORBA::tk_struct,
+    sizeof (_oc_TimeBase_UtcT),
+    (char *) &_oc_TimeBase_UtcT,
+    0,
+    sizeof (TimeBase::UtcT)
+  );
+
+namespace TimeBase
+{
+  ::CORBA::TypeCode_ptr _tc_UtcT =
+    &_tc_TAO_tc_TimeBase_UtcT;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_TimeBase_IntervalT[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  35,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x54696d65),
+  ACE_NTOHL (0x42617365),
+  ACE_NTOHL (0x2f496e74),
+  ACE_NTOHL (0x65727661),
+  ACE_NTOHL (0x6c543a31),
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/IntervalT:1.0
+    10,
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x7276616c),
+  ACE_NTOHL (0x54000000),  // name = IntervalT
+  2, // member count
+    12,
+  ACE_NTOHL (0x6c6f7765),
+  ACE_NTOHL (0x725f626f),
+  ACE_NTOHL (0x756e6400),  // name = lower_bound
+    CORBA::tk_alias, // typecode kind for typedefs
+  56, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    31,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x42617365),
+    ACE_NTOHL (0x2f54696d),
+    ACE_NTOHL (0x65543a31),
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
+        6,
+    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x54000000),  // name = TimeT
+        CORBA::tk_ulonglong,
+
+
+  12,
+  ACE_NTOHL (0x75707065),
+  ACE_NTOHL (0x725f626f),
+  ACE_NTOHL (0x756e6400),  // name = upper_bound
+    CORBA::tk_alias, // typecode kind for typedefs
+  56, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    31,
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x42617365),
+    ACE_NTOHL (0x2f54696d),
+    ACE_NTOHL (0x65543a31),
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
+        6,
+    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x54000000),  // name = TimeT
+        CORBA::tk_ulonglong,
+
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_TimeBase_IntervalT (
+    CORBA::tk_struct,
+    sizeof (_oc_TimeBase_IntervalT),
+    (char *) &_oc_TimeBase_IntervalT,
+    0,
+    sizeof (TimeBase::IntervalT)
+  );
+
+namespace TimeBase
+{
+  ::CORBA::TypeCode_ptr _tc_IntervalT =
+    &_tc_TAO_tc_TimeBase_IntervalT;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -88,8 +381,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -172,5 +465,5 @@ CORBA::Boolean operator>>= (
         TimeBase::IntervalT \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/TAO/tao/TimeBaseA.h b/TAO/tao/TimeBaseA.h
deleted file mode 100644
index 218c1b7ee53..00000000000
--- a/TAO/tao/TimeBaseA.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:848
-
-#ifndef _TAO_IDL_ORIG_TIMEBASEA_ANYOP_H_
-#define _TAO_IDL_ORIG_TIMEBASEA_ANYOP_H_
-
-#include /**/ "ace/pre.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const TimeBase::UtcT &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, TimeBase::UtcT*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TimeBase::UtcT *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TimeBase::UtcT *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const TimeBase::IntervalT &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, TimeBase::IntervalT*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TimeBase::IntervalT *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TimeBase::IntervalT *&);
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp
index 125e0513d33..e964e8a07bd 100644
--- a/TAO/tao/TimeBaseC.cpp
+++ b/TAO/tao/TimeBaseC.cpp
@@ -26,10 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:338
+// be\be_codegen.cpp:323
 
 
 #include "TimeBaseC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
@@ -41,7 +42,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:62
+// be\be_visitor_arg_traits.cpp:64
 
 // Arg traits specializations.
 namespace TAO
@@ -49,328 +50,84 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_TimeBase_TimeT[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x42617365), 
-  ACE_NTOHL (0x2f54696d), 
-  ACE_NTOHL (0x65543a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-    6,
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x54000000),  // name = TimeT
-    CORBA::tk_ulonglong,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_TimeBase_TimeT (
-    CORBA::tk_alias,
-    sizeof (_oc_TimeBase_TimeT),
-    (char *) &_oc_TimeBase_TimeT,
-    0,
-    sizeof (TimeBase::TimeT)
-  );
-
-namespace TimeBase
-{
-  ::CORBA::TypeCode_ptr _tc_TimeT =
-    &_tc_TAO_tc_TimeBase_TimeT;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/structure_cs.cpp:66
 
-static const CORBA::Long _oc_TimeBase_InaccuracyT[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x42617365), 
-  ACE_NTOHL (0x2f496e61), 
-  ACE_NTOHL (0x63637572), 
-  ACE_NTOHL (0x61637954), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/TimeBase/InaccuracyT:1.0
-    12,
-  ACE_NTOHL (0x496e6163), 
-  ACE_NTOHL (0x63757261), 
-  ACE_NTOHL (0x63795400),  // name = InaccuracyT
-    CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f54696d), 
-    ACE_NTOHL (0x65543a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-        6,
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x54000000),  // name = TimeT
-        CORBA::tk_ulonglong,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_TimeBase_InaccuracyT (
-    CORBA::tk_alias,
-    sizeof (_oc_TimeBase_InaccuracyT),
-    (char *) &_oc_TimeBase_InaccuracyT,
-    0,
-    sizeof (TimeBase::InaccuracyT)
-  );
-
-namespace TimeBase
+void 
+TimeBase::UtcT::_tao_any_destructor (
+    void *_tao_void_pointer
+  )
 {
-  ::CORBA::TypeCode_ptr _tc_InaccuracyT =
-    &_tc_TAO_tc_TimeBase_InaccuracyT;
+  UtcT *_tao_tmp_pointer =
+    ACE_static_cast (UtcT *, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/structure_cs.cpp:66
 
-static const CORBA::Long _oc_TimeBase_TdfT[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x42617365), 
-  ACE_NTOHL (0x2f546466), 
-  ACE_NTOHL (0x543a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/TdfT:1.0
-    5,
-  ACE_NTOHL (0x54646654), 
-  ACE_NTOHL (0x0),  // name = TdfT
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_TimeBase_TdfT (
-    CORBA::tk_alias,
-    sizeof (_oc_TimeBase_TdfT),
-    (char *) &_oc_TimeBase_TdfT,
-    0,
-    sizeof (TimeBase::TdfT)
-  );
-
-namespace TimeBase
+void 
+TimeBase::IntervalT::_tao_any_destructor (
+    void *_tao_void_pointer
+  )
 {
-  ::CORBA::TypeCode_ptr _tc_TdfT =
-    &_tc_TAO_tc_TimeBase_TdfT;
+  IntervalT *_tao_tmp_pointer =
+    ACE_static_cast (IntervalT *, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_structure/cdr_op_cs.cpp:61
 
-static const CORBA::Long _oc_TimeBase_UtcT[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x42617365), 
-  ACE_NTOHL (0x2f557463), 
-  ACE_NTOHL (0x543a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/UtcT:1.0
-    5,
-  ACE_NTOHL (0x55746354), 
-  ACE_NTOHL (0x0),  // name = UtcT
-  4, // member count
-    5,
-  ACE_NTOHL (0x74696d65), 
-  ACE_NTOHL (0x0),  // name = time
-    CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f54696d), 
-    ACE_NTOHL (0x65543a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-        6,
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x54000000),  // name = TimeT
-        CORBA::tk_ulonglong,
-
-
-  8,
-  ACE_NTOHL (0x696e6163), 
-  ACE_NTOHL (0x636c6f00),  // name = inacclo
-    CORBA::tk_ulong,
-
-  8,
-  ACE_NTOHL (0x696e6163), 
-  ACE_NTOHL (0x63686900),  // name = inacchi
-    CORBA::tk_ushort,
-
-  4,
-  ACE_NTOHL (0x74646600),  // name = tdf
-    CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f546466), 
-    ACE_NTOHL (0x543a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/TdfT:1.0
-        5,
-    ACE_NTOHL (0x54646654), 
-    ACE_NTOHL (0x0),  // name = TdfT
-        CORBA::tk_short,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_TimeBase_UtcT (
-    CORBA::tk_struct,
-    sizeof (_oc_TimeBase_UtcT),
-    (char *) &_oc_TimeBase_UtcT,
-    0,
-    sizeof (TimeBase::UtcT)
-  );
-
-namespace TimeBase
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const TimeBase::UtcT &_tao_aggregate
+  )
 {
-  ::CORBA::TypeCode_ptr _tc_UtcT =
-    &_tc_TAO_tc_TimeBase_UtcT;
+  return
+    (strm << _tao_aggregate.time) &&
+    (strm << _tao_aggregate.inacclo) &&
+    (strm << _tao_aggregate.inacchi) &&
+    (strm << _tao_aggregate.tdf);
 }
 
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:66
-
-void 
-TimeBase::UtcT::_tao_any_destructor (
-    void *_tao_void_pointer
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    TimeBase::UtcT &_tao_aggregate
   )
 {
-  UtcT *_tao_tmp_pointer =
-    ACE_static_cast (UtcT *, _tao_void_pointer);
-  delete _tao_tmp_pointer;
+  return
+    (strm >> _tao_aggregate.time) &&
+    (strm >> _tao_aggregate.inacclo) &&
+    (strm >> _tao_aggregate.inacchi) &&
+    (strm >> _tao_aggregate.tdf);
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// be\be_visitor_structure/cdr_op_cs.cpp:61
 
-static const CORBA::Long _oc_TimeBase_IntervalT[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x42617365), 
-  ACE_NTOHL (0x2f496e74), 
-  ACE_NTOHL (0x65727661), 
-  ACE_NTOHL (0x6c543a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/IntervalT:1.0
-    10,
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x7276616c), 
-  ACE_NTOHL (0x54000000),  // name = IntervalT
-  2, // member count
-    12,
-  ACE_NTOHL (0x6c6f7765), 
-  ACE_NTOHL (0x725f626f), 
-  ACE_NTOHL (0x756e6400),  // name = lower_bound
-    CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f54696d), 
-    ACE_NTOHL (0x65543a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-        6,
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x54000000),  // name = TimeT
-        CORBA::tk_ulonglong,
-
-
-  12,
-  ACE_NTOHL (0x75707065), 
-  ACE_NTOHL (0x725f626f), 
-  ACE_NTOHL (0x756e6400),  // name = upper_bound
-    CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f54696d), 
-    ACE_NTOHL (0x65543a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-        6,
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x54000000),  // name = TimeT
-        CORBA::tk_ulonglong,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_TimeBase_IntervalT (
-    CORBA::tk_struct,
-    sizeof (_oc_TimeBase_IntervalT),
-    (char *) &_oc_TimeBase_IntervalT,
-    0,
-    sizeof (TimeBase::IntervalT)
-  );
-
-namespace TimeBase
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const TimeBase::IntervalT &_tao_aggregate
+  )
 {
-  ::CORBA::TypeCode_ptr _tc_IntervalT =
-    &_tc_TAO_tc_TimeBase_IntervalT;
+  return
+    (strm << _tao_aggregate.lower_bound) &&
+    (strm << _tao_aggregate.upper_bound);
 }
 
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:66
-
-void 
-TimeBase::IntervalT::_tao_any_destructor (
-    void *_tao_void_pointer
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    TimeBase::IntervalT &_tao_aggregate
   )
 {
-  IntervalT *_tao_tmp_pointer =
-    ACE_static_cast (IntervalT *, _tao_void_pointer);
-  delete _tao_tmp_pointer;
+  return
+    (strm >> _tao_aggregate.lower_bound) &&
+    (strm >> _tao_aggregate.upper_bound);
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1725
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h
index f16972abaf5..d7baa55ef8c 100644
--- a/TAO/tao/TimeBaseC.h
+++ b/TAO/tao/TimeBaseC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:186
+// be\be_codegen.cpp:171
 
 #ifndef _TAO_IDL_ORIG_TIMEBASEC_H_
 #define _TAO_IDL_ORIG_TIMEBASEC_H_
@@ -40,7 +40,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
-#include "tao/CDR.h"
 #include "tao/Environment.h"
 #include "tao/VarOut_T.h"
 
@@ -68,46 +67,46 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace TimeBase
 {
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:342
   
   typedef CORBA::ULongLong TimeT;
   typedef CORBA::ULongLong_out TimeT_out;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TimeT;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:342
   
   typedef TimeT InaccuracyT;
   typedef TimeT_out InaccuracyT_out;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InaccuracyT;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:342
   
   typedef CORBA::Short TdfT;
   typedef CORBA::Short_out TdfT_out;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TdfT;
   
   // TAO_IDL - Generated from
-  // be/be_type.cpp:258
+  // be\be_type.cpp:258
   
   struct UtcT;
   
@@ -122,7 +121,7 @@ namespace TimeBase
     UtcT_out;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_Export UtcT
   {
@@ -136,12 +135,12 @@ namespace TimeBase
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UtcT;
   
   // TAO_IDL - Generated from
-  // be/be_type.cpp:258
+  // be\be_type.cpp:258
   
   struct IntervalT;
   
@@ -156,7 +155,7 @@ namespace TimeBase
     IntervalT_out;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_Export IntervalT
   {
@@ -168,17 +167,17 @@ namespace TimeBase
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IntervalT;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module TimeBase
 
 // TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -186,46 +185,35 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
+// be\be_visitor_structure/any_op_ch.cpp:52
 
-#ifndef __ACE_INLINE__
+TAO_Export void operator<<= (CORBA::Any &, const TimeBase::UtcT &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, TimeBase::UtcT*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TimeBase::UtcT *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TimeBase::UtcT *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:53
+// be\be_visitor_structure/any_op_ch.cpp:52
+
+TAO_Export void operator<<= (CORBA::Any &, const TimeBase::IntervalT &); // copying version
+TAO_Export void operator<<= (CORBA::Any &, TimeBase::IntervalT*); // noncopying version
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TimeBase::IntervalT *&); // deprecated
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TimeBase::IntervalT *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TimeBase::UtcT &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::UtcT &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:53
+// be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TimeBase::IntervalT &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::IntervalT &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
-
-#endif /* __ACE_INLINE__ */
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1050
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const TimeBase::UtcT &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, TimeBase::UtcT*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TimeBase::UtcT *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TimeBase::UtcT *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const TimeBase::IntervalT &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, TimeBase::IntervalT*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TimeBase::IntervalT *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TimeBase::IntervalT *&);
+// be\be_codegen.cpp:978
 
 #if defined (__ACE_INLINE__)
 #include "TimeBaseC.i"
diff --git a/TAO/tao/TimeBaseC.i b/TAO/tao/TimeBaseC.i
index 1e8bb802fed..38aa32569ba 100644
--- a/TAO/tao/TimeBaseC.i
+++ b/TAO/tao/TimeBaseC.i
@@ -26,57 +26,3 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:70
-
-ACE_INLINE
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TimeBase::UtcT &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.time) &&
-    (strm << _tao_aggregate.inacclo) &&
-    (strm << _tao_aggregate.inacchi) &&
-    (strm << _tao_aggregate.tdf);
-}
-
-ACE_INLINE
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    TimeBase::UtcT &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.time) &&
-    (strm >> _tao_aggregate.inacclo) &&
-    (strm >> _tao_aggregate.inacchi) &&
-    (strm >> _tao_aggregate.tdf);
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:70
-
-ACE_INLINE
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const TimeBase::IntervalT &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.lower_bound) &&
-    (strm << _tao_aggregate.upper_bound);
-}
-
-ACE_INLINE
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    TimeBase::IntervalT &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.lower_bound) &&
-    (strm >> _tao_aggregate.upper_bound);
-}
-
diff --git a/TAO/tao/TimeBaseS.i b/TAO/tao/TimeBaseS.i
index f455a06b8f0..1d2df31bd57 100644
--- a/TAO/tao/TimeBaseS.i
+++ b/TAO/tao/TimeBaseS.i
@@ -15,7 +15,12 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
-
diff --git a/TAO/tao/TimeBaseS_T.cpp b/TAO/tao/TimeBaseS_T.cpp
index 7c9344162f2..5597b10a284 100644
--- a/TAO/tao/TimeBaseS_T.cpp
+++ b/TAO/tao/TimeBaseS_T.cpp
@@ -15,10 +15,19 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from 
+// be\be_codegen.cpp:705
+
 #ifndef _TAO_IDL_ORIG_TIMEBASES_T_CPP_
 #define _TAO_IDL_ORIG_TIMEBASES_T_CPP_
 
diff --git a/TAO/tao/TimeBaseS_T.h b/TAO/tao/TimeBaseS_T.h
index 9d7c9002343..25e0aacd8b6 100644
--- a/TAO/tao/TimeBaseS_T.h
+++ b/TAO/tao/TimeBaseS_T.h
@@ -15,14 +15,24 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:566
+
 #ifndef _TAO_IDL_ORIG_TIMEBASES_T_H_
 #define _TAO_IDL_ORIG_TIMEBASES_T_H_
 
 #include /**/ "ace/pre.h"
+
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -31,16 +41,26 @@
 #endif /* _MSC_VER */
 
 
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_sth.cpp:116
+
+#if defined (ACE_HAS_USING_KEYWORD)
+namespace POA_TimeBase
+{
+} // module TimeBase
+#endif /* ACE_HAS_USING_KEYWORD */
+
+// TAO_IDL - Generated from 
+// be\be_codegen.cpp:1111
+
 #if defined (__ACE_INLINE__)
 #include "TimeBaseS_T.i"
 #endif /* defined INLINE */
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "TimeBaseS_T.cpp"
 #endif /* defined REQUIRED SOURCE */
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
 #pragma implementation ("TimeBaseS_T.cpp")
 #endif /* defined REQUIRED PRAGMA */
diff --git a/TAO/tao/TimeBaseS_T.i b/TAO/tao/TimeBaseS_T.i
index f455a06b8f0..38aa32569ba 100644
--- a/TAO/tao/TimeBaseS_T.i
+++ b/TAO/tao/TimeBaseS_T.i
@@ -15,7 +15,14 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index 1542bf15a3f..e0cca6ccd53 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -24,8 +24,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Transport_Timer.h"
-#include "Incoming_Message_Queue.h"
+#include "tao/Transport_Timer.h"
+#include "tao/Incoming_Message_Queue.h"
+#include "ace/Time_Value.h"
 
 class TAO_ORB_Core;
 class TAO_Target_Specification;
diff --git a/TAO/tao/ULongSeqA.cpp b/TAO/tao/ULongSeqA.cpp
index 891ecab0848..361baf4aff0 100644
--- a/TAO/tao/ULongSeqA.cpp
+++ b/TAO/tao/ULongSeqA.cpp
@@ -30,6 +30,48 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_ULongSeq[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  31,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f554c),
+  ACE_NTOHL (0x6f6e6753),
+  ACE_NTOHL (0x65713a31),
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ULongSeq:1.0
+    9,
+  ACE_NTOHL (0x554c6f6e),
+  ACE_NTOHL (0x67536571),
+  ACE_NTOHL (0x0),  // name = ULongSeq
+    CORBA::tk_sequence, // typecode kind
+  12, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_ulong,
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ULongSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ULongSeq),
+    (char *) &_oc_CORBA_ULongSeq,
+    0,
+    sizeof (CORBA::ULongSeq)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ULongSeq =
+    &_tc_TAO_tc_CORBA_ULongSeq;
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
diff --git a/TAO/tao/ULongSeqC.cpp b/TAO/tao/ULongSeqC.cpp
index 5382172e4f1..7196334371f 100644
--- a/TAO/tao/ULongSeqC.cpp
+++ b/TAO/tao/ULongSeqC.cpp
@@ -30,6 +30,7 @@
 
 
 #include "ULongSeqC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
@@ -103,48 +104,6 @@ void CORBA::ULongSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_ULongSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f554c), 
-  ACE_NTOHL (0x6f6e6753), 
-  ACE_NTOHL (0x65713a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ULongSeq:1.0
-    9,
-  ACE_NTOHL (0x554c6f6e), 
-  ACE_NTOHL (0x67536571), 
-  ACE_NTOHL (0x0),  // name = ULongSeq
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_ulong,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ULongSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_ULongSeq),
-    (char *) &_oc_CORBA_ULongSeq,
-    0,
-    sizeof (CORBA::ULongSeq)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_ULongSeq =
-    &_tc_TAO_tc_CORBA_ULongSeq;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_CORBA_ULongSeq_CPP_
@@ -203,7 +162,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ULongSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/ULongSeqC.h b/TAO/tao/ULongSeqC.h
index ccecfa96072..c15eda5ca82 100644
--- a/TAO/tao/ULongSeqC.h
+++ b/TAO/tao/ULongSeqC.h
@@ -40,7 +40,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
-#include "tao/CDR.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
diff --git a/TAO/tao/UShortSeqA.cpp b/TAO/tao/UShortSeqA.cpp
index 72249becf3b..4ac3c33892f 100644
--- a/TAO/tao/UShortSeqA.cpp
+++ b/TAO/tao/UShortSeqA.cpp
@@ -30,6 +30,48 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_UShortSeq[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  32,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5553),
+  ACE_NTOHL (0x686f7274),
+  ACE_NTOHL (0x5365713a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/UShortSeq:1.0
+    10,
+  ACE_NTOHL (0x5553686f),
+  ACE_NTOHL (0x72745365),
+  ACE_NTOHL (0x71000000),  // name = UShortSeq
+    CORBA::tk_sequence, // typecode kind
+  12, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_ushort,
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_UShortSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_UShortSeq),
+    (char *) &_oc_CORBA_UShortSeq,
+    0,
+    sizeof (CORBA::UShortSeq)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_UShortSeq =
+    &_tc_TAO_tc_CORBA_UShortSeq;
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
diff --git a/TAO/tao/UShortSeqC.cpp b/TAO/tao/UShortSeqC.cpp
index 0b8345ec3e0..4597fa1f108 100644
--- a/TAO/tao/UShortSeqC.cpp
+++ b/TAO/tao/UShortSeqC.cpp
@@ -30,6 +30,7 @@
 
 
 #include "UShortSeqC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
@@ -103,48 +104,6 @@ void CORBA::UShortSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_UShortSeq[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  32,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5553), 
-  ACE_NTOHL (0x686f7274), 
-  ACE_NTOHL (0x5365713a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/UShortSeq:1.0
-    10,
-  ACE_NTOHL (0x5553686f), 
-  ACE_NTOHL (0x72745365), 
-  ACE_NTOHL (0x71000000),  // name = UShortSeq
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_ushort,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_UShortSeq (
-    CORBA::tk_alias,
-    sizeof (_oc_CORBA_UShortSeq),
-    (char *) &_oc_CORBA_UShortSeq,
-    0,
-    sizeof (CORBA::UShortSeq)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_UShortSeq =
-    &_tc_TAO_tc_CORBA_UShortSeq;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_CORBA_UShortSeq_CPP_
@@ -203,7 +162,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_UShortSeq_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/UShortSeqC.h b/TAO/tao/UShortSeqC.h
index db1ccbbd9fd..1ba78ecea0e 100644
--- a/TAO/tao/UShortSeqC.h
+++ b/TAO/tao/UShortSeqC.h
@@ -33,14 +33,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/CDR.h"
+#include "tao/Environment.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
-#include "tao/Environment.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
@@ -73,22 +72,22 @@
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_USHORTSEQ_CH_)
 #define _CORBA_USHORTSEQ_CH_
-
+  
   class UShortSeq;
-
+  
   typedef
     TAO_FixedSeq_Var_T<
         UShortSeq,
         CORBA::UShort
       >
     UShortSeq_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         UShortSeq,
@@ -96,7 +95,7 @@ namespace CORBA
         CORBA::UShort
       >
     UShortSeq_out;
-
+  
   class TAO_Export UShortSeq
     : public
         TAO_Unbounded_Sequence<
@@ -109,22 +108,22 @@ namespace CORBA
     UShortSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::UShort* buffer,
+        CORBA::UShort* buffer, 
         CORBA::Boolean release = 0
       );
     UShortSeq (const UShortSeq &);
     ~UShortSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef UShortSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UShortSeq;
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/WrongTransactionA.cpp b/TAO/tao/WrongTransactionA.cpp
index 4f30655d72e..2357c5fc611 100644
--- a/TAO/tao/WrongTransactionA.cpp
+++ b/TAO/tao/WrongTransactionA.cpp
@@ -30,6 +30,46 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_WrongTransaction[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  39,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f5772),
+  ACE_NTOHL (0x6f6e6754),
+  ACE_NTOHL (0x72616e73),
+  ACE_NTOHL (0x61637469),
+  ACE_NTOHL (0x6f6e3a31),
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/WrongTransaction:1.0
+    17,
+  ACE_NTOHL (0x57726f6e),
+  ACE_NTOHL (0x67547261),
+  ACE_NTOHL (0x6e736163),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x0),  // name = WrongTransaction
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_WrongTransaction (
+    CORBA::tk_except,
+    sizeof (_oc_CORBA_WrongTransaction),
+    (char *) &_oc_CORBA_WrongTransaction,
+    0,
+    sizeof (CORBA::WrongTransaction)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_WrongTransaction =
+    &_tc_TAO_tc_CORBA_WrongTransaction;
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index 6c05568b6db..2eb3b8da4ff 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -30,6 +30,7 @@
 
 
 #include "WrongTransactionC.h"
+#include "tao/CDR.h"
 #include "tao/Typecode.h"
 #include "ace/OS_NS_string.h"
 
@@ -162,46 +163,6 @@ CORBA::TypeCode_ptr CORBA::WrongTransaction::_type (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_CORBA_WrongTransaction[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f5772), 
-  ACE_NTOHL (0x6f6e6754), 
-  ACE_NTOHL (0x72616e73), 
-  ACE_NTOHL (0x61637469), 
-  ACE_NTOHL (0x6f6e3a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/WrongTransaction:1.0
-    17,
-  ACE_NTOHL (0x57726f6e), 
-  ACE_NTOHL (0x67547261), 
-  ACE_NTOHL (0x6e736163), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x0),  // name = WrongTransaction
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_CORBA_WrongTransaction (
-    CORBA::tk_except,
-    sizeof (_oc_CORBA_WrongTransaction),
-    (char *) &_oc_CORBA_WrongTransaction,
-    0,
-    sizeof (CORBA::WrongTransaction)
-  );
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr _tc_WrongTransaction =
-    &_tc_TAO_tc_CORBA_WrongTransaction;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_exception/cdr_op_cs.cpp:60
 
 CORBA::Boolean operator<< (
@@ -229,7 +190,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1633
+// be\be_visitor_root/root.cpp:1628
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
index 7f3e59cb956..85afaff5e3b 100644
--- a/TAO/tao/WrongTransactionC.h
+++ b/TAO/tao/WrongTransactionC.h
@@ -40,7 +40,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
-#include "tao/CDR.h"
 #include "tao/Environment.h"
 
 #if defined (TAO_EXPORT_MACRO)
diff --git a/TAO/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp
index ad587997591..3a76569817e 100644
--- a/TAO/tests/AMI_Buffering/client.cpp
+++ b/TAO/tests/AMI_Buffering/client.cpp
@@ -4,7 +4,6 @@
 #include "Client_Task.h"
 #include "tao/Messaging/Messaging.h"
 #include "tao/TAOC.h"
-#include "tao/TAOA.h"
 #include "ace/Get_Opt.h"
 
 ACE_RCSID(AMI_Buffering, client, "$Id$")
diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp
index 552c2a3ca5d..08caf86c4a7 100644
--- a/TAO/tests/CDR/basic_types.cpp
+++ b/TAO/tests/CDR/basic_types.cpp
@@ -19,6 +19,7 @@
 
 #include "tao/ORB.h"
 #include "tao/debug.h"
+#include "tao/CDR.h"
 
 #include "ace/Get_Opt.h"
 
diff --git a/TAO/tests/CDR/growth.cpp b/TAO/tests/CDR/growth.cpp
index 953c9b37ef7..ead4518df27 100644
--- a/TAO/tests/CDR/growth.cpp
+++ b/TAO/tests/CDR/growth.cpp
@@ -22,6 +22,7 @@
 
 #include "tao/ORB.h"
 #include "tao/debug.h"
+#include "tao/CDR.h"
 #include "ace/OS_NS_stdio.h"
 
 ACE_RCSID(CDR, growth, "$Id$")
diff --git a/TAO/tests/OctetSeq/OctetSeq.cpp b/TAO/tests/OctetSeq/OctetSeq.cpp
index a4d88f2ed6b..4fd3d478071 100644
--- a/TAO/tests/OctetSeq/OctetSeq.cpp
+++ b/TAO/tests/OctetSeq/OctetSeq.cpp
@@ -22,6 +22,7 @@
 #include "ace/High_Res_Timer.h"
 
 #include "tao/ORB.h"
+#include "tao/CDR.h"
 #include "testC.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/tests/Oneway_Buffering/client.cpp b/TAO/tests/Oneway_Buffering/client.cpp
index 40138d5ea2e..b6fa9e179c8 100644
--- a/TAO/tests/Oneway_Buffering/client.cpp
+++ b/TAO/tests/Oneway_Buffering/client.cpp
@@ -3,7 +3,6 @@
 #include "TestC.h"
 #include "tao/Messaging/Messaging.h"
 #include "tao/TAOC.h"
-#include "tao/TAOA.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_sys_time.h"
 
diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp
index b2fbaade6a6..62f5c9600dd 100644
--- a/TAO/tests/Timed_Buffered_Oneways/client.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp
@@ -18,7 +18,6 @@
 
 #include "tao/Messaging/Messaging.h"
 #include "tao/TAOC.h"
-#include "tao/TAOA.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"