ChangeLogTag:Fri Apr 5 11:40:00 UTC 2002 Don Hinton <dhinton@ieee.org>

51 files changed, 183 insertions, 105 deletions

diff --git a/ace/ATM_Acceptor.h b/ace/ATM_Acceptor.h
index 173be1ad532..a431d9043ac 100644
--- a/ace/ATM_Acceptor.h
+++ b/ace/ATM_Acceptor.h
@@ -15,10 +15,7 @@
 #define ACE_ATM_ACCEPTOR_H
 #include "ace/pre.h"
 
-#include "ace/Time_Value.h"
-#include "ace/ATM_Stream.h"
-#include "ace/ATM_Params.h"
-#include "ace/ATM_QoS.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,6 +23,11 @@
 
 #if defined (ACE_HAS_ATM)
 
+#include "ace/Time_Value.h"
+#include "ace/ATM_Stream.h"
+#include "ace/ATM_Params.h"
+#include "ace/ATM_QoS.h"
+
 #if defined (ACE_HAS_LINUX_ATM)
 #include "atm.h"
 #endif /* ACE_HAS_LINUX_ATM */
diff --git a/ace/ATM_Addr.cpp b/ace/ATM_Addr.cpp
index d03ae5c5d09..e371d9b4f1c 100644
--- a/ace/ATM_Addr.cpp
+++ b/ace/ATM_Addr.cpp
@@ -3,6 +3,8 @@
 // Defines the Internet domain address family address format.
 
 #include "ace/ATM_Addr.h"
+#if defined (ACE_HAS_ATM)
+
 #include "ace/Log_Msg.h"
 
 #if defined (ACE_HAS_FORE_ATM_WS2)
@@ -497,3 +499,5 @@ ACE_ATM_Addr::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("%s"), s));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
+
+#endif /* ACE_HAS_ATM */
diff --git a/ace/ATM_Addr.h b/ace/ATM_Addr.h
index 85319006ba5..69c1f6e27f8 100644
--- a/ace/ATM_Addr.h
+++ b/ace/ATM_Addr.h
@@ -12,13 +12,17 @@
 #define ACE_ATM_ADDR_H
 #include "ace/pre.h"
 
-#include "ace/ACE.h"
-#include "ace/Addr.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if defined (ACE_HAS_ATM)
+
+#include "ace/ACE.h"
+#include "ace/Addr.h"
+
 #if defined (ACE_HAS_FORE_ATM_XTI)
 typedef ATMSAPAddress ATM_Addr;
 #elif defined (ACE_HAS_FORE_ATM_WS2)
@@ -175,5 +179,6 @@ private:
 #include "ace/ATM_Addr.i"
 #endif /* __ACE_INLINE__ */
 
+#endif /* ACE_HAS_ATM */
 #include "ace/post.h"
 #endif /* ACE_ATM_ADDR_H */
diff --git a/ace/ATM_Connector.cpp b/ace/ATM_Connector.cpp
index d804f87ef03..c04294ab0c1 100644
--- a/ace/ATM_Connector.cpp
+++ b/ace/ATM_Connector.cpp
@@ -1,12 +1,12 @@
 // ATM_Connector.cpp
 // $Id$
 
-#include "ace/Handle_Set.h"
 #include "ace/ATM_Connector.h"
+#if defined (ACE_HAS_ATM)
 
-ACE_RCSID(ace, ATM_Connector, "$Id$")
+#include "ace/Handle_Set.h"
 
-#if defined (ACE_HAS_ATM)
+ACE_RCSID(ace, ATM_Connector, "$Id$")
 
 #if !defined (__ACE_INLINE__)
 #include "ace/ATM_Connector.i"
diff --git a/ace/ATM_Connector.h b/ace/ATM_Connector.h
index baa84fd47d6..6689b0acdd5 100644
--- a/ace/ATM_Connector.h
+++ b/ace/ATM_Connector.h
@@ -14,9 +14,7 @@
 #define ACE_ATM_CONNECTOR_H
 #include "ace/pre.h"
 
-#include "ace/ATM_Stream.h"
-#include "ace/ATM_Params.h"
-#include "ace/ATM_QoS.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,6 +22,10 @@
 
 #if defined (ACE_HAS_ATM)
 
+#include "ace/ATM_Stream.h"
+#include "ace/ATM_Params.h"
+#include "ace/ATM_QoS.h"
+
 #if defined (ACE_WIN32) || defined (ACE_HAS_LINUX_ATM)
 #include "SOCK_Connector.h"
 typedef ACE_SOCK_Connector ATM_Connector;
