ChangeLogTag: Thu Sep 18 21:00:50 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

68 files changed, 421 insertions, 198 deletions

diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index e39bd6289e0..848fe7a072a 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,89 @@
+Thu Sep 18 21:00:50 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_arg_traits.cpp (visit_sequence):
+
+	  Changed #ifdef guard generation to use the flat name of
+	  the sequence typedef (anonymous sequences can't be used
+	  as operation arguments).
+
+        * orbsvcs/orbsvcs/CosEvent.dsp:
+        * orbsvcs/orbsvcs/CosNaming.dsp:
+        * orbsvcs/orbsvcs/CosNotification.dsp:
+        * orbsvcs/orbsvcs/FT_ORB.dsp:
+        * tao/IORManipulation/TAO_IORManip.dsp:
+
+	  Turned on RTTI, and in some cases add a link to the 
+	  TAO_Valuetype library.
+
+        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Factory.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp:
+        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h:
+        * orbsvcs/orbsvcs/CosEvent/event_export.h:
+        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp:
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp:
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp:
+        * tao/DynamicAny/DynamicAnyC.h:
+
+	  Changes to eliminate compile and link errors in CosNotification.
+
+        * tao/CONV_FRAMEC.cpp:
+        * tao/CORBALOC_Parser.cpp:
+        * tao/CORBALOC_Parser.h:
+        * tao/CORBANAME_Parser.cpp:
+        * tao/CORBANAME_Parser.h:
+        * tao/CORBA_String.cpp:
+        * tao/ClientRequestInterceptor_Adapter.cpp:
+        * tao/CodecFactory.h:
+        * tao/CodecFactory_ORBInitializer.h:
+        * tao/Codeset_Manager.cpp:
+        * tao/Codeset_Manager.h:
+        * tao/Codeset_Translator_Factory.cpp:
+        * tao/Collocated_Invocation.h:
+        * tao/Collocation_Resolver.cpp:
+        * tao/Collocation_Resolver.h:
+        * tao/Connect_Strategy.cpp:
+        * tao/Connect_Strategy.h:
+        * tao/Connection_Handler.cpp:
+        * tao/Connection_Handler.h:
+        * tao/Connection_Purging_Strategy.cpp:
+        * tao/Connection_Purging_Strategy.h:
+        * tao/Connector_Registry.cpp:
+        * tao/Connector_Registry.h:
+        * tao/CurrentC.cpp:
+        * tao/CurrentC.h:
+        * tao/DLL_ORB.cpp:
+        * tao/DLL_ORB.h:
+        * tao/DLL_Parser.cpp:
+        * tao/DLL_Parser.h:
+        * tao/Default_Collocation_Resolver.cpp:
+        * tao/Default_Collocation_Resolver.h:
+        * tao/Default_Endpoint_Selector_Factory.cpp:
+        * tao/Default_Endpoint_Selector_Factory.h:
+        * tao/Default_Protocols_Hooks.cpp:
+        * tao/Default_Protocols_Hooks.h:
+        * tao/Default_Stub_Factory.cpp:
+        * tao/Default_Stub_Factory.h:
+        * tao/Default_Thread_Lane_Resources_Manager.cpp:
+        * tao/Default_Thread_Lane_Resources_Manager.h:
+        * tao/DomainC.cpp:
+        * tao/DomainC.h:
+        * tao/Objref_VarOut_T.h:
+        * tao/PolicyC.h:
+        * tao/UB_String_Argument_T.cpp:
+        * tao/debug.h:
+        * tao/default_client.cpp:
+        * tao/default_client.h:
+        * tao/default_resource.cpp:
+        * tao/default_resource.h:
+        * tao/default_server.cpp:
+        * tao/default_server.h:
+
+	  Cleaned up #include structure.
+
 Thu Sep 18 12:13:50 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_arg_traits.cpp (visit_sequence):
diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
index 4819b44b29b..31bf02b720f 100644
--- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
@@ -263,7 +263,7 @@ be_visitor_arg_traits::visit_sequence (be_sequence *node)
 
   // This will include the bound if there is one, and should also
   // prevent duplication, even if there have been further typdefs.
-  os->gen_ifdef_macro (node->flat_name (), "arg_traits");
+  os->gen_ifdef_macro (alias->flat_name (), "arg_traits");
 
   *os << be_nl << be_nl
       << "ACE_TEMPLATE_SPECIALIZATION" << be_nl
@@ -281,7 +281,7 @@ be_visitor_arg_traits::visit_sequence (be_sequence *node)
 
   os->gen_endif ();
 
-//  this->generated (node, I_TRUE);
+  this->generated (node, I_TRUE);
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
index 8476e47731a..75b8e2c7540 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
@@ -12,15 +12,17 @@
 
 #ifndef TAO_CEC_CONSUMERCONTROL_H
 #define TAO_CEC_CONSUMERCONTROL_H
+
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosEvent/event_export.h"
+#include "tao/corba.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/corba.h"
+#include "tao/Objref_VarOut_T.h"
+#include "orbsvcs/CosEvent/event_export.h"
 
 class TAO_CEC_EventChannel;
 class TAO_CEC_ProxyPushSupplier;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
index cfc18b78700..18894a753d8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
@@ -16,17 +16,20 @@
 #define TAO_CEC_DISPATCHING_TASK_H
 
 #include /**/ "ace/pre.h"
-
 #include "ace/Task.h"
-#include "ace/Message_Block.h"
-#include "ace/Lock_Adapter_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Message_Block.h"
+#include "ace/Lock_Adapter_T.h"
+
+#include "tao/Basic_Types.h"
+#include "tao/Objref_VarOut_T.h"
 #include "orbsvcs/CosEvent/event_export.h"
 #include "CEC_ProxyPushSupplier.h"
+
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
 #include "CEC_TypedEvent.h"
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
index bc92de0b99b..a150c84e20e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
@@ -12,16 +12,17 @@
 
 #ifndef TAO_CEC_FACTORY_H
 #define TAO_CEC_FACTORY_H
-#include /**/ "ace/pre.h"
 
-#include "event_export.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/corba.h"
-#include "ace/Service_Object.h"
+#include "tao/Objref_VarOut_T.h"
+#include "event_export.h"
 
 class ACE_Lock;
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
index f6153df1220..1087fc49918 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -12,6 +12,7 @@
 #include "tao/DynamicInterface/Request.h"
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
+#include "tao/debug.h"
 #include "ace/Reverse_Lock_T.h"
 
 #if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
index be324ea2efb..0ed4782cf77 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
@@ -12,14 +12,18 @@
 
 #ifndef TAO_CEC_PULLING_STRATEGY_H
 #define TAO_CEC_PULLING_STRATEGY_H
