ChangeLogTag:Thu Jun 10 18:41:29 2004 Steve Huston <shuston@riverace.com>

18 files changed, 11 insertions, 19 deletions

diff --git a/apps/JAWS3/jaws3/Asynch_IO.cpp b/apps/JAWS3/jaws3/Asynch_IO.cpp
index eafc5b6306f..811c3d88a6f 100644
--- a/apps/JAWS3/jaws3/Asynch_IO.cpp
+++ b/apps/JAWS3/jaws3/Asynch_IO.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "ace/OS.h"
-
 #ifndef JAWS_BUILD_DLL
 #define JAWS_BUILD_DLL
 #endif /*JAWS_BUILD_DLL*/
 
+#include "ace/config-lite.h"
+
 #include "jaws3/IO.h"
 #include "jaws3/Asynch_IO.h"
 #include "jaws3/Event_Completer.h"
diff --git a/apps/JAWS3/jaws3/Config_File.cpp b/apps/JAWS3/jaws3/Config_File.cpp
index bc324ce0484..5793aa60dc5 100644
--- a/apps/JAWS3/jaws3/Config_File.cpp
+++ b/apps/JAWS3/jaws3/Config_File.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
-#include "ace/OS.h"
+#include "ace/OS_NS_stdlib.h"
+#include "ace/OS_NS_string.h"
 #include "ace/FILE_Connector.h"
 #include "ace/Message_Block.h"
 #include "ace/Singleton.h"
diff --git a/apps/JAWS3/jaws3/Datagram.h b/apps/JAWS3/jaws3/Datagram.h
index e0ff0c6f1a9..370088892de 100644
--- a/apps/JAWS3/jaws3/Datagram.h
+++ b/apps/JAWS3/jaws3/Datagram.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_DATAGRAM_H
 #define JAWS_DATAGRAM_H
 
-#include "ace/OS.h"
 #include "ace/Addr.h"
 #include "ace/Synch.h"
 #include "ace/Singleton.h"
diff --git a/apps/JAWS3/jaws3/Export.h b/apps/JAWS3/jaws3/Export.h
index 22e3c7b61f7..8af831df529 100644
--- a/apps/JAWS3/jaws3/Export.h
+++ b/apps/JAWS3/jaws3/Export.h
@@ -7,7 +7,7 @@
 #ifndef JAWS_EXPORT_H
 #define JAWS_EXPORT_H
 
-#include "ace/OS.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/apps/JAWS3/jaws3/IO.h b/apps/JAWS3/jaws3/IO.h
index 9c71702105b..a910a4fb029 100644
--- a/apps/JAWS3/jaws3/IO.h
+++ b/apps/JAWS3/jaws3/IO.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_IO_H
 #define JAWS_IO_H
 
-#include "ace/OS.h"
 #include "ace/Message_Block.h"
 #include "ace/Singleton.h"
 #include "ace/Synch_Traits.h"
diff --git a/apps/JAWS3/jaws3/Options.cpp b/apps/JAWS3/jaws3/Options.cpp
index 6ba0ed82fe7..19c7a40406e 100644
--- a/apps/JAWS3/jaws3/Options.cpp
+++ b/apps/JAWS3/jaws3/Options.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ace/OS.h"
+#include "ace/OS_NS_stdlib.h"
 
 #ifndef JAWS_BUILD_DLL
 #define JAWS_BUILD_DLL
diff --git a/apps/JAWS3/jaws3/Protocol_Handler.h b/apps/JAWS3/jaws3/Protocol_Handler.h
index 663a3eda032..5452d4e0247 100644
--- a/apps/JAWS3/jaws3/Protocol_Handler.h
+++ b/apps/JAWS3/jaws3/Protocol_Handler.h
@@ -2,7 +2,6 @@
 #ifndef JAWS_PROTOCOL_HANDLER_H
 #define JAWS_PROTOCOL_HANDLER_H
 
-#include "ace/OS.h"
 #include "ace/Message_Block.h"
 
 #include "jaws3/Export.h"
diff --git a/apps/JAWS3/jaws3/Signal_Task.cpp b/apps/JAWS3/jaws3/Signal_Task.cpp
index 00c3f557692..24c79eec032 100644
--- a/apps/JAWS3/jaws3/Signal_Task.cpp
+++ b/apps/JAWS3/jaws3/Signal_Task.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
-#include "ace/OS.h"
+#include "ace/OS_NS_signal.h"
+#include "ace/OS_NS_Thread.h"
 #include "ace/Thread.h"
 
 #ifndef JAWS_BUILD_DLL