diff --git a/ace/ATM_Params.h b/ace/ATM_Params.h
index 5544bd3afcd..0b76afc0e38 100644
--- a/ace/ATM_Params.h
+++ b/ace/ATM_Params.h
@@ -14,7 +14,7 @@
 #define ACE_ATM_PARAMS_H
 #include "ace/pre.h"
 
-#include "ace/ACE.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,6 +22,8 @@
 
 #if defined (ACE_HAS_ATM)
 
+#include "ace/ACE.h"
+
 #if defined (ACE_HAS_FORE_ATM_XTI)
 #include "ace/TLI.h"
 #define ATM_PROTOCOL_DEFAULT 0
diff --git a/ace/ATM_QoS.h b/ace/ATM_QoS.h
index 2b94534a8b1..586f9cd4146 100644
--- a/ace/ATM_QoS.h
+++ b/ace/ATM_QoS.h
@@ -15,7 +15,7 @@
 #define ACE_ATM_QoS_H
 #include "ace/pre.h"
 
-#include "ace/ACE.h"
+#include "ace/config-all.h"
 
 #if !defined(ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -23,6 +23,8 @@
 
 #if defined (ACE_HAS_ATM)
 
+#include "ace/ACE.h"
+
 #if defined (ACE_HAS_FORE_ATM_WS2)
 // just map to WS2 GQOS struct
 typedef ACE_QoS ATM_QoS;
diff --git a/ace/ATM_Stream.h b/ace/ATM_Stream.h
index f9dd3741f96..0267b095f5d 100644
--- a/ace/ATM_Stream.h
+++ b/ace/ATM_Stream.h
@@ -15,8 +15,7 @@
 #define ACE_ATM_STREAM_H
 #include "ace/pre.h"
 
-#include "ace/ATM_Addr.h"
-#include "ace/ATM_Params.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,6 +23,9 @@
 
 #if defined (ACE_HAS_ATM)
 
+#include "ace/ATM_Addr.h"
+#include "ace/ATM_Params.h"
+
 #if defined (ACE_WIN32)
 #include "SOCK_Stream.h"
 typedef ACE_SOCK_Stream ATM_Stream;
diff --git a/ace/Asynch_Acceptor.h b/ace/Asynch_Acceptor.h
index 41a454a3a10..761cf230ec0 100644
--- a/ace/Asynch_Acceptor.h
+++ b/ace/Asynch_Acceptor.h
@@ -14,7 +14,7 @@
 #define ACE_ASYNCH_ACCEPTOR_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,6 +23,7 @@
 #if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
 // This only works on platforms that support async i/o.
 
+#include "ace/OS.h"
 #include "ace/Asynch_IO.h"
 
 // Forward declarations
diff --git a/ace/Asynch_IO.h b/ace/Asynch_IO.h
index 311650d33ee..96a6f99dc2b 100644
--- a/ace/Asynch_IO.h
+++ b/ace/Asynch_IO.h
@@ -26,7 +26,7 @@
 #define ACE_ASYNCH_IO_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -34,6 +34,8 @@
 
 #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
 
+#include "ace/OS.h"
+
 // Forward declarations
 class ACE_Proactor;
 class ACE_Handler;
diff --git a/ace/Asynch_IO_Impl.cpp b/ace/Asynch_IO_Impl.cpp
index ac079a80994..e3796fead53 100644
--- a/ace/Asynch_IO_Impl.cpp
+++ b/ace/Asynch_IO_Impl.cpp
@@ -1,10 +1,11 @@
 // $Id$
-#include "ace/OS.h"
+
 #include "ace/Asynch_IO_Impl.h"
 
 #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
 // This only works on Win32 platforms and on Unix platforms supporting
 // aio calls. 
+#include "ace/OS.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Asynch_IO_Impl.i"
diff --git a/ace/Asynch_IO_Impl.h b/ace/Asynch_IO_Impl.h
index 5137145534d..b49a827d8ba 100644
--- a/ace/Asynch_IO_Impl.h
+++ b/ace/Asynch_IO_Impl.h
@@ -23,6 +23,8 @@
 #define ACE_ASYNCH_IO_IMPL_H
 #include "ace/pre.h"
 
+#include "ace/config-all.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
diff --git a/ace/CE_Screen_Output.cpp b/ace/CE_Screen_Output.cpp
index 73de1d707ba..14e9858f713 100644
--- a/ace/CE_Screen_Output.cpp
+++ b/ace/CE_Screen_Output.cpp
@@ -3,10 +3,10 @@
 // $Id$
 
 #include "ace/CE_Screen_Output.h"
