11 files changed, 11 insertions, 10 deletions
diff --git a/apps/JAWS3/jaws3/Asynch_IO.h b/apps/JAWS3/jaws3/Asynch_IO.h
index b62a0e4b285..68fd257cb24 100644
--- a/apps/JAWS3/jaws3/Asynch_IO.h
+++ b/apps/JAWS3/jaws3/Asynch_IO.h
@@ -4,9 +4,10 @@
 #ifndef JAWS_ASYNCH_IO_H
 #define JAWS_ASYNCH_IO_H
 
-#include "ace/OS.h"
 #include "ace/Asynch_IO.h"
+#include "ace/Message_Block.h"
 #include "ace/Singleton.h"
+#include "ace/Time_Value.h"
 
 #include "jaws3/Export.h"
 #include "jaws3/IO.h"
diff --git a/apps/JAWS3/jaws3/Asynch_IO_Helpers.h b/apps/JAWS3/jaws3/Asynch_IO_Helpers.h
index 473b5cbc842..e82ab8189e5 100644
--- a/apps/JAWS3/jaws3/Asynch_IO_Helpers.h
+++ b/apps/JAWS3/jaws3/Asynch_IO_Helpers.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_ASYNCH_IO_HELPERS_H
 #define JAWS_ASYNCH_IO_HELPERS_H
 
-#include "ace/OS.h"
 #include "ace/Asynch_IO.h"
 #include "ace/Singleton.h"
 
diff --git a/apps/JAWS3/jaws3/Concurrency.cpp b/apps/JAWS3/jaws3/Concurrency.cpp
index 3844950c25d..3d42fde5fae 100644
--- a/apps/JAWS3/jaws3/Concurrency.cpp
+++ b/apps/JAWS3/jaws3/Concurrency.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "ace/OS_NS_strings.h"
 #include "ace/Message_Block.h"
 #include "ace/Singleton.h"
 #include "ace/Synch_Traits.h"
diff --git a/apps/JAWS3/jaws3/Concurrency_T.h b/apps/JAWS3/jaws3/Concurrency_T.h
index 788129d74cf..704da56faea 100644
--- a/apps/JAWS3/jaws3/Concurrency_T.h
+++ b/apps/JAWS3/jaws3/Concurrency_T.h
@@ -4,8 +4,8 @@
 #ifndef JAWS_CONCURRENCY_T_H
 #define JAWS_CONCURRENCY_T_H
 
-// This gets me the ACE #defines without having to #include "ace/OS.h".
-#include "ace/OS.h"
+// This gets me the ACE template defines without having to #include "ace/OS.h".
+#include "ace/config-lite.h"
 
 class JAWS_Protocol_Handler;
 
diff --git a/apps/JAWS3/jaws3/Event_Dispatcher.h b/apps/JAWS3/jaws3/Event_Dispatcher.h
index 65a82e56e03..d29095b5744 100644
--- a/apps/JAWS3/jaws3/Event_Dispatcher.h
+++ b/apps/JAWS3/jaws3/Event_Dispatcher.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_EVENT_DISPATCHER_H
 #define JAWS_EVENT_DISPATCHER_H
 
-#include "ace/OS.h"
 #include "ace/Reactor.h"
 #include "ace/Select_Reactor.h"
 
diff --git a/apps/JAWS3/jaws3/IO.cpp b/apps/JAWS3/jaws3/IO.cpp
index 6a4090f8481..98e2e6e32f5 100644
--- a/apps/JAWS3/jaws3/IO.cpp
+++ b/apps/JAWS3/jaws3/IO.cpp
@@ -4,6 +4,8 @@
 #define JAWS_BUILD_DLL
 #endif /*JAWS_BUILD_DLL*/
 
+#include "ace/OS_NS_strings.h"
+
 #include "jaws3/IO.h"
 #include "jaws3/Asynch_IO.h"
 #include "jaws3/Synch_IO.h"
diff --git a/apps/JAWS3/jaws3/Options.h b/apps/JAWS3/jaws3/Options.h
index b767cc5438c..ff3720706ad 100644
--- a/apps/JAWS3/jaws3/Options.h
+++ b/apps/JAWS3/jaws3/Options.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_OPTIONS_H
 #define JAWS_OPTIONS_H
 
-#include "ace/OS.h"
 #include "ace/Singleton.h"
 #include "ace/Synch.h"
 
diff --git a/apps/JAWS3/jaws3/Reactive_IO.h b/apps/JAWS3/jaws3/Reactive_IO.h
index 9bbb8dbffdf..e899357e5fc 100644
--- a/apps/JAWS3/jaws3/Reactive_IO.h
+++ b/apps/JAWS3/jaws3/Reactive_IO.h
@@ -4,9 +4,10 @@
 #ifndef JAWS_REACTIVE_IO_H
 #define JAWS_REACTIVE_IO_H
 
-#include "ace/OS.h"
 #include "ace/Message_Block.h"
 #include "ace/Singleton.h"
+#include "ace/Synch_Traits.h"
+#include "ace/Time_Value.h"
 
 #include "jaws3/Export.h"
 #include "jaws3/IO.h"
diff --git a/apps/JAWS3/jaws3/Reactive_IO_Helpers.h b/apps/JAWS3/jaws3/Reactive_IO_Helpers.h
index 966f99a0e55..9f94fd4caaf 100644
--- a/apps/JAWS3/jaws3/Reactive_IO_Helpers.h
+++ b/apps/JAWS3/jaws3/Reactive_IO_Helpers.h
@@ -4,9 +4,10 @@
 #ifndef JAWS_REACTIVE_IO_HELPERS_H
 #define JAWS_REACTIVE_IO_HELPERS_H
 
-#include "ace/OS.h"
+#include "ace/Event_Handler.h"
 #include "ace/Message_Block.h"
 #include "ace/Singleton.h"
+#include "ace/Time_Value.h"
 
 #include "jaws3/Export.h"
 #include "jaws3/IO.h"
diff --git a/apps/JAWS3/jaws3/Signal_Task.h b/apps/JAWS3/jaws3/Signal_Task.h
index f66c9fb9e56..f1564b812a0 100644
--- a/apps/JAWS3/jaws3/Signal_Task.h
+++ b/apps/JAWS3/jaws3/Signal_Task.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_SIGNAL_TASK_H
 #define JAWS_SIGNAL_TASK_H
 
-#include "ace/OS.h"
 #include "ace/Synch.h"
 #include "ace/Signal.h"
 #include "ace/Singleton.h"
diff --git a/apps/JAWS3/jaws3/Synch_IO.h b/apps/JAWS3/jaws3/Synch_IO.h
index f74d78ce04d..5ecf5267088 100644
--- a/apps/JAWS3/jaws3/Synch_IO.h
+++ b/apps/JAWS3/jaws3/Synch_IO.h
@@ -4,7 +4,6 @@
 #ifndef JAWS_SYNCH_IO_H
 #define JAWS_SYNCH_IO_H
 
-#include "ace/OS.h"
 #include "ace/Singleton.h"
 
 #include "jaws3/IO.h"