Mon Sep 13 09:27:13 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * DevGuideExamples/AMH_AMI/inner_i.cpp:
        * examples/Advanced/ch_12/icp.h:
        * examples/Advanced/ch_18/icp.h:
        * examples/Advanced/ch_21/icp.h:
        * examples/Advanced/ch_8_and_10/icp.h:
        * examples/CSD_Strategy/ThreadPool/Foo_i.cpp:
        * examples/CSD_Strategy/ThreadPool2/FooServantList.cpp:
        * examples/CSD_Strategy/ThreadPool2/Foo_i.cpp:
        * examples/CSD_Strategy/ThreadPool4/ClientTask.cpp:
        * examples/CSD_Strategy/ThreadPool4/Foo_i.cpp:
        * examples/CSD_Strategy/ThreadPool5/ClientTask.cpp:
        * examples/CSD_Strategy/ThreadPool5/FooServantList.cpp:
        * examples/CSD_Strategy/ThreadPool5/Foo_i.cpp:
        * examples/CSD_Strategy/ThreadPool6/Foo_i.cpp:
        * examples/Callback_Quoter/Consumer_Handler.cpp:
        * examples/Callback_Quoter/Supplier_Timer_Handler.cpp:
        * examples/Kokyu_dsrt_schedulers/Task_Stats.cpp:
        * examples/Kokyu_dsrt_schedulers/utils.h:
        * examples/Logging/Logging_Service_i.h:
        * examples/Persistent_Grid/Grid_i.h:
        * examples/RTCORBA/Activity/Task_Stats.cpp:
        * examples/RTScheduling/Task_Stats.cpp:
        * examples/Simple/bank/AccountManager_i.h:
        * examples/Simulator/Event_Supplier/DOVE_Supplier.h:
        * interop-tests/wchar/wchar_reference.h:
        * orbsvcs/DevGuideExamples/NamingService/Naming_Server/NamingMessenger.cpp:
        * orbsvcs/DevGuideExamples/Security/PolicyControllingApp/MessengerClient.cpp:
        * orbsvcs/ImplRepo_Service/tao_imr_i.cpp:
        * orbsvcs/Naming_Service/NT_Naming_Server.cpp:
        * orbsvcs/Naming_Service/NT_Naming_Service.h:
        * orbsvcs/Notify_Service/NT_Notify_Server.cpp:
        * orbsvcs/Notify_Service/NT_Notify_Service.h:
        * orbsvcs/PSS/PSDL_l.cpp:
        * orbsvcs/Trading_Service/Trading_Service.cpp:
        * orbsvcs/examples/LoadBalancing/server.cpp:
        * orbsvcs/examples/Notify/Federation/Agent/Agent.cpp:
        * orbsvcs/examples/Notify/Federation/Gate/Gate.h:
        * orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp:
        * orbsvcs/orbsvcs/AV/AVStreams_i.h:
        * orbsvcs/orbsvcs/AV/QoS_UDP.h:
        * orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h:
        * orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h:
        * orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h:
        * orbsvcs/orbsvcs/Notify/Random_File.cpp:
        * orbsvcs/orbsvcs/Sched/Config_Scheduler.h:
        * orbsvcs/orbsvcs/Scheduler_Factory.cpp:
        * orbsvcs/orbsvcs/Time/TAO_UTO.cpp:
        * orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp:
        * orbsvcs/tests/Bug_2248_Regression/client.cpp:
        * orbsvcs/tests/Bug_2800_Regression/nsmain.cpp:
        * orbsvcs/tests/Bug_3673_Regression/nsmain.cpp:
        * orbsvcs/tests/COIOP_Naming_Test/Hello.h:
        * orbsvcs/tests/Concurrency/CC_test_utils.cpp:
        * orbsvcs/tests/Concurrency/CC_tests.cpp:
        * orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp:
        * orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp:
        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp:
        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp:
        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp:
        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp:
        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp:
        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp:
        * orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp:
        * orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp:
        * orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp:
        * orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp:
        * orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp:
        * orbsvcs/tests/Notify/lib/Task_Stats.cpp:
        * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp:
        * performance-tests/CSD_Strategy/TestApps/ServerApp.cpp:
        * performance-tests/CSD_Strategy/TestInf/AppHelper.h:
        * performance-tests/CSD_Strategy/TestServant/Foo_i.cpp:
        * tests/Bug_2677_Regression/server.cpp:
        * tests/Bug_2936_Regression/bug2936.cpp:
        * tests/Bug_3251_Regression/server.cpp:
        * tests/Bug_3531_Regression/client.cpp:
        * tests/Bug_3531_Regression/test_i.cpp:
        * tests/Bug_3542_Regression/server.cpp:
        * tests/Bug_3647_Regression/Backend_Impl.cpp:
        * tests/Bug_3766_Regression/client.cpp:
        * tests/Bug_3766_Regression/server.cpp:
        * tests/Bug_3812_Regression/Bug_3812_Regression.cpp:
        * tests/Bug_3853_Regression/Hello_i.cpp:
        * tests/Bug_3853_Regression/client.cpp:
        * tests/COIOP/Hello.h:
        * tests/CSD_Strategy_Tests/Broken/ServerApp.cpp:
        * tests/CSD_Strategy_Tests/TP_Common/AppHelper.h:
        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp:
        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp:
        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp:
        * tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp:
        * tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp:
        * tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp:
        * tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp:
        * tests/Collocation_Exception_Test/Hello.h:
        * tests/Collocation_Oneway_Tests/Hello.h:
        * tests/Collocation_Tests/Hello.h:
        * tests/DII_Collocation_Tests/oneway/Hello.h:
        * tests/DII_Collocation_Tests/twoway/Hello.h:
        * tests/DynAny_Test/test_wrapper.cpp:
        * tests/File_IO/client.cpp:
        * tests/ForwardOnceUponException/client.cpp:
        * tests/Hang_Shutdown/client.cpp:
        * tests/Nested_Event_Loop/client.cpp:
        * tests/Nested_Upcall_Crash/Clock_Ticks.h:
        * tests/ORB_Local_Config/Bug_2612/Test.cpp:
        * tests/POA/Bug_2511_Regression/server.cpp:
        * tests/POA/Default_Servant2/client.cpp:
        * tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h:
        * tests/ZIOP/client.cpp:
          Removed include of ace/OS.h