-#include "ace/Log_Msg.h"
-
 #if defined (ACE_HAS_WINCE)
 
+#include "ace/Log_Msg.h"
+
 ACE_CE_Screen_Output::ACE_CE_Screen_Output(HWND hEdit)
 : handler_(hEdit)
 , pFile_(0)
diff --git a/ace/CE_Screen_Output.h b/ace/CE_Screen_Output.h
index c50786d4c38..0b79c75c2f5 100644
--- a/ace/CE_Screen_Output.h
+++ b/ace/CE_Screen_Output.h
@@ -10,12 +10,18 @@
 #ifndef ACE_CE_Screen_Output_h
 #define ACE_CE_Screen_Output_h
 
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+#pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if defined (ACE_HAS_WINCE)
+
 #include "ace/OS.h"
 #include "ace/Log_Msg_Callback.h"
 #include "ace/Log_Record.h"
 
-#if defined (ACE_HAS_WINCE)
-
 const ACE_TCHAR endl[] = ACE_LIB_TEXT("\r\n");
 const ACE_TCHAR tab[]  = ACE_LIB_TEXT("\t");
 
diff --git a/ace/FlReactor.cpp b/ace/FlReactor.cpp
index c9a64145ce7..dd609a16556 100644
--- a/ace/FlReactor.cpp
+++ b/ace/FlReactor.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
 #include "ace/FlReactor.h"
-#include "ace/Synch_T.h"
 
 ACE_RCSID(ace, FlReactor, "$Id$")
 
 #if defined (ACE_HAS_FL)
 
+#include "ace/Synch_T.h"
 #include <FL/Fl.h>
 
 ACE_ALLOC_HOOK_DEFINE (ACE_FlReactor)
diff --git a/ace/FlReactor.h b/ace/FlReactor.h
index c9cb7670b0d..09bd82e3b2c 100644
--- a/ace/FlReactor.h
+++ b/ace/FlReactor.h
@@ -19,7 +19,7 @@
 #define ACE_FLREACTOR_H
 #include "ace/pre.h"
 
-#include "ace/Select_Reactor.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,6 +27,8 @@
 
 #if defined (ACE_HAS_FL)
 