+
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosEvent/event_export.h"
+#include "tao/Basic_Types.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Objref_VarOut_T.h"
+#include "orbsvcs/CosEvent/event_export.h"
+
 /**
  * @class TAO_CEC_Pulling_Strategy
  *
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
index 96d1e0119cd..94b53443ebf 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
@@ -18,7 +18,9 @@
 #include "CEC_Reactive_SupplierControl.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(CosEvent, CEC_Reactive_SupplierControl, "$Id$")
+ACE_RCSID (CosEvent, 
+           CEC_Reactive_SupplierControl, 
+           "$Id$")
 
 TAO_CEC_Reactive_SupplierControl::
      TAO_CEC_Reactive_SupplierControl (const ACE_Time_Value &rate,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
index 3bdcb86f3cf..c25375b62cd 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
@@ -17,19 +17,23 @@
 
 #ifndef TAO_CEC_SUPPLIERCONTROL_H
 #define TAO_CEC_SUPPLIERCONTROL_H
+
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosEvent/event_export.h"
+#include "tao/Basic_Types.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Objref_Varout_T.h"
+#include "orbsvcs/CosEvent/event_export.h"
 #include "tao/corba.h"
 
 class TAO_CEC_EventChannel;
 class TAO_CEC_ProxyPushConsumer;
 class TAO_CEC_ProxyPullConsumer;
+
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
 class TAO_CEC_TypedProxyPushConsumer;
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/event_export.h b/TAO/orbsvcs/orbsvcs/CosEvent/event_export.h
index 5d16512df9b..fa146a3381b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/event_export.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/event_export.h
@@ -35,6 +35,114 @@
 #  define TAO_EVENT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #endif /* TAO_EVENT_HAS_DLL == 1 */
 