21 files changed, 26 insertions, 59 deletions

diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
index 9cc9cdb2f6e..0657a8eb0a1 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
@@ -11,7 +11,6 @@
 #include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
 #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 #include "ace/OS_NS_stdio.h"
-#include "ace/OS.h"
 
 // Files which have the IOR
 const ACE_TCHAR *first_ior = 0;
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
index abced085c27..f8b50ad46b5 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp
@@ -4,7 +4,6 @@
 #include "Hello.h"
 #include "NsShutdown.h"
 #include "orbsvcs/CosNamingC.h"
-#include "ace/OS.h"
 #include "ace/Get_Opt.h"
 
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ns.ior");
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp
index abced085c27..f8b50ad46b5 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/nsmain.cpp
@@ -4,7 +4,6 @@
 #include "Hello.h"
 #include "NsShutdown.h"
 #include "orbsvcs/CosNamingC.h"
-#include "ace/OS.h"
 #include "ace/Get_Opt.h"
 
 const ACE_TCHAR *ior_output_file = ACE_TEXT("ns.ior");
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h
index 556409e5d00..1d5e27d075f 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h
@@ -8,8 +8,6 @@
 
 #include "TestS.h"
 
-#include "ace/OS.h"
-
 /// Implement the Test::Hello interface
 class Hello
   : public virtual POA_Test::Hello
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
index 930792d8a14..420a426e7cf 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
@@ -19,11 +19,8 @@
 
 #include "CC_test_utils.h"
 #include "CC_naming_service.h"
-#include "ace/OS.h"
 #include "ace/Log_Msg.h"
 
-
-
 char *CC_TestUtils::get_lock_mode_name (CosConcurrencyControl::lock_mode mode)
 {
   if (mode==CosConcurrencyControl::read)
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
index ce1cbd5d4fd..02f73ac5907 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
@@ -18,11 +18,8 @@
 // ============================================================================
 
 #include "CC_tests.h"
-#include "ace/OS.h"
 #include "ace/Log_Msg.h"
 
-
-
 CC_Test::CC_Test (CC_naming_service *ns)
   : result (CC_FAIL),
     naming_service_ (ns)
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
index 4efc786b6a0..a60382930f3 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp
@@ -3,12 +3,10 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 #include <ace/Task.h>
-#include <ace/OS.h>
-
 
 const ACE_TCHAR *ior_input_file = ACE_TEXT ("file://serverA.ior");
 int test_duration_sec = 15;
-bool expect_object_not_exist = false; 
+bool expect_object_not_exist = false;
 
 class Client_Task : public ACE_Task_Base
 {
@@ -23,7 +21,7 @@ class Client_Task : public ACE_Task_Base
     virtual int svc (void)
     {
       ACE_Time_Value start = ACE_OS::gettimeofday ();
-      ACE_Time_Value elapsed; 
+      ACE_Time_Value elapsed;
       int i = 0;
       while (elapsed < ACE_Time_Value (test_duration_sec))
       {
@@ -45,7 +43,7 @@ class Client_Task : public ACE_Task_Base
           caught_object_not_exist_ = true;
           ACE_OS::sleep (1);
         }
-        catch (const CORBA::Exception & /*ex*/) 
+        catch (const CORBA::Exception & /*ex*/)
         {
           //ex._tao_print_exception ("Exception caught:");
           communication_failed_ = true;
@@ -54,7 +52,7 @@ class Client_Task : public ACE_Task_Base
         ++i;
         elapsed = ACE_OS::gettimeofday () - start;
       }
-          
+
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)Client thread exit \n")));
       return 0;
     }
@@ -109,7 +107,7 @@ parse_args (int argc, ACE_TCHAR* argv[])
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
-  try 
+  try
   {
     CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
@@ -137,7 +135,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
     Client_Task task (test.in ());
     task.activate (THR_NEW_LWP | THR_JOINABLE, 1, 1);
-    
+
     ACE_Time_Value tv(test_duration_sec);
     orb->run (&tv);
 
@@ -156,7 +154,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t)Client test failed.\n")), 1);
     }
   }