+#include "ace/Select_Reactor.h"
+
 /**
  * @class ACE_FlReactor
  *
diff --git a/ace/IOStream.h b/ace/IOStream.h
index 89ce9fb31d5..f97af63c4b2 100644
--- a/ace/IOStream.h
+++ b/ace/IOStream.h
@@ -16,7 +16,7 @@
 #define ACE_IOSTREAM_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -35,6 +35,7 @@
 
 #if !defined (ACE_LACKS_ACE_IOSTREAM)
 
+#include "ace/OS.h"
 #include "ace/streams.h"
 
 #if defined (ACE_HAS_STRING_CLASS)
diff --git a/ace/LSOCK.cpp b/ace/LSOCK.cpp
index 427d2117f06..45f56f5770b 100644
--- a/ace/LSOCK.cpp
+++ b/ace/LSOCK.cpp
@@ -1,12 +1,13 @@
 // $Id$
 
 #include "ace/LSOCK.h"
-#include "ace/Log_Msg.h"
 
 ACE_RCSID(ace, LSOCK, "$Id$")
 
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
+#include "ace/Log_Msg.h"
+
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/LSOCK.i"
 #endif
diff --git a/ace/LSOCK.h b/ace/LSOCK.h
index b307e99e2e0..b57ae3d224c 100644
--- a/ace/LSOCK.h
+++ b/ace/LSOCK.h
@@ -15,7 +15,7 @@
 #define ACE_LOCAL_SOCK_H
 #include "ace/pre.h"
 
-#include "ace/SOCK.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,6 +23,8 @@
 
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
+#include "ace/SOCK.h"
+
 /**
  * @class ACE_LSOCK
  *
diff --git a/ace/LSOCK_Acceptor.cpp b/ace/LSOCK_Acceptor.cpp
index 9c4574a50d3..b6beee7a1ae 100644
--- a/ace/LSOCK_Acceptor.cpp
+++ b/ace/LSOCK_Acceptor.cpp
@@ -2,12 +2,12 @@
 // $Id$
 
 #include "ace/LSOCK_Acceptor.h"
+#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
+
 #include "ace/Log_Msg.h"
 
 ACE_RCSID(ace, LSOCK_Acceptor, "$Id$")
 
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
 ACE_ALLOC_HOOK_DEFINE(ACE_LSOCK_Acceptor)
 
 // Return the local endpoint address.
diff --git a/ace/LSOCK_Acceptor.h b/ace/LSOCK_Acceptor.h
index 852dccfbc44..6fd37f02df6 100644
--- a/ace/LSOCK_Acceptor.h
+++ b/ace/LSOCK_Acceptor.h
@@ -15,17 +15,18 @@
 #define ACE_LOCAL_SOCK_ACCEPTOR_H
 #include "ace/pre.h"
 
-#include "ace/SOCK_Acceptor.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
+
+#include "ace/SOCK_Acceptor.h"
 #include "ace/UNIX_Addr.h"
 #include "ace/LSOCK_Stream.h"
 
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
 // Forward decl.
 class ACE_Reactor;
 
diff --git a/ace/LSOCK_CODgram.cpp b/ace/LSOCK_CODgram.cpp
index 5bce9e7887d..759bbb42cff 100644
--- a/ace/LSOCK_CODgram.cpp
+++ b/ace/LSOCK_CODgram.cpp
@@ -2,12 +2,12 @@
 // $Id$
 
 #include "ace/LSOCK_CODgram.h"
+#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
+
 #include "ace/Log_Msg.h"
 
 ACE_RCSID(ace, LSOCK_CODgram, "$Id$")
 
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/LSOCK_CODgram.i"
 #endif
diff --git a/ace/LSOCK_CODgram.h b/ace/LSOCK_CODgram.h
index f9bbf138654..a26e99af73e 100644
--- a/ace/LSOCK_CODgram.h
+++ b/ace/LSOCK_CODgram.h
@@ -15,17 +15,18 @@
 #define ACE_LOCAL_SOCK_CODGRAM_H
 #include "ace/pre.h"
 
-#include "ace/LSOCK.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
+
+#include "ace/LSOCK.h"
 #include "ace/SOCK_CODgram.h"
 #include "ace/Addr.h"
 
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
 /**
  * @class ACE_LSOCK_CODgram
  *
diff --git a/ace/LSOCK_Connector.cpp b/ace/LSOCK_Connector.cpp
index 538ba21d4f2..b4ef7f4b950 100644
--- a/ace/LSOCK_Connector.cpp
+++ b/ace/LSOCK_Connector.cpp
@@ -2,12 +2,12 @@
 // $Id$
 
 #include "ace/LSOCK_Connector.h"
+#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
+
 #include "ace/Log_Msg.h"
 
 ACE_RCSID(ace, LSOCK_Connector, "$Id$")
 
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/LSOCK_Connector.i"
 #endif
diff --git a/ace/LSOCK_Connector.h b/ace/LSOCK_Connector.h
index 7058e6be321..92c4cfe4682 100644
--- a/ace/LSOCK_Connector.h
+++ b/ace/LSOCK_Connector.h
@@ -14,17 +14,18 @@
 #define ACE_LOCAL_SOCK_CONNECTOR_H
 #include "ace/pre.h"
 
-#include "ace/SOCK_Connector.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
+
+#include "ace/SOCK_Connector.h"
 #include "ace/LSOCK_Stream.h"
 #include "ace/UNIX_Addr.h"
 
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
 /**
  * @class ACE_LSOCK_Connector
  *
diff --git a/ace/LSOCK_Dgram.cpp b/ace/LSOCK_Dgram.cpp
index fd1a67c1363..9a44cfa08a0 100644
--- a/ace/LSOCK_Dgram.cpp
+++ b/ace/LSOCK_Dgram.cpp
@@ -1,13 +1,12 @@
 // $Id$
 
 #include "ace/LSOCK_Dgram.h"
-#include "ace/Log_Msg.h"
+#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
+#include "ace/Log_Msg.h"
 
 ACE_RCSID(ace, LSOCK_Dgram, "$Id$")
 
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/LSOCK_Dgram.i"
 #endif
diff --git a/ace/LSOCK_Dgram.h b/ace/LSOCK_Dgram.h
index 0bc90cf3008..5f63e25c80d 100644
--- a/ace/LSOCK_Dgram.h
+++ b/ace/LSOCK_Dgram.h
@@ -16,16 +16,17 @@
 #define ACE_LOCAL_SOCK_DGRAM_H
 #include "ace/pre.h"
 
-#include "ace/SOCK_Dgram.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/LSOCK.h"
-
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
+#include "ace/SOCK_Dgram.h"
+#include "ace/LSOCK.h"
+
 /**
  * @class ACE_LSOCK_Dgram
  *
diff --git a/ace/LSOCK_Stream.cpp b/ace/LSOCK_Stream.cpp
index 6cc8efdb20c..6340d3d57e4 100644
--- a/ace/LSOCK_Stream.cpp
+++ b/ace/LSOCK_Stream.cpp
@@ -2,12 +2,12 @@
 // $Id$
 
 #include "ace/LSOCK_Stream.h"
+#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
+
 #include "ace/Log_Msg.h"
 
 ACE_RCSID(ace, LSOCK_Stream, "$Id$")
 
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/LSOCK_Stream.i"
 #endif
diff --git a/ace/LSOCK_Stream.h b/ace/LSOCK_Stream.h
index 51382e2f5dd..5395c7a8d53 100644
--- a/ace/LSOCK_Stream.h
+++ b/ace/LSOCK_Stream.h
@@ -15,17 +15,18 @@
 #define ACE_LOCAL_SOCK_STREAM_H
 #include "ace/pre.h"
 
-#include "ace/SOCK_Stream.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
+
+#include "ace/SOCK_Stream.h"
 #include "ace/UNIX_Addr.h"
 #include "ace/LSOCK.h"
 
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
 /**
  * @class ACE_LSOCK_Stream
  *
diff --git a/ace/Local_Tokens.cpp b/ace/Local_Tokens.cpp
index bca379f58ca..890adbcbcee 100644
--- a/ace/Local_Tokens.cpp
+++ b/ace/Local_Tokens.cpp
@@ -1,7 +1,10 @@
 // $Id$
 
-#include "ace/Thread.h"
 #include "ace/Local_Tokens.h"
+
+#if defined (ACE_HAS_TOKENS_LIBRARY)
+
+#include "ace/Thread.h"
 #include "ace/Token_Manager.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/ace/Local_Tokens.h b/ace/Local_Tokens.h
index 6660d8b2028..e64762e0bd5 100644
--- a/ace/Local_Tokens.h
+++ b/ace/Local_Tokens.h
@@ -45,19 +45,20 @@
 #define ACE_LOCAL_MUTEX_H
 #include "ace/pre.h"
 
-#include "ace/Synch_T.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if defined (ACE_HAS_TOKENS_LIBRARY)
+
+#include "ace/Synch_T.h"
 #include "ace/Containers.h"
 #include "ace/Synch_Options.h"
 #include "ace/Map_Manager.h"
 #include "ace/Log_Msg.h"
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
-
 #if !(defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREAD_SPECIFIC_STORAGE))
 # define ACE_NO_TSS_TOKENS 1
 #endif /* !(defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)) */
