ChangeLogTag: Sun May 4 18:06:59 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

159 files changed, 19452 insertions, 18762 deletions

diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index c6af1f3cfa1..46ac282d6c9 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -1,6 +1,11 @@
 // $Id$
 
-#include "tao/Any_T.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Basic_Impl_T.h"
+#include "tao/Any_Special_Impl_T.h"
+#include "tao/Any_Special_Basic_Impl_T.h"
+#include "tao/Any_Dual_Impl_T.h"
+
 #include "tao/ORB_Core.h"
 #include "tao/Codeset_Translator_Factory.h"
 
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h
index 3205c681031..dd0395475c6 100644
--- a/TAO/tao/Any.h
+++ b/TAO/tao/Any.h
@@ -6,7 +6,7 @@
  *
  *  $Id$
  *
- *  @author  Carlos O'Ryan and Jeff Parsons
+ *  @authors  Carlos O'Ryan and Jeff Parsons
  */
 //=============================================================================
 
diff --git a/TAO/tao/Any_Array_Impl_T.cpp b/TAO/tao/Any_Array_Impl_T.cpp
new file mode 100644
index 00000000000..d3804a5a718
--- /dev/null
+++ b/TAO/tao/Any_Array_Impl_T.cpp
@@ -0,0 +1,159 @@
+// $Id$
+
+#ifndef TAO_ANY_ARRAY_IMPL_T_C
+#define TAO_ANY_ARRAY_IMPL_T_C
+
+#include "tao/Any_Array_Impl_T.h"
+#include "tao/Marshal.h"
+#include "tao/debug.h"
+#include "ace/CORBA_macros.h"
+
+#if !defined (__ACE_INLINE__)
+# include "tao/Any_Array_Impl_T.inl"
+#endif /* ! __ACE_INLINE__ */
+
+ACE_RCSID (tao,
+           Any_Array_Impl_T,
+           "$Id$")
+
+template<typename T_slice, typename T_forany>
+TAO::Any_Array_Impl_T<T_slice, T_forany>::Any_Array_Impl_T (
+    _tao_destructor destructor,
+    CORBA::TypeCode_ptr tc,
+    T_slice * const val
+  )
+  : Any_Impl (destructor,
+              tc),
+    value_ (val)
+{
+}
+
+template<typename T_slice, typename T_forany>
+TAO::Any_Array_Impl_T<T_slice, T_forany>::~Any_Array_Impl_T (void)
+{
+}
+
+template<typename T_slice, typename T_forany> 
+void
+TAO::Any_Array_Impl_T<T_slice, T_forany>::insert (CORBA::Any & any,
+                                                  _tao_destructor destructor,
+                                                  CORBA::TypeCode_ptr tc,
+                                                  T_slice * const value)
+{
+  TAO::Any_Array_Impl_T<T_slice, T_forany> *new_impl = 0;
+  typedef TAO::Any_Array_Impl_T<T_slice, T_forany> ARRAY_ANY_IMPL;
+  ACE_NEW (new_impl,
+           ARRAY_ANY_IMPL (destructor,
+                           tc,
+                           value));
+  any.replace (new_impl);
+}
+
+template<typename T_slice, typename T_forany> 
+CORBA::Boolean
+TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
+                                                   _tao_destructor destructor,
+                                                   CORBA::TypeCode_ptr tc,
+                                                   const T_slice *& _tao_elem)
+{
+  _tao_elem = 0;
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
+      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
+                                                      ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (_tao_equiv == 0)
+        {
+          return 0;
+        }
+
+      TAO::Any_Impl *impl = any.impl ();
+
+      ACE_Message_Block *mb = impl->_tao_get_cdr ();
+
+      if (mb == 0)
+        {
+          TAO::Any_Array_Impl_T<T_slice, T_forany> *narrow_impl =
+            dynamic_cast <TAO::Any_Array_Impl_T<T_slice, T_forany> *> (impl);
+
+          if (narrow_impl == 0)
+            {
+              return 0;
+            }
+
+          _tao_elem = reinterpret_cast<const T_slice*>(narrow_impl->value_) ;
+          return 1;
+        }
+
+      TAO::Any_Array_Impl_T<T_slice, T_forany> *replacement = 0;
+      typedef TAO::Any_Array_Impl_T<T_slice, T_forany> ARRAY_ANY_IMPL;
+      ACE_NEW_RETURN (replacement,
+                      ARRAY_ANY_IMPL (destructor,
+                                      any_tc,
+                                      T_forany::tao_alloc ()),
+                      0);
+                      
+      auto_ptr<TAO::Any_Array_Impl_T<T_slice, T_forany> > replacement_safety (
+          replacement
+        );
+
+      TAO_InputCDR cdr (mb->data_block (),
+                        ACE_Message_Block::DONT_DELETE,
+                        mb->rd_ptr () - mb->base (),
+                        mb->wr_ptr () - mb->base (),
+                        impl->_tao_byte_order (),
+						            TAO_DEF_GIOP_MAJOR,
+						            TAO_DEF_GIOP_MINOR);
+
+      CORBA::TCKind kind = any_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      impl->assign_translator (kind,
+                               &cdr);
+      CORBA::Boolean result = replacement->demarshal_value (cdr);
+
+      if (result == 1)
+        {
+          _tao_elem = reinterpret_cast<const T_slice*>(replacement->value_) ;
+          ACE_const_cast (CORBA::Any &, any).replace (replacement);
+          replacement_safety.release ();
+          return result;
+        }
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+  
+  return 0;
+}
+
+template<typename T_slice, typename T_forany> 
+void
+TAO::Any_Array_Impl_T<T_slice, T_forany>::free_value (void)
+{
+  if (this->value_destructor_ != 0)
+    {
+      (*this->value_destructor_) (this->value_);
+      this->value_destructor_ = 0;
+    }
+
+  this->value_ = 0;
+}
+
+template<typename T_slice, typename T_forany> 
+void 
+TAO::Any_Array_Impl_T<T_slice, T_forany>::_tao_decode (TAO_InputCDR &cdr
+                                                       ACE_ENV_ARG_DECL)
+{
+  if (! this->demarshal_value (cdr))
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+#endif /* TAO_ANY_ARRAY_IMPL_T_C */
+
diff --git a/TAO/tao/Any_Array_Impl_T.h b/TAO/tao/Any_Array_Impl_T.h
new file mode 100644
index 00000000000..47fee8784ad
--- /dev/null
+++ b/TAO/tao/Any_Array_Impl_T.h
@@ -0,0 +1,85 @@
+// This may look like C, but it's really -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Any_Array_Impl_T.h
+ *
+ *  $Id$
+ *
+ *  @authors  Carlos O'Ryan and Jeff Parsons
+ */
+//=============================================================================
+
+
+#ifndef TAO_ANY_ARRAY_IMPL_T_H
+#define TAO_ANY_ARRAY_IMPL_T_H
+
+#include "ace/pre.h"
+
+#include "tao/Any.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+  /**
+   * @class Any_Array_Impl_T
+   *
+   * @brief Template Any class for array types.
+   *
+   * Used for arrays
+   */
+  template<typename T_slice, typename T_forany> 
+  class Any_Array_Impl_T : public Any_Impl
+  {
+  public:
+    Any_Array_Impl_T (_tao_destructor destructor,
+                      CORBA::TypeCode_ptr,
+                      T_slice * const);
+    virtual ~Any_Array_Impl_T (void);
+
+    static void insert (CORBA::Any &, 
+                        _tao_destructor destructor,
+                        CORBA::TypeCode_ptr,
+                        T_slice * const);
+    static CORBA::Boolean extract (const CORBA::Any &,
+                                   _tao_destructor,
+                                   CORBA::TypeCode_ptr,
+                                   const T_slice *&);
+
+    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
+    CORBA::Boolean demarshal_value (TAO_InputCDR &);
+    virtual void _tao_decode (TAO_InputCDR &
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual const void *value (void) const;
+    virtual void free_value (void);
+
+  private:
+    T_slice * value_;
+  };
+};
+
+#if defined (__ACE_INLINE__)
+# include "tao/Any_Array_Impl_T.inl"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "tao/Any_Array_Impl_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Any_Array_Impl_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+
+#endif /* TAO_ANY_ARRAY_IMPL_T_H */
+
diff --git a/TAO/tao/Any_Array_Impl_T.inl b/TAO/tao/Any_Array_Impl_T.inl
new file mode 100644
index 00000000000..c0a66876d5b
--- /dev/null
+++ b/TAO/tao/Any_Array_Impl_T.inl
@@ -0,0 +1,27 @@
+// $Id$
+
+template<typename T_slice, typename T_forany> 
+ACE_INLINE 
+CORBA::Boolean
+TAO::Any_Array_Impl_T<T_slice, T_forany>::marshal_value (TAO_OutputCDR &cdr)
+{
+  return (cdr << T_forany (this->value_));
+}
+
+template<typename T_slice, typename T_forany> 
+ACE_INLINE 
+CORBA::Boolean
+TAO::Any_Array_Impl_T<T_slice, T_forany>::demarshal_value (TAO_InputCDR &cdr)
+{
+  T_forany tmp (this->value_);
+  return (cdr >> tmp);
+}
+
+template<typename T_slice, typename T_forany> 
+ACE_INLINE 
+const void *
+TAO::Any_Array_Impl_T<T_slice, T_forany>::value (void) const
+{
+  return this->value_;
+}
+
diff --git a/TAO/tao/Any_Basic_Impl_T.cpp b/TAO/tao/Any_Basic_Impl_T.cpp
new file mode 100644
index 00000000000..88c55a7e04b
--- /dev/null
+++ b/TAO/tao/Any_Basic_Impl_T.cpp
@@ -0,0 +1,137 @@
+// $Id$
+
+#ifndef TAO_ANY_BASIC_IMPL_T_C
+#define TAO_ANY_BASIC_IMPL_T_C
+
+#include "tao/Any_Basic_Impl_T.h"
+#include "tao/Marshal.h"
+#include "tao/debug.h"
+#include "ace/CORBA_macros.h"
+
+#if !defined (__ACE_INLINE__)
+# include "tao/Any_Basic_Impl_T.inl"
+#endif /* ! __ACE_INLINE__ */
+
+ACE_RCSID (tao,
+           Any_T,
+           "$Id$")
+
+template<typename T>
+TAO::Any_Basic_Impl_T<T>::Any_Basic_Impl_T (CORBA::TypeCode_ptr tc,
+                                            const T & val)
+  : Any_Impl (0,
+              tc),
+    value_ (val)
+{
+}
+
+template<typename T>
+TAO::Any_Basic_Impl_T<T>::~Any_Basic_Impl_T (void)
+{
+}
+
+template<typename T> 
+void
+TAO::Any_Basic_Impl_T<T>::insert (CORBA::Any & any,
+                                  CORBA::TypeCode_ptr tc,
+                                  const T & value)
+{
+  Any_Basic_Impl_T<T> *new_impl = 0;
+  ACE_NEW (new_impl,
+           Any_Basic_Impl_T (tc,
+                             value));
+  any.replace (new_impl);
+}
+
+template<typename T> 
+CORBA::Boolean
+TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
+                                   CORBA::TypeCode_ptr tc,
+                                   T & _tao_elem)
+{
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
+      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
+                                                      ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (_tao_equiv == 0)
+        {
+          return 0;
+        }
+
+      TAO::Any_Impl *impl = any.impl ();
+
+      ACE_Message_Block *mb = impl->_tao_get_cdr ();
+
+      if (mb == 0)
+        {
+          TAO::Any_Basic_Impl_T<T> *narrow_impl =
+            dynamic_cast <TAO::Any_Basic_Impl_T<T> *> (impl);
+
+          if (narrow_impl == 0)
+            {
+              return 0;
+            }
+
+          _tao_elem = narrow_impl->value_;
+          return 1;
+        }
+
+      TAO::Any_Basic_Impl_T<T> *replacement = 
+        TAO::Any_Basic_Impl_T<T>::create_empty (any_tc);
+                      
+      auto_ptr<TAO::Any_Basic_Impl_T<T> > replacement_safety (replacement);
+
+      TAO_InputCDR cdr (mb->data_block (),
+                        ACE_Message_Block::DONT_DELETE,
+                        mb->rd_ptr () - mb->base (),
+                        mb->wr_ptr () - mb->base (),
+                        impl->_tao_byte_order (),
+						            TAO_DEF_GIOP_MAJOR,
+						            TAO_DEF_GIOP_MINOR);
+
+      CORBA::Boolean result = replacement->demarshal_value (cdr);
+
+      if (result == 1)
+        {
+          _tao_elem = replacement->value_;
+          ACE_const_cast (CORBA::Any &, any).replace (replacement);
+          replacement_safety.release ();
+          return result;
+        }
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+  
+  return 0;
+}
+
+template<typename T> 
+TAO::Any_Basic_Impl_T<T> *
+TAO::Any_Basic_Impl_T<T>::create_empty (CORBA::TypeCode_ptr tc)
+{
+  TAO::Any_Basic_Impl_T<T> * retval = 0;
+  ACE_NEW_RETURN (retval,
+                  TAO::Any_Basic_Impl_T<T> (tc,
+                                            ACE_static_cast (T, 0)),
+                  0);
+  return retval;
+}
+
+template<typename T> 
+void 
+TAO::Any_Basic_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
+                                       ACE_ENV_ARG_DECL)
+{
+  if (! this->demarshal_value (cdr))
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+#endif /* TAO_ANY_BASIC_IMPL_T_C */
+
diff --git a/TAO/tao/Any_Basic_Impl_T.h b/TAO/tao/Any_Basic_Impl_T.h
new file mode 100644
index 00000000000..f7dedc15548
--- /dev/null
+++ b/TAO/tao/Any_Basic_Impl_T.h
@@ -0,0 +1,82 @@
+// This may look like C, but it's really -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Any_Basic_Impl_T.h
+ *
+ *  $Id$
+ *
+ *  @authors  Carlos O'Ryan and Jeff Parsons
+ */
+//=============================================================================
+
+
+#ifndef TAO_ANY_BASIC_IMPL_T_H
+#define TAO_ANY_BASIC_IMPL_T_H
+
+#include "ace/pre.h"
+
+#include "tao/Any.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+  /**
+   * @class Any_Basic_Impl_T
+   *
+   * @brief Template Any class for basic types.
+   *
+   * Used for all basic IDL types except bounded (w)strings.
+   */
+  template<typename T> 
+  class Any_Basic_Impl_T : public Any_Impl
+  {
+  public:
+    Any_Basic_Impl_T (CORBA::TypeCode_ptr,
+                      const T & val);
+    virtual ~Any_Basic_Impl_T (void);
+
+    static void insert (CORBA::Any &,
+                        CORBA::TypeCode_ptr,
+                        const T &);
+    static CORBA::Boolean extract (const CORBA::Any &, 
+                                   CORBA::TypeCode_ptr,
+                                   T &);
+
+    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
+    CORBA::Boolean demarshal_value (TAO_InputCDR &);
+    virtual void _tao_decode (TAO_InputCDR &
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual const void *value (void) const;
+    static Any_Basic_Impl_T<T> *create_empty (CORBA::TypeCode_ptr);
+
+  private:
+    T value_;
+  };
+};
+
+#if defined (__ACE_INLINE__)
+# include "tao/Any_Basic_Impl_T.inl"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "tao/Any_Basic_Impl_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Any_Basic_Impl_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+
+#endif /* TAO_ANY_BASIC_IMPL_T_H */
+
diff --git a/TAO/tao/Any_Basic_Impl_T.inl b/TAO/tao/Any_Basic_Impl_T.inl
new file mode 100644
index 00000000000..4250b5f4f88
--- /dev/null
+++ b/TAO/tao/Any_Basic_Impl_T.inl
@@ -0,0 +1,26 @@
+// $Id$
+
+template<typename T> 
+ACE_INLINE 
+CORBA::Boolean
+TAO::Any_Basic_Impl_T<T>::marshal_value (TAO_OutputCDR &cdr)
+{
+  return (cdr << this->value_);
+}
+
+template<typename T> 
+ACE_INLINE 
+CORBA::Boolean
+TAO::Any_Basic_Impl_T<T>::demarshal_value (TAO_InputCDR &cdr)
+{
+  return (cdr >> this->value_);
+}
+
+template<typename T> 
+ACE_INLINE 
+const void *
+TAO::Any_Basic_Impl_T<T>::value (void) const
+{
+  return &this->value_;
+}
+
diff --git a/TAO/tao/Any_Dual_Impl_T.cpp b/TAO/tao/Any_Dual_Impl_T.cpp
new file mode 100644
index 00000000000..0fa43342773
--- /dev/null
+++ b/TAO/tao/Any_Dual_Impl_T.cpp
@@ -0,0 +1,190 @@
+// $Id$
+
+#ifndef TAO_ANY_DUAL_IMPL_T_C
+#define TAO_ANY_DUAL_IMPL_T_C
+
+#include "tao/Any_Dual_Impl_T.h"
+#include "tao/Marshal.h"
+#include "tao/debug.h"
+#include "ace/CORBA_macros.h"
+
+#if !defined (__ACE_INLINE__)
+# include "tao/Any_Dual_Impl_T.inl"
+#endif /* ! __ACE_INLINE__ */
+
+ACE_RCSID (tao,
+           Any_Dual_Impl_T,
+           "$Id$")
+
+template<typename T>
+TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (_tao_destructor destructor,
+                                          CORBA::TypeCode_ptr tc,
+                                          T * const val)
+  : Any_Impl (destructor,
+              tc),
+    value_ (val)
+{
+}
+
+template<typename T>
+TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (_tao_destructor destructor,
+                                          CORBA::TypeCode_ptr tc,
+                                          const T & val)
+  : Any_Impl (destructor,
+              tc)
+{
+  ACE_NEW (this->value_,
+           T (val));
+}
+
+template<typename T>
+TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (CORBA::TypeCode_ptr tc)
+  : Any_Impl (0,
+              tc)
+{
+}
+
+template<typename T>
+TAO::Any_Dual_Impl_T<T>::~Any_Dual_Impl_T (void)
+{
+}
+
+template<typename T>
+void
+TAO::Any_Dual_Impl_T<T>::insert (CORBA::Any & any,
+                                 _tao_destructor destructor,
+                                 CORBA::TypeCode_ptr tc,
+                                 T * const value)
+{
+  Any_Dual_Impl_T<T> *new_impl = 0;
+  ACE_NEW (new_impl,
+           Any_Dual_Impl_T (destructor,
+                            tc,
+                            value));
+  any.replace (new_impl);
+}
+
+template<typename T>
+void
+TAO::Any_Dual_Impl_T<T>::insert_copy (CORBA::Any & any,
+                                      _tao_destructor destructor,
+                                      CORBA::TypeCode_ptr tc,
+                                      const T & value)
+{
+  Any_Dual_Impl_T<T> *new_impl = 0;
+  ACE_NEW (new_impl,
+           Any_Dual_Impl_T (destructor,
+                            tc,
+                            value));
+  any.replace (new_impl);
+}
+
+template<typename T>
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any,
+                                  _tao_destructor destructor,
+                                  CORBA::TypeCode_ptr tc,
+                                  const T *& _tao_elem)
+{
+  _tao_elem = 0;
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
+      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
+                                                      ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (_tao_equiv == 0)
+        {
+          return 0;
+        }
+
+      TAO::Any_Impl *impl = any.impl ();
+
+      ACE_Message_Block *mb = impl->_tao_get_cdr ();
+
+      if (mb == 0)
+        {
+          TAO::Any_Dual_Impl_T<T> *narrow_impl =
+            dynamic_cast <TAO::Any_Dual_Impl_T<T> *> (impl);
+
+          if (narrow_impl == 0)
+            {
+              return 0;
+            }
+
+          _tao_elem = narrow_impl->value_;
+          return 1;
+        }
+
+      T *empty_value = 0;
+      ACE_NEW_RETURN (empty_value,
+                      T,
+                      0);
+      TAO::Any_Dual_Impl_T<T> *replacement = 0;
+      ACE_NEW_RETURN (replacement,
+                      TAO::Any_Dual_Impl_T<T> (destructor,
+                                               any_tc,
+                                               empty_value),
+                      0);
+                      
+      auto_ptr<TAO::Any_Dual_Impl_T<T> > replacement_safety (replacement);
+
+      TAO_InputCDR cdr (mb->data_block (),
+                        ACE_Message_Block::DONT_DELETE,
+                        mb->rd_ptr () - mb->base (),
+                        mb->wr_ptr () - mb->base (),
+                        impl->_tao_byte_order (),
+						            TAO_DEF_GIOP_MAJOR,
+						            TAO_DEF_GIOP_MINOR);
+
+      CORBA::TCKind kind = any_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      impl->assign_translator (kind,
+                               &cdr);
+      CORBA::Boolean result = replacement->demarshal_value (cdr);
+
+      if (result == 1)
+        {
+          _tao_elem = replacement->value_;
+          ACE_const_cast (CORBA::Any &, any).replace (replacement);
+          replacement_safety.release ();
+          return result;
+        }
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+  
+  return 0;
+}
+
+template<typename T> 
+void
+TAO::Any_Dual_Impl_T<T>::free_value (void)
+{
+  if (this->value_destructor_ != 0)
+    {
+      (*this->value_destructor_) (this->value_);
+      this->value_destructor_ = 0;
+    }
+
+  this->value_ = 0;
+}
+
+template<typename T> 
+void 
+TAO::Any_Dual_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
+                                      ACE_ENV_ARG_DECL)
+{
+  if (! this->demarshal_value (cdr))
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+#endif /* TAO_ANY_DUAL_IMPL_T_C */
+
diff --git a/TAO/tao/Any_Dual_Impl_T.h b/TAO/tao/Any_Dual_Impl_T.h
new file mode 100644
index 00000000000..66898337da0
--- /dev/null
+++ b/TAO/tao/Any_Dual_Impl_T.h
@@ -0,0 +1,95 @@
+// This may look like C, but it's really -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Any_Dual_Impl_T.h
+ *
+ *  $Id$
+ *
+ *  @authors  Carlos O'Ryan and Jeff Parsons
+ */
+//=============================================================================
+
+
+#ifndef TAO_ANY_DUAL_IMPL_T_H
+#define TAO_ANY_DUAL_IMPL_T_H
+
+#include "ace/pre.h"
+
+#include "tao/Any.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+  /**
+   * @class Any_Dual_Impl_T
+   *
+   * @brief Template Any class for IDL types with 2 modes of insertion
+   *
+   * Used for the IDL types that have copying and non-copying insertion,
+   * but which are not (de)marshaled as pointers - struct, union, sequence,
+   * and exception.
+   */
+  template<typename T>
+  class Any_Dual_Impl_T : public Any_Impl
+  {
+  public:
+    Any_Dual_Impl_T (_tao_destructor destructor,
+                     CORBA::TypeCode_ptr,
+                     T * const);
+    Any_Dual_Impl_T (_tao_destructor destructor,
+                     CORBA::TypeCode_ptr,
+                     const T &);
+    Any_Dual_Impl_T (CORBA::TypeCode_ptr);
+    virtual ~Any_Dual_Impl_T (void);
+
+    static void insert (CORBA::Any &,
+                        _tao_destructor,
+                        CORBA::TypeCode_ptr,
+                        T * const);
+    static void insert_copy (CORBA::Any &, 
+                             _tao_destructor destructor,
+                             CORBA::TypeCode_ptr,
+                             const T &);
+    static CORBA::Boolean extract (const CORBA::Any &,
+                                   _tao_destructor,
+                                   CORBA::TypeCode_ptr,
+                                   const T *&);
+
+    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
+    CORBA::Boolean demarshal_value (TAO_InputCDR &);
+    virtual void _tao_decode (TAO_InputCDR &
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual const void *value (void) const;
+    virtual void free_value (void);
+
+  protected:
+    T * value_;
+  };
+};
+
+#if defined (__ACE_INLINE__)
+# include "tao/Any_Dual_Impl_T.inl"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "tao/Any_Dual_Impl_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Any_Dual_Impl_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+
+#endif /* TAO_ANY_DUAL_IMPL_T_H */
+
diff --git a/TAO/tao/Any_Dual_Impl_T.inl b/TAO/tao/Any_Dual_Impl_T.inl
new file mode 100644
index 00000000000..bf3ecd90e33
--- /dev/null
+++ b/TAO/tao/Any_Dual_Impl_T.inl
@@ -0,0 +1,26 @@
+// $Id$
+
+template<typename T> 
+ACE_INLINE 
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<T>::marshal_value (TAO_OutputCDR &cdr)
+{
+  return (cdr << *this->value_);
+}
+
+template<typename T> 
+ACE_INLINE 
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<T>::demarshal_value (TAO_InputCDR &cdr)
+{
+  return (cdr >> *this->value_);
+}
+
+template<typename T> 
+ACE_INLINE 
+const void *
+TAO::Any_Dual_Impl_T<T>::value (void) const
+{
+  return this->value_;
+}
+
diff --git a/TAO/tao/Any_Impl_T.cpp b/TAO/tao/Any_Impl_T.cpp
new file mode 100644
index 00000000000..28abc307b4b
--- /dev/null
+++ b/TAO/tao/Any_Impl_T.cpp
@@ -0,0 +1,152 @@
+// $Id$
+
+#ifndef TAO_ANY_IMPL_T_C
+#define TAO_ANY_IMPL_T_C
+
+#include "tao/Any_Impl_T.h"
+#include "tao/Marshal.h"
+#include "tao/debug.h"
+#include "ace/CORBA_macros.h"
+
+#if !defined (__ACE_INLINE__)
+# include "tao/Any_Impl_T.inl"
+#endif /* ! __ACE_INLINE__ */
+
+ACE_RCSID (tao,
+           Any_Impl_T,
+           "$Id$")
+
+template<typename T>
+TAO::Any_Impl_T<T>::Any_Impl_T (_tao_destructor destructor,
+                                CORBA::TypeCode_ptr tc,
+                                T * const val)
+  : Any_Impl (destructor,
+              tc),
+    value_ (val)
+{
+}
+
+template<typename T>
+TAO::Any_Impl_T<T>::~Any_Impl_T (void)
+{
+}
+
+template<typename T> 
+void
+TAO::Any_Impl_T<T>::insert (CORBA::Any & any,
+                            _tao_destructor destructor,
+                            CORBA::TypeCode_ptr tc,
+                            T * const value)
+{
+  TAO::Any_Impl_T<T> *new_impl = 0;
+  ACE_NEW (new_impl,
+           TAO::Any_Impl_T<T> (destructor,
+                               tc,
+                               value));
+  any.replace (new_impl);
+}
+
+template<typename T> 
+CORBA::Boolean
+TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
+                             _tao_destructor destructor,
+                             CORBA::TypeCode_ptr tc,
+                             T *& _tao_elem)
+{
+  _tao_elem = 0;
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
+      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
+                                                      ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (_tao_equiv == 0)
+        {
+          return 0;
+        }
+
+      TAO::Any_Impl *impl = any.impl ();
+
+      ACE_Message_Block *mb = impl->_tao_get_cdr ();
+
+      if (mb == 0)
+        {
+          TAO::Any_Impl_T<T> *narrow_impl =
+            dynamic_cast <TAO::Any_Impl_T<T> *> (impl);
+
+          if (narrow_impl == 0)
+            {
+              return 0;
+            }
+
+          _tao_elem = (T *) narrow_impl->value_;
+          return 1;
+        }
+
+      TAO::Any_Impl_T<T> *replacement = 0;
+      ACE_NEW_RETURN (replacement,
+                      TAO::Any_Impl_T<T> (destructor,
+                                          any_tc,
+                                          0),
+                      0);
+                      
+      auto_ptr<TAO::Any_Impl_T<T> > replacement_safety (replacement);
+
+      TAO_InputCDR cdr (mb->data_block (),
+                        ACE_Message_Block::DONT_DELETE,
+                        mb->rd_ptr () - mb->base (),
+                        mb->wr_ptr () - mb->base (),
+                        impl->_tao_byte_order (),
+						            TAO_DEF_GIOP_MAJOR,
+						            TAO_DEF_GIOP_MINOR);
+
+      CORBA::TCKind kind = any_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      impl->assign_translator (kind,
+                               &cdr);
+      CORBA::Boolean result = replacement->demarshal_value (cdr);
+
+      if (result == 1)
+        {
+          _tao_elem = ACE_const_cast (T *, replacement->value_);
+          ACE_const_cast (CORBA::Any &, any).replace (replacement);
+          replacement_safety.release ();
+          return result;
+        }
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+  
+  return 0;
+}
+
+template<typename T> 
+void
+TAO::Any_Impl_T<T>::free_value (void)
+{
+  if (this->value_destructor_ != 0)
+    {
+      (*this->value_destructor_) (this->value_);
+      this->value_destructor_ = 0;
+    }
+
+  this->value_ = 0;
+}
+
+template<typename T> 
+void 
+TAO::Any_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
+                                 ACE_ENV_ARG_DECL)
+{
+  if (! this->demarshal_value (cdr))
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+#endif /* TAO_ANY_IMPL_T_C */
diff --git a/TAO/tao/Any_Impl_T.h b/TAO/tao/Any_Impl_T.h
new file mode 100644
index 00000000000..7b87ad4afb4
--- /dev/null
+++ b/TAO/tao/Any_Impl_T.h
@@ -0,0 +1,90 @@
+// This may look like C, but it's really -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Any_Impl_T.h
+ *
+ *  $Id$
+ *
+ *  @authors  Carlos O'Ryan and Jeff Parsons
+ */
+//=============================================================================
+
+
+#ifndef TAO_ANY_IMPL_T_H
+#define TAO_ANY_IMPL_T_H
+
+#include "ace/pre.h"
+
+#include "tao/Any.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+  /**
+   * @class Any_Impl_T
+   *
+   * @brief Template Any class for pointer types.
+   *
+   * Used for interfaces and typecodes
+   */
+  template<typename T> 
+  class Any_Impl_T : public Any_Impl
+  {
+  public:
+    Any_Impl_T (_tao_destructor destructor,
+                CORBA::TypeCode_ptr,
+                T * const);
+    virtual ~Any_Impl_T (void);
+
+    static void insert (CORBA::Any &, 
+                        _tao_destructor destructor,
+                        CORBA::TypeCode_ptr,
+                        T * const);
+    static CORBA::Boolean extract (const CORBA::Any &,
+                                   _tao_destructor,
+                                   CORBA::TypeCode_ptr,
+                                   T *&);
+
+    virtual CORBA::Boolean to_object (CORBA::Object_ptr &) const;
+    virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const;
+    virtual CORBA::Boolean to_abstract_base (CORBA::AbstractBase_ptr &) const;
+
+    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
+    CORBA::Boolean demarshal_value (TAO_InputCDR &);
+    virtual void _tao_decode (TAO_InputCDR &
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual const void *value (void) const;
+    virtual void free_value (void);
+
+  private:
+    T * value_;
+  };
+};
+
+#if defined (__ACE_INLINE__)
+# include "tao/Any_Impl_T.inl"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "tao/Any_Impl_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Any_Impl_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+
+#endif /* TAO_ANY_IMPL_T_H */
+
+
diff --git a/TAO/tao/Any_Impl_T.inl b/TAO/tao/Any_Impl_T.inl
new file mode 100644
index 00000000000..1bbeebeea78
--- /dev/null
+++ b/TAO/tao/Any_Impl_T.inl
@@ -0,0 +1,53 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
+
+// These three are overridden in generated code where appropriate.
+
+template<typename T> 
+ACE_INLINE 
+CORBA::Boolean
+TAO::Any_Impl_T<T>::to_object (CORBA::Object_ptr &) const
+{
+  return 0;
+}
+
+template<typename T> 
+ACE_INLINE 
+CORBA::Boolean
+TAO::Any_Impl_T<T>::to_value (CORBA::ValueBase *&) const
+{
+  return 0;
+}
+
+template<typename T> 
+ACE_INLINE 
+CORBA::Boolean
+TAO::Any_Impl_T<T>::to_abstract_base (CORBA::AbstractBase_ptr &) const
+{
+  return 0;
+}
+
+template<typename T> 
+ACE_INLINE 
+CORBA::Boolean
+TAO::Any_Impl_T<T>::marshal_value (TAO_OutputCDR &cdr)
+{
+  return (cdr << this->value_);
+}
+
+template<typename T> 
+ACE_INLINE 
+CORBA::Boolean
+TAO::Any_Impl_T<T>::demarshal_value (TAO_InputCDR &cdr)
+{
+  return (cdr >> this->value_);
+}
+
+template<typename T> 
+ACE_INLINE 
+const void *
+TAO::Any_Impl_T<T>::value (void) const
+{
+  return this->value_;
+}
+
diff --git a/TAO/tao/Any_Special_Basic_Impl_T.cpp b/TAO/tao/Any_Special_Basic_Impl_T.cpp
new file mode 100644
index 00000000000..d34d8db4f80
--- /dev/null
+++ b/TAO/tao/Any_Special_Basic_Impl_T.cpp
@@ -0,0 +1,144 @@
+// $Id$
+
+#ifndef TAO_ANY_SPECIAL_BASIC_IMPL_T_C
+#define TAO_ANY_SPECIAL_BASIC_IMPL_T_C
+
+#include "tao/Any_Special_Basic_Impl_T.h"
+#include "tao/Marshal.h"
+#include "tao/debug.h"
+#include "ace/CORBA_macros.h"
+
+#if !defined (__ACE_INLINE__)
+# include "tao/Any_Special_Basic_Impl_T.inl"
+#endif /* ! __ACE_INLINE__ */
+
+ACE_RCSID (tao,
+           Any_Special_Basic_Impl_T,
+           "$Id$")
+
+template<typename T, typename from_T, typename to_T>
+TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::Any_Special_Basic_Impl_T (
+    CORBA::TypeCode_ptr tc,
+    const T & val
+  )
+  : Any_Impl (0,
+              tc),
+    value_ (val)
+{
+}
+
+template<typename T, typename from_T, typename to_T>
+TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::~Any_Special_Basic_Impl_T (
+    void
+  )
+{
+}
+
+template<typename T, typename from_T, typename to_T> void
+TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::insert (
+    CORBA::Any & any,
+    CORBA::TypeCode_ptr tc,
+    const T & value
+  )
+{
+  Any_Special_Basic_Impl_T<T, from_T, to_T> *new_impl = 0;
+  ACE_NEW (new_impl,
+           Any_Special_Basic_Impl_T (tc,
+                                     value));
+  any.replace (new_impl);
+}
+
+template<typename T, typename from_T, typename to_T> 
+CORBA::Boolean
+TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::extract (
+    const CORBA::Any & any,
+    CORBA::TypeCode_ptr tc,
+    T & _tao_elem
+  )
+{
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
+
+      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
+                                                      ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (_tao_equiv == 0)
+        {
+          return 0;
+        }
+
+      typedef TAO::Any_Special_Basic_Impl_T<T, from_T, to_T> 
+        UNSIGNED_CHAR_ANY_IMPL;
+
+      TAO::Any_Impl *impl = any.impl ();
+
+      ACE_Message_Block *mb = impl->_tao_get_cdr ();
+
+      if (mb == 0)
+        {
+          TAO::Any_Special_Basic_Impl_T<T, from_T, to_T> *narrow_impl =
+            dynamic_cast <UNSIGNED_CHAR_ANY_IMPL *> (impl);
+
+          if (narrow_impl == 0)
+            {
+              return 0;
+            }
+
+          _tao_elem = narrow_impl->value_;
+          return 1;
+        }
+
+      TAO::Any_Special_Basic_Impl_T<T, from_T, to_T> *replacement = 0;
+      ACE_NEW_RETURN (replacement,
+                      UNSIGNED_CHAR_ANY_IMPL (any_tc,
+                                              0),
+                      0);
+                      
+      auto_ptr<UNSIGNED_CHAR_ANY_IMPL> replacement_safety (replacement);
+
+      TAO_InputCDR cdr (mb->data_block (),
+                        ACE_Message_Block::DONT_DELETE,
+                        mb->rd_ptr () - mb->base (),
+                        mb->wr_ptr () - mb->base (),
+                        impl->_tao_byte_order (),
+						            TAO_DEF_GIOP_MAJOR,
+						            TAO_DEF_GIOP_MINOR);
+
+      CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      impl->assign_translator (kind,
+                               &cdr);
+      CORBA::Boolean result = replacement->demarshal_value (cdr);
+
+      if (result == 1)
+        {
+          _tao_elem = replacement->value_;
+          ACE_const_cast (CORBA::Any &, any).replace (replacement);
+          replacement_safety.release ();
+          return result;
+        }
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+  
+  return 0;
+}
+
+template<typename T, typename from_T, typename to_T> 
+void 
+TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::_tao_decode (TAO_InputCDR &cdr
+                                                             ACE_ENV_ARG_DECL)
+{
+  if (! this->demarshal_value (cdr))
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+#endif /* TAO_ANY_T_C */
+
diff --git a/TAO/tao/Any_Special_Basic_Impl_T.h b/TAO/tao/Any_Special_Basic_Impl_T.h
new file mode 100644
index 00000000000..4e0b41c3237
--- /dev/null
+++ b/TAO/tao/Any_Special_Basic_Impl_T.h
@@ -0,0 +1,82 @@
+// This may look like C, but it's really -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Any_Special_Basic_Impl_T.h
+ *
+ *  $Id$
+ *
+ *  @authorS  Carlos O'Ryan and Jeff Parsons
+ */
+//=============================================================================
+
+
+#ifndef TAO_ANY_SPECIAL_BASIC_IMPL_T_H
+#define TAO_ANY_SPECIAL_BASIC_IMPL_T_H
+
+#include "ace/pre.h"
+
+#include "tao/Any.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+  /**
+   * @class Any_Special_Basic_Impl_T
+   *
+   * @brief Template Any class for special basic types.
+   *
+   * Used for the basic IDL types that usually map to unsigned char
+   * or unsigned short - boolean, char, wchar and octet.
+   */
+  template<typename T, typename from_T, typename to_T>
+  class Any_Special_Basic_Impl_T : public Any_Impl
+  {
+  public:
+    Any_Special_Basic_Impl_T (CORBA::TypeCode_ptr,
+                              const T & val);
+    virtual ~Any_Special_Basic_Impl_T (void);
+
+    static void insert (CORBA::Any &,
+                        CORBA::TypeCode_ptr,
+                        const T &);
+    static CORBA::Boolean extract (const CORBA::Any &, 
+                                   CORBA::TypeCode_ptr,
+                                   T &);
+
+    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
+    CORBA::Boolean demarshal_value (TAO_InputCDR &);
+    virtual void _tao_decode (TAO_InputCDR &
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual const void *value (void) const;
+
+  private:
+    T value_;
+  };
+};
+
+#if defined (__ACE_INLINE__)
+# include "tao/Any_Special_Basic_Impl_T.inl"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "tao/Any_Special_Basic_Impl_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Any_Special_Basic_Impl_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+
+#endif /* TAO_ANY_SPECIAL_BASIC_IMPL_T_H */
+
diff --git a/TAO/tao/Any_Special_Basic_Impl_T.inl b/TAO/tao/Any_Special_Basic_Impl_T.inl
new file mode 100644
index 00000000000..f58adb34e5d
--- /dev/null
+++ b/TAO/tao/Any_Special_Basic_Impl_T.inl
@@ -0,0 +1,30 @@
+// $Id$
+
+template<typename T, typename from_T, typename to_T> 
+ACE_INLINE 
+CORBA::Boolean
+TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::marshal_value (
+    TAO_OutputCDR &cdr
+  )
+{
+  return (cdr << from_T (this->value_));
+}
+
+template<typename T, typename from_T, typename to_T> 
+ACE_INLINE 
+CORBA::Boolean
+TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::demarshal_value (
+    TAO_InputCDR &cdr
+  )
+{
+  return (cdr >> to_T (this->value_));
+}
+
+template<typename T, typename from_T, typename to_T> 
+ACE_INLINE 
+const void *
+TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::value (void) const
+{
+  return &this->value_;
+}
+
diff --git a/TAO/tao/Any_Special_Impl_T.cpp b/TAO/tao/Any_Special_Impl_T.cpp
new file mode 100644
index 00000000000..92a2ef99c40
--- /dev/null
+++ b/TAO/tao/Any_Special_Impl_T.cpp
@@ -0,0 +1,212 @@
+// $Id$
+
+#ifndef TAO_ANY_SPECIAL_IMPL_T_C
+#define TAO_ANY_SPECIAL_IMPL_T_C
+
+#include "tao/Any_Special_Impl_T.h"
+#include "tao/Marshal.h"
+#include "tao/debug.h"
+#include "ace/CORBA_macros.h"
+
+#if !defined (__ACE_INLINE__)
+# include "tao/Any_Special_Impl_T.inl"
+#endif /* ! __ACE_INLINE__ */
+
+ACE_RCSID (tao,
+           Any_Special_Impl_T,
+           "$Id$")
+
+template<typename T, typename from_T, typename to_T>
+TAO::Any_Special_Impl_T<T, from_T, to_T>::Any_Special_Impl_T (
+    _tao_destructor destructor,
+    CORBA::TypeCode_ptr tc,
+    T * const val,
+    CORBA::ULong bound
+  )
+  : Any_Impl (destructor,
+              tc),
+    value_ (val),
+    bound_ (bound)
+{
+}
+
+template<typename T, typename from_T, typename to_T>
+TAO::Any_Special_Impl_T<T, from_T, to_T>::~Any_Special_Impl_T (void)
+{
+}
+
+template<typename T, typename from_T, typename to_T>
+void
+TAO::Any_Special_Impl_T<T, from_T, to_T>::insert (CORBA::Any & any,
+                                                  _tao_destructor destructor,
+                                                  CORBA::TypeCode_ptr tc,
+                                                  T * const value,
+                                                  CORBA::ULong bound
+  )
+{
+  CORBA::TypeCode_ptr bounded_tc = CORBA::TypeCode::_nil ();
+
+  if (bound > 0)
+    {
+      CORBA::TCKind kind = ACE_static_cast (CORBA::TCKind, 
+                                            tc->kind_);
+      static CORBA::Long _oc_buffer [] =
+        {
+          TAO_ENCAP_BYTE_ORDER,
+          ACE_static_cast (CORBA::Long, bound)
+        };
+
+      ACE_NEW (bounded_tc,
+               CORBA::TypeCode (kind,
+                                sizeof _oc_buffer,
+                                (char *) &_oc_buffer,
+                                1,
+                                0));
+    }
+  else
+    {
+      bounded_tc = CORBA::TypeCode::_duplicate (tc);
+    }
+
+  Any_Special_Impl_T<T, from_T, to_T> *new_impl = 0;
+  ACE_NEW (new_impl,
+           Any_Special_Impl_T (destructor,
+                               bounded_tc,
+                               value,
+                               bound));
+  any.replace (new_impl);
+}
+
+template<typename T, typename from_T, typename to_T>
+CORBA::Boolean
+TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
+                                                   _tao_destructor destructor,
+                                                   CORBA::TypeCode_ptr tc,
+                                                   const T *& _tao_elem,
+                                                   CORBA::ULong bound
+  )
+{
+  _tao_elem = 0;
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::TypeCode_ptr any_type = any._tao_get_typecode ();
+      CORBA::TypeCode_var unaliased_any_type = 
+        any_type->unalias (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::TCKind any_kind = 
+        unaliased_any_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::TCKind try_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (any_kind != try_kind)
+        {
+          return 0;
+        }
+
+      CORBA::ULong length = 
+        unaliased_any_type->length (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (length != bound)
+        {
+          return 0;
+        }
+
+      TAO::Any_Impl *impl = any.impl ();
+
+      typedef TAO::Any_Special_Impl_T<T, from_T, to_T> 
+        BOUNDED_TSTRING_ANY_IMPL;
+
+      TAO::Any_Special_Impl_T<T, from_T, to_T> *narrow_impl =
+        dynamic_cast <BOUNDED_TSTRING_ANY_IMPL *> (impl);
+
+      if (narrow_impl != 0)
+        {
+          _tao_elem = narrow_impl->value_;
+          return 1;
+        }
+
+      ACE_Message_Block *mb = impl->_tao_get_cdr ();
+
+      if (mb == 0)
+        {
+          return 0;
+        }
+
+      TAO::Any_Special_Impl_T<T, from_T, to_T> *replacement = 0;
+      ACE_NEW_RETURN (replacement,
+                      BOUNDED_TSTRING_ANY_IMPL (destructor,
+                                                CORBA::TypeCode::_duplicate (tc),
+                                                0,
+                                                bound),
+                      0);
+                      
+      auto_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety (
+          replacement
+        );
+
+      TAO_InputCDR cdr (mb->data_block (),
+                        ACE_Message_Block::DONT_DELETE,
+                        mb->rd_ptr () - mb->base (),
+                        mb->wr_ptr () - mb->base (),
+                        impl->_tao_byte_order (),
+						            TAO_DEF_GIOP_MAJOR,
+						            TAO_DEF_GIOP_MINOR);
+
+      CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      impl->assign_translator (kind,
+                               &cdr);
+      CORBA::Boolean result = replacement->demarshal_value (cdr);
+
+      if (result == 1)
+        {
+          _tao_elem = replacement->value_;
+          ACE_const_cast (CORBA::Any &, any).replace (replacement);
+          replacement_safety.release ();
+          return 1;
+        }
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+  
+  return 0;
+}
+
+template<typename T, typename from_T, typename to_T>
+void
+TAO::Any_Special_Impl_T<T, from_T, to_T>::free_value (void)
+{
+  if (this->value_destructor_ != 0)
+    {
+      (*this->value_destructor_) (this->value_);
+      this->value_destructor_ = 0;
+    }
+
+  CORBA::release (this->type_);
+  this->type_ = CORBA::TypeCode::_nil ();
+  this->value_ = 0;
+}
+
+template<typename T, typename from_T, typename to_T> 
+void 
+TAO::Any_Special_Impl_T<T, from_T, to_T>::_tao_decode (
+    TAO_InputCDR &cdr
+    ACE_ENV_ARG_DECL
+  )
+{
+  if (! this->demarshal_value (cdr))
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+#endif /* TAO_ANY_T_C */
+
diff --git a/TAO/tao/Any_Special_Impl_T.h b/TAO/tao/Any_Special_Impl_T.h
new file mode 100644
index 00000000000..0b5d64503cf
--- /dev/null
+++ b/TAO/tao/Any_Special_Impl_T.h
@@ -0,0 +1,87 @@
+// This may look like C, but it's really -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Any_Special_Impl_T.h
+ *
+ *  $Id$
+ *
+ *  @authorS  Carlos O'Ryan and Jeff Parsons
+ */
+//=============================================================================
+
+
+#ifndef TAO_ANY_SPECIAL_IMPL_T_H
+#define TAO_ANY_SPECIAL_IMPL_T_H
+
+#include "ace/pre.h"
+
+#include "tao/Any.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+  /**
+   * @class Any_Special_Impl_T
+   *
+   * @brief Template Any class for bounded IDL (w)strings.
+   */
+  template<typename T, typename from_T, typename to_T>
+  class Any_Special_Impl_T : public Any_Impl
+  {
+  public:
+    Any_Special_Impl_T (_tao_destructor destructor,
+                        CORBA::TypeCode_ptr,
+                        T * const,
+                        CORBA::ULong bound);
+    virtual ~Any_Special_Impl_T (void);
+
+    static void insert (CORBA::Any &,
+                        _tao_destructor destructor,
+                        CORBA::TypeCode_ptr,
+                        T * const,
+                        CORBA::ULong bound);
+    static CORBA::Boolean extract (const CORBA::Any &,
+                                   _tao_destructor,
+                                   CORBA::TypeCode_ptr,
+                                   const T *&,
+                                   CORBA::ULong bound);
+
+    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
+    CORBA::Boolean demarshal_value (TAO_InputCDR &);
+    virtual void _tao_decode (TAO_InputCDR &
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+    virtual const void *value (void) const;
+    virtual void free_value (void);
+
+  private:
+    T * value_;
+    CORBA::ULong bound_;
+  };
+};
+
+#if defined (__ACE_INLINE__)
+# include "tao/Any_Special_Impl_T.inl"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "tao/Any_Special_Impl_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Any_Special_Impl_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+
+#endif /* TAO_ANY_SPECIAL_IMPL_T_H */
+
diff --git a/TAO/tao/Any_Special_Impl_T.inl b/TAO/tao/Any_Special_Impl_T.inl
new file mode 100644
index 00000000000..bc8715b083f
--- /dev/null
+++ b/TAO/tao/Any_Special_Impl_T.inl
@@ -0,0 +1,30 @@
+// $Id$
+
+template<typename T, typename from_T, typename to_T> 
+ACE_INLINE 
+CORBA::Boolean
+TAO::Any_Special_Impl_T<T, from_T, to_T>::marshal_value (
+    TAO_OutputCDR &cdr
+  )
+{
+  return (cdr << from_T (this->value_, this->bound_));
+}
+
+template<typename T, typename from_T, typename to_T> 
+ACE_INLINE 
+CORBA::Boolean
+TAO::Any_Special_Impl_T<T, from_T, to_T>::demarshal_value (
+    TAO_InputCDR &cdr
+  )
+{
+  return (cdr >> to_T (this->value_, this->bound_));
+}
+
+template<typename T, typename from_T, typename to_T> 
+ACE_INLINE 
+const void *
+TAO::Any_Special_Impl_T<T, from_T, to_T>::value (void) const
+{
+  return this->value_;
+}
+
diff --git a/TAO/tao/Any_T.cpp b/TAO/tao/Any_T.cpp
deleted file mode 100644
index ffef914d5c5..00000000000
--- a/TAO/tao/Any_T.cpp
+++ /dev/null
@@ -1,904 +0,0 @@
-// $Id$
-
-#ifndef TAO_ANY_T_C
-#define TAO_ANY_T_C
-
-#include "tao/Any_T.h"
-#include "tao/Marshal.h"
-#include "tao/debug.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Any_T.inl"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Any_T,
-           "$Id$")
-
-template<typename T>
-TAO::Any_Impl_T<T>::Any_Impl_T (_tao_destructor destructor,
-                                CORBA::TypeCode_ptr tc,
-                                T * const val)
-  : Any_Impl (destructor,
-              tc),
-    value_ (val)
-{
-}
-
-template<typename T>
-TAO::Any_Impl_T<T>::~Any_Impl_T (void)
-{
-}
-
-template<typename T>
-void
-TAO::Any_Impl_T<T>::insert (CORBA::Any & any,
-                            _tao_destructor destructor,
-                            CORBA::TypeCode_ptr tc,
-                            T * const value)
-{
-  TAO::Any_Impl_T<T> *new_impl = 0;
-  ACE_NEW (new_impl,
-           TAO::Any_Impl_T<T> (destructor,
-                               tc,
-                               value));
-  any.replace (new_impl);
-}
-
-template<typename T>
-CORBA::Boolean
-TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
-                             _tao_destructor destructor,
-                             CORBA::TypeCode_ptr tc,
-                             T *& _tao_elem)
-{
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (_tao_equiv == 0)
-        {
-          return 0;
-        }
-
-      TAO::Any_Impl *impl = any.impl ();
-
-      ACE_Message_Block *mb = impl->_tao_get_cdr ();
-
-      if (mb == 0)
-        {
-          TAO::Any_Impl_T<T> *narrow_impl =
-            dynamic_cast <TAO::Any_Impl_T<T> *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = (T *) narrow_impl->value_;
-          return 1;
-        }
-
-      TAO::Any_Impl_T<T> *replacement = 0;
-      ACE_NEW_RETURN (replacement,
-                      TAO::Any_Impl_T<T> (destructor,
-                                          any_tc,
-                                          0),
-                      0);
-
-      auto_ptr<TAO::Any_Impl_T<T> > replacement_safety (replacement);
-
-      TAO_InputCDR cdr (mb->data_block (),
-                        ACE_Message_Block::DONT_DELETE,
-                        mb->rd_ptr () - mb->base (),
-                        mb->wr_ptr () - mb->base (),
-                        impl->_tao_byte_order (),
-                        TAO_DEF_GIOP_MAJOR,
-                        TAO_DEF_GIOP_MINOR);
-
-      CORBA::TCKind kind = any_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      impl->assign_translator (kind,
-                               &cdr);
-      CORBA::Boolean result = replacement->demarshal_value (cdr);
-
-      if (result == 1)
-        {
-          _tao_elem = ACE_const_cast (T *, replacement->value_);
-          ACE_const_cast (CORBA::Any &, any).replace (replacement);
-          replacement_safety.release ();
-          return result;
-        }
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-template<typename T>
-void
-TAO::Any_Impl_T<T>::free_value (void)
-{
-  if (this->value_destructor_ != 0)
-    {
-      (*this->value_destructor_) (this->value_);
-      this->value_destructor_ = 0;
-    }
-
-  this->value_ = 0;
-}
-
-template<typename T>
-void
-TAO::Any_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
-                                 ACE_ENV_ARG_DECL)
-{
-  if (! this->demarshal_value (cdr))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-// =======================================================================
-
-template<typename T_slice, typename T_forany>
-TAO::Any_Array_Impl_T<T_slice, T_forany>::Any_Array_Impl_T (
-    _tao_destructor destructor,
-    CORBA::TypeCode_ptr tc,
-    T_slice * const val
-  )
-  : Any_Impl (destructor,
-              tc),
-    value_ (val)
-{
-}
-
-template<typename T_slice, typename T_forany>
-TAO::Any_Array_Impl_T<T_slice, T_forany>::~Any_Array_Impl_T (void)
-{
-}
-
-template<typename T_slice, typename T_forany>
-void
-TAO::Any_Array_Impl_T<T_slice, T_forany>::insert (CORBA::Any & any,
-                                                  _tao_destructor destructor,
-                                                  CORBA::TypeCode_ptr tc,
-                                                  T_slice * const value)
-{
-  TAO::Any_Array_Impl_T<T_slice, T_forany> *new_impl = 0;
-  typedef TAO::Any_Array_Impl_T<T_slice, T_forany> ARRAY_ANY_IMPL;
-  ACE_NEW (new_impl,
-           ARRAY_ANY_IMPL (destructor,
-                           tc,
-                           value));
-  any.replace (new_impl);
-}
-
-template<typename T_slice, typename T_forany>
-CORBA::Boolean
-TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
-                                                   _tao_destructor destructor,
-                                                   CORBA::TypeCode_ptr tc,
-                                                   const T_slice *& _tao_elem)
-{
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (_tao_equiv == 0)
-        {
-          return 0;
-        }
-
-      TAO::Any_Impl *impl = any.impl ();
-
-      ACE_Message_Block *mb = impl->_tao_get_cdr ();
-
-      if (mb == 0)
-        {
-          TAO::Any_Array_Impl_T<T_slice, T_forany> *narrow_impl =
-            dynamic_cast <TAO::Any_Array_Impl_T<T_slice, T_forany> *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = reinterpret_cast<const T_slice*>(narrow_impl->value_) ;
-          return 1;
-        }
-
-      TAO::Any_Array_Impl_T<T_slice, T_forany> *replacement = 0;
-      typedef TAO::Any_Array_Impl_T<T_slice, T_forany> ARRAY_ANY_IMPL;
-      ACE_NEW_RETURN (replacement,
-                      ARRAY_ANY_IMPL (destructor,
-                                      any_tc,
-                                      T_forany::tao_alloc ()),
-                      0);
-
-      auto_ptr<TAO::Any_Array_Impl_T<T_slice, T_forany> > replacement_safety (
-          replacement
-        );
-
-      TAO_InputCDR cdr (mb->data_block (),
-                        ACE_Message_Block::DONT_DELETE,
-                        mb->rd_ptr () - mb->base (),
-                        mb->wr_ptr () - mb->base (),
-                        impl->_tao_byte_order (),
-                                                            TAO_DEF_GIOP_MAJOR,
-                                                            TAO_DEF_GIOP_MINOR);
-
-      CORBA::TCKind kind = any_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      impl->assign_translator (kind,
-                               &cdr);
-      CORBA::Boolean result = replacement->demarshal_value (cdr);
-
-      if (result == 1)
-        {
-          _tao_elem = reinterpret_cast<const T_slice*>(replacement->value_) ;
-          ACE_const_cast (CORBA::Any &, any).replace (replacement);
-          replacement_safety.release ();
-          return result;
-        }
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-template<typename T_slice, typename T_forany>
-void
-TAO::Any_Array_Impl_T<T_slice, T_forany>::free_value (void)
-{
-  if (this->value_destructor_ != 0)
-    {
-      (*this->value_destructor_) (this->value_);
-      this->value_destructor_ = 0;
-    }
-
-  this->value_ = 0;
-}
-
-template<typename T_slice, typename T_forany>
-void
-TAO::Any_Array_Impl_T<T_slice, T_forany>::_tao_decode (TAO_InputCDR &cdr
-                                                       ACE_ENV_ARG_DECL)
-{
-  if (! this->demarshal_value (cdr))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-// =======================================================================
-
-template<typename T, typename from_T, typename to_T>
-TAO::Any_Special_Impl_T<T, from_T, to_T>::Any_Special_Impl_T (
-    _tao_destructor destructor,
-    CORBA::TypeCode_ptr tc,
-    T * const val,
-    CORBA::ULong bound
-  )
-  : Any_Impl (destructor,
-              tc),
-    value_ (val),
-    bound_ (bound)
-{
-}
-
-template<typename T, typename from_T, typename to_T>
-TAO::Any_Special_Impl_T<T, from_T, to_T>::~Any_Special_Impl_T (void)
-{
-}
-
-template<typename T, typename from_T, typename to_T>
-void
-TAO::Any_Special_Impl_T<T, from_T, to_T>::insert (CORBA::Any & any,
-                                                  _tao_destructor destructor,
-                                                  CORBA::TypeCode_ptr tc,
-                                                  T * const value,
-                                                  CORBA::ULong bound
-  )
-{
-  CORBA::TypeCode_ptr bounded_tc = CORBA::TypeCode::_nil ();
-
-  if (bound > 0)
-    {
-      CORBA::TCKind kind = ACE_static_cast (CORBA::TCKind,
-                                            tc->kind_);
-      static CORBA::Long _oc_buffer [] =
-        {
-          TAO_ENCAP_BYTE_ORDER,
-          ACE_static_cast (CORBA::Long, bound)
-        };
-
-      ACE_NEW (bounded_tc,
-               CORBA::TypeCode (kind,
-                                sizeof _oc_buffer,
-                                (char *) &_oc_buffer,
-                                1,
-                                0));
-    }
-  else
-    {
-      bounded_tc = CORBA::TypeCode::_duplicate (tc);
-    }
-
-  Any_Special_Impl_T<T, from_T, to_T> *new_impl = 0;
-  ACE_NEW (new_impl,
-           Any_Special_Impl_T (destructor,
-                               bounded_tc,
-                               value,
-                               bound));
-  any.replace (new_impl);
-}
-
-template<typename T, typename from_T, typename to_T>
-CORBA::Boolean
-TAO::Any_Special_Impl_T<T, from_T, to_T>::extract(const CORBA::Any & any,
-                                                   _tao_destructor destructor,
-                                                   CORBA::TypeCode_ptr tc,
-                                                   const T *& _tao_elem,
-                                                   CORBA::ULong bound
-  )
-{
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode_ptr any_type = any._tao_get_typecode ();
-      CORBA::TypeCode_var unaliased_any_type =
-        any_type->unalias (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::TCKind any_kind =
-        unaliased_any_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::TCKind try_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (any_kind != try_kind)
-        {
-          return 0;
-        }
-
-      CORBA::ULong length =
-        unaliased_any_type->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (length != bound)
-        {
-          return 0;
-        }
-
-      TAO::Any_Impl *impl = any.impl ();
-
-      typedef TAO::Any_Special_Impl_T<T, from_T, to_T>
-        BOUNDED_TSTRING_ANY_IMPL;
-
-      TAO::Any_Special_Impl_T<T, from_T, to_T> *narrow_impl =
-        dynamic_cast <BOUNDED_TSTRING_ANY_IMPL *> (impl);
-
-      if (narrow_impl != 0)
-        {
-          _tao_elem = narrow_impl->value_;
-          return 1;
-        }
-
-      ACE_Message_Block *mb = impl->_tao_get_cdr ();
-
-      if (mb == 0)
-        {
-          return 0;
-        }
-
-      TAO::Any_Special_Impl_T<T, from_T, to_T> *replacement = 0;
-      ACE_NEW_RETURN (replacement,
-                      BOUNDED_TSTRING_ANY_IMPL (destructor,
-                                                CORBA::TypeCode::_duplicate (tc),
-                                                0,
-                                                bound),
-                      0);
-
-      auto_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety (
-          replacement
-        );
-
-      TAO_InputCDR cdr (mb->data_block (),
-                        ACE_Message_Block::DONT_DELETE,
-                        mb->rd_ptr () - mb->base (),
-                        mb->wr_ptr () - mb->base (),
-                        impl->_tao_byte_order (),
-                                                            TAO_DEF_GIOP_MAJOR,
-                                                            TAO_DEF_GIOP_MINOR);
-
-      CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      impl->assign_translator (kind,
-                               &cdr);
-      CORBA::Boolean result = replacement->demarshal_value (cdr);
-
-      if (result == 1)
-        {
-          _tao_elem = replacement->value_;
-          ACE_const_cast (CORBA::Any &, any).replace (replacement);
-          replacement_safety.release ();
-          return 1;
-        }
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-template<typename T, typename from_T, typename to_T>
-void
-TAO::Any_Special_Impl_T<T, from_T, to_T>::free_value (void)
-{
-  if (this->value_destructor_ != 0)
-    {
-      (*this->value_destructor_) (this->value_);
-      this->value_destructor_ = 0;
-    }
-
-  CORBA::release (this->type_);
-  this->type_ = CORBA::TypeCode::_nil ();
-  this->value_ = 0;
-}
-
-template<typename T, typename from_T, typename to_T>
-void
-TAO::Any_Special_Impl_T<T, from_T, to_T>::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (! this->demarshal_value (cdr))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-// =======================================================================
-
-template<typename T>
-TAO::Any_Basic_Impl_T<T>::Any_Basic_Impl_T (CORBA::TypeCode_ptr tc,
-                                            const T & val)
-  : Any_Impl (0,
-              tc),
-    value_ (val)
-{
-}
-
-template<typename T>
-TAO::Any_Basic_Impl_T<T>::~Any_Basic_Impl_T (void)
-{
-}
-
-template<typename T>
-void
-TAO::Any_Basic_Impl_T<T>::insert (CORBA::Any & any,
-                                  CORBA::TypeCode_ptr tc,
-                                  const T & value)
-{
-  Any_Basic_Impl_T<T> *new_impl = 0;
-  ACE_NEW (new_impl,
-           Any_Basic_Impl_T (tc,
-                             value));
-  any.replace (new_impl);
-}
-
-template<typename T>
-CORBA::Boolean
-TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
-                                   CORBA::TypeCode_ptr tc,
-                                   T & _tao_elem)
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (_tao_equiv == 0)
-        {
-          return 0;
-        }
-
-      TAO::Any_Impl *impl = any.impl ();
-
-      ACE_Message_Block *mb = impl->_tao_get_cdr ();
-
-      if (mb == 0)
-        {
-          TAO::Any_Basic_Impl_T<T> *narrow_impl =
-            dynamic_cast <TAO::Any_Basic_Impl_T<T> *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = narrow_impl->value_;
-          return 1;
-        }
-
-      TAO::Any_Basic_Impl_T<T> *replacement =
-        TAO::Any_Basic_Impl_T<T>::create_empty (any_tc);
-
-      auto_ptr<TAO::Any_Basic_Impl_T<T> > replacement_safety (replacement);
-
-      TAO_InputCDR cdr (mb->data_block (),
-                        ACE_Message_Block::DONT_DELETE,
-                        mb->rd_ptr () - mb->base (),
-                        mb->wr_ptr () - mb->base (),
-                        impl->_tao_byte_order (),
-                                                            TAO_DEF_GIOP_MAJOR,
-                                                            TAO_DEF_GIOP_MINOR);
-
-      CORBA::Boolean result = replacement->demarshal_value (cdr);
-
-      if (result == 1)
-        {
-          _tao_elem = replacement->value_;
-          ACE_const_cast (CORBA::Any &, any).replace (replacement);
-          replacement_safety.release ();
-          return result;
-        }
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-template<typename T>
-TAO::Any_Basic_Impl_T<T> *
-TAO::Any_Basic_Impl_T<T>::create_empty (CORBA::TypeCode_ptr tc)
-{
-  TAO::Any_Basic_Impl_T<T> * retval = 0;
-  ACE_NEW_RETURN (retval,
-                  TAO::Any_Basic_Impl_T<T> (tc,
-                                            ACE_static_cast (T, 0)),
-                  0);
-  return retval;
-}
-
-template<typename T>
-void
-TAO::Any_Basic_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
-                                       ACE_ENV_ARG_DECL)
-{
-  if (! this->demarshal_value (cdr))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-// =======================================================================
-
-template<typename T, typename from_T, typename to_T>
-TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::Any_Special_Basic_Impl_T (
-    CORBA::TypeCode_ptr tc,
-    const T & val
-  )
-  : Any_Impl (0,
-              tc),
-    value_ (val)
-{
-}
-
-template<typename T, typename from_T, typename to_T>
-TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::~Any_Special_Basic_Impl_T (
-    void
-  )
-{
-}
-
-template<typename T, typename from_T, typename to_T> void
-TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::insert (
-    CORBA::Any & any,
-    CORBA::TypeCode_ptr tc,
-    const T & value
-  )
-{
-  Any_Special_Basic_Impl_T<T, from_T, to_T> *new_impl = 0;
-  ACE_NEW (new_impl,
-           Any_Special_Basic_Impl_T (tc,
-                                     value));
-  any.replace (new_impl);
-}
-
-template<typename T, typename from_T, typename to_T>
-CORBA::Boolean
-TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::extract (
-    const CORBA::Any & any,
-    CORBA::TypeCode_ptr tc,
-    T & _tao_elem
-  )
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-
-      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (_tao_equiv == 0)
-        {
-          return 0;
-        }
-
-      typedef TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>
-        UNSIGNED_CHAR_ANY_IMPL;
-
-      TAO::Any_Impl *impl = any.impl ();
-
-      ACE_Message_Block *mb = impl->_tao_get_cdr ();
-
-      if (mb == 0)
-        {
-          TAO::Any_Special_Basic_Impl_T<T, from_T, to_T> *narrow_impl =
-            dynamic_cast <UNSIGNED_CHAR_ANY_IMPL *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = narrow_impl->value_;
-          return 1;
-        }
-
-      TAO::Any_Special_Basic_Impl_T<T, from_T, to_T> *replacement = 0;
-      ACE_NEW_RETURN (replacement,
-                      UNSIGNED_CHAR_ANY_IMPL (any_tc,
-                                              0),
-                      0);
-
-      auto_ptr<UNSIGNED_CHAR_ANY_IMPL> replacement_safety (replacement);
-
-      TAO_InputCDR cdr (mb->data_block (),
-                        ACE_Message_Block::DONT_DELETE,
-                        mb->rd_ptr () - mb->base (),
-                        mb->wr_ptr () - mb->base (),
-                        impl->_tao_byte_order (),
-                                                            TAO_DEF_GIOP_MAJOR,
-                                                            TAO_DEF_GIOP_MINOR);
-
-      CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      impl->assign_translator (kind,
-                               &cdr);
-      CORBA::Boolean result = replacement->demarshal_value (cdr);
-
-      if (result == 1)
-        {
-          _tao_elem = replacement->value_;
-          ACE_const_cast (CORBA::Any &, any).replace (replacement);
-          replacement_safety.release ();
-          return result;
-        }
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-template<typename T, typename from_T, typename to_T>
-void
-TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::_tao_decode (TAO_InputCDR &cdr
-                                                             ACE_ENV_ARG_DECL)
-{
-  if (! this->demarshal_value (cdr))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-// =======================================================================
-
-template<typename T>
-TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (_tao_destructor destructor,
-                                          CORBA::TypeCode_ptr tc,
-                                          T * const val)
-  : Any_Impl (destructor,
-              tc),
-    value_ (val)
-{
-}
-
-template<typename T>
-TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (_tao_destructor destructor,
-                                          CORBA::TypeCode_ptr tc,
-                                          const T & val)
-  : Any_Impl (destructor,
-              tc)
-{
-  ACE_NEW (this->value_,
-           T (val));
-}
-
-template<typename T>
-TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (CORBA::TypeCode_ptr tc)
-  : Any_Impl (0,
-              tc)
-{
-}
-
-template<typename T>
-TAO::Any_Dual_Impl_T<T>::~Any_Dual_Impl_T (void)
-{
-}
-
-template<typename T>
-void
-TAO::Any_Dual_Impl_T<T>::insert (CORBA::Any & any,
-                                 _tao_destructor destructor,
-                                 CORBA::TypeCode_ptr tc,
-                                 T * const value)
-{
-  Any_Dual_Impl_T<T> *new_impl = 0;
-  ACE_NEW (new_impl,
-           Any_Dual_Impl_T (destructor,
-                            tc,
-                            value));
-  any.replace (new_impl);
-}
-
-template<typename T>
-void
-TAO::Any_Dual_Impl_T<T>::insert_copy (CORBA::Any & any,
-                                      _tao_destructor destructor,
-                                      CORBA::TypeCode_ptr tc,
-                                      const T & value)
-{
-  Any_Dual_Impl_T<T> *new_impl = 0;
-  ACE_NEW (new_impl,
-           Any_Dual_Impl_T (destructor,
-                            tc,
-                            value));
-  any.replace (new_impl);
-}
-
-template<typename T>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any,
-                                  _tao_destructor destructor,
-                                  CORBA::TypeCode_ptr tc,
-                                  const T *& _tao_elem)
-{
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (_tao_equiv == 0)
-        {
-          return 0;
-        }
-
-      TAO::Any_Impl *impl = any.impl ();
-
-      ACE_Message_Block *mb = impl->_tao_get_cdr ();
-
-      if (mb == 0)
-        {
-          TAO::Any_Dual_Impl_T<T> *narrow_impl =
-            dynamic_cast <TAO::Any_Dual_Impl_T<T> *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = narrow_impl->value_;
-          return 1;
-        }
-
-      T *empty_value = 0;
-      ACE_NEW_RETURN (empty_value,
-                      T,
-                      0);
-      TAO::Any_Dual_Impl_T<T> *replacement = 0;
-      ACE_NEW_RETURN (replacement,
-                      TAO::Any_Dual_Impl_T<T> (destructor,
-                                               any_tc,
-                                               empty_value),
-                      0);
-
-      auto_ptr<TAO::Any_Dual_Impl_T<T> > replacement_safety (replacement);
-
-      TAO_InputCDR cdr (mb->data_block (),
-                        ACE_Message_Block::DONT_DELETE,
-                        mb->rd_ptr () - mb->base (),
-                        mb->wr_ptr () - mb->base (),
-                        impl->_tao_byte_order (),
-                                                            TAO_DEF_GIOP_MAJOR,
-                                                            TAO_DEF_GIOP_MINOR);
-
-      CORBA::TCKind kind = any_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      impl->assign_translator (kind,
-                               &cdr);
-      CORBA::Boolean result = replacement->demarshal_value (cdr);
-
-      if (result == 1)
-        {
-          _tao_elem = replacement->value_;
-          ACE_const_cast (CORBA::Any &, any).replace (replacement);
-          replacement_safety.release ();
-          return result;
-        }
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-template<typename T>
-void
-TAO::Any_Dual_Impl_T<T>::free_value (void)
-{
-  if (this->value_destructor_ != 0)
-    {
-      (*this->value_destructor_) (this->value_);
-      this->value_destructor_ = 0;
-    }
-
-  this->value_ = 0;
-}
-
-template<typename T>
-void
-TAO::Any_Dual_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
-                                      ACE_ENV_ARG_DECL)
-{
-  if (! this->demarshal_value (cdr))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-#endif /* TAO_ANY_T_C */
diff --git a/TAO/tao/Any_T.h b/TAO/tao/Any_T.h
deleted file mode 100644
index fe3f2f5ab9c..00000000000
--- a/TAO/tao/Any_T.h
+++ /dev/null
@@ -1,282 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_T.h
- *
- *  $Id$
- *
- *  @author  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_ANY_T_H
-#define TAO_ANY_T_H
-
-#include "ace/pre.h"
-
-#include "tao/Any.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/AbstractBase.h"
-
-namespace TAO
-{
-  /**
-   * @class Any_Impl_T
-   *
-   * @brief Template Any class for pointer types.
-   *
-   * Used for interfaces and typecodes
-   */
-  template<typename T> 
-  class Any_Impl_T : public Any_Impl
-  {
-  public:
-    Any_Impl_T (_tao_destructor destructor,
-                CORBA::TypeCode_ptr,
-                T * const);
-    virtual ~Any_Impl_T (void);
-
-    static void insert (CORBA::Any &, 
-                        _tao_destructor destructor,
-                        CORBA::TypeCode_ptr,
-                        T * const);
-    static CORBA::Boolean extract (const CORBA::Any &,
-                                   _tao_destructor,
-                                   CORBA::TypeCode_ptr,
-                                   T *&);
-
-    virtual CORBA::Boolean to_object (CORBA::Object_ptr &) const;
-    virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const;
-    virtual CORBA::Boolean to_abstract_base (CORBA::AbstractBase_ptr &) const;
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual const void *value (void) const;
-    virtual void free_value (void);
-
-  private:
-    T * value_;
-  };
-
-  /**
-   * @class Any_Array_Impl_T
-   *
-   * @brief Template Any class for array types.
-   *
-   * Used for arrays
-   */
-  template<typename T_slice, typename T_forany> 
-  class Any_Array_Impl_T : public Any_Impl
-  {
-  public:
-    Any_Array_Impl_T (_tao_destructor destructor,
-                      CORBA::TypeCode_ptr,
-                      T_slice * const);
-    virtual ~Any_Array_Impl_T (void);
-
-    static void insert (CORBA::Any &, 
-                        _tao_destructor destructor,
-                        CORBA::TypeCode_ptr,
-                        T_slice * const);
-    static CORBA::Boolean extract (const CORBA::Any &,
-                                   _tao_destructor,
-                                   CORBA::TypeCode_ptr,
-                                   const T_slice *&);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual const void *value (void) const;
-    virtual void free_value (void);
-
-  private:
-    T_slice * value_;
-  };
-
-  /**
-   * @class Any_Basic_Impl_T
-   *
-   * @brief Template Any class for basic types.
-   *
-   * Used for all basic IDL types except bounded (w)strings.
-   */
-  template<typename T> 
-  class Any_Basic_Impl_T : public Any_Impl
-  {
-  public:
-    Any_Basic_Impl_T (CORBA::TypeCode_ptr,
-                      const T & val);
-    virtual ~Any_Basic_Impl_T (void);
-
-    static void insert (CORBA::Any &,
-                        CORBA::TypeCode_ptr,
-                        const T &);
-    static CORBA::Boolean extract (const CORBA::Any &, 
-                                   CORBA::TypeCode_ptr,
-                                   T &);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual const void *value (void) const;
-    static Any_Basic_Impl_T<T> *create_empty (CORBA::TypeCode_ptr);
-
-  private:
-    T value_;
-  };
-
-  /**
-   * @class Any_Special_Impl_T
-   *
-   * @brief Template Any class for bounded IDL (w)strings.
-   */
-  template<typename T, typename from_T, typename to_T>
-  class Any_Special_Impl_T : public Any_Impl
-  {
-  public:
-    Any_Special_Impl_T (_tao_destructor destructor,
-                        CORBA::TypeCode_ptr,
-                        T * const,
-                        CORBA::ULong bound);
-    virtual ~Any_Special_Impl_T (void);
-
-    static void insert (CORBA::Any &,
-                        _tao_destructor destructor,
-                        CORBA::TypeCode_ptr,
-                        T * const,
-                        CORBA::ULong bound);
-    static CORBA::Boolean extract (const CORBA::Any &,
-                                   _tao_destructor,
-                                   CORBA::TypeCode_ptr,
-                                   const T *&,
-                                   CORBA::ULong bound);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual const void *value (void) const;
-    virtual void free_value (void);
-
-  private:
-    T * value_;
-    CORBA::ULong bound_;
-  };
-
-  /**
-   * @class Any_Special_Basic_Impl_T
-   *
-   * @brief Template Any class for special basic types.
-   *
-   * Used for the basic IDL types that usually map to unsigned char
-   * or unsigned short - boolean, char, wchar and octet.
-   */
-  template<typename T, typename from_T, typename to_T>
-  class Any_Special_Basic_Impl_T : public Any_Impl
-  {
-  public:
-    Any_Special_Basic_Impl_T (CORBA::TypeCode_ptr,
-                              const T & val);
-    virtual ~Any_Special_Basic_Impl_T (void);
-
-    static void insert (CORBA::Any &,
-                        CORBA::TypeCode_ptr,
-                        const T &);
-    static CORBA::Boolean extract (const CORBA::Any &, 
-                                   CORBA::TypeCode_ptr,
-                                   T &);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual const void *value (void) const;
-
-  private:
-    T value_;
-  };
-
-  /**
-   * @class Any_Dual_Impl_T
-   *
-   * @brief Template Any class for IDL types with 2 modes of insertion
-   *
-   * Used for the IDL types that have copying and non-copying insertion,
-   * but which are not (de)marshaled as pointers - struct, union, sequence,
-   * and exception.
-   */
-  template<typename T>
-  class Any_Dual_Impl_T : public Any_Impl
-  {
-  public:
-    Any_Dual_Impl_T (_tao_destructor destructor,
-                     CORBA::TypeCode_ptr,
-                     T * const);
-    Any_Dual_Impl_T (_tao_destructor destructor,
-                     CORBA::TypeCode_ptr,
-                     const T &);
-    Any_Dual_Impl_T (CORBA::TypeCode_ptr);
-    virtual ~Any_Dual_Impl_T (void);
-
-    static void insert (CORBA::Any &,
-                        _tao_destructor,
-                        CORBA::TypeCode_ptr,
-                        T * const);
-    static void insert_copy (CORBA::Any &, 
-                             _tao_destructor destructor,
-                             CORBA::TypeCode_ptr,
-                             const T &);
-    static CORBA::Boolean extract (const CORBA::Any &,
-                                   _tao_destructor,
-                                   CORBA::TypeCode_ptr,
-                                   const T *&);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual const void *value (void) const;
-    virtual void free_value (void);
-
-  protected:
-    T * value_;
-  };
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Any_T.inl"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Any_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Any_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include "ace/post.h"
-
-#endif /* TAO_ANY_T_H */
-
diff --git a/TAO/tao/Any_T.inl b/TAO/tao/Any_T.inl
deleted file mode 100644
index 350b0334f98..00000000000
--- a/TAO/tao/Any_T.inl
+++ /dev/null
@@ -1,192 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// These three are overridden in generated code where appropriate.
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Impl_T<T>::to_object (CORBA::Object_ptr &) const
-{
-  return 0;
-}
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Impl_T<T>::to_value (CORBA::ValueBase *&) const
-{
-  return 0;
-}
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Impl_T<T>::to_abstract_base (CORBA::AbstractBase_ptr &) const
-{
-  return 0;
-}
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Impl_T<T>::marshal_value (TAO_OutputCDR &cdr)
-{
-  return (cdr << this->value_);
-}
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Impl_T<T>::demarshal_value (TAO_InputCDR &cdr)
-{
-  return (cdr >> this->value_);
-}
-
-template<typename T> 
-ACE_INLINE 
-const void *
-TAO::Any_Impl_T<T>::value (void) const
-{
-  return this->value_;
-}
-
-// ***********************************************************************
-
-template<typename T_slice, typename T_forany> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Array_Impl_T<T_slice, T_forany>::marshal_value (TAO_OutputCDR &cdr)
-{
-  return (cdr << T_forany (this->value_));
-}
-
-template<typename T_slice, typename T_forany> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Array_Impl_T<T_slice, T_forany>::demarshal_value (TAO_InputCDR &cdr)
-{
-  T_forany tmp (this->value_);
-  return (cdr >> tmp);
-}
-
-template<typename T_slice, typename T_forany> 
-ACE_INLINE 
-const void *
-TAO::Any_Array_Impl_T<T_slice, T_forany>::value (void) const
-{
-  return this->value_;
-}
-
-// ***********************************************************************
-
-template<typename T, typename from_T, typename to_T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Special_Impl_T<T, from_T, to_T>::marshal_value (
-    TAO_OutputCDR &cdr
-  )
-{
-  return (cdr << from_T (this->value_, this->bound_));
-}
-
-template<typename T, typename from_T, typename to_T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Special_Impl_T<T, from_T, to_T>::demarshal_value (
-    TAO_InputCDR &cdr
-  )
-{
-  return (cdr >> to_T (this->value_, this->bound_));
-}
-
-template<typename T, typename from_T, typename to_T> 
-ACE_INLINE 
-const void *
-TAO::Any_Special_Impl_T<T, from_T, to_T>::value (void) const
-{
-  return this->value_;
-}
-
-// ***********************************************************************
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Basic_Impl_T<T>::marshal_value (TAO_OutputCDR &cdr)
-{
-  return (cdr << this->value_);
-}
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Basic_Impl_T<T>::demarshal_value (TAO_InputCDR &cdr)
-{
-  return (cdr >> this->value_);
-}
-
-template<typename T> 
-ACE_INLINE 
-const void *
-TAO::Any_Basic_Impl_T<T>::value (void) const
-{
-  return &this->value_;
-}
-
-// ***********************************************************************
-
-template<typename T, typename from_T, typename to_T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::marshal_value (
-    TAO_OutputCDR &cdr
-  )
-{
-  return (cdr << from_T (this->value_));
-}
-
-template<typename T, typename from_T, typename to_T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::demarshal_value (
-    TAO_InputCDR &cdr
-  )
-{
-  return (cdr >> to_T (this->value_));
-}
-
-template<typename T, typename from_T, typename to_T> 
-ACE_INLINE 
-const void *
-TAO::Any_Special_Basic_Impl_T<T, from_T, to_T>::value (void) const
-{
-  return &this->value_;
-}
-
-// ***********************************************************************
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<T>::marshal_value (TAO_OutputCDR &cdr)
-{
-  return (cdr << *this->value_);
-}
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<T>::demarshal_value (TAO_InputCDR &cdr)
-{
-  return (cdr >> *this->value_);
-}
-
-template<typename T> 
-ACE_INLINE 
-const void *
-TAO::Any_Dual_Impl_T<T>::value (void) const
-{
-  return this->value_;
-}
-
diff --git a/TAO/tao/BiDir_GIOP/Makefile b/TAO/tao/BiDir_GIOP/Makefile
index 4ddd7558afd..6e1d1714dbb 100644
--- a/TAO/tao/BiDir_GIOP/Makefile
+++ b/TAO/tao/BiDir_GIOP/Makefile
@@ -70,8 +70,7 @@ endif
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/BiDirGIOP.o .obj/BiDirGIOP.so .shobj/BiDirGIOP.o .shobj/BiDirGIOP.so: BiDirGIOP.cpp BiDirGIOP.h \
-  $(ACE_ROOT)/ace/pre.h bidirgiop_export.h \
+.obj/BiDirGIOP.o .obj/BiDirGIOP.SO .shobj/BiDirGIOP.o .shobj/BiDirGIOP.SO: BiDirGIOP.cpp BiDirGIOP.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -111,8 +110,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -250,15 +248,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -268,23 +267,15 @@ endif
   $(TAO_ROOT)/tao/PolicyC.i BiDirPolicyC.i \
   BiDir_ORBInitializer.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -293,8 +284,7 @@ endif
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  BiDirPolicy_Validator.h \
+  $(TAO_ROOT)/tao/LocalObject.i BiDirPolicy_Validator.h \
   $(TAO_ROOT)/tao/Policy_Validator.h \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
@@ -367,7 +357,7 @@ endif
   $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i
 
-.obj/BiDirPolicyC.o .obj/BiDirPolicyC.so .shobj/BiDirPolicyC.o .shobj/BiDirPolicyC.so: BiDirPolicyC.cpp BiDirGIOP.h \
+.obj/BiDirPolicyC.o .obj/BiDirPolicyC.SO .shobj/BiDirPolicyC.o .shobj/BiDirPolicyC.SO: BiDirPolicyC.cpp BiDirGIOP.h \
   $(ACE_ROOT)/ace/pre.h bidirgiop_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -408,8 +398,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -547,15 +536,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -564,15 +554,15 @@ endif
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i BiDirPolicyC.i
 
-.obj/BiDir_ORBInitializer.o .obj/BiDir_ORBInitializer.so .shobj/BiDir_ORBInitializer.o .shobj/BiDir_ORBInitializer.so: BiDir_ORBInitializer.cpp BiDir_ORBInitializer.h \
+.obj/BiDir_ORBInitializer.o .obj/BiDir_ORBInitializer.SO .shobj/BiDir_ORBInitializer.o .shobj/BiDir_ORBInitializer.SO: BiDir_ORBInitializer.cpp BiDir_ORBInitializer.h \
   $(ACE_ROOT)/ace/pre.h bidirgiop_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -584,7 +574,6 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
@@ -607,8 +596,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -718,63 +706,57 @@ endif
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
   $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
@@ -789,15 +771,15 @@ endif
   $(ACE_ROOT)/ace/Service_Object.i BiDirPolicyC.h \
   BiDirPolicyC.i
 
-.obj/BiDir_PolicyFactory.o .obj/BiDir_PolicyFactory.so .shobj/BiDir_PolicyFactory.o .shobj/BiDir_PolicyFactory.so: BiDir_PolicyFactory.cpp BiDir_PolicyFactory.h \
+.obj/BiDir_PolicyFactory.o .obj/BiDir_PolicyFactory.SO .shobj/BiDir_PolicyFactory.o .shobj/BiDir_PolicyFactory.SO: BiDir_PolicyFactory.cpp BiDir_PolicyFactory.h \
   $(ACE_ROOT)/ace/pre.h bidirgiop_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -809,7 +791,6 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
@@ -832,8 +813,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -943,63 +923,57 @@ endif
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
   $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
@@ -1014,7 +988,7 @@ endif
   $(ACE_ROOT)/ace/Service_Object.i BiDirPolicyC.h \
   BiDirPolicyC.i BiDir_Policy_i.h BiDir_Policy_i.inl
 
-.obj/BiDir_Policy_i.o .obj/BiDir_Policy_i.so .shobj/BiDir_Policy_i.o .shobj/BiDir_Policy_i.so: BiDir_Policy_i.cpp BiDir_Policy_i.h \
+.obj/BiDir_Policy_i.o .obj/BiDir_Policy_i.SO .shobj/BiDir_Policy_i.o .shobj/BiDir_Policy_i.SO: BiDir_Policy_i.cpp BiDir_Policy_i.h \
   $(ACE_ROOT)/ace/pre.h bidirgiop_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -1055,8 +1029,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -1194,15 +1167,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -1217,9 +1191,6 @@ endif
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -1251,20 +1222,15 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -1314,7 +1280,7 @@ endif
   $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
   $(TAO_ROOT)/tao/Stub.i
 
-.obj/BiDirPolicy_Validator.o .obj/BiDirPolicy_Validator.so .shobj/BiDirPolicy_Validator.o .shobj/BiDirPolicy_Validator.so: BiDirPolicy_Validator.cpp \
+.obj/BiDirPolicy_Validator.o .obj/BiDirPolicy_Validator.SO .shobj/BiDirPolicy_Validator.o .shobj/BiDirPolicy_Validator.SO: BiDirPolicy_Validator.cpp \
   BiDirPolicy_Validator.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -1355,8 +1321,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1495,15 +1460,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -1518,9 +1484,6 @@ endif
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -1549,20 +1512,15 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp
index 1e35a37bd98..355ac4293a3 100644
--- a/TAO/tao/CONV_FRAMEC.cpp
+++ b/TAO/tao/CONV_FRAMEC.cpp
@@ -23,8 +23,8 @@
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:314
 
 
-#include "CONV_FRAMEC.h"
-#include "tao/Any_T.h"
+#include "tao/CONV_FRAMEC.h"
+#include "tao/Any_Dual_Impl_T.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
diff --git a/TAO/tao/ClientRequestInfo_i.cpp b/TAO/tao/ClientRequestInfo_i.cpp
index 27527bf7b4e..7c90b33fbb9 100644
--- a/TAO/tao/ClientRequestInfo_i.cpp
+++ b/TAO/tao/ClientRequestInfo_i.cpp
@@ -1,11 +1,13 @@
 #include "ClientRequestInfo_i.h"
 #include "Invocation.h"
 #include "Stub.h"
-#include "AbstractBase.h"
 #include "Profile.h"
 #include "Tagged_Components.h"
+#include "Valuetype_Adapter.h"
 #include "debug.h"
 
+#include "ace/Dynamic_Service.h"
+
 ACE_RCSID (TAO,
            ClientRequestInfo_i,
            "$Id$")
@@ -20,7 +22,7 @@ TAO_ClientRequestInfo_i::TAO_ClientRequestInfo_i (TAO_GIOP_Invocation *inv,
                                                   CORBA::Object_ptr target)
   : invocation_ (inv),
     target_ (target), // No need to duplicate.
-    abstract_target_ (CORBA::AbstractBase::_nil ()),
+    abstract_target_ (0),
     caught_exception_ (0),
     response_expected_ (1),
     reply_status_ (-1),
@@ -77,24 +79,38 @@ TAO_ClientRequestInfo_i::setup_picurrent (void)
       //
       // Only set the TSC's peer if a copy was actually performed.
       if (this->rs_pi_current_.dirty ())
-        tsc->pi_peer (&this->rs_pi_current_);
+        {
+          tsc->pi_peer (&this->rs_pi_current_);
+        }
     }
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo_i::target (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ClientRequestInfo_i::target (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->target_))
     {
-      return this->abstract_target_->_to_object ();
+      
+      TAO_Valuetype_Adapter *adapter =
+        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
+            TAO_ORB_Core::valuetype_adapter_name ()
+          );
+
+      if (adapter == 0)
+        {
+          ACE_THROW_RETURN (CORBA::INTERNAL (),
+                            CORBA::Object::_nil ());
+        }
+
+      return adapter->abstractbase_to_object (this->abstract_target_);
     }
 
   return CORBA::Object::_duplicate (this->target_);
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo_i::effective_target (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ClientRequestInfo_i::effective_target (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->reply_status_ == PortableInterceptor::LOCATION_FORWARD)
@@ -107,7 +123,18 @@ TAO_ClientRequestInfo_i::effective_target (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
   if (CORBA::is_nil (this->target_))
     {
-      return this->abstract_target_->_to_object ();
+      TAO_Valuetype_Adapter *adapter =
+        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
+            TAO_ORB_Core::valuetype_adapter_name ()
+          );
+
+      if (adapter == 0)
+        {
+          ACE_THROW_RETURN (CORBA::INTERNAL (),
+                            CORBA::Object::_nil ());
+        }
+
+      return adapter->abstractbase_to_object (this->abstract_target_);
     }
 
   return CORBA::Object::_duplicate (this->target_);
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index 2ec0188944c..fe32df7bae8 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -31,8 +31,8 @@
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/Any_T.h"
 
+#include "tao/Any_Impl_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/Domain/Makefile b/TAO/tao/Domain/Makefile
index d6941d0770a..1e8cdbe0b72 100644
--- a/TAO/tao/Domain/Makefile
+++ b/TAO/tao/Domain/Makefile
@@ -61,7 +61,7 @@ endif
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/DomainS.o .obj/DomainS.so .shobj/DomainS.o .shobj/DomainS.so: DomainS.cpp DomainS.h $(ACE_ROOT)/ace/pre.h \
+.obj/DomainS.o .obj/DomainS.SO .shobj/DomainS.o .shobj/DomainS.SO: DomainS.cpp DomainS.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -104,8 +104,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -235,15 +234,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -254,6 +254,12 @@ endif
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
@@ -330,9 +336,6 @@ endif
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/GIOPC.h \
   $(TAO_ROOT)/tao/GIOPC.i \
@@ -344,20 +347,12 @@ endif
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
@@ -431,9 +426,33 @@ endif
   $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.h \
   $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.inl \
   $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Array_VarOut_T.h \
+  $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/IFR_Client/ifr_client_export.h \
   $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.h \
   $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.h \
-  $(TAO_ROOT)/tao/IFR_Client/ifr_client_export.h \
   $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.i \
   $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.i \
   $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.i \
diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h
index 3e1a1e13bdd..371684846da 100644
--- a/TAO/tao/DynamicAny/DynAny_i.h
+++ b/TAO/tao/DynamicAny/DynAny_i.h
@@ -25,7 +25,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "DynCommon.h"
-#include "tao/Any_T.h"
 
 #if defined (_MSC_VER)
 # if (_MSC_VER >= 1200)
diff --git a/TAO/tao/DynamicAny/Makefile b/TAO/tao/DynamicAny/Makefile
index 96c683bc3b6..239e04acf02 100644
--- a/TAO/tao/DynamicAny/Makefile
+++ b/TAO/tao/DynamicAny/Makefile
@@ -74,7 +74,7 @@ endif
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/DynamicAny.o .obj/DynamicAny.so .shobj/DynamicAny.o .shobj/DynamicAny.so: DynamicAny.cpp DynamicAny.h \
+.obj/DynamicAny.o .obj/DynamicAny.SO .shobj/DynamicAny.o .shobj/DynamicAny.SO: DynamicAny.cpp DynamicAny.h \
   $(ACE_ROOT)/ace/pre.h dynamicany_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -115,8 +115,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -218,7 +217,7 @@ endif
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -256,16 +255,32 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -274,9 +289,6 @@ endif
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -292,13 +304,6 @@ endif
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/BoundsC.h \
   $(TAO_ROOT)/tao/BoundsC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -312,10 +317,10 @@ endif
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -325,7 +330,7 @@ endif
   $(TAO_ROOT)/tao/PortableInterceptorC.i DynamicAnyC.i \
   DynAnyFactory.h
 
-.obj/DynAnyFactory.o .obj/DynAnyFactory.so .shobj/DynAnyFactory.o .shobj/DynAnyFactory.so: DynAnyFactory.cpp DynAnyFactory.h \
+.obj/DynAnyFactory.o .obj/DynAnyFactory.SO .shobj/DynAnyFactory.o .shobj/DynAnyFactory.SO: DynAnyFactory.cpp DynAnyFactory.h \
   $(ACE_ROOT)/ace/pre.h DynamicAny.h dynamicany_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -366,8 +371,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -469,7 +473,7 @@ endif
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -507,16 +511,32 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -525,9 +545,6 @@ endif
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -543,13 +560,6 @@ endif
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/BoundsC.h \
   $(TAO_ROOT)/tao/BoundsC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -563,10 +573,10 @@ endif
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -585,8 +595,8 @@ endif
   $(ACE_ROOT)/ace/Containers_T.cpp DynSequence_i.h \
   DynEnum_i.h DynArray_i.h DynUnion_i.h
 
-.obj/DynCommon.o .obj/DynCommon.so .shobj/DynCommon.o .shobj/DynCommon.so: DynCommon.cpp DynCommon.h \
-  $(ACE_ROOT)/ace/pre.h DynamicAny.h dynamicany_export.h \
+.obj/DynCommon.o .obj/DynCommon.SO .shobj/DynCommon.o .shobj/DynCommon.SO: DynCommon.cpp DynCommon.h $(ACE_ROOT)/ace/pre.h \
+  DynamicAny.h dynamicany_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -626,8 +636,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -729,7 +738,7 @@ endif
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -767,16 +776,32 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -785,9 +810,6 @@ endif
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -803,13 +825,6 @@ endif
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/BoundsC.h \
   $(TAO_ROOT)/tao/BoundsC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -823,10 +838,10 @@ endif
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -845,7 +860,7 @@ endif
   $(ACE_ROOT)/ace/Containers_T.cpp DynEnum_i.h \
   DynSequence_i.h DynStruct_i.h DynUnion_i.h
 
-.obj/DynAny_i.o .obj/DynAny_i.so .shobj/DynAny_i.o .shobj/DynAny_i.so: DynAny_i.cpp DynAny_i.h $(ACE_ROOT)/ace/pre.h \
+.obj/DynAny_i.o .obj/DynAny_i.SO .shobj/DynAny_i.o .shobj/DynAny_i.SO: DynAny_i.cpp DynAny_i.h $(ACE_ROOT)/ace/pre.h \
   DynamicAny.h dynamicany_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -886,8 +901,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -989,7 +1003,7 @@ endif
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1027,16 +1041,32 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -1045,9 +1075,6 @@ endif
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -1063,13 +1090,6 @@ endif
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/BoundsC.h \
   $(TAO_ROOT)/tao/BoundsC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -1083,10 +1103,10 @@ endif
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -1096,7 +1116,7 @@ endif
   $(TAO_ROOT)/tao/PortableInterceptorC.i DynamicAnyC.i \
   DynCommon.h DynAnyFactory.h
 
-.obj/DynStruct_i.o .obj/DynStruct_i.so .shobj/DynStruct_i.o .shobj/DynStruct_i.so: DynStruct_i.cpp DynStruct_i.h \
+.obj/DynStruct_i.o .obj/DynStruct_i.SO .shobj/DynStruct_i.o .shobj/DynStruct_i.SO: DynStruct_i.cpp DynStruct_i.h \
   $(ACE_ROOT)/ace/pre.h DynamicAny.h dynamicany_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -1137,8 +1157,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -1240,7 +1259,7 @@ endif
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1278,16 +1297,32 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -1296,9 +1331,6 @@ endif
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -1314,13 +1346,6 @@ endif
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/BoundsC.h \
   $(TAO_ROOT)/tao/BoundsC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -1334,10 +1359,10 @@ endif
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -1354,7 +1379,7 @@ endif
   $(ACE_ROOT)/ace/Containers_T.i \
   $(ACE_ROOT)/ace/Containers_T.cpp DynAnyFactory.h
 
-.obj/DynSequence_i.o .obj/DynSequence_i.so .shobj/DynSequence_i.o .shobj/DynSequence_i.so: DynSequence_i.cpp DynSequence_i.h \
+.obj/DynSequence_i.o .obj/DynSequence_i.SO .shobj/DynSequence_i.o .shobj/DynSequence_i.SO: DynSequence_i.cpp DynSequence_i.h \
   $(ACE_ROOT)/ace/pre.h DynamicAny.h dynamicany_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -1395,8 +1420,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -1498,7 +1522,7 @@ endif
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1536,16 +1560,32 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -1554,9 +1594,6 @@ endif
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -1572,13 +1609,6 @@ endif
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/BoundsC.h \
   $(TAO_ROOT)/tao/BoundsC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -1592,10 +1622,10 @@ endif
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -1612,8 +1642,8 @@ endif
   $(ACE_ROOT)/ace/Containers_T.i \
   $(ACE_ROOT)/ace/Containers_T.cpp DynAnyFactory.h
 
-.obj/DynEnum_i.o .obj/DynEnum_i.so .shobj/DynEnum_i.o .shobj/DynEnum_i.so: DynEnum_i.cpp DynEnum_i.h \
-  $(ACE_ROOT)/ace/pre.h DynamicAny.h dynamicany_export.h \
+.obj/DynEnum_i.o .obj/DynEnum_i.SO .shobj/DynEnum_i.o .shobj/DynEnum_i.SO: DynEnum_i.cpp DynEnum_i.h $(ACE_ROOT)/ace/pre.h \
+  DynamicAny.h dynamicany_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -1653,8 +1683,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -1756,7 +1785,7 @@ endif
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1794,16 +1823,32 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -1812,9 +1857,6 @@ endif
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -1830,13 +1872,6 @@ endif
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/BoundsC.h \
   $(TAO_ROOT)/tao/BoundsC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -1850,10 +1885,10 @@ endif
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -1870,7 +1905,7 @@ endif
   $(ACE_ROOT)/ace/Containers_T.i \
   $(ACE_ROOT)/ace/Containers_T.cpp DynAnyFactory.h
 
-.obj/DynArray_i.o .obj/DynArray_i.so .shobj/DynArray_i.o .shobj/DynArray_i.so: DynArray_i.cpp DynArray_i.h \
+.obj/DynArray_i.o .obj/DynArray_i.SO .shobj/DynArray_i.o .shobj/DynArray_i.SO: DynArray_i.cpp DynArray_i.h \
   $(ACE_ROOT)/ace/pre.h DynamicAny.h dynamicany_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -1911,8 +1946,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -2014,7 +2048,7 @@ endif
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2052,16 +2086,32 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -2070,9 +2120,6 @@ endif
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -2088,13 +2135,6 @@ endif
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/BoundsC.h \
   $(TAO_ROOT)/tao/BoundsC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -2108,10 +2148,10 @@ endif
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -2128,7 +2168,7 @@ endif
   $(ACE_ROOT)/ace/Containers_T.i \
   $(ACE_ROOT)/ace/Containers_T.cpp DynAnyFactory.h
 
-.obj/DynUnion_i.o .obj/DynUnion_i.so .shobj/DynUnion_i.o .shobj/DynUnion_i.so: DynUnion_i.cpp DynUnion_i.h \
+.obj/DynUnion_i.o .obj/DynUnion_i.SO .shobj/DynUnion_i.o .shobj/DynUnion_i.SO: DynUnion_i.cpp DynUnion_i.h \
   $(ACE_ROOT)/ace/pre.h DynamicAny.h dynamicany_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -2169,8 +2209,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -2272,7 +2311,7 @@ endif
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2310,16 +2349,32 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -2328,9 +2383,6 @@ endif
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -2346,13 +2398,6 @@ endif
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/BoundsC.h \
   $(TAO_ROOT)/tao/BoundsC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -2366,10 +2411,10 @@ endif
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -2379,7 +2424,7 @@ endif
   $(TAO_ROOT)/tao/PortableInterceptorC.i DynamicAnyC.i \
   DynCommon.h DynAnyFactory.h
 
-.obj/DynamicAnyC.o .obj/DynamicAnyC.so .shobj/DynamicAnyC.o .shobj/DynamicAnyC.so: DynamicAnyC.cpp DynamicAny.h \
+.obj/DynamicAnyC.o .obj/DynamicAnyC.SO .shobj/DynamicAnyC.o .shobj/DynamicAnyC.SO: DynamicAnyC.cpp DynamicAny.h \
   $(ACE_ROOT)/ace/pre.h dynamicany_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -2420,8 +2465,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -2523,7 +2567,7 @@ endif
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2561,16 +2605,32 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -2579,9 +2639,6 @@ endif
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -2597,13 +2654,6 @@ endif
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/BoundsC.h \
   $(TAO_ROOT)/tao/BoundsC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -2617,10 +2667,10 @@ endif
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -2698,9 +2748,6 @@ endif
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/LF_Event.h \
diff --git a/TAO/tao/DynamicC.h b/TAO/tao/DynamicC.h
index ec159b3abc7..7ff32e455b1 100644
--- a/TAO/tao/DynamicC.h
+++ b/TAO/tao/DynamicC.h
@@ -37,9 +37,10 @@
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "StringSeqC.h"
+#include "tao/Any_Dual_Impl_T.h"
 #include "tao/TAO_Export.h"
-#include "tao/Any_T.h"
 #include "tao/Sequence.h"
 #include "tao/VarOut_T.h"
 #include "tao/Seq_Var_T.h"
diff --git a/TAO/tao/DynamicInterface/Makefile b/TAO/tao/DynamicInterface/Makefile
index 354b8861032..92651cbf296 100644
--- a/TAO/tao/DynamicInterface/Makefile
+++ b/TAO/tao/DynamicInterface/Makefile
@@ -71,7 +71,7 @@ endif
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/Context.o .obj/Context.so .shobj/Context.o .shobj/Context.so: Context.cpp Context.h $(ACE_ROOT)/ace/pre.h \
+.obj/Context.o .obj/Context.SO .shobj/Context.o .shobj/Context.SO: Context.cpp Context.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -111,8 +111,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
@@ -249,12 +248,15 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
   $(TAO_ROOT)/tao/NVList.i
 
-.obj/DII_Invocation.o .obj/DII_Invocation.so .shobj/DII_Invocation.o .shobj/DII_Invocation.so: DII_Invocation.cpp DII_Invocation.h \
+.obj/DII_Invocation.o .obj/DII_Invocation.SO .shobj/DII_Invocation.o .shobj/DII_Invocation.SO: DII_Invocation.cpp DII_Invocation.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/CDR.h \
@@ -298,12 +300,22 @@ endif
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Invocation_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/operation_details.h \
+  $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
@@ -421,9 +433,12 @@ endif
   $(TAO_ROOT)/tao/Seq_Out_T.inl \
   $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
@@ -436,32 +451,16 @@ endif
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
-  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
-  $(TAO_ROOT)/tao/LF_Invocation_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.inl \
-  $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/operation_details.h \
-  $(TAO_ROOT)/tao/Service_Context.h \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
   $(TAO_ROOT)/tao/target_specification.i \
@@ -550,20 +549,12 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -610,7 +601,7 @@ endif
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/Transport_Mux_Strategy.h
 
-.obj/DII_Reply_Dispatcher.o .obj/DII_Reply_Dispatcher.so .shobj/DII_Reply_Dispatcher.o .shobj/DII_Reply_Dispatcher.so: DII_Reply_Dispatcher.cpp DII_Reply_Dispatcher.h \
+.obj/DII_Reply_Dispatcher.o .obj/DII_Reply_Dispatcher.SO .shobj/DII_Reply_Dispatcher.o .shobj/DII_Reply_Dispatcher.SO: DII_Reply_Dispatcher.cpp DII_Reply_Dispatcher.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -648,8 +639,7 @@ endif
   $(TAO_ROOT)/tao/Cache_Entries.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -660,8 +650,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -754,7 +743,6 @@ endif
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
@@ -783,37 +771,14 @@ endif
   $(TAO_ROOT)/tao/Seq_Out_T.inl \
   $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
@@ -822,9 +787,6 @@ endif
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
   $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.i \
   Request.h Dynamic_Adapter_Impl.h \
@@ -849,6 +811,24 @@ endif
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
@@ -882,22 +862,21 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -938,7 +917,7 @@ endif
   $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i
 
-.obj/DII_ClientRequestInfo.o .obj/DII_ClientRequestInfo.so .shobj/DII_ClientRequestInfo.o .shobj/DII_ClientRequestInfo.so: DII_ClientRequestInfo.cpp \
+.obj/DII_ClientRequestInfo.o .obj/DII_ClientRequestInfo.SO .shobj/DII_ClientRequestInfo.o .shobj/DII_ClientRequestInfo.SO: DII_ClientRequestInfo.cpp \
   DII_ClientRequestInfo.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/ClientRequestInfo_i.h \
   $(TAO_ROOT)/tao/corbafwd.h \
@@ -961,9 +940,8 @@ endif
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -982,8 +960,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1093,63 +1070,57 @@ endif
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
   $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
@@ -1194,7 +1165,7 @@ endif
   Request.inl \
   $(TAO_ROOT)/tao/RequestInfo_Util.h
 
-.obj/Dynamic_Adapter_Impl.o .obj/Dynamic_Adapter_Impl.so .shobj/Dynamic_Adapter_Impl.o .shobj/Dynamic_Adapter_Impl.so: Dynamic_Adapter_Impl.cpp Dynamic_Adapter_Impl.h \
+.obj/Dynamic_Adapter_Impl.o .obj/Dynamic_Adapter_Impl.SO .shobj/Dynamic_Adapter_Impl.o .shobj/Dynamic_Adapter_Impl.SO: Dynamic_Adapter_Impl.cpp Dynamic_Adapter_Impl.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/Dynamic_Adapter.h \
   $(TAO_ROOT)/tao/corbafwd.h \
@@ -1229,8 +1200,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -1239,8 +1209,7 @@ endif
   $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
-  dynamicinterface_export.h \
-  $(ACE_ROOT)/ace/Service_Config.h \
+  dynamicinterface_export.h $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Node.h \
   $(ACE_ROOT)/ace/Node.cpp \
@@ -1393,13 +1362,11 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -1409,12 +1376,14 @@ endif
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/NVList.h \
-  $(TAO_ROOT)/tao/NVList.i Request.inl \
-  Server_Request.h \
+  $(TAO_ROOT)/tao/NVList.i Request.inl Server_Request.h \
   $(TAO_ROOT)/tao/TAO_Server_Request.h \
   $(TAO_ROOT)/tao/Tagged_Profile.h \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/GIOPC.h \
@@ -1427,20 +1396,12 @@ endif
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
@@ -1451,9 +1412,6 @@ endif
   Server_Request.inl $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/LF_Event.h \
@@ -1542,7 +1500,7 @@ endif
   $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i
 
-.obj/Dynamic_Implementation.o .obj/Dynamic_Implementation.so .shobj/Dynamic_Implementation.o .shobj/Dynamic_Implementation.so: Dynamic_Implementation.cpp \
+.obj/Dynamic_Implementation.o .obj/Dynamic_Implementation.SO .shobj/Dynamic_Implementation.o .shobj/Dynamic_Implementation.SO: Dynamic_Implementation.cpp \
   Dynamic_Implementation.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -1586,8 +1544,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1717,15 +1674,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -1735,6 +1693,12 @@ endif
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
   $(ACE_ROOT)/ace/Atomic_Op.h \
@@ -1755,9 +1719,6 @@ endif
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/GIOPC.h \
   $(TAO_ROOT)/tao/GIOPC.i \
@@ -1769,20 +1730,12 @@ endif
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
@@ -1883,6 +1836,17 @@ endif
   $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \
   $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
   $(TAO_ROOT)/tao/PortableServer/POAManager.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/PortableServer/POAManager.i \
   $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.h \
   $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.i \
@@ -1894,7 +1858,7 @@ endif
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/ExceptionList.o .obj/ExceptionList.so .shobj/ExceptionList.o .shobj/ExceptionList.so: ExceptionList.cpp ExceptionList.h \
+.obj/ExceptionList.o .obj/ExceptionList.SO .shobj/ExceptionList.o .shobj/ExceptionList.SO: ExceptionList.cpp ExceptionList.h \
   $(ACE_ROOT)/ace/pre.h dynamicinterface_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -1935,8 +1899,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
@@ -2038,7 +2001,7 @@ endif
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i
 
-.obj/Request.o .obj/Request.so .shobj/Request.o .shobj/Request.so: Request.cpp Request.h $(ACE_ROOT)/ace/pre.h \
+.obj/Request.o .obj/Request.SO .shobj/Request.o .shobj/Request.SO: Request.cpp Request.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/post.h \
@@ -2072,8 +2035,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -2082,8 +2044,7 @@ endif
   $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
-  dynamicinterface_export.h \
-  $(ACE_ROOT)/ace/Service_Config.h \
+  dynamicinterface_export.h $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Node.h \
   $(ACE_ROOT)/ace/Node.cpp \
@@ -2236,13 +2197,11 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -2252,17 +2211,10 @@ endif
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/NVList.h \
-  $(TAO_ROOT)/tao/NVList.i Request.inl \
-  DII_Invocation.h $(TAO_ROOT)/tao/Invocation.h \
+  $(TAO_ROOT)/tao/NVList.i Request.inl DII_Invocation.h \
+  $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/LF_Event.h \
@@ -2274,6 +2226,13 @@ endif
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/operation_details.h \
   $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
   $(TAO_ROOT)/tao/target_specification.i \
@@ -2306,20 +2265,12 @@ endif
   DII_Invocation.inl DII_ClientRequestInfo.h \
   $(TAO_ROOT)/tao/ClientRequestInfo_i.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/tao/PICurrent.h \
   $(ACE_ROOT)/ace/Array_Base.h \
@@ -2395,7 +2346,7 @@ endif
   $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
   $(TAO_ROOT)/tao/Stub.i
 
-.obj/Server_Request.o .obj/Server_Request.so .shobj/Server_Request.o .shobj/Server_Request.so: Server_Request.cpp Server_Request.h \
+.obj/Server_Request.o .obj/Server_Request.SO .shobj/Server_Request.o .shobj/Server_Request.SO: Server_Request.cpp Server_Request.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -2430,8 +2381,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -2440,8 +2390,7 @@ endif
   $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
-  dynamicinterface_export.h \
-  $(ACE_ROOT)/ace/Service_Config.h \
+  dynamicinterface_export.h $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Node.h \
   $(ACE_ROOT)/ace/Node.cpp \
@@ -2569,13 +2518,16 @@ endif
   $(TAO_ROOT)/tao/Seq_Out_T.inl \
   $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
@@ -2588,17 +2540,15 @@ endif
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/GIOPC.h \
   $(TAO_ROOT)/tao/GIOPC.i \
@@ -2610,25 +2560,17 @@ endif
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
@@ -2642,7 +2584,7 @@ endif
   $(TAO_ROOT)/tao/GIOP_Utils.h \
   $(TAO_ROOT)/tao/GIOP_Utils.i
 
-.obj/Unknown_User_Exception.o .obj/Unknown_User_Exception.so .shobj/Unknown_User_Exception.o .shobj/Unknown_User_Exception.so: Unknown_User_Exception.cpp \
+.obj/Unknown_User_Exception.o .obj/Unknown_User_Exception.SO .shobj/Unknown_User_Exception.o .shobj/Unknown_User_Exception.SO: Unknown_User_Exception.cpp \
   Unknown_User_Exception.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -2688,8 +2630,7 @@ endif
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
@@ -2815,6 +2756,9 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i
diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h
index 5bf31a26cf4..0884daeb528 100644
--- a/TAO/tao/GIOPC.h
+++ b/TAO/tao/GIOPC.h
@@ -40,7 +40,7 @@
 
 #include "tao/IOP_IORC.h"
 #include "tao/VarOut_T.h"
-#include "tao/Any_T.h"
+#include "Any_Dual_Impl_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/IFR_Client/Makefile b/TAO/tao/IFR_Client/Makefile
index 44213937b30..1e0a9b3f862 100644
--- a/TAO/tao/IFR_Client/Makefile
+++ b/TAO/tao/IFR_Client/Makefile
@@ -65,12 +65,11 @@ endif
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/IFR_BaseC.o .obj/IFR_BaseC.so .shobj/IFR_BaseC.o .shobj/IFR_BaseC.so: IFR_BaseC.cpp IFR_BaseC.h \
-  $(ACE_ROOT)/ace/pre.h ifr_client_export.h \
+.obj/IFR_BaseC.o .obj/IFR_BaseC.SO .shobj/IFR_BaseC.o .shobj/IFR_BaseC.SO: IFR_BaseC.cpp IFR_BaseC.h $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -87,17 +86,10 @@ endif
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -108,24 +100,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -141,6 +116,10 @@ endif
   $(ACE_ROOT)/ace/Functor_T.h \
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
@@ -160,6 +139,7 @@ endif
   $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
@@ -211,17 +191,35 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/iosfwd.h \
   $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
@@ -239,28 +237,38 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp IFR_BaseC.i \
-  $(TAO_ROOT)/tao/Stub.h \
-  $(TAO_ROOT)/tao/MProfile.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
   $(TAO_ROOT)/tao/ServicesC.i \
@@ -269,13 +277,46 @@ endif
   $(TAO_ROOT)/tao/ObjectIdListC.h \
   $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Array_VarOut_T.h \
+  $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  ifr_client_export.h IFR_BaseC.i $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
@@ -300,28 +341,6 @@ endif
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -366,9 +385,6 @@ endif
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/LF_Event.h \
@@ -409,12 +425,12 @@ endif
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
-.obj/IFR_BasicC.o .obj/IFR_BasicC.so .shobj/IFR_BasicC.o .shobj/IFR_BasicC.so: IFR_BasicC.cpp IFR_BasicC.h \
-  $(ACE_ROOT)/ace/pre.h IFR_BaseC.h ifr_client_export.h \
+.obj/IFR_BasicC.o .obj/IFR_BasicC.SO .shobj/IFR_BasicC.o .shobj/IFR_BasicC.SO: IFR_BasicC.cpp IFR_BasicC.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -431,17 +447,10 @@ endif
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -452,24 +461,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -485,6 +477,10 @@ endif
   $(ACE_ROOT)/ace/Functor_T.h \
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
@@ -504,6 +500,7 @@ endif
   $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
@@ -555,17 +552,35 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/iosfwd.h \
   $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
@@ -583,28 +598,38 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp IFR_BaseC.i \
-  IFR_BasicC.i $(TAO_ROOT)/tao/Stub.h \
-  $(TAO_ROOT)/tao/MProfile.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
   $(TAO_ROOT)/tao/ServicesC.i \
@@ -613,13 +638,47 @@ endif
   $(TAO_ROOT)/tao/ObjectIdListC.h \
   $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Array_VarOut_T.h \
+  $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  ifr_client_export.h IFR_BaseC.h IFR_BaseC.i IFR_BasicC.i \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
@@ -644,28 +703,6 @@ endif
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -710,9 +747,6 @@ endif
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/LF_Event.h \
@@ -753,12 +787,12 @@ endif
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
-.obj/IFR_ExtendedC.o .obj/IFR_ExtendedC.so .shobj/IFR_ExtendedC.o .shobj/IFR_ExtendedC.so: IFR_ExtendedC.cpp IFR_ExtendedC.h \
-  $(ACE_ROOT)/ace/pre.h IFR_BasicC.h IFR_BaseC.h \
+.obj/IFR_ExtendedC.o .obj/IFR_ExtendedC.SO .shobj/IFR_ExtendedC.o .shobj/IFR_ExtendedC.SO: IFR_ExtendedC.cpp IFR_ExtendedC.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -775,17 +809,10 @@ endif
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -796,24 +823,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -829,6 +839,10 @@ endif
   $(ACE_ROOT)/ace/Functor_T.h \
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
@@ -848,6 +862,7 @@ endif
   $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
@@ -899,17 +914,35 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/iosfwd.h \
   $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
@@ -927,28 +960,38 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp IFR_BaseC.i \
-  IFR_BasicC.i IFR_ExtendedC.i $(TAO_ROOT)/tao/Stub.h \
-  $(TAO_ROOT)/tao/MProfile.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
   $(TAO_ROOT)/tao/ServicesC.i \
@@ -957,13 +1000,47 @@ endif
   $(TAO_ROOT)/tao/ObjectIdListC.h \
   $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Array_VarOut_T.h \
+  $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  ifr_client_export.h IFR_BasicC.h IFR_BaseC.h IFR_BaseC.i IFR_BasicC.i \
+  IFR_ExtendedC.i $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
@@ -988,28 +1065,6 @@ endif
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -1054,9 +1109,6 @@ endif
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/LF_Event.h \
@@ -1097,13 +1149,12 @@ endif
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
-.obj/IFR_ComponentsC.o .obj/IFR_ComponentsC.so .shobj/IFR_ComponentsC.o .shobj/IFR_ComponentsC.so: IFR_ComponentsC.cpp IFR_ComponentsC.h \
-  $(ACE_ROOT)/ace/pre.h IFR_ExtendedC.h IFR_BasicC.h \
-  IFR_BaseC.h ifr_client_export.h \
+.obj/IFR_ComponentsC.o .obj/IFR_ComponentsC.SO .shobj/IFR_ComponentsC.o .shobj/IFR_ComponentsC.SO: IFR_ComponentsC.cpp IFR_ComponentsC.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1120,17 +1171,10 @@ endif
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -1141,24 +1185,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -1174,6 +1201,10 @@ endif
   $(ACE_ROOT)/ace/Functor_T.h \
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
@@ -1193,6 +1224,7 @@ endif
   $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
@@ -1244,17 +1276,35 @@ endif
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/iosfwd.h \
   $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
@@ -1272,29 +1322,38 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp IFR_BaseC.i \
-  IFR_BasicC.i IFR_ExtendedC.i IFR_ComponentsC.i \
-  $(TAO_ROOT)/tao/Stub.h \
-  $(TAO_ROOT)/tao/MProfile.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
   $(TAO_ROOT)/tao/ServicesC.i \
@@ -1303,13 +1362,48 @@ endif
   $(TAO_ROOT)/tao/ObjectIdListC.h \
   $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Array_VarOut_T.h \
+  $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  ifr_client_export.h IFR_ExtendedC.h IFR_BasicC.h IFR_BaseC.h \
+  IFR_BaseC.i IFR_BasicC.i IFR_ExtendedC.i IFR_ComponentsC.i \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
@@ -1334,28 +1428,6 @@ endif
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -1400,9 +1472,6 @@ endif
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/LF_Event.h \
@@ -1443,7 +1512,7 @@ endif
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
-.obj/IFR_Client_Adapter_Impl.o .obj/IFR_Client_Adapter_Impl.so .shobj/IFR_Client_Adapter_Impl.o .shobj/IFR_Client_Adapter_Impl.so: IFR_Client_Adapter_Impl.cpp \
+.obj/IFR_Client_Adapter_Impl.o .obj/IFR_Client_Adapter_Impl.SO .shobj/IFR_Client_Adapter_Impl.o .shobj/IFR_Client_Adapter_Impl.SO: IFR_Client_Adapter_Impl.cpp \
   IFR_Client_Adapter_Impl.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
   $(TAO_ROOT)/tao/corbafwd.h \
@@ -1478,8 +1547,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -1569,23 +1637,7 @@ endif
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h IFR_ExtendedC.h \
-  IFR_BasicC.h IFR_BaseC.h \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
@@ -1602,11 +1654,27 @@ endif
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
@@ -1624,23 +1692,38 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp IFR_BaseC.i \
-  IFR_BasicC.i IFR_ExtendedC.i \
-  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
   $(TAO_ROOT)/tao/ServicesC.i \
@@ -1652,13 +1735,41 @@ endif
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Array_VarOut_T.h \
+  $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i IFR_BasicC.h \
+  IFR_BaseC.h IFR_BaseC.i IFR_BasicC.i IFR_ExtendedC.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(TAO_ROOT)/tao/CONV_FRAMEC.h \
@@ -1678,28 +1789,6 @@ endif
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -1741,9 +1830,6 @@ endif
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/LF_Event.h \
diff --git a/TAO/tao/IFR_Client_Adapter.cpp b/TAO/tao/IFR_Client_Adapter.cpp
index 7524eff668a..5089b6156db 100644
--- a/TAO/tao/IFR_Client_Adapter.cpp
+++ b/TAO/tao/IFR_Client_Adapter.cpp
@@ -3,7 +3,9 @@
 #include "tao/IFR_Client_Adapter.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID(tao, IFR_Client_Adapter, "$Id$")
+ACE_RCSID (tao, 
+           IFR_Client_Adapter, 
+           "$Id$")
 
 TAO_IFR_Client_Adapter::~TAO_IFR_Client_Adapter (void)
 {
diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp
index caaa3c73ef6..fddbf332cce 100644
--- a/TAO/tao/IIOPC.cpp
+++ b/TAO/tao/IIOPC.cpp
@@ -25,7 +25,7 @@
 
 #include "tao/IIOPC.h"
 #include "tao/Typecode.h"
-#include "tao/Any_T.h"
+#include "tao/Any_Dual_Impl_T.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h
index 11bd39b63a2..061d23f2c97 100644
--- a/TAO/tao/IOPC.h
+++ b/TAO/tao/IOPC.h
@@ -35,7 +35,6 @@
 #include "tao/TAO_Export.h"
 #include "tao/IOP_IORC.h"
 #include "tao/IOP_CodecC.h"
-#include "tao/Any_T.h"
 #include "tao/VarOut_T.h"
 
 
diff --git a/TAO/tao/IOP_CodecC.h b/TAO/tao/IOP_CodecC.h
index dd398ccb2b0..dbf2498ba5b 100644
--- a/TAO/tao/IOP_CodecC.h
+++ b/TAO/tao/IOP_CodecC.h
@@ -37,9 +37,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 #include "tao/TAO_Export.h"
-#include "tao/Any_T.h"
 #include "tao/VarOut_T.h"
-#include "tao/Any_T.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Dual_Impl_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/IOP_IORC.cpp b/TAO/tao/IOP_IORC.cpp
index 6b117081a57..7fcd22c2cbb 100644
--- a/TAO/tao/IOP_IORC.cpp
+++ b/TAO/tao/IOP_IORC.cpp
@@ -30,7 +30,7 @@
 
 
 #include "IOP_IORC.h"
-#include "Any_T.h"
+#include "Any_Dual_Impl_T.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
diff --git a/TAO/tao/IORInterceptor/IORInterceptor.mpc b/TAO/tao/IORInterceptor/IORInterceptor.mpc
new file mode 100644
index 00000000000..a32fb318c8e
--- /dev/null
+++ b/TAO/tao/IORInterceptor/IORInterceptor.mpc
@@ -0,0 +1,7 @@
+project : taolib, core {
+  sharedname  = TAO_IORInterceptor
+  libs       += TAO
+  dllflags    = TAO_IORINTERCEPTOR_BUILD_DLL
+  libout      = ..
+  include_dir = tao/IORInterceptor
+}
diff --git a/TAO/tao/IORInterceptor/IORInterceptor.pidl b/TAO/tao/IORInterceptor/IORInterceptor.pidl
new file mode 100644
index 00000000000..2e876590dbf
--- /dev/null
+++ b/TAO/tao/IORInterceptor/IORInterceptor.pidl
@@ -0,0 +1,82 @@
+// -*- IDL -*-
+
+/**
+ * @file IORInterceptor.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for the IOR Interceptor
+ * components in the ORB.
+ *
+ * The following is from orbos/99-12-02 Portable Interceptors spec,
+ * the full IDL is downloadable from orbos/99-12-02. This file contains
+ * interfaces from PortableInterceptor.idl that depend on 
+ * ObjectReferenceFactory and ObjectReferenceTemplate, which inherit
+ * directly or indirectly from CORBA::ValueBase. This separate file
+ * has been created to remove the dependency from the rest of module
+ * PortableInterceptor.
+ *
+ * This file was used to generate the code in IORInterceptorC.*
+ * The command used to generate code is:
+ *
+ *  tao_idl
+ *     -o orig -Gp -Gd -Ge 1 -Sa -St
+ *          -Wb,export_macro=TAO_IORInterceptor_Export
+ *          -Wb,export_include="iorinterceptor_export.h"
+ *          -Wb,pre_include="ace/pre.h"
+ *          -Wb,post_include="ace/post.h"
+ *          IORInterceptor.pidl
+ *
+ * Patches for changes to the generated code are available in the
+ * `diffs' directory.
+ */
+
+// File: IORInterceptor.idl
+#ifndef _IOR_INTERCEPTOR_IDL_
+#define _IOR_INTERCEPTOR_IDL_
+
+#include <PortableInterceptor.pidl>
+#include <ObjectReferenceTemplate.pidl>
+
+module PortableInterceptor 
+{
+  typeprefix PortableInterceptor "omg.org";
+
+  local interface IORInfo 
+  {
+    CORBA::Policy get_effective_policy (in CORBA::PolicyType type);
+
+    void add_ior_component (in IOP::TaggedComponent a_component);
+
+    void add_ior_component_to_profile (
+        in IOP::TaggedComponent a_component,
+        in IOP::ProfileId profile_id
+      );
+
+    readonly attribute AdapterManagerId manager_id;
+
+    readonly attribute AdapterState state;
+
+    readonly attribute ObjectReferenceTemplate adapter_template;
+
+    attribute ObjectReferenceFactory current_factory;
+  };
+
+  local interface IORInterceptor : Interceptor 
+  {
+    void establish_components (in IORInfo info);
+
+    void components_established (in IORInfo info);
+
+    void adapter_manager_state_changed (
+        in AdapterManagerId id, 
+        in AdapterState state
+      );
+    void adapter_state_changed (
+        in ObjectReferenceTemplateSeq templates,
+        in AdapterState state
+      );
+  };
+};
+
+#endif  /* _IOR_INTERCEPTOR_IDL_ */
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.cpp b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
new file mode 100644
index 00000000000..3bb6b0f711c
--- /dev/null
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
@@ -0,0 +1,405 @@
+// -*- 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_codegen.cpp:344
+
+
+#include "IORInterceptorC.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "IORInterceptorC.i"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:63
+
+int PortableInterceptor::IORInfo::_tao_class_id = 0;
+
+PortableInterceptor::IORInfo_ptr
+PortableInterceptor::tao_IORInfo_life::tao_duplicate (
+    IORInfo_ptr p
+  )
+{
+  return IORInfo::_duplicate (p);
+}
+
+void
+PortableInterceptor::tao_IORInfo_life::tao_release (
+    IORInfo_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+PortableInterceptor::IORInfo_ptr
+PortableInterceptor::tao_IORInfo_life::tao_nil (
+    void
+  )
+{
+  return IORInfo::_nil ();
+}
+
+CORBA::Boolean
+PortableInterceptor::tao_IORInfo_life::tao_marshal (
+    IORInfo_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
+PortableInterceptor::IORInfo_ptr
+PortableInterceptor::tao_IORInfo_cast::tao_narrow (
+    CORBA::Object *p
+    ACE_ENV_ARG_DECL
+  )
+{
+  return IORInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+PortableInterceptor::tao_IORInfo_cast::tao_upcast (
+    void *src
+  )
+{
+  IORInfo **tmp =
+    ACE_static_cast (IORInfo **, src);
+  return *tmp;
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableInterceptor::IORInfo,
+        PortableInterceptor::tao_IORInfo_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableInterceptor::IORInfo,
+        PortableInterceptor::tao_IORInfo_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableInterceptor::IORInfo, \
+        PortableInterceptor::tao_IORInfo_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableInterceptor::IORInfo, \
+        PortableInterceptor::tao_IORInfo_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:245
+
+PortableInterceptor::IORInfo::IORInfo (void)
+{}
+
+PortableInterceptor::IORInfo::~IORInfo (void)
+{}
+
+PortableInterceptor::IORInfo_ptr
+PortableInterceptor::IORInfo::_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL
+  )
+{
+  return IORInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+}
+
+PortableInterceptor::IORInfo_ptr 
+PortableInterceptor::IORInfo::_unchecked_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (obj))
+    {
+      return IORInfo::_nil ();
+    }
+  
+  return
+      ACE_reinterpret_cast (
+          IORInfo_ptr,
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptrdiff_t,
+                  &IORInfo::_tao_class_id
+                )
+            )
+        );
+}
+
+PortableInterceptor::IORInfo_ptr
+PortableInterceptor::IORInfo::_duplicate (IORInfo_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+void *PortableInterceptor::IORInfo::_tao_QueryInterface (ptrdiff_t type)
+{
+  void *retv = 0;
+  
+  if (type == ACE_reinterpret_cast (
+              ptrdiff_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, IORInfo)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptrdiff_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
+  return retv;
+}
+
+const char* PortableInterceptor::IORInfo::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableInterceptor/IORInfo:1.0";
+}
+
+CORBA::Boolean
+PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:63
+
+int PortableInterceptor::IORInterceptor::_tao_class_id = 0;
+
+PortableInterceptor::IORInterceptor_ptr
+PortableInterceptor::tao_IORInterceptor_life::tao_duplicate (
+    IORInterceptor_ptr p
+  )
+{
+  return IORInterceptor::_duplicate (p);
+}
+
+void
+PortableInterceptor::tao_IORInterceptor_life::tao_release (
+    IORInterceptor_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+PortableInterceptor::IORInterceptor_ptr
+PortableInterceptor::tao_IORInterceptor_life::tao_nil (
+    void
+  )
+{
+  return IORInterceptor::_nil ();
+}
+
+CORBA::Boolean
+PortableInterceptor::tao_IORInterceptor_life::tao_marshal (
+    IORInterceptor_ptr p,
+    TAO_OutputCDR &cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
+PortableInterceptor::IORInterceptor_ptr
+PortableInterceptor::tao_IORInterceptor_cast::tao_narrow (
+    CORBA::Object *p
+    ACE_ENV_ARG_DECL
+  )
+{
+  return IORInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object *
+PortableInterceptor::tao_IORInterceptor_cast::tao_upcast (
+    void *src
+  )
+{
+  IORInterceptor **tmp =
+    ACE_static_cast (IORInterceptor **, src);
+  return *tmp;
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  template class
+    TAO_Objref_Var_T<
+        PortableInterceptor::IORInterceptor,
+        PortableInterceptor::tao_IORInterceptor_life
+      >;
+  template class
+    TAO_Objref_Out_T<
+        PortableInterceptor::IORInterceptor,
+        PortableInterceptor::tao_IORInterceptor_life
+      >;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableInterceptor::IORInterceptor, \
+        PortableInterceptor::tao_IORInterceptor_life \
+      >
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableInterceptor::IORInterceptor, \
+        PortableInterceptor::tao_IORInterceptor_life \
+      >
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:245
+
+PortableInterceptor::IORInterceptor::IORInterceptor (void)
+{}
+
+PortableInterceptor::IORInterceptor::~IORInterceptor (void)
+{}
+
+PortableInterceptor::IORInterceptor_ptr
+PortableInterceptor::IORInterceptor::_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL
+  )
+{
+  return IORInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+}
+
+PortableInterceptor::IORInterceptor_ptr 
+PortableInterceptor::IORInterceptor::_unchecked_narrow (
+    CORBA::Object_ptr obj
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (obj))
+    {
+      return IORInterceptor::_nil ();
+    }
+  
+  return
+      ACE_reinterpret_cast (
+          IORInterceptor_ptr,
+          obj->_tao_QueryInterface (
+              ACE_reinterpret_cast (
+                  ptrdiff_t,
+                  &IORInterceptor::_tao_class_id
+                )
+            )
+        );
+}
+
+PortableInterceptor::IORInterceptor_ptr
+PortableInterceptor::IORInterceptor::_duplicate (IORInterceptor_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+void *PortableInterceptor::IORInterceptor::_tao_QueryInterface (ptrdiff_t type)
+{
+  void *retv = 0;
+  
+  if (type == ACE_reinterpret_cast (
+              ptrdiff_t,
+              &ACE_NESTED_CLASS (::PortableInterceptor, IORInterceptor)::_tao_class_id)
+            )
+    {
+      retv = ACE_reinterpret_cast (void*, this);
+    }
+  else if (type == ACE_reinterpret_cast (
+              ptrdiff_t,
+              &::PortableInterceptor::Interceptor::_tao_class_id)
+            )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (
+                PortableInterceptor::Interceptor_ptr,
+                this
+              )
+          );
+    }
+  else if (type == ACE_reinterpret_cast (
+               ptrdiff_t,
+               &CORBA::Object::_tao_class_id)
+             )
+    {
+      retv =
+        ACE_reinterpret_cast (
+            void *,
+            ACE_static_cast (CORBA::Object_ptr, this)
+          );
+    }
+  
+  if (retv != 0)
+    {
+      this->_add_ref ();
+    }
+  
+  return retv;
+}
+
+const char* PortableInterceptor::IORInterceptor::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableInterceptor/IORInterceptor:1.0";
+}
+
+CORBA::Boolean
+PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.h b/TAO/tao/IORInterceptor/IORInterceptorC.h
new file mode 100644
index 00000000000..d08043c49a3
--- /dev/null
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.h
@@ -0,0 +1,435 @@
+// -*- 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_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_IORINTERCEPTORC_H_
+#define _TAO_IDL_ORIG_IORINTERCEPTORC_H_
+
+#include "ace/pre.h"
+#include "tao/PortableInterceptorC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h"
+#include "iorinterceptor_export.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_IORInterceptor_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_IORInterceptor_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
+TAO_NAMESPACE  PortableInterceptor
+{
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:576
+
+#if !defined (_PORTABLEINTERCEPTOR_IORINFO__ODDS_N_ENDS_CH_)
+#define _PORTABLEINTERCEPTOR_IORINFO__ODDS_N_ENDS_CH_
+  
+  class IORInfo;
+  typedef IORInfo *IORInfo_ptr;
+  struct tao_IORInfo_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        IORInfo,
+        tao_IORInfo_life
+      >
+    IORInfo_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        IORInfo,
+        tao_IORInfo_life
+      >
+    IORInfo_out;
+  
+  struct TAO_IORInterceptor_Export tao_IORInfo_life
+  {
+    static IORInfo_ptr tao_duplicate (IORInfo_ptr);
+    static void tao_release (IORInfo_ptr);
+    static IORInfo_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        IORInfo_ptr,
+        TAO_OutputCDR &
+      );
+  };
+  
+  struct TAO_IORInterceptor_Export tao_IORInfo_cast
+  {
+    static IORInfo_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
+
+#if !defined (_PORTABLEINTERCEPTOR_IORINFO_CH_)
+#define _PORTABLEINTERCEPTOR_IORINFO_CH_
+  
+  class TAO_IORInterceptor_Export IORInfo
+    : public virtual CORBA::Object
+  {
+  public:
+    typedef IORInfo_ptr _ptr_type;
+    typedef IORInfo_var _var_type;
+    static int _tao_class_id;
+    
+    // The static operations.
+    static IORInfo_ptr _duplicate (IORInfo_ptr obj);
+    
+    static IORInfo_ptr _narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static IORInfo_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static IORInfo_ptr _nil (void)
+      {
+        return (IORInfo_ptr)0;
+      }
+    
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::Policy_ptr get_effective_policy (
+        CORBA::PolicyType type
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void add_ior_component (
+        const IOP::TaggedComponent & a_component
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void add_ior_component_to_profile (
+        const IOP::TaggedComponent & a_component,
+        IOP::ProfileId profile_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual PortableInterceptor::AdapterManagerId manager_id (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual PortableInterceptor::AdapterState state (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::PortableInterceptor::ObjectReferenceTemplate * adapter_template (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::PortableInterceptor::ObjectReferenceFactory * current_factory (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void current_factory (
+        PortableInterceptor::ObjectReferenceFactory * current_factory
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:210
+    
+    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
+  protected:
+    IORInfo (void);
+    virtual ~IORInfo (void);
+  
+  private:
+    IORInfo (const IORInfo &);
+    void operator= (const IORInfo &);
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:576
+
+#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__ODDS_N_ENDS_CH_)
+#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__ODDS_N_ENDS_CH_
+  
+  class IORInterceptor;
+  typedef IORInterceptor *IORInterceptor_ptr;
+  struct tao_IORInterceptor_life;
+  
+  typedef
+    TAO_Objref_Var_T<
+        IORInterceptor,
+        tao_IORInterceptor_life
+      >
+    IORInterceptor_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        IORInterceptor,
+        tao_IORInterceptor_life
+      >
+    IORInterceptor_out;
+  
+  struct TAO_IORInterceptor_Export tao_IORInterceptor_life
+  {
+    static IORInterceptor_ptr tao_duplicate (IORInterceptor_ptr);
+    static void tao_release (IORInterceptor_ptr);
+    static IORInterceptor_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        IORInterceptor_ptr,
+        TAO_OutputCDR &
+      );
+  };
+  
+  struct TAO_IORInterceptor_Export tao_IORInterceptor_cast
+  {
+    static IORInterceptor_ptr tao_narrow (
+        CORBA::Object_ptr
+        ACE_ENV_ARG_DECL
+      );
+    static CORBA::Object_ptr tao_upcast (void *);
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
+
+#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_)
+#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_
+  
+  class TAO_IORInterceptor_Export IORInterceptor
+    : public virtual PortableInterceptor::Interceptor
+  {
+  public:
+    typedef IORInterceptor_ptr _ptr_type;
+    typedef IORInterceptor_var _var_type;
+    static int _tao_class_id;
+    
+    // The static operations.
+    static IORInterceptor_ptr _duplicate (IORInterceptor_ptr obj);
+    
+    static IORInterceptor_ptr _narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static IORInterceptor_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
+    static IORInterceptor_ptr _nil (void)
+      {
+        return (IORInterceptor_ptr)0;
+      }
+    
+    
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void establish_components (
+        PortableInterceptor::IORInfo_ptr info
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void components_established (
+        PortableInterceptor::IORInfo_ptr info
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void adapter_manager_state_changed (
+        PortableInterceptor::AdapterManagerId id,
+        PortableInterceptor::AdapterState state
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void adapter_state_changed (
+        const PortableInterceptor::ObjectReferenceTemplateSeq & templates,
+        PortableInterceptor::AdapterState state
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:210
+    
+    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+  
+  protected:
+    IORInterceptor (void);
+    virtual ~IORInterceptor (void);
+  
+  private:
+    IORInterceptor (const IORInterceptor &);
+    void operator= (const IORInterceptor &);
+  };
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
+}
+TAO_NAMESPACE_CLOSE // module PortableInterceptor
+
+// 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:1048
+
+#if defined (__ACE_INLINE__)
+#include "IORInterceptorC.i"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.i b/TAO/tao/IORInterceptor/IORInterceptorC.i
new file mode 100644
index 00000000000..7bdefffe4fa
--- /dev/null
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.i
@@ -0,0 +1,44 @@
+// -*- 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_interface/interface_ci.cpp:63
+
+#if !defined (_PORTABLEINTERCEPTOR_IORINFO___CI_)
+#define _PORTABLEINTERCEPTOR_IORINFO___CI_
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
+
+#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___CI_)
+#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___CI_
+
+#endif /* end #if !defined */
+
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
new file mode 100644
index 00000000000..6003bb948ae
--- /dev/null
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
@@ -0,0 +1,84 @@
+// $Id$
+
+#include "IORInterceptor_Adapter_Impl.h"
+#include "tao/ORB_Core.h"
+
+ACE_RCSID (IORInterceptor,
+           IORInterceptor_Adapter_Impl,
+           "$Id$")
+
+TAO_IORInterceptor_Adapter_Impl::~TAO_IORInterceptor_Adapter_Impl (void)
+{
+}
+
+void
+TAO_IORInterceptor_Adapter_Impl::tao_iorinterceptor_release (
+      PortableInterceptor::IORInterceptor_ptr p
+    )
+{
+  CORBA::release (p);
+}
+
+PortableInterceptor::Interceptor_ptr 
+TAO_IORInterceptor_Adapter_Impl::tao_iorinterceptor (
+    TAO_IORInterceptor_List::TYPE & container,
+    size_t index
+  )
+{
+  return container[index];
+}
+
+void 
+TAO_IORInterceptor_Adapter_Impl::tao_add_iorinterceptor (
+    TAO_IORInterceptor_List * list,
+    TAO_IORInterceptor_List::TYPE & container,
+    PortableInterceptor::IORInterceptor_ptr interceptor
+    ACE_ENV_ARG_DECL
+  )
+{
+  size_t index = list->add_interceptor_helper (interceptor
+                                               ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  container[index] =
+    PortableInterceptor::IORInterceptor::_duplicate (interceptor);
+}
+
+void 
+TAO_IORInterceptor_Adapter_Impl::tao_iorinterceptor_destroy (
+    TAO_IORInterceptor_List::TYPE & container,
+    size_t ilen
+    ACE_ENV_ARG_DECL
+  )
+{
+  container[ilen]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+// *********************************************************************
+
+// Initialization and registration of dynamic service object.
+
+int
+TAO_IORInterceptor_Adapter_Impl::Initializer (void)
+{
+  TAO_ORB_Core::iorinterceptor_adapter_name (
+      "Concrete_IORInterceptor_Adapter"
+    );
+
+  return 
+    ACE_Service_Config::process_directive (
+        ace_svc_desc_TAO_IORInterceptor_Adapter_Impl
+      );
+}
+
+ACE_STATIC_SVC_DEFINE (
+    TAO_IORInterceptor_Adapter_Impl,
+    ACE_TEXT ("Concrete_IORInterceptor_Adapter"),
+    ACE_SVC_OBJ_T,
+    &ACE_SVC_NAME (TAO_IORInterceptor_Adapter_Impl),
+    ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+    0
+  )
+
+ACE_FACTORY_DEFINE (TAO_IORInterceptor, TAO_IORInterceptor_Adapter_Impl)
+
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
new file mode 100644
index 00000000000..68a0fff4ed4
--- /dev/null
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
@@ -0,0 +1,91 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    IORInterceptor_Adapter_Impl.h
+ *
+ *  $Id$
+ *
+ *  @author  Jeff Parsons <parsons@cs.wustl.edu>
+ */
+//=============================================================================
+
+
+#ifndef TAO_IORINTERCEPTOR_ADAPTER_IMPL_H
+#define TAO_IORINTERCEPTOR_ADAPTER_IMPL_H
+
+#include "ace/pre.h"
+
+#include "IORInterceptorC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "iorinterceptor_export.h"
+#include "tao/IORInterceptor_Adapter.h"
+#include "ace/Service_Config.h"
+
+/**
+ * @class TAO_IORInterceptor_Adapter_Impl
+ *
+ * @brief TAO_IORInterceptor_Adapter_Impl.
+ *
+ * Class that adapts various functions involving the PortableInterceptor
+ * interfaces IORInfo and IORInterceptor. This is the derived class
+ * that contains the actual implementations.
+ */
+class TAO_IORInterceptor_Export TAO_IORInterceptor_Adapter_Impl
+  : public TAO_IORInterceptor_Adapter
+{
+public:
+  virtual ~TAO_IORInterceptor_Adapter_Impl (void);
+
+  virtual void tao_iorinterceptor_release (
+      PortableInterceptor::IORInterceptor_ptr
+    );
+
+  virtual PortableInterceptor::Interceptor_ptr tao_iorinterceptor (
+      TAO_IORInterceptor_List::TYPE & container,
+      size_t index
+    );
+
+  virtual void tao_add_iorinterceptor (
+      TAO_IORInterceptor_List * list,
+      TAO_IORInterceptor_List::TYPE & container,
+      PortableInterceptor::IORInterceptor_ptr interceptor
+      ACE_ENV_ARG_DECL
+    );
+
+  virtual void tao_iorinterceptor_destroy (
+      TAO_IORInterceptor_List::TYPE & container,
+      size_t ilen
+      ACE_ENV_ARG_DECL
+    );
+
+  // Used to force the initialization of the ORB code.
+  static int Initializer (void);
+};
+
+ACE_STATIC_SVC_DECLARE (TAO_IORInterceptor_Adapter_Impl)
+ACE_FACTORY_DECLARE (TAO_IORInterceptor, TAO_IORInterceptor_Adapter_Impl)
+
+#if defined (ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
+
+typedef int (*TAO_Module_Initializer) (void);
+
+static TAO_Module_Initializer
+TAO_Requires_IORInterceptor_Initializer =
+  &TAO_IORInterceptor_Adapter_Impl::Initializer;
+
+#else
+
+static int
+TAO_Requires_IORInterceptor_Initializer =
+  TAO_IORInterceptor_Adapter_Impl::Initializer ();
+
+#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
+
+#include "ace/post.h"
+
+#endif /* TAO_IORINTERCEPTOR_ADAPTER_IMPL_H */
diff --git a/TAO/tao/IORInterceptor/Makefile b/TAO/tao/IORInterceptor/Makefile
new file mode 100644
index 00000000000..bad8705d4c3
--- /dev/null
+++ b/TAO/tao/IORInterceptor/Makefile
@@ -0,0 +1,585 @@
+#----------------------------------------------------------------------------
+#
+# $Id$
+#
+#----------------------------------------------------------------------------
+ifndef TAO_ROOT
+  TAO_ROOT = $(ACE_ROOT)/TAO
+endif # ! TAO_ROOT
+
+MAKEFILE = Makefile
+LIBNAME  = libTAO_IORInterceptor
+LIB      = $(LIBNAME).a
+SHLIB    = $(LIBNAME).$(SOEXT)
+
+ACE_SHLIBS = -lTAO -lACE
+
+
+CPP_SRCS += \
+  IORInterceptorC \
+  IORInterceptor_Adapter_Impl
+
+FILES = $(CPP_SRCS)
+DEFS  = $(addsuffix .h,$(FILES))
+LSRC  = $(addsuffix .cpp,$(FILES))
+
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+#----------------------------------------------------------------------------
+#       Local targets (and local hacks)
+#----------------------------------------------------------------------------
+
+LDFLAGS += -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)
+
+ifeq ($(shared_libs),1)
+ifneq ($(SHLIB),)
+CPPFLAGS     += -DTAO_IORINTERCEPTOR_BUILD_DLL
+endif
+endif
+
+ifeq ($(static_libs),1)
+ifneq ($(LIB),)
+CPPFLAGS     += -DTAO_AS_STATIC_LIBS
+endif
+endif
+
+#----------------------------------------------------------------------------
+#       Dependencies
+#----------------------------------------------------------------------------
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/IORInterceptorC.o .obj/IORInterceptorC.SO .shobj/IORInterceptorC.o .shobj/IORInterceptorC.SO: IORInterceptorC.cpp IORInterceptorC.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.i \
+  iorinterceptor_export.h IORInterceptorC.i
+
+.obj/IORInterceptor_Adapter_Impl.o .obj/IORInterceptor_Adapter_Impl.SO .shobj/IORInterceptor_Adapter_Impl.o .shobj/IORInterceptor_Adapter_Impl.SO: IORInterceptor_Adapter_Impl.cpp \
+  IORInterceptor_Adapter_Impl.h $(ACE_ROOT)/ace/pre.h \
+  IORInterceptorC.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.i \
+  iorinterceptor_export.h IORInterceptorC.i \
+  $(TAO_ROOT)/tao/IORInterceptor_Adapter.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/PICurrent.h \
+  $(TAO_ROOT)/tao/PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/IORInterceptor/Makefile.bor b/TAO/tao/IORInterceptor/Makefile.bor
new file mode 100644
index 00000000000..91874b40edf
--- /dev/null
+++ b/TAO/tao/IORInterceptor/Makefile.bor
@@ -0,0 +1,26 @@
+#
+# Makefile for building the TAO IORInterceptor library
+#
+
+NAME = TAO_IORInterceptor
+
+OBJFILES = \
+	$(OBJDIR)\IORInterceptorC.obj \
+	$(OBJDIR)\IORInterceptor_Adapter_Impl.obj
+
+RESOURCE = $(OBJDIR)\TAO_IORInterceptor.res
+
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_IORINTERCEPTOR_CFLAGS) \
+	-DTAO_IORINTERCEPTOR_BUILD_DLL
+
+CPPDIR = .
+
+INCDIR_NAME = tao\IORInterceptor
+INCLUDES = \
+	*.h *.i \
+	 IORInterceptor.pidl
+
+LIBFILES = $(TAO_LIB) $(ACE_LIB)
+
+!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tao/IORInterceptor/TAO_IORInterceptor.dsp b/TAO/tao/IORInterceptor/TAO_IORInterceptor.dsp
new file mode 100644
index 00000000000..682396ca5cd
--- /dev/null
+++ b/TAO/tao/IORInterceptor/TAO_IORInterceptor.dsp
@@ -0,0 +1,134 @@
+# Microsoft Developer Studio Project File - Name="IORInterceptor" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+

+CFG=IORInterceptor - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "TAO_IORInterceptor.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "TAO_IORInterceptor.mak" CFG="IORInterceptor - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "IORInterceptor - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "IORInterceptor - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+MTL=midl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "IORInterceptor - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IORINTERCEPTOR_EXPORTS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_IORINTERCEPTOR_BUILD_DLL" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

+# ADD LINK32 ace.lib TAO.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_IORInterceptor.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+

+!ELSEIF  "$(CFG)" == "IORInterceptor - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "IORInterceptor___Win32_Debug"

+# PROP BASE Intermediate_Dir "IORInterceptor___Win32_Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IORINTERCEPTOR_EXPORTS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "TAO_IORINTERCEPTOR_BUILD_DLL" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_IORInterceptord.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "IORInterceptor - Win32 Release"

+# Name "IORInterceptor - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# Begin Source File

+

+SOURCE=.\IORInterceptor_Adapter_Impl.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\IORInterceptorC.cpp

+# ADD CPP /GR

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=.\IORInterceptor_Adapter_Impl.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\iorinterceptor_export.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\IORInterceptorC.h

+# End Source File

+# End Group

+# Begin Group "Inline Files"

+

+# PROP Default_Filter "i"

+# Begin Source File

+

+SOURCE=.\IORInterceptorC.i

+# End Source File

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter ""

+# End Group

+# End Target

+# End Project

diff --git a/TAO/tao/IORInterceptor/TAO_IORInterceptor.rc b/TAO/tao/IORInterceptor/TAO_IORInterceptor.rc
new file mode 100644
index 00000000000..7a5d23864d3
--- /dev/null
+++ b/TAO/tao/IORInterceptor/TAO_IORInterceptor.rc
@@ -0,0 +1,109 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "..\version.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+1 VERSIONINFO
+ FILEVERSION 1,3,1,0
+ PRODUCTVERSION 1,3,1,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "\0"
+            VALUE "CompanyName", "\0"
+            VALUE "FileDescription", "IORInterceptor\0"
+            VALUE "FileVersion", "1.3.1\0"
+            VALUE "InternalName", "TAO_IORInterceptorDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "TAO_IORInterceptor.DLL\0"
+            VALUE "PrivateBuild", "\0"
+            VALUE "ProductName", "TAO\0"
+            VALUE "ProductVersion", "1.3.1\0"
+            VALUE "SpecialBuild", "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // !_MAC
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""..\\version.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/TAO/tao/IORInterceptor/iorinterceptor_export.h b/TAO/tao/IORInterceptor/iorinterceptor_export.h
new file mode 100644
index 00000000000..4c6180c412a
--- /dev/null
+++ b/TAO/tao/IORInterceptor/iorinterceptor_export.h
@@ -0,0 +1,40 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl
+// ------------------------------
+#ifndef TAO_IORINTERCEPTOR_EXPORT_H
+#define TAO_IORINTERCEPTOR_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (TAO_AS_STATIC_LIBS)
+#  if !defined (TAO_IORINTERCEPTOR_HAS_DLL)
+#    define TAO_IORINTERCEPTOR_HAS_DLL 0
+#  endif /* ! TAO_IORINTERCEPTOR_HAS_DLL */
+#else
+#  if !defined (TAO_IORINTERCEPTOR_HAS_DLL)
+#    define TAO_IORINTERCEPTOR_HAS_DLL 1
+#  endif /* ! TAO_IORINTERCEPTOR_HAS_DLL */
+#endif
+
+#if defined (TAO_IORINTERCEPTOR_HAS_DLL) && (TAO_IORINTERCEPTOR_HAS_DLL == 1)
+#  if defined (TAO_IORINTERCEPTOR_BUILD_DLL)
+#    define TAO_IORInterceptor_Export ACE_Proper_Export_Flag
+#    define TAO_IORINTERCEPTOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TAO_IORINTERCEPTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TAO_IORINTERCEPTOR_BUILD_DLL */
+#    define TAO_IORInterceptor_Export ACE_Proper_Import_Flag
+#    define TAO_IORINTERCEPTOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TAO_IORINTERCEPTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TAO_IORINTERCEPTOR_BUILD_DLL */
+#else /* TAO_IORINTERCEPTOR_HAS_DLL == 1 */
+#  define TAO_IORInterceptor_Export
+#  define TAO_IORINTERCEPTOR_SINGLETON_DECLARATION(T)
+#  define TAO_IORINTERCEPTOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TAO_IORINTERCEPTOR_HAS_DLL == 1 */
+
+#endif /* TAO_IORINTERCEPTOR_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/tao/IORInterceptor_Adapter.cpp b/TAO/tao/IORInterceptor_Adapter.cpp
new file mode 100644
index 00000000000..184136d993a
--- /dev/null
+++ b/TAO/tao/IORInterceptor_Adapter.cpp
@@ -0,0 +1,24 @@
+// @(#) $Id$
+
+#include "tao/IORInterceptor_Adapter.h"
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID (tao, 
+           IORInterceptor_Adapter, 
+           "$Id$")
+
+TAO_IORInterceptor_Adapter::~TAO_IORInterceptor_Adapter (void)
+{
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Dynamic_Service<TAO_IORInterceptor_Adapter>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Dynamic_Service<TAO_IORInterceptor_Adapter>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+
diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h
new file mode 100644
index 00000000000..8ed278d9ec2
--- /dev/null
+++ b/TAO/tao/IORInterceptor_Adapter.h
@@ -0,0 +1,74 @@
+// This may look like C, but it's really -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    IORInterceptor_Adapter.h
+ *
+ *  $Id$
+ *
+ *  @author  Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
+
+#ifndef TAO_IORINTERCEPTOR_ADAPTER_H
+#define TAO_IORINTERCEPTOR_ADAPTER_H
+#include "ace/pre.h"
+
+#include "tao/corbafwd.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/Interceptor_List.h"
+#include "ace/Service_Object.h"
+#include "ace/CORBA_macros.h"
+
+namespace PortableInterceptor
+{
+  class Interceptor;
+  typedef Interceptor *Interceptor_ptr;
+  class IORInterceptor;
+  typedef IORInterceptor *IORInterceptor_ptr;
+};
+
+/**
+ * @class TAO_IORInterceptor_Adapter
+ *
+ * @brief TAO_IORInterceptor_Adapter.
+ *
+ * Class that adapts various functions involving the PortableInterceptor
+ * interfaces IORInfo and IORInterceptor. This is a base class for
+ * the actual implementation in the TAO_IORInterceptor library.
+ */
+class TAO_Export TAO_IORInterceptor_Adapter : public ACE_Service_Object
+{
+public:
+  virtual ~TAO_IORInterceptor_Adapter (void);
+
+  virtual void tao_iorinterceptor_release (
+      PortableInterceptor::IORInterceptor_ptr
+    ) = 0;
+
+  virtual PortableInterceptor::Interceptor_ptr tao_iorinterceptor (
+      TAO_IORInterceptor_List::TYPE & container,
+      size_t index
+    ) = 0;
+
+  virtual void tao_add_iorinterceptor (
+      TAO_IORInterceptor_List * list,
+      TAO_IORInterceptor_List::TYPE & container,
+      PortableInterceptor::IORInterceptor_ptr interceptor
+      ACE_ENV_ARG_DECL
+    ) = 0;
+
+  virtual void tao_iorinterceptor_destroy (
+      TAO_IORInterceptor_List::TYPE & container,
+      size_t ilen
+      ACE_ENV_ARG_DECL
+    ) = 0;
+};
+
+#include "ace/post.h"
+#endif /* TAO_IORINTERCEPTOR_ADAPTER_H */
diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h
index acdb669cec5..f8133230a4c 100644
--- a/TAO/tao/IORManipulation/IORC.h
+++ b/TAO/tao/IORManipulation/IORC.h
@@ -39,7 +39,8 @@
 #include "ior_manip_export.h"
 #include "tao/Object.h"
 #include "tao/Sequence.h"
-#include "tao/Any_T.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Dual_Impl_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/IORManipulation/Makefile b/TAO/tao/IORManipulation/Makefile
index 7eb637ec0d6..a0b8e78f421 100644
--- a/TAO/tao/IORManipulation/Makefile
+++ b/TAO/tao/IORManipulation/Makefile
@@ -67,7 +67,7 @@ endif
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/IORC.o .obj/IORC.so .shobj/IORC.o .shobj/IORC.so: IORC.cpp IORManip_Loader.h $(ACE_ROOT)/ace/pre.h \
+.obj/IORC.o .obj/IORC.SO .shobj/IORC.o .shobj/IORC.SO: IORC.cpp IORManip_Loader.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -107,8 +107,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -245,18 +244,22 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h IORC.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp IORC.i \
   $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/PolicyC.h \
@@ -268,9 +271,6 @@ endif
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -304,20 +304,12 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -369,9 +361,6 @@ endif
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/LF_Event.h \
@@ -412,7 +401,7 @@ endif
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
-.obj/IORManip_Loader.o .obj/IORManip_Loader.so .shobj/IORManip_Loader.o .shobj/IORManip_Loader.so: IORManip_Loader.cpp IORManip_Loader.h \
+.obj/IORManip_Loader.o .obj/IORManip_Loader.SO .shobj/IORManip_Loader.o .shobj/IORManip_Loader.SO: IORManip_Loader.cpp IORManip_Loader.h \
   $(ACE_ROOT)/ace/pre.h ior_manip_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -453,8 +442,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -591,22 +579,26 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h IORC.i IORManipulation.h \
-  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp IORC.i \
+  IORManipulation.h $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i
 
-.obj/IORManipulation.o .obj/IORManipulation.so .shobj/IORManipulation.o .shobj/IORManipulation.so: IORManipulation.cpp IORManipulation.h \
+.obj/IORManipulation.o .obj/IORManipulation.SO .shobj/IORManipulation.o .shobj/IORManipulation.SO: IORManipulation.cpp IORManipulation.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/Object.h \
@@ -648,8 +640,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -779,6 +770,9 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/LocalObject.i IORManip_Loader.h \
@@ -789,16 +783,17 @@ endif
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
   $(TAO_ROOT)/tao/Object_Loader.i IORC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h IORC.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp IORC.i \
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -812,9 +807,6 @@ endif
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/CONV_FRAMEC.h \
   $(TAO_ROOT)/tao/CONV_FRAMEC.i \
@@ -854,20 +846,12 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
diff --git a/TAO/tao/IORTable/Makefile b/TAO/tao/IORTable/Makefile
index 02718064023..8755385be2d 100644
--- a/TAO/tao/IORTable/Makefile
+++ b/TAO/tao/IORTable/Makefile
@@ -65,7 +65,7 @@ endif
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/IORTable.o .obj/IORTable.so .shobj/IORTable.o .shobj/IORTable.so: IORTable.cpp IORTable.h $(ACE_ROOT)/ace/pre.h \
+.obj/IORTable.o .obj/IORTable.SO .shobj/IORTable.o .shobj/IORTable.SO: IORTable.cpp IORTable.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -89,8 +89,7 @@ endif
   $(TAO_ROOT)/tao/Typecode.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -101,8 +100,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -201,7 +199,7 @@ endif
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -239,16 +237,32 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -257,9 +271,6 @@ endif
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -275,13 +286,6 @@ endif
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/BoundsC.h \
   $(TAO_ROOT)/tao/BoundsC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -295,10 +299,10 @@ endif
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -314,8 +318,7 @@ endif
   $(ACE_ROOT)/ace/Service_Object.i \
   $(TAO_ROOT)/tao/Adapter.i
 
-.obj/IORTableC.o .obj/IORTableC.so .shobj/IORTableC.o .shobj/IORTableC.so: IORTableC.cpp IORTableC.h \
-  $(ACE_ROOT)/ace/pre.h \
+.obj/IORTableC.o .obj/IORTableC.SO .shobj/IORTableC.o .shobj/IORTableC.SO: IORTableC.cpp IORTableC.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -339,8 +342,7 @@ endif
   $(TAO_ROOT)/tao/Typecode.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -351,8 +353,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -451,7 +452,7 @@ endif
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -489,16 +490,32 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -507,9 +524,6 @@ endif
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -525,13 +539,6 @@ endif
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/BoundsC.h \
   $(TAO_ROOT)/tao/BoundsC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -545,10 +552,10 @@ endif
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -631,9 +638,6 @@ endif
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/LF_Event.h \
@@ -674,7 +678,7 @@ endif
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
-.obj/Table_Adapter.o .obj/Table_Adapter.so .shobj/Table_Adapter.o .shobj/Table_Adapter.so: Table_Adapter.cpp Table_Adapter.h \
+.obj/Table_Adapter.o .obj/Table_Adapter.SO .shobj/Table_Adapter.o .shobj/Table_Adapter.SO: Table_Adapter.cpp Table_Adapter.h \
   $(ACE_ROOT)/ace/pre.h iortable_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -716,8 +720,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -847,6 +850,9 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(ACE_ROOT)/ace/Service_Object.h \
@@ -854,18 +860,31 @@ endif
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
-  $(TAO_ROOT)/tao/Adapter.i IOR_Table_Impl.h \
-  IORTable.h IORTableC.h $(TAO_ROOT)/tao/corba.h \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Adapter.i IOR_Table_Impl.h IORTable.h \
+  IORTableC.h $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -874,9 +893,6 @@ endif
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -892,13 +908,6 @@ endif
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/BoundsC.h \
   $(TAO_ROOT)/tao/BoundsC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -912,10 +921,10 @@ endif
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -984,7 +993,7 @@ endif
   $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i
 
-.obj/IOR_Table_Impl.o .obj/IOR_Table_Impl.so .shobj/IOR_Table_Impl.o .shobj/IOR_Table_Impl.so: IOR_Table_Impl.cpp IOR_Table_Impl.h \
+.obj/IOR_Table_Impl.o .obj/IOR_Table_Impl.SO .shobj/IOR_Table_Impl.o .shobj/IOR_Table_Impl.SO: IOR_Table_Impl.cpp IOR_Table_Impl.h \
   $(ACE_ROOT)/ace/pre.h IORTable.h iortable_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -1009,8 +1018,7 @@ endif
   $(TAO_ROOT)/tao/Typecode.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -1021,8 +1029,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -1121,7 +1128,7 @@ endif
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1159,16 +1166,32 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/NVList.h \
   $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -1177,9 +1200,6 @@ endif
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -1195,13 +1215,6 @@ endif
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/BoundsC.h \
   $(TAO_ROOT)/tao/BoundsC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
   $(TAO_ROOT)/tao/DomainC.h \
   $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -1215,10 +1228,10 @@ endif
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
   $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
diff --git a/TAO/tao/Interceptor_List.cpp b/TAO/tao/Interceptor_List.cpp
index 36ffe0c104e..cc9e1466f23 100644
--- a/TAO/tao/Interceptor_List.cpp
+++ b/TAO/tao/Interceptor_List.cpp
@@ -3,14 +3,19 @@
 // $Id$
 
 #include "tao/Interceptor_List.h"
-
+#include "tao/IORInterceptor_Adapter.h"
 #include "tao/CORBA_String.h"
+#include "tao/ORB_Core.h"
+
+#include "ace/Dynamic_Service.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Interceptor_List.inl"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(tao, Interceptor_List, "$Id$")
+ACE_RCSID (tao, 
+           Interceptor_List, 
+           "$Id$")
 
 // ****************************************************************
 
@@ -34,7 +39,8 @@ TAO_Interceptor_List::add_interceptor_i (
       /// If the Interceptor is not anonymous, make sure an
       /// Interceptor with the same isn't already registered.
       CORBA::String_var name = interceptor->name (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_ENV_SINGLE_ARG_PARAMETER
+        );
       ACE_CHECK_RETURN (0);
 
       size_t old_len = this->length ();
@@ -60,26 +66,35 @@ TAO_Interceptor_List::add_interceptor_i (
             {
               CORBA::String_var existing_name =
                 this->interceptor (i)->name ();
-              if (ACE_OS_String::strcmp (existing_name.in (),
+
+              if (ACE_OS_String::strcmp (existing_name.in (), 
                                          name.in ()) == 0)
-                ACE_THROW_RETURN
-                  (PortableInterceptor::ORBInitInfo::DuplicateName (),
-                   0);
+                {
+                  ACE_THROW_RETURN
+                    (PortableInterceptor::ORBInitInfo::DuplicateName (),
+                     0);
+                }
             }
         }
 
       /// Increase the length of the Interceptor sequence by one.
       size_t new_len = old_len + 1;
       this->length (new_len);
-          return old_len;
+      return old_len;
     }
   else
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (
-                        CORBA::SystemException::_tao_minor_code (
-                          TAO_DEFAULT_MINOR_CODE,
-                          EINVAL),
-                        CORBA::COMPLETED_NO),
-                      0);
+    {
+      ACE_THROW_RETURN (
+          CORBA::INV_OBJREF (
+              CORBA::SystemException::_tao_minor_code (
+                  TAO_DEFAULT_MINOR_CODE,
+                  EINVAL
+                ),
+              CORBA::COMPLETED_NO
+            ),
+          0
+        );
+    }
 }
 
 
@@ -191,8 +206,18 @@ TAO_IORInterceptor_List::~TAO_IORInterceptor_List (void)
 {
   size_t len = this->interceptors_.size ();
 
-  for (size_t i = 0; i < len; ++i)
-    CORBA::release (this->interceptors_[i]);
+  TAO_IORInterceptor_Adapter *adapter =
+    ACE_Dynamic_Service<TAO_IORInterceptor_Adapter>::instance (
+        TAO_ORB_Core::iorinterceptor_adapter_name ()
+      );
+
+  if (adapter != 0)
+    {
+      for (size_t i = 0; i < len; ++i)
+        {
+          adapter->tao_iorinterceptor_release (this->interceptors_[i]);
+        }
+    }
 }
 
 size_t
@@ -210,7 +235,21 @@ TAO_IORInterceptor_List::length (size_t len)
 PortableInterceptor::Interceptor_ptr
 TAO_IORInterceptor_List::interceptor (size_t index)
 {
-  return this->interceptors_[index];
+  TAO_IORInterceptor_Adapter *adapter =
+    ACE_Dynamic_Service<TAO_IORInterceptor_Adapter>::instance (
+        TAO_ORB_Core::iorinterceptor_adapter_name ()
+      );
+
+  if (adapter == 0)
+    {
+      ACE_DECLARE_NEW_CORBA_ENV;
+
+      ACE_THROW_RETURN (CORBA::INTERNAL (),
+                        PortableInterceptor::Interceptor::_nil ());
+    }
+
+  return adapter->tao_iorinterceptor (this->interceptors_,
+                                      index);
 }
 
 void
@@ -218,14 +257,21 @@ TAO_IORInterceptor_List::add_interceptor (
   PortableInterceptor::IORInterceptor_ptr interceptor
   ACE_ENV_ARG_DECL)
 {
-  size_t index = this->add_interceptor_i (interceptor
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  TAO_IORInterceptor_Adapter *adapter =
+    ACE_Dynamic_Service<TAO_IORInterceptor_Adapter>::instance (
+        TAO_ORB_Core::iorinterceptor_adapter_name ()
+      );
 
-  this->interceptors_[index] =
-    PortableInterceptor::IORInterceptor::_duplicate (interceptor);
-}
+  if (adapter == 0)
+    {
+      ACE_THROW (CORBA::INTERNAL ());
+    }
 
+  adapter->tao_add_iorinterceptor (this,
+                                   this->interceptors_,
+                                   interceptor
+                                   ACE_ENV_ARG_PARAMETER);
+}
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/Interceptor_List.h b/TAO/tao/Interceptor_List.h
index 7dbf3306be3..a43958bec46 100644
--- a/TAO/tao/Interceptor_List.h
+++ b/TAO/tao/Interceptor_List.h
@@ -49,7 +49,8 @@ protected:
   /// Register an in interceptor with interceptor list.
   size_t add_interceptor_i (
       PortableInterceptor::Interceptor_ptr interceptor
-      ACE_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL
+    )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::DuplicateName));
 
@@ -61,7 +62,8 @@ protected:
 
   /// Return the interceptor in sequence element <index>.
   virtual PortableInterceptor::Interceptor_ptr interceptor (
-   size_t index) = 0;
+      size_t index
+    ) = 0;
 
 };
 
@@ -93,7 +95,7 @@ public:
                         ACE_ENV_ARG_DECL);
 
   /// Return reference to the underlying Portable Interceptor array.
-  TYPE &interceptors (void);
+  TYPE & interceptors (void);
 
 protected:
 
@@ -186,11 +188,16 @@ public:
   ~TAO_IORInterceptor_List (void);
 
   /// Register an IOR interceptor.
-  void add_interceptor (PortableInterceptor::IORInterceptor_ptr i
+  void add_interceptor (PortableInterceptor::IORInterceptor_ptr
                         ACE_ENV_ARG_DECL);
 
+  /// Callback made from the IORInterceptor_Adaper_Impl, where the
+  /// knowledge of type resides.
+  size_t add_interceptor_helper (PortableInterceptor::Interceptor_ptr
+                                 ACE_ENV_ARG_DECL);
+
   /// Return reference to the underlying Portable Interceptor array.
-  TYPE &interceptors (void);
+  TYPE & interceptors (void);
 
 protected:
 
diff --git a/TAO/tao/Interceptor_List.inl b/TAO/tao/Interceptor_List.inl
index 8b49ce536d1..9b860ae0143 100644
--- a/TAO/tao/Interceptor_List.inl
+++ b/TAO/tao/Interceptor_List.inl
@@ -20,8 +20,19 @@ TAO_ServerRequestInterceptor_List::interceptors (void)
 
 // ------------------
 
+ACE_INLINE size_t
+TAO_IORInterceptor_List::add_interceptor_helper (
+    PortableInterceptor::Interceptor_ptr interceptor
+    ACE_ENV_ARG_DECL
+  )
+{
+  return this->add_interceptor_i (interceptor
+                                  ACE_ENV_ARG_PARAMETER);
+}
+
 ACE_INLINE TAO_IORInterceptor_List::TYPE &
 TAO_IORInterceptor_List::interceptors (void)
 {
   return this->interceptors_;
 }
+
diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor
index 28690dbf0cf..deb61ecb058 100644
--- a/TAO/tao/Makefile.bor
+++ b/TAO/tao/Makefile.bor
@@ -5,6 +5,9 @@
 NAME = TAO
 
 DIRS = \
+        ObjRefTemplate \
+        IORInterceptor \
+        Valuetype \
 	PortableServer \
         Messaging \
 	DynamicAny \
@@ -21,7 +24,6 @@ DIRS = \
 	RTPortableServer
 
 OBJFILES = \
-	$(OBJDIR)\AbstractBase.obj \
 	$(OBJDIR)\Abstract_Servant_Base.obj \
 	$(OBJDIR)\Acceptor_Filter.obj \
 	$(OBJDIR)\Acceptor_Registry.obj \
@@ -105,6 +107,7 @@ OBJFILES = \
 	$(OBJDIR)\IIOP_Profile.obj \
 	$(OBJDIR)\IIOP_Transport.obj \
 	$(OBJDIR)\IOPC.obj \
+	$(OBJDIR)\IORInterceptor_Adapter.obj \
 	$(OBJDIR)\IOR_Parser.obj \
 	$(OBJDIR)\Incoming_Message_Queue.obj \
 	$(OBJDIR)\Interceptor_List.obj \
@@ -146,11 +149,11 @@ OBJFILES = \
 	$(OBJDIR)\Object_Proxy_Broker.obj \
 	$(OBJDIR)\Object_Proxy_Impl.obj \
 	$(OBJDIR)\Object_Ref_Table.obj \
-        $(OBJDIR)\ObjectReferenceTemplateC.obj \
 	$(OBJDIR)\OctetSeqC.obj \
 	$(OBJDIR)\Parser_Registry.obj \
 	$(OBJDIR)\PICurrent.obj \
 	$(OBJDIR)\PICurrent_ORBInitializer.obj \
+	$(OBJDIR)\PI_ForwardC.obj \
 	$(OBJDIR)\Pluggable_Messaging.obj \
 	$(OBJDIR)\Pluggable_Messaging_Utils.obj \
 	$(OBJDIR)\Policy_ForwardC.obj \
@@ -208,9 +211,7 @@ OBJFILES = \
 	$(OBJDIR)\TypeCodeFactory_Adapter.obj \
 	$(OBJDIR)\Typecode.obj \
 	$(OBJDIR)\Typecode_Constants.obj \
-	$(OBJDIR)\ValueBase.obj \
-	$(OBJDIR)\ValueFactory.obj \
-	$(OBJDIR)\ValueFactory_Map.obj \
+	$(OBJDIR)\Valuetype_Adapter.obj \
 	$(OBJDIR)\Wait_On_Leader_Follower.obj \
 	$(OBJDIR)\Wait_On_Reactor.obj \
 	$(OBJDIR)\Wait_On_Read.obj \
diff --git a/TAO/tao/Makefile.dirs b/TAO/tao/Makefile.dirs
index 13b82cb9b45..e9377054feb 100644
--- a/TAO/tao/Makefile.dirs
+++ b/TAO/tao/Makefile.dirs
@@ -8,6 +8,9 @@
 MAKEFILE = Makefile.dirs
 
 DIRS = \
+  IORInterceptor \
+  Valuetype \
+  ObjRefTemplate \
   PortableServer \
   DynamicAny \
   DynamicInterface \
diff --git a/TAO/tao/Makefile.tao b/TAO/tao/Makefile.tao
index 5ab42e46667..0b900f3c6a6 100644
--- a/TAO/tao/Makefile.tao
+++ b/TAO/tao/Makefile.tao
@@ -172,10 +172,6 @@ ORB_CORE_FILES = \
   MProfile \
   Stub \
   Typecode \
-  AbstractBase \
-  ValueBase \
-  ValueFactory \
-  ValueFactory_Map \
   CDR \
   Client_Strategy_Factory \
   debug \
@@ -191,7 +187,7 @@ ORB_CORE_FILES = \
   ClientRequestInfo_i \
   RequestInfo_Util \
   ClientInterceptorAdapter \
-  ObjectReferenceTemplateC \
+  PI_ForwardC \
   PortableInterceptorC \
   PICurrent \
   PICurrent_ORBInitializer \
@@ -264,6 +260,7 @@ ORB_CORE_FILES = \
   Bind_Dispatcher_Guard \
   Fault_Tolerance_Service \
   Interceptor_List \
+  IORInterceptor_Adapter \
   IFR_Client_Adapter \
   ORBInitInfo \
   ORBInitializer_Registry \
@@ -298,7 +295,8 @@ ORB_CORE_FILES = \
   Thread_Lane_Resources_Manager \
   Default_Thread_Lane_Resources_Manager \
   Default_Stub_Factory \
-  Request_Dispatcher
+  Request_Dispatcher \
+  Valuetype_Adapter
 
 DYNAMIC_ANY_FILES =
 
@@ -307,7 +305,20 @@ TEMPLATE_FILES = \
   Connector_Impl \
   Connector_Impl \
   Sequence_T \
-  Any_T \
+  Any_Impl_T \
+  Any_Array_Impl_T \
+  Any_Basic_Impl_T \
+  Any_Dual_Impl_T \
+  Any_Special_Basic_Impl_T \
+  Any_Special_Impl_T \
+  Array_VarOut_T \
+  Objref_VarOut_T \
+  Pseudo_Value_VarOut_T \
+  Pseudo_VarOut_T \
+  Seq_Out_T \
+  Seq_Var_T \
+  Value_VarOut_T \
+  VarOut_T \
   TAO_Singleton
 
 ifndef TAO_ROOT
@@ -509,9 +520,8 @@ realclean:
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/Transport_Acceptor.o .obj/Transport_Acceptor.so .shobj/Transport_Acceptor.o .shobj/Transport_Acceptor.so: Transport_Acceptor.cpp Transport_Acceptor.h \
+.obj/Transport_Acceptor.o .obj/Transport_Acceptor.SO .shobj/Transport_Acceptor.o .shobj/Transport_Acceptor.SO: Transport_Acceptor.cpp Transport_Acceptor.h \
   $(ACE_ROOT)/ace/pre.h \
-  IOPC.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -530,9 +540,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
-  corbafwd.i \
-  IOP_IORC.h \
-  OctetSeqC.h \
+  corbafwd.i Transport_Acceptor.inl \
+  IOP_IORC.h OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -551,8 +560,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -669,39 +677,16 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
-  Object.h \
-  Policy_ForwardC.h \
-  Objref_VarOut_T.h \
-  varbase.h \
-  Objref_VarOut_T.inl \
-  Objref_VarOut_T.cpp \
-  Policy_ForwardC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  Object.i \
-  Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
-  Marshal.h \
-  Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
   VarOut_T.h \
   VarOut_T.inl \
   VarOut_T.cpp \
-  IOPC.i Transport_Acceptor.inl
+  CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i IOP_IORC.i Object_KeyC.h \
+  Object_KeyC.i
 
-.obj/Transport_Connector.o .obj/Transport_Connector.so .shobj/Transport_Connector.o .shobj/Transport_Connector.so: Transport_Connector.cpp Transport_Connector.h \
+.obj/Transport_Connector.o .obj/Transport_Connector.SO .shobj/Transport_Connector.o .shobj/Transport_Connector.SO: Transport_Connector.cpp Transport_Connector.h \
   $(ACE_ROOT)/ace/pre.h corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -722,9 +707,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  Transport_Connector.inl Transport.h Exception.h \
-  corbafwd.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h Transport_Connector.inl \
+  Transport.h Exception.h corbafwd.h \
   $(ACE_ROOT)/ace/SStringfwd.h \
   $(ACE_ROOT)/ace/iosfwd.h \
   Exception.i \
@@ -738,8 +722,7 @@ realclean:
   Cache_Entries.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -750,8 +733,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -842,8 +824,7 @@ realclean:
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Transport_Cache_Manager.inl \
   Transport_Timer.h TAO_Export.h Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h IOPC.h \
-  IOP_IORC.h \
+  Pluggable_Messaging_Utils.h IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
@@ -872,14 +853,21 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
+  Transport.inl ORB_Core.h ORB.h ServicesC.h ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
   Objref_VarOut_T.h \
@@ -890,27 +878,15 @@ realclean:
   Object_KeyC.h \
   Object_KeyC.i \
   Object.i \
+  Any_Impl_T.h \
+  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl Synch_Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
-  Transport.inl ORB_Core.h ORB.h ServicesC.h ServicesC.i CORBA_String.h \
-  CORBA_String.inl ObjectIdListC.h \
-  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h CurrentC.i \
-  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
+  debug.h CurrentC.i Policy_ForwardC.h \
+  Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h PolicyC.i \
   ORB.i Environment.h Policy_Manager.h \
   Policy_Set.h \
@@ -936,25 +912,19 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
+  OctetSeqC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i IOPC.i \
+  PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
+  Parser_Registry.i Service_Callbacks.h \
+  IOPC.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -983,9 +953,6 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i Invocation.h \
   CDR.h Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   LF_Invocation_Event.h \
   LF_Event.h \
@@ -1004,9 +971,8 @@ realclean:
   Thread_Lane_Resources.i debug.h \
   Connect_Strategy.h Client_Strategy_Factory.h
 
-.obj/Transport.o .obj/Transport.so .shobj/Transport.o .shobj/Transport.so: Transport.cpp Transport.h \
-  $(ACE_ROOT)/ace/pre.h corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
+.obj/Transport.o .obj/Transport.SO .shobj/Transport.o .shobj/Transport.SO: Transport.cpp Transport.h $(ACE_ROOT)/ace/pre.h \
+  corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -1040,8 +1006,7 @@ realclean:
   Cache_Entries.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -1052,8 +1017,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -1144,8 +1108,7 @@ realclean:
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Transport_Cache_Manager.inl \
   Transport_Timer.h TAO_Export.h Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h IOPC.h \
-  IOP_IORC.h \
+  Pluggable_Messaging_Utils.h IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
@@ -1174,14 +1137,21 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
+  Transport.inl ORB_Core.h ORB.h ServicesC.h ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
   Objref_VarOut_T.h \
@@ -1192,27 +1162,15 @@ realclean:
   Object_KeyC.h \
   Object_KeyC.i \
   Object.i \
+  Any_Impl_T.h \
+  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl Synch_Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
-  Transport.inl ORB_Core.h ORB.h ServicesC.h ServicesC.i CORBA_String.h \
-  CORBA_String.inl ObjectIdListC.h \
-  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h CurrentC.i \
-  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
+  debug.h CurrentC.i Policy_ForwardC.h \
+  Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h PolicyC.i \
   ORB.i Environment.h Policy_Manager.h \
   Policy_Set.h \
@@ -1238,25 +1196,19 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
+  OctetSeqC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i IOPC.i \
+  PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
+  Parser_Registry.i Service_Callbacks.h \
+  IOPC.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -1308,9 +1260,8 @@ realclean:
   TimeBaseC.h \
   TimeBaseC.i \
   TAOC.i \
-  Sync_Strategies.i \
-  Connection_Handler.h LF_CH_Event.h LF_Event.h LF_Event.inl \
-  LF_Invocation_Event.inl \
+  Sync_Strategies.i Connection_Handler.h \
+  LF_CH_Event.h LF_Event.h LF_Event.inl LF_Invocation_Event.inl \
   Connection_Handler.inl \
   Pluggable_Messaging.h \
   Pluggable_Messaging_Utils.h \
@@ -1329,9 +1280,9 @@ realclean:
   Codeset_Translator_Factory.h \
   Codeset_Translator_Factory_T.cpp
 
-.obj/Incoming_Message_Queue.o .obj/Incoming_Message_Queue.so .shobj/Incoming_Message_Queue.o .shobj/Incoming_Message_Queue.so: Incoming_Message_Queue.cpp \
+.obj/Incoming_Message_Queue.o .obj/Incoming_Message_Queue.SO .shobj/Incoming_Message_Queue.o .shobj/Incoming_Message_Queue.SO: Incoming_Message_Queue.cpp \
   Incoming_Message_Queue.h $(ACE_ROOT)/ace/pre.h \
-  Pluggable_Messaging_Utils.h IOPC.h \
+  Pluggable_Messaging_Utils.h IOP_IORC.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -1351,7 +1302,6 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i \
-  IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
@@ -1371,8 +1321,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1489,14 +1438,19 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl ORB_Core.h corbafwd.h ORB.h Exception.h \
+  ServicesC.h ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
   Objref_VarOut_T.h \
@@ -1507,25 +1461,15 @@ realclean:
   Object_KeyC.h \
   Object_KeyC.i \
   Object.i \
+  Any_Impl_T.h \
+  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl ORB_Core.h corbafwd.h ORB.h Exception.h \
-  ServicesC.h ServicesC.i CORBA_String.h \
-  CORBA_String.inl ObjectIdListC.h \
-  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h CurrentC.i \
-  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
+  debug.h CurrentC.i Policy_ForwardC.h \
+  Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h PolicyC.i \
   ORB.i Environment.h Policy_Manager.h \
   Policy_Set.h \
@@ -1551,25 +1495,19 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
+  OctetSeqC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i IOPC.i \
+  PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
+  Parser_Registry.i Service_Callbacks.h \
+  IOPC.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -1598,7 +1536,7 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i debug.h
 
-.obj/Notify_Handler.o .obj/Notify_Handler.so .shobj/Notify_Handler.o .shobj/Notify_Handler.so: Notify_Handler.cpp Notify_Handler.h \
+.obj/Notify_Handler.o .obj/Notify_Handler.SO .shobj/Notify_Handler.o .shobj/Notify_Handler.SO: Notify_Handler.cpp Notify_Handler.h \
   $(ACE_ROOT)/ace/pre.h TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -1625,8 +1563,7 @@ realclean:
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Event_Handler.i Connection_Handler.h \
   LF_CH_Event.h LF_Event.h LF_Event.inl LF_Invocation_Event.inl \
   Connection_Handler.inl Transport.h \
@@ -1740,7 +1677,6 @@ realclean:
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Transport_Cache_Manager.inl \
   Transport_Timer.h Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
-  IOPC.h \
   IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
@@ -1770,14 +1706,21 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
+  Transport.inl ORB_Core.h ORB.h ServicesC.h ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
   Objref_VarOut_T.h \
@@ -1788,27 +1731,15 @@ realclean:
   Object_KeyC.h \
   Object_KeyC.i \
   Object.i \
+  Any_Impl_T.h \
+  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl Synch_Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
-  Transport.inl ORB_Core.h ORB.h ServicesC.h ServicesC.i CORBA_String.h \
-  CORBA_String.inl ObjectIdListC.h \
-  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h CurrentC.i \
-  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
+  debug.h CurrentC.i Policy_ForwardC.h \
+  Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h PolicyC.i \
   ORB.i Environment.h Policy_Manager.h \
   Policy_Set.h \
@@ -1834,25 +1765,19 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
+  OctetSeqC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i IOPC.i \
+  PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
+  Parser_Registry.i Service_Callbacks.h \
+  IOPC.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -1881,12 +1806,12 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
   Resume_Handle.h Resume_Handle.inl
 
-.obj/Resume_Handle.o .obj/Resume_Handle.so .shobj/Resume_Handle.o .shobj/Resume_Handle.so: Resume_Handle.cpp Resume_Handle.h \
+.obj/Resume_Handle.o .obj/Resume_Handle.SO .shobj/Resume_Handle.o .shobj/Resume_Handle.SO: Resume_Handle.cpp Resume_Handle.h \
   $(ACE_ROOT)/ace/pre.h TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl Resume_Handle.inl \
-  ORB_Core.h corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl Resume_Handle.inl ORB_Core.h \
+  corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1924,8 +1849,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2060,13 +1984,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h CurrentC.i Policy_ForwardC.h \
@@ -2096,27 +2018,19 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
+  OctetSeqC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   IOP_CodecC.h \
   IOP_CodecC.i IOPC.i \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h IOPC.h \
+  Parser_Registry.i Service_Callbacks.h \
+  IOPC.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -2144,7 +2058,7 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i
 
-.obj/Profile.o .obj/Profile.so .shobj/Profile.o .shobj/Profile.so: Profile.cpp Profile.h $(ACE_ROOT)/ace/pre.h \
+.obj/Profile.o .obj/Profile.SO .shobj/Profile.o .shobj/Profile.SO: Profile.cpp Profile.h $(ACE_ROOT)/ace/pre.h \
   Tagged_Components.h \
   IOPC.h \
   corbafwd.h \
@@ -2186,8 +2100,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2304,13 +2217,16 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -2323,31 +2239,29 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   IOPC.i \
   CONV_FRAMEC.h \
   CONV_FRAMEC.i \
   Tagged_Components.i \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl Profile.i \
-  Object_KeyC.h Messaging_PolicyValueC.h IOPC.h Messaging_PolicyValueC.i \
-  Stub.h MProfile.h \
+  Object_KeyC.h Messaging_PolicyValueC.h IOP_IORC.h \
   PolicyC.h \
   CurrentC.h \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
-  PolicyC.i \
+  PolicyC.i Messaging_PolicyValueC.i \
+  Stub.h MProfile.h \
   MProfile.i \
   ORB.h \
   ServicesC.h \
@@ -2387,20 +2301,12 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   PortableInterceptorC.i \
@@ -2444,10 +2350,10 @@ realclean:
   ORB_Core.i \
   ORB_Core_Auto_Ptr.h \
   ORB_Core_Auto_Ptr.inl \
-  Stub.i debug.h \
-  target_specification.h target_specification.i
+  Stub.i debug.h target_specification.h \
+  target_specification.i
 
-.obj/Endpoint.o .obj/Endpoint.so .shobj/Endpoint.o .shobj/Endpoint.so: Endpoint.cpp Endpoint.h \
+.obj/Endpoint.o .obj/Endpoint.SO .shobj/Endpoint.o .shobj/Endpoint.SO: Endpoint.cpp Endpoint.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -2469,8 +2375,7 @@ realclean:
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -2481,8 +2386,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -2498,7 +2402,7 @@ realclean:
   $(ACE_ROOT)/ace/Log_Priority.h \
   Endpoint.i
 
-.obj/Connector_Registry.o .obj/Connector_Registry.so .shobj/Connector_Registry.o .shobj/Connector_Registry.so: Connector_Registry.cpp \
+.obj/Connector_Registry.o .obj/Connector_Registry.SO .shobj/Connector_Registry.o .shobj/Connector_Registry.SO: Connector_Registry.cpp \
   Connector_Registry.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -2522,8 +2426,7 @@ realclean:
   corbafwd.i \
   Endpoint.h \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -2534,8 +2437,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -2690,13 +2592,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -2735,20 +2635,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -2806,7 +2701,7 @@ realclean:
   Transport_Descriptor_Interface.h \
   Transport_Descriptor_Interface.inl
 
-.obj/Connection_Handler.o .obj/Connection_Handler.so .shobj/Connection_Handler.o .shobj/Connection_Handler.so: Connection_Handler.cpp Connection_Handler.h \
+.obj/Connection_Handler.o .obj/Connection_Handler.SO .shobj/Connection_Handler.o .shobj/Connection_Handler.SO: Connection_Handler.cpp Connection_Handler.h \
   $(ACE_ROOT)/ace/pre.h LF_CH_Event.h LF_Event.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -2851,8 +2746,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2987,13 +2881,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h CurrentC.i Policy_ForwardC.h \
@@ -3023,27 +2915,19 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
+  OctetSeqC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   IOP_CodecC.h \
   IOP_CodecC.i IOPC.i \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h IOPC.h \
+  Parser_Registry.i Service_Callbacks.h \
+  IOPC.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -3086,14 +2970,13 @@ realclean:
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
   Transport.inl Wait_Strategy.h Wait_Strategy.inl \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
   $(ACE_ROOT)/ace/SOCK.i
 
-.obj/Acceptor_Registry.o .obj/Acceptor_Registry.so .shobj/Acceptor_Registry.o .shobj/Acceptor_Registry.so: Acceptor_Registry.cpp \
+.obj/Acceptor_Registry.o .obj/Acceptor_Registry.SO .shobj/Acceptor_Registry.o .shobj/Acceptor_Registry.SO: Acceptor_Registry.cpp \
   Acceptor_Registry.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -3129,8 +3012,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -3274,7 +3156,7 @@ realclean:
   OctetSeqC.i \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -3287,13 +3169,14 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
   IOPC.i \
   Tagged_Components.i \
@@ -3341,20 +3224,12 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   PortableInterceptorC.i \
@@ -3403,7 +3278,7 @@ realclean:
   Endpoint.h \
   Endpoint.i
 
-.obj/Protocol_Factory.o .obj/Protocol_Factory.so .shobj/Protocol_Factory.o .shobj/Protocol_Factory.so: Protocol_Factory.cpp \
+.obj/Protocol_Factory.o .obj/Protocol_Factory.SO .shobj/Protocol_Factory.o .shobj/Protocol_Factory.SO: Protocol_Factory.cpp \
   Protocol_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -3438,8 +3313,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -3452,7 +3326,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/Acceptor_Filter.o .obj/Acceptor_Filter.so .shobj/Acceptor_Filter.o .shobj/Acceptor_Filter.so: Acceptor_Filter.cpp \
+.obj/Acceptor_Filter.o .obj/Acceptor_Filter.SO .shobj/Acceptor_Filter.o .shobj/Acceptor_Filter.SO: Acceptor_Filter.cpp \
   Acceptor_Filter.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -3500,8 +3374,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -3613,7 +3486,7 @@ realclean:
   Object_KeyC.i \
   Acceptor_Filter.i
 
-.obj/iiop_endpoints.o .obj/iiop_endpoints.so .shobj/iiop_endpoints.o .shobj/iiop_endpoints.so: iiop_endpoints.cpp iiop_endpoints.h \
+.obj/iiop_endpoints.o .obj/iiop_endpoints.SO .shobj/iiop_endpoints.o .shobj/iiop_endpoints.SO: iiop_endpoints.cpp iiop_endpoints.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -3652,8 +3525,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -3768,7 +3640,7 @@ realclean:
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i iiop_endpoints.i
 
-.obj/IIOP_Factory.o .obj/IIOP_Factory.so .shobj/IIOP_Factory.o .shobj/IIOP_Factory.so: IIOP_Factory.cpp IIOP_Factory.h \
+.obj/IIOP_Factory.o .obj/IIOP_Factory.SO .shobj/IIOP_Factory.o .shobj/IIOP_Factory.SO: IIOP_Factory.cpp IIOP_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
   Protocol_Factory.h \
   corbafwd.h \
@@ -3803,8 +3675,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -3893,9 +3764,16 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h IIOP_Acceptor.h \
   Transport_Acceptor.h \
-  IOPC.h \
-  IOP_IORC.h \
-  OctetSeqC.h \
+  Transport_Acceptor.inl \
+  IIOP_Connection_Handler.h \
+  Connection_Handler.h \
+  LF_CH_Event.h \
+  LF_Event.h \
+  LF_Event.inl \
+  LF_Invocation_Event.inl \
+  Connection_Handler.inl \
+  IIOPC.h \
+  Sequence_T.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -3907,7 +3785,6 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   Sequence.i \
-  Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
   Typecode.h \
@@ -3928,53 +3805,19 @@ realclean:
   Typecode.i \
   Environment.h \
   Environment.i \
-  Seq_Var_T.h \
-  Seq_Var_T.inl \
-  Seq_Var_T.cpp \
-  Seq_Out_T.h \
-  Seq_Out_T.inl \
-  Seq_Out_T.cpp \
-  OctetSeqC.i \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
-  IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
-  Object.h \
-  Policy_ForwardC.h \
-  Objref_VarOut_T.h \
-  varbase.h \
-  Objref_VarOut_T.inl \
-  Objref_VarOut_T.cpp \
-  Policy_ForwardC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  Object.i \
-  Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
-  Marshal.h \
-  Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
   VarOut_T.h \
   VarOut_T.inl \
   VarOut_T.cpp \
-  IOPC.i \
-  Transport_Acceptor.inl \
-  IIOP_Connection_Handler.h \
-  Connection_Handler.h \
-  LF_CH_Event.h \
-  LF_Event.h \
-  LF_Event.inl \
-  LF_Invocation_Event.inl \
-  Connection_Handler.inl \
-  IIOPC.h \
+  Seq_Out_T.h \
+  Seq_Out_T.inl \
+  Seq_Out_T.cpp \
+  Seq_Var_T.h \
+  Seq_Var_T.inl \
+  Seq_Var_T.cpp \
   IIOPC.i \
   $(ACE_ROOT)/ace/Svc_Handler.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -4031,8 +3874,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic.i \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
@@ -4062,6 +3904,8 @@ realclean:
   ORB_Core.h \
   ORB.h \
   ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
   ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
@@ -4070,6 +3914,26 @@ realclean:
   objectid.h \
   PolicyC.h \
   CurrentC.h \
+  Object.h \
+  Policy_ForwardC.h \
+  Objref_VarOut_T.h \
+  varbase.h \
+  Objref_VarOut_T.inl \
+  Objref_VarOut_T.cpp \
+  Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  IOP_IORC.h \
+  IOP_IORC.i \
+  Object.i \
+  Any_Impl_T.h \
+  Any.h \
+  Any.i \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
@@ -4095,22 +3959,21 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
+  IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i \
+  IOPC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -4167,7 +4030,7 @@ realclean:
   Connector_Impl.inl \
   Connector_Impl.cpp IOPC.h
 
-.obj/IIOP_Lite_Factory.o .obj/IIOP_Lite_Factory.so .shobj/IIOP_Lite_Factory.o .shobj/IIOP_Lite_Factory.so: IIOP_Lite_Factory.cpp \
+.obj/IIOP_Lite_Factory.o .obj/IIOP_Lite_Factory.SO .shobj/IIOP_Lite_Factory.o .shobj/IIOP_Lite_Factory.SO: IIOP_Lite_Factory.cpp \
   IIOP_Lite_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
   Protocol_Factory.h \
@@ -4203,8 +4066,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -4294,9 +4156,16 @@ realclean:
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   IIOP_Acceptor.h \
   Transport_Acceptor.h \
-  IOPC.h \
-  IOP_IORC.h \
-  OctetSeqC.h \
+  Transport_Acceptor.inl \
+  IIOP_Connection_Handler.h \
+  Connection_Handler.h \
+  LF_CH_Event.h \
+  LF_Event.h \
+  LF_Event.inl \
+  LF_Invocation_Event.inl \
+  Connection_Handler.inl \
+  IIOPC.h \
+  Sequence_T.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -4308,7 +4177,6 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   Sequence.i \
-  Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
   Typecode.h \
@@ -4329,53 +4197,19 @@ realclean:
   Typecode.i \
   Environment.h \
   Environment.i \
-  Seq_Var_T.h \
-  Seq_Var_T.inl \
-  Seq_Var_T.cpp \
-  Seq_Out_T.h \
-  Seq_Out_T.inl \
-  Seq_Out_T.cpp \
-  OctetSeqC.i \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
-  IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
-  Object.h \
-  Policy_ForwardC.h \
-  Objref_VarOut_T.h \
-  varbase.h \
-  Objref_VarOut_T.inl \
-  Objref_VarOut_T.cpp \
-  Policy_ForwardC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  Object.i \
-  Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
-  Marshal.h \
-  Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
   VarOut_T.h \
   VarOut_T.inl \
   VarOut_T.cpp \
-  IOPC.i \
-  Transport_Acceptor.inl \
-  IIOP_Connection_Handler.h \
-  Connection_Handler.h \
-  LF_CH_Event.h \
-  LF_Event.h \
-  LF_Event.inl \
-  LF_Invocation_Event.inl \
-  Connection_Handler.inl \
-  IIOPC.h \
+  Seq_Out_T.h \
+  Seq_Out_T.inl \
+  Seq_Out_T.cpp \
+  Seq_Var_T.h \
+  Seq_Var_T.inl \
+  Seq_Var_T.cpp \
   IIOPC.i \
   $(ACE_ROOT)/ace/Svc_Handler.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -4432,8 +4266,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic.i \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
@@ -4463,6 +4296,8 @@ realclean:
   ORB_Core.h \
   ORB.h \
   ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
   ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
@@ -4471,6 +4306,26 @@ realclean:
   objectid.h \
   PolicyC.h \
   CurrentC.h \
+  Object.h \
+  Policy_ForwardC.h \
+  Objref_VarOut_T.h \
+  varbase.h \
+  Objref_VarOut_T.inl \
+  Objref_VarOut_T.cpp \
+  Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  IOP_IORC.h \
+  IOP_IORC.i \
+  Object.i \
+  Any_Impl_T.h \
+  Any.h \
+  Any.i \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
@@ -4496,22 +4351,21 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
+  IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i \
+  IOPC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -4576,7 +4430,7 @@ realclean:
   $(ACE_ROOT)/ace/Get_Opt.h \
   $(ACE_ROOT)/ace/Get_Opt.i
 
-.obj/IIOP_Profile.o .obj/IIOP_Profile.so .shobj/IIOP_Profile.o .shobj/IIOP_Profile.so: IIOP_Profile.cpp IIOP_Profile.h \
+.obj/IIOP_Profile.o .obj/IIOP_Profile.SO .shobj/IIOP_Profile.o .shobj/IIOP_Profile.SO: IIOP_Profile.cpp IIOP_Profile.h \
   $(ACE_ROOT)/ace/pre.h \
   Profile.h \
   Tagged_Components.h \
@@ -4620,8 +4474,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -4738,13 +4591,16 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -4757,17 +4613,15 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   IOPC.i \
   CONV_FRAMEC.h \
   CONV_FRAMEC.i \
@@ -4781,8 +4635,7 @@ realclean:
   CORBA_String.h \
   CORBA_String.inl \
   $(ACE_ROOT)/ace/INET_Addr.h \
-  $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/Addr.i \
+  $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/INET_Addr.i \
   IIOP_Endpoint.i \
   IIOP_Profile.i CDR.h Environment.h \
@@ -4813,25 +4666,14 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h PortableInterceptorC.i \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
+  OctetSeqC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h DynamicC.i Messaging_SyncScopeC.h Messaging_SyncScopeC.i \
+  IOPC.h PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
+  Parser_Registry.i Service_Callbacks.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -4861,7 +4703,7 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i debug.h \
   iiop_endpoints.h iiop_endpoints.i
 
-.obj/IIOP_Transport.o .obj/IIOP_Transport.so .shobj/IIOP_Transport.o .shobj/IIOP_Transport.so: IIOP_Transport.cpp IIOP_Transport.h \
+.obj/IIOP_Transport.o .obj/IIOP_Transport.SO .shobj/IIOP_Transport.o .shobj/IIOP_Transport.SO: IIOP_Transport.cpp IIOP_Transport.h \
   $(ACE_ROOT)/ace/pre.h \
   Transport.h \
   corbafwd.h \
@@ -4898,8 +4740,7 @@ realclean:
   Cache_Entries.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -4910,8 +4751,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -5004,7 +4844,6 @@ realclean:
   Transport_Timer.h \
   Incoming_Message_Queue.h \
   Pluggable_Messaging_Utils.h \
-  IOPC.h \
   IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
@@ -5033,37 +4872,14 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
-  Object.h \
-  Policy_ForwardC.h \
-  Objref_VarOut_T.h \
-  varbase.h \
-  Objref_VarOut_T.inl \
-  Objref_VarOut_T.cpp \
-  Policy_ForwardC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  Object.i \
-  Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
-  Marshal.h \
-  Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl \
   Synch_Refcountable.h \
@@ -5075,8 +4891,7 @@ realclean:
   IIOPC.i \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
@@ -5179,6 +4994,24 @@ realclean:
   objectid.h \
   PolicyC.h \
   CurrentC.h \
+  Object.h \
+  Policy_ForwardC.h \
+  Objref_VarOut_T.h \
+  varbase.h \
+  Objref_VarOut_T.inl \
+  Objref_VarOut_T.cpp \
+  Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i \
+  Any_Impl_T.h \
+  Any.h \
+  Any.i \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
@@ -5204,22 +5037,21 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
+  IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i \
+  IOPC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -5261,8 +5093,7 @@ realclean:
   IIOP_Profile.i Acceptor_Registry.h \
   Acceptor_Registry.i \
   Thread_Lane_Resources.h operation_details.h corbafwd.h \
-  Service_Context.h \
-  Service_Context.inl \
+  Service_Context.h Service_Context.inl \
   target_specification.h target_specification.i operation_details.i \
   Timeprobe.h $(ACE_ROOT)/ace/Timeprobe.h CDR.h \
   Transport_Mux_Strategy.h Wait_Strategy.h Wait_Strategy.inl \
@@ -5295,10 +5126,10 @@ realclean:
   GIOP_Message_State.inl \
   GIOP_Message_Base.i \
   GIOP_Message_Lite.h \
-  GIOP_Message_Lite.i \
-  Protocols_Hooks.h Policy_ForwardC.h Adapter.h
+  GIOP_Message_Lite.i Protocols_Hooks.h \
+  Policy_ForwardC.h Adapter.h
 
-.obj/IIOP_Connector.o .obj/IIOP_Connector.so .shobj/IIOP_Connector.o .shobj/IIOP_Connector.so: IIOP_Connector.cpp IIOP_Connector.h \
+.obj/IIOP_Connector.o .obj/IIOP_Connector.SO .shobj/IIOP_Connector.o .shobj/IIOP_Connector.SO: IIOP_Connector.cpp IIOP_Connector.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/SOCK_Connector.h \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
@@ -5308,8 +5139,7 @@ realclean:
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/Addr.i \
+  $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/OS.h \
@@ -5332,12 +5162,10 @@ realclean:
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/IPC_SAP.i \
-  $(ACE_ROOT)/ace/SOCK.i \
-  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/SOCK.i $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Handle_Ops.h \
   $(ACE_ROOT)/ace/Handle_Ops.i \
   $(ACE_ROOT)/ace/Lib_Find.h \
@@ -5486,8 +5314,7 @@ realclean:
   $(ACE_ROOT)/ace/Synch_Options.i \
   $(ACE_ROOT)/ace/Connector.cpp \
   $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
   $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -5511,15 +5338,14 @@ realclean:
   $(ACE_ROOT)/ace/Stream_Modules.cpp \
   $(ACE_ROOT)/ace/Svc_Handler.cpp \
   $(ACE_ROOT)/ace/Dynamic.h \
-  $(ACE_ROOT)/ace/Dynamic.i Transport_Connector.h \
-  corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Dynamic.i Transport_Connector.h corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/CDR_Base.inl \
   orbconf.h \
   TAO_Export.h \
   corbafwd.i \
   $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  Transport_Connector.inl \
+  $(ACE_ROOT)/ace/Exception_Macros.h Transport_Connector.inl \
   Connector_Impl.h \
   corbafwd.h \
   Connector_Impl.inl \
@@ -5572,7 +5398,7 @@ realclean:
   OctetSeqC.i \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -5585,13 +5411,14 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
   IOPC.i \
   CONV_FRAMEC.h \
@@ -5625,22 +5452,11 @@ realclean:
   TAO_Singleton.cpp \
   TAO_Singleton.h \
   TAO_Singleton_Manager.h Adapter.h \
-  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h PortableInterceptorC.i Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
+  OctetSeqC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h DynamicC.i Messaging_SyncScopeC.h Messaging_SyncScopeC.i \
+  IOPC.h PortableInterceptorC.i Parser_Registry.h \
+  Parser_Registry.i Service_Callbacks.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -5657,9 +5473,6 @@ realclean:
   Transport_Cache_Manager.inl \
   Invocation.h CDR.h Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   LF_Invocation_Event.h \
   operation_details.h Service_Context.h \
@@ -5673,11 +5486,10 @@ realclean:
   Thread_Lane_Resources.i \
   Wait_Strategy.h Wait_Strategy.inl
 
-.obj/IIOP_Acceptor.o .obj/IIOP_Acceptor.so .shobj/IIOP_Acceptor.o .shobj/IIOP_Acceptor.so: IIOP_Acceptor.cpp \
+.obj/IIOP_Acceptor.o .obj/IIOP_Acceptor.SO .shobj/IIOP_Acceptor.o .shobj/IIOP_Acceptor.SO: IIOP_Acceptor.cpp \
   IIOP_Acceptor.h \
   $(ACE_ROOT)/ace/pre.h \
   Transport_Acceptor.h \
-  IOPC.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -5697,15 +5509,10 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i \
-  IOP_IORC.h \
-  OctetSeqC.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
+  Transport_Acceptor.inl \
+  IIOP_Connection_Handler.h \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -5717,10 +5524,52 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  Connection_Handler.h \
+  LF_CH_Event.h \
+  LF_Event.h \
+  LF_Event.inl \
+  LF_Invocation_Event.inl \
+  Connection_Handler.inl \
+  IIOPC.h \
+  Sequence_T.h \
+  Sequence.h \
+  Managed_Types.h \
+  Managed_Types.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block.i \
   $(ACE_ROOT)/ace/Message_Block_T.h \
@@ -5728,7 +5577,6 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
   Sequence.i \
-  Sequence_T.h \
   Sequence_T.i \
   Sequence_T.cpp \
   Typecode.h \
@@ -5751,17 +5599,6 @@ realclean:
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
@@ -5783,16 +5620,9 @@ realclean:
   $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
   $(ACE_ROOT)/ace/Malloc_T.i \
   $(ACE_ROOT)/ace/Malloc_T.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
   $(ACE_ROOT)/ace/Mem_Map.h \
   $(ACE_ROOT)/ace/Mem_Map.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
@@ -5806,18 +5636,6 @@ realclean:
   $(ACE_ROOT)/ace/SString.i \
   $(ACE_ROOT)/ace/XML_Svc_Conf.h \
   $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Exception.h \
   $(ACE_ROOT)/ace/iosfwd.h \
@@ -5828,53 +5646,19 @@ realclean:
   Typecode.i \
   Environment.h \
   Environment.i \
-  Seq_Var_T.h \
-  Seq_Var_T.inl \
-  Seq_Var_T.cpp \
-  Seq_Out_T.h \
-  Seq_Out_T.inl \
-  Seq_Out_T.cpp \
-  OctetSeqC.i \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
-  IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
-  Object.h \
-  Policy_ForwardC.h \
-  Objref_VarOut_T.h \
-  varbase.h \
-  Objref_VarOut_T.inl \
-  Objref_VarOut_T.cpp \
-  Policy_ForwardC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  Object.i \
-  Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
-  Marshal.h \
-  Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
   VarOut_T.h \
   VarOut_T.inl \
   VarOut_T.cpp \
-  IOPC.i \
-  Transport_Acceptor.inl \
-  IIOP_Connection_Handler.h \
-  Connection_Handler.h \
-  LF_CH_Event.h \
-  LF_Event.h \
-  LF_Event.inl \
-  LF_Invocation_Event.inl \
-  Connection_Handler.inl \
-  IIOPC.h \
+  Seq_Out_T.h \
+  Seq_Out_T.inl \
+  Seq_Out_T.cpp \
+  Seq_Var_T.h \
+  Seq_Var_T.inl \
+  Seq_Var_T.cpp \
   IIOPC.i \
   $(ACE_ROOT)/ace/Svc_Handler.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
@@ -5936,8 +5720,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic.i \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
@@ -5967,6 +5750,8 @@ realclean:
   ORB_Core.h \
   ORB.h \
   ServicesC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
   ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
@@ -5975,6 +5760,26 @@ realclean:
   objectid.h \
   PolicyC.h \
   CurrentC.h \
+  Object.h \
+  Policy_ForwardC.h \
+  Objref_VarOut_T.h \
+  varbase.h \
+  Objref_VarOut_T.inl \
+  Objref_VarOut_T.cpp \
+  Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  IOP_IORC.h \
+  IOP_IORC.i \
+  Object.i \
+  Any_Impl_T.h \
+  Any.h \
+  Any.i \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
@@ -6000,22 +5805,21 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
+  IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i \
+  IOPC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -6076,7 +5880,7 @@ realclean:
   Protocols_Hooks.h \
   Codeset_Manager.h
 
-.obj/IIOP_Connection_Handler.o .obj/IIOP_Connection_Handler.so .shobj/IIOP_Connection_Handler.o .shobj/IIOP_Connection_Handler.so: IIOP_Connection_Handler.cpp \
+.obj/IIOP_Connection_Handler.o .obj/IIOP_Connection_Handler.SO .shobj/IIOP_Connection_Handler.o .shobj/IIOP_Connection_Handler.SO: IIOP_Connection_Handler.cpp \
   IIOP_Connection_Handler.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Reactor.h \
@@ -6105,8 +5909,7 @@ realclean:
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Handle_Set.i \
   $(ACE_ROOT)/ace/Timer_Queue.h \
   $(ACE_ROOT)/ace/Synch.h \
@@ -6308,8 +6111,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic.i \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
@@ -6347,13 +6149,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   CurrentC.i \
@@ -6381,20 +6181,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -6453,7 +6248,7 @@ realclean:
   Wait_Strategy.h \
   Wait_Strategy.inl
 
-.obj/IIOP_Endpoint.o .obj/IIOP_Endpoint.so .shobj/IIOP_Endpoint.o .shobj/IIOP_Endpoint.so: IIOP_Endpoint.cpp IIOP_Endpoint.h \
+.obj/IIOP_Endpoint.o .obj/IIOP_Endpoint.SO .shobj/IIOP_Endpoint.o .shobj/IIOP_Endpoint.SO: IIOP_Endpoint.cpp IIOP_Endpoint.h \
   $(ACE_ROOT)/ace/pre.h \
   Endpoint.h \
   corbafwd.h \
@@ -6476,8 +6271,7 @@ realclean:
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -6488,8 +6282,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -6512,8 +6305,7 @@ realclean:
   $(ACE_ROOT)/ace/INET_Addr.h \
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/Addr.i \
+  $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/INET_Addr.i \
   IIOP_Endpoint.i IOPC.h \
   IOP_IORC.h \
@@ -6621,13 +6413,16 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -6640,19 +6435,17 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp IOPC.i debug.h
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
+  IOP_CodecC.i IOPC.i debug.h
 
-.obj/IIOPC.o .obj/IIOPC.so .shobj/IIOPC.o .shobj/IIOPC.so: IIOPC.cpp IIOPC.h \
+.obj/IIOPC.o .obj/IIOPC.SO .shobj/IIOPC.o .shobj/IIOPC.SO: IIOPC.cpp IIOPC.h \
   $(ACE_ROOT)/ace/pre.h \
   Sequence_T.h \
   Sequence.h \
@@ -6692,8 +6485,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -6816,7 +6608,7 @@ realclean:
   Seq_Var_T.inl \
   Seq_Var_T.cpp \
   IIOPC.i \
-  Any_T.h \
+  Any_Dual_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -6833,15 +6625,13 @@ realclean:
   IOP_IORC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h
 
-.obj/default_client.o .obj/default_client.so .shobj/default_client.o .shobj/default_client.so: default_client.cpp default_client.h \
+.obj/default_client.o .obj/default_client.SO .shobj/default_client.o .shobj/default_client.SO: default_client.cpp default_client.h \
   $(ACE_ROOT)/ace/pre.h \
   Client_Strategy_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
@@ -6870,8 +6660,7 @@ realclean:
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -6960,8 +6749,8 @@ realclean:
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
-  default_client.i ORB_Core.h \
-  corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
+  default_client.i ORB_Core.h corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/CDR_Base.inl \
   orbconf.h \
   corbafwd.i ORB.h Exception.h \
@@ -7027,13 +6816,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h CurrentC.i Policy_ForwardC.h \
@@ -7058,27 +6845,19 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
+  OctetSeqC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   IOP_CodecC.h \
   IOP_CodecC.i IOPC.i \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h IOPC.h \
+  Parser_Registry.i Service_Callbacks.h \
+  IOPC.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -7105,8 +6884,8 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.h \
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
-  Wait_On_Read.h Wait_Strategy.h \
+  $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i Wait_On_Read.h \
+  Wait_Strategy.h \
   Wait_Strategy.inl Wait_On_Reactor.h \
   Wait_On_Leader_Follower.h Exclusive_TMS.h \
   Transport_Mux_Strategy.h Muxed_TMS.h \
@@ -7114,7 +6893,7 @@ realclean:
   Blocked_Connect_Strategy.h Connect_Strategy.h \
   Reactive_Connect_Strategy.h LF_Connect_Strategy.h
 
-.obj/default_server.o .obj/default_server.so .shobj/default_server.o .shobj/default_server.so: default_server.cpp \
+.obj/default_server.o .obj/default_server.SO .shobj/default_server.o .shobj/default_server.SO: default_server.cpp \
   default_server.h \
   $(ACE_ROOT)/ace/pre.h \
   Server_Strategy_Factory.h \
@@ -7150,8 +6929,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -7310,13 +7088,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -7350,20 +7126,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -7410,7 +7181,7 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Manager.i \
   ORB_Core.i
 
-.obj/default_resource.o .obj/default_resource.so .shobj/default_resource.o .shobj/default_resource.so: default_resource.cpp \
+.obj/default_resource.o .obj/default_resource.SO .shobj/default_resource.o .shobj/default_resource.SO: default_resource.cpp \
   default_resource.h \
   $(ACE_ROOT)/ace/pre.h \
   Resource_Factory.h \
@@ -7440,8 +7211,7 @@ realclean:
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -7608,13 +7378,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -7645,20 +7413,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -7740,9 +7503,7 @@ realclean:
   $(ACE_ROOT)/ace/Select_Reactor_T.h \
   $(ACE_ROOT)/ace/Select_Reactor_Base.h \
   $(ACE_ROOT)/ace/Token.h \
-  $(ACE_ROOT)/ace/Token.i \
-  $(ACE_ROOT)/ace/Pipe.h \
-  $(ACE_ROOT)/ace/Pipe.i \
+  $(ACE_ROOT)/ace/Pipe.h $(ACE_ROOT)/ace/Pipe.i \
   $(ACE_ROOT)/ace/Select_Reactor_Base.i \
   $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
   $(ACE_ROOT)/ace/Timer_Heap.h \
@@ -7758,7 +7519,7 @@ realclean:
   $(ACE_ROOT)/ace/Codeset_Registry.h \
   $(ACE_ROOT)/ace/Codeset_Registry.inl
 
-.obj/xt_resource.o .obj/xt_resource.so .shobj/xt_resource.o .shobj/xt_resource.so: xt_resource.cpp \
+.obj/xt_resource.o .obj/xt_resource.SO .shobj/xt_resource.o .shobj/xt_resource.SO: xt_resource.cpp \
   xt_resource.h \
   $(ACE_ROOT)/ace/pre.h \
   default_resource.h \
@@ -7789,8 +7550,7 @@ realclean:
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -7927,7 +7687,7 @@ realclean:
   CONV_FRAMEC.i \
   default_resource.i
 
-.obj/qt_resource.o .obj/qt_resource.so .shobj/qt_resource.o .shobj/qt_resource.so: qt_resource.cpp \
+.obj/qt_resource.o .obj/qt_resource.SO .shobj/qt_resource.o .shobj/qt_resource.SO: qt_resource.cpp \
   qt_resource.h \
   $(ACE_ROOT)/ace/pre.h \
   default_resource.h \
@@ -7958,8 +7718,7 @@ realclean:
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -8096,7 +7855,7 @@ realclean:
   CONV_FRAMEC.i \
   default_resource.i
 
-.obj/append.o .obj/append.so .shobj/append.o .shobj/append.so: append.cpp Marshal.h \
+.obj/append.o .obj/append.SO .shobj/append.o .shobj/append.SO: append.cpp Marshal.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -8120,8 +7879,7 @@ realclean:
   Typecode.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -8132,8 +7890,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -8270,17 +8027,123 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
   Any.i \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  debug.h
+  debug.h \
+  Valuetype_Adapter.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  ORB_Core.h \
+  ORB.h \
+  ServicesC.h \
+  ServicesC.i \
+  CORBA_String.h \
+  CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
+  objectid.h \
+  PolicyC.h \
+  CurrentC.h \
+  Any_Impl_T.h \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
+  CurrentC.i \
+  Remote_Object_Proxy_Impl.h \
+  Object_Proxy_Impl.h \
+  PolicyC.i \
+  ORB.i \
+  Policy_Manager.h \
+  Policy_Set.h \
+  Policy_Set.i \
+  LocalObject.h \
+  LocalObject.i \
+  Policy_Manager.i \
+  Resource_Factory.h \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
+  params.h \
+  params.i \
+  TAO_Singleton_Manager.h \
+  TAO_Singleton_Manager.inl \
+  TAO_Singleton.h \
+  TAO_Singleton.inl \
+  TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  Adapter.h \
+  Adapter.i \
+  PolicyFactory_Registry.h \
+  PortableInterceptorC.h \
+  PI_ForwardC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
+  DynamicC.i \
+  Messaging_SyncScopeC.h \
+  Messaging_SyncScopeC.i \
+  IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i \
+  IOPC.i \
+  PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  Parser_Registry.h \
+  Parser_Registry.i \
+  Service_Callbacks.h \
+  Service_Callbacks.i \
+  Fault_Tolerance_Service.h \
+  Fault_Tolerance_Service.i \
+  Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  Cleanup_Func_Registry.inl \
+  Object_Ref_Table.h \
+  Interceptor_List.h \
+  Interceptor_List.inl \
+  PICurrent.h \
+  PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  ORB_Core.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.h \
+  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/Marshal.o .obj/Marshal.so .shobj/Marshal.o .shobj/Marshal.so: Marshal.cpp Marshal.h \
+.obj/Marshal.o .obj/Marshal.SO .shobj/Marshal.o .shobj/Marshal.SO: Marshal.cpp Marshal.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -8304,8 +8167,7 @@ realclean:
   Typecode.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -8316,8 +8178,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -8429,7 +8290,7 @@ realclean:
   Environment.h \
   Environment.i
 
-.obj/skip.o .obj/skip.so .shobj/skip.o .shobj/skip.so: skip.cpp Marshal.h \
+.obj/skip.o .obj/skip.SO .shobj/skip.o .shobj/skip.SO: skip.cpp Marshal.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -8453,8 +8314,7 @@ realclean:
   Typecode.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -8465,8 +8325,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -8603,17 +8462,123 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
   Any.i \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  debug.h
+  debug.h \
+  Valuetype_Adapter.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  ORB_Core.h \
+  ORB.h \
+  ServicesC.h \
+  ServicesC.i \
+  CORBA_String.h \
+  CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
+  objectid.h \
+  PolicyC.h \
+  CurrentC.h \
+  Any_Impl_T.h \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
+  CurrentC.i \
+  Remote_Object_Proxy_Impl.h \
+  Object_Proxy_Impl.h \
+  PolicyC.i \
+  ORB.i \
+  Policy_Manager.h \
+  Policy_Set.h \
+  Policy_Set.i \
+  LocalObject.h \
+  LocalObject.i \
+  Policy_Manager.i \
+  Resource_Factory.h \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
+  params.h \
+  params.i \
+  TAO_Singleton_Manager.h \
+  TAO_Singleton_Manager.inl \
+  TAO_Singleton.h \
+  TAO_Singleton.inl \
+  TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  Adapter.h \
+  Adapter.i \
+  PolicyFactory_Registry.h \
+  PortableInterceptorC.h \
+  PI_ForwardC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
+  DynamicC.i \
+  Messaging_SyncScopeC.h \
+  Messaging_SyncScopeC.i \
+  IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i \
+  IOPC.i \
+  PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  Parser_Registry.h \
+  Parser_Registry.i \
+  Service_Callbacks.h \
+  Service_Callbacks.i \
+  Fault_Tolerance_Service.h \
+  Fault_Tolerance_Service.i \
+  Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  Cleanup_Func_Registry.inl \
+  Object_Ref_Table.h \
+  Interceptor_List.h \
+  Interceptor_List.inl \
+  PICurrent.h \
+  PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  ORB_Core.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.h \
+  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/Managed_Types.o .obj/Managed_Types.so .shobj/Managed_Types.o .shobj/Managed_Types.so: Managed_Types.cpp \
+.obj/Managed_Types.o .obj/Managed_Types.SO .shobj/Managed_Types.o .shobj/Managed_Types.SO: Managed_Types.cpp \
   Managed_Types.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -8659,8 +8624,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -8800,13 +8764,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -8816,7 +8778,7 @@ realclean:
   PolicyC.i \
   ORB.i
 
-.obj/Any.o .obj/Any.so .shobj/Any.o .shobj/Any.so: Any.cpp Any_T.h \
+.obj/Any.o .obj/Any.SO .shobj/Any.o .shobj/Any.SO: Any.cpp Any_Impl_T.h \
   $(ACE_ROOT)/ace/pre.h \
   Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -8853,8 +8815,7 @@ realclean:
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   Object.h \
   Policy_ForwardC.h \
@@ -8989,22 +8950,32 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Basic_Impl_T.h \
+  Any_Basic_Impl_T.inl \
+  Any_Basic_Impl_T.cpp \
+  Any_Special_Impl_T.h \
+  Any_Special_Impl_T.inl \
+  Any_Special_Impl_T.cpp \
+  Any_Special_Basic_Impl_T.h \
+  Any_Special_Basic_Impl_T.inl \
+  Any_Special_Basic_Impl_T.cpp \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   ORB_Core.h \
   ORB.h \
   ServicesC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
@@ -9048,20 +9019,12 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -9111,7 +9074,7 @@ realclean:
   Codeset_Translator_Factory_T.h \
   Codeset_Translator_Factory_T.cpp
 
-.obj/CORBA_String.o .obj/CORBA_String.so .shobj/CORBA_String.o .shobj/CORBA_String.so: CORBA_String.cpp \
+.obj/CORBA_String.o .obj/CORBA_String.SO .shobj/CORBA_String.o .shobj/CORBA_String.SO: CORBA_String.cpp \
   CORBA_String.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -9148,10 +9111,9 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i
 
-.obj/CurrentC.o .obj/CurrentC.so .shobj/CurrentC.o .shobj/CurrentC.so: CurrentC.cpp CurrentC.h $(ACE_ROOT)/ace/pre.h \
+.obj/CurrentC.o .obj/CurrentC.SO .shobj/CurrentC.o .shobj/CurrentC.SO: CurrentC.cpp CurrentC.h $(ACE_ROOT)/ace/pre.h \
   Object.h \
   Policy_ForwardC.h \
   Sequence.h \
@@ -9191,8 +9153,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -9322,20 +9283,21 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h CurrentC.i
 
-.obj/Exception.o .obj/Exception.so .shobj/Exception.o .shobj/Exception.so: Exception.cpp $(ACE_ROOT)/ace/streams.h \
+.obj/Exception.o .obj/Exception.SO .shobj/Exception.o .shobj/Exception.SO: Exception.cpp $(ACE_ROOT)/ace/streams.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -9366,8 +9328,7 @@ realclean:
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -9516,14 +9477,14 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
   Any.i \
   ORB.h \
   ServicesC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
@@ -9532,11 +9493,9 @@ realclean:
   objectid.h \
   PolicyC.h \
   CurrentC.h \
-  Any_T.h \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.h \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -9571,20 +9530,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -9632,7 +9586,7 @@ realclean:
   ORB_Core.i \
   Dynamic_Adapter.h
 
-.obj/WrongTransactionC.o .obj/WrongTransactionC.so .shobj/WrongTransactionC.o .shobj/WrongTransactionC.so: WrongTransactionC.cpp WrongTransactionC.h \
+.obj/WrongTransactionC.o .obj/WrongTransactionC.SO .shobj/WrongTransactionC.o .shobj/WrongTransactionC.SO: WrongTransactionC.cpp WrongTransactionC.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -9678,11 +9632,10 @@ realclean:
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i TAO_Export.h \
-  WrongTransactionC.i Stub.h \
+  CDR.i TAO_Export.h WrongTransactionC.i \
+  Stub.h \
   MProfile.h \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
@@ -9808,15 +9761,16 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -9827,9 +9781,6 @@ realclean:
   MProfile.i \
   ORB.h \
   ServicesC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
@@ -9868,20 +9819,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -9933,9 +9879,6 @@ realclean:
   Invocation.h \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   LF_Invocation_Event.h \
   LF_Event.h \
@@ -9976,7 +9919,7 @@ realclean:
   ClientInterceptorAdapter.h \
   ClientInterceptorAdapter.inl
 
-.obj/Environment.o .obj/Environment.so .shobj/Environment.o .shobj/Environment.so: Environment.cpp \
+.obj/Environment.o .obj/Environment.SO .shobj/Environment.o .shobj/Environment.SO: Environment.cpp \
   Environment.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -10028,8 +9971,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -10164,13 +10106,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -10209,20 +10149,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -10269,7 +10204,7 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Manager.i \
   ORB_Core.i
 
-.obj/Object.o .obj/Object.so .shobj/Object.o .shobj/Object.so: Object.cpp Object.h \
+.obj/Object.o .obj/Object.SO .shobj/Object.o .shobj/Object.SO: Object.cpp Object.h \
   $(ACE_ROOT)/ace/pre.h \
   Policy_ForwardC.h \
   Sequence.h \
@@ -10309,8 +10244,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -10440,19 +10374,20 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
   Stub.h \
   MProfile.h \
   PolicyC.h \
   CurrentC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -10463,9 +10398,6 @@ realclean:
   MProfile.i \
   ORB.h \
   ServicesC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
@@ -10504,20 +10436,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -10575,9 +10502,6 @@ realclean:
   Invocation.h \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   LF_Invocation_Event.h \
   LF_Event.h \
@@ -10622,7 +10546,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/LocalObject.o .obj/LocalObject.so .shobj/LocalObject.o .shobj/LocalObject.so: LocalObject.cpp LocalObject.h \
+.obj/LocalObject.o .obj/LocalObject.SO .shobj/LocalObject.o .shobj/LocalObject.SO: LocalObject.cpp LocalObject.h \
   $(ACE_ROOT)/ace/pre.h Object.h \
   Policy_ForwardC.h \
   Sequence.h \
@@ -10662,8 +10586,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -10793,24 +10716,24 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i Object_KeyC.h LocalObject.i \
   PolicyC.h CurrentC.h Object.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h CurrentC.i Policy_ForwardC.h \
   Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h PolicyC.i \
-  debug.h
+  Object_Proxy_Impl.h PolicyC.i debug.h
 
-.obj/ObjectIdListC.o .obj/ObjectIdListC.so .shobj/ObjectIdListC.o .shobj/ObjectIdListC.so: ObjectIdListC.cpp ObjectIdListC.h \
+.obj/ObjectIdListC.o .obj/ObjectIdListC.SO .shobj/ObjectIdListC.o .shobj/ObjectIdListC.SO: ObjectIdListC.cpp ObjectIdListC.h \
   $(ACE_ROOT)/ace/pre.h \
   Sequence.h \
   corbafwd.h \
@@ -10849,8 +10772,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -10986,15 +10908,16 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -11005,9 +10928,6 @@ realclean:
   MProfile.i \
   ORB.h \
   ServicesC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
@@ -11045,20 +10965,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -11108,7 +11023,7 @@ realclean:
   ORB_Core_Auto_Ptr.inl \
   Stub.i
 
-.obj/ORB.o .obj/ORB.so .shobj/ORB.o .shobj/ORB.so: ORB.cpp ORB.h $(ACE_ROOT)/ace/pre.h corbafwd.h \
+.obj/ORB.o .obj/ORB.SO .shobj/ORB.o .shobj/ORB.SO: ORB.cpp ORB.h $(ACE_ROOT)/ace/pre.h corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -11150,8 +11065,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -11286,13 +11200,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h CurrentC.i Policy_ForwardC.h \
@@ -11308,8 +11220,8 @@ realclean:
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
   IOR_Parser.i Parser_Registry.h \
-  Parser_Registry.i Object.h \
-  Typecode.h Stub.h MProfile.h \
+  Parser_Registry.i Object.h Typecode.h \
+  Stub.h MProfile.h \
   PolicyC.h \
   MProfile.i \
   ORB.h \
@@ -11341,21 +11253,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  CurrentC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -11413,9 +11319,8 @@ realclean:
   default_ports.h ORBInitInfo.h PortableInterceptorC.h LocalObject.h \
   StringSeqC.h ORBInitInfo.inl ORBInitializer_Registry.h \
   CodecFactory_ORBInitializer.h TypeCodeFactory_Adapter.h \
-  PICurrent_ORBInitializer.h PICurrent.h ValueFactory_Map.h \
-  ValueFactory_Map.i Object_KeyC.h \
-  $(ACE_ROOT)/ace/Dynamic_Service.h \
+  Valuetype_Adapter.h PICurrent_ORBInitializer.h PICurrent.h \
+  Object_KeyC.h $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp \
@@ -11423,8 +11328,7 @@ realclean:
   $(ACE_ROOT)/ace/Service_Repository.i \
   $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
   $(ACE_ROOT)/ace/SOCK_Dgram.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
@@ -11443,7 +11347,7 @@ realclean:
   $(ACE_ROOT)/ace/Argv_Type_Converter.h \
   $(ACE_ROOT)/ace/Argv_Type_Converter.inl
 
-.obj/corbafwd.o .obj/corbafwd.so .shobj/corbafwd.o .shobj/corbafwd.so: corbafwd.cpp corbafwd.h \
+.obj/corbafwd.o .obj/corbafwd.SO .shobj/corbafwd.o .shobj/corbafwd.SO: corbafwd.cpp corbafwd.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -11474,10 +11378,9 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i
 
-.obj/Policy_ForwardC.o .obj/Policy_ForwardC.so .shobj/Policy_ForwardC.o .shobj/Policy_ForwardC.so: Policy_ForwardC.cpp Policy_ForwardC.h \
+.obj/Policy_ForwardC.o .obj/Policy_ForwardC.SO .shobj/Policy_ForwardC.o .shobj/Policy_ForwardC.SO: Policy_ForwardC.cpp Policy_ForwardC.h \
   $(ACE_ROOT)/ace/pre.h \
   Sequence.h \
   corbafwd.h \
@@ -11516,8 +11419,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -11641,10 +11543,8 @@ realclean:
   Seq_Out_T.h \
   Seq_Out_T.inl \
   Seq_Out_T.cpp Policy_ForwardC.i \
-  Stub.h \
-  MProfile.h \
-  PolicyC.h \
-  CurrentC.h \
+  Any_Basic_Impl_T.h \
+  Any.h \
   Object.h \
   Policy_ForwardC.h \
   Object_KeyC.h \
@@ -11652,18 +11552,28 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
-  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Basic_Impl_T.inl \
+  Any_Basic_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_IMpl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
+  Any_Dual_Impl_T.h \
+  Stub.h \
+  MProfile.h \
+  PolicyC.h \
+  CurrentC.h \
+  Any_Impl_T.h \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
@@ -11671,9 +11581,6 @@ realclean:
   MProfile.i \
   ORB.h \
   ServicesC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
@@ -11712,20 +11619,12 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -11775,7 +11674,7 @@ realclean:
   ORB_Core_Auto_Ptr.inl \
   Stub.i
 
-.obj/PolicyC.o .obj/PolicyC.so .shobj/PolicyC.o .shobj/PolicyC.so: PolicyC.cpp PolicyC.h $(ACE_ROOT)/ace/pre.h \
+.obj/PolicyC.o .obj/PolicyC.SO .shobj/PolicyC.o .shobj/PolicyC.SO: PolicyC.cpp PolicyC.h $(ACE_ROOT)/ace/pre.h \
   CurrentC.h Object.h \
   Policy_ForwardC.h \
   Sequence.h \
@@ -11815,8 +11714,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -11946,15 +11844,16 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h CurrentC.i Policy_ForwardC.h \
@@ -11966,9 +11865,6 @@ realclean:
   MProfile.i \
   ORB.h \
   ServicesC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
@@ -12007,21 +11903,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  CurrentC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -12073,9 +11963,6 @@ realclean:
   Invocation.h \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   LF_Invocation_Event.h \
   LF_Event.h \
@@ -12116,7 +12003,7 @@ realclean:
   ClientInterceptorAdapter.h \
   ClientInterceptorAdapter.inl
 
-.obj/Policy_Validator.o .obj/Policy_Validator.so .shobj/Policy_Validator.o .shobj/Policy_Validator.so: Policy_Validator.cpp Policy_Validator.h \
+.obj/Policy_Validator.o .obj/Policy_Validator.SO .shobj/Policy_Validator.o .shobj/Policy_Validator.SO: Policy_Validator.cpp Policy_Validator.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -12156,8 +12043,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -12296,13 +12182,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h CurrentC.i Policy_ForwardC.h \
@@ -12332,27 +12216,19 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
+  OctetSeqC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   IOP_CodecC.h \
   IOP_CodecC.i IOPC.i \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h IOPC.h \
+  Parser_Registry.i Service_Callbacks.h \
+  IOPC.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -12381,7 +12257,7 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i debug.h
 
-.obj/Encodable.o .obj/Encodable.so .shobj/Encodable.o .shobj/Encodable.so: Encodable.cpp Encodable.h \
+.obj/Encodable.o .obj/Encodable.SO .shobj/Encodable.o .shobj/Encodable.SO: Encodable.cpp Encodable.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -12403,7 +12279,7 @@ realclean:
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i
 
-.obj/Abstract_Servant_Base.o .obj/Abstract_Servant_Base.so .shobj/Abstract_Servant_Base.o .shobj/Abstract_Servant_Base.so: Abstract_Servant_Base.cpp \
+.obj/Abstract_Servant_Base.o .obj/Abstract_Servant_Base.SO .shobj/Abstract_Servant_Base.o .shobj/Abstract_Servant_Base.SO: Abstract_Servant_Base.cpp \
   Abstract_Servant_Base.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -12428,7 +12304,7 @@ realclean:
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h
 
-.obj/Object_Proxy_Broker.o .obj/Object_Proxy_Broker.so .shobj/Object_Proxy_Broker.o .shobj/Object_Proxy_Broker.so: Object_Proxy_Broker.cpp \
+.obj/Object_Proxy_Broker.o .obj/Object_Proxy_Broker.SO .shobj/Object_Proxy_Broker.o .shobj/Object_Proxy_Broker.SO: Object_Proxy_Broker.cpp \
   Object_Proxy_Broker.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -12453,7 +12329,7 @@ realclean:
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h
 
-.obj/Remote_Object_Proxy_Broker.o .obj/Remote_Object_Proxy_Broker.so .shobj/Remote_Object_Proxy_Broker.o .shobj/Remote_Object_Proxy_Broker.so: Remote_Object_Proxy_Broker.cpp \
+.obj/Remote_Object_Proxy_Broker.o .obj/Remote_Object_Proxy_Broker.SO .shobj/Remote_Object_Proxy_Broker.o .shobj/Remote_Object_Proxy_Broker.SO: Remote_Object_Proxy_Broker.cpp \
   Remote_Object_Proxy_Broker.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -12481,7 +12357,7 @@ realclean:
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h
 
-.obj/Object_Proxy_Impl.o .obj/Object_Proxy_Impl.so .shobj/Object_Proxy_Impl.o .shobj/Object_Proxy_Impl.so: Object_Proxy_Impl.cpp \
+.obj/Object_Proxy_Impl.o .obj/Object_Proxy_Impl.SO .shobj/Object_Proxy_Impl.o .shobj/Object_Proxy_Impl.SO: Object_Proxy_Impl.cpp \
   Object_Proxy_Impl.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -12506,7 +12382,7 @@ realclean:
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h
 
-.obj/Remote_Object_Proxy_Impl.o .obj/Remote_Object_Proxy_Impl.so .shobj/Remote_Object_Proxy_Impl.o .shobj/Remote_Object_Proxy_Impl.so: Remote_Object_Proxy_Impl.cpp \
+.obj/Remote_Object_Proxy_Impl.o .obj/Remote_Object_Proxy_Impl.SO .shobj/Remote_Object_Proxy_Impl.o .shobj/Remote_Object_Proxy_Impl.SO: Remote_Object_Proxy_Impl.cpp \
   Remote_Object_Proxy_Impl.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -12537,8 +12413,7 @@ realclean:
   Exception.i \
   Stub.h \
   MProfile.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -12549,8 +12424,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
@@ -12684,15 +12558,16 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -12701,9 +12576,6 @@ realclean:
   MProfile.i \
   ORB.h \
   ServicesC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
@@ -12742,20 +12614,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -12807,9 +12674,6 @@ realclean:
   Invocation.h \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   LF_Invocation_Event.h \
   LF_Event.h \
@@ -12849,7 +12713,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/DomainC.o .obj/DomainC.so .shobj/DomainC.o .shobj/DomainC.so: DomainC.cpp DomainC.h $(ACE_ROOT)/ace/pre.h \
+.obj/DomainC.o .obj/DomainC.SO .shobj/DomainC.o .shobj/DomainC.SO: DomainC.cpp DomainC.h $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -12889,8 +12753,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -13020,15 +12883,16 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h CurrentC.i Policy_ForwardC.h \
@@ -13040,9 +12904,6 @@ realclean:
   MProfile.i \
   ORB.h \
   ServicesC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
@@ -13081,21 +12942,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  CurrentC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -13147,9 +13002,6 @@ realclean:
   Invocation.h \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   LF_Invocation_Event.h \
   LF_Event.h \
@@ -13195,9 +13047,9 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/TimeBaseC.o .obj/TimeBaseC.so .shobj/TimeBaseC.o .shobj/TimeBaseC.so: TimeBaseC.cpp TimeBaseC.h \
+.obj/TimeBaseC.o .obj/TimeBaseC.SO .shobj/TimeBaseC.o .shobj/TimeBaseC.SO: TimeBaseC.cpp TimeBaseC.h \
   $(ACE_ROOT)/ace/pre.h \
-  Any_T.h \
+  Any_Dual_Impl_T.h \
   Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -13233,8 +13085,7 @@ realclean:
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   Object.h \
   Policy_ForwardC.h \
@@ -13369,24 +13220,25 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   TimeBaseC.i \
   Stub.h \
   MProfile.h \
   PolicyC.h \
   CurrentC.h \
+  Any_Impl_T.h \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
@@ -13432,20 +13284,12 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -13497,9 +13341,6 @@ realclean:
   Invocation.h \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   LF_Invocation_Event.h \
   LF_Event.h \
@@ -13535,7 +13376,7 @@ realclean:
   Invocation.i \
   RequestInfo_Util.h
 
-.obj/Principal.o .obj/Principal.so .shobj/Principal.o .shobj/Principal.so: Principal.cpp Principal.h \
+.obj/Principal.o .obj/Principal.SO .shobj/Principal.o .shobj/Principal.SO: Principal.cpp Principal.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -13575,8 +13416,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -13699,7 +13539,7 @@ realclean:
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i
 
-.obj/Sequence.o .obj/Sequence.so .shobj/Sequence.o .shobj/Sequence.so: Sequence.cpp Sequence.h \
+.obj/Sequence.o .obj/Sequence.SO .shobj/Sequence.o .shobj/Sequence.SO: Sequence.cpp Sequence.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -13737,8 +13577,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -13849,9 +13688,8 @@ realclean:
   Environment.h \
   Environment.i
 
-.obj/MProfile.o .obj/MProfile.so .shobj/MProfile.o .shobj/MProfile.so: MProfile.cpp MProfile.h \
-  $(ACE_ROOT)/ace/pre.h \
-  $(ACE_ROOT)/ace/Synch.h \
+.obj/MProfile.o .obj/MProfile.SO .shobj/MProfile.o .shobj/MProfile.SO: MProfile.cpp MProfile.h \
+  $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -13876,8 +13714,7 @@ realclean:
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
@@ -14023,15 +13860,16 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -14044,10 +13882,10 @@ realclean:
   Tagged_Components.h \
   IOPC.h \
   IOP_CodecC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   IOPC.i \
   CONV_FRAMEC.h \
   CONV_FRAMEC.i \
@@ -14056,7 +13894,7 @@ realclean:
   GIOP_Message_Version.inl \
   Profile.i
 
-.obj/Stub.o .obj/Stub.so .shobj/Stub.o .shobj/Stub.so: Stub.cpp Endpoint.h $(ACE_ROOT)/ace/pre.h \
+.obj/Stub.o .obj/Stub.SO .shobj/Stub.o .shobj/Stub.SO: Stub.cpp Endpoint.h $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -14077,8 +13915,7 @@ realclean:
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -14089,8 +13926,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -14231,15 +14067,16 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -14250,9 +14087,6 @@ realclean:
   MProfile.i \
   ORB.h \
   ServicesC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
@@ -14291,20 +14125,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -14359,9 +14188,6 @@ realclean:
   GIOP_Message_Version.inl Profile.i \
   Sequence.h Object.h Invocation.h CDR.h Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   LF_Invocation_Event.h \
   LF_Event.h \
@@ -14396,10 +14222,9 @@ realclean:
   TAOC.i \
   Sync_Strategies.i \
   Buffering_Constraint_Policy.h \
-  Buffering_Constraint_Policy.i \
-  debug.h
+  Buffering_Constraint_Policy.i debug.h
 
-.obj/Typecode.o .obj/Typecode.so .shobj/Typecode.o .shobj/Typecode.so: Typecode.cpp Typecode.h \
+.obj/Typecode.o .obj/Typecode.SO .shobj/Typecode.o .shobj/Typecode.SO: Typecode.cpp Typecode.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/post.h \
@@ -14407,8 +14232,7 @@ realclean:
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
@@ -14428,8 +14252,7 @@ realclean:
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -14571,816 +14394,19 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
-  IOP_IORC.i \
-  Object.i \
-  Any.i \
-  Marshal.h \
-  Marshal.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  debug.h
-
-.obj/AbstractBase.o .obj/AbstractBase.so .shobj/AbstractBase.o .shobj/AbstractBase.so: AbstractBase.cpp \
-  AbstractBase.h \
-  $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/post.h \
-  $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  orbconf.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
-  TAO_Export.h \
-  $(ACE_ROOT)/ace/OS_Memory.h \
-  $(ACE_ROOT)/ace/OS_Errno.h \
-  $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(ACE_ROOT)/ace/OS_Memory.inl \
-  corbafwd.i \
-  Pseudo_VarOut_T.h \
-  Pseudo_VarOut_T.inl \
-  Pseudo_VarOut_T.cpp \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  AbstractBase.inl \
-  Stub.h \
-  MProfile.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
-  $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Dirent.inl \
-  $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/OS_String.inl \
-  $(ACE_ROOT)/ace/OS_TLI.h \
-  $(ACE_ROOT)/ace/OS_TLI.inl \
-  $(ACE_ROOT)/ace/Time_Value.h \
-  $(ACE_ROOT)/ace/Time_Value.inl \
-  $(ACE_ROOT)/ace/Min_Max.h \
-  $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  PolicyC.h \
-  CurrentC.h \
-  Object.h \
-  Policy_ForwardC.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Exception.h \
-  $(ACE_ROOT)/ace/iosfwd.h \
-  Exception.i \
-  Typecode.i \
-  Environment.h \
-  Environment.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  Objref_VarOut_T.h \
-  varbase.h \
-  Objref_VarOut_T.inl \
-  Objref_VarOut_T.cpp \
-  Seq_Var_T.h \
-  Seq_Var_T.inl \
-  Seq_Var_T.cpp \
-  Seq_Out_T.h \
-  Seq_Out_T.inl \
-  Seq_Out_T.cpp \
-  Policy_ForwardC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  IOP_IORC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
-  IOP_IORC.i \
-  Object.i \
-  Any_T.h \
-  Any.h \
-  Any.i \
-  Any_T.inl \
-  Any_T.cpp \
-  Marshal.h \
-  Marshal.i \
-  debug.h \
-  CurrentC.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  PolicyC.i \
-  MProfile.i \
-  ORB.h \
-  ServicesC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  ServicesC.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ObjectIdListC.h \
-  ObjectIdListC.i \
-  objectid.h \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  params.h \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  StringSeqC.h \
-  StringSeqC.i \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
-  Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i \
-  IOPC.h \
-  IOP_CodecC.h \
-  IOP_CodecC.i \
-  IOPC.i \
-  PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  PICurrent.h \
-  PICurrent.inl \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  ORB_Core_Auto_Ptr.h \
-  ORB_Core_Auto_Ptr.inl \
-  Stub.i \
-  Profile.h \
-  Tagged_Components.h \
-  Tagged_Components.i \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Profile.i \
-  ValueFactory.h \
-  ValueFactory.i
-
-.obj/ValueBase.o .obj/ValueBase.so .shobj/ValueBase.o .shobj/ValueBase.so: ValueBase.cpp CDR.h \
-  $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/post.h \
-  $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  orbconf.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
-  TAO_Export.h \
-  $(ACE_ROOT)/ace/OS_Memory.h \
-  $(ACE_ROOT)/ace/OS_Errno.h \
-  $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(ACE_ROOT)/ace/OS_Memory.inl \
-  corbafwd.i \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
-  $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/OS_String.inl \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Time_Value.h \
-  $(ACE_ROOT)/ace/Time_Value.inl \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/OS.h \
-  $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Dirent.inl \
-  $(ACE_ROOT)/ace/OS_TLI.h \
-  $(ACE_ROOT)/ace/OS_TLI.inl \
-  $(ACE_ROOT)/ace/Min_Max.h \
-  $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  ORB.h \
-  Exception.h \
-  $(ACE_ROOT)/ace/iosfwd.h \
-  Exception.i \
-  ServicesC.h \
-  OctetSeqC.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Pseudo_VarOut_T.h \
-  Pseudo_VarOut_T.inl \
-  Pseudo_VarOut_T.cpp \
-  Typecode.i \
-  Environment.h \
-  Environment.i \
-  Seq_Var_T.h \
-  Seq_Var_T.inl \
-  Seq_Var_T.cpp \
-  Seq_Out_T.h \
-  Seq_Out_T.inl \
-  Seq_Out_T.cpp \
-  OctetSeqC.i \
   VarOut_T.h \
   VarOut_T.inl \
   VarOut_T.cpp \
-  ServicesC.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ObjectIdListC.h \
-  ObjectIdListC.i \
-  objectid.h \
-  PolicyC.h \
-  CurrentC.h \
-  Object.h \
-  Policy_ForwardC.h \
-  Objref_VarOut_T.h \
-  varbase.h \
-  Objref_VarOut_T.inl \
-  Objref_VarOut_T.cpp \
-  Policy_ForwardC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
-  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
   Marshal.h \
   Marshal.i \
-  debug.h \
-  CurrentC.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  PolicyC.i \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  params.h \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  StringSeqC.h \
-  StringSeqC.i \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
-  Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i \
-  IOPC.h \
-  IOP_CodecC.h \
-  IOP_CodecC.i \
-  IOPC.i \
-  PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  PICurrent.h \
-  PICurrent.inl \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  ValueFactory.h \
-  ValueFactory.i
-
-.obj/ValueFactory.o .obj/ValueFactory.so .shobj/ValueFactory.o .shobj/ValueFactory.so: ValueFactory.cpp \
-  ValueFactory.h \
-  $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/post.h \
-  $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  orbconf.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
-  TAO_Export.h \
-  $(ACE_ROOT)/ace/OS_Memory.h \
-  $(ACE_ROOT)/ace/OS_Errno.h \
-  $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(ACE_ROOT)/ace/OS_Memory.inl \
-  corbafwd.i \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
-  $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Dirent.inl \
-  $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/OS_String.inl \
-  $(ACE_ROOT)/ace/OS_TLI.h \
-  $(ACE_ROOT)/ace/OS_TLI.inl \
-  $(ACE_ROOT)/ace/Time_Value.h \
-  $(ACE_ROOT)/ace/Time_Value.inl \
-  $(ACE_ROOT)/ace/Min_Max.h \
-  $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  ValueFactory.i
+  CORBA_String.h \
+  CORBA_String.inl \
+  debug.h
 
-.obj/ValueFactory_Map.o .obj/ValueFactory_Map.so .shobj/ValueFactory_Map.o .shobj/ValueFactory_Map.so: ValueFactory_Map.cpp \
-  ValueFactory_Map.h \
-  $(ACE_ROOT)/ace/pre.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/post.h \
-  $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
-  $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
-  $(ACE_ROOT)/ace/OS_Errno.h \
-  $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(ACE_ROOT)/ace/OS_Dirent.inl \
-  $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/OS_String.inl \
-  $(ACE_ROOT)/ace/OS_Memory.h \
-  $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(ACE_ROOT)/ace/OS_TLI.h \
-  $(ACE_ROOT)/ace/OS_TLI.inl \
-  $(ACE_ROOT)/ace/Time_Value.h \
-  $(ACE_ROOT)/ace/Time_Value.inl \
-  $(ACE_ROOT)/ace/Global_Macros.h \
-  $(ACE_ROOT)/ace/Min_Max.h \
-  $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h \
-  TAO_Export.h \
-  orbconf.h \
-  TAO_Singleton_Manager.inl \
-  corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  corbafwd.i \
-  ValueFactory_Map.i \
-  ValueFactory.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueFactory.i
-
-.obj/CDR.o .obj/CDR.so .shobj/CDR.o .shobj/CDR.so: CDR.cpp Timeprobe.h \
+.obj/CDR.o .obj/CDR.SO .shobj/CDR.o .shobj/CDR.SO: CDR.cpp Timeprobe.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -15407,8 +14433,7 @@ realclean:
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   CDR.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -15569,13 +14594,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -15614,20 +14637,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -15674,7 +14692,7 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Manager.i \
   ORB_Core.i
 
-.obj/Client_Strategy_Factory.o .obj/Client_Strategy_Factory.so .shobj/Client_Strategy_Factory.o .shobj/Client_Strategy_Factory.so: Client_Strategy_Factory.cpp \
+.obj/Client_Strategy_Factory.o .obj/Client_Strategy_Factory.SO .shobj/Client_Strategy_Factory.o .shobj/Client_Strategy_Factory.SO: Client_Strategy_Factory.cpp \
   Client_Strategy_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Service_Object.h \
@@ -15703,8 +14721,7 @@ realclean:
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -15713,14 +14730,14 @@ realclean:
   $(ACE_ROOT)/ace/Service_Object.i \
   TAO_Export.h
 
-.obj/debug.o .obj/debug.so .shobj/debug.o .shobj/debug.so: debug.cpp debug.h \
+.obj/debug.o .obj/debug.SO .shobj/debug.o .shobj/debug.SO: debug.cpp debug.h \
   $(ACE_ROOT)/ace/pre.h \
   TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl
 
-.obj/Object_KeyC.o .obj/Object_KeyC.so .shobj/Object_KeyC.o .shobj/Object_KeyC.so: Object_KeyC.cpp Object_KeyC.h \
+.obj/Object_KeyC.o .obj/Object_KeyC.SO .shobj/Object_KeyC.o .shobj/Object_KeyC.SO: Object_KeyC.cpp Object_KeyC.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -15766,8 +14783,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -15895,15 +14911,16 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -15914,9 +14931,6 @@ realclean:
   MProfile.i \
   ORB.h \
   ServicesC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
@@ -15955,20 +14969,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -16020,9 +15029,6 @@ realclean:
   Invocation.h \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   LF_Invocation_Event.h \
   LF_Event.h \
@@ -16063,7 +15069,7 @@ realclean:
   ClientInterceptorAdapter.h \
   ClientInterceptorAdapter.inl
 
-.obj/Protocols_Hooks.o .obj/Protocols_Hooks.so .shobj/Protocols_Hooks.o .shobj/Protocols_Hooks.so: Protocols_Hooks.cpp Protocols_Hooks.h \
+.obj/Protocols_Hooks.o .obj/Protocols_Hooks.SO .shobj/Protocols_Hooks.o .shobj/Protocols_Hooks.SO: Protocols_Hooks.cpp Protocols_Hooks.h \
   $(ACE_ROOT)/ace/pre.h corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -16102,8 +15108,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -16237,7 +15242,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/Default_Protocols_Hooks.o .obj/Default_Protocols_Hooks.so .shobj/Default_Protocols_Hooks.o .shobj/Default_Protocols_Hooks.so: Default_Protocols_Hooks.cpp \
+.obj/Default_Protocols_Hooks.o .obj/Default_Protocols_Hooks.SO .shobj/Default_Protocols_Hooks.o .shobj/Default_Protocols_Hooks.SO: Default_Protocols_Hooks.cpp \
   Default_Protocols_Hooks.h $(ACE_ROOT)/ace/pre.h \
   Protocols_Hooks.h corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -16276,8 +15281,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -16414,15 +15418,16 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h CurrentC.i \
@@ -16439,7 +15444,7 @@ realclean:
   LF_Invocation_Event.inl \
   Connection_Handler.inl
 
-.obj/Messaging_SyncScopeC.o .obj/Messaging_SyncScopeC.so .shobj/Messaging_SyncScopeC.o .shobj/Messaging_SyncScopeC.so: Messaging_SyncScopeC.cpp Messaging_SyncScopeC.h \
+.obj/Messaging_SyncScopeC.o .obj/Messaging_SyncScopeC.SO .shobj/Messaging_SyncScopeC.o .shobj/Messaging_SyncScopeC.SO: Messaging_SyncScopeC.cpp Messaging_SyncScopeC.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -16463,8 +15468,7 @@ realclean:
   Typecode.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -16475,8 +15479,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -16576,7 +15579,7 @@ realclean:
   Pseudo_VarOut_T.cpp \
   Typecode.i
 
-.obj/Invocation.o .obj/Invocation.so .shobj/Invocation.o .shobj/Invocation.so: Invocation.cpp Invocation.h \
+.obj/Invocation.o .obj/Invocation.SO .shobj/Invocation.o .shobj/Invocation.SO: Invocation.cpp Invocation.h \
   $(ACE_ROOT)/ace/pre.h CDR.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -16618,11 +15621,19 @@ realclean:
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
+  Reply_Dispatcher.i \
+  LF_Invocation_Event.h \
+  LF_Event.h \
+  LF_Event.inl \
+  LF_Invocation_Event.inl \
+  GIOP_Message_Version.h \
+  GIOP_Message_Version.inl \
+  CDR.h Messaging_SyncScopeC.h \
+  Messaging_SyncScopeC.i operation_details.h corbafwd.h Service_Context.h \
   IOPC.h \
   IOP_IORC.h \
   OctetSeqC.h \
@@ -16740,10 +15751,12 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
-  CDR.h \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -16756,30 +15769,16 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   IOPC.i \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
-  Reply_Dispatcher.i \
-  LF_Invocation_Event.h \
-  LF_Event.h \
-  LF_Event.inl \
-  LF_Invocation_Event.inl \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Messaging_SyncScopeC.h Messaging_SyncScopeC.i operation_details.h \
-  corbafwd.h Service_Context.h \
   Service_Context.inl \
   target_specification.h target_specification.i operation_details.i \
   Transport.h Exception.h Transport_Descriptor_Interface.h \
@@ -16846,20 +15845,12 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
@@ -16915,11 +15906,10 @@ realclean:
   Transport_Connector.h Transport_Connector.inl GIOP_Utils.h \
   GIOP_Utils.i ORB_Core.h \
   Endpoint_Selector_Factory.h Invocation_Endpoint_Selectors.h \
-  Invocation_Endpoint_Selectors.i \
-  TAOC.h PolicyC.h TimeBaseC.h TimeBaseC.i VarOut_T.h TAOC.i \
-  Codeset_Manager.h
+  Invocation_Endpoint_Selectors.i TAOC.h \
+  PolicyC.h TimeBaseC.h TimeBaseC.i VarOut_T.h TAOC.i Codeset_Manager.h
 
-.obj/Invocation_Endpoint_Selectors.o .obj/Invocation_Endpoint_Selectors.so .shobj/Invocation_Endpoint_Selectors.o .shobj/Invocation_Endpoint_Selectors.so: Invocation_Endpoint_Selectors.cpp \
+.obj/Invocation_Endpoint_Selectors.o .obj/Invocation_Endpoint_Selectors.SO .shobj/Invocation_Endpoint_Selectors.o .shobj/Invocation_Endpoint_Selectors.SO: Invocation_Endpoint_Selectors.cpp \
   Invocation_Endpoint_Selectors.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -16965,12 +15955,22 @@ realclean:
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
+  Reply_Dispatcher.i \
+  LF_Invocation_Event.h \
+  LF_Event.h \
+  LF_Event.inl \
+  LF_Invocation_Event.inl \
+  GIOP_Message_Version.h \
+  GIOP_Message_Version.inl \
+  Messaging_SyncScopeC.h \
+  Messaging_SyncScopeC.i \
+  operation_details.h \
+  Service_Context.h \
   IOPC.h \
   IOP_IORC.h \
   OctetSeqC.h \
@@ -17088,9 +16088,12 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -17103,32 +16106,16 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   IOPC.i \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
-  Reply_Dispatcher.i \
-  LF_Invocation_Event.h \
-  LF_Event.h \
-  LF_Event.inl \
-  LF_Invocation_Event.inl \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i \
-  operation_details.h \
-  Service_Context.h \
   Service_Context.inl \
   target_specification.h \
   target_specification.i \
@@ -17202,20 +16189,12 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -17267,7 +16246,7 @@ realclean:
   Base_Transport_Property.h \
   Base_Transport_Property.inl
 
-.obj/Asynch_Invocation.o .obj/Asynch_Invocation.so .shobj/Asynch_Invocation.o .shobj/Asynch_Invocation.so: Asynch_Invocation.cpp \
+.obj/Asynch_Invocation.o .obj/Asynch_Invocation.SO .shobj/Asynch_Invocation.o .shobj/Asynch_Invocation.SO: Asynch_Invocation.cpp \
   Asynch_Invocation.h \
   $(ACE_ROOT)/ace/pre.h \
   Invocation.h \
@@ -17312,12 +16291,22 @@ realclean:
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
+  Reply_Dispatcher.i \
+  LF_Invocation_Event.h \
+  LF_Event.h \
+  LF_Event.inl \
+  LF_Invocation_Event.inl \
+  GIOP_Message_Version.h \
+  GIOP_Message_Version.inl \
+  Messaging_SyncScopeC.h \
+  Messaging_SyncScopeC.i \
+  operation_details.h \
+  Service_Context.h \
   IOPC.h \
   IOP_IORC.h \
   OctetSeqC.h \
@@ -17435,9 +16424,12 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -17450,32 +16442,16 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   IOPC.i \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
-  Reply_Dispatcher.i \
-  LF_Invocation_Event.h \
-  LF_Event.h \
-  LF_Event.inl \
-  LF_Invocation_Event.inl \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i \
-  operation_details.h \
-  Service_Context.h \
   Service_Context.inl \
   target_specification.h \
   target_specification.i \
@@ -17552,20 +16528,12 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -17614,7 +16582,7 @@ realclean:
   Profile.i \
   Transport_Mux_Strategy.h
 
-.obj/operation_details.o .obj/operation_details.so .shobj/operation_details.o .shobj/operation_details.so: operation_details.cpp \
+.obj/operation_details.o .obj/operation_details.SO .shobj/operation_details.o .shobj/operation_details.SO: operation_details.cpp \
   operation_details.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -17658,8 +16626,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -17776,13 +16743,16 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -17795,24 +16765,22 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   IOPC.i \
   Service_Context.inl \
   target_specification.h \
   target_specification.i \
   operation_details.i
 
-.obj/ClientRequestInfo.o .obj/ClientRequestInfo.so .shobj/ClientRequestInfo.o .shobj/ClientRequestInfo.so: ClientRequestInfo.cpp ClientRequestInfo.h \
+.obj/ClientRequestInfo.o .obj/ClientRequestInfo.SO .shobj/ClientRequestInfo.o .shobj/ClientRequestInfo.SO: ClientRequestInfo.cpp ClientRequestInfo.h \
   $(ACE_ROOT)/ace/pre.h \
   orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -17824,15 +16792,14 @@ realclean:
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   PortableInterceptorC.h \
-  CurrentC.h \
-  Object.h \
-  Policy_ForwardC.h \
+  PI_ForwardC.h \
+  TAO_Export.h \
+  OctetSeqC.h \
   Sequence.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  TAO_Export.h \
   $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
@@ -17855,8 +16822,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -17966,63 +16932,57 @@ realclean:
   Typecode.i \
   Environment.h \
   Environment.i \
-  CDR.h \
+  Seq_Var_T.h \
+  Seq_Var_T.inl \
+  Seq_Var_T.cpp \
+  Seq_Out_T.h \
+  Seq_Out_T.inl \
+  Seq_Out_T.cpp \
+  OctetSeqC.i \
+  StringSeqC.h \
+  StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  Object.h \
+  Policy_ForwardC.h \
+  CDR.h \
   CDR.i \
   Objref_VarOut_T.h \
   varbase.h \
   Objref_VarOut_T.inl \
   Objref_VarOut_T.cpp \
-  Seq_Var_T.h \
-  Seq_Var_T.inl \
-  Seq_Var_T.cpp \
-  Seq_Out_T.h \
-  Seq_Out_T.inl \
-  Seq_Out_T.cpp \
   Policy_ForwardC.i \
   Object_KeyC.h \
   Object_KeyC.i \
   IOP_IORC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
-  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
-  CurrentC.i \
-  DynamicC.h \
-  StringSeqC.h \
-  StringSeqC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
   IOP_CodecC.h \
+  Any_Impl_T.h \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   IOP_CodecC.i \
   IOPC.i \
   PolicyC.h \
+  CurrentC.h \
+  CurrentC.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
   PolicyC.i \
@@ -18033,10 +16993,9 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
-  PICurrent.inl \
-  ClientRequestInfo_i.inl
+  PICurrent.inl ClientRequestInfo_i.inl
 
-.obj/ClientRequestInfo_i.o .obj/ClientRequestInfo_i.so .shobj/ClientRequestInfo_i.o .shobj/ClientRequestInfo_i.so: ClientRequestInfo_i.cpp ClientRequestInfo_i.h \
+.obj/ClientRequestInfo_i.o .obj/ClientRequestInfo_i.SO .shobj/ClientRequestInfo_i.o .shobj/ClientRequestInfo_i.SO: ClientRequestInfo_i.cpp ClientRequestInfo_i.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -18058,9 +17017,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i \
   PortableInterceptorC.h \
-  CurrentC.h \
-  Object.h \
-  Policy_ForwardC.h \
+  PI_ForwardC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -18079,8 +17037,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -18190,63 +17147,57 @@ realclean:
   Typecode.i \
   Environment.h \
   Environment.i \
-  CDR.h \
+  Seq_Var_T.h \
+  Seq_Var_T.inl \
+  Seq_Var_T.cpp \
+  Seq_Out_T.h \
+  Seq_Out_T.inl \
+  Seq_Out_T.cpp \
+  OctetSeqC.i \
+  StringSeqC.h \
+  StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  Object.h \
+  Policy_ForwardC.h \
+  CDR.h \
   CDR.i \
   Objref_VarOut_T.h \
   varbase.h \
   Objref_VarOut_T.inl \
   Objref_VarOut_T.cpp \
-  Seq_Var_T.h \
-  Seq_Var_T.inl \
-  Seq_Var_T.cpp \
-  Seq_Out_T.h \
-  Seq_Out_T.inl \
-  Seq_Out_T.cpp \
   Policy_ForwardC.i \
   Object_KeyC.h \
   Object_KeyC.i \
   IOP_IORC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
-  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
-  CurrentC.i \
-  DynamicC.h \
-  StringSeqC.h \
-  StringSeqC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
   IOP_CodecC.h \
+  Any_Impl_T.h \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   IOP_CodecC.i \
   IOPC.i \
   PolicyC.h \
+  CurrentC.h \
+  CurrentC.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
   PolicyC.i \
@@ -18257,12 +17208,9 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.cpp \
   LocalObject.h \
   LocalObject.i \
-  PICurrent.inl \
-  ClientRequestInfo_i.inl Invocation.h CDR.h Synch_Reply_Dispatcher.h \
+  PICurrent.inl ClientRequestInfo_i.inl \
+  Invocation.h CDR.h Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   LF_Invocation_Event.h \
   LF_Event.h \
@@ -18363,12 +17311,16 @@ realclean:
   ORB_Core.i \
   ORB_Core_Auto_Ptr.h \
   ORB_Core_Auto_Ptr.inl \
-  Stub.i AbstractBase.h Profile.h \
+  Stub.i Profile.h \
   Tagged_Components.h \
   Tagged_Components.i Profile.i \
-  Tagged_Components.h debug.h
+  Tagged_Components.h Valuetype_Adapter.h debug.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.h \
+  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/RequestInfo_Util.o .obj/RequestInfo_Util.so .shobj/RequestInfo_Util.o .shobj/RequestInfo_Util.so: RequestInfo_Util.cpp RequestInfo_Util.h \
+.obj/RequestInfo_Util.o .obj/RequestInfo_Util.SO .shobj/RequestInfo_Util.o .shobj/RequestInfo_Util.SO: RequestInfo_Util.cpp RequestInfo_Util.h \
   $(ACE_ROOT)/ace/pre.h corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -18406,8 +17358,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -18524,7 +17475,7 @@ realclean:
   Seq_Out_T.h \
   Seq_Out_T.inl \
   Seq_Out_T.cpp StringSeqC.i \
-  Any_T.h \
+  Any_Dual_Impl_T.h \
   Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
@@ -18542,31 +17493,29 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
-  debug.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp DynamicC.i Any.h
+  debug.h DynamicC.i Any.h
 
-.obj/ClientInterceptorAdapter.o .obj/ClientInterceptorAdapter.so .shobj/ClientInterceptorAdapter.o .shobj/ClientInterceptorAdapter.so: ClientInterceptorAdapter.cpp \
-  ClientInterceptorAdapter.h $(ACE_ROOT)/ace/pre.h \
-  orbconf.h $(ACE_ROOT)/ace/Basic_Types.h \
+.obj/ClientInterceptorAdapter.o .obj/ClientInterceptorAdapter.SO .shobj/ClientInterceptorAdapter.o .shobj/ClientInterceptorAdapter.SO: ClientInterceptorAdapter.cpp \
+  ClientInterceptorAdapter.h $(ACE_ROOT)/ace/pre.h orbconf.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Global_Macros.h \
-  $(ACE_ROOT)/ace/OS_Export.h Interceptor_List.h \
-  corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/OS_Export.h Interceptor_List.h corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/CDR_Base.inl \
   orbconf.h \
@@ -18576,9 +17525,7 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i PortableInterceptorC.h \
-  CurrentC.h Object.h \
-  Policy_ForwardC.h \
-  Sequence.h \
+  PI_ForwardC.h OctetSeqC.h Sequence.h \
   corbafwd.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -18597,8 +17544,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -18708,57 +17654,48 @@ realclean:
   Typecode.i \
   Environment.h \
   Environment.i \
-  CDR.h \
+  Seq_Var_T.h \
+  Seq_Var_T.inl \
+  Seq_Var_T.cpp \
+  Seq_Out_T.h \
+  Seq_Out_T.inl \
+  Seq_Out_T.cpp OctetSeqC.i StringSeqC.h \
+  Sequence.h StringSeqC.i PI_ForwardC.i DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  Object.h \
+  Policy_ForwardC.h \
+  CDR.h \
   CDR.i \
   Objref_VarOut_T.h \
   varbase.h \
   Objref_VarOut_T.inl \
   Objref_VarOut_T.cpp \
-  Seq_Var_T.h \
-  Seq_Var_T.inl \
-  Seq_Var_T.cpp \
-  Seq_Out_T.h \
-  Seq_Out_T.inl \
-  Seq_Out_T.cpp \
   Policy_ForwardC.i \
   Object_KeyC.h \
   Object_KeyC.i \
   IOP_IORC.h \
   OctetSeqC.h \
-  OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
-  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
-  debug.h CurrentC.i DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h \
+  debug.h DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   IOP_CodecC.h \
+  Any_Impl_T.h \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   IOP_CodecC.i IOPC.i PolicyC.h \
-  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
+  CurrentC.h CurrentC.i Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h PolicyC.i \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
@@ -18767,14 +17704,11 @@ realclean:
   PortableInterceptorC.h \
   LocalObject.h \
   LocalObject.i ClientRequestInfo.inl \
-  ClientRequestInfo_i.h PICurrent.h \
-  PICurrent.inl \
-  ClientRequestInfo_i.inl Invocation.h CDR.h Synch_Reply_Dispatcher.h \
+  ClientRequestInfo_i.h StringSeqC.h \
+  PICurrent.h \
+  PICurrent.inl ClientRequestInfo_i.inl \
+  Invocation.h CDR.h Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
-  IOPC.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   LF_Invocation_Event.h \
   LF_Event.h \
@@ -18783,6 +17717,7 @@ realclean:
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
   operation_details.h Service_Context.h \
+  IOPC.h \
   Service_Context.inl \
   target_specification.h target_specification.i operation_details.i \
   Transport.h Exception.h Transport_Descriptor_Interface.h \
@@ -18829,8 +17764,7 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
+  Parser_Registry.i Service_Callbacks.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -18854,15 +17788,15 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i
 
-.obj/ObjectReferenceTemplateC.o .obj/ObjectReferenceTemplateC.so .shobj/ObjectReferenceTemplateC.o .shobj/ObjectReferenceTemplateC.so: ObjectReferenceTemplateC.cpp \
-  ObjectReferenceTemplateC.h $(ACE_ROOT)/ace/pre.h \
-  OctetSeqC.h \
+.obj/PI_ForwardC.o .obj/PI_ForwardC.SO .shobj/PI_ForwardC.o .shobj/PI_ForwardC.SO: PI_ForwardC.cpp PI_ForwardC.h \
+  $(ACE_ROOT)/ace/pre.h \
+  TAO_Export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl OctetSeqC.h \
   Sequence.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/post.h \
-  $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -18871,7 +17805,6 @@ realclean:
   orbconf.h \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h \
-  TAO_Export.h \
   $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
@@ -18894,8 +17827,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -19010,160 +17942,18 @@ realclean:
   Seq_Var_T.cpp \
   Seq_Out_T.h \
   Seq_Out_T.inl \
-  Seq_Out_T.cpp \
-  OctetSeqC.i \
-  StringSeqC.h \
-  StringSeqC.i \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Any_T.h \
-  Any.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  Object.h \
-  Policy_ForwardC.h \
-  CDR.h \
-  CDR.i \
-  Objref_VarOut_T.h \
-  varbase.h \
-  Objref_VarOut_T.inl \
-  Objref_VarOut_T.cpp \
-  Policy_ForwardC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  IOP_IORC.h \
-  IOP_IORC.i \
-  Object.i \
-  Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
-  Marshal.h \
-  Marshal.i \
-  debug.h \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Stub.h \
-  MProfile.h \
-  PolicyC.h \
-  CurrentC.h \
-  CurrentC.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  PolicyC.i \
-  MProfile.i \
-  ORB.h \
-  ServicesC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  ServicesC.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ObjectIdListC.h \
-  ObjectIdListC.i \
-  objectid.h \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  params.h \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i \
-  IOPC.h \
-  IOP_CodecC.h \
-  IOP_CodecC.i \
-  IOPC.i \
-  PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  PICurrent.h \
-  PICurrent.inl \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  ORB_Core_Auto_Ptr.h \
-  ORB_Core_Auto_Ptr.inl \
-  Stub.i \
-  ValueFactory.h \
-  ValueFactory.i
+  Seq_Out_T.cpp OctetSeqC.i StringSeqC.h \
+  Sequence.h StringSeqC.i PI_ForwardC.i
 
-.obj/PortableInterceptorC.o .obj/PortableInterceptorC.so .shobj/PortableInterceptorC.o .shobj/PortableInterceptorC.so: PortableInterceptorC.cpp PortableInterceptorC.h \
-  $(ACE_ROOT)/ace/pre.h CurrentC.h \
-  Object.h \
-  Policy_ForwardC.h \
+.obj/PortableInterceptorC.o .obj/PortableInterceptorC.SO .shobj/PortableInterceptorC.o .shobj/PortableInterceptorC.SO: PortableInterceptorC.cpp PortableInterceptorC.h \
+  $(ACE_ROOT)/ace/pre.h PI_ForwardC.h \
+  TAO_Export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl OctetSeqC.h \
   Sequence.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/post.h \
-  $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -19172,7 +17962,6 @@ realclean:
   orbconf.h \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h \
-  TAO_Export.h \
   $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
@@ -19195,8 +17984,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -19306,57 +18094,48 @@ realclean:
   Typecode.i \
   Environment.h \
   Environment.i \
-  CDR.h \
+  Seq_Var_T.h \
+  Seq_Var_T.inl \
+  Seq_Var_T.cpp \
+  Seq_Out_T.h \
+  Seq_Out_T.inl \
+  Seq_Out_T.cpp OctetSeqC.i StringSeqC.h \
+  Sequence.h StringSeqC.i PI_ForwardC.i DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  Object.h \
+  Policy_ForwardC.h \
+  CDR.h \
   CDR.i \
   Objref_VarOut_T.h \
   varbase.h \
   Objref_VarOut_T.inl \
   Objref_VarOut_T.cpp \
-  Seq_Var_T.h \
-  Seq_Var_T.inl \
-  Seq_Var_T.cpp \
-  Seq_Out_T.h \
-  Seq_Out_T.inl \
-  Seq_Out_T.cpp \
   Policy_ForwardC.i \
   Object_KeyC.h \
   Object_KeyC.i \
   IOP_IORC.h \
   OctetSeqC.h \
-  OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
-  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
-  debug.h CurrentC.i DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h \
+  debug.h DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   IOP_CodecC.h \
+  Any_Impl_T.h \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   IOP_CodecC.i IOPC.i PolicyC.h \
-  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
+  CurrentC.h CurrentC.i Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h PolicyC.i \
   PortableInterceptorC.i Stub.h \
   MProfile.h \
@@ -19447,9 +18226,6 @@ realclean:
   Invocation.h \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   LF_Invocation_Event.h \
   LF_Event.h \
@@ -19488,12 +18264,12 @@ realclean:
   RequestInfo_Util.h \
   DynamicC.h \
   ClientRequestInfo_i.h \
+  StringSeqC.h \
   ClientRequestInfo_i.inl \
   ClientInterceptorAdapter.h \
   ClientInterceptorAdapter.inl
 
-.obj/PICurrent.o .obj/PICurrent.so .shobj/PICurrent.o .shobj/PICurrent.so: PICurrent.cpp PICurrent.h \
-  $(ACE_ROOT)/ace/pre.h \
+.obj/PICurrent.o .obj/PICurrent.SO .shobj/PICurrent.o .shobj/PICurrent.SO: PICurrent.cpp PICurrent.h $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -19525,14 +18301,11 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp PortableInterceptorC.h \
-  CurrentC.h Object.h \
-  Policy_ForwardC.h \
-  Sequence.h \
+  PI_ForwardC.h OctetSeqC.h Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
   $(ACE_ROOT)/ace/CORBA_macros.h \
@@ -19647,57 +18420,48 @@ realclean:
   Typecode.i \
   Environment.h \
   Environment.i \
-  CDR.h \
+  Seq_Var_T.h \
+  Seq_Var_T.inl \
+  Seq_Var_T.cpp \
+  Seq_Out_T.h \
+  Seq_Out_T.inl \
+  Seq_Out_T.cpp OctetSeqC.i StringSeqC.h \
+  Sequence.h StringSeqC.i PI_ForwardC.i DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  Object.h \
+  Policy_ForwardC.h \
+  CDR.h \
   CDR.i \
   Objref_VarOut_T.h \
   varbase.h \
   Objref_VarOut_T.inl \
   Objref_VarOut_T.cpp \
-  Seq_Var_T.h \
-  Seq_Var_T.inl \
-  Seq_Var_T.cpp \
-  Seq_Out_T.h \
-  Seq_Out_T.inl \
-  Seq_Out_T.cpp \
   Policy_ForwardC.i \
   Object_KeyC.h \
   Object_KeyC.i \
   IOP_IORC.h \
   OctetSeqC.h \
-  OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
-  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
-  debug.h CurrentC.i DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h \
+  debug.h DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   IOP_CodecC.h \
+  Any_Impl_T.h \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   IOP_CodecC.i IOPC.i PolicyC.h \
-  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
+  CurrentC.h CurrentC.i Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h PolicyC.i \
   PortableInterceptorC.i LocalObject.h Object.h Object_KeyC.h \
   LocalObject.i PICurrent.inl ORB_Core.h corbafwd.h ORB.h Exception.h \
@@ -19731,8 +18495,8 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h IOPC.h \
+  Parser_Registry.i Service_Callbacks.h \
+  IOPC.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -19759,12 +18523,11 @@ realclean:
   TAO_Server_Request.h Tagged_Profile.h \
   GIOPC.h \
   GIOPC.i \
-  Tagged_Profile.i OctetSeqC.h \
-  Service_Context.h \
+  Tagged_Profile.i Service_Context.h \
   Service_Context.inl \
   TAO_Server_Request.i debug.h
 
-.obj/PICurrent_ORBInitializer.o .obj/PICurrent_ORBInitializer.so .shobj/PICurrent_ORBInitializer.o .shobj/PICurrent_ORBInitializer.so: PICurrent_ORBInitializer.cpp \
+.obj/PICurrent_ORBInitializer.o .obj/PICurrent_ORBInitializer.SO .shobj/PICurrent_ORBInitializer.o .shobj/PICurrent_ORBInitializer.SO: PICurrent_ORBInitializer.cpp \
   PICurrent_ORBInitializer.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -19804,8 +18567,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -19935,39 +18697,29 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i Object_KeyC.h LocalObject.i \
-  PortableInterceptorC.h CurrentC.h \
-  Object.h \
-  Any_T.h \
+  PortableInterceptorC.h PI_ForwardC.h OctetSeqC.h StringSeqC.h \
+  Sequence.h StringSeqC.i PI_ForwardC.i DynamicC.h \
+  Any_Dual_Impl_T.h \
   Any.h \
+  Object.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
-  debug.h CurrentC.i DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h \
+  debug.h DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   IOP_CodecC.h \
+  Any_Impl_T.h \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   IOP_CodecC.i IOPC.i PolicyC.h \
-  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
+  CurrentC.h CurrentC.i Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h PolicyC.i \
   PortableInterceptorC.i PICurrent.h \
   $(ACE_ROOT)/ace/Array_Base.h \
@@ -20003,8 +18755,8 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h IOPC.h \
+  Parser_Registry.i Service_Callbacks.h \
+  IOPC.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -20027,10 +18779,10 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.h \
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
-  ORBInitInfo.h ORBInitInfo.inl
+  $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i ORBInitInfo.h \
+  ORBInitInfo.inl
 
-.obj/DynamicC.o .obj/DynamicC.so .shobj/DynamicC.o .shobj/DynamicC.so: DynamicC.cpp DynamicC.h $(ACE_ROOT)/ace/pre.h \
+.obj/DynamicC.o .obj/DynamicC.SO .shobj/DynamicC.o .shobj/DynamicC.SO: DynamicC.cpp DynamicC.h $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -20067,8 +18819,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -20185,7 +18936,7 @@ realclean:
   Seq_Out_T.h \
   Seq_Out_T.inl \
   Seq_Out_T.cpp StringSeqC.i \
-  Any_T.h \
+  Any_Dual_Impl_T.h \
   Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
@@ -20203,22 +18954,166 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
-  debug.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp DynamicC.i
+  debug.h DynamicC.i \
+  Stub.h \
+  MProfile.h \
+  PolicyC.h \
+  CurrentC.h \
+  Any_Impl_T.h \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
+  CurrentC.i \
+  Remote_Object_Proxy_Impl.h \
+  Object_Proxy_Impl.h \
+  PolicyC.i \
+  MProfile.i \
+  ORB.h \
+  ServicesC.h \
+  ServicesC.i \
+  CORBA_String.h \
+  CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
+  objectid.h \
+  ORB.i \
+  ORB_Core.h \
+  Policy_Manager.h \
+  Policy_Set.h \
+  Policy_Set.i \
+  LocalObject.h \
+  LocalObject.i \
+  Policy_Manager.i \
+  Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
+  params.h \
+  params.i \
+  TAO_Singleton_Manager.h \
+  TAO_Singleton_Manager.inl \
+  TAO_Singleton.h \
+  TAO_Singleton.inl \
+  TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  Adapter.h \
+  Adapter.i \
+  PolicyFactory_Registry.h \
+  PortableInterceptorC.h \
+  PI_ForwardC.h \
+  StringSeqC.h \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Messaging_SyncScopeC.h \
+  Messaging_SyncScopeC.i \
+  IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i \
+  IOPC.i \
+  PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  Parser_Registry.h \
+  Parser_Registry.i \
+  Service_Callbacks.h \
+  Service_Callbacks.i \
+  Fault_Tolerance_Service.h \
+  Fault_Tolerance_Service.i \
+  Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  Cleanup_Func_Registry.inl \
+  Object_Ref_Table.h \
+  Interceptor_List.h \
+  Interceptor_List.inl \
+  PICurrent.h \
+  PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  ORB_Core.i \
+  ORB_Core_Auto_Ptr.h \
+  ORB_Core_Auto_Ptr.inl \
+  Stub.i \
+  Invocation.h \
+  Synch_Reply_Dispatcher.h \
+  Reply_Dispatcher.h \
+  Reply_Dispatcher.i \
+  LF_Invocation_Event.h \
+  LF_Event.h \
+  LF_Event.inl \
+  LF_Invocation_Event.inl \
+  GIOP_Message_Version.h \
+  GIOP_Message_Version.inl \
+  operation_details.h \
+  Service_Context.h \
+  Service_Context.inl \
+  target_specification.h \
+  target_specification.i \
+  operation_details.i \
+  Transport.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h \
+  Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl \
+  Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl \
+  Transport.inl \
+  Invocation.i \
+  PortableInterceptor.h \
+  RequestInfo_Util.h \
+  ClientRequestInfo_i.h \
+  ClientRequestInfo_i.inl \
+  ClientInterceptorAdapter.h \
+  ClientInterceptorAdapter.inl
 
-.obj/OctetSeqC.o .obj/OctetSeqC.so .shobj/OctetSeqC.o .shobj/OctetSeqC.so: OctetSeqC.cpp OctetSeqC.h \
-  $(ACE_ROOT)/ace/pre.h Sequence.h \
+.obj/OctetSeqC.o .obj/OctetSeqC.SO .shobj/OctetSeqC.o .shobj/OctetSeqC.SO: OctetSeqC.cpp OctetSeqC.h $(ACE_ROOT)/ace/pre.h \
+  Sequence.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -20255,8 +19150,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -20267,7 +19161,6 @@ realclean:
   $(ACE_ROOT)/ace/Malloc_Base.h \
   Sequence.i \
   Sequence_T.h \
-  Sequence.h \
   Sequence_T.i \
   Sequence_T.cpp \
   Typecode.h \
@@ -20372,13 +19265,16 @@ realclean:
   Seq_Var_T.cpp \
   Seq_Out_T.h \
   Seq_Out_T.inl \
-  Seq_Out_T.cpp OctetSeqC.i Any_T.h \
-  Any.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
+  Seq_Out_T.cpp OctetSeqC.i \
+  Stub.h \
+  MProfile.h \
+  PolicyC.h \
+  CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
   CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   Objref_VarOut_T.h \
   varbase.h \
@@ -20389,76 +19285,99 @@ realclean:
   Object_KeyC.i \
   IOP_IORC.h \
   OctetSeqC.h \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
+  Any_Impl_T.h \
+  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
-  Any_T.h \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
-  debug.h ORB_Core.h corbafwd.h ORB.h \
-  Exception.h ServicesC.h VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp ServicesC.i \
-  CORBA_String.h CORBA_String.inl \
-  ObjectIdListC.h ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
-  CurrentC.i Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h PolicyC.i \
-  ORB.i Environment.h Policy_Manager.h \
+  debug.h \
+  CurrentC.i \
+  Remote_Object_Proxy_Impl.h \
+  Object_Proxy_Impl.h \
+  PolicyC.i \
+  MProfile.i \
+  ORB.h \
+  ServicesC.h \
+  ServicesC.i \
+  CORBA_String.h \
+  CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
+  objectid.h \
+  ORB.i \
+  ORB_Core.h \
+  Policy_Manager.h \
   Policy_Set.h \
-  PolicyC.h \
   Policy_Set.i \
   LocalObject.h \
   LocalObject.i \
-  Policy_Manager.i Resource_Factory.h \
+  Policy_Manager.i \
+  Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i CONV_FRAMEC.h \
-  CONV_FRAMEC.i params.h params.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
+  params.h \
+  params.i \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
-  TAO_Singleton.h TAO_Singleton.inl \
-  TAO_Singleton.cpp \
   TAO_Singleton.h \
+  TAO_Singleton.inl \
+  TAO_Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
-  TAO_Singleton_Manager.h Adapter.h \
-  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  StringSeqC.h StringSeqC.i DynamicC.i ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h \
+  Adapter.h \
+  Adapter.i \
+  PolicyFactory_Registry.h \
+  PortableInterceptorC.h \
+  PI_ForwardC.h \
+  StringSeqC.h \
+  StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
+  DynamicC.i \
+  Messaging_SyncScopeC.h \
+  Messaging_SyncScopeC.i \
+  IOPC.h \
   IOP_CodecC.h \
-  IOP_CodecC.i IOPC.i \
-  PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
+  IOP_CodecC.i \
+  IOPC.i \
+  PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  Parser_Registry.h \
   Parser_Registry.i \
-  Service_Callbacks.h IOPC.h \
+  Service_Callbacks.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h TAO_Export.h \
+  Cleanup_Func_Registry.h \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h Interceptor_List.h Interceptor_List.inl PICurrent.h \
-  LocalObject.h PICurrent.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  Cleanup_Func_Registry.inl \
+  Object_Ref_Table.h \
+  Interceptor_List.h \
+  Interceptor_List.inl \
+  PICurrent.h \
+  PICurrent.inl \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -20476,9 +19395,55 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.h \
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  ORB_Core.i \
+  ORB_Core_Auto_Ptr.h \
+  ORB_Core_Auto_Ptr.inl \
+  Stub.i \
+  Invocation.h \
+  Synch_Reply_Dispatcher.h \
+  Reply_Dispatcher.h \
+  Reply_Dispatcher.i \
+  LF_Invocation_Event.h \
+  LF_Event.h \
+  LF_Event.inl \
+  LF_Invocation_Event.inl \
+  GIOP_Message_Version.h \
+  GIOP_Message_Version.inl \
+  operation_details.h \
+  Service_Context.h \
+  Service_Context.inl \
+  target_specification.h \
+  target_specification.i \
+  operation_details.i \
+  Transport.h \
+  Transport_Descriptor_Interface.h \
+  Transport_Descriptor_Interface.inl \
+  Transport_Cache_Manager.h \
+  Cache_Entries.h \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  Cache_Entries.inl \
+  Transport_Cache_Manager.inl \
+  Transport_Timer.h \
+  Incoming_Message_Queue.h \
+  Pluggable_Messaging_Utils.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl \
+  Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl \
+  Transport.inl \
+  Invocation.i \
+  PortableInterceptor.h \
+  Any_Dual_Impl_T.h RequestInfo_Util.h \
+  ClientRequestInfo_i.h \
+  ClientRequestInfo_i.inl \
+  ClientInterceptorAdapter.h \
+  ClientInterceptorAdapter.inl
 
-.obj/StringSeqC.o .obj/StringSeqC.so .shobj/StringSeqC.o .shobj/StringSeqC.so: StringSeqC.cpp StringSeqC.h \
+.obj/StringSeqC.o .obj/StringSeqC.SO .shobj/StringSeqC.o .shobj/StringSeqC.SO: StringSeqC.cpp StringSeqC.h \
   $(ACE_ROOT)/ace/pre.h Sequence.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -20516,8 +19481,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -20633,14 +19597,14 @@ realclean:
   Seq_Var_T.cpp \
   Seq_Out_T.h \
   Seq_Out_T.inl \
-  Seq_Out_T.cpp StringSeqC.i Any_T.h \
-  Any.h \
+  Seq_Out_T.cpp StringSeqC.i CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i Any_Dual_Impl_T.h \
+  Any.h \
   Object.h \
   Policy_ForwardC.h \
   CDR.h \
-  CDR.i \
   Objref_VarOut_T.h \
   varbase.h \
   Objref_VarOut_T.inl \
@@ -20651,19 +19615,20 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
-  Any_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
+  Any_Dual_Impl_T.h \
   Marshal.h \
   Marshal.i \
-  debug.h CDR.h
+  debug.h
 
-.obj/Codeset_Manager.o .obj/Codeset_Manager.so .shobj/Codeset_Manager.o .shobj/Codeset_Manager.so: Codeset_Manager.cpp \
+.obj/Codeset_Manager.o .obj/Codeset_Manager.SO .shobj/Codeset_Manager.o .shobj/Codeset_Manager.SO: Codeset_Manager.cpp \
   Codeset_Manager.h \
   $(ACE_ROOT)/ace/pre.h \
   CONV_FRAMEC.h \
@@ -20708,8 +19673,7 @@ realclean:
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   Sequence.h \
@@ -20838,7 +19802,7 @@ realclean:
   OctetSeqC.i \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -20851,12 +19815,13 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
   IOPC.i \
   GIOPC.h \
@@ -20869,25 +19834,17 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   PortableInterceptorC.h \
-  CurrentC.h \
-  CurrentC.i \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   PolicyC.h \
+  CurrentC.h \
+  CurrentC.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
   PolicyC.i \
@@ -20940,7 +19897,7 @@ realclean:
   $(ACE_ROOT)/ace/Codeset_Registry.h \
   $(ACE_ROOT)/ace/Codeset_Registry.inl
 
-.obj/Codeset_Translator_Factory.o .obj/Codeset_Translator_Factory.so .shobj/Codeset_Translator_Factory.o .shobj/Codeset_Translator_Factory.so: Codeset_Translator_Factory.cpp \
+.obj/Codeset_Translator_Factory.o .obj/Codeset_Translator_Factory.SO .shobj/Codeset_Translator_Factory.o .shobj/Codeset_Translator_Factory.SO: Codeset_Translator_Factory.cpp \
   Codeset_Translator_Factory.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
@@ -20968,8 +19925,7 @@ realclean:
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -21109,7 +20065,7 @@ realclean:
   Codeset_Translator_Factory_T.cpp \
   debug.h
 
-.obj/ORB_Core.o .obj/ORB_Core.so .shobj/ORB_Core.o .shobj/ORB_Core.so: ORB_Core.cpp ORB_Core.h $(ACE_ROOT)/ace/pre.h \
+.obj/ORB_Core.o .obj/ORB_Core.SO .shobj/ORB_Core.o .shobj/ORB_Core.SO: ORB_Core.cpp ORB_Core.h $(ACE_ROOT)/ace/pre.h \
   corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -21151,8 +20107,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -21287,13 +20242,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h CurrentC.i Policy_ForwardC.h \
@@ -21323,27 +20276,19 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
+  OctetSeqC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   IOP_CodecC.h \
   IOP_CodecC.i IOPC.i \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h IOPC.h \
+  Parser_Registry.i Service_Callbacks.h \
+  IOPC.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -21379,8 +20324,8 @@ realclean:
   default_server.i default_resource.h \
   Resource_Factory.h \
   CONV_FRAMEC.h \
-  default_resource.i debug.h \
-  MProfile.h MProfile.i Profile.h \
+  default_resource.i debug.h MProfile.h \
+  MProfile.i Profile.h \
   Tagged_Components.h \
   Tagged_Components.i \
   GIOP_Message_Version.h \
@@ -21400,11 +20345,10 @@ realclean:
   $(ACE_ROOT)/ace/Intrusive_List.h \
   $(ACE_ROOT)/ace/Intrusive_List.inl \
   $(ACE_ROOT)/ace/Intrusive_List.cpp \
-  Leader_Follower.i \
-  Connector_Registry.h Endpoint.h \
-  Endpoint.i \
-  Connector_Registry.i \
-  Sync_Strategies.h Transport.h \
+  Leader_Follower.i Connector_Registry.h \
+  Endpoint.h Endpoint.i \
+  Connector_Registry.i Sync_Strategies.h \
+  Transport.h \
   Transport_Descriptor_Interface.h \
   Transport_Descriptor_Interface.inl \
   Transport_Cache_Manager.h \
@@ -21432,9 +20376,6 @@ realclean:
   Object_Loader.i Services_Activate.h Invocation.h CDR.h \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   LF_Invocation_Event.h \
   LF_Event.h \
@@ -21450,7 +20391,9 @@ realclean:
   Thread_Lane_Resources.i \
   Thread_Lane_Resources_Manager.h \
   Thread_Lane_Resources_Manager.i \
-  Protocols_Hooks.h Buffering_Constraint_Policy.h \
+  Protocols_Hooks.h IORInterceptor_Adapter.h \
+  Interceptor_List.h \
+  Buffering_Constraint_Policy.h \
   Buffering_Constraint_Policy.i \
   LF_Event_Loop_Thread_Helper.h \
   LF_Strategy.h \
@@ -21465,10 +20408,9 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.cpp \
   $(ACE_ROOT)/ace/Arg_Shifter.h \
   $(ACE_ROOT)/ace/Argv_Type_Converter.h \
-  $(ACE_ROOT)/ace/Argv_Type_Converter.inl \
-  Codeset_Manager.h
+  $(ACE_ROOT)/ace/Argv_Type_Converter.inl Codeset_Manager.h
 
-.obj/ORB_Core_Auto_Ptr.o .obj/ORB_Core_Auto_Ptr.so .shobj/ORB_Core_Auto_Ptr.o .shobj/ORB_Core_Auto_Ptr.so: ORB_Core_Auto_Ptr.cpp ORB_Core_Auto_Ptr.h \
+.obj/ORB_Core_Auto_Ptr.o .obj/ORB_Core_Auto_Ptr.SO .shobj/ORB_Core_Auto_Ptr.o .shobj/ORB_Core_Auto_Ptr.SO: ORB_Core_Auto_Ptr.cpp ORB_Core_Auto_Ptr.h \
   $(ACE_ROOT)/ace/pre.h \
   TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
@@ -21511,8 +20453,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -21647,13 +20588,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h CurrentC.i Policy_ForwardC.h \
@@ -21683,27 +20622,19 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
+  OctetSeqC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   IOP_CodecC.h \
   IOP_CodecC.i IOPC.i \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h IOPC.h \
+  Parser_Registry.i Service_Callbacks.h \
+  IOPC.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -21732,7 +20663,7 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i
 
-.obj/Collocation_Resolver.o .obj/Collocation_Resolver.so .shobj/Collocation_Resolver.o .shobj/Collocation_Resolver.so: Collocation_Resolver.cpp \
+.obj/Collocation_Resolver.o .obj/Collocation_Resolver.SO .shobj/Collocation_Resolver.o .shobj/Collocation_Resolver.SO: Collocation_Resolver.cpp \
   Collocation_Resolver.h \
   $(ACE_ROOT)/ace/pre.h \
   orbconf.h \
@@ -21767,8 +20698,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -21783,7 +20713,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/Default_Collocation_Resolver.o .obj/Default_Collocation_Resolver.so .shobj/Default_Collocation_Resolver.o .shobj/Default_Collocation_Resolver.so: Default_Collocation_Resolver.cpp \
+.obj/Default_Collocation_Resolver.o .obj/Default_Collocation_Resolver.SO .shobj/Default_Collocation_Resolver.o .shobj/Default_Collocation_Resolver.SO: Default_Collocation_Resolver.cpp \
   Default_Collocation_Resolver.h \
   $(ACE_ROOT)/ace/pre.h \
   orbconf.h \
@@ -21819,8 +20749,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -21964,10 +20893,13 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i
 
-.obj/Stub_Factory.o .obj/Stub_Factory.so .shobj/Stub_Factory.o .shobj/Stub_Factory.so: Stub_Factory.cpp Stub_Factory.h \
+.obj/Stub_Factory.o .obj/Stub_Factory.SO .shobj/Stub_Factory.o .shobj/Stub_Factory.SO: Stub_Factory.cpp Stub_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -22001,8 +20933,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -22016,8 +20947,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/ORB_Table.o .obj/ORB_Table.so .shobj/ORB_Table.o .shobj/ORB_Table.so: ORB_Table.cpp ORB_Table.h \
-  $(ACE_ROOT)/ace/pre.h \
+.obj/ORB_Table.o .obj/ORB_Table.SO .shobj/ORB_Table.o .shobj/ORB_Table.SO: ORB_Table.cpp ORB_Table.h $(ACE_ROOT)/ace/pre.h \
   TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -22044,8 +20974,7 @@ realclean:
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
@@ -22196,13 +21125,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h CurrentC.i Policy_ForwardC.h \
@@ -22232,27 +21159,19 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
+  OctetSeqC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   IOP_CodecC.h \
   IOP_CodecC.i IOPC.i \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h IOPC.h \
+  Parser_Registry.i Service_Callbacks.h \
+  IOPC.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -22281,7 +21200,7 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i
 
-.obj/LF_Follower.o .obj/LF_Follower.so .shobj/LF_Follower.o .shobj/LF_Follower.so: LF_Follower.cpp \
+.obj/LF_Follower.o .obj/LF_Follower.SO .shobj/LF_Follower.o .shobj/LF_Follower.SO: LF_Follower.cpp \
   LF_Follower.h \
   $(ACE_ROOT)/ace/pre.h \
   orbconf.h \
@@ -22294,8 +21213,7 @@ realclean:
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   TAO_Export.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
@@ -22311,8 +21229,7 @@ realclean:
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
@@ -22475,13 +21392,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -22520,20 +21435,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -22585,7 +21495,7 @@ realclean:
   $(ACE_ROOT)/ace/Intrusive_List.cpp \
   Leader_Follower.i
 
-.obj/LF_Follower_Auto_Ptr.o .obj/LF_Follower_Auto_Ptr.so .shobj/LF_Follower_Auto_Ptr.o .shobj/LF_Follower_Auto_Ptr.so: LF_Follower_Auto_Ptr.cpp \
+.obj/LF_Follower_Auto_Ptr.o .obj/LF_Follower_Auto_Ptr.SO .shobj/LF_Follower_Auto_Ptr.o .shobj/LF_Follower_Auto_Ptr.SO: LF_Follower_Auto_Ptr.cpp \
   LF_Follower_Auto_Ptr.h \
   $(ACE_ROOT)/ace/pre.h \
   orbconf.h \
@@ -22600,8 +21510,7 @@ realclean:
   Leader_Follower.h \
   LF_Follower.h \
   TAO_Export.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
@@ -22617,8 +21526,7 @@ realclean:
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
@@ -22780,13 +21688,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -22825,20 +21731,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -22891,7 +21792,7 @@ realclean:
   Leader_Follower.i \
   LF_Follower_Auto_Ptr.inl
 
-.obj/LF_Follower_Auto_Adder.o .obj/LF_Follower_Auto_Adder.so .shobj/LF_Follower_Auto_Adder.o .shobj/LF_Follower_Auto_Adder.so: LF_Follower_Auto_Adder.cpp \
+.obj/LF_Follower_Auto_Adder.o .obj/LF_Follower_Auto_Adder.SO .shobj/LF_Follower_Auto_Adder.o .shobj/LF_Follower_Auto_Adder.SO: LF_Follower_Auto_Adder.cpp \
   LF_Follower_Auto_Adder.h \
   $(ACE_ROOT)/ace/pre.h \
   orbconf.h \
@@ -22906,8 +21807,7 @@ realclean:
   Leader_Follower.h \
   LF_Follower.h \
   TAO_Export.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
@@ -22923,8 +21823,7 @@ realclean:
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
@@ -23086,13 +21985,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -23131,20 +22028,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -23197,7 +22089,7 @@ realclean:
   Leader_Follower.i \
   LF_Follower_Auto_Adder.inl
 
-.obj/Leader_Follower.o .obj/Leader_Follower.so .shobj/Leader_Follower.o .shobj/Leader_Follower.so: Leader_Follower.cpp \
+.obj/Leader_Follower.o .obj/Leader_Follower.SO .shobj/Leader_Follower.o .shobj/Leader_Follower.SO: Leader_Follower.cpp \
   Leader_Follower.h \
   $(ACE_ROOT)/ace/pre.h \
   LF_Follower.h \
@@ -23211,8 +22103,7 @@ realclean:
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   TAO_Export.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
@@ -23228,8 +22119,7 @@ realclean:
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
@@ -23391,13 +22281,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -23436,20 +22324,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -23528,7 +22411,7 @@ realclean:
   Synch_Refcountable.inl \
   Transport.inl
 
-.obj/Leader_Follower_Flushing_Strategy.o .obj/Leader_Follower_Flushing_Strategy.so .shobj/Leader_Follower_Flushing_Strategy.o .shobj/Leader_Follower_Flushing_Strategy.so:  \
+.obj/Leader_Follower_Flushing_Strategy.o .obj/Leader_Follower_Flushing_Strategy.SO .shobj/Leader_Follower_Flushing_Strategy.o .shobj/Leader_Follower_Flushing_Strategy.SO:  \
  Leader_Follower_Flushing_Strategy.cpp \
   Leader_Follower_Flushing_Strategy.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -23545,8 +22428,7 @@ realclean:
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
@@ -23562,8 +22444,7 @@ realclean:
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
@@ -23725,13 +22606,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -23770,20 +22649,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -23860,7 +22734,7 @@ realclean:
   LF_Invocation_Event.inl \
   Queued_Message.inl
 
-.obj/LF_Event.o .obj/LF_Event.so .shobj/LF_Event.o .shobj/LF_Event.so: LF_Event.cpp LF_Event.h \
+.obj/LF_Event.o .obj/LF_Event.SO .shobj/LF_Event.o .shobj/LF_Event.SO: LF_Event.cpp LF_Event.h \
   $(ACE_ROOT)/ace/pre.h \
   TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
@@ -23873,8 +22747,7 @@ realclean:
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
@@ -23890,8 +22763,7 @@ realclean:
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
@@ -24054,13 +22926,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -24099,20 +22969,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -24164,14 +23029,14 @@ realclean:
   $(ACE_ROOT)/ace/Intrusive_List.cpp \
   Leader_Follower.i
 
-.obj/LF_Invocation_Event.o .obj/LF_Invocation_Event.so .shobj/LF_Invocation_Event.o .shobj/LF_Invocation_Event.so: LF_Invocation_Event.cpp LF_Invocation_Event.h \
+.obj/LF_Invocation_Event.o .obj/LF_Invocation_Event.SO .shobj/LF_Invocation_Event.o .shobj/LF_Invocation_Event.SO: LF_Invocation_Event.cpp LF_Invocation_Event.h \
   $(ACE_ROOT)/ace/pre.h LF_Event.h TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl LF_Event.inl \
   LF_Invocation_Event.inl
 
-.obj/LF_CH_Event.o .obj/LF_CH_Event.so .shobj/LF_CH_Event.o .shobj/LF_CH_Event.so: LF_CH_Event.cpp LF_CH_Event.h \
+.obj/LF_CH_Event.o .obj/LF_CH_Event.SO .shobj/LF_CH_Event.o .shobj/LF_CH_Event.SO: LF_CH_Event.cpp LF_CH_Event.h \
   $(ACE_ROOT)/ace/pre.h LF_Event.h TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -24199,12 +23064,11 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl
 
-.obj/LF_Event_Binder.o .obj/LF_Event_Binder.so .shobj/LF_Event_Binder.o .shobj/LF_Event_Binder.so: LF_Event_Binder.cpp \
+.obj/LF_Event_Binder.o .obj/LF_Event_Binder.SO .shobj/LF_Event_Binder.o .shobj/LF_Event_Binder.SO: LF_Event_Binder.cpp \
   LF_Event_Binder.h \
   $(ACE_ROOT)/ace/pre.h \
   LF_Event.h \
@@ -24215,7 +23079,7 @@ realclean:
   LF_Event.inl \
   LF_Event_Binder.inl
 
-.obj/LF_Event_Loop_Thread_Helper.o .obj/LF_Event_Loop_Thread_Helper.so .shobj/LF_Event_Loop_Thread_Helper.o .shobj/LF_Event_Loop_Thread_Helper.so: LF_Event_Loop_Thread_Helper.cpp \
+.obj/LF_Event_Loop_Thread_Helper.o .obj/LF_Event_Loop_Thread_Helper.SO .shobj/LF_Event_Loop_Thread_Helper.o .shobj/LF_Event_Loop_Thread_Helper.SO: LF_Event_Loop_Thread_Helper.cpp \
   LF_Event_Loop_Thread_Helper.h \
   $(ACE_ROOT)/ace/pre.h \
   LF_Strategy.h \
@@ -24226,7 +23090,7 @@ realclean:
   LF_Strategy.inl \
   LF_Event_Loop_Thread_Helper.inl
 
-.obj/LF_Strategy.o .obj/LF_Strategy.so .shobj/LF_Strategy.o .shobj/LF_Strategy.so: LF_Strategy.cpp \
+.obj/LF_Strategy.o .obj/LF_Strategy.SO .shobj/LF_Strategy.o .shobj/LF_Strategy.SO: LF_Strategy.cpp \
   LF_Strategy.h \
   $(ACE_ROOT)/ace/pre.h \
   TAO_Export.h \
@@ -24235,7 +23099,7 @@ realclean:
   $(ACE_ROOT)/ace/ace_wchar.inl \
   LF_Strategy.inl
 
-.obj/LF_Strategy_Complete.o .obj/LF_Strategy_Complete.so .shobj/LF_Strategy_Complete.o .shobj/LF_Strategy_Complete.so: LF_Strategy_Complete.cpp \
+.obj/LF_Strategy_Complete.o .obj/LF_Strategy_Complete.SO .shobj/LF_Strategy_Complete.o .shobj/LF_Strategy_Complete.SO: LF_Strategy_Complete.cpp \
   LF_Strategy_Complete.h \
   $(ACE_ROOT)/ace/pre.h \
   LF_Strategy.h \
@@ -24253,8 +23117,7 @@ realclean:
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
@@ -24270,8 +23133,7 @@ realclean:
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
@@ -24433,13 +23295,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -24478,20 +23338,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -24543,7 +23398,7 @@ realclean:
   $(ACE_ROOT)/ace/Intrusive_List.cpp \
   Leader_Follower.i
 
-.obj/params.o .obj/params.so .shobj/params.o .shobj/params.so: params.cpp params.h \
+.obj/params.o .obj/params.SO .shobj/params.o .shobj/params.SO: params.cpp params.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -24587,8 +23442,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -24653,7 +23507,7 @@ realclean:
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   params.i
 
-.obj/Resource_Factory.o .obj/Resource_Factory.so .shobj/Resource_Factory.o .shobj/Resource_Factory.so: Resource_Factory.cpp \
+.obj/Resource_Factory.o .obj/Resource_Factory.SO .shobj/Resource_Factory.o .shobj/Resource_Factory.SO: Resource_Factory.cpp \
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
@@ -24854,13 +23708,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -24891,20 +23743,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -24952,7 +23799,7 @@ realclean:
   ORB_Core.i \
   Client_Strategy_Factory.h
 
-.obj/Server_Strategy_Factory.o .obj/Server_Strategy_Factory.so .shobj/Server_Strategy_Factory.o .shobj/Server_Strategy_Factory.so: Server_Strategy_Factory.cpp \
+.obj/Server_Strategy_Factory.o .obj/Server_Strategy_Factory.SO .shobj/Server_Strategy_Factory.o .shobj/Server_Strategy_Factory.SO: Server_Strategy_Factory.cpp \
   Server_Strategy_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -24987,8 +23834,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -24996,7 +23842,7 @@ realclean:
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i
 
-.obj/Sync_Strategies.o .obj/Sync_Strategies.so .shobj/Sync_Strategies.o .shobj/Sync_Strategies.so: Sync_Strategies.cpp \
+.obj/Sync_Strategies.o .obj/Sync_Strategies.SO .shobj/Sync_Strategies.o .shobj/Sync_Strategies.SO: Sync_Strategies.cpp \
   Sync_Strategies.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -25034,8 +23880,7 @@ realclean:
   Cache_Entries.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -25046,8 +23891,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -25140,7 +23984,6 @@ realclean:
   Transport_Timer.h \
   Incoming_Message_Queue.h \
   Pluggable_Messaging_Utils.h \
-  IOPC.h \
   IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
@@ -25169,14 +24012,24 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl \
+  Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  Synch_Refcountable.inl \
+  Transport.inl \
+  TAOC.h \
+  PolicyC.h \
+  CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
   Objref_VarOut_T.h \
@@ -25187,29 +24040,14 @@ realclean:
   Object_KeyC.h \
   Object_KeyC.i \
   Object.i \
+  Any_Impl_T.h \
+  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Synch_Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl \
-  Synch_Refcountable.inl \
-  Transport.inl \
-  TAOC.h \
-  PolicyC.h \
-  CurrentC.h \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
@@ -25217,6 +24055,9 @@ realclean:
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   TimeBaseC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   TimeBaseC.i \
   TAOC.i \
   Sync_Strategies.i \
@@ -25265,20 +24106,16 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
+  IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i \
+  IOPC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -25322,7 +24159,7 @@ realclean:
   ORB_Core_Auto_Ptr.inl \
   Stub.i
 
-.obj/TAO_Internal.o .obj/TAO_Internal.so .shobj/TAO_Internal.o .shobj/TAO_Internal.so: TAO_Internal.cpp TAO_Internal.h \
+.obj/TAO_Internal.o .obj/TAO_Internal.SO .shobj/TAO_Internal.o .shobj/TAO_Internal.SO: TAO_Internal.cpp TAO_Internal.h \
   $(ACE_ROOT)/ace/pre.h TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -25357,8 +24194,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -25522,13 +24358,11 @@ realclean:
   StringSeqC.h Sequence.h StringSeqC.i ORB_Core.h corbafwd.h ORB.h \
   Exception.h ServicesC.h ServicesC.i CORBA_String.h ObjectIdListC.h \
   ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h CurrentC.i Policy_ForwardC.h \
@@ -25553,26 +24387,19 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h \
-  PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h \
+  PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
+  OctetSeqC.h PI_ForwardC.i DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   IOP_CodecC.h \
   IOP_CodecC.i IOPC.i \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h IOPC.h \
+  Parser_Registry.i Service_Callbacks.h \
+  IOPC.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -25626,7 +24453,7 @@ realclean:
   $(ACE_ROOT)/ace/Argv_Type_Converter.h \
   $(ACE_ROOT)/ace/Argv_Type_Converter.inl debug.h
 
-.obj/TAO_Server_Request.o .obj/TAO_Server_Request.so .shobj/TAO_Server_Request.o .shobj/TAO_Server_Request.so: TAO_Server_Request.cpp TAO_Server_Request.h \
+.obj/TAO_Server_Request.o .obj/TAO_Server_Request.SO .shobj/TAO_Server_Request.o .shobj/TAO_Server_Request.SO: TAO_Server_Request.cpp TAO_Server_Request.h \
   $(ACE_ROOT)/ace/pre.h corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -25663,8 +24490,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -25786,13 +24612,16 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -25805,39 +24634,26 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   IOPC.i \
   GIOPC.h \
   GIOPC.i \
   Tagged_Profile.i OctetSeqC.h \
-  Service_Context.h \
-  Service_Context.inl Object.h \
-  PICurrent.h $(ACE_ROOT)/ace/Array_Base.h \
+  Service_Context.h Service_Context.inl \
+  Object.h PICurrent.h $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp PortableInterceptorC.h \
-  CurrentC.h CurrentC.i DynamicC.h StringSeqC.h Sequence.h StringSeqC.i \
-  DynamicC.i ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h PolicyC.h Policy_ForwardC.h \
+  PI_ForwardC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h DynamicC.i Messaging_SyncScopeC.h Messaging_SyncScopeC.i \
+  IOPC.h PolicyC.h CurrentC.h CurrentC.i Policy_ForwardC.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h PolicyC.i \
   PortableInterceptorC.i LocalObject.h Object_KeyC.h LocalObject.i \
@@ -25872,8 +24688,7 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
+  Parser_Registry.i Service_Callbacks.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -25918,7 +24733,7 @@ realclean:
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
   Transport.inl
 
-.obj/Typecode_Constants.o .obj/Typecode_Constants.so .shobj/Typecode_Constants.o .shobj/Typecode_Constants.so: Typecode_Constants.cpp \
+.obj/Typecode_Constants.o .obj/Typecode_Constants.SO .shobj/Typecode_Constants.o .shobj/Typecode_Constants.SO: Typecode_Constants.cpp \
   Typecode.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
@@ -25927,8 +24742,7 @@ realclean:
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
@@ -25948,8 +24762,7 @@ realclean:
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -26105,13 +24918,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -26129,7 +24940,186 @@ realclean:
   BoundsC.h \
   BoundsC.i
 
-.obj/TypeCodeFactory_Adapter.o .obj/TypeCodeFactory_Adapter.so .shobj/TypeCodeFactory_Adapter.o .shobj/TypeCodeFactory_Adapter.so: TypeCodeFactory_Adapter.cpp \
+.obj/PredefinedType_Seq_Tmplinst.o .obj/PredefinedType_Seq_Tmplinst.SO .shobj/PredefinedType_Seq_Tmplinst.o .shobj/PredefinedType_Seq_Tmplinst.SO: PredefinedType_Seq_Tmplinst.cpp \
+  Sequence_T.h \
+  $(ACE_ROOT)/ace/pre.h \
+  Sequence.h \
+  corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  corbafwd.i \
+  Managed_Types.h \
+  Managed_Types.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  Sequence.i \
+  Sequence_T.i \
+  Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  Exception.i \
+  Pseudo_VarOut_T.h \
+  Pseudo_VarOut_T.inl \
+  Pseudo_VarOut_T.cpp \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  Object.h \
+  Policy_ForwardC.h \
+  CDR.h \
+  CDR.i \
+  Objref_VarOut_T.h \
+  varbase.h \
+  Objref_VarOut_T.inl \
+  Objref_VarOut_T.cpp \
+  Seq_Var_T.h \
+  Seq_Var_T.inl \
+  Seq_Var_T.cpp \
+  Seq_Out_T.h \
+  Seq_Out_T.inl \
+  Seq_Out_T.cpp \
+  Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  IOP_IORC.h \
+  OctetSeqC.h \
+  OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
+  IOP_IORC.i \
+  Object.i \
+  Any.i
+
+.obj/TypeCodeFactory_Adapter.o .obj/TypeCodeFactory_Adapter.SO .shobj/TypeCodeFactory_Adapter.o .shobj/TypeCodeFactory_Adapter.SO: TypeCodeFactory_Adapter.cpp \
   TypeCodeFactory_Adapter.h \
   $(ACE_ROOT)/ace/pre.h \
   Exception.h \
@@ -26170,8 +25160,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -26183,7 +25172,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/Wait_Strategy.o .obj/Wait_Strategy.so .shobj/Wait_Strategy.o .shobj/Wait_Strategy.so: Wait_Strategy.cpp \
+.obj/Wait_Strategy.o .obj/Wait_Strategy.SO .shobj/Wait_Strategy.o .shobj/Wait_Strategy.SO: Wait_Strategy.cpp \
   Wait_Strategy.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -26207,7 +25196,7 @@ realclean:
   corbafwd.i \
   Wait_Strategy.inl
 
-.obj/Wait_On_Read.o .obj/Wait_On_Read.so .shobj/Wait_On_Read.o .shobj/Wait_On_Read.so: Wait_On_Read.cpp \
+.obj/Wait_On_Read.o .obj/Wait_On_Read.SO .shobj/Wait_On_Read.o .shobj/Wait_On_Read.SO: Wait_On_Read.cpp \
   Wait_On_Read.h \
   $(ACE_ROOT)/ace/pre.h \
   Wait_Strategy.h \
@@ -26247,8 +25236,7 @@ realclean:
   Cache_Entries.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -26259,8 +25247,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -26353,7 +25340,6 @@ realclean:
   Transport_Timer.h \
   Incoming_Message_Queue.h \
   Pluggable_Messaging_Utils.h \
-  IOPC.h \
   IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
@@ -26382,37 +25368,14 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
-  Object.h \
-  Policy_ForwardC.h \
-  Objref_VarOut_T.h \
-  varbase.h \
-  Objref_VarOut_T.inl \
-  Objref_VarOut_T.cpp \
-  Policy_ForwardC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  Object.i \
-  Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
-  Marshal.h \
-  Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl \
   Synch_Refcountable.h \
@@ -26424,9 +25387,6 @@ realclean:
   Resume_Handle.inl \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   LF_Invocation_Event.h \
   LF_Event.h \
@@ -26435,7 +25395,7 @@ realclean:
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl
 
-.obj/Wait_On_Reactor.o .obj/Wait_On_Reactor.so .shobj/Wait_On_Reactor.o .shobj/Wait_On_Reactor.so: Wait_On_Reactor.cpp \
+.obj/Wait_On_Reactor.o .obj/Wait_On_Reactor.SO .shobj/Wait_On_Reactor.o .shobj/Wait_On_Reactor.SO: Wait_On_Reactor.cpp \
   $(ACE_ROOT)/ace/Reactor.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Handle_Set.h \
@@ -26463,8 +25423,7 @@ realclean:
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Handle_Set.i \
   $(ACE_ROOT)/ace/Timer_Queue.h \
   $(ACE_ROOT)/ace/Synch.h \
@@ -26626,13 +25585,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -26671,20 +25628,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -26751,9 +25703,6 @@ realclean:
   Transport.inl \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   LF_Invocation_Event.h \
   LF_Event.h \
@@ -26762,7 +25711,7 @@ realclean:
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl
 
-.obj/Wait_On_Leader_Follower.o .obj/Wait_On_Leader_Follower.so .shobj/Wait_On_Leader_Follower.o .shobj/Wait_On_Leader_Follower.so: Wait_On_Leader_Follower.cpp \
+.obj/Wait_On_Leader_Follower.o .obj/Wait_On_Leader_Follower.SO .shobj/Wait_On_Leader_Follower.o .shobj/Wait_On_Leader_Follower.SO: Wait_On_Leader_Follower.cpp \
   Wait_On_Leader_Follower.h \
   $(ACE_ROOT)/ace/pre.h \
   Wait_Strategy.h \
@@ -26812,8 +25761,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -26953,13 +25901,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -26998,20 +25944,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -27089,9 +26030,6 @@ realclean:
   Transport.inl \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   LF_Invocation_Event.h \
   LF_Event.h \
@@ -27100,7 +26038,7 @@ realclean:
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl
 
-.obj/Transport_Mux_Strategy.o .obj/Transport_Mux_Strategy.so .shobj/Transport_Mux_Strategy.o .shobj/Transport_Mux_Strategy.so: Transport_Mux_Strategy.cpp \
+.obj/Transport_Mux_Strategy.o .obj/Transport_Mux_Strategy.SO .shobj/Transport_Mux_Strategy.o .shobj/Transport_Mux_Strategy.SO: Transport_Mux_Strategy.cpp \
   Transport_Mux_Strategy.h \
   $(ACE_ROOT)/ace/pre.h \
   IOPC.h \
@@ -27143,8 +26081,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -27261,13 +26198,16 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -27280,25 +26220,20 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   IOPC.i \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i
 
-.obj/Exclusive_TMS.o .obj/Exclusive_TMS.so .shobj/Exclusive_TMS.o .shobj/Exclusive_TMS.so: Exclusive_TMS.cpp \
+.obj/Exclusive_TMS.o .obj/Exclusive_TMS.SO .shobj/Exclusive_TMS.o .shobj/Exclusive_TMS.SO: Exclusive_TMS.cpp \
   Exclusive_TMS.h \
   $(ACE_ROOT)/ace/pre.h \
   Transport_Mux_Strategy.h \
@@ -27342,8 +26277,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -27460,13 +26394,16 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -27479,22 +26416,17 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   IOPC.i \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   Pluggable_Messaging_Utils.h \
   Pluggable_Messaging_Utils.i \
@@ -27513,7 +26445,7 @@ realclean:
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
   Transport.inl
 
-.obj/Muxed_TMS.o .obj/Muxed_TMS.so .shobj/Muxed_TMS.o .shobj/Muxed_TMS.so: Muxed_TMS.cpp Muxed_TMS.h \
+.obj/Muxed_TMS.o .obj/Muxed_TMS.SO .shobj/Muxed_TMS.o .shobj/Muxed_TMS.SO: Muxed_TMS.cpp Muxed_TMS.h \
   $(ACE_ROOT)/ace/pre.h \
   Transport_Mux_Strategy.h \
   IOPC.h \
@@ -27556,8 +26488,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -27674,13 +26605,16 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -27693,23 +26627,18 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   IOPC.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
@@ -27757,25 +26686,14 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h PortableInterceptorC.i \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
+  OctetSeqC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h DynamicC.i Messaging_SyncScopeC.h Messaging_SyncScopeC.i \
+  IOPC.h PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
+  Parser_Registry.i Service_Callbacks.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -27804,10 +26722,9 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
   Client_Strategy_Factory.h
 
-.obj/Reply_Dispatcher.o .obj/Reply_Dispatcher.so .shobj/Reply_Dispatcher.o .shobj/Reply_Dispatcher.so: Reply_Dispatcher.cpp \
+.obj/Reply_Dispatcher.o .obj/Reply_Dispatcher.SO .shobj/Reply_Dispatcher.o .shobj/Reply_Dispatcher.SO: Reply_Dispatcher.cpp \
   Reply_Dispatcher.h \
   $(ACE_ROOT)/ace/pre.h \
-  IOPC.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -27827,16 +26744,9 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i \
-  IOP_IORC.h \
-  OctetSeqC.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS.h \
+  Reply_Dispatcher.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -27847,165 +26757,25 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  Sequence.i \
-  Sequence_T.h \
-  Sequence_T.i \
-  Sequence_T.cpp \
-  Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Exception.h \
-  $(ACE_ROOT)/ace/iosfwd.h \
-  Exception.i \
-  Pseudo_VarOut_T.h \
-  Pseudo_VarOut_T.inl \
-  Pseudo_VarOut_T.cpp \
-  Typecode.i \
-  Environment.h \
-  Environment.i \
-  Seq_Var_T.h \
-  Seq_Var_T.inl \
-  Seq_Var_T.cpp \
-  Seq_Out_T.h \
-  Seq_Out_T.inl \
-  Seq_Out_T.cpp \
-  OctetSeqC.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
-  Object.h \
-  Policy_ForwardC.h \
-  Objref_VarOut_T.h \
-  varbase.h \
-  Objref_VarOut_T.inl \
-  Objref_VarOut_T.cpp \
-  Policy_ForwardC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  Object.i \
-  Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
-  Marshal.h \
-  Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
-  Reply_Dispatcher.i
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h
 
-.obj/Synch_Reply_Dispatcher.o .obj/Synch_Reply_Dispatcher.so .shobj/Synch_Reply_Dispatcher.o .shobj/Synch_Reply_Dispatcher.so: Synch_Reply_Dispatcher.cpp \
+.obj/Synch_Reply_Dispatcher.o .obj/Synch_Reply_Dispatcher.SO .shobj/Synch_Reply_Dispatcher.o .shobj/Synch_Reply_Dispatcher.SO: Synch_Reply_Dispatcher.cpp \
   Synch_Reply_Dispatcher.h \
   $(ACE_ROOT)/ace/pre.h \
   Reply_Dispatcher.h \
-  IOPC.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -28025,36 +26795,52 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i \
-  IOP_IORC.h \
-  OctetSeqC.h \
-  Sequence.h \
-  Managed_Types.h \
-  Managed_Types.i \
+  Reply_Dispatcher.i \
+  LF_Invocation_Event.h \
+  LF_Event.h \
+  LF_Event.inl \
+  LF_Invocation_Event.inl \
+  GIOP_Message_Version.h \
+  GIOP_Message_Version.inl \
+  CDR.h \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS.h \
-  $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
   $(ACE_ROOT)/ace/OS_String.h \
   $(ACE_ROOT)/ace/OS_String.inl \
-  $(ACE_ROOT)/ace/OS_TLI.h \
-  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
-  $(ACE_ROOT)/ace/Min_Max.h \
-  $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block.i \
   $(ACE_ROOT)/ace/Message_Block_T.h \
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  CDR.i \
+  ORB_Core.h \
+  ORB.h \
+  Exception.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  Exception.i \
+  ServicesC.h \
+  OctetSeqC.h \
+  Sequence.h \
+  Managed_Types.h \
+  Managed_Types.i \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   Sequence.i \
   Sequence_T.h \
   Sequence_T.i \
@@ -28101,7 +26887,6 @@ realclean:
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
   $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
@@ -28147,9 +26932,6 @@ realclean:
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  Exception.h \
-  $(ACE_ROOT)/ace/iosfwd.h \
-  Exception.i \
   Pseudo_VarOut_T.h \
   Pseudo_VarOut_T.inl \
   Pseudo_VarOut_T.cpp \
@@ -28163,14 +26945,17 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
-  CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
+  ServicesC.i \
+  CORBA_String.h \
+  CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
+  objectid.h \
+  PolicyC.h \
+  CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
   Objref_VarOut_T.h \
@@ -28180,41 +26965,17 @@ realclean:
   Policy_ForwardC.i \
   Object_KeyC.h \
   Object_KeyC.i \
+  IOP_IORC.h \
+  IOP_IORC.i \
   Object.i \
+  Any_Impl_T.h \
+  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
-  Reply_Dispatcher.i \
-  LF_Invocation_Event.h \
-  LF_Event.h \
-  LF_Event.inl \
-  LF_Invocation_Event.inl \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  ORB_Core.h \
-  ORB.h \
-  ServicesC.h \
-  ServicesC.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ObjectIdListC.h \
-  ObjectIdListC.i \
-  objectid.h \
-  PolicyC.h \
-  CurrentC.h \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
@@ -28250,22 +27011,21 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
+  IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i \
+  IOPC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -28325,7 +27085,7 @@ realclean:
   Synch_Refcountable.inl \
   Transport.inl
 
-.obj/Synch_Refcountable.o .obj/Synch_Refcountable.so .shobj/Synch_Refcountable.o .shobj/Synch_Refcountable.so: Synch_Refcountable.cpp Synch_Refcountable.h \
+.obj/Synch_Refcountable.o .obj/Synch_Refcountable.SO .shobj/Synch_Refcountable.o .shobj/Synch_Refcountable.SO: Synch_Refcountable.cpp Synch_Refcountable.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -28333,8 +27093,7 @@ realclean:
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/Refcountable.inl TAO_Export.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Export.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
@@ -28354,8 +27113,7 @@ realclean:
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
@@ -28371,7 +27129,7 @@ realclean:
   $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Priority.h Synch_Refcountable.inl
 
-.obj/Asynch_Reply_Dispatcher_Base.o .obj/Asynch_Reply_Dispatcher_Base.so .shobj/Asynch_Reply_Dispatcher_Base.o .shobj/Asynch_Reply_Dispatcher_Base.so: Asynch_Reply_Dispatcher_Base.cpp \
+.obj/Asynch_Reply_Dispatcher_Base.o .obj/Asynch_Reply_Dispatcher_Base.SO .shobj/Asynch_Reply_Dispatcher_Base.o .shobj/Asynch_Reply_Dispatcher_Base.SO: Asynch_Reply_Dispatcher_Base.cpp \
   Asynch_Reply_Dispatcher_Base.h \
   $(ACE_ROOT)/ace/pre.h \
   TAO_Export.h \
@@ -28409,8 +27167,7 @@ realclean:
   Cache_Entries.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -28421,8 +27178,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -28515,7 +27271,6 @@ realclean:
   Transport_Timer.h \
   Incoming_Message_Queue.h \
   Pluggable_Messaging_Utils.h \
-  IOPC.h \
   IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
@@ -28544,37 +27299,14 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
-  Object.h \
-  Policy_ForwardC.h \
-  Objref_VarOut_T.h \
-  varbase.h \
-  Objref_VarOut_T.inl \
-  Objref_VarOut_T.cpp \
-  Policy_ForwardC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  Object.i \
-  Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
-  Marshal.h \
-  Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl \
   Synch_Refcountable.h \
@@ -28583,9 +27315,6 @@ realclean:
   Synch_Refcountable.inl \
   Transport.inl \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   Asynch_Reply_Dispatcher_Base.i \
   ORB_Core.h \
@@ -28599,6 +27328,24 @@ realclean:
   objectid.h \
   PolicyC.h \
   CurrentC.h \
+  Object.h \
+  Policy_ForwardC.h \
+  Objref_VarOut_T.h \
+  varbase.h \
+  Objref_VarOut_T.inl \
+  Objref_VarOut_T.cpp \
+  Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i \
+  Any_Impl_T.h \
+  Any.h \
+  Any.i \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
@@ -28634,22 +27381,21 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
+  IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i \
+  IOPC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -28690,7 +27436,7 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Manager.i \
   ORB_Core.i
 
-.obj/IOP_IORC.o .obj/IOP_IORC.so .shobj/IOP_IORC.o .shobj/IOP_IORC.so: IOP_IORC.cpp IOP_IORC.h $(ACE_ROOT)/ace/pre.h \
+.obj/IOP_IORC.o .obj/IOP_IORC.SO .shobj/IOP_IORC.o .shobj/IOP_IORC.SO: IOP_IORC.cpp IOP_IORC.h $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -28729,8 +27475,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -28847,14 +27592,14 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i IOP_IORC.i \
-  Stub.h \
-  MProfile.h \
-  PolicyC.h \
-  CurrentC.h \
+  CDR.i IOP_IORC.i Any_Dual_Impl_T.h \
+  Any.h \
   Object.h \
   Policy_ForwardC.h \
   Objref_VarOut_T.h \
@@ -28866,173 +27611,15 @@ realclean:
   Object_KeyC.i \
   IOP_IORC.h \
   Object.i \
-  Any_T.h \
-  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
+  Any_Dual_Impl_T.h \
   Marshal.h \
   Marshal.i \
-  debug.h \
-  CurrentC.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  PolicyC.i \
-  MProfile.i \
-  ORB.h \
-  ServicesC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  ServicesC.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ObjectIdListC.h \
-  ObjectIdListC.i \
-  objectid.h \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  params.h \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  StringSeqC.h \
-  StringSeqC.i \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
-  Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i \
-  IOPC.h \
-  IOP_CodecC.h \
-  IOP_CodecC.i \
-  IOPC.i \
-  PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  PICurrent.h \
-  PICurrent.inl \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  ORB_Core_Auto_Ptr.h \
-  ORB_Core_Auto_Ptr.inl \
-  Stub.i \
-  Invocation.h \
-  Synch_Reply_Dispatcher.h \
-  Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
-  Reply_Dispatcher.i \
-  LF_Invocation_Event.h \
-  LF_Event.h \
-  LF_Event.inl \
-  LF_Invocation_Event.inl \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  operation_details.h \
-  Service_Context.h \
-  Service_Context.inl \
-  target_specification.h \
-  target_specification.i \
-  operation_details.i \
-  Transport.h \
-  Transport_Descriptor_Interface.h \
-  Transport_Descriptor_Interface.inl \
-  Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
-  Cache_Entries.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Synch_Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl \
-  Synch_Refcountable.inl \
-  Transport.inl \
-  Invocation.i \
-  PortableInterceptor.h \
-  RequestInfo_Util.h \
-  ClientRequestInfo_i.h \
-  ClientRequestInfo_i.inl \
-  ClientInterceptorAdapter.h \
-  ClientInterceptorAdapter.inl
+  debug.h
 
-.obj/IOP_CodecC.o .obj/IOP_CodecC.so .shobj/IOP_CodecC.o .shobj/IOP_CodecC.so: IOP_CodecC.cpp IOP_CodecC.h \
+.obj/IOP_CodecC.o .obj/IOP_CodecC.SO .shobj/IOP_CodecC.o .shobj/IOP_CodecC.SO: IOP_CodecC.cpp IOP_CodecC.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -29053,7 +27640,10 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i \
-  Any_T.h \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
+  Any_Impl_T.h \
   Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/SStringfwd.h \
@@ -29074,8 +27664,7 @@ realclean:
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   Object.h \
   Policy_ForwardC.h \
@@ -29209,13 +27798,14 @@ realclean:
   IOP_IORC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
-  debug.h IOP_CodecC.i \
+  debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp IOP_CodecC.i \
   Stub.h \
   MProfile.h \
   PolicyC.h \
@@ -29227,9 +27817,6 @@ realclean:
   MProfile.i \
   ORB.h \
   ServicesC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
@@ -29268,20 +27855,12 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -29332,9 +27911,6 @@ realclean:
   Invocation.h \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   LF_Invocation_Event.h \
   LF_Event.h \
@@ -29375,7 +27951,7 @@ realclean:
   ClientInterceptorAdapter.h \
   ClientInterceptorAdapter.inl
 
-.obj/IOPC.o .obj/IOPC.so .shobj/IOPC.o .shobj/IOPC.so: IOPC.cpp IOPC.h $(ACE_ROOT)/ace/pre.h \
+.obj/IOPC.o .obj/IOPC.SO .shobj/IOPC.o .shobj/IOPC.SO: IOPC.cpp IOPC.h $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -29415,8 +27991,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -29533,13 +28108,16 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -29552,17 +28130,15 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp IOPC.i \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
+  IOP_CodecC.i IOPC.i \
   Stub.h \
   MProfile.h \
   PolicyC.h \
@@ -29612,20 +28188,12 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -29674,9 +28242,6 @@ realclean:
   Invocation.h \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   LF_Invocation_Event.h \
   LF_Event.h \
@@ -29717,9 +28282,8 @@ realclean:
   ClientInterceptorAdapter.h \
   ClientInterceptorAdapter.inl
 
-.obj/PollableC.o .obj/PollableC.so .shobj/PollableC.o .shobj/PollableC.so: PollableC.cpp PollableC.h \
-  $(ACE_ROOT)/ace/pre.h Exception.h \
-  corbafwd.h \
+.obj/PollableC.o .obj/PollableC.SO .shobj/PollableC.o .shobj/PollableC.SO: PollableC.cpp PollableC.h $(ACE_ROOT)/ace/pre.h \
+  Exception.h corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -29744,7 +28308,8 @@ realclean:
   $(ACE_ROOT)/ace/iosfwd.h \
   Exception.i
 
-.obj/CONV_FRAMEC.o .obj/CONV_FRAMEC.so .shobj/CONV_FRAMEC.o .shobj/CONV_FRAMEC.so: CONV_FRAMEC.cpp CONV_FRAMEC.h \
+.obj/CONV_FRAMEC.o .obj/CONV_FRAMEC.SO .shobj/CONV_FRAMEC.o .shobj/CONV_FRAMEC.SO: CONV_FRAMEC.cpp \
+  CONV_FRAMEC.h \
   $(ACE_ROOT)/ace/pre.h \
   CDR.h \
   corbafwd.h \
@@ -29787,8 +28352,7 @@ realclean:
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   Sequence.h \
@@ -29900,8 +28464,9 @@ realclean:
   Environment.i \
   VarOut_T.h \
   VarOut_T.inl \
-  VarOut_T.cpp CONV_FRAMEC.i \
-  Any_T.h \
+  VarOut_T.cpp \
+  CONV_FRAMEC.i \
+  Any_Dual_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -29924,15 +28489,13 @@ realclean:
   IOP_IORC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h
 
-.obj/Tagged_Components.o .obj/Tagged_Components.so .shobj/Tagged_Components.o .shobj/Tagged_Components.so: Tagged_Components.cpp \
+.obj/Tagged_Components.o .obj/Tagged_Components.SO .shobj/Tagged_Components.o .shobj/Tagged_Components.SO: Tagged_Components.cpp \
   Tagged_Components.h \
   $(ACE_ROOT)/ace/pre.h \
   IOPC.h \
@@ -29975,8 +28538,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -30093,13 +28655,16 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -30112,17 +28677,15 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   IOPC.i \
   CONV_FRAMEC.h \
   CONV_FRAMEC.i \
@@ -30175,20 +28738,12 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   PortableInterceptorC.i \
@@ -30231,7 +28786,7 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Manager.i \
   ORB_Core.i
 
-.obj/Service_Context.o .obj/Service_Context.so .shobj/Service_Context.o .shobj/Service_Context.so: Service_Context.cpp \
+.obj/Service_Context.o .obj/Service_Context.SO .shobj/Service_Context.o .shobj/Service_Context.SO: Service_Context.cpp \
   Service_Context.h \
   $(ACE_ROOT)/ace/pre.h \
   IOPC.h \
@@ -30274,8 +28829,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -30392,13 +28946,16 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -30411,21 +28968,19 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   IOPC.i \
   Service_Context.inl
 
-.obj/GIOPC.o .obj/GIOPC.so .shobj/GIOPC.o .shobj/GIOPC.so: GIOPC.cpp GIOPC.h $(ACE_ROOT)/ace/pre.h \
+.obj/GIOPC.o .obj/GIOPC.SO .shobj/GIOPC.o .shobj/GIOPC.SO: GIOPC.cpp GIOPC.h $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -30445,7 +29000,6 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i \
-  IOPC.h \
   IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
@@ -30466,8 +29020,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -30584,13 +29137,14 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
-  IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
+  IOP_IORC.i Any_Dual_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -30603,172 +29157,14 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
+  Any_Dual_Impl_T.h \
   Marshal.h \
   Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i OctetSeqC.h GIOPC.i \
-  Stub.h \
-  MProfile.h \
-  PolicyC.h \
-  CurrentC.h \
-  CurrentC.i \
-  Remote_Object_Proxy_Impl.h \
-  Object_Proxy_Impl.h \
-  PolicyC.i \
-  MProfile.i \
-  ORB.h \
-  ServicesC.h \
-  ServicesC.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ObjectIdListC.h \
-  ObjectIdListC.i \
-  objectid.h \
-  ORB.i \
-  ORB_Core.h \
-  Policy_Manager.h \
-  Policy_Set.h \
-  Policy_Set.i \
-  LocalObject.h \
-  LocalObject.i \
-  Policy_Manager.i \
-  Resource_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  CONV_FRAMEC.h \
-  CONV_FRAMEC.i \
-  params.h \
-  params.i \
-  TAO_Singleton_Manager.h \
-  TAO_Singleton_Manager.inl \
-  TAO_Singleton.h \
-  TAO_Singleton.inl \
-  TAO_Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  Adapter.h \
-  Adapter.i \
-  PolicyFactory_Registry.h \
-  PortableInterceptorC.h \
-  DynamicC.h \
-  StringSeqC.h \
-  StringSeqC.i \
-  DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
-  Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i \
-  PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
-  Service_Callbacks.i \
-  Fault_Tolerance_Service.h \
-  Fault_Tolerance_Service.i \
-  Cleanup_Func_Registry.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  Cleanup_Func_Registry.inl \
-  Object_Ref_Table.h \
-  Interceptor_List.h \
-  Interceptor_List.inl \
-  PICurrent.h \
-  PICurrent.inl \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  ORB_Core.i \
-  ORB_Core_Auto_Ptr.h \
-  ORB_Core_Auto_Ptr.inl \
-  Stub.i \
-  Invocation.h \
-  Synch_Reply_Dispatcher.h \
-  Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
-  Reply_Dispatcher.i \
-  LF_Invocation_Event.h \
-  LF_Event.h \
-  LF_Event.inl \
-  LF_Invocation_Event.inl \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  operation_details.h \
-  Service_Context.h \
-  Service_Context.inl \
-  target_specification.h \
-  target_specification.i \
-  operation_details.i \
-  Transport.h \
-  Transport_Descriptor_Interface.h \
-  Transport_Descriptor_Interface.inl \
-  Transport_Cache_Manager.h \
-  Cache_Entries.h \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
-  Cache_Entries.inl \
-  Transport_Cache_Manager.inl \
-  Transport_Timer.h \
-  Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl \
-  Synch_Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl \
-  Synch_Refcountable.inl \
-  Transport.inl \
-  Invocation.i \
-  PortableInterceptor.h \
-  RequestInfo_Util.h \
-  ClientRequestInfo_i.h \
-  ClientRequestInfo_i.inl \
-  ClientInterceptorAdapter.h \
-  ClientInterceptorAdapter.inl
+  debug.h GIOPC.i
 
-.obj/BoundsC.o .obj/BoundsC.so .shobj/BoundsC.o .shobj/BoundsC.so: BoundsC.cpp BoundsC.h $(ACE_ROOT)/ace/pre.h \
+.obj/BoundsC.o .obj/BoundsC.SO .shobj/BoundsC.o .shobj/BoundsC.SO: BoundsC.cpp BoundsC.h $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -30811,8 +29207,7 @@ realclean:
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i BoundsC.i \
   Stub.h \
@@ -30943,15 +29338,16 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -30962,9 +29358,6 @@ realclean:
   MProfile.i \
   ORB.h \
   ServicesC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
@@ -31003,20 +29396,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -31068,9 +29456,6 @@ realclean:
   Invocation.h \
   Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
   Reply_Dispatcher.i \
   LF_Invocation_Event.h \
   LF_Event.h \
@@ -31111,7 +29496,7 @@ realclean:
   ClientInterceptorAdapter.h \
   ClientInterceptorAdapter.inl
 
-.obj/TAOC.o .obj/TAOC.so .shobj/TAOC.o .shobj/TAOC.so: TAOC.cpp TAOC.h $(ACE_ROOT)/ace/pre.h PolicyC.h \
+.obj/TAOC.o .obj/TAOC.SO .shobj/TAOC.o .shobj/TAOC.SO: TAOC.cpp TAOC.h $(ACE_ROOT)/ace/pre.h PolicyC.h \
   CurrentC.h Object.h \
   Policy_ForwardC.h \
   Sequence.h \
@@ -31151,8 +29536,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -31282,27 +29666,28 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h CurrentC.i Policy_ForwardC.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h PolicyC.i \
   Messaging_SyncScopeC.h Messaging_SyncScopeC.i TimeBaseC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp TimeBaseC.i VarOut_T.h \
-  TAOC.i
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp TimeBaseC.i \
+  VarOut_T.h TAOC.i
 
-.obj/Object_Loader.o .obj/Object_Loader.so .shobj/Object_Loader.o .shobj/Object_Loader.so: Object_Loader.cpp Object_Loader.h \
+.obj/Object_Loader.o .obj/Object_Loader.SO .shobj/Object_Loader.o .shobj/Object_Loader.SO: Object_Loader.cpp Object_Loader.h \
   $(ACE_ROOT)/ace/pre.h \
   Exception.h \
   corbafwd.h \
@@ -31342,8 +29727,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -31355,7 +29739,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/TAO_Singleton_Manager.o .obj/TAO_Singleton_Manager.so .shobj/TAO_Singleton_Manager.o .shobj/TAO_Singleton_Manager.so: TAO_Singleton_Manager.cpp \
+.obj/TAO_Singleton_Manager.o .obj/TAO_Singleton_Manager.SO .shobj/TAO_Singleton_Manager.o .shobj/TAO_Singleton_Manager.SO: TAO_Singleton_Manager.cpp \
   orbconf.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -31383,8 +29767,7 @@ realclean:
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Object_Manager.i \
   $(ACE_ROOT)/ace/Managed_Object.h \
   $(ACE_ROOT)/ace/Managed_Object.i \
@@ -31499,9 +29882,8 @@ realclean:
   Pseudo_VarOut_T.cpp \
   Typecode.i
 
-.obj/DLL_ORB.o .obj/DLL_ORB.so .shobj/DLL_ORB.o .shobj/DLL_ORB.so: DLL_ORB.cpp DLL_ORB.h \
-  $(ACE_ROOT)/ace/pre.h \
-  $(ACE_ROOT)/ace/Task.h \
+.obj/DLL_ORB.o .obj/DLL_ORB.SO .shobj/DLL_ORB.o .shobj/DLL_ORB.SO: DLL_ORB.cpp DLL_ORB.h \
+  $(ACE_ROOT)/ace/pre.h $(ACE_ROOT)/ace/Task.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -31528,8 +29910,7 @@ realclean:
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -31735,13 +30116,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -31753,8 +30132,7 @@ realclean:
   DLL_ORB.inl \
   TAO_Singleton_Manager.h \
   TAO_Singleton_Manager.inl \
-  $(ACE_ROOT)/ace/ARGV.h \
-  $(ACE_ROOT)/ace/ARGV.i \
+  $(ACE_ROOT)/ace/ARGV.h $(ACE_ROOT)/ace/ARGV.i \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
@@ -31762,7 +30140,7 @@ realclean:
   $(ACE_ROOT)/ace/Argv_Type_Converter.h \
   $(ACE_ROOT)/ace/Argv_Type_Converter.inl
 
-.obj/Adapter.o .obj/Adapter.so .shobj/Adapter.o .shobj/Adapter.so: Adapter.cpp Adapter.h \
+.obj/Adapter.o .obj/Adapter.SO .shobj/Adapter.o .shobj/Adapter.SO: Adapter.cpp Adapter.h \
   $(ACE_ROOT)/ace/pre.h \
   Object.h \
   Policy_ForwardC.h \
@@ -31803,8 +30181,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -31934,6 +30311,9 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
   $(ACE_ROOT)/ace/Service_Object.h \
@@ -31947,7 +30327,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp debug.h
 
-.obj/Services_Activate.o .obj/Services_Activate.so .shobj/Services_Activate.o .shobj/Services_Activate.so: Services_Activate.cpp \
+.obj/Services_Activate.o .obj/Services_Activate.SO .shobj/Services_Activate.o .shobj/Services_Activate.SO: Services_Activate.cpp \
   Services_Activate.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -31982,8 +30362,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -32001,7 +30380,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/Service_Callbacks.o .obj/Service_Callbacks.so .shobj/Service_Callbacks.o .shobj/Service_Callbacks.so: Service_Callbacks.cpp \
+.obj/Service_Callbacks.o .obj/Service_Callbacks.SO .shobj/Service_Callbacks.o .shobj/Service_Callbacks.SO: Service_Callbacks.cpp \
   Service_Callbacks.h \
   $(ACE_ROOT)/ace/pre.h \
   IOPC.h \
@@ -32044,8 +30423,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -32162,13 +30540,16 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -32181,17 +30562,15 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   IOPC.i \
   Service_Callbacks.i \
   PolicyC.h \
@@ -32201,7 +30580,7 @@ realclean:
   Object_Proxy_Impl.h \
   PolicyC.i
 
-.obj/Parser_Registry.o .obj/Parser_Registry.so .shobj/Parser_Registry.o .shobj/Parser_Registry.so: Parser_Registry.cpp \
+.obj/Parser_Registry.o .obj/Parser_Registry.SO .shobj/Parser_Registry.o .shobj/Parser_Registry.SO: Parser_Registry.cpp \
   Parser_Registry.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -32244,8 +30623,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -32398,13 +30776,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -32438,20 +30814,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -32504,7 +30875,7 @@ realclean:
   $(ACE_ROOT)/ace/Service_Repository.h \
   $(ACE_ROOT)/ace/Service_Repository.i
 
-.obj/IOR_Parser.o .obj/IOR_Parser.so .shobj/IOR_Parser.o .shobj/IOR_Parser.so: IOR_Parser.cpp \
+.obj/IOR_Parser.o .obj/IOR_Parser.SO .shobj/IOR_Parser.o .shobj/IOR_Parser.SO: IOR_Parser.cpp \
   IOR_Parser.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -32545,8 +30916,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -32559,7 +30929,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/DLL_Parser.o .obj/DLL_Parser.so .shobj/DLL_Parser.o .shobj/DLL_Parser.so: DLL_Parser.cpp DLL_Parser.h \
+.obj/DLL_Parser.o .obj/DLL_Parser.SO .shobj/DLL_Parser.o .shobj/DLL_Parser.SO: DLL_Parser.cpp DLL_Parser.h \
   $(ACE_ROOT)/ace/pre.h \
   IOR_Parser.h \
   corbafwd.h \
@@ -32600,8 +30970,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -32739,6 +31108,9 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
@@ -32746,7 +31118,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/FILE_Parser.o .obj/FILE_Parser.so .shobj/FILE_Parser.o .shobj/FILE_Parser.so: FILE_Parser.cpp FILE_Parser.h \
+.obj/FILE_Parser.o .obj/FILE_Parser.SO .shobj/FILE_Parser.o .shobj/FILE_Parser.SO: FILE_Parser.cpp FILE_Parser.h \
   $(ACE_ROOT)/ace/pre.h \
   IOR_Parser.h \
   corbafwd.h \
@@ -32787,8 +31159,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -32927,13 +31298,13 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
   ORB.h \
   ServicesC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
@@ -32942,13 +31313,11 @@ realclean:
   objectid.h \
   PolicyC.h \
   CurrentC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -32960,7 +31329,7 @@ realclean:
   $(ACE_ROOT)/ace/Read_Buffer.h \
   $(ACE_ROOT)/ace/Read_Buffer.i
 
-.obj/CORBALOC_Parser.o .obj/CORBALOC_Parser.so .shobj/CORBALOC_Parser.o .shobj/CORBALOC_Parser.so: CORBALOC_Parser.cpp CORBALOC_Parser.h \
+.obj/CORBALOC_Parser.o .obj/CORBALOC_Parser.SO .shobj/CORBALOC_Parser.o .shobj/CORBALOC_Parser.SO: CORBALOC_Parser.cpp CORBALOC_Parser.h \
   $(ACE_ROOT)/ace/pre.h \
   IOR_Parser.h \
   corbafwd.h \
@@ -33001,8 +31370,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -33147,13 +31515,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h CurrentC.i Policy_ForwardC.h \
@@ -33178,27 +31544,19 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
+  OctetSeqC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   IOP_CodecC.h \
   IOP_CodecC.i IOPC.i \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h IOPC.h \
+  Parser_Registry.i Service_Callbacks.h \
+  IOPC.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -33232,12 +31590,11 @@ realclean:
   ORB_Core.h \
   ORB_Core_Auto_Ptr.h \
   ORB_Core_Auto_Ptr.inl \
-  Stub.i MProfile.h \
-  Connector_Registry.h Endpoint.h \
-  Endpoint.i \
+  Stub.i MProfile.h Connector_Registry.h \
+  Endpoint.h Endpoint.i \
   Connector_Registry.i
 
-.obj/CORBANAME_Parser.o .obj/CORBANAME_Parser.so .shobj/CORBANAME_Parser.o .shobj/CORBANAME_Parser.so: CORBANAME_Parser.cpp CORBANAME_Parser.h \
+.obj/CORBANAME_Parser.o .obj/CORBANAME_Parser.SO .shobj/CORBANAME_Parser.o .shobj/CORBANAME_Parser.SO: CORBANAME_Parser.cpp CORBANAME_Parser.h \
   $(ACE_ROOT)/ace/pre.h \
   IOR_Parser.h \
   corbafwd.h \
@@ -33278,8 +31635,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -33376,6 +31732,15 @@ realclean:
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i Synch_Reply_Dispatcher.h \
   Reply_Dispatcher.h \
+  Reply_Dispatcher.i \
+  LF_Invocation_Event.h \
+  LF_Event.h \
+  LF_Event.inl \
+  LF_Invocation_Event.inl \
+  GIOP_Message_Version.h \
+  GIOP_Message_Version.inl \
+  CDR.h Messaging_SyncScopeC.h \
+  Messaging_SyncScopeC.i operation_details.h corbafwd.h Service_Context.h \
   IOPC.h \
   IOP_IORC.h \
   OctetSeqC.h \
@@ -33408,10 +31773,12 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
-  CDR.h \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -33424,30 +31791,16 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   IOPC.i \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
-  Reply_Dispatcher.i \
-  LF_Invocation_Event.h \
-  LF_Event.h \
-  LF_Event.inl \
-  LF_Invocation_Event.inl \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  Messaging_SyncScopeC.h Messaging_SyncScopeC.i operation_details.h \
-  corbafwd.h Service_Context.h \
   Service_Context.inl \
   target_specification.h target_specification.i operation_details.i \
   Transport.h Exception.h Transport_Descriptor_Interface.h \
@@ -33509,20 +31862,12 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
@@ -33567,7 +31912,7 @@ realclean:
   ORB_Core_Auto_Ptr.inl \
   Stub.i debug.h
 
-.obj/MCAST_Parser.o .obj/MCAST_Parser.so .shobj/MCAST_Parser.o .shobj/MCAST_Parser.so: MCAST_Parser.cpp MCAST_Parser.h \
+.obj/MCAST_Parser.o .obj/MCAST_Parser.SO .shobj/MCAST_Parser.o .shobj/MCAST_Parser.SO: MCAST_Parser.cpp MCAST_Parser.h \
   $(ACE_ROOT)/ace/pre.h \
   IOR_Parser.h \
   corbafwd.h \
@@ -33608,8 +31953,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -33748,20 +32092,19 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i ORB_Core.h corbafwd.h ORB.h \
-  Exception.h ServicesC.h VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp ServicesC.i \
-  CORBA_String.h ObjectIdListC.h ObjectIdListC.i objectid.h PolicyC.h \
-  CurrentC.h Object.h \
-  Any_T.h \
+  Exception.h ServicesC.h ServicesC.i CORBA_String.h ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
+  Object.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h CurrentC.i Policy_ForwardC.h \
@@ -33786,27 +32129,19 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
+  OctetSeqC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   IOP_CodecC.h \
   IOP_CodecC.i IOPC.i \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h IOPC.h \
+  Parser_Registry.i Service_Callbacks.h \
+  IOPC.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -33837,8 +32172,7 @@ realclean:
   $(ACE_ROOT)/ace/Read_Buffer.h \
   $(ACE_ROOT)/ace/Read_Buffer.i \
   $(ACE_ROOT)/ace/INET_Addr.h \
-  $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/Addr.i \
+  $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/INET_Addr.i \
   $(ACE_ROOT)/ace/SOCK_Acceptor.h \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
@@ -33853,7 +32187,7 @@ realclean:
   $(ACE_ROOT)/ace/SOCK_Dgram.h \
   $(ACE_ROOT)/ace/SOCK_Dgram.i
 
-.obj/Bind_Dispatcher_Guard.o .obj/Bind_Dispatcher_Guard.so .shobj/Bind_Dispatcher_Guard.o .shobj/Bind_Dispatcher_Guard.so: Bind_Dispatcher_Guard.cpp \
+.obj/Bind_Dispatcher_Guard.o .obj/Bind_Dispatcher_Guard.SO .shobj/Bind_Dispatcher_Guard.o .shobj/Bind_Dispatcher_Guard.SO: Bind_Dispatcher_Guard.cpp \
   Bind_Dispatcher_Guard.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -33877,6 +32211,8 @@ realclean:
   corbafwd.i \
   Bind_Dispatcher_Guard.i \
   Reply_Dispatcher.h \
+  Reply_Dispatcher.i \
+  Transport_Mux_Strategy.h \
   IOPC.h \
   IOP_IORC.h \
   OctetSeqC.h \
@@ -33898,8 +32234,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -34016,13 +32351,16 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -34035,25 +32373,18 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
-  Condition.h \
-  Condition.inl \
-  Condition.cpp \
-  Reply_Dispatcher.i \
-  Transport_Mux_Strategy.h
+  IOPC.i
 
-.obj/Fault_Tolerance_Service.o .obj/Fault_Tolerance_Service.so .shobj/Fault_Tolerance_Service.o .shobj/Fault_Tolerance_Service.so: Fault_Tolerance_Service.cpp \
+.obj/Fault_Tolerance_Service.o .obj/Fault_Tolerance_Service.SO .shobj/Fault_Tolerance_Service.o .shobj/Fault_Tolerance_Service.SO: Fault_Tolerance_Service.cpp \
   Fault_Tolerance_Service.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/SString.h \
@@ -34086,8 +32417,7 @@ realclean:
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -34216,13 +32546,16 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -34235,17 +32568,15 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   IOPC.i \
   Service_Callbacks.i \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
@@ -34299,20 +32630,12 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   PortableInterceptorC.i \
@@ -34352,7 +32675,7 @@ realclean:
   ORB_Core.i \
   Client_Strategy_Factory.h
 
-.obj/Interceptor_List.o .obj/Interceptor_List.so .shobj/Interceptor_List.o .shobj/Interceptor_List.so: Interceptor_List.cpp \
+.obj/Interceptor_List.o .obj/Interceptor_List.SO .shobj/Interceptor_List.o .shobj/Interceptor_List.SO: Interceptor_List.cpp \
   Interceptor_List.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -34375,9 +32698,8 @@ realclean:
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i \
   PortableInterceptorC.h \
-  CurrentC.h \
-  Object.h \
-  Policy_ForwardC.h \
+  PI_ForwardC.h \
+  OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -34396,8 +32718,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -34507,63 +32828,348 @@ realclean:
   Typecode.i \
   Environment.h \
   Environment.i \
-  CDR.h \
+  Seq_Var_T.h \
+  Seq_Var_T.inl \
+  Seq_Var_T.cpp \
+  Seq_Out_T.h \
+  Seq_Out_T.inl \
+  Seq_Out_T.cpp \
+  OctetSeqC.i \
+  StringSeqC.h \
+  StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  Object.h \
+  Policy_ForwardC.h \
+  CDR.h \
   CDR.i \
   Objref_VarOut_T.h \
   varbase.h \
   Objref_VarOut_T.inl \
   Objref_VarOut_T.cpp \
-  Seq_Var_T.h \
-  Seq_Var_T.inl \
-  Seq_Var_T.cpp \
-  Seq_Out_T.h \
-  Seq_Out_T.inl \
-  Seq_Out_T.cpp \
   Policy_ForwardC.i \
   Object_KeyC.h \
   Object_KeyC.i \
   IOP_IORC.h \
-  OctetSeqC.h \
-  OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
-  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  DynamicC.i \
+  Messaging_SyncScopeC.h \
+  Messaging_SyncScopeC.i \
+  IOPC.h \
+  IOP_CodecC.h \
+  Any_Impl_T.h \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
+  IOP_CodecC.i \
+  IOPC.i \
+  PolicyC.h \
+  CurrentC.h \
   CurrentC.i \
-  DynamicC.h \
+  Remote_Object_Proxy_Impl.h \
+  Object_Proxy_Impl.h \
+  PolicyC.i \
+  PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  Interceptor_List.inl \
+  IORInterceptor_Adapter.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  CORBA_String.h \
+  CORBA_String.inl \
+  ORB_Core.h \
+  ORB.h \
+  ServicesC.h \
+  ServicesC.i \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
+  objectid.h \
+  ORB.i \
+  Policy_Manager.h \
+  Policy_Set.h \
+  Policy_Set.i \
+  LocalObject.h \
+  LocalObject.i \
+  Policy_Manager.i \
+  Resource_Factory.h \
+  CONV_FRAMEC.h \
+  CONV_FRAMEC.i \
+  params.h \
+  params.i \
+  TAO_Singleton_Manager.h \
+  TAO_Singleton_Manager.inl \
+  TAO_Singleton.h \
+  TAO_Singleton.inl \
+  TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  Adapter.h \
+  Adapter.i \
+  PolicyFactory_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  Parser_Registry.h \
+  Parser_Registry.i \
+  Service_Callbacks.h \
+  Service_Callbacks.i \
+  Fault_Tolerance_Service.h \
+  Fault_Tolerance_Service.i \
+  Cleanup_Func_Registry.h \
+  Cleanup_Func_Registry.inl \
+  Object_Ref_Table.h \
+  PICurrent.h \
+  PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  ORB_Core.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.h \
+  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.cpp
+
+.obj/IORInterceptor_Adapter.o .obj/IORInterceptor_Adapter.SO .shobj/IORInterceptor_Adapter.o .shobj/IORInterceptor_Adapter.SO: IORInterceptor_Adapter.cpp \
+  IORInterceptor_Adapter.h \
+  $(ACE_ROOT)/ace/pre.h \
+  corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  corbafwd.i \
+  Interceptor_List.h \
+  PortableInterceptorC.h \
+  PI_ForwardC.h \
+  OctetSeqC.h \
+  Sequence.h \
+  Managed_Types.h \
+  Managed_Types.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  Sequence.i \
+  Sequence_T.h \
+  Sequence_T.i \
+  Sequence_T.cpp \
+  Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  Exception.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  Exception.i \
+  Pseudo_VarOut_T.h \
+  Pseudo_VarOut_T.inl \
+  Pseudo_VarOut_T.cpp \
+  Typecode.i \
+  Environment.h \
+  Environment.i \
+  Seq_Var_T.h \
+  Seq_Var_T.inl \
+  Seq_Var_T.cpp \
+  Seq_Out_T.h \
+  Seq_Out_T.inl \
+  Seq_Out_T.cpp \
+  OctetSeqC.i \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  Object.h \
+  Policy_ForwardC.h \
+  CDR.h \
+  CDR.i \
+  Objref_VarOut_T.h \
+  varbase.h \
+  Objref_VarOut_T.inl \
+  Objref_VarOut_T.cpp \
+  Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  IOP_IORC.h \
   VarOut_T.h \
   VarOut_T.inl \
   VarOut_T.cpp \
+  IOP_IORC.i \
+  Object.i \
+  Any.i \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
   IOP_CodecC.h \
+  Any_Impl_T.h \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   IOP_CodecC.i \
   IOPC.i \
   PolicyC.h \
+  CurrentC.h \
+  CurrentC.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
   PolicyC.i \
@@ -34572,10 +33178,17 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   Interceptor_List.inl \
-  CORBA_String.h \
-  CORBA_String.inl
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.h \
+  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/IFR_Client_Adapter.o .obj/IFR_Client_Adapter.so .shobj/IFR_Client_Adapter.o .shobj/IFR_Client_Adapter.so: IFR_Client_Adapter.cpp \
+.obj/IFR_Client_Adapter.o .obj/IFR_Client_Adapter.SO .shobj/IFR_Client_Adapter.o .shobj/IFR_Client_Adapter.SO: IFR_Client_Adapter.cpp \
   IFR_Client_Adapter.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -34610,8 +33223,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -34625,7 +33237,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/ORBInitInfo.o .obj/ORBInitInfo.so .shobj/ORBInitInfo.o .shobj/ORBInitInfo.so: ORBInitInfo.cpp ORBInitInfo.h \
+.obj/ORBInitInfo.o .obj/ORBInitInfo.SO .shobj/ORBInitInfo.o .shobj/ORBInitInfo.SO: ORBInitInfo.cpp ORBInitInfo.h \
   $(ACE_ROOT)/ace/pre.h corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -34645,9 +33257,7 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i PortableInterceptorC.h \
-  CurrentC.h Object.h \
-  Policy_ForwardC.h \
-  Sequence.h \
+  PI_ForwardC.h OctetSeqC.h Sequence.h \
   corbafwd.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -34666,8 +33276,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -34777,57 +33386,48 @@ realclean:
   Typecode.i \
   Environment.h \
   Environment.i \
-  CDR.h \
+  Seq_Var_T.h \
+  Seq_Var_T.inl \
+  Seq_Var_T.cpp \
+  Seq_Out_T.h \
+  Seq_Out_T.inl \
+  Seq_Out_T.cpp OctetSeqC.i StringSeqC.h \
+  Sequence.h StringSeqC.i PI_ForwardC.i DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  Object.h \
+  Policy_ForwardC.h \
+  CDR.h \
   CDR.i \
   Objref_VarOut_T.h \
   varbase.h \
   Objref_VarOut_T.inl \
   Objref_VarOut_T.cpp \
-  Seq_Var_T.h \
-  Seq_Var_T.inl \
-  Seq_Var_T.cpp \
-  Seq_Out_T.h \
-  Seq_Out_T.inl \
-  Seq_Out_T.cpp \
   Policy_ForwardC.i \
   Object_KeyC.h \
   Object_KeyC.i \
   IOP_IORC.h \
   OctetSeqC.h \
-  OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
-  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
-  debug.h CurrentC.i DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h \
+  debug.h DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   IOP_CodecC.h \
+  Any_Impl_T.h \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   IOP_CodecC.i IOPC.i PolicyC.h \
-  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
+  CurrentC.h CurrentC.i Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h PolicyC.i \
   PortableInterceptorC.i LocalObject.h Object.h Object_KeyC.h \
   LocalObject.i ORBInitInfo.inl ORB_Core.h ORB.h Exception.h ServicesC.h \
@@ -34861,8 +33461,8 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h IOPC.h \
+  Parser_Registry.i Service_Callbacks.h \
+  IOPC.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -34888,16 +33488,14 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.h \
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
-  CodecFactory.h
+  $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i CodecFactory.h
 
-.obj/ORBInitializer_Registry.o .obj/ORBInitializer_Registry.so .shobj/ORBInitializer_Registry.o .shobj/ORBInitializer_Registry.so: ORBInitializer_Registry.cpp \
+.obj/ORBInitializer_Registry.o .obj/ORBInitializer_Registry.SO .shobj/ORBInitializer_Registry.o .shobj/ORBInitializer_Registry.SO: ORBInitializer_Registry.cpp \
   ORBInitializer_Registry.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl PortableInterceptorC.h \
-  CurrentC.h Object.h \
-  Policy_ForwardC.h \
+  PI_ForwardC.h TAO_Export.h OctetSeqC.h \
   Sequence.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -34909,7 +33507,6 @@ realclean:
   orbconf.h \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h \
-  TAO_Export.h \
   $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
@@ -34932,8 +33529,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -35043,57 +33639,48 @@ realclean:
   Typecode.i \
   Environment.h \
   Environment.i \
-  CDR.h \
+  Seq_Var_T.h \
+  Seq_Var_T.inl \
+  Seq_Var_T.cpp \
+  Seq_Out_T.h \
+  Seq_Out_T.inl \
+  Seq_Out_T.cpp OctetSeqC.i StringSeqC.h \
+  Sequence.h StringSeqC.i PI_ForwardC.i DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  Object.h \
+  Policy_ForwardC.h \
+  CDR.h \
   CDR.i \
   Objref_VarOut_T.h \
   varbase.h \
   Objref_VarOut_T.inl \
   Objref_VarOut_T.cpp \
-  Seq_Var_T.h \
-  Seq_Var_T.inl \
-  Seq_Var_T.cpp \
-  Seq_Out_T.h \
-  Seq_Out_T.inl \
-  Seq_Out_T.cpp \
   Policy_ForwardC.i \
   Object_KeyC.h \
   Object_KeyC.i \
   IOP_IORC.h \
   OctetSeqC.h \
-  OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
-  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
-  debug.h CurrentC.i DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h \
+  debug.h DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   IOP_CodecC.h \
+  Any_Impl_T.h \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   IOP_CodecC.i IOPC.i PolicyC.h \
-  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
+  CurrentC.h CurrentC.i Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h PolicyC.i \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
@@ -35113,9 +33700,9 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h
 
-.obj/PolicyFactory_Registry.o .obj/PolicyFactory_Registry.so .shobj/PolicyFactory_Registry.o .shobj/PolicyFactory_Registry.so: PolicyFactory_Registry.cpp \
-  PolicyFactory_Registry.h $(ACE_ROOT)/ace/pre.h \
-  corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
+.obj/PolicyFactory_Registry.o .obj/PolicyFactory_Registry.SO .shobj/PolicyFactory_Registry.o .shobj/PolicyFactory_Registry.SO: PolicyFactory_Registry.cpp \
+  PolicyFactory_Registry.h $(ACE_ROOT)/ace/pre.h corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -35133,9 +33720,7 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i PortableInterceptorC.h \
-  CurrentC.h Object.h \
-  Policy_ForwardC.h \
-  Sequence.h \
+  PI_ForwardC.h OctetSeqC.h Sequence.h \
   corbafwd.h \
   Managed_Types.h \
   Managed_Types.i \
@@ -35154,8 +33739,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -35265,63 +33849,54 @@ realclean:
   Typecode.i \
   Environment.h \
   Environment.i \
-  CDR.h \
+  Seq_Var_T.h \
+  Seq_Var_T.inl \
+  Seq_Var_T.cpp \
+  Seq_Out_T.h \
+  Seq_Out_T.inl \
+  Seq_Out_T.cpp OctetSeqC.i StringSeqC.h \
+  Sequence.h StringSeqC.i PI_ForwardC.i DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  Object.h \
+  Policy_ForwardC.h \
+  CDR.h \
   CDR.i \
   Objref_VarOut_T.h \
   varbase.h \
   Objref_VarOut_T.inl \
   Objref_VarOut_T.cpp \
-  Seq_Var_T.h \
-  Seq_Var_T.inl \
-  Seq_Var_T.cpp \
-  Seq_Out_T.h \
-  Seq_Out_T.inl \
-  Seq_Out_T.cpp \
   Policy_ForwardC.i \
   Object_KeyC.h \
   Object_KeyC.i \
   IOP_IORC.h \
   OctetSeqC.h \
-  OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
-  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
-  debug.h CurrentC.i DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h \
+  debug.h DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   IOP_CodecC.h \
+  Any_Impl_T.h \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   IOP_CodecC.i IOPC.i PolicyC.h \
-  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
+  CurrentC.h CurrentC.i Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h PolicyC.i \
   PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp
 
-.obj/Cache_Entries.o .obj/Cache_Entries.so .shobj/Cache_Entries.o .shobj/Cache_Entries.so: Cache_Entries.cpp \
+.obj/Cache_Entries.o .obj/Cache_Entries.SO .shobj/Cache_Entries.o .shobj/Cache_Entries.SO: Cache_Entries.cpp \
   Cache_Entries.h \
   $(ACE_ROOT)/ace/pre.h \
   Transport_Descriptor_Interface.h \
@@ -35358,8 +33933,7 @@ realclean:
   Transport_Cache_Manager.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -35370,8 +33944,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -35464,7 +34037,6 @@ realclean:
   Transport_Timer.h \
   Incoming_Message_Queue.h \
   Pluggable_Messaging_Utils.h \
-  IOPC.h \
   IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
@@ -35493,37 +34065,14 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
-  Object.h \
-  Policy_ForwardC.h \
-  Objref_VarOut_T.h \
-  varbase.h \
-  Objref_VarOut_T.inl \
-  Objref_VarOut_T.cpp \
-  Policy_ForwardC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  Object.i \
-  Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
-  Marshal.h \
-  Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl \
   Synch_Refcountable.h \
@@ -35532,7 +34081,7 @@ realclean:
   Synch_Refcountable.inl \
   Transport.inl
 
-.obj/Base_Transport_Property.o .obj/Base_Transport_Property.so .shobj/Base_Transport_Property.o .shobj/Base_Transport_Property.so: Base_Transport_Property.cpp \
+.obj/Base_Transport_Property.o .obj/Base_Transport_Property.SO .shobj/Base_Transport_Property.o .shobj/Base_Transport_Property.SO: Base_Transport_Property.cpp \
   Base_Transport_Property.h \
   $(ACE_ROOT)/ace/pre.h \
   Transport_Descriptor_Interface.h \
@@ -35558,8 +34107,7 @@ realclean:
   Transport_Descriptor_Interface.inl \
   Endpoint.h \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -35570,8 +34118,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -35588,7 +34135,7 @@ realclean:
   Endpoint.i \
   Base_Transport_Property.inl
 
-.obj/Transport_Cache_Manager.o .obj/Transport_Cache_Manager.so .shobj/Transport_Cache_Manager.o .shobj/Transport_Cache_Manager.so: Transport_Cache_Manager.cpp \
+.obj/Transport_Cache_Manager.o .obj/Transport_Cache_Manager.SO .shobj/Transport_Cache_Manager.o .shobj/Transport_Cache_Manager.SO: Transport_Cache_Manager.cpp \
   Transport_Cache_Manager.h \
   $(ACE_ROOT)/ace/pre.h \
   Cache_Entries.h \
@@ -35618,8 +34165,7 @@ realclean:
   Cache_Entries.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -35630,8 +34176,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -35731,7 +34276,6 @@ realclean:
   Transport_Timer.h \
   Incoming_Message_Queue.h \
   Pluggable_Messaging_Utils.h \
-  IOPC.h \
   IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
@@ -35760,37 +34304,14 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
-  Object.h \
-  Policy_ForwardC.h \
-  Objref_VarOut_T.h \
-  varbase.h \
-  Objref_VarOut_T.inl \
-  Objref_VarOut_T.cpp \
-  Policy_ForwardC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  Object.i \
-  Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
-  Marshal.h \
-  Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl \
   Synch_Refcountable.h \
@@ -35798,6 +34319,7 @@ realclean:
   $(ACE_ROOT)/ace/Refcountable.inl \
   Synch_Refcountable.inl \
   Transport.inl \
+  debug.h \
   ORB_Core.h \
   ORB.h \
   ServicesC.h \
@@ -35809,6 +34331,23 @@ realclean:
   objectid.h \
   PolicyC.h \
   CurrentC.h \
+  Object.h \
+  Policy_ForwardC.h \
+  Objref_VarOut_T.h \
+  varbase.h \
+  Objref_VarOut_T.inl \
+  Objref_VarOut_T.cpp \
+  Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i \
+  Any_Impl_T.h \
+  Any.h \
+  Any.i \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
+  Marshal.h \
+  Marshal.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
@@ -35844,22 +34383,21 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
+  IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i \
+  IOPC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -35905,8 +34443,8 @@ realclean:
   Condition.inl \
   Condition.cpp
 
-.obj/Cleanup_Func_Registry.o .obj/Cleanup_Func_Registry.so .shobj/Cleanup_Func_Registry.o .shobj/Cleanup_Func_Registry.so: Cleanup_Func_Registry.cpp \
-  Cleanup_Func_Registry.h $(ACE_ROOT)/ace/pre.h \
+.obj/Cleanup_Func_Registry.o .obj/Cleanup_Func_Registry.SO .shobj/Cleanup_Func_Registry.o .shobj/Cleanup_Func_Registry.SO: Cleanup_Func_Registry.cpp \
+  Cleanup_Func_Registry.h $(ACE_ROOT)/ace/pre.h TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -35932,8 +34470,7 @@ realclean:
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp Cleanup_Func_Registry.inl \
@@ -35942,7 +34479,7 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl
 
-.obj/Transport_Descriptor_Interface.o .obj/Transport_Descriptor_Interface.so .shobj/Transport_Descriptor_Interface.o .shobj/Transport_Descriptor_Interface.so: Transport_Descriptor_Interface.cpp \
+.obj/Transport_Descriptor_Interface.o .obj/Transport_Descriptor_Interface.SO .shobj/Transport_Descriptor_Interface.o .shobj/Transport_Descriptor_Interface.SO: Transport_Descriptor_Interface.cpp \
   Transport_Descriptor_Interface.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -35967,8 +34504,7 @@ realclean:
   Transport_Descriptor_Interface.inl \
   Endpoint.h \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -35979,8 +34515,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -35996,7 +34531,7 @@ realclean:
   $(ACE_ROOT)/ace/Log_Priority.h \
   Endpoint.i
 
-.obj/Object_Ref_Table.o .obj/Object_Ref_Table.so .shobj/Object_Ref_Table.o .shobj/Object_Ref_Table.so: Object_Ref_Table.cpp Object_Ref_Table.h \
+.obj/Object_Ref_Table.o .obj/Object_Ref_Table.SO .shobj/Object_Ref_Table.o .shobj/Object_Ref_Table.SO: Object_Ref_Table.cpp Object_Ref_Table.h \
   $(ACE_ROOT)/ace/pre.h corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -36016,8 +34551,7 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -36028,8 +34562,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
@@ -36167,21 +34700,20 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
-  IOP_IORC.i \
-  Object.i ORB.h Exception.h \
-  ServicesC.h VarOut_T.h \
+  VarOut_T.h \
   VarOut_T.inl \
-  VarOut_T.cpp ServicesC.i \
-  CORBA_String.h CORBA_String.inl \
-  ObjectIdListC.h ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
+  VarOut_T.cpp \
+  IOP_IORC.i \
+  Object.i ORB.h Exception.h ServicesC.h \
+  ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
   Object.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h CurrentC.i Policy_ForwardC.h \
@@ -36189,7 +34721,7 @@ realclean:
   Object_Proxy_Impl.h PolicyC.i \
   ORB.i Environment.h debug.h
 
-.obj/BiDir_Adapter.o .obj/BiDir_Adapter.so .shobj/BiDir_Adapter.o .shobj/BiDir_Adapter.so: BiDir_Adapter.cpp \
+.obj/BiDir_Adapter.o .obj/BiDir_Adapter.SO .shobj/BiDir_Adapter.o .shobj/BiDir_Adapter.SO: BiDir_Adapter.cpp \
   BiDir_Adapter.h \
   $(ACE_ROOT)/ace/pre.h \
   Exception.h \
@@ -36230,8 +34762,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -36243,7 +34774,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/CodecFactory.o .obj/CodecFactory.so .shobj/CodecFactory.o .shobj/CodecFactory.so: CodecFactory.cpp CodecFactory.h \
+.obj/CodecFactory.o .obj/CodecFactory.SO .shobj/CodecFactory.o .shobj/CodecFactory.SO: CodecFactory.cpp CodecFactory.h \
   $(ACE_ROOT)/ace/pre.h TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -36284,8 +34815,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -36402,13 +34932,16 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -36421,26 +34954,23 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp IOPC.i LocalObject.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
+  IOP_CodecC.i IOPC.i LocalObject.h \
   Object.h Object_KeyC.h LocalObject.i CDR_Encaps_Codec.h
 
-.obj/CodecFactory_ORBInitializer.o .obj/CodecFactory_ORBInitializer.so .shobj/CodecFactory_ORBInitializer.o .shobj/CodecFactory_ORBInitializer.so: CodecFactory_ORBInitializer.cpp \
+.obj/CodecFactory_ORBInitializer.o .obj/CodecFactory_ORBInitializer.SO .shobj/CodecFactory_ORBInitializer.o .shobj/CodecFactory_ORBInitializer.SO: CodecFactory_ORBInitializer.cpp \
   CodecFactory_ORBInitializer.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl PortableInterceptorC.h \
-  CurrentC.h Object.h \
-  Policy_ForwardC.h \
+  PI_ForwardC.h TAO_Export.h OctetSeqC.h \
   Sequence.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -36452,7 +34982,6 @@ realclean:
   orbconf.h \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h \
-  TAO_Export.h \
   $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
@@ -36475,8 +35004,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -36586,62 +35114,53 @@ realclean:
   Typecode.i \
   Environment.h \
   Environment.i \
-  CDR.h \
+  Seq_Var_T.h \
+  Seq_Var_T.inl \
+  Seq_Var_T.cpp \
+  Seq_Out_T.h \
+  Seq_Out_T.inl \
+  Seq_Out_T.cpp OctetSeqC.i StringSeqC.h \
+  Sequence.h StringSeqC.i PI_ForwardC.i DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  Object.h \
+  Policy_ForwardC.h \
+  CDR.h \
   CDR.i \
   Objref_VarOut_T.h \
   varbase.h \
   Objref_VarOut_T.inl \
   Objref_VarOut_T.cpp \
-  Seq_Var_T.h \
-  Seq_Var_T.inl \
-  Seq_Var_T.cpp \
-  Seq_Out_T.h \
-  Seq_Out_T.inl \
-  Seq_Out_T.cpp \
   Policy_ForwardC.i \
   Object_KeyC.h \
   Object_KeyC.i \
   IOP_IORC.h \
   OctetSeqC.h \
-  OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
-  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
-  debug.h CurrentC.i DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h \
+  debug.h DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
   IOP_CodecC.h \
+  Any_Impl_T.h \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   IOP_CodecC.i IOPC.i PolicyC.h \
-  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
+  CurrentC.h CurrentC.i Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h PolicyC.i \
   PortableInterceptorC.i LocalObject.h Object.h Object_KeyC.h \
   LocalObject.i CodecFactory.h ORBInitInfo.h corbafwd.h ORBInitInfo.inl
 
-.obj/CDR_Encaps_Codec.o .obj/CDR_Encaps_Codec.so .shobj/CDR_Encaps_Codec.o .shobj/CDR_Encaps_Codec.so: CDR_Encaps_Codec.cpp CDR.h \
+.obj/CDR_Encaps_Codec.o .obj/CDR_Encaps_Codec.SO .shobj/CDR_Encaps_Codec.o .shobj/CDR_Encaps_Codec.SO: CDR_Encaps_Codec.cpp CDR.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -36683,10 +35202,10 @@ realclean:
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i OctetSeqC.h Sequence.h \
+  CDR.i OctetSeqC.h \
+  Sequence.h \
   Managed_Types.h \
   Managed_Types.i \
   $(ACE_ROOT)/ace/Log_Msg.h \
@@ -36695,7 +35214,6 @@ realclean:
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   Sequence.i \
   Sequence_T.h \
-  Sequence.h \
   Sequence_T.i \
   Sequence_T.cpp \
   Typecode.h \
@@ -36812,26 +35330,27 @@ realclean:
   Object_KeyC.i \
   IOP_IORC.h \
   OctetSeqC.h \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
   Any.i Typecode.h Marshal.h \
   Marshal.i CDR_Encaps_Codec.h \
   TAO_Export.h IOPC.h IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp IOPC.i LocalObject.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
+  IOP_CodecC.i IOPC.i LocalObject.h \
   Object.h Object_KeyC.h LocalObject.i
 
-.obj/Endpoint_Selector_Factory.o .obj/Endpoint_Selector_Factory.so .shobj/Endpoint_Selector_Factory.o .shobj/Endpoint_Selector_Factory.so: Endpoint_Selector_Factory.cpp \
+.obj/Endpoint_Selector_Factory.o .obj/Endpoint_Selector_Factory.SO .shobj/Endpoint_Selector_Factory.o .shobj/Endpoint_Selector_Factory.SO: Endpoint_Selector_Factory.cpp \
   Endpoint_Selector_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -36866,8 +35385,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -36881,13 +35399,13 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/Flushing_Strategy.o .obj/Flushing_Strategy.so .shobj/Flushing_Strategy.o .shobj/Flushing_Strategy.so: Flushing_Strategy.cpp Flushing_Strategy.h \
+.obj/Flushing_Strategy.o .obj/Flushing_Strategy.SO .shobj/Flushing_Strategy.o .shobj/Flushing_Strategy.SO: Flushing_Strategy.cpp Flushing_Strategy.h \
   $(ACE_ROOT)/ace/pre.h TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl
 
-.obj/Block_Flushing_Strategy.o .obj/Block_Flushing_Strategy.so .shobj/Block_Flushing_Strategy.o .shobj/Block_Flushing_Strategy.so: Block_Flushing_Strategy.cpp \
+.obj/Block_Flushing_Strategy.o .obj/Block_Flushing_Strategy.SO .shobj/Block_Flushing_Strategy.o .shobj/Block_Flushing_Strategy.SO: Block_Flushing_Strategy.cpp \
   Block_Flushing_Strategy.h $(ACE_ROOT)/ace/pre.h \
   Flushing_Strategy.h TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
@@ -36924,8 +35442,7 @@ realclean:
   Cache_Entries.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -36936,8 +35453,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -37028,7 +35544,6 @@ realclean:
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Transport_Cache_Manager.inl \
   Transport_Timer.h Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
-  IOPC.h \
   IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
@@ -37058,37 +35573,14 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
-  Object.h \
-  Policy_ForwardC.h \
-  Objref_VarOut_T.h \
-  varbase.h \
-  Objref_VarOut_T.inl \
-  Objref_VarOut_T.cpp \
-  Policy_ForwardC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  Object.i \
-  Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
-  Marshal.h \
-  Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl Synch_Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.h \
@@ -37100,7 +35592,7 @@ realclean:
   LF_Invocation_Event.inl \
   Queued_Message.inl
 
-.obj/Reactive_Flushing_Strategy.o .obj/Reactive_Flushing_Strategy.so .shobj/Reactive_Flushing_Strategy.o .shobj/Reactive_Flushing_Strategy.so: Reactive_Flushing_Strategy.cpp \
+.obj/Reactive_Flushing_Strategy.o .obj/Reactive_Flushing_Strategy.SO .shobj/Reactive_Flushing_Strategy.o .shobj/Reactive_Flushing_Strategy.SO: Reactive_Flushing_Strategy.cpp \
   Reactive_Flushing_Strategy.h $(ACE_ROOT)/ace/pre.h \
   Flushing_Strategy.h TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
@@ -37137,8 +35629,7 @@ realclean:
   Cache_Entries.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -37149,8 +35640,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -37241,7 +35731,6 @@ realclean:
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Transport_Cache_Manager.inl \
   Transport_Timer.h Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
-  IOPC.h \
   IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
@@ -37271,14 +35760,21 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
+  Transport.inl ORB_Core.h ORB.h ServicesC.h ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
   Objref_VarOut_T.h \
@@ -37289,27 +35785,15 @@ realclean:
   Object_KeyC.h \
   Object_KeyC.i \
   Object.i \
+  Any_Impl_T.h \
+  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl Synch_Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
-  Transport.inl ORB_Core.h ORB.h ServicesC.h ServicesC.i CORBA_String.h \
-  CORBA_String.inl ObjectIdListC.h \
-  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h CurrentC.i \
-  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
+  debug.h CurrentC.i Policy_ForwardC.h \
+  Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h PolicyC.i \
   ORB.i Environment.h Policy_Manager.h \
   Policy_Set.h \
@@ -37335,25 +35819,19 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
+  OctetSeqC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i IOPC.i \
+  PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
+  Parser_Registry.i Service_Callbacks.h \
+  IOPC.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -37380,14 +35858,13 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
-  Queued_Message.h \
-  LF_Invocation_Event.h \
+  Queued_Message.h LF_Invocation_Event.h \
   LF_Event.h \
   LF_Event.inl \
   LF_Invocation_Event.inl \
   Queued_Message.inl debug.h
 
-.obj/Connect_Strategy.o .obj/Connect_Strategy.so .shobj/Connect_Strategy.o .shobj/Connect_Strategy.so: Connect_Strategy.cpp Connect_Strategy.h \
+.obj/Connect_Strategy.o .obj/Connect_Strategy.SO .shobj/Connect_Strategy.o .shobj/Connect_Strategy.SO: Connect_Strategy.cpp Connect_Strategy.h \
   $(ACE_ROOT)/ace/pre.h TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -37395,7 +35872,7 @@ realclean:
   LF_CH_Event.h LF_Event.h LF_Event.inl LF_Invocation_Event.inl \
   Connection_Handler.inl
 
-.obj/Blocked_Connect_Strategy.o .obj/Blocked_Connect_Strategy.so .shobj/Blocked_Connect_Strategy.o .shobj/Blocked_Connect_Strategy.so: Blocked_Connect_Strategy.cpp \
+.obj/Blocked_Connect_Strategy.o .obj/Blocked_Connect_Strategy.SO .shobj/Blocked_Connect_Strategy.o .shobj/Blocked_Connect_Strategy.SO: Blocked_Connect_Strategy.cpp \
   Blocked_Connect_Strategy.h $(ACE_ROOT)/ace/pre.h \
   Connect_Strategy.h TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
@@ -37410,7 +35887,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Synch_Options.i
 
-.obj/Reactive_Connect_Strategy.o .obj/Reactive_Connect_Strategy.so .shobj/Reactive_Connect_Strategy.o .shobj/Reactive_Connect_Strategy.so: Reactive_Connect_Strategy.cpp \
+.obj/Reactive_Connect_Strategy.o .obj/Reactive_Connect_Strategy.SO .shobj/Reactive_Connect_Strategy.o .shobj/Reactive_Connect_Strategy.SO: Reactive_Connect_Strategy.cpp \
   Reactive_Connect_Strategy.h $(ACE_ROOT)/ace/pre.h \
   Connect_Strategy.h TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
@@ -37449,8 +35926,7 @@ realclean:
   Cache_Entries.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -37461,8 +35937,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -37553,7 +36028,6 @@ realclean:
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Transport_Cache_Manager.inl \
   Transport_Timer.h Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
-  IOPC.h \
   IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
@@ -37583,14 +36057,21 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
+  Transport.inl ORB_Core.h ORB.h ServicesC.h ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
   Objref_VarOut_T.h \
@@ -37601,27 +36082,15 @@ realclean:
   Object_KeyC.h \
   Object_KeyC.i \
   Object.i \
+  Any_Impl_T.h \
+  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl Synch_Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
-  Transport.inl ORB_Core.h ORB.h ServicesC.h ServicesC.i CORBA_String.h \
-  CORBA_String.inl ObjectIdListC.h \
-  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h CurrentC.i \
-  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
+  debug.h CurrentC.i Policy_ForwardC.h \
+  Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h PolicyC.i \
   ORB.i Environment.h Policy_Manager.h \
   Policy_Set.h \
@@ -37647,25 +36116,19 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
+  OctetSeqC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i IOPC.i \
+  PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
+  Parser_Registry.i Service_Callbacks.h \
+  IOPC.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -37695,7 +36158,7 @@ realclean:
   $(ACE_ROOT)/ace/Synch_Options.h \
   $(ACE_ROOT)/ace/Synch_Options.i
 
-.obj/LF_Connect_Strategy.o .obj/LF_Connect_Strategy.so .shobj/LF_Connect_Strategy.o .shobj/LF_Connect_Strategy.so: LF_Connect_Strategy.cpp LF_Connect_Strategy.h \
+.obj/LF_Connect_Strategy.o .obj/LF_Connect_Strategy.SO .shobj/LF_Connect_Strategy.o .shobj/LF_Connect_Strategy.SO: LF_Connect_Strategy.cpp LF_Connect_Strategy.h \
   $(ACE_ROOT)/ace/pre.h Connect_Strategy.h TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -37733,8 +36196,7 @@ realclean:
   Cache_Entries.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -37745,8 +36207,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -37837,7 +36298,6 @@ realclean:
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Transport_Cache_Manager.inl \
   Transport_Timer.h Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
-  IOPC.h \
   IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
@@ -37867,14 +36327,21 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
+  Pluggable_Messaging_Utils.i \
+  Incoming_Message_Queue.inl Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
+  Transport.inl ORB_Core.h ORB.h ServicesC.h ServicesC.i CORBA_String.h \
+  CORBA_String.inl ObjectIdListC.h \
+  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
   Objref_VarOut_T.h \
@@ -37885,27 +36352,15 @@ realclean:
   Object_KeyC.h \
   Object_KeyC.i \
   Object.i \
+  Any_Impl_T.h \
+  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  Incoming_Message_Queue.inl Synch_Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
-  Transport.inl ORB_Core.h ORB.h ServicesC.h ServicesC.i CORBA_String.h \
-  CORBA_String.inl ObjectIdListC.h \
-  ObjectIdListC.i objectid.h PolicyC.h CurrentC.h CurrentC.i \
-  Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
+  debug.h CurrentC.i Policy_ForwardC.h \
+  Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h PolicyC.i \
   ORB.i Environment.h Policy_Manager.h \
   Policy_Set.h \
@@ -37931,25 +36386,19 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
+  OctetSeqC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp DynamicC.i \
+  Messaging_SyncScopeC.h Messaging_SyncScopeC.i IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i IOPC.i \
+  PortableInterceptorC.i $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
+  Parser_Registry.i Service_Callbacks.h \
+  IOPC.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -37990,7 +36439,7 @@ realclean:
   $(ACE_ROOT)/ace/Synch_Options.h \
   $(ACE_ROOT)/ace/Synch_Options.i
 
-.obj/Queued_Message.o .obj/Queued_Message.so .shobj/Queued_Message.o .shobj/Queued_Message.so: Queued_Message.cpp Queued_Message.h \
+.obj/Queued_Message.o .obj/Queued_Message.SO .shobj/Queued_Message.o .shobj/Queued_Message.SO: Queued_Message.cpp Queued_Message.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -38017,7 +36466,7 @@ realclean:
   LF_Invocation_Event.inl \
   Queued_Message.inl
 
-.obj/Synch_Queued_Message.o .obj/Synch_Queued_Message.so .shobj/Synch_Queued_Message.o .shobj/Synch_Queued_Message.so: Synch_Queued_Message.cpp Synch_Queued_Message.h \
+.obj/Synch_Queued_Message.o .obj/Synch_Queued_Message.SO .shobj/Synch_Queued_Message.o .shobj/Synch_Queued_Message.SO: Synch_Queued_Message.cpp Synch_Queued_Message.h \
   $(ACE_ROOT)/ace/pre.h Queued_Message.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -38054,8 +36503,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
@@ -38116,7 +36564,7 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp
 
-.obj/Asynch_Queued_Message.o .obj/Asynch_Queued_Message.so .shobj/Asynch_Queued_Message.o .shobj/Asynch_Queued_Message.so: Asynch_Queued_Message.cpp \
+.obj/Asynch_Queued_Message.o .obj/Asynch_Queued_Message.SO .shobj/Asynch_Queued_Message.o .shobj/Asynch_Queued_Message.SO: Asynch_Queued_Message.cpp \
   Asynch_Queued_Message.h $(ACE_ROOT)/ace/pre.h \
   Queued_Message.h corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -38153,8 +36601,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
@@ -38215,7 +36662,7 @@ realclean:
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp
 
-.obj/Transport_Timer.o .obj/Transport_Timer.so .shobj/Transport_Timer.o .shobj/Transport_Timer.so: Transport_Timer.cpp Transport_Timer.h \
+.obj/Transport_Timer.o .obj/Transport_Timer.SO .shobj/Transport_Timer.o .shobj/Transport_Timer.SO: Transport_Timer.cpp Transport_Timer.h \
   $(ACE_ROOT)/ace/pre.h TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -38242,8 +36689,7 @@ realclean:
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Event_Handler.i Transport.h corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/CDR_Base.inl \
@@ -38355,7 +36801,6 @@ realclean:
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Transport_Cache_Manager.inl \
   Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \
-  IOPC.h \
   IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
@@ -38385,44 +36830,21 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
-  Object.h \
-  Policy_ForwardC.h \
-  Objref_VarOut_T.h \
-  varbase.h \
-  Objref_VarOut_T.inl \
-  Objref_VarOut_T.cpp \
-  Policy_ForwardC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  Object.i \
-  Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
-  Marshal.h \
-  Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl Synch_Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
   Transport.inl
 
-.obj/Connection_Purging_Strategy.o .obj/Connection_Purging_Strategy.so .shobj/Connection_Purging_Strategy.o .shobj/Connection_Purging_Strategy.so: Connection_Purging_Strategy.cpp \
+.obj/Connection_Purging_Strategy.o .obj/Connection_Purging_Strategy.SO .shobj/Connection_Purging_Strategy.o .shobj/Connection_Purging_Strategy.SO: Connection_Purging_Strategy.cpp \
   Connection_Purging_Strategy.h \
   $(ACE_ROOT)/ace/pre.h \
   TAO_Export.h \
@@ -38431,7 +36853,7 @@ realclean:
   $(ACE_ROOT)/ace/ace_wchar.inl \
   Connection_Purging_Strategy.inl
 
-.obj/LRU_Connection_Purging_Strategy.o .obj/LRU_Connection_Purging_Strategy.so .shobj/LRU_Connection_Purging_Strategy.o .shobj/LRU_Connection_Purging_Strategy.so: LRU_Connection_Purging_Strategy.cpp \
+.obj/LRU_Connection_Purging_Strategy.o .obj/LRU_Connection_Purging_Strategy.SO .shobj/LRU_Connection_Purging_Strategy.o .shobj/LRU_Connection_Purging_Strategy.SO: LRU_Connection_Purging_Strategy.cpp \
   LRU_Connection_Purging_Strategy.h $(ACE_ROOT)/ace/pre.h \
   Connection_Purging_Strategy.h \
   TAO_Export.h \
@@ -38469,8 +36891,7 @@ realclean:
   Cache_Entries.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -38481,8 +36902,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -38573,8 +36993,7 @@ realclean:
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   Transport_Cache_Manager.inl \
   Transport_Timer.h TAO_Export.h Incoming_Message_Queue.h \
-  Pluggable_Messaging_Utils.h IOPC.h \
-  IOP_IORC.h \
+  Pluggable_Messaging_Utils.h IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
@@ -38603,44 +37022,21 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
-  Object.h \
-  Policy_ForwardC.h \
-  Objref_VarOut_T.h \
-  varbase.h \
-  Objref_VarOut_T.inl \
-  Objref_VarOut_T.cpp \
-  Policy_ForwardC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  Object.i \
-  Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
-  Marshal.h \
-  Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
   Pluggable_Messaging_Utils.i \
   Incoming_Message_Queue.inl Synch_Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
   Transport.inl
 
-.obj/Policy_Set.o .obj/Policy_Set.so .shobj/Policy_Set.o .shobj/Policy_Set.so: Policy_Set.cpp \
+.obj/Policy_Set.o .obj/Policy_Set.SO .shobj/Policy_Set.o .shobj/Policy_Set.SO: Policy_Set.cpp \
   Policy_Set.h \
   $(ACE_ROOT)/ace/pre.h \
   PolicyC.h \
@@ -38684,8 +37080,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -38815,15 +37210,16 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -38833,7 +37229,7 @@ realclean:
   PolicyC.i \
   Policy_Set.i
 
-.obj/Default_Endpoint_Selector_Factory.o .obj/Default_Endpoint_Selector_Factory.so .shobj/Default_Endpoint_Selector_Factory.o .shobj/Default_Endpoint_Selector_Factory.so:  \
+.obj/Default_Endpoint_Selector_Factory.o .obj/Default_Endpoint_Selector_Factory.SO .shobj/Default_Endpoint_Selector_Factory.o .shobj/Default_Endpoint_Selector_Factory.SO:  \
  Default_Endpoint_Selector_Factory.cpp \
   Default_Endpoint_Selector_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -38870,8 +37266,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -38964,7 +37359,7 @@ realclean:
   Invocation_Endpoint_Selectors.h \
   Invocation_Endpoint_Selectors.i
 
-.obj/Thread_Lane_Resources.o .obj/Thread_Lane_Resources.so .shobj/Thread_Lane_Resources.o .shobj/Thread_Lane_Resources.so: Thread_Lane_Resources.cpp \
+.obj/Thread_Lane_Resources.o .obj/Thread_Lane_Resources.SO .shobj/Thread_Lane_Resources.o .shobj/Thread_Lane_Resources.SO: Thread_Lane_Resources.cpp \
   Thread_Lane_Resources.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -38987,8 +37382,7 @@ realclean:
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -38999,8 +37393,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -39154,13 +37547,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -39199,20 +37590,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -39278,12 +37664,11 @@ realclean:
   $(ACE_ROOT)/ace/Intrusive_List.h \
   $(ACE_ROOT)/ace/Intrusive_List.inl \
   $(ACE_ROOT)/ace/Intrusive_List.cpp \
-  Leader_Follower.i \
-  Connector_Registry.h corbafwd.h Endpoint.h \
-  Endpoint.i \
+  Leader_Follower.i Connector_Registry.h \
+  corbafwd.h Endpoint.h Endpoint.i \
   Connector_Registry.i
 
-.obj/Thread_Lane_Resources_Manager.o .obj/Thread_Lane_Resources_Manager.so .shobj/Thread_Lane_Resources_Manager.o .shobj/Thread_Lane_Resources_Manager.so: Thread_Lane_Resources_Manager.cpp \
+.obj/Thread_Lane_Resources_Manager.o .obj/Thread_Lane_Resources_Manager.SO .shobj/Thread_Lane_Resources_Manager.o .shobj/Thread_Lane_Resources_Manager.SO: Thread_Lane_Resources_Manager.cpp \
   Thread_Lane_Resources_Manager.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -39320,8 +37705,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -39484,13 +37868,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -39524,20 +37906,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -39595,7 +37972,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/Default_Thread_Lane_Resources_Manager.o .obj/Default_Thread_Lane_Resources_Manager.so .shobj/Default_Thread_Lane_Resources_Manager.o .shobj/Default_Thread_Lane_Resources_Manager.so:  \
+.obj/Default_Thread_Lane_Resources_Manager.o .obj/Default_Thread_Lane_Resources_Manager.SO .shobj/Default_Thread_Lane_Resources_Manager.o .shobj/Default_Thread_Lane_Resources_Manager.SO:  \
  Default_Thread_Lane_Resources_Manager.cpp \
   Default_Thread_Lane_Resources_Manager.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -39634,8 +38011,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -39793,13 +38169,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -39833,20 +38207,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -39908,7 +38277,7 @@ realclean:
   $(ACE_ROOT)/ace/Intrusive_List.cpp \
   Leader_Follower.i
 
-.obj/Default_Stub_Factory.o .obj/Default_Stub_Factory.so .shobj/Default_Stub_Factory.o .shobj/Default_Stub_Factory.so: Default_Stub_Factory.cpp Default_Stub_Factory.h \
+.obj/Default_Stub_Factory.o .obj/Default_Stub_Factory.SO .shobj/Default_Stub_Factory.o .shobj/Default_Stub_Factory.SO: Default_Stub_Factory.cpp Default_Stub_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
   Stub_Factory.h \
   corbafwd.h \
@@ -39943,8 +38312,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -40089,15 +38457,16 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -40108,9 +38477,6 @@ realclean:
   MProfile.i \
   ORB.h \
   ServicesC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
@@ -40144,20 +38510,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -40207,7 +38568,7 @@ realclean:
   ORB_Core_Auto_Ptr.inl \
   Stub.i
 
-.obj/Request_Dispatcher.o .obj/Request_Dispatcher.so .shobj/Request_Dispatcher.o .shobj/Request_Dispatcher.so: Request_Dispatcher.cpp Request_Dispatcher.h \
+.obj/Request_Dispatcher.o .obj/Request_Dispatcher.SO .shobj/Request_Dispatcher.o .shobj/Request_Dispatcher.SO: Request_Dispatcher.cpp Request_Dispatcher.h \
   $(ACE_ROOT)/ace/pre.h \
   Object_KeyC.h \
   corbafwd.h \
@@ -40254,8 +38615,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -40369,13 +38729,16 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -40386,39 +38749,26 @@ realclean:
   Policy_ForwardC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i TAO_Server_Request.h \
-  corbafwd.h Tagged_Profile.h GIOPC.h \
+  IOPC.i TAO_Server_Request.h corbafwd.h \
+  Tagged_Profile.h GIOPC.h \
   GIOPC.i \
   Tagged_Profile.i OctetSeqC.h \
-  Service_Context.h \
-  Service_Context.inl Object.h \
-  PICurrent.h $(ACE_ROOT)/ace/Array_Base.h \
+  Service_Context.h Service_Context.inl \
+  Object.h PICurrent.h $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp PortableInterceptorC.h \
-  CurrentC.h CurrentC.i DynamicC.h StringSeqC.h Sequence.h StringSeqC.i \
-  DynamicC.i ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h PolicyC.h Policy_ForwardC.h \
+  PI_ForwardC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h DynamicC.i Messaging_SyncScopeC.h Messaging_SyncScopeC.i \
+  IOPC.h PolicyC.h CurrentC.h CurrentC.i Policy_ForwardC.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h PolicyC.i \
   PortableInterceptorC.i LocalObject.h Object_KeyC.h LocalObject.i \
@@ -40453,8 +38803,7 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
+  Parser_Registry.i Service_Callbacks.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -40479,8 +38828,54 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i
 
-.obj/ServicesC.o .obj/ServicesC.so .shobj/ServicesC.o .shobj/ServicesC.so: ServicesC.cpp ServicesC.h \
+.obj/Valuetype_Adapter.o .obj/Valuetype_Adapter.SO .shobj/Valuetype_Adapter.o .shobj/Valuetype_Adapter.SO: Valuetype_Adapter.cpp \
+  Valuetype_Adapter.h \
   $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  orbconf.h \
+  TAO_Export.h \
+  corbafwd.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.h \
+  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.cpp
+
+.obj/ServicesC.o .obj/ServicesC.SO .shobj/ServicesC.o .shobj/ServicesC.SO: ServicesC.cpp ServicesC.h $(ACE_ROOT)/ace/pre.h \
   OctetSeqC.h \
   Sequence.h \
   corbafwd.h \
@@ -40519,8 +38914,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -40644,7 +39038,7 @@ realclean:
   VarOut_T.h \
   VarOut_T.inl \
   VarOut_T.cpp ServicesC.i \
-  Any_T.h \
+  Any_Dual_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -40659,10 +39053,8 @@ realclean:
   IOP_IORC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -40676,6 +39068,9 @@ realclean:
   objectid.h \
   PolicyC.h \
   CurrentC.h \
+  Any_Impl_T.h \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
@@ -40711,20 +39106,12 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -40771,7 +39158,7 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Manager.i \
   ORB_Core.i
 
-.obj/NVList.o .obj/NVList.so .shobj/NVList.o .shobj/NVList.so: NVList.cpp NVList.h \
+.obj/NVList.o .obj/NVList.SO .shobj/NVList.o .shobj/NVList.SO: NVList.cpp NVList.h \
   $(ACE_ROOT)/ace/pre.h \
   orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -40804,8 +39191,7 @@ realclean:
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
@@ -40944,15 +39330,15 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
   Any.i \
   NVList.i \
   ORB.h \
   ServicesC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
@@ -40961,11 +39347,9 @@ realclean:
   objectid.h \
   PolicyC.h \
   CurrentC.h \
-  Any_T.h \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.h \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -40977,7 +39361,7 @@ realclean:
   BoundsC.h \
   BoundsC.i
 
-.obj/Dynamic_Adapter.o .obj/Dynamic_Adapter.so .shobj/Dynamic_Adapter.o .shobj/Dynamic_Adapter.so: Dynamic_Adapter.cpp \
+.obj/Dynamic_Adapter.o .obj/Dynamic_Adapter.SO .shobj/Dynamic_Adapter.o .shobj/Dynamic_Adapter.SO: Dynamic_Adapter.cpp \
   Dynamic_Adapter.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -41012,8 +39396,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -41171,13 +39554,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -41211,20 +39592,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -41275,7 +39651,7 @@ realclean:
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/Policy_Manager.o .obj/Policy_Manager.so .shobj/Policy_Manager.o .shobj/Policy_Manager.so: Policy_Manager.cpp \
+.obj/Policy_Manager.o .obj/Policy_Manager.SO .shobj/Policy_Manager.o .shobj/Policy_Manager.SO: Policy_Manager.cpp \
   Policy_Manager.h \
   $(ACE_ROOT)/ace/pre.h \
   orbconf.h \
@@ -41320,8 +39696,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -41451,15 +39826,16 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -41474,9 +39850,6 @@ realclean:
   ORB_Core.h \
   ORB.h \
   ServicesC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   ServicesC.i \
   CORBA_String.h \
   CORBA_String.inl \
@@ -41508,20 +39881,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -41574,7 +39942,7 @@ realclean:
   TAOC.i \
   Buffering_Constraint_Policy.i
 
-.obj/Buffering_Constraint_Policy.o .obj/Buffering_Constraint_Policy.so .shobj/Buffering_Constraint_Policy.o .shobj/Buffering_Constraint_Policy.so: Buffering_Constraint_Policy.cpp \
+.obj/Buffering_Constraint_Policy.o .obj/Buffering_Constraint_Policy.SO .shobj/Buffering_Constraint_Policy.o .shobj/Buffering_Constraint_Policy.SO: Buffering_Constraint_Policy.cpp \
   Buffering_Constraint_Policy.h \
   $(ACE_ROOT)/ace/pre.h \
   orbconf.h \
@@ -41619,8 +39987,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -41750,15 +40117,16 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -41769,17 +40137,17 @@ realclean:
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   TimeBaseC.h \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   TimeBaseC.i \
   TAOC.i \
   LocalObject.h \
   LocalObject.i \
   Buffering_Constraint_Policy.i
 
-.obj/Messaging_PolicyValueC.o .obj/Messaging_PolicyValueC.so .shobj/Messaging_PolicyValueC.o .shobj/Messaging_PolicyValueC.so: Messaging_PolicyValueC.cpp \
-  Messaging_PolicyValueC.h $(ACE_ROOT)/ace/pre.h IOPC.h \
+.obj/Messaging_PolicyValueC.o .obj/Messaging_PolicyValueC.SO .shobj/Messaging_PolicyValueC.o .shobj/Messaging_PolicyValueC.SO: Messaging_PolicyValueC.cpp \
+  Messaging_PolicyValueC.h $(ACE_ROOT)/ace/pre.h IOP_IORC.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -41799,7 +40167,6 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i \
-  IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
@@ -41819,8 +40186,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -41937,14 +40303,15 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
-  CDR.i \
-  IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
+  CDR.i IOP_IORC.i \
+  PolicyC.h \
+  CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
   Objref_VarOut_T.h \
@@ -41954,27 +40321,22 @@ realclean:
   Policy_ForwardC.i \
   Object_KeyC.h \
   Object_KeyC.i \
+  IOP_IORC.h \
   Object.i \
+  Any_Impl_T.h \
+  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp IOPC.i \
-  Messaging_PolicyValueC.i Stub.h \
-  MProfile.h \
-  PolicyC.h \
-  CurrentC.h \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
-  PolicyC.i \
+  PolicyC.i Messaging_PolicyValueC.i \
+  Stub.h \
+  MProfile.h \
   MProfile.i \
   ORB.h \
   ServicesC.h \
@@ -42016,23 +40378,21 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i \
+  IOPC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -42076,11 +40436,11 @@ realclean:
   ORB_Core_Auto_Ptr.inl \
   Stub.i
 
-.obj/Pluggable_Messaging.o .obj/Pluggable_Messaging.so .shobj/Pluggable_Messaging.o .shobj/Pluggable_Messaging.so: Pluggable_Messaging.cpp \
+.obj/Pluggable_Messaging.o .obj/Pluggable_Messaging.SO .shobj/Pluggable_Messaging.o .shobj/Pluggable_Messaging.SO: Pluggable_Messaging.cpp \
   Pluggable_Messaging.h \
   $(ACE_ROOT)/ace/pre.h \
   Pluggable_Messaging_Utils.h \
-  IOPC.h \
+  IOP_IORC.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -42100,7 +40460,6 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i \
-  IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
@@ -42120,8 +40479,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -42238,44 +40596,21 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
-  Object.h \
-  Policy_ForwardC.h \
-  Objref_VarOut_T.h \
-  varbase.h \
-  Objref_VarOut_T.inl \
-  Objref_VarOut_T.cpp \
-  Policy_ForwardC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  Object.i \
-  Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
-  Marshal.h \
-  Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
   Pluggable_Messaging_Utils.i \
   Pluggable_Messaging.i
 
-.obj/Pluggable_Messaging_Utils.o .obj/Pluggable_Messaging_Utils.so .shobj/Pluggable_Messaging_Utils.o .shobj/Pluggable_Messaging_Utils.so: Pluggable_Messaging_Utils.cpp \
+.obj/Pluggable_Messaging_Utils.o .obj/Pluggable_Messaging_Utils.SO .shobj/Pluggable_Messaging_Utils.o .shobj/Pluggable_Messaging_Utils.SO: Pluggable_Messaging_Utils.cpp \
   Pluggable_Messaging_Utils.h \
   $(ACE_ROOT)/ace/pre.h \
-  IOPC.h \
+  IOP_IORC.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -42295,7 +40630,6 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i \
-  IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
@@ -42315,8 +40649,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -42433,14 +40766,26 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
+  Pluggable_Messaging_Utils.i \
+  ORB_Core.h \
+  ORB.h \
+  ServicesC.h \
+  ServicesC.i \
+  CORBA_String.h \
+  CORBA_String.inl \
+  ObjectIdListC.h \
+  ObjectIdListC.i \
+  objectid.h \
+  PolicyC.h \
+  CurrentC.h \
   Object.h \
   Policy_ForwardC.h \
   Objref_VarOut_T.h \
@@ -42451,31 +40796,14 @@ realclean:
   Object_KeyC.h \
   Object_KeyC.i \
   Object.i \
+  Any_Impl_T.h \
+  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  ORB_Core.h \
-  ORB.h \
-  ServicesC.h \
-  ServicesC.i \
-  CORBA_String.h \
-  CORBA_String.inl \
-  ObjectIdListC.h \
-  ObjectIdListC.i \
-  objectid.h \
-  PolicyC.h \
-  CurrentC.h \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
@@ -42511,22 +40839,21 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
+  IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i \
+  IOPC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -42567,11 +40894,11 @@ realclean:
   $(ACE_ROOT)/ace/Thread_Manager.i \
   ORB_Core.i
 
-.obj/GIOP_Message_Base.o .obj/GIOP_Message_Base.so .shobj/GIOP_Message_Base.o .shobj/GIOP_Message_Base.so: GIOP_Message_Base.cpp GIOP_Message_Base.h \
+.obj/GIOP_Message_Base.o .obj/GIOP_Message_Base.SO .shobj/GIOP_Message_Base.o .shobj/GIOP_Message_Base.SO: GIOP_Message_Base.cpp GIOP_Message_Base.h \
   $(ACE_ROOT)/ace/pre.h \
   Pluggable_Messaging.h \
   Pluggable_Messaging_Utils.h \
-  IOPC.h \
+  IOP_IORC.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -42591,7 +40918,6 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i \
-  IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
@@ -42611,8 +40937,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -42729,37 +41054,14 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
-  Object.h \
-  Policy_ForwardC.h \
-  Objref_VarOut_T.h \
-  varbase.h \
-  Objref_VarOut_T.inl \
-  Objref_VarOut_T.cpp \
-  Policy_ForwardC.i \
-  Object_KeyC.h \
-  Object_KeyC.i \
-  Object.i \
-  Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
-  Marshal.h \
-  Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
   Pluggable_Messaging_Utils.i \
   Pluggable_Messaging.i \
   GIOP_Message_Generator_Parser_Impl.h \
@@ -42773,6 +41075,16 @@ realclean:
   GIOP_Message_Generator_Parser_12.inl \
   GIOP_Message_Generator_Parser_Impl.inl \
   GIOP_Utils.h \
+  Object.h \
+  Policy_ForwardC.h \
+  Objref_VarOut_T.h \
+  varbase.h \
+  Objref_VarOut_T.inl \
+  Objref_VarOut_T.cpp \
+  Policy_ForwardC.i \
+  Object_KeyC.h \
+  Object_KeyC.i \
+  Object.i \
   GIOP_Utils.i \
   GIOP_Message_State.h \
   GIOP_Message_Version.h \
@@ -42780,6 +41092,21 @@ realclean:
   GIOP_Message_State.inl \
   GIOP_Message_Base.i \
   operation_details.h corbafwd.h Service_Context.h \
+  IOPC.h \
+  IOP_CodecC.h \
+  Any_Impl_T.h \
+  Any.h \
+  Any.i \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
+  Marshal.h \
+  Marshal.i \
+  debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
+  IOP_CodecC.i \
+  IOPC.i \
   Service_Context.inl \
   target_specification.h target_specification.i operation_details.i \
   GIOP_Utils.h debug.h ORB_Core.h ORB.h Exception.h ServicesC.h \
@@ -42812,25 +41139,14 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h PortableInterceptorC.i \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
+  OctetSeqC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h DynamicC.i Messaging_SyncScopeC.h Messaging_SyncScopeC.i \
+  IOPC.h PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
+  Parser_Registry.i Service_Callbacks.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -42868,12 +41184,11 @@ realclean:
   $(ACE_ROOT)/ace/Intrusive_List.h \
   $(ACE_ROOT)/ace/Intrusive_List.inl \
   $(ACE_ROOT)/ace/Intrusive_List.cpp \
-  Leader_Follower.i \
-  TAO_Server_Request.h Tagged_Profile.h \
-  GIOPC.h \
+  Leader_Follower.i TAO_Server_Request.h \
+  Tagged_Profile.h GIOPC.h \
   GIOPC.i \
-  Tagged_Profile.i OctetSeqC.h \
-  Object.h TAO_Server_Request.i GIOP_Message_Locate_Header.h \
+  Tagged_Profile.i Object.h \
+  TAO_Server_Request.i GIOP_Message_Locate_Header.h \
   Tagged_Profile.h \
   GIOP_Message_Locate_Header.i \
   Transport.h Transport_Descriptor_Interface.h \
@@ -42893,12 +41208,12 @@ realclean:
   LF_Strategy.inl Request_Dispatcher.h \
   Codeset_Manager.h CONV_FRAMEC.h
 
-.obj/GIOP_Message_Lite.o .obj/GIOP_Message_Lite.so .shobj/GIOP_Message_Lite.o .shobj/GIOP_Message_Lite.so: GIOP_Message_Lite.cpp \
+.obj/GIOP_Message_Lite.o .obj/GIOP_Message_Lite.SO .shobj/GIOP_Message_Lite.o .shobj/GIOP_Message_Lite.SO: GIOP_Message_Lite.cpp \
   GIOP_Message_Lite.h \
   $(ACE_ROOT)/ace/pre.h \
   Pluggable_Messaging.h \
   Pluggable_Messaging_Utils.h \
-  IOPC.h \
+  IOP_IORC.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -42918,7 +41233,6 @@ realclean:
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   corbafwd.i \
-  IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
   Managed_Types.h \
@@ -42938,8 +41252,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -43056,14 +41369,17 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
+  Pluggable_Messaging_Utils.i \
+  Pluggable_Messaging.i \
+  GIOP_Utils.h \
   Object.h \
   Policy_ForwardC.h \
   Objref_VarOut_T.h \
@@ -43074,31 +41390,23 @@ realclean:
   Object_KeyC.h \
   Object_KeyC.i \
   Object.i \
-  Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
-  Marshal.h \
-  Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
-  IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  Pluggable_Messaging.i \
-  GIOP_Utils.h \
   GIOP_Utils.i \
   GIOP_Message_State.h \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
   GIOP_Message_State.inl \
   GIOP_Message_Lite.i \
+  debug.h \
   TAOC.h \
   PolicyC.h \
   CurrentC.h \
+  Any_Impl_T.h \
+  Any.h \
+  Any.i \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
+  Marshal.h \
+  Marshal.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
@@ -43106,6 +41414,9 @@ realclean:
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   TimeBaseC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   TimeBaseC.i \
   TAOC.i \
   ORB_Core.h \
@@ -43148,20 +41459,16 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
+  IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i \
+  IOPC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -43247,7 +41554,7 @@ realclean:
   Transport.inl \
   Codeset_Manager.h
 
-.obj/GIOP_Message_Generator_Parser.o .obj/GIOP_Message_Generator_Parser.so .shobj/GIOP_Message_Generator_Parser.o .shobj/GIOP_Message_Generator_Parser.so: GIOP_Message_Generator_Parser.cpp \
+.obj/GIOP_Message_Generator_Parser.o .obj/GIOP_Message_Generator_Parser.SO .shobj/GIOP_Message_Generator_Parser.o .shobj/GIOP_Message_Generator_Parser.SO: GIOP_Message_Generator_Parser.cpp \
   GIOP_Message_Generator_Parser.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
@@ -43277,7 +41584,6 @@ realclean:
   Exception.i \
   GIOP_Message_Generator_Parser.inl \
   Pluggable_Messaging_Utils.h \
-  IOPC.h \
   IOP_IORC.h \
   OctetSeqC.h \
   Sequence.h \
@@ -43296,8 +41602,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -43410,14 +41715,16 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
+  Pluggable_Messaging_Utils.i \
+  GIOP_Utils.h \
   Object.h \
   Policy_ForwardC.h \
   Objref_VarOut_T.h \
@@ -43428,28 +41735,28 @@ realclean:
   Object_KeyC.h \
   Object_KeyC.i \
   Object.i \
+  GIOP_Utils.i \
+  IOPC.h \
+  IOP_CodecC.h \
+  Any_Impl_T.h \
+  Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   IOPC.i \
-  Pluggable_Messaging_Utils.i \
-  GIOP_Utils.h \
-  GIOP_Utils.i \
   Tagged_Profile.h \
   GIOPC.h \
   GIOPC.i \
   Tagged_Profile.i
 
-.obj/GIOP_Message_Generator_Parser_10.o .obj/GIOP_Message_Generator_Parser_10.so .shobj/GIOP_Message_Generator_Parser_10.o .shobj/GIOP_Message_Generator_Parser_10.so: GIOP_Message_Generator_Parser_10.cpp \
+.obj/GIOP_Message_Generator_Parser_10.o .obj/GIOP_Message_Generator_Parser_10.SO .shobj/GIOP_Message_Generator_Parser_10.o .shobj/GIOP_Message_Generator_Parser_10.SO: GIOP_Message_Generator_Parser_10.cpp \
   GIOP_Message_Generator_Parser_10.h $(ACE_ROOT)/ace/pre.h \
   GIOP_Message_Generator_Parser.h \
   corbafwd.h \
@@ -43497,8 +41804,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -43624,28 +41930,29 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
+  GIOP_Utils.i \
+  GIOP_Message_Locate_Header.h \
+  Tagged_Profile.h \
   IOPC.h \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   IOPC.i \
-  GIOP_Utils.i \
-  GIOP_Message_Locate_Header.h \
-  Tagged_Profile.h \
   GIOPC.h \
   GIOPC.i \
   Tagged_Profile.i \
@@ -43659,31 +41966,20 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp PortableInterceptorC.h \
-  CurrentC.h CurrentC.i DynamicC.h StringSeqC.h Sequence.h StringSeqC.i \
-  DynamicC.i ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h PolicyC.h Policy_ForwardC.h \
+  PI_ForwardC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h DynamicC.i Messaging_SyncScopeC.h Messaging_SyncScopeC.i \
+  IOPC.h PolicyC.h CurrentC.h CurrentC.i Policy_ForwardC.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h PolicyC.i \
   PortableInterceptorC.i LocalObject.h Object_KeyC.h LocalObject.i \
   PICurrent.inl TAO_Server_Request.i GIOP_Message_State.h \
   GIOP_Message_Version.h \
   GIOP_Message_Version.inl \
-  GIOP_Message_State.inl \
-  CORBA_String.h CORBA_String.inl \
-  ORB_Core.h ORB.h Exception.h ServicesC.h ServicesC.i ObjectIdListC.h \
-  ObjectIdListC.i objectid.h ORB.i \
-  Environment.h Policy_Manager.h \
-  Policy_Set.h \
+  GIOP_Message_State.inl CORBA_String.h \
+  CORBA_String.inl ORB_Core.h ORB.h \
+  Exception.h ServicesC.h ServicesC.i ObjectIdListC.h ObjectIdListC.i \
+  objectid.h ORB.i Environment.h \
+  Policy_Manager.h Policy_Set.h \
   PolicyC.h \
   Policy_Set.i \
   LocalObject.h \
@@ -43709,8 +42005,7 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
+  Parser_Registry.i Service_Callbacks.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -43735,7 +42030,7 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i
 
-.obj/GIOP_Message_Generator_Parser_11.o .obj/GIOP_Message_Generator_Parser_11.so .shobj/GIOP_Message_Generator_Parser_11.o .shobj/GIOP_Message_Generator_Parser_11.so: GIOP_Message_Generator_Parser_11.cpp \
+.obj/GIOP_Message_Generator_Parser_11.o .obj/GIOP_Message_Generator_Parser_11.SO .shobj/GIOP_Message_Generator_Parser_11.o .shobj/GIOP_Message_Generator_Parser_11.SO: GIOP_Message_Generator_Parser_11.cpp \
   GIOP_Message_Generator_Parser_11.h \
   $(ACE_ROOT)/ace/pre.h \
   GIOP_Message_Generator_Parser_10.h \
@@ -43769,7 +42064,7 @@ realclean:
   GIOP_Message_Generator_Parser_10.inl \
   GIOP_Message_Generator_Parser_11.inl
 
-.obj/GIOP_Message_Generator_Parser_12.o .obj/GIOP_Message_Generator_Parser_12.so .shobj/GIOP_Message_Generator_Parser_12.o .shobj/GIOP_Message_Generator_Parser_12.so: GIOP_Message_Generator_Parser_12.cpp \
+.obj/GIOP_Message_Generator_Parser_12.o .obj/GIOP_Message_Generator_Parser_12.SO .shobj/GIOP_Message_Generator_Parser_12.o .shobj/GIOP_Message_Generator_Parser_12.SO: GIOP_Message_Generator_Parser_12.cpp \
   GIOP_Message_Generator_Parser_12.h $(ACE_ROOT)/ace/pre.h \
   GIOP_Message_Generator_Parser.h \
   corbafwd.h \
@@ -43817,8 +42112,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -43944,31 +42238,32 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   IOP_IORC.i \
   Object.i \
+  GIOP_Utils.i GIOP_Message_State.h \
+  GIOP_Message_Version.h \
+  GIOP_Message_Version.inl \
+  GIOP_Message_State.inl \
+  GIOP_Message_Locate_Header.h \
+  Tagged_Profile.h \
   IOPC.h \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   IOPC.i \
-  GIOP_Utils.i GIOP_Message_State.h \
-  GIOP_Message_Version.h \
-  GIOP_Message_Version.inl \
-  GIOP_Message_State.inl \
-  GIOP_Message_Locate_Header.h \
-  Tagged_Profile.h \
   GIOPC.h \
   GIOPC.i \
   Tagged_Profile.i \
@@ -43982,19 +42277,9 @@ realclean:
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp PortableInterceptorC.h \
-  CurrentC.h CurrentC.i DynamicC.h StringSeqC.h Sequence.h StringSeqC.i \
-  DynamicC.i ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h PolicyC.h Policy_ForwardC.h \
+  PI_ForwardC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h DynamicC.i Messaging_SyncScopeC.h Messaging_SyncScopeC.i \
+  IOPC.h PolicyC.h CurrentC.h CurrentC.i Policy_ForwardC.h \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h PolicyC.i \
   PortableInterceptorC.i LocalObject.h Object_KeyC.h LocalObject.i \
@@ -44029,8 +42314,7 @@ realclean:
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
+  Parser_Registry.i Service_Callbacks.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -44068,7 +42352,7 @@ realclean:
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
   Transport.inl
 
-.obj/GIOP_Message_Generator_Parser_Impl.o .obj/GIOP_Message_Generator_Parser_Impl.so .shobj/GIOP_Message_Generator_Parser_Impl.o .shobj/GIOP_Message_Generator_Parser_Impl.so:  \
+.obj/GIOP_Message_Generator_Parser_Impl.o .obj/GIOP_Message_Generator_Parser_Impl.SO .shobj/GIOP_Message_Generator_Parser_Impl.o .shobj/GIOP_Message_Generator_Parser_Impl.SO:  \
  GIOP_Message_Generator_Parser_Impl.cpp \
   GIOP_Message_Generator_Parser_Impl.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -44107,7 +42391,7 @@ realclean:
   GIOP_Message_Generator_Parser_12.inl \
   GIOP_Message_Generator_Parser_Impl.inl
 
-.obj/GIOP_Utils.o .obj/GIOP_Utils.so .shobj/GIOP_Utils.o .shobj/GIOP_Utils.so: GIOP_Utils.cpp \
+.obj/GIOP_Utils.o .obj/GIOP_Utils.SO .shobj/GIOP_Utils.o .shobj/GIOP_Utils.SO: GIOP_Utils.cpp \
   GIOP_Utils.h \
   $(ACE_ROOT)/ace/pre.h \
   Object.h \
@@ -44149,8 +42433,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -44280,26 +42563,13 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
-  IOP_IORC.i \
-  Object.i \
-  IOPC.h \
-  IOP_CodecC.h \
-  Any_T.h \
-  Any.h \
-  Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
-  Marshal.h \
-  Marshal.i \
-  debug.h \
-  IOP_CodecC.i \
   VarOut_T.h \
   VarOut_T.inl \
   VarOut_T.cpp \
-  IOPC.i \
+  IOP_IORC.i \
+  Object.i \
   GIOP_Utils.i \
+  debug.h \
   ORB_Core.h \
   ORB.h \
   ServicesC.h \
@@ -44311,6 +42581,13 @@ realclean:
   objectid.h \
   PolicyC.h \
   CurrentC.h \
+  Any_Impl_T.h \
+  Any.h \
+  Any.i \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
+  Marshal.h \
+  Marshal.i \
   CurrentC.i \
   Remote_Object_Proxy_Impl.h \
   Object_Proxy_Impl.h \
@@ -44346,22 +42623,21 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
+  IOPC.h \
+  IOP_CodecC.h \
+  IOP_CodecC.i \
+  IOPC.i \
   PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -44418,7 +42694,7 @@ realclean:
   $(ACE_ROOT)/ace/Refcountable.inl Synch_Refcountable.inl \
   Transport.inl
 
-.obj/GIOP_Message_Locate_Header.o .obj/GIOP_Message_Locate_Header.so .shobj/GIOP_Message_Locate_Header.o .shobj/GIOP_Message_Locate_Header.so: GIOP_Message_Locate_Header.cpp \
+.obj/GIOP_Message_Locate_Header.o .obj/GIOP_Message_Locate_Header.SO .shobj/GIOP_Message_Locate_Header.o .shobj/GIOP_Message_Locate_Header.SO: GIOP_Message_Locate_Header.cpp \
   GIOP_Message_Locate_Header.h \
   $(ACE_ROOT)/ace/pre.h \
   Tagged_Profile.h \
@@ -44462,8 +42738,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -44580,13 +42855,16 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -44599,24 +42877,22 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   IOPC.i \
   GIOPC.h \
   GIOPC.i \
   Tagged_Profile.i \
   GIOP_Message_Locate_Header.i
 
-.obj/target_specification.o .obj/target_specification.so .shobj/target_specification.o .shobj/target_specification.so: target_specification.cpp \
+.obj/target_specification.o .obj/target_specification.SO .shobj/target_specification.o .shobj/target_specification.SO: target_specification.cpp \
   target_specification.h \
   $(ACE_ROOT)/ace/pre.h \
   Object_KeyC.h \
@@ -44664,8 +42940,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -44779,13 +43054,16 @@ realclean:
   IOP_IORC.h \
   OctetSeqC.h \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -44796,21 +43074,19 @@ realclean:
   Policy_ForwardC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   IOPC.i \
   target_specification.i
 
-.obj/GIOP_Message_State.o .obj/GIOP_Message_State.so .shobj/GIOP_Message_State.o .shobj/GIOP_Message_State.so: GIOP_Message_State.cpp \
+.obj/GIOP_Message_State.o .obj/GIOP_Message_State.SO .shobj/GIOP_Message_State.o .shobj/GIOP_Message_State.SO: GIOP_Message_State.cpp \
   GIOP_Message_State.h \
   $(ACE_ROOT)/ace/pre.h \
   GIOP_Message_Version.h \
@@ -44871,8 +43147,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -45012,13 +43287,11 @@ realclean:
   IOP_IORC.h \
   IOP_IORC.i \
   Object.i \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
@@ -45057,20 +43330,15 @@ realclean:
   Adapter.i \
   PolicyFactory_Registry.h \
   PortableInterceptorC.h \
-  DynamicC.h \
+  PI_ForwardC.h \
   StringSeqC.h \
   StringSeqC.i \
+  PI_ForwardC.i \
+  DynamicC.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i \
   Messaging_SyncScopeC.h \
   Messaging_SyncScopeC.i \
   IOPC.h \
@@ -45125,7 +43393,7 @@ realclean:
   GIOP_Utils.i \
   GIOP_Message_Base.i
 
-.obj/GIOP_Message_Version.o .obj/GIOP_Message_Version.so .shobj/GIOP_Message_Version.o .shobj/GIOP_Message_Version.so: GIOP_Message_Version.cpp GIOP_Message_Version.h \
+.obj/GIOP_Message_Version.o .obj/GIOP_Message_Version.SO .shobj/GIOP_Message_Version.o .shobj/GIOP_Message_Version.SO: GIOP_Message_Version.cpp GIOP_Message_Version.h \
   $(ACE_ROOT)/ace/pre.h \
   corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -45148,7 +43416,7 @@ realclean:
   corbafwd.i \
   GIOP_Message_Version.inl
 
-.obj/Tagged_Profile.o .obj/Tagged_Profile.so .shobj/Tagged_Profile.o .shobj/Tagged_Profile.so: Tagged_Profile.cpp Tagged_Profile.h \
+.obj/Tagged_Profile.o .obj/Tagged_Profile.SO .shobj/Tagged_Profile.o .shobj/Tagged_Profile.SO: Tagged_Profile.cpp Tagged_Profile.h \
   $(ACE_ROOT)/ace/pre.h \
   IOPC.h \
   corbafwd.h \
@@ -45190,8 +43458,7 @@ realclean:
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -45308,13 +43575,16 @@ realclean:
   Seq_Out_T.inl \
   Seq_Out_T.cpp \
   OctetSeqC.i \
+  VarOut_T.h \
+  VarOut_T.inl \
+  VarOut_T.cpp \
   CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   CDR.i \
   IOP_IORC.i \
   IOP_CodecC.h \
-  Any_T.h \
+  Any_Impl_T.h \
   Any.h \
   Object.h \
   Policy_ForwardC.h \
@@ -45327,22 +43597,20 @@ realclean:
   Object_KeyC.i \
   Object.i \
   Any.i \
-  AbstractBase.h \
-  AbstractBase.inl \
-  Any_T.inl \
-  Any_T.cpp \
+  Any_Impl_T.inl \
+  Any_Impl_T.cpp \
   Marshal.h \
   Marshal.i \
   debug.h \
+  Any_Dual_Impl_T.h \
+  Any_Dual_Impl_T.inl \
+  Any_Dual_Impl_T.cpp \
   IOP_CodecC.i \
-  VarOut_T.h \
-  VarOut_T.inl \
-  VarOut_T.cpp \
   IOPC.i \
   GIOPC.h \
   GIOPC.i \
-  Tagged_Profile.i ORB_Core.h \
-  corbafwd.h ORB.h Exception.h ServicesC.h ServicesC.i CORBA_String.h \
+  Tagged_Profile.i ORB_Core.h corbafwd.h \
+  ORB.h Exception.h ServicesC.h ServicesC.i CORBA_String.h \
   CORBA_String.inl ObjectIdListC.h \
   ObjectIdListC.i objectid.h PolicyC.h CurrentC.h CurrentC.i \
   Policy_ForwardC.h Remote_Object_Proxy_Impl.h \
@@ -45371,25 +43639,14 @@ realclean:
   $(ACE_ROOT)/ace/Managed_Object.i \
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   TAO_Singleton_Manager.h Adapter.h \
-  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
-  StringSeqC.h Sequence.h StringSeqC.i DynamicC.i \
-  ObjectReferenceTemplateC.h \
-  StringSeqC.h \
-  ValueBase.h \
-  Pseudo_Value_VarOut_T.h \
-  Pseudo_Value_VarOut_T.inl \
-  Pseudo_Value_VarOut_T.cpp \
-  ValueBase.i \
-  Value_VarOut_T.h \
-  Value_VarOut_T.inl \
-  Value_VarOut_T.cpp \
-  ObjectReferenceTemplateC.i Messaging_SyncScopeC.h \
-  Messaging_SyncScopeC.i IOPC.h PortableInterceptorC.i \
+  Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h PI_ForwardC.h \
+  OctetSeqC.h StringSeqC.h Sequence.h StringSeqC.i PI_ForwardC.i \
+  DynamicC.h DynamicC.i Messaging_SyncScopeC.h Messaging_SyncScopeC.i \
+  IOPC.h PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp Parser_Registry.h \
-  Parser_Registry.i \
-  Service_Callbacks.h \
+  Parser_Registry.i Service_Callbacks.h \
   Service_Callbacks.i \
   Fault_Tolerance_Service.h \
   Fault_Tolerance_Service.i \
@@ -45417,8 +43674,7 @@ realclean:
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i ORB_Core.i \
-  Acceptor_Registry.h \
-  Resource_Factory.h \
+  Acceptor_Registry.h Resource_Factory.h \
   Acceptor_Registry.i \
   Transport_Acceptor.h Transport_Acceptor.inl Thread_Lane_Resources.h \
   Thread_Lane_Resources.i debug.h \
diff --git a/TAO/tao/Messaging/Makefile b/TAO/tao/Messaging/Makefile
index fa203ea7f6a..336e1903dcd 100644
--- a/TAO/tao/Messaging/Makefile
+++ b/TAO/tao/Messaging/Makefile
@@ -12,7 +12,8 @@ LIBNAME  = libTAO_Messaging
 LIB = $(LIBNAME).a
 SHLIB = $(LIBNAME).$(SOEXT)
 
-ACE_SHLIBS = -lTAO_PortableServer -lTAO -lACE
+ACE_SHLIBS = -lTAO_PortableServer -lTAO_ObjRefTemplate \
+  -lTAO_Valuetype -lTAO -lACE
 
 CPP_SRCS += \
   Twoway_Asynch_Invocation \
@@ -75,7 +76,7 @@ endif
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/Twoway_Asynch_Invocation.o .obj/Twoway_Asynch_Invocation.so .shobj/Twoway_Asynch_Invocation.o .shobj/Twoway_Asynch_Invocation.so: Twoway_Asynch_Invocation.cpp \
+.obj/Twoway_Asynch_Invocation.o .obj/Twoway_Asynch_Invocation.SO .shobj/Twoway_Asynch_Invocation.o .shobj/Twoway_Asynch_Invocation.SO: Twoway_Asynch_Invocation.cpp \
   Twoway_Asynch_Invocation.h $(ACE_ROOT)/ace/pre.h \
   Messaging.h messaging_export.h \
   $(ACE_ROOT)/ace/post.h \
@@ -120,8 +121,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -251,15 +251,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -271,22 +272,21 @@ endif
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   Messaging_SyncScope_PolicyC.i Messaging_RT_PolicyC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/TimeBaseC.i Messaging_RT_PolicyC.i \
   Messaging_No_ImplC.h Messaging_No_ImplC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
   $(TAO_ROOT)/tao/Value_VarOut_T.h \
   $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp MessagingC.i \
-  TAO_ExtC.h TAO_ExtC.i $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  MessagingC.i TAO_ExtC.h TAO_ExtC.i \
+  $(TAO_ROOT)/tao/TAOC.h \
   $(TAO_ROOT)/tao/TAOC.i Asynch_Reply_Dispatcher.h \
   Asynch_Timeout_Handler.h \
   $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.h \
@@ -302,10 +302,6 @@ endif
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
@@ -314,9 +310,6 @@ endif
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
   $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.i \
   Asynch_Reply_Dispatcher.i \
@@ -331,6 +324,10 @@ endif
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
   $(TAO_ROOT)/tao/operation_details.h \
   $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
   $(TAO_ROOT)/tao/target_specification.i \
@@ -380,12 +377,12 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -430,7 +427,7 @@ endif
   $(TAO_ROOT)/tao/Stub.i \
   $(TAO_ROOT)/tao/Transport_Mux_Strategy.h
 
-.obj/Asynch_Reply_Dispatcher.o .obj/Asynch_Reply_Dispatcher.so .shobj/Asynch_Reply_Dispatcher.o .shobj/Asynch_Reply_Dispatcher.so: Asynch_Reply_Dispatcher.cpp \
+.obj/Asynch_Reply_Dispatcher.o .obj/Asynch_Reply_Dispatcher.SO .shobj/Asynch_Reply_Dispatcher.o .shobj/Asynch_Reply_Dispatcher.SO: Asynch_Reply_Dispatcher.cpp \
   Asynch_Reply_Dispatcher.h $(ACE_ROOT)/ace/pre.h \
   Messaging.h messaging_export.h \
   $(ACE_ROOT)/ace/post.h \
@@ -475,8 +472,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -606,15 +602,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -626,22 +623,21 @@ endif
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   Messaging_SyncScope_PolicyC.i Messaging_RT_PolicyC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/TimeBaseC.i Messaging_RT_PolicyC.i \
   Messaging_No_ImplC.h Messaging_No_ImplC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
   $(TAO_ROOT)/tao/Value_VarOut_T.h \
   $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp MessagingC.i \
-  TAO_ExtC.h TAO_ExtC.i $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  MessagingC.i TAO_ExtC.h TAO_ExtC.i \
+  $(TAO_ROOT)/tao/TAOC.h \
   $(TAO_ROOT)/tao/TAOC.i Asynch_Timeout_Handler.h \
   $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.h \
   $(TAO_ROOT)/tao/Transport.h \
@@ -656,10 +652,6 @@ endif
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
@@ -668,9 +660,6 @@ endif
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
   $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.i \
   Asynch_Reply_Dispatcher.i $(TAO_ROOT)/tao/ORB_Core.h \
@@ -713,12 +702,16 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -759,7 +752,7 @@ endif
   $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i
 
-.obj/Asynch_Timeout_Handler.o .obj/Asynch_Timeout_Handler.so .shobj/Asynch_Timeout_Handler.o .shobj/Asynch_Timeout_Handler.so: Asynch_Timeout_Handler.cpp \
+.obj/Asynch_Timeout_Handler.o .obj/Asynch_Timeout_Handler.SO .shobj/Asynch_Timeout_Handler.o .shobj/Asynch_Timeout_Handler.SO: Asynch_Timeout_Handler.cpp \
   Asynch_Timeout_Handler.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -792,11 +785,9 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  Asynch_Reply_Dispatcher.h Messaging.h MessagingC.h \
-  Messaging_SyncScope_PolicyC.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Event_Handler.i Asynch_Reply_Dispatcher.h \
+  Messaging.h MessagingC.h Messaging_SyncScope_PolicyC.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
@@ -935,15 +926,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -955,22 +947,21 @@ endif
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   Messaging_SyncScope_PolicyC.i Messaging_RT_PolicyC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/TimeBaseC.i Messaging_RT_PolicyC.i \
   Messaging_No_ImplC.h Messaging_No_ImplC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
   $(TAO_ROOT)/tao/Value_VarOut_T.h \
   $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp MessagingC.i \
-  TAO_ExtC.h TAO_ExtC.i $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  MessagingC.i TAO_ExtC.h TAO_ExtC.i \
+  $(TAO_ROOT)/tao/TAOC.h \
   $(TAO_ROOT)/tao/TAOC.i \
   $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.h \
   $(TAO_ROOT)/tao/Transport.h \
@@ -985,10 +976,6 @@ endif
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
@@ -997,15 +984,16 @@ endif
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
   $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.i \
   Asynch_Reply_Dispatcher.i \
-  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h
+  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i
 
-.obj/Connection_Timeout_Policy_i.o .obj/Connection_Timeout_Policy_i.so .shobj/Connection_Timeout_Policy_i.o .shobj/Connection_Timeout_Policy_i.so: Connection_Timeout_Policy_i.cpp \
+.obj/Connection_Timeout_Policy_i.o .obj/Connection_Timeout_Policy_i.SO .shobj/Connection_Timeout_Policy_i.o .shobj/Connection_Timeout_Policy_i.SO: Connection_Timeout_Policy_i.cpp \
   Connection_Timeout_Policy_i.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1048,8 +1036,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1179,15 +1166,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -1196,9 +1184,9 @@ endif
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/TimeBaseC.i messaging_export.h \
   TAO_ExtC.i $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
@@ -1240,20 +1228,12 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -1306,8 +1286,7 @@ endif
   $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
   $(TAO_ROOT)/tao/Stub.i
 
-.obj/Messaging.o .obj/Messaging.so .shobj/Messaging.o .shobj/Messaging.so: Messaging.cpp Messaging.h \
-  $(ACE_ROOT)/ace/pre.h messaging_export.h \
+.obj/Messaging.o .obj/Messaging.SO .shobj/Messaging.o .shobj/Messaging.SO: Messaging.cpp Messaging.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl MessagingC.h \
@@ -1350,8 +1329,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1481,15 +1459,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -1501,30 +1480,29 @@ endif
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   Messaging_SyncScope_PolicyC.i Messaging_RT_PolicyC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/TimeBaseC.i Messaging_RT_PolicyC.i \
   Messaging_No_ImplC.h Messaging_No_ImplC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
   $(TAO_ROOT)/tao/Value_VarOut_T.h \
   $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp MessagingC.i \
-  TAO_ExtC.h TAO_ExtC.i $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  MessagingC.i TAO_ExtC.h TAO_ExtC.i \
+  $(TAO_ROOT)/tao/TAOC.h \
   $(TAO_ROOT)/tao/TAOC.i Messaging_ORBInitializer.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
@@ -1614,7 +1592,7 @@ endif
   $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
   $(TAO_ROOT)/tao/Stub.i
 
-.obj/MessagingC.o .obj/MessagingC.so .shobj/MessagingC.o .shobj/MessagingC.so: MessagingC.cpp Messaging.h \
+.obj/MessagingC.o .obj/MessagingC.SO .shobj/MessagingC.o .shobj/MessagingC.SO: MessagingC.cpp Messaging.h \
   $(ACE_ROOT)/ace/pre.h messaging_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -1658,8 +1636,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1789,15 +1766,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -1809,22 +1787,21 @@ endif
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   Messaging_SyncScope_PolicyC.i Messaging_RT_PolicyC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/TimeBaseC.i Messaging_RT_PolicyC.i \
   Messaging_No_ImplC.h Messaging_No_ImplC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
   $(TAO_ROOT)/tao/Value_VarOut_T.h \
   $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp MessagingC.i \
-  TAO_ExtC.h TAO_ExtC.i $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  MessagingC.i TAO_ExtC.h TAO_ExtC.i \
+  $(TAO_ROOT)/tao/TAOC.h \
   $(TAO_ROOT)/tao/TAOC.i \
   $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
@@ -1869,12 +1846,12 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
@@ -1924,9 +1901,6 @@ endif
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/LF_Event.h \
@@ -1967,7 +1941,7 @@ endif
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
-.obj/MessagingS.o .obj/MessagingS.so .shobj/MessagingS.o .shobj/MessagingS.so: MessagingS.cpp MessagingS.h \
+.obj/MessagingS.o .obj/MessagingS.SO .shobj/MessagingS.o .shobj/MessagingS.SO: MessagingS.cpp MessagingS.h \
   $(ACE_ROOT)/ace/pre.h Messaging.h messaging_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -2011,8 +1985,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2142,15 +2115,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -2162,26 +2136,28 @@ endif
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   Messaging_SyncScope_PolicyC.i Messaging_RT_PolicyC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/TimeBaseC.i Messaging_RT_PolicyC.i \
   Messaging_No_ImplC.h Messaging_No_ImplC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
   $(TAO_ROOT)/tao/Value_VarOut_T.h \
   $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp MessagingC.i \
-  TAO_ExtC.h TAO_ExtC.i $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  MessagingC.i TAO_ExtC.h TAO_ExtC.i \
+  $(TAO_ROOT)/tao/TAOC.h \
   $(TAO_ROOT)/tao/TAOC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
@@ -2263,12 +2239,12 @@ endif
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/tao/PICurrent.inl \
   $(TAO_ROOT)/tao/TAO_Server_Request.i \
@@ -2338,7 +2314,7 @@ endif
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/Messaging_No_ImplC.o .obj/Messaging_No_ImplC.so .shobj/Messaging_No_ImplC.o .shobj/Messaging_No_ImplC.so: Messaging_No_ImplC.cpp Messaging_No_ImplC.h \
+.obj/Messaging_No_ImplC.o .obj/Messaging_No_ImplC.SO .shobj/Messaging_No_ImplC.o .shobj/Messaging_No_ImplC.SO: Messaging_No_ImplC.cpp Messaging_No_ImplC.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -2381,8 +2357,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2512,15 +2487,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -2529,12 +2505,12 @@ endif
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/TimeBaseC.i Messaging_No_ImplC.i
 
-.obj/Messaging_RT_PolicyC.o .obj/Messaging_RT_PolicyC.so .shobj/Messaging_RT_PolicyC.o .shobj/Messaging_RT_PolicyC.so: Messaging_RT_PolicyC.cpp Messaging_RT_PolicyC.h \
+.obj/Messaging_RT_PolicyC.o .obj/Messaging_RT_PolicyC.SO .shobj/Messaging_RT_PolicyC.o .shobj/Messaging_RT_PolicyC.SO: Messaging_RT_PolicyC.cpp Messaging_RT_PolicyC.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -2577,8 +2553,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2708,15 +2683,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -2725,12 +2701,12 @@ endif
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i messaging_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/TimeBaseC.i Messaging_RT_PolicyC.i
 
-.obj/Messaging_SyncScope_PolicyC.o .obj/Messaging_SyncScope_PolicyC.so .shobj/Messaging_SyncScope_PolicyC.o .shobj/Messaging_SyncScope_PolicyC.so: Messaging_SyncScope_PolicyC.cpp \
+.obj/Messaging_SyncScope_PolicyC.o .obj/Messaging_SyncScope_PolicyC.SO .shobj/Messaging_SyncScope_PolicyC.o .shobj/Messaging_SyncScope_PolicyC.SO: Messaging_SyncScope_PolicyC.cpp \
   Messaging_SyncScope_PolicyC.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -2773,8 +2749,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2904,15 +2879,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -2927,9 +2903,6 @@ endif
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -2968,20 +2941,15 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
@@ -3029,7 +2997,7 @@ endif
   $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
   $(TAO_ROOT)/tao/Stub.i
 
-.obj/TAO_ExtC.o .obj/TAO_ExtC.so .shobj/TAO_ExtC.o .shobj/TAO_ExtC.so: TAO_ExtC.cpp TAO_ExtC.h $(ACE_ROOT)/ace/pre.h \
+.obj/TAO_ExtC.o .obj/TAO_ExtC.SO .shobj/TAO_ExtC.o .shobj/TAO_ExtC.SO: TAO_ExtC.cpp TAO_ExtC.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
@@ -3071,8 +3039,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -3202,15 +3169,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -3219,13 +3187,13 @@ endif
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/TimeBaseC.i messaging_export.h \
   TAO_ExtC.i
 
-.obj/Messaging_ORBInitializer.o .obj/Messaging_ORBInitializer.so .shobj/Messaging_ORBInitializer.o .shobj/Messaging_ORBInitializer.so: Messaging_ORBInitializer.cpp \
+.obj/Messaging_ORBInitializer.o .obj/Messaging_ORBInitializer.SO .shobj/Messaging_ORBInitializer.o .shobj/Messaging_ORBInitializer.SO: Messaging_ORBInitializer.cpp \
   Messaging_ORBInitializer.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -3247,9 +3215,8 @@ endif
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i messaging_export.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -3268,8 +3235,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -3379,63 +3345,57 @@ endif
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
   $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
@@ -3453,8 +3413,14 @@ endif
   Messaging_RT_PolicyC.i \
   Messaging_No_ImplC.h \
   Messaging_No_ImplC.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
   MessagingC.i \
   TAO_ExtC.h \
   TAO_ExtC.i \
@@ -3537,7 +3503,7 @@ endif
   $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i
 
-.obj/Messaging_PolicyFactory.o .obj/Messaging_PolicyFactory.so .shobj/Messaging_PolicyFactory.o .shobj/Messaging_PolicyFactory.so: Messaging_PolicyFactory.cpp \
+.obj/Messaging_PolicyFactory.o .obj/Messaging_PolicyFactory.SO .shobj/Messaging_PolicyFactory.o .shobj/Messaging_PolicyFactory.SO: Messaging_PolicyFactory.cpp \
   Messaging_PolicyFactory.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -3559,9 +3525,8 @@ endif
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i messaging_export.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -3580,8 +3545,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -3691,63 +3655,57 @@ endif
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
   $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
@@ -3765,8 +3723,14 @@ endif
   Messaging_RT_PolicyC.i \
   Messaging_No_ImplC.h \
   Messaging_No_ImplC.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
   MessagingC.i \
   TAO_ExtC.h \
   TAO_ExtC.i \
@@ -3776,7 +3740,7 @@ endif
   $(TAO_ROOT)/tao/Buffering_Constraint_Policy.h \
   $(TAO_ROOT)/tao/Buffering_Constraint_Policy.i
 
-.obj/Messaging_Policy_i.o .obj/Messaging_Policy_i.so .shobj/Messaging_Policy_i.o .shobj/Messaging_Policy_i.so: Messaging_Policy_i.cpp \
+.obj/Messaging_Policy_i.o .obj/Messaging_Policy_i.SO .shobj/Messaging_Policy_i.o .shobj/Messaging_Policy_i.SO: Messaging_Policy_i.cpp \
   Messaging_Policy_i.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/orbconf.h \
@@ -3824,8 +3788,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -3955,15 +3918,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -3976,23 +3940,21 @@ endif
   Messaging_SyncScope_PolicyC.i \
   Messaging_RT_PolicyC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/TimeBaseC.i \
   Messaging_RT_PolicyC.i \
   Messaging_No_ImplC.h \
   Messaging_No_ImplC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i \
   $(TAO_ROOT)/tao/Value_VarOut_T.h \
   $(TAO_ROOT)/tao/Value_VarOut_T.inl \
   $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
   MessagingC.i \
   TAO_ExtC.h \
   TAO_ExtC.i \
@@ -4042,12 +4004,12 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
@@ -4095,7 +4057,7 @@ endif
   $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
   $(TAO_ROOT)/tao/Stub.i
 
-.obj/AMI_ClientRequestInfo_i.o .obj/AMI_ClientRequestInfo_i.so .shobj/AMI_ClientRequestInfo_i.o .shobj/AMI_ClientRequestInfo_i.so: AMI_ClientRequestInfo_i.cpp \
+.obj/AMI_ClientRequestInfo_i.o .obj/AMI_ClientRequestInfo_i.SO .shobj/AMI_ClientRequestInfo_i.o .shobj/AMI_ClientRequestInfo_i.SO: AMI_ClientRequestInfo_i.cpp \
   AMI_ClientRequestInfo_i.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -4118,9 +4080,8 @@ endif
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -4139,8 +4100,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -4250,63 +4210,57 @@ endif
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
   $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
@@ -4324,9 +4278,16 @@ endif
   Messaging_RT_PolicyC.h $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/TimeBaseC.i Messaging_RT_PolicyC.i \
   Messaging_No_ImplC.h Messaging_No_ImplC.i \
-  $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i MessagingC.i \
-  TAO_ExtC.h TAO_ExtC.i $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  MessagingC.i TAO_ExtC.h TAO_ExtC.i \
+  $(TAO_ROOT)/tao/TAOC.h \
   $(TAO_ROOT)/tao/TAOC.i Asynch_Reply_Dispatcher.h \
   Asynch_Timeout_Handler.h \
   $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.h \
@@ -4350,9 +4311,6 @@ endif
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
   $(TAO_ROOT)/tao/Transport.inl \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher_Base.i \
   Asynch_Reply_Dispatcher.i \
diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp
index a9fd63a35be..7352df894e3 100644
--- a/TAO/tao/Messaging/MessagingC.cpp
+++ b/TAO/tao/Messaging/MessagingC.cpp
@@ -189,7 +189,7 @@ Messaging::ExceptionHolder::_downcast (CORBA::ValueBase *v)
     {
       return 0;
     }
-
+  
   return (ExceptionHolder *) v->_tao_obv_narrow ((ptrdiff_t) &_downcast);
 }
 
diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h
index 20d1e9a6595..e45f2b4b217 100644
--- a/TAO/tao/Messaging/MessagingC.h
+++ b/TAO/tao/Messaging/MessagingC.h
@@ -41,9 +41,9 @@
 #include "Messaging_RT_PolicyC.h"
 #include "Messaging_No_ImplC.h"
 #include "tao/OctetSeqC.h"
-#include "tao/ValueBase.h"
-#include "tao/ValueFactory.h"
-#include "tao/Value_VarOut_T.h"
+#include "tao/Valuetype/Value_VarOut_T.h"
+#include "tao/Valuetype/ValueBase.h"
+#include "tao/Valuetype/ValueFactory.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.h b/TAO/tao/Messaging/Messaging_No_ImplC.h
index 645f36e162c..3f0b7f7864b 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplC.h
+++ b/TAO/tao/Messaging/Messaging_No_ImplC.h
@@ -260,10 +260,10 @@ TAO_NAMESPACE  Messaging
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
@@ -411,10 +411,10 @@ TAO_NAMESPACE  Messaging
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
@@ -530,10 +530,10 @@ TAO_NAMESPACE  Messaging
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
@@ -649,10 +649,10 @@ TAO_NAMESPACE  Messaging
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
@@ -768,10 +768,10 @@ TAO_NAMESPACE  Messaging
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
@@ -887,10 +887,10 @@ TAO_NAMESPACE  Messaging
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
@@ -1006,10 +1006,10 @@ TAO_NAMESPACE  Messaging
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
@@ -1125,10 +1125,10 @@ TAO_NAMESPACE  Messaging
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
@@ -1276,10 +1276,10 @@ TAO_NAMESPACE  Messaging
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
@@ -1395,10 +1395,10 @@ TAO_NAMESPACE  Messaging
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
@@ -1514,10 +1514,10 @@ TAO_NAMESPACE  Messaging
       )) = 0;
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:267
+    
     virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
diff --git a/TAO/tao/Messaging/TAO_Messaging.dsp b/TAO/tao/Messaging/TAO_Messaging.dsp
index 2c17893d794..1dee7e275eb 100644
--- a/TAO/tao/Messaging/TAO_Messaging.dsp
+++ b/TAO/tao/Messaging/TAO_Messaging.dsp
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /dll /map /debug /machine:I386 /out:"..\..\..\bin\TAO_Messaging.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAO_PortableServer.lib TAO_Valuetyped.lib TAO.lib ace.lib /nologo /dll /map /debug /machine:I386 /out:"..\..\..\bin\TAO_Messaging.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Messaging - Win32 Debug"

 

@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "Messaging_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "TAO_MESSAGING_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "TAO_MESSAGING_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -83,7 +83,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_Messagingd.dll" /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAO_PortableServerd.lib TAO_Valuetyped.lib TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_Messagingd.dll" /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Messaging - Win32 MFC Debug"

 

@@ -112,7 +112,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 TAOd.lib aced.lib TAO_Svc_Utilsd.lib TAO_RTEventd.lib TAO_RTSchedd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_Messagingd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-# ADD LINK32 TAO_PortableServermfcd.lib TAOmfcd.lib acemfcd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_Messagingmfcd.dll" /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAO_PortableServermfcd.lib TAOmfcd.lib acemfcd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_Messagingmfcd.dll" /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Messaging - Win32 MFC Release"

 

@@ -141,7 +141,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 ace.lib TAO.lib TAO_Svc_Utils.lib TAO_RTEvent.lib TAO_RTSched.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_Messaging.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-# ADD LINK32 TAO_PortableServermfc.lib TAOmfc.lib acemfc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /map /debug /machine:I386 /out:"..\..\..\bin\TAO_Messagingmfc.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAO_PortableServermfc.lib TAOmfc.lib acemfc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /map /debug /machine:I386 /out:"..\..\..\bin\TAO_Messagingmfc.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

 !ENDIF 

 

diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 01b272760fa..28f896c09bc 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -29,13 +29,12 @@ ACE_RCSID (tao,
 #include "CodecFactory_ORBInitializer.h"
 
 #include "TypeCodeFactory_Adapter.h"
+#include "Valuetype_Adapter.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 # include "PICurrent_ORBInitializer.h"  /* @@ This should go away! */
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
-#include "ValueFactory_Map.h"
-
 #include "Object_KeyC.h"
 
 #include "ace/Dynamic_Service.h"
@@ -2049,47 +2048,80 @@ CORBA::ORB::register_value_factory (const char *repository_id,
 // %! guard, and ACE_Null_Mutex in the map
 // do _add_ref here not in map->rebind
 
-  if (valuetype_factory_map_ == 0)
+  TAO_Valuetype_Adapter *adapter =
+    ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
+        TAO_ORB_Core::valuetype_adapter_name ()
+      );
+
+  if (adapter == 0)
+    {
+      ACE_THROW_RETURN (CORBA::INTERNAL (),
+                        0);
+    }
+
+  if (this->valuetype_factory_map_ == 0)
     {
       // currently the ValueFactory_Map is a singleton and not per ORB
       // as in the OMG specs
-      valuetype_factory_map_ = TAO_VALUEFACTORY_MAP::instance ();
-      if (valuetype_factory_map_ == 0)
-        ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+      this->valuetype_factory_map_ = 
+        adapter->valuefactory_map_instance ();
+
+      if (this->valuetype_factory_map_ == 0)
+        {
+          ACE_THROW_RETURN (CORBA::INTERNAL (), 
+                            0);
+        }
     }
 
-  int result = valuetype_factory_map_->rebind (repository_id, factory);
+  int result = adapter->vf_map_rebind (this->valuetype_factory_map_,
+                                       repository_id, 
+                                       factory);
+
   if (result == -1)
     {
       // Error on bind.
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+      ACE_THROW_RETURN (CORBA::INTERNAL (), 
+                        0);
     }
+
   if (result == 1)
     {
       return factory;    // previous factory was found
     }
+
   return 0;
 }
 
 void
 CORBA::ORB::unregister_value_factory (const char * /* repository_id */
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+                                      ACE_ENV_ARG_DECL)
 {
-  ACE_ERROR((LM_ERROR, ACE_TEXT ("(%N:%l) function not implemented\n")));
-  // %! TODO
+  ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
 CORBA::ValueFactory
 CORBA::ORB::lookup_value_factory (const char *repository_id
-                                  ACE_ENV_ARG_DECL_NOT_USED)
+                                  ACE_ENV_ARG_DECL)
 {
 // %! guard
 // do _add_ref here not in map->find
-  if (valuetype_factory_map_)
+  if (this->valuetype_factory_map_)
     {
-      CORBA::ValueFactory factory;
-      int result = valuetype_factory_map_->find (repository_id,
-                                                 factory);
+      TAO_Valuetype_Adapter *adapter =
+        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
+            TAO_ORB_Core::valuetype_adapter_name ()
+          );
+
+      if (adapter == 0)
+        {
+          ACE_THROW_RETURN (CORBA::INTERNAL (),
+                            0);
+        }
+
+      CORBA::ValueFactory factory = 0;
+      int result = adapter->vf_map_find (this->valuetype_factory_map_,
+                                         repository_id,
+                                         factory);
 
       if (result == -1)
         {
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index e59d0d827b9..b68e3484258 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -35,7 +35,7 @@
 #include "Thread_Lane_Resources_Manager.h"
 
 #include "Protocols_Hooks.h"
-
+#include "IORInterceptor_Adapter.h"
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 # include "Buffering_Constraint_Policy.h"
@@ -114,6 +114,8 @@ TAO_ORB_Core_Static_Resources::TAO_ORB_Core_Static_Resources (void)
     dynamic_adapter_name_ ("Dynamic_Adapter"),
     ifr_client_adapter_name_ ("IFR_Client_Adapter"),
     typecodefactory_adapter_name_ ("TypeCodeFactory_Adapter"),
+    iorinterceptor_adapter_name_ ("IORInterceptor_Adapter"),
+    valuetype_adapter_name_ ("Valuetype_Adapter"),
     poa_factory_name_ ("TAO_POA"),
     poa_factory_directive_ ("dynamic TAO_POA Service_Object * TAO_PortableServer:_make_TAO_Object_Adapter_Factory()")
 {
@@ -1205,12 +1207,38 @@ TAO_ORB_Core::typecodefactory_adapter_name (void)
   return TAO_ORB_Core_Static_Resources::instance ()->typecodefactory_adapter_name_.c_str();
 }
 
+void
+TAO_ORB_Core::iorinterceptor_adapter_name (const char *name)
+{
+  TAO_ORB_Core_Static_Resources::instance ()->iorinterceptor_adapter_name_ = name;
+}
+
+const char *
+TAO_ORB_Core::iorinterceptor_adapter_name (void)
+{
+  return TAO_ORB_Core_Static_Resources::instance ()->iorinterceptor_adapter_name_.c_str();
+}
+
+void
+TAO_ORB_Core::valuetype_adapter_name (const char *name)
+{
+  TAO_ORB_Core_Static_Resources::instance ()->valuetype_adapter_name_ = name;
+}
+
+const char *
+TAO_ORB_Core::valuetype_adapter_name (void)
+{
+  return TAO_ORB_Core_Static_Resources::instance ()->valuetype_adapter_name_.c_str();
+}
+
 TAO_Resource_Factory *
 TAO_ORB_Core::resource_factory (void)
 {
   // Check if there is a cached reference.
   if (this->resource_factory_ != 0)
-    return this->resource_factory_;
+    {
+      return this->resource_factory_;
+    }
 
   // Look in the service repository for an instance.
   this->resource_factory_ =
@@ -1951,6 +1979,7 @@ TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
 
       len = client_interceptors.size ();
       ilen = len;
+
       for (size_t i = 0; i < len; ++i)
         {
           // Destroy the interceptors in reverse order in case the array
@@ -1974,6 +2003,7 @@ TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
 
       len = server_interceptors.size ();
       ilen = len;
+
       for (size_t j = 0; j < len; ++j)
         {
           // Destroy the interceptors in reverse order in case the array
@@ -1999,6 +2029,17 @@ TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
 
       len = ior_interceptors.size ();
       ilen = len;
+
+      TAO_IORInterceptor_Adapter *adapter =
+        ACE_Dynamic_Service<TAO_IORInterceptor_Adapter>::instance (
+            TAO_ORB_Core::iorinterceptor_adapter_name ()
+          );
+
+      if (adapter == 0)
+        {
+          ACE_THROW (CORBA::INTERNAL ());
+        }
+
       for (size_t k = 0; k < len; ++k)
         {
           // Destroy the interceptors in reverse order in case the array
@@ -2006,7 +2047,9 @@ TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
           // occurs afterwards.
           --ilen;
 
-          ior_interceptors[ilen]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+          adapter->tao_iorinterceptor_destroy (ior_interceptors,
+                                               ilen
+                                               ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Since Interceptor::destroy() can throw an exception, decrease
@@ -2021,8 +2064,11 @@ TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
     {
       // .. catch all the exceptions..
       if (TAO_debug_level > 3)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_LIB_TEXT ("(%P|%t) Exception in TAO_ORB_Core::destroy_interceptors () \n")));
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_LIB_TEXT ("(%P|%t) Exception in TAO_ORB_Core"),
+                      ACE_LIB_TEXT ("::destroy_interceptors () \n")));
+        }
     }
   ACE_ENDTRY;
 
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 2e5e69b979d..50db8476681 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -400,9 +400,8 @@ public:
 
   /// Sets the name of the POA factory and the dynamic service
   /// configurator directive to load it if needed.
-  static void set_poa_factory (
-                    const char *poa_factory_name,
-                    const char *poa_factory_directive);
+  static void set_poa_factory (const char *poa_factory_name,
+                               const char *poa_factory_directive);
 
   /// Access the POA factory name.
   static const ACE_CString &poa_factory_name (void);
@@ -428,6 +427,18 @@ public:
   /// Gets the value of TAO_ORB_Core::typecodefactory_adapter_name_.
   static const char *typecodefactory_adapter_name (void);
 
+  /// Sets the value of TAO_ORB_Core::iorinterceptor_adapter_name_.
+  static void iorinterceptor_adapter_name (const char *name);
+
+  /// Gets the value of TAO_ORB_Core::iorinterceptor_adapter_name_.
+  static const char *iorinterceptor_adapter_name (void);
+
+  /// Sets the value of TAO_ORB_Core::valuetype_adapter_name.
+  static void valuetype_adapter_name (const char *name);
+
+  /// Gets the value of TAO_ORB_Core::valuetype_adapter_name.
+  static const char *valuetype_adapter_name (void);
+
   /// See if we have a collocated address, if yes, return the POA
   /// associated with the address.
   int is_collocated (const TAO_MProfile& mprofile);
@@ -1344,6 +1355,22 @@ public:
   // the value to "Concrete_TypeCodeFactory_Adapter".
   ACE_CString typecodefactory_adapter_name_;
 
+  // Name of the service object used to adapt function calls on
+  // the PortableInterceptor interfaces IORInfo and IORInterceptor.
+  // The default value is "IORInterceptor_Adapter". If the
+  // IORInterceptor library is linked, the corresponding accessor
+  // function iorinterceptor_adapter_name() will be called to set
+  // the value to "Concrete_IORInterceptor_Adapter".
+  ACE_CString iorinterceptor_adapter_name_;
+
+  // Name of the service object used to adapt function calls on
+  // the valuetype-related interfaces.
+  // The default value is "Valuetype_Adapter". If the
+  // Valuetype library is linked, the corresponding accessor
+  // function valuetype_adapter_name() will be called to set
+  // the value to "Concrete_Valuetype_Adapter".
+  ACE_CString valuetype_adapter_name_;
+
   // Name of the service object used to create the RootPOA.  The
   // default value is "TAO_POA".  If TAO_RTCORBA is loaded, this
   // will be changed to TAO_RT_POA so that a POA equipped with
diff --git a/TAO/tao/ObjRefTemplate/Makefile b/TAO/tao/ObjRefTemplate/Makefile
new file mode 100644
index 00000000000..64d8d138296
--- /dev/null
+++ b/TAO/tao/ObjRefTemplate/Makefile
@@ -0,0 +1,405 @@
+#----------------------------------------------------------------------------
+#
+# $Id$
+#
+#----------------------------------------------------------------------------
+ifndef TAO_ROOT
+  TAO_ROOT = $(ACE_ROOT)/TAO
+endif # ! TAO_ROOT
+
+MAKEFILE = Makefile
+LIBNAME  = libTAO_ObjRefTemplate
+LIB      = $(LIBNAME).a
+SHLIB    = $(LIBNAME).$(SOEXT)
+
+ACE_SHLIBS = -lTAO_Valuetype -lTAO -lACE
+
+
+CPP_SRCS += ObjectReferenceTemplateC
+
+FILES = $(CPP_SRCS)
+DEFS  = $(addsuffix .h,$(FILES))
+LSRC  = $(addsuffix .cpp,$(FILES))
+
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+#----------------------------------------------------------------------------
+#       Local targets (and local hacks)
+#----------------------------------------------------------------------------
+
+LDFLAGS += -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)
+
+ifeq ($(shared_libs),1)
+ifneq ($(SHLIB),)
+CPPFLAGS     += -DTAO_ORT_BUILD_DLL
+endif
+endif
+
+ifeq ($(static_libs),1)
+ifneq ($(LIB),)
+CPPFLAGS     += -DTAO_AS_STATIC_LIBS
+endif
+endif
+
+#----------------------------------------------------------------------------
+#       Dependencies
+#----------------------------------------------------------------------------
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/ObjectReferenceTemplateC.o .obj/ObjectReferenceTemplateC.SO .shobj/ObjectReferenceTemplateC.o .shobj/ObjectReferenceTemplateC.SO: ObjectReferenceTemplateC.cpp \
+  ObjectReferenceTemplateC.h $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  ObjectReferenceTemplateC.i $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/PICurrent.h \
+  $(TAO_ROOT)/tao/PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.h \
+  $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/Invocation.h \
+  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Invocation_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/operation_details.h \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/target_specification.h \
+  $(TAO_ROOT)/tao/target_specification.i \
+  $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Transport_Timer.h \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.h \
+  $(ACE_ROOT)/ace/Refcountable.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Transport.inl \
+  $(TAO_ROOT)/tao/Invocation.i \
+  $(TAO_ROOT)/tao/PortableInterceptor.h \
+  $(TAO_ROOT)/tao/RequestInfo_Util.h \
+  $(TAO_ROOT)/tao/ClientRequestInfo_i.h \
+  $(TAO_ROOT)/tao/ClientRequestInfo_i.inl \
+  $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
+  $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/ObjRefTemplate/Makefile.bor b/TAO/tao/ObjRefTemplate/Makefile.bor
new file mode 100644
index 00000000000..d2b46a5e5aa
--- /dev/null
+++ b/TAO/tao/ObjRefTemplate/Makefile.bor
@@ -0,0 +1,25 @@
+#
+# Makefile for building the TAO ObjRefTemplate library
+#
+
+NAME = TAO_ObjRefTemplate
+
+OBJFILES = \
+	$(OBJDIR)\ObjectReferenceTemplateC.obj
+
+RESOURCE = $(OBJDIR)\TAO_ObjRefTemplate.res
+
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_ORT_CFLAGS) \
+	-DTAO_ORT_BUILD_DLL
+
+CPPDIR = .
+
+INCDIR_NAME = tao\ObjRefTemplate
+INCLUDES = \
+	*.h *.i \
+	 ObjectReferenceTemplate.pidl
+
+LIBFILES = $(TAO_VALUETYPE_LIB) $(TAO_LIB) $(ACE_LIB)
+
+!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc b/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc
new file mode 100644
index 00000000000..6798f908b3d
--- /dev/null
+++ b/TAO/tao/ObjRefTemplate/ObjRefTemplate.mpc
@@ -0,0 +1,7 @@
+project : taolib, core {
+  sharedname  = TAO_ObjRefTemplate
+  libs       += TAO_Valuetype TAO
+  dllflags    = TAO_ORT_BUILD_DLL
+  libout      = ..
+  include_dir = tao/ObjRefTemplate
+}
diff --git a/TAO/tao/ObjectReferenceTemplate.pidl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
index 037c785a0ea..acdee1bd99c 100644
--- a/TAO/tao/ObjectReferenceTemplate.pidl
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
@@ -12,8 +12,8 @@
  *
  *   tao_idl.exe
  *        -o orig -Gp -Gd -Ge 1
- *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=tao/TAO_Export.h
+ *        -Wb,export_macro=TAO_ORT_Export
+ *        -Wb,export_include=ort_export.h
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
  *        ObjectReferenceTemplate.pidl
@@ -33,19 +33,12 @@
 #define _OBJECT_REFERENCE_TEMPLATE_IDL_
 
 #include <orb.idl>
-
-#include <OctetSeq.pidl>
-#include <StringSeq.pidl>
+#include <PI_Forward.pidl>
 
 module PortableInterceptor
 {
   typeprefix PortableInterceptor "omg.org";
 
-  typedef string ServerId;
-  typedef string ORBId;
-  typedef CORBA::StringSeq AdapterName;
-  typedef CORBA::OctetSeq ObjectId;
-
   abstract valuetype ObjectReferenceFactory {
     // boolean equals (in ObjectReferenceFactory other);
     Object make_object (in string repository_id,
diff --git a/TAO/tao/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
index d3defb5d1a5..b3914924d90 100644
--- a/TAO/tao/ObjectReferenceTemplateC.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
@@ -15,17 +15,31 @@
 //       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:314
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:344
 
 
 #include "ObjectReferenceTemplateC.h"
 #include "tao/Stub.h"
-#include "tao/ValueFactory.h"
+#include "tao/Invocation.h"
+#include "tao/PortableInterceptor.h"
+
+#if TAO_HAS_INTERCEPTORS == 1
+#include "tao/RequestInfo_Util.h"
+#include "tao/ClientRequestInfo_i.h"
+#include "tao/ClientInterceptorAdapter.h"
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -38,249 +52,31 @@
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-static const CORBA::Long _oc_PortableInterceptor_ServerId[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  45,
-  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 (0x65724964),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ServerId:1.0
-    9,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65724964),
-  ACE_NTOHL (0x0),  // name = ServerId
-    CORBA::tk_string,
-  0U, // string length
-};
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerId (
-    CORBA::tk_alias,
-    sizeof (_oc_PortableInterceptor_ServerId),
-    (char *) &_oc_PortableInterceptor_ServerId,
-    0,
-    sizeof (PortableInterceptor::ServerId)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ServerId,
-    &_tc_TAO_tc_PortableInterceptor_ServerId
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_PortableInterceptor_ORBId[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  42,
-  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 (0x643a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBId:1.0
-    6,
-  ACE_NTOHL (0x4f524249),
-  ACE_NTOHL (0x64000000),  // name = ORBId
-    CORBA::tk_string,
-  0U, // string length
-};
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBId (
-    CORBA::tk_alias,
-    sizeof (_oc_PortableInterceptor_ORBId),
-    (char *) &_oc_PortableInterceptor_ORBId,
-    0,
-    sizeof (PortableInterceptor::ORBId)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ORBId,
-    &_tc_TAO_tc_PortableInterceptor_ORBId
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_PortableInterceptor_AdapterName[] =
-{
-    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 (0x41646170),
-  ACE_NTOHL (0x7465724e),
-  ACE_NTOHL (0x616d653a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/AdapterName:1.0
-    12,
-  ACE_NTOHL (0x41646170),
-  ACE_NTOHL (0x7465724e),
-  ACE_NTOHL (0x616d6500),  // name = AdapterName
-    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_PortableInterceptor_AdapterName (
-    CORBA::tk_alias,
-    sizeof (_oc_PortableInterceptor_AdapterName),
-    (char *) &_oc_PortableInterceptor_AdapterName,
-    0,
-    sizeof (PortableInterceptor::AdapterName)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_AdapterName,
-    &_tc_TAO_tc_PortableInterceptor_AdapterName
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_PortableInterceptor_ObjectId[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  45,
-  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 (0x4f626a65),
-  ACE_NTOHL (0x63744964),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectId:1.0
-    9,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63744964),
-  ACE_NTOHL (0x0),  // name = ObjectId
-    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_PortableInterceptor_ObjectId (
-    CORBA::tk_alias,
-    sizeof (_oc_PortableInterceptor_ObjectId),
-    (char *) &_oc_PortableInterceptor_ObjectId,
-    0,
-    sizeof (PortableInterceptor::ObjectId)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ObjectId,
-    &_tc_TAO_tc_PortableInterceptor_ObjectId
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
-
 static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceFactory[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   59,
-  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 (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636546),
-  ACE_NTOHL (0x6163746f),
-  ACE_NTOHL (0x72793a31),
+  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 (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636546), 
+  ACE_NTOHL (0x6163746f), 
+  ACE_NTOHL (0x72793a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0
     23,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636546),
-  ACE_NTOHL (0x6163746f),
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636546), 
+  ACE_NTOHL (0x6163746f), 
   ACE_NTOHL (0x72790000),  // name = ObjectReferenceFactory
     2, // value modifier
   CORBA::tk_null, // no stateful base valuetype
@@ -355,7 +151,7 @@ PortableInterceptor::ObjectReferenceFactory::_downcast (CORBA::ValueBase *v)
     {
       return 0;
     }
-
+  
   return (ObjectReferenceFactory *) v->_tao_obv_narrow ((ptrdiff_t) &_downcast);
 }
 
@@ -376,9 +172,9 @@ PortableInterceptor::ObjectReferenceFactory::_tao_obv_narrow (ptrdiff_t type_id)
     {
       return this;
     }
-
+  
   void *rval = 0;
-
+  
   return rval;
 }
 
@@ -415,29 +211,29 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (
         base,
         ObjectReferenceFactory::_tao_obv_static_repository_id ()
       );
-
+  
   if (retval == 0)
     {
       return 0;
     }
-
+  
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-
+      
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-
+      
       retval = base->_tao_unmarshal_v (strm);
-
+      
       if (retval == 0)
         {
           return 0;
         }
     }
-
+  
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceFactory::_downcast (base);
@@ -451,27 +247,27 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplate[] =
 {
     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 (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x6174653a),
+  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 (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x6174653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0
     24,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
   ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
     2, // value modifier
   CORBA::tk_null, // no stateful base valuetype
@@ -546,7 +342,7 @@ PortableInterceptor::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
     {
       return 0;
     }
-
+  
   return (ObjectReferenceTemplate *) v->_tao_obv_narrow ((ptrdiff_t) &_downcast);
 }
 
@@ -567,9 +363,9 @@ PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (ptrdiff_t type_id
     {
       return this;
     }
-
+  
   void *rval = 0;
-
+  
   if (rval == 0)
     {
 #if defined (_MSC_VER)
@@ -578,7 +374,7 @@ PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (ptrdiff_t type_id
       rval = this->PortableInterceptor::ObjectReferenceFactory::_tao_obv_narrow (type_id);
 #endif /* _MSC_VER */
     }
-
+  
   return rval;
 }
 
@@ -615,42 +411,47 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceTemplate::_tao_unmarshal (
         base,
         ObjectReferenceTemplate::_tao_obv_static_repository_id ()
       );
-
+  
   if (retval == 0)
     {
       return 0;
     }
-
+  
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-
+      
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-
+      
       retval = base->_tao_unmarshal_v (strm);
-
+      
       if (retval == 0)
         {
           return 0;
         }
     }
-
+  
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceTemplate::_downcast (base);
   return retval;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:72
+
+#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_)
+#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CS_
 
 PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (void)
 {}
 
-PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (CORBA::ULong max)
+PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (
+    CORBA::ULong max
+  )
   : TAO_Unbounded_Valuetype_Sequence<
         PortableInterceptor::ObjectReferenceTemplate,
         PortableInterceptor::ObjectReferenceTemplate_var,
@@ -662,7 +463,7 @@ PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (COR
 PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (
     CORBA::ULong max,
     CORBA::ULong length,
-    PortableInterceptor::ObjectReferenceTemplate ** buffer,
+    PortableInterceptor::ObjectReferenceTemplate * * buffer,
     CORBA::Boolean release
   )
   : TAO_Unbounded_Valuetype_Sequence<
@@ -673,7 +474,9 @@ PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (
     (max, length, buffer, release)
 {}
 
-PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &seq)
+PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (
+    const ObjectReferenceTemplateSeq &seq
+  )
   : TAO_Unbounded_Valuetype_Sequence<
         PortableInterceptor::ObjectReferenceTemplate,
         PortableInterceptor::ObjectReferenceTemplate_var,
@@ -685,15 +488,41 @@ PortableInterceptor::ObjectReferenceTemplateSeq::ObjectReferenceTemplateSeq (con
 PortableInterceptor::ObjectReferenceTemplateSeq::~ObjectReferenceTemplateSeq (void)
 {}
 
-void PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor (void *_tao_void_pointer)
+void PortableInterceptor::ObjectReferenceTemplateSeq::_tao_any_destructor (
+    void * _tao_void_pointer
+  )
 {
-  ObjectReferenceTemplateSeq *tmp = ACE_static_cast (ObjectReferenceTemplateSeq*, _tao_void_pointer);
+  ObjectReferenceTemplateSeq * tmp =
+    ACE_static_cast (
+        ObjectReferenceTemplateSeq *,
+        _tao_void_pointer
+      );
   delete tmp;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class
+  TAO_Valuetype_Manager<
+      PortableInterceptor::ObjectReferenceTemplate,
+      PortableInterceptor::ObjectReferenceTemplate_var,
+      PortableInterceptor::tao_ObjectReferenceTemplate_life
+    >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO_Valuetype_Manager< \
+        PortableInterceptor::ObjectReferenceTemplate, \
+        PortableInterceptor::ObjectReferenceTemplate_var, \
+        PortableInterceptor::tao_ObjectReferenceTemplate_life \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class
   TAO_MngSeq_Var_T<
       PortableInterceptor::ObjectReferenceTemplateSeq,
       TAO_Valuetype_Manager<
@@ -703,15 +532,15 @@ template class
         >
     >;
 
-template class TAO_Seq_Var_Base_T<PortableInterceptor::ObjectReferenceTemplateSeq,
-    TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate,
-                          TAO_Value_Var_T<PortableInterceptor::ObjectReferenceTemplate,
-                                          PortableInterceptor::tao_ObjectReferenceTemplate_life>,
-                          PortableInterceptor::tao_ObjectReferenceTemplate_life> >;
-template class TAO_Unbounded_Valuetype_Sequence<PortableInterceptor::ObjectReferenceTemplate,
-                                                TAO_Value_Var_T<PortableInterceptor::ObjectReferenceTemplate,
-                                                PortableInterceptor::tao_ObjectReferenceTemplate_life>,
-                                                PortableInterceptor::tao_ObjectReferenceTemplate_life>;
+template class
+  TAO_Seq_Var_Base_T<
+      PortableInterceptor::ObjectReferenceTemplateSeq,
+      TAO_Valuetype_Manager<
+          PortableInterceptor::ObjectReferenceTemplate,
+          PortableInterceptor::ObjectReferenceTemplate_var,
+          PortableInterceptor::tao_ObjectReferenceTemplate_life
+        >
+    >;
 
 template class
   TAO_MngSeq_Out_T<
@@ -736,13 +565,18 @@ template class
         > \
     >
 
-#pragma instantiate TAO_Unbounded_Valuetype_Sequence<PortableInterceptor::ObjectReferenceTemplate,
-TAO_Value_Var_T<PortableInterceptor::ObjectReferenceTemplate,
-                PortableInterceptor::tao_ObjectReferenceTemplate_life>,
-                PortableInterceptor::tao_ObjectReferenceTemplate_life>;
+# pragma instantiate \
+  TAO_Seq_Var_Base_T< \
+      PortableInterceptor::ObjectReferenceTemplateSeq, \
+      TAO_Valuetype_Manager< \
+          PortableInterceptor::ObjectReferenceTemplate, \
+          PortableInterceptor::ObjectReferenceTemplate_var, \
+          PortableInterceptor::tao_ObjectReferenceTemplate_life \
+        > \
+    >
 
 # pragma instantiate \
-  TAO_Seq_Out_T< \
+  TAO_MngSeq_Out_T< \
       PortableInterceptor::ObjectReferenceTemplateSeq, \
       PortableInterceptor::ObjectReferenceTemplateSeq_var, \
       TAO_Valuetype_Manager< \
@@ -752,12 +586,32 @@ TAO_Value_Var_T<PortableInterceptor::ObjectReferenceTemplate,
         > \
     >
 
-#pragms instantiate TAO_Seq_Var_Base_T<PortableInterceptor::ObjectReferenceTemplateSeq,
-    TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate,
-                          TAO_Value_Var_T<PortableInterceptor::ObjectReferenceTemplate,
-                                          PortableInterceptor::tao_ObjectReferenceTemplate_life>,
-                          PortableInterceptor::tao_ObjectReferenceTemplate_life> >;
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#if !defined (__TAO_UNBOUNDED_VALUETYPE_SEQUENCE_OBJECTREFERENCETEMPLATE_CS_)
+#define __TAO_UNBOUNDED_VALUETYPE_SEQUENCE_OBJECTREFERENCETEMPLATE_CS_
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class TAO_Unbounded_Valuetype_Sequence<
+    PortableInterceptor::ObjectReferenceTemplate,
+    PortableInterceptor::ObjectReferenceTemplate_var,
+    PortableInterceptor::tao_ObjectReferenceTemplate_life
+  >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate TAO_Unbounded_Valuetype_Sequence<
+    PortableInterceptor::ObjectReferenceTemplate,
+    PortableInterceptor::ObjectReferenceTemplate_var,
+    PortableInterceptor::tao_ObjectReferenceTemplate_life
+  >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#endif /* end #if !defined */
+
+#endif /* end #if !defined */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -766,29 +620,29 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   63,
-  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 (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x61746553),
-  ACE_NTOHL (0x65713a31),
+  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 (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x61746553), 
+  ACE_NTOHL (0x65713a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplateSeq:1.0
     27,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x61746553),
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x61746553), 
   ACE_NTOHL (0x65710000),  // name = ObjectReferenceTemplateSeq
     CORBA::tk_sequence, // typecode kind
   124, // encapsulation length
@@ -797,33 +651,33 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] =
     480, // encapsulation length
       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 (0x4f626a65),
-      ACE_NTOHL (0x63745265),
-      ACE_NTOHL (0x66657265),
-      ACE_NTOHL (0x6e636554),
-      ACE_NTOHL (0x656d706c),
-      ACE_NTOHL (0x6174653a),
+      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 (0x4f626a65), 
+      ACE_NTOHL (0x63745265), 
+      ACE_NTOHL (0x66657265), 
+      ACE_NTOHL (0x6e636554), 
+      ACE_NTOHL (0x656d706c), 
+      ACE_NTOHL (0x6174653a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0
             24,
-      ACE_NTOHL (0x4f626a65),
-      ACE_NTOHL (0x63745265),
-      ACE_NTOHL (0x66657265),
-      ACE_NTOHL (0x6e636554),
-      ACE_NTOHL (0x656d706c),
+      ACE_NTOHL (0x4f626a65), 
+      ACE_NTOHL (0x63745265), 
+      ACE_NTOHL (0x66657265), 
+      ACE_NTOHL (0x6e636554), 
+      ACE_NTOHL (0x656d706c), 
       ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
             2, // value modifier
       CORBA::tk_null, // no stateful base valuetype
 
 3, // member count
-
+      
     0U,
 
 };
@@ -852,25 +706,25 @@ static const CORBA::Long _oc_PortableInterceptor_AdapterManagerId[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   53,
-  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 (0x41646170),
-  ACE_NTOHL (0x7465724d),
-  ACE_NTOHL (0x616e6167),
-  ACE_NTOHL (0x65724964),
-  ACE_NTOHL (0x3a312e30),
+  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 (0x41646170), 
+  ACE_NTOHL (0x7465724d), 
+  ACE_NTOHL (0x616e6167), 
+  ACE_NTOHL (0x65724964), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/AdapterManagerId:1.0
     17,
-  ACE_NTOHL (0x41646170),
-  ACE_NTOHL (0x7465724d),
-  ACE_NTOHL (0x616e6167),
-  ACE_NTOHL (0x65724964),
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x7465724d), 
+  ACE_NTOHL (0x616e6167), 
+  ACE_NTOHL (0x65724964), 
   ACE_NTOHL (0x0),  // name = AdapterManagerId
     CORBA::tk_long,
 
@@ -900,23 +754,23 @@ static const CORBA::Long _oc_PortableInterceptor_AdapterState[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   49,
-  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 (0x41646170),
-  ACE_NTOHL (0x74657253),
-  ACE_NTOHL (0x74617465),
-  ACE_NTOHL (0x3a312e30),
+  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 (0x41646170), 
+  ACE_NTOHL (0x74657253), 
+  ACE_NTOHL (0x74617465), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/AdapterState:1.0
     13,
-  ACE_NTOHL (0x41646170),
-  ACE_NTOHL (0x74657253),
-  ACE_NTOHL (0x74617465),
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x74657253), 
+  ACE_NTOHL (0x74617465), 
   ACE_NTOHL (0x0),  // name = AdapterState
     CORBA::tk_short,
 
@@ -940,7 +794,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_cs.cpp:57
 
 // Copying insertion.
 void
@@ -985,15 +839,13 @@ operator>>= (
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-  template class TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceFactory, PortableInterceptor::ObjectReferenceFactory_var, PortableInterceptor::tao_ObjectReferenceFactory_life>;
   template class TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceFactory, PortableInterceptor::ObjectReferenceFactory_var, PortableInterceptor::tao_ObjectReferenceFactory_life>
 #  pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_cs.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_cs.cpp:57
 
 // Copying insertion.
 void
@@ -1036,27 +888,14 @@ operator>>= (
       );
 }
 
-template<>
-CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>::to_value (
-    CORBA::ValueBase *&_tao_elem
-  ) const
-{
-  CORBA::add_ref (this->value_);
-  _tao_elem = this->value_;
-  return 1;
-}
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-  template class TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var, PortableInterceptor::tao_ObjectReferenceTemplate_life>;
   template class TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Valuetype_Manager<PortableInterceptor::ObjectReferenceTemplate, PortableInterceptor::ObjectReferenceTemplate_var, PortableInterceptor::tao_ObjectReferenceTemplate_life>
 #  pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1122,7 +961,7 @@ CORBA::Boolean operator>>= (
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:270
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:248
 
 void
 CORBA::add_ref (PortableInterceptor::ObjectReferenceFactory * vt)
@@ -1174,7 +1013,7 @@ operator>> (
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:270
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:248
 
 void
 CORBA::add_ref (PortableInterceptor::ObjectReferenceTemplate * vt)
@@ -1226,7 +1065,10 @@ operator>> (
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:80
+
+#if !defined _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_
+#define _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -1234,20 +1076,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].in ());
         }
-
+      
       return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
@@ -1257,7 +1099,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -1267,26 +1109,30 @@ 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].out ());
         }
-
+      
       return _tao_marshal_flag;
+    
     }
-
+  
   return 0;
 }
+
+#endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_CPP_ */
+
diff --git a/TAO/tao/ObjectReferenceTemplateC.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
index f577abfc4d2..9b208607b0b 100644
--- a/TAO/tao/ObjectReferenceTemplateC.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
@@ -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
@@ -26,31 +32,31 @@
 #define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_
 
 #include "ace/pre.h"
-#include "tao/OctetSeqC.h"
+#include "ort_export.h"
+#include "tao/PI_ForwardC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/StringSeqC.h"
-#include "tao/ValueBase.h"
 #include "tao/Exception.h"
-#include "tao/Any_T.h"
-#include "tao/Value_VarOut_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Dual_Impl_T.h"
+#include "tao/Valuetype/ValueBase.h"
+#include "tao/Valuetype/ValueFactory.h"
+#include "tao/Valuetype/Value_VarOut_T.h"
+#include "tao/Valuetype/Sequence_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO TAO_Export
+#define TAO_EXPORT_MACRO TAO_ORT_Export
 
 #if defined (TAO_EXPORT_NESTED_CLASSES)
 #  if defined (TAO_EXPORT_NESTED_MACRO)
 #    undef TAO_EXPORT_NESTED_MACRO
 #  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_Export
+#  define TAO_EXPORT_NESTED_MACRO TAO_ORT_Export
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
@@ -69,86 +75,47 @@
 
 TAO_NAMESPACE  PortableInterceptor
 {
-
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
-
-  typedef char * ServerId;
-  typedef CORBA::String_var ServerId_var;
-  typedef CORBA::String_out ServerId_out;
-
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerId;
-
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
-
-  typedef char * ORBId;
-  typedef CORBA::String_var ORBId_var;
-  typedef CORBA::String_out ORBId_out;
-
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBId;
-
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:426
-
-  typedef CORBA::StringSeq AdapterName;
-  typedef CORBA::StringSeq_var AdapterName_var;
-  typedef CORBA::StringSeq_out AdapterName_out;
-
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterName;
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:426
-
-  typedef CORBA::OctetSeq ObjectId;
-  typedef CORBA::OctetSeq_var ObjectId_var;
-  typedef CORBA::OctetSeq_out ObjectId_out;
-
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId;
-
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:307
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:285
+  
+  
 
+#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ODDS_N_ENDS_CH_)
+#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ODDS_N_ENDS_CH_
+  
   class ObjectReferenceFactory;
   struct tao_ObjectReferenceFactory_life;
+  
   typedef
     TAO_Value_Var_T<
         ObjectReferenceFactory,
         tao_ObjectReferenceFactory_life
       >
     ObjectReferenceFactory_var;
+  
   typedef
     TAO_Value_Out_T<
         ObjectReferenceFactory,
         tao_ObjectReferenceFactory_life
       >
     ObjectReferenceFactory_out;
-
-  struct TAO_Export tao_ObjectReferenceFactory_life
+  
+  struct TAO_ORT_Export tao_ObjectReferenceFactory_life
   {
     static void tao_add_ref (ObjectReferenceFactory *);
     static void tao_remove_ref (ObjectReferenceFactory *);
   };
 
+#endif /* end #if !defined */
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:56
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY_CH_
-
-  class TAO_Export ObjectReferenceFactory
+  
+  class TAO_ORT_Export ObjectReferenceFactory
     : public virtual CORBA::ValueBase
   {
   public:
@@ -163,62 +130,81 @@ TAO_NAMESPACE  PortableInterceptor
       );
     virtual const char* _tao_obv_repository_id (void) const;
     static const char* _tao_obv_static_repository_id (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:427
-
+    
     virtual CORBA::Object_ptr make_object (
         const char *, const PortableInterceptor::ObjectId & ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:272
-
+  
   protected:
     ObjectReferenceFactory (void);
     virtual ~ObjectReferenceFactory (void);
-
+    
     virtual void *_tao_obv_narrow (ptrdiff_t);
 #if defined (_MSC_VER)
     virtual void *PortableInterceptor_ObjectReferenceFactory_tao_obv_narrow (ptrdiff_t);
 #endif /* _MSC_VER */
-
+    
   private:
     ObjectReferenceFactory (const ObjectReferenceFactory &);
     void operator= (const ObjectReferenceFactory &);
-
+    
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceFactory;
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:307
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:285
+  
+  
 
+#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__ODDS_N_ENDS_CH_)
+#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE__ODDS_N_ENDS_CH_
+  
   class ObjectReferenceTemplate;
   struct tao_ObjectReferenceTemplate_life;
-  typedef TAO_Value_Var_T<ObjectReferenceTemplate, tao_ObjectReferenceTemplate_life> ObjectReferenceTemplate_var;
-  typedef TAO_Value_Out_T<ObjectReferenceTemplate, tao_ObjectReferenceTemplate_life> ObjectReferenceTemplate_out;
-
-  struct TAO_Export tao_ObjectReferenceTemplate_life
+  
+  typedef
+    TAO_Value_Var_T<
+        ObjectReferenceTemplate,
+        tao_ObjectReferenceTemplate_life
+      >
+    ObjectReferenceTemplate_var;
+  
+  typedef
+    TAO_Value_Out_T<
+        ObjectReferenceTemplate,
+        tao_ObjectReferenceTemplate_life
+      >
+    ObjectReferenceTemplate_out;
+  
+  struct TAO_ORT_Export tao_ObjectReferenceTemplate_life
   {
     static void tao_add_ref (ObjectReferenceTemplate *);
     static void tao_remove_ref (ObjectReferenceTemplate *);
   };
 
+#endif /* end #if !defined */
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:56
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATE_CH_
-
-  class TAO_Export ObjectReferenceTemplate
+  
+  class TAO_ORT_Export ObjectReferenceTemplate
     : public virtual ObjectReferenceFactory
   {
   public:
@@ -233,89 +219,92 @@ TAO_NAMESPACE  PortableInterceptor
       );
     virtual const char* _tao_obv_repository_id (void) const;
     static const char* _tao_obv_static_repository_id (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:427
-
+    
     virtual char * server_id (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:427
-
+    
     virtual char * orb_id (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:427
-
+    
     virtual ::PortableInterceptor::AdapterName * adapter_name (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:272
-
+  
   protected:
     ObjectReferenceTemplate (void);
     virtual ~ObjectReferenceTemplate (void);
-
+    
     virtual void *_tao_obv_narrow (ptrdiff_t);
 #if defined (_MSC_VER)
     virtual void *PortableInterceptor_ObjectReferenceTemplate_tao_obv_narrow (ptrdiff_t);
 #endif /* _MSC_VER */
-
+    
   private:
     ObjectReferenceTemplate (const ObjectReferenceTemplate &);
     void operator= (const ObjectReferenceTemplate &);
-
+    
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate;
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:91
 
+#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_)
+#define _PORTABLEINTERCEPTOR_OBJECTREFERENCETEMPLATESEQ_CH_
+  
   class ObjectReferenceTemplateSeq;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         ObjectReferenceTemplateSeq,
         TAO_Valuetype_Manager<
-            PortableInterceptor::ObjectReferenceTemplate,
-            PortableInterceptor::ObjectReferenceTemplate_var,
+            ObjectReferenceTemplate,
+            ObjectReferenceTemplate_var,
             PortableInterceptor::tao_ObjectReferenceTemplate_life
           >
       >
     ObjectReferenceTemplateSeq_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         ObjectReferenceTemplateSeq,
         ObjectReferenceTemplateSeq_var,
         TAO_Valuetype_Manager<
-            PortableInterceptor::ObjectReferenceTemplate,
-            PortableInterceptor::ObjectReferenceTemplate_var,
+            ObjectReferenceTemplate,
+            ObjectReferenceTemplate_var,
             PortableInterceptor::tao_ObjectReferenceTemplate_life
           >
       >
     ObjectReferenceTemplateSeq_out;
-
-  class TAO_Export ObjectReferenceTemplateSeq
+  
+  class TAO_ORT_Export ObjectReferenceTemplateSeq
     : public
         TAO_Unbounded_Valuetype_Sequence<
-            PortableInterceptor::ObjectReferenceTemplate,
-            PortableInterceptor::ObjectReferenceTemplate_var,
-            PortableInterceptor::tao_ObjectReferenceTemplate_life
+            ObjectReferenceTemplate,
+            ObjectReferenceTemplate_var,
+            tao_ObjectReferenceTemplate_life
           >
   {
   public:
@@ -324,67 +313,69 @@ TAO_NAMESPACE  PortableInterceptor
     ObjectReferenceTemplateSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ObjectReferenceTemplate ** buffer,
+        ObjectReferenceTemplate ** buffer, 
         CORBA::Boolean release = 0
       );
     ObjectReferenceTemplateSeq (const ObjectReferenceTemplateSeq &);
     ~ObjectReferenceTemplateSeq (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ObjectReferenceTemplateSeq_var _var_type;
   };
 
+#endif /* end #if !defined */
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplateSeq;
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:343
+  
   typedef CORBA::Long AdapterManagerId;
   typedef CORBA::Long_out AdapterManagerId_out;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterManagerId;
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:343
+  
   typedef CORBA::Short AdapterState;
   typedef CORBA::Short_out AdapterState_out;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterState;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState HOLDING = 0;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState ACTIVE = 1;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState DISCARDING = 2;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState INACTIVE = 3;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState NON_EXISTENT = 4;
 
 // TAO_IDL - Generated from
@@ -398,7 +389,7 @@ TAO_NAMESPACE_CLOSE // module PortableInterceptor
 
 TAO_NAMESPACE  OBV_PortableInterceptor
 {
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/obv_module.cpp:85
 
@@ -407,24 +398,24 @@ TAO_NAMESPACE  OBV_PortableInterceptor
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_ch.cpp:54
 
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceFactory *); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceFactory **); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceFactory *&);
+TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceFactory *); // copying
+TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceFactory **); // non-copying
+TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceFactory *&);
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_ch.cpp:54
 
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate *); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate **); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate *&);
+TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate *); // copying
+TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate **); // non-copying
+TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceTemplate *&);
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
-TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ObjectReferenceTemplateSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplateSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceTemplateSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ObjectReferenceTemplateSeq *&);
+TAO_ORT_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ObjectReferenceTemplateSeq &); // copying version
+TAO_ORT_Export void operator<<= (CORBA::Any &, PortableInterceptor::ObjectReferenceTemplateSeq*); // noncopying version
+TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ObjectReferenceTemplateSeq *&); // deprecated
+TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::ObjectReferenceTemplateSeq *&);
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
@@ -432,7 +423,7 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterce
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:212
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:190
 
 TAO_NAMESPACE CORBA
 {
@@ -444,11 +435,11 @@ TAO_NAMESPACE_CLOSE
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ch.cpp:61
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceFactory *);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceFactory *&);
+TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceFactory *);
+TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceFactory *&);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:212
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:190
 
 TAO_NAMESPACE CORBA
 {
@@ -460,20 +451,20 @@ TAO_NAMESPACE_CLOSE
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ch.cpp:61
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceTemplate *);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceTemplate *&);
+TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceTemplate *);
+TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceTemplate *&);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70
 
 #if !defined _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_
 #define _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_H_
 
-TAO_Export CORBA::Boolean operator<< (
+TAO_ORT_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const PortableInterceptor::ObjectReferenceTemplateSeq &
   );
-TAO_Export CORBA::Boolean operator>> (
+TAO_ORT_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     PortableInterceptor::ObjectReferenceTemplateSeq &
   );
@@ -486,7 +477,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1048
 
 #if defined (__ACE_INLINE__)
 #include "ObjectReferenceTemplateC.i"
@@ -502,3 +493,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #include "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/ObjectReferenceTemplateC.i b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.i
index 920743c6412..2c55d37978d 100644
--- a/TAO/tao/ObjectReferenceTemplateC.i
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.i
@@ -15,12 +15,18 @@
 //       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
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ci.cpp:56
 
 ACE_INLINE
@@ -31,7 +37,7 @@ ACE_INLINE
 PortableInterceptor::ObjectReferenceFactory::~ObjectReferenceFactory (void)
 {}
 
-ACE_INLINE const char*
+ACE_INLINE const char* 
 PortableInterceptor::ObjectReferenceFactory::_tao_obv_static_repository_id ()
 {
   return "IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0";
@@ -49,7 +55,7 @@ TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceFactory>::to_value (
   return 1;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ci.cpp:56
 
 ACE_INLINE
@@ -60,14 +66,26 @@ ACE_INLINE
 PortableInterceptor::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
 {}
 
-ACE_INLINE const char*
+ACE_INLINE const char* 
 PortableInterceptor::ObjectReferenceTemplate::_tao_obv_static_repository_id ()
 {
   return "IDL:omg.org/PortableInterceptor/ObjectReferenceTemplate:1.0";
 }
 
+template<>
+ACE_INLINE
+CORBA::Boolean
+TAO::Any_Impl_T<PortableInterceptor::ObjectReferenceTemplate>::to_value (
+    CORBA::ValueBase *&_tao_elem
+  ) const
+{
+  CORBA::add_ref (this->value_);
+  _tao_elem = this->value_;
+  return 1;
+}
+
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:242
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:220
 
 #if defined (__ACE_INLINE__)
 
@@ -83,11 +101,11 @@ TAO_NAMESPACE_CLOSE
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ci.cpp:60
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceFactory *);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceFactory *&);
+TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceFactory *);
+TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceFactory *&);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:242
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:220
 
 #if defined (__ACE_INLINE__)
 
@@ -103,23 +121,24 @@ TAO_NAMESPACE_CLOSE
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ci.cpp:60
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceTemplate *);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceTemplate *&);
+TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::ObjectReferenceTemplate *);
+TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::ObjectReferenceTemplate *&);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81
 
 #if !defined _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_I_
 #define _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_I_
 
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean TAO_ORT_Export operator<< (
     TAO_OutputCDR &,
     const PortableInterceptor::ObjectReferenceTemplateSeq &
   );
 
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean TAO_ORT_Export operator>> (
     TAO_InputCDR &,
     PortableInterceptor::ObjectReferenceTemplateSeq &
   );
 
 #endif /* _TAO_CDR_OP_PortableInterceptor_ObjectReferenceTemplateSeq_I_ */
+
diff --git a/TAO/tao/ObjRefTemplate/TAO_ObjRefTemplate.dsp b/TAO/tao/ObjRefTemplate/TAO_ObjRefTemplate.dsp
new file mode 100644
index 00000000000..1cdb81785a7
--- /dev/null
+++ b/TAO/tao/ObjRefTemplate/TAO_ObjRefTemplate.dsp
@@ -0,0 +1,124 @@
+# Microsoft Developer Studio Project File - Name="ObjRefTemplate" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+

+CFG=ObjRefTemplate - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "TAO_ObjRefTemplate.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "TAO_ObjRefTemplate.mak" CFG="ObjRefTemplate - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "ObjRefTemplate - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "ObjRefTemplate - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+MTL=midl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "ObjRefTemplate - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OBJREFTEMPLATE_EXPORTS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "TAO_ORT_BUILD_DLL" /YX /FD /c

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

+# ADD LINK32 TAO_Valuetype.lib TAO.lib ace.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_ObjRefTemplate.dll" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+

+!ELSEIF  "$(CFG)" == "ObjRefTemplate - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OBJREFTEMPLATE_EXPORTS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "TAO_ORT_BUILD_DLL" /YX /FD /c

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 TAO_Valuetyped.lib TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_ObjRefTemplated.dll" /pdbtype:sept /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "ObjRefTemplate - Win32 Release"

+# Name "ObjRefTemplate - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# Begin Source File

+

+SOURCE=.\ObjectReferenceTemplateC.cpp

+# ADD CPP /GR

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=.\ObjectReferenceTemplateC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ort_export.h

+# End Source File

+# End Group

+# Begin Group "Inline Files"

+

+# PROP Default_Filter "i"

+# Begin Source File

+

+SOURCE=.\ObjectReferenceTemplateC.i

+# End Source File

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "rc"

+# End Group

+# End Target

+# End Project

diff --git a/TAO/tao/ObjRefTemplate/ort_export.h b/TAO/tao/ObjRefTemplate/ort_export.h
new file mode 100644
index 00000000000..3da9ca420ee
--- /dev/null
+++ b/TAO/tao/ObjRefTemplate/ort_export.h
@@ -0,0 +1,40 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl
+// ------------------------------
+#ifndef TAO_ORT_EXPORT_H
+#define TAO_ORT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (TAO_AS_STATIC_LIBS)
+#  if !defined (TAO_ORT_HAS_DLL)
+#    define TAO_ORT_HAS_DLL 0
+#  endif /* ! TAO_ORT_HAS_DLL */
+#else
+#  if !defined (TAO_ORT_HAS_DLL)
+#    define TAO_ORT_HAS_DLL 1
+#  endif /* ! TAO_ORT_HAS_DLL */
+#endif
+
+#if defined (TAO_ORT_HAS_DLL) && (TAO_ORT_HAS_DLL == 1)
+#  if defined (TAO_ORT_BUILD_DLL)
+#    define TAO_ORT_Export ACE_Proper_Export_Flag
+#    define TAO_ORT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TAO_ORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TAO_ORT_BUILD_DLL */
+#    define TAO_ORT_Export ACE_Proper_Import_Flag
+#    define TAO_ORT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TAO_ORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TAO_ORT_BUILD_DLL */
+#else /* TAO_ORT_HAS_DLL == 1 */
+#  define TAO_ORT_Export
+#  define TAO_ORT_SINGLETON_DECLARATION(T)
+#  define TAO_ORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TAO_ORT_HAS_DLL == 1 */
+
+#endif /* TAO_ORT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index 2ff2065051f..c5b69977071 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -2,7 +2,7 @@
 
 //=============================================================================
 /**
- *  @file    Object.h
+ *  @file    Object.h`
  *
  *  $Id$
  *
diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp
index 077e66f1af6..dc8fa6b7ffa 100644
--- a/TAO/tao/OctetSeqC.cpp
+++ b/TAO/tao/OctetSeqC.cpp
@@ -33,6 +33,7 @@
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
+#include "Any_Dual_Impl_T.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
@@ -49,9 +50,6 @@
 #include "OctetSeqC.i"
 #endif /* !defined INLINE */
 
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_cs.cpp:70
-
 #if !defined (_CORBA_OCTETSEQ_CS_)
 #define _CORBA_OCTETSEQ_CS_
 
diff --git a/TAO/tao/PI_Forward.pidl b/TAO/tao/PI_Forward.pidl
new file mode 100644
index 00000000000..aee3389a241
--- /dev/null
+++ b/TAO/tao/PI_Forward.pidl
@@ -0,0 +1,48 @@
+// -*- IDL -*-
+
+/**
+ * @file PI_Forward.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for typedefs in the 
+ * PortableInterceptor module.
+ *
+ * This file is used to generate PI_Forward.{h,i,cpp},
+ * using the following command:
+ *
+ *   tao_idl.exe
+ *        -o orig -Gp -Gd -Ge 1
+ *        -Wb,export_macro=TAO_Export
+ *        -Wb,export_include=tao/TAO_Export.h
+ *        -Wb,pre_include="ace/pre.h"
+ *        -Wb,post_include="ace/post.h"
+ *        PI_Forward.pidl
+ *
+ * and then:
+ *
+ * cp orig/PI_Forward.{h,i,cpp} .
+ *
+ * The code left in PI_Forward.{h,i,cpp} is ready for use.
+ *
+ */
+
+// File: PI_Forward.pidl
+
+#ifndef _PI_FORWARD_IDL_
+#define _PI_FORWARD_IDL_
+
+#include <OctetSeq.pidl>
+#include <StringSeq.pidl>
+
+module PortableInterceptor
+{
+  typeprefix PortableInterceptor "omg.org";
+
+  typedef string ServerId;
+  typedef string ORBId;
+  typedef CORBA::StringSeq AdapterName;
+  typedef CORBA::OctetSeq ObjectId;
+};
+
+#endif  /* _PI_FORWARD_IDL_ */
diff --git a/TAO/tao/PI_ForwardC.cpp b/TAO/tao/PI_ForwardC.cpp
new file mode 100644
index 00000000000..929808c426f
--- /dev/null
+++ b/TAO/tao/PI_ForwardC.cpp
@@ -0,0 +1,259 @@
+// -*- 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_codegen.cpp:314
+
+
+#include "PI_ForwardC.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "PI_ForwardC.i"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_ServerId[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  45,
+  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 (0x65724964), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ServerId:1.0
+    9,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65724964), 
+  ACE_NTOHL (0x0),  // name = ServerId
+    CORBA::tk_string, 
+  0U, // string length
+};
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ServerId (
+    CORBA::tk_alias,
+    sizeof (_oc_PortableInterceptor_ServerId),
+    (char *) &_oc_PortableInterceptor_ServerId,
+    0,
+    sizeof (PortableInterceptor::ServerId)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ServerId,
+    &_tc_TAO_tc_PortableInterceptor_ServerId
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_ORBId[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  42,
+  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 (0x643a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableInterceptor/ORBId:1.0
+    6,
+  ACE_NTOHL (0x4f524249), 
+  ACE_NTOHL (0x64000000),  // name = ORBId
+    CORBA::tk_string, 
+  0U, // string length
+};
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBId (
+    CORBA::tk_alias,
+    sizeof (_oc_PortableInterceptor_ORBId),
+    (char *) &_oc_PortableInterceptor_ORBId,
+    0,
+    sizeof (PortableInterceptor::ORBId)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ORBId,
+    &_tc_TAO_tc_PortableInterceptor_ORBId
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_AdapterName[] =
+{
+    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 (0x41646170), 
+  ACE_NTOHL (0x7465724e), 
+  ACE_NTOHL (0x616d653a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/AdapterName:1.0
+    12,
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x7465724e), 
+  ACE_NTOHL (0x616d6500),  // name = AdapterName
+    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_PortableInterceptor_AdapterName (
+    CORBA::tk_alias,
+    sizeof (_oc_PortableInterceptor_AdapterName),
+    (char *) &_oc_PortableInterceptor_AdapterName,
+    0,
+    sizeof (PortableInterceptor::AdapterName)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_AdapterName,
+    &_tc_TAO_tc_PortableInterceptor_AdapterName
+  )
+TAO_NAMESPACE_END
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+
+static const CORBA::Long _oc_PortableInterceptor_ObjectId[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  45,
+  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 (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectId:1.0
+    9,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
+  ACE_NTOHL (0x0),  // name = ObjectId
+    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_PortableInterceptor_ObjectId (
+    CORBA::tk_alias,
+    sizeof (_oc_PortableInterceptor_ObjectId),
+    (char *) &_oc_PortableInterceptor_ObjectId,
+    0,
+    sizeof (PortableInterceptor::ObjectId)
+  );
+
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (PortableInterceptor)
+TAO_NAMESPACE_DEFINE (
+    ::CORBA::TypeCode_ptr,
+    _tc_ObjectId,
+    &_tc_TAO_tc_PortableInterceptor_ObjectId
+  )
+TAO_NAMESPACE_END
+
diff --git a/TAO/tao/PI_ForwardC.h b/TAO/tao/PI_ForwardC.h
new file mode 100644
index 00000000000..1e7d72c5f4b
--- /dev/null
+++ b/TAO/tao/PI_ForwardC.h
@@ -0,0 +1,155 @@
+// -*- 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_codegen.cpp:151
+
+#ifndef _TAO_IDL_ORIG_PI_FORWARDC_H_
+#define _TAO_IDL_ORIG_PI_FORWARDC_H_
+
+#include "ace/pre.h"
+
+#include "tao/TAO_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "OctetSeqC.h"
+#include "StringSeqC.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
+
+TAO_NAMESPACE  PortableInterceptor
+{
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
+  
+  typedef char * ServerId;
+  typedef CORBA::String_var ServerId_var;
+  typedef CORBA::String_out ServerId_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerId;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
+  
+  typedef char * ORBId;
+  typedef CORBA::String_var ORBId_var;
+  typedef CORBA::String_out ORBId_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBId;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:426
+  
+  typedef CORBA::StringSeq AdapterName;
+  typedef CORBA::StringSeq_var AdapterName_var;
+  typedef CORBA::StringSeq_out AdapterName_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterName;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:426
+  
+  typedef CORBA::OctetSeq ObjectId;
+  typedef CORBA::OctetSeq_var ObjectId_var;
+  typedef CORBA::OctetSeq_out ObjectId_out;
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId;
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+
+}
+TAO_NAMESPACE_CLOSE // module PortableInterceptor
+
+// 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:1018
+
+#if defined (__ACE_INLINE__)
+#include "PI_ForwardC.i"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/PI_ForwardC.i b/TAO/tao/PI_ForwardC.i
new file mode 100644
index 00000000000..38aa32569ba
--- /dev/null
+++ b/TAO/tao/PI_ForwardC.i
@@ -0,0 +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/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp
index 7d25acf0c14..b1b92748d0c 100644
--- a/TAO/tao/Policy_ForwardC.cpp
+++ b/TAO/tao/Policy_ForwardC.cpp
@@ -24,6 +24,8 @@
 
 
 #include "Policy_ForwardC.h"
+#include "tao/Any_Basic_Impl_T.h"
+#include "tao/Any_Dual_IMpl_T.h"
 #include "tao/Stub.h"
 
 #if defined (__BORLANDC__)
diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl
index 2db0543b4c8..16dcfb474b0 100644
--- a/TAO/tao/PortableInterceptor.pidl
+++ b/TAO/tao/PortableInterceptor.pidl
@@ -37,9 +37,9 @@
 #ifndef _PORTABLE_INTERCEPTOR_IDL_
 #define _PORTABLE_INTERCEPTOR_IDL_
 
+#include <PI_Forward.pidl>
 #include <Current.pidl>
 #include <Dynamic.pidl>
-#include <ObjectReferenceTemplate.pidl>
 #include <Messaging_SyncScope.pidl>
 #include <IOP.pidl>
 
@@ -108,11 +108,6 @@ module PortableInterceptor {
       in boolean replace);
   };
 
-  // typedef string ServerId;
-  // typedef string ORBId;
-  // typedef CORBA::StringSeq AdapterName;
-  // typedef CORBA::OctetSeq ObjectId;
-
   local interface ServerRequestInfo : RequestInfo {
     readonly attribute any sending_exception;
     readonly attribute ServerId server_id;
@@ -145,35 +140,14 @@ module PortableInterceptor {
     void send_other (in ServerRequestInfo ri) raises (ForwardRequest);
   };
 
-  local interface IORInfo {
-    CORBA::Policy get_effective_policy (in CORBA::PolicyType type);
-    void add_ior_component (in IOP::TaggedComponent a_component);
-    void add_ior_component_to_profile (
-      in IOP::TaggedComponent a_component,
-      in IOP::ProfileId profile_id);
-    readonly attribute AdapterManagerId manager_id;
-    readonly attribute AdapterState state;
-    readonly attribute ObjectReferenceTemplate adapter_template;
-    attribute ObjectReferenceFactory current_factory;
-    };
-
-  local interface IORInterceptor : Interceptor {
-    void establish_components (in IORInfo info);
-
-    void components_established (in IORInfo info);
-    void adapter_manager_state_changed(
-       in AdapterManagerId id, in AdapterState state);
-    void adapter_state_changed (
-       in ObjectReferenceTemplateSeq templates,
-       in AdapterState state);
-  };
-
   local interface PolicyFactory
   {
     CORBA::Policy create_policy (in CORBA::PolicyType type, in any value)
       raises (CORBA::PolicyError);
   };
 
+  local interface IORInterceptor;
+
   local interface ORBInitInfo {
     typedef string ObjectId;
     exception DuplicateName {
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index 74e60727435..836308e8346 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -15,12 +15,18 @@
 //       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:314
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:344
 
 
 #include "PortableInterceptorC.h"
@@ -44,21 +50,21 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:63
 
 int PortableInterceptor::Interceptor::_tao_class_id = 0;
 
 PortableInterceptor::Interceptor_ptr
 PortableInterceptor::tao_Interceptor_life::tao_duplicate (
-    PortableInterceptor::Interceptor_ptr p
+    Interceptor_ptr p
   )
 {
-  return PortableInterceptor::Interceptor::_duplicate (p);
+  return Interceptor::_duplicate (p);
 }
 
 void
 PortableInterceptor::tao_Interceptor_life::tao_release (
-    PortableInterceptor::Interceptor_ptr p
+    Interceptor_ptr p
   )
 {
   CORBA::release (p);
@@ -69,12 +75,12 @@ PortableInterceptor::tao_Interceptor_life::tao_nil (
     void
   )
 {
-  return PortableInterceptor::Interceptor::_nil ();
+  return Interceptor::_nil ();
 }
 
 CORBA::Boolean
 PortableInterceptor::tao_Interceptor_life::tao_marshal (
-    PortableInterceptor::Interceptor_ptr p,
+    Interceptor_ptr p,
     TAO_OutputCDR &cdr
   )
 {
@@ -87,7 +93,7 @@ PortableInterceptor::tao_Interceptor_cast::tao_narrow (
     ACE_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::Interceptor::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return Interceptor::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -95,8 +101,8 @@ PortableInterceptor::tao_Interceptor_cast::tao_upcast (
     void *src
   )
 {
-  PortableInterceptor::Interceptor **tmp =
-    ACE_static_cast (PortableInterceptor::Interceptor **, src);
+  Interceptor **tmp =
+    ACE_static_cast (Interceptor **, src);
   return *tmp;
 }
 
@@ -124,8 +130,8 @@ PortableInterceptor::tao_Interceptor_cast::tao_upcast (
       >
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:245
 
 PortableInterceptor::Interceptor::Interceptor (void)
 {}
@@ -133,7 +139,7 @@ PortableInterceptor::Interceptor::Interceptor (void)
 PortableInterceptor::Interceptor::~Interceptor (void)
 {}
 
-void
+void 
 PortableInterceptor::Interceptor::_tao_any_destructor (void *_tao_void_pointer)
 {
   Interceptor *tmp = ACE_static_cast (Interceptor *, _tao_void_pointer);
@@ -149,7 +155,7 @@ PortableInterceptor::Interceptor::_narrow (
   return Interceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::Interceptor_ptr
+PortableInterceptor::Interceptor_ptr 
 PortableInterceptor::Interceptor::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -159,7 +165,7 @@ PortableInterceptor::Interceptor::_unchecked_narrow (
     {
       return Interceptor::_nil ();
     }
-
+  
   return
       ACE_reinterpret_cast (
           Interceptor_ptr,
@@ -179,14 +185,14 @@ PortableInterceptor::Interceptor::_duplicate (Interceptor_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
 void *PortableInterceptor::Interceptor::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
-
+  
   if (type == ACE_reinterpret_cast (
               ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id)
@@ -205,12 +211,12 @@ void *PortableInterceptor::Interceptor::_tao_QueryInterface (ptrdiff_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-
+  
   if (retv != 0)
     {
       this->_add_ref ();
     }
-
+  
   return retv;
 }
 
@@ -232,21 +238,21 @@ 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 (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 (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
   ACE_NTOHL (0x746f7200),  // name = Interceptor
   };
 
@@ -267,7 +273,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::ForwardRequest::ForwardRequest (void)
@@ -353,7 +359,7 @@ void PortableInterceptor::ForwardRequest::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -366,7 +372,7 @@ void PortableInterceptor::ForwardRequest::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -400,47 +406,47 @@ 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 (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 (0x466f7277), 
+  ACE_NTOHL (0x61726452), 
+  ACE_NTOHL (0x65717565), 
   ACE_NTOHL (0x73740000),  // name = ForwardRequest
   2, // member count
     8,
-  ACE_NTOHL (0x666f7277),
+  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 (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 (0x4f626a65), 
     ACE_NTOHL (0x63740000),  // name = Object
-
+    
   10,
-  ACE_NTOHL (0x7065726d),
-  ACE_NTOHL (0x616e656e),
+  ACE_NTOHL (0x7065726d), 
+  ACE_NTOHL (0x616e656e), 
   ACE_NTOHL (0x74000000),  // name = permanent
     CORBA::tk_boolean,
 
@@ -470,21 +476,21 @@ 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 (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 (0x5265706c), 
+  ACE_NTOHL (0x79537461), 
   ACE_NTOHL (0x74757300),  // name = ReplyStatus
     CORBA::tk_short,
 
@@ -514,19 +520,19 @@ 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 (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 (0x536c6f74), 
   ACE_NTOHL (0x49640000),  // name = SlotId
     CORBA::tk_ulong,
 
@@ -549,7 +555,7 @@ TAO_NAMESPACE_DEFINE (
   )
 TAO_NAMESPACE_END
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::InvalidSlot::InvalidSlot (void)
@@ -631,7 +637,7 @@ void PortableInterceptor::InvalidSlot::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -644,7 +650,7 @@ void PortableInterceptor::InvalidSlot::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -661,21 +667,21 @@ 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 (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 (0x496e7661), 
+  ACE_NTOHL (0x6c696453), 
   ACE_NTOHL (0x6c6f7400),  // name = InvalidSlot
   0, // member count
   };
@@ -698,21 +704,21 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:63
 
 int PortableInterceptor::Current::_tao_class_id = 0;
 
 PortableInterceptor::Current_ptr
 PortableInterceptor::tao_Current_life::tao_duplicate (
-    PortableInterceptor::Current_ptr p
+    Current_ptr p
   )
 {
-  return PortableInterceptor::Current::_duplicate (p);
+  return Current::_duplicate (p);
 }
 
 void
 PortableInterceptor::tao_Current_life::tao_release (
-    PortableInterceptor::Current_ptr p
+    Current_ptr p
   )
 {
   CORBA::release (p);
@@ -723,12 +729,12 @@ PortableInterceptor::tao_Current_life::tao_nil (
     void
   )
 {
-  return PortableInterceptor::Current::_nil ();
+  return Current::_nil ();
 }
 
 CORBA::Boolean
 PortableInterceptor::tao_Current_life::tao_marshal (
-    PortableInterceptor::Current_ptr p,
+    Current_ptr p,
     TAO_OutputCDR &cdr
   )
 {
@@ -741,7 +747,7 @@ PortableInterceptor::tao_Current_cast::tao_narrow (
     ACE_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::Current::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return Current::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -749,8 +755,8 @@ PortableInterceptor::tao_Current_cast::tao_upcast (
     void *src
   )
 {
-  PortableInterceptor::Current **tmp =
-    ACE_static_cast (PortableInterceptor::Current **, src);
+  Current **tmp =
+    ACE_static_cast (Current **, src);
   return *tmp;
 }
 
@@ -778,8 +784,8 @@ PortableInterceptor::tao_Current_cast::tao_upcast (
       >
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:245
 
 PortableInterceptor::Current::Current (void)
 {}
@@ -787,7 +793,7 @@ PortableInterceptor::Current::Current (void)
 PortableInterceptor::Current::~Current (void)
 {}
 
-void
+void 
 PortableInterceptor::Current::_tao_any_destructor (void *_tao_void_pointer)
 {
   Current *tmp = ACE_static_cast (Current *, _tao_void_pointer);
@@ -803,7 +809,7 @@ PortableInterceptor::Current::_narrow (
   return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::Current_ptr
+PortableInterceptor::Current_ptr 
 PortableInterceptor::Current::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -813,7 +819,7 @@ PortableInterceptor::Current::_unchecked_narrow (
     {
       return Current::_nil ();
     }
-
+  
   return
       ACE_reinterpret_cast (
           Current_ptr,
@@ -833,14 +839,14 @@ PortableInterceptor::Current::_duplicate (Current_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
 void *PortableInterceptor::Current::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
-
+  
   if (type == ACE_reinterpret_cast (
               ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, Current)::_tao_class_id)
@@ -873,12 +879,12 @@ void *PortableInterceptor::Current::_tao_QueryInterface (ptrdiff_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-
+  
   if (retv != 0)
     {
       this->_add_ref ();
     }
-
+  
   return retv;
 }
 
@@ -900,19 +906,19 @@ 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 (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 (0x43757272), 
   ACE_NTOHL (0x656e7400),  // name = Current
   };
 
@@ -934,21 +940,21 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:63
 
 int PortableInterceptor::RequestInfo::_tao_class_id = 0;
 
 PortableInterceptor::RequestInfo_ptr
 PortableInterceptor::tao_RequestInfo_life::tao_duplicate (
-    PortableInterceptor::RequestInfo_ptr p
+    RequestInfo_ptr p
   )
 {
-  return PortableInterceptor::RequestInfo::_duplicate (p);
+  return RequestInfo::_duplicate (p);
 }
 
 void
 PortableInterceptor::tao_RequestInfo_life::tao_release (
-    PortableInterceptor::RequestInfo_ptr p
+    RequestInfo_ptr p
   )
 {
   CORBA::release (p);
@@ -959,12 +965,12 @@ PortableInterceptor::tao_RequestInfo_life::tao_nil (
     void
   )
 {
-  return PortableInterceptor::RequestInfo::_nil ();
+  return RequestInfo::_nil ();
 }
 
 CORBA::Boolean
 PortableInterceptor::tao_RequestInfo_life::tao_marshal (
-    PortableInterceptor::RequestInfo_ptr p,
+    RequestInfo_ptr p,
     TAO_OutputCDR &cdr
   )
 {
@@ -977,7 +983,7 @@ PortableInterceptor::tao_RequestInfo_cast::tao_narrow (
     ACE_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::RequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return RequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -985,8 +991,8 @@ PortableInterceptor::tao_RequestInfo_cast::tao_upcast (
     void *src
   )
 {
-  PortableInterceptor::RequestInfo **tmp =
-    ACE_static_cast (PortableInterceptor::RequestInfo **, src);
+  RequestInfo **tmp =
+    ACE_static_cast (RequestInfo **, src);
   return *tmp;
 }
 
@@ -1014,8 +1020,8 @@ PortableInterceptor::tao_RequestInfo_cast::tao_upcast (
       >
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:245
 
 PortableInterceptor::RequestInfo::RequestInfo (void)
 {}
@@ -1023,7 +1029,7 @@ PortableInterceptor::RequestInfo::RequestInfo (void)
 PortableInterceptor::RequestInfo::~RequestInfo (void)
 {}
 
-void
+void 
 PortableInterceptor::RequestInfo::_tao_any_destructor (void *_tao_void_pointer)
 {
   RequestInfo *tmp = ACE_static_cast (RequestInfo *, _tao_void_pointer);
@@ -1039,7 +1045,7 @@ PortableInterceptor::RequestInfo::_narrow (
   return RequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::RequestInfo_ptr
+PortableInterceptor::RequestInfo_ptr 
 PortableInterceptor::RequestInfo::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1049,7 +1055,7 @@ PortableInterceptor::RequestInfo::_unchecked_narrow (
     {
       return RequestInfo::_nil ();
     }
-
+  
   return
       ACE_reinterpret_cast (
           RequestInfo_ptr,
@@ -1069,14 +1075,14 @@ PortableInterceptor::RequestInfo::_duplicate (RequestInfo_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
 void *PortableInterceptor::RequestInfo::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
-
+  
   if (type == ACE_reinterpret_cast (
               ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, RequestInfo)::_tao_class_id)
@@ -1095,12 +1101,12 @@ void *PortableInterceptor::RequestInfo::_tao_QueryInterface (ptrdiff_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-
+  
   if (retv != 0)
     {
       this->_add_ref ();
     }
-
+  
   return retv;
 }
 
@@ -1122,21 +1128,21 @@ 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 (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 (0x52657175), 
+  ACE_NTOHL (0x65737449), 
   ACE_NTOHL (0x6e666f00),  // name = RequestInfo
   };
 
@@ -1158,21 +1164,21 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:63
 
 int PortableInterceptor::ClientRequestInfo::_tao_class_id = 0;
 
 PortableInterceptor::ClientRequestInfo_ptr
 PortableInterceptor::tao_ClientRequestInfo_life::tao_duplicate (
-    PortableInterceptor::ClientRequestInfo_ptr p
+    ClientRequestInfo_ptr p
   )
 {
-  return PortableInterceptor::ClientRequestInfo::_duplicate (p);
+  return ClientRequestInfo::_duplicate (p);
 }
 
 void
 PortableInterceptor::tao_ClientRequestInfo_life::tao_release (
-    PortableInterceptor::ClientRequestInfo_ptr p
+    ClientRequestInfo_ptr p
   )
 {
   CORBA::release (p);
@@ -1183,12 +1189,12 @@ PortableInterceptor::tao_ClientRequestInfo_life::tao_nil (
     void
   )
 {
-  return PortableInterceptor::ClientRequestInfo::_nil ();
+  return ClientRequestInfo::_nil ();
 }
 
 CORBA::Boolean
 PortableInterceptor::tao_ClientRequestInfo_life::tao_marshal (
-    PortableInterceptor::ClientRequestInfo_ptr p,
+    ClientRequestInfo_ptr p,
     TAO_OutputCDR &cdr
   )
 {
@@ -1201,7 +1207,7 @@ PortableInterceptor::tao_ClientRequestInfo_cast::tao_narrow (
     ACE_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::ClientRequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ClientRequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1209,8 +1215,8 @@ PortableInterceptor::tao_ClientRequestInfo_cast::tao_upcast (
     void *src
   )
 {
-  PortableInterceptor::ClientRequestInfo **tmp =
-    ACE_static_cast (PortableInterceptor::ClientRequestInfo **, src);
+  ClientRequestInfo **tmp =
+    ACE_static_cast (ClientRequestInfo **, src);
   return *tmp;
 }
 
@@ -1238,8 +1244,8 @@ PortableInterceptor::tao_ClientRequestInfo_cast::tao_upcast (
       >
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:245
 
 PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void)
 {}
@@ -1247,7 +1253,7 @@ PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void)
 PortableInterceptor::ClientRequestInfo::~ClientRequestInfo (void)
 {}
 
-void
+void 
 PortableInterceptor::ClientRequestInfo::_tao_any_destructor (void *_tao_void_pointer)
 {
   ClientRequestInfo *tmp = ACE_static_cast (ClientRequestInfo *, _tao_void_pointer);
@@ -1263,7 +1269,7 @@ PortableInterceptor::ClientRequestInfo::_narrow (
   return ClientRequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ClientRequestInfo_ptr
+PortableInterceptor::ClientRequestInfo_ptr 
 PortableInterceptor::ClientRequestInfo::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1273,7 +1279,7 @@ PortableInterceptor::ClientRequestInfo::_unchecked_narrow (
     {
       return ClientRequestInfo::_nil ();
     }
-
+  
   return
       ACE_reinterpret_cast (
           ClientRequestInfo_ptr,
@@ -1293,14 +1299,14 @@ PortableInterceptor::ClientRequestInfo::_duplicate (ClientRequestInfo_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
 void *PortableInterceptor::ClientRequestInfo::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
-
+  
   if (type == ACE_reinterpret_cast (
               ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, ClientRequestInfo)::_tao_class_id)
@@ -1333,12 +1339,12 @@ void *PortableInterceptor::ClientRequestInfo::_tao_QueryInterface (ptrdiff_t typ
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-
+  
   if (retv != 0)
     {
       this->_add_ref ();
     }
-
+  
   return retv;
 }
 
@@ -1360,25 +1366,25 @@ 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 (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 (0x436c6965), 
+  ACE_NTOHL (0x6e745265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e66), 
   ACE_NTOHL (0x6f000000),  // name = ClientRequestInfo
   };
 
@@ -1400,21 +1406,21 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:63
 
 int PortableInterceptor::ServerRequestInfo::_tao_class_id = 0;
 
 PortableInterceptor::ServerRequestInfo_ptr
 PortableInterceptor::tao_ServerRequestInfo_life::tao_duplicate (
-    PortableInterceptor::ServerRequestInfo_ptr p
+    ServerRequestInfo_ptr p
   )
 {
-  return PortableInterceptor::ServerRequestInfo::_duplicate (p);
+  return ServerRequestInfo::_duplicate (p);
 }
 
 void
 PortableInterceptor::tao_ServerRequestInfo_life::tao_release (
-    PortableInterceptor::ServerRequestInfo_ptr p
+    ServerRequestInfo_ptr p
   )
 {
   CORBA::release (p);
@@ -1425,12 +1431,12 @@ PortableInterceptor::tao_ServerRequestInfo_life::tao_nil (
     void
   )
 {
-  return PortableInterceptor::ServerRequestInfo::_nil ();
+  return ServerRequestInfo::_nil ();
 }
 
 CORBA::Boolean
 PortableInterceptor::tao_ServerRequestInfo_life::tao_marshal (
-    PortableInterceptor::ServerRequestInfo_ptr p,
+    ServerRequestInfo_ptr p,
     TAO_OutputCDR &cdr
   )
 {
@@ -1443,7 +1449,7 @@ PortableInterceptor::tao_ServerRequestInfo_cast::tao_narrow (
     ACE_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::ServerRequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ServerRequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1451,8 +1457,8 @@ PortableInterceptor::tao_ServerRequestInfo_cast::tao_upcast (
     void *src
   )
 {
-  PortableInterceptor::ServerRequestInfo **tmp =
-    ACE_static_cast (PortableInterceptor::ServerRequestInfo **, src);
+  ServerRequestInfo **tmp =
+    ACE_static_cast (ServerRequestInfo **, src);
   return *tmp;
 }
 
@@ -1480,8 +1486,8 @@ PortableInterceptor::tao_ServerRequestInfo_cast::tao_upcast (
       >
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:245
 
 PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void)
 {}
@@ -1489,7 +1495,7 @@ PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void)
 PortableInterceptor::ServerRequestInfo::~ServerRequestInfo (void)
 {}
 
-void
+void 
 PortableInterceptor::ServerRequestInfo::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerRequestInfo *tmp = ACE_static_cast (ServerRequestInfo *, _tao_void_pointer);
@@ -1505,7 +1511,7 @@ PortableInterceptor::ServerRequestInfo::_narrow (
   return ServerRequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ServerRequestInfo_ptr
+PortableInterceptor::ServerRequestInfo_ptr 
 PortableInterceptor::ServerRequestInfo::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1515,7 +1521,7 @@ PortableInterceptor::ServerRequestInfo::_unchecked_narrow (
     {
       return ServerRequestInfo::_nil ();
     }
-
+  
   return
       ACE_reinterpret_cast (
           ServerRequestInfo_ptr,
@@ -1535,14 +1541,14 @@ PortableInterceptor::ServerRequestInfo::_duplicate (ServerRequestInfo_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
 void *PortableInterceptor::ServerRequestInfo::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
-
+  
   if (type == ACE_reinterpret_cast (
               ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, ServerRequestInfo)::_tao_class_id)
@@ -1575,12 +1581,12 @@ void *PortableInterceptor::ServerRequestInfo::_tao_QueryInterface (ptrdiff_t typ
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-
+  
   if (retv != 0)
     {
       this->_add_ref ();
     }
-
+  
   return retv;
 }
 
@@ -1602,25 +1608,25 @@ 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 (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 (0x53657276), 
+  ACE_NTOHL (0x65725265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e66), 
   ACE_NTOHL (0x6f000000),  // name = ServerRequestInfo
   };
 
@@ -1642,21 +1648,21 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:63
 
 int PortableInterceptor::ClientRequestInterceptor::_tao_class_id = 0;
 
 PortableInterceptor::ClientRequestInterceptor_ptr
 PortableInterceptor::tao_ClientRequestInterceptor_life::tao_duplicate (
-    PortableInterceptor::ClientRequestInterceptor_ptr p
+    ClientRequestInterceptor_ptr p
   )
 {
-  return PortableInterceptor::ClientRequestInterceptor::_duplicate (p);
+  return ClientRequestInterceptor::_duplicate (p);
 }
 
 void
 PortableInterceptor::tao_ClientRequestInterceptor_life::tao_release (
-    PortableInterceptor::ClientRequestInterceptor_ptr p
+    ClientRequestInterceptor_ptr p
   )
 {
   CORBA::release (p);
@@ -1667,12 +1673,12 @@ PortableInterceptor::tao_ClientRequestInterceptor_life::tao_nil (
     void
   )
 {
-  return PortableInterceptor::ClientRequestInterceptor::_nil ();
+  return ClientRequestInterceptor::_nil ();
 }
 
 CORBA::Boolean
 PortableInterceptor::tao_ClientRequestInterceptor_life::tao_marshal (
-    PortableInterceptor::ClientRequestInterceptor_ptr p,
+    ClientRequestInterceptor_ptr p,
     TAO_OutputCDR &cdr
   )
 {
@@ -1685,7 +1691,7 @@ PortableInterceptor::tao_ClientRequestInterceptor_cast::tao_narrow (
     ACE_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::ClientRequestInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ClientRequestInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1693,8 +1699,8 @@ PortableInterceptor::tao_ClientRequestInterceptor_cast::tao_upcast (
     void *src
   )
 {
-  PortableInterceptor::ClientRequestInterceptor **tmp =
-    ACE_static_cast (PortableInterceptor::ClientRequestInterceptor **, src);
+  ClientRequestInterceptor **tmp =
+    ACE_static_cast (ClientRequestInterceptor **, src);
   return *tmp;
 }
 
@@ -1722,8 +1728,8 @@ PortableInterceptor::tao_ClientRequestInterceptor_cast::tao_upcast (
       >
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:245
 
 PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void)
 {}
@@ -1731,7 +1737,7 @@ PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void)
 PortableInterceptor::ClientRequestInterceptor::~ClientRequestInterceptor (void)
 {}
 
-void
+void 
 PortableInterceptor::ClientRequestInterceptor::_tao_any_destructor (void *_tao_void_pointer)
 {
   ClientRequestInterceptor *tmp = ACE_static_cast (ClientRequestInterceptor *, _tao_void_pointer);
@@ -1747,7 +1753,7 @@ PortableInterceptor::ClientRequestInterceptor::_narrow (
   return ClientRequestInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ClientRequestInterceptor_ptr
+PortableInterceptor::ClientRequestInterceptor_ptr 
 PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1757,7 +1763,7 @@ PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow (
     {
       return ClientRequestInterceptor::_nil ();
     }
-
+  
   return
       ACE_reinterpret_cast (
           ClientRequestInterceptor_ptr,
@@ -1777,14 +1783,14 @@ PortableInterceptor::ClientRequestInterceptor::_duplicate (ClientRequestIntercep
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
 void *PortableInterceptor::ClientRequestInterceptor::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
-
+  
   if (type == ACE_reinterpret_cast (
               ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, ClientRequestInterceptor)::_tao_class_id)
@@ -1817,12 +1823,12 @@ void *PortableInterceptor::ClientRequestInterceptor::_tao_QueryInterface (ptrdif
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-
+  
   if (retv != 0)
     {
       this->_add_ref ();
     }
-
+  
   return retv;
 }
 
@@ -1844,29 +1850,29 @@ 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 (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 (0x436c6965), 
+  ACE_NTOHL (0x6e745265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e74), 
+  ACE_NTOHL (0x65726365), 
+  ACE_NTOHL (0x70746f72), 
   ACE_NTOHL (0x0),  // name = ClientRequestInterceptor
   };
 
@@ -1888,21 +1894,21 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:63
 
 int PortableInterceptor::ServerRequestInterceptor::_tao_class_id = 0;
 
 PortableInterceptor::ServerRequestInterceptor_ptr
 PortableInterceptor::tao_ServerRequestInterceptor_life::tao_duplicate (
-    PortableInterceptor::ServerRequestInterceptor_ptr p
+    ServerRequestInterceptor_ptr p
   )
 {
-  return PortableInterceptor::ServerRequestInterceptor::_duplicate (p);
+  return ServerRequestInterceptor::_duplicate (p);
 }
 
 void
 PortableInterceptor::tao_ServerRequestInterceptor_life::tao_release (
-    PortableInterceptor::ServerRequestInterceptor_ptr p
+    ServerRequestInterceptor_ptr p
   )
 {
   CORBA::release (p);
@@ -1913,12 +1919,12 @@ PortableInterceptor::tao_ServerRequestInterceptor_life::tao_nil (
     void
   )
 {
-  return PortableInterceptor::ServerRequestInterceptor::_nil ();
+  return ServerRequestInterceptor::_nil ();
 }
 
 CORBA::Boolean
 PortableInterceptor::tao_ServerRequestInterceptor_life::tao_marshal (
-    PortableInterceptor::ServerRequestInterceptor_ptr p,
+    ServerRequestInterceptor_ptr p,
     TAO_OutputCDR &cdr
   )
 {
@@ -1931,7 +1937,7 @@ PortableInterceptor::tao_ServerRequestInterceptor_cast::tao_narrow (
     ACE_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::ServerRequestInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ServerRequestInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1939,8 +1945,8 @@ PortableInterceptor::tao_ServerRequestInterceptor_cast::tao_upcast (
     void *src
   )
 {
-  PortableInterceptor::ServerRequestInterceptor **tmp =
-    ACE_static_cast (PortableInterceptor::ServerRequestInterceptor **, src);
+  ServerRequestInterceptor **tmp =
+    ACE_static_cast (ServerRequestInterceptor **, src);
   return *tmp;
 }
 
@@ -1968,8 +1974,8 @@ PortableInterceptor::tao_ServerRequestInterceptor_cast::tao_upcast (
       >
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:245
 
 PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void)
 {}
@@ -1977,7 +1983,7 @@ PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void)
 PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void)
 {}
 
-void
+void 
 PortableInterceptor::ServerRequestInterceptor::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerRequestInterceptor *tmp = ACE_static_cast (ServerRequestInterceptor *, _tao_void_pointer);
@@ -1993,7 +1999,7 @@ PortableInterceptor::ServerRequestInterceptor::_narrow (
   return ServerRequestInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ServerRequestInterceptor_ptr
+PortableInterceptor::ServerRequestInterceptor_ptr 
 PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2003,7 +2009,7 @@ PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow (
     {
       return ServerRequestInterceptor::_nil ();
     }
-
+  
   return
       ACE_reinterpret_cast (
           ServerRequestInterceptor_ptr,
@@ -2023,14 +2029,14 @@ PortableInterceptor::ServerRequestInterceptor::_duplicate (ServerRequestIntercep
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
 void *PortableInterceptor::ServerRequestInterceptor::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
-
+  
   if (type == ACE_reinterpret_cast (
               ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, ServerRequestInterceptor)::_tao_class_id)
@@ -2063,12 +2069,12 @@ void *PortableInterceptor::ServerRequestInterceptor::_tao_QueryInterface (ptrdif
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-
+  
   if (retv != 0)
     {
       this->_add_ref ();
     }
-
+  
   return retv;
 }
 
@@ -2090,29 +2096,29 @@ 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 (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 (0x53657276), 
+  ACE_NTOHL (0x65725265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x74496e74), 
+  ACE_NTOHL (0x65726365), 
+  ACE_NTOHL (0x70746f72), 
   ACE_NTOHL (0x0),  // name = ServerRequestInterceptor
   };
 
@@ -2134,483 +2140,21 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
-
-int PortableInterceptor::IORInfo::_tao_class_id = 0;
-
-PortableInterceptor::IORInfo_ptr
-PortableInterceptor::tao_IORInfo_life::tao_duplicate (
-    PortableInterceptor::IORInfo_ptr p
-  )
-{
-  return PortableInterceptor::IORInfo::_duplicate (p);
-}
-
-void
-PortableInterceptor::tao_IORInfo_life::tao_release (
-    PortableInterceptor::IORInfo_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableInterceptor::IORInfo_ptr
-PortableInterceptor::tao_IORInfo_life::tao_nil (
-    void
-  )
-{
-  return PortableInterceptor::IORInfo::_nil ();
-}
-
-CORBA::Boolean
-PortableInterceptor::tao_IORInfo_life::tao_marshal (
-    PortableInterceptor::IORInfo_ptr p,
-    TAO_OutputCDR &cdr
-  )
-{
-  return p->marshal (cdr);
-}
-
-PortableInterceptor::IORInfo_ptr
-PortableInterceptor::tao_IORInfo_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return PortableInterceptor::IORInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableInterceptor::tao_IORInfo_cast::tao_upcast (
-    void *src
-  )
-{
-  PortableInterceptor::IORInfo **tmp =
-    ACE_static_cast (PortableInterceptor::IORInfo **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        PortableInterceptor::IORInfo,
-        PortableInterceptor::tao_IORInfo_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        PortableInterceptor::IORInfo,
-        PortableInterceptor::tao_IORInfo_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableInterceptor::IORInfo, \
-        PortableInterceptor::tao_IORInfo_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableInterceptor::IORInfo, \
-        PortableInterceptor::tao_IORInfo_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
-
-PortableInterceptor::IORInfo::IORInfo (void)
-{}
-
-PortableInterceptor::IORInfo::~IORInfo (void)
-{}
-
-void
-PortableInterceptor::IORInfo::_tao_any_destructor (void *_tao_void_pointer)
-{
-  IORInfo *tmp = ACE_static_cast (IORInfo *, _tao_void_pointer);
-  CORBA::release (tmp);
-}
-
-PortableInterceptor::IORInfo_ptr
-PortableInterceptor::IORInfo::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return IORInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-PortableInterceptor::IORInfo_ptr
-PortableInterceptor::IORInfo::_unchecked_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (obj))
-    {
-      return IORInfo::_nil ();
-    }
-
-  return
-      ACE_reinterpret_cast (
-          IORInfo_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &IORInfo::_tao_class_id
-                )
-            )
-        );
-}
-
-PortableInterceptor::IORInfo_ptr
-PortableInterceptor::IORInfo::_duplicate (IORInfo_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void *PortableInterceptor::IORInfo::_tao_QueryInterface (ptrdiff_t type)
-{
-  void *retv = 0;
-
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::PortableInterceptor, IORInfo)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-
-  if (retv != 0)
-    {
-      this->_add_ref ();
-    }
-
-  return retv;
-}
-
-const char* PortableInterceptor::IORInfo::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableInterceptor/IORInfo:1.0";
-}
-
-CORBA::Boolean
-PortableInterceptor::IORInfo::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_PortableInterceptor_IORInfo[] =
-{
-    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 (0x494f5249),
-  ACE_NTOHL (0x6e666f3a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/IORInfo:1.0
-    8,
-  ACE_NTOHL (0x494f5249),
-  ACE_NTOHL (0x6e666f00),  // name = IORInfo
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_IORInfo (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_IORInfo),
-    (char *) &_oc_PortableInterceptor_IORInfo,
-    0,
-    sizeof (PortableInterceptor::IORInfo)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_IORInfo,
-    &_tc_TAO_tc_PortableInterceptor_IORInfo
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
-
-int PortableInterceptor::IORInterceptor::_tao_class_id = 0;
-
-PortableInterceptor::IORInterceptor_ptr
-PortableInterceptor::tao_IORInterceptor_life::tao_duplicate (
-    PortableInterceptor::IORInterceptor_ptr p
-  )
-{
-  return PortableInterceptor::IORInterceptor::_duplicate (p);
-}
-
-void
-PortableInterceptor::tao_IORInterceptor_life::tao_release (
-    PortableInterceptor::IORInterceptor_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableInterceptor::IORInterceptor_ptr
-PortableInterceptor::tao_IORInterceptor_life::tao_nil (
-    void
-  )
-{
-  return PortableInterceptor::IORInterceptor::_nil ();
-}
-
-CORBA::Boolean
-PortableInterceptor::tao_IORInterceptor_life::tao_marshal (
-    PortableInterceptor::IORInterceptor_ptr p,
-    TAO_OutputCDR &cdr
-  )
-{
-  return p->marshal (cdr);
-}
-
-PortableInterceptor::IORInterceptor_ptr
-PortableInterceptor::tao_IORInterceptor_cast::tao_narrow (
-    CORBA::Object *p
-    ACE_ENV_ARG_DECL
-  )
-{
-  return PortableInterceptor::IORInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object *
-PortableInterceptor::tao_IORInterceptor_cast::tao_upcast (
-    void *src
-  )
-{
-  PortableInterceptor::IORInterceptor **tmp =
-    ACE_static_cast (PortableInterceptor::IORInterceptor **, src);
-  return *tmp;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        PortableInterceptor::IORInterceptor,
-        PortableInterceptor::tao_IORInterceptor_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        PortableInterceptor::IORInterceptor,
-        PortableInterceptor::tao_IORInterceptor_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableInterceptor::IORInterceptor, \
-        PortableInterceptor::tao_IORInterceptor_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableInterceptor::IORInterceptor, \
-        PortableInterceptor::tao_IORInterceptor_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
-
-PortableInterceptor::IORInterceptor::IORInterceptor (void)
-{}
-
-PortableInterceptor::IORInterceptor::~IORInterceptor (void)
-{}
-
-void
-PortableInterceptor::IORInterceptor::_tao_any_destructor (void *_tao_void_pointer)
-{
-  IORInterceptor *tmp = ACE_static_cast (IORInterceptor *, _tao_void_pointer);
-  CORBA::release (tmp);
-}
-
-PortableInterceptor::IORInterceptor_ptr
-PortableInterceptor::IORInterceptor::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return IORInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-PortableInterceptor::IORInterceptor_ptr
-PortableInterceptor::IORInterceptor::_unchecked_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (obj))
-    {
-      return IORInterceptor::_nil ();
-    }
-
-  return
-      ACE_reinterpret_cast (
-          IORInterceptor_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &IORInterceptor::_tao_class_id
-                )
-            )
-        );
-}
-
-PortableInterceptor::IORInterceptor_ptr
-PortableInterceptor::IORInterceptor::_duplicate (IORInterceptor_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void *PortableInterceptor::IORInterceptor::_tao_QueryInterface (ptrdiff_t type)
-{
-  void *retv = 0;
-
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::PortableInterceptor, IORInterceptor)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::PortableInterceptor, Interceptor)::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                PortableInterceptor::Interceptor_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-
-  if (retv != 0)
-    {
-      this->_add_ref ();
-    }
-
-  return retv;
-}
-
-const char* PortableInterceptor::IORInterceptor::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableInterceptor/IORInterceptor:1.0";
-}
-
-CORBA::Boolean
-PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_PortableInterceptor_IORInterceptor[] =
-{
-    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 (0x494f5249),
-  ACE_NTOHL (0x6e746572),
-  ACE_NTOHL (0x63657074),
-  ACE_NTOHL (0x6f723a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/IORInterceptor:1.0
-    15,
-  ACE_NTOHL (0x494f5249),
-  ACE_NTOHL (0x6e746572),
-  ACE_NTOHL (0x63657074),
-  ACE_NTOHL (0x6f720000),  // name = IORInterceptor
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_IORInterceptor (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableInterceptor_IORInterceptor),
-    (char *) &_oc_PortableInterceptor_IORInterceptor,
-    0,
-    sizeof (PortableInterceptor::IORInterceptor)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableInterceptor)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_IORInterceptor,
-    &_tc_TAO_tc_PortableInterceptor_IORInterceptor
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:63
 
 int PortableInterceptor::PolicyFactory::_tao_class_id = 0;
 
 PortableInterceptor::PolicyFactory_ptr
 PortableInterceptor::tao_PolicyFactory_life::tao_duplicate (
-    PortableInterceptor::PolicyFactory_ptr p
+    PolicyFactory_ptr p
   )
 {
-  return PortableInterceptor::PolicyFactory::_duplicate (p);
+  return PolicyFactory::_duplicate (p);
 }
 
 void
 PortableInterceptor::tao_PolicyFactory_life::tao_release (
-    PortableInterceptor::PolicyFactory_ptr p
+    PolicyFactory_ptr p
   )
 {
   CORBA::release (p);
@@ -2621,12 +2165,12 @@ PortableInterceptor::tao_PolicyFactory_life::tao_nil (
     void
   )
 {
-  return PortableInterceptor::PolicyFactory::_nil ();
+  return PolicyFactory::_nil ();
 }
 
 CORBA::Boolean
 PortableInterceptor::tao_PolicyFactory_life::tao_marshal (
-    PortableInterceptor::PolicyFactory_ptr p,
+    PolicyFactory_ptr p,
     TAO_OutputCDR &cdr
   )
 {
@@ -2639,7 +2183,7 @@ PortableInterceptor::tao_PolicyFactory_cast::tao_narrow (
     ACE_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::PolicyFactory::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return PolicyFactory::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2647,8 +2191,8 @@ PortableInterceptor::tao_PolicyFactory_cast::tao_upcast (
     void *src
   )
 {
-  PortableInterceptor::PolicyFactory **tmp =
-    ACE_static_cast (PortableInterceptor::PolicyFactory **, src);
+  PolicyFactory **tmp =
+    ACE_static_cast (PolicyFactory **, src);
   return *tmp;
 }
 
@@ -2676,8 +2220,8 @@ PortableInterceptor::tao_PolicyFactory_cast::tao_upcast (
       >
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:245
 
 PortableInterceptor::PolicyFactory::PolicyFactory (void)
 {}
@@ -2685,7 +2229,7 @@ PortableInterceptor::PolicyFactory::PolicyFactory (void)
 PortableInterceptor::PolicyFactory::~PolicyFactory (void)
 {}
 
-void
+void 
 PortableInterceptor::PolicyFactory::_tao_any_destructor (void *_tao_void_pointer)
 {
   PolicyFactory *tmp = ACE_static_cast (PolicyFactory *, _tao_void_pointer);
@@ -2701,7 +2245,7 @@ PortableInterceptor::PolicyFactory::_narrow (
   return PolicyFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::PolicyFactory_ptr
+PortableInterceptor::PolicyFactory_ptr 
 PortableInterceptor::PolicyFactory::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2711,7 +2255,7 @@ PortableInterceptor::PolicyFactory::_unchecked_narrow (
     {
       return PolicyFactory::_nil ();
     }
-
+  
   return
       ACE_reinterpret_cast (
           PolicyFactory_ptr,
@@ -2731,7 +2275,7 @@ PortableInterceptor::PolicyFactory::_duplicate (PolicyFactory_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -2750,7 +2294,7 @@ PortableInterceptor::PolicyFactory::_create_policy (CORBA::PolicyType
 void *PortableInterceptor::PolicyFactory::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
-
+  
   if (type == ACE_reinterpret_cast (
               ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, PolicyFactory)::_tao_class_id)
@@ -2769,12 +2313,12 @@ void *PortableInterceptor::PolicyFactory::_tao_QueryInterface (ptrdiff_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-
+  
   if (retv != 0)
     {
       this->_add_ref ();
     }
-
+  
   return retv;
 }
 
@@ -2796,23 +2340,23 @@ 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 (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 (0x506f6c69), 
+  ACE_NTOHL (0x63794661), 
+  ACE_NTOHL (0x63746f72), 
   ACE_NTOHL (0x79000000),  // name = PolicyFactory
   };
 
@@ -2834,21 +2378,21 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:63
 
 int PortableInterceptor::ORBInitInfo::_tao_class_id = 0;
 
 PortableInterceptor::ORBInitInfo_ptr
 PortableInterceptor::tao_ORBInitInfo_life::tao_duplicate (
-    PortableInterceptor::ORBInitInfo_ptr p
+    ORBInitInfo_ptr p
   )
 {
-  return PortableInterceptor::ORBInitInfo::_duplicate (p);
+  return ORBInitInfo::_duplicate (p);
 }
 
 void
 PortableInterceptor::tao_ORBInitInfo_life::tao_release (
-    PortableInterceptor::ORBInitInfo_ptr p
+    ORBInitInfo_ptr p
   )
 {
   CORBA::release (p);
@@ -2859,12 +2403,12 @@ PortableInterceptor::tao_ORBInitInfo_life::tao_nil (
     void
   )
 {
-  return PortableInterceptor::ORBInitInfo::_nil ();
+  return ORBInitInfo::_nil ();
 }
 
 CORBA::Boolean
 PortableInterceptor::tao_ORBInitInfo_life::tao_marshal (
-    PortableInterceptor::ORBInitInfo_ptr p,
+    ORBInitInfo_ptr p,
     TAO_OutputCDR &cdr
   )
 {
@@ -2877,7 +2421,7 @@ PortableInterceptor::tao_ORBInitInfo_cast::tao_narrow (
     ACE_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::ORBInitInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ORBInitInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2885,8 +2429,8 @@ PortableInterceptor::tao_ORBInitInfo_cast::tao_upcast (
     void *src
   )
 {
-  PortableInterceptor::ORBInitInfo **tmp =
-    ACE_static_cast (PortableInterceptor::ORBInitInfo **, src);
+  ORBInitInfo **tmp =
+    ACE_static_cast (ORBInitInfo **, src);
   return *tmp;
 }
 
@@ -2914,8 +2458,8 @@ PortableInterceptor::tao_ORBInitInfo_cast::tao_upcast (
       >
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:245
 
 PortableInterceptor::ORBInitInfo::ORBInitInfo (void)
 {}
@@ -2923,7 +2467,7 @@ PortableInterceptor::ORBInitInfo::ORBInitInfo (void)
 PortableInterceptor::ORBInitInfo::~ORBInitInfo (void)
 {}
 
-void
+void 
 PortableInterceptor::ORBInitInfo::_tao_any_destructor (void *_tao_void_pointer)
 {
   ORBInitInfo *tmp = ACE_static_cast (ORBInitInfo *, _tao_void_pointer);
@@ -2939,7 +2483,7 @@ PortableInterceptor::ORBInitInfo::_narrow (
   return ORBInitInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ORBInitInfo_ptr
+PortableInterceptor::ORBInitInfo_ptr 
 PortableInterceptor::ORBInitInfo::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2949,7 +2493,7 @@ PortableInterceptor::ORBInitInfo::_unchecked_narrow (
     {
       return ORBInitInfo::_nil ();
     }
-
+  
   return
       ACE_reinterpret_cast (
           ORBInitInfo_ptr,
@@ -2969,14 +2513,14 @@ PortableInterceptor::ORBInitInfo::_duplicate (ORBInitInfo_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
 void *PortableInterceptor::ORBInitInfo::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
-
+  
   if (type == ACE_reinterpret_cast (
               ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, ORBInitInfo)::_tao_class_id)
@@ -2995,12 +2539,12 @@ void *PortableInterceptor::ORBInitInfo::_tao_QueryInterface (ptrdiff_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-
+  
   if (retv != 0)
     {
       this->_add_ref ();
     }
-
+  
   return retv;
 }
 
@@ -3022,26 +2566,26 @@ 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 (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 (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
   ACE_NTOHL (0x0),  // name = ObjectId
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -3056,7 +2600,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_ObjectId (
 ::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_ObjectId =
   &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_ObjectId;
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (void)
@@ -3175,32 +2719,32 @@ 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 (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 (0x4475706c), 
+  ACE_NTOHL (0x69636174), 
+  ACE_NTOHL (0x654e616d), 
   ACE_NTOHL (0x65000000),  // name = DuplicateName
   1, // member count
     5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -3215,7 +2759,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ORBInitInfo_DuplicateName
 ::CORBA::TypeCode_ptr PortableInterceptor::ORBInitInfo::_tc_DuplicateName =
   &_tc_TAO_tc_PortableInterceptor_ORBInitInfo_DuplicateName;
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (void)
@@ -3317,24 +2861,24 @@ 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 (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 (0x496e7661), 
+  ACE_NTOHL (0x6c69644e), 
   ACE_NTOHL (0x616d6500),  // name = InvalidName
   0, // member count
   };
@@ -3357,21 +2901,21 @@ 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 (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 (0x4f524249), 
+  ACE_NTOHL (0x6e697449), 
   ACE_NTOHL (0x6e666f00),  // name = ORBInitInfo
   };
 
@@ -3393,21 +2937,21 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:63
 
 int PortableInterceptor::ORBInitializer::_tao_class_id = 0;
 
 PortableInterceptor::ORBInitializer_ptr
 PortableInterceptor::tao_ORBInitializer_life::tao_duplicate (
-    PortableInterceptor::ORBInitializer_ptr p
+    ORBInitializer_ptr p
   )
 {
-  return PortableInterceptor::ORBInitializer::_duplicate (p);
+  return ORBInitializer::_duplicate (p);
 }
 
 void
 PortableInterceptor::tao_ORBInitializer_life::tao_release (
-    PortableInterceptor::ORBInitializer_ptr p
+    ORBInitializer_ptr p
   )
 {
   CORBA::release (p);
@@ -3418,12 +2962,12 @@ PortableInterceptor::tao_ORBInitializer_life::tao_nil (
     void
   )
 {
-  return PortableInterceptor::ORBInitializer::_nil ();
+  return ORBInitializer::_nil ();
 }
 
 CORBA::Boolean
 PortableInterceptor::tao_ORBInitializer_life::tao_marshal (
-    PortableInterceptor::ORBInitializer_ptr p,
+    ORBInitializer_ptr p,
     TAO_OutputCDR &cdr
   )
 {
@@ -3436,7 +2980,7 @@ PortableInterceptor::tao_ORBInitializer_cast::tao_narrow (
     ACE_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::ORBInitializer::_narrow (p ACE_ENV_ARG_PARAMETER);
+  return ORBInitializer::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3444,8 +2988,8 @@ PortableInterceptor::tao_ORBInitializer_cast::tao_upcast (
     void *src
   )
 {
-  PortableInterceptor::ORBInitializer **tmp =
-    ACE_static_cast (PortableInterceptor::ORBInitializer **, src);
+  ORBInitializer **tmp =
+    ACE_static_cast (ORBInitializer **, src);
   return *tmp;
 }
 
@@ -3473,8 +3017,8 @@ PortableInterceptor::tao_ORBInitializer_cast::tao_upcast (
       >
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:245
 
 PortableInterceptor::ORBInitializer::ORBInitializer (void)
 {}
@@ -3482,7 +3026,7 @@ PortableInterceptor::ORBInitializer::ORBInitializer (void)
 PortableInterceptor::ORBInitializer::~ORBInitializer (void)
 {}
 
-void
+void 
 PortableInterceptor::ORBInitializer::_tao_any_destructor (void *_tao_void_pointer)
 {
   ORBInitializer *tmp = ACE_static_cast (ORBInitializer *, _tao_void_pointer);
@@ -3498,7 +3042,7 @@ PortableInterceptor::ORBInitializer::_narrow (
   return ORBInitializer::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
-PortableInterceptor::ORBInitializer_ptr
+PortableInterceptor::ORBInitializer_ptr 
 PortableInterceptor::ORBInitializer::_unchecked_narrow (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL_NOT_USED
@@ -3508,7 +3052,7 @@ PortableInterceptor::ORBInitializer::_unchecked_narrow (
     {
       return ORBInitializer::_nil ();
     }
-
+  
   return
       ACE_reinterpret_cast (
           ORBInitializer_ptr,
@@ -3528,14 +3072,14 @@ PortableInterceptor::ORBInitializer::_duplicate (ORBInitializer_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
 void *PortableInterceptor::ORBInitializer::_tao_QueryInterface (ptrdiff_t type)
 {
   void *retv = 0;
-
+  
   if (type == ACE_reinterpret_cast (
               ptrdiff_t,
               &ACE_NESTED_CLASS (::PortableInterceptor, ORBInitializer)::_tao_class_id)
@@ -3554,12 +3098,12 @@ void *PortableInterceptor::ORBInitializer::_tao_QueryInterface (ptrdiff_t type)
             ACE_static_cast (CORBA::Object_ptr, this)
           );
     }
-
+  
   if (retv != 0)
     {
       this->_add_ref ();
     }
-
+  
   return retv;
 }
 
@@ -3581,23 +3125,23 @@ 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 (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 (0x4f524249), 
+  ACE_NTOHL (0x6e697469), 
+  ACE_NTOHL (0x616c697a), 
   ACE_NTOHL (0x65720000),  // name = ORBInitializer
   };
 
@@ -3619,7 +3163,7 @@ TAO_NAMESPACE_DEFINE (
 TAO_NAMESPACE_END
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -3665,15 +3209,13 @@ operator>>= (
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<PortableInterceptor::Interceptor,PortableInterceptor::Interceptor_var, PortableInterceptor::tao_Interceptor_life>;
   template class TAO::Any_Impl_T<PortableInterceptor::Interceptor>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableInterceptor::Interceptor, PortableInterceptor::Interceptor_var, PortableInterceptor::tao_Interceptor_life>
 # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::Interceptor>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50
 
 // Copying insertion.
 void operator<<= (
@@ -3737,8 +3279,8 @@ CORBA::Boolean operator>>= (
 # pragma instantiate TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest \>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50
 
 // Copying insertion.
 void operator<<= (
@@ -3803,7 +3345,7 @@ CORBA::Boolean operator>>= (
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -3849,15 +3391,13 @@ operator>>= (
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<PortableInterceptor::Current,PortableInterceptor::Current_var,PortableInterceptor::tao_Current_life>;
   template class TAO::Any_Impl_T<PortableInterceptor::Current>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableInterceptor::Current, PortableInterceptor::Current_var, PortableInterceptor::tao_Current_life>
 # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::Current>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -3903,15 +3443,13 @@ operator>>= (
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<PortableInterceptor::RequestInfo,PortableInterceptor::RequestInfo_var,PortableInterceptor::tao_RequestInfo_life>;
   template class TAO::Any_Impl_T<PortableInterceptor::RequestInfo>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableInterceptor::RequestInfo, PortableInterceptor::RequestInfo_var,PortableInterceptor::tao_RequestInfo_life>
 # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::RequestInfo>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -3957,15 +3495,13 @@ operator>>= (
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<PortableInterceptor::ClientRequestInfo,PortableInterceptor::ClientRequestInfo_var, PortableInterceptor::tao_ClientRequestInfo_life>;
   template class TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableInterceptor::ClientRequestInfo, PortableInterceptor::ClientRequestInfo_var,PortableInterceptor::tao_ClientRequestInfo_life>
 # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -4011,15 +3547,13 @@ operator>>= (
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<PortableInterceptor::ServerRequestInfo,PortableInterceptor::ServerRequestInfo_var,PortableInterceptor::tao_ServerRequestInfo_life>;
   template class TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableInterceptor::ServerRequestInfo, PortableInterceptor::ServerRequestInfo_var,PortableInterceptor::tao_ServerRequestInfo_life>
 # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -4065,15 +3599,13 @@ operator>>= (
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<PortableInterceptor::ClientRequestInterceptor,PortableInterceptor::ClientRequestInterceptor_var,PortableInterceptor::tao_ClientRequestInterceptor_life>;
   template class TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableInterceptor::ClientRequestInterceptor, PortableInterceptor::ClientRequestInterceptor_var, PortableInterceptor::tao_ClientRequestInterceptor_life>
 # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -4119,123 +3651,13 @@ operator>>= (
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<PortableInterceptor::ServerRequestInterceptor,PortableInterceptor::ServerRequestInterceptor_var,PortableInterceptor::tao_ServerRequestInterceptor_life>;
   template class TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableInterceptor::ServerRequestInterceptor, PortableInterceptor::ServerRequestInterceptor_var, PortableInterceptor::tao_ServerRequestInterceptor_life>
 # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::IORInfo_ptr _tao_elem
-  )
-{
-  PortableInterceptor::IORInfo_ptr _tao_objptr =
-    PortableInterceptor::IORInfo::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::IORInfo_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::IORInfo>::insert (
-      _tao_any,
-      PortableInterceptor::IORInfo::_tao_any_destructor,
-      PortableInterceptor::_tc_IORInfo,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::IORInfo_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::IORInfo>::extract (
-        _tao_any,
-        PortableInterceptor::IORInfo::_tao_any_destructor,
-        PortableInterceptor::_tc_IORInfo,
-        _tao_elem
-      );
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<PortableInterceptor::IORInfo,PortableInterceptor::IORInfo_var,PortableInterceptor::tao_IORInfo_life>;
-  template class TAO::Any_Impl_T<PortableInterceptor::IORInfo>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableInterceptor::IORInfo, PortableInterceptor::IORInfo_var,PortableInterceptor::tao_IORInfo_life>
-# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::IORInfo>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::IORInterceptor_ptr _tao_elem
-  )
-{
-  PortableInterceptor::IORInterceptor_ptr _tao_objptr =
-    PortableInterceptor::IORInterceptor::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableInterceptor::IORInterceptor_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>::insert (
-      _tao_any,
-      PortableInterceptor::IORInterceptor::_tao_any_destructor,
-      PortableInterceptor::_tc_IORInterceptor,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableInterceptor::IORInterceptor_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>::extract (
-        _tao_any,
-        PortableInterceptor::IORInterceptor::_tao_any_destructor,
-        PortableInterceptor::_tc_IORInterceptor,
-        _tao_elem
-      );
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<PortableInterceptor::IORInterceptor,PortableInterceptor::IORInterceptor_var,PortableInterceptor::tao_IORInterceptor_life>;
-  template class TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableInterceptor::IORInterceptor, PortableInterceptor::IORInterceptor_var,PortableInterceptor::tao_IORInterceptor_life>
-# pragma instantiate TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -4281,15 +3703,13 @@ operator>>= (
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<PortableInterceptor::PolicyFactory,PortableInterceptor::PolicyFactory_var,PortableInterceptor::tao_PolicyFactory_life>;
   template class TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableInterceptor::PolicyFactory, PortableInterceptor::PolicyFactory_var,PortableInterceptor::tao_PolicyFactory_life>
 # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -4335,15 +3755,13 @@ operator>>= (
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<PortableInterceptor::ORBInitInfo,PortableInterceptor::ORBInitInfo_var,PortableInterceptor::tao_ORBInitInfo_life>;
   template class TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitInfo, PortableInterceptor::ORBInitInfo_var,PortableInterceptor::tao_ORBInitInfo_life>
 # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -4389,9 +3807,8 @@ operator>>= (
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<PortableInterceptor::ORBInitializer,PortableInterceptor::ORBInitializer_var,PortableInterceptor::tao_ORBInitializer_life>;
   template class TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitializer, PortableInterceptor::ORBInitializer_var,PortableInterceptor::tao_ORBInitializer_life>
 # pragma instantiate TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index dab30212561..6737a5f0eb8 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -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
@@ -26,14 +32,13 @@
 #define _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
 
 #include "ace/pre.h"
-#include "CurrentC.h"
+#include "PI_ForwardC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "DynamicC.h"
-#include "ObjectReferenceTemplateC.h"
 #include "Messaging_SyncScopeC.h"
 #include "IOPC.h"
 #include "PolicyC.h"
@@ -68,7 +73,7 @@ TAO_NAMESPACE  PortableInterceptor
 {
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:576
 
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__ODDS_N_ENDS_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR__ODDS_N_ENDS_CH_
@@ -76,8 +81,20 @@ TAO_NAMESPACE  PortableInterceptor
   class Interceptor;
   typedef Interceptor *Interceptor_ptr;
   struct tao_Interceptor_life;
-  typedef TAO_Objref_Var_T<Interceptor, tao_Interceptor_life> Interceptor_var;
-  typedef TAO_Objref_Out_T<Interceptor, tao_Interceptor_life> Interceptor_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        Interceptor,
+        tao_Interceptor_life
+      >
+    Interceptor_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        Interceptor,
+        tao_Interceptor_life
+      >
+    Interceptor_out;
   
   struct TAO_Export tao_Interceptor_life
   {
@@ -102,7 +119,7 @@ TAO_NAMESPACE  PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR_CH_
@@ -156,7 +173,7 @@ TAO_NAMESPACE  PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:210
     
     virtual void *_tao_QueryInterface (ptrdiff_t type);
     
@@ -238,7 +255,7 @@ TAO_NAMESPACE  PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:343
   
   typedef CORBA::Short ReplyStatus;
   typedef CORBA::Short_out ReplyStatus_out;
@@ -284,7 +301,7 @@ TAO_NAMESPACE  PortableInterceptor
   const PortableInterceptor::ReplyStatus UNKNOWN = 6;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:333
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:343
   
   typedef CORBA::ULong SlotId;
   typedef CORBA::ULong_out SlotId_out;
@@ -343,7 +360,7 @@ TAO_NAMESPACE  PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:576
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT__ODDS_N_ENDS_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT__ODDS_N_ENDS_CH_
@@ -351,8 +368,20 @@ TAO_NAMESPACE  PortableInterceptor
   class Current;
   typedef Current *Current_ptr;
   struct tao_Current_life;
-  typedef TAO_Objref_Var_T<Current, tao_Current_life> Current_var;
-  typedef TAO_Objref_Out_T<Current, tao_Current_life> Current_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        Current,
+        tao_Current_life
+      >
+    Current_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        Current,
+        tao_Current_life
+      >
+    Current_out;
   
   struct TAO_Export tao_Current_life
   {
@@ -377,7 +406,7 @@ TAO_NAMESPACE  PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT_CH_
@@ -436,7 +465,7 @@ TAO_NAMESPACE  PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:210
     
     virtual void *_tao_QueryInterface (ptrdiff_t type);
     
@@ -460,7 +489,7 @@ TAO_NAMESPACE  PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:576
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__ODDS_N_ENDS_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO__ODDS_N_ENDS_CH_
@@ -468,8 +497,20 @@ TAO_NAMESPACE  PortableInterceptor
   class RequestInfo;
   typedef RequestInfo *RequestInfo_ptr;
   struct tao_RequestInfo_life;
-  typedef TAO_Objref_Var_T<RequestInfo, tao_RequestInfo_life> RequestInfo_var;
-  typedef TAO_Objref_Out_T<RequestInfo, tao_RequestInfo_life> RequestInfo_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        RequestInfo,
+        tao_RequestInfo_life
+      >
+    RequestInfo_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        RequestInfo,
+        tao_RequestInfo_life
+      >
+    RequestInfo_out;
   
   struct TAO_Export tao_RequestInfo_life
   {
@@ -494,7 +535,7 @@ TAO_NAMESPACE  PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO_CH_
@@ -672,7 +713,7 @@ TAO_NAMESPACE  PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:210
     
     virtual void *_tao_QueryInterface (ptrdiff_t type);
     
@@ -696,7 +737,7 @@ TAO_NAMESPACE  PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestInfo;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:576
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ODDS_N_ENDS_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__ODDS_N_ENDS_CH_
@@ -704,8 +745,20 @@ TAO_NAMESPACE  PortableInterceptor
   class ClientRequestInfo;
   typedef ClientRequestInfo *ClientRequestInfo_ptr;
   struct tao_ClientRequestInfo_life;
-  typedef TAO_Objref_Var_T<ClientRequestInfo, tao_ClientRequestInfo_life> ClientRequestInfo_var;
-  typedef TAO_Objref_Out_T<ClientRequestInfo, tao_ClientRequestInfo_life> ClientRequestInfo_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ClientRequestInfo,
+        tao_ClientRequestInfo_life
+      >
+    ClientRequestInfo_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ClientRequestInfo,
+        tao_ClientRequestInfo_life
+      >
+    ClientRequestInfo_out;
   
   struct TAO_Export tao_ClientRequestInfo_life
   {
@@ -730,7 +783,7 @@ TAO_NAMESPACE  PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_
@@ -859,7 +912,7 @@ TAO_NAMESPACE  PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:210
     
     virtual void *_tao_QueryInterface (ptrdiff_t type);
     
@@ -883,7 +936,7 @@ TAO_NAMESPACE  PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientRequestInfo;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:576
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ODDS_N_ENDS_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__ODDS_N_ENDS_CH_
@@ -891,8 +944,20 @@ TAO_NAMESPACE  PortableInterceptor
   class ServerRequestInfo;
   typedef ServerRequestInfo *ServerRequestInfo_ptr;
   struct tao_ServerRequestInfo_life;
-  typedef TAO_Objref_Var_T<ServerRequestInfo, tao_ServerRequestInfo_life> ServerRequestInfo_var;
-  typedef TAO_Objref_Out_T<ServerRequestInfo, tao_ServerRequestInfo_life> ServerRequestInfo_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ServerRequestInfo,
+        tao_ServerRequestInfo_life
+      >
+    ServerRequestInfo_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ServerRequestInfo,
+        tao_ServerRequestInfo_life
+      >
+    ServerRequestInfo_out;
   
   struct TAO_Export tao_ServerRequestInfo_life
   {
@@ -917,7 +982,7 @@ TAO_NAMESPACE  PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_
@@ -1068,7 +1133,7 @@ TAO_NAMESPACE  PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:210
     
     virtual void *_tao_QueryInterface (ptrdiff_t type);
     
@@ -1092,7 +1157,7 @@ TAO_NAMESPACE  PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerRequestInfo;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:576
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__ODDS_N_ENDS_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__ODDS_N_ENDS_CH_
@@ -1100,8 +1165,20 @@ TAO_NAMESPACE  PortableInterceptor
   class ClientRequestInterceptor;
   typedef ClientRequestInterceptor *ClientRequestInterceptor_ptr;
   struct tao_ClientRequestInterceptor_life;
-  typedef TAO_Objref_Var_T<ClientRequestInterceptor, tao_ClientRequestInterceptor_life> ClientRequestInterceptor_var;
-  typedef TAO_Objref_Out_T<ClientRequestInterceptor, tao_ClientRequestInterceptor_life> ClientRequestInterceptor_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ClientRequestInterceptor,
+        tao_ClientRequestInterceptor_life
+      >
+    ClientRequestInterceptor_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ClientRequestInterceptor,
+        tao_ClientRequestInterceptor_life
+      >
+    ClientRequestInterceptor_out;
   
   struct TAO_Export tao_ClientRequestInterceptor_life
   {
@@ -1126,7 +1203,7 @@ TAO_NAMESPACE  PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_
@@ -1218,7 +1295,7 @@ TAO_NAMESPACE  PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:210
     
     virtual void *_tao_QueryInterface (ptrdiff_t type);
     
@@ -1242,7 +1319,7 @@ TAO_NAMESPACE  PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientRequestInterceptor;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:576
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__ODDS_N_ENDS_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__ODDS_N_ENDS_CH_
@@ -1250,8 +1327,20 @@ TAO_NAMESPACE  PortableInterceptor
   class ServerRequestInterceptor;
   typedef ServerRequestInterceptor *ServerRequestInterceptor_ptr;
   struct tao_ServerRequestInterceptor_life;
-  typedef TAO_Objref_Var_T<ServerRequestInterceptor, tao_ServerRequestInterceptor_life> ServerRequestInterceptor_var;
-  typedef TAO_Objref_Out_T<ServerRequestInterceptor, tao_ServerRequestInterceptor_life> ServerRequestInterceptor_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ServerRequestInterceptor,
+        tao_ServerRequestInterceptor_life
+      >
+    ServerRequestInterceptor_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ServerRequestInterceptor,
+        tao_ServerRequestInterceptor_life
+      >
+    ServerRequestInterceptor_out;
   
   struct TAO_Export tao_ServerRequestInterceptor_life
   {
@@ -1276,7 +1365,7 @@ TAO_NAMESPACE  PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_
@@ -1369,7 +1458,7 @@ TAO_NAMESPACE  PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:210
     
     virtual void *_tao_QueryInterface (ptrdiff_t type);
     
@@ -1393,322 +1482,7 @@ TAO_NAMESPACE  PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerRequestInterceptor;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
-
-#if !defined (_PORTABLEINTERCEPTOR_IORINFO__ODDS_N_ENDS_CH_)
-#define _PORTABLEINTERCEPTOR_IORINFO__ODDS_N_ENDS_CH_
-  
-  class IORInfo;
-  typedef IORInfo *IORInfo_ptr;
-  struct tao_IORInfo_life;
-  typedef TAO_Objref_Var_T<IORInfo, tao_IORInfo_life> IORInfo_var;
-  typedef TAO_Objref_Out_T<IORInfo, tao_IORInfo_life> IORInfo_out;
-  
-  struct TAO_Export tao_IORInfo_life
-  {
-    static IORInfo_ptr tao_duplicate (IORInfo_ptr);
-    static void tao_release (IORInfo_ptr);
-    static IORInfo_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        IORInfo_ptr,
-        TAO_OutputCDR &
-      );
-  };
-  
-  struct TAO_Export tao_IORInfo_cast
-  {
-    static IORInfo_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLEINTERCEPTOR_IORINFO_CH_)
-#define _PORTABLEINTERCEPTOR_IORINFO_CH_
-  
-  class TAO_Export IORInfo
-    : public virtual CORBA::Object
-  {
-  public:
-    typedef IORInfo_ptr _ptr_type;
-    typedef IORInfo_var _var_type;
-    static int _tao_class_id;
-    
-    // The static operations.
-    static IORInfo_ptr _duplicate (IORInfo_ptr obj);
-    
-    static IORInfo_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static IORInfo_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static IORInfo_ptr _nil (void)
-      {
-        return (IORInfo_ptr)0;
-      }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Policy_ptr get_effective_policy (
-        CORBA::PolicyType type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void add_ior_component (
-        const IOP::TaggedComponent & a_component
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void add_ior_component_to_profile (
-        const IOP::TaggedComponent & a_component,
-        IOP::ProfileId profile_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual PortableInterceptor::AdapterManagerId manager_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual PortableInterceptor::AdapterState state (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableInterceptor::ObjectReferenceTemplate * adapter_template (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableInterceptor::ObjectReferenceFactory * current_factory (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void current_factory (
-        PortableInterceptor::ObjectReferenceFactory * current_factory
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-    
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    IORInfo (void);
-    virtual ~IORInfo (void);
-  
-  private:
-    IORInfo (const IORInfo &);
-    void operator= (const IORInfo &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IORInfo;
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
-
-#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__ODDS_N_ENDS_CH_)
-#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__ODDS_N_ENDS_CH_
-  
-  class IORInterceptor;
-  typedef IORInterceptor *IORInterceptor_ptr;
-  struct tao_IORInterceptor_life;
-  typedef TAO_Objref_Var_T<IORInterceptor, tao_IORInterceptor_life> IORInterceptor_var;
-  typedef TAO_Objref_Out_T<IORInterceptor, tao_IORInterceptor_life> IORInterceptor_out;
-  
-  struct TAO_Export tao_IORInterceptor_life
-  {
-    static IORInterceptor_ptr tao_duplicate (IORInterceptor_ptr);
-    static void tao_release (IORInterceptor_ptr);
-    static IORInterceptor_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        IORInterceptor_ptr,
-        TAO_OutputCDR &
-      );
-  };
-  
-  struct TAO_Export tao_IORInterceptor_cast
-  {
-    static IORInterceptor_ptr tao_narrow (
-        CORBA::Object_ptr
-        ACE_ENV_ARG_DECL
-      );
-    static CORBA::Object_ptr tao_upcast (void *);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_)
-#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_
-  
-  class TAO_Export IORInterceptor
-    : public virtual PortableInterceptor::Interceptor
-  {
-  public:
-    typedef IORInterceptor_ptr _ptr_type;
-    typedef IORInterceptor_var _var_type;
-    static int _tao_class_id;
-    
-    // The static operations.
-    static IORInterceptor_ptr _duplicate (IORInterceptor_ptr obj);
-    
-    static IORInterceptor_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static IORInterceptor_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static IORInterceptor_ptr _nil (void)
-      {
-        return (IORInterceptor_ptr)0;
-      }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void establish_components (
-        PortableInterceptor::IORInfo_ptr info
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void components_established (
-        PortableInterceptor::IORInfo_ptr info
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void adapter_manager_state_changed (
-        PortableInterceptor::AdapterManagerId id,
-        PortableInterceptor::AdapterState state
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void adapter_state_changed (
-        const PortableInterceptor::ObjectReferenceTemplateSeq & templates,
-        PortableInterceptor::AdapterState state
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-    
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
-    
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
-  protected:
-    IORInterceptor (void);
-    virtual ~IORInterceptor (void);
-  
-  private:
-    IORInterceptor (const IORInterceptor &);
-    void operator= (const IORInterceptor &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IORInterceptor;
-  
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:576
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__ODDS_N_ENDS_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY__ODDS_N_ENDS_CH_
@@ -1716,8 +1490,20 @@ TAO_NAMESPACE  PortableInterceptor
   class PolicyFactory;
   typedef PolicyFactory *PolicyFactory_ptr;
   struct tao_PolicyFactory_life;
-  typedef TAO_Objref_Var_T<PolicyFactory, tao_PolicyFactory_life> PolicyFactory_var;
-  typedef TAO_Objref_Out_T<PolicyFactory, tao_PolicyFactory_life> PolicyFactory_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        PolicyFactory,
+        tao_PolicyFactory_life
+      >
+    PolicyFactory_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        PolicyFactory,
+        tao_PolicyFactory_life
+      >
+    PolicyFactory_out;
   
   struct TAO_Export tao_PolicyFactory_life
   {
@@ -1742,7 +1528,7 @@ TAO_NAMESPACE  PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY_CH_
@@ -1800,7 +1586,7 @@ TAO_NAMESPACE  PortableInterceptor
       ));
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:210
     
     virtual void *_tao_QueryInterface (ptrdiff_t type);
     
@@ -1822,9 +1608,15 @@ TAO_NAMESPACE  PortableInterceptor
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyFactory;
-  
+
+  // The #if defined guard and the rest of the declarations and typedefs
+  // for IORInterceptor have been removed here so they will not conflict
+  // with the full definition in the TAO_IORInterceptor library.
+  class IORInterceptor;
+  typedef IORInterceptor *IORInterceptor_ptr;
+
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:576
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__ODDS_N_ENDS_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO__ODDS_N_ENDS_CH_
@@ -1832,8 +1624,20 @@ TAO_NAMESPACE  PortableInterceptor
   class ORBInitInfo;
   typedef ORBInitInfo *ORBInitInfo_ptr;
   struct tao_ORBInitInfo_life;
-  typedef TAO_Objref_Var_T<ORBInitInfo, tao_ORBInitInfo_life> ORBInitInfo_var;
-  typedef TAO_Objref_Out_T<ORBInitInfo, tao_ORBInitInfo_life> ORBInitInfo_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ORBInitInfo,
+        tao_ORBInitInfo_life
+      >
+    ORBInitInfo_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ORBInitInfo,
+        tao_ORBInitInfo_life
+      >
+    ORBInitInfo_out;
   
   struct TAO_Export tao_ORBInitInfo_life
   {
@@ -1858,7 +1662,7 @@ TAO_NAMESPACE  PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO_CH_
@@ -1892,7 +1696,7 @@ TAO_NAMESPACE  PortableInterceptor
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:377
     
     typedef char * ObjectId;
     typedef CORBA::String_var ObjectId_var;
@@ -2121,7 +1925,7 @@ TAO_NAMESPACE  PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:210
     
     virtual void *_tao_QueryInterface (ptrdiff_t type);
     
@@ -2145,7 +1949,7 @@ TAO_NAMESPACE  PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBInitInfo;
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:576
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__ODDS_N_ENDS_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER__ODDS_N_ENDS_CH_
@@ -2153,8 +1957,20 @@ TAO_NAMESPACE  PortableInterceptor
   class ORBInitializer;
   typedef ORBInitializer *ORBInitializer_ptr;
   struct tao_ORBInitializer_life;
-  typedef TAO_Objref_Var_T<ORBInitializer, tao_ORBInitializer_life> ORBInitializer_var;
-  typedef TAO_Objref_Out_T<ORBInitializer, tao_ORBInitializer_life> ORBInitializer_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ORBInitializer,
+        tao_ORBInitializer_life
+      >
+    ORBInitializer_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ORBInitializer,
+        tao_ORBInitializer_life
+      >
+    ORBInitializer_out;
   
   struct TAO_Export tao_ORBInitializer_life
   {
@@ -2179,7 +1995,7 @@ TAO_NAMESPACE  PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_
@@ -2235,7 +2051,7 @@ TAO_NAMESPACE  PortableInterceptor
       )) = 0;
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:210
     
     virtual void *_tao_QueryInterface (ptrdiff_t type);
     
@@ -2253,6 +2069,11 @@ TAO_NAMESPACE  PortableInterceptor
 
 #endif /* end #if !defined */
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBInitializer;
+
   /// Hand-crafted addition.   
   /// Register an ORBInitializer with the global ORBInitializer
   /// table.
@@ -2261,11 +2082,6 @@ TAO_NAMESPACE  PortableInterceptor
       TAO_ENV_ARG_DECL_WITH_DEFAULTS
     );
 
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBInitializer;
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
 
@@ -2340,23 +2156,16 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::IORInfo_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::IORInfo_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::IORInfo_ptr &);
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_ptr); // copying
+TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_ptr *); // non-copying
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::PolicyFactory_ptr &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/any_op_ch.cpp:65
 
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::IORInterceptor_ptr); // copying
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::IORInterceptor_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::IORInterceptor_ptr &);
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::PolicyFactory_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::PolicyFactory_ptr &);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::IORInterceptor *&);
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
@@ -2406,12 +2215,19 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::InvalidSlot &);
 
 // TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
+
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::IORInterceptor_ptr );
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::IORInterceptor_ptr &);
+
+
+// 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:1018
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1048
 
 #if defined (__ACE_INLINE__)
 #include "PortableInterceptorC.i"
diff --git a/TAO/tao/PortableInterceptorC.i b/TAO/tao/PortableInterceptorC.i
index 26112c92c40..afc8d7ec95b 100644
--- a/TAO/tao/PortableInterceptorC.i
+++ b/TAO/tao/PortableInterceptorC.i
@@ -15,13 +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
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___CI_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR___CI_
@@ -56,10 +62,11 @@ TAO::Any_Impl_T<PortableInterceptor::Interceptor>::demarshal_value (TAO_InputCDR
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT___CI_)
 #define _PORTABLEINTERCEPTOR_CURRENT___CI_
+
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -90,10 +97,11 @@ TAO::Any_Impl_T<PortableInterceptor::Current>::demarshal_value (TAO_InputCDR &)
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___CI_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO___CI_
+
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -124,7 +132,7 @@ TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::demarshal_value (TAO_InputCDR
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___CI_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___CI_
@@ -159,10 +167,11 @@ TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::demarshal_value (TAO_In
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___CI_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___CI_
+
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -193,10 +202,11 @@ TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::demarshal_value (TAO_In
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___CI_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___CI_
+
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -227,10 +237,11 @@ TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::demarshal_value
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___CI_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___CI_
+
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -261,14 +272,15 @@ TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::demarshal_value
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
+
+#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___CI_)
+#define _PORTABLEINTERCEPTOR_POLICYFACTORY___CI_
 
-#if !defined (_PORTABLEINTERCEPTOR_IORINFO___CI_)
-#define _PORTABLEINTERCEPTOR_IORINFO___CI_
 template<>
 ACE_INLINE
 CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::IORInfo>::to_object (
+TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::to_object (
     CORBA::Object_ptr &_tao_elem
   ) const
 {
@@ -279,7 +291,7 @@ TAO::Any_Impl_T<PortableInterceptor::IORInfo>::to_object (
 template<>
 ACE_INLINE
 CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::IORInfo>::marshal_value (TAO_OutputCDR &)
+TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::marshal_value (TAO_OutputCDR &)
 {
   return 0;
 }
@@ -287,33 +299,17 @@ TAO::Any_Impl_T<PortableInterceptor::IORInfo>::marshal_value (TAO_OutputCDR &)
 template<>
 ACE_INLINE
 CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::IORInfo>::demarshal_value (TAO_InputCDR &)
+TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::demarshal_value (TAO_InputCDR &)
 {
   return 0;
 }
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___CI_)
-#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___CI_
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
 template<>
 ACE_INLINE
 CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>::marshal_value (TAO_OutputCDR &)
+TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::marshal_value (TAO_OutputCDR &)
 {
   return 0;
 }
@@ -321,34 +317,15 @@ TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>::marshal_value (TAO_OutputC
 template<>
 ACE_INLINE
 CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::IORInterceptor>::demarshal_value (TAO_InputCDR &)
+TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::demarshal_value (TAO_InputCDR &)
 {
   return 0;
 }
 
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___CI_)
-#define _PORTABLEINTERCEPTOR_POLICYFACTORY___CI_
-
 template<>
 ACE_INLINE
 CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::marshal_value (TAO_OutputCDR &)
+TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::marshal_value (TAO_OutputCDR &)
 {
   return 0;
 }
@@ -356,18 +333,17 @@ TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::marshal_value (TAO_OutputCD
 template<>
 ACE_INLINE
 CORBA::Boolean
-TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::demarshal_value (TAO_InputCDR &)
+TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::demarshal_value (TAO_InputCDR &)
 {
   return 0;
 }
 
-#endif /* end #if !defined */
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___CI_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO___CI_
+
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -398,10 +374,11 @@ TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::demarshal_value (TAO_InputCDR
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___CI_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER___CI_
+
 template<>
 ACE_INLINE
 CORBA::Boolean
@@ -510,3 +487,4 @@ CORBA::Boolean operator>> (
 {
   return 1;
 }
+
diff --git a/TAO/tao/PortableServer/Default_ORTC.cpp b/TAO/tao/PortableServer/Default_ORTC.cpp
index 64a8e5010c3..e35b23c75a3 100644
--- a/TAO/tao/PortableServer/Default_ORTC.cpp
+++ b/TAO/tao/PortableServer/Default_ORTC.cpp
@@ -30,10 +30,8 @@
 
 
 #include "Default_ORTC.h"
-#include "tao/Any.h"
-#include "tao/ValueFactory.h"
-
-
+#include "tao/Any_Impl_T.h"
+#include "tao/Valuetype/ValueFactory.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -142,7 +140,7 @@ TAO_Default_ORT::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
     {
       return 0;
     }
-
+  
   return (ObjectReferenceTemplate *) v->_tao_obv_narrow ((ptrdiff_t) &_downcast);
 }
 
diff --git a/TAO/tao/PortableServer/Default_ORTC.h b/TAO/tao/PortableServer/Default_ORTC.h
index 894651ffcec..0bad1a1671c 100644
--- a/TAO/tao/PortableServer/Default_ORTC.h
+++ b/TAO/tao/PortableServer/Default_ORTC.h
@@ -1,7 +1,6 @@
 // -*- 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
@@ -33,14 +32,13 @@
 #include "ace/pre.h"
 #include "portableserver_export.h"
 
+#include "ace/pre.h"
+#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/corbafwd.h"
-#include "tao/ObjectReferenceTemplateC.h"
-
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -133,7 +131,7 @@ TAO_NAMESPACE  TAO_Default_ORT
   protected:
     ObjectReferenceTemplate (void);
     virtual ~ObjectReferenceTemplate (void);
-
+    
     virtual void *_tao_obv_narrow (ptrdiff_t);
 #if defined (_MSC_VER)
     virtual void *TAO_Default_ORT_ObjectReferenceTemplate_tao_obv_narrow (ptrdiff_t);
diff --git a/TAO/tao/PortableServer/IORInfo.h b/TAO/tao/PortableServer/IORInfo.h
index 6621bb1a08f..dc20afbdc52 100644
--- a/TAO/tao/PortableServer/IORInfo.h
+++ b/TAO/tao/PortableServer/IORInfo.h
@@ -15,13 +15,12 @@
 
 #include "ace/pre.h"
 
-#include "tao/corbafwd.h"
+#include "tao/IORInterceptor/IORInterceptorC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h
index 6a8b4df5b28..69bac16f8d1 100644
--- a/TAO/tao/PortableServer/ImplRepoC.h
+++ b/TAO/tao/PortableServer/ImplRepoC.h
@@ -42,7 +42,9 @@
 #include "tao/Sequence.h"
 #include "tao/Remote_Object_Proxy_Impl.h"
 #include "tao/VarOut_T.h"
-#include "tao/Any_T.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Dual_Impl_T.h"
+#include "tao/Any_Basic_Impl_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile
index 812e4792250..10d186a3176 100644
--- a/TAO/tao/PortableServer/Makefile
+++ b/TAO/tao/PortableServer/Makefile
@@ -12,7 +12,8 @@ LIBNAME  = libTAO_PortableServer
 LIB      = $(LIBNAME).a
 SHLIB    = $(LIBNAME).$(SOEXT)
 
-ACE_SHLIBS = -lTAO -lACE
+ACE_SHLIBS = -lTAO_ObjRefTemplate -lTAO_Valuetype \
+  -lTAO_IORInterceptor -lTAO -lACE
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -108,7 +109,7 @@ endif
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/PortableServer.o .obj/PortableServer.so .shobj/PortableServer.o .shobj/PortableServer.so: PortableServer.cpp PortableServer.h \
+.obj/PortableServer.o .obj/PortableServer.SO .shobj/PortableServer.o .shobj/PortableServer.SO: PortableServer.cpp PortableServer.h \
   $(ACE_ROOT)/ace/pre.h portableserver_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -150,8 +151,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -281,15 +281,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -297,7 +298,13 @@ endif
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp PortableServerC.i \
   Object_Adapter.h Key_Adapters.h $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/Pair_T.i \
@@ -336,7 +343,7 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \
   Object_Adapter.i
 
-.obj/PortableServerC.o .obj/PortableServerC.so .shobj/PortableServerC.o .shobj/PortableServerC.so: PortableServerC.cpp PortableServerC.h \
+.obj/PortableServerC.o .obj/PortableServerC.SO .shobj/PortableServerC.o .shobj/PortableServerC.SO: PortableServerC.cpp PortableServerC.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
@@ -378,8 +385,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -509,15 +515,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -525,15 +532,18 @@ endif
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp PortableServerC.i \
   $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -572,20 +582,12 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -637,9 +639,6 @@ endif
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/LF_Event.h \
@@ -701,10 +700,21 @@ endif
   Active_Object_Map.i Default_Policy_Validator.h \
   $(TAO_ROOT)/tao/Policy_Validator.h POA_Policy_Set.h \
   POA_Policies.h POA_Policies.i POA_Policy_Set.i Object_Adapter.i \
-  POAManager.h POAManager.i POA_Cached_Policies.h POA_Cached_Policies.i \
-  POA.i
+  POAManager.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.i \
+  POAManager.i POA_Cached_Policies.h POA_Cached_Policies.i POA.i
 
-.obj/POA.o .obj/POA.so .shobj/POA.o .shobj/POA.so: POA.cpp POA.h \
+.obj/POA.o .obj/POA.SO .shobj/POA.o .shobj/POA.SO: POA.cpp POA.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SStringfwd.h \
@@ -736,8 +746,7 @@ endif
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -881,15 +890,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -898,6 +908,12 @@ endif
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
   PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
@@ -946,23 +962,12 @@ endif
   Object_Adapter.i \
   POAManager.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -970,6 +975,17 @@ endif
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.i \
   POAManager.i \
   POA_Cached_Policies.h \
   POA_Cached_Policies.i \
@@ -1002,6 +1018,9 @@ endif
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i \
   IORInfo.h \
+  $(TAO_ROOT)/tao/IORInterceptor/IORInterceptorC.h \
+  $(TAO_ROOT)/tao/IORInterceptor/iorinterceptor_export.h \
+  $(TAO_ROOT)/tao/IORInterceptor/IORInterceptorC.i \
   IORInfo.inl \
   ObjectReferenceTemplate.h \
   Default_ORTC.h \
@@ -1079,7 +1098,7 @@ endif
   $(TAO_ROOT)/tao/Profile.i Default_Acceptor_Filter.h \
   PortableGroup_Hooks.h PortableServerC.h POA.h
 
-.obj/Default_Acceptor_Filter.o .obj/Default_Acceptor_Filter.so .shobj/Default_Acceptor_Filter.o .shobj/Default_Acceptor_Filter.so: Default_Acceptor_Filter.cpp \
+.obj/Default_Acceptor_Filter.o .obj/Default_Acceptor_Filter.SO .shobj/Default_Acceptor_Filter.o .shobj/Default_Acceptor_Filter.SO: Default_Acceptor_Filter.cpp \
   Default_Acceptor_Filter.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -1127,8 +1146,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1240,42 +1258,9 @@ endif
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Acceptor_Filter.i \
   $(TAO_ROOT)/tao/Transport_Acceptor.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Transport_Acceptor.inl
 
-.obj/Object_Adapter.o .obj/Object_Adapter.so .shobj/Object_Adapter.o .shobj/Object_Adapter.so: Object_Adapter.cpp Object_Adapter.h \
+.obj/Object_Adapter.o .obj/Object_Adapter.SO .shobj/Object_Adapter.o .shobj/Object_Adapter.SO: Object_Adapter.cpp Object_Adapter.h \
   $(ACE_ROOT)/ace/pre.h portableserver_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -1317,8 +1302,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1448,15 +1432,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -1464,7 +1449,13 @@ endif
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/Pair_T.i \
@@ -1503,31 +1494,31 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \
   Object_Adapter.i POA.h POAManager.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i POAManager.i \
-  POA_Cached_Policies.h POA_Cached_Policies.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.i \
+  POAManager.i POA_Cached_Policies.h POA_Cached_Policies.i \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp POA.i \
@@ -1605,8 +1596,7 @@ endif
   portableserver_export.h \
   ServerRequestInfo.inl Default_Servant_Dispatcher.h Servant_Dispatcher.h \
   ServerInterceptorAdapter.h ServerInterceptorAdapter.inl \
-  PortableServer_ORBInitializer.h \
-  $(TAO_ROOT)/tao/Stub.h \
+  PortableServer_ORBInitializer.h $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.h \
@@ -1627,7 +1617,7 @@ endif
   $(TAO_ROOT)/tao/Timeprobe.h \
   $(ACE_ROOT)/ace/Timeprobe.h
 
-.obj/Operation_Table.o .obj/Operation_Table.so .shobj/Operation_Table.o .shobj/Operation_Table.so: Operation_Table.cpp Operation_Table.h \
+.obj/Operation_Table.o .obj/Operation_Table.SO .shobj/Operation_Table.o .shobj/Operation_Table.SO: Operation_Table.cpp Operation_Table.h \
   $(ACE_ROOT)/ace/pre.h portableserver_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -1652,8 +1642,7 @@ endif
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
   $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -1664,8 +1653,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
@@ -1828,13 +1816,11 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -1844,7 +1830,7 @@ endif
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i
 
-.obj/Key_Adapters.o .obj/Key_Adapters.so .shobj/Key_Adapters.o .shobj/Key_Adapters.so: Key_Adapters.cpp Key_Adapters.h \
+.obj/Key_Adapters.o .obj/Key_Adapters.SO .shobj/Key_Adapters.o .shobj/Key_Adapters.SO: Key_Adapters.cpp Key_Adapters.h \
   $(ACE_ROOT)/ace/pre.h PortableServerC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
@@ -1886,8 +1872,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2017,15 +2002,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -2033,7 +2019,13 @@ endif
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/Pair_T.i \
@@ -2049,7 +2041,7 @@ endif
   $(ACE_ROOT)/ace/Map_T.i \
   $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i
 
-.obj/POAManager.o .obj/POAManager.so .shobj/POAManager.o .shobj/POAManager.so: POAManager.cpp POAManager.h \
+.obj/POAManager.o .obj/POAManager.SO .shobj/POAManager.o .shobj/POAManager.SO: POAManager.cpp POAManager.h \
   $(ACE_ROOT)/ace/pre.h PortableServerC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
@@ -2091,8 +2083,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2222,15 +2213,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -2238,35 +2230,41 @@ endif
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp PortableServerC.i \
   poa_macros.h $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i POAManager.i \
-  POA.h Object_Adapter.h Key_Adapters.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.i \
+  POAManager.i POA.h Object_Adapter.h Key_Adapters.h \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/Pair_T.i \
@@ -2304,6 +2302,9 @@ endif
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp POA.i \
+  $(TAO_ROOT)/tao/IORInterceptor/IORInterceptorC.h \
+  $(TAO_ROOT)/tao/IORInterceptor/iorinterceptor_export.h \
+  $(TAO_ROOT)/tao/IORInterceptor/IORInterceptorC.i \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/ORB_Core.h \
@@ -2365,7 +2366,7 @@ endif
   $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i
 
-.obj/Active_Object_Map.o .obj/Active_Object_Map.so .shobj/Active_Object_Map.o .shobj/Active_Object_Map.so: Active_Object_Map.cpp Active_Object_Map.h \
+.obj/Active_Object_Map.o .obj/Active_Object_Map.SO .shobj/Active_Object_Map.o .shobj/Active_Object_Map.SO: Active_Object_Map.cpp Active_Object_Map.h \
   $(ACE_ROOT)/ace/pre.h Key_Adapters.h PortableServerC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
@@ -2407,8 +2408,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2538,15 +2538,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -2554,7 +2555,13 @@ endif
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/Pair_T.i \
@@ -2582,7 +2589,7 @@ endif
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i Active_Object_Map.i
 
-.obj/Servant_Base.o .obj/Servant_Base.so .shobj/Servant_Base.o .shobj/Servant_Base.so: Servant_Base.cpp Servant_Base.h \
+.obj/Servant_Base.o .obj/Servant_Base.SO .shobj/Servant_Base.o .shobj/Servant_Base.SO: Servant_Base.cpp Servant_Base.h \
   $(ACE_ROOT)/ace/pre.h PortableServerC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
@@ -2624,8 +2631,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2755,15 +2761,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -2771,7 +2778,13 @@ endif
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp PortableServerC.i \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
   $(ACE_ROOT)/ace/Atomic_Op.h \
   $(ACE_ROOT)/ace/Atomic_Op_T.h \
@@ -2810,31 +2823,31 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \
   Object_Adapter.i POAManager.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i POAManager.i \
-  POA_Cached_Policies.h POA_Cached_Policies.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.i \
+  POAManager.i POA_Cached_Policies.h POA_Cached_Policies.i \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp POA.i Operation_Table.h \
@@ -2921,7 +2934,7 @@ endif
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/ThruPOA_Object_Proxy_Impl.o .obj/ThruPOA_Object_Proxy_Impl.so .shobj/ThruPOA_Object_Proxy_Impl.o .shobj/ThruPOA_Object_Proxy_Impl.so: ThruPOA_Object_Proxy_Impl.cpp POA.h \
+.obj/ThruPOA_Object_Proxy_Impl.o .obj/ThruPOA_Object_Proxy_Impl.SO .shobj/ThruPOA_Object_Proxy_Impl.o .shobj/ThruPOA_Object_Proxy_Impl.SO: ThruPOA_Object_Proxy_Impl.cpp POA.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SStringfwd.h \
@@ -2953,8 +2966,7 @@ endif
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -3095,15 +3107,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -3111,7 +3124,13 @@ endif
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/Pair_T.i \
@@ -3150,36 +3169,35 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \
   Object_Adapter.i POAManager.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i POAManager.i \
-  POA_Cached_Policies.h POA_Cached_Policies.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.i \
+  POAManager.i POA_Cached_Policies.h POA_Cached_Policies.i \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp POA.i \
-  ThruPOA_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/ORB_Core.h \
+  ThruPOA_Object_Proxy_Impl.h $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
   $(TAO_ROOT)/tao/ServicesC.i \
@@ -3252,7 +3270,7 @@ endif
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
   $(TAO_ROOT)/tao/Profile.i
 
-.obj/Direct_Object_Proxy_Impl.o .obj/Direct_Object_Proxy_Impl.so .shobj/Direct_Object_Proxy_Impl.o .shobj/Direct_Object_Proxy_Impl.so: Direct_Object_Proxy_Impl.cpp \
+.obj/Direct_Object_Proxy_Impl.o .obj/Direct_Object_Proxy_Impl.SO .shobj/Direct_Object_Proxy_Impl.o .shobj/Direct_Object_Proxy_Impl.SO: Direct_Object_Proxy_Impl.cpp \
   Direct_Object_Proxy_Impl.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -3296,8 +3314,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -3427,22 +3444,29 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/Pair_T.i \
@@ -3481,7 +3505,7 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \
   Object_Adapter.i
 
-.obj/Strategized_Object_Proxy_Broker.o .obj/Strategized_Object_Proxy_Broker.so .shobj/Strategized_Object_Proxy_Broker.o .shobj/Strategized_Object_Proxy_Broker.so: Strategized_Object_Proxy_Broker.cpp \
+.obj/Strategized_Object_Proxy_Broker.o .obj/Strategized_Object_Proxy_Broker.SO .shobj/Strategized_Object_Proxy_Broker.o .shobj/Strategized_Object_Proxy_Broker.SO: Strategized_Object_Proxy_Broker.cpp \
   Strategized_Object_Proxy_Broker.h portableserver_export.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
@@ -3530,8 +3554,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -3671,13 +3694,11 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -3716,20 +3737,15 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -3774,10 +3790,10 @@ endif
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(TAO_ROOT)/tao/ORB_Core.i \
-  Direct_Object_Proxy_Impl.h ThruPOA_Object_Proxy_Impl.h
+  $(TAO_ROOT)/tao/ORB_Core.i Direct_Object_Proxy_Impl.h \
+  ThruPOA_Object_Proxy_Impl.h
 
-.obj/Collocated_Object.o .obj/Collocated_Object.so .shobj/Collocated_Object.o .shobj/Collocated_Object.so: Collocated_Object.cpp Collocated_Object.h \
+.obj/Collocated_Object.o .obj/Collocated_Object.SO .shobj/Collocated_Object.o .shobj/Collocated_Object.SO: Collocated_Object.cpp Collocated_Object.h \
   $(ACE_ROOT)/ace/pre.h portableserver_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -3821,8 +3837,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -3952,15 +3967,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -3970,6 +3986,12 @@ endif
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
   PortableServerC.i \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
   $(ACE_ROOT)/ace/Atomic_Op.h \
@@ -4012,9 +4034,6 @@ endif
   Object_Adapter.i $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -4041,20 +4060,12 @@ endif
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -4110,7 +4121,7 @@ endif
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
   $(TAO_ROOT)/tao/Profile.i
 
-.obj/PolicyS.o .obj/PolicyS.so .shobj/PolicyS.o .shobj/PolicyS.so: PolicyS.cpp PolicyS.h $(ACE_ROOT)/ace/pre.h \
+.obj/PolicyS.o .obj/PolicyS.SO .shobj/PolicyS.o .shobj/PolicyS.SO: PolicyS.cpp PolicyS.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
@@ -4152,8 +4163,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -4283,15 +4293,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -4302,6 +4313,12 @@ endif
   PortableServer.h \
   portableserver_export.h \
   PortableServerC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
   PortableServerC.i \
   Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
@@ -4372,9 +4389,6 @@ endif
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/GIOPC.h \
   $(TAO_ROOT)/tao/GIOPC.i \
@@ -4386,20 +4400,12 @@ endif
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
@@ -4477,7 +4483,7 @@ endif
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/ORB_Manager.o .obj/ORB_Manager.so .shobj/ORB_Manager.o .shobj/ORB_Manager.so: ORB_Manager.cpp ORB_Manager.h \
+.obj/ORB_Manager.o .obj/ORB_Manager.SO .shobj/ORB_Manager.o .shobj/ORB_Manager.SO: ORB_Manager.cpp ORB_Manager.h \
   $(ACE_ROOT)/ace/pre.h PortableServer.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -4519,8 +4525,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -4650,15 +4655,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -4666,12 +4672,15 @@ endif
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp PortableServerC.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -4680,7 +4689,7 @@ endif
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i
 
-.obj/ImplRepo_i.o .obj/ImplRepo_i.so .shobj/ImplRepo_i.o .shobj/ImplRepo_i.so: ImplRepo_i.cpp $(TAO_ROOT)/tao/orbconf.h \
+.obj/ImplRepo_i.o .obj/ImplRepo_i.SO .shobj/ImplRepo_i.o .shobj/ImplRepo_i.SO: ImplRepo_i.cpp $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/post.h \
@@ -4728,8 +4737,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -4855,23 +4863,27 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
   ImplRepoC.i \
   PortableServer.h \
   PortableServerC.h \
@@ -4906,7 +4918,7 @@ endif
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/ORB.i
 
-.obj/ServerRequestInfo.o .obj/ServerRequestInfo.so .shobj/ServerRequestInfo.o .shobj/ServerRequestInfo.so: ServerRequestInfo.cpp ServerRequestInfo.h \
+.obj/ServerRequestInfo.o .obj/ServerRequestInfo.SO .shobj/ServerRequestInfo.o .shobj/ServerRequestInfo.SO: ServerRequestInfo.cpp ServerRequestInfo.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -4928,9 +4940,8 @@ endif
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -4949,8 +4960,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -5060,63 +5070,57 @@ endif
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
   $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
@@ -5140,6 +5144,9 @@ endif
   portableserver_export.h \
   Key_Adapters.h \
   PortableServerC.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
   PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
@@ -5185,9 +5192,20 @@ endif
   POA_Policy_Set.i \
   Object_Adapter.i \
   ServerRequestInfo.inl POA.h Object_Adapter.h POAManager.h \
-  PortableServerC.h poa_macros.h POAManager.i POA_Policy_Set.h \
-  POA_Cached_Policies.h POA_Policies.h POA_Cached_Policies.i POA.i \
-  $(TAO_ROOT)/tao/ORB_Core.h \
+  PortableServerC.h poa_macros.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.i \
+  POAManager.i POA_Policy_Set.h POA_Cached_Policies.h POA_Policies.h \
+  POA_Cached_Policies.i POA.i $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
   $(TAO_ROOT)/tao/ServicesC.i \
@@ -5246,7 +5264,7 @@ endif
   $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i
 
-.obj/ServerInterceptorAdapter.o .obj/ServerInterceptorAdapter.so .shobj/ServerInterceptorAdapter.o .shobj/ServerInterceptorAdapter.so: ServerInterceptorAdapter.cpp \
+.obj/ServerInterceptorAdapter.o .obj/ServerInterceptorAdapter.SO .shobj/ServerInterceptorAdapter.o .shobj/ServerInterceptorAdapter.SO: ServerInterceptorAdapter.cpp \
   ServerInterceptorAdapter.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -5258,15 +5276,14 @@ endif
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h portableserver_export.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
@@ -5289,8 +5306,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -5400,63 +5416,57 @@ endif
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
   $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
@@ -5483,6 +5493,9 @@ endif
   portableserver_export.h \
   Key_Adapters.h \
   PortableServerC.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
   PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
@@ -5529,7 +5542,7 @@ endif
   Object_Adapter.i \
   ServerRequestInfo.inl
 
-.obj/Default_Servant_Dispatcher.o .obj/Default_Servant_Dispatcher.so .shobj/Default_Servant_Dispatcher.o .shobj/Default_Servant_Dispatcher.so: Default_Servant_Dispatcher.cpp \
+.obj/Default_Servant_Dispatcher.o .obj/Default_Servant_Dispatcher.SO .shobj/Default_Servant_Dispatcher.o .shobj/Default_Servant_Dispatcher.SO: Default_Servant_Dispatcher.cpp \
   Default_Servant_Dispatcher.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -5561,8 +5574,7 @@ endif
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -5621,9 +5633,8 @@ endif
   $(ACE_ROOT)/ace/Auto_Ptr.h \
   $(ACE_ROOT)/ace/Auto_Ptr.i \
   $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i Object_Adapter.h \
-  Key_Adapters.h PortableServerC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
+  $(ACE_ROOT)/ace/SString.i Object_Adapter.h Key_Adapters.h \
+  PortableServerC.h $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Sequence.h \
@@ -5703,15 +5714,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -5719,7 +5731,13 @@ endif
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/Pair_T.i \
@@ -5758,36 +5776,36 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \
   Object_Adapter.i POA.h POAManager.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i POAManager.i \
-  POA_Cached_Policies.h POA_Cached_Policies.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.i \
+  POAManager.i POA_Cached_Policies.h POA_Cached_Policies.i \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp POA.i
 
-.obj/Servant_Dispatcher.o .obj/Servant_Dispatcher.so .shobj/Servant_Dispatcher.o .shobj/Servant_Dispatcher.so: Servant_Dispatcher.cpp Servant_Dispatcher.h \
+.obj/Servant_Dispatcher.o .obj/Servant_Dispatcher.SO .shobj/Servant_Dispatcher.o .shobj/Servant_Dispatcher.SO: Servant_Dispatcher.cpp Servant_Dispatcher.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SStringfwd.h \
@@ -5819,8 +5837,7 @@ endif
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -5961,15 +5978,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -5977,7 +5995,13 @@ endif
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/Pair_T.i \
@@ -6016,7 +6040,7 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \
   Object_Adapter.i
 
-.obj/POA_Cached_Policies.o .obj/POA_Cached_Policies.so .shobj/POA_Cached_Policies.o .shobj/POA_Cached_Policies.so: POA_Cached_Policies.cpp POA_Cached_Policies.h \
+.obj/POA_Cached_Policies.o .obj/POA_Cached_Policies.SO .shobj/POA_Cached_Policies.o .shobj/POA_Cached_Policies.SO: POA_Cached_Policies.cpp POA_Cached_Policies.h \
   $(ACE_ROOT)/ace/pre.h POA_Policies.h PortableServerC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
@@ -6058,8 +6082,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -6189,15 +6212,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -6205,14 +6229,20 @@ endif
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp PortableServerC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i POA_Policies.i \
   POA_Cached_Policies.i POA_Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i
 
-.obj/POA_Policies.o .obj/POA_Policies.so .shobj/POA_Policies.o .shobj/POA_Policies.so: POA_Policies.cpp POA_Policies.h \
+.obj/POA_Policies.o .obj/POA_Policies.SO .shobj/POA_Policies.o .shobj/POA_Policies.SO: POA_Policies.cpp POA_Policies.h \
   $(ACE_ROOT)/ace/pre.h PortableServerC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
@@ -6254,8 +6284,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -6385,15 +6414,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -6401,11 +6431,17 @@ endif
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp PortableServerC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i POA_Policies.i
 
-.obj/PortableServer_ORBInitializer.o .obj/PortableServer_ORBInitializer.so .shobj/PortableServer_ORBInitializer.o .shobj/PortableServer_ORBInitializer.so: PortableServer_ORBInitializer.cpp \
+.obj/PortableServer_ORBInitializer.o .obj/PortableServer_ORBInitializer.SO .shobj/PortableServer_ORBInitializer.o .shobj/PortableServer_ORBInitializer.SO: PortableServer_ORBInitializer.cpp \
   PortableServer_ORBInitializer.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -6427,9 +6463,8 @@ endif
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i portableserver_export.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -6448,8 +6483,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -6559,70 +6593,67 @@ endif
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
   $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  PortableServer_PolicyFactory.h PortableServerC.h PortableServerC.i \
+  PortableServer_PolicyFactory.h PortableServerC.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp PortableServerC.i \
   Object_Adapter.h Key_Adapters.h $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/Pair_T.i \
@@ -6722,7 +6753,7 @@ endif
   $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i
 
-.obj/PortableServer_PolicyFactory.o .obj/PortableServer_PolicyFactory.so .shobj/PortableServer_PolicyFactory.o .shobj/PortableServer_PolicyFactory.so: PortableServer_PolicyFactory.cpp \
+.obj/PortableServer_PolicyFactory.o .obj/PortableServer_PolicyFactory.SO .shobj/PortableServer_PolicyFactory.o .shobj/PortableServer_PolicyFactory.SO: PortableServer_PolicyFactory.cpp \
   PortableServer_PolicyFactory.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -6744,9 +6775,8 @@ endif
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i portableserver_export.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -6765,8 +6795,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -6876,72 +6905,69 @@ endif
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
   $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i POA_Policies.h \
-  PortableServerC.h PortableServerC.i POA_Policies.i
+  PortableServerC.h $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp PortableServerC.i \
+  POA_Policies.i
 
-.obj/POA_Policy_Set.o .obj/POA_Policy_Set.so .shobj/POA_Policy_Set.o .shobj/POA_Policy_Set.so: POA_Policy_Set.cpp POA_Policy_Set.h \
+.obj/POA_Policy_Set.o .obj/POA_Policy_Set.SO .shobj/POA_Policy_Set.o .shobj/POA_Policy_Set.SO: POA_Policy_Set.cpp POA_Policy_Set.h \
   $(ACE_ROOT)/ace/pre.h POA_Policies.h PortableServerC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
@@ -6983,8 +7009,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -7114,15 +7139,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -7130,7 +7156,13 @@ endif
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp PortableServerC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i POA_Policies.i \
   $(TAO_ROOT)/tao/Policy_Set.h \
@@ -7140,9 +7172,6 @@ endif
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -7176,20 +7205,12 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -7236,7 +7257,7 @@ endif
   $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i
 
-.obj/Default_Policy_Validator.o .obj/Default_Policy_Validator.so .shobj/Default_Policy_Validator.o .shobj/Default_Policy_Validator.so: Default_Policy_Validator.cpp \
+.obj/Default_Policy_Validator.o .obj/Default_Policy_Validator.SO .shobj/Default_Policy_Validator.o .shobj/Default_Policy_Validator.SO: Default_Policy_Validator.cpp \
   Default_Policy_Validator.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -7277,8 +7298,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -7410,15 +7430,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -7426,20 +7447,32 @@ endif
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp PortableServerC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i POA_Policies.i \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i
 
-.obj/IORInfo.o .obj/IORInfo.so .shobj/IORInfo.o .shobj/IORInfo.so: IORInfo.cpp \
+.obj/IORInfo.o .obj/IORInfo.SO .shobj/IORInfo.o .shobj/IORInfo.SO: IORInfo.cpp \
   IORInfo.h \
   $(ACE_ROOT)/ace/pre.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(TAO_ROOT)/tao/IORInterceptor/IORInterceptorC.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7448,17 +7481,11 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
   $(ACE_ROOT)/ace/CORBA_macros.h \
@@ -7476,8 +7503,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -7587,67 +7613,74 @@ endif
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
   $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.i \
+  $(TAO_ROOT)/tao/IORInterceptor/iorinterceptor_export.h \
+  $(TAO_ROOT)/tao/IORInterceptor/IORInterceptorC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
   IORInfo.inl \
@@ -7656,6 +7689,9 @@ endif
   portableserver_export.h \
   Key_Adapters.h \
   PortableServerC.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
   PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
@@ -7709,16 +7745,19 @@ endif
   $(ACE_ROOT)/ace/Array_Base.cpp \
   POA.i
 
-.obj/Default_ORTC.o .obj/Default_ORTC.so .shobj/Default_ORTC.o .shobj/Default_ORTC.so: Default_ORTC.cpp Default_ORTC.h \
-  $(ACE_ROOT)/ace/pre.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+.obj/Default_ORTC.o .obj/Default_ORTC.SO .shobj/Default_ORTC.o .shobj/Default_ORTC.SO: Default_ORTC.cpp Default_ORTC.h \
+  $(ACE_ROOT)/ace/pre.h portableserver_export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/post.h \
-  $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7727,7 +7766,6 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
@@ -7750,8 +7788,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -7870,12 +7907,11 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
@@ -7891,30 +7927,39 @@ endif
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  Default_ORTC.i $(TAO_ROOT)/tao/ValueFactory.h \
-  $(TAO_ROOT)/tao/ValueFactory.i
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.i \
+  Default_ORTC.i
 
-.obj/ObjectReferenceTemplate.o .obj/ObjectReferenceTemplate.so .shobj/ObjectReferenceTemplate.o .shobj/ObjectReferenceTemplate.so: ObjectReferenceTemplate.cpp \
+.obj/ObjectReferenceTemplate.o .obj/ObjectReferenceTemplate.SO .shobj/ObjectReferenceTemplate.o .shobj/ObjectReferenceTemplate.SO: ObjectReferenceTemplate.cpp \
   ObjectReferenceTemplate.h $(ACE_ROOT)/ace/pre.h \
   portableserver_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl Default_ORTC.h \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+  portableserver_export.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/corbafwd.h \
@@ -7927,7 +7972,6 @@ endif
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
   $(ACE_ROOT)/ace/OS_Memory.h \
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
@@ -7950,8 +7994,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -8070,12 +8113,11 @@ endif
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
@@ -8091,28 +8133,37 @@ endif
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.i \
   Default_ORTC.i ObjectReferenceTemplate.inl POA.h Object_Adapter.h \
-  portableserver_export.h Key_Adapters.h PortableServerC.h \
+  Key_Adapters.h PortableServerC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/Pair_T.i \
@@ -8152,9 +8203,6 @@ endif
   Object_Adapter.i POAManager.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
   $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
@@ -8168,7 +8216,7 @@ endif
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp POA.i
 
-.obj/AMH_Response_Handler.o .obj/AMH_Response_Handler.so .shobj/AMH_Response_Handler.o .shobj/AMH_Response_Handler.so: AMH_Response_Handler.cpp AMH_Response_Handler.h \
+.obj/AMH_Response_Handler.o .obj/AMH_Response_Handler.SO .shobj/AMH_Response_Handler.o .shobj/AMH_Response_Handler.SO: AMH_Response_Handler.cpp AMH_Response_Handler.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -8211,8 +8259,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -8329,13 +8376,16 @@ endif
   $(TAO_ROOT)/tao/Seq_Out_T.inl \
   $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
@@ -8348,17 +8398,15 @@ endif
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/LocalObject.h \
@@ -8373,25 +8421,17 @@ endif
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
@@ -8492,7 +8532,7 @@ endif
   $(TAO_ROOT)/tao/GIOP_Utils.h \
   $(TAO_ROOT)/tao/GIOP_Utils.i
 
-.obj/PortableGroup_Hooks.o .obj/PortableGroup_Hooks.so .shobj/PortableGroup_Hooks.o .shobj/PortableGroup_Hooks.so: PortableGroup_Hooks.cpp PortableGroup_Hooks.h \
+.obj/PortableGroup_Hooks.o .obj/PortableGroup_Hooks.SO .shobj/PortableGroup_Hooks.o .shobj/PortableGroup_Hooks.SO: PortableGroup_Hooks.cpp PortableGroup_Hooks.h \
   $(ACE_ROOT)/ace/pre.h PortableServerC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
@@ -8534,8 +8574,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -8665,15 +8704,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -8681,8 +8721,15 @@ endif
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i POA.h \
-  Object_Adapter.h Key_Adapters.h $(ACE_ROOT)/ace/Map_T.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp PortableServerC.i \
+  POA.h Object_Adapter.h Key_Adapters.h \
+  $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
   $(ACE_ROOT)/ace/Pair_T.i \
   $(ACE_ROOT)/ace/Pair_T.cpp \
@@ -8720,42 +8767,43 @@ endif
   $(TAO_ROOT)/tao/Policy_Set.i POA_Policy_Set.i \
   Object_Adapter.i POAManager.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i POAManager.i \
-  POA_Cached_Policies.h POA_Cached_Policies.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.i \
+  POAManager.i POA_Cached_Policies.h POA_Cached_Policies.i \
   $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp POA.i
 
-.obj/ImR_LocatorC.o .obj/ImR_LocatorC.so .shobj/ImR_LocatorC.o .shobj/ImR_LocatorC.so: ImR_LocatorC.cpp ImR_LocatorC.h \
-  $(ACE_ROOT)/ace/pre.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
+.obj/ImR_LocatorC.o .obj/ImR_LocatorC.SO .shobj/ImR_LocatorC.o .shobj/ImR_LocatorC.SO: ImR_LocatorC.cpp ImR_LocatorC.h \
+  $(ACE_ROOT)/ace/pre.h portableserver_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/ace_wchar.inl ImplRepoC.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8769,8 +8817,7 @@ endif
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(TAO_ROOT)/tao/corbafwd.i portableserver_export.h \
-  ImplRepoC.h $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/SStringfwd.h \
@@ -8794,8 +8841,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -8921,23 +8967,27 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp ImplRepoC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp ImplRepoC.i \
   ImR_LocatorC.i $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/PolicyC.h \
@@ -8985,20 +9035,12 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -9050,9 +9092,6 @@ endif
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/LF_Event.h \
@@ -9093,7 +9132,7 @@ endif
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
-.obj/ImR_LocatorS.o .obj/ImR_LocatorS.so .shobj/ImR_LocatorS.o .shobj/ImR_LocatorS.so: ImR_LocatorS.cpp ImR_LocatorS.h \
+.obj/ImR_LocatorS.o .obj/ImR_LocatorS.SO .shobj/ImR_LocatorS.o .shobj/ImR_LocatorS.SO: ImR_LocatorS.cpp ImR_LocatorS.h \
   $(ACE_ROOT)/ace/pre.h ImplRepoS.h ImplRepoC.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -9138,8 +9177,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -9265,23 +9303,27 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp ImplRepoC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp ImplRepoC.i \
   PortableServer.h \
   portableserver_export.h \
   PortableServerC.h \
@@ -9372,20 +9414,12 @@ endif
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
@@ -9463,43 +9497,36 @@ endif
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/ImR_ActivatorC.o .obj/ImR_ActivatorC.so .shobj/ImR_ActivatorC.o .shobj/ImR_ActivatorC.so: ImR_ActivatorC.cpp ImR_ActivatorC.h \
-  $(ACE_ROOT)/ace/pre.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
+.obj/ImR_ActivatorC.o .obj/ImR_ActivatorC.SO .shobj/ImR_ActivatorC.o .shobj/ImR_ActivatorC.SO: ImR_ActivatorC.cpp ImR_ActivatorC.h \
+  $(ACE_ROOT)/ace/pre.h portableserver_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/orbconf.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
-  $(ACE_ROOT)/ace/OS_Memory.h \
-  $(ACE_ROOT)/ace/OS_Errno.h \
-  $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(TAO_ROOT)/tao/corbafwd.i portableserver_export.h \
-  ImR_ActivatorC.i $(TAO_ROOT)/tao/Stub.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl ImR_ActivatorC.i \
+  $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
   $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
   $(ACE_ROOT)/ace/OS_TLI.h \
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Time_Value.h \
   $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
@@ -9514,6 +9541,12 @@ endif
   $(ACE_ROOT)/ace/Synch_T.cpp \
   $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
@@ -9639,15 +9672,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -9658,9 +9692,6 @@ endif
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -9699,20 +9730,15 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -9764,9 +9790,6 @@ endif
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/LF_Event.h \
@@ -9807,13 +9830,15 @@ endif
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
-.obj/ImR_ActivatorS.o .obj/ImR_ActivatorS.so .shobj/ImR_ActivatorS.o .shobj/ImR_ActivatorS.so: ImR_ActivatorS.cpp ImR_ActivatorS.h \
+.obj/ImR_ActivatorS.o .obj/ImR_ActivatorS.SO .shobj/ImR_ActivatorS.o .shobj/ImR_ActivatorS.SO: ImR_ActivatorS.cpp ImR_ActivatorS.h \
   $(ACE_ROOT)/ace/pre.h ImR_ActivatorC.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/ace_wchar.inl ImR_ActivatorC.i \
+  PortableServer.h \
+  portableserver_export.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9827,10 +9852,7 @@ endif
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(TAO_ROOT)/tao/corbafwd.i portableserver_export.h \
-  ImR_ActivatorC.i \
-  PortableServer.h \
-  portableserver_export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   PortableServerC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
@@ -9853,8 +9875,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -9984,15 +10005,16 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -10001,6 +10023,12 @@ endif
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
   PortableServerC.i \
   Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
@@ -10072,9 +10100,6 @@ endif
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/GIOPC.h \
   $(TAO_ROOT)/tao/GIOPC.i \
@@ -10086,20 +10111,12 @@ endif
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
@@ -10171,8 +10188,7 @@ endif
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/ImplRepoC.o .obj/ImplRepoC.so .shobj/ImplRepoC.o .shobj/ImplRepoC.so: ImplRepoC.cpp ImplRepoC.h \
-  $(ACE_ROOT)/ace/pre.h portableserver_export.h \
+.obj/ImplRepoC.o .obj/ImplRepoC.SO .shobj/ImplRepoC.o .shobj/ImplRepoC.SO: ImplRepoC.cpp ImplRepoC.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -10216,8 +10232,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -10343,23 +10358,27 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp ImplRepoC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp ImplRepoC.i \
   $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/PolicyC.h \
@@ -10407,20 +10426,12 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -10472,9 +10483,6 @@ endif
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/LF_Event.h \
@@ -10515,8 +10523,8 @@ endif
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
-.obj/ImplRepoS.o .obj/ImplRepoS.so .shobj/ImplRepoS.o .shobj/ImplRepoS.so: ImplRepoS.cpp ImplRepoS.h \
-  $(ACE_ROOT)/ace/pre.h ImplRepoC.h \
+.obj/ImplRepoS.o .obj/ImplRepoS.SO .shobj/ImplRepoS.o .shobj/ImplRepoS.SO: ImplRepoS.cpp ImplRepoS.h $(ACE_ROOT)/ace/pre.h \
+  ImplRepoC.h portableserver_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -10560,8 +10568,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -10687,23 +10694,27 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp ImplRepoC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp ImplRepoC.i \
   PortableServer.h \
   portableserver_export.h \
   PortableServerC.h \
@@ -10792,20 +10803,12 @@ endif
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
diff --git a/TAO/tao/PortableServer/Makefile.bor b/TAO/tao/PortableServer/Makefile.bor
index 9a9a38aa3af..58c4e315b0f 100644
--- a/TAO/tao/PortableServer/Makefile.bor
+++ b/TAO/tao/PortableServer/Makefile.bor
@@ -47,10 +47,12 @@ OBJFILES = \
 RESOURCE = $(OBJDIR)\TAO_PortableServer.res
 
 !ifdef STATIC
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_PORTABLESERVER_CFLAGS)
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_PORTABLESERVER_CFLAGS) \
+         $(TAO_IORINTERCEPTOR_CFLAGS)
 !else
 CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_PORTABLESERVER_CFLAGS) \
-	-DTAO_PORTABLESERVER_BUILD_DLL
+         $(TAO_IORINTERCEPTOR_CFLAGS) $(TAO_ORT_CFLAGS) \
+         -DTAO_PORTABLESERVER_BUILD_DLL
 !endif
 
 CPPDIR = .
@@ -58,6 +60,10 @@ CPPDIR = .
 INCDIR_NAME = tao\PortableServer
 INCLUDES = *.h *.i *.inl *_T.cpp PortableServer.pidl ImplRepo.pidl
 
-LIBFILES = $(ACE_LIB) $(TAO_LIB)
+LIBFILES = \
+        $(ACE_LIB) \
+        $(TAO_LIB) \
+        $(TAO_ORT_LIB) \
+        $(TAO_IORINTERCEPTOR_LIB)
 
 !include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h
index 6fb1dd2bd92..98de832d728 100644
--- a/TAO/tao/PortableServer/POA.h
+++ b/TAO/tao/PortableServer/POA.h
@@ -134,6 +134,12 @@ protected:
 // Forward Declaration
 class ServerObject_i;
 
+namespace PortableInterceptor
+{
+  class IORInfo;
+  typedef IORInfo *IORInfo_ptr;
+};
+
 /**
  * @class TAO_POA
  *
@@ -164,10 +170,12 @@ public:
    */
   virtual TAO_POA* _tao_poa_downcast (void);
 
-  PortableServer::POA_ptr create_POA (const char *adapter_name,
-                                      PortableServer::POAManager_ptr poa_manager,
-                                      const CORBA::PolicyList &policies
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::POA_ptr create_POA (
+      const char *adapter_name,
+      PortableServer::POAManager_ptr poa_manager,
+      const CORBA::PolicyList &policies
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterAlreadyExists,
                      PortableServer::POA::InvalidPolicy));
@@ -185,36 +193,53 @@ public:
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value
-                                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ThreadPolicy_ptr create_thread_policy (
+      PortableServer::ThreadPolicyValue value
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value
-                                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::LifespanPolicy_ptr create_lifespan_policy (
+      PortableServer::LifespanPolicyValue value
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
-                                                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
+      PortableServer::IdUniquenessPolicyValue value
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
-                                                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
+      PortableServer::IdAssignmentPolicyValue value
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
-                                                                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ImplicitActivationPolicy_ptr 
+  create_implicit_activation_policy (
+      PortableServer::ImplicitActivationPolicyValue value
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
-                                                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ServantRetentionPolicy_ptr 
+  create_servant_retention_policy (
+      PortableServer::ServantRetentionPolicyValue value
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
-                                                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::RequestProcessingPolicy_ptr 
+  create_request_processing_policy (
+      PortableServer::RequestProcessingPolicyValue value
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
@@ -225,7 +250,9 @@ public:
   PortableServer::POA_ptr the_parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POAList *the_children (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::POAList *the_children (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::POAManager_ptr the_POAManager (
@@ -325,9 +352,11 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid,
-                                              const char *intf
-                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Object_ptr create_reference_with_id (
+      const PortableServer::ObjectId &oid,
+      const char *intf
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
@@ -343,8 +372,10 @@ public:
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference
-                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::Servant reference_to_servant (
+      CORBA::Object_ptr reference
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongAdapter,
@@ -423,8 +454,10 @@ public:
   /// Accessor for cached POA policies.
   TAO_POA_Cached_Policies &cached_policies (void);
 
-  virtual CORBA::PolicyList *client_exposed_policies (CORBA::Short object_priority
-                                                      ACE_ENV_ARG_DECL);
+  virtual CORBA::PolicyList *client_exposed_policies (
+      CORBA::Short object_priority
+      ACE_ENV_ARG_DECL
+    );
   // This method gives the policies that are exposed to the client.
   // These policies are shipped within the IOR.
 
@@ -432,14 +465,18 @@ public:
   // Utility functions for the other
   static char* ObjectId_to_string (const PortableServer::ObjectId &id);
 
-  static CORBA::WChar* ObjectId_to_wstring (const PortableServer::ObjectId &id);
+  static CORBA::WChar* ObjectId_to_wstring (
+      const PortableServer::ObjectId &id
+    );
 
   static PortableServer::ObjectId *string_to_ObjectId (const char *id);
 
   static PortableServer::ObjectId *string_to_ObjectId (const char *string,
                                                        int size);
 
-  static PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id);
+  static PortableServer::ObjectId *wstring_to_ObjectId (
+      const CORBA::WChar *id
+    );
 
   TAO_POA (const String &name,
            TAO_POA_Manager &poa_manager,
@@ -468,9 +505,11 @@ public:
 
   const TAO_Object_Adapter::poa_name &system_name (void) const;
 
-  static void check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core,
-                                                    CORBA::Boolean wait_for_completion
-                                                    ACE_ENV_ARG_DECL);
+  static void check_for_valid_wait_for_completions (
+      const TAO_ORB_Core &orb_core,
+      CORBA::Boolean wait_for_completion
+      ACE_ENV_ARG_DECL
+    );
 
   TAO_ORB_Core &orb_core (void) const;
   // ORB Core for POA.
@@ -523,10 +562,12 @@ protected:
                             TAO_Object_Adapter *object_adapter
                             ACE_ENV_ARG_DECL);
 
-  PortableServer::POA_ptr create_POA_i (const char *adapter_name,
-                                        PortableServer::POAManager_ptr poa_manager,
-                                        const CORBA::PolicyList &policies
-                                        ACE_ENV_ARG_DECL)
+  PortableServer::POA_ptr create_POA_i (
+      const char *adapter_name,
+      PortableServer::POAManager_ptr poa_manager,
+      const CORBA::PolicyList &policies
+      ACE_ENV_ARG_DECL
+    )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterAlreadyExists,
                      PortableServer::POA::InvalidPolicy));
@@ -564,9 +605,10 @@ protected:
   /// Method to notify the IOR Interceptors when there is a state
   /// changed not related to POAManager.
   void adapter_state_changed (
-   const PortableInterceptor::ObjectReferenceTemplateSeq &seq_obj_ref_template,
-   PortableInterceptor::AdapterState state
-   ACE_ENV_ARG_DECL)
+      const PortableInterceptor::ObjectReferenceTemplateSeq &seq_obj_ref_template,
+      PortableInterceptor::AdapterState state
+      ACE_ENV_ARG_DECL
+    )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the given tagged component to all profiles.
@@ -585,7 +627,9 @@ protected:
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::ServantManager_ptr get_servant_manager_i (ACE_ENV_SINGLE_ARG_DECL)
+  PortableServer::ServantManager_ptr get_servant_manager_i (
+      ACE_ENV_SINGLE_ARG_DECL
+    )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
@@ -651,10 +695,12 @@ protected:
                          int &priorities_match,
                          int &wait_occurred_restart_call);
 
-  PortableServer::ObjectId *activate_object_i (PortableServer::Servant p_servant,
-                                               CORBA::Short priority,
-                                               int &wait_occurred_restart_call
-                                               ACE_ENV_ARG_DECL)
+  PortableServer::ObjectId *activate_object_i (
+      PortableServer::Servant p_servant,
+      CORBA::Short priority,
+      int &wait_occurred_restart_call
+      ACE_ENV_ARG_DECL
+    )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::WrongPolicy));
@@ -691,11 +737,15 @@ protected:
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy));
 
-  void cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_entry
-                        ACE_ENV_ARG_DECL);
+  void cleanup_servant (
+      TAO_Active_Object_Map::Map_Entry *active_object_map_entry
+      ACE_ENV_ARG_DECL
+    );
 
-  void deactivate_map_entry (TAO_Active_Object_Map::Map_Entry *active_object_map_entry
-                             ACE_ENV_ARG_DECL);
+  void deactivate_map_entry (
+      TAO_Active_Object_Map::Map_Entry *active_object_map_entry
+      ACE_ENV_ARG_DECL
+    );
 
   CORBA::Object_ptr create_reference_i (const char *intf,
                                         CORBA::Short priority
@@ -703,10 +753,12 @@ protected:
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::Object_ptr create_reference_with_id_i (const PortableServer::ObjectId &oid,
-                                                const char *intf,
-                                                CORBA::Short priority
-                                                ACE_ENV_ARG_DECL)
+  CORBA::Object_ptr create_reference_with_id_i (
+      const PortableServer::ObjectId &oid,
+      const char *intf,
+      CORBA::Short priority
+      ACE_ENV_ARG_DECL
+    )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
@@ -716,22 +768,28 @@ protected:
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::ObjectId *servant_to_system_id (PortableServer::Servant p_servant,
-                                                  CORBA::Short &priority
-                                                  ACE_ENV_ARG_DECL)
+  PortableServer::ObjectId *servant_to_system_id (
+      PortableServer::Servant p_servant,
+      CORBA::Short &priority
+      ACE_ENV_ARG_DECL
+    )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::ObjectId *servant_to_system_id_i (PortableServer::Servant p_servant,
-                                                    CORBA::Short &priority
-                                                    ACE_ENV_ARG_DECL)
+  PortableServer::ObjectId *servant_to_system_id_i (
+      PortableServer::Servant p_servant,
+      CORBA::Short &priority
+      ACE_ENV_ARG_DECL
+    )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::Servant reference_to_servant_i (CORBA::Object_ptr reference
-                                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::Servant reference_to_servant_i (
+      CORBA::Object_ptr reference
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongAdapter,
@@ -794,12 +852,14 @@ protected:
                                          PortableServer::Servant &servant
                                          ACE_ENV_ARG_DECL);
 
-  PortableServer::Servant locate_servant_i (const char *operation,
-                                            const PortableServer::ObjectId &id,
-                                            TAO_Object_Adapter::Servant_Upcall &servant_upcall,
-                                            TAO_POA_Current_Impl &poa_current_impl,
-                                            int &wait_occurred_restart_call
-                                            ACE_ENV_ARG_DECL);
+  PortableServer::Servant locate_servant_i (
+      const char *operation,
+      const PortableServer::ObjectId &id,
+      TAO_Object_Adapter::Servant_Upcall &servant_upcall,
+      TAO_POA_Current_Impl &poa_current_impl,
+      int &wait_occurred_restart_call
+      ACE_ENV_ARG_DECL
+    );
 
   const TAO_Creation_Time &creation_time (void);
 
@@ -904,8 +964,14 @@ protected:
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-  typedef ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-  CHILDREN;
+  typedef 
+    ACE_Hash_Map_Manager_Ex<
+        ACE_CString, TAO_POA *, 
+        ACE_Hash<ACE_CString>, 
+        ACE_Equal_To<ACE_CString>, 
+        ACE_Null_Mutex
+      >
+    CHILDREN;
 
   CHILDREN children_;
 
@@ -979,7 +1045,8 @@ private:
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-class TAO_PortableServer_Export TAO_Adapter_Activator : public PortableServer::AdapterActivator
+class TAO_PortableServer_Export TAO_Adapter_Activator 
+  : public PortableServer::AdapterActivator
 {
 public:
 
diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp
index 40ce3e1f58e..4d788268477 100644
--- a/TAO/tao/PortableServer/POAManager.cpp
+++ b/TAO/tao/PortableServer/POAManager.cpp
@@ -3,6 +3,7 @@
 #include "POAManager.h"
 #include "POA.h"
 #include "poa_macros.h"
+#include "tao/IORInterceptor/IORInterceptorC.h"
 #include "tao/Server_Strategy_Factory.h"
 #include "tao/Interceptor_List.h"
 #include "tao/ORB_Core.h"
diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h
index 1c7b3410152..9e36106c177 100644
--- a/TAO/tao/PortableServer/POAManager.h
+++ b/TAO/tao/PortableServer/POAManager.h
@@ -30,7 +30,7 @@
 #include "tao/LocalObject.h"
 
 #include "tao/PortableInterceptorC.h"
-
+#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h"
 #include "ace/Unbounded_Set.h"
 
 // Forward decl.
diff --git a/TAO/tao/PortableServer/PortableServer.mpc b/TAO/tao/PortableServer/PortableServer.mpc
index f683c12037a..c6378a6b4d3 100644
--- a/TAO/tao/PortableServer/PortableServer.mpc
+++ b/TAO/tao/PortableServer/PortableServer.mpc
@@ -1,6 +1,6 @@
 project : taolib, core {
   sharedname  = TAO_PortableServer
-  libs       += TAO
+  libs       += TAO TAO_IORInterceptor
   dllflags    = TAO_PORTABLESERVER_BUILD_DLL
   libout      = ..
   include_dir = tao/PortableServer
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index f8ea5840b55..bc7ddfe2bbb 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -36,6 +36,8 @@
 #include "tao/Exception.h"
 #include "tao/PolicyC.h"
 #include "tao/OctetSeqC.h"
+#include "tao/Any_Dual_Impl_T.h"
+#include "tao/Any_Basic_Impl_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/PortableServer/TAO_PortableServer.dsp b/TAO/tao/PortableServer/TAO_PortableServer.dsp
index d79c78626c6..86b96baae6b 100644
--- a/TAO/tao/PortableServer/TAO_PortableServer.dsp
+++ b/TAO/tao/PortableServer/TAO_PortableServer.dsp
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 ace.lib TAO.lib /nologo /dll /map /debug /machine:I386 /out:"..\..\..\bin\TAO_PortableServer.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAO_ObjRefTemplate.lib TAO_Valuetype.lib TAO_IORInterceptor.lib ace.lib TAO.lib /nologo /dll /map /debug /machine:I386 /out:"..\..\..\bin\TAO_PortableServer.dll" /libpath:"..\..\tao\ObjRefTemplate" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\IORInterceptor" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "PortableServer - Win32 Debug"

 

@@ -83,7 +83,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_PortableServerd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAO_ObjRefTemplated.lib TAO_Valuetyped.lib TAO_IORInterceptord.lib TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_PortableServerd.dll" /pdbtype:sept /libpath:"..\..\tao\ObjRefTemplate" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\IORInterceptor" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "PortableServer - Win32 MFC Debug"

 

@@ -112,7 +112,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 TAOd.lib aced.lib TAO_Svc_Utilsd.lib TAO_RTEventd.lib TAO_RTSchedd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_PortableServerd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-# ADD LINK32 TAOmfcd.lib acemfcd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_PortableServermfcd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAOmfcd.lib acemfcd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_PortableServermfcd.dll" /pdbtype:sept /libpath:"..\..\tao\ObjRefTemplate" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\IORInterceptor" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "PortableServer - Win32 MFC Release"

 

@@ -141,7 +141,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 ace.lib TAO.lib TAO_Svc_Utils.lib TAO_RTEvent.lib TAO_RTSched.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_PortableServer.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-# ADD LINK32 TAOmfc.lib acemfc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /map /debug /machine:I386 /out:"..\..\..\bin\TAO_PortableServermfc.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAOmfc.lib acemfc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /map /debug /machine:I386 /out:"..\..\..\bin\TAO_PortableServermfc.dll" /libpath:"..\..\tao\ObjRefTemplate" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\IORInterceptor" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

 !ENDIF 

 

@@ -611,10 +611,12 @@ SOURCE=.\ImplRepoS_T.cpp
 # Begin Source File

 

 SOURCE=.\ImR_ActivatorS_T.cpp

+# PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

 SOURCE=.\ImR_LocatorS_T.cpp

+# PROP Exclude_From_Build 1

 # End Source File

 # End Group

 # Begin Group "Resource Files"

diff --git a/TAO/tao/PredefinedType_Seq_Tmplinst.cpp b/TAO/tao/PredefinedType_Seq_Tmplinst.cpp
index 2cd5d230217..2a44b0937b4 100644
--- a/TAO/tao/PredefinedType_Seq_Tmplinst.cpp
+++ b/TAO/tao/PredefinedType_Seq_Tmplinst.cpp
@@ -19,8 +19,6 @@
 // ============================================================================
 
 #include "tao/Sequence_T.h"
-#include "tao/ValueBase.h"
-#include "tao/AbstractBase.h"
 #include "tao/Any.h"
 
 ACE_RCSID (tao, 
@@ -42,11 +40,6 @@ template class TAO_Unbounded_Sequence<CORBA::Double>;
 template class TAO_Unbounded_Sequence<CORBA::LongDouble>;
 template class TAO_Unbounded_Pseudo_Sequence<CORBA::Object, 
                                              CORBA::Object_var>;
-template class TAO_Unbounded_Valuetype_Sequence<CORBA::ValueBase, 
-                                                CORBA::ValueBase_var, 
-                                                CORBA::tao_ValueBase_life>;
-template class TAO_Unbounded_Pseudo_Sequence<CORBA::AbstractBase, 
-                                             CORBA::AbstractBase_var>;
 template class TAO_Unbounded_Sequence<CORBA::Any>;
 template class TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode, 
                                              CORBA::TypeCode_var>;
@@ -66,11 +59,6 @@ template class TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode,
 #pragma instantiate TAO_Unbounded_Sequence<CORBA::LongDouble>
 #pragma instantiate TAO_Unbounded_Pseudo_Sequence<CORBA::Object, \
                                                   CORBA::Object_var>
-#pragma instantiate TAO_Unbounded_Valuetype_Sequence<CORBA::ValueBase, \
-                                                     CORBA::ValueBase_var, \
-                                                     CORBA::tao_ValueBase_life>
-#pragma instantiate TAO_Unbounded_Pseudo_Sequence<CORBA::AbstractBase, \
-                                                  CORBA::AbstractBase_var>
 #pragma instantiate TAO_Unbounded_Sequence<CORBA::Any>
 #pragma instantiate TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode, \
                                                   CORBA::TypeCode_var>
diff --git a/TAO/tao/Pseudo_Value_VarOut_T.cpp b/TAO/tao/Pseudo_Value_VarOut_T.cpp
deleted file mode 100644
index 2be58fb50f1..00000000000
--- a/TAO/tao/Pseudo_Value_VarOut_T.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-// $Id$
-
-#ifndef TAO_PSEUDO_VALUE_VAROUT_T_C
-#define TAO_PSEUDO_VALUE_VAROUT_T_C
-
-#include "tao/Pseudo_Value_VarOut_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Pseudo_Value_VarOut_T.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao, 
-           Pseudo_Value_VarOut_T, 
-           "$Id$")
-
-#endif /* TAO_PSEUDO_VALUE_VAROUT_T_C */
diff --git a/TAO/tao/Pseudo_Value_VarOut_T.h b/TAO/tao/Pseudo_Value_VarOut_T.h
deleted file mode 100644
index cb78c98f5c3..00000000000
--- a/TAO/tao/Pseudo_Value_VarOut_T.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Pseudo_Value_VarOut_T.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_PSEUDO_VALUE_VAROUT_T_H
-#define TAO_PSEUDO_VALUE_VAROUT_T_H
-
-#include "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class TAO_Pseudo_Value_Var_T
- *
- * @brief Parametrized implementation of _var class for
- * CORBA::ValueBase and CORBA::ValueFactoryBase.
- *
- */
-template <typename T>
-class TAO_Pseudo_Value_Var_T
-{
-public:
-  TAO_Pseudo_Value_Var_T (void);
-  TAO_Pseudo_Value_Var_T (T *);
-  TAO_Pseudo_Value_Var_T (const TAO_Pseudo_Value_Var_T<T> &);
-
-  ~TAO_Pseudo_Value_Var_T (void);
-
-  TAO_Pseudo_Value_Var_T<T> & operator= (T *);
-  TAO_Pseudo_Value_Var_T<T> & operator= (const TAO_Pseudo_Value_Var_T<T> &);
-
-  T * operator-> (void) const;
-
-  operator const T *& () const;
-  operator T *& ();
-
-  T * in (void) const;
-  T *& inout (void);
-  T *& out (void);
-  T * _retn (void);
-
-  // TAO extension.
-  T * ptr (void) const;
-
-private:
-  T * ptr_;
-};
-
-/**
- * @class TAO_Pseudo_Value_Out_T
- *
- * @brief Parametrized implementation of _out class for
- * CORBA::ValueBase and CORBA::ValueFactoryBase.
- *
- */
-template <typename T, typename T_var>
-class TAO_Pseudo_Value_Out_T
-{
-public:
-  TAO_Pseudo_Value_Out_T (T *&);
-  TAO_Pseudo_Value_Out_T (T_var &);
-  TAO_Pseudo_Value_Out_T (const TAO_Pseudo_Value_Out_T<T,T_var> &);
-
-  TAO_Pseudo_Value_Out_T<T,T_var> & operator= (
-      const TAO_Pseudo_Value_Out_T<T,T_var> &
-    );
-  TAO_Pseudo_Value_Out_T<T,T_var> & operator= (T *);
-
-  operator T *& ();
-
-  T *& ptr (void);
-
-  T * operator-> (void);
-
-private:
-  T *& ptr_;
-
-  /// Assignment from _var not allowed.
-  TAO_Pseudo_Value_Out_T<T,T_var> & operator= (const T_var &);
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/Pseudo_Value_VarOut_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Pseudo_Value_VarOut_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Pseudo_Value_VarOut_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include "ace/post.h"
-
-#endif /* TAO_PSEUDO_VALUE_VAROUT_T_H */
diff --git a/TAO/tao/Pseudo_Value_VarOut_T.inl b/TAO/tao/Pseudo_Value_VarOut_T.inl
deleted file mode 100644
index 48467ad926a..00000000000
--- a/TAO/tao/Pseudo_Value_VarOut_T.inl
+++ /dev/null
@@ -1,189 +0,0 @@
-// $Id$
-
-template <typename T>
-ACE_INLINE
-TAO_Pseudo_Value_Var_T<T>::TAO_Pseudo_Value_Var_T (void)
-  : ptr_ (0)
-{}
-
-template <typename T>
-ACE_INLINE
-TAO_Pseudo_Value_Var_T<T>::TAO_Pseudo_Value_Var_T (T * p)
-  : ptr_ (p)
-{}
-
-template <typename T>
-ACE_INLINE
-TAO_Pseudo_Value_Var_T<T>::TAO_Pseudo_Value_Var_T (const TAO_Pseudo_Value_Var_T<T> & p)
-  : ptr_ (p.ptr_)
-{
-  CORBA::add_ref (this->ptr_);
-}
-
-template <typename T>
-ACE_INLINE
-TAO_Pseudo_Value_Var_T<T>::~TAO_Pseudo_Value_Var_T (void)
-{
-  CORBA::remove_ref (this->ptr_);
-}
-
-template <typename T>
-ACE_INLINE
-TAO_Pseudo_Value_Var_T<T> &
-TAO_Pseudo_Value_Var_T<T>::operator= (T * p)
-{
-  CORBA::remove_ref (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-template <typename T>
-ACE_INLINE
-TAO_Pseudo_Value_Var_T<T> &
-TAO_Pseudo_Value_Var_T<T>::operator= (const TAO_Pseudo_Value_Var_T<T> & p)
-{
-  if (this != &p)
-    {
-      CORBA::remove_ref (this->ptr_);
-      this->ptr_ = p.ptr ();
-      CORBA::add_ref (this->ptr_);
-    }
-
-  return *this;
-}
-
-template <typename T>
-ACE_INLINE
-TAO_Pseudo_Value_Var_T<T>::operator const T *& () const
-{
-  return ACE_const_cast (const T*, this->ptr_);
-}
-
-template <typename T>
-ACE_INLINE
-TAO_Pseudo_Value_Var_T<T>::operator T *& ()
-{
-  return this->ptr_;
-}
-
-template <typename T>
-ACE_INLINE
-T *
-TAO_Pseudo_Value_Var_T<T>::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-template <typename T>
-ACE_INLINE
-T *
-TAO_Pseudo_Value_Var_T<T>::in (void) const
-{
-  return this->ptr_;
-}
-
-template <typename T>
-ACE_INLINE
-T *&
-TAO_Pseudo_Value_Var_T<T>::inout (void)
-{
-  return this->ptr_;
-}
-
-template <typename T>
-ACE_INLINE
-T *&
-TAO_Pseudo_Value_Var_T<T>::out (void)
-{
-  CORBA::remove_ref (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-template <typename T>
-ACE_INLINE
-T *
-TAO_Pseudo_Value_Var_T<T>::_retn (void)
-{
-  T * val = this->ptr_;
-  this->ptr_ = 0;
-  return val;
-}
-
-template <typename T>
-ACE_INLINE
-T *
-TAO_Pseudo_Value_Var_T<T>::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Pseudo_Value_Out_T<T,T_var>::TAO_Pseudo_Value_Out_T (T *& p)
-  : ptr_ (p)
-{
-  this->ptr_ = T::_nil ();
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Pseudo_Value_Out_T<T,T_var>::TAO_Pseudo_Value_Out_T (T_var & p)
-  : ptr_ (p.out ())
-{
-  CORBA::remove_ref (this->ptr_);
-  this->ptr_ = T::_nil ();
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Pseudo_Value_Out_T<T,T_var>::TAO_Pseudo_Value_Out_T (
-    const TAO_Pseudo_Value_Out_T<T,T_var> & p
-  )
-  : ptr_ (p.ptr_)
-{}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Pseudo_Value_Out_T<T,T_var> &
-TAO_Pseudo_Value_Out_T<T,T_var>::operator= (
-    const TAO_Pseudo_Value_Out_T<T,T_var> & p
-  )
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Pseudo_Value_Out_T<T,T_var> &
-TAO_Pseudo_Value_Out_T<T,T_var>::operator= (T * p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-TAO_Pseudo_Value_Out_T<T,T_var>::operator T *& ()
-{
-  return this->ptr_;
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-T *&
-TAO_Pseudo_Value_Out_T<T,T_var>::ptr (void)
-{
-  return this->ptr_;
-}
-
-template <typename T, typename T_var>
-ACE_INLINE
-T *
-TAO_Pseudo_Value_Out_T<T,T_var>::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/Queued_Message.h b/TAO/tao/Queued_Message.h
index dcd54f52a16..03700402289 100644
--- a/TAO/tao/Queued_Message.h
+++ b/TAO/tao/Queued_Message.h
@@ -24,6 +24,8 @@
 
 struct iovec;
 
+struct iovec;
+
 class ACE_Message_Block;
 class ACE_Allocator;
 
diff --git a/TAO/tao/RTCORBA/Makefile b/TAO/tao/RTCORBA/Makefile
index 848c92c36cd..daca9b36592 100644
--- a/TAO/tao/RTCORBA/Makefile
+++ b/TAO/tao/RTCORBA/Makefile
@@ -101,7 +101,7 @@ endif # corba_messaging
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/Continuous_Priority_Mapping.o .obj/Continuous_Priority_Mapping.so .shobj/Continuous_Priority_Mapping.o .shobj/Continuous_Priority_Mapping.so: Continuous_Priority_Mapping.cpp \
+.obj/Continuous_Priority_Mapping.o .obj/Continuous_Priority_Mapping.SO .shobj/Continuous_Priority_Mapping.o .shobj/Continuous_Priority_Mapping.SO: Continuous_Priority_Mapping.cpp \
   Continuous_Priority_Mapping.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -112,7 +112,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h rtcorba_export.h \
-  Priority_Mapping.h RTCORBAC.h $(TAO_ROOT)/tao/IOPC.h \
+  Priority_Mapping.h RTCORBAC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Default_Constants.h \
@@ -123,8 +123,16 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -143,8 +151,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -154,7 +161,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Typecode.h \
@@ -254,23 +260,14 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
@@ -278,33 +275,37 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp RTCORBAC.i \
   Priority_Mapping.i Continuous_Priority_Mapping.i \
   $(ACE_ROOT)/ace/Sched_Params.h \
   $(ACE_ROOT)/ace/Sched_Params.i
 
-.obj/Direct_Priority_Mapping.o .obj/Direct_Priority_Mapping.so .shobj/Direct_Priority_Mapping.o .shobj/Direct_Priority_Mapping.so: Direct_Priority_Mapping.cpp \
+.obj/Direct_Priority_Mapping.o .obj/Direct_Priority_Mapping.SO .shobj/Direct_Priority_Mapping.o .shobj/Direct_Priority_Mapping.SO: Direct_Priority_Mapping.cpp \
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -316,7 +317,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h Direct_Priority_Mapping.h \
   Priority_Mapping.h RTCORBAC.h rtcorba_export.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Default_Constants.h \
@@ -327,8 +327,16 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -347,8 +355,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -358,7 +365,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Typecode.h \
@@ -458,23 +464,14 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
@@ -482,33 +479,37 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp RTCORBAC.i \
   Priority_Mapping.i Direct_Priority_Mapping.i \
   $(ACE_ROOT)/ace/Sched_Params.h \
   $(ACE_ROOT)/ace/Sched_Params.i
 
-.obj/Linear_Priority_Mapping.o .obj/Linear_Priority_Mapping.so .shobj/Linear_Priority_Mapping.o .shobj/Linear_Priority_Mapping.so: Linear_Priority_Mapping.cpp \
+.obj/Linear_Priority_Mapping.o .obj/Linear_Priority_Mapping.SO .shobj/Linear_Priority_Mapping.o .shobj/Linear_Priority_Mapping.SO: Linear_Priority_Mapping.cpp \
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -520,7 +521,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h Linear_Priority_Mapping.h \
   rtcorba_export.h Priority_Mapping.h RTCORBAC.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Default_Constants.h \
@@ -531,8 +531,16 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -551,8 +559,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -562,7 +569,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Typecode.h \
@@ -662,23 +668,14 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
@@ -686,33 +683,37 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp RTCORBAC.i \
   Priority_Mapping.i Linear_Priority_Mapping.i \
   $(ACE_ROOT)/ace/Sched_Params.h \
   $(ACE_ROOT)/ace/Sched_Params.i
 
-.obj/RT_Thread_Lane_Resources_Manager.o .obj/RT_Thread_Lane_Resources_Manager.so .shobj/RT_Thread_Lane_Resources_Manager.o .shobj/RT_Thread_Lane_Resources_Manager.so: RT_Thread_Lane_Resources_Manager.cpp \
+.obj/RT_Thread_Lane_Resources_Manager.o .obj/RT_Thread_Lane_Resources_Manager.SO .shobj/RT_Thread_Lane_Resources_Manager.o .shobj/RT_Thread_Lane_Resources_Manager.SO: RT_Thread_Lane_Resources_Manager.cpp \
   RT_Thread_Lane_Resources_Manager.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/orbconf.h \
@@ -751,8 +752,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -910,13 +910,11 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -950,20 +948,15 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -1017,11 +1010,14 @@ endif # corba_messaging
   RTCORBAC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
   RTCORBAC.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(TAO_ROOT)/tao/New_Leader_Generator.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
   $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
@@ -1050,7 +1046,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Intrusive_List.cpp \
   $(TAO_ROOT)/tao/Leader_Follower.i
 
-.obj/Priority_Mapping.o .obj/Priority_Mapping.so .shobj/Priority_Mapping.o .shobj/Priority_Mapping.so: Priority_Mapping.cpp \
+.obj/Priority_Mapping.o .obj/Priority_Mapping.SO .shobj/Priority_Mapping.o .shobj/Priority_Mapping.SO: Priority_Mapping.cpp \
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1060,9 +1056,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/ACE_export.h \
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Global_Macros.h \
-  $(ACE_ROOT)/ace/OS_Export.h Priority_Mapping.h \
-  RTCORBAC.h rtcorba_export.h $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/OS_Export.h Priority_Mapping.h RTCORBAC.h \
+  rtcorba_export.h $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/CDR_Base.inl \
@@ -1072,8 +1067,16 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -1092,8 +1095,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1103,7 +1105,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Typecode.h \
@@ -1203,23 +1204,14 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
@@ -1227,31 +1219,35 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp RTCORBAC.i \
   Priority_Mapping.i
 
-.obj/Priority_Mapping_Manager.o .obj/Priority_Mapping_Manager.so .shobj/Priority_Mapping_Manager.o .shobj/Priority_Mapping_Manager.so: Priority_Mapping_Manager.cpp \
+.obj/Priority_Mapping_Manager.o .obj/Priority_Mapping_Manager.SO .shobj/Priority_Mapping_Manager.o .shobj/Priority_Mapping_Manager.SO: Priority_Mapping_Manager.cpp \
   Priority_Mapping_Manager.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1262,7 +1258,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h rtcorba_export.h \
-  Priority_Mapping.h RTCORBAC.h $(TAO_ROOT)/tao/IOPC.h \
+  Priority_Mapping.h RTCORBAC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Default_Constants.h \
@@ -1273,8 +1269,16 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -1293,8 +1297,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1304,7 +1307,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Typecode.h \
@@ -1404,23 +1406,14 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
@@ -1428,33 +1421,37 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp RTCORBAC.i \
   Priority_Mapping.i $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
   Priority_Mapping_Manager.i
 
-.obj/Linear_Network_Priority_Mapping.o .obj/Linear_Network_Priority_Mapping.so .shobj/Linear_Network_Priority_Mapping.o .shobj/Linear_Network_Priority_Mapping.so: Linear_Network_Priority_Mapping.cpp \
+.obj/Linear_Network_Priority_Mapping.o .obj/Linear_Network_Priority_Mapping.SO .shobj/Linear_Network_Priority_Mapping.o .shobj/Linear_Network_Priority_Mapping.SO: Linear_Network_Priority_Mapping.cpp \
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1467,7 +1464,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Export.h \
   Linear_Network_Priority_Mapping.h rtcorba_export.h \
   Network_Priority_Mapping.h RTCORBAC.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Default_Constants.h \
@@ -1478,8 +1474,16 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -1498,8 +1502,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1509,7 +1512,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Typecode.h \
@@ -1609,23 +1611,14 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
@@ -1633,33 +1626,37 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp RTCORBAC.i \
   Network_Priority_Mapping.i Linear_Network_Priority_Mapping.i \
   $(ACE_ROOT)/ace/Sched_Params.h \
   $(ACE_ROOT)/ace/Sched_Params.i
 
-.obj/Network_Priority_Mapping.o .obj/Network_Priority_Mapping.so .shobj/Network_Priority_Mapping.o .shobj/Network_Priority_Mapping.so: Network_Priority_Mapping.cpp \
+.obj/Network_Priority_Mapping.o .obj/Network_Priority_Mapping.SO .shobj/Network_Priority_Mapping.o .shobj/Network_Priority_Mapping.SO: Network_Priority_Mapping.cpp \
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1670,8 +1667,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h Network_Priority_Mapping.h \
-  RTCORBAC.h rtcorba_export.h $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
+  RTCORBAC.h rtcorba_export.h $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/CDR_Base.inl \
@@ -1681,8 +1677,16 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -1701,8 +1705,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1712,7 +1715,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Typecode.h \
@@ -1812,23 +1814,14 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
@@ -1836,31 +1829,35 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp RTCORBAC.i \
   Network_Priority_Mapping.i
 
-.obj/Network_Priority_Mapping_Manager.o .obj/Network_Priority_Mapping_Manager.so .shobj/Network_Priority_Mapping_Manager.o .shobj/Network_Priority_Mapping_Manager.so: Network_Priority_Mapping_Manager.cpp \
+.obj/Network_Priority_Mapping_Manager.o .obj/Network_Priority_Mapping_Manager.SO .shobj/Network_Priority_Mapping_Manager.o .shobj/Network_Priority_Mapping_Manager.SO: Network_Priority_Mapping_Manager.cpp \
   Network_Priority_Mapping_Manager.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1872,7 +1869,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h rtcorba_export.h \
   Network_Priority_Mapping.h RTCORBAC.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Default_Constants.h \
@@ -1883,8 +1879,16 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -1903,8 +1907,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1914,7 +1917,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Typecode.h \
@@ -2014,23 +2016,14 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
@@ -2038,34 +2031,38 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp RTCORBAC.i \
   Network_Priority_Mapping.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
   Network_Priority_Mapping_Manager.i
 
-.obj/Private_Transport_Descriptor.o .obj/Private_Transport_Descriptor.so .shobj/Private_Transport_Descriptor.o .shobj/Private_Transport_Descriptor.so: Private_Transport_Descriptor.cpp \
+.obj/Private_Transport_Descriptor.o .obj/Private_Transport_Descriptor.SO .shobj/Private_Transport_Descriptor.o .shobj/Private_Transport_Descriptor.SO: Private_Transport_Descriptor.cpp \
   Private_Transport_Descriptor.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -2091,8 +2088,7 @@ endif # corba_messaging
   Private_Transport_Descriptor.inl \
   $(TAO_ROOT)/tao/Endpoint.h \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -2103,8 +2099,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -2120,7 +2115,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(TAO_ROOT)/tao/Endpoint.i
 
-.obj/RTCORBA.o .obj/RTCORBA.so .shobj/RTCORBA.o .shobj/RTCORBA.so: RTCORBA.cpp RTCORBA.h $(ACE_ROOT)/ace/pre.h \
+.obj/RTCORBA.o .obj/RTCORBA.SO .shobj/RTCORBA.o .shobj/RTCORBA.SO: RTCORBA.cpp RTCORBA.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -2140,9 +2135,16 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i RTCORBAC.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -2161,8 +2163,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2172,7 +2173,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Typecode.h \
@@ -2272,23 +2272,14 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
@@ -2296,35 +2287,39 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i RT_ORB_Loader.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp RTCORBAC.i \
+  RT_ORB_Loader.h $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i
 
-.obj/RTCORBAC.o .obj/RTCORBAC.so .shobj/RTCORBAC.o .shobj/RTCORBAC.so: RTCORBAC.cpp RTCORBA.h $(ACE_ROOT)/ace/pre.h \
+.obj/RTCORBAC.o .obj/RTCORBAC.SO .shobj/RTCORBAC.o .shobj/RTCORBAC.SO: RTCORBAC.cpp RTCORBA.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -2344,9 +2339,16 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i RTCORBAC.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -2365,8 +2367,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2376,7 +2377,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Typecode.h \
@@ -2476,23 +2476,14 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
@@ -2500,28 +2491,32 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp RTCORBAC.i \
   $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
   $(TAO_ROOT)/tao/MProfile.i \
@@ -2565,22 +2560,18 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -2626,9 +2617,6 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/LF_Event.h \
@@ -2669,7 +2657,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
-.obj/RT_Current.o .obj/RT_Current.so .shobj/RT_Current.o .shobj/RT_Current.so: RT_Current.cpp RT_Current.h \
+.obj/RT_Current.o .obj/RT_Current.SO .shobj/RT_Current.o .shobj/RT_Current.SO: RT_Current.cpp RT_Current.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -2680,7 +2668,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h RTCORBAC.h rtcorba_export.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Default_Constants.h \
@@ -2691,8 +2678,16 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -2711,8 +2706,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2722,7 +2716,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Typecode.h \
@@ -2822,23 +2815,14 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
@@ -2846,28 +2830,32 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp RTCORBAC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i RT_Current.i \
   Priority_Mapping.h Priority_Mapping.i \
@@ -2912,22 +2900,18 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -2972,7 +2956,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Stub.i \
   $(TAO_ROOT)/tao/Protocols_Hooks.h
 
-.obj/RT_Endpoint_Selector_Factory.o .obj/RT_Endpoint_Selector_Factory.so .shobj/RT_Endpoint_Selector_Factory.o .shobj/RT_Endpoint_Selector_Factory.so: RT_Endpoint_Selector_Factory.cpp \
+.obj/RT_Endpoint_Selector_Factory.o .obj/RT_Endpoint_Selector_Factory.SO .shobj/RT_Endpoint_Selector_Factory.o .shobj/RT_Endpoint_Selector_Factory.SO: RT_Endpoint_Selector_Factory.cpp \
   RT_Endpoint_Selector_Factory.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -3007,8 +2991,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -3099,9 +3082,16 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   RT_Invocation_Endpoint_Selectors.h RTCORBA.h RTCORBAC.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -3111,7 +3101,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Typecode.h \
@@ -3132,23 +3121,14 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
@@ -3156,28 +3136,32 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp RTCORBAC.i \
   $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
   $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
   RT_Invocation_Endpoint_Selectors.i RT_Endpoint_Utils.h RT_Stub.h \
@@ -3219,22 +3203,18 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -3280,9 +3260,6 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/LF_Event.h \
@@ -3318,7 +3295,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Invocation.i \
   $(TAO_ROOT)/tao/Protocols_Hooks.h
 
-.obj/RT_Endpoint_Utils.o .obj/RT_Endpoint_Utils.so .shobj/RT_Endpoint_Utils.o .shobj/RT_Endpoint_Utils.so: RT_Endpoint_Utils.cpp RT_Endpoint_Utils.h \
+.obj/RT_Endpoint_Utils.o .obj/RT_Endpoint_Utils.SO .shobj/RT_Endpoint_Utils.o .shobj/RT_Endpoint_Utils.SO: RT_Endpoint_Utils.cpp RT_Endpoint_Utils.h \
   $(ACE_ROOT)/ace/pre.h rtcorba_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -3358,8 +3335,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -3492,48 +3468,46 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
   RT_Invocation_Endpoint_Selectors.h RTCORBA.h RTCORBAC.h \
-  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp RTCORBAC.i \
   $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
   $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
   RT_Invocation_Endpoint_Selectors.i \
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/LF_Event.h \
@@ -3545,6 +3519,10 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/operation_details.h \
   $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
   $(TAO_ROOT)/tao/target_specification.i \
@@ -3607,20 +3585,12 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -3664,7 +3634,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
   $(TAO_ROOT)/tao/Stub.i
 
-.obj/RT_Invocation_Endpoint_Selectors.o .obj/RT_Invocation_Endpoint_Selectors.so .shobj/RT_Invocation_Endpoint_Selectors.o .shobj/RT_Invocation_Endpoint_Selectors.so: RT_Invocation_Endpoint_Selectors.cpp \
+.obj/RT_Invocation_Endpoint_Selectors.o .obj/RT_Invocation_Endpoint_Selectors.SO .shobj/RT_Invocation_Endpoint_Selectors.o .shobj/RT_Invocation_Endpoint_Selectors.SO: RT_Invocation_Endpoint_Selectors.cpp \
   RT_Invocation_Endpoint_Selectors.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -3684,10 +3654,17 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(TAO_ROOT)/tao/corbafwd.i RTCORBA.h \
-  rtcorba_export.h RTCORBAC.h $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/corbafwd.i RTCORBA.h rtcorba_export.h \
+  RTCORBAC.h $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -3706,8 +3683,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -3717,7 +3693,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Typecode.h \
@@ -3817,23 +3792,14 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
@@ -3841,37 +3807,38 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp RTCORBAC.i \
   $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
   $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
   RT_Invocation_Endpoint_Selectors.i \
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/LF_Event.h \
@@ -3883,6 +3850,10 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/operation_details.h \
   $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
   $(TAO_ROOT)/tao/target_specification.i \
@@ -3950,20 +3921,12 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -4022,7 +3985,7 @@ endif # corba_messaging
   Network_Priority_Mapping.h Network_Priority_Mapping.i \
   Network_Priority_Mapping_Manager.i RT_Protocols_Hooks.i
 
-.obj/RT_Mutex.o .obj/RT_Mutex.so .shobj/RT_Mutex.o .shobj/RT_Mutex.so: RT_Mutex.cpp RT_Mutex.h $(ACE_ROOT)/ace/pre.h \
+.obj/RT_Mutex.o .obj/RT_Mutex.SO .shobj/RT_Mutex.o .shobj/RT_Mutex.SO: RT_Mutex.cpp RT_Mutex.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/post.h \
@@ -4032,7 +3995,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h RTCORBAC.h rtcorba_export.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Default_Constants.h \
@@ -4043,8 +4005,16 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -4063,8 +4033,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -4074,7 +4043,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Typecode.h \
@@ -4174,23 +4142,14 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
@@ -4198,32 +4157,36 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp RTCORBAC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i RT_ORB.h RT_ORB.i
 
-.obj/RT_ORB.o .obj/RT_ORB.so .shobj/RT_ORB.o .shobj/RT_ORB.so: RT_ORB.cpp RT_ORB.h $(ACE_ROOT)/ace/pre.h \
+.obj/RT_ORB.o .obj/RT_ORB.SO .shobj/RT_ORB.o .shobj/RT_ORB.SO: RT_ORB.cpp RT_ORB.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
   $(ACE_ROOT)/ace/post.h \
@@ -4233,7 +4196,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h RTCORBAC.h rtcorba_export.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Default_Constants.h \
@@ -4244,8 +4206,16 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -4264,8 +4234,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -4275,7 +4244,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Typecode.h \
@@ -4375,23 +4343,14 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
@@ -4399,28 +4358,32 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp RTCORBAC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i RT_ORB.i RT_Policy_i.h \
   RT_Policy_i.i RT_Mutex.h Priority_Mapping_Manager.h Priority_Mapping.h \
@@ -4463,22 +4426,18 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -4524,8 +4483,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
   $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
   $(TAO_ROOT)/tao/New_Leader_Generator.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
   $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
@@ -4551,7 +4509,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Sched_Params.h \
   $(ACE_ROOT)/ace/Sched_Params.i
 
-.obj/RT_ORBInitializer.o .obj/RT_ORBInitializer.so .shobj/RT_ORBInitializer.o .shobj/RT_ORBInitializer.so: RT_ORBInitializer.cpp RT_ORBInitializer.h \
+.obj/RT_ORBInitializer.o .obj/RT_ORBInitializer.SO .shobj/RT_ORBInitializer.o .shobj/RT_ORBInitializer.SO: RT_ORBInitializer.cpp RT_ORBInitializer.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -4573,9 +4531,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i rtcorba_export.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -4594,8 +4551,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -4705,63 +4661,57 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
   $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
@@ -4772,6 +4722,10 @@ endif # corba_messaging
   rtcorba_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
   RTCORBAC.i RT_Policy_i.h \
   RTCORBAC.h RT_Policy_i.i RT_Protocols_Hooks.h \
   $(TAO_ROOT)/tao/Protocols_Hooks.h \
@@ -4882,7 +4836,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Sched_Params.h \
   $(ACE_ROOT)/ace/Sched_Params.i
 
-.obj/RT_ORB_Loader.o .obj/RT_ORB_Loader.so .shobj/RT_ORB_Loader.o .shobj/RT_ORB_Loader.so: RT_ORB_Loader.cpp RT_ORB_Loader.h \
+.obj/RT_ORB_Loader.o .obj/RT_ORB_Loader.SO .shobj/RT_ORB_Loader.o .shobj/RT_ORB_Loader.SO: RT_ORB_Loader.cpp RT_ORB_Loader.h \
   $(ACE_ROOT)/ace/pre.h rtcorba_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -4910,8 +4864,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -5006,9 +4959,8 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -5041,63 +4993,57 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
   $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
@@ -5105,7 +5051,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i RT_PolicyFactory.h
 
-.obj/RT_PolicyFactory.o .obj/RT_PolicyFactory.so .shobj/RT_PolicyFactory.o .shobj/RT_PolicyFactory.so: RT_PolicyFactory.cpp RT_PolicyFactory.h \
+.obj/RT_PolicyFactory.o .obj/RT_PolicyFactory.SO .shobj/RT_PolicyFactory.o .shobj/RT_PolicyFactory.SO: RT_PolicyFactory.cpp RT_PolicyFactory.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -5127,9 +5073,8 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i rtcorba_export.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -5148,8 +5093,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -5259,73 +5203,72 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/CDR.h \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
   $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i RT_Policy_i.h \
-  RTCORBAC.h $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i RTCORBAC.i RT_Policy_i.i
+  $(TAO_ROOT)/tao/LocalObject.i RT_Policy_i.h RTCORBAC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp RTCORBAC.i \
+  RT_Policy_i.i
 
-.obj/RT_Policy_i.o .obj/RT_Policy_i.so .shobj/RT_Policy_i.o .shobj/RT_Policy_i.so: RT_Policy_i.cpp RT_Policy_i.h \
+.obj/RT_Policy_i.o .obj/RT_Policy_i.SO .shobj/RT_Policy_i.o .shobj/RT_Policy_i.SO: RT_Policy_i.cpp RT_Policy_i.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -5336,7 +5279,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h RTCORBAC.h rtcorba_export.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Default_Constants.h \
@@ -5347,8 +5289,16 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -5367,8 +5317,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -5378,7 +5327,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Typecode.h \
@@ -5478,23 +5426,14 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
@@ -5502,28 +5441,32 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp RTCORBAC.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i RT_Policy_i.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
@@ -5564,22 +5507,18 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -5620,7 +5559,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i
 
-.obj/RT_Protocols_Hooks.o .obj/RT_Protocols_Hooks.so .shobj/RT_Protocols_Hooks.o .shobj/RT_Protocols_Hooks.so: RT_Protocols_Hooks.cpp RT_Protocols_Hooks.h \
+.obj/RT_Protocols_Hooks.o .obj/RT_Protocols_Hooks.SO .shobj/RT_Protocols_Hooks.o .shobj/RT_Protocols_Hooks.SO: RT_Protocols_Hooks.cpp RT_Protocols_Hooks.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(TAO_ROOT)/tao/corbafwd.h \
@@ -5661,8 +5600,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -5793,39 +5731,40 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
   Priority_Mapping_Manager.h rtcorba_export.h Priority_Mapping.h \
-  RTCORBAC.h $(TAO_ROOT)/tao/IOPC.h \
+  RTCORBAC.h $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp RTCORBAC.i \
   Priority_Mapping.i $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
   Priority_Mapping_Manager.i Network_Priority_Mapping_Manager.h \
@@ -5834,9 +5773,6 @@ endif # corba_messaging
   RT_Policy_i.i $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/LF_Event.h \
@@ -5848,6 +5784,10 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/operation_details.h \
   $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Service_Context.inl \
   $(TAO_ROOT)/tao/target_specification.h \
   $(TAO_ROOT)/tao/target_specification.i \
@@ -5908,20 +5848,12 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -5982,8 +5914,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Svc_Handler.h \
   $(ACE_ROOT)/ace/Synch_Options.h \
   $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
   $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
@@ -6006,8 +5937,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Dynamic.i \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
@@ -6022,7 +5952,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Dynamic_Service.i \
   $(ACE_ROOT)/ace/Dynamic_Service.cpp
 
-.obj/RT_Stub.o .obj/RT_Stub.so .shobj/RT_Stub.o .shobj/RT_Stub.so: RT_Stub.cpp RT_Stub.h $(ACE_ROOT)/ace/pre.h \
+.obj/RT_Stub.o .obj/RT_Stub.SO .shobj/RT_Stub.o .shobj/RT_Stub.SO: RT_Stub.cpp RT_Stub.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -6044,8 +5974,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/corbafwd.i \
   $(TAO_ROOT)/tao/Stub.h \
   $(TAO_ROOT)/tao/MProfile.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -6056,8 +5985,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
   $(ACE_ROOT)/ace/Synch_T.i \
@@ -6197,15 +6125,16 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -6216,9 +6145,6 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -6257,20 +6183,15 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -6318,11 +6239,16 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/ORB_Core.i \
   $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.h \
   $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
-  $(TAO_ROOT)/tao/Stub.i rtcorba_export.h \
-  RT_Policy_i.h RTCORBAC.h $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i RTCORBAC.i RT_Policy_i.i
+  $(TAO_ROOT)/tao/Stub.i rtcorba_export.h RT_Policy_i.h \
+  RTCORBAC.h $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp RTCORBAC.i \
+  RT_Policy_i.i
 
-.obj/RT_Stub_Factory.o .obj/RT_Stub_Factory.so .shobj/RT_Stub_Factory.o .shobj/RT_Stub_Factory.so: RT_Stub_Factory.cpp RT_Stub_Factory.h \
+.obj/RT_Stub_Factory.o .obj/RT_Stub_Factory.SO .shobj/RT_Stub_Factory.o .shobj/RT_Stub_Factory.SO: RT_Stub_Factory.cpp RT_Stub_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -6357,8 +6283,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -6504,15 +6429,16 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -6523,9 +6449,6 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -6559,20 +6482,15 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -6622,7 +6540,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
   $(TAO_ROOT)/tao/Stub.i
 
-.obj/Thread_Pool.o .obj/Thread_Pool.so .shobj/Thread_Pool.o .shobj/Thread_Pool.so: Thread_Pool.cpp Thread_Pool.h \
+.obj/Thread_Pool.o .obj/Thread_Pool.SO .shobj/Thread_Pool.o .shobj/Thread_Pool.SO: Thread_Pool.cpp Thread_Pool.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -6633,7 +6551,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Basic_Types.i \
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/OS_Export.h RTCORBAC.h rtcorba_export.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Default_Constants.h \
@@ -6644,8 +6561,16 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -6664,8 +6589,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -6675,7 +6599,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Typecode.h \
@@ -6775,23 +6698,14 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
@@ -6799,28 +6713,32 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i RTCORBAC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp RTCORBAC.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
   $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
@@ -6904,22 +6822,18 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h
index 71838486ff6..a4b434721d6 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.h
+++ b/TAO/tao/RTCORBA/RTCORBAC.h
@@ -37,6 +37,7 @@
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "tao/corbafwd.h"
 #include "tao/VarOut_T.h"
 #include "tao/Seq_Var_T.h"
@@ -45,6 +46,7 @@
 #include "tao/PolicyC.h"
 #include "tao/TimeBaseC.h"
 #include "tao/Encodable.h"
+#include "tao/Any_Basic_Impl_T.h"
 
 // Forward references.
 class TAO_Priority_Mapping_Manager;
diff --git a/TAO/tao/RTPortableServer/Makefile b/TAO/tao/RTPortableServer/Makefile
index 15d43164178..9d3fa14160e 100644
--- a/TAO/tao/RTPortableServer/Makefile
+++ b/TAO/tao/RTPortableServer/Makefile
@@ -83,7 +83,7 @@ endif # corba_messaging
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/RTPortableServer.o .obj/RTPortableServer.so .shobj/RTPortableServer.o .shobj/RTPortableServer.so: RTPortableServer.cpp RTPortableServer.h \
+.obj/RTPortableServer.o .obj/RTPortableServer.SO .shobj/RTPortableServer.o .shobj/RTPortableServer.SO: RTPortableServer.cpp RTPortableServer.h \
   $(ACE_ROOT)/ace/pre.h rtportableserver_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -107,9 +107,16 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
   $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
@@ -128,8 +135,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -139,7 +145,6 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
   $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Typecode.h \
@@ -239,23 +244,14 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
@@ -263,30 +259,33 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
-  RTPortableServerC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i RTPortableServerC.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
@@ -339,7 +338,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \
   $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i
 
-.obj/RTPortableServerC.o .obj/RTPortableServerC.so .shobj/RTPortableServerC.o .shobj/RTPortableServerC.so: RTPortableServerC.cpp RTPortableServerC.h \
+.obj/RTPortableServerC.o .obj/RTPortableServerC.SO .shobj/RTPortableServerC.o .shobj/RTPortableServerC.SO: RTPortableServerC.cpp RTPortableServerC.h \
   $(ACE_ROOT)/ace/pre.h rtportableserver_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -382,8 +381,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -513,15 +511,16 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -531,22 +530,21 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
   $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
-  RTPortableServerC.i
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i RTPortableServerC.i
 
-.obj/RT_Acceptor_Filters.o .obj/RT_Acceptor_Filters.so .shobj/RT_Acceptor_Filters.o .shobj/RT_Acceptor_Filters.so: RT_Acceptor_Filters.cpp RT_Acceptor_Filters.h \
+.obj/RT_Acceptor_Filters.o .obj/RT_Acceptor_Filters.SO .shobj/RT_Acceptor_Filters.o .shobj/RT_Acceptor_Filters.SO: RT_Acceptor_Filters.cpp RT_Acceptor_Filters.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -594,8 +592,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -708,47 +705,48 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Acceptor_Filter.i \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
   $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
   $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
   RT_Acceptor_Filters.i \
   $(TAO_ROOT)/tao/Transport_Acceptor.h \
@@ -757,6 +755,10 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/Profile.h \
   $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/CONV_FRAMEC.h \
   $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/Tagged_Components.i \
@@ -764,7 +766,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
   $(TAO_ROOT)/tao/Profile.i
 
-.obj/RT_Collocation_Resolver.o .obj/RT_Collocation_Resolver.so .shobj/RT_Collocation_Resolver.o .shobj/RT_Collocation_Resolver.so: RT_Collocation_Resolver.cpp \
+.obj/RT_Collocation_Resolver.o .obj/RT_Collocation_Resolver.SO .shobj/RT_Collocation_Resolver.o .shobj/RT_Collocation_Resolver.SO: RT_Collocation_Resolver.cpp \
   RT_Collocation_Resolver.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/orbconf.h \
@@ -801,8 +803,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -962,13 +963,11 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -1002,20 +1001,15 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -1071,6 +1065,9 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
@@ -1105,6 +1102,17 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
   $(TAO_ROOT)/tao/PortableServer/POA.h \
   $(TAO_ROOT)/tao/PortableServer/POAManager.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/PortableServer/POAManager.i \
   $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.h \
   $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.i \
@@ -1114,13 +1122,13 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
   $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
   $(TAO_ROOT)/tao/New_Leader_Generator.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
   $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
@@ -1145,7 +1153,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
   $(TAO_ROOT)/tao/Profile.i
 
-.obj/RT_Object_Adapter_Factory.o .obj/RT_Object_Adapter_Factory.so .shobj/RT_Object_Adapter_Factory.o .shobj/RT_Object_Adapter_Factory.so: RT_Object_Adapter_Factory.cpp \
+.obj/RT_Object_Adapter_Factory.o .obj/RT_Object_Adapter_Factory.SO .shobj/RT_Object_Adapter_Factory.o .shobj/RT_Object_Adapter_Factory.SO: RT_Object_Adapter_Factory.cpp \
   RT_Object_Adapter_Factory.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -1191,8 +1199,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1322,15 +1329,16 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -1339,6 +1347,12 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
@@ -1388,9 +1402,6 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -1417,20 +1428,12 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Managed_Object.cpp \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -1478,6 +1481,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
   RT_Policy_Validator.h RT_Collocation_Resolver.h \
   rtportableserver_export.h \
@@ -1485,7 +1489,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Collocation_Resolver.i \
   RT_Collocation_Resolver.i
 
-.obj/RT_POA.o .obj/RT_POA.so .shobj/RT_POA.o .shobj/RT_POA.so: RT_POA.cpp RT_POA.h $(ACE_ROOT)/ace/pre.h \
+.obj/RT_POA.o .obj/RT_POA.SO .shobj/RT_POA.o .shobj/RT_POA.SO: RT_POA.cpp RT_POA.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
@@ -1517,8 +1521,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -1662,15 +1665,16 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -1679,6 +1683,12 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
@@ -1727,23 +1737,12 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
   $(TAO_ROOT)/tao/PortableServer/POAManager.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -1751,6 +1750,17 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/IOP_CodecC.i \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/PortableServer/POAManager.i \
   $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.h \
   $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.i \
@@ -1758,14 +1768,13 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/PortableServer/POA.i \
-  RTPortableServerC.h \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  RTPortableServerC.h $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
   $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
-  RTPortableServerC.i RT_POA.i \
-  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i RTPortableServerC.i \
+  RT_POA.i $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
   $(TAO_ROOT)/tao/ServicesC.i \
@@ -1836,8 +1845,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
   $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
   $(TAO_ROOT)/tao/New_Leader_Generator.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
   $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
@@ -1866,7 +1874,7 @@ endif # corba_messaging
   rtportableserver_export.h \
   RT_Acceptor_Filters.h RT_Acceptor_Filters.i
 
-.obj/RT_Policy_Validator.o .obj/RT_Policy_Validator.so .shobj/RT_Policy_Validator.o .shobj/RT_Policy_Validator.so: RT_Policy_Validator.cpp RT_Policy_Validator.h \
+.obj/RT_Policy_Validator.o .obj/RT_Policy_Validator.SO .shobj/RT_Policy_Validator.o .shobj/RT_Policy_Validator.SO: RT_Policy_Validator.cpp RT_Policy_Validator.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/orbconf.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1907,8 +1915,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2041,15 +2048,16 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -2059,13 +2067,16 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -2103,20 +2114,12 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -2167,6 +2170,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
   $(TAO_ROOT)/tao/RTCORBA/RT_Policy_i.i \
   $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.h \
@@ -2174,8 +2178,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
   $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
   $(TAO_ROOT)/tao/New_Leader_Generator.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
   $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
@@ -2206,7 +2209,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \
   $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.i
 
-.obj/RT_Servant_Dispatcher.o .obj/RT_Servant_Dispatcher.so .shobj/RT_Servant_Dispatcher.o .shobj/RT_Servant_Dispatcher.so: RT_Servant_Dispatcher.cpp \
+.obj/RT_Servant_Dispatcher.o .obj/RT_Servant_Dispatcher.SO .shobj/RT_Servant_Dispatcher.o .shobj/RT_Servant_Dispatcher.SO: RT_Servant_Dispatcher.cpp \
   RT_Servant_Dispatcher.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -2239,8 +2242,7 @@ endif # corba_messaging
   $(ACE_ROOT)/ace/Default_Constants.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/String_Base.cpp \
   $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -2384,15 +2386,16 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -2401,6 +2404,12 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(ACE_ROOT)/ace/Map_T.h \
   $(ACE_ROOT)/ace/Pair_T.h \
@@ -2449,36 +2458,37 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
   $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i RT_POA.h \
   $(TAO_ROOT)/tao/PortableServer/POA.h \
   $(TAO_ROOT)/tao/PortableServer/POAManager.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.h \
+  $(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueBase.inl \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.h \
+  $(TAO_ROOT)/tao/Valuetype/ValueFactory.inl \
+  $(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/PortableServer/POAManager.i \
   $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.h \
   $(TAO_ROOT)/tao/PortableServer/POA_Cached_Policies.i \
@@ -2603,8 +2613,7 @@ endif # corba_messaging
   $(TAO_ROOT)/tao/IIOPC.i \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp
index a78e7aa8e10..9a3aa7adc84 100644
--- a/TAO/tao/Sequence_T.cpp
+++ b/TAO/tao/Sequence_T.cpp
@@ -543,159 +543,6 @@ TAO_Pseudo_Object_Manager<T,T_var>::operator= (const T_var & p)
 }
 
 // *************************************************************
-// class TAO_Valuetype_Manager
-// *************************************************************
-
-template <typename T, typename T_var, typename T_life> 
-TAO_Valuetype_Manager<T,T_var,T_life> &
-TAO_Valuetype_Manager<T,T_var,T_life>::operator= (
-    const TAO_Valuetype_Manager<T,T_var,T_life> & rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      T_life::tao_remove_ref (*this->ptr_);
-      *this->ptr_ = *rhs.ptr_;
-      T_life::tao_add_ref (*this->ptr_);
-    }
-  else
-    {
-      *this->ptr_ = *rhs.ptr_;
-    }
-
-  return *this;
-}
-
-template <typename T, typename T_var, typename T_life> 
-TAO_Valuetype_Manager<T,T_var,T_life> &
-TAO_Valuetype_Manager<T,T_var,T_life>::operator= (T * p)
-{
-  if (this->release_)
-    {
-      // The semantics of the elements of a sequence are the same as
-      // that of a var variable.  Therefore we will not duplicate the
-      // user provided pointer before assigning it to the internal
-      // variable.
-      T_life::tao_remove_ref (*this->ptr_);
-      *this->ptr_ = p;
-    }
-  else
-    {
-      *this->ptr_ = p;
-    }
-
-  return *this;
-}
-
-template <typename T, typename T_var, typename T_life> 
-TAO_Valuetype_Manager<T,T_var,T_life> &
-TAO_Valuetype_Manager<T,T_var,T_life>::operator= (const T_var & p)
-{
-  if (this->release_)
-    {
-      // The semantics of the elements of a sequence are the same as
-      // that of a var variable.  Therefore we duplicate p's
-      // pointer before assigning it to the internal
-      // variable.
-      if (*this->ptr_ != 0)
-        {
-          (*this->ptr_)->_remove_ref ();
-        }
-
-      T_life::tao_remove_ref (*this->ptr_);
-      *this->ptr_ = p.in ();
-      T_life::tao_add_ref (*this->ptr_);
-    }
-  else
-    {
-      *this->ptr_ = p.in ();
-    }
-
-  return *this;
-}
-
-// *************************************************************
-// class TAO_Abstract_Manager
-// *************************************************************
-
-template<typename T, typename T_var, typename T_life>
-TAO_Abstract_Manager<T,T_var,T_life> &
-TAO_Abstract_Manager<T,T_var,T_life>::operator= (
-    const TAO_Abstract_Manager<T,T_var,T_life> & rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      T_life::tao_release (*this->ptr_);
-      T_life::tao_duplicate (*rhs->ptr_);
-    }
-
-  *this->ptr_ = *rhs.ptr_;
-  return *this;
-}
-
-template<typename T, typename T_var, typename T_life>
-TAO_Abstract_Manager<T,T_var,T_life> &
-TAO_Abstract_Manager<T,T_var,T_life>::operator= (T * p)
-{
-  if (this->release_)
-    {
-      // The semantics of the elements of a sequence are the same as
-      // that of a var variable.  Therefore we will not duplicate the
-      // user provided pointer before assigning it to the internal
-      // variable.
-      T_life::tao_release (*this->ptr_);
-    }
-
-  *this->ptr_ = p;
-  return *this;
-}
-
-template<typename T, typename T_var, typename T_life>
-TAO_Abstract_Manager<T,T_var,T_life> &
-TAO_Abstract_Manager<T,T_var,T_life>::operator= (const T_var & p)
-{
-  if (this->release_)
-    {
-      // The semantics of the elements of a sequence are the same as
-      // that of a var variable.  Therefore we duplicate p's
-      // pointer before assigning it to the internal
-      // variable.
-      T_life::tao_release (*this->ptr_);
-      T_life::tao_duplicate (p.in ());
-    }
-
-  *this->ptr_ = p.in ();
-  return *this;
-}
-
-template<typename T, typename T_var, typename T_life>
-TAO_Abstract_Manager<T,T_var,T_life>::operator const T_var () const
-{
-  T_life::tao_duplicate (*this->ptr_);
-  return *this->ptr_;
-}
-
-template<typename T, typename T_var, typename T_life>
-T *&
-TAO_Abstract_Manager<T,T_var,T_life>::out (void)
-{
-  T_life::tao_release (*this->ptr_);
-  *this->ptr_ = 0;
-  return *this->ptr_;
-}
-
-// *************************************************************
 // Operations for class TAO_Unbounded_Object_Sequence
 // *************************************************************
 
@@ -1590,824 +1437,6 @@ TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::_shrink_buffer (CORBA::ULong nl,
 }
 
 // *************************************************************
-// Operations for class TAO_Unbounded_Valuetype_Sequence
-// *************************************************************
-
-template <typename T, typename T_var, typename T_life> 
-TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::
-TAO_Unbounded_Valuetype_Sequence (
-    CORBA::ULong maximum
-  )
-  : TAO_Unbounded_Base_Sequence (
-        maximum,
-        TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::allocbuf (maximum)
-      )
-{
-}
-
-template <typename T, typename T_var, typename T_life> 
-TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::
-TAO_Unbounded_Valuetype_Sequence (
-    const TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life> & rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      T ** tmp1 =
-        TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::allocbuf (
-            this->maximum_
-          );
-      T ** const tmp2 =
-        ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
-                              rhs.buffer_);
-
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          T_life::tao_add_ref (tmp2[i]);
-          tmp1[i] = tmp2[i];
-        }
-
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-template <typename T, typename T_var, typename T_life> 
-TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::
-~TAO_Unbounded_Valuetype_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-template <typename T, typename T_var, typename T_life> 
-TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life> &
-TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::operator= (
-    const TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life> & rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      T ** tmp = ACE_reinterpret_cast (T **,
-                                       this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          T_life::tao_remove_ref (tmp[i]);
-          tmp[i] = 0;
-        }
-
-      if (this->maximum_ < rhs.maximum_)
-        {
-          TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::freebuf (tmp);
-          this->buffer_ =
-            TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::allocbuf (
-                rhs.maximum_
-              );
-        }
-    }
-
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  T ** tmp1 = ACE_reinterpret_cast (T **, 
-                                    this->buffer_);
-  T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
-                                          rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      T_life::tao_add_ref (tmp2[i]);
-      tmp1[i] = tmp2[i];
-    }
-
-  return *this;
-}
-
-template <typename T, typename T_var, typename T_life> 
-T **
-TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::allocbuf (CORBA::ULong nelems)
-{
-  T ** buf = 0;
-  ACE_NEW_RETURN (buf, 
-                  T * [nelems], 
-                  0);
-
-  for (CORBA::ULong i = 0; i < nelems; ++i)
-    {
-      buf[i] = 0;
-    }
-
-  return buf;
-}
-
-template <typename T, typename T_var, typename T_life> 
-void
-TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::freebuf (T ** buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-
-  // {orbos/97-05-15:16.11} The freebuf function ensures that the
-  // destructor for each element is called before the buffer is
-  // destroyed, except for string elements, which are freed using
-  // string_free(), and object reference elements, which are freed
-  // using release(). The freebuf function will ignore null pointers
-  // passed to it.
-
-  // @@ How are we supposed to implement that! We don't know the
-  // length of the buffer here.
-  // Mark the length in the first four bytes? For the moment we let
-  // that be.
-
-  delete [] buffer;
-}
-
-template <typename T, typename T_var, typename T_life> 
-void
-TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::_allocate_buffer (
-    CORBA::ULong length
-  )
-{
-  T ** tmp = 
-    TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::allocbuf (length);
-
-  if (this->buffer_ != 0)
-    {
-      T ** old = ACE_reinterpret_cast (T **, 
-                                       this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        // Only call duplicate when we did not own the previous
-        // buffer, since after this method we own it we must also own
-        // the objects.  If we already own the objects there is no
-        // need to copy them, if we did we would also have to remove
-        // the old instances.
-        if (!this->release_)
-          {
-            T_life::tao_add_ref (tmp[i]);
-            tmp[i] = old[i];
-          }
-        else
-          {
-            tmp[i] = old[i];
-          }
-
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-
-  this->buffer_ = tmp;
-}
-
-template <typename T, typename T_var, typename T_life> 
-void
-TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-
-  T ** tmp = ACE_reinterpret_cast (T **, 
-                                   this->buffer_);
-
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      T_life::tao_remove_ref (tmp[i]);
-      tmp[i] = 0;
-    }
-
-  TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-template <typename T, typename T_var, typename T_life> 
-void
-TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::_shrink_buffer (
-    CORBA::ULong nl,
-    CORBA::ULong ol
-  )
-{
-  T ** tmp = ACE_static_cast (T **, 
-                              this->buffer_);
-
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      T_life::tao_remove_ref (tmp[i]);
-      tmp[i] = 0;
-    }
-}
-
-// *************************************************************
-// Operations for class TAO_Bounded_Valuetype_Sequence
-// *************************************************************
-
-template <typename T, typename T_var, typename T_life, size_t MAX>
-TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::
-TAO_Bounded_Valuetype_Sequence (void)
-  : TAO_Bounded_Base_Sequence (
-        MAX,
-        TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::allocbuf (MAX)
-      )
-{
-}
-
-template <typename T, typename T_var, typename T_life, size_t MAX>
-TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::
-TAO_Bounded_Valuetype_Sequence (
-    const TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX> & rhs
-  )
-  : TAO_Bounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      T ** tmp1 =
-        TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::allocbuf (MAX);
-
-      T ** const tmp2 =
-        ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
-
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          T_life::tao_add_ref (tmp2[i]);
-          tmp1[i] = tmp2[i];
-        }
-
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-template <typename T, typename T_var, typename T_life, size_t MAX>
-TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>&
-TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::operator= (
-    const TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX> & rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      T ** tmp = ACE_reinterpret_cast (T **, 
-                                       this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          T_life::tao_remove_ref (tmp[i]);
-          tmp[i] = 0;
-        }
-      // No need to reallocate the buffer since it is always of size
-      // MAX
-    }
-  else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::allocbuf (
-                rhs.maximum_
-              );
-        }
-    }
-
-  TAO_Bounded_Base_Sequence::operator= (rhs);
-
-  T ** tmp1 = ACE_reinterpret_cast (T **, 
-                                    this->buffer_);
-  T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
-                                          rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      T_life::tao_add_ref (tmp2[i]);
-      tmp1[i] = tmp2[i];
-    }
-
-  return *this;
-}
-
-template <typename T, typename T_var, typename T_life, size_t MAX>
-T **
-TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::allocbuf (CORBA::ULong)
-{
-  T ** buf = 0;
-  ACE_NEW_RETURN (buf, 
-                  T * [MAX], 
-                  0);
-
-  for (CORBA::ULong i = 0; i < MAX; ++i)
-    {
-      buf[i] = 0;
-    }
-
-  return buf;
-}
-
-template <typename T, typename T_var, typename T_life, size_t MAX>
-void
-TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::freebuf (T ** buffer)
-{
-  // How much do we deallocate? Easy! allocbuf() always creates MAX
-  // elements and initialize them to T::_nil().  So we can be
-  // complaint and call CORBA::release() on each one.
-  for (CORBA::ULong i = 0; i < MAX; ++i)
-    {
-      if (buffer[i] != 0)
-        {
-          T_life::tao_remove_ref (buffer[i]);
-          buffer[i] = 0;
-        }
-    }
-
-  delete [] buffer;
-}
-
-template <typename T, typename T_var, typename T_life, size_t MAX>
-void
-TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::_allocate_buffer (
-    CORBA::ULong length
-  )
-{
-  // For this class memory is never reallocated so the implementation
-  // is *really* simple.
-  this->buffer_ =
-    TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::allocbuf (length);
-}
-
-template <typename T, typename T_var, typename T_life, size_t MAX>
-void
-TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::_deallocate_buffer (void)
-{
-  if (this->release_ == 0)
-    {
-      return;
-    }
-
-  T ** tmp = ACE_reinterpret_cast (T **, 
-                                   this->buffer_);
-  TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-template <typename T, typename T_var, typename T_life, size_t MAX>
-void
-TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::_shrink_buffer (
-    CORBA::ULong nl,
-    CORBA::ULong ol
-  )
-{
-  T ** tmp = ACE_reinterpret_cast (T **, 
-                                   this->buffer_);
-
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      T_life::tao_remove_ref (tmp[i]);
-      tmp[i] = 0;
-    }
-}
-
-// *************************************************************
-// Operations for class TAO_Unbounded_Abstract_Sequence
-// *************************************************************
-
-template <typename T, typename T_var, typename T_life>
-TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::
-TAO_Unbounded_Abstract_Sequence (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (
-        maximum,
-        TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::allocbuf (maximum)
-      )
-{
-}
-
-template <typename T, typename T_var, typename T_life>
-TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::
-TAO_Unbounded_Abstract_Sequence (
-    const TAO_Unbounded_Abstract_Sequence<T,T_var,T_life> & rhs
-  )
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      T ** tmp1 =
-        TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::allocbuf (
-            this->maximum_
-          );
-      T ** const tmp2 =
-        ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
-                              rhs.buffer_);
-
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = T_life::tao_duplicate (tmp2[i]);
-        }
-
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-template <typename T, typename T_var, typename T_life>
-TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::
-~TAO_Unbounded_Abstract_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-template <typename T, typename T_var, typename T_life>
-TAO_Unbounded_Abstract_Sequence<T,T_var,T_life> &
-TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::operator= (
-    const TAO_Unbounded_Abstract_Sequence<T,T_var,T_life> & rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      T ** tmp = ACE_reinterpret_cast (T **,
-                                       this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          T_life::tao_release (tmp[i]);
-          tmp[i] = T_life::tao_nil ();
-        }
-
-      if (this->maximum_ < rhs.maximum_)
-        {
-          TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::freebuf (tmp);
-          this->buffer_ =
-            TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::allocbuf (
-                rhs.maximum_
-              );
-        }
-    }
-  else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::allocbuf (
-                rhs.maximum_
-              );
-        }
-    }
-
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  T ** tmp1 = ACE_reinterpret_cast (T **, 
-                                    this->buffer_);
-  T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
-                                          rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = T_life::tao_duplicate (tmp2[i]);
-    }
-
-  return *this;
-}
-
-template <typename T, typename T_var, typename T_life>
-T **
-TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::allocbuf (
-    CORBA::ULong nelems
-  )
-{
-  T ** buf = 0;
-  ACE_NEW_RETURN (buf, 
-                  T * [nelems], 
-                  0);
-
-  for (CORBA::ULong i = 0; i < nelems; ++i)
-    {
-      buf[i] = T_life::tao_nil ();
-    }
-
-  return buf;
-}
-
-template <typename T, typename T_var, typename T_life>
-void
-TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::freebuf (T ** buffer)
-{
-  if (buffer == 0)
-    {
-      return;
-    }
-
-  // {orbos/97-05-15:16.11} The freebuf function ensures that the
-  // destructor for each element is called before the buffer is
-  // destroyed, except for string elements, which are freed using
-  // string_free(), and object reference elements, which are freed
-  // using release(). The freebuf function will ignore null pointers
-  // passed to it.
-
-  // @@ How are we supposed to implement that! We don't know the
-  // length of the buffer here.
-  // Mark the length in the first four bytes? For the moment we let
-  // that be.
-
-  delete [] buffer;
-}
-
-template <typename T, typename T_var, typename T_life>
-void
-TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::_allocate_buffer (
-    CORBA::ULong length
-  )
-{
-  T ** tmp = TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::allocbuf (length);
-
-  if (this->buffer_ != 0)
-    {
-      T ** old = ACE_reinterpret_cast (T **, 
-                                       this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        // Only call duplicate when we did not own the previous
-        // buffer, since after this method we own it we must also own
-        // the objects.  If we already own the objects there is no
-        // need to copy them, if we did we would also have to remove
-        // the old instances.
-        if (!this->release_)
-          {
-            tmp[i] = T_life::tao_duplicate (old[i]);
-          }
-        else
-          {
-            tmp[i] = old[i];
-          }
-
-      if (this->release_)
-        {
-          delete [] old;
-        }
-    }
-
-  this->buffer_ = tmp;
-}
-
-template <typename T, typename T_var, typename T_life>
-void
-TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    {
-      return;
-    }
-
-  T ** tmp = ACE_reinterpret_cast (T **, 
-                                   this->buffer_);
-
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      T_life::tao_release (tmp[i]);
-      tmp[i] = T_life::tao_nil ();
-    }
-
-  TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-template <typename T, typename T_var, typename T_life>
-void
-TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::_shrink_buffer (
-    CORBA::ULong nl,
-    CORBA::ULong ol
-  )
-{
-  T ** tmp = ACE_static_cast (T **, 
-                              this->buffer_);
-
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      T_life::tao_release (tmp[i]);
-      tmp[i] = T_life::tao_nil ();
-    }
-}
-
-// *************************************************************
-// Operations for class TAO_Bounded_Abstract_Sequence
-// *************************************************************
-
-template <typename T, typename T_var, typename T_life, size_t MAX>
-TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::
-TAO_Bounded_Abstract_Sequence (void)
-  : TAO_Bounded_Base_Sequence (
-        MAX,
-        TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::allocbuf (MAX)
-      )
-{
-}
-
-template <typename T, typename T_var, typename T_life, size_t MAX>
-TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::
-TAO_Bounded_Abstract_Sequence (
-    const TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX> & rhs
-  )
-  : TAO_Bounded_Base_Sequence (rhs)
-{
-  if (rhs.buffer_ != 0)
-    {
-      T ** tmp1 =
-        TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::allocbuf (MAX);
-
-      T ** const tmp2 =
-        ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
-
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        {
-          tmp1[i] = T_life::tao_duplicate (tmp2[i]);
-        }
-
-      this->buffer_ = tmp1;
-    }
-  else
-    {
-      this->buffer_ = 0;
-    }
-}
-
-template <typename T, typename T_var, typename T_life, size_t MAX>
-TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX> &
-TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::operator= (
-    const TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX> & rhs
-  )
-{
-  if (this == &rhs)
-    {
-      return *this;
-    }
-
-  if (this->release_)
-    {
-      T ** tmp = ACE_reinterpret_cast (T **, 
-                                       this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        {
-          T_life::tao_release (tmp[i]);
-          tmp[i] = T_life::tao_nil ();
-        }
-      // No need to reallocate the buffer since it is always of size
-      // MAX
-    }
-  else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::allocbuf (
-                rhs.maximum_
-              );
-        }
-    }
-
-  TAO_Bounded_Base_Sequence::operator= (rhs);
-
-  T ** tmp1 = ACE_reinterpret_cast (T **, 
-                                    this->buffer_);
-  T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
-                                          rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    {
-      tmp1[i] = T_life::tao_duplicate (tmp2[i]);
-    }
-
-  return *this;
-}
-
-template <typename T, typename T_var, typename T_life, size_t MAX>
-T **
-TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::allocbuf (CORBA::ULong)
-{
-  T ** buf = 0;
-  ACE_NEW_RETURN (buf, 
-                  T * [MAX], 
-                  0);
-
-  for (CORBA::ULong i = 0; i < MAX; ++i)
-    {
-      buf[i] = T_life::tao_nil ();
-    }
-
-  return buf;
-}
-
-template <typename T, typename T_var, typename T_life, size_t MAX>
-void
-TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::freebuf (T ** buffer)
-{
-  // How much do we deallocate? Easy! allocbuf() always creates MAX
-  // elements and initialize them to T::_nil().  So we can be
-  // complaint and call CORBA::release() on each one.
-  for (CORBA::ULong i = 0; i < MAX; ++i)
-    {
-      if (buffer[i] != T_life::tao_nil ())
-        {
-          T_life::tao_release (buffer[i]);
-          buffer[i] = T_life::tao_nil ();
-        }
-    }
-
-  delete [] buffer;
-}
-
-template <typename T, typename T_var, typename T_life, size_t MAX>
-void
-TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::_allocate_buffer (
-    CORBA::ULong length
-  )
-{
-  // For this class memory is never reallocated so the implementation
-  // is *really* simple.
-  this->buffer_ =
-    TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::allocbuf (length);
-}
-
-template <typename T, typename T_var, typename T_life, size_t MAX>
-void
-TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::_deallocate_buffer (void)
-{
-  if (this->release_ == 0)
-    {
-      return;
-    }
-
-  T ** tmp = ACE_reinterpret_cast (T **, 
-                                   this->buffer_);
-  TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::freebuf (tmp);
-  this->buffer_ = 0;
-}
-
-template <typename T, typename T_var, typename T_life, size_t MAX>
-void
-TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::_shrink_buffer (
-    CORBA::ULong nl,
-    CORBA::ULong ol
-  )
-{
-  T ** tmp = ACE_reinterpret_cast (T **, 
-                                   this->buffer_);
-
-  for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      T_life::tao_release (tmp[i]);
-      tmp[i] = T_life::tao_nil ();
-    }
-}
-
-// *************************************************************
 // Operations for class TAO_Unbounded_Array_Sequence
 // *************************************************************
 
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
index 0e9ba5192f4..2506c8807f4 100644
--- a/TAO/tao/Sequence_T.h
+++ b/TAO/tao/Sequence_T.h
@@ -249,19 +249,10 @@ template<typename T,
 template<class T,class T_var> class TAO_Unbounded_Pseudo_Sequence;
 template<typename T,
          typename T_var,
-         typename T_life>
-  class TAO_Unbounded_Valuetype_Sequence;
-template<typename T,
-         typename T_var,
          typename T_life,
          typename T_cast,
          size_t MAX>
   class TAO_Bounded_Object_Sequence;
-template<typename T,
-         typename T_var,
-         typename T_life,
-         size_t MAX>
-  class TAO_Bounded_Valuetype_Sequence;
 template<size_t MAX> class TAO_Bounded_String_Sequence;
 
 // *************************************************************
@@ -453,185 +444,6 @@ private:
 
 // *************************************************************
 
-  /**
-   * @class TAO_Valuetype_Manager
-   *
-   * @brief Manager for valuetypes.
-   *
-   * According to the spec., valuetypes are handled similarly to object
-   * references, so a manager class is needed.
-   *
-   * @see TAO_Object_Manager
-   */
-template<typename T, typename T_var, typename T_life>
-class TAO_Valuetype_Manager
-{
-  friend class TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>;
-public:
-  // @@ Use partial template specialization here to give access only
-  // to the right kind of sequence.
-  // friend template<CORBA::ULong MAX>
-  //    class TAO_Bounded_Valuetype_Sequence<T,MAX>;
-
-  // = Initialization and termination methods.
-  /**
-   * Copy constructor, the semantics are non-trivial:
-   *   + The referenced element is duplicated or not according to the
-   *   release value on the <rhs>.
-   *   + In any case a new reference to the same object is created.
-   */
-  TAO_Valuetype_Manager (const TAO_Valuetype_Manager<T,T_var,T_life> & rhs);
-
-  /**
-   * Constructor from address of an element, it should be private and
-   * only TAO_*_Object_Sequence would use it, but we have some
-   * problems with friendship and templates.
-   */
-  TAO_Valuetype_Manager (T **,
-                         CORBA::Boolean release);
-
-  /// Destructor, only releases the object if <release_> is true.
-  ~TAO_Valuetype_Manager (void);
-
-  /**
-   * Assignment from another managed type, only release if
-   * <this->release_> is true.
-   * @@ TODO what happens if rhs.release_ is true an this->relase_ is
-   * false?
-   */
-  TAO_Valuetype_Manager<T,T_var,T_life> &operator= (
-      const TAO_Valuetype_Manager<T,T_var,T_life> & rhs
-    );
-
-  /// Assignment from T *.
-  TAO_Valuetype_Manager<T,T_var,T_life> &operator= (T *);
-
-  /// Assignment from T_var.
-  TAO_Valuetype_Manager<T,T_var,T_life> &operator= (const T_var &);
-
-  /// Return pointer.
-  T * operator-> (void) const;
-
-  /// Cast (read-only).
-  operator const T * () const;
-
-  /// Cast.
-  operator T *& ();
-
-  /// Cast (read-only) so that assignment from a structured
-  /// type to a T_var will make a copy.
-  operator const T_var() const;
-
-  /// for in parameter.
-  T * in (void) const;
-
-  /// for inout parameter.
-  T *& inout (void);
-
-  /// for out parameter.
-  T * &out (void);
-
-  /// for return type
-  T * _retn (void);
-
-private:
-  /// data member, notice that it is a pointer, to implement the
-  /// reference behavior for assignment.
-  T ** ptr_;
-
-  /// release flag based on parent's flag
-  CORBA::Boolean release_;
-};
-
-// *************************************************************
-
-  /**
-   * @class TAO_Abstract_Manager
-   *
-   * @brief Manager for abstract intefaces.
-   *
-   * An abstract interface can be either a valuetype or an object
-   * references, so a manager class is needed.
-   *
-   * @see TAO_Object_Manager
-   */
-template<typename T, typename T_var, typename T_life>
-class TAO_Abstract_Manager
-{
-//  friend class TAO_Unbounded_Abstract_Sequence<T,T_var>;
-public:
-  // = Initialization and termination methods.
-  /**
-   * Copy constructor, the semantics are non-trivial:
-   *   + The referenced element is duplicated or not according to the
-   *   release value on the <rhs>.
-   *   + In any case a new reference to the same object is created.
-   */
-  TAO_Abstract_Manager (const TAO_Abstract_Manager<T,T_var,T_life> & rhs);
-
-  /**
-   * Constructor from address of an element, it should be private and
-   * only TAO_*_Object_Sequence would use it, but we have some
-   * problems with friendship and templates.
-   */
-  TAO_Abstract_Manager (T **,
-                        CORBA::Boolean release);
-
-  /// Destructor, only releases the object if <release_> is true.
-  ~TAO_Abstract_Manager (void);
-
-  /**
-   * Assignment from another managed type, only release if
-   * <this->release_> is true.
-   * @@ TODO what happens if rhs.release_ is true an this->relase_ is
-   * false?
-   */
-  TAO_Abstract_Manager<T,T_var,T_life> & operator= (
-      const TAO_Abstract_Manager<T,T_var,T_life> & rhs
-    );
-
-  /// Assignment from T *.
-  TAO_Abstract_Manager<T,T_var,T_life> & operator= (T *);
-
-  /// Assignment from T_var.
-  TAO_Abstract_Manager<T,T_var,T_life> & operator= (const T_var &);
-
-  /// Return pointer.
-  T * operator-> (void) const;
-
-  /// Cast (read-only).
-  operator const T * () const;
-
-  /// Cast.
-  operator T *& ();
-
-  /// Cast (read-only) so that assignment from a structured
-  /// type to a T_var will make a copy.
-  operator const T_var () const;
-
-  /// for in parameter.
-  T * in (void) const;
-
-  /// for inout parameter.
-  T *& inout (void);
-
-  /// for out parameter.
-  T *& out (void);
-
-  /// for return type
-  T * _retn (void);
-
-private:
-  /// data member, notice that it is a pointer, to implement the
-  /// reference behavior for assignment.
-  T ** ptr_;
-
-  /// release flag based on parent's flag
-  CORBA::Boolean release_;
-};
-
-// *************************************************************
-
 /**
  * @class TAO_Unbounded_Object_Sequence
  *
@@ -973,244 +785,6 @@ public:
 // *************************************************************
 
 /**
- * @class TAO_Unbounded_Valuetype_Sequence
- *
- * @brief Parametric sequence for valuetypes
- *
- * @see TAO_Unbounded_Object_Sequence
- */
-template<typename T, typename T_var, typename T_life>
-class TAO_Unbounded_Valuetype_Sequence : public TAO_Unbounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-
-  // Default ctor.
-  TAO_Unbounded_Valuetype_Sequence (void);
-
-  /// Constructor with a "hint" for the maximum capacity.
-  TAO_Unbounded_Valuetype_Sequence (CORBA::ULong max);
-
-  /// Constructor with a given buffer.
-  TAO_Unbounded_Valuetype_Sequence (CORBA::ULong maximum,
-                                    CORBA::ULong length,
-                                    T ** data,
-                                    CORBA::Boolean release = 0);
-
-  /// Copy ctor, deep copies.
-  TAO_Unbounded_Valuetype_Sequence (
-      const TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life> &
-    );
-
-  /// The destructor releases all object reference memebrs and frees
-  /// all string members.
-  ~TAO_Unbounded_Valuetype_Sequence (void);
-
-  /**
-   * The assignment operator first releases all object reference
-   * members and frees all string members, and then performs a
-   * deepcopy to create a new structure.
-   */
-  TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life> & operator= (
-      const TAO_Unbounded_Valuetype_Sequence <T,T_var,T_life> &
-    );
-
-  /// read-write accessor
-  TAO_Valuetype_Manager<T,T_var,T_life> operator[] (CORBA::ULong slot) const;
-
-  /// The allocbuf function allocates a vector of T elements that can
-  /// be passed to the T *data constructor.
-  static T ** allocbuf (CORBA::ULong);
-
-  /// Release all the elements.
-  static void freebuf (T **);
-
-  // The Base_Sequence functions, please see "tao/Sequence.h"
-  /// No default to workaround egcs problem with templates and
-  /// namespaces
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Bounded_Valuetype_Sequence
- *
- * @brief Parametric sequence for types that require managers.
- *
- * Please see the documentation for the unbounded case.
- */
-template<typename T, typename T_var, typename T_life, size_t MAX>
-class TAO_Bounded_Valuetype_Sequence : public TAO_Bounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-
-  // Default ctor.
-  TAO_Bounded_Valuetype_Sequence (void);
-
-  /// Constructor from data.
-  TAO_Bounded_Valuetype_Sequence (CORBA::ULong length,
-                                  T ** value,
-                                  CORBA::Boolean release = 0);
-
-  /// Copy constructor.
-  TAO_Bounded_Valuetype_Sequence (
-      const TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX> &
-    );
-
-  /// destructor
-  ~TAO_Bounded_Valuetype_Sequence (void);
-
-  /// Assignment from another Bounded sequence.
-  TAO_Bounded_Valuetype_Sequence &operator= (
-      const TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX> &
-    );
-
-  /// Read-write accessor.
-  TAO_Valuetype_Manager<T,T_var,T_life> operator[] (CORBA::ULong slot) const;
-
-  /// Allocate storage for a sequence..
-  static T ** allocbuf (CORBA::ULong length);
-
-  /// Free a buffer allocated by allocbuf() and release each element on
-  /// it.
-  static void freebuf (T ** buffer);
-
-  // The Base_Sequence functions, please see "tao/sequence.h"
-  /// No default to workaround egcs problem with templates and
-  /// namespaces
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Unbounded_Abstract_Sequence
- *
- * @brief Parametric sequence for abstract interfaces
- *
- * @see TAO_Unbounded_Object_Sequence
- */
-template<typename T, typename T_var, typename T_life>
-class TAO_Unbounded_Abstract_Sequence : public TAO_Unbounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-
-  // Default ctor.
-  TAO_Unbounded_Abstract_Sequence (void);
-
-  /// Constructor with a "hint" for the maximum capacity.
-  TAO_Unbounded_Abstract_Sequence (CORBA::ULong max);
-
-  /// Constructor with a given buffer.
-  TAO_Unbounded_Abstract_Sequence (CORBA::ULong maximum,
-                                   CORBA::ULong length,
-                                   T ** data,
-                                   CORBA::Boolean release = 0);
-
-  /// Copy ctor, deep copies.
-  TAO_Unbounded_Abstract_Sequence (
-      const TAO_Unbounded_Abstract_Sequence<T,T_var,T_life> &
-    );
-
-  /// The destructor releases all object reference memebrs and frees
-  /// all string members.
-  ~TAO_Unbounded_Abstract_Sequence (void);
-
-  /**
-   * The assignment operator first releases all object reference
-   * members and frees all string members, and then performs a
-   * deepcopy to create a new structure.
-   */
-  TAO_Unbounded_Abstract_Sequence<T,T_var,T_life> &operator= (
-      const TAO_Unbounded_Abstract_Sequence <T,T_var,T_life> &
-    );
-
-  /// read-write accessor
-  TAO_Abstract_Manager<T,T_var,T_life> operator[] (CORBA::ULong slot) const;
-
-  /// The allocbuf function allocates a vector of T elements that can
-  /// be passed to the T *data constructor.
-  static T ** allocbuf (CORBA::ULong);
-
-  /// Release all the elements.
-  static void freebuf (T **);
-
-  // The Base_Sequence functions, please see "tao/Sequence.h"
-  /// No default to workaround egcs problem with templates and
-  /// namespaces
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-};
-
-// *************************************************************
-
-/**
- * @class TAO_Bounded_Abstract_Sequence
- *
- * @brief Parametric sequence for types that require managers.
- *
- * Please see the documentation for the unbounded case.
- */
-template<typename T, typename T_var, typename T_life, size_t MAX>
-class TAO_Bounded_Abstract_Sequence : public TAO_Bounded_Base_Sequence
-{
-public:
-  // = Initialization and termination methods.
-
-  // Default ctor.
-  TAO_Bounded_Abstract_Sequence (void);
-
-  /// Constructor from data.
-  TAO_Bounded_Abstract_Sequence (CORBA::ULong length,
-                                 T ** value,
-                                 CORBA::Boolean release = 0);
-
-  /// Copy constructor.
-  TAO_Bounded_Abstract_Sequence (
-      const TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX> &
-    );
-
-  /// destructor
-  ~TAO_Bounded_Abstract_Sequence (void);
-
-  /// Assignment from another Bounded sequence.
-  TAO_Bounded_Abstract_Sequence &operator= (
-      const TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX> &
-    );
-
-  /// Read-write accessor.
-  TAO_Abstract_Manager<T,T_var,T_life> operator[] (CORBA::ULong slot) const;
-
-  /// Allocate storage for a sequence..
-  static T ** allocbuf (CORBA::ULong length);
-
-  /// Free a buffer allocated by allocbuf() and release each element on
-  /// it.
-  static void freebuf (T ** buffer);
-
-  // The Base_Sequence functions, please see "tao/sequence.h"
-  /// No default to workaround egcs problem with templates and
-  /// namespaces
-  virtual void _allocate_buffer (CORBA::ULong length);
-  virtual void _deallocate_buffer (void);
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-};
-
-// *************************************************************
-
-/**
  * @class TAO_Unbounded_Array_Sequence
  *
  * @brief Parametric sequence for arrays.
diff --git a/TAO/tao/Sequence_T.i b/TAO/tao/Sequence_T.i
index f9719391cab..7b4d4645c44 100644
--- a/TAO/tao/Sequence_T.i
+++ b/TAO/tao/Sequence_T.i
@@ -282,182 +282,6 @@ TAO_Pseudo_Object_Manager<T,T_var>::_retn (void)
 }
 
 // *************************************************************
-// Inline operations for class TAO_Valuetype_Manager
-// *************************************************************
-
-template <typename T, typename T_var, typename T_life> 
-ACE_INLINE
-TAO_Valuetype_Manager<T,T_var,T_life>::~TAO_Valuetype_Manager (void)
-{
-}
-
-template <typename T, typename T_var, typename T_life> 
-ACE_INLINE
-TAO_Valuetype_Manager<T,T_var,T_life>::TAO_Valuetype_Manager (
-    const TAO_Valuetype_Manager<T,T_var,T_life> & rhs
-  )
-  : ptr_ (rhs.ptr_),
-    release_ (rhs.release_)
-{
-}
-
-template <typename T, typename T_var, typename T_life> 
-ACE_INLINE
-TAO_Valuetype_Manager<T,T_var,T_life>::TAO_Valuetype_Manager(
-    T ** buffer, 
-    CORBA::Boolean release
-  )
-  : ptr_ (buffer),
-    release_ (release)
-{
-}
-
-template <typename T, typename T_var, typename T_life> 
-ACE_INLINE 
-T *
-TAO_Valuetype_Manager<T,T_var,T_life>::operator-> (void) const
-{
-  return *this->ptr_;
-}
-
-template <typename T, typename T_var, typename T_life> 
-ACE_INLINE
-TAO_Valuetype_Manager<T,T_var,T_life>::operator const T_var () const
-{
-  T_life::tao_add_ref (*this->ptr_);
-  return *this->ptr_;
-}
-
-template <typename T, typename T_var, typename T_life> 
-ACE_INLINE
-TAO_Valuetype_Manager<T,T_var,T_life>::operator const T * () const
-{
-  return *this->ptr_;
-}
-
-template <typename T, typename T_var, typename T_life> 
-ACE_INLINE
-TAO_Valuetype_Manager<T,T_var,T_life>::operator T *& ()
-{
-  return *this->ptr_;
-}
-
-template <typename T, typename T_var, typename T_life> 
-ACE_INLINE 
-T *
-TAO_Valuetype_Manager<T,T_var,T_life>::in (void) const
-{
-  return *this->ptr_;
-}
-
-template <typename T, typename T_var, typename T_life> 
-ACE_INLINE 
-T *&
-TAO_Valuetype_Manager<T,T_var,T_life>::inout (void)
-{
-  return *this->ptr_;
-}
-
-template <typename T, typename T_var, typename T_life> 
-ACE_INLINE 
-T *&
-TAO_Valuetype_Manager<T,T_var,T_life>::out (void)
-{
-  T_life::tao_remove_ref (*this->ptr_);
-  *this->ptr_ = 0;
-  return *this->ptr_;
-}
-
-template <typename T, typename T_var, typename T_life> 
-ACE_INLINE 
-T *
-TAO_Valuetype_Manager<T,T_var,T_life>::_retn (void)
-{
-  T * temp = *this->ptr_;
-  *this->ptr_ = 0;
-  return temp;
-}
-
-// *************************************************************
-// Inline operations for class TAO_Abstract_Manager
-// *************************************************************
-
-template<typename T, typename T_var, typename T_life>
-ACE_INLINE
-TAO_Abstract_Manager<T,T_var,T_life>::~TAO_Abstract_Manager (void)
-{
-}
-
-template<typename T, typename T_var, typename T_life>
-ACE_INLINE
-TAO_Abstract_Manager<T,T_var,T_life>::TAO_Abstract_Manager (
-    const TAO_Abstract_Manager<T,T_var,T_life> & rhs
-  )
-  : ptr_ (rhs.ptr_),
-    release_ (rhs.release_)
-{
-}
-
-template<typename T, typename T_var, typename T_life>
-ACE_INLINE
-TAO_Abstract_Manager<T,T_var,T_life>::TAO_Abstract_Manager(
-    T ** buffer, 
-    CORBA::Boolean release
-  )
-  : ptr_ (buffer),
-    release_ (release)
-{
-}
-
-template<typename T, typename T_var, typename T_life>
-ACE_INLINE 
-T *
-TAO_Abstract_Manager<T,T_var,T_life>::operator-> (void) const
-{
-  return *this->ptr_;
-}
-
-template<typename T, typename T_var, typename T_life>
-ACE_INLINE
-TAO_Abstract_Manager<T,T_var,T_life>::operator const T * () const
-{
-  return *this->ptr_;
-}
-
-template<typename T, typename T_var, typename T_life>
-ACE_INLINE
-TAO_Abstract_Manager<T,T_var,T_life>::operator T *& ()
-{
-  return *this->ptr_;
-}
-
-template<typename T, typename T_var, typename T_life>
-ACE_INLINE 
-T *
-TAO_Abstract_Manager<T,T_var,T_life>::in (void) const
-{
-  return *this->ptr_;
-}
-
-template<typename T, typename T_var, typename T_life>
-ACE_INLINE 
-T *&
-TAO_Abstract_Manager<T,T_var,T_life>::inout (void)
-{
-  return *this->ptr_;
-}
-
-template<typename T, typename T_var, typename T_life>
-ACE_INLINE 
-T *
-TAO_Abstract_Manager<T,T_var,T_life>::_retn (void)
-{
-  T * temp = *this->ptr_;
-  *this->ptr_ = 0;
-  return temp;
-}
-
-// *************************************************************
 // class TAO_Unbounded_Object_Sequence
 // *************************************************************
 
@@ -609,154 +433,6 @@ TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::operator[] (
 }
 
 // *************************************************************
-// class TAO_Unbounded_Valuetype_Sequence
-// *************************************************************
-
-template <typename T, typename T_var, typename T_life> 
-ACE_INLINE
-TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::
-TAO_Unbounded_Valuetype_Sequence (
-    void
-  )
-{
-}
-
-template <typename T, typename T_var, typename T_life> 
-ACE_INLINE
-TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::
-TAO_Unbounded_Valuetype_Sequence (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    T ** value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-template <typename T, typename T_var, typename T_life> 
-ACE_INLINE 
-TAO_Valuetype_Manager<T,T_var,T_life>
-TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::operator[] (
-    CORBA::ULong slot
-  ) const
-{
-  ACE_ASSERT (slot < this->maximum_);
-  T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Valuetype_Manager<T,T_var,T_life> (tmp + slot, this->release_);
-}
-
-// *************************************************************
-// class TAO_Bounded_Valuetype_Sequence
-// *************************************************************
-
-template<typename T, typename T_var, typename T_life, size_t MAX> 
-ACE_INLINE
-TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::
-~TAO_Bounded_Valuetype_Sequence (
-    void
-  )
-{
-  this->_deallocate_buffer ();
-}
-
-template<typename T, typename T_var, typename T_life, size_t MAX> 
-ACE_INLINE
-TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::
-TAO_Bounded_Valuetype_Sequence (
-    CORBA::ULong length,
-    T **value,
-    CORBA::Boolean release
-  )
-  : TAO_Bounded_Base_Sequence (MAX, length, value, release)
-{
-}
-
-template<typename T, typename T_var, typename T_life, size_t MAX> 
-ACE_INLINE 
-TAO_Valuetype_Manager<T,T_var,T_life>
-TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::operator[] (
-    CORBA::ULong slot
-  ) const
-{
-  ACE_ASSERT (slot < this->maximum_);
-  T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Valuetype_Manager<T,T_var,T_life> (tmp + slot, this->release_);
-}
-
-// *************************************************************
-// class TAO_Unbounded_Abstract_Sequence
-// *************************************************************
-
-template <typename T, typename T_var, typename T_life> 
-ACE_INLINE
-TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::
-TAO_Unbounded_Abstract_Sequence (void)
-{
-}
-
-template <typename T, typename T_var, typename T_life> 
-ACE_INLINE
-TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::
-TAO_Unbounded_Abstract_Sequence (
-    CORBA::ULong maximum,
-    CORBA::ULong length,
-    T ** value,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-{
-}
-
-template <typename T, typename T_var, typename T_life> 
-ACE_INLINE 
-TAO_Abstract_Manager<T,T_var,T_life>
-TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::operator[] (
-    CORBA::ULong slot
-  ) const
-{
-  ACE_ASSERT (slot < this->maximum_);
-  T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Abstract_Manager<T,T_var,T_life> (tmp + slot, this->release_);
-}
-
-// *************************************************************
-// class TAO_Bounded_Abstract_Sequence
-// *************************************************************
-
-template<typename T, typename T_var, typename T_life, size_t MAX>
-ACE_INLINE
-TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::
-~TAO_Bounded_Abstract_Sequence (void)
-{
-  this->_deallocate_buffer ();
-}
-
-template<typename T, typename T_var, typename T_life, size_t MAX>
-ACE_INLINE
-TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::
-TAO_Bounded_Abstract_Sequence (
-    CORBA::ULong length,
-    T ** value,
-    CORBA::Boolean release
-  )
-  : TAO_Bounded_Base_Sequence (MAX, length, value, release)
-{
-}
-
-template<typename T, typename T_var, typename T_life, size_t MAX>
-ACE_INLINE 
-TAO_Abstract_Manager<T,T_var,T_life>
-TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::operator[] (
-    CORBA::ULong slot
-  ) const
-{
-  ACE_ASSERT (slot < this->maximum_);
-  T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
-  return TAO_Abstract_Manager<T,T_var,T_life> (tmp + slot, this->release_);
-}
-
-// *************************************************************
 // class TAO_Unbounded_Array_Sequence
 // *************************************************************
 
diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp
index 514fcf05f27..27b4aded612 100644
--- a/TAO/tao/ServicesC.cpp
+++ b/TAO/tao/ServicesC.cpp
@@ -24,7 +24,7 @@
 
 
 #include "ServicesC.h"
-#include "tao/Any_T.h"
+#include "tao/Any_Dual_Impl_T.h"
 #include "tao/Environment.h"
 #include "tao/ORB_Core.h"
 
diff --git a/TAO/tao/SmartProxies/Makefile b/TAO/tao/SmartProxies/Makefile
index fac86e9dd72..1ce326c6da0 100644
--- a/TAO/tao/SmartProxies/Makefile
+++ b/TAO/tao/SmartProxies/Makefile
@@ -49,7 +49,7 @@ CPPFLAGS += -I$(TAO_ROOT)
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/Smart_Proxies.o .obj/Smart_Proxies.so .shobj/Smart_Proxies.o .shobj/Smart_Proxies.so: Smart_Proxies.cpp Smart_Proxies.h \
+.obj/Smart_Proxies.o .obj/Smart_Proxies.SO .shobj/Smart_Proxies.o .shobj/Smart_Proxies.SO: Smart_Proxies.cpp Smart_Proxies.h \
   $(ACE_ROOT)/ace/pre.h smartproxies_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -90,8 +90,7 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -221,6 +220,9 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/TAO_Singleton.h \
diff --git a/TAO/tao/Strategies/Makefile b/TAO/tao/Strategies/Makefile
index 67748c770af..9f79f596480 100644
--- a/TAO/tao/Strategies/Makefile
+++ b/TAO/tao/Strategies/Makefile
@@ -104,7 +104,7 @@ endif
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/DIOP_Factory.o .obj/DIOP_Factory.so .shobj/DIOP_Factory.o .shobj/DIOP_Factory.so: DIOP_Factory.cpp DIOP_Factory.h \
+.obj/DIOP_Factory.o .obj/DIOP_Factory.SO .shobj/DIOP_Factory.o .shobj/DIOP_Factory.SO: DIOP_Factory.cpp DIOP_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -139,8 +139,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -229,24 +228,9 @@ endif
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h strategies_export.h \
   DIOP_Acceptor.h $(TAO_ROOT)/tao/Transport_Acceptor.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Transport_Acceptor.inl \
+  DIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
+  $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -255,56 +239,6 @@ endif
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/iosfwd.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/Transport_Acceptor.inl \
-  DIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
-  $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -349,10 +283,14 @@ endif
   $(ACE_ROOT)/ace/Synch_Options.i \
   $(ACE_ROOT)/ace/Acceptor.cpp \
   $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
   $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
   $(ACE_ROOT)/ace/Message_Queue_T.h \
   $(ACE_ROOT)/ace/Message_Queue_T.i \
@@ -379,6 +317,11 @@ endif
   $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
   $(TAO_ROOT)/tao/Connection_Handler.inl \
   DIOP_Transport.h $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
   $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
   $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
@@ -388,6 +331,37 @@ endif
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
@@ -395,8 +369,7 @@ endif
   $(TAO_ROOT)/tao/Transport.inl \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
@@ -421,6 +394,24 @@ endif
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
@@ -446,22 +437,21 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -495,7 +485,7 @@ endif
   $(TAO_ROOT)/tao/Transport_Connector.h \
   $(TAO_ROOT)/tao/Transport_Connector.inl
 
-.obj/DIOP_Profile.o .obj/DIOP_Profile.so .shobj/DIOP_Profile.o .shobj/DIOP_Profile.so: DIOP_Profile.cpp DIOP_Profile.h \
+.obj/DIOP_Profile.o .obj/DIOP_Profile.SO .shobj/DIOP_Profile.o .shobj/DIOP_Profile.SO: DIOP_Profile.cpp DIOP_Profile.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -539,8 +529,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -657,13 +646,16 @@ endif
   $(TAO_ROOT)/tao/Seq_Out_T.inl \
   $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
@@ -676,17 +668,15 @@ endif
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/CONV_FRAMEC.h \
   $(TAO_ROOT)/tao/CONV_FRAMEC.i \
@@ -699,8 +689,7 @@ endif
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
   $(ACE_ROOT)/ace/INET_Addr.h \
-  $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/Addr.i \
+  $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/INET_Addr.i strategies_export.h \
   DIOP_Endpoint.i DIOP_Profile.i $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
@@ -744,20 +733,12 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
@@ -802,7 +783,7 @@ endif
   $(TAO_ROOT)/tao/iiop_endpoints.h \
   $(TAO_ROOT)/tao/iiop_endpoints.i
 
-.obj/DIOP_Transport.o .obj/DIOP_Transport.so .shobj/DIOP_Transport.o .shobj/DIOP_Transport.so: DIOP_Transport.cpp DIOP_Transport.h \
+.obj/DIOP_Transport.o .obj/DIOP_Transport.SO .shobj/DIOP_Transport.o .shobj/DIOP_Transport.SO: DIOP_Transport.cpp DIOP_Transport.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -839,8 +820,7 @@ endif
   $(TAO_ROOT)/tao/Cache_Entries.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -851,8 +831,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -945,7 +924,6 @@ endif
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
@@ -974,37 +952,14 @@ endif
   $(TAO_ROOT)/tao/Seq_Out_T.inl \
   $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
@@ -1014,8 +969,7 @@ endif
   $(TAO_ROOT)/tao/Transport.inl \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
@@ -1119,6 +1073,24 @@ endif
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
@@ -1144,22 +1116,21 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -1241,7 +1212,7 @@ endif
   $(TAO_ROOT)/tao/GIOP_Message_Lite.h \
   $(TAO_ROOT)/tao/GIOP_Message_Lite.i
 
-.obj/DIOP_Connector.o .obj/DIOP_Connector.so .shobj/DIOP_Connector.o .shobj/DIOP_Connector.so: DIOP_Connector.cpp DIOP_Connector.h \
+.obj/DIOP_Connector.o .obj/DIOP_Connector.SO .shobj/DIOP_Connector.o .shobj/DIOP_Connector.SO: DIOP_Connector.cpp DIOP_Connector.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -1279,8 +1250,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Handle_Set.i \
   $(ACE_ROOT)/ace/Timer_Queue.h \
   $(ACE_ROOT)/ace/Synch.h \
@@ -1422,8 +1392,7 @@ endif
   $(ACE_ROOT)/ace/Synch_Options.i \
   $(ACE_ROOT)/ace/Acceptor.cpp \
   $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
   $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -1469,7 +1438,6 @@ endif
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
@@ -1493,37 +1461,14 @@ endif
   $(TAO_ROOT)/tao/Seq_Out_T.inl \
   $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
@@ -1531,8 +1476,7 @@ endif
   $(TAO_ROOT)/tao/Transport.inl \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
@@ -1548,6 +1492,7 @@ endif
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
   $(ACE_ROOT)/ace/Connector.cpp \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
@@ -1559,6 +1504,23 @@ endif
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
@@ -1584,22 +1546,21 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
@@ -1623,9 +1584,6 @@ endif
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/GIOP_Message_Version.h \
@@ -1643,7 +1601,7 @@ endif
   $(TAO_ROOT)/tao/Profile.i DIOP_Endpoint.h \
   DIOP_Endpoint.i DIOP_Profile.i
 
-.obj/DIOP_Acceptor.o .obj/DIOP_Acceptor.so .shobj/DIOP_Acceptor.o .shobj/DIOP_Acceptor.so: DIOP_Acceptor.cpp DIOP_Acceptor.h \
+.obj/DIOP_Acceptor.o .obj/DIOP_Acceptor.SO .shobj/DIOP_Acceptor.o .shobj/DIOP_Acceptor.SO: DIOP_Acceptor.cpp DIOP_Acceptor.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -1665,16 +1623,9 @@ endif
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
   $(TAO_ROOT)/tao/Transport_Acceptor.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(TAO_ROOT)/tao/Transport_Acceptor.inl \
+  DIOP_Connection_Handler.h $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -1686,21 +1637,47 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Acceptor.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -1720,17 +1697,6 @@ endif
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
@@ -1738,6 +1704,7 @@ endif
   $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
@@ -1752,16 +1719,9 @@ endif
   $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
   $(ACE_ROOT)/ace/Malloc_T.i \
   $(ACE_ROOT)/ace/Malloc_T.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
   $(ACE_ROOT)/ace/Mem_Map.h \
   $(ACE_ROOT)/ace/Mem_Map.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
@@ -1775,74 +1735,6 @@ endif
   $(ACE_ROOT)/ace/SString.i \
   $(ACE_ROOT)/ace/XML_Svc_Conf.h \
   $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/iosfwd.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/Transport_Acceptor.inl \
-  DIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -1887,10 +1779,14 @@ endif
   $(ACE_ROOT)/ace/Synch_Options.i \
   $(ACE_ROOT)/ace/Acceptor.cpp \
   $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
   $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
   $(ACE_ROOT)/ace/Message_Queue_T.h \
   $(ACE_ROOT)/ace/Message_Queue_T.i \
@@ -1917,6 +1813,11 @@ endif
   $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
   $(TAO_ROOT)/tao/Connection_Handler.inl \
   DIOP_Transport.h $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
   $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
   $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
@@ -1926,6 +1827,37 @@ endif
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
@@ -1933,8 +1865,7 @@ endif
   $(TAO_ROOT)/tao/Transport.inl \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
@@ -1959,6 +1890,24 @@ endif
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
@@ -1984,22 +1933,21 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -2040,7 +1988,7 @@ endif
   $(TAO_ROOT)/tao/Protocols_Hooks.h \
   $(TAO_ROOT)/tao/Codeset_Manager.h
 
-.obj/DIOP_Connection_Handler.o .obj/DIOP_Connection_Handler.so .shobj/DIOP_Connection_Handler.o .shobj/DIOP_Connection_Handler.so: DIOP_Connection_Handler.cpp \
+.obj/DIOP_Connection_Handler.o .obj/DIOP_Connection_Handler.SO .shobj/DIOP_Connection_Handler.o .shobj/DIOP_Connection_Handler.SO: DIOP_Connection_Handler.cpp \
   DIOP_Connection_Handler.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -2074,8 +2022,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Handle_Set.i \
   $(ACE_ROOT)/ace/Timer_Queue.h \
   $(ACE_ROOT)/ace/Synch.h \
@@ -2217,8 +2164,7 @@ endif
   $(ACE_ROOT)/ace/Synch_Options.i \
   $(ACE_ROOT)/ace/Acceptor.cpp \
   $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
   $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2266,7 +2212,6 @@ endif
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
@@ -2290,37 +2235,14 @@ endif
   $(TAO_ROOT)/tao/Seq_Out_T.inl \
   $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
@@ -2328,8 +2250,7 @@ endif
   $(TAO_ROOT)/tao/Transport.inl \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
@@ -2342,6 +2263,7 @@ endif
   $(ACE_ROOT)/ace/SOCK_Dgram.i DIOP_Connection_Handler.i \
   $(TAO_ROOT)/tao/Timeprobe.h \
   $(ACE_ROOT)/ace/Timeprobe.h \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
@@ -2353,6 +2275,23 @@ endif
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
@@ -2378,22 +2317,21 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -2423,7 +2361,7 @@ endif
   $(TAO_ROOT)/tao/Resume_Handle.inl DIOP_Endpoint.h \
   DIOP_Endpoint.i
 
-.obj/DIOP_Endpoint.o .obj/DIOP_Endpoint.so .shobj/DIOP_Endpoint.o .shobj/DIOP_Endpoint.so: DIOP_Endpoint.cpp DIOP_Endpoint.h \
+.obj/DIOP_Endpoint.o .obj/DIOP_Endpoint.SO .shobj/DIOP_Endpoint.o .shobj/DIOP_Endpoint.SO: DIOP_Endpoint.cpp DIOP_Endpoint.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/Endpoint.h \
   $(TAO_ROOT)/tao/corbafwd.h \
@@ -2446,8 +2384,7 @@ endif
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -2458,8 +2395,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -2482,8 +2418,7 @@ endif
   $(ACE_ROOT)/ace/INET_Addr.h \
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/Addr.i \
+  $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/INET_Addr.i strategies_export.h \
   DIOP_Endpoint.i DIOP_Connection_Handler.h \
   $(ACE_ROOT)/ace/Reactor.h \
@@ -2612,8 +2547,7 @@ endif
   $(ACE_ROOT)/ace/Synch_Options.i \
   $(ACE_ROOT)/ace/Acceptor.cpp \
   $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
   $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -2660,7 +2594,6 @@ endif
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
@@ -2682,37 +2615,14 @@ endif
   $(TAO_ROOT)/tao/Seq_Out_T.inl \
   $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
@@ -2727,9 +2637,32 @@ endif
   $(ACE_ROOT)/ace/SOCK_IO.i \
   $(ACE_ROOT)/ace/SOCK_Stream.i DIOP_Transport.i \
   $(ACE_ROOT)/ace/SOCK_Dgram.h \
-  $(ACE_ROOT)/ace/SOCK_Dgram.i DIOP_Connection_Handler.i
+  $(ACE_ROOT)/ace/SOCK_Dgram.i DIOP_Connection_Handler.i \
+  $(TAO_ROOT)/tao/debug.h
+
+.obj/UIOP_Factory.o .obj/UIOP_Factory.SO .shobj/UIOP_Factory.o .shobj/UIOP_Factory.SO: UIOP_Factory.cpp UIOP_Factory.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(TAO_ROOT)/tao/corbafwd.i
 
-.obj/UIOP_Factory.o .obj/UIOP_Factory.so .shobj/UIOP_Factory.o .shobj/UIOP_Factory.so: UIOP_Factory.cpp UIOP_Factory.h \
+.obj/UIOP_Lite_Factory.o .obj/UIOP_Lite_Factory.SO .shobj/UIOP_Lite_Factory.o .shobj/UIOP_Lite_Factory.SO: UIOP_Lite_Factory.cpp UIOP_Lite_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -2749,8 +2682,192 @@ endif
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(TAO_ROOT)/tao/corbafwd.i
+
+.obj/UIOP_Profile.o .obj/UIOP_Profile.SO .shobj/UIOP_Profile.o .shobj/UIOP_Profile.SO: UIOP_Profile.cpp UIOP_Profile.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(TAO_ROOT)/tao/corbafwd.i
+
+.obj/UIOP_Transport.o .obj/UIOP_Transport.SO .shobj/UIOP_Transport.o .shobj/UIOP_Transport.SO: UIOP_Transport.cpp UIOP_Transport.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(TAO_ROOT)/tao/corbafwd.i
+
+.obj/UIOP_Connector.o .obj/UIOP_Connector.SO .shobj/UIOP_Connector.o .shobj/UIOP_Connector.SO: UIOP_Connector.cpp UIOP_Connector.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(TAO_ROOT)/tao/corbafwd.i
+
+.obj/UIOP_Acceptor.o .obj/UIOP_Acceptor.SO .shobj/UIOP_Acceptor.o .shobj/UIOP_Acceptor.SO: UIOP_Acceptor.cpp UIOP_Acceptor.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/Transport_Acceptor.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Transport_Acceptor.inl
+
+.obj/UIOP_Connection_Handler.o .obj/UIOP_Connection_Handler.SO .shobj/UIOP_Connection_Handler.o .shobj/UIOP_Connection_Handler.SO: UIOP_Connection_Handler.cpp \
+  UIOP_Connection_Handler.h $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(TAO_ROOT)/tao/corbafwd.i
+
+.obj/UIOP_Endpoint.o .obj/UIOP_Endpoint.SO .shobj/UIOP_Endpoint.o .shobj/UIOP_Endpoint.SO: UIOP_Endpoint.cpp UIOP_Endpoint.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/Endpoint.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(TAO_ROOT)/tao/Endpoint.i UIOP_Connection_Handler.h
+
+.obj/SCIOP_Factory.o .obj/SCIOP_Factory.SO .shobj/SCIOP_Factory.o .shobj/SCIOP_Factory.SO: SCIOP_Factory.cpp SCIOP_Factory.h \
+  $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/OS.h \
@@ -2764,37 +2881,26 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
   $(ACE_ROOT)/ace/Event_Handler.i \
   $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/SStringfwd.h strategies_export.h \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/SStringfwd.h SCIOP_Acceptor.h \
+  $(TAO_ROOT)/tao/Transport_Acceptor.h \
+  $(TAO_ROOT)/tao/Transport_Acceptor.inl \
+  SCIOP_Connector.h $(ACE_ROOT)/ace/SOCK_SEQPACK_Connector.h \
+  $(ACE_ROOT)/ace/SOCK_SEQPACK_Association.h \
+  $(ACE_ROOT)/ace/SOCK_IO.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/Addr.i \
+  $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/IPC_SAP.i \
+  $(ACE_ROOT)/ace/SOCK.i $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Handle_Ops.h \
   $(ACE_ROOT)/ace/Handle_Ops.i \
   $(ACE_ROOT)/ace/Lib_Find.h \
@@ -2804,340 +2910,38 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h UIOP_Acceptor.h \
-  $(TAO_ROOT)/tao/Transport_Acceptor.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/iosfwd.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/Transport_Acceptor.inl \
-  $(ACE_ROOT)/ace/Acceptor.h \
-  $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/SOCK_IO.i \
+  $(ACE_ROOT)/ace/INET_Addr.h \
+  $(ACE_ROOT)/ace/INET_Addr.i \
+  $(ACE_ROOT)/ace/SOCK_SEQPACK_Association.i \
+  $(ACE_ROOT)/ace/Multihomed_INET_Addr.h \
+  $(ACE_ROOT)/ace/Containers_T.h \
   $(ACE_ROOT)/ace/Containers.h \
   $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Containers_T.i \
   $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl \
-  $(ACE_ROOT)/ace/Hashable.h \
-  $(ACE_ROOT)/ace/Hashable.inl \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Acceptor.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Notification_Strategy.h \
-  $(ACE_ROOT)/ace/Notification_Strategy.inl \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.cpp \
-  $(ACE_ROOT)/ace/Dynamic.h \
-  $(ACE_ROOT)/ace/Dynamic.i \
-  $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Stream.h \
-  $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/Addr.i \
-  $(ACE_ROOT)/ace/IPC_SAP.h \
-  $(ACE_ROOT)/ace/IPC_SAP.i \
-  $(ACE_ROOT)/ace/SOCK.i \
-  $(ACE_ROOT)/ace/SOCK_IO.i \
-  $(ACE_ROOT)/ace/INET_Addr.h \
-  $(ACE_ROOT)/ace/INET_Addr.i \
-  $(ACE_ROOT)/ace/SOCK_Stream.i \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
-  $(ACE_ROOT)/ace/UNIX_Addr.h \
-  $(ACE_ROOT)/ace/UNIX_Addr.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.h \
-  $(ACE_ROOT)/ace/LSOCK.h \
-  $(ACE_ROOT)/ace/LSOCK.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.i UIOP_Connection_Handler.h \
-  $(TAO_ROOT)/tao/Connection_Handler.h \
-  $(TAO_ROOT)/tao/LF_CH_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.inl \
-  $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Wait_Strategy.h \
-  $(TAO_ROOT)/tao/Wait_Strategy.inl UIOP_Transport.h \
-  $(TAO_ROOT)/tao/Transport.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
-  $(TAO_ROOT)/tao/Cache_Entries.h \
-  $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
-  $(TAO_ROOT)/tao/Transport_Timer.h \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
-  $(TAO_ROOT)/tao/Synch_Refcountable.h \
-  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
-  $(TAO_ROOT)/tao/Transport.inl UIOP_Transport.i \
-  UIOP_Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Acceptor_Impl.h \
-  $(TAO_ROOT)/tao/Acceptor_Impl.i \
-  $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/ServicesC.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/ObjectIdListC.h \
-  $(TAO_ROOT)/tao/ObjectIdListC.i \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/ORB.i \
-  $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/Policy_Manager.i \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
-  $(TAO_ROOT)/tao/params.h \
-  $(TAO_ROOT)/tao/params.i \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(TAO_ROOT)/tao/Parser_Registry.h \
-  $(TAO_ROOT)/tao/Parser_Registry.i \
-  $(TAO_ROOT)/tao/Service_Callbacks.h \
-  $(TAO_ROOT)/tao/Service_Callbacks.i \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
-  $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(TAO_ROOT)/tao/Interceptor_List.h \
-  $(TAO_ROOT)/tao/Interceptor_List.inl \
-  $(TAO_ROOT)/tao/PICurrent.h \
-  $(TAO_ROOT)/tao/PICurrent.inl \
-  $(TAO_ROOT)/tao/ORB_Core.i \
-  $(TAO_ROOT)/tao/ORB_Table.h \
-  $(TAO_ROOT)/tao/ORB_Table.inl \
-  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
-  $(TAO_ROOT)/tao/Connector_Registry.h \
-  $(TAO_ROOT)/tao/Endpoint.h \
-  $(TAO_ROOT)/tao/Endpoint.i \
-  $(TAO_ROOT)/tao/Connector_Registry.i \
-  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
-  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
-  UIOP_Connector.h $(ACE_ROOT)/ace/LSOCK_Connector.h \
-  $(ACE_ROOT)/ace/SOCK_Connector.h \
-  $(ACE_ROOT)/ace/SOCK_Connector.i \
-  $(ACE_ROOT)/ace/LSOCK_Connector.i \
-  $(ACE_ROOT)/ace/Connector.h \
-  $(ACE_ROOT)/ace/Connector.cpp \
-  $(TAO_ROOT)/tao/Transport_Connector.h \
-  $(TAO_ROOT)/tao/Transport_Connector.inl \
-  $(TAO_ROOT)/tao/Connector_Impl.h \
-  $(TAO_ROOT)/tao/Connector_Impl.inl \
-  $(TAO_ROOT)/tao/Connector_Impl.cpp
+  $(ACE_ROOT)/ace/Multihomed_INET_Addr.i \
+  $(ACE_ROOT)/ace/SOCK_SEQPACK_Connector.i
 
-.obj/UIOP_Lite_Factory.o .obj/UIOP_Lite_Factory.so .shobj/UIOP_Lite_Factory.o .shobj/UIOP_Lite_Factory.so: UIOP_Lite_Factory.cpp UIOP_Lite_Factory.h \
+.obj/SCIOP_Lite_Factory.o .obj/SCIOP_Lite_Factory.SO .shobj/SCIOP_Lite_Factory.o .shobj/SCIOP_Lite_Factory.SO: SCIOP_Lite_Factory.cpp SCIOP_Lite_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -3157,13 +2961,8 @@ endif
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -3175,24 +2974,26 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(ACE_ROOT)/ace/SStringfwd.h SCIOP_Acceptor.h \
+  $(TAO_ROOT)/tao/Transport_Acceptor.h \
+  $(TAO_ROOT)/tao/Transport_Acceptor.inl \
+  SCIOP_Connector.h $(ACE_ROOT)/ace/SOCK_SEQPACK_Connector.h \
+  $(ACE_ROOT)/ace/SOCK_SEQPACK_Association.h \
+  $(ACE_ROOT)/ace/SOCK_IO.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/Addr.i \
+  $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/IPC_SAP.i \
+  $(ACE_ROOT)/ace/SOCK.i $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Handle_Ops.h \
   $(ACE_ROOT)/ace/Handle_Ops.i \
   $(ACE_ROOT)/ace/Lib_Find.h \
@@ -3202,353 +3003,46 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h strategies_export.h \
-  $(TAO_ROOT)/tao/Protocol_Factory.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i UIOP_Acceptor.h \
-  $(TAO_ROOT)/tao/Transport_Acceptor.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/iosfwd.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/Transport_Acceptor.inl \
-  $(ACE_ROOT)/ace/Acceptor.h \
-  $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/SOCK_IO.i \
+  $(ACE_ROOT)/ace/INET_Addr.h \
+  $(ACE_ROOT)/ace/INET_Addr.i \
+  $(ACE_ROOT)/ace/SOCK_SEQPACK_Association.i \
+  $(ACE_ROOT)/ace/Multihomed_INET_Addr.h \
+  $(ACE_ROOT)/ace/Containers_T.h \
   $(ACE_ROOT)/ace/Containers.h \
   $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Containers_T.i \
   $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl \
-  $(ACE_ROOT)/ace/Hashable.h \
-  $(ACE_ROOT)/ace/Hashable.inl \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Acceptor.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Notification_Strategy.h \
-  $(ACE_ROOT)/ace/Notification_Strategy.inl \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.cpp \
-  $(ACE_ROOT)/ace/Dynamic.h \
-  $(ACE_ROOT)/ace/Dynamic.i \
-  $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Stream.h \
-  $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/Addr.i \
-  $(ACE_ROOT)/ace/IPC_SAP.h \
-  $(ACE_ROOT)/ace/IPC_SAP.i \
-  $(ACE_ROOT)/ace/SOCK.i \
-  $(ACE_ROOT)/ace/SOCK_IO.i \
-  $(ACE_ROOT)/ace/INET_Addr.h \
-  $(ACE_ROOT)/ace/INET_Addr.i \
-  $(ACE_ROOT)/ace/SOCK_Stream.i \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
-  $(ACE_ROOT)/ace/UNIX_Addr.h \
-  $(ACE_ROOT)/ace/UNIX_Addr.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.h \
-  $(ACE_ROOT)/ace/LSOCK.h \
-  $(ACE_ROOT)/ace/LSOCK.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.i UIOP_Connection_Handler.h \
-  $(TAO_ROOT)/tao/Connection_Handler.h \
-  $(TAO_ROOT)/tao/LF_CH_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.inl \
-  $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Wait_Strategy.h \
-  $(TAO_ROOT)/tao/Wait_Strategy.inl UIOP_Transport.h \
-  $(TAO_ROOT)/tao/Transport.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
-  $(TAO_ROOT)/tao/Cache_Entries.h \
-  $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
-  $(TAO_ROOT)/tao/Transport_Timer.h \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
-  $(TAO_ROOT)/tao/Synch_Refcountable.h \
-  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
-  $(TAO_ROOT)/tao/Transport.inl UIOP_Transport.i \
-  UIOP_Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Acceptor_Impl.h \
-  $(TAO_ROOT)/tao/Acceptor_Impl.i \
-  $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/ServicesC.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/ObjectIdListC.h \
-  $(TAO_ROOT)/tao/ObjectIdListC.i \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/ORB.i \
-  $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/Policy_Manager.i \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
-  $(TAO_ROOT)/tao/params.h \
-  $(TAO_ROOT)/tao/params.i \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(TAO_ROOT)/tao/Parser_Registry.h \
-  $(TAO_ROOT)/tao/Parser_Registry.i \
-  $(TAO_ROOT)/tao/Service_Callbacks.h \
-  $(TAO_ROOT)/tao/Service_Callbacks.i \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
-  $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(TAO_ROOT)/tao/Interceptor_List.h \
-  $(TAO_ROOT)/tao/Interceptor_List.inl \
-  $(TAO_ROOT)/tao/PICurrent.h \
-  $(TAO_ROOT)/tao/PICurrent.inl \
-  $(TAO_ROOT)/tao/ORB_Core.i \
-  $(TAO_ROOT)/tao/ORB_Table.h \
-  $(TAO_ROOT)/tao/ORB_Table.inl \
-  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
-  $(TAO_ROOT)/tao/Connector_Registry.h \
-  $(TAO_ROOT)/tao/Endpoint.h \
-  $(TAO_ROOT)/tao/Endpoint.i \
-  $(TAO_ROOT)/tao/Connector_Registry.i \
-  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
-  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
-  UIOP_Connector.h $(ACE_ROOT)/ace/LSOCK_Connector.h \
-  $(ACE_ROOT)/ace/SOCK_Connector.h \
-  $(ACE_ROOT)/ace/SOCK_Connector.i \
-  $(ACE_ROOT)/ace/LSOCK_Connector.i \
-  $(ACE_ROOT)/ace/Connector.h \
-  $(ACE_ROOT)/ace/Connector.cpp \
-  $(TAO_ROOT)/tao/Transport_Connector.h \
-  $(TAO_ROOT)/tao/Transport_Connector.inl \
-  $(TAO_ROOT)/tao/Connector_Impl.h \
-  $(TAO_ROOT)/tao/Connector_Impl.inl \
-  $(TAO_ROOT)/tao/Connector_Impl.cpp \
+  $(ACE_ROOT)/ace/Multihomed_INET_Addr.i \
+  $(ACE_ROOT)/ace/SOCK_SEQPACK_Connector.i \
   $(ACE_ROOT)/ace/Dynamic_Service.h \
   $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
   $(ACE_ROOT)/ace/Dynamic_Service.i \
-  $(ACE_ROOT)/ace/Dynamic_Service.cpp
+  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+  $(ACE_ROOT)/ace/Get_Opt.h \
+  $(ACE_ROOT)/ace/Get_Opt.i
 
-.obj/UIOP_Profile.o .obj/UIOP_Profile.so .shobj/UIOP_Profile.o .shobj/UIOP_Profile.so: UIOP_Profile.cpp UIOP_Profile.h \
+.obj/SCIOP_Profile.o .obj/SCIOP_Profile.SO .shobj/SCIOP_Profile.o .shobj/SCIOP_Profile.SO: SCIOP_Profile.cpp SCIOP_Profile.h \
   $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -3567,10 +3061,7 @@ endif
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(TAO_ROOT)/tao/corbafwd.i strategies_export.h \
-  $(TAO_ROOT)/tao/Profile.h \
-  $(TAO_ROOT)/tao/Tagged_Components.h \
-  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
@@ -3591,8 +3082,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -3709,13 +3199,16 @@ endif
   $(TAO_ROOT)/tao/Seq_Out_T.inl \
   $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
@@ -3728,215 +3221,26 @@ endif
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/CONV_FRAMEC.h \
   $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/Tagged_Components.i \
   $(TAO_ROOT)/tao/GIOP_Message_Version.h \
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
-  $(TAO_ROOT)/tao/Profile.i UIOP_Connection_Handler.h \
-  $(ACE_ROOT)/ace/Acceptor.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl \
-  $(ACE_ROOT)/ace/Hashable.h \
-  $(ACE_ROOT)/ace/Hashable.inl \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Acceptor.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Notification_Strategy.h \
-  $(ACE_ROOT)/ace/Notification_Strategy.inl \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.cpp \
-  $(ACE_ROOT)/ace/Dynamic.h \
-  $(ACE_ROOT)/ace/Dynamic.i \
-  $(TAO_ROOT)/tao/Connection_Handler.h \
-  $(TAO_ROOT)/tao/LF_CH_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.inl \
-  $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Wait_Strategy.h \
-  $(TAO_ROOT)/tao/Wait_Strategy.inl UIOP_Transport.h \
-  $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Stream.h \
-  $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/Addr.i \
-  $(ACE_ROOT)/ace/IPC_SAP.h \
-  $(ACE_ROOT)/ace/IPC_SAP.i \
-  $(ACE_ROOT)/ace/SOCK.i \
-  $(ACE_ROOT)/ace/SOCK_IO.i \
-  $(ACE_ROOT)/ace/INET_Addr.h \
-  $(ACE_ROOT)/ace/INET_Addr.i \
-  $(ACE_ROOT)/ace/SOCK_Stream.i \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
-  $(ACE_ROOT)/ace/UNIX_Addr.h \
-  $(ACE_ROOT)/ace/UNIX_Addr.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.h \
-  $(ACE_ROOT)/ace/LSOCK.h \
-  $(ACE_ROOT)/ace/LSOCK.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.i \
-  $(TAO_ROOT)/tao/Transport.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
-  $(TAO_ROOT)/tao/Cache_Entries.h \
-  $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
-  $(TAO_ROOT)/tao/Transport_Timer.h \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
-  $(TAO_ROOT)/tao/Synch_Refcountable.h \
-  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
-  $(TAO_ROOT)/tao/Transport.inl UIOP_Transport.i \
-  UIOP_Connection_Handler.inl UIOP_Endpoint.h \
-  $(TAO_ROOT)/tao/Endpoint.h \
-  $(TAO_ROOT)/tao/Endpoint.i UIOP_Endpoint.i \
-  UIOP_Profile.i $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/ServicesC.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/ObjectIdListC.h \
-  $(TAO_ROOT)/tao/ObjectIdListC.i \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/ORB.i \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/Policy_Manager.i \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(TAO_ROOT)/tao/params.h \
-  $(TAO_ROOT)/tao/params.i \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(TAO_ROOT)/tao/Parser_Registry.h \
-  $(TAO_ROOT)/tao/Parser_Registry.i \
-  $(TAO_ROOT)/tao/Service_Callbacks.h \
-  $(TAO_ROOT)/tao/Service_Callbacks.i \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
-  $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(TAO_ROOT)/tao/Interceptor_List.h \
-  $(TAO_ROOT)/tao/Interceptor_List.inl \
-  $(TAO_ROOT)/tao/PICurrent.h \
-  $(TAO_ROOT)/tao/PICurrent.inl \
-  $(TAO_ROOT)/tao/ORB_Core.i uiop_endpoints.h \
-  uiop_endpoints.i
+  $(TAO_ROOT)/tao/Profile.i
 
-.obj/UIOP_Transport.o .obj/UIOP_Transport.so .shobj/UIOP_Transport.o .shobj/UIOP_Transport.so: UIOP_Transport.cpp UIOP_Transport.h \
+.obj/SCIOP_Transport.o .obj/SCIOP_Transport.SO .shobj/SCIOP_Transport.o .shobj/SCIOP_Transport.SO: SCIOP_Transport.cpp SCIOP_Transport.h \
   $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/Transport.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -3955,17 +3259,23 @@ endif
   $(ACE_ROOT)/ace/OS_Errno.h \
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(TAO_ROOT)/tao/corbafwd.i strategies_export.h \
-  $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Stream.h \
-  $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/Addr.i \
-  $(ACE_ROOT)/ace/IPC_SAP.h \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
+  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
+  $(TAO_ROOT)/tao/Cache_Entries.h \
+  $(ACE_ROOT)/ace/Recyclable.h \
+  $(ACE_ROOT)/ace/Recyclable.inl \
+  $(TAO_ROOT)/tao/Cache_Entries.inl \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -3976,12 +3286,9 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/IPC_SAP.i \
-  $(ACE_ROOT)/ace/SOCK.i \
-  $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Handle_Ops.h \
   $(ACE_ROOT)/ace/Handle_Ops.i \
   $(ACE_ROOT)/ace/Lib_Find.h \
@@ -3991,21 +3298,15 @@ endif
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/SOCK_IO.i \
-  $(ACE_ROOT)/ace/INET_Addr.h \
-  $(ACE_ROOT)/ace/INET_Addr.i \
-  $(ACE_ROOT)/ace/SOCK_Stream.i \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
-  $(ACE_ROOT)/ace/UNIX_Addr.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/UNIX_Addr.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.h \
-  $(ACE_ROOT)/ace/LSOCK.h \
-  $(ACE_ROOT)/ace/LSOCK.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.h \
@@ -4017,81 +3318,18 @@ endif
   $(ACE_ROOT)/ace/Thread_Adapter.inl \
   $(ACE_ROOT)/ace/Thread.i \
   $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Node.h \
   $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
   $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Notification_Strategy.h \
-  $(ACE_ROOT)/ace/Notification_Strategy.inl \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
   $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
@@ -4101,9 +3339,14 @@ endif
   $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
   $(ACE_ROOT)/ace/Malloc_T.i \
   $(ACE_ROOT)/ace/Malloc_T.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
   $(ACE_ROOT)/ace/Signal.h \
   $(ACE_ROOT)/ace/Signal.i \
   $(ACE_ROOT)/ace/Mem_Map.h \
@@ -4131,41 +3374,21 @@ endif
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
-  $(ACE_ROOT)/ace/Svc_Handler.cpp \
-  $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \
-  $(ACE_ROOT)/ace/Dynamic.h \
-  $(ACE_ROOT)/ace/Dynamic.i \
-  $(TAO_ROOT)/tao/Transport.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/iosfwd.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
-  $(TAO_ROOT)/tao/Cache_Entries.h \
-  $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
   $(TAO_ROOT)/tao/Managed_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(TAO_ROOT)/tao/Sequence.i \
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
@@ -4184,180 +3407,23 @@ endif
   $(TAO_ROOT)/tao/Seq_Out_T.inl \
   $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.h \
   $(ACE_ROOT)/ace/Refcountable.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
-  $(TAO_ROOT)/tao/Transport.inl UIOP_Transport.i \
-  UIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
-  $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Hashable.h \
-  $(ACE_ROOT)/ace/Hashable.inl \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Acceptor.cpp \
-  $(TAO_ROOT)/tao/Connection_Handler.h \
-  $(TAO_ROOT)/tao/LF_CH_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.inl \
-  $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Wait_Strategy.h \
-  $(TAO_ROOT)/tao/Wait_Strategy.inl \
-  UIOP_Connection_Handler.inl UIOP_Profile.h \
-  $(TAO_ROOT)/tao/Profile.h \
-  $(TAO_ROOT)/tao/Tagged_Components.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
-  $(TAO_ROOT)/tao/Tagged_Components.i \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
-  $(TAO_ROOT)/tao/Profile.i UIOP_Endpoint.h \
-  $(TAO_ROOT)/tao/Endpoint.h \
-  $(TAO_ROOT)/tao/Endpoint.i UIOP_Endpoint.i \
-  UIOP_Profile.i $(TAO_ROOT)/tao/Timeprobe.h \
-  $(ACE_ROOT)/ace/Timeprobe.h \
-  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
-  $(TAO_ROOT)/tao/Sync_Strategies.h \
-  $(TAO_ROOT)/tao/TAOC.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/TAOC.i \
-  $(TAO_ROOT)/tao/Sync_Strategies.i \
-  $(TAO_ROOT)/tao/Stub.h \
-  $(TAO_ROOT)/tao/MProfile.h \
-  $(TAO_ROOT)/tao/MProfile.i \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/ServicesC.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/ObjectIdListC.h \
-  $(TAO_ROOT)/tao/ObjectIdListC.i \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/ORB.i \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/Policy_Manager.i \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(TAO_ROOT)/tao/params.h \
-  $(TAO_ROOT)/tao/params.i \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(TAO_ROOT)/tao/Parser_Registry.h \
-  $(TAO_ROOT)/tao/Parser_Registry.i \
-  $(TAO_ROOT)/tao/Service_Callbacks.h \
-  $(TAO_ROOT)/tao/Service_Callbacks.i \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
-  $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(TAO_ROOT)/tao/Interceptor_List.h \
-  $(TAO_ROOT)/tao/Interceptor_List.inl \
-  $(TAO_ROOT)/tao/PICurrent.h \
-  $(TAO_ROOT)/tao/PICurrent.inl \
-  $(TAO_ROOT)/tao/ORB_Core.i \
-  $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.h \
-  $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
-  $(TAO_ROOT)/tao/Stub.i \
-  $(TAO_ROOT)/tao/GIOP_Message_Base.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging.i \
-  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_Impl.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_11.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_10.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser.inl \
-  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_10.inl \
-  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_11.inl \
-  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_12.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_12.inl \
-  $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_Impl.inl \
-  $(TAO_ROOT)/tao/GIOP_Utils.h \
-  $(TAO_ROOT)/tao/GIOP_Utils.i \
-  $(TAO_ROOT)/tao/GIOP_Message_State.h \
-  $(TAO_ROOT)/tao/GIOP_Message_State.inl \
-  $(TAO_ROOT)/tao/GIOP_Message_Base.i \
-  $(TAO_ROOT)/tao/GIOP_Message_Lite.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Lite.i
+  $(TAO_ROOT)/tao/Transport.inl
 
-.obj/UIOP_Connector.o .obj/UIOP_Connector.so .shobj/UIOP_Connector.o .shobj/UIOP_Connector.so: UIOP_Connector.cpp UIOP_Connector.h \
+.obj/SCIOP_Connector.o .obj/SCIOP_Connector.SO .shobj/SCIOP_Connector.o .shobj/SCIOP_Connector.SO: SCIOP_Connector.cpp SCIOP_Connector.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -4378,12 +3444,10 @@ endif
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(ACE_ROOT)/ace/LSOCK_Connector.h \
-  $(ACE_ROOT)/ace/SOCK_Connector.h \
-  $(ACE_ROOT)/ace/SOCK_Stream.h \
+  $(ACE_ROOT)/ace/SOCK_SEQPACK_Connector.h \
+  $(ACE_ROOT)/ace/SOCK_SEQPACK_Association.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -4398,12 +3462,10 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/IPC_SAP.i \
-  $(ACE_ROOT)/ace/SOCK.i \
-  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/SOCK.i $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Handle_Ops.h \
   $(ACE_ROOT)/ace/Handle_Ops.i \
   $(ACE_ROOT)/ace/Lib_Find.h \
@@ -4416,389 +3478,34 @@ endif
   $(ACE_ROOT)/ace/SOCK_IO.i \
   $(ACE_ROOT)/ace/INET_Addr.h \
   $(ACE_ROOT)/ace/INET_Addr.i \
-  $(ACE_ROOT)/ace/SOCK_Stream.i \
-  $(ACE_ROOT)/ace/SOCK_Connector.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.h \
-  $(ACE_ROOT)/ace/UNIX_Addr.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/UNIX_Addr.i \
-  $(ACE_ROOT)/ace/LSOCK.h \
-  $(ACE_ROOT)/ace/LSOCK.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.i \
-  $(ACE_ROOT)/ace/LSOCK_Connector.i \
-  $(ACE_ROOT)/ace/Connector.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/SOCK_SEQPACK_Association.i \
+  $(ACE_ROOT)/ace/Multihomed_INET_Addr.h \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
   $(ACE_ROOT)/ace/Node.h \
   $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
   $(ACE_ROOT)/ace/Containers_T.i \
   $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl \
-  $(ACE_ROOT)/ace/Hashable.h \
-  $(ACE_ROOT)/ace/Hashable.inl \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Connector.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Notification_Strategy.h \
-  $(ACE_ROOT)/ace/Notification_Strategy.inl \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.cpp \
-  $(ACE_ROOT)/ace/Dynamic.h \
-  $(ACE_ROOT)/ace/Dynamic.i \
-  $(TAO_ROOT)/tao/Transport_Connector.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/Transport_Connector.inl \
-  UIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
-  $(ACE_ROOT)/ace/Acceptor.cpp \
-  $(TAO_ROOT)/tao/Connection_Handler.h \
-  $(TAO_ROOT)/tao/LF_CH_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.inl \
-  $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Wait_Strategy.h \
-  $(TAO_ROOT)/tao/Wait_Strategy.inl UIOP_Transport.h \
-  strategies_export.h $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
-  $(TAO_ROOT)/tao/Transport.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/iosfwd.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
-  $(TAO_ROOT)/tao/Cache_Entries.h \
-  $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
-  $(TAO_ROOT)/tao/Transport_Timer.h \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
-  $(TAO_ROOT)/tao/Synch_Refcountable.h \
-  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
-  $(TAO_ROOT)/tao/Transport.inl UIOP_Transport.i \
-  UIOP_Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
-  $(TAO_ROOT)/tao/Connector_Impl.h \
-  $(TAO_ROOT)/tao/Connector_Impl.inl \
-  $(TAO_ROOT)/tao/Connector_Impl.cpp UIOP_Profile.h \
+  $(ACE_ROOT)/ace/Multihomed_INET_Addr.i \
+  $(ACE_ROOT)/ace/SOCK_SEQPACK_Connector.i SCIOP_Profile.h \
   $(TAO_ROOT)/tao/Profile.h \
   $(TAO_ROOT)/tao/Tagged_Components.h \
-  $(TAO_ROOT)/tao/Tagged_Components.i \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
-  $(TAO_ROOT)/tao/Profile.i UIOP_Endpoint.h \
-  $(TAO_ROOT)/tao/Endpoint.h \
-  $(TAO_ROOT)/tao/Endpoint.i UIOP_Endpoint.i \
-  UIOP_Profile.i $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/ServicesC.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/ObjectIdListC.h \
-  $(TAO_ROOT)/tao/ObjectIdListC.i \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/ORB.i \
-  $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/Policy_Manager.i \
-  $(TAO_ROOT)/tao/params.h \
-  $(TAO_ROOT)/tao/params.i \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  $(TAO_ROOT)/tao/Parser_Registry.h \
-  $(TAO_ROOT)/tao/Parser_Registry.i \
-  $(TAO_ROOT)/tao/Service_Callbacks.h \
-  $(TAO_ROOT)/tao/Service_Callbacks.i \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
-  $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(TAO_ROOT)/tao/Interceptor_List.h \
-  $(TAO_ROOT)/tao/Interceptor_List.inl \
-  $(TAO_ROOT)/tao/PICurrent.h \
-  $(TAO_ROOT)/tao/PICurrent.inl \
-  $(TAO_ROOT)/tao/ORB_Core.i \
-  $(TAO_ROOT)/tao/Protocols_Hooks.h \
-  $(TAO_ROOT)/tao/Base_Transport_Property.h \
-  $(TAO_ROOT)/tao/Base_Transport_Property.inl \
-  $(TAO_ROOT)/tao/Invocation.h \
-  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
-  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
-  $(TAO_ROOT)/tao/LF_Invocation_Event.h \
-  $(TAO_ROOT)/tao/operation_details.h \
-  $(TAO_ROOT)/tao/Service_Context.h \
-  $(TAO_ROOT)/tao/Service_Context.inl \
-  $(TAO_ROOT)/tao/target_specification.h \
-  $(TAO_ROOT)/tao/target_specification.i \
-  $(TAO_ROOT)/tao/operation_details.i \
-  $(TAO_ROOT)/tao/Invocation.i \
-  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
-  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
-  $(TAO_ROOT)/tao/Connect_Strategy.h
-
-.obj/UIOP_Acceptor.o .obj/UIOP_Acceptor.so .shobj/UIOP_Acceptor.o .shobj/UIOP_Acceptor.so: UIOP_Acceptor.cpp UIOP_Acceptor.h \
-  $(ACE_ROOT)/ace/pre.h \
-  $(TAO_ROOT)/tao/Transport_Acceptor.h \
   $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/corbafwd.h \
-  $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/post.h \
-  $(ACE_ROOT)/ace/ace_wchar.h \
-  $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/Basic_Types.h \
-  $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i \
-  $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/CDR_Base.inl \
-  $(TAO_ROOT)/tao/orbconf.h \
-  $(ACE_ROOT)/ace/Global_Macros.h \
-  $(ACE_ROOT)/ace/OS_Export.h \
-  $(TAO_ROOT)/tao/TAO_Export.h \
-  $(ACE_ROOT)/ace/OS_Memory.h \
-  $(ACE_ROOT)/ace/OS_Errno.h \
-  $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(TAO_ROOT)/tao/corbafwd.i \
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
@@ -4806,29 +3513,11 @@ endif
   $(TAO_ROOT)/tao/Managed_Types.i \
   $(ACE_ROOT)/ace/CORBA_macros.h \
   $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS.h \
-  $(ACE_ROOT)/ace/OS_Dirent.h \
-  $(ACE_ROOT)/ace/OS_Dirent.inl \
-  $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/OS_String.inl \
-  $(ACE_ROOT)/ace/OS_TLI.h \
-  $(ACE_ROOT)/ace/OS_TLI.inl \
-  $(ACE_ROOT)/ace/Time_Value.h \
-  $(ACE_ROOT)/ace/Time_Value.inl \
-  $(ACE_ROOT)/ace/Min_Max.h \
-  $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
   $(ACE_ROOT)/ace/Message_Block.i \
   $(ACE_ROOT)/ace/Message_Block_T.h \
   $(ACE_ROOT)/ace/Message_Block_T.i \
   $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(TAO_ROOT)/tao/Sequence.i \
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
@@ -4836,18 +3525,6 @@ endif
   $(TAO_ROOT)/tao/Typecode.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i \
   $(ACE_ROOT)/ace/Functor.i \
   $(ACE_ROOT)/ace/Functor_T.h \
   $(ACE_ROOT)/ace/Functor_T.i \
@@ -4866,14 +3543,6 @@ endif
   $(ACE_ROOT)/ace/Synch_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/SString.h \
   $(ACE_ROOT)/ace/SStringfwd.h \
   $(ACE_ROOT)/ace/String_Base.h \
@@ -4937,13 +3606,16 @@ endif
   $(TAO_ROOT)/tao/Seq_Out_T.inl \
   $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
@@ -4956,232 +3628,26 @@ endif
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/Transport_Acceptor.inl \
-  $(ACE_ROOT)/ace/Acceptor.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl \
-  $(ACE_ROOT)/ace/Hashable.h \
-  $(ACE_ROOT)/ace/Hashable.inl \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Acceptor.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Notification_Strategy.h \
-  $(ACE_ROOT)/ace/Notification_Strategy.inl \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.cpp \
-  $(ACE_ROOT)/ace/Dynamic.h \
-  $(ACE_ROOT)/ace/Dynamic.i \
-  $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Stream.h \
-  $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/Addr.i \
-  $(ACE_ROOT)/ace/IPC_SAP.h \
-  $(ACE_ROOT)/ace/IPC_SAP.i \
-  $(ACE_ROOT)/ace/SOCK.i \
-  $(ACE_ROOT)/ace/SOCK_IO.i \
-  $(ACE_ROOT)/ace/INET_Addr.h \
-  $(ACE_ROOT)/ace/INET_Addr.i \
-  $(ACE_ROOT)/ace/SOCK_Stream.i \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
-  $(ACE_ROOT)/ace/UNIX_Addr.h \
-  $(ACE_ROOT)/ace/UNIX_Addr.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.h \
-  $(ACE_ROOT)/ace/LSOCK.h \
-  $(ACE_ROOT)/ace/LSOCK.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.i UIOP_Connection_Handler.h \
-  $(TAO_ROOT)/tao/Connection_Handler.h \
-  $(TAO_ROOT)/tao/LF_CH_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.inl \
-  $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Wait_Strategy.h \
-  $(TAO_ROOT)/tao/Wait_Strategy.inl UIOP_Transport.h \
-  strategies_export.h $(TAO_ROOT)/tao/Transport.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
-  $(TAO_ROOT)/tao/Cache_Entries.h \
-  $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
-  $(TAO_ROOT)/tao/Transport_Timer.h \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
-  $(TAO_ROOT)/tao/Synch_Refcountable.h \
-  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
-  $(TAO_ROOT)/tao/Transport.inl UIOP_Transport.i \
-  UIOP_Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Acceptor_Impl.h \
-  $(TAO_ROOT)/tao/Acceptor_Impl.i \
-  $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/ServicesC.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/ObjectIdListC.h \
-  $(TAO_ROOT)/tao/ObjectIdListC.i \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/ORB.i \
-  $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/Policy_Manager.i \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(TAO_ROOT)/tao/CONV_FRAMEC.h \
   $(TAO_ROOT)/tao/CONV_FRAMEC.i \
-  $(TAO_ROOT)/tao/params.h \
-  $(TAO_ROOT)/tao/params.i \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(TAO_ROOT)/tao/Parser_Registry.h \
-  $(TAO_ROOT)/tao/Parser_Registry.i \
-  $(TAO_ROOT)/tao/Service_Callbacks.h \
-  $(TAO_ROOT)/tao/Service_Callbacks.i \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
-  $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(TAO_ROOT)/tao/Interceptor_List.h \
-  $(TAO_ROOT)/tao/Interceptor_List.inl \
-  $(TAO_ROOT)/tao/PICurrent.h \
-  $(TAO_ROOT)/tao/PICurrent.inl \
-  $(TAO_ROOT)/tao/ORB_Core.i \
-  $(TAO_ROOT)/tao/ORB_Table.h \
-  $(TAO_ROOT)/tao/ORB_Table.inl \
-  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
-  $(TAO_ROOT)/tao/Connector_Registry.h \
-  $(TAO_ROOT)/tao/Endpoint.h \
-  $(TAO_ROOT)/tao/Endpoint.i \
-  $(TAO_ROOT)/tao/Connector_Registry.i \
-  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
-  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
   $(TAO_ROOT)/tao/GIOP_Message_Version.h \
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
-  UIOP_Profile.h $(TAO_ROOT)/tao/Profile.h \
-  $(TAO_ROOT)/tao/Tagged_Components.h \
-  $(TAO_ROOT)/tao/Tagged_Components.i \
-  $(TAO_ROOT)/tao/Profile.i UIOP_Endpoint.h \
-  UIOP_Endpoint.i UIOP_Profile.i \
-  $(TAO_ROOT)/tao/MProfile.h \
-  $(TAO_ROOT)/tao/MProfile.i \
-  $(TAO_ROOT)/tao/Protocols_Hooks.h \
-  $(TAO_ROOT)/tao/Codeset_Manager.h
+  $(TAO_ROOT)/tao/Profile.i
 
-.obj/UIOP_Connection_Handler.o .obj/UIOP_Connection_Handler.so .shobj/UIOP_Connection_Handler.o .shobj/UIOP_Connection_Handler.so: UIOP_Connection_Handler.cpp \
-  UIOP_Connection_Handler.h $(ACE_ROOT)/ace/pre.h \
+.obj/SCIOP_Acceptor.o .obj/SCIOP_Acceptor.SO .shobj/SCIOP_Acceptor.o .shobj/SCIOP_Acceptor.SO: SCIOP_Acceptor.cpp SCIOP_Acceptor.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/Transport_Acceptor.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/post.h \
@@ -5201,29 +3667,69 @@ endif
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(ACE_ROOT)/ace/Acceptor.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(TAO_ROOT)/tao/Transport_Acceptor.inl
+
+.obj/SCIOP_Connection_Handler.o .obj/SCIOP_Connection_Handler.SO .shobj/SCIOP_Connection_Handler.o .shobj/SCIOP_Connection_Handler.SO: SCIOP_Connection_Handler.cpp \
+  SCIOP_Connection_Handler.h $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
-  $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/OS_String.inl \
   $(ACE_ROOT)/ace/OS_TLI.h \
   $(ACE_ROOT)/ace/OS_TLI.inl \
-  $(ACE_ROOT)/ace/Time_Value.h \
-  $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Strategies_T.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -5242,10 +3748,6 @@ endif
   $(ACE_ROOT)/ace/Functor_T.h \
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
@@ -5265,12 +3767,10 @@ endif
   $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
   $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
   $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
@@ -5286,6 +3786,8 @@ endif
   $(ACE_ROOT)/ace/Malloc_T.i \
   $(ACE_ROOT)/ace/Malloc_T.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
   $(ACE_ROOT)/ace/Signal.h \
   $(ACE_ROOT)/ace/Signal.i \
   $(ACE_ROOT)/ace/Mem_Map.h \
@@ -5313,274 +3815,48 @@ endif
   $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl \
-  $(ACE_ROOT)/ace/Hashable.h \
-  $(ACE_ROOT)/ace/Hashable.inl \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Acceptor.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Notification_Strategy.h \
-  $(ACE_ROOT)/ace/Notification_Strategy.inl \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.cpp \
-  $(ACE_ROOT)/ace/Dynamic.h \
-  $(ACE_ROOT)/ace/Dynamic.i \
-  $(TAO_ROOT)/tao/Connection_Handler.h \
-  $(TAO_ROOT)/tao/LF_CH_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.inl \
-  $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Wait_Strategy.h \
-  $(TAO_ROOT)/tao/Wait_Strategy.inl UIOP_Transport.h \
-  strategies_export.h $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Stream.h \
-  $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/Addr.i \
-  $(ACE_ROOT)/ace/IPC_SAP.h \
-  $(ACE_ROOT)/ace/IPC_SAP.i \
-  $(ACE_ROOT)/ace/SOCK.i \
-  $(ACE_ROOT)/ace/SOCK_IO.i \
-  $(ACE_ROOT)/ace/INET_Addr.h \
-  $(ACE_ROOT)/ace/INET_Addr.i \
-  $(ACE_ROOT)/ace/SOCK_Stream.i \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
-  $(ACE_ROOT)/ace/UNIX_Addr.h \
-  $(ACE_ROOT)/ace/UNIX_Addr.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.h \
-  $(ACE_ROOT)/ace/LSOCK.h \
-  $(ACE_ROOT)/ace/LSOCK.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.i \
-  $(TAO_ROOT)/tao/Transport.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/iosfwd.h \
   $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
-  $(TAO_ROOT)/tao/Cache_Entries.h \
-  $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
-  $(TAO_ROOT)/tao/Transport_Timer.h \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.h \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
   $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
   $(TAO_ROOT)/tao/Object_KeyC.h \
   $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
-  $(TAO_ROOT)/tao/Synch_Refcountable.h \
-  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
-  $(TAO_ROOT)/tao/Transport.inl UIOP_Transport.i \
-  UIOP_Connection_Handler.inl UIOP_Endpoint.h \
-  $(TAO_ROOT)/tao/Endpoint.h \
-  $(TAO_ROOT)/tao/Endpoint.i UIOP_Endpoint.i \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/ServicesC.h \
-  $(TAO_ROOT)/tao/ServicesC.i \
-  $(TAO_ROOT)/tao/CORBA_String.h \
-  $(TAO_ROOT)/tao/CORBA_String.inl \
-  $(TAO_ROOT)/tao/ObjectIdListC.h \
-  $(TAO_ROOT)/tao/ObjectIdListC.i \
-  $(TAO_ROOT)/tao/objectid.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/ORB.i \
-  $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/Policy_Manager.i \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
-  $(TAO_ROOT)/tao/params.h \
-  $(TAO_ROOT)/tao/params.i \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(TAO_ROOT)/tao/Parser_Registry.h \
-  $(TAO_ROOT)/tao/Parser_Registry.i \
-  $(TAO_ROOT)/tao/Service_Callbacks.h \
-  $(TAO_ROOT)/tao/Service_Callbacks.i \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
-  $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(TAO_ROOT)/tao/Interceptor_List.h \
-  $(TAO_ROOT)/tao/Interceptor_List.inl \
-  $(TAO_ROOT)/tao/PICurrent.h \
-  $(TAO_ROOT)/tao/PICurrent.inl \
-  $(TAO_ROOT)/tao/ORB_Core.i \
-  $(TAO_ROOT)/tao/Timeprobe.h \
-  $(ACE_ROOT)/ace/Timeprobe.h \
-  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
-  $(TAO_ROOT)/tao/Base_Transport_Property.h \
-  $(TAO_ROOT)/tao/Base_Transport_Property.inl \
-  $(TAO_ROOT)/tao/GIOP_Message_Lite.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging.i \
-  $(TAO_ROOT)/tao/GIOP_Utils.h \
-  $(TAO_ROOT)/tao/GIOP_Utils.i \
-  $(TAO_ROOT)/tao/GIOP_Message_State.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
-  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
-  $(TAO_ROOT)/tao/GIOP_Message_State.inl \
-  $(TAO_ROOT)/tao/GIOP_Message_Lite.i \
-  $(TAO_ROOT)/tao/Resume_Handle.h \
-  $(TAO_ROOT)/tao/Resume_Handle.inl \
-  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
-  $(TAO_ROOT)/tao/Thread_Lane_Resources.i
+  $(TAO_ROOT)/tao/TimeBaseC.i
 
-.obj/UIOP_Endpoint.o .obj/UIOP_Endpoint.so .shobj/UIOP_Endpoint.o .shobj/UIOP_Endpoint.so: UIOP_Endpoint.cpp UIOP_Endpoint.h \
+.obj/SCIOP_Endpoint.o .obj/SCIOP_Endpoint.SO .shobj/SCIOP_Endpoint.o .shobj/SCIOP_Endpoint.SO: SCIOP_Endpoint.cpp SCIOP_Endpoint.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/Endpoint.h \
   $(TAO_ROOT)/tao/corbafwd.h \
@@ -5603,8 +3879,7 @@ endif
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -5615,8 +3890,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -5630,268 +3904,10 @@ endif
   $(ACE_ROOT)/ace/Synch_T.cpp \
   $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
-  $(TAO_ROOT)/tao/Endpoint.i strategies_export.h \
-  $(ACE_ROOT)/ace/UNIX_Addr.h \
-  $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/Addr.i \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i \
-  $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i \
-  $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i \
-  $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i \
-  $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/UNIX_Addr.i UIOP_Endpoint.i \
-  UIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h \
-  $(ACE_ROOT)/ace/Node.cpp \
-  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
-  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SStringfwd.h \
-  $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/String_Base_Const.h \
-  $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp \
-  $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i \
-  $(ACE_ROOT)/ace/Malloc_T.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.h \
-  $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
-  $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
-  $(ACE_ROOT)/ace/Mem_Map.h \
-  $(ACE_ROOT)/ace/Mem_Map.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
-  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
-  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Memory_Pool.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i \
-  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Thread_Exit.h \
-  $(ACE_ROOT)/ace/Thread_Control.h \
-  $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(ACE_ROOT)/ace/Framework_Component.h \
-  $(ACE_ROOT)/ace/Framework_Component.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.h \
-  $(ACE_ROOT)/ace/Framework_Component_T.inl \
-  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \
-  $(ACE_ROOT)/ace/Recyclable.h \
-  $(ACE_ROOT)/ace/Recyclable.inl \
-  $(ACE_ROOT)/ace/Refcountable.h \
-  $(ACE_ROOT)/ace/Refcountable.inl \
-  $(ACE_ROOT)/ace/Hashable.h \
-  $(ACE_ROOT)/ace/Hashable.inl \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Acceptor.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Notification_Strategy.h \
-  $(ACE_ROOT)/ace/Notification_Strategy.inl \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(ACE_ROOT)/ace/Svc_Handler.cpp \
-  $(ACE_ROOT)/ace/Dynamic.h \
-  $(ACE_ROOT)/ace/Dynamic.i \
-  $(TAO_ROOT)/tao/Connection_Handler.h \
-  $(TAO_ROOT)/tao/LF_CH_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.h \
-  $(TAO_ROOT)/tao/LF_Event.inl \
-  $(TAO_ROOT)/tao/LF_Invocation_Event.inl \
-  $(TAO_ROOT)/tao/Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Wait_Strategy.h \
-  $(TAO_ROOT)/tao/Wait_Strategy.inl UIOP_Transport.h \
-  $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
-  $(ACE_ROOT)/ace/SOCK_Stream.h \
-  $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/IPC_SAP.h \
-  $(ACE_ROOT)/ace/IPC_SAP.i \
-  $(ACE_ROOT)/ace/SOCK.i \
-  $(ACE_ROOT)/ace/SOCK_IO.i \
-  $(ACE_ROOT)/ace/INET_Addr.h \
-  $(ACE_ROOT)/ace/INET_Addr.i \
-  $(ACE_ROOT)/ace/SOCK_Stream.i \
-  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.h \
-  $(ACE_ROOT)/ace/LSOCK.h \
-  $(ACE_ROOT)/ace/LSOCK.i \
-  $(ACE_ROOT)/ace/LSOCK_Stream.i \
-  $(TAO_ROOT)/tao/Transport.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/iosfwd.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
-  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
-  $(TAO_ROOT)/tao/Cache_Entries.h \
-  $(TAO_ROOT)/tao/Cache_Entries.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
-  $(TAO_ROOT)/tao/Transport_Timer.h \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
-  $(TAO_ROOT)/tao/Synch_Refcountable.h \
-  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
-  $(TAO_ROOT)/tao/Transport.inl UIOP_Transport.i \
-  UIOP_Connection_Handler.inl
+  $(TAO_ROOT)/tao/Endpoint.i \
+  $(TAO_ROOT)/tao/debug.h
 
-.obj/SHMIOP_Factory.o .obj/SHMIOP_Factory.so .shobj/SHMIOP_Factory.o .shobj/SHMIOP_Factory.so: SHMIOP_Factory.cpp SHMIOP_Factory.h \
+.obj/SHMIOP_Factory.o .obj/SHMIOP_Factory.SO .shobj/SHMIOP_Factory.o .shobj/SHMIOP_Factory.SO: SHMIOP_Factory.cpp SHMIOP_Factory.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -5926,8 +3942,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -6016,24 +4031,9 @@ endif
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h SHMIOP_Acceptor.h \
   $(TAO_ROOT)/tao/Transport_Acceptor.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Transport_Acceptor.inl \
+  SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
+  $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/Functor.i \
@@ -6042,56 +4042,6 @@ endif
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/iosfwd.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/Transport_Acceptor.inl \
-  SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
-  $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -6136,10 +4086,14 @@ endif
   $(ACE_ROOT)/ace/Synch_Options.i \
   $(ACE_ROOT)/ace/Acceptor.cpp \
   $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
   $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
   $(ACE_ROOT)/ace/Message_Queue_T.h \
   $(ACE_ROOT)/ace/Message_Queue_T.i \
@@ -6167,8 +4121,7 @@ endif
   $(TAO_ROOT)/tao/Connection_Handler.inl \
   SHMIOP_Transport.h $(ACE_ROOT)/ace/MEM_Stream.h \
   $(ACE_ROOT)/ace/MEM_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
@@ -6190,6 +4143,11 @@ endif
   $(ACE_ROOT)/ace/INET_Addr.i \
   $(ACE_ROOT)/ace/MEM_Stream.i \
   $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
   $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
   $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
@@ -6199,6 +4157,37 @@ endif
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
@@ -6219,6 +4208,24 @@ endif
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
@@ -6244,22 +4251,21 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -6316,7 +4322,7 @@ endif
   $(ACE_ROOT)/ace/Argv_Type_Converter.h \
   $(ACE_ROOT)/ace/Argv_Type_Converter.inl
 
-.obj/SHMIOP_Profile.o .obj/SHMIOP_Profile.so .shobj/SHMIOP_Profile.o .shobj/SHMIOP_Profile.so: SHMIOP_Profile.cpp SHMIOP_Profile.h \
+.obj/SHMIOP_Profile.o .obj/SHMIOP_Profile.SO .shobj/SHMIOP_Profile.o .shobj/SHMIOP_Profile.SO: SHMIOP_Profile.cpp SHMIOP_Profile.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -6360,8 +4366,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -6478,13 +4483,16 @@ endif
   $(TAO_ROOT)/tao/Seq_Out_T.inl \
   $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
@@ -6497,17 +4505,15 @@ endif
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/CONV_FRAMEC.h \
   $(TAO_ROOT)/tao/CONV_FRAMEC.i \
@@ -6520,8 +4526,7 @@ endif
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
   $(ACE_ROOT)/ace/INET_Addr.h \
-  $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/Addr.i \
+  $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/INET_Addr.i \
   $(ACE_ROOT)/ace/MEM_Addr.h \
   $(ACE_ROOT)/ace/MEM_Addr.i SHMIOP_Endpoint.i \
@@ -6567,20 +4572,12 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
@@ -6625,7 +4622,7 @@ endif
   $(TAO_ROOT)/tao/iiop_endpoints.h \
   $(TAO_ROOT)/tao/iiop_endpoints.i
 
-.obj/SHMIOP_Transport.o .obj/SHMIOP_Transport.so .shobj/SHMIOP_Transport.o .shobj/SHMIOP_Transport.so: SHMIOP_Transport.cpp SHMIOP_Transport.h \
+.obj/SHMIOP_Transport.o .obj/SHMIOP_Transport.SO .shobj/SHMIOP_Transport.o .shobj/SHMIOP_Transport.SO: SHMIOP_Transport.cpp SHMIOP_Transport.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -6663,8 +4660,7 @@ endif
   $(ACE_ROOT)/ace/OS_TLI.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -6808,8 +4804,7 @@ endif
   $(ACE_ROOT)/ace/Dynamic.i \
   $(ACE_ROOT)/ace/MEM_Stream.h \
   $(ACE_ROOT)/ace/MEM_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
@@ -6853,7 +4848,6 @@ endif
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
@@ -6877,37 +4871,14 @@ endif
   $(TAO_ROOT)/tao/Seq_Out_T.inl \
   $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
@@ -6938,6 +4909,31 @@ endif
   SHMIOP_Connection_Handler.inl SHMIOP_Profile.h \
   $(TAO_ROOT)/tao/Profile.h \
   $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/CONV_FRAMEC.h \
   $(TAO_ROOT)/tao/CONV_FRAMEC.i \
   $(TAO_ROOT)/tao/Tagged_Components.i \
@@ -6996,20 +4992,12 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -7054,7 +5042,7 @@ endif
   $(TAO_ROOT)/tao/GIOP_Message_Lite.h \
   $(TAO_ROOT)/tao/GIOP_Message_Lite.i
 
-.obj/SHMIOP_Connector.o .obj/SHMIOP_Connector.so .shobj/SHMIOP_Connector.o .shobj/SHMIOP_Connector.so: SHMIOP_Connector.cpp SHMIOP_Connector.h \
+.obj/SHMIOP_Connector.o .obj/SHMIOP_Connector.SO .shobj/SHMIOP_Connector.o .shobj/SHMIOP_Connector.SO: SHMIOP_Connector.cpp SHMIOP_Connector.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -7079,8 +5067,7 @@ endif
   $(ACE_ROOT)/ace/SOCK_Connector.h \
   $(ACE_ROOT)/ace/SOCK_Stream.h \
   $(ACE_ROOT)/ace/SOCK_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/Flag_Manip.h \
@@ -7095,12 +5082,10 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/IPC_SAP.i \
-  $(ACE_ROOT)/ace/SOCK.i \
-  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/SOCK.i $(ACE_ROOT)/ace/ACE.h \
   $(ACE_ROOT)/ace/Handle_Ops.h \
   $(ACE_ROOT)/ace/Handle_Ops.i \
   $(ACE_ROOT)/ace/Lib_Find.h \
@@ -7273,8 +5258,7 @@ endif
   $(ACE_ROOT)/ace/Synch_Options.i \
   $(ACE_ROOT)/ace/Connector.cpp \
   $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
   $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
@@ -7322,7 +5306,6 @@ endif
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
@@ -7346,13 +5329,31 @@ endif
   $(TAO_ROOT)/tao/Seq_Out_T.inl \
   $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/IOP_IORC.i \
+  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
+  $(TAO_ROOT)/tao/Synch_Refcountable.h \
+  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
+  $(TAO_ROOT)/tao/Transport.inl SHMIOP_Transport.i \
+  SHMIOP_Connection_Handler.inl \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Connector_Impl.h \
+  $(TAO_ROOT)/tao/Connector_Impl.inl \
+  $(TAO_ROOT)/tao/Connector_Impl.cpp SHMIOP_Profile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
@@ -7365,32 +5366,16 @@ endif
   $(TAO_ROOT)/tao/Object_KeyC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
-  $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
-  $(TAO_ROOT)/tao/Synch_Refcountable.h \
-  $(TAO_ROOT)/tao/Synch_Refcountable.inl \
-  $(TAO_ROOT)/tao/Transport.inl SHMIOP_Transport.i \
-  SHMIOP_Connection_Handler.inl \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
-  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
-  $(TAO_ROOT)/tao/Connector_Impl.h \
-  $(TAO_ROOT)/tao/Connector_Impl.inl \
-  $(TAO_ROOT)/tao/Connector_Impl.cpp SHMIOP_Profile.h \
-  $(TAO_ROOT)/tao/Profile.h \
-  $(TAO_ROOT)/tao/Tagged_Components.h \
   $(TAO_ROOT)/tao/Tagged_Components.i \
   $(TAO_ROOT)/tao/GIOP_Message_Version.h \
   $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
@@ -7433,20 +5418,12 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
@@ -7468,9 +5445,6 @@ endif
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/operation_details.h \
@@ -7485,7 +5459,7 @@ endif
   $(TAO_ROOT)/tao/Blocked_Connect_Strategy.h \
   $(TAO_ROOT)/tao/Connect_Strategy.h
 
-.obj/SHMIOP_Acceptor.o .obj/SHMIOP_Acceptor.so .shobj/SHMIOP_Acceptor.o .shobj/SHMIOP_Acceptor.so: SHMIOP_Acceptor.cpp SHMIOP_Acceptor.h \
+.obj/SHMIOP_Acceptor.o .obj/SHMIOP_Acceptor.SO .shobj/SHMIOP_Acceptor.o .shobj/SHMIOP_Acceptor.SO: SHMIOP_Acceptor.cpp SHMIOP_Acceptor.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -7507,16 +5481,9 @@ endif
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
   $(TAO_ROOT)/tao/Transport_Acceptor.h \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_IORC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(TAO_ROOT)/tao/Transport_Acceptor.inl \
+  SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
   $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
@@ -7528,21 +5495,47 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Acceptor.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
   $(ACE_ROOT)/ace/ACE.h \
@@ -7562,17 +5555,6 @@ endif
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch.i \
-  $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i \
-  $(ACE_ROOT)/ace/Thread.h \
-  $(ACE_ROOT)/ace/Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
-  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
@@ -7580,6 +5562,7 @@ endif
   $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
@@ -7594,16 +5577,9 @@ endif
   $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h \
-  $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp \
   $(ACE_ROOT)/ace/Malloc_T.i \
   $(ACE_ROOT)/ace/Malloc_T.cpp \
   $(ACE_ROOT)/ace/Memory_Pool.h \
-  $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i \
-  $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i \
   $(ACE_ROOT)/ace/Mem_Map.h \
   $(ACE_ROOT)/ace/Mem_Map.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
@@ -7617,74 +5593,6 @@ endif
   $(ACE_ROOT)/ace/SString.i \
   $(ACE_ROOT)/ace/XML_Svc_Conf.h \
   $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/iosfwd.h \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.i \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
-  $(TAO_ROOT)/tao/Seq_Var_T.h \
-  $(TAO_ROOT)/tao/Seq_Var_T.inl \
-  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
-  $(TAO_ROOT)/tao/Seq_Out_T.h \
-  $(TAO_ROOT)/tao/Seq_Out_T.inl \
-  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
-  $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/Transport_Acceptor.inl \
-  SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/Acceptor.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Strategies_T.h \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
@@ -7729,10 +5637,14 @@ endif
   $(ACE_ROOT)/ace/Synch_Options.i \
   $(ACE_ROOT)/ace/Acceptor.cpp \
   $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
   $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
   $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
   $(ACE_ROOT)/ace/Message_Queue_T.h \
   $(ACE_ROOT)/ace/Message_Queue_T.i \
@@ -7761,8 +5673,7 @@ endif
   SHMIOP_Transport.h strategies_export.h \
   $(ACE_ROOT)/ace/MEM_Stream.h \
   $(ACE_ROOT)/ace/MEM_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
@@ -7784,6 +5695,11 @@ endif
   $(ACE_ROOT)/ace/INET_Addr.i \
   $(ACE_ROOT)/ace/MEM_Stream.i \
   $(TAO_ROOT)/tao/Transport.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
   $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
   $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
@@ -7793,6 +5709,37 @@ endif
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
@@ -7813,6 +5760,24 @@ endif
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
@@ -7838,22 +5803,21 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -7904,7 +5868,7 @@ endif
   $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/Codeset_Manager.h
 
-.obj/SHMIOP_Connection_Handler.o .obj/SHMIOP_Connection_Handler.so .shobj/SHMIOP_Connection_Handler.o .shobj/SHMIOP_Connection_Handler.so: SHMIOP_Connection_Handler.cpp \
+.obj/SHMIOP_Connection_Handler.o .obj/SHMIOP_Connection_Handler.SO .shobj/SHMIOP_Connection_Handler.o .shobj/SHMIOP_Connection_Handler.SO: SHMIOP_Connection_Handler.cpp \
   SHMIOP_Connection_Handler.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -7938,8 +5902,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Handle_Set.i \
   $(ACE_ROOT)/ace/Timer_Queue.h \
   $(ACE_ROOT)/ace/Synch.h \
@@ -8081,8 +6044,7 @@ endif
   $(ACE_ROOT)/ace/Synch_Options.i \
   $(ACE_ROOT)/ace/Acceptor.cpp \
   $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
   $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -8118,8 +6080,7 @@ endif
   SHMIOP_Transport.h strategies_export.h \
   $(ACE_ROOT)/ace/MEM_Stream.h \
   $(ACE_ROOT)/ace/MEM_IO.h \
-  $(ACE_ROOT)/ace/SOCK.h \
-  $(ACE_ROOT)/ace/Addr.h \
+  $(ACE_ROOT)/ace/SOCK.h $(ACE_ROOT)/ace/Addr.h \
   $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/IPC_SAP.h \
   $(ACE_ROOT)/ace/IPC_SAP.i \
@@ -8155,7 +6116,6 @@ endif
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
@@ -8179,37 +6139,14 @@ endif
   $(TAO_ROOT)/tao/Seq_Out_T.inl \
   $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
@@ -8218,6 +6155,7 @@ endif
   SHMIOP_Connection_Handler.inl \
   $(TAO_ROOT)/tao/Timeprobe.h \
   $(ACE_ROOT)/ace/Timeprobe.h \
+  $(TAO_ROOT)/tao/debug.h \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
@@ -8229,6 +6167,23 @@ endif
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
@@ -8254,22 +6209,21 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
@@ -8300,7 +6254,7 @@ endif
   $(TAO_ROOT)/tao/Resume_Handle.h \
   $(TAO_ROOT)/tao/Resume_Handle.inl
 
-.obj/SHMIOP_Endpoint.o .obj/SHMIOP_Endpoint.so .shobj/SHMIOP_Endpoint.o .shobj/SHMIOP_Endpoint.so: SHMIOP_Endpoint.cpp SHMIOP_Endpoint.h \
+.obj/SHMIOP_Endpoint.o .obj/SHMIOP_Endpoint.SO .shobj/SHMIOP_Endpoint.o .shobj/SHMIOP_Endpoint.SO: SHMIOP_Endpoint.cpp SHMIOP_Endpoint.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/Endpoint.h \
   $(TAO_ROOT)/tao/corbafwd.h \
@@ -8323,8 +6277,7 @@ endif
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
   $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -8335,8 +6288,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Synch.i \
   $(ACE_ROOT)/ace/Synch_T.i \
   $(ACE_ROOT)/ace/Thread.h \
@@ -8359,8 +6311,7 @@ endif
   $(ACE_ROOT)/ace/INET_Addr.h \
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
-  $(ACE_ROOT)/ace/Addr.h \
-  $(ACE_ROOT)/ace/Addr.i \
+  $(ACE_ROOT)/ace/Addr.h $(ACE_ROOT)/ace/Addr.i \
   $(ACE_ROOT)/ace/INET_Addr.i \
   $(ACE_ROOT)/ace/MEM_Addr.h \
   $(ACE_ROOT)/ace/MEM_Addr.i SHMIOP_Endpoint.i \
@@ -8490,8 +6441,7 @@ endif
   $(ACE_ROOT)/ace/Synch_Options.i \
   $(ACE_ROOT)/ace/Acceptor.cpp \
   $(ACE_ROOT)/ace/Svc_Handler.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Task.i \
   $(ACE_ROOT)/ace/Task_T.h \
   $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -8558,7 +6508,6 @@ endif
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
@@ -8580,45 +6529,22 @@ endif
   $(TAO_ROOT)/tao/Seq_Out_T.inl \
   $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
   $(TAO_ROOT)/tao/Transport.inl SHMIOP_Transport.i \
-  SHMIOP_Connection_Handler.inl
+  SHMIOP_Connection_Handler.inl $(TAO_ROOT)/tao/debug.h
 
-.obj/uiop_endpoints.o .obj/uiop_endpoints.so .shobj/uiop_endpoints.o .shobj/uiop_endpoints.so: uiop_endpoints.cpp uiop_endpoints.h \
+.obj/uiop_endpoints.o .obj/uiop_endpoints.SO .shobj/uiop_endpoints.o .shobj/uiop_endpoints.SO: uiop_endpoints.cpp uiop_endpoints.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
@@ -8657,8 +6583,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -8791,11 +6716,168 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/Any.i uiop_endpoints.i
 
-.obj/advanced_resource.o .obj/advanced_resource.so .shobj/advanced_resource.o .shobj/advanced_resource.so: advanced_resource.cpp advanced_resource.h \
+.obj/sciop_endpoints.o .obj/sciop_endpoints.SO .shobj/sciop_endpoints.o .shobj/sciop_endpoints.SO: sciop_endpoints.cpp sciop_endpoints.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i sciop_endpoints.i
+
+.obj/advanced_resource.o .obj/advanced_resource.SO .shobj/advanced_resource.o .shobj/advanced_resource.SO: advanced_resource.cpp advanced_resource.h \
   $(ACE_ROOT)/ace/pre.h strategies_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -8825,8 +6907,7 @@ endif
   $(ACE_ROOT)/ace/Global_Macros.h \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -8993,13 +7074,11 @@ endif
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -9030,20 +7109,15 @@ endif
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
   $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/IOPC.h \
@@ -9089,8 +7163,9 @@ endif
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i advanced_resource.i \
-  UIOP_Factory.h $(TAO_ROOT)/tao/Protocol_Factory.h \
-  SHMIOP_Factory.h DIOP_Factory.h LFU_Connection_Purging_Strategy.h \
+  UIOP_Factory.h SHMIOP_Factory.h \
+  $(TAO_ROOT)/tao/Protocol_Factory.h DIOP_Factory.h \
+  SCIOP_Factory.h LFU_Connection_Purging_Strategy.h \
   $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
   $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
   FIFO_Connection_Purging_Strategy.h NULL_Connection_Purging_Strategy.h \
@@ -9119,9 +7194,7 @@ endif
   $(ACE_ROOT)/ace/Select_Reactor_T.h \
   $(ACE_ROOT)/ace/Select_Reactor_Base.h \
   $(ACE_ROOT)/ace/Token.h \
-  $(ACE_ROOT)/ace/Token.i \
-  $(ACE_ROOT)/ace/Pipe.h \
-  $(ACE_ROOT)/ace/Pipe.i \
+  $(ACE_ROOT)/ace/Pipe.h $(ACE_ROOT)/ace/Pipe.i \
   $(ACE_ROOT)/ace/Select_Reactor_Base.i \
   $(ACE_ROOT)/ace/Select_Reactor_T.cpp \
   $(ACE_ROOT)/ace/Timer_Heap.h \
@@ -9136,7 +7209,7 @@ endif
   $(ACE_ROOT)/ace/TP_Reactor.h \
   $(ACE_ROOT)/ace/TP_Reactor.i
 
-.obj/LFU_Connection_Purging_Strategy.o .obj/LFU_Connection_Purging_Strategy.so .shobj/LFU_Connection_Purging_Strategy.o .shobj/LFU_Connection_Purging_Strategy.so: LFU_Connection_Purging_Strategy.cpp \
+.obj/LFU_Connection_Purging_Strategy.o .obj/LFU_Connection_Purging_Strategy.SO .shobj/LFU_Connection_Purging_Strategy.o .shobj/LFU_Connection_Purging_Strategy.SO: LFU_Connection_Purging_Strategy.cpp \
   LFU_Connection_Purging_Strategy.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -9175,8 +7248,7 @@ endif
   $(TAO_ROOT)/tao/Cache_Entries.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -9187,8 +7259,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -9281,7 +7352,6 @@ endif
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
@@ -9310,37 +7380,14 @@ endif
   $(TAO_ROOT)/tao/Seq_Out_T.inl \
   $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
@@ -9349,7 +7396,7 @@ endif
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
   $(TAO_ROOT)/tao/Transport.inl
 
-.obj/FIFO_Connection_Purging_Strategy.o .obj/FIFO_Connection_Purging_Strategy.so .shobj/FIFO_Connection_Purging_Strategy.o .shobj/FIFO_Connection_Purging_Strategy.so: FIFO_Connection_Purging_Strategy.cpp \
+.obj/FIFO_Connection_Purging_Strategy.o .obj/FIFO_Connection_Purging_Strategy.SO .shobj/FIFO_Connection_Purging_Strategy.o .shobj/FIFO_Connection_Purging_Strategy.SO: FIFO_Connection_Purging_Strategy.cpp \
   FIFO_Connection_Purging_Strategy.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -9388,8 +7435,7 @@ endif
   $(TAO_ROOT)/tao/Cache_Entries.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -9400,8 +7446,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -9494,7 +7539,6 @@ endif
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
@@ -9523,37 +7567,14 @@ endif
   $(TAO_ROOT)/tao/Seq_Out_T.inl \
   $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
@@ -9562,7 +7583,7 @@ endif
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
   $(TAO_ROOT)/tao/Transport.inl
 
-.obj/NULL_Connection_Purging_Strategy.o .obj/NULL_Connection_Purging_Strategy.so .shobj/NULL_Connection_Purging_Strategy.o .shobj/NULL_Connection_Purging_Strategy.so: NULL_Connection_Purging_Strategy.cpp \
+.obj/NULL_Connection_Purging_Strategy.o .obj/NULL_Connection_Purging_Strategy.SO .shobj/NULL_Connection_Purging_Strategy.o .shobj/NULL_Connection_Purging_Strategy.SO: NULL_Connection_Purging_Strategy.cpp \
   NULL_Connection_Purging_Strategy.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -9601,8 +7622,7 @@ endif
   $(TAO_ROOT)/tao/Cache_Entries.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -9613,8 +7633,7 @@ endif
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -9707,7 +7726,6 @@ endif
   $(TAO_ROOT)/tao/Transport_Timer.h \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.h \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
-  $(TAO_ROOT)/tao/IOPC.h \
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/Sequence.h \
@@ -9736,37 +7754,14 @@ endif
   $(TAO_ROOT)/tao/Seq_Out_T.inl \
   $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
   $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/IOP_IORC.i \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
-  $(TAO_ROOT)/tao/varbase.h \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
-  $(TAO_ROOT)/tao/Marshal.h \
-  $(TAO_ROOT)/tao/Marshal.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
   $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \
   $(TAO_ROOT)/tao/Synch_Refcountable.h \
@@ -9775,7 +7770,7 @@ endif
   $(TAO_ROOT)/tao/Synch_Refcountable.inl \
   $(TAO_ROOT)/tao/Transport.inl
 
-.obj/LF_Strategy_Null.o .obj/LF_Strategy_Null.so .shobj/LF_Strategy_Null.o .shobj/LF_Strategy_Null.so: LF_Strategy_Null.cpp LF_Strategy_Null.h \
+.obj/LF_Strategy_Null.o .obj/LF_Strategy_Null.SO .shobj/LF_Strategy_Null.o .shobj/LF_Strategy_Null.SO: LF_Strategy_Null.cpp LF_Strategy_Null.h \
   $(ACE_ROOT)/ace/pre.h strategies_export.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp
index 7e63c126ffe..0e0a6133d72 100644
--- a/TAO/tao/StringSeqC.cpp
+++ b/TAO/tao/StringSeqC.cpp
@@ -24,7 +24,6 @@
 
 
 #include "StringSeqC.h"
-#include "Any_T.h"
 #include "CDR.h"
 
 #if defined (__BORLANDC__)
@@ -35,6 +34,8 @@
 #include "StringSeqC.i"
 #endif /* !defined INLINE */
 
+#include "Any_Dual_Impl_T.h"
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:50
 
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 52ed4850ac0..88634bce6ca 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -163,10 +163,6 @@ SOURCE=.\Abstract_Servant_Base.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\AbstractBase.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Acceptor_Filter.cpp

 # End Source File

 # Begin Source File

@@ -547,6 +543,10 @@ SOURCE=.\IOR_Parser.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\IORInterceptor_Adapter.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Leader_Follower.cpp

 # End Source File

 # Begin Source File

@@ -674,11 +674,6 @@ SOURCE=.\ObjectIdListC.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\ObjectReferenceTemplateC.cpp

-# ADD CPP /GR

-# End Source File

-# Begin Source File

-

 SOURCE=.\OctetSeqC.cpp

 # ADD CPP /GR

 # End Source File

@@ -720,6 +715,10 @@ SOURCE=.\Parser_Registry.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\PI_ForwardC.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\PICurrent.cpp

 # End Source File

 # Begin Source File

@@ -972,15 +971,7 @@ SOURCE=.\TypeCodeFactory_Adapter.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\ValueBase.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory_Map.cpp

+SOURCE=.\Valuetype_Adapter.cpp

 # End Source File

 # Begin Source File

 

@@ -1013,10 +1004,6 @@ SOURCE=.\Abstract_Servant_Base.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\AbstractBase.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Acceptor_Filter.h

 # End Source File

 # Begin Source File

@@ -1033,15 +1020,31 @@ SOURCE=.\any.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Any_T.h

+SOURCE=.\Any_Array_Impl_T.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\arg_shifter.h

+SOURCE=.\Any_Basic_Impl_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Any_Dual_Impl_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Any_Impl_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Any_Special_Basic_Impl_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Any_Special_Impl_T.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Array_VarOut_T.h

+SOURCE=.\arg_shifter.h

 # End Source File

 # Begin Source File

 

@@ -1417,6 +1420,10 @@ SOURCE=.\IOR_Parser.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\IORInterceptor_Adapter.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Leader_Follower.h

 # End Source File

 # Begin Source File

@@ -1549,10 +1556,6 @@ SOURCE=.\ObjectIdListC.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\ObjectReferenceTemplateC.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Objref_VarOut_T.h

 # End Source File

 # Begin Source File

@@ -1601,6 +1604,10 @@ SOURCE=.\Parser_Registry.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\PI_ForwardC.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\PICurrent.h

 # End Source File

 # Begin Source File

@@ -1669,10 +1676,6 @@ SOURCE=.\Protocols_Hooks.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Pseudo_Value_VarOut_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Pseudo_VarOut_T.h

 # End Source File

 # Begin Source File

@@ -1717,7 +1720,11 @@ SOURCE=.\Resume_Handle.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Seq_VarOut_T.h

+SOURCE=.\Seq_Out_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Seq_Var_T.h

 # End Source File

 # Begin Source File

 

@@ -1869,19 +1876,7 @@ SOURCE=.\TypeCodeFactory_Adapter.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Value_VarOut_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueBase.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory_Map.h

+SOURCE=.\Valuetype_Adapter.h

 # End Source File

 # Begin Source File

 

@@ -1917,10 +1912,6 @@ SOURCE=.\WrongTransactionC.h
 # PROP Default_Filter "i;inl"

 # Begin Source File

 

-SOURCE=.\AbstractBase.inl

-# End Source File

-# Begin Source File

-

 SOURCE=.\Acceptor_Filter.i

 # End Source File

 # Begin Source File

@@ -1937,7 +1928,27 @@ SOURCE=.\any.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Any_T.inl

+SOURCE=.\Any_Array_Impl_T.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\Any_Basic_Impl_T.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\Any_Dual_Impl_T.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\Any_Impl_T.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\Any_Special_Basic_Impl_T.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\Any_Special_Impl_T.inl

 # End Source File

 # Begin Source File

 

@@ -2285,10 +2296,6 @@ SOURCE=.\ObjectIdListC.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\ObjectReferenceTemplateC.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Objref_VarOut_T.inl

 # End Source File

 # Begin Source File

@@ -2325,6 +2332,10 @@ SOURCE=.\Parser_Registry.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\PI_ForwardC.i

+# End Source File

+# Begin Source File

+

 SOURCE=.\PICurrent.inl

 # End Source File

 # Begin Source File

@@ -2389,7 +2400,11 @@ SOURCE=.\Resume_Handle.inl
 # End Source File

 # Begin Source File

 

-SOURCE=.\Seq_VarOut_T.inl

+SOURCE=.\Seq_Out_T.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\Seq_Var_T.inl

 # End Source File

 # Begin Source File

 

@@ -2493,59 +2508,63 @@ SOURCE=.\typecode.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Value_VarOut_T.inl

+SOURCE=.\VarOut_T.inl

 # End Source File

+# End Group

+# Begin Group "Resource files"

+

+# PROP Default_Filter "rc"

 # Begin Source File

 

-SOURCE=.\ValueBase.i

+SOURCE=.\tao.rc

 # End Source File

+# End Group

+# Begin Group "Template Files"

+

+# PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=.\ValueFactory.i

+SOURCE=.\Any_Array_Impl_T.cpp

+# PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

-SOURCE=.\ValueFactory_Map.i

+SOURCE=.\Any_Basic_Impl_T.cpp

+# PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

-SOURCE=.\VarOut_T.inl

+SOURCE=.\Any_Dual_Impl_T.cpp

+# PROP Exclude_From_Build 1

 # End Source File

-# End Group

-# Begin Group "Resource files"

-

-# PROP Default_Filter "rc"

 # Begin Source File

 

-SOURCE=.\tao.rc

+SOURCE=.\Any_Impl_T.cpp

+# PROP Exclude_From_Build 1

 # End Source File

-# End Group

-# Begin Group "Template Files"

-

-# PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=.\Any_T.cpp

+SOURCE=.\Any_Special_Basic_Impl_T.cpp

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

-SOURCE=.\Array_VarOut_T.cpp

+SOURCE=.\Any_Special_Impl_T.cpp

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

-SOURCE=.\Codeset_Translator_Factory_T.cpp

+SOURCE=.\Array_VarOut_T.cpp

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

-SOURCE=.\Objref_VarOut_T.cpp

+SOURCE=.\Codeset_Translator_Factory_T.cpp

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

-SOURCE=.\Pseudo_Value_VarOut_T.cpp

+SOURCE=.\Objref_VarOut_T.cpp

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

@@ -2555,17 +2574,17 @@ SOURCE=.\Pseudo_VarOut_T.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Seq_VarOut_T.cpp

+SOURCE=.\Seq_Out_T.cpp

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

-SOURCE=.\Sequence_T.cpp

+SOURCE=.\Seq_Var_T.cpp

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

 

-SOURCE=.\Value_VarOut_T.cpp

+SOURCE=.\Sequence_T.cpp

 # PROP Exclude_From_Build 1

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/TAO.dsw b/TAO/tao/TAO.dsw
index 5c655cfead9..143a0afb5e8 100644
--- a/TAO/tao/TAO.dsw
+++ b/TAO/tao/TAO.dsw
@@ -48,7 +48,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Domain_Static"=.\Domain\TAO_Domain_Static.dsp - Package Owner=<4>

+Project: "Domain_static"=.\Domain\TAO_Domain_Static.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -426,6 +426,18 @@ Package=<4>
 

 ###############################################################################

 

+Project: "Valuetype"=.\Valuetype\TAO_Valuetype.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

 Global:

 

 Package=<5>

diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp
index bdbab4c8055..a151795ce5a 100644
--- a/TAO/tao/TAOC.cpp
+++ b/TAO/tao/TAOC.cpp
@@ -29,6 +29,9 @@
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Dual_Impl_T.h"
+
 #if !defined (__ACE_INLINE__)
 #include "TAOC.i"
 #endif /* !defined INLINE */
diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h
index e30bb4552d2..1db24437731 100644
--- a/TAO/tao/TimeBaseC.h
+++ b/TAO/tao/TimeBaseC.h
@@ -26,7 +26,7 @@
 #define _TAO_IDL_ORIG_TIMEBASEC_H_
 
 #include "ace/pre.h"
-#include "tao/Any_T.h"
+#include "tao/Any_Dual_Impl_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/TypeCodeFactory/Makefile b/TAO/tao/TypeCodeFactory/Makefile
index f8e0ccfbdad..e2e5b3a8c48 100644
--- a/TAO/tao/TypeCodeFactory/Makefile
+++ b/TAO/tao/TypeCodeFactory/Makefile
@@ -70,16 +70,13 @@ realclean: clean
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/TypeCodeFactoryC.o .obj/TypeCodeFactoryC.so .shobj/TypeCodeFactoryC.o .shobj/TypeCodeFactoryC.so: TypeCodeFactoryC.cpp TypeCodeFactoryC.h \
+.obj/TypeCodeFactoryC.o .obj/TypeCodeFactoryC.SO .shobj/TypeCodeFactoryC.o .shobj/TypeCodeFactoryC.SO: TypeCodeFactoryC.cpp TypeCodeFactoryC.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.h \
-  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.h \
-  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.h \
-  $(TAO_ROOT)/tao/IFR_Client/ifr_client_export.h \
+  $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
   $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Basic_Types.h \
@@ -96,17 +93,10 @@ realclean: clean
   $(ACE_ROOT)/ace/OS_Errno.inl \
   $(ACE_ROOT)/ace/OS_Memory.inl \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/Log_Msg.h \
-  $(ACE_ROOT)/ace/Log_Priority.h \
-  $(ACE_ROOT)/ace/OS.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
   $(ACE_ROOT)/ace/OS_Dirent.h \
   $(ACE_ROOT)/ace/OS_Dirent.inl \
   $(ACE_ROOT)/ace/OS_String.h \
@@ -117,24 +107,7 @@ realclean: clean
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
-  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Flag_Manip.h \
   $(ACE_ROOT)/ace/Flag_Manip.i \
   $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -150,6 +123,10 @@ realclean: clean
   $(ACE_ROOT)/ace/Functor_T.h \
   $(ACE_ROOT)/ace/Functor_T.i \
   $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
   $(ACE_ROOT)/ace/Synch.h \
   $(ACE_ROOT)/ace/Synch.i \
@@ -169,6 +146,7 @@ realclean: clean
   $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
   $(ACE_ROOT)/ace/Unbounded_Set.h \
   $(ACE_ROOT)/ace/Unbounded_Set.inl \
   $(ACE_ROOT)/ace/Unbounded_Set.cpp \
@@ -220,17 +198,35 @@ realclean: clean
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
   $(ACE_ROOT)/ace/iosfwd.h \
   $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
@@ -248,32 +244,38 @@ realclean: clean
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.i \
-  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.i \
-  $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.i \
-  typecodefactory_export.h TypeCodeFactoryC.inl \
-  $(TAO_ROOT)/tao/Stub.h \
-  $(TAO_ROOT)/tao/MProfile.h \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
   $(TAO_ROOT)/tao/ServicesC.i \
@@ -282,13 +284,53 @@ realclean: clean
   $(TAO_ROOT)/tao/ObjectIdListC.h \
   $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Array_VarOut_T.h \
+  $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/IFR_Client/ifr_client_export.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.i \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.i \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.i \
+  typecodefactory_export.h TypeCodeFactoryC.inl \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/MProfile.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
@@ -313,28 +355,6 @@ realclean: clean
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -379,9 +399,6 @@ realclean: clean
   $(TAO_ROOT)/tao/Invocation.h \
   $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
   $(TAO_ROOT)/tao/Reply_Dispatcher.h \
-  $(TAO_ROOT)/tao/Condition.h \
-  $(TAO_ROOT)/tao/Condition.inl \
-  $(TAO_ROOT)/tao/Condition.cpp \
   $(TAO_ROOT)/tao/Reply_Dispatcher.i \
   $(TAO_ROOT)/tao/LF_Invocation_Event.h \
   $(TAO_ROOT)/tao/LF_Event.h \
@@ -422,7 +439,7 @@ realclean: clean
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
-.obj/TypeCodeFactory_i.o .obj/TypeCodeFactory_i.so .shobj/TypeCodeFactory_i.o .shobj/TypeCodeFactory_i.so: TypeCodeFactory_i.cpp TypeCodeFactory_i.h \
+.obj/TypeCodeFactory_i.o .obj/TypeCodeFactory_i.SO .shobj/TypeCodeFactory_i.o .shobj/TypeCodeFactory_i.SO: TypeCodeFactory_i.cpp TypeCodeFactory_i.h \
   $(ACE_ROOT)/ace/pre.h TypeCodeFactory_Loader.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -463,8 +480,7 @@ realclean: clean
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -553,25 +569,7 @@ realclean: clean
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h TypeCodeFactoryC.h \
   $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.h \
-  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.h \
-  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.h \
-  $(TAO_ROOT)/tao/IFR_Client/ifr_client_export.h \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
@@ -585,11 +583,27 @@ realclean: clean
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
@@ -607,27 +621,86 @@ realclean: clean
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Array_VarOut_T.h \
+  $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/IFR_Client/ifr_client_export.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.h \
   $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.i \
   $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.i \
   $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.i \
-  TypeCodeFactoryC.inl $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
+  TypeCodeFactoryC.inl $(ACE_ROOT)/ace/Containers_T.h \
   $(ACE_ROOT)/ace/Containers.h \
   $(ACE_ROOT)/ace/Containers.i \
   $(ACE_ROOT)/ace/Array_Base.h \
@@ -636,7 +709,7 @@ realclean: clean
   $(ACE_ROOT)/ace/Containers_T.i \
   $(ACE_ROOT)/ace/Containers_T.cpp
 
-.obj/TypeCodeFactory_Adapter_Impl.o .obj/TypeCodeFactory_Adapter_Impl.so .shobj/TypeCodeFactory_Adapter_Impl.o .shobj/TypeCodeFactory_Adapter_Impl.so: TypeCodeFactory_Adapter_Impl.cpp \
+.obj/TypeCodeFactory_Adapter_Impl.o .obj/TypeCodeFactory_Adapter_Impl.SO .shobj/TypeCodeFactory_Adapter_Impl.o .shobj/TypeCodeFactory_Adapter_Impl.SO: TypeCodeFactory_Adapter_Impl.cpp \
   TypeCodeFactory_Adapter_Impl.h $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/TypeCodeFactory_Adapter.h \
   $(TAO_ROOT)/tao/Exception.h \
@@ -677,15 +750,13 @@ realclean: clean
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
   $(ACE_ROOT)/ace/Event_Handler.i \
   $(ACE_ROOT)/ace/DLL.h \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  typecodefactory_export.h \
+  $(ACE_ROOT)/ace/Service_Object.i typecodefactory_export.h \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Node.h \
@@ -770,25 +841,7 @@ realclean: clean
   $(TAO_ROOT)/tao/Object_Loader.h \
   $(TAO_ROOT)/tao/Object_Loader.i TypeCodeFactoryC.h \
   $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.h \
-  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.h \
-  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.h \
-  $(TAO_ROOT)/tao/IFR_Client/ifr_client_export.h \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
@@ -802,11 +855,27 @@ realclean: clean
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
@@ -824,27 +893,38 @@ realclean: clean
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
-  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.i \
-  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.i \
-  $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.i \
-  TypeCodeFactoryC.inl $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
-  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
   $(TAO_ROOT)/tao/ServicesC.h \
   $(TAO_ROOT)/tao/ServicesC.i \
@@ -856,8 +936,43 @@ realclean: clean
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Array_VarOut_T.h \
+  $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/IFR_Client/ifr_client_export.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.i \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.i \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.i \
+  TypeCodeFactoryC.inl $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
   $(TAO_ROOT)/tao/Policy_Set.h \
   $(TAO_ROOT)/tao/Policy_Set.i \
@@ -880,28 +995,6 @@ realclean: clean
   $(TAO_ROOT)/tao/Adapter.h \
   $(TAO_ROOT)/tao/Adapter.i \
   $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(TAO_ROOT)/tao/PortableInterceptorC.h \
-  $(TAO_ROOT)/tao/DynamicC.h \
-  $(TAO_ROOT)/tao/StringSeqC.h \
-  $(TAO_ROOT)/tao/StringSeqC.i \
-  $(TAO_ROOT)/tao/DynamicC.i \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
-  $(TAO_ROOT)/tao/ValueBase.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ValueBase.i \
-  $(TAO_ROOT)/tao/Value_VarOut_T.h \
-  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
-  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
-  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
-  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/IOPC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.h \
-  $(TAO_ROOT)/tao/IOP_CodecC.i \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(ACE_ROOT)/ace/Map_Manager.h \
   $(ACE_ROOT)/ace/Map_Manager.i \
   $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -941,7 +1034,7 @@ realclean: clean
   $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i
 
-.obj/TypeCodeFactory_Loader.o .obj/TypeCodeFactory_Loader.so .shobj/TypeCodeFactory_Loader.o .shobj/TypeCodeFactory_Loader.so: TypeCodeFactory_Loader.cpp \
+.obj/TypeCodeFactory_Loader.o .obj/TypeCodeFactory_Loader.SO .shobj/TypeCodeFactory_Loader.o .shobj/TypeCodeFactory_Loader.SO: TypeCodeFactory_Loader.cpp \
   TypeCodeFactory_Loader.h $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -982,8 +1075,7 @@ realclean: clean
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
@@ -1072,25 +1164,7 @@ realclean: clean
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h TypeCodeFactoryC.h \
   $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.h \
-  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.h \
-  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.h \
-  $(TAO_ROOT)/tao/IFR_Client/ifr_client_export.h \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Policy_ForwardC.h \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/Typecode.h \
   $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
   $(ACE_ROOT)/ace/Functor.h \
@@ -1104,11 +1178,27 @@ realclean: clean
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
   $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
   $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/CDR.h \
-  $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Objref_VarOut_T.h \
   $(TAO_ROOT)/tao/varbase.h \
@@ -1126,26 +1216,85 @@ realclean: clean
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
-  $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/VarOut_T.h \
-  $(TAO_ROOT)/tao/VarOut_T.inl \
-  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Special_Basic_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Array_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Array_VarOut_T.h \
+  $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/IFR_Client/ifr_client_export.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.h \
+  $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.h \
   $(TAO_ROOT)/tao/IFR_Client/IFR_BaseC.i \
   $(TAO_ROOT)/tao/IFR_Client/IFR_BasicC.i \
   $(TAO_ROOT)/tao/IFR_Client/IFR_ExtendedC.i \
-  TypeCodeFactoryC.inl TypeCodeFactory_i.h \
-  $(TAO_ROOT)/tao/LocalObject.h \
-  $(TAO_ROOT)/tao/LocalObject.i
+  TypeCodeFactoryC.inl TypeCodeFactory_i.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/Utils/Makefile b/TAO/tao/Utils/Makefile
index e48cd7566c5..7340cfa831c 100644
--- a/TAO/tao/Utils/Makefile
+++ b/TAO/tao/Utils/Makefile
@@ -56,7 +56,7 @@ CPPFLAGS += -I$(TAO_ROOT)
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/ORB_Destroyer.o .obj/ORB_Destroyer.so .shobj/ORB_Destroyer.o .shobj/ORB_Destroyer.so: ORB_Destroyer.cpp ORB_Destroyer.h \
+.obj/ORB_Destroyer.o .obj/ORB_Destroyer.SO .shobj/ORB_Destroyer.o .shobj/ORB_Destroyer.SO: ORB_Destroyer.cpp ORB_Destroyer.h \
   $(ACE_ROOT)/ace/pre.h Auto_Functor.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -107,8 +107,7 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -243,13 +242,11 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -259,7 +256,7 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i
 
-.obj/Implicit_Deactivator.o .obj/Implicit_Deactivator.so .shobj/Implicit_Deactivator.o .shobj/Implicit_Deactivator.so: Implicit_Deactivator.cpp Implicit_Deactivator.h \
+.obj/Implicit_Deactivator.o .obj/Implicit_Deactivator.SO .shobj/Implicit_Deactivator.o .shobj/Implicit_Deactivator.SO: Implicit_Deactivator.cpp Implicit_Deactivator.h \
   $(ACE_ROOT)/ace/pre.h Auto_Functor.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ace_wchar.h \
@@ -310,8 +307,7 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -436,15 +432,16 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
@@ -453,6 +450,12 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Basic_Impl_T.cpp \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
@@ -463,7 +466,7 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/Atomic_Op.i \
   $(TAO_ROOT)/tao/PortableServer/Servant_Base.i
 
-.obj/PolicyList_Destroyer.o .obj/PolicyList_Destroyer.so .shobj/PolicyList_Destroyer.o .shobj/PolicyList_Destroyer.so: PolicyList_Destroyer.cpp PolicyList_Destroyer.h \
+.obj/PolicyList_Destroyer.o .obj/PolicyList_Destroyer.SO .shobj/PolicyList_Destroyer.o .shobj/PolicyList_Destroyer.SO: PolicyList_Destroyer.cpp PolicyList_Destroyer.h \
   $(ACE_ROOT)/ace/pre.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
@@ -506,8 +509,7 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Min_Max.h \
   $(ACE_ROOT)/ace/streams.h \
-  $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -637,15 +639,16 @@ CPPFLAGS += -I$(TAO_ROOT)
   $(TAO_ROOT)/tao/IOP_IORC.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
   $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
   $(TAO_ROOT)/tao/IOP_IORC.i \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/Any_T.inl \
-  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
   $(TAO_ROOT)/tao/Marshal.h \
   $(TAO_ROOT)/tao/Marshal.i \
   $(TAO_ROOT)/tao/debug.h \
diff --git a/TAO/tao/ValueBase.i b/TAO/tao/ValueBase.i
deleted file mode 100644
index 9d58f3e7b7e..00000000000
--- a/TAO/tao/ValueBase.i
+++ /dev/null
@@ -1,158 +0,0 @@
-// This may not look like C++, but it's really -*- C++ -*-
-//
-// $Id$
-
-// static operations in namespace CORBA ========================
-
-ACE_INLINE 
-void
-CORBA::add_ref (CORBA::ValueBase *val)
-{
-  if (val)
-    {
-      val->_add_ref ();
-    }
-}
-
-ACE_INLINE 
-void
-CORBA::remove_ref (CORBA::ValueBase *val)
-{
-  if (val)
-    {
-      val->_remove_ref ();
-    }
-}
-
-// ===========================================================
-
-ACE_INLINE
-CORBA::ValueBase::ValueBase (void)
-{
-}
-
-// ===========================================================
-
-ACE_INLINE
-CORBA::DefaultValueRefCountBase::DefaultValueRefCountBase (void)
-  : _tao_reference_count_ (1)
-{
-}
-
-
-ACE_INLINE 
-void
-CORBA::DefaultValueRefCountBase::_tao_add_ref (void)
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_);
-  ++_tao_reference_count_;
-}
-
-ACE_INLINE 
-void
-CORBA::DefaultValueRefCountBase::_tao_remove_ref (void)
-{
-  {
-    ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_);
-    -- this->_tao_reference_count_;
-    if (this->_tao_reference_count_ != 0)
-      return;
-  }
-  // The guard has been already given up, but this is no problem
-  // cause we have held the last reference, and this one we don't give
-  // away anymore, we do:
-  delete this;
-}
-
-ACE_INLINE 
-CORBA::ULong
-CORBA::DefaultValueRefCountBase::_tao_refcount_value (void)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                    guard,
-                    this->_tao_reference_count_lock_,
-                    0);
-  return _tao_reference_count_;
-}
-
-// ===========================================================
-
-// Detection of flags in the CDR Stream
-
-ACE_INLINE 
-CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_null_ref (CORBA::ULong tag)
-{
-  return (tag == 0);
-}
-
-ACE_INLINE
-CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_value_tag (CORBA::ULong tag)
-{
-  return ((tag & Value_tag_sigbits) == 0x7FFFFF00L);
-}
-
-ACE_INLINE 
-CORBA::Boolean
-TAO_OBV_GIOP_Flags:: has_codebase_url(CORBA::ULong tag)
-{
-  return (CORBA::Boolean) (tag & Codebase_url);
-}
-
-ACE_INLINE 
-CORBA::Boolean
-TAO_OBV_GIOP_Flags::has_no_type_info (CORBA::ULong tag)
-{
-  return ((tag & Type_info_sigbits) == Type_info_none);
-}
-
-ACE_INLINE 
-CORBA::Boolean
-TAO_OBV_GIOP_Flags::has_single_type_info (CORBA::ULong tag)
-{
-  return ((tag & Type_info_sigbits) == Type_info_single);
-}
-
-ACE_INLINE 
-CORBA::Boolean
-TAO_OBV_GIOP_Flags::has_list_type_info (CORBA::ULong tag)
-{
-  return ((tag & Type_info_sigbits) == Type_info_list);
-}
-
-ACE_INLINE 
-CORBA::Boolean
-TAO_OBV_GIOP_Flags:: is_chunked (CORBA::ULong tag)
-{
-  return (CORBA::Boolean) (tag & 8);
-}
-
-ACE_INLINE 
-CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_indirection_tag (CORBA::ULong tag)
-{
-  return (tag == 0xFFFFFFFFL);
-}
-
-ACE_INLINE 
-CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_indirection (CORBA::ULong value)
-{
-  return (0x80000000L < value && value <= (0xFFFFFFFFL - 4));
-}
-
-ACE_INLINE 
-CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_block_size (CORBA::ULong value)
-{
-  return ( 0 < value && value < 0x7fffff00L);
-}
-
-ACE_INLINE 
-CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_end_tag (CORBA::ULong tag)
-{
-  return (0x80000000L < tag  && tag <= 0xFFFFFFFFL);
-}
-
diff --git a/TAO/tao/ValueFactory.cpp b/TAO/tao/ValueFactory.cpp
deleted file mode 100644
index f0a09e7ee00..00000000000
--- a/TAO/tao/ValueFactory.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "tao/ValueFactory.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/ValueFactory.i"
-#endif /* ! __ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           ValueFactory,
-           "$Id$")
-
-
-CORBA::ValueFactoryBase::~ValueFactoryBase (void)
-{
-}
-
-/*static*/ CORBA::ValueFactoryBase *
-CORBA::ValueFactoryBase::_nil (void)
-{
-  return 0;
-}
-
-// No-op. This should never be called, but it can't be pure virtual.
-CORBA::AbstractBase *
-CORBA::ValueFactoryBase::create_for_unmarshal_abstract (void)
-{
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  template class TAO_Pseudo_Value_Var_T<CORBA::ValueFactoryBase>;
-  template class TAO_Pseudo_Value_Out_T<CORBA::ValueFactoryBase, CORBA::ValueFactoryBase_var>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate TAO_Pseudo_Value_Var_T<CORBA::ValueFactoryBase>
-# pragma instantiate TAO_Pseudo_Value_Out_T<CORBA::ValueFactoryBase, CORBA::ValueFactoryBase_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/ValueFactory.i b/TAO/tao/ValueFactory.i
deleted file mode 100644
index e1f2572fb2c..00000000000
--- a/TAO/tao/ValueFactory.i
+++ /dev/null
@@ -1,62 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-void
-CORBA::add_ref (CORBA::ValueFactoryBase * p)
-{
-  if (p != 0)
-    {
-      p->_add_ref ();
-    }
-}
-
-ACE_INLINE
-void
-CORBA::remove_ref (CORBA::ValueFactoryBase * p)
-{
-  if (p != 0)
-    {
-      p->_remove_ref ();
-    }
-}
-
-// ================================================================
-
-ACE_INLINE
-CORBA::ValueFactoryBase::ValueFactoryBase (void)
-  : _tao_reference_count_ (1)
-{
-}
-
-ACE_INLINE 
-void
-CORBA::ValueFactoryBase::_add_ref (void)
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX, 
-             guard, 
-             this->_tao_reference_count_lock_);
-  ++_tao_reference_count_;
-}
-
-ACE_INLINE 
-void
-CORBA::ValueFactoryBase::_remove_ref (void)
-{
-  {
-    ACE_GUARD (TAO_SYNCH_MUTEX, 
-               guard, 
-               this->_tao_reference_count_lock_);
-
-    -- this->_tao_reference_count_;
-
-    if (this->_tao_reference_count_ != 0)
-      {
-        return;
-      }
-  }
-
-  delete this;
-}
-
diff --git a/TAO/tao/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp
index 10edad454c2..352ba691a2d 100644
--- a/TAO/tao/AbstractBase.cpp
+++ b/TAO/tao/Valuetype/AbstractBase.cpp
@@ -1,22 +1,41 @@
 // "$Id$"
 
-#include "tao/AbstractBase.h"
-
+#include "AbstractBase.h"
+#include "ValueBase.h"
+#include "ValueFactory.h"
 #include "tao/Stub.h"
 #include "tao/Profile.h"
-#include "tao/ValueFactory.h"
 #include "tao/debug.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/AbstractBase.inl"
+# include "AbstractBase.inl"
 #endif /* ! __ACE_INLINE__ */
 
 
-ACE_RCSID (tao,
+ACE_RCSID (Valuetype,
            AbstractBase,
            "$Id$")
 
+// ************************************************************
+// These are in CORBA namespace
+
+void
+CORBA::release (CORBA::AbstractBase_ptr obj)
+{
+  if (obj)
+    {
+      obj->_remove_ref ();
+    }
+}
 
+CORBA::Boolean
+CORBA::is_nil (CORBA::AbstractBase_ptr obj)
+{
+  return (obj == 0);
+}
+
+// ************************************************************
+ 
 int CORBA::AbstractBase::_tao_class_id = 0;
 
 CORBA::AbstractBase::AbstractBase (void)
@@ -64,12 +83,15 @@ CORBA::AbstractBase::~AbstractBase (void)
     }
 }
 
-CORBA::Boolean
-CORBA::AbstractBase::_is_a (const char *type_id
-                            ACE_ENV_ARG_DECL_NOT_USED)
+CORBA::AbstractBase_ptr
+CORBA::AbstractBase::_duplicate (CORBA::AbstractBase_ptr obj)
 {
-  return ! ACE_OS::strcmp (type_id,
-                           "IDL:omg.org/CORBA/AbstractBase:1.0");
+  if (obj)
+    {
+      obj->_add_ref ();
+    }
+
+  return obj;
 }
 
 void *
@@ -350,14 +372,3 @@ CORBA::AbstractBase::_tao_to_value (void)
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  template class TAO_Pseudo_Var_T<CORBA::AbstractBase>;
-  template class TAO_Pseudo_Out_T<CORBA::AbstractBase, CORBA::AbstractBase_var>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate TAO_Pseudo_Var_T<CORBA::AbstractBase>
-# pragma instantiate TAO_Pseudo_Out_T<CORBA::AbstractBase, CORBA::AbstractBase_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h
index 04a87da98e7..47333e9ca9f 100644
--- a/TAO/tao/AbstractBase.h
+++ b/TAO/tao/Valuetype/AbstractBase.h
@@ -15,6 +15,7 @@
 #define TAO_ABSTRACTBASE_H
 
 #include "ace/pre.h"
+#include "valuetype_export.h"
 #include "tao/corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -23,13 +24,21 @@
 
 #include "tao/Pseudo_VarOut_T.h"
 #include "ace/CORBA_macros.h"
+#include "ace/OS.h"
 
 class TAO_Stub;
 class TAO_Abstract_ServantBase;
 
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Valuetype_Export
+
 namespace CORBA
 {
-  class AbstractBase;
+  extern TAO_Valuetype_Export Boolean is_nil (AbstractBase_ptr);
+  extern TAO_Valuetype_Export void release (AbstractBase_ptr);
+
   typedef TAO_Pseudo_Var_T<AbstractBase> AbstractBase_var;
   typedef TAO_Pseudo_Out_T<AbstractBase, AbstractBase_var> AbstractBase_out;
 
@@ -41,7 +50,7 @@ namespace CORBA
    * Allows the determination of whether an object has been passed by
    * reference or by value to be deferred until runtime.
    */
-  class TAO_Export AbstractBase
+  class TAO_Valuetype_Export AbstractBase
   {
   public:
 
@@ -50,9 +59,9 @@ namespace CORBA
      * This constructor is only meant to be called by the
      * corresponding CDR stream extraction operator.
      */
-    AbstractBase (TAO_Stub * p,
+    AbstractBase (TAO_Stub *p,
                   CORBA::Boolean collocated,
-                  TAO_Abstract_ServantBase * servant);
+                  TAO_Abstract_ServantBase *servant);
 
     typedef CORBA::AbstractBase_ptr _ptr_type;
     typedef CORBA::AbstractBase_var _var_type;
@@ -62,8 +71,8 @@ namespace CORBA
     static CORBA::AbstractBase_ptr _narrow (CORBA::AbstractBase_ptr obj
                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
     static CORBA::AbstractBase_ptr _unchecked_narrow (
-        CORBA::AbstractBase_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      CORBA::AbstractBase_ptr obj
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static CORBA::AbstractBase_ptr _duplicate (CORBA::AbstractBase_ptr obj);
@@ -75,22 +84,22 @@ namespace CORBA
     CORBA::Object_ptr _to_object (void);
     CORBA::ValueBase *_to_value (void);
 
-    virtual CORBA::Boolean _is_a (const char * type_id
+    virtual CORBA::Boolean _is_a (const char *type_id
                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-    virtual void * _tao_QueryInterface (ptrdiff_t type);
-    virtual const char * _interface_repository_id (void) const;
-    virtual const char * _tao_obv_repository_id (void) const;
-    virtual void * _tao_obv_narrow (ptrdiff_t type_id);
-    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR & strm);
-    virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR & strm);
+    virtual void *_tao_QueryInterface (ptrdiff_t type);
+    virtual const char* _interface_repository_id (void) const;
+    virtual const char* _tao_obv_repository_id (void) const;
+    virtual void *_tao_obv_narrow (ptrdiff_t type_id);
+    virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &strm);
+    virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &strm);
 
     virtual void _add_ref (void);
     virtual void _remove_ref (void);
 
     CORBA::Boolean _is_objref (void) const;
-    TAO_Stub * _stubobj (void) const;
+    TAO_Stub *_stubobj (void) const;
     CORBA::Boolean _is_collocated (void) const;
-    TAO_Abstract_ServantBase * _servant (void) const;
+    TAO_Abstract_ServantBase *_servant (void) const;
     CORBA::Boolean _is_local (void) const;
 
   protected:
@@ -108,26 +117,25 @@ namespace CORBA
 
     AbstractBase & operator= (const AbstractBase &);
 
-    virtual CORBA::ValueBase * _tao_to_value (void);
+    virtual CORBA::ValueBase *_tao_to_value (void);
 
   private:
-
-    TAO_Stub * concrete_stubobj_;
+    TAO_Stub *concrete_stubobj_;
     CORBA::Boolean is_collocated_;
-    TAO_Abstract_ServantBase * servant_;
+    TAO_Abstract_ServantBase *servant_;
     CORBA::Boolean is_local_;
   };
 }
 
-TAO_Export CORBA::Boolean
+TAO_Valuetype_Export CORBA::Boolean
 operator<< (TAO_OutputCDR &, const CORBA::AbstractBase_ptr);
 
-TAO_Export CORBA::Boolean
+TAO_Valuetype_Export CORBA::Boolean
 operator>> (TAO_InputCDR &, CORBA::AbstractBase_ptr &);
 
 
 #if defined (__ACE_INLINE__)
-# include "tao/AbstractBase.inl"
+# include "AbstractBase.inl"
 #endif /* __ACE_INLINE__) */
 
 #include "ace/post.h"
diff --git a/TAO/tao/AbstractBase.inl b/TAO/tao/Valuetype/AbstractBase.inl
index e71e029601c..d9e99bc61db 100644
--- a/TAO/tao/AbstractBase.inl
+++ b/TAO/tao/Valuetype/AbstractBase.inl
@@ -2,27 +2,15 @@
 //
 // $Id$
 
-ACE_INLINE
+ACE_INLINE 
 CORBA::AbstractBase_ptr
 CORBA::AbstractBase::_nil (void)
 {
-  return 0;
-}
-
-ACE_INLINE
-CORBA::AbstractBase_ptr
-CORBA::AbstractBase::_duplicate (CORBA::AbstractBase_ptr obj)
-{
-  if (obj)
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
+  return (CORBA::AbstractBase_ptr)0;
 }
 
 /// Just call _duplicate and let it decide what to do.
-ACE_INLINE
+ACE_INLINE 
 CORBA::AbstractBase_ptr
 CORBA::AbstractBase::_narrow (CORBA::AbstractBase_ptr obj
                               ACE_ENV_ARG_DECL_NOT_USED)
@@ -31,7 +19,7 @@ CORBA::AbstractBase::_narrow (CORBA::AbstractBase_ptr obj
 }
 
 /// Same for this one.
-ACE_INLINE
+ACE_INLINE 
 CORBA::AbstractBase_ptr
 CORBA::AbstractBase::_unchecked_narrow (CORBA::AbstractBase_ptr obj
                                         ACE_ENV_ARG_DECL_NOT_USED)
@@ -40,6 +28,15 @@ CORBA::AbstractBase::_unchecked_narrow (CORBA::AbstractBase_ptr obj
 }
 
 ACE_INLINE
+CORBA::Boolean
+CORBA::AbstractBase::_is_a (const char *type_id
+                            ACE_ENV_ARG_DECL_NOT_USED)
+{
+  return ! ACE_OS::strcmp (type_id,
+                           "IDL:omg.org/CORBA/AbstractBase:1.0");
+}
+
+ACE_INLINE
 const char *
 CORBA::AbstractBase::_interface_repository_id (void) const
 {
@@ -95,22 +92,3 @@ CORBA::AbstractBase::_is_local (void) const
   return this->is_local_;
 }
 
-// ************************************************************
-// These are in CORBA namespace
-
-ACE_INLINE
-void
-CORBA::release (CORBA::AbstractBase_ptr obj)
-{
-  if (obj)
-    {
-      obj->_remove_ref ();
-    }
-}
-
-ACE_INLINE
-CORBA::Boolean
-CORBA::is_nil (CORBA::AbstractBase_ptr obj)
-{
-  return (obj == 0);
-}
diff --git a/TAO/tao/Valuetype/Makefile b/TAO/tao/Valuetype/Makefile
new file mode 100644
index 00000000000..dc514cca64d
--- /dev/null
+++ b/TAO/tao/Valuetype/Makefile
@@ -0,0 +1,1127 @@
+#----------------------------------------------------------------------------
+#
+# $Id$
+#
+#----------------------------------------------------------------------------
+ifndef TAO_ROOT
+  TAO_ROOT = $(ACE_ROOT)/TAO
+endif # ! TAO_ROOT
+
+MAKEFILE = Makefile
+LIBNAME  = libTAO_Valuetype
+LIB      = $(LIBNAME).a
+SHLIB    = $(LIBNAME).$(SOEXT)
+
+ACE_SHLIBS = -lTAO -lACE
+
+
+CPP_SRCS += \
+  ValueBase \
+  Valuetype_Adapter_Impl \
+  AbstractBase \
+  ValueFactory \
+  ValueFactory_Map \
+  Seq_Tmplinst
+
+FILES = $(CPP_SRCS)
+DEFS  = $(addsuffix .h,$(FILES))
+LSRC  = $(addsuffix .cpp,$(FILES))
+
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+#----------------------------------------------------------------------------
+#       Local targets (and local hacks)
+#----------------------------------------------------------------------------
+
+LDFLAGS += -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)
+
+ifeq ($(shared_libs),1)
+ifneq ($(SHLIB),)
+CPPFLAGS     += -DTAO_VALUETYPE_BUILD_DLL
+endif
+endif
+
+ifeq ($(static_libs),1)
+ifneq ($(LIB),)
+CPPFLAGS     += -DTAO_AS_STATIC_LIBS
+endif
+endif
+
+#----------------------------------------------------------------------------
+#       Dependencies
+#----------------------------------------------------------------------------
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/ValueBase.o .obj/ValueBase.SO .shobj/ValueBase.o .shobj/ValueBase.SO: ValueBase.cpp ValueBase.h $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h ValueBase.inl \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/PICurrent.h \
+  $(TAO_ROOT)/tao/PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i ValueFactory.h \
+  ValueFactory.inl
+
+.obj/Valuetype_Adapter_Impl.o .obj/Valuetype_Adapter_Impl.SO .shobj/Valuetype_Adapter_Impl.o .shobj/Valuetype_Adapter_Impl.SO: Valuetype_Adapter_Impl.cpp \
+  Valuetype_Adapter_Impl.h $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Valuetype_Adapter.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i valuetype_export.h \
+  AbstractBase.h $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h AbstractBase.inl \
+  ValueBase.h ValueBase.inl ValueFactory_Map.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  ValueFactory_Map.inl $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/PICurrent.h \
+  $(TAO_ROOT)/tao/PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i
+
+.obj/AbstractBase.o .obj/AbstractBase.SO .shobj/AbstractBase.o .shobj/AbstractBase.SO: AbstractBase.cpp AbstractBase.h \
+  $(ACE_ROOT)/ace/pre.h valuetype_export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  AbstractBase.inl ValueBase.h $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h ValueBase.inl \
+  ValueFactory.h ValueFactory.inl $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/Any_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Impl_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/PI_ForwardC.h \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PI_ForwardC.i \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.h \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.inl \
+  $(TAO_ROOT)/tao/Any_Dual_Impl_T.cpp \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/PICurrent.h \
+  $(TAO_ROOT)/tao/PICurrent.inl \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Exit.h \
+  $(ACE_ROOT)/ace/Thread_Control.h \
+  $(ACE_ROOT)/ace/Thread_Control.inl \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Framework_Component.h \
+  $(ACE_ROOT)/ace/Framework_Component.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.h \
+  $(ACE_ROOT)/ace/Framework_Component_T.inl \
+  $(ACE_ROOT)/ace/Framework_Component_T.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.h \
+  $(TAO_ROOT)/tao/ORB_Core_Auto_Ptr.inl \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i
+
+.obj/ValueFactory.o .obj/ValueFactory.SO .shobj/ValueFactory.o .shobj/ValueFactory.SO: ValueFactory.cpp ValueFactory.h \
+  $(ACE_ROOT)/ace/pre.h valuetype_export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h ValueFactory.inl
+
+.obj/ValueFactory_Map.o .obj/ValueFactory_Map.SO .shobj/ValueFactory_Map.o .shobj/ValueFactory_Map.SO: ValueFactory_Map.cpp ValueFactory_Map.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(ACE_ROOT)/ace/Synch.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  valuetype_export.h $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h ValueFactory_Map.inl \
+  ValueFactory.h $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp ValueFactory.inl
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/Valuetype/Makefile.bor b/TAO/tao/Valuetype/Makefile.bor
new file mode 100644
index 00000000000..44bc116399c
--- /dev/null
+++ b/TAO/tao/Valuetype/Makefile.bor
@@ -0,0 +1,29 @@
+#
+# Makefile for building the TAO Valuetype library
+#
+
+NAME = TAO_Valuetype
+
+OBJFILES = \
+	$(OBJDIR)\ValueBase.obj \
+	$(OBJDIR)\AbstractBase.obj \
+	$(OBJDIR)\ValueFactory.obj \
+	$(OBJDIR)\ValueFactory_Map.obj \
+	$(OBJDIR)\Valuetype_Adapter_Impl.obj \
+	$(OBJDIR)\Seq_Tmplinst.obj
+
+RESOURCE = $(OBJDIR)\TAO_Valuetype.res
+
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_VALUETYPE_CFLAGS) \
+	-DTAO_VALUETYPE_BUILD_DLL
+
+CPPDIR = .
+
+INCDIR_NAME = tao\Valuetype
+INCLUDES = \
+	*.h *.inl
+
+LIBFILES = $(TAO_LIB) $(ACE_LIB)
+
+!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tao/Valuetype/Seq_Tmplinst.cpp b/TAO/tao/Valuetype/Seq_Tmplinst.cpp
new file mode 100644
index 00000000000..7816987d089
--- /dev/null
+++ b/TAO/tao/Valuetype/Seq_Tmplinst.cpp
@@ -0,0 +1,51 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO
+//
+// = FILENAME
+//    Seq_Tmplinst.cpp
+//
+// = DESCRIPTION
+//   Explicit instantiation of the TAO sequence template classes for ValueBase
+//   and AbstractBase. These instantiations free us from having to
+//   generate them over and over with the IDL compiler.
+//
+// = AUTHOR
+//     Jeff Parsons <j.parsons@vanderbilt.edu>
+//
+// ============================================================================
+
+#include "tao/Sequence_T.h"
+#include "tao/Any.h"
+
+ACE_RCSID (tao, 
+           Seq_Tmplinst, 
+           "$Id$")
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class TAO_Valuetype_Manager<CORBA::ValueBase,
+                                     CORBA::ValueBase_var,
+                                     CORBA::tao_ValueBase_life>;
+template class TAO_Unbounded_Valuetype_Sequence<CORBA::ValueBase, 
+                                                CORBA::ValueBase_var, 
+                                                CORBA::tao_ValueBase_life>;
+template class TAO_Unbounded_Pseudo_Sequence<CORBA::AbstractBase, 
+                                             CORBA::AbstractBase_var>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate TAO_Valuetype_Manager<CORBA::ValueBase,
+                                          CORBA::ValueBase_var,
+                                          CORBA::tao_ValueBase_life>
+#pragma instantiate TAO_Unbounded_Valuetype_Sequence<CORBA::ValueBase, \
+                                                     CORBA::ValueBase_var, \
+                                                     CORBA::tao_ValueBase_life>
+#pragma instantiate TAO_Unbounded_Pseudo_Sequence<CORBA::AbstractBase, \
+                                                  CORBA::AbstractBase_var>
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/Valuetype/Sequence_T.cpp b/TAO/tao/Valuetype/Sequence_T.cpp
new file mode 100644
index 00000000000..1aba6361a74
--- /dev/null
+++ b/TAO/tao/Valuetype/Sequence_T.cpp
@@ -0,0 +1,987 @@
+// $Id$
+
+#ifndef TAO_VALUETYPE_SEQUENCE_T_C
+#define TAO_VALUETYPE_SEQUENCE_T_C
+
+#include "Sequence_T.h"
+
+#if !defined (__ACE_INLINE__)
+#include "Sequence_T.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID (Valuetype, 
+           Sequence_T, 
+           "$Id$")
+
+// *************************************************************
+// class TAO_Valuetype_Manager
+// *************************************************************
+
+template <typename T, typename T_var, typename T_life> 
+TAO_Valuetype_Manager<T,T_var,T_life> &
+TAO_Valuetype_Manager<T,T_var,T_life>::operator= (
+    const TAO_Valuetype_Manager<T,T_var,T_life> & rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      T_life::tao_remove_ref (*this->ptr_);
+      *this->ptr_ = *rhs.ptr_;
+      T_life::tao_add_ref (*this->ptr_);
+    }
+  else
+    {
+      *this->ptr_ = *rhs.ptr_;
+    }
+
+  return *this;
+}
+
+template <typename T, typename T_var, typename T_life> 
+TAO_Valuetype_Manager<T,T_var,T_life> &
+TAO_Valuetype_Manager<T,T_var,T_life>::operator= (T * p)
+{
+  if (this->release_)
+    {
+      // The semantics of the elements of a sequence are the same as
+      // that of a var variable.  Therefore we will not duplicate the
+      // user provided pointer before assigning it to the internal
+      // variable.
+      T_life::tao_remove_ref (*this->ptr_);
+      *this->ptr_ = p;
+    }
+  else
+    {
+      *this->ptr_ = p;
+    }
+
+  return *this;
+}
+
+template <typename T, typename T_var, typename T_life> 
+TAO_Valuetype_Manager<T,T_var,T_life> &
+TAO_Valuetype_Manager<T,T_var,T_life>::operator= (const T_var & p)
+{
+  if (this->release_)
+    {
+      // The semantics of the elements of a sequence are the same as
+      // that of a var variable.  Therefore we duplicate p's
+      // pointer before assigning it to the internal
+      // variable.
+      if (*this->ptr_ != 0)
+        {
+          (*this->ptr_)->_remove_ref ();
+        }
+
+      T_life::tao_remove_ref (*this->ptr_);
+      *this->ptr_ = p.in ();
+      T_life::tao_add_ref (*this->ptr_);
+    }
+  else
+    {
+      *this->ptr_ = p.in ();
+    }
+
+  return *this;
+}
+
+// *************************************************************
+// class TAO_Abstract_Manager
+// *************************************************************
+
+template<typename T, typename T_var, typename T_life>
+TAO_Abstract_Manager<T,T_var,T_life> &
+TAO_Abstract_Manager<T,T_var,T_life>::operator= (
+    const TAO_Abstract_Manager<T,T_var,T_life> & rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      T_life::tao_release (*this->ptr_);
+      T_life::tao_duplicate (*rhs->ptr_);
+    }
+
+  *this->ptr_ = *rhs.ptr_;
+  return *this;
+}
+
+template<typename T, typename T_var, typename T_life>
+TAO_Abstract_Manager<T,T_var,T_life> &
+TAO_Abstract_Manager<T,T_var,T_life>::operator= (T * p)
+{
+  if (this->release_)
+    {
+      // The semantics of the elements of a sequence are the same as
+      // that of a var variable.  Therefore we will not duplicate the
+      // user provided pointer before assigning it to the internal
+      // variable.
+      T_life::tao_release (*this->ptr_);
+    }
+
+  *this->ptr_ = p;
+  return *this;
+}
+
+template<typename T, typename T_var, typename T_life>
+TAO_Abstract_Manager<T,T_var,T_life> &
+TAO_Abstract_Manager<T,T_var,T_life>::operator= (const T_var & p)
+{
+  if (this->release_)
+    {
+      // The semantics of the elements of a sequence are the same as
+      // that of a var variable.  Therefore we duplicate p's
+      // pointer before assigning it to the internal
+      // variable.
+      T_life::tao_release (*this->ptr_);
+      T_life::tao_duplicate (p.in ());
+    }
+
+  *this->ptr_ = p.in ();
+  return *this;
+}
+
+template<typename T, typename T_var, typename T_life>
+TAO_Abstract_Manager<T,T_var,T_life>::operator const T_var () const
+{
+  T_life::tao_duplicate (*this->ptr_);
+  return *this->ptr_;
+}
+
+template<typename T, typename T_var, typename T_life>
+T *&
+TAO_Abstract_Manager<T,T_var,T_life>::out (void)
+{
+  T_life::tao_release (*this->ptr_);
+  *this->ptr_ = 0;
+  return *this->ptr_;
+}
+
+// *************************************************************
+// Operations for class TAO_Unbounded_Valuetype_Sequence
+// *************************************************************
+
+template <typename T, typename T_var, typename T_life> 
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::
+TAO_Unbounded_Valuetype_Sequence (
+    CORBA::ULong maximum
+  )
+  : TAO_Unbounded_Base_Sequence (
+        maximum,
+        TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::allocbuf (maximum)
+      )
+{
+}
+
+template <typename T, typename T_var, typename T_life> 
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::
+TAO_Unbounded_Valuetype_Sequence (
+    const TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life> & rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      T ** tmp1 =
+        TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::allocbuf (
+            this->maximum_
+          );
+      T ** const tmp2 =
+        ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
+                              rhs.buffer_);
+
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          T_life::tao_add_ref (tmp2[i]);
+          tmp1[i] = tmp2[i];
+        }
+
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+template <typename T, typename T_var, typename T_life> 
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::
+~TAO_Unbounded_Valuetype_Sequence (void)
+{
+  this->_deallocate_buffer ();
+}
+
+template <typename T, typename T_var, typename T_life> 
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life> &
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::operator= (
+    const TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life> & rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      T ** tmp = ACE_reinterpret_cast (T **,
+                                       this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          T_life::tao_remove_ref (tmp[i]);
+          tmp[i] = 0;
+        }
+
+      if (this->maximum_ < rhs.maximum_)
+        {
+          TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::freebuf (tmp);
+          this->buffer_ =
+            TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::allocbuf (rhs.maximum_);
+        }
+    }
+  else
+    {
+      if (rhs.maximum_ == 0)
+        {
+          this->buffer_ = 0;
+        }
+      else
+        {
+          this->buffer_ =
+            TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::allocbuf (
+                rhs.maximum_
+              );
+        }
+    }
+
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+  T ** tmp1 = ACE_reinterpret_cast (T **, 
+                                    this->buffer_);
+  T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
+                                          rhs.buffer_);
+
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+    {
+      T_life::tao_add_ref (tmp2[i]);
+      tmp1[i] = tmp2[i];
+    }
+
+  return *this;
+}
+
+template <typename T, typename T_var, typename T_life> 
+T **
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::allocbuf (CORBA::ULong nelems)
+{
+  T ** buf = 0;
+  ACE_NEW_RETURN (buf, 
+                  T * [nelems], 
+                  0);
+
+  for (CORBA::ULong i = 0; i < nelems; ++i)
+    {
+      buf[i] = 0;
+    }
+
+  return buf;
+}
+
+template <typename T, typename T_var, typename T_life> 
+void
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::freebuf (T ** buffer)
+{
+  if (buffer == 0)
+    {
+      return;
+    }
+
+  // {orbos/97-05-15:16.11} The freebuf function ensures that the
+  // destructor for each element is called before the buffer is
+  // destroyed, except for string elements, which are freed using
+  // string_free(), and object reference elements, which are freed
+  // using release(). The freebuf function will ignore null pointers
+  // passed to it.
+
+  // @@ How are we supposed to implement that! We don't know the
+  // length of the buffer here.
+  // Mark the length in the first four bytes? For the moment we let
+  // that be.
+
+  delete [] buffer;
+}
+
+template <typename T, typename T_var, typename T_life> 
+void
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::_allocate_buffer (
+    CORBA::ULong length
+  )
+{
+  T ** tmp = 
+    TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::allocbuf (length);
+
+  if (this->buffer_ != 0)
+    {
+      T ** old = ACE_reinterpret_cast (T **, 
+                                       this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        // Only call duplicate when we did not own the previous
+        // buffer, since after this method we own it we must also own
+        // the objects.  If we already own the objects there is no
+        // need to copy them, if we did we would also have to remove
+        // the old instances.
+        if (!this->release_)
+          {
+            T_life::tao_add_ref (tmp[i]);
+            tmp[i] = old[i];
+          }
+        else
+          {
+            tmp[i] = old[i];
+          }
+
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+
+  this->buffer_ = tmp;
+}
+
+template <typename T, typename T_var, typename T_life> 
+void
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+
+  T ** tmp = ACE_reinterpret_cast (T **, 
+                                   this->buffer_);
+
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      T_life::tao_remove_ref (tmp[i]);
+      tmp[i] = 0;
+    }
+
+  TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+template <typename T, typename T_var, typename T_life> 
+void
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::_shrink_buffer (
+    CORBA::ULong nl,
+    CORBA::ULong ol
+  )
+{
+  T ** tmp = ACE_static_cast (T **, 
+                              this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      T_life::tao_remove_ref (tmp[i]);
+      tmp[i] = 0;
+    }
+}
+
+// *************************************************************
+// Operations for class TAO_Bounded_Valuetype_Sequence
+// *************************************************************
+
+template <typename T, typename T_var, typename T_life, size_t MAX>
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::
+TAO_Bounded_Valuetype_Sequence (void)
+  : TAO_Bounded_Base_Sequence (
+        MAX,
+        TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::allocbuf (MAX)
+      )
+{
+}
+
+template <typename T, typename T_var, typename T_life, size_t MAX>
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::
+TAO_Bounded_Valuetype_Sequence (
+    const TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX> & rhs
+  )
+  : TAO_Bounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      T ** tmp1 =
+        TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::allocbuf (MAX);
+
+      T ** const tmp2 =
+        ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
+
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          T_life::tao_add_ref (tmp2[i]);
+          tmp1[i] = tmp2[i];
+        }
+
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+template <typename T, typename T_var, typename T_life, size_t MAX>
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>&
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::operator= (
+    const TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX> & rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      T ** tmp = ACE_reinterpret_cast (T **, 
+                                       this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          T_life::tao_remove_ref (tmp[i]);
+          tmp[i] = 0;
+        }
+      // No need to reallocate the buffer since it is always of size
+      // MAX
+    }
+  else
+    {
+      if (rhs.maximum_ == 0)
+        {
+          this->buffer_ = 0;
+        }
+      else
+        {
+          this->buffer_ =
+            TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::allocbuf (
+                rhs.maximum_
+              );
+        }
+    }
+
+  TAO_Bounded_Base_Sequence::operator= (rhs);
+
+  T ** tmp1 = ACE_reinterpret_cast (T **, 
+                                    this->buffer_);
+  T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
+                                          rhs.buffer_);
+
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+    {
+      T_life::tao_add_ref (tmp2[i]);
+      tmp1[i] = tmp2[i];
+    }
+
+  return *this;
+}
+
+template <typename T, typename T_var, typename T_life, size_t MAX>
+T **
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::allocbuf (CORBA::ULong)
+{
+  T ** buf = 0;
+  ACE_NEW_RETURN (buf, 
+                  T * [MAX], 
+                  0);
+
+  for (CORBA::ULong i = 0; i < MAX; ++i)
+    {
+      buf[i] = 0;
+    }
+
+  return buf;
+}
+
+template <typename T, typename T_var, typename T_life, size_t MAX>
+void
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::freebuf (T ** buffer)
+{
+  // How much do we deallocate? Easy! allocbuf() always creates MAX
+  // elements and initialize them to T::_nil().  So we can be
+  // complaint and call CORBA::release() on each one.
+  for (CORBA::ULong i = 0; i < MAX; ++i)
+    {
+      if (buffer[i] != 0)
+        {
+          T_life::tao_remove_ref (buffer[i]);
+          buffer[i] = 0;
+        }
+    }
+
+  delete [] buffer;
+}
+
+template <typename T, typename T_var, typename T_life, size_t MAX>
+void
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::_allocate_buffer (
+    CORBA::ULong length
+  )
+{
+  // For this class memory is never reallocated so the implementation
+  // is *really* simple.
+  this->buffer_ =
+    TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::allocbuf (length);
+}
+
+template <typename T, typename T_var, typename T_life, size_t MAX>
+void
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::_deallocate_buffer (void)
+{
+  if (this->release_ == 0)
+    {
+      return;
+    }
+
+  T ** tmp = ACE_reinterpret_cast (T **, 
+                                   this->buffer_);
+  TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+template <typename T, typename T_var, typename T_life, size_t MAX>
+void
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::_shrink_buffer (
+    CORBA::ULong nl,
+    CORBA::ULong ol
+  )
+{
+  T ** tmp = ACE_reinterpret_cast (T **, 
+                                   this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      T_life::tao_remove_ref (tmp[i]);
+      tmp[i] = 0;
+    }
+}
+
+// *************************************************************
+// Operations for class TAO_Unbounded_Abstract_Sequence
+// *************************************************************
+
+template <typename T, typename T_var, typename T_life>
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::
+TAO_Unbounded_Abstract_Sequence (CORBA::ULong maximum)
+  : TAO_Unbounded_Base_Sequence (
+        maximum,
+        TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::allocbuf (maximum)
+      )
+{
+}
+
+template <typename T, typename T_var, typename T_life>
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::
+TAO_Unbounded_Abstract_Sequence (
+    const TAO_Unbounded_Abstract_Sequence<T,T_var,T_life> & rhs
+  )
+  : TAO_Unbounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      T ** tmp1 =
+        TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::allocbuf (
+            this->maximum_
+          );
+      T ** const tmp2 =
+        ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
+                              rhs.buffer_);
+
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = T_life::tao_duplicate (tmp2[i]);
+        }
+
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+template <typename T, typename T_var, typename T_life>
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::
+~TAO_Unbounded_Abstract_Sequence (void)
+{
+  this->_deallocate_buffer ();
+}
+
+template <typename T, typename T_var, typename T_life>
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life> &
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::operator= (
+    const TAO_Unbounded_Abstract_Sequence<T,T_var,T_life> & rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      T ** tmp = ACE_reinterpret_cast (T **,
+                                       this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          T_life::tao_release (tmp[i]);
+          tmp[i] = T_life::tao_nil ();
+        }
+
+      if (this->maximum_ < rhs.maximum_)
+        {
+          TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::freebuf (tmp);
+          this->buffer_ =
+            TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::allocbuf (
+                rhs.maximum_
+              );
+        }
+    }
+  else
+    {
+      if (rhs.maximum_ == 0)
+        {
+          this->buffer_ = 0;
+        }
+      else
+        {
+          this->buffer_ =
+            TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::allocbuf (
+                rhs.maximum_
+              );
+        }
+    }
+
+  TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+  T ** tmp1 = ACE_reinterpret_cast (T **, 
+                                    this->buffer_);
+  T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
+                                          rhs.buffer_);
+
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+    {
+      tmp1[i] = T_life::tao_duplicate (tmp2[i]);
+    }
+
+  return *this;
+}
+
+template <typename T, typename T_var, typename T_life>
+T **
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::allocbuf (
+    CORBA::ULong nelems
+  )
+{
+  T ** buf = 0;
+  ACE_NEW_RETURN (buf, 
+                  T * [nelems], 
+                  0);
+
+  for (CORBA::ULong i = 0; i < nelems; ++i)
+    {
+      buf[i] = T_life::tao_nil ();
+    }
+
+  return buf;
+}
+
+template <typename T, typename T_var, typename T_life>
+void
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::freebuf (T ** buffer)
+{
+  if (buffer == 0)
+    {
+      return;
+    }
+
+  // {orbos/97-05-15:16.11} The freebuf function ensures that the
+  // destructor for each element is called before the buffer is
+  // destroyed, except for string elements, which are freed using
+  // string_free(), and object reference elements, which are freed
+  // using release(). The freebuf function will ignore null pointers
+  // passed to it.
+
+  // @@ How are we supposed to implement that! We don't know the
+  // length of the buffer here.
+  // Mark the length in the first four bytes? For the moment we let
+  // that be.
+
+  delete [] buffer;
+}
+
+template <typename T, typename T_var, typename T_life>
+void
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::_allocate_buffer (
+    CORBA::ULong length
+  )
+{
+  T ** tmp = TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::allocbuf (length);
+
+  if (this->buffer_ != 0)
+    {
+      T ** old = ACE_reinterpret_cast (T **, 
+                                       this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        // Only call duplicate when we did not own the previous
+        // buffer, since after this method we own it we must also own
+        // the objects.  If we already own the objects there is no
+        // need to copy them, if we did we would also have to remove
+        // the old instances.
+        if (!this->release_)
+          {
+            tmp[i] = T_life::tao_duplicate (old[i]);
+          }
+        else
+          {
+            tmp[i] = old[i];
+          }
+
+      if (this->release_)
+        {
+          delete [] old;
+        }
+    }
+
+  this->buffer_ = tmp;
+}
+
+template <typename T, typename T_var, typename T_life>
+void
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::_deallocate_buffer (void)
+{
+  if (this->buffer_ == 0 || this->release_ == 0)
+    {
+      return;
+    }
+
+  T ** tmp = ACE_reinterpret_cast (T **, 
+                                   this->buffer_);
+
+  for (CORBA::ULong i = 0; i < this->length_; ++i)
+    {
+      T_life::tao_release (tmp[i]);
+      tmp[i] = T_life::tao_nil ();
+    }
+
+  TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+template <typename T, typename T_var, typename T_life>
+void
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::_shrink_buffer (
+    CORBA::ULong nl,
+    CORBA::ULong ol
+  )
+{
+  T ** tmp = ACE_static_cast (T **, 
+                              this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      T_life::tao_release (tmp[i]);
+      tmp[i] = T_life::tao_nil ();
+    }
+}
+
+// *************************************************************
+// Operations for class TAO_Bounded_Abstract_Sequence
+// *************************************************************
+
+template <typename T, typename T_var, typename T_life, size_t MAX>
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::
+TAO_Bounded_Abstract_Sequence (void)
+  : TAO_Bounded_Base_Sequence (
+        MAX,
+        TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::allocbuf (MAX)
+      )
+{
+}
+
+template <typename T, typename T_var, typename T_life, size_t MAX>
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::
+TAO_Bounded_Abstract_Sequence (
+    const TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX> & rhs
+  )
+  : TAO_Bounded_Base_Sequence (rhs)
+{
+  if (rhs.buffer_ != 0)
+    {
+      T ** tmp1 =
+        TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::allocbuf (MAX);
+
+      T ** const tmp2 =
+        ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
+
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = T_life::tao_duplicate (tmp2[i]);
+        }
+
+      this->buffer_ = tmp1;
+    }
+  else
+    {
+      this->buffer_ = 0;
+    }
+}
+
+template <typename T, typename T_var, typename T_life, size_t MAX>
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX> &
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::operator= (
+    const TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX> & rhs
+  )
+{
+  if (this == &rhs)
+    {
+      return *this;
+    }
+
+  if (this->release_)
+    {
+      T ** tmp = ACE_reinterpret_cast (T **, 
+                                       this->buffer_);
+
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          T_life::tao_release (tmp[i]);
+          tmp[i] = T_life::tao_nil ();
+        }
+      // No need to reallocate the buffer since it is always of size
+      // MAX
+    }
+  else
+    {
+      if (rhs.maximum_ == 0)
+        {
+          this->buffer_ = 0;
+        }
+      else
+        {
+          this->buffer_ =
+            TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::allocbuf (
+                rhs.maximum_
+              );
+        }
+    }
+
+  TAO_Bounded_Base_Sequence::operator= (rhs);
+
+  T ** tmp1 = ACE_reinterpret_cast (T **, 
+                                    this->buffer_);
+  T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, 
+                                          rhs.buffer_);
+
+  for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+    {
+      tmp1[i] = T_life::tao_duplicate (tmp2[i]);
+    }
+
+  return *this;
+}
+
+template <typename T, typename T_var, typename T_life, size_t MAX>
+T **
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::allocbuf (CORBA::ULong)
+{
+  T ** buf = 0;
+  ACE_NEW_RETURN (buf, 
+                  T * [MAX], 
+                  0);
+
+  for (CORBA::ULong i = 0; i < MAX; ++i)
+    {
+      buf[i] = T_life::tao_nil ();
+    }
+
+  return buf;
+}
+
+template <typename T, typename T_var, typename T_life, size_t MAX>
+void
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::freebuf (T ** buffer)
+{
+  // How much do we deallocate? Easy! allocbuf() always creates MAX
+  // elements and initialize them to T::_nil().  So we can be
+  // complaint and call CORBA::release() on each one.
+  for (CORBA::ULong i = 0; i < MAX; ++i)
+    {
+      if (buffer[i] != T_life::tao_nil ())
+        {
+          T_life::tao_release (buffer[i]);
+          buffer[i] = T_life::tao_nil ();
+        }
+    }
+
+  delete [] buffer;
+}
+
+template <typename T, typename T_var, typename T_life, size_t MAX>
+void
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::_allocate_buffer (
+    CORBA::ULong length
+  )
+{
+  // For this class memory is never reallocated so the implementation
+  // is *really* simple.
+  this->buffer_ =
+    TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::allocbuf (length);
+}
+
+template <typename T, typename T_var, typename T_life, size_t MAX>
+void
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::_deallocate_buffer (void)
+{
+  if (this->release_ == 0)
+    {
+      return;
+    }
+
+  T ** tmp = ACE_reinterpret_cast (T **, 
+                                   this->buffer_);
+  TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::freebuf (tmp);
+  this->buffer_ = 0;
+}
+
+template <typename T, typename T_var, typename T_life, size_t MAX>
+void
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::_shrink_buffer (
+    CORBA::ULong nl,
+    CORBA::ULong ol
+  )
+{
+  T ** tmp = ACE_reinterpret_cast (T **, 
+                                   this->buffer_);
+
+  for (CORBA::ULong i = nl; i < ol; ++i)
+    {
+      T_life::tao_release (tmp[i]);
+      tmp[i] = T_life::tao_nil ();
+    }
+}
+
+#endif /* TAO_VALUETYPE_SEQUENCE_T_C */
diff --git a/TAO/tao/Valuetype/Sequence_T.h b/TAO/tao/Valuetype/Sequence_T.h
new file mode 100644
index 00000000000..1955c6307c6
--- /dev/null
+++ b/TAO/tao/Valuetype/Sequence_T.h
@@ -0,0 +1,461 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Sequence_T.h
+ *
+ *  $Id$
+ *
+ *  @authors Jeff Parsons
+ */
+//=============================================================================
+
+#ifndef TAO_VALUETYPE_SEQUENCE_T_H
+#define TAO_VALUETYPE_SEQUENCE_T_H
+
+#include "ace/pre.h"
+
+#include "tao/Sequence.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+template<typename T, typename T_var, typename T_life>
+class TAO_Unbounded_Valuetype_Sequence;
+
+  /**
+   * @class TAO_Valuetype_Manager
+   *
+   * @brief Manager for valuetypes.
+   *
+   * According to the spec., valuetypes are handled similarly to object
+   * references, so a manager class is needed.
+   *
+   * @see TAO_Object_Manager
+   */
+template<typename T, typename T_var, typename T_life>
+class TAO_Valuetype_Manager
+{
+  friend class TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>;
+public:
+  // @@ Use partial template specialization here to give access only
+  // to the right kind of sequence.
+  // friend template<CORBA::ULong MAX>
+  //    class TAO_Bounded_Valuetype_Sequence<T,MAX>;
+
+  // = Initialization and termination methods.
+  /**
+   * Copy constructor, the semantics are non-trivial:
+   *   + The referenced element is duplicated or not according to the
+   *   release value on the <rhs>.
+   *   + In any case a new reference to the same object is created.
+   */
+  TAO_Valuetype_Manager (const TAO_Valuetype_Manager<T,T_var,T_life> & rhs);
+
+  /**
+   * Constructor from address of an element, it should be private and
+   * only TAO_*_Object_Sequence would use it, but we have some
+   * problems with friendship and templates.
+   */
+  TAO_Valuetype_Manager (T **,
+                         CORBA::Boolean release);
+
+  /// Destructor, only releases the object if <release_> is true.
+  ~TAO_Valuetype_Manager (void);
+
+  /**
+   * Assignment from another managed type, only release if
+   * <this->release_> is true.
+   * @@ TODO what happens if rhs.release_ is true an this->relase_ is
+   * false?
+   */
+  TAO_Valuetype_Manager<T,T_var,T_life> &operator= (
+      const TAO_Valuetype_Manager<T,T_var,T_life> & rhs
+    );
+
+  /// Assignment from T *.
+  TAO_Valuetype_Manager<T,T_var,T_life> &operator= (T *);
+
+  /// Assignment from T_var.
+  TAO_Valuetype_Manager<T,T_var,T_life> &operator= (const T_var &);
+
+  /// Return pointer.
+  T * operator-> (void) const;
+
+  /// Cast (read-only).
+  operator const T * () const;
+
+  /// Cast.
+  operator T *& ();
+
+  /// Cast (read-only) so that assignment from a structured
+  /// type to a T_var will make a copy.
+  operator const T_var() const;
+
+  /// for in parameter.
+  T * in (void) const;
+
+  /// for inout parameter.
+  T *& inout (void);
+
+  /// for out parameter.
+  T * &out (void);
+
+  /// for return type
+  T * _retn (void);
+
+private:
+  /// data member, notice that it is a pointer, to implement the
+  /// reference behavior for assignment.
+  T ** ptr_;
+
+  /// release flag based on parent's flag
+  CORBA::Boolean release_;
+};
+
+// *************************************************************
+
+  /**
+   * @class TAO_Abstract_Manager
+   *
+   * @brief Manager for abstract intefaces.
+   *
+   * An abstract interface can be either a valuetype or an object
+   * references, so a manager class is needed.
+   *
+   * @see TAO_Object_Manager
+   */
+template<typename T, typename T_var, typename T_life>
+class TAO_Abstract_Manager
+{
+//  friend class TAO_Unbounded_Abstract_Sequence<T,T_var>;
+public:
+  // = Initialization and termination methods.
+  /**
+   * Copy constructor, the semantics are non-trivial:
+   *   + The referenced element is duplicated or not according to the
+   *   release value on the <rhs>.
+   *   + In any case a new reference to the same object is created.
+   */
+  TAO_Abstract_Manager (const TAO_Abstract_Manager<T,T_var,T_life> & rhs);
+
+  /**
+   * Constructor from address of an element, it should be private and
+   * only TAO_*_Object_Sequence would use it, but we have some
+   * problems with friendship and templates.
+   */
+  TAO_Abstract_Manager (T **,
+                        CORBA::Boolean release);
+
+  /// Destructor, only releases the object if <release_> is true.
+  ~TAO_Abstract_Manager (void);
+
+  /**
+   * Assignment from another managed type, only release if
+   * <this->release_> is true.
+   * @@ TODO what happens if rhs.release_ is true an this->relase_ is
+   * false?
+   */
+  TAO_Abstract_Manager<T,T_var,T_life> & operator= (
+      const TAO_Abstract_Manager<T,T_var,T_life> & rhs
+    );
+
+  /// Assignment from T *.
+  TAO_Abstract_Manager<T,T_var,T_life> & operator= (T *);
+
+  /// Assignment from T_var.
+  TAO_Abstract_Manager<T,T_var,T_life> & operator= (const T_var &);
+
+  /// Return pointer.
+  T * operator-> (void) const;
+
+  /// Cast (read-only).
+  operator const T * () const;
+
+  /// Cast.
+  operator T *& ();
+
+  /// Cast (read-only) so that assignment from a structured
+  /// type to a T_var will make a copy.
+  operator const T_var () const;
+
+  /// for in parameter.
+  T * in (void) const;
+
+  /// for inout parameter.
+  T *& inout (void);
+
+  /// for out parameter.
+  T *& out (void);
+
+  /// for return type
+  T * _retn (void);
+
+private:
+  /// data member, notice that it is a pointer, to implement the
+  /// reference behavior for assignment.
+  T ** ptr_;
+
+  /// release flag based on parent's flag
+  CORBA::Boolean release_;
+};
+
+// *************************************************************
+
+/**
+ * @class TAO_Unbounded_Valuetype_Sequence
+ *
+ * @brief Parametric sequence for valuetypes
+ *
+ * @see TAO_Unbounded_Object_Sequence
+ */
+template<typename T, typename T_var, typename T_life>
+class TAO_Unbounded_Valuetype_Sequence : public TAO_Unbounded_Base_Sequence
+{
+public:
+  // = Initialization and termination methods.
+
+  // Default ctor.
+  TAO_Unbounded_Valuetype_Sequence (void);
+
+  /// Constructor with a "hint" for the maximum capacity.
+  TAO_Unbounded_Valuetype_Sequence (CORBA::ULong max);
+
+  /// Constructor with a given buffer.
+  TAO_Unbounded_Valuetype_Sequence (CORBA::ULong maximum,
+                                    CORBA::ULong length,
+                                    T ** data,
+                                    CORBA::Boolean release = 0);
+
+  /// Copy ctor, deep copies.
+  TAO_Unbounded_Valuetype_Sequence (
+      const TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life> &
+    );
+
+  /// The destructor releases all object reference memebrs and frees
+  /// all string members.
+  ~TAO_Unbounded_Valuetype_Sequence (void);
+
+  /**
+   * The assignment operator first releases all object reference
+   * members and frees all string members, and then performs a
+   * deepcopy to create a new structure.
+   */
+  TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life> & operator= (
+      const TAO_Unbounded_Valuetype_Sequence <T,T_var,T_life> &
+    );
+
+  /// read-write accessor
+  TAO_Valuetype_Manager<T,T_var,T_life> operator[] (CORBA::ULong slot) const;
+
+  /// The allocbuf function allocates a vector of T elements that can
+  /// be passed to the T *data constructor.
+  static T ** allocbuf (CORBA::ULong);
+
+  /// Release all the elements.
+  static void freebuf (T **);
+
+  // The Base_Sequence functions, please see "tao/Sequence.h"
+  /// No default to workaround egcs problem with templates and
+  /// namespaces
+  virtual void _allocate_buffer (CORBA::ULong length);
+  virtual void _deallocate_buffer (void);
+  virtual void _shrink_buffer (CORBA::ULong new_length,
+                               CORBA::ULong old_length);
+};
+
+// *************************************************************
+
+/**
+ * @class TAO_Bounded_Valuetype_Sequence
+ *
+ * @brief Parametric sequence for types that require managers.
+ *
+ * Please see the documentation for the unbounded case.
+ */
+template<typename T, typename T_var, typename T_life, size_t MAX>
+class TAO_Bounded_Valuetype_Sequence : public TAO_Bounded_Base_Sequence
+{
+public:
+  // = Initialization and termination methods.
+
+  // Default ctor.
+  TAO_Bounded_Valuetype_Sequence (void);
+
+  /// Constructor from data.
+  TAO_Bounded_Valuetype_Sequence (CORBA::ULong length,
+                                  T ** value,
+                                  CORBA::Boolean release = 0);
+
+  /// Copy constructor.
+  TAO_Bounded_Valuetype_Sequence (
+      const TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX> &
+    );
+
+  /// destructor
+  ~TAO_Bounded_Valuetype_Sequence (void);
+
+  /// Assignment from another Bounded sequence.
+  TAO_Bounded_Valuetype_Sequence &operator= (
+      const TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX> &
+    );
+
+  /// Read-write accessor.
+  TAO_Valuetype_Manager<T,T_var,T_life> operator[] (CORBA::ULong slot) const;
+
+  /// Allocate storage for a sequence..
+  static T ** allocbuf (CORBA::ULong length);
+
+  /// Free a buffer allocated by allocbuf() and release each element on
+  /// it.
+  static void freebuf (T ** buffer);
+
+  // The Base_Sequence functions, please see "tao/sequence.h"
+  /// No default to workaround egcs problem with templates and
+  /// namespaces
+  virtual void _allocate_buffer (CORBA::ULong length);
+  virtual void _deallocate_buffer (void);
+  virtual void _shrink_buffer (CORBA::ULong new_length,
+                               CORBA::ULong old_length);
+};
+
+// *************************************************************
+
+/**
+ * @class TAO_Unbounded_Abstract_Sequence
+ *
+ * @brief Parametric sequence for abstract interfaces
+ *
+ * @see TAO_Unbounded_Object_Sequence
+ */
+template<typename T, typename T_var, typename T_life>
+class TAO_Unbounded_Abstract_Sequence : public TAO_Unbounded_Base_Sequence
+{
+public:
+  // = Initialization and termination methods.
+
+  // Default ctor.
+  TAO_Unbounded_Abstract_Sequence (void);
+
+  /// Constructor with a "hint" for the maximum capacity.
+  TAO_Unbounded_Abstract_Sequence (CORBA::ULong max);
+
+  /// Constructor with a given buffer.
+  TAO_Unbounded_Abstract_Sequence (CORBA::ULong maximum,
+                                   CORBA::ULong length,
+                                   T ** data,
+                                   CORBA::Boolean release = 0);
+
+  /// Copy ctor, deep copies.
+  TAO_Unbounded_Abstract_Sequence (
+      const TAO_Unbounded_Abstract_Sequence<T,T_var,T_life> &
+    );
+
+  /// The destructor releases all object reference memebrs and frees
+  /// all string members.
+  ~TAO_Unbounded_Abstract_Sequence (void);
+
+  /**
+   * The assignment operator first releases all object reference
+   * members and frees all string members, and then performs a
+   * deepcopy to create a new structure.
+   */
+  TAO_Unbounded_Abstract_Sequence<T,T_var,T_life> &operator= (
+      const TAO_Unbounded_Abstract_Sequence <T,T_var,T_life> &
+    );
+
+  /// read-write accessor
+  TAO_Abstract_Manager<T,T_var,T_life> operator[] (CORBA::ULong slot) const;
+
+  /// The allocbuf function allocates a vector of T elements that can
+  /// be passed to the T *data constructor.
+  static T ** allocbuf (CORBA::ULong);
+
+  /// Release all the elements.
+  static void freebuf (T **);
+
+  // The Base_Sequence functions, please see "tao/Sequence.h"
+  /// No default to workaround egcs problem with templates and
+  /// namespaces
+  virtual void _allocate_buffer (CORBA::ULong length);
+  virtual void _deallocate_buffer (void);
+  virtual void _shrink_buffer (CORBA::ULong new_length,
+                               CORBA::ULong old_length);
+};
+
+// *************************************************************
+
+/**
+ * @class TAO_Bounded_Abstract_Sequence
+ *
+ * @brief Parametric sequence for types that require managers.
+ *
+ * Please see the documentation for the unbounded case.
+ */
+template<typename T, typename T_var, typename T_life, size_t MAX>
+class TAO_Bounded_Abstract_Sequence : public TAO_Bounded_Base_Sequence
+{
+public:
+  // = Initialization and termination methods.
+
+  // Default ctor.
+  TAO_Bounded_Abstract_Sequence (void);
+
+  /// Constructor from data.
+  TAO_Bounded_Abstract_Sequence (CORBA::ULong length,
+                                 T ** value,
+                                 CORBA::Boolean release = 0);
+
+  /// Copy constructor.
+  TAO_Bounded_Abstract_Sequence (
+      const TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX> &
+    );
+
+  /// destructor
+  ~TAO_Bounded_Abstract_Sequence (void);
+
+  /// Assignment from another Bounded sequence.
+  TAO_Bounded_Abstract_Sequence &operator= (
+      const TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX> &
+    );
+
+  /// Read-write accessor.
+  TAO_Abstract_Manager<T,T_var,T_life> operator[] (CORBA::ULong slot) const;
+
+  /// Allocate storage for a sequence..
+  static T ** allocbuf (CORBA::ULong length);
+
+  /// Free a buffer allocated by allocbuf() and release each element on
+  /// it.
+  static void freebuf (T ** buffer);
+
+  // The Base_Sequence functions, please see "tao/sequence.h"
+  /// No default to workaround egcs problem with templates and
+  /// namespaces
+  virtual void _allocate_buffer (CORBA::ULong length);
+  virtual void _deallocate_buffer (void);
+  virtual void _shrink_buffer (CORBA::ULong new_length,
+                               CORBA::ULong old_length);
+};
+
+#if defined (__ACE_INLINE__)
+#include "Sequence_T.inl"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "Sequence_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Sequence_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include "ace/post.h"
+
+#endif /* TAO_VALUETYPE_SEQUENCE_T_H */
diff --git a/TAO/tao/Valuetype/Sequence_T.inl b/TAO/tao/Valuetype/Sequence_T.inl
new file mode 100644
index 00000000000..d36e355b374
--- /dev/null
+++ b/TAO/tao/Valuetype/Sequence_T.inl
@@ -0,0 +1,326 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
+
+// *************************************************************
+// Inline operations for class TAO_Valuetype_Manager
+// *************************************************************
+
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE
+TAO_Valuetype_Manager<T,T_var,T_life>::~TAO_Valuetype_Manager (void)
+{
+}
+
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE
+TAO_Valuetype_Manager<T,T_var,T_life>::TAO_Valuetype_Manager (
+    const TAO_Valuetype_Manager<T,T_var,T_life> & rhs
+  )
+  : ptr_ (rhs.ptr_),
+    release_ (rhs.release_)
+{
+}
+
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE
+TAO_Valuetype_Manager<T,T_var,T_life>::TAO_Valuetype_Manager(
+    T ** buffer, 
+    CORBA::Boolean release
+  )
+  : ptr_ (buffer),
+    release_ (release)
+{
+}
+
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE 
+T *
+TAO_Valuetype_Manager<T,T_var,T_life>::operator-> (void) const
+{
+  return *this->ptr_;
+}
+
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE
+TAO_Valuetype_Manager<T,T_var,T_life>::operator const T_var () const
+{
+  T_life::tao_add_ref (*this->ptr_);
+  return *this->ptr_;
+}
+
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE
+TAO_Valuetype_Manager<T,T_var,T_life>::operator const T * () const
+{
+  return *this->ptr_;
+}
+
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE
+TAO_Valuetype_Manager<T,T_var,T_life>::operator T *& ()
+{
+  return *this->ptr_;
+}
+
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE 
+T *
+TAO_Valuetype_Manager<T,T_var,T_life>::in (void) const
+{
+  return *this->ptr_;
+}
+
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE 
+T *&
+TAO_Valuetype_Manager<T,T_var,T_life>::inout (void)
+{
+  return *this->ptr_;
+}
+
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE 
+T *&
+TAO_Valuetype_Manager<T,T_var,T_life>::out (void)
+{
+  T_life::tao_remove_ref (*this->ptr_);
+  *this->ptr_ = 0;
+  return *this->ptr_;
+}
+
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE 
+T *
+TAO_Valuetype_Manager<T,T_var,T_life>::_retn (void)
+{
+  T * temp = *this->ptr_;
+  *this->ptr_ = 0;
+  return temp;
+}
+
+// *************************************************************
+// Inline operations for class TAO_Abstract_Manager
+// *************************************************************
+
+template<typename T, typename T_var, typename T_life>
+ACE_INLINE
+TAO_Abstract_Manager<T,T_var,T_life>::~TAO_Abstract_Manager (void)
+{
+}
+
+template<typename T, typename T_var, typename T_life>
+ACE_INLINE
+TAO_Abstract_Manager<T,T_var,T_life>::TAO_Abstract_Manager (
+    const TAO_Abstract_Manager<T,T_var,T_life> & rhs
+  )
+  : ptr_ (rhs.ptr_),
+    release_ (rhs.release_)
+{
+}
+
+template<typename T, typename T_var, typename T_life>
+ACE_INLINE
+TAO_Abstract_Manager<T,T_var,T_life>::TAO_Abstract_Manager(
+    T ** buffer, 
+    CORBA::Boolean release
+  )
+  : ptr_ (buffer),
+    release_ (release)
+{
+}
+
+template<typename T, typename T_var, typename T_life>
+ACE_INLINE 
+T *
+TAO_Abstract_Manager<T,T_var,T_life>::operator-> (void) const
+{
+  return *this->ptr_;
+}
+
+template<typename T, typename T_var, typename T_life>
+ACE_INLINE
+TAO_Abstract_Manager<T,T_var,T_life>::operator const T * () const
+{
+  return *this->ptr_;
+}
+
+template<typename T, typename T_var, typename T_life>
+ACE_INLINE
+TAO_Abstract_Manager<T,T_var,T_life>::operator T *& ()
+{
+  return *this->ptr_;
+}
+
+template<typename T, typename T_var, typename T_life>
+ACE_INLINE 
+T *
+TAO_Abstract_Manager<T,T_var,T_life>::in (void) const
+{
+  return *this->ptr_;
+}
+
+template<typename T, typename T_var, typename T_life>
+ACE_INLINE 
+T *&
+TAO_Abstract_Manager<T,T_var,T_life>::inout (void)
+{
+  return *this->ptr_;
+}
+
+template<typename T, typename T_var, typename T_life>
+ACE_INLINE 
+T *
+TAO_Abstract_Manager<T,T_var,T_life>::_retn (void)
+{
+  T * temp = *this->ptr_;
+  *this->ptr_ = 0;
+  return temp;
+}
+
+// *************************************************************
+// class TAO_Unbounded_Valuetype_Sequence
+// *************************************************************
+
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::
+TAO_Unbounded_Valuetype_Sequence (
+    void
+  )
+{
+}
+
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::
+TAO_Unbounded_Valuetype_Sequence (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    T ** value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE 
+TAO_Valuetype_Manager<T,T_var,T_life>
+TAO_Unbounded_Valuetype_Sequence<T,T_var,T_life>::operator[] (
+    CORBA::ULong slot
+  ) const
+{
+  ACE_ASSERT (slot < this->maximum_);
+  T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Valuetype_Manager<T,T_var,T_life> (tmp + slot, this->release_);
+}
+
+// *************************************************************
+// class TAO_Bounded_Valuetype_Sequence
+// *************************************************************
+
+template<typename T, typename T_var, typename T_life, size_t MAX> 
+ACE_INLINE
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::
+~TAO_Bounded_Valuetype_Sequence (
+    void
+  )
+{
+  this->_deallocate_buffer ();
+}
+
+template<typename T, typename T_var, typename T_life, size_t MAX> 
+ACE_INLINE
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::
+TAO_Bounded_Valuetype_Sequence (
+    CORBA::ULong length,
+    T **value,
+    CORBA::Boolean release
+  )
+  : TAO_Bounded_Base_Sequence (MAX, length, value, release)
+{
+}
+
+template<typename T, typename T_var, typename T_life, size_t MAX> 
+ACE_INLINE 
+TAO_Valuetype_Manager<T,T_var,T_life>
+TAO_Bounded_Valuetype_Sequence<T,T_var,T_life,MAX>::operator[] (
+    CORBA::ULong slot
+  ) const
+{
+  ACE_ASSERT (slot < this->maximum_);
+  T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Valuetype_Manager<T,T_var,T_life> (tmp + slot, this->release_);
+}
+
+// *************************************************************
+// class TAO_Unbounded_Abstract_Sequence
+// *************************************************************
+
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::
+TAO_Unbounded_Abstract_Sequence (void)
+{
+}
+
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::
+TAO_Unbounded_Abstract_Sequence (
+    CORBA::ULong maximum,
+    CORBA::ULong length,
+    T ** value,
+    CORBA::Boolean release
+  )
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+{
+}
+
+template <typename T, typename T_var, typename T_life> 
+ACE_INLINE 
+TAO_Abstract_Manager<T,T_var,T_life>
+TAO_Unbounded_Abstract_Sequence<T,T_var,T_life>::operator[] (
+    CORBA::ULong slot
+  ) const
+{
+  ACE_ASSERT (slot < this->maximum_);
+  T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Abstract_Manager<T,T_var,T_life> (tmp + slot, this->release_);
+}
+
+// *************************************************************
+// class TAO_Bounded_Abstract_Sequence
+// *************************************************************
+
+template<typename T, typename T_var, typename T_life, size_t MAX>
+ACE_INLINE
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::
+~TAO_Bounded_Abstract_Sequence (void)
+{
+  this->_deallocate_buffer ();
+}
+
+template<typename T, typename T_var, typename T_life, size_t MAX>
+ACE_INLINE
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::
+TAO_Bounded_Abstract_Sequence (
+    CORBA::ULong length,
+    T ** value,
+    CORBA::Boolean release
+  )
+  : TAO_Bounded_Base_Sequence (MAX, length, value, release)
+{
+}
+
+template<typename T, typename T_var, typename T_life, size_t MAX>
+ACE_INLINE 
+TAO_Abstract_Manager<T,T_var,T_life>
+TAO_Bounded_Abstract_Sequence<T,T_var,T_life,MAX>::operator[] (
+    CORBA::ULong slot
+  ) const
+{
+  ACE_ASSERT (slot < this->maximum_);
+  T ** const tmp = ACE_reinterpret_cast (T ** ACE_CAST_CONST, this->buffer_);
+  return TAO_Abstract_Manager<T,T_var,T_life> (tmp + slot, this->release_);
+}
diff --git a/TAO/tao/Valuetype/TAO_Valuetype.dsp b/TAO/tao/Valuetype/TAO_Valuetype.dsp
new file mode 100644
index 00000000000..424f4eb9a5a
--- /dev/null
+++ b/TAO/tao/Valuetype/TAO_Valuetype.dsp
@@ -0,0 +1,199 @@
+# Microsoft Developer Studio Project File - Name="Valuetype" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+

+CFG=Valuetype - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "TAO_Valuetype.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "TAO_Valuetype.mak" CFG="Valuetype - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Valuetype - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "Valuetype - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+MTL=midl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "Valuetype - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "DLL\Release\Valuetype"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VALUETYPE_EXPORTS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_VALUETYPE_BUILD_DLL" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

+# ADD LINK32 TAO.lib ace.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_Valuetype.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+

+!ELSEIF  "$(CFG)" == "Valuetype - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "DLL\Debug\Valuetype"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VALUETYPE_EXPORTS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\.." /D "TAO_VALUETYPE_BUILD_DLL" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_Valuetyped.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Valuetype - Win32 Release"

+# Name "Valuetype - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# Begin Source File

+

+SOURCE=.\AbstractBase.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Seq_Tmplinst.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ValueBase.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ValueFactory.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\ValueFactory_Map.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Valuetype_Adapter_Impl.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=.\AbstractBase.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Sequence_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Value_VarOut_T.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ValueBase.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ValueFactory.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\ValueFactory_Map.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Valuetype_Adapter_Impl.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\valuetype_export.h

+# End Source File

+# End Group

+# Begin Group "Inline Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\AbstractBase.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\Sequence_T.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\Value_VarOut_T.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\ValueBase.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\ValueFactory.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\ValueFactory_Map.inl

+# End Source File

+# End Group

+# Begin Group "Template Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\Sequence_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

+

+SOURCE=.\Value_VarOut_T.cpp

+# PROP Exclude_From_Build 1

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/TAO/tao/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp
index b575025d1a4..84c747280e4 100644
--- a/TAO/tao/ValueBase.cpp
+++ b/TAO/tao/Valuetype/ValueBase.cpp
@@ -13,57 +13,76 @@
 //
 // ============================================================================
 
+#include "ValueBase.h"
 #include "tao/CDR.h"
 #include "tao/ORB.h"
 #include "tao/ORB_Core.h"
-#include "tao/ValueBase.h"
-#include "tao/ValueFactory.h"
+#include "ValueFactory.h"
 #include "tao/debug.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/ValueBase.i"
+# include "ValueBase.inl"
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID (tao,
            ValueBase,
            "$Id$")
 
+// Static operations in namespace CORBA.
+
+void
+CORBA::add_ref (CORBA::ValueBase *val)
+{
+  if (val)
+    {
+      val->_add_ref ();
+    }
+}
+
 void
-CORBA::tao_ValueBase_life::tao_add_ref (
-    ValueBase * p
-  )
+CORBA::remove_ref (CORBA::ValueBase *val)
+{
+  if (val)
+    {
+      val->_remove_ref ();
+    }
+}
+
+// ===========================================================
+
+void
+CORBA::tao_ValueBase_life::tao_add_ref (ValueBase *p)
 {
   CORBA::add_ref (p);
 }
 
 void
-CORBA::tao_ValueBase_life::tao_remove_ref (
-    ValueBase * p
-  )
+CORBA::tao_ValueBase_life::tao_remove_ref (ValueBase *p)
 {
   CORBA::remove_ref (p);
 }
 
-CORBA::ValueBase::~ValueBase (void)
+// ***********************************************************************
+
+CORBA::ValueBase::ValueBase (void)
 {
 }
 
-CORBA::ValueBase*
-CORBA::ValueBase::_downcast (CORBA::ValueBase *vt)
+CORBA::ValueBase::~ValueBase (void)
 {
-  return vt;  // every vt is a CORBA::ValueBase :-)
 }
 
-/*static*/ CORBA::ValueBase*
-CORBA::ValueBase::_nil (void)
+CORBA::ValueBase*
+CORBA::ValueBase::_downcast (CORBA::ValueBase *vt)
 {
-  return 0;
+  // Every vt is a CORBA::ValueBase :-).
+  return vt;
 }
 
 void
 CORBA::ValueBase::_tao_any_destructor (void *x)
 {
-  CORBA::ValueBase * tmp = ACE_static_cast (CORBA::ValueBase *, x);
+  CORBA::ValueBase *tmp = ACE_static_cast (CORBA::ValueBase *, x);
   CORBA::remove_ref (tmp);
 }
 
@@ -340,7 +359,58 @@ CORBA::DefaultValueRefCountBase::_refcount_value (void)
 
 // ===========================================================
 
-// some constants
+CORBA::DefaultValueRefCountBase::DefaultValueRefCountBase (void)
+  : _tao_reference_count_ (1)
+{
+}
+
+
+void
+CORBA::DefaultValueRefCountBase::_tao_add_ref (void)
+{
+  ACE_GUARD (TAO_SYNCH_MUTEX, 
+             guard, 
+             this->_tao_reference_count_lock_);
+
+  ++this->_tao_reference_count_;
+}
+
+void
+CORBA::DefaultValueRefCountBase::_tao_remove_ref (void)
+{
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX, 
+               guard, 
+               this->_tao_reference_count_lock_);
+
+    --this->_tao_reference_count_;
+
+    if (this->_tao_reference_count_ != 0)
+      {
+        return;
+      }
+  }
+
+  // The guard has been already given up, but this is no problem
+  // cause we have held the last reference, and this one we don't give
+  // away anymore, we do:
+  delete this;
+}
+
+CORBA::ULong
+CORBA::DefaultValueRefCountBase::_tao_refcount_value (void)
+{
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                    guard,
+                    this->_tao_reference_count_lock_,
+                    0);
+
+  return _tao_reference_count_;
+}
+
+// ===========================================================
+
+// Some constants.
 
 const CORBA::ULong TAO_OBV_GIOP_Flags::Value_tag_base    = 0x7fffff00L;
 const CORBA::ULong TAO_OBV_GIOP_Flags::Value_tag_sigbits = 0xffffff00L;
@@ -372,14 +442,3 @@ operator>> (TAO_InputCDR &strm,
                                            _tao_valuetype);
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  template class TAO_Pseudo_Value_Var_T<CORBA::ValueBase>;
-  template class TAO_Pseudo_Value_Out_T<CORBA::ValueBase, CORBA::ValueBase_var>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate TAO_Pseudo_Value_Var_T<CORBA::ValueBase>
-# pragma instantiate TAO_Pseudo_Value_Out_T<CORBA::ValueBase, CORBA::ValueBase_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h
index a3fc3fad6e7..0c36015f1fd 100644
--- a/TAO/tao/ValueBase.h
+++ b/TAO/tao/Valuetype/ValueBase.h
@@ -16,6 +16,7 @@
 
 #include "ace/pre.h"
 
+#include "valuetype_export.h"
 #include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -23,23 +24,29 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/corbafwd.h"
-#include "tao/Pseudo_Value_VarOut_T.h"
+#include "Value_VarOut_T.h"
 
-#include "ace/Basic_Types.h"           /* for ptrdiff_t */
+#include "ace/Basic_Types.h"
 #include "ace/Synch_T.h"
+#include "ace/CORBA_macros.h"
 
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Valuetype_Export
 
 namespace CORBA
 {
   class ValueBase;
+  struct tao_ValueBase_life;
 
-  TAO_NAMESPACE_INLINE_FUNCTION void add_ref (ValueBase *);
-  TAO_NAMESPACE_INLINE_FUNCTION void remove_ref (ValueBase *);
+  extern TAO_Valuetype_Export void add_ref (ValueBase *);
+  extern TAO_Valuetype_Export void remove_ref (ValueBase *);
 
-  typedef TAO_Pseudo_Value_Var_T<ValueBase> ValueBase_var;
-  typedef TAO_Pseudo_Value_Out_T<ValueBase, ValueBase_var> ValueBase_out;
+  typedef TAO_Value_Var_T<ValueBase, tao_ValueBase_life> ValueBase_var;
+  typedef TAO_Value_Out_T<ValueBase, tao_ValueBase_life> ValueBase_out;
 
-  struct  tao_ValueBase_life
+  struct TAO_Valuetype_Export tao_ValueBase_life
   {
     static void tao_add_ref (ValueBase *);
     static void tao_remove_ref (ValueBase *);
@@ -52,14 +59,12 @@ namespace CORBA
    *
    * @see CORBA 2.3 - Section 20.17.5
    */
-  class TAO_Export ValueBase
+  class TAO_Valuetype_Export ValueBase
   {
   public:
     typedef ValueBase* _ptr_type;
     typedef ValueBase_var _var_type;
 
-
-    static ValueBase *_nil (void);
     // reference counting
     /// %! virtual CORBA::ValueBase* _copy_value (void) = 0;
     virtual void _add_ref (void) = 0;
@@ -134,7 +139,7 @@ namespace CORBA
    *
    * Default mix-in for reference count of a valuetype.
    */
-  class TAO_Export DefaultValueRefCountBase
+  class TAO_Valuetype_Export DefaultValueRefCountBase
     : public virtual ValueBase
   {
   public:
@@ -174,7 +179,7 @@ namespace CORBA
  *
  * @see CORBA 2.3 -- Section 15.3.4
  */
-class TAO_OBV_GIOP_Flags
+class TAO_Valuetype_Export TAO_OBV_GIOP_Flags
 {
 public:
   static const CORBA::ULong Value_tag_base;
@@ -198,14 +203,14 @@ public:
   static CORBA::Boolean is_end_tag            (CORBA::ULong);
 };
 
-TAO_Export CORBA::Boolean
+TAO_Valuetype_Export CORBA::Boolean
 operator<< (TAO_OutputCDR&, const CORBA::ValueBase *);
 
-TAO_Export CORBA::Boolean
+TAO_Valuetype_Export CORBA::Boolean
 operator>> (TAO_InputCDR&, CORBA::ValueBase *&);
 
 #if defined (__ACE_INLINE__)
-# include "tao/ValueBase.i"
+# include "ValueBase.inl"
 #endif /* __ACE_INLINE__*/
 
 #include "ace/post.h"
diff --git a/TAO/tao/Valuetype/ValueBase.inl b/TAO/tao/Valuetype/ValueBase.inl
new file mode 100644
index 00000000000..99face005a1
--- /dev/null
+++ b/TAO/tao/Valuetype/ValueBase.inl
@@ -0,0 +1,72 @@
+// This may not look like C++, but it's really -*- C++ -*-
+//
+// $Id$
+
+// Detection of flags in the CDR Stream
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags::is_null_ref (CORBA::ULong tag)
+{
+  return (tag == 0);
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags::is_value_tag (CORBA::ULong tag)
+{
+  return ((tag & Value_tag_sigbits) == 0x7FFFFF00L);
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags:: has_codebase_url (CORBA::ULong tag)
+{
+  return (CORBA::Boolean) (tag & Codebase_url);
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags::has_no_type_info (CORBA::ULong tag)
+{
+  return ((tag & Type_info_sigbits) == Type_info_none);
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags::has_single_type_info (CORBA::ULong tag)
+{
+  return ((tag & Type_info_sigbits) == Type_info_single);
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags::has_list_type_info (CORBA::ULong tag)
+{
+  return ((tag & Type_info_sigbits) == Type_info_list);
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags:: is_chunked (CORBA::ULong tag)
+{
+  return (CORBA::Boolean) (tag & 8);
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags::is_indirection_tag (CORBA::ULong tag)
+{
+  return (tag == 0xFFFFFFFFL);
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags::is_indirection (CORBA::ULong value)
+{
+  return (0x80000000L < value && value <= (0xFFFFFFFFL - 4));
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags::is_block_size (CORBA::ULong value)
+{
+  return ( 0 < value && value < 0x7fffff00L);
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_OBV_GIOP_Flags::is_end_tag (CORBA::ULong tag)
+{
+  return (0x80000000L < tag  && tag <= 0xFFFFFFFFL);
+}
+
diff --git a/TAO/tao/Valuetype/ValueFactory.cpp b/TAO/tao/Valuetype/ValueFactory.cpp
new file mode 100644
index 00000000000..895fb166cfc
--- /dev/null
+++ b/TAO/tao/Valuetype/ValueFactory.cpp
@@ -0,0 +1,92 @@
+#include "ValueFactory.h"
+
+#if !defined (__ACE_INLINE__)
+# include "ValueFactory.inl"
+#endif /* ! __ACE_INLINE__ */
+
+
+ACE_RCSID (tao,
+           ValueFactory,
+           "$Id$")
+
+// Static operations in namespace CORBA.
+
+void
+CORBA::add_ref (CORBA::ValueFactoryBase *val)
+{
+  if (val)
+    {
+      val->_add_ref ();
+    }
+}
+
+void
+CORBA::remove_ref (CORBA::ValueFactoryBase *val)
+{
+  if (val)
+    {
+      val->_remove_ref ();
+    }
+}
+
+// ===========================================================
+
+void
+CORBA::tao_ValueFactoryBase_life::tao_add_ref (ValueFactoryBase *p)
+{
+  CORBA::add_ref (p);
+}
+
+void
+CORBA::tao_ValueFactoryBase_life::tao_remove_ref (ValueFactoryBase *p)
+{
+  CORBA::remove_ref (p);
+}
+
+// ===========================================================
+
+CORBA::ValueFactoryBase::ValueFactoryBase (void)
+  : _tao_reference_count_ (1)
+{
+}
+
+CORBA::ValueFactoryBase::~ValueFactoryBase (void)
+{
+}
+
+void
+CORBA::ValueFactoryBase::_add_ref (void)
+{
+  ACE_GUARD (TAO_SYNCH_MUTEX, 
+             guard, 
+             this->_tao_reference_count_lock_);
+
+  ++this->_tao_reference_count_;
+}
+
+void
+CORBA::ValueFactoryBase::_remove_ref (void)
+{
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX, 
+               guard, 
+               this->_tao_reference_count_lock_);
+
+    --this->_tao_reference_count_;
+
+    if (this->_tao_reference_count_ != 0)
+      {
+        return;
+      }
+  }
+
+  delete this;
+}
+
+// No-op. This should never be called, but it can't be pure virtual.
+CORBA::AbstractBase *
+CORBA::ValueFactoryBase::create_for_unmarshal_abstract (void)
+{
+  return 0;
+}
+
diff --git a/TAO/tao/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h
index 875d3633e11..59183a72d0f 100644
--- a/TAO/tao/ValueFactory.h
+++ b/TAO/tao/Valuetype/ValueFactory.h
@@ -15,37 +15,41 @@
 #define TAO_VALUEFACTORY_H
 #include "ace/pre.h"
 
+#include "valuetype_export.h"
 #include "tao/corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Pseudo_Value_VarOut_T.h"
-
+#include "Value_VarOut_T.h"
 #include "ace/Synch_T.h"
 
 namespace CORBA
 {
   class ValueFactoryBase;
+  struct tao_ValueFactoryBase_life;
 
-  TAO_NAMESPACE_INLINE_FUNCTION void add_ref (ValueFactoryBase *);
-  TAO_NAMESPACE_INLINE_FUNCTION void remove_ref (ValueFactoryBase *);
-
-  typedef TAO_Pseudo_Value_Var_T<ValueFactoryBase> ValueFactoryBase_var;
+  extern TAO_Valuetype_Export void add_ref (ValueFactoryBase *);
+  extern TAO_Valuetype_Export void remove_ref (ValueFactoryBase *);
 
-  typedef TAO_Pseudo_Value_Out_T<ValueFactoryBase, ValueFactoryBase_var>
-    ValueFactoryBase_out;
+  typedef TAO_Value_Var_T<ValueFactoryBase, 
+                          tao_ValueFactoryBase_life> 
+    ValueFactoryBase_var;
 
   typedef ValueFactoryBase_var ValueFactory_var;
 
-  class TAO_Export ValueFactoryBase
+  struct TAO_Valuetype_Export tao_ValueFactoryBase_life
   {
-  public:
-    ValueFactoryBase ();
-    virtual ~ValueFactoryBase ();
+    static void tao_add_ref (ValueFactoryBase *);
+    static void tao_remove_ref (ValueFactoryBase *);
+  };
 
-    static ValueFactoryBase * _nil (void);
+  class TAO_Valuetype_Export ValueFactoryBase
+  {
+  public:
+    ValueFactoryBase (void);
+    virtual ~ValueFactoryBase (void);
 
     // non-virtual is non-standard
     void _add_ref (void);
@@ -63,7 +67,8 @@ namespace CORBA
   private:
     CORBA::ULong _tao_reference_count_;
     TAO_SYNCH_MUTEX _tao_reference_count_lock_;
-  }; // CORBA_ValueFactoryBase
+  };
+
 }  // End CORBA namespace
 
 // Use this macro for writing code that is independend from
@@ -99,7 +104,7 @@ namespace CORBA
 
 
 #if defined (__ACE_INLINE__)
-# include "tao/ValueFactory.i"
+# include "ValueFactory.inl"
 #endif /* __ACE_INLINE__) */
 
 #include "ace/post.h"
diff --git a/TAO/tao/Valuetype/ValueFactory.inl b/TAO/tao/Valuetype/ValueFactory.inl
new file mode 100644
index 00000000000..bf195e7d4ae
--- /dev/null
+++ b/TAO/tao/Valuetype/ValueFactory.inl
@@ -0,0 +1,4 @@
+// -*- C++ -*-
+//
+// $Id$
+
diff --git a/TAO/tao/ValueFactory_Map.cpp b/TAO/tao/Valuetype/ValueFactory_Map.cpp
index d43b139f1c2..068e8c9c50e 100644
--- a/TAO/tao/ValueFactory_Map.cpp
+++ b/TAO/tao/Valuetype/ValueFactory_Map.cpp
@@ -1,8 +1,8 @@
-#include "tao/ValueFactory_Map.h"
-#include "tao/ValueFactory.h"
+#include "ValueFactory_Map.h"
+#include "ValueFactory.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/ValueFactory_Map.i"
+# include "ValueFactory_Map.inl"
 #endif /* ! __ACE_INLINE__ */
 
 
diff --git a/TAO/tao/ValueFactory_Map.h b/TAO/tao/Valuetype/ValueFactory_Map.h
index 78ea7c3e915..c94a28f1e6d 100644
--- a/TAO/tao/ValueFactory_Map.h
+++ b/TAO/tao/Valuetype/ValueFactory_Map.h
@@ -15,17 +15,18 @@
 #define TAO_VALUEFACTORY_MAP_H
 #include "ace/pre.h"
 
-#include "ace/Hash_Map_Manager_T.h"
+#include "tao/corbafwd.h"
+#include "tao/TAO_Singleton.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/TAO_Singleton.h"
-#include "ace/Synch.h"
-#include "tao/corbafwd.h"
+#include "valuetype_export.h"
+#include "ace/Hash_Map_Manager_T.h"
+//#include "ace/Synch.h"
 
-class TAO_ValueFactory_Map
+class TAO_Valuetype_Export TAO_ValueFactory_Map
 {
 public:
 
@@ -40,18 +41,21 @@ public:
    * Returns -1 on failure, 0 on success and 1 if a previous factory
    * is found (and returned in factory).
    */
-  int rebind (const char *repo_id, CORBA::ValueFactory &factory);
+  int rebind (const char *repo_id, 
+              CORBA::ValueFactory &factory);
 
   /// Removes entry for repo_id from the map and sets factory to
   /// the tied one.
-  int unbind (const char *repo_id, CORBA::ValueFactory &factory);
+  int unbind (const char *repo_id, 
+              CORBA::ValueFactory &factory);
 
   /**
    * Lookup a matching factory for repo_id.
    * Invokes _add_ref () on the factory if found.
    * Returns -1 on failure and 0 on success.
    */
-  int find (const char *repo_id, CORBA::ValueFactory &factory);
+  int find (const char *repo_id, 
+            CORBA::ValueFactory &factory);
 
   void dump (void);
 
@@ -68,18 +72,18 @@ private:
 }; /* TAO_ValueFactory_Map */
 
 
-// currently the ValueFactory_Map is a singleton and not per ORB
-// as in the OMG specs
+// Currently the ValueFactory_Map is a singleton and not per ORB
+// as in the OMG spec.
 typedef TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX>
         TAO_VALUEFACTORY_MAP;
 
-TAO_SINGLETON_DECLARE (TAO_Singleton,
-                       TAO_ValueFactory_Map,
-                       TAO_SYNCH_MUTEX)
+TAO_VALUETYPE_SINGLETON_DECLARE (TAO_Singleton,
+                                 TAO_ValueFactory_Map,
+                                 TAO_SYNCH_MUTEX)
 
 
 #if defined (__ACE_INLINE__)
-# include "tao/ValueFactory_Map.i"
+# include "ValueFactory_Map.inl"
 #endif /* __ACE_INLINE__) */
 
 #include "ace/post.h"
diff --git a/TAO/tao/ValueFactory_Map.i b/TAO/tao/Valuetype/ValueFactory_Map.inl
index cfa1da318d3..cfa1da318d3 100644
--- a/TAO/tao/ValueFactory_Map.i
+++ b/TAO/tao/Valuetype/ValueFactory_Map.inl
diff --git a/TAO/tao/Value_VarOut_T.cpp b/TAO/tao/Valuetype/Value_VarOut_T.cpp
index 5b75b912c9b..9ee88a39c8f 100644
--- a/TAO/tao/Value_VarOut_T.cpp
+++ b/TAO/tao/Valuetype/Value_VarOut_T.cpp
@@ -3,7 +3,7 @@
 #ifndef TAO_VALUE_VAROUT_T_C
 #define TAO_VALUE_VAROUT_T_C
 
-#include "tao/Value_VarOut_T.h"
+#include "Value_VarOut_T.h"
 
 ACE_RCSID (tao, 
            Value_VarOut_T, 
diff --git a/TAO/tao/Value_VarOut_T.h b/TAO/tao/Valuetype/Value_VarOut_T.h
index 67ac420ddf0..a2fcee4223e 100644
--- a/TAO/tao/Value_VarOut_T.h
+++ b/TAO/tao/Valuetype/Value_VarOut_T.h
@@ -89,11 +89,11 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-#include "tao/Value_VarOut_T.inl"
+#include "Value_VarOut_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Value_VarOut_T.cpp"
+#include "Value_VarOut_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/tao/Value_VarOut_T.inl b/TAO/tao/Valuetype/Value_VarOut_T.inl
index 74e88caa0c5..74e88caa0c5 100644
--- a/TAO/tao/Value_VarOut_T.inl
+++ b/TAO/tao/Valuetype/Value_VarOut_T.inl
diff --git a/TAO/tao/Valuetype/Valuetype.mpc b/TAO/tao/Valuetype/Valuetype.mpc
new file mode 100644
index 00000000000..b1d3579aed3
--- /dev/null
+++ b/TAO/tao/Valuetype/Valuetype.mpc
@@ -0,0 +1,7 @@
+project : taolib, core {
+  sharedname  = TAO_Valuetype
+  libs       += TAO
+  dllflags    = TAO_VALUETYPE_BUILD_DLL
+  libout      = ..
+  include_dir = tao/Valuetype
+}
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
new file mode 100644
index 00000000000..5990001b91b
--- /dev/null
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
@@ -0,0 +1,82 @@
+// $Id$
+
+#include "Valuetype_Adapter_Impl.h"
+#include "AbstractBase.h"
+#include "ValueBase.h"
+#include "ValueFactory_Map.h"
+#include "tao/ORB_Core.h"
+
+ACE_RCSID (Valuetype,
+           Valuetype_Adapter_Impl,
+           "$Id$")
+
+TAO_Valuetype_Adapter_Impl::~TAO_Valuetype_Adapter_Impl (void)
+{
+}
+
+CORBA::Object_ptr 
+TAO_Valuetype_Adapter_Impl::abstractbase_to_object (
+    CORBA::AbstractBase_ptr p
+  )
+{
+  return p->_to_object ();
+}
+
+CORBA::ULong
+TAO_Valuetype_Adapter_Impl::type_info_single (void) const
+{
+  return TAO_OBV_GIOP_Flags::Type_info_single;
+}
+
+TAO_ValueFactory_Map *
+TAO_Valuetype_Adapter_Impl::valuefactory_map_instance (void)
+{
+  return TAO_VALUEFACTORY_MAP::instance ();
+}
+    
+int 
+TAO_Valuetype_Adapter_Impl::vf_map_rebind (TAO_ValueFactory_Map *map,
+                                           const char *repo_id,
+                                           CORBA::ValueFactory &factory)
+{
+  return map->rebind (repo_id,
+                      factory);
+}
+
+int 
+TAO_Valuetype_Adapter_Impl::vf_map_find (TAO_ValueFactory_Map *map,
+                                         const char *repo_id,
+                                         CORBA::ValueFactory &factory)
+{
+  return map->find (repo_id,
+                    factory);
+}
+    
+// *********************************************************************
+
+// Initialization and registration of dynamic service object.
+
+int
+TAO_Valuetype_Adapter_Impl::Initializer (void)
+{
+  TAO_ORB_Core::valuetype_adapter_name (
+      "Concrete_Valuetype_Adapter"
+    );
+
+  return 
+    ACE_Service_Config::process_directive (
+        ace_svc_desc_TAO_Valuetype_Adapter_Impl
+      );
+}
+
+ACE_STATIC_SVC_DEFINE (
+    TAO_Valuetype_Adapter_Impl,
+    ACE_TEXT ("Concrete_Valuetype_Adapter"),
+    ACE_SVC_OBJ_T,
+    &ACE_SVC_NAME (TAO_Valuetype_Adapter_Impl),
+    ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+    0
+  )
+
+ACE_FACTORY_DEFINE (TAO_Valuetype, TAO_Valuetype_Adapter_Impl)
+
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
new file mode 100644
index 00000000000..8a7ca834c1c
--- /dev/null
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
@@ -0,0 +1,81 @@
+// This may look like C, but it's really -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Valuetype_Adapter_Impl.h
+ *
+ *  $Id$
+ *
+ *  @author  Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
+
+#ifndef TAO_VALUETYPE_ADAPTER_IMPL_H
+#define TAO_VALUETYPE_ADAPTER_IMPL_H
+#include "ace/pre.h"
+
+#include "ace/Service_Config.h"
+#include "tao/Valuetype_Adapter.h"
+#include "valuetype_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+/**
+ * @class TAO_Valuetype_Adapter_Impl
+ *
+ * @brief TAO_Valuetype_Adapter_Impl.
+ *
+ * Class that adapts various functions involving the Valuetype,
+ * ValueFactory and AbstractInterface classes. This is a concrete class
+ * implementating the pure virtual methods of TAO_Valuetype_Adapter
+ */
+class TAO_Valuetype_Export TAO_Valuetype_Adapter_Impl 
+  : public TAO_Valuetype_Adapter
+{
+public:
+  virtual ~TAO_Valuetype_Adapter_Impl (void);
+
+  virtual CORBA::Object_ptr abstractbase_to_object (
+      CORBA::AbstractBase_ptr
+    );
+
+  virtual CORBA::ULong type_info_single (void) const;
+
+  virtual TAO_ValueFactory_Map *valuefactory_map_instance (void);
+
+  virtual int vf_map_rebind (TAO_ValueFactory_Map *,
+                             const char *,
+                             CORBA::ValueFactory &);
+
+  virtual int vf_map_find (TAO_ValueFactory_Map *,
+                           const char *,
+                           CORBA::ValueFactory &);
+    
+  // Used to force the initialization of the ORB code.
+  static int Initializer (void);
+};
+
+ACE_STATIC_SVC_DECLARE (TAO_Valuetype_Adapter_Impl)
+ACE_FACTORY_DECLARE (TAO_Valuetype, TAO_Valuetype_Adapter_Impl)
+
+#if defined (ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
+
+typedef int (*TAO_Module_Initializer) (void);
+
+static TAO_Module_Initializer
+TAO_Requires_Valuetype_Initializer =
+  &TAO_Valuetype_Adapter_Impl::Initializer;
+
+#else
+
+static int
+TAO_Requires_Valuetype_Initializer =
+  TAO_Valuetype_Adapter_Impl::Initializer ();
+
+#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
+
+#include "ace/post.h"
+#endif /* TAO_VALUETYPE_ADAPTER_IMPL_H */
diff --git a/TAO/tao/Valuetype/valuetype_export.h b/TAO/tao/Valuetype/valuetype_export.h
new file mode 100644
index 00000000000..851fa9a4ea2
--- /dev/null
+++ b/TAO/tao/Valuetype/valuetype_export.h
@@ -0,0 +1,40 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl
+// ------------------------------
+#ifndef TAO_VAULETYPE_EXPORT_H
+#define TAO_VAULETYPE_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (TAO_AS_STATIC_LIBS)
+#  if !defined (TAO_VALUETYPE_HAS_DLL)
+#    define TAO_VALUETYPE_HAS_DLL 0
+#  endif /* ! TAO_IORINTERCEPTOR_HAS_DLL */
+#else
+#  if !defined (TAO_VALUETYPE_HAS_DLL)
+#    define TAO_VALUETYPE_HAS_DLL 1
+#  endif /* ! TAO_IORINTERCEPTOR_HAS_DLL */
+#endif
+
+#if defined (TAO_VALUETYPE_HAS_DLL) && (TAO_VALUETYPE_HAS_DLL == 1)
+#  if defined (TAO_VALUETYPE_BUILD_DLL)
+#    define TAO_Valuetype_Export ACE_Proper_Export_Flag
+#    define TAO_VALUETYPE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TAO_VALUETYPE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TAO_VALUETYPE_BUILD_DLL */
+#    define TAO_Valuetype_Export ACE_Proper_Import_Flag
+#    define TAO_VALUETYPE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TAO_VALUETYPE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TAO_IORINTERCEPTOR_BUILD_DLL */
+#else /* TAO_VALUETYPE_HAS_DLL == 1 */
+#  define TAO_Valuetype_Export
+#  define TAO_VALUETYPE_SINGLETON_DECLARATION(T)
+#  define TAO_VALUETYPE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TAO_VALUETYPE_HAS_DLL == 1 */
+
+#endif /* TAO_VAULETYPE_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/tao/Valuetype_Adapter.cpp b/TAO/tao/Valuetype_Adapter.cpp
new file mode 100644
index 00000000000..29e05d3ea98
--- /dev/null
+++ b/TAO/tao/Valuetype_Adapter.cpp
@@ -0,0 +1,24 @@
+// @(#) $Id$
+
+#include "tao/Valuetype_Adapter.h"
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID (tao, 
+           Valuetype_Adapter, 
+           "$Id$")
+
+TAO_Valuetype_Adapter::~TAO_Valuetype_Adapter (void)
+{
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Dynamic_Service<TAO_Valuetype_Adapter>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Dynamic_Service<TAO_Valuetype_Adapter>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+
diff --git a/TAO/tao/Valuetype_Adapter.h b/TAO/tao/Valuetype_Adapter.h
new file mode 100644
index 00000000000..9c9c4b8f5a6
--- /dev/null
+++ b/TAO/tao/Valuetype_Adapter.h
@@ -0,0 +1,60 @@
+// This may look like C, but it's really -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Valuetype_Adapter.h
+ *
+ *  $Id$
+ *
+ *  @author  Jeff Parsons <j.parsons@vanderbilt.edu>
+ */
+//=============================================================================
+
+
+#ifndef TAO_VALUETYPE_ADAPTER_H
+#define TAO_VALUETYPE_ADAPTER_H
+#include "ace/pre.h"
+
+#include "ace/Service_Object.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/corbafwd.h"
+
+class TAO_ValueFactory_Map;
+
+/**
+ * @class TAO_Valuetype_Adapter
+ *
+ * @brief TAO_Valuetype_Adapter.
+ *
+ * Class that adapts various functions involving the Valuetype,
+ * ValueFactory and AbstractInterface classes. This is a base class for
+ * the actual implementation in the TAO_Valuetype library.
+ */
+class TAO_Export TAO_Valuetype_Adapter : public ACE_Service_Object
+{
+public:
+  virtual ~TAO_Valuetype_Adapter (void);
+
+  virtual CORBA::Object_ptr abstractbase_to_object (
+      CORBA::AbstractBase_ptr p
+    ) = 0;
+
+  virtual CORBA::ULong type_info_single (void) const = 0;
+
+  virtual TAO_ValueFactory_Map * valuefactory_map_instance (void) = 0;
+
+  virtual int vf_map_rebind (TAO_ValueFactory_Map *,
+                             const char *,
+                             CORBA::ValueFactory &) = 0;
+
+  virtual int vf_map_find (TAO_ValueFactory_Map *,
+                           const char *,
+                           CORBA::ValueFactory &) = 0;
+};
+
+#include "ace/post.h"
+#endif /* TAO_VALUETYPE_ADAPTER_H */
diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp
index 48b819a5070..2a0132d6119 100644
--- a/TAO/tao/append.cpp
+++ b/TAO/tao/append.cpp
@@ -23,11 +23,14 @@
 #include "tao/CDR.h"
 #include "tao/Environment.h"
 #include "tao/Any.h"
-#include "tao/ValueBase.h"
 #include "tao/debug.h"
+#include "tao/Valuetype_Adapter.h"
+#include "tao/ORB_Core.h"
 
-ACE_RCSID (tao,
-           append,
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID (tao, 
+           append, 
            "$Id$")
 
 // Encode instances of arbitrary data types based only on typecode.
@@ -1190,12 +1193,23 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
           return CORBA::TypeCode::TRAVERSE_STOP;
         }
 
+      TAO_Valuetype_Adapter *adapter =
+        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
+            TAO_ORB_Core::valuetype_adapter_name ()
+          );
+
+      if (adapter == 0)
+        {
+          ACE_THROW_RETURN (CORBA::INTERNAL (),
+                            CORBA::TypeCode::TRAVERSE_STOP);
+        }
+
       if (value_tag == 0) // Null value type pointer.
         {
           //We are done.
           return retval;
         }
-      else if (value_tag & TAO_OBV_GIOP_Flags::Type_info_single)
+      else if (value_tag & adapter->type_info_single ())
         {
           // Append repository id which is of type string.
           dest->append_string (*src);
@@ -1210,6 +1224,7 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
   // Handle our base valuetype if any.
   param = tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+
   if (param->kind () != CORBA::tk_null)
     {
       retval = this->append (param.in (),
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index 83c6348f486..8167801991b 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -36,7 +36,13 @@
 // The definitions are included in the same order as they are declared
 // in corbafwd.h
 #include "tao/Typecode.h"
-#include "tao/Any_T.h"
+
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Basic_Impl_T.h"
+#include "tao/Any_Special_Impl_T.h"
+#include "tao/Any_Special_Basic_Impl_T.h"
+#include "tao/Any_Array_Impl_T.h"
+#include "tao/Any_Dual_Impl_T.h"
 
 #include "tao/Environment.h"
 #include "tao/Exception.h"
@@ -51,9 +57,6 @@
 
 #include "tao/CurrentC.h"
 #include "tao/BoundsC.h"
-#include "tao/ValueBase.h"
-#include "tao/ValueFactory.h"
-#include "tao/AbstractBase.h"
 #include "tao/PolicyC.h"
 #include "tao/ServicesC.h"
 #include "tao/DomainC.h"
@@ -70,8 +73,6 @@
 
 // Template _var and _out classes.
 #include "tao/Objref_VarOut_T.h"
-#include "tao/Value_VarOut_T.h"
-#include "tao/Pseudo_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/Array_VarOut_T.h"
diff --git a/TAO/tao/corbafwd.cpp b/TAO/tao/corbafwd.cpp
index 729c1878842..1f1c301dc48 100644
--- a/TAO/tao/corbafwd.cpp
+++ b/TAO/tao/corbafwd.cpp
@@ -8,12 +8,10 @@
 
 #include "ace/OS.h"
 
-
-ACE_RCSID (tao,
-           corbafwd,
+ACE_RCSID (tao, 
+           corbafwd, 
            "$Id$")
 
-
 char *
 CORBA::string_dup (const char *str)
 {
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 9f2380418d9..fef6980dbf3 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -343,7 +343,6 @@ namespace CORBA
    */
   //@{
   TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Object_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (AbstractBase_ptr);
   TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Environment_ptr);
   TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (TypeCode_ptr);
   TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ORB_ptr);
@@ -362,7 +361,6 @@ namespace CORBA
    */
   //@{
   TAO_NAMESPACE_INLINE_FUNCTION void release (Object_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (AbstractBase_ptr);
   TAO_NAMESPACE_INLINE_FUNCTION void release (Environment_ptr);
   TAO_NAMESPACE_INLINE_FUNCTION void release (Principal_ptr);
   TAO_NAMESPACE_INLINE_FUNCTION void release (TypeCode_ptr);
diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp
index d66e3a71bfd..b62e2b7c114 100644
--- a/TAO/tao/skip.cpp
+++ b/TAO/tao/skip.cpp
@@ -23,8 +23,11 @@
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Environment.h"
-#include "tao/ValueBase.h"
 #include "tao/debug.h"
+#include "tao/Valuetype_Adapter.h"
+#include "tao/ORB_Core.h"
+
+#include "ace/Dynamic_Service.h"
 
 ACE_RCSID (tao, 
 
@@ -948,12 +951,23 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr  tc,
           return CORBA::TypeCode::TRAVERSE_STOP;
         }
 
+      TAO_Valuetype_Adapter *adapter =
+        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
+            TAO_ORB_Core::valuetype_adapter_name ()
+          );
+
+      if (adapter == 0)
+        {
+          ACE_THROW_RETURN (CORBA::INTERNAL (),
+                            CORBA::TypeCode::TRAVERSE_STOP);
+        }
+
       if (value_tag == 0) // Null value type pointer.
         {
           //We are done.
           return retval;
         }
-      else if (value_tag & TAO_OBV_GIOP_Flags::Type_info_single)
+      else if (value_tag & adapter->type_info_single ())
         {
           // Skip a single repository id which is of type string.
           stream->skip_string ();
@@ -968,6 +982,7 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr  tc,
   // Handle our base valuetype if any.
   param = tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+
   if (param->kind () != CORBA::tk_null)
     {
       retval = this->skip (param.in (), stream ACE_ENV_ARG_PARAMETER);