ChangeLogTag: Thu Jan 12 00:31:27 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>

45 files changed, 117 insertions, 2 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 0a722fb1ac4..6756bab6cd6 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,63 @@
+Thu Jan 12 00:31:27 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+	* TAO_IDL/be/be_visitor_home.cpp:
+	* TAO_IDL/be/be_visitor_interface.cpp:
+	* TAO_IDL/be/be_visitor_valuebox.cpp:
+	* examples/Kokyu_dsrt_schedulers/Task_Stats.inl:
+	* examples/RTCORBA/Activity/Task_Stats.inl:
+	* orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp:
+	* orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp:
+	* orbsvcs/orbsvcs/IOR_Multicast.cpp:
+	* orbsvcs/orbsvcs/Shutdown_Utilities.cpp:
+	* orbsvcs/orbsvcs/AV/TCP.h:
+	* orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp:
+	* orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h:
+	* orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp:
+	* orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp:
+	* orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp:
+	* orbsvcs/orbsvcs/IFRService/Options.h:
+	* orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp:
+	* orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp:
+	* orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp:
+	* orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h:
+	* orbsvcs/orbsvcs/Notify/EventChannel.cpp:
+	* orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp:
+	* orbsvcs/orbsvcs/Notify/Event_Manager.cpp:
+	* orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp:
+	* orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp:
+	* orbsvcs/orbsvcs/Notify/Random_File.cpp:
+	* orbsvcs/orbsvcs/Notify/ThreadPool_Task.h:
+	* orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp:
+	* orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp:
+	* orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp:
+	* orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp:
+	* orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp:
+	* orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp:
+	* orbsvcs/tests/Notify/lib/Activation_Manager.h:
+	* orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp:
+	* orbsvcs/tests/Notify/lib/Task_Stats.inl:
+	* tao/Any_Insert_Policy_T.h:
+	* tao/ORB_Table.inl:
+	* tao/WrongTransactionC.cpp:
+	* tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp:
+	* tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl:
+	* tao/Codeset/UTF16_BOM_Factory.cpp:
+	* tao/Codeset/UTF8_Latin1_Factory.cpp:
+        
+          On systems where ACE_TEMPLATES_REQUIRE_SOURCE is not defined,
+          template implementation files (*_T.cpp) are not #included by the
+          corresponding template header file (*_T.h).  So headers that had
+          been implicitly #included via the template implementation file,
+          may now need to be #included explicitly.
+        
+          This change explicitly #includes those headers (most commonly
+          ace/Log_Msg.h and ace/Auto_Ptr.h).  Now TAO can be built with
+          autoconf on Solaris using the Sun Studio C++ compiler.
+        
+          Thanks to Vladimir Panov for reporting this problem and
+          providing the initial patch.
+        
 Tue Jan 10 19:38:49 UTC 2006  Scott Harris  <harris_s@ociweb.com>
 
         * orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp:
@@ -12,8 +72,8 @@ Tue Jan 10 19:26:58 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
         * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp:
         * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp:
 
-				  On behalf of Tim Bradley (bradley_t@ociweb.com), applying these
-					changes to resolve the failure of the two tests.
+          On behalf of Tim Bradley (bradley_t@ociweb.com), applying these
+          changes to resolve the failure of the two tests.
 
 Tue Jan 10 10:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
index 476d94437bd..57fb11c2c6c 100644
--- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
@@ -41,6 +41,7 @@
 #include "be_extern.h"
 #include "utl_identifier.h"
 #include "idl_defines.h"
+#include "ace/Log_Msg.h"
 
 #include <string>
 
diff --git a/TAO/TAO_IDL/be/be_visitor_home.cpp b/TAO/TAO_IDL/be/be_visitor_home.cpp
index 3ef51b8fe8e..b3c720138a7 100644
--- a/TAO/TAO_IDL/be/be_visitor_home.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_home.cpp
@@ -26,6 +26,7 @@
 #include "be_visitor_context.h"
 #include "be_helper.h"
 #include "be_extern.h"
+#include "ace/Log_Msg.h"
 
 #include "be_visitor_home/home_ch.cpp"
 #include "be_visitor_home/home_cs.cpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface.cpp
index 94e476b2a82..2e7e3ff277f 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface.cpp
@@ -51,6 +51,7 @@
 #include "be_visitor_operation.h"
 #include "be_visitor_typecode.h"
 #include "be_visitor_context.h"