diff --git a/ace/Msg_WFMO_Reactor.h b/ace/Msg_WFMO_Reactor.h
index 827a51e0e0f..c5246c0c8b6 100644
--- a/ace/Msg_WFMO_Reactor.h
+++ b/ace/Msg_WFMO_Reactor.h
@@ -16,7 +16,7 @@
 #define ACE_MSG_WFMO_REACTOR_H
 #include "ace/pre.h"
 
-#include "ace/WFMO_Reactor.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,6 +24,8 @@
 
 #if defined (ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO)
 
+#include "ace/WFMO_Reactor.h"
+
 /**
  * @class ACE_Msg_WFMO_Reactor
  *
diff --git a/ace/POSIX_Asynch_IO.h b/ace/POSIX_Asynch_IO.h
index ea31b0faafb..6e9ba7d0146 100644
--- a/ace/POSIX_Asynch_IO.h
+++ b/ace/POSIX_Asynch_IO.h
@@ -20,7 +20,7 @@
 #ifndef ACE_POSIX_ASYNCH_IO_H
 #define ACE_POSIX_ASYNCH_IO_H
 
-#include "ace/OS.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -28,6 +28,7 @@
 
 #if defined (ACE_HAS_AIO_CALLS)
 
+#include "ace/OS.h"
 #include "ace/Asynch_IO_Impl.h"
 #include "ace/Reactor.h"
 #include "ace/Select_Reactor.h"
diff --git a/ace/POSIX_Proactor.h b/ace/POSIX_Proactor.h
index 9fc6ec6cc8c..5331f3abb3d 100644
--- a/ace/POSIX_Proactor.h
+++ b/ace/POSIX_Proactor.h
@@ -17,12 +17,17 @@
 #ifndef ACE_POSIX_PROACTOR_H
 #define ACE_POSIX_PROACTOR_H
 
-#include "ace/Proactor_Impl.h"
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+#pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (ACE_HAS_AIO_CALLS)
 // POSIX implementation of Proactor depends on the <aio_> family of
 // system calls.
 
+#include "ace/Proactor_Impl.h"
 #include "ace/Free_List.h"
 #include "ace/Pipe.h"
 #include "ace/POSIX_Asynch_IO.h"
diff --git a/ace/Proactor.cpp b/ace/Proactor.cpp
index 042df8a8b0c..6a87d59fe4a 100644
--- a/ace/Proactor.cpp
+++ b/ace/Proactor.cpp
@@ -1,6 +1,10 @@
 // $Id$
 
 #include "ace/Proactor.h"
+#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+// This only works on Win32 platforms and on Unix platforms with aio
+// calls.
+
 #include "ace/Proactor_Impl.h"
 #include "ace/Object_Manager.h"
 #include "ace/Task_T.h"
@@ -10,9 +14,6 @@
 
 ACE_RCSID(ace, Proactor, "$Id$")
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
-// This only works on Win32 platforms and on Unix platforms with aio
-// calls.
 #include "ace/Task_T.h"
 #include "ace/Log_Msg.h"
 #include "ace/Framework_Component.h"
diff --git a/ace/Proactor.h b/ace/Proactor.h
index b677d4811d2..88df20ccd8c 100644
--- a/ace/Proactor.h
+++ b/ace/Proactor.h
@@ -17,7 +17,7 @@
 #define ACE_PROACTOR_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -27,6 +27,7 @@
 // This only works on Win32 platforms and on Unix platforms supporting
 // POSIX aio calls.
 
+#include "ace/OS.h"
 #include "ace/Asynch_IO.h"
 #include "ace/Asynch_IO_Impl.h"
 #include "ace/Thread_Manager.h"
diff --git a/ace/Proactor_Impl.h b/ace/Proactor_Impl.h
index f569494667a..4b129de07b1 100644
--- a/ace/Proactor_Impl.h
+++ b/ace/Proactor_Impl.h
@@ -15,11 +15,12 @@
 #define ACE_PROACTOR_IMPL_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/config-all.h"
 
 #if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
 // This only works on Win32 platforms and on Unix platforms supporting
 // aio calls.
+#include "ace/OS.h"
 
 #include "ace/Asynch_IO.h"
 #include "ace/Reactor.h"
diff --git a/ace/QtReactor.h b/ace/QtReactor.h
index 7b6cb0684cb..7ac9d73b922 100644
--- a/ace/QtReactor.h
+++ b/ace/QtReactor.h
@@ -15,14 +15,15 @@
 #define ACE_QTREACTOR_H
 #include "ace/pre.h"
 
-
-#include "ace/Select_Reactor.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (ACE_HAS_QT)
+
+#include "ace/Select_Reactor.h"
 #include "ace/Map_Manager.h"
 
 // Qttoolkit specific includes.
diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp
index e65ddc6af01..525647f8153 100644
--- a/ace/Reactor.cpp
+++ b/ace/Reactor.cpp
@@ -7,8 +7,10 @@
 #  if !defined (ACE_LACKS_ACE_SVCCONF)
 #    include "ace/Service_Config.h"
 #  endif /* !ACE_LACKS_ACE_SVCCONF */
