ChangeLogTag:Fri Oct 31 15:07:26 UTC 2003 Don Hinton <dhinton@dresystems.com>

54 files changed, 91 insertions, 13 deletions

diff --git a/ACEXML/parser/parser/ParserContext.cpp b/ACEXML/parser/parser/ParserContext.cpp
index fd0792677fb..77592dc13cb 100644
--- a/ACEXML/parser/parser/ParserContext.cpp
+++ b/ACEXML/parser/parser/ParserContext.cpp
@@ -13,3 +13,12 @@ ACEXML_Parser_Context::~ACEXML_Parser_Context()
   delete this->locator_;
   this->locator_ = 0;
 }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Swap <ACEXML_InputSource*>; 
+template class ACE_Swap <ACEXML_LocatorImpl*>; 
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#  pragma instantiate ACE_Swap <ACEXML_InputSource*>
+#  pragma instantiate ACE_Swap <ACEXML_LocatorImpl*>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/ChangeLog b/ChangeLog
index 8ec6d323955..046bba021b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct 31 15:07:26 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * header reduction on sun. 
+
 Fri Oct 31 03:00:20 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
         * header reductions.
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 26f9fc71029..57515145549 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -24,6 +24,7 @@
 #include "ace/OS_NS_sys_uio.h"
 #include "ace/OS_NS_sys_stat.h"
 #include "ace/OS_NS_ctype.h"
+#include "ace/OS_TLI.h"
 
 ACE_RCSID(ace, ACE, "$Id$")
 
diff --git a/ace/High_Res_Timer.cpp b/ace/High_Res_Timer.cpp
index a6d5167bf11..4767d6c6636 100644
--- a/ace/High_Res_Timer.cpp
+++ b/ace/High_Res_Timer.cpp
@@ -19,6 +19,7 @@
 #include "ace/OS_NS_sys_time.h"
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_stdlib.h"
 
 ACE_RCSID(ace, High_Res_Timer, "$Id$")
 
diff --git a/ace/IO_SAP.cpp b/ace/IO_SAP.cpp
index e41bf98a3ff..3dbdb650b1f 100644
--- a/ace/IO_SAP.cpp
+++ b/ace/IO_SAP.cpp
@@ -10,6 +10,7 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/os_include/os_signal.h"
 
 ACE_RCSID(ace, IO_SAP, "$Id$")
 
diff --git a/ace/IPC_SAP.cpp b/ace/IPC_SAP.cpp
index a14ed05889b..24152f87ad2 100644
--- a/ace/IPC_SAP.cpp
+++ b/ace/IPC_SAP.cpp
@@ -9,6 +9,7 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/os_include/os_signal.h"
+#include "ace/OS_NS_errno.h"
 
 ACE_RCSID(ace, IPC_SAP, "$Id$")
 
diff --git a/ace/Local_Name_Space_T.cpp b/ace/Local_Name_Space_T.cpp
index c1cb753ee9f..59feaacdbfc 100644
--- a/ace/Local_Name_Space_T.cpp
+++ b/ace/Local_Name_Space_T.cpp
@@ -9,7 +9,7 @@
 
 #include "ace/Local_Name_Space.h"
 #include "ace/Auto_Ptr.h"