+// Export decl of Objref_Traits<> specializations needed by other libs.
+namespace CosEventChannelAdmin
+{
+  class ProxyPushSupplier;
+  typedef ProxyPushSupplier *ProxyPushSupplier_ptr;
+  class ProxyPushConsumer;
+  typedef ProxyPushConsumer *ProxyPushConsumer_ptr;
+}
+
+namespace CosEventComm
+{
+  class PushSupplier;
+  typedef PushSupplier *PushSupplier_ptr;
+  class PushConsumer;
+  typedef PushConsumer *PushConsumer_ptr;
+  class PullSupplier;
+  typedef PullSupplier *PullSupplier_ptr;
+  class PullConsumer;
+  typedef PullConsumer *PullConsumer_ptr;
+}
+
+namespace TAO
+{
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_Event_Export Objref_Traits<CosEventChannelAdmin::ProxyPushSupplier>
+  {
+    static CosEventChannelAdmin::ProxyPushSupplier_ptr tao_duplicate (
+        CosEventChannelAdmin::ProxyPushSupplier_ptr
+      );
+    static void tao_release (CosEventChannelAdmin::ProxyPushSupplier_ptr);
+    static CosEventChannelAdmin::ProxyPushSupplier_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        CosEventChannelAdmin::ProxyPushSupplier_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_Event_Export Objref_Traits<CosEventChannelAdmin::ProxyPushConsumer>
+  {
+    static CosEventChannelAdmin::ProxyPushConsumer_ptr tao_duplicate (
+        CosEventChannelAdmin::ProxyPushConsumer_ptr
+      );
+    static void tao_release (CosEventChannelAdmin::ProxyPushConsumer_ptr);
+    static CosEventChannelAdmin::ProxyPushConsumer_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        CosEventChannelAdmin::ProxyPushConsumer_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_Event_Export Objref_Traits<CosEventComm::PushSupplier>
+  {
+    static CosEventComm::PushSupplier_ptr tao_duplicate (
+        CosEventComm::PushSupplier_ptr
+      );
+    static void tao_release (CosEventComm::PushSupplier_ptr);
+    static CosEventComm::PushSupplier_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        CosEventComm::PushSupplier_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_Event_Export Objref_Traits<CosEventComm::PushConsumer>
+  {
+    static CosEventComm::PushConsumer_ptr tao_duplicate (
+        CosEventComm::PushConsumer_ptr
+      );
+    static void tao_release (CosEventComm::PushConsumer_ptr);
+    static CosEventComm::PushConsumer_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        CosEventComm::PushConsumer_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_Event_Export Objref_Traits<CosEventComm::PullSupplier>
+  {
+    static CosEventComm::PullSupplier_ptr tao_duplicate (
+        CosEventComm::PullSupplier_ptr
+      );
+    static void tao_release (CosEventComm::PullSupplier_ptr);
+    static CosEventComm::PullSupplier_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        CosEventComm::PullSupplier_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_Event_Export Objref_Traits<CosEventComm::PullConsumer>
+  {
+    static CosEventComm::PullConsumer_ptr tao_duplicate (
+        CosEventComm::PullConsumer_ptr
+      );
+    static void tao_release (CosEventComm::PullConsumer_ptr);
+    static CosEventComm::PullConsumer_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        CosEventComm::PullConsumer_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+}
+
 #endif /* TAO_EVENT_EXPORT_H */
 
 // End of auto generated file.
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.dsp b/TAO/orbsvcs/orbsvcs/CosNaming.dsp
index a217fae5af0..841bdd1e30a 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.dsp
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.dsp
@@ -256,6 +256,10 @@ SOURCE=.\Naming\Naming_Context_Interface.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Naming\naming_export.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Naming\Naming_Loader.h

 # End Source File

 # Begin Source File

diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
index d8a76ce6170..1822003aea4 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
@@ -8,12 +8,15 @@
 #include "tao/Managed_Types.h"
 #include "tao/Environment.h"
 #include "tao/CDR.h"
+#include "tao/Typecode.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "ETCL_Constraint.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(ETCL, ETCL_Constraint, "$Id$")
+ACE_RCSID (ETCL, 
+           ETCL_Constraint, 
+           "$Id$")
 
 TAO_ETCL_Constraint::TAO_ETCL_Constraint (void)
 {
diff --git a/TAO/orbsvcs/orbsvcs/FT_ORB.dsp b/TAO/orbsvcs/orbsvcs/FT_ORB.dsp
index 2ae578e70e6..cda2f7ddfea 100644
--- a/TAO/orbsvcs/orbsvcs/FT_ORB.dsp
+++ b/TAO/orbsvcs/orbsvcs/FT_ORB.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # 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 "TAO_FT_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_FT_BUILD_DLL" /D "TAO_ORBSVCS_HAS_FT" /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_FT_BUILD_DLL" /D "TAO_ORBSVCS_HAS_FT" /FD /c

 # SUBTRACT CPP /YX

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

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

@@ -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 "TAO_FT_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 "_USRDLL" /D "TAO_FT_BUILD_DLL" /D "TAO_ORBSVCS_HAS_FT" /FD /c

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

 # SUBTRACT CPP /YX

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

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

@@ -102,7 +102,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_FT_BUILD_DLL" /D "TAO_ORBSVCS_HAS_FT" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_FT_BUILD_DLL" /D "TAO_ORBSVCS_HAS_FT" /D ACE_HAS_MFC=1 /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../" /I "../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_FT_BUILD_DLL" /D "TAO_ORBSVCS_HAS_FT" /D ACE_HAS_MFC=1 /FD /c

 # SUBTRACT CPP /YX

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

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

@@ -131,7 +131,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_FT_BUILD_DLL" /D "TAO_ORBSVCS_HAS_FT" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_FT_BUILD_DLL" /D "TAO_ORBSVCS_HAS_FT" /D ACE_HAS_MFC=1 /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_FT_BUILD_DLL" /D "TAO_ORBSVCS_HAS_FT" /D ACE_HAS_MFC=1 /FD /c

 # SUBTRACT CPP /YX

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

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

diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
index d630c479e8a..2f1d296ca1a 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
@@ -3,6 +3,7 @@
 #include "FT_ClientRequest_Interceptor.h"
 #include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/CORBA_String.h"
+#include "tao/debug.h"
 #include "ace/UUID.h"
 
 ACE_RCSID (FaultTolerance,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
index fb6a3262cb4..81204353c55 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
@@ -3,6 +3,7 @@
 #include "Notify_Constraint_Visitors.h"
 #include "orbsvcs/ETCL/ETCL_Constraint.h"
 #include "orbsvcs/ETCL/ETCL_y.h"
+#include "tao/Any_Unknown_IDL_Type.h"
 #include "tao/DynamicAny/DynArray_i.h"
 #include "tao/DynamicAny/DynSequence_i.h"
 #include "tao/DynamicAny/DynStruct_i.h"
@@ -15,7 +16,7 @@ TAO_Notify_Constraint_Visitor::TAO_Notify_Constraint_Visitor (void)
 {
   (void) this->implicit_ids_.bind (ACE_CString ("filterable_data",
                                                 0,
-                                               0),
+                                                0),
                                    FILTERABLE_DATA);
   (void) this->implicit_ids_.bind (ACE_CString ("header",
                                                 0,
@@ -35,11 +36,11 @@ TAO_Notify_Constraint_Visitor::TAO_Notify_Constraint_Visitor (void)
                                    VARIABLE_HEADER);
   (void) this->implicit_ids_.bind (ACE_CString ("event_name",
                                                 0,
-                                                         0),
+                                                0),
                                    EVENT_NAME);
   (void) this->implicit_ids_.bind (ACE_CString ("event_type",
                                                 0,
-                                                         0),
+                                                0),
                                    EVENT_TYPE);
   (void) this->implicit_ids_.bind (ACE_CString ("domain_name",
                                                 0,
diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp
index 982a3597d97..e60c97279e4 100644
--- a/TAO/tao/CONV_FRAMEC.cpp
+++ b/TAO/tao/CONV_FRAMEC.cpp
@@ -30,7 +30,6 @@
 
 
 #include "CONV_FRAMEC.h"
-#include "ace/OS.h"
 #include "Typecode.h"
 
 #if defined (__BORLANDC__)
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
index 06cc0ddf32c..2cd95dbaf39 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -1,7 +1,6 @@
 #include "CORBALOC_Parser.h"
 #include "ORB_Core.h"
 #include "Stub.h"
-#include "MProfile.h"
 #include "Connector_Registry.h"
 #include "tao/debug.h"
 
diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h
index 03b79502cbb..0d12aa87d95 100644
--- a/TAO/tao/CORBALOC_Parser.h
+++ b/TAO/tao/CORBALOC_Parser.h
@@ -11,18 +11,17 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_CORBALOC_PARSER_H
 #define TAO_CORBALOC_PARSER_H
-#include /**/ "ace/pre.h"
 
-#include "tao/IOR_Parser.h"
+#include /**/ "ace/pre.h"
+#include "ace/Service_Config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Service_Config.h"
+#include "tao/IOR_Parser.h"
 
 class TAO_MProfile;
 
diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp
index 671fb5c7de8..70aa4a46c23 100644
--- a/TAO/tao/CORBANAME_Parser.cpp
+++ b/TAO/tao/CORBANAME_Parser.cpp
@@ -1,8 +1,7 @@
 // $Id$
 
 #include "CORBANAME_Parser.h"
-#include "Stub.h"
-#include "DynamicC.h"
+#include "ORB.h"
 #include "Object.h"
 #include "UB_String_Arguments.h"
 #include "Invocation_Adapter.h"
@@ -12,7 +11,9 @@
 #include "CORBANAME_Parser.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(tao, CORBANAME_Parser, "$Id$")
+ACE_RCSID (tao, 
+           CORBANAME_Parser, 
+           "$Id$")
 
 TAO_CORBANAME_Parser::~TAO_CORBANAME_Parser (void)
 {
diff --git a/TAO/tao/CORBANAME_Parser.h b/TAO/tao/CORBANAME_Parser.h
index 823205aacc8..5f1f66cf8db 100644
--- a/TAO/tao/CORBANAME_Parser.h
+++ b/TAO/tao/CORBANAME_Parser.h
@@ -12,6 +12,7 @@
 
 #ifndef TAO_CORBANAME_PARSER_H
 #define TAO_CORBANAME_PARSER_H
+
 #include /**/ "ace/pre.h"
 
 #include "tao/IOR_Parser.h"
diff --git a/TAO/tao/CORBA_String.cpp b/TAO/tao/CORBA_String.cpp
index e6f520cf061..60423008b74 100644
--- a/TAO/tao/CORBA_String.cpp
+++ b/TAO/tao/CORBA_String.cpp
@@ -1,14 +1,14 @@
 #include "CORBA_String.h"
 #include "Managed_Types.h"
-#include "ace/OS.h"
+
+#include "ace/OS_String.h"
+#include "ace/OS_Memory.h"
 #include "ace/streams.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/CORBA_String.inl"
 #endif /* ! __ACE_INLINE__ */
 
-
-
 ACE_RCSID (tao,
            CORBA_String,
            "$Id$")
@@ -22,7 +22,7 @@ CORBA::string_dup (const char *str)
       return 0;
     }
 
-  size_t len = ACE_OS::strlen (str);
+  size_t len = ACE_OS_String::strlen (str);
 
   // This allocates an extra byte for the '\0';
   char * copy = CORBA::string_alloc (ACE_static_cast (CORBA::ULong, len));
@@ -33,9 +33,9 @@ CORBA::string_dup (const char *str)
       return 0;
     }
 
-  ACE_OS::memcpy (copy,
-                  str,
-                  len + 1);
+  ACE_OS_String::memcpy (copy,
+                         str,
+                         len + 1);
   return copy;
 }
 
@@ -69,7 +69,7 @@ CORBA::wstring_dup (const WChar *const str)
       return 0;
     }
 
-  CORBA::WChar* retval = CORBA::wstring_alloc (ACE_OS::wslen (str));
+  CORBA::WChar* retval = CORBA::wstring_alloc (ACE_OS_String::strlen (str));
 
   // The wscpy() below assumes that the destination is a valid buffer.
   if (retval == 0)
@@ -77,8 +77,8 @@ CORBA::wstring_dup (const WChar *const str)
       return 0;
     }
 
-  return ACE_OS::wscpy (retval,
-                        str);
+  return ACE_OS_String::strcpy (retval,
+                                str);
 }
 
 CORBA::WChar*
@@ -267,7 +267,7 @@ operator>> (istream &is, CORBA::String_out &so)
 ostream &
 operator<< (ostream &os, const CORBA::WString_var &wsv)
 {
-  const CORBA::ULong len = ACE_OS::wslen (wsv.in ());
+  const CORBA::ULong len = ACE_OS_String::strlen (wsv.in ());
 
   for (CORBA::ULong i = 0; i < len; ++i)
     {
@@ -306,7 +306,7 @@ ostream &
 operator<< (ostream &os, CORBA::WString_out &wso)
 {
   CORBA::WChar *tmp = wso.ptr ();
-  const CORBA::ULong len = ACE_OS::wslen (tmp);
+  const CORBA::ULong len = ACE_OS_String::strlen (tmp);
 
   for (CORBA::ULong i = 0; i < len; ++i)
     {
diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.cpp b/TAO/tao/ClientRequestInterceptor_Adapter.cpp
index 9695f3526d9..26b72338676 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter.cpp
+++ b/TAO/tao/ClientRequestInterceptor_Adapter.cpp
@@ -7,7 +7,6 @@
 #endif /* defined INLINE */
 
 #include "ClientRequestInfo.h"
-#include "ClientRequestInfo_i.h"
 #include "Invocation_Base.h"
 #include "ORB_Core.h"
 
@@ -32,9 +31,11 @@ namespace TAO
         // Only perform the TSS access if interceptors were registered
         // with the ORB.
         if (this->len_ > 0)
-        this->info_ =
-          this->invocation_->orb_core ()->
-          get_tss_resources ()->client_request_info_;
+          {
+            TAO_ORB_Core *orb_core = this->invocation_->orb_core ();
+            this->info_ =
+              orb_core->get_tss_resources ()->client_request_info_;
+          }
 
         TAO_ClientRequestInfo_Guard info_guard (this->info_, ri);
 
diff --git a/TAO/tao/CodecFactory.h b/TAO/tao/CodecFactory.h
index 6a8f372da70..d07f88c1cae 100644
--- a/TAO/tao/CodecFactory.h
+++ b/TAO/tao/CodecFactory.h
@@ -15,13 +15,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "TAO_Export.h"
+#include "IOP_CodecC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "IOP_CodecC.h"
 #include "LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
diff --git a/TAO/tao/CodecFactory_ORBInitializer.h b/TAO/tao/CodecFactory_ORBInitializer.h
index adbde53089d..5beec042708 100644
--- a/TAO/tao/CodecFactory_ORBInitializer.h
+++ b/TAO/tao/CodecFactory_ORBInitializer.h
@@ -16,13 +16,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "TAO_Export.h"
+#include "PortableInterceptorC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PortableInterceptorC.h"
 #include "LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp
index 13005448634..6b863c1c375 100644
--- a/TAO/tao/Codeset_Manager.cpp
+++ b/TAO/tao/Codeset_Manager.cpp
@@ -1,21 +1,18 @@
 // $Id$
+
 #include "tao/Codeset_Manager.h"
-#include "tao/debug.h"
-#include "tao/CDR.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/operation_details.h"
 #include "tao/Transport.h"
 #include "tao/Profile.h"
-#include "tao/Exception.h"
-#include "tao/corbafwd.h"
 #include "tao/Codeset_Translator_Factory.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/Tagged_Components.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Codeset_Registry.h"
 
-ACE_RCSID(tao, Codeset_Manager, "$Id$")
+ACE_RCSID (tao, 
+           Codeset_Manager, 
+           "$Id$")
 
 /// NCS for char is defaulted to ISO 8859-1:1987; Latin Alphabet No. 1
 CONV_FRAME::CodeSetId
diff --git a/TAO/tao/Codeset_Manager.h b/TAO/tao/Codeset_Manager.h
index 43aa23471bf..479e707a75a 100644
--- a/TAO/tao/Codeset_Manager.h
+++ b/TAO/tao/Codeset_Manager.h
@@ -14,6 +14,7 @@
 
 #ifndef TAO_CODESET_MANAGER_H
 #define TAO_CODESET_MANAGER_H
+
 #include /**/ "ace/pre.h"
 
 #include "tao/CONV_FRAMEC.h"
@@ -156,17 +157,14 @@ public:
   void configure_codeset_factories();
 
 private:
+  // typedefs for containers containing the list of codesets
+  // factories for character and wide character.
+  typedef ACE_Unbounded_Set<TAO_Codeset_Item*>
+          TAO_CodesetFactorySet;
 
-// typedefs for containers containing the list of codesets
-// factories for character and wide character.
-typedef ACE_Unbounded_Set<TAO_Codeset_Item*>
-        TAO_CodesetFactorySet;
-
-// Iterators
-typedef ACE_Unbounded_Set_Iterator<TAO_Codeset_Item*>
-        TAO_CodesetFactorySetItor;
-
-
+  // Iterators
+  typedef ACE_Unbounded_Set_Iterator<TAO_Codeset_Item*>
+          TAO_CodesetFactorySetItor;
 
   // Compute the TCS for Char/WChar asper the CORBA Specification
   CONV_FRAME::CodeSetId computeTCS (CONV_FRAME::CodeSetComponent &,
@@ -210,4 +208,5 @@ typedef ACE_Unbounded_Set_Iterator<TAO_Codeset_Item*>
 };
 
 #include /**/ "ace/post.h"
+
 #endif /* TAO_CODESET_MANAGER_H */
diff --git a/TAO/tao/Codeset_Translator_Factory.cpp b/TAO/tao/Codeset_Translator_Factory.cpp
index d1cda814ad2..a2d660952df 100644
--- a/TAO/tao/Codeset_Translator_Factory.cpp
+++ b/TAO/tao/Codeset_Translator_Factory.cpp
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-// $Id$
 
 // ============================================================================
 //
@@ -18,9 +17,11 @@
 //
 // ============================================================================
 
-
 #include "Codeset_Translator_Factory.h"
-#include <ace/CDR_Stream.h>
+
+ACE_RCSID (tao,
+           Codeset_Translator_Factory,
+           "$Id$")
 
 TAO_Codeset_Translator_Factory::TAO_Codeset_Translator_Factory ()
 {
@@ -33,31 +34,43 @@ TAO_Codeset_Translator_Factory::~TAO_Codeset_Translator_Factory ()
 }
 
 int
-TAO_Codeset_Translator_Factory::init (int , ACE_TCHAR ** )
+TAO_Codeset_Translator_Factory::init (int , ACE_TCHAR **)
 {
   return 0;
 }
 
 void
-TAO_Codeset_Translator_Factory::assign_i (TAO_InputCDR *cdr, ACE_Char_Codeset_Translator *trans) const
+TAO_Codeset_Translator_Factory::assign_i (
+    TAO_InputCDR *cdr, 
+    ACE_Char_Codeset_Translator *trans
+  ) const
 {
   cdr->char_translator(trans);
 }
 
 void
-TAO_Codeset_Translator_Factory::assign_i (TAO_OutputCDR *cdr, ACE_Char_Codeset_Translator *trans) const
+TAO_Codeset_Translator_Factory::assign_i (
+    TAO_OutputCDR *cdr, 
+    ACE_Char_Codeset_Translator *trans
+  ) const
 {
   cdr->char_translator(trans);
 }
 
 void
-TAO_Codeset_Translator_Factory::assign_i (TAO_InputCDR *cdr, ACE_WChar_Codeset_Translator *trans) const
+TAO_Codeset_Translator_Factory::assign_i (
+    TAO_InputCDR *cdr, 
+    ACE_WChar_Codeset_Translator *trans
+  ) const
 {
   cdr->wchar_translator(trans);
 }
 
 void
-TAO_Codeset_Translator_Factory::assign_i (TAO_OutputCDR *cdr, ACE_WChar_Codeset_Translator *trans) const
+TAO_Codeset_Translator_Factory::assign_i (
+    TAO_OutputCDR *cdr, 
+    ACE_WChar_Codeset_Translator *trans
+  ) const
 {
   cdr->wchar_translator(trans);
 }
diff --git a/TAO/tao/Collocated_Invocation.h b/TAO/tao/Collocated_Invocation.h
index 6a0ea91d67a..cc0ea5a5f6d 100644
--- a/TAO/tao/Collocated_Invocation.h
+++ b/TAO/tao/Collocated_Invocation.h
@@ -15,16 +15,14 @@
 
 #include "ace/pre.h"
 
-#include "ace/CORBA_macros.h"
+#include "tao/TAO_Export.h"
+#include "tao/Collocation_Strategy.h"
+#include "tao/Invocation_Base.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/TAO_Export.h"
-#include "tao/Collocation_Strategy.h"
-#include "tao/Invocation_Base.h"
-
 class TAO_Operation_Details;
 class TAO_Stub;
 
diff --git a/TAO/tao/Collocation_Resolver.cpp b/TAO/tao/Collocation_Resolver.cpp
index 0cbc7c4847f..8978a842b44 100644
--- a/TAO/tao/Collocation_Resolver.cpp
+++ b/TAO/tao/Collocation_Resolver.cpp
@@ -3,7 +3,9 @@
 #include "tao/Collocation_Resolver.h"
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID(tao, Collocation_Resolver, "$Id$")
+ACE_RCSID (tao, 
+           Collocation_Resolver, 
+           "$Id$")
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Collocation_Resolver.i"
diff --git a/TAO/tao/Collocation_Resolver.h b/TAO/tao/Collocation_Resolver.h
index 57988d47ed5..a9efa72d418 100644
--- a/TAO/tao/Collocation_Resolver.h
+++ b/TAO/tao/Collocation_Resolver.h
@@ -27,9 +27,6 @@ namespace CORBA
 {
   class Object;
   typedef Object *Object_ptr;
-
-  class Environment;
-
 };
 
 /**
diff --git a/TAO/tao/Connect_Strategy.cpp b/TAO/tao/Connect_Strategy.cpp
index 8baa2aba950..98764d36066 100644
--- a/TAO/tao/Connect_Strategy.cpp
+++ b/TAO/tao/Connect_Strategy.cpp
@@ -1,10 +1,8 @@
 #include "Connect_Strategy.h"
-#include "Connection_Handler.h"
 
-
-ACE_RCSID(tao,
-          Connect_Strategy,
-          "$Id$")
+ACE_RCSID (tao,
+           Connect_Strategy,
+           "$Id$")
 
 TAO_Connect_Strategy::TAO_Connect_Strategy (TAO_ORB_Core *orb_core)
   : orb_core_ (orb_core)
diff --git a/TAO/tao/Connect_Strategy.h b/TAO/tao/Connect_Strategy.h
index 18f9f078e6d..61b400e4510 100644
--- a/TAO/tao/Connect_Strategy.h
+++ b/TAO/tao/Connect_Strategy.h
@@ -12,6 +12,7 @@
 
 #ifndef TAO_CONNECT_STRATEGY_H
 #define TAO_CONNECT_STRATEGY_H
+
 #include /**/ "ace/pre.h"
 
 #include "TAO_Export.h"
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index c96896e7013..b13edd7147b 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -2,9 +2,7 @@
 
 #include "Connection_Handler.h"
 #include "ORB_Core.h"
-#include "Server_Strategy_Factory.h"
 #include "debug.h"
-#include "Object.h"
 #include "Resume_Handle.h"
 #include "Transport.h"
 #include "Wait_Strategy.h"
diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h
index 662bfa76aa6..e3b348a3b2c 100644
--- a/TAO/tao/Connection_Handler.h
+++ b/TAO/tao/Connection_Handler.h
@@ -17,7 +17,6 @@
 #include /**/ "ace/pre.h"
 
 #include "LF_CH_Event.h"
-#include "ace/Event_Handler.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/Connection_Purging_Strategy.cpp b/TAO/tao/Connection_Purging_Strategy.cpp
index 01f0bfa8500..f903b1107e8 100644
--- a/TAO/tao/Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Connection_Purging_Strategy.cpp
@@ -6,13 +6,14 @@
 # include "tao/Connection_Purging_Strategy.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(tao, Connection_Purging_Strategy, "$Id$")
+ACE_RCSID (tao, 
+           Connection_Purging_Strategy, 
+           "$Id$")
 
 TAO_Connection_Purging_Strategy::~TAO_Connection_Purging_Strategy (void)
 {
 }
 
-
 int
 TAO_Connection_Purging_Strategy::cache_maximum (void) const
 {
diff --git a/TAO/tao/Connection_Purging_Strategy.h b/TAO/tao/Connection_Purging_Strategy.h
index b4901c1def6..eace4e9114c 100644
--- a/TAO/tao/Connection_Purging_Strategy.h
+++ b/TAO/tao/Connection_Purging_Strategy.h
@@ -10,6 +10,7 @@
 
 #ifndef TAO_PURGING_STRATEGY_H
 #define TAO_PURGING_STRATEGY_H
+
 #include /**/ "ace/pre.h"
 
 #include "TAO_Export.h"
@@ -18,7 +19,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
 class TAO_Transport;
 
 // ****************************************************************
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
index 7fe380f9855..7738cf58478 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -7,10 +7,8 @@
 #include "Profile.h"
 #include "Transport_Connector.h"
 #include "Protocol_Factory.h"
-#include "Endpoint.h"
 #include "Environment.h"
 #include "debug.h"
-#include "Transport_Descriptor_Interface.h"
 
 #if !defined(__ACE_INLINE__)
 #include "tao/Connector_Registry.i"
diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h
index faa55f3f92f..8c7f324d07c 100644
--- a/TAO/tao/Connector_Registry.h
+++ b/TAO/tao/Connector_Registry.h
@@ -17,27 +17,22 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/corbafwd.h"
+#include "ace/CORBA_macros.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/CORBA_macros.h"
+#include "tao/TAO_Export.h"
+#include "tao/Basic_Types.h"
+#include "tao/orbconf.h"
 
 // Forward declarations.
-class ACE_Addr;
-class ACE_Reactor;
-
 class TAO_ORB_Core;
 class TAO_Connector;
-
-class TAO_Transport_Descriptor_Interface;
-class TAO_Stub;
 class TAO_MProfile;
 class TAO_Profile;
-class TAO_Resource_Factory;
-class TAO_GIOP_Invocation;
+class TAO_InputCDR;
 
 typedef TAO_Connector** TAO_ConnectorSetIterator;
 
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index 12dbb545006..b5b6031332d 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -31,7 +31,6 @@
 
 #include "CurrentC.h"
 #include "Typecode.h"
-#include "ace/OS.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index 80160db7cbb..1c52a75c18e 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -39,8 +39,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Objref_VarOut_T.h"
-
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
diff --git a/TAO/tao/DLL_ORB.cpp b/TAO/tao/DLL_ORB.cpp
index e1887156efe..1a78989405e 100644
--- a/TAO/tao/DLL_ORB.cpp
+++ b/TAO/tao/DLL_ORB.cpp
@@ -3,11 +3,9 @@
 #include "tao/DLL_ORB.h"
 #include "tao/TAO_Singleton_Manager.h"
 #include "tao/Environment.h"
-
 #include "tao/debug.h"
+
 #include "ace/ARGV.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (tao,
            DLL_ORB,
diff --git a/TAO/tao/DLL_ORB.h b/TAO/tao/DLL_ORB.h
index e078d121e43..dc1f63b46eb 100644
--- a/TAO/tao/DLL_ORB.h
+++ b/TAO/tao/DLL_ORB.h
@@ -18,7 +18,6 @@
 #define TAO_DLL_ORB_H
 
 #include /**/ "ace/pre.h"
-
 #include "ace/Task.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -26,8 +25,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Config.h"
-#include "tao/ORB.h"
 
+#include "tao/ORB.h"
 /**
  * @class TAO_DLL_ORB
  *
diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp
index 4634f9759b7..0c82a68ddc4 100644
--- a/TAO/tao/DLL_Parser.cpp
+++ b/TAO/tao/DLL_Parser.cpp
@@ -3,15 +3,17 @@
 #include "DLL_Parser.h"
 #include "Object_Loader.h"
 #include "tao/Object.h"
-#include "tao/Exception.h"
 #include "tao/Environment.h"
+
 #include "ace/Dynamic_Service.h"
 
 #if !defined(__ACE_INLINE__)
 #include "DLL_Parser.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(tao, DLL_Parser, "$Id$")
+ACE_RCSID (tao, 
+           DLL_Parser, 
+           "$Id$")
 
 TAO_DLL_Parser::~TAO_DLL_Parser (void)
 {
diff --git a/TAO/tao/DLL_Parser.h b/TAO/tao/DLL_Parser.h
index 1d0cf6fcfd8..e509ee3ca29 100644
--- a/TAO/tao/DLL_Parser.h
+++ b/TAO/tao/DLL_Parser.h
@@ -12,15 +12,16 @@
 
 #ifndef TAO_DLL_PARSER_H
 #define TAO_DLL_PARSER_H
-#include /**/ "ace/pre.h"
 
-#include "tao/IOR_Parser.h"
+#include /**/ "ace/pre.h"
 #include "ace/Service_Config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/IOR_Parser.h"
+
 /**
  * @class TAO_DLL_Parser
  *
diff --git a/TAO/tao/Default_Collocation_Resolver.cpp b/TAO/tao/Default_Collocation_Resolver.cpp
index fef0836a43e..d81bebaa808 100644
--- a/TAO/tao/Default_Collocation_Resolver.cpp
+++ b/TAO/tao/Default_Collocation_Resolver.cpp
@@ -2,7 +2,9 @@
 
 #include "tao/Default_Collocation_Resolver.h"
 
-ACE_RCSID(tao, Default_Collocation_Resolver, "$Id$")
+ACE_RCSID (tao, 
+           Default_Collocation_Resolver, 
+           "$Id$")
 
 #include "tao/Object.h"
 
diff --git a/TAO/tao/Default_Collocation_Resolver.h b/TAO/tao/Default_Collocation_Resolver.h
index 0acfbb44286..2998ce75bd6 100644
--- a/TAO/tao/Default_Collocation_Resolver.h
+++ b/TAO/tao/Default_Collocation_Resolver.h
@@ -12,14 +12,13 @@
 #define TAO_DEFAULT_COLLOCATION_RESOLVER_H
 
 #include /**/ "ace/pre.h"
-#include "tao/orbconf.h"
+#include "ace/Service_Config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Collocation_Resolver.h"
-#include "ace/Service_Config.h"
 
 namespace CORBA
 {
diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.cpp b/TAO/tao/Default_Endpoint_Selector_Factory.cpp
index 3678056fe19..7a787999d0c 100644
--- a/TAO/tao/Default_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/Default_Endpoint_Selector_Factory.cpp
@@ -3,7 +3,6 @@
 
 #include "tao/Default_Endpoint_Selector_Factory.h"
 #include "tao/Invocation_Endpoint_Selectors.h"
-#include "ace/Log_Msg.h"
 
 ACE_RCSID (tao,
            Default_Endpoint_Selector_Factory,
diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.h b/TAO/tao/Default_Endpoint_Selector_Factory.h
index 3af1d722fc2..00558b91983 100644
--- a/TAO/tao/Default_Endpoint_Selector_Factory.h
+++ b/TAO/tao/Default_Endpoint_Selector_Factory.h
@@ -16,15 +16,16 @@
 
 #ifndef TAO_DEFAULT_ENDPOINT_SELECTOR_FACTORY_H
 #define TAO_DEFAULT_ENDPOINT_SELECTOR_FACTORY_H
-#include /**/ "ace/pre.h"
 
-#include "tao/Endpoint_Selector_Factory.h"
+#include /**/ "ace/pre.h"
 #include "ace/Service_Config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Endpoint_Selector_Factory.h"
+
 // Forward references
 class TAO_Default_Endpoint_Selector;
 
diff --git a/TAO/tao/Default_Protocols_Hooks.cpp b/TAO/tao/Default_Protocols_Hooks.cpp
index 1be7df9586e..0a7a3f063c2 100644
--- a/TAO/tao/Default_Protocols_Hooks.cpp
+++ b/TAO/tao/Default_Protocols_Hooks.cpp
@@ -3,9 +3,6 @@
 // $Id$
 
 #include "Default_Protocols_Hooks.h"
-#include "PolicyC.h"
-#include "ace/Dynamic_Service.h"
-
 
 #if !defined (__ACE_INLINE__)
 # include "Default_Protocols_Hooks.i"
diff --git a/TAO/tao/Default_Protocols_Hooks.h b/TAO/tao/Default_Protocols_Hooks.h
index 12cae53b330..fc8a3e7177b 100644
--- a/TAO/tao/Default_Protocols_Hooks.h
+++ b/TAO/tao/Default_Protocols_Hooks.h
@@ -15,15 +15,13 @@
 #define TAO_DEFAULT_PROTOCOLS_HOOKS_H
 
 #include /**/ "ace/pre.h"
-
-#include "Protocols_Hooks.h"
-
+#include "ace/Service_Config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Service_Config.h"
+#include "tao/Protocols_Hooks.h"
 
 class TAO_POA;
 
@@ -64,10 +62,12 @@ public:
                                    CORBA::Boolean restart
                                    ACE_ENV_ARG_DECL);
 
-  virtual void add_rt_service_context_hook (TAO_Service_Context &service_context,
-                                            CORBA::Policy *model_policy,
-                                            CORBA::Short &client_priority
-                                            ACE_ENV_ARG_DECL);
+  virtual void add_rt_service_context_hook (
+      TAO_Service_Context &service_context,
+      CORBA::Policy *model_policy,
+      CORBA::Short &client_priority
+      ACE_ENV_ARG_DECL
+    );
 
   virtual void get_selector_hook (CORBA::Policy *model_policy,
                                   CORBA::Boolean
@@ -86,9 +86,11 @@ public:
   virtual int get_thread_native_priority (CORBA::Short &
                                           ACE_ENV_ARG_DECL_NOT_USED);
 
-  virtual int get_thread_CORBA_and_native_priority (CORBA::Short &,
-                                                    CORBA::Short &
-                                                    ACE_ENV_ARG_DECL_NOT_USED);
+  virtual int get_thread_CORBA_and_native_priority (
+      CORBA::Short &,
+      CORBA::Short &
+      ACE_ENV_ARG_DECL_NOT_USED
+    );
 
   virtual int set_thread_CORBA_priority (CORBA::Short
                                          ACE_ENV_ARG_DECL_NOT_USED);
@@ -98,8 +100,10 @@ public:
 
   virtual int set_default_policies (ACE_ENV_SINGLE_ARG_DECL);
 
-  virtual int set_default_server_protocol_policy (TAO_Acceptor_Registry &acceptor_registry
-                                                  ACE_ENV_ARG_DECL);
+  virtual int set_default_server_protocol_policy (
+      TAO_Acceptor_Registry &acceptor_registry
+      ACE_ENV_ARG_DECL
+    );
 
 };
 
diff --git a/TAO/tao/Default_Stub_Factory.cpp b/TAO/tao/Default_Stub_Factory.cpp
index 21f5988080b..7494dcbae15 100644
--- a/TAO/tao/Default_Stub_Factory.cpp
+++ b/TAO/tao/Default_Stub_Factory.cpp
@@ -1,8 +1,11 @@
 // $Id$
+
 #include "Default_Stub_Factory.h"
 #include "Stub.h"
 
-ACE_RCSID(tao, TAO_Default_Stub_Factory, "$Id$")
+ACE_RCSID (tao, 
+           TAO_Default_Stub_Factory, 
+           "$Id$")
 
 TAO_Default_Stub_Factory::~TAO_Default_Stub_Factory (void)
 {
@@ -28,10 +31,12 @@ TAO_Default_Stub_Factory::create_stub (const char *repository_id,
 
 // ****************************************************************
 
-ACE_STATIC_SVC_DEFINE (TAO_Default_Stub_Factory,
-                       ACE_TEXT ("Default_Stub_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Default_Stub_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
+ACE_STATIC_SVC_DEFINE (
+    TAO_Default_Stub_Factory,
+    ACE_TEXT ("Default_Stub_Factory"),
+    ACE_SVC_OBJ_T,
+    &ACE_SVC_NAME (TAO_Default_Stub_Factory),
+    ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+    0
+  )
 ACE_FACTORY_DEFINE (TAO, TAO_Default_Stub_Factory)
diff --git a/TAO/tao/Default_Stub_Factory.h b/TAO/tao/Default_Stub_Factory.h
index f29255ff440..f5b82a070ee 100644
--- a/TAO/tao/Default_Stub_Factory.h
+++ b/TAO/tao/Default_Stub_Factory.h
@@ -17,14 +17,14 @@
 #define TAO_DEFAULT_STUB_FACTORY_H_
 
 #include /**/ "ace/pre.h"
-
-#include "tao/Stub_Factory.h"
 #include "ace/Service_Config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Stub_Factory.h"
+
 /**
  * @class TAO_Default_Stub_Factory
  *
@@ -53,4 +53,5 @@ ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Stub_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Stub_Factory)
 
 #include /**/ "ace/post.h"
+
 #endif /* TAO_DEFAULT_STUB_FACTORY_H_ */
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
index 3b8c2cbd97e..3edd36b336c 100644
--- a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
@@ -2,21 +2,16 @@
 
 #include "tao/Default_Thread_Lane_Resources_Manager.h"
 
-
 ACE_RCSID (tao,
            Default_Thread_Lane_Resources_Manager,
            "$Id$")
 
-
-#include "tao/Acceptor_Registry.h"
 #include "tao/Thread_Lane_Resources.h"
-#include "tao/Leader_Follower.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Default_Thread_Lane_Resources_Manager.i"
 #endif /* ! __ACE_INLINE__ */
 
-
 TAO_Default_Thread_Lane_Resources_Manager::TAO_Default_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core)
   : TAO_Thread_Lane_Resources_Manager (orb_core),
     lane_resources_ (0)
@@ -37,7 +32,7 @@ TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (ACE_ENV_SINGL
 {
   int result =
     this->lane_resources_->open_acceptor_registry (0
-                                                    ACE_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return result;
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.h b/TAO/tao/Default_Thread_Lane_Resources_Manager.h
index a8d90368bdf..7b7250dc087 100644
--- a/TAO/tao/Default_Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.h
@@ -12,14 +12,13 @@
 #define TAO_DEFAULT_THREAD_LANE_RESOURCES_MANAGER_H
 
 #include /**/ "ace/pre.h"
-#include "tao/orbconf.h"
+#include "ace/Service_Config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Thread_Lane_Resources_Manager.h"
-#include "ace/Service_Config.h"
 
 /**
  * @class TAO_Default_Thread_Lane_Resources_Manager
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index 18e4f94b435..ffe79ae9320 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -30,11 +30,9 @@
 
 
 #include "DomainC.h"
-#include "tao/Stub.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
 #include "tao/Basic_Arguments.h"
-#include "tao/Object_Argument_T.h"
 #include "tao/Special_Basic_Arguments.h"
 #include "tao/IFR_Client_Adapter.h"
 
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index 3e6578dc2a9..2625d3606db 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -33,19 +33,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/corbafwd.h"
+#include "tao/PolicyC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Sequence_T.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#include "PolicyC.h"
-
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h
index 5b9671c138b..c6c0e556a2f 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.h
+++ b/TAO/tao/DynamicAny/DynamicAnyC.h
@@ -2205,6 +2205,16 @@ namespace DynamicAny
 // Traits specializations.
 namespace TAO
 {
+  // Hand crafted.
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_DynamicAny_Export Objref_Traits<DynamicAny::DynAny>
+  {
+    static DynamicAny::DynAny_ptr tao_duplicate (DynamicAny::DynAny_ptr);
+    static void tao_release (DynamicAny::DynAny_ptr);
+    static DynamicAny::DynAny_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (DynamicAny::DynAny_ptr p,
+                                       TAO_OutputCDR & cdr);
+  };
 };
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/IORManipulation/TAO_IORManip.dsp b/TAO/tao/IORManipulation/TAO_IORManip.dsp
index 210064b50c3..4392ac2e886 100644
--- a/TAO/tao/IORManipulation/TAO_IORManip.dsp
+++ b/TAO/tao/IORManipulation/TAO_IORManip.dsp
@@ -45,7 +45,7 @@ RSC=rc.exe
 # 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 "IORManip_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_IORMANIP_BUILD_DLL" /FD /c

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

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

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

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

@@ -71,7 +71,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 "IORManip_EXPORTS" /YX /FD /c

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

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

 # SUBTRACT CPP /YX

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

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

@@ -100,7 +100,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

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

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D ACE_HAS_MFC=1 /D "TAO_IORMANIP_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D ACE_HAS_MFC=1 /D "TAO_IORMANIP_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

@@ -129,7 +129,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

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

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D ACE_HAS_MFC=1 /D "TAO_IORMANIP_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D ACE_HAS_MFC=1 /D "TAO_IORMANIP_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

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

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

diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h
index 8e415e95ed6..802d6c0f1fa 100644
--- a/TAO/tao/Objref_VarOut_T.h
+++ b/TAO/tao/Objref_VarOut_T.h
@@ -23,6 +23,8 @@
 
 #include "ace/CORBA_macros.h"
 
+class TAO_OutputCDR;
+
 namespace TAO
 {
   /**
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index 324f6379bac..0d540a61516 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -604,6 +604,22 @@ TAO::Collocation_Proxy_Broker *
 // Traits specializations.
 namespace TAO
 {
+  // Hand crafted.
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_Export Objref_Traits<CORBA::PolicyCurrent>
+  {
+    static CORBA::PolicyCurrent_ptr tao_duplicate (
+        CORBA::PolicyCurrent_ptr
+      );
+    static void tao_release (
+        CORBA::PolicyCurrent_ptr
+      );
+    static CORBA::PolicyCurrent_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        CORBA::PolicyCurrent_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
 };
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/UB_String_Argument_T.cpp b/TAO/tao/UB_String_Argument_T.cpp
index ed83c078d99..b7fff1642d6 100644
--- a/TAO/tao/UB_String_Argument_T.cpp
+++ b/TAO/tao/UB_String_Argument_T.cpp
@@ -9,6 +9,8 @@
 #include "tao/UB_String_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
 
+#include "tao/DynamicC.h"
+
 ACE_RCSID (tao,
            UB_String_Argument_T,
            "$Id$")
diff --git a/TAO/tao/debug.h b/TAO/tao/debug.h
index 4a7b6acd7e6..1ca35af44d1 100644
--- a/TAO/tao/debug.h
+++ b/TAO/tao/debug.h
@@ -13,6 +13,7 @@
 
 #ifndef TAO_DEBUG_H
 #define TAO_DEBUG_H
+
 #include /**/ "ace/pre.h"
 
 #include "tao/TAO_Export.h"
@@ -31,7 +32,7 @@
 extern TAO_Export unsigned int TAO_debug_level;
 
 // debug messages on (1) or off (0)
-extern TAO_Export unsigned int  TAO_orbdebug;
+extern TAO_Export unsigned int TAO_orbdebug;
 
 #include /**/ "ace/post.h"
 #endif /* TAO_DEBUG_H */
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index 230ff1b1a93..2931f1bb87f 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -11,19 +11,15 @@
 #include "LF_Connect_Strategy.h"
 
 #include "ace/Lock_Adapter_T.h"
-#include "ace/Recursive_Thread_Mutex.h"
-
 
 #if !defined (__ACE_INLINE__)
 # include "tao/default_client.i"
 #endif /* ! __ACE_INLINE__ */
 
-
 ACE_RCSID (tao,
            default_client,
            "$Id$")
 
-
 TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void)
   : profile_lock_type_ (TAO_THREAD_LOCK)
     , rd_table_size_ (TAO_RD_TABLE_SIZE)
diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h
index 94c3713c541..d1958ff4aeb 100644
--- a/TAO/tao/default_client.h
+++ b/TAO/tao/default_client.h
@@ -13,15 +13,15 @@
 
 #ifndef TAO_DEFAULT_CLIENT_H
 #define TAO_DEFAULT_CLIENT_H
-#include /**/ "ace/pre.h"
 
-#include "tao/Client_Strategy_Factory.h"
+#include /**/ "ace/pre.h"
+#include "ace/Service_Config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Service_Config.h"
+#include "tao/Client_Strategy_Factory.h"
 
 /**
  * @class TAO_Default_Client_Strategy_Factory
@@ -31,7 +31,8 @@
  * options so that everything operates as if there were no
  * dynamically-linkable strategies.
  */
-class TAO_Export TAO_Default_Client_Strategy_Factory : public TAO_Client_Strategy_Factory
+class TAO_Export TAO_Default_Client_Strategy_Factory 
+  : public TAO_Client_Strategy_Factory
 {
 public:
   // = Initialization and termination methods.
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index 3fb36206fc6..5aa9b0202d9 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -4,25 +4,17 @@
 
 #include "tao/debug.h"
 #include "tao/IIOP_Factory.h"
-
 #include "tao/Acceptor_Registry.h"
 #include "tao/Connector_Registry.h"
-
 #include "tao/Reactive_Flushing_Strategy.h"
 #include "tao/Block_Flushing_Strategy.h"
 #include "tao/Leader_Follower_Flushing_Strategy.h"
-
-#include "tao/Leader_Follower.h"
 #include "tao/LRU_Connection_Purging_Strategy.h"
-
 #include "tao/LF_Strategy_Complete.h"
 #include "tao/Codeset_Manager.h"
 
 #include "ace/TP_Reactor.h"
 #include "ace/Dynamic_Service.h"
-#include "ace/Arg_Shifter.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Memory_Pool.h"
 #include "ace/Malloc.h"
 #include "ace/Codeset_Registry.h"
 
diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h
index 53d76620a97..0737e45f8b3 100644
--- a/TAO/tao/default_resource.h
+++ b/TAO/tao/default_resource.h
@@ -14,16 +14,15 @@
 
 #ifndef TAO_DEFAULT_RESOURCE_H
 #define TAO_DEFAULT_RESOURCE_H
-#include /**/ "ace/pre.h"
 
-#include "tao/Resource_Factory.h"
+#include /**/ "ace/pre.h"
+#include "ace/Service_Config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Service_Config.h"
-#include "tao/CONV_FRAMEC.h"
+#include "tao/Resource_Factory.h"
 
 class TAO_Object_Adapter;
 class TAO_IOR_Parser;
diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
index c8c3609ddb1..bb6a4f1ccb4 100644
--- a/TAO/tao/default_server.cpp
+++ b/TAO/tao/default_server.cpp
@@ -10,7 +10,6 @@ ACE_RCSID (tao,
            default_server,
            "$Id$")
 
-
 TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory (void)
   : activate_server_connections_ (0),
     thread_flags_ (THR_BOUND | THR_DETACHED),
diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h
index 202ea653594..1f4d488cb9d 100644
--- a/TAO/tao/default_server.h
+++ b/TAO/tao/default_server.h
@@ -13,15 +13,15 @@
 
 #ifndef TAO_DEFAULT_SERVER_FACTORY_H
 #define TAO_DEFAULT_SERVER_FACTORY_H
-#include /**/ "ace/pre.h"
 
-#include "tao/Server_Strategy_Factory.h"
+#include /**/ "ace/pre.h"
+#include "ace/Service_Config.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Service_Config.h"
+#include "tao/Server_Strategy_Factory.h"
 
 /**
  * @class TAO_Default_Server_Strategy_Factory
@@ -31,7 +31,8 @@
  * This design gives substantial freedom for experimentation.
  *
  */
-class TAO_Export TAO_Default_Server_Strategy_Factory : public TAO_Server_Strategy_Factory
+class TAO_Export TAO_Default_Server_Strategy_Factory 
+  : public TAO_Server_Strategy_Factory
 {
 public:
   // = Initialization and termination methods.