-#  include "ace/WFMO_Reactor.h"
-#  include "ace/Msg_WFMO_Reactor.h"
+#  if defined (ACE_WIN32)
+#    include "ace/WFMO_Reactor.h"
+#    include "ace/Msg_WFMO_Reactor.h"
+#  endif /* ACE_WIN32 */
 #endif /* ! ACE_HAS_WINCE */
 #include "ace/Select_Reactor.h"
 #include "ace/TP_Reactor.h"
diff --git a/ace/SUN_Proactor.h b/ace/SUN_Proactor.h
index ae01690d731..3c14a243576 100644
--- a/ace/SUN_Proactor.h
+++ b/ace/SUN_Proactor.h
@@ -13,10 +13,15 @@
 #ifndef ACE_SUN_PROACTOR_H
 #define ACE_SUN_PROACTOR_H
 
-#include "ace/POSIX_Proactor.h"
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (ACE_HAS_AIO_CALLS) && defined (sun)
 
+#include "ace/POSIX_Proactor.h"
 #include "sys/asynch.h"    // Sun native aio calls
 
 /**
diff --git a/ace/TkReactor.cpp b/ace/TkReactor.cpp
index 78ca60e2741..c9fa9b251d0 100644
--- a/ace/TkReactor.cpp
+++ b/ace/TkReactor.cpp
@@ -1,12 +1,14 @@
+#include "ace/TkReactor.h"
+
+#if defined (ACE_HAS_TK)
+
+
 #include "ace/Synch_T.h"
 #include "ace/SOCK_Acceptor.h"
 #include "ace/SOCK_Connector.h"
-#include "ace/TkReactor.h"
 
 ACE_RCSID(ace, TkReactor, "$Id$")
 
-#if defined (ACE_HAS_TK)
-
 ACE_ALLOC_HOOK_DEFINE (ACE_TkReactor)
 
 // Must be called with lock held
diff --git a/ace/TkReactor.h b/ace/TkReactor.h
index 7aca8465274..9f45637aff9 100644
--- a/ace/TkReactor.h
+++ b/ace/TkReactor.h
@@ -14,12 +14,15 @@
 #define ACE_TKREACTOR_H
 #include "ace/pre.h"
 
-#include "ace/Select_Reactor.h"
+#include "ace/config-all.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (ACE_HAS_TK)
+
+#include "ace/Select_Reactor.h"
 #include <tk.h>
 
 /**
diff --git a/ace/UNIX_Addr.cpp b/ace/UNIX_Addr.cpp
index 5b580cff1ce..13bb91e1db1 100644
--- a/ace/UNIX_Addr.cpp
+++ b/ace/UNIX_Addr.cpp
@@ -3,14 +3,14 @@
 
 #include "ace/UNIX_Addr.h"
 
-#if !defined (__ACE_INLINE__)
-#include "ace/UNIX_Addr.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(ace, UNIX_Addr, "$Id$")
 
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
+#if !defined (__ACE_INLINE__)
+#include "ace/UNIX_Addr.i"
+#endif /* __ACE_INLINE__ */
+
 ACE_ALLOC_HOOK_DEFINE(ACE_UNIX_Addr)
 
 // Set a pointer to the address.