-
+#include "ace/OS_NS_regex.h"
 
 ACE_RCSID (ace,
            Local_Name_Space_T,
diff --git a/ace/MEM_Addr.cpp b/ace/MEM_Addr.cpp
index 22c7ab04912..2711aa0da06 100644
--- a/ace/MEM_Addr.cpp
+++ b/ace/MEM_Addr.cpp
@@ -13,6 +13,7 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdlib.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/os_include/os_netdb.h"
 
 ACE_RCSID (ace,
 	   MEM_Addr,
diff --git a/ace/Naming_Context.h b/ace/Naming_Context.h
index f34ee7d6f5e..91690ffcb94 100644
--- a/ace/Naming_Context.h
+++ b/ace/Naming_Context.h
@@ -27,6 +27,7 @@
 #include "ace/Service_Object.h"
 #include "ace/Name_Proxy.h"
 #include "ace/Name_Space.h"
+#include "ace/os_include/os_netdb.h"
 
 // Forward decl
 class ACE_Name_Options;
diff --git a/ace/OS.cpp b/ace/OS.cpp
index 579a6617192..6a876da64eb 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -340,6 +340,7 @@ extern "C" int __d10_sigwait (const sigset_t *set, int *sig)
 #include "ace/OS_NS_netdb.cpp"
 #include "ace/OS_NS_poll.cpp"
 #include "ace/OS_NS_pwd.cpp"
+#include "ace/OS_NS_regex.cpp"
 #include "ace/OS_NS_signal.cpp"
 #include "ace/OS_NS_stdio.cpp"
 #include "ace/OS_NS_stdlib.cpp"
diff --git a/ace/OS_NS_Thread.cpp b/ace/OS_NS_Thread.cpp
index 8d8ab19026d..283a4154544 100644
--- a/ace/OS_NS_Thread.cpp
+++ b/ace/OS_NS_Thread.cpp
@@ -14,6 +14,7 @@ ACE_RCSID(ace, OS_NS_Thread, "$Id$")
 #include "ace/OS_Memory.h"
 #include "ace/OS_Thread_Adapter.h"
 #include "ace/Min_Max.h"
+#include "ace/OS_NS_errno.h"
 
 // This is necessary to work around nasty problems with MVS C++.
 
diff --git a/ace/OS_NS_time.inl b/ace/OS_NS_time.inl
index f14059e8a25..dc5ba491912 100644
--- a/ace/OS_NS_time.inl
+++ b/ace/OS_NS_time.inl
@@ -457,7 +457,7 @@ ACE_OS::time (time_t *tloc)
 }
 
 // Linux won't compile unless we explicitly use a namespace here.
-#if defined (linux) || defined (sun)
+#if defined (linux) || (defined (sun) && defined (__GNUG__))
 namespace ACE_OS {
   ACE_INLINE long
   timezone (void)
diff --git a/ace/Object_Manager_Base.h b/ace/Object_Manager_Base.h
index a1d1d18f498..545ad666767 100644
--- a/ace/Object_Manager_Base.h
+++ b/ace/Object_Manager_Base.h
@@ -27,6 +27,7 @@
 #include "ace/OS_Export.h"
 #include "ace/Cleanup.h"
 #include "ace/os_include/sys/os_types.h"
+#include "ace/os_include/os_signal.h"
 //#include "ace/OS_NS_netdb.h"
 //#include "ace/OS_NS_unistd.h"
 //#include "ace/OS_NS_time.h"
@@ -221,10 +222,13 @@ public:
   /// Destructor.
   ~ACE_OS_Object_Manager (void);
 
-private:
   /// Accessor to singleton instance.
   static ACE_OS_Object_Manager *instance (void);
 
+  /// For <ACE_OS::atexit> support.
+  int at_exit (ACE_EXIT_HOOK func);
+
+private:
   /// Singleton instance pointer.
   static ACE_OS_Object_Manager *instance_;
 
@@ -247,9 +251,6 @@ private:
   ACE_SEH_EXCEPT_HANDLER seh_except_handler_;
 #endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
 
-  /// For <ACE_OS::atexit> support.
-  int at_exit (ACE_EXIT_HOOK func);
-
   /// For use by init () and fini (), to consolidate error reporting.
   static void print_error_message (u_int line_number, const ACE_TCHAR *message);
 
diff --git a/ace/Pipe.h b/ace/Pipe.h
index 7273e39a271..2a466db1a8b 100644
--- a/ace/Pipe.h
+++ b/ace/Pipe.h
@@ -22,6 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Default_Constants.h"
+
 /**
  * @class ACE_Pipe
  *
diff --git a/ace/SPIPE_Acceptor.cpp b/ace/SPIPE_Acceptor.cpp
index 3728004dfe8..682007e6633 100644
--- a/ace/SPIPE_Acceptor.cpp
+++ b/ace/SPIPE_Acceptor.cpp
@@ -3,6 +3,7 @@
 
 #include "ace/SPIPE_Acceptor.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_sys_stat.h"
 
 ACE_RCSID(ace, SPIPE_Acceptor, "$Id$")
 
diff --git a/ace/Sched_Params.cpp b/ace/Sched_Params.cpp
index 0dd45f79fd1..e0a2e14b0b9 100644
--- a/ace/Sched_Params.cpp
+++ b/ace/Sched_Params.cpp
@@ -22,6 +22,11 @@
 #include "ace/Sched_Params.i"
 #endif /* __ACE_INLINE__ */
 
+#if defined (ACE_HAS_PRIOCNTL) && defined (ACE_HAS_STHREADS)
+#  include "ace/OS_NS_string.h"
+#  include /**/ <sys/priocntl.h>
+#endif /* ACE_HAS_PRIOCNTL && ACE_HAS_THREADS */
+
 ACE_RCSID(ace, Sched_Params, "$Id$")
 
 int
diff --git a/ace/TLI.cpp b/ace/TLI.cpp
index 2a07df957ff..da0674c605e 100644
--- a/ace/TLI.cpp
+++ b/ace/TLI.cpp
@@ -5,6 +5,8 @@
 
 #include "ace/TLI.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_Memory.h"
+#include "ace/OS_NS_string.h"
 
 ACE_RCSID(ace, TLI, "$Id$")
 
diff --git a/ace/TLI.h b/ace/TLI.h
index 58c35284c8d..ac8089be7a9 100644
--- a/ace/TLI.h
+++ b/ace/TLI.h
@@ -22,6 +22,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Addr.h"
+#include "ace/OS_TLI.h"
 
 #if defined (ACE_HAS_TLI)
 
diff --git a/ace/TLI_Acceptor.cpp b/ace/TLI_Acceptor.cpp
index d3116be865e..cc74c45113a 100644
--- a/ace/TLI_Acceptor.cpp
+++ b/ace/TLI_Acceptor.cpp
@@ -3,6 +3,7 @@
 #include "ace/TLI_Acceptor.h"
 #include "ace/Log_Msg.h"
 #include "ace/ACE.h"
+#include "ace/OS_NS_string.h"
 
 ACE_RCSID(ace, TLI_Acceptor, "$Id$")
 
diff --git a/ace/TLI_Acceptor.h b/ace/TLI_Acceptor.h
index 3e958c1c9ee..2eb8008030c 100644
--- a/ace/TLI_Acceptor.h
+++ b/ace/TLI_Acceptor.h
@@ -23,6 +23,7 @@
 
 #include "ace/Time_Value.h"
 #include "ace/TLI_Stream.h"
+#include "ace/Default_Constants.h"
 
 #if defined (ACE_HAS_TLI)
 
diff --git a/ace/TLI_Connector.cpp b/ace/TLI_Connector.cpp
index 6acf741f3ba..96b5bf3649e 100644
--- a/ace/TLI_Connector.cpp
+++ b/ace/TLI_Connector.cpp
@@ -1,9 +1,7 @@
 // TLI_Connector.cpp
 // $Id$
 
-#include "ace/Handle_Set.h"
 #include "ace/TLI_Connector.h"
-#include "ace/ACE.h"
 
 ACE_RCSID(ace, TLI_Connector, "$Id$")
 
@@ -13,6 +11,10 @@ ACE_RCSID(ace, TLI_Connector, "$Id$")
 #include "ace/TLI_Connector.i"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/Handle_Set.h"
+#include "ace/ACE.h"
+#include "ace/OS_NS_string.h"
+
 ACE_ALLOC_HOOK_DEFINE(ACE_TLI_Connector)
 
 void
diff --git a/ace/TLI_Stream.h b/ace/TLI_Stream.h
index 7cb03c7904b..4a1ce7fcde0 100644
--- a/ace/TLI_Stream.h
+++ b/ace/TLI_Stream.h
@@ -25,6 +25,8 @@
 
 #if defined (ACE_HAS_TLI)
 
+class ACE_Time_Value;
+
 /**
  * @class ACE_TLI_Stream
  *
diff --git a/ace/Task_T.i b/ace/Task_T.i
index 1a78650279f..e4694062fc4 100644
--- a/ace/Task_T.i
+++ b/ace/Task_T.i
@@ -3,6 +3,8 @@
 
 // Task_T.i
 
+#include "ace/os_include/os_assert.h"
+
 template <ACE_SYNCH_DECL> ACE_INLINE void
 ACE_Task<ACE_SYNCH_USE>::water_marks (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd, 
 				    size_t wm_size)
diff --git a/apps/Gateway/Gateway/Connection_Handler_Connector.cpp b/apps/Gateway/Gateway/Connection_Handler_Connector.cpp
index 81645b1b3fb..a91d00f9e38 100644
--- a/apps/Gateway/Gateway/Connection_Handler_Connector.cpp
+++ b/apps/Gateway/Gateway/Connection_Handler_Connector.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "Connection_Handler_Connector.h"
+#include "ace/os_include/os_netdb.h"
 
 ACE_RCSID(Gateway, Connection_Handler_Connector, "$Id$")
 
diff --git a/apps/drwho/BS_Server.cpp b/apps/drwho/BS_Server.cpp
index 22d2c77d3ff..057fbc25a04 100644
--- a/apps/drwho/BS_Server.cpp
+++ b/apps/drwho/BS_Server.cpp
@@ -4,6 +4,7 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_stdlib.h"
 #include "ace/OS_Memory.h"
+#include "ace/os_include/os_netdb.h"
 
 // This constructor takes a message of sorted login names and loads up
 // the symbol table on the server's side.  It assumes that the number
diff --git a/apps/drwho/CM_Client.cpp b/apps/drwho/CM_Client.cpp
index e24e9866503..3352d8d9a92 100644
--- a/apps/drwho/CM_Client.cpp
+++ b/apps/drwho/CM_Client.cpp
@@ -9,6 +9,7 @@
 #include "ace/OS_NS_sys_select.h"
 #include "ace/OS_NS_netdb.h"
 #include "ace/OS_NS_arpa_inet.h"
+#include "ace/os_include/os_string.h"
 
 // Creates and binds a UDP socket...
 
diff --git a/apps/drwho/PMC_Ruser.cpp b/apps/drwho/PMC_Ruser.cpp
index 9b9f3ff6f63..0d872b3dcb5 100644
--- a/apps/drwho/PMC_Ruser.cpp
+++ b/apps/drwho/PMC_Ruser.cpp
@@ -7,6 +7,7 @@
 #include "ace/ACE.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
+#include "ace/os_include/os_netdb.h"
 
 // This function is pretty much a no-op that just sets up the
 // appropriate lookup function to use.
diff --git a/apps/drwho/PMS_Ruser.cpp b/apps/drwho/PMS_Ruser.cpp
index 062cf80471f..50c969bf52a 100644
--- a/apps/drwho/PMS_Ruser.cpp
+++ b/apps/drwho/PMS_Ruser.cpp
@@ -7,6 +7,7 @@
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_pwd.h"
+#include "ace/os_include/os_netdb.h"
 
 // This function packs the located friends userids, plus the machines
 // they are logged into (along with the inactive and active counts on
diff --git a/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp b/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp
index 165e370e87b..6a6ea29876f 100644
--- a/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp
+++ b/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp
@@ -2,6 +2,7 @@
 
 #include "Consumer_Router.h"
 #include "Options.h"
+#include "ace/os_include/os_assert.h"
 
 ACE_RCSID(Event_Server, Consumer_Router, "$Id$")
 
diff --git a/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp b/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
index 7e2018a3d56..a7edd7893b5 100644
--- a/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
+++ b/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
@@ -2,6 +2,7 @@
 
 #include "Supplier_Router.h"
 #include "Options.h"
+#include "ace/os_include/os_assert.h"
 
 ACE_RCSID(Event_Server, Supplier_Router, "$Id$")
 
diff --git a/examples/C++NPv1/Logging_Handler.cpp b/examples/C++NPv1/Logging_Handler.cpp
index 002958f028e..a1bcb5851fd 100644
--- a/examples/C++NPv1/Logging_Handler.cpp
+++ b/examples/C++NPv1/Logging_Handler.cpp
@@ -12,7 +12,7 @@
 
 #include "Logging_Handler.h"
 #include "ace/streams.h"
-
+#include "ace/os_include/os_netdb.h"
 
 int operator>> (ACE_InputCDR &cdr, ACE_Log_Record &log_record)
 {
diff --git a/examples/C++NPv1/Logging_Server.cpp b/examples/C++NPv1/Logging_Server.cpp
index c33c5efd2d5..c685412c769 100644
--- a/examples/C++NPv1/Logging_Server.cpp
+++ b/examples/C++NPv1/Logging_Server.cpp
@@ -11,6 +11,7 @@
 #include "ace/SOCK_Stream.h"
 #include "Logging_Server.h"
 #include "ace/OS_NS_string.h"
+#include "ace/os_include/os_netdb.h"
 
 int Logging_Server::run (int argc, char *argv[])
 {
diff --git a/examples/C++NPv2/Client_Logging_Daemon.cpp b/examples/C++NPv2/Client_Logging_Daemon.cpp
index 777e56f757a..b60f16d795d 100644
--- a/examples/C++NPv2/Client_Logging_Daemon.cpp
+++ b/examples/C++NPv2/Client_Logging_Daemon.cpp
@@ -19,7 +19,7 @@
 #include "ace/Thread_Manager.h"
 #include "Logging_Acceptor.h"
 #include "CLD_export.h"
-
+#include "ace/os_include/os_netdb.h"
 
 #if !defined (FLUSH_TIMEOUT)
 #define FLUSH_TIMEOUT 120 /* 120 seconds == 2 minutes. */
diff --git a/examples/C++NPv2/Logging_Event_Handler.cpp b/examples/C++NPv2/Logging_Event_Handler.cpp
index 26da7053c7c..d805e776390 100644
--- a/examples/C++NPv2/Logging_Event_Handler.cpp
+++ b/examples/C++NPv2/Logging_Event_Handler.cpp
@@ -8,6 +8,7 @@
 
 #include "Logging_Event_Handler.h"
 #include "ace/OS_NS_string.h"
+#include "ace/os_include/os_netdb.h"
 
 int Logging_Event_Handler::open () {
 
diff --git a/examples/C++NPv2/Logging_Handler.cpp b/examples/C++NPv2/Logging_Handler.cpp
index 2f755bdf82b..247164cd361 100644
--- a/examples/C++NPv2/Logging_Handler.cpp
+++ b/examples/C++NPv2/Logging_Handler.cpp
@@ -12,7 +12,7 @@
 #include "ace/streams.h"
 
 #include "Logging_Handler.h"
-
+#include "ace/os_include/os_netdb.h"
 
 int operator>> (ACE_InputCDR &cdr, ACE_Log_Record &log_record)
 {
diff --git a/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp b/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp
index 6f4199da1a3..3f267ba66ce 100644
--- a/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp
+++ b/examples/IPC_SAP/FIFO_SAP/FIFO-Msg-client.cpp
@@ -3,6 +3,9 @@
 #include "ace/FIFO_Send_Msg.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_main.h"
+#include "ace/OS_NS_stdlib.h"
+#include "ace/OS_NS_time.h"
+#include "ace/OS_NS_string.h"
 
 ACE_RCSID(FIFO_SAP, FIFO_Msg_client, "$Id$")
 
@@ -20,7 +23,7 @@ ACE_TMAIN (int, ACE_TCHAR *[])
 
   while (ACE_OS::fgets (buf, sizeof buf, stdin) != 0)
     {
-      msg.len = strlen (buf) + 1;
+      msg.len = ACE_OS::strlen (buf) + 1;
       if (client.send (ACE_OS::rand () % 11, &msg) == -1)
 	::perror ("send");
     }
diff --git a/examples/IPC_SAP/SPIPE_SAP/client.cpp b/examples/IPC_SAP/SPIPE_SAP/client.cpp
index 934a4a0390e..ad0ee029dbd 100644
--- a/examples/IPC_SAP/SPIPE_SAP/client.cpp
+++ b/examples/IPC_SAP/SPIPE_SAP/client.cpp
@@ -5,6 +5,7 @@
 #include "ace/SPIPE_Connector.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
 
 ACE_RCSID(SPIPE_SAP, client, "$Id$")
 
diff --git a/examples/IPC_SAP/SPIPE_SAP/server.cpp b/examples/IPC_SAP/SPIPE_SAP/server.cpp
index 6575418e497..f2f5ef12a01 100644
--- a/examples/IPC_SAP/SPIPE_SAP/server.cpp
+++ b/examples/IPC_SAP/SPIPE_SAP/server.cpp
@@ -5,6 +5,7 @@
 #include "ace/SPIPE_Acceptor.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_poll.h"
 
 ACE_RCSID(SPIPE_SAP, server, "$Id$")
 
diff --git a/examples/IPC_SAP/TLI_SAP/CPP-client.cpp b/examples/IPC_SAP/TLI_SAP/CPP-client.cpp
index 480ed4f9adf..fe6c1ff09ba 100644
--- a/examples/IPC_SAP/TLI_SAP/CPP-client.cpp
+++ b/examples/IPC_SAP/TLI_SAP/CPP-client.cpp
@@ -3,6 +3,9 @@
 #include "ace/TLI_Connector.h"
 #include "ace/INET_Addr.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_stdlib.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/Time_Value.h"
 
 ACE_RCSID(TLI_SAP, CPP_client, "$Id$")
 
diff --git a/examples/IPC_SAP/TLI_SAP/CPP-server.cpp b/examples/IPC_SAP/TLI_SAP/CPP-server.cpp
index 08d3162dca1..8f8fdda9efe 100644
--- a/examples/IPC_SAP/TLI_SAP/CPP-server.cpp
+++ b/examples/IPC_SAP/TLI_SAP/CPP-server.cpp
@@ -2,6 +2,8 @@
 
 #include "ace/TLI_Acceptor.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_stdlib.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(TLI_SAP, CPP_server, "$Id$")
 
diff --git a/examples/IPC_SAP/TLI_SAP/db-client.cpp b/examples/IPC_SAP/TLI_SAP/db-client.cpp
index aedb139967a..168c5beb1af 100644
--- a/examples/IPC_SAP/TLI_SAP/db-client.cpp
+++ b/examples/IPC_SAP/TLI_SAP/db-client.cpp
@@ -2,6 +2,9 @@
 
 #include "ace/TLI_Connector.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_stdlib.h"
+#include "ace/OS_NS_string.h"
 
 ACE_RCSID(TLI_SAP, db_client, "$Id$")
 
diff --git a/examples/IPC_SAP/TLI_SAP/ftp-client.cpp b/examples/IPC_SAP/TLI_SAP/ftp-client.cpp
index 6c6d1ced180..86f64df29c7 100644
--- a/examples/IPC_SAP/TLI_SAP/ftp-client.cpp
+++ b/examples/IPC_SAP/TLI_SAP/ftp-client.cpp
@@ -2,6 +2,9 @@
 
 #include "ace/TLI_Connector.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_stdlib.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(TLI_SAP, ftp_client, "$Id$")
 
diff --git a/examples/Logger/Acceptor-server/server_loggerd.h b/examples/Logger/Acceptor-server/server_loggerd.h
index dcb48be907f..debc98a38b3 100644
--- a/examples/Logger/Acceptor-server/server_loggerd.h
+++ b/examples/Logger/Acceptor-server/server_loggerd.h
@@ -8,7 +8,7 @@
 #include "ace/SOCK_Stream.h"
 #include "ace/Svc_Handler.h"
 #include "ace/Synch.h"
-
+#include "ace/os_include/os_netdb.h"
 
 class Options
 {
diff --git a/examples/Logger/simple-server/Logging_Handler.h b/examples/Logger/simple-server/Logging_Handler.h
index 6f960694947..633e04a167c 100644
--- a/examples/Logger/simple-server/Logging_Handler.h
+++ b/examples/Logger/simple-server/Logging_Handler.h
@@ -26,6 +26,7 @@
 
 #include "ace/INET_Addr.h"
 #include "ace/SOCK_Stream.h"
+#include "ace/os_include/os_netdb.h"
 
 class Logging_Handler : public ACE_Event_Handler
   // = TITLE
diff --git a/examples/Map_Manager/test_hash_map_manager.cpp b/examples/Map_Manager/test_hash_map_manager.cpp
index b9e7cddc626..c8ecec29c68 100644
--- a/examples/Map_Manager/test_hash_map_manager.cpp
+++ b/examples/Map_Manager/test_hash_map_manager.cpp
@@ -6,6 +6,7 @@
 #include "ace/SString.h"
 #include "ace/Synch_Traits.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/os_include/os_assert.h"
 
 ACE_RCSID(Map_Manager, test_hash_map_manager, "$Id$")
 
diff --git a/examples/Reactor/Multicast/server.cpp b/examples/Reactor/Multicast/server.cpp
index e2251e317de..15fc818bab4 100644
--- a/examples/Reactor/Multicast/server.cpp
+++ b/examples/Reactor/Multicast/server.cpp
@@ -14,6 +14,7 @@
 #include "Log_Wrapper.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/os_include/os_netdb.h"
 
 ACE_RCSID(Multicast, server, "$Id$")
 
diff --git a/examples/Reactor/Proactor/test_end_event_loop.cpp b/examples/Reactor/Proactor/test_end_event_loop.cpp
index 8177f2ca429..919a076ec37 100644
--- a/examples/Reactor/Proactor/test_end_event_loop.cpp
+++ b/examples/Reactor/Proactor/test_end_event_loop.cpp
@@ -29,6 +29,7 @@
 #include "ace/Task.h"
 #include "ace/WIN32_Proactor.h"
 #include "ace/POSIX_Proactor.h"
+#include "ace/OS_main.h"
 
 #if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \
      (defined (ACE_HAS_AIO_CALLS)) && !defined (ACE_POSIX_AIOCB_PROACTOR))
diff --git a/examples/Reactor/Proactor/test_timeout.cpp b/examples/Reactor/Proactor/test_timeout.cpp
index 8639b79ee23..0df96f9efbf 100644
--- a/examples/Reactor/Proactor/test_timeout.cpp
+++ b/examples/Reactor/Proactor/test_timeout.cpp
@@ -25,6 +25,8 @@
 #include "ace/Synch.h"
 #include "ace/Task.h"
 #include "ace/Atomic_Op.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/OS_main.h"
 
 ACE_RCSID(Proactor, test_timeout, "$Id$")
 
diff --git a/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp b/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp
index c425d3210ea..1ca5edea908 100644
--- a/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/client/remote_thr_stream_client_test.cpp
@@ -8,6 +8,7 @@
 #include "ace/INET_Addr.h"
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(client, remote_thr_stream_client_test, "$Id$")
 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i
index 209acc871de..1f88a676743 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i
@@ -4,6 +4,7 @@
 
 #include "ace/SPIPE_Stream.h"
 #include "ace/Get_Opt.h"
+#include "ace/OS_NS_stdio.h"
 
 #if defined (ACE_HAS_STREAM_PIPES)
 
diff --git a/netsvcs/clients/Naming/Client/Client_Test.cpp b/netsvcs/clients/Naming/Client/Client_Test.cpp
index 5f8cb56c3fa..11b4e66d29d 100644
--- a/netsvcs/clients/Naming/Client/Client_Test.cpp
+++ b/netsvcs/clients/Naming/Client/Client_Test.cpp
@@ -8,6 +8,7 @@
 #include "ace/Thread_Manager.h"
 #include "Client_Test.h"
 #include "ace/OS_NS_signal.h"
+#include "ace/os_include/os_assert.h"
 
 ACE_RCSID(Client, Client_Test, "$Id$")
 
diff --git a/netsvcs/lib/TS_Clerk_Handler.cpp b/netsvcs/lib/TS_Clerk_Handler.cpp
index 6b64b5c2916..0e8460b2913 100644
--- a/netsvcs/lib/TS_Clerk_Handler.cpp
+++ b/netsvcs/lib/TS_Clerk_Handler.cpp
@@ -5,6 +5,7 @@
 #include "ace/Get_Opt.h"
 #include "TS_Clerk_Handler.h"
 #include "ace/OS_NS_time.h"
+#include "ace/os_include/os_netdb.h"
 
 ACE_RCSID(lib, TS_Clerk_Handler, "$Id$")
 
diff --git a/performance-tests/UDP/udp_test.cpp b/performance-tests/UDP/udp_test.cpp
index 2da41b2b725..47126bd0e41 100644
--- a/performance-tests/UDP/udp_test.cpp
+++ b/performance-tests/UDP/udp_test.cpp
@@ -27,6 +27,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_arpa_inet.h"
 #include "ace/OS_NS_string.h"
+#include "ace/os_include/os_netdb.h"
 // FUZZ: disable check_for_math_include
 #include <math.h>
 
diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp
index 63fd23b4c7a..1a238c5e5af 100644
--- a/tests/Conn_Test.cpp
+++ b/tests/Conn_Test.cpp
@@ -36,6 +36,7 @@
 #include "ace/Barrier.h"
 #include "ace/OS_NS_signal.h"
 #include "ace/OS_NS_sys_wait.h"
+#include "ace/os_include/os_netdb.h"
 
 ACE_RCSID(tests, Conn_Test, "$Id$")