diff --git a/apps/JAWS3/jaws3/Symbol_Table.h b/apps/JAWS3/jaws3/Symbol_Table.h
index 67c6ebf5d18..dfd856205e3 100644
--- a/apps/JAWS3/jaws3/Symbol_Table.h
+++ b/apps/JAWS3/jaws3/Symbol_Table.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_SYMBOL_TABLE_H
 #define JAWS_SYMBOL_TABLE_H
 
-#include "ace/OS.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Synch.h"
 
diff --git a/apps/JAWS3/jaws3/Synch_IO.cpp b/apps/JAWS3/jaws3/Synch_IO.cpp
index 76f53dc0e0b..69b0d92fd95 100644
--- a/apps/JAWS3/jaws3/Synch_IO.cpp
+++ b/apps/JAWS3/jaws3/Synch_IO.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-#include "ace/OS.h"
 #include "ace/ACE.h"
 
 #ifndef JAWS_BUILD_DLL
diff --git a/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp b/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp
index d42a7b47018..83c3da28bc7 100644
--- a/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp
+++ b/apps/JAWS3/jaws3/THYBRID_Concurrency.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ace/OS.h"
+#include "ace/OS_NS_stdlib.h"
 #include "ace/Message_Block.h"
 
 #ifndef JAWS_BUILD_DLL
diff --git a/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp b/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp
index c048b6a647d..4f91c5f34c8 100644
--- a/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp
+++ b/apps/JAWS3/jaws3/TPOOL_Concurrency.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ace/OS.h"
+#include "ace/OS_NS_stdlib.h"
 #include "ace/Message_Block.h"
 
 #ifndef JAWS_BUILD_DLL
diff --git a/apps/JAWS3/jaws3/TPR_Concurrency.cpp b/apps/JAWS3/jaws3/TPR_Concurrency.cpp
index 6f07a6479cc..6e15def5cb8 100644
--- a/apps/JAWS3/jaws3/TPR_Concurrency.cpp
+++ b/apps/JAWS3/jaws3/TPR_Concurrency.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-#include "ace/OS.h"
 #include "ace/Message_Block.h"
 
 #ifndef JAWS_BUILD_DLL
diff --git a/apps/JAWS3/jaws3/Task_Timer.h b/apps/JAWS3/jaws3/Task_Timer.h
index 08e1804e1c2..a31781a922a 100644
--- a/apps/JAWS3/jaws3/Task_Timer.h
+++ b/apps/JAWS3/jaws3/Task_Timer.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_TASK_TIMER_H
 #define JAWS_TASK_TIMER_H
 
-#include "ace/OS.h"
 #include "ace/Singleton.h"
 #include "ace/Timer_Wheel.h"
 #include "ace/Timer_Queue_Adapters.h"
diff --git a/apps/JAWS3/jaws3/Templates.cpp b/apps/JAWS3/jaws3/Templates.cpp
index 47eb80eb203..32bd4642109 100644
--- a/apps/JAWS3/jaws3/Templates.cpp
+++ b/apps/JAWS3/jaws3/Templates.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-#include "ace/OS.h"
 #include "ace/Reactor.h"
 #include "ace/Select_Reactor.h"
 #include "ace/Svc_Handler.h"
diff --git a/apps/JAWS3/jaws3/Timer.h b/apps/JAWS3/jaws3/Timer.h
index 32c4abc8007..d2468344307 100644
--- a/apps/JAWS3/jaws3/Timer.h
+++ b/apps/JAWS3/jaws3/Timer.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_TIMER_H
 #define JAWS_TIMER_H
 
-#include "ace/OS.h"
 #include "ace/Singleton.h"
 #include "ace/Timer_Wheel.h"
 #include "ace/Timer_Queue_Adapters.h"
diff --git a/apps/JAWS3/jaws3/Timer_Helpers.h b/apps/JAWS3/jaws3/Timer_Helpers.h
index a88aa68285d..9ce8434975f 100644
--- a/apps/JAWS3/jaws3/Timer_Helpers.h
+++ b/apps/JAWS3/jaws3/Timer_Helpers.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_TIMER_HELPERS_H
 #define JAWS_TIMER_HELPERS_H
 
-#include "ace/OS.h"
 #include "ace/Singleton.h"
 #include "ace/Event_Handler.h"
 
diff --git a/apps/JAWS3/jaws3/main.cpp b/apps/JAWS3/jaws3/main.cpp
index e93e1d95cdd..4b5705abc2f 100644
--- a/apps/JAWS3/jaws3/main.cpp
+++ b/apps/JAWS3/jaws3/main.cpp
@@ -1,5 +1,5 @@
 // $Id$
-#include "ace/OS.h"
+#include "ace/Log_Msg.h"
 #include "ace/Reactor.h"
 #include "ace/Select_Reactor.h"
 #include "ace/Service_Config.h"