diff --git a/ace/UNIX_Addr.h b/ace/UNIX_Addr.h
index fc9be3bdff6..505df2250c7 100644
--- a/ace/UNIX_Addr.h
+++ b/ace/UNIX_Addr.h
@@ -15,9 +15,7 @@
 #define ACE_UNIX_ADDR_H
 #include "ace/pre.h"
 
-#include "ace/Addr.h"
-#include "ace/Log_Msg.h"
-#include "ace/ACE.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,6 +23,10 @@
 
 #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
 
+#include "ace/Addr.h"
+#include "ace/Log_Msg.h"
+#include "ace/ACE.h"
+
 /**
  * @class ACE_UNIX_Addr
  *
diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp
index c1df71ef25f..cb674dd425c 100644
--- a/ace/WFMO_Reactor.cpp
+++ b/ace/WFMO_Reactor.cpp
@@ -2,6 +2,8 @@
 
 #include "ace/WFMO_Reactor.h"
 
+#if defined (ACE_WIN32)
+
 #include "ace/Handle_Set.h"
 #include "ace/Timer_Heap.h"
 #include "ace/Thread.h"
@@ -12,9 +14,6 @@
 
 ACE_RCSID(ace, WFMO_Reactor, "$Id$")
 
-
-#if defined (ACE_WIN32)
-
 #include "ace/Auto_Ptr.h"
 
 ACE_WFMO_Reactor_Handler_Repository::ACE_WFMO_Reactor_Handler_Repository (ACE_WFMO_Reactor &wfmo_reactor)
diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h
index 509a197e172..07c677ffeb8 100644
--- a/ace/WFMO_Reactor.h
+++ b/ace/WFMO_Reactor.h
@@ -16,12 +16,15 @@
 #define ACE_WFMO_REACTOR_H
 #include "ace/pre.h"
 
-#include "ace/Signal.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if defined (ACE_WIN32)
+
+#include "ace/Signal.h"
 #include "ace/Timer_Queue.h"
 #include "ace/Event_Handler.h"
 #include "ace/Synch.h"
@@ -29,7 +32,6 @@
 #include "ace/Message_Queue.h"
 #include "ace/Process_Mutex.h"
 
-#if defined (ACE_WIN32)
 // If we don't have WinSOCK2, we need these defined
 #if !defined (ACE_HAS_WINSOCK2) || (ACE_HAS_WINSOCK2 == 0)
 /*
@@ -67,7 +69,6 @@ int WSAEnumNetworkEvents (SOCKET s,
                           LPWSANETWORKEVENTS lpNetworkEvents);
 
 #endif /* !defined ACE_HAS_WINSOCK2 */
-#endif /* defined (ACE_WIN32) && !define (ACE_HAS_WINCE) */
 
 // Forward decl.
 class ACE_WFMO_Reactor;