-  catch (const CORBA::Exception &ex) 
+  catch (const CORBA::Exception &ex)
   {
     ex._tao_print_exception ("Exception caught by client:");
     return 1;
diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
index 2049cc94590..78ddaecf9a8 100755
--- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverB.cpp
@@ -4,7 +4,6 @@
 #include "tao/ImR_Client/ImR_Client.h"
 #include <ace/Task.h>
 #include <ace/Get_Opt.h>
-#include <ace/OS.h>
 
 const ACE_TCHAR * ior_output_file = ACE_TEXT ("serverB.ior");
 // server_notify_delay between resolving RootPOA init ref and create_POA.
@@ -35,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            argv [0]),
                           -1);
       }
-  
+
   return 0;
 }
 
@@ -64,7 +63,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       rootPOA->the_POAManager ();
 
     CORBA::PolicyList policies (5);
-    policies.length (5); 
+    policies.length (5);
 
     // Lifespan policy
     policies[0] =
@@ -131,7 +130,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     rootPOA->destroy (1, 1);
     orb->destroy ();
   }
-  catch (const CORBA::Exception &ex) 
+  catch (const CORBA::Exception &ex)
   {
     ex._tao_print_exception ("Exception caught by serverB:");
     return 1;
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
index 2a897201d84..d0460e5c566 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
@@ -2,7 +2,6 @@
 
 #include "Basic.h"
 #include "LB_server.h"
-#include "ace/OS.h"
 
 extern int pong_delay;
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp
index 619fd6688cb..0d6ebf472db 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/client.cpp
@@ -2,7 +2,6 @@
 
 #include "TestC.h"
 #include "ace/Get_Opt.h"
-#include "ace/OS.h"
 #include "ace/Vector_T.h"
 
 const ACE_TCHAR *group_file = ACE_TEXT("group.ior");
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp
index ac22738cf2f..ab54c098a33 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp
@@ -3,7 +3,6 @@
 #include "LB_server.h"
 #include "Basic.h"
 #include "ace/Get_Opt.h"
-#include "ace/OS.h"
 #include "ace/Task.h"
 
 const ACE_TCHAR *group_file = ACE_TEXT("group.ior");
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp
index 9f58115f761..7325a046a5b 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Factory.cpp
@@ -58,12 +58,9 @@ Factory::create_object (
   return obj_._retn ();
 }
 
-#include <ace/OS.h>
-
 void
 Factory::delete_object (
-    const PortableGroup::GenericFactory::FactoryCreationId &
-      fcid)
+    const PortableGroup::GenericFactory::FactoryCreationId & fcid)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T delete_object \n"));
   ACE_OS::sleep (10);
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp
index 2f944107d78..90c5aa90e38 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "Simple.h"
-#include "ace/OS.h"
 
 extern int pong_delay;
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp
index fd86fa9214c..11ac9a66692 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/client.cpp
@@ -2,7 +2,6 @@
 
 #include "TestC.h"
 #include "ace/Get_Opt.h"
-#include "ace/OS.h"
 #include "ace/Vector_T.h"
 
 const ACE_TCHAR* group_ior = ACE_TEXT ("file:://group.ior");
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
index 5088b562343..96990ac6304 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
@@ -1,16 +1,14 @@
 // $Id$
 
 #include "common.h"