+#include "ace/Auto_Ptr.h"
 
 #include "be_visitor_interface/interface.cpp"
 #include "be_visitor_interface/interface_ch.cpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox.cpp
index 394ec3fe36f..c6d4bb2eaed 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox.cpp
@@ -42,6 +42,7 @@
 #include "be_visitor_typecode.h"
 #include "be_visitor_union.h"
 #include "be_visitor_valuebox.h"
+#include "ace/Log_Msg.h"
 
 #include "be_visitor_valuebox/valuebox.cpp"
 #include "be_visitor_valuebox/valuebox_ch.cpp"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.inl b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.inl
index 3b50f8c52a4..0971502bcc0 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.inl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.inl
@@ -1,5 +1,7 @@
 //$Id$
 
+#include "ace/Log_Msg.h"
+
 ACE_INLINE int
 Task_Stats::sample (ACE_UINT32 thr_run_time, int thr_count)
 {
diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.inl b/TAO/examples/RTCORBA/Activity/Task_Stats.inl
index 0e9aa2b2bb7..78ce13d05bc 100644
--- a/TAO/examples/RTCORBA/Activity/Task_Stats.inl
+++ b/TAO/examples/RTCORBA/Activity/Task_Stats.inl
@@ -1,5 +1,7 @@
 //$Id$
 
+#include "ace/Log_Msg.h"
+
 ACE_INLINE int
 Task_Stats::sample (ACE_UINT64 inv_start_time, ACE_UINT64 inv_end_time)
 {
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
index 95326565432..0efefef03cd 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
@@ -14,6 +14,7 @@
 #include "Fault_Detector_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Auto_Ptr.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/PortableGroup/PG_Property_Set.h"
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
index ee990f2230b..ed3b767e2f4 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
@@ -2,6 +2,7 @@
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
 // cvs-id    : $Id$
 
+#include "ace/Auto_Ptr.h"
 #include "tao/corba.h"
 #include "tao/PI/ORBInitInfo.h"
 #include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.h b/TAO/orbsvcs/orbsvcs/AV/TCP.h
index 9e3c338e392..f83d46d175b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/TCP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/TCP.h
@@ -19,6 +19,7 @@
 #include "FlowSpec_Entry.h"
 
 #include "ace/Service_Config.h"
+#include "ace/Svc_Handler.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
index e2e9fe1f09d..e62cd3c37b6 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
@@ -23,6 +23,9 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_strings.h"
+#include "ace/Null_Mutex.h"
+#include "ace/Null_Condition.h"
+#include "ace/Recursive_Thread_Mutex.h"
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
 #include "CEC_TypedConsumerAdmin.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
index 013707ef07d..929c0bade2a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
@@ -14,6 +14,7 @@
 #include /**/ "ace/pre.h"
 
 #include "ace/Hash_Map_Manager_T.h"
+#include "ace/Null_Mutex.h"
 
 #include "EC_Dispatching.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
index 488a3a746d5..4c3cbc61c1b 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
@@ -4,6 +4,7 @@
 #include "HTIOP_Profile.h"
 
 #include "ace/os_include/os_netdb.h"
+#include "ace/Log_Msg.h"
 
 #include "tao/IOPC.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
index 1a6c2edc224..ce3be7d690c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
@@ -4,6 +4,7 @@
 #include "EventPortDef_i.h"
 #include "EventDef_i.h"
 #include "IFR_Service_Utils_T.h"
+#include "IFR_Service_Utils.h"
 
 #include "ace/SString.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
index 1906d73c208..5caa2ee6f75 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
@@ -8,6 +8,7 @@
 #include "ExceptionDef_i.h"
 #include "AttributeDef_i.h"
 #include "IFR_Service_Utils_T.h"
+#include "IFR_Service_Utils.h"
 
 #include "ace/SString.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Options.h b/TAO/orbsvcs/orbsvcs/IFRService/Options.h
index c7e2eaed844..79554df38f9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Options.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.h
@@ -23,6 +23,7 @@
 #define OPTIONS_H
 
 #include "ace/Singleton.h"
+#include "ace/Null_Mutex.h"
 #include "ifr_service_export.h"
 #include "tao/Versioned_Namespace.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
index 597cf85946d..9d859d45567 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
@@ -4,6 +4,7 @@
 #include "ProvidesDef_i.h"
 #include "IFR_ComponentsS.h"
 #include "IFR_Service_Utils_T.h"
+#include "IFR_Service_Utils.h"
 
 #include "ace/SString.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
index bb8c41568ed..4f8ac2424a9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
@@ -3,6 +3,7 @@
 #include "Repository_i.h"
 #include "UsesDef_i.h"
 #include "IFR_Service_Utils_T.h"
+#include "IFR_Service_Utils.h"
 
 #include "ace/SString.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
index 82bcab0b2dc..a503b34cb32 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
@@ -4,6 +4,7 @@
 #include "ValueMemberDef_i.h"
 #include "IDLType_i.h"
 #include "IFR_Service_Utils_T.h"
+#include "IFR_Service_Utils.h"
 
 #include "ace/SString.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
index 934e298c38e..3f2b08d662d 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
@@ -5,6 +5,7 @@
 #include "tao/debug.h"
 
 #include "ace/SOCK_Connector.h"
+#include "ace/Log_Msg.h"
 
 ACE_RCSID (orbsvcs,
            IOR_Multicast,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
index b4d9b6a4a51..2d9e4a1388b 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
@@ -16,6 +16,7 @@
 
 #include "Hash_Naming_Context.h"
 #include "ace/Hash_Map_Manager.h"
+#include "ace/Auto_Ptr.h"
 
 #include "Storable.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
index 8044de9bfcd..a034bb2b158 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
@@ -16,6 +16,7 @@
 #include "Reconnect_Worker_T.h"
 #include "Proxy.h"
 #include "Event_Manager.h"
+#include "POA_Helper.h"
 
 #include "tao/debug.h"
 //#define DEBUG_LEVEL 9
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
index 6cfd5d721cf..7255e7412f1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
@@ -17,6 +17,7 @@ ACE_RCSID(Notify, TAO_Notify_EventChannelFactory, "$Id$")
 #include "Container_T.h"
 #include "Find_Worker_T.h"
 #include "Seq_Worker_T.h"
+#include "POA_Helper.h"
 
 #include "ace/Dynamic_Service.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
index dad57b097f7..94dfe9b99be 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
@@ -11,6 +11,7 @@ ACE_RCSID(Notify, TAO_Notify_Event_Manager, "$Id$")
 #include "Event_Map_T.h"
 
 #include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 
 #include "tao/debug.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
index 3cea62df04d..f9f3e890c6e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
@@ -11,6 +11,7 @@ ACE_RCSID(Notify, TAO_Notify_Method_Request_Dispatch, "$Id$")
 #include "EventChannelFactory.h"
 
 #include "tao/debug.h"
+#include "tao/CDR.h"
 
 #include "ace/OS_NS_stdio.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
index 9371b241401..629f3ca4f9b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
@@ -14,8 +14,12 @@ ACE_RCSID(Notify, TAO_Notify_Method_Request_Lookup, "$Id$")
 #include "Delivery_Request.h"
 #include "EventChannelFactory.h"
 #include "Event_Manager.h"
+#include "Factory.h"
+
+#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 
 #include "tao/debug.h"
+#include "tao/CDR.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
index e2fa60b0451..c112f8b337d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
@@ -3,6 +3,7 @@
 #include "Random_File.h"
 
 #include "ace/OS.h"
+#include "ace/Log_Msg.h"
 #include "tao/debug.h"
 //#define DEBUG_LEVEL 9
 #ifndef DEBUG_LEVEL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
index 3c3220aa7a0..cbea2a75782 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
@@ -22,6 +22,7 @@
 #include "ace/Task.h"
 #include "ace/Message_Queue.h"
 #include "ace/Reactor.h"
+#include "ace/Null_Condition.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
index 7df26bf8241..1ec6fc67ae0 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
@@ -7,6 +7,7 @@
 #include "ace/Vector_T.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Auto_Ptr.h"
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 #include "tao/PortableServer/POAManagerC.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
index d899a094059..c230cbdf01a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
@@ -4,6 +4,7 @@
 #include "UIPMC_Acceptor.h"
 #include "UIPMC_Connector.h"
 #include "ace/OS_NS_strings.h"
+#include "tao/ORB_Constants.h"
 
 ACE_RCSID (PortableGroup, 
            UIPMC_Factory, 
diff --git a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
index 45488574da3..65d0c1a3e64 100644
--- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "Shutdown_Utilities.h"
+#include "ace/Log_Msg.h"
 
 ACE_RCSID(orbsvcs,
           Shutdown_Utilities,
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
index 1ca1ad0b3ea..3ace3eaea71 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
@@ -6,6 +6,7 @@
 #include "tao/ORB_Constants.h"
 #include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/CDR.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 #include "Hello.h"
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
index b1b9cf78f48..cc63dbf287e 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
@@ -6,6 +6,7 @@
 #include "tao/ORB_Constants.h"
 #include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/CDR.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
index 74a2621c2b2..226898bcf40 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
@@ -6,6 +6,7 @@
 #include "tao/ORB_Constants.h"
 #include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/CDR.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
index 716e1747ebe..8097361c468 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
@@ -4,6 +4,7 @@
 // Include Section
 // ******************************************************************
 
+#include "ace/Auto_Ptr.h"
 #include "ace/Get_Opt.h"
 
 #include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
index 9e1ec6d2acd..838516b3d64 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
@@ -19,6 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Null_Mutex.h"
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager.h"
 #include "Task_Callback.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
index efa4eb67f71..a718deb73bf 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
@@ -4,6 +4,7 @@
 
 #include "ace/Arg_Shifter.h"
 #include "ace/High_Res_Timer.h"
+#include "ace/Task.h"
 #include "tao/debug.h"
 #include "orbsvcs/Time_Utilities.h"
 #include "StructuredEvent.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl
index 3be923f7f73..aed41117a3d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl
@@ -1,6 +1,7 @@
 //$Id$
 
 #include "ace/High_Res_Timer.h"
+#include "ace/Log_Msg.h"
 
 ACE_INLINE double
 Task_Stats::diff_sec (ACE_UINT64 before, ACE_UINT64 after)
diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
index f9297bab75b..51063cf07c8 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
@@ -14,6 +14,7 @@
 #include "Struct_TypeCode.h"
 #include "Union_TypeCode.h"
 #include "Value_TypeCode.h"
+#include "Any.h"
 
 #include "Recursive_Type_TypeCode.h"
 
@@ -24,6 +25,7 @@
 #include "tao/CDR.h"
 
 #include "ace/Array_Base.h"
+#include "ace/Value_Ptr.h"
 
 
 ACE_RCSID (tao,
diff --git a/TAO/tao/Any_Insert_Policy_T.h b/TAO/tao/Any_Insert_Policy_T.h
index dd742fef986..df79cbbc1f9 100644
--- a/TAO/tao/Any_Insert_Policy_T.h
+++ b/TAO/tao/Any_Insert_Policy_T.h
@@ -26,6 +26,7 @@
 #include "tao/AnyTypeCode_Adapter.h"
 
 #include "ace/Dynamic_Service.h"
+#include "ace/Log_Msg.h"
 #include "tao/debug.h"
 #include "tao/IFR_Client_Adapter.h"
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl
index a46c7de8985..c92dfe4719f 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl
@@ -2,6 +2,8 @@
 //
 // $Id$
 
+#include "ace/Auto_Ptr.h"
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
diff --git a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp
index 4f14caca47d..72fae8e36bd 100644
--- a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp
+++ b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp
@@ -17,6 +17,7 @@
 //
 // ============================================================================
 
+#include "tao/debug.h"
 #include "UTF16_BOM_Factory.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/Dynamic_Service.h"
diff --git a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp
index a1187e2099d..36acbe9ba16 100644
--- a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp
+++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp
@@ -1,5 +1,7 @@
 // $Id$
+#include "tao/debug.h"
 #include "ace/Dynamic_Service.h"
+#include "ace/Log_Msg.h"
 #include "UTF8_Latin1_Factory.h"
 
 ACE_STATIC_SVC_DEFINE (TAO_UTF8_Latin1_Factory,
diff --git a/TAO/tao/ORB_Table.inl b/TAO/tao/ORB_Table.inl
index 9bce09a0f6f..ddedd35a049 100644
--- a/TAO/tao/ORB_Table.inl
+++ b/TAO/tao/ORB_Table.inl
@@ -4,6 +4,8 @@
 
 #include "tao/ORB_Core.h"
 
+#include <algorithm>
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE TAO_ORB_Core *
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index f2f7d3683aa..ce670c4f08f 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -35,6 +35,7 @@
 #include "ace/OS_NS_string.h"
 #include "tao/AnyTypeCode_Adapter.h"
 #include "ace/Dynamic_Service.h"
+#include "ace/Log_Msg.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig