Fri Jun 29 01:27:22 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

75 files changed, 217 insertions, 130 deletions

diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp
index 9e6a52cb0f3..823243f15af 100644
--- a/TAO/tests/AMH_Exceptions/server.cpp
+++ b/TAO/tests/AMH_Exceptions/server.cpp
@@ -2,6 +2,7 @@
 // $Id$
 
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_time.h"
 #include "TestS.h"
 #include "tao/ORB_Core.h"
 
@@ -17,7 +18,9 @@ public:
   void test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                     Test::Timestamp send_time);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh);
+  //FUZZ: disable check_for_lack_ACE_OS
 
 protected:
   CORBA::ORB_ptr orb_;
diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp
index 86774aa5880..1358bc3205f 100644
--- a/TAO/tests/Bug_1361_Regression/client.cpp
+++ b/TAO/tests/Bug_1361_Regression/client.cpp
@@ -185,7 +185,7 @@ parse_args (int argc, char *argv[])
         ior = get_opts.opt_arg ();
         break;
       case 't':
-        serverthreads = atoi(get_opts.opt_arg ());
+        serverthreads = ACE_OS::atoi(get_opts.opt_arg ());
         break;
 
       case '?':
diff --git a/TAO/tests/Bug_1676_Regression/Hello.cpp b/TAO/tests/Bug_1676_Regression/Hello.cpp
index 07dfbcf6ac6..5c007ea38aa 100644
--- a/TAO/tests/Bug_1676_Regression/Hello.cpp
+++ b/TAO/tests/Bug_1676_Regression/Hello.cpp
@@ -31,7 +31,7 @@ Hello::get_stringList (
 	for (CORBA::ULong i = 0; i<seq->length(); i++)
 	{
 		char tmp[255] = {0};
-		sprintf(tmp, "Hello World %d", i);
+    ACE_OS::sprintf(tmp, "Hello World %d", i);
 		(*seq)[i] = CORBA::string_dup(tmp);
 	}
 
@@ -55,7 +55,7 @@ Hello::get_stringList2 (
         for (CORBA::ULong i = 0; i<osl->length(); i++)
 	    {
 		    char tmp[255] = {0};
-		    sprintf(tmp, "Hello Again %d", i);
+        ACE_OS::sprintf(tmp, "Hello Again %d", i);
 		    (*osl)[i] = CORBA::string_dup(tmp);
 	    }
     }
@@ -70,7 +70,7 @@ Hello::mod_stringList (
     for (CORBA::ULong i = 0; i<iosl.length(); i++)
 	{
 		char tmp[255] = {0};
-		sprintf(tmp, "Hello Client %d", i);
+    ACE_OS::sprintf(tmp, "Hello Client %d", i);
         if (i%2) {
 		    iosl[i] = CORBA::string_dup(tmp);
         }
diff --git a/TAO/tests/Bug_2319_Regression/server.cpp b/TAO/tests/Bug_2319_Regression/server.cpp
index 6b5b25a1451..ca59cc05a1c 100644
--- a/TAO/tests/Bug_2319_Regression/server.cpp
+++ b/TAO/tests/Bug_2319_Regression/server.cpp
@@ -124,7 +124,7 @@ void
 ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
                              Test::Timestamp send_time)
 {
-  	printf("Recieved Timestamp # %d \n", calls_received);
+    ACE_OS::printf("Recieved Timestamp # %d \n", calls_received);
   	ACE_OS::sleep(1);
   	calls_received++;
 
@@ -341,9 +341,9 @@ ST_AMH_Servant servant(orb.in());
                                           );
 
     ACE_Thread_Manager::instance()->join(clientThr);
-    printf("End client\n");
+    ACE_OS::printf("End client\n");
     ACE_Thread_Manager::instance()->join(serverThr);
-    printf("End server\n");
+    ACE_OS::printf("End server\n");
 
    	orb->destroy();
 
diff --git a/TAO/tests/Bug_2349_Regression/server.cpp b/TAO/tests/Bug_2349_Regression/server.cpp
index 9eaf0475477..df194eedbb3 100644
--- a/TAO/tests/Bug_2349_Regression/server.cpp
+++ b/TAO/tests/Bug_2349_Regression/server.cpp
@@ -12,7 +12,9 @@ public:
    : orb_ (CORBA::ORB::_duplicate (orb)) {
   }
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown ();
+  //FUZZ: enable check_for_lack_ACE_OS
 
   void destroy ();
 
diff --git a/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp b/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp
index 07b5da4e9a2..4538fd8508f 100644
--- a/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp
+++ b/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp
@@ -20,7 +20,7 @@ Subscriber_impl::onData (
 {
 	++count;
 	if (count > 100)
-		shutdown();
+		this->shutdown();
 }
 
 ::CORBA::Boolean
diff --git a/TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp b/TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp
index d07909c06d1..9c4abff9b30 100644
--- a/TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp
+++ b/TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp
@@ -27,9 +27,9 @@ Quoter_Stock_Factory_i::get_stock (const char *symbol)
     throw (Quoter::Invalid_Stock_Symbol)
 {
   try {
-    if (strcmp (symbol, "RHAT") == 0) {
+    if (ACE_OS::strcmp (symbol, "RHAT") == 0) {
       return Quoter::Stock::_duplicate(ref1_);
-    } else if (strcmp (symbol, "MSFT") == 0) {
+    } else if (ACE_OS::strcmp (symbol, "MSFT") == 0) {
       return Quoter::Stock::_duplicate(ref2_);
     }
   } catch (CORBA::Exception & e) {
diff --git a/TAO/tests/Bug_2678_Regression/server.cpp b/TAO/tests/Bug_2678_Regression/server.cpp
index 6495248f459..438f52eba30 100644
--- a/TAO/tests/Bug_2678_Regression/server.cpp
+++ b/TAO/tests/Bug_2678_Regression/server.cpp
@@ -9,7 +9,10 @@ class Test_impl : public virtual POA_Test
 public:
   Test_impl (CORBA::ORB_ptr orb);
   virtual AnySeq *RunTest(const AnySeq &params);
+
+  //FUZZ: disable check_for_lack_ACE_OS
   virtual void shutdown (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 private:
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/CDR/allocator.cpp b/TAO/tests/CDR/allocator.cpp
index 5f0acd3c5a5..7039b9b1b9c 100644
--- a/TAO/tests/CDR/allocator.cpp
+++ b/TAO/tests/CDR/allocator.cpp
@@ -78,7 +78,7 @@ main (int argc, char *argv[])
   int max_arguments = 16;
   int max_argument_size = 1024;
   int quiet = 0;
-  ACE_RANDR_TYPE seed = time(0);
+  ACE_RANDR_TYPE seed = ACE_OS::time(0);
 
   ACE_Get_Opt get_opt (argc, argv, "tn:f:m:s:a:b:r:q");
   int opt;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp
index c64221af9cc..c7f01889e9c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp
@@ -37,11 +37,13 @@ OrbShutdownTask::open(void*)
 {
   if (this->activate(THR_NEW_LWP | THR_JOINABLE, 1) != 0)
     {
+      //FUZZ: disable check_for_lack_ACE_OS
       // Assumes that when activate returns non-zero return code that
       // no threads were activated.
       ACE_ERROR_RETURN((LM_ERROR,
                         "(%P|%t) OrbShutdownTask failed to open().\n"),
                        -1);
+      //FUZZ: enable check_for_lack_ACE_OS
     }
 
   return 0;
diff --git a/TAO/tests/CodeSets/simple/client.cpp b/TAO/tests/CodeSets/simple/client.cpp
index 09f6e6e1cc3..3a741b077c9 100644
--- a/TAO/tests/CodeSets/simple/client.cpp
+++ b/TAO/tests/CodeSets/simple/client.cpp
@@ -33,7 +33,7 @@ make_wstring (const char *str)
   if (str == 0)
     return 0;
 
-  size_t len = strlen (str) + 1;
+  size_t len = ACE_OS::strlen (str) + 1;
   wchar_t *wstr = new wchar_t[len];
   ACE_DEBUG ((LM_DEBUG,
               "make_wstring: str = %s\n",str));
diff --git a/TAO/tests/CodeSets/simple/server.cpp b/TAO/tests/CodeSets/simple/server.cpp
index b405e62d53b..f7b4b696add 100644
--- a/TAO/tests/CodeSets/simple/server.cpp
+++ b/TAO/tests/CodeSets/simple/server.cpp
@@ -62,10 +62,12 @@ public:
     return CORBA::wstring_dup (s1);
   };
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown (void)
   {
     this->orb_->shutdown (0);
   };
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   /// Use an ORB reference to shutdown
diff --git a/TAO/tests/CollocationLockup/SimpleNamingService.cpp b/TAO/tests/CollocationLockup/SimpleNamingService.cpp
index 7c69b11474e..725060fe6b6 100644
--- a/TAO/tests/CollocationLockup/SimpleNamingService.cpp
+++ b/TAO/tests/CollocationLockup/SimpleNamingService.cpp
@@ -20,10 +20,12 @@ class SimpleNamingService_i : public virtual POA_SimpleNamingService
 {
 public:
 
+  //FUZZ: disable check_for_lack_ACE_OS
   virtual void bind (CORBA::Object_ptr obj)
   {
     obj_ = CORBA::Object::_duplicate (obj);
   }
+  //FUZZ: enable check_for_lack_ACE_OS
 
 
   virtual CORBA::Object_ptr resolve ()
diff --git a/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp b/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
index e1e606e0ab4..48cc80897c6 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
@@ -40,16 +40,16 @@ parse_args (int argc, char *argv[])
         // cout << "mode = " << mode << endl;
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) - mode set to <%C> for collocated oneway test\n", mode));
         if(mode) {
-             if(!strcmp("none", mode)) {
+             if(!ACE_OS::strcmp("none", mode)) {
                 syncMode = Client_Task::MODE_NONE;
              }
-             else if (!strcmp("transport", mode)) {
+             else if (!ACE_OS::strcmp("transport", mode)) {
                 syncMode = Client_Task::MODE_TRANSPORT;
              }
-             else if (!strcmp("server", mode)) {
+             else if (!ACE_OS::strcmp("server", mode)) {
                 syncMode = Client_Task::MODE_SERVER;
              }
-             else if (!strcmp("target", mode)) {
+             else if (!ACE_OS::strcmp("target", mode)) {
                 syncMode = Client_Task::MODE_TARGET;
              }
           }
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp
index b021e38bb47..9c7a8deb9d7 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp
@@ -64,7 +64,7 @@ Hello::test_unbounded_string_arg(const char* message)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_unbounded_string_arg ")
                         ACE_TEXT("got unbounded string: %s\n"),
                         message));
-  if (ACE_OS::strncmp (message, TEST_STR, strlen (TEST_STR) != 0))
+  if (ACE_OS::strncmp (message, TEST_STR, ACE_OS::strlen (TEST_STR) != 0))
   {
     ERROR_COUNT ("Hello::test_unbounded_string_arg")
   }
@@ -117,7 +117,7 @@ Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_unbounded_var_size_arg ")
                         ACE_TEXT("got unbounded var size arg.\n")));
-  if (ACE_OS::strncmp (message.get_buffer (), TEST_STR, strlen (TEST_STR)) != 0)
+  if (ACE_OS::strncmp (message.get_buffer (), TEST_STR, ACE_OS::strlen (TEST_STR)) != 0)
     ERROR_COUNT ("Hello::test_unbounded_var_size_arg")
 }
 
@@ -145,7 +145,7 @@ Hello::test_var_array_arg(const Test::Var_Array messages)
     if (debug)
       ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_var_array_arg ")
                         ACE_TEXT("messages[%d] = %s \n"), i, messages[i].in ()));
-    if (ACE_OS::strncmp (messages[i].in (), TEST_STR, strlen (TEST_STR)) != 0)
+    if (ACE_OS::strncmp (messages[i].in (), TEST_STR, ACE_OS::strlen (TEST_STR)) != 0)
       ERROR_COUNT ("Hello::test_var_array_arg")
   }
 }
@@ -235,7 +235,7 @@ void Hello::test_args_2 (
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_2 \n")));
-  if (ACE_OS::strncmp (arg1, TEST_STR, strlen (TEST_STR)) != 0 )
+  if (ACE_OS::strncmp (arg1, TEST_STR, ACE_OS::strlen (TEST_STR)) != 0 )
     ERROR_COUNT ("Hello::test_args_2")
 
   for (unsigned i = 0; i < ::Test::FIX_ARRAY_SIZE; i++)
@@ -259,15 +259,15 @@ void Hello::test_args_3 (
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_3 \n")));
-  if (ACE_OS::strncmp (arg1, TEST_STR, strlen (arg1)) != 0)
+  if (ACE_OS::strncmp (arg1, TEST_STR, ACE_OS::strlen (arg1)) != 0)
     ERROR_COUNT ("Hello::test_args_3")
   if (ACE_OS::strncmp (arg2.get_buffer (), TEST_STR, ::Test::BOUNDED_VAR_SIZE) != 0)
     ERROR_COUNT ("Hello::test_args_3")
-  if (ACE_OS::strncmp (arg3.get_buffer (), TEST_STR, strlen (TEST_STR)) != 0)
+  if (ACE_OS::strncmp (arg3.get_buffer (), TEST_STR, ACE_OS::strlen (TEST_STR)) != 0)
     ERROR_COUNT ("Hello::test_args_3")
   for (CORBA::ULong i = 0; i != ::Test::VAR_ARRAY_SIZE; i ++)
   {
-    if (ACE_OS::strncmp (arg4[i].in (), TEST_STR, strlen (TEST_STR)) != 0)
+    if (ACE_OS::strncmp (arg4[i].in (), TEST_STR, ACE_OS::strlen (TEST_STR)) != 0)
       ERROR_COUNT ("Hello::test_args_3")
   }
 }
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
index 29862aed6d1..6122ce28dca 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp
@@ -67,7 +67,7 @@ Hello::test_unbounded_string_arg(const char* message)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_unbounded_string_arg ")
                         ACE_TEXT("got unbounded string: %s\n"),
                         message));
-  if (ACE_OS::strncmp (message, TEST_STR, strlen (TEST_STR) != 0))
+  if (ACE_OS::strncmp (message, TEST_STR, ACE_OS::strlen (TEST_STR) != 0))
   {
     ERROR_COUNT ("Hello::test_unbounded_string_arg")
   }
@@ -80,7 +80,7 @@ Hello::test_unbounded_string_arg_out(const char* message, ::CORBA::String_out ou
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_unbounded_string_arg_out ")
                         ACE_TEXT("got unbounded string: %s\n"),
                         message));
-  if (ACE_OS::strncmp (message, TEST_STR, strlen (TEST_STR) != 0))
+  if (ACE_OS::strncmp (message, TEST_STR, ACE_OS::strlen (TEST_STR) != 0))
   {
     ERROR_COUNT ("Hello::test_unbounded_string_arg_out")
   }
@@ -134,7 +134,7 @@ Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_unbounded_var_size_arg ")
                         ACE_TEXT("got unbounded var size arg.\n")));
-  if (ACE_OS::strncmp (message.get_buffer (), TEST_STR, strlen (TEST_STR)) != 0)
+  if (ACE_OS::strncmp (message.get_buffer (), TEST_STR, ACE_OS::strlen (TEST_STR)) != 0)
     ERROR_COUNT ("Hello::test_unbounded_var_size_arg")
 }
 
@@ -162,7 +162,7 @@ Hello::test_var_array_arg(const Test::Var_Array messages)
     if (debug)
       ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_var_array_arg ")
                         ACE_TEXT("messages[%d] = %s \n"), i, messages[i].in ()));
-    if (ACE_OS::strncmp (messages[i].in (), TEST_STR, strlen (TEST_STR)) != 0)
+    if (ACE_OS::strncmp (messages[i].in (), TEST_STR, ACE_OS::strlen (TEST_STR)) != 0)
       ERROR_COUNT ("Hello::test_var_array_arg")
   }
 }
@@ -252,7 +252,7 @@ void Hello::test_args_2 (
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_2 \n")));
-  if (ACE_OS::strncmp (arg1, TEST_STR, strlen (TEST_STR)) != 0 )
+  if (ACE_OS::strncmp (arg1, TEST_STR, ACE_OS::strlen (TEST_STR)) != 0 )
     ERROR_COUNT ("Hello::test_args_2")
 
   for (unsigned i = 0; i < ::Test::FIX_ARRAY_SIZE; i++)
@@ -276,15 +276,15 @@ void Hello::test_args_3 (
 {
   if (debug)
     ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_3 \n")));
-  if (ACE_OS::strncmp (arg1, TEST_STR, strlen (arg1)) != 0)
+  if (ACE_OS::strncmp (arg1, TEST_STR, ACE_OS::strlen (arg1)) != 0)
     ERROR_COUNT ("Hello::test_args_3")
   if (ACE_OS::strncmp (arg2.get_buffer (), TEST_STR, ::Test::BOUNDED_VAR_SIZE) != 0)
     ERROR_COUNT ("Hello::test_args_3")
-  if (ACE_OS::strncmp (arg3.get_buffer (), TEST_STR, strlen (TEST_STR)) != 0)
+  if (ACE_OS::strncmp (arg3.get_buffer (), TEST_STR, ACE_OS::strlen (TEST_STR)) != 0)
     ERROR_COUNT ("Hello::test_args_3")
   for (CORBA::ULong i = 0; i != ::Test::VAR_ARRAY_SIZE; i ++)
   {
-    if (ACE_OS::strncmp (arg4[i].in (), TEST_STR, strlen (TEST_STR)) != 0)
+    if (ACE_OS::strncmp (arg4[i].in (), TEST_STR, ACE_OS::strlen (TEST_STR)) != 0)
       ERROR_COUNT ("Hello::test_args_3")
   }
 }
diff --git a/TAO/tests/DiffServ/server.cpp b/TAO/tests/DiffServ/server.cpp
index ef64f958cc4..fddab01d128 100644
--- a/TAO/tests/DiffServ/server.cpp
+++ b/TAO/tests/DiffServ/server.cpp
@@ -65,7 +65,9 @@ public:
 
   void test_method (void);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Explicit_Event_Loop/server.cpp b/TAO/tests/Explicit_Event_Loop/server.cpp
index 1deb79a4052..6cc08c3d902 100644
--- a/TAO/tests/Explicit_Event_Loop/server.cpp
+++ b/TAO/tests/Explicit_Event_Loop/server.cpp
@@ -24,6 +24,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_time.h"
 
 const char *ior_output_file = "server.ior";
 int done = 0;
@@ -61,8 +62,8 @@ TimeOfDay
 Time_impl::
 get_gmt ()
 {
-  time_t time_now = time (0);
-  struct tm *time_p = gmtime (&time_now);
+  time_t time_now = ACE_OS::time (0);
+  struct tm *time_p = ACE_OS::gmtime (&time_now);
 
   TimeOfDay tod;
   tod.hour = time_p->tm_hour;
diff --git a/TAO/tests/File_IO/client.cpp b/TAO/tests/File_IO/client.cpp
index 4a40ea6b316..580723389ff 100644
--- a/TAO/tests/File_IO/client.cpp
+++ b/TAO/tests/File_IO/client.cpp
@@ -178,7 +178,7 @@ main (int argc, char **argv)
                           -1);
 
       ACE_CString ior = data;
-      ior_buffer.alloc ()-> free (data);
+      ior_buffer.alloc ()->free (data);
       ACE_OS::close (input_file);
 
       if (ACE_Thread_Manager::instance ()->spawn_n (NUM_THREADS,
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
index 0f71b782372..e74151bc1fc 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
@@ -37,7 +37,7 @@ main (int argc, char *argv[])
       CORBA::String_var ior =
         orb->object_to_string (b.in());
 
-      printf ("%s\n", ior.in());
+      ACE_OS::printf ("%s\n", ior.in());
 
       orb->shutdown();
       orb->destroy();
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp b/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
index c6f463d08bf..cc855a6baea 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
@@ -9,6 +9,7 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/INET_Addr.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_stdio.h"
 
 ACE_RCSID (IOR_Endpoint_Hostnames, list_interfaces, "$Id$")
 
@@ -76,7 +77,7 @@ main (int argc, char *argv[])
         continue;
 
       // Print the address as a string.
-      printf ("%s\n", if_addrs[i].get_host_addr());
+      ACE_OS::printf ("%s\n", if_addrs[i].get_host_addr());
 
       host_cnt++;
     }
diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp
index 8fb575a16be..1063d4680bf 100644
--- a/TAO/tests/Leader_Followers/client.cpp
+++ b/TAO/tests/Leader_Followers/client.cpp
@@ -56,19 +56,19 @@ parse_args (int argc, char **argv)
         break;
 
       case 'c':
-        number_of_client_threads = ::atoi (get_opts.opt_arg ());
+        number_of_client_threads = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'e':
-        number_of_event_loop_threads = ::atoi (get_opts.opt_arg ());
+        number_of_event_loop_threads = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 't':
-        event_loop_timeout = ::atoi (get_opts.opt_arg ());
+        event_loop_timeout = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'w':
-        remote_work = ::atoi (get_opts.opt_arg ());
+        remote_work = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'x':
diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp
index c456cc56dba..5d156589fc0 100644
--- a/TAO/tests/Leader_Followers/server.cpp
+++ b/TAO/tests/Leader_Followers/server.cpp
@@ -26,7 +26,7 @@ parse_args (int argc, char *argv[])
         break;
 
       case 'e':
-        number_of_event_loop_threads = ::atoi (get_opts.opt_arg ());
+        number_of_event_loop_threads = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case '?':
diff --git a/TAO/tests/MT_Timeout/client.cpp b/TAO/tests/MT_Timeout/client.cpp
index 8cb04d4d478..efd944e25fe 100644
--- a/TAO/tests/MT_Timeout/client.cpp
+++ b/TAO/tests/MT_Timeout/client.cpp
@@ -113,11 +113,13 @@ main (int argc, char *argv[])
       if (task0.too_big_difference_calls () > iterations/20
           || task1.too_big_difference_calls () > iterations/20)
         {
+          //FUZZ: disable check_for_lack_ACE_OS
           ACE_DEBUG ((LM_DEBUG,
                       "Warning: Too many calls have a too big difference between "
                       "timeout and elapsed time (task0: %d, task1: %d)\n",
                       task0.too_big_difference_calls (),
                       task1.too_big_difference_calls ()));
+          //FUZZ: enable check_for_lack_ACE_OS
         }
       else  if (task0.too_big_difference_calls () != 0
                 || task1.too_big_difference_calls () != 0)
diff --git a/TAO/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp
index ccac4641b28..1fbfa4fa4f0 100644
--- a/TAO/tests/Multiple_Inheritance/client.cpp
+++ b/TAO/tests/Multiple_Inheritance/client.cpp
@@ -96,7 +96,7 @@ main (int argc, char **argv)
                                "Unable to read ior\n"),
                               -1);
           ior = ACE_OS::strdup (data);
-          ior_buffer.alloc ()-> free (data);
+          ior_buffer.alloc ()->free (data);
           ACE_OS::close (input_file);
         }
 
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
index 6e8aa3aee3a..d6643c11fe2 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
@@ -111,7 +111,7 @@ MT_Server::parse_args (void)
       case 'i':
       case 'n':
         break;
-      case 's': this->iterations_ = atoi (get_opts.opt_arg ());
+      case 's': this->iterations_ = ACE_OS::atoi (get_opts.opt_arg ());
         break;
       case '?':
       default:
diff --git a/TAO/tests/Nested_Event_Loop/client.cpp b/TAO/tests/Nested_Event_Loop/client.cpp
index 0490bb71ad3..5303d7b1a8c 100644
--- a/TAO/tests/Nested_Event_Loop/client.cpp
+++ b/TAO/tests/Nested_Event_Loop/client.cpp
@@ -35,11 +35,11 @@ parse_args (int argc, char **argv)
         break;
 
       case 'i':
-        event_loop_iterations = ::atoi (get_opts.opt_arg ());
+        event_loop_iterations = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'd':
-        event_loop_depth = ::atoi (get_opts.opt_arg ());
+        event_loop_depth = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'x':
diff --git a/TAO/tests/OBV/Supports/client.cpp b/TAO/tests/OBV/Supports/client.cpp
index 7342eaaf0a5..f904544f346 100644
--- a/TAO/tests/OBV/Supports/client.cpp
+++ b/TAO/tests/OBV/Supports/client.cpp
@@ -16,11 +16,11 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 't':
-        num_trials = atoi (get_opts.optarg);
+        num_trials = ACE_OS::atoi (get_opts.optarg);
         break;
 
       case 'i':
-        id = atoi (get_opts.optarg);
+        id = ACE_OS::atoi (get_opts.optarg);
         break;
 
       case '?':
diff --git a/TAO/tests/OBV/ValueBox/Test_impl.cpp b/TAO/tests/OBV/ValueBox/Test_impl.cpp
index 6ef251b7b85..ec5b020d1c5 100644
--- a/TAO/tests/OBV/ValueBox/Test_impl.cpp
+++ b/TAO/tests/OBV/ValueBox/Test_impl.cpp
@@ -20,11 +20,11 @@ void rotate_string(char *s)
    unsigned char c;
    size_t l;
 
-   l = strlen(s);
+   l = ACE_OS::strlen(s);
    if (l>1)
    {
       c = s[l-1];
-      memmove(&s[1], &s[0], l-1);
+      ACE_OS::memmove(&s[1], &s[0], l-1);
       s[0] = c;
    }
 }
@@ -106,14 +106,14 @@ Test_impl::string_op2 (const char * p1,
 {
   rotate_string (p2);
 
-  p3 = CORBA::string_alloc (strlen(p2));
-  strcpy (p3, p2);
+  p3 = CORBA::string_alloc (ACE_OS::strlen(p2));
+  ACE_OS::strcpy (p3, p2);
 
   rotate_string ((char *) p1);
 
   char *return_string;
-  return_string = CORBA::string_alloc (strlen(p1));
-  strcpy (return_string, p1);
+  return_string = CORBA::string_alloc (ACE_OS::strlen(p1));
+  ACE_OS::strcpy (return_string, p1);
 
   return return_string;
 }
diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp
index b9698901d3d..22843a63e2b 100644
--- a/TAO/tests/OBV/ValueBox/client.cpp
+++ b/TAO/tests/OBV/ValueBox/client.cpp
@@ -369,9 +369,9 @@ int test_boxed_string()
   const char *string2 = "Second-string";
 
   // Establish that we have data setup correctly...
-  OBV_VERITY (strcmp (string1, string2) <  0);
-  OBV_VERITY (strcmp (string2, string1) >  0);
-  OBV_VERITY (strcmp (string1, string1) == 0);
+  OBV_VERITY (ACE_OS::strcmp (string1, string2) <  0);
+  OBV_VERITY (ACE_OS::strcmp (string2, string1) >  0);
+  OBV_VERITY (ACE_OS::strcmp (string1, string1) == 0);
 
   // Make some objects, using our data
   VBstring *temp = 0;
@@ -385,15 +385,15 @@ int test_boxed_string()
                   VBstring(string1), // tests const char * ctor.
                   1);
 
-  OBV_VERITY (strcmp (vbstring1->_value(), string1) == 0);
-  OBV_VERITY (strcmp (vbstring2->_value(), string1) == 0);
+  OBV_VERITY (ACE_OS::strcmp (vbstring1->_value(), string1) == 0);
+  OBV_VERITY (ACE_OS::strcmp (vbstring2->_value(), string1) == 0);
 
   // Test assignment operators
   char *carray1 = 0;
   ACE_NEW_RETURN (carray1,
                   char[15],
                   1);
-  memcpy(carray1, string2, strlen(string2));
+  ACE_OS::memcpy(carray1, string2, ACE_OS::strlen(string2));
   *vbstring2 = carray1;              // char * (adopted by box)
   OBV_VERITY ((*vbstring2)[0] == 'S');
   *vbstring2 = string1;
@@ -407,7 +407,7 @@ int test_boxed_string()
   ACE_NEW_RETURN (carray2,
                   char[15],
                   1);
-  memcpy(carray2, string1, strlen(string1));
+  ACE_OS::memcpy(carray2, string1, ACE_OS::strlen(string1));
   vbstring2->_value(carray2);        // char * (adopted by box)
   OBV_VERITY ((*vbstring2)[0] == 'F');
   vbstring2->_value(string2);       // const char *
@@ -437,7 +437,7 @@ int test_boxed_string()
   ACE_NEW_RETURN (carray3,
                   char[15],
                   1);
-  memcpy(carray3, string1, strlen(string1));
+  ACE_OS::memcpy(carray3, string1, ACE_OS::strlen(string1));
   VBstring *vbstring4 = 0;
   ACE_NEW_RETURN (vbstring4,
                   VBstring(carray3),
@@ -483,14 +483,14 @@ int test_boxed_string_invocations (Test * test_object)
                         1);
         VBstring *p3 = 0;
 
-        OBV_VERITY (strcmp(p1->_value (), "string1") == 0);
-        OBV_VERITY (strcmp(p2->_value (), "string2") == 0);
+        OBV_VERITY (ACE_OS::strcmp(p1->_value (), "string1") == 0);
+        OBV_VERITY (ACE_OS::strcmp(p2->_value (), "string2") == 0);
 
         VBstring_var result = test_object->string_op1(p1, p2, p3);
 
-        OBV_VERITY (strcmp(p2->_value (), "2string") == 0);
-        OBV_VERITY (strcmp(p3->_value (), "2string") == 0);
-        OBV_VERITY (strcmp(result->_value (), "1string") == 0);
+        OBV_VERITY (ACE_OS::strcmp(p2->_value (), "2string") == 0);
+        OBV_VERITY (ACE_OS::strcmp(p3->_value (), "2string") == 0);
+        OBV_VERITY (ACE_OS::strcmp(result->_value (), "1string") == 0);
 
         //============================================================
         // Test _boxed_in(), _boxed_inout(), and _boxed_out())
@@ -502,9 +502,9 @@ int test_boxed_string_invocations (Test * test_object)
           test_object->string_op2(p1->_boxed_in(), p2->_boxed_inout(),
                                   p3->_boxed_out());
 
-        OBV_VERITY (strcmp(p2->_value (), "2second string") == 0);
-        OBV_VERITY (strcmp(p3->_value (), "2second string") == 0);
-        OBV_VERITY (strcmp(sresult.in (), "1string") == 0);
+        OBV_VERITY (ACE_OS::strcmp(p2->_value (), "2second string") == 0);
+        OBV_VERITY (ACE_OS::strcmp(p3->_value (), "2second string") == 0);
+        OBV_VERITY (ACE_OS::strcmp(sresult.in (), "1string") == 0);
 
         p1->_remove_ref ();
         p2->_remove_ref ();
@@ -900,18 +900,18 @@ int test_boxed_struct_invocations (Test * test_object)
 
 
         OBV_VERITY (p4->l() == 29);
-        OBV_VERITY (strcmp(p4->str(), "variable1") == 0);
+        OBV_VERITY (ACE_OS::strcmp(p4->str(), "variable1") == 0);
 
         VBvariable_struct1_var result2 = test_object->struct_op3(p4, p5, p6);
 
         OBV_VERITY (p5->l() == vs2.l*3);
-        OBV_VERITY (strcmp(p5->str(), "2variable") == 0);
+        OBV_VERITY (ACE_OS::strcmp(p5->str(), "2variable") == 0);
 
         OBV_VERITY (p6->l() == vs2.l*3);
-        OBV_VERITY (strcmp(p6->str(), "2variable") == 0);
+        OBV_VERITY (ACE_OS::strcmp(p6->str(), "2variable") == 0);
 
         OBV_VERITY (result2->l() == vs1.l);
-        OBV_VERITY (strcmp(result2->str(), vs1.str) == 0);
+        OBV_VERITY (ACE_OS::strcmp(result2->str(), vs1.str) == 0);
 
 
         //============================================================
@@ -923,10 +923,10 @@ int test_boxed_struct_invocations (Test * test_object)
                                 p6->_boxed_out());
 
         OBV_VERITY (p5->l() == vs2.l*3*3);
-        OBV_VERITY (strcmp(p5->str(), "e2variabl") == 0);
+        OBV_VERITY (ACE_OS::strcmp(p5->str(), "e2variabl") == 0);
 
         OBV_VERITY (p6->l() == vs1.l);
-        OBV_VERITY (strcmp(p6->str(), vs1.str) == 0);
+        OBV_VERITY (ACE_OS::strcmp(p6->str(), vs1.str) == 0);
 
 
         p4->_remove_ref ();
@@ -1122,19 +1122,19 @@ int test_boxed_array_invocations (Test * test_object)
                         VBstringarray (sa2),
                         1);
 
-        OBV_VERITY (strcmp((*p4)[0], sa[0]) == 0);
-        OBV_VERITY (strcmp((*p4)[1], sa[1]) == 0);
+        OBV_VERITY (ACE_OS::strcmp((*p4)[0], sa[0]) == 0);
+        OBV_VERITY (ACE_OS::strcmp((*p4)[1], sa[1]) == 0);
 
         VBstringarray *p6;
 
         VBstringarray_var result2 = test_object->array_op3 (p4, p5, p6);
 
-        OBV_VERITY (strcmp((*p5)[0], "1inout string") == 0);
-        OBV_VERITY (strcmp((*p5)[1], "2inout string") == 0);
-        OBV_VERITY (strcmp((*p6)[0], "1inout string") == 0);
-        OBV_VERITY (strcmp((*p6)[1], "2inout string") == 0);
-        OBV_VERITY (strcmp((*result2.in ())[0], sa[0]) == 0);
-        OBV_VERITY (strcmp((*result2.in ())[1], sa[1]) == 0);
+        OBV_VERITY (ACE_OS::strcmp((*p5)[0], "1inout string") == 0);
+        OBV_VERITY (ACE_OS::strcmp((*p5)[1], "2inout string") == 0);
+        OBV_VERITY (ACE_OS::strcmp((*p6)[0], "1inout string") == 0);
+        OBV_VERITY (ACE_OS::strcmp((*p6)[1], "2inout string") == 0);
+        OBV_VERITY (ACE_OS::strcmp((*result2.in ())[0], sa[0]) == 0);
+        OBV_VERITY (ACE_OS::strcmp((*result2.in ())[1], sa[1]) == 0);
 
         //============================================================
         // Array (variable)
@@ -1161,10 +1161,10 @@ int test_boxed_array_invocations (Test * test_object)
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) p5[1]=%s\n", (const char *)((*p5)[1])));
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) p6[0]=%s\n", (const char *)((*p6)[0])));
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) p6[1]=%s\n", (const char *)((*p6)[1])));
-        OBV_VERITY (strcmp((*p5)[0], "g1inout strin") == 0);
-        OBV_VERITY (strcmp((*p5)[1], "g2inout strin") == 0);
-        OBV_VERITY (strcmp((*p6)[0],  sa[0]) == 0);
-        OBV_VERITY (strcmp((*p6)[1],  sa[1]) == 0);
+        OBV_VERITY (ACE_OS::strcmp((*p5)[0], "g1inout strin") == 0);
+        OBV_VERITY (ACE_OS::strcmp((*p5)[1], "g2inout strin") == 0);
+        OBV_VERITY (ACE_OS::strcmp((*p6)[0],  sa[0]) == 0);
+        OBV_VERITY (ACE_OS::strcmp((*p6)[1],  sa[1]) == 0);
 #endif
 
         p4->_remove_ref ();
@@ -1368,14 +1368,14 @@ int test_boxed_union_invocations (Test * test_object)
         OBV_VERITY (p4->_d () == 1);
         OBV_VERITY (p4->m1 () == 321);
         OBV_VERITY (p5->_d () == 2);
-        OBV_VERITY (strcmp(p5->m2 (), "abracadabra") == 0);
+        OBV_VERITY (ACE_OS::strcmp(p5->m2 (), "abracadabra") == 0);
 
         VBvariable_union1 * p6;
 
         VBvariable_union1_var result2 = test_object->union_op3 (p4, p5, p6);
 
         OBV_VERITY (p5->_d () == 2);
-        OBV_VERITY (strcmp(p5->m2 (), "aabracadabr") == 0);
+        OBV_VERITY (ACE_OS::strcmp(p5->m2 (), "aabracadabr") == 0);
         OBV_VERITY (p6->_d () == 1);
         OBV_VERITY (p6->m1 () == 321);
         OBV_VERITY (result2->_d () == 1);
@@ -1392,7 +1392,7 @@ int test_boxed_union_invocations (Test * test_object)
                                p6->_boxed_out());
 
         OBV_VERITY (p5->_d () == 2);
-        OBV_VERITY (strcmp(p5->m2 (), "raabracadab") == 0);
+        OBV_VERITY (ACE_OS::strcmp(p5->m2 (), "raabracadab") == 0);
 
         OBV_VERITY (p6->_d () == 1);
         OBV_VERITY (p6->m1 () == 1722);
diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
index f1b15d04f81..38ff10c29a5 100644
--- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
+++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp
@@ -155,7 +155,7 @@ int DllOrb::fini (void)
 
 
   // wait for our threads to finish
-  wait();
+  this->wait();
 
 #if defined (ACE_HAS_THREADS)
   delete mp_barrier;
diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp
index 599ae7518dd..59943a0b9cc 100644
--- a/TAO/tests/Objref_Sequence_Test/server.cpp
+++ b/TAO/tests/Objref_Sequence_Test/server.cpp
@@ -17,7 +17,9 @@ public:
 
   void DeleteExtra (const ServerSequence &seq);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   /// Our root POA
diff --git a/TAO/tests/Oneway_Buffering/client.cpp b/TAO/tests/Oneway_Buffering/client.cpp
index 74d7a475abd..f3ec40d2b15 100644
--- a/TAO/tests/Oneway_Buffering/client.cpp
+++ b/TAO/tests/Oneway_Buffering/client.cpp
@@ -744,9 +744,11 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
         {
           CORBA::ULong receive_count =
             request_count (oneway_buffering_admin);
-
+    
+          //FUZZ: disable check_for_lack_ACE_OS
           ACE_Time_Value sleep (0, 10000);
           orb->run (sleep);
+          //FUZZ: enable check_for_lack_ACE_OS
 
           ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start;
           if (receive_count != initial_receive_count)
diff --git a/TAO/tests/Oneway_Timeouts/server.cpp b/TAO/tests/Oneway_Timeouts/server.cpp
index 0df5c20605d..50d6dc6b176 100644
--- a/TAO/tests/Oneway_Timeouts/server.cpp
+++ b/TAO/tests/Oneway_Timeouts/server.cpp
@@ -154,6 +154,7 @@ namespace {
 
   void print_usage ()
   {
+    //FUZZ: disable check_for_lack_ACE_OS
     cout << "server [-activate_delay ms] [-run_delay ms] [-request_delay ms] "
       "[-abort_after n]\n"
       "\t[-expected n=0] [-elapsed_max ms=0] [-elapsed_min ms=0] "
@@ -163,6 +164,7 @@ namespace {
       "\trun_delay Millisecond delay before ORB::run ().\n"
       "\trequest_delay Millisecond delay within each servant request.\n"
       "\tabort_after abort () after N requests.\n" << endl;
+    //FUZZ: enable check_for_lack_ACE_OS
   }
 
   bool parse_command_line (int ac, char *av[])
diff --git a/TAO/tests/POA/EndpointPolicy/server.cpp b/TAO/tests/POA/EndpointPolicy/server.cpp
index 0dcef0c4cd6..11cde64c52e 100644
--- a/TAO/tests/POA/EndpointPolicy/server.cpp
+++ b/TAO/tests/POA/EndpointPolicy/server.cpp
@@ -39,7 +39,7 @@ parse_args (int argc, char *argv[])
       {
         verbose = 1;
       }
-    else if (strstr(argv[c],"-ORB") == argv[c])
+    else if (ACE_OS::strstr(argv[c],"-ORB") == argv[c])
       {
         c++;
         continue;
diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp
index 2b7aa10bd1d..3f947de960f 100644
--- a/TAO/tests/POA/Persistent_ID/server.cpp
+++ b/TAO/tests/POA/Persistent_ID/server.cpp
@@ -33,7 +33,9 @@ public:
 
   void method (void);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 
   test_ptr create_POA (void);
 
diff --git a/TAO/tests/Param_Test/helper.cpp b/TAO/tests/Param_Test/helper.cpp
index 3018a60ed1f..260879b6ce4 100644
--- a/TAO/tests/Param_Test/helper.cpp
+++ b/TAO/tests/Param_Test/helper.cpp
@@ -18,7 +18,7 @@
 // ============================================================================
 
 #include "helper.h"
-#include "ace/os_include/os_ctype.h"
+#include "ace/OS_NS_ctype.h"
 
 const CORBA::ULong TEST_BUFSIZE = 128;
 
@@ -62,7 +62,7 @@ Generator::gen_string (int max_length)
   while (i < len)
     {
       int c = ACE_OS::rand () % 128;
-      if (isprint (c) && !isspace (c))
+      if (ACE_OS::ace_isprint (c) && !ACE_OS::ace_isspace (c))
         {
           buf [i] = c;
           i++;
diff --git a/TAO/tests/Param_Test/results.cpp b/TAO/tests/Param_Test/results.cpp
index 29299e2945e..a575b1c0bac 100644
--- a/TAO/tests/Param_Test/results.cpp
+++ b/TAO/tests/Param_Test/results.cpp
@@ -46,9 +46,12 @@ Results::print_stats (void)
 
   if (TAO_debug_level > 0 && this->error_count_ == 0)
     {
+      //FUZZ: disable check_for_lack_ACE_OS
       ACE_DEBUG ((LM_DEBUG,
                   "Iteration\tReal time (msec)\tUser time (msec)"
                   "\tSystem time (msec)\n\n"));
+      //FUZZ: enable check_for_lack_ACE_OS
+
       for (i = 0; i < this->call_count_; i++)
         {
           this->elapsed_time_[i].real_time *= ACE_ONE_SECOND_IN_MSECS;
diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp
index fbe85b62655..633862bf044 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.cpp
+++ b/TAO/tests/Param_Test/ub_struct_seq.cpp
@@ -368,7 +368,7 @@ Test_Unbounded_Struct_Sequence::compare (const Param_Test::PathSpec &s1,
       const Param_Test::Step& vs2 = s2[i];
 
       if (ACE_OS::strcmp (vs1.name.id.in (), vs2.name.id.in ())
-          || ACE_OS:: strcmp (vs1.name.kind.in (), vs2.name.kind.in ())
+          || ACE_OS::strcmp (vs1.name.kind.in (), vs2.name.kind.in ())
           || vs1.process != vs2.process)
         return 0;
     }
diff --git a/TAO/tests/Param_Test/var_array.cpp b/TAO/tests/Param_Test/var_array.cpp
index 96d64aa76c9..01ba3ae9af5 100644
--- a/TAO/tests/Param_Test/var_array.cpp
+++ b/TAO/tests/Param_Test/var_array.cpp
@@ -142,7 +142,7 @@ Test_Var_Array::compare (const Param_Test::Var_Array_slice *a1,
 {
   for (CORBA::ULong i=0; i < Param_Test::DIM2; i++)
     {
-      if (strcmp (a1[i].in (), a2[i].in ()))
+      if (ACE_OS::strcmp (a1[i].in (), a2[i].in ()))
         return 0;
     }
   return 1; // success
diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
index 98da1770179..bec2fec98a8 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
@@ -48,12 +48,14 @@ public:
     return 1;
   }
 
+  //FUZZ: disable check_for_lack_ACE_OS
   virtual void
   shutdown () throw (SystemException)
   {
     ACE_DEBUG ((LM_DEBUG, "Server is shutting down.\n"));
     this->orb_->shutdown (0);
   }
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   ORB_var orb_;
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
index d0072b2869e..adca9a99c0d 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
@@ -160,12 +160,14 @@ public:
     ACE_DEBUG ((LM_DEBUG, "invoke_me\n"));
   }
 
+  //FUZZ: disable check_for_lack_ACE_OS
   virtual void
   shutdown () throw (SystemException)
   {
     ACE_DEBUG ((LM_DEBUG, "\nServer is shutting down.\n"));
     this->orb_->shutdown (0);
   }
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   ORB_var orb_;
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
index 9b2116de073..2904d579070 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
@@ -48,12 +48,14 @@ public:
     return 1;
   }
 
+  //FUZZ: disable check_for_lack_ACE_OS
   virtual void
   shutdown () throw (SystemException)
   {
     ACE_DEBUG ((LM_DEBUG, "Server is shutting down.\n"));
     this->orb_->shutdown (0);
   }
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   ORB_var orb_;
diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
index f00702ec176..ec7e41a1014 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
@@ -16,7 +16,9 @@ public:
   void test_method (CORBA::Boolean client_propagated,
                     CORBA::Short priority);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
index 0ebfe985c70..e36f90b4c39 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
@@ -20,7 +20,9 @@ public:
   // = The Test methods.
   void test_method (CORBA::Short priority);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
index b5e012a90cd..b8c46953130 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
@@ -18,7 +18,9 @@ public:
 
   void test_method (void);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
index 813b5429d2d..26ff0aab28f 100644
--- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp
+++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
@@ -361,7 +361,10 @@ public:
                                                          RTCORBA::PriorityModel priority_model);
   void test (void);
   void start_testing (void);
+
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 
   CORBA::ORB_var orb_;
   RTCORBA::RTORB_var rt_orb_;
diff --git a/TAO/tests/RTCORBA/Diffserv/server.cpp b/TAO/tests/RTCORBA/Diffserv/server.cpp
index 29999455f8a..191bdf7be4e 100644
--- a/TAO/tests/RTCORBA/Diffserv/server.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/server.cpp
@@ -17,7 +17,9 @@ public:
 
   void test_method (void);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
index c7d15760b70..48d802e44a3 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
@@ -19,7 +19,9 @@ public:
   // = The Test methods.
   void test_method (void);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
index 3f5f1a6179c..7334600bc90 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
@@ -31,11 +31,11 @@ parse_args (int argc, char **argv)
         break;
 
       case 'i':
-        iterations = ::atoi (get_opts.opt_arg ());
+        iterations = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'd':
-        debug = ::atoi (get_opts.opt_arg ());
+        debug = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'x':
diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
index e551c2583a5..a46b65c0cc3 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
@@ -17,7 +17,9 @@ public:
 
   void method (void);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 
   PortableServer::POA_ptr _default_POA (void);
 
@@ -84,7 +86,7 @@ parse_args (int argc, char **argv)
         break;
 
       case 'd':
-        debug = ::atoi (get_opts.opt_arg ());
+        debug = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'l':
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
index f13ac81e89c..f3bb343db61 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
@@ -20,7 +20,9 @@ public:
 
   void test_method (void);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
index 17818644116..bfec3748b91 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
@@ -22,7 +22,7 @@ parse_args (int argc, char **argv)
         break;
 
       case 'i':
-        iterations = ::atoi (get_opts.opt_arg ());
+        iterations = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'x':
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
index 3802b89a475..98701515818 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
@@ -15,7 +15,9 @@ public:
 
   void method (void);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 
   PortableServer::POA_ptr _default_POA (void);
 
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
index d29036173e9..d0ebde5bd96 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
@@ -26,7 +26,7 @@ parse_args (int argc, char **argv)
         break;
 
       case 'i':
-        iterations = ::atoi (get_opts.opt_arg ());
+        iterations = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'x':
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
index b5207a64b70..27609392a80 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
@@ -20,7 +20,9 @@ public:
 
   void prioritized_method (void);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 
   PortableServer::POA_ptr _default_POA (void);
 
@@ -109,11 +111,11 @@ parse_args (int argc, char **argv)
     switch (c)
       {
       case 's':
-        ::server_priority = ::atoi (get_opts.opt_arg ());
+        ::server_priority = ACE_OS::atoi (get_opts.opt_arg ());
       break;
 
       case 'c':
-        ::client_priority = ::atoi (get_opts.opt_arg ());
+        ::client_priority = ACE_OS::atoi (get_opts.opt_arg ());
       break;
 
       case '?':
diff --git a/TAO/tests/RTCORBA/Private_Connection/server.cpp b/TAO/tests/RTCORBA/Private_Connection/server.cpp
index ed3ee580a26..43bf4272810 100644
--- a/TAO/tests/RTCORBA/Private_Connection/server.cpp
+++ b/TAO/tests/RTCORBA/Private_Connection/server.cpp
@@ -18,7 +18,9 @@ public:
   // = The Test methods.
   void test_method (void);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
index e7db2d0dbcc..bb32bad8d4e 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
@@ -47,11 +47,11 @@ parse_args (int argc, char **argv)
         break;
 
       case 'd':
-        debug = ::atoi (get_opts.opt_arg ());
+        debug = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'i':
-        iterations = ::atoi (get_opts.opt_arg ());
+        iterations = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'k':
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
index 996e7b77a8e..39568f7685b 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
@@ -32,7 +32,9 @@ public:
 
   void method (void);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 
   PortableServer::POA_ptr _default_POA (void);
 
@@ -103,7 +105,7 @@ parse_args (int argc, char **argv)
         break;
 
       case 'd':
-        debug = ::atoi (get_opts.opt_arg ());
+        debug = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'l':
@@ -137,10 +139,10 @@ write_iors_to_file (CORBA::Object_ptr object,
                     CORBA::ORB_ptr orb)
 {
   char filename[BUFSIZ];
-  sprintf (filename,
-           "%s_%d",
-           ior_file_base,
-           ior_file_count);
+  ACE_OS::sprintf (filename,
+                   "%s_%d",
+                   ior_file_base,
+                   ior_file_count);
   ior_file_count++;
 
   FILE *file =
diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp
index c818a81b734..a0e420e0171 100644
--- a/TAO/tests/RTCORBA/Server_Declared/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp
@@ -19,7 +19,9 @@ public:
 
   void test_method (CORBA::Short priority);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
index 48a479d4d03..ff419a938b0 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
@@ -18,7 +18,9 @@ public:
   Test_i (CORBA::ORB_ptr orb);
   // ctor
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
index 79544c0dce9..1d611ce19c8 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
@@ -40,10 +40,12 @@ public:
     return CORBA::string_dup (message);
   }
 
+  //FUZZ: disable check_for_lack_ACE_OS
   virtual void shutdown (void)
   {
     orb_->shutdown ();
   }
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   CORBA::ORB_ptr orb_;
diff --git a/TAO/tests/Reliable_Oneways/client.cpp b/TAO/tests/Reliable_Oneways/client.cpp
index f0608773dfd..0d6a8468674 100644
--- a/TAO/tests/Reliable_Oneways/client.cpp
+++ b/TAO/tests/Reliable_Oneways/client.cpp
@@ -122,9 +122,12 @@ main (int argc, char *argv[])
           run_test_sync_none (oneway_receiver.in ());
         }
 
+      //FUZZ: disable check_for_lack_ACE_OS
       // Run the orb for 3 seconds, this way we make sure things are flushed
       // to the transport.
       ACE_Time_Value time (3, 0);
+      //FUZZ: enable check_for_lack_ACE_OS
+
       orb->run (time);
 
       if (successful_calls == 0)
diff --git a/TAO/tests/Sequence_Unit_Tests/mock_array.cpp b/TAO/tests/Sequence_Unit_Tests/mock_array.cpp
index ae4017ff3e9..b9b7e1f35fa 100644
--- a/TAO/tests/Sequence_Unit_Tests/mock_array.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/mock_array.cpp
@@ -6,22 +6,21 @@
 #include "mock_array.hpp"
 
 my_array_slice *
-TAO::Array_Traits<my_array,my_array_slice,my_array_tag>::
-alloc()
+TAO::Array_Traits<my_array,my_array_slice,my_array_tag>::alloc()
 {
   return new my_array;
 }
 
 void
-TAO::Array_Traits<my_array,my_array_slice,my_array_tag>::
-free(my_array_slice * _tao_slice)
+TAO::Array_Traits<my_array,my_array_slice,my_array_tag>::free(
+    my_array_slice * _tao_slice)
 {
   delete[] _tao_slice;
 }
 
 my_array_slice *
-TAO::Array_Traits<my_array,my_array_slice,my_array_tag>::
-dup(my_array_slice const * _tao_source)
+TAO::Array_Traits<my_array,my_array_slice,my_array_tag>::dup(
+    my_array_slice const * _tao_source)
 {
   // TODO exception safety
   my_array_slice * _tao_destination = alloc();
@@ -30,8 +29,7 @@ dup(my_array_slice const * _tao_source)
 }
 
 void
-TAO::Array_Traits<my_array,my_array_slice,my_array_tag>::
-copy(
+TAO::Array_Traits<my_array,my_array_slice,my_array_tag>::copy(
     my_array_slice * _tao_destination,
     my_array_slice const * _tao_source)
 {
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp
index 73772259ac1..56162ac842a 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp
@@ -22,6 +22,8 @@
 #include "tao/Basic_Types.h"
 #include "tao/CDR.h"
 
+#include "ace/OS_NS_stdio.h"
+
 using namespace boost::unit_test_framework;
 using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
 
@@ -168,8 +170,8 @@ struct Tester
   ACE_Message_Block * alloc_and_init_mb()
   {
     char buf[9];
-    sprintf (buf, "%s", "testing ");
-    size_t n = (strlen (buf) + 1) * sizeof (char);
+    ACE_OS::sprintf (buf, "%s", "testing ");
+    size_t n = (ACE_OS::strlen (buf) + 1) * sizeof (char);
     ACE_Message_Block * mb = new ACE_Message_Block (n);
     mb->copy ((char *) buf, n);
 
@@ -371,8 +373,8 @@ struct Tester
     BOOST_CHECK_EQUAL(CORBA::Octet( 'g'), a[6]);
 
     char upperbuf[256];
-    sprintf (upperbuf, "%s", "THIS IS A TEST");
-    size_t n = (strlen (upperbuf) + 1) * sizeof (char);
+    ACE_OS::sprintf (upperbuf, "%s", "THIS IS A TEST");
+    size_t n = (ACE_OS::strlen (upperbuf) + 1) * sizeof (char);
     ACE_Message_Block * upper_mb = 0;
     ACE_NEW (upper_mb,
              ACE_Message_Block (n));
diff --git a/TAO/tests/Single_Read/client.cpp b/TAO/tests/Single_Read/client.cpp
index 1b6ef1afe6d..2e3fec470ae 100644
--- a/TAO/tests/Single_Read/client.cpp
+++ b/TAO/tests/Single_Read/client.cpp
@@ -33,10 +33,10 @@ parse_args (int argc, char **argv)
         IOR = get_opts.opt_arg ();
         break;
       case 'i':
-        iterations = ::atoi (get_opts.opt_arg ());
+        iterations = ACE_OS::atoi (get_opts.opt_arg ());
         break;
       case 'd':
-        data_bytes = ::atoi (get_opts.opt_arg ());
+        data_bytes = ACE_OS::atoi (get_opts.opt_arg ());
         break;
       case 'x':
         shutdown_server = 1;
diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
index 126fc241449..b6ac65282b8 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
@@ -33,7 +33,9 @@ public:
 
   CORBA::Long tickets  (CORBA::Short number);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown  (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
index 4d54b7d9204..e7ae1b339a5 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
@@ -31,7 +31,9 @@ public:
 
   CORBA::Short method  (CORBA::Short boo);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown  (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp
index 149739da9ee..06e90e45600 100644
--- a/TAO/tests/Smart_Proxies/Policy/server.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/server.cpp
@@ -31,7 +31,9 @@ public:
 
   CORBA::Short method  (CORBA::Short boo);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown  (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Smart_Proxies/dtor/server.cpp b/TAO/tests/Smart_Proxies/dtor/server.cpp
index 70db5fdd604..8c42d37514b 100644
--- a/TAO/tests/Smart_Proxies/dtor/server.cpp
+++ b/TAO/tests/Smart_Proxies/dtor/server.cpp
@@ -11,7 +11,9 @@ public:
 
   void hello (CORBA::Long howmany);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown  (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp
index 68448d85eba..967b1986579 100644
--- a/TAO/tests/Smart_Proxies/server.cpp
+++ b/TAO/tests/Smart_Proxies/server.cpp
@@ -31,7 +31,9 @@ public:
 
   CORBA::Short method  (CORBA::Short boo);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   void shutdown  (void);
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp
index d09ed7dc969..90b0076ff77 100644
--- a/TAO/tests/Timed_Buffered_Oneways/client.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp
@@ -70,23 +70,23 @@ parse_args (int argc, char **argv)
         break;
 
       case 'i':
-        iterations = ::atoi (get_opts.opt_arg ());
+        iterations = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'd':
-        data_bytes = ::atoi (get_opts.opt_arg ());
+        data_bytes = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 't':
-        timeout = ::atoi (get_opts.opt_arg ());
+        timeout = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'w':
-        work = ::atoi (get_opts.opt_arg ());
+        work = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'z':
-        interval = ::atoi (get_opts.opt_arg ());
+        interval = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
       case 'x':
diff --git a/TAO/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp
index 92b82e00f48..5df70515d89 100644
--- a/TAO/tests/Timeout/client.cpp
+++ b/TAO/tests/Timeout/client.cpp
@@ -244,9 +244,11 @@ int main (int argc, char* argv[])
         ACE_ERROR ((LM_ERROR,
                     "ERROR: No messages timed out\n"));
 
+      //FUZZ: disable check_for_lack_ACE_OS
       if (in_time_count_total == 0)
         ACE_ERROR ((LM_ERROR,
                     "ERROR: No messages on time (within time limit)\n"));
+      //FUZZ: enable check_for_lack_ACE_OS
 
       ACE_DEBUG ((LM_DEBUG, "in_time_count_total = %d, timeout_count_total = %d\n",
                   in_time_count_total, timeout_count_total));
diff --git a/TAO/tests/TransportCurrent/Framework/server.cpp b/TAO/tests/TransportCurrent/Framework/server.cpp
index 9cf0a5f5c7b..cc085a0f62f 100644
--- a/TAO/tests/TransportCurrent/Framework/server.cpp
+++ b/TAO/tests/TransportCurrent/Framework/server.cpp
@@ -187,11 +187,13 @@ server_main (int argc,
                            ACE_TEXT ("Server (%P|%t) Cannot activate %d threads\n"),
                            nthreads),
                           -1);
+      //FUZZ: disable check_for_lack_ACE_OS
       if(worker.thr_mgr ()->wait () != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("Server (%P|%t) wait() Cannot wait for all %d threads\n"),
                            nthreads),
                           -1);
+      //FUZZ: enable check_for_lack_ACE_OS
 #else
       if (nthreads > 1)
         ACE_ERROR ((LM_WARNING,
diff --git a/TAO/tests/UNKNOWN_Exception/server.cpp b/TAO/tests/UNKNOWN_Exception/server.cpp
index fb61a039766..381367d80fc 100644
--- a/TAO/tests/UNKNOWN_Exception/server.cpp
+++ b/TAO/tests/UNKNOWN_Exception/server.cpp
@@ -103,6 +103,7 @@ test_i::_remove_ref (void)
     }
 }
 
+//FUZZ: disable check_for_lack_ACE_OS
 class test_factory_i :
   public POA_test_factory
 {
@@ -116,6 +117,7 @@ public:
 
   CORBA::ORB_var orb_;
 };
+//FUZZ: enable check_for_lack_ACE_OS
 
 test_factory_i::test_factory_i (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))