ChangeLogTag:Sat Nov 1 05:40:21 UTC 2003 Don Hinton <dhinton@dresystems.com>

10 files changed, 16 insertions, 5 deletions

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/Gateway/Gateway/Event.h b/apps/Gateway/Gateway/Event.h
index fe4ae2c2272..0b83febc92c 100644
--- a/apps/Gateway/Gateway/Event.h
+++ b/apps/Gateway/Gateway/Event.h
@@ -17,12 +17,14 @@
 #ifndef EVENT_H
 #define EVENT_H
 
-#include "ace/OS.h"
+#include "ace/os_include/arpa/os_inet.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Basic_Types.h"
+
 // = The following #defines should really be in a separate include
 // file that is shared with the ../Peer/ directory.  For now, we'll
 // keep them here to simplify the sharing between the two directories.
diff --git a/apps/Gateway/Gateway/Event_Channel.cpp b/apps/Gateway/Gateway/Event_Channel.cpp
index 350a72a4c16..f993869ed58 100644
--- a/apps/Gateway/Gateway/Event_Channel.cpp
+++ b/apps/Gateway/Gateway/Event_Channel.cpp
@@ -4,6 +4,7 @@
 
 #include "Connection_Handler_Connector.h"
 #include "Event_Channel.h"
+#include "ace/OS_NS_sys_select.h"
 
 ACE_RCSID(Gateway, Event_Channel, "$Id$")
 
diff --git a/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h b/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h
index 10bc4409589..2a83a53a584 100644
--- a/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h
+++ b/apps/Gateway/Gateway/Event_Forwarding_Discriminator.h
@@ -23,7 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Synch.h"
+#include "ace/Null_Mutex.h"
 #include "Event.h"
 #include "Consumer_Dispatch_Set.h"
 
diff --git a/apps/Gateway/Gateway/File_Parser.cpp b/apps/Gateway/Gateway/File_Parser.cpp
index 6f248e6762d..e108636a83e 100644
--- a/apps/Gateway/Gateway/File_Parser.cpp
+++ b/apps/Gateway/Gateway/File_Parser.cpp
@@ -4,7 +4,7 @@
 
 #define FILE_PARSER_C
 
-#include "ace/OS.h"
+#include "ace/OS_NS_stdio.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/apps/Gateway/Gateway/File_Parser.h b/apps/Gateway/Gateway/File_Parser.h
index a91a8f75827..9b5033bf5a6 100644
--- a/apps/Gateway/Gateway/File_Parser.h
+++ b/apps/Gateway/Gateway/File_Parser.h
@@ -17,7 +17,7 @@
 #ifndef _FILE_PARSER
 #define _FILE_PARSER
 
-#include "ace/OS.h"
+#include "ace/Basic_Types.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/apps/Gateway/Gateway/Gateway.h b/apps/Gateway/Gateway/Gateway.h
index cd50cfa6e8e..fe7d138b3a1 100644
--- a/apps/Gateway/Gateway/Gateway.h
+++ b/apps/Gateway/Gateway/Gateway.h
@@ -22,7 +22,6 @@
 #ifndef ACE_GATEWAY
 #define ACE_GATEWAY
 
-#include "ace/OS.h"
 #include "ace/svc_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/apps/Gateway/Gateway/Options.cpp b/apps/Gateway/Gateway/Options.cpp
index d13848835bf..b97f5aab784 100644
--- a/apps/Gateway/Gateway/Options.cpp
+++ b/apps/Gateway/Gateway/Options.cpp
@@ -6,6 +6,9 @@
 #include "Options.h"
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_string.h"
+#include "ace/OS_NS_strings.h"
+#include "ace/os_include/os_fcntl.h"
 
 ACE_RCSID(Gateway, Options, "$Id$")
 
diff --git a/apps/Gateway/Gateway/Options.h b/apps/Gateway/Gateway/Options.h
index 82bb7069c3a..c6913dd2310 100644
--- a/apps/Gateway/Gateway/Options.h
+++ b/apps/Gateway/Gateway/Options.h
@@ -24,6 +24,9 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/svc_export.h"
+#include "ace/Lock_Adapter_T.h"
+#include "ace/Synch_Traits.h"
+#include "ace/Thread_Mutex.h"
 
 class ACE_Svc_Export Options
 {
diff --git a/apps/Gateway/Peer/Options.cpp b/apps/Gateway/Peer/Options.cpp
index e4c5842c696..92dc6474a73 100644
--- a/apps/Gateway/Peer/Options.cpp
+++ b/apps/Gateway/Peer/Options.cpp
@@ -5,6 +5,8 @@
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
 #include "Options.h"
+#include "ace/OS_NS_strings.h"
+#include "ace/OS_NS_string.h"
 
 ACE_RCSID(Peer, Options, "$Id$")