@@ -573,10 +574,7 @@ private:
   /// thread up (e.g., when the <notify> method is called).
   ACE_Auto_Event wakeup_one_thread_;
 
-#if defined (ACE_WIN32)
-// because Sun C++ 4.1 can't cope with this declaration:
   ACE_Message_Queue<ACE_MT_SYNCH> message_queue_;
-#endif /* ACE_WIN32 */
   // Message queue that keeps track of pending <ACE_Event_Handlers>.
   // This queue must be thread-safe because it can be called by
   // multiple threads of control.
@@ -592,7 +590,6 @@ private:
   int max_notify_iterations_;
 };
 
-#if defined (ACE_WIN32)
 /**
  * @class ACE_WFMO_Reactor
  *
@@ -1315,10 +1312,10 @@ private:
   ACE_WFMO_Reactor &operator = (const ACE_WFMO_Reactor &);
 };
 
-#endif /* ACE_WIN32 */
-
 #if defined (__ACE_INLINE__)
 #include "ace/WFMO_Reactor.i"
 #endif /* __ACE_INLINE__ */
+
+#endif /* ACE_WIN32 */
 #include "ace/post.h"
 #endif /* ACE_WFMO_REACTOR_H */
diff --git a/ace/WIN32_Asynch_IO.h b/ace/WIN32_Asynch_IO.h
index 8dba2c3cbfc..1d99a0e61b8 100644
--- a/ace/WIN32_Asynch_IO.h
+++ b/ace/WIN32_Asynch_IO.h
@@ -25,7 +25,7 @@
 #define ACE_WIN32_ASYNCH_IO_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -33,6 +33,7 @@
 
 #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
 
+#include "ace/OS.h"
 #include "ace/Asynch_IO_Impl.h"
 #include "ace/Addr.h"
 
diff --git a/ace/WIN32_Proactor.h b/ace/WIN32_Proactor.h
index 4180efe37d7..1784ead2c8a 100644
--- a/ace/WIN32_Proactor.h
+++ b/ace/WIN32_Proactor.h
@@ -17,13 +17,19 @@
 #define ACE_WIN32_PROACTOR_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
-#include "ace/WIN32_Asynch_IO.h"
-#include "ace/Event_Handler.h"
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+#pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
 // WIN32 implementation of the Proactor.
 
+#include "ace/OS.h"
+#include "ace/WIN32_Asynch_IO.h"
+#include "ace/Event_Handler.h"
+
 #include "ace/Proactor_Impl.h"
 
 // Forward declarations.
diff --git a/ace/XTI_ATM_Mcast.h b/ace/XTI_ATM_Mcast.h
index ed1ef058303..5c3e8821f81 100644
--- a/ace/XTI_ATM_Mcast.h
+++ b/ace/XTI_ATM_Mcast.h
@@ -15,15 +15,17 @@
 #define ACE_XTI_ATM_MCAST_H
 #include "ace/pre.h"
 
-#include "ace/TLI_Connector.h"
-#include "ace/ATM_Addr.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
+#pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined (ACE_HAS_XTI_ATM)
 
+#include "ace/TLI_Connector.h"
+#include "ace/ATM_Addr.h"
+
 /**
  * @class ACE_XTI_ATM_Mcast
  *
diff --git a/ace/XtReactor.cpp b/ace/XtReactor.cpp
index 9b86329eb0e..a6d87a398f5 100644
--- a/ace/XtReactor.cpp
+++ b/ace/XtReactor.cpp
@@ -1,14 +1,14 @@
 // $Id$
 
+#include "ace/XtReactor.h"
+#if defined (ACE_HAS_XT)
+
 #include "ace/Synch_T.h"
 #include "ace/SOCK_Acceptor.h"
 #include "ace/SOCK_Connector.h"
-#include "ace/XtReactor.h"
 
 ACE_RCSID(ace, XtReactor, "$Id$")
 
-#if defined (ACE_HAS_XT)
-
 ACE_ALLOC_HOOK_DEFINE (ACE_XtReactor)
 
 // Must be called with lock held
diff --git a/ace/XtReactor.h b/ace/XtReactor.h
index 0104e946952..3c56618f8e4 100644
--- a/ace/XtReactor.h
+++ b/ace/XtReactor.h
@@ -17,7 +17,7 @@
 #define ACE_XTREACTOR_H
 #include "ace/pre.h"
 
-#include "ace/Select_Reactor.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,6 +25,8 @@
 
 #if defined (ACE_HAS_XT)
 
+#include "ace/Select_Reactor.h"
+
 //#define String XtString
 #include /**/ <X11/Intrinsic.h>
 //#undef String