-#include "ace/OS.h"
-
 
 namespace CosNotifyCommImpl{
-  class StructuredPushSupplier: public virtual POA_CosNotifyComm:: StructuredPushSupplier 
+  class StructuredPushSupplier: public virtual POA_CosNotifyComm:: StructuredPushSupplier
   {
   public:
     void disconnect_structured_push_supplier()
     {};
-    void subscription_change( const CosNotification::EventTypeSeq&, 
+    void subscription_change( const CosNotification::EventTypeSeq&,
       const CosNotification::EventTypeSeq&)
     {};
 
@@ -38,7 +36,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     CosNotifyChannelAdmin::EventChannel_var ec = get_event_channel(orb.in());
 
     //Instanciating the Supplier
-    CosNotifyComm::StructuredPushSupplier_var sps = 
+    CosNotifyComm::StructuredPushSupplier_var sps =
       CosNotifyComm::StructuredPushSupplier::_nil();
 
 
@@ -102,17 +100,17 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     event.remainder_of_body <<= "";
 
     std::cout << "Sending a demo event...," << std::endl;
-    std::cout << "event.header.fixed_header.event_type.domain_name = " 
-      << event.header.fixed_header.event_type.domain_name 
+    std::cout << "event.header.fixed_header.event_type.domain_name = "
+      << event.header.fixed_header.event_type.domain_name
       << std::endl;
-    std::cout << "event.header.fixed_header.event_type.type_name = " 
+    std::cout << "event.header.fixed_header.event_type.type_name = "
       << event.header.fixed_header.event_type.type_name
       << std::endl;
 
 
     try{
       ppc->push_structured_event(event);
-    }   
+    }
     catch (CORBA::SystemException& se)
     {
       std::cerr << "System exception occurred during push: "
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
index 5f6a4383598..7d3320078be 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "ace/ARGV.h"
-#include "ace/OS.h"
 #include "ace/Service_Config.h"
 #include "ace/Log_Msg.h"
 
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
index 5ee3773c559..6411254316b 100755
--- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
@@ -1,17 +1,15 @@
 // $Id$
 
 #include "common.h"
-#include "ace/OS.h"
-
 
 namespace CosNotifyCommImpl{
-  class StructuredPushSupplier: public virtual POA_CosNotifyComm:: StructuredPushSupplier 
+  class StructuredPushSupplier: public virtual POA_CosNotifyComm:: StructuredPushSupplier
   {
   public:
     void disconnect_structured_push_supplier()
     {
     };
-    void subscription_change( const CosNotification::EventTypeSeq&, 
+    void subscription_change( const CosNotification::EventTypeSeq&,
       const CosNotification::EventTypeSeq&)
     {};
 
@@ -39,7 +37,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     CosNotifyChannelAdmin::EventChannel_var ec = get_event_channel(orb.in());
 
     //Instanciating the Supplier
-    CosNotifyComm::StructuredPushSupplier_var sps = 
+    CosNotifyComm::StructuredPushSupplier_var sps =
       CosNotifyComm::StructuredPushSupplier::_nil();
 
 
@@ -107,18 +105,18 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     event.remainder_of_body <<= data;
 
     std::cout << "Sending a demo event...," << std::endl;
-    std::cout << "event.header.fixed_header.event_type.domain_name = " 
-      << event.header.fixed_header.event_type.domain_name 
+    std::cout << "event.header.fixed_header.event_type.domain_name = "
+      << event.header.fixed_header.event_type.domain_name
       << std::endl;
-    std::cout << "event.header.fixed_header.event_type.type_name = " 
+    std::cout << "event.header.fixed_header.event_type.type_name = "
       << event.header.fixed_header.event_type.type_name
       << std::endl;
-    std::cout << "event.filterable_data: data=" << data << std::endl; 
+    std::cout << "event.filterable_data: data=" << data << std::endl;
 
 
     try{
       ppc->push_structured_event(event);
-    }   
+    }
     catch (CORBA::SystemException& se)
     {
       std::cerr << "System exception occurred during push: "
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
index 4c74caed6df..a7c028f6052 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
@@ -2,7 +2,6 @@
 
 #include "Notify_Structured_Push_Consumer.h"
 #include "Notify_Test_Client.h"
-#include "ace/OS.h"
 
 Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer (
   const char* name,
diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp
index 374c542d4c5..918089f3cb5 100644
--- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp
@@ -2,9 +2,6 @@
 
 #include "Filter.h"
 #include "ace/Get_Opt.h"
-#include "ace/OS.h"
-
-
 
 #define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory"
 #define NAMING_SERVICE_NAME "NameService"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
index 3669f3987a1..42a82c83796 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
@@ -1,7 +1,6 @@
 //$Id$
 
 #include "Task_Stats.h"
-#include "ace/OS.h"
 #include "ace/Log_Msg.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index f8c152bd297..b8727bcd8c5 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -5,7 +5,6 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
 #include "ace/Synch.h"
-#include "ace/OS.h"
 #include "ace/Dynamic_Service.h"
 #include "tao/Strategies/advanced_resource.h"
 #include "tao/Messaging/Messaging.h"