ChangeLogTag:Tue Nov 4 04:55:40 UTC 2003 Don Hinton <dhinton@dresystems.com>

94 files changed, 149 insertions, 66 deletions

diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index 09846e7afd8..88068232fdf 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -17,6 +17,7 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
+#include "ace/OS_NS_strings.h"
 
 ACE_RCSID(Event_Service, Event_Service, "$Id$")
 
diff --git a/TAO/orbsvcs/IFR_Service/drv_args_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_args_ifr.cpp
index a34fa15e5d9..c715934ccb4 100644
--- a/TAO/orbsvcs/IFR_Service/drv_args_ifr.cpp
+++ b/TAO/orbsvcs/IFR_Service/drv_args_ifr.cpp
@@ -6,6 +6,7 @@
 #include "drv_extern_ifr.h"
 #include "be_extern.h"
 #include "ace/Process.h"
+#include "ace/OS_NS_stdio.h"
 
 ACE_RCSID (IFR_Service, 
            drv_args_ifr, 
diff --git a/TAO/orbsvcs/IFR_Service/drv_preproc_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_preproc_ifr.cpp
index 978ad02a973..a118e2bcff5 100644
--- a/TAO/orbsvcs/IFR_Service/drv_preproc_ifr.cpp
+++ b/TAO/orbsvcs/IFR_Service/drv_preproc_ifr.cpp
@@ -80,6 +80,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ace/Env_Value_T.h"
 #include "ace/ARGV.h"
 #include "ace/streams.h"
+#include "ace/OS_NS_stdio.h"
 
 ACE_RCSID (IFR_Service, 
            drv_preproc_ifr, 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Options.cpp
index 427d3eadc8c..b754fb55363 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Options.cpp
@@ -13,7 +13,7 @@
 #include "tao/Strategies/advanced_resource.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/ARGV.h"
-
+#include "ace/OS_NS_strings.h"
 
 ACE_RCSID (ImplRepo_Service,
            Options,
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
index bc60d0548e4..1d4c3aebee8 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
@@ -9,6 +9,7 @@
 #include "ace/Read_Buffer.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_netdb.h"
+#include "ace/OS_NS_strings.h"
 
 // How many servers should we get at once?
 const size_t IR_LIST_CHUNK = 10;
@@ -366,7 +367,7 @@ TAO_IMR_Op_Add::parse (int argc, ACE_TCHAR **argv)
   ACE_Get_Opt get_opts (argc, argv, "hc:w:a:e:l:");
 
   this->server_name_ = argv[1];
-  if (ACE_OS_String::strlen(this->server_name_.c_str()) < 1)
+  if (ACE_OS::strlen(this->server_name_.c_str()) < 1)
   {
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Server name <%s> must be at least one character long!\n",
diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
index d2157681d22..c98e8e5c298 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
@@ -6,6 +6,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_main.h"
+#include "ace/OS_NS_strings.h"
 
 #if defined (linux) && defined (ACE_HAS_THREADS)
 # include "ace/Signal.h"
diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
index 89a4b3e0af1..d20dac005fe 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
@@ -8,6 +8,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_main.h"
+#include "ace/OS_NS_strings.h"
 
 
 ACE_RCSID (LoadBalancer,
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
index 21a28c9e63f..15e4ada0344 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
@@ -9,6 +9,7 @@
 #include "orbsvcs/Event/EC_Default_Factory.h"
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "ace/OS_main.h"
+#include "ace/OS_NS_strings.h"
 
 ACE_RCSID (RTEvent_Logging_Service,
            RTEvent_Logging_Service,
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
index 88cd01f829b..376efed5b3b 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
@@ -7,6 +7,8 @@
 #include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/OS_main.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_strings.h"
 
 ACE_RCSID(Scheduling_Service, Scheduling_Service, "$Id$")
 
diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp
index a752e41287e..ad5e0bf71c6 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Server_i.cpp
@@ -6,6 +6,7 @@
 #include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_string.h"
 
 ACE_RCSID(Time_Service, Server_i, "$Id$")
 
@@ -239,8 +240,8 @@ Server_i::register_server (void)
       CosNaming::Name server_name (server_context_name);
 
       server_name.length (2);
-      strcpy (server_mc_name, "Server:");
-      strcat (server_mc_name, host_name);
+      ACE_OS::strcpy (server_mc_name, "Server:");
+      ACE_OS::strcat (server_mc_name, host_name);
       server_name[1].id = CORBA::string_dup (server_mc_name);
 
       // Bind the compound name (ServerContext(Server:<hostname>))
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
index aefa1693c0a..3b421034a08 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
@@ -2,6 +2,7 @@
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/Event_Service_Constants.h"
 #include "ace/OS_main.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID (RTEvent,
            RTEvent_Supplier,
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
index 44eea79510d..8b60e9def69 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
@@ -18,6 +18,8 @@
 #include "ace/Sched_Params.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
+#include "ace/OS_NS_strings.h"
+#include "ace/Thread.h"
 
 ACE_RCSID(EC_Examples, Service, "$Id$")
 
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
index 2b675d94f14..3157a3b7ec4 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
@@ -4,6 +4,7 @@
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/Event_Service_Constants.h"
 #include "orbsvcs/CosNamingC.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(EC_Examples, Supplier, "$Id$")
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index e3f6e6f3c69..2b34a7824c3 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -22,6 +22,7 @@
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 #include "tao/Any.h"
+#include "ace/OS_NS_arpa_inet.h"
 
 #if !defined (__ACE_INLINE__)
 #include "AVStreams_i.i"
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
index e765fbdfe43..f29715633bf 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
@@ -10,6 +10,7 @@
 #include "tao/debug.h"
 
 #include "tao/PortableServer/ORB_Manager.h"
+#include "ace/OS_NS_strings.h"
 
 #if !defined (__ACE_INLINE__)
 #include "FlowSpec_Entry.i"
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
index 072a1b58518..a9a8236c777 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
@@ -41,7 +41,8 @@
 #include "md5.h"
 
 #include "RTCP_Packet.h"
-
+#include "ace/OS_NS_time.h"
+#include "ace/OS_NS_strings.h"
 
 int
 TAO_AV_RTCP_Callback::receive_control_frame (ACE_Message_Block *data,
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
index 60e14841a73..e2fd18dcc64 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
@@ -5,7 +5,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/Basic_Types.h"
 
 /**
  * @struct RTCP_Common_Header
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
index 3e96c026318..7d75cdedf6a 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
@@ -39,6 +39,8 @@
 #include "Nil.h"
 
 #include "tao/debug.h"
+#include "ace/OS_NS_arpa_inet.h"
+#include "ace/OS_NS_strings.h"
 
 // RTP_Packet
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
index 6fa0e085f92..b36a2785a7e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
@@ -4,6 +4,7 @@
 #include "AVStreams_i.h"
 
 #include "tao/debug.h"
+#include "ace/OS_NS_strings.h"
 
 //------------------------------------------------------------
 // TAO_AV_TCP_Transport
@@ -635,9 +636,9 @@ int
 TAO_AV_TCP_Flow_Handler::open (void * /*arg*/)
 {
 
+#if defined (TCP_NODELAY)
   int nodelay = 1;
 
-#if defined (TCP_NODELAY)
   if (this->peer ().set_option (IPPROTO_TCP,
                                 TCP_NODELAY,
                                 (void *) &nodelay,
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
index 7e1a0b2b945..7b3fcc320f2 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
@@ -5,6 +5,7 @@
 #include "MCast.h"
 
 #include "tao/debug.h"
+#include "ace/OS_NS_strings.h"
 
 #if !defined (__ACE_INLINE__)
 #include "UDP.i"
@@ -683,7 +684,7 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry,
                           char buf [BUFSIZ];
                           ACE_CString addr_str (local_addr->get_host_name ());
                           addr_str += ":";
-                          addr_str += ACE_OS_String::itoa (local_addr->get_port_number () + 1, buf, 10);
+                          addr_str += ACE_OS::itoa (local_addr->get_port_number () + 1, buf, 10);
                           ACE_NEW_RETURN (local_control_addr,
                                           ACE_INET_Addr (addr_str.c_str ()),
                                           -1);
diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
index 6d9dbf02c3a..e29c8e154ce 100644
--- a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
@@ -4,6 +4,7 @@
 
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
+#include "ace/OS_NS_strings.h"
 
 TAO_AV_Default_Resource_Factory::TAO_AV_Default_Resource_Factory (void)
 {
diff --git a/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp
index 902352b6b1b..098515b27d5 100644
--- a/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp
@@ -38,9 +38,9 @@ static const char rcsid[] =
 */
 
 #include "media_timer.h"
-// FUZZ: disable check_for_math_include
-#include <math.h>
-
+#include "ace/Time_Value.h"
+#include "ace/OS_NS_sys_time.h"
+#include "ace/OS_NS_stdlib.h"
 
 MediaTimer* MediaTimer::instance_;
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/media_timer.h b/TAO/orbsvcs/orbsvcs/AV/media_timer.h
index 9248093e61a..408ecb7136b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/media_timer.h
+++ b/TAO/orbsvcs/orbsvcs/AV/media_timer.h
@@ -39,7 +39,7 @@
 #define TAO_AV_MEDIA_TIMER_H
 #include /**/ "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/Basic_Types.h"
 //long random (void);
 
 class MediaTimer
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
index 787ffcbaa62..0e778f961b7 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
@@ -4,6 +4,7 @@
 #include "ace/ARGV.h"
 
 #include "tao/debug.h"
+#include "ace/OS_NS_strings.h"
 
 // default arguments to pass to use for the ORB
 const char *TAO_SFP_Base::TAO_SFP_ORB_ARGUMENTS = "-ORBobjrefstyle URL";
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
index 470c7ce93f6..5ab30c57eb0 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
@@ -18,6 +18,7 @@
 // ============================================================================
 
 #include "CC_Lock.h"
+#include "ace/Log_Msg.h"
 
 ACE_RCSID (Concurrency, 
            CC_Lock, 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
index a2988e610e5..87fff75616e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
@@ -22,6 +22,7 @@
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Sched_Params.h"
+#include "ace/OS_NS_strings.h"
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
 #include "CEC_TypedConsumerAdmin.h"
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp
index 426bbef0655..5446ebe6eca 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp
@@ -3,6 +3,8 @@
 
 #include "ETCL_Interpreter.h"
 #include "ETCL_Constraint.h"
+#include "ace/Guard_T.h"
+#include "ace/Thread_Mutex.h"
 
 ACE_RCSID(ETCL, ETCL_Interpreter, "$Id$")
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
index e938ac2ae9b..abdebd55529 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
@@ -24,6 +24,7 @@
 
 #include "ace/Hash_Map_Manager.h"
 #include "ace/INET_Addr.h"
+#include "ace/Null_Mutex.h"
 
 /**
  * @class TAO_ECG_CDR_Processor
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i
index b8c0c73e4ba..59eeae30034 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i
@@ -1,5 +1,7 @@
 // $Id$
 
+#include "ace/Null_Mutex.h"
+
 ACE_INLINE
 TAO_ECG_CDR_Message_Sender::TAO_ECG_CDR_Message_Sender (CORBA::Boolean crc)
   :  endpoint_rptr_ ()
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
index 750d892304e..fe1f9aa8da7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
@@ -14,6 +14,7 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/Arg_Shifter.h"
 #include "tao/ORB_Core.h"
+#include "ace/OS_NS_strings.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "ECG_Mcast_Gateway.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
index 56b33d213db..bc7e81f477a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
@@ -1,5 +1,8 @@
+/* -*- C++ -*- */
 // $Id$
 
+#include "ace/Null_Mutex.h"
+
 ACE_INLINE TAO_EC_Servant_Var<TAO_ECG_UDP_Sender>
 TAO_ECG_UDP_Sender::create (CORBA::Boolean crc)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
index 6ece9deb3a5..61adaf515d7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
@@ -31,6 +31,7 @@
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Sched_Params.h"
+#include "ace/OS_NS_strings.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_Default_Factory.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
index c180026b352..eb368de2dbb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
@@ -12,6 +12,7 @@
 #include "ECG_Reactive_ConsumerEC_Control.h"
 #include "ECG_Reconnect_ConsumerEC_Control.h"
 #include "EC_Gateway_IIOP.h"
+#include "ace/OS_NS_strings.h"
 
 #if !defined (__ACE_INLINE__)
 #include "EC_Gateway_IIOP_Factory.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
index e30cfbe09a0..62d433eb367 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
@@ -9,6 +9,7 @@
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Sched_Params.h"
+#include "ace/OS_NS_strings.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_Kokyu_Factory.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
index f7f6a6e5169..c0490f4cf17 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
@@ -8,6 +8,7 @@
 #include "EC_Disjunction_Filter.h"
 #include "EC_Timeout_Filter.h"
 #include "EC_Event_Channel_Base.h"
+#include "ace/OS_NS_stdio.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_Kokyu_Filter_Builder.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
index 214e22aa4ce..0199dec1957 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
@@ -9,6 +9,7 @@
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Sched_Params.h"
+#include "ace/OS_NS_strings.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_Sched_Factory.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
index 9011189c522..6b2815e4897 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
@@ -8,6 +8,7 @@
 #include "EC_Disjunction_Filter.h"
 #include "EC_Timeout_Filter.h"
 #include "EC_Event_Channel_Base.h"
+#include "ace/OS_NS_stdio.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_Sched_Filter_Builder.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
index 4b61e0e0542..b6771dfac03 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
@@ -1,6 +1,8 @@
 // $Id$
 
 #include "orbsvcs/Event_Utilities.h"
+#include "ace/Log_Msg.h"
+#include "ace/OS_NS_stdio.h"
 
 #if !defined (__ACE_INLINE__)
 #include "orbsvcs/Event_Utilities.i"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
index 51f604ef5d4..052001b11fa 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
@@ -3,6 +3,7 @@
 
 #include "tao/ORB_Constants.h"
 #include "tao/ORBInitializer_Registry.h"
+#include "ace/OS_NS_strings.h"
 
 ACE_RCSID (LoadBalancing,
            LB_Component,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
index d4f5b0332e7..b056fc7622b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
@@ -7,6 +7,7 @@ ACE_RCSID (LoadBalancing,
 
 
 #include "tao/debug.h"
+#include "ace/OS_NS_strings.h"
 
 
 // The number of different object groups to support.
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
index 2dac4d201f3..0917d813c5b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -6,7 +6,7 @@
 #include "orbsvcs/Time_Utilities.h"
 
 #include "tao/debug.h"
-
+#include "ace/OS_NS_stdio.h"
 
 ACE_RCSID (Log,
            Log_i,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
index ebcc4575345..b5387ff1c72 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
@@ -410,7 +410,7 @@ TAO_Naming_Context::to_url_validate_and_compute_size (
     const char *sn
     ACE_ENV_ARG_DECL)
 {
-  size_t addr_len = ACE_OS_String::strlen (addr);
+  size_t addr_len = ACE_OS::strlen (addr);
 
   // Check for invalid address
   if (addr_len == 0)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
index dc3394d73ab..f113da90784 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
@@ -18,6 +18,7 @@
 #include "orbsvcs/CosNamingS.h"
 
 #include "naming_export.h"
+#include "ace/Null_Mutex.h"
 
 class TAO_Naming_Context_Impl;
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
index d222ea5c80c..88e6db290ab 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
@@ -15,6 +15,7 @@
 #include "ace/Auto_Ptr.h"
 #include "Transient_Naming_Context.h"
 #include "Bindings_Iterator_T.h"
+#include "ace/OS_NS_stdio.h"
 
 ACE_RCSID(Naming, Transient_Naming_Context, "$Id$")
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
index 61c455338ee..dada530013a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
@@ -22,6 +22,7 @@
 
 #include "ace/Atomic_Op.h"
 #include "ace/Refcounted_Auto_Ptr.h"
+#include "ace/Condition_Thread_Mutex.h"
 
 #include "tao/orbconf.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
index 55acfa6f5dc..06f1da252e4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
@@ -19,6 +19,7 @@ ACE_RCSID (Notify,
 #include "QoSProperties.h"
 
 #include "tao/debug.h"
+#include "ace/Null_Condition.h"
 
 TAO_Notify_Buffering_Strategy::TAO_Notify_Buffering_Strategy (
     TAO_Notify_Message_Queue& msg_queue,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
index 82da06e143b..d3056151c25 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
@@ -24,6 +24,7 @@
 #include "ace/Atomic_Op.h"
 #include "orbsvcs/CosNotifyFilterS.h"
 #include "Notify_Constraint_Interpreter.h"
+#include "ace/Null_Mutex.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
index 0358e88b59a..fd0182a8dfc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
@@ -26,7 +26,7 @@ TAO_Notify_POA_Helper::get_unique_id (void)
   static TAO_Notify_ID_Factory poa_id_factory;
 
   char buf[32];
-  ACE_OS_String::itoa (poa_id_factory.id (), buf, 10);
+  ACE_OS::itoa (poa_id_factory.id (), buf, 10);
 
   return ACE_CString (buf);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp
index eb8985f6554..73bd444b95d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/Batch_Buffering_Strategy.cpp
@@ -2,6 +2,7 @@
 
 #include "Batch_Buffering_Strategy.h"
 #include "../Method_Request_Event.h"
+#include "ace/Null_Condition.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "Batch_Buffering_Strategy.inl"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
index 8063ef6f8d7..297d35f5b80 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
@@ -26,6 +26,7 @@
 #include "../Consumer.h"
 #include "../AdminProperties.h"
 #include "Batch_Buffering_Strategy.h"
+#include "ace/Null_Condition.h"
 
 class TAO_Notify_ProxySupplier;
 class TAO_Notify_QoSProperties;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
index fd55554a028..a234e7882d6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
@@ -12,6 +12,7 @@ ACE_RCSID(Notify, TAO_Notify_ThreadPool_Task, "$Id$")
 #include "tao/ORB_Core.h"
 #include "Properties.h"
 #include "Timer_Queue.h"
+#include "ace/OS_NS_errno.h"
 
 TAO_Notify_ThreadPool_Task::TAO_Notify_ThreadPool_Task (void)
   : buffering_strategy_ (0), shutdown_ (0), timer_ (0)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
index 6b604f25e15..d080e94ea38 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
@@ -23,6 +23,7 @@
 
 #include "ace/Timer_Queue.h"
 #include "ace/Timer_Heap.h"
+#include "ace/Recursive_Thread_Mutex.h"
 
 /**
  * @class TAO_Notify_Timer_Queue
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
index 75c69f9e388..52e225f76a3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
@@ -13,6 +13,7 @@
 #include "tao/Protocols_Hooks.h"
 
 #include "UIPMC_Profile.h"
+#include "ace/OS_NS_strings.h"
 
 ACE_RCSID (tao, 
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
index a521ed66824..ba2accd9ff2 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
@@ -5,6 +5,7 @@
 #include "UIPMC_Factory.h"
 #include "UIPMC_Acceptor.h"
 #include "UIPMC_Connector.h"
+#include "ace/OS_NS_strings.h"
 
 ACE_RCSID (PortableGroup, 
            UIPMC_Factory, 
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
index e6bd45686f5..39c80f49402 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
@@ -11,6 +11,8 @@
 //=============================================================================
 
 #include "RTCosScheduling_PCP_Manager.h"
+#include "ace/Condition_Thread_Mutex.h"
+#include "ace/Thread.h"
 
 #if !defined (__ACE_INLINE__)
 #include "RTCosScheduling_PCP_Manager.i"
@@ -428,14 +430,14 @@ PCP_Manager_Factory::PCP_Manager_Factory(char *shared_file)
 
       /// Get the temporary directory
       if (ACE::get_temp_dir (temp_file,
-                             MAXPATHLEN - ACE_OS_String::strlen(shared_file))
+                             MAXPATHLEN - ACE_OS::strlen(shared_file))
           == -1)
         ACE_ERROR ((LM_ERROR,
                     "Temporary path too long\n"));
       ACE_TRY_CHECK;
 
       /// Add the filename to the end
-      ACE_OS_String::strcat (temp_file, shared_file);
+      ACE_OS::strcat (temp_file, shared_file);
 
       /// Store in the global variable.
       this->shm_key_ = temp_file;
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index 542f2738c90..1e8d81e53bd 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -19,6 +19,7 @@
 #include "DynSched.h"
 #include "ace/Basic_Types.h"
 #include "ace/Sched_Params.h"
+#include "ace/OS_NS_stdio.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "DynSched.i"
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
index 215361f2090..d3cfadfab4e 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
@@ -33,6 +33,7 @@
 #include "ace/SString.h"
 #include "SchedEntry.h"
 #include "sched_export.h"
+#include "ace/Recursive_Thread_Mutex.h"
 
 class TAO_RTSched_Export ACE_DynScheduler
   // = TITLE
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
index 402678f13de..6c300c402bf 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
@@ -18,6 +18,7 @@
 
 #include "SchedEntry.h"
 #include "ace/SString.h"
+#include "ace/OS_NS_stdio.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "SchedEntry.i"
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
index c9cdd4192ac..f7b44f4249f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
@@ -19,6 +19,7 @@
 #include "ace/Sched_Params.h"
 #include "orbsvcs/Time_Utilities.h"
 #include "Scheduler.h"
+#include "ace/OS_NS_stdio.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "Scheduler.i"
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
index 7153d0a4d73..f3a3877c13e 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
@@ -19,6 +19,7 @@
 #include "ace/Sched_Params.h"
 
 #include "Scheduler_Generic.h"
+#include "ace/OS_NS_stdio.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "Scheduler_Generic.i"
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
index 2a3c09226c4..7c039ca4002 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
@@ -23,6 +23,8 @@
 
 #include "Scheduler.h"
 #include "ace/Unbounded_Set.h"
+#include "ace/Synch_Traits.h"
+#include "ace/Recursive_Thread_Mutex.h"
 
 class TAO_RTSched_Export Scheduler_Generic : public ACE_Scheduler
   // = TITLE
diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
index 66bd6f22243..0d6f880263a 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
@@ -3,7 +3,7 @@
 
 #include "tao/debug.h"
 
-#include "ace/OS.h"
+#include "ace/OS_NS_time.h"
 
 
 ACE_RCSID (Time,
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
index 1edbebeaed7..c34fb9e0a91 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
@@ -4,6 +4,7 @@
 #include "Constraint_Visitors.h"
 
 #include "tao/Managed_Types.h"
+#include "ace/OS_NS_string.h"
 
 ACE_RCSID (Trader,
            Constraint_Nodes,
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
index 55406876dfd..5bb6486c5c2 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
@@ -13,7 +13,7 @@
 //
 // ========================================================================
 
-#include "ace/OS.h"
+#include "ace/OS_NS_string.h"
 #include "Constraint_Interpreter.h"
 #include "Constraint_Nodes.h"
 
@@ -279,7 +279,7 @@ char * yyreds[] =
 #define YYRECOVERING()	(!!yyerrflag)
 #define YYNEW(type)	malloc(sizeof(type) * yynewmax)
 #define YYCOPY(to, from, type) \
-	(type *) memcpy(to, (char *) from, yynewmax * sizeof(type))
+	(type *) ACE_OS::memcpy(to, (char *) from, yynewmax * sizeof(type))
 #define YYENLARGE( from, type) \
 	(type *) realloc((char *) from, yynewmax * sizeof(type))
 #ifndef YYDEBUG
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
index 44a07b258d1..8205067b623 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "Interpreter.h"
+#include "ace/OS_NS_string.h"
 
 TAO_SYNCH_MUTEX TAO_Interpreter::parserMutex__;
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
index e1ba06d18dd..0df1e67b258 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
@@ -2,6 +2,7 @@
 
 #include "Interpreter_Utils.h"
 #include "ace/ACE.h"
+#include "ace/OS_NS_string.h"
 
 // = Methods to deal with ACE_Hash_Map_Manager.
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index 5a0db26616c..0d4ad659c02 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -4,6 +4,8 @@
 #include "Offer_Iterators_T.h"
 #include "ace/Thread_Mutex.h"
 #include "ace/RW_Thread_Mutex.h"
+#include "ace/OS_NS_strings.h"
+#include "ace/os_include/os_ctype.h"
 
 // The following #include is needed only for the instantiation pragmas.
 #include "Trader_Interfaces.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h
index 698d95b1180..88e6fc31b97 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h
@@ -19,6 +19,7 @@
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Policy.h"
 #include "orbsvcs/AV/Flows_T.h"
+#include "ace/OS_NS_time.h"
 
 class Ping_Recv_Callback : public TAO_AV_Callback
 {
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
index 04695ae8b56..e06135526c4 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
@@ -25,6 +25,7 @@
 #include "ace/Read_Buffer.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/os_include/os_ctype.h"
 
 ACE_RCSID(Concurrency, CC_client, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
index 4de63e67cbe..b26b31e4c79 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
@@ -19,10 +19,9 @@
 #include "CC_test_utils.h"
 #include "CC_naming_service.h"
 #include "ace/ACE.h"
-#include "ace/OS.h"
 #include "ace/Process.h"
 #include "orbsvcs/CosConcurrencyControlC.h"
-#include <stdio.h>
+#include "ace/OS_NS_stdio.h"
 
 ACE_RCSID(Concurrency, CC_command, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
index ec6ffd9effb..7d9019d5bba 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
@@ -4,6 +4,7 @@
 #include "orbsvcs/CosEvent/CEC_EventChannel.h"
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
 #include "ace/Arg_Shifter.h"
+#include "ace/OS_NS_strings.h"
 
 ACE_RCSID(CEC_Tests, Random, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index c43b71cb4ca..ad32b062a54 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -20,6 +20,8 @@
 #include "ace/Get_Opt.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Sched_Params.h"
+#include "ace/OS_NS_errno.h"
+#include "ace/OS_NS_strings.h"
 
 #if defined (sun)
 # include <sys/lwp.h> /* for _lwp_self */
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index be3e75e7ed8..6de28a3c6d7 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -14,6 +14,7 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(EC_Throughput, ECT_Consumer_Driver, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index 701da7d3d15..0bb6d9422af 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -14,6 +14,7 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(EC_Throughput, ECT_Supplier_Driver, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index d6a03203c50..fd2ffe3273b 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -20,6 +20,8 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/Sched_Params.h"
 #include "ace/High_Res_Timer.h"
+#include "ace/OS_NS_strings.h"
+#include "ace/OS_NS_errno.h"
 
 ACE_RCSID(EC_Throughput, ECT_Throughput, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
index 967f69b7edd..6217f46081e 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
@@ -6,6 +6,7 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Time_Utilities.h"
 #include "ace/Arg_Shifter.h"
+#include "ace/OS_NS_strings.h"
 
 ACE_RCSID(EC_Tests, Random, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
index bc3dc16a191..087bf7f3831 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
@@ -6,6 +6,7 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/High_Res_Timer.h"
+#include "ace/OS_NS_strings.h"
 
 ACE_RCSID(EC_Tests_Performance, Connect, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
index 0c9d83d8fcb..838f3b35e7c 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
@@ -2,6 +2,7 @@
 
 #include "Counting_Supplier.h"
 #include "orbsvcs/Event_Utilities.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(EC_Tests, EC_Count_Supplier, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
index 0eb220e760a..8424216bd5c 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
@@ -5,6 +5,7 @@
 #include "orbsvcs/Event_Utilities.h"
 
 #include "tao/debug.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(EC_Tests, EC_Supplier, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/common.cpp b/TAO/orbsvcs/tests/Notify/Blocking/common.cpp
index 1caccdbb3df..c88d7dc082d 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/common.cpp
@@ -5,6 +5,7 @@
 #include "orbsvcs/CosNotifyCommC.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
 
 
 const char*
@@ -36,12 +37,12 @@ Any_String (const CORBA::Any& any)
     }
   else if (any >>= str)
     {
-      ACE_OS_String::strcpy (out, str);
+      ACE_OS::strcpy (out, str);
     }
   else if (any >>= ull)
     {
 #if defined (ACE_LACKS_LONGLONG_T)
-      ACE_OS_String::strcpy (out, ull.as_string (out));
+      ACE_OS::strcpy (out, ull.as_string (out));
 #else
       double temp =
 # if defined (ACE_CONFIG_WIN32_H)
@@ -55,7 +56,7 @@ Any_String (const CORBA::Any& any)
     }
   else
     {
-      ACE_OS_String::strcpy (out, "Unsupported Any Type");
+      ACE_OS::strcpy (out, "Unsupported Any Type");
     }
 
   return out;
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/common.cpp b/TAO/orbsvcs/tests/Notify/Discarding/common.cpp
index 1caccdbb3df..c88d7dc082d 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/common.cpp
@@ -5,6 +5,7 @@
 #include "orbsvcs/CosNotifyCommC.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
 
 
 const char*
@@ -36,12 +37,12 @@ Any_String (const CORBA::Any& any)
     }
   else if (any >>= str)
     {
-      ACE_OS_String::strcpy (out, str);
+      ACE_OS::strcpy (out, str);
     }
   else if (any >>= ull)
     {
 #if defined (ACE_LACKS_LONGLONG_T)
-      ACE_OS_String::strcpy (out, ull.as_string (out));
+      ACE_OS::strcpy (out, ull.as_string (out));
 #else
       double temp =
 # if defined (ACE_CONFIG_WIN32_H)
@@ -55,7 +56,7 @@ Any_String (const CORBA::Any& any)
     }
   else
     {
-      ACE_OS_String::strcpy (out, "Unsupported Any Type");
+      ACE_OS::strcpy (out, "Unsupported Any Type");
     }
 
   return out;
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
index aff5df0cad2..495f48ce04f 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
@@ -196,10 +196,10 @@ int main (int argc, char* argv[])
               // before we start receiving events.
               ACE_stat buf;
               char ior_file[PATH_MAX];
-              const char* filepart = ACE_OS_String::strstr (ior, "file://");
+              const char* filepart = ACE_OS::strstr (ior, "file://");
               if (filepart != 0)
                 {
-                  ACE_OS_String::strcpy (ior_file, filepart + 7);
+                  ACE_OS::strcpy (ior_file, filepart + 7);
                   while (ACE_OS::stat (ior_file, &buf) == 0)
                     {
                       ACE_OS::sleep (1);
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
index 0ab02f6757a..2942fc5ed3f 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
@@ -189,10 +189,10 @@ int main (int argc, char* argv[])
               // before we start receiving events.
               ACE_stat buf;
               char ior_file[PATH_MAX];
-              const char* filepart = ACE_OS_String::strstr (ior, "file://");
+              const char* filepart = ACE_OS::strstr (ior, "file://");
               if (filepart != 0)
                 {
-                  ACE_OS_String::strcpy (ior_file, filepart + 7);
+                  ACE_OS::strcpy (ior_file, filepart + 7);
                   while (ACE_OS::stat (ior_file, &buf) == 0)
                     {
                       ACE_OS::sleep (1);
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/common.cpp b/TAO/orbsvcs/tests/Notify/Ordering/common.cpp
index 1caccdbb3df..27cb6382507 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/common.cpp
@@ -36,12 +36,12 @@ Any_String (const CORBA::Any& any)
     }
   else if (any >>= str)
     {
-      ACE_OS_String::strcpy (out, str);
+      ACE_OS::strcpy (out, str);
     }
   else if (any >>= ull)
     {
 #if defined (ACE_LACKS_LONGLONG_T)
-      ACE_OS_String::strcpy (out, ull.as_string (out));
+      ACE_OS::strcpy (out, ull.as_string (out));
 #else
       double temp =
 # if defined (ACE_CONFIG_WIN32_H)
@@ -55,7 +55,7 @@ Any_String (const CORBA::Any& any)
     }
   else
     {
-      ACE_OS_String::strcpy (out, "Unsupported Any Type");
+      ACE_OS::strcpy (out, "Unsupported Any Type");
     }
 
   return out;
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp
index 1caccdbb3df..27cb6382507 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp
@@ -36,12 +36,12 @@ Any_String (const CORBA::Any& any)
     }
   else if (any >>= str)
     {
-      ACE_OS_String::strcpy (out, str);
+      ACE_OS::strcpy (out, str);
     }
   else if (any >>= ull)
     {
 #if defined (ACE_LACKS_LONGLONG_T)
-      ACE_OS_String::strcpy (out, ull.as_string (out));
+      ACE_OS::strcpy (out, ull.as_string (out));
 #else
       double temp =
 # if defined (ACE_CONFIG_WIN32_H)
@@ -55,7 +55,7 @@ Any_String (const CORBA::Any& any)
     }
   else
     {
-      ACE_OS_String::strcpy (out, "Unsupported Any Type");
+      ACE_OS::strcpy (out, "Unsupported Any Type");
     }
 
   return out;
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp
index 1caccdbb3df..27cb6382507 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp
@@ -36,12 +36,12 @@ Any_String (const CORBA::Any& any)
     }
   else if (any >>= str)
     {
-      ACE_OS_String::strcpy (out, str);
+      ACE_OS::strcpy (out, str);
     }
   else if (any >>= ull)
     {
 #if defined (ACE_LACKS_LONGLONG_T)
-      ACE_OS_String::strcpy (out, ull.as_string (out));
+      ACE_OS::strcpy (out, ull.as_string (out));
 #else
       double temp =
 # if defined (ACE_CONFIG_WIN32_H)
@@ -55,7 +55,7 @@ Any_String (const CORBA::Any& any)
     }
   else
     {
-      ACE_OS_String::strcpy (out, "Unsupported Any Type");
+      ACE_OS::strcpy (out, "Unsupported Any Type");
     }
 
   return out;
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
index 61d82d51eff..e018c1114ab 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
@@ -49,12 +49,12 @@ Any_String (const CORBA::Any& any)
     }
   else if (any >>= str)
     {
-      ACE_OS_String::strcpy (out, str);
+      ACE_OS::strcpy (out, str);
     }
   else if (any >>= ull)
     {
 #if defined (ACE_LACKS_LONGLONG_T)
-      ACE_OS_String::strcpy (out, ull.as_string (out));
+      ACE_OS::strcpy (out, ull.as_string (out));
 #else
       // @@@@ (JP) Need to cast to signed int64 to cast to
       // double on Win32, but this hack may not fly on
@@ -65,7 +65,7 @@ Any_String (const CORBA::Any& any)
     }
   else
     {
-      ACE_OS_String::strcpy (out, "Unsupported Any Type");
+      ACE_OS::strcpy (out, "Unsupported Any Type");
     }
 
   return out;
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
index b25876d1f83..d2706a70453 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
@@ -113,12 +113,12 @@ Any_String (const CORBA::Any& any)
     }
   else if (any >>= str)
     {
-      ACE_OS_String::strcpy (out, str);
+      ACE_OS::strcpy (out, str);
     }
   else if (any >>= ull)
     {
 #if defined (ACE_LACKS_LONGLONG_T)
-      ACE_OS_String::strcpy (out, ull.as_string (out));
+      ACE_OS::strcpy (out, ull.as_string (out));
 #else
       double temp =
 # if defined (ACE_CONFIG_WIN32_H)
@@ -132,7 +132,7 @@ Any_String (const CORBA::Any& any)
     }
   else
     {
-      ACE_OS_String::strcpy (out, "Unsupported Any Type");
+      ACE_OS::strcpy (out, "Unsupported Any Type");
     }
 
   return out;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
index c0a92bbdabd..cc4d7190887 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
@@ -13,7 +13,7 @@
 #ifndef TASK_STATS_H
 #define TASK_STATS_H
 
-#include "ace/OS.h"
+#include "ace/OS_NS_time.h"
 #include "ace/Singleton.h"
 #include "tao/orbconf.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp
index 1caccdbb3df..c88d7dc082d 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp
@@ -5,6 +5,7 @@
 #include "orbsvcs/CosNotifyCommC.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
 
 
 const char*
@@ -36,12 +37,12 @@ Any_String (const CORBA::Any& any)
     }
   else if (any >>= str)
     {
-      ACE_OS_String::strcpy (out, str);
+      ACE_OS::strcpy (out, str);
     }
   else if (any >>= ull)
     {
 #if defined (ACE_LACKS_LONGLONG_T)
-      ACE_OS_String::strcpy (out, ull.as_string (out));
+      ACE_OS::strcpy (out, ull.as_string (out));
 #else
       double temp =
 # if defined (ACE_CONFIG_WIN32_H)
@@ -55,7 +56,7 @@ Any_String (const CORBA::Any& any)
     }
   else
     {
-      ACE_OS_String::strcpy (out, "Unsupported Any Type");
+      ACE_OS::strcpy (out, "Unsupported Any Type");
     }
 
   return out;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
index 6d2869f0609..6b9ee00d231 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
@@ -3,8 +3,7 @@
 #include "RedGreen_Test.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
-#include "ace/Synch.h"
-#include "ace/OS.h"
+#include "ace/OS_NS_unistd.h"
 #include "orbsvcs/Time_Utilities.h"
 #include "tao/debug.h"
 
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp
index 83d4b3f516d..9b78e32dd27 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp
@@ -59,7 +59,7 @@ void Object1_impl::method1(const char* activity,
 
 
 
-  if (strcmp(activity,"Client1") == 0)
+  if (ACE_OS::strcmp(activity,"Client1") == 0)
     {
        ACE_OS::sleep(5);
     }
@@ -77,7 +77,7 @@ void Object1_impl::method1(const char* activity,
                   ACE::timestamp(date_and_time, time_size),
                   activity);
   ACE_DEBUG((LM_DEBUG,"%s",buf2));
-  ACE_OS_String::strcat(buf,buf2);
-  output = ACE_OS_String::strdup(buf);
+  ACE_OS::strcat(buf,buf2);
+  output = ACE_OS::strdup(buf);
 
 }
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
index 0f89c467e59..a75adb276d0 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
@@ -275,7 +275,7 @@ int svc(void) {
           ACE_DEBUG ((LM_DEBUG,
                       "%s",
                       buf));
-          ACE_OS_String::strcat(client_output_, buf);
+          ACE_OS::strcat(client_output_, buf);
 
           do_work(before_);
           ACE_TRY_CHECK;
@@ -289,11 +289,11 @@ int svc(void) {
           ACE_DEBUG ((LM_DEBUG,
                       "%s",
                       buf));
-          ACE_OS_String::strcat(client_output_, buf);
-      serv_output_ = ACE_OS_String::strdup("");
+          ACE_OS::strcat(client_output_, buf);
+      serv_output_ = ACE_OS::strdup("");
           object1->method1 (activity_, remote_, serv_output_.inout());
 
-          ACE_OS_String::strcat(client_output_, serv_output_.in());
+          ACE_OS::strcat(client_output_, serv_output_.in());
 
 
           ACE_OS::sprintf(buf,
@@ -304,7 +304,7 @@ int svc(void) {
           ACE_DEBUG ((LM_DEBUG,
                       "%s",
                       buf));
-          ACE_OS_String::strcat(client_output_, buf);
+          ACE_OS::strcat(client_output_, buf);
 
 
           do_work(after_);
@@ -317,7 +317,7 @@ int svc(void) {
           ACE_DEBUG ((LM_DEBUG,
                       "%s",
                       buf));
-          ACE_OS_String::strcat(client_output_, buf);
+          ACE_OS::strcat(client_output_, buf);
 
 
         }
@@ -333,7 +333,7 @@ int svc(void) {
                       activity_));
 
           object1->method1 (activity_, remote_, serv_output_.inout());
-          ACE_OS_String::strcat(client_output_,serv_output_.in());
+          ACE_OS::strcat(client_output_,serv_output_.in());
           /// Finished with remote call
           ACE_DEBUG ((LM_DEBUG,
                       "%T\t%s\tClient\tDone with method1\n",
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index 46bc4dd1d3e..97bef9c2b92 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -6,7 +6,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
-#include "ace/OS.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(Time_Service, Client_i, "$Id$")
 
@@ -346,8 +346,8 @@ Client_i::obtain_initial_references (void)
       CosNaming::Name clerk_name;
       clerk_name.length (2);
       clerk_name[0].id = CORBA::string_dup ("ClerkContext");
-      strcpy (name, "Clerk:");
-      strcat (name, host_name);
+      ACE_OS::strcpy (name, "Clerk:");
+      ACE_OS::strcat (name, host_name);
       clerk_name[1].id = CORBA::string_dup (name);
 
       ACE_DEBUG ((LM_DEBUG,