*** empty log message ***

47 files changed, 49 insertions, 54 deletions

diff --git a/ChangeLog-97b b/ChangeLog-97b
index 323d4f53da7..f90c205d000 100644
--- a/ChangeLog-97b
+++ b/ChangeLog-97b
@@ -1,5 +1,9 @@
 Sat Sep 13 12:11:50 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
+	* tests: #include "test_config.h" before all the other files so
+ 	  that we always have the ACE_ASSERT enabled...  Thanks to Carlos
+ 	  for noticing this.
+ 
 	* ace/Reactor.cpp: Added Arturo's improvements for suspending and
 	  resuming Event_Handlers.
 
diff --git a/tests/Async_Timer_Queue_Test.cpp b/tests/Async_Timer_Queue_Test.cpp
index 3347eca79f5..c166c016a23 100644
--- a/tests/Async_Timer_Queue_Test.cpp
+++ b/tests/Async_Timer_Queue_Test.cpp
@@ -17,9 +17,9 @@
 // 
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Signal.h"
 #include "ace/Timer_List.h"
-#include "test_config.h"
 
 class Timer_Handler : public ACE_Event_Handler
   // = TITLE
diff --git a/tests/Atomic_Op_Test.cpp b/tests/Atomic_Op_Test.cpp
index a7cc6f3a111..775e1bd664b 100644
--- a/tests/Atomic_Op_Test.cpp
+++ b/tests/Atomic_Op_Test.cpp
@@ -19,8 +19,8 @@
 //
 // ============================================================================
 
-#include "ace/Synch.h"
 #include "tests/test_config.h"
+#include "ace/Synch.h"
 
 #if defined (ACE_HAS_THREADS)
 
diff --git a/tests/Barrier_Test.cpp b/tests/Barrier_Test.cpp
index b34b262312d..5da971114f4 100644
--- a/tests/Barrier_Test.cpp
+++ b/tests/Barrier_Test.cpp
@@ -17,10 +17,10 @@
 // 
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Synch.h"
 #include "ace/Thread_Manager.h"
 #include "ace/Service_Config.h"
-#include "test_config.h"
 
 #if defined (ACE_HAS_THREADS)
 
diff --git a/tests/Buffer_Stream_Test.cpp b/tests/Buffer_Stream_Test.cpp
index 254c3e38bf7..57a96e5b3ee 100644
--- a/tests/Buffer_Stream_Test.cpp
+++ b/tests/Buffer_Stream_Test.cpp
@@ -21,12 +21,12 @@
 // 
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Service_Config.h"
 #include "ace/Synch.h"
 #include "ace/Stream.h"
 #include "ace/Module.h"
 #include "ace/Task.h"
-#include "test_config.h"
 
 #if defined (ACE_HAS_THREADS)
 
diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp
index 6e7b4c5eee2..a06fc7154ec 100644
--- a/tests/Conn_Test.cpp
+++ b/tests/Conn_Test.cpp
@@ -21,13 +21,13 @@
 //
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/SOCK_Connector.h"
 #include "ace/SOCK_Acceptor.h"
 #include "ace/Acceptor.h"
 #include "ace/Handle_Set.h"
 #include "ace/Connector.h"
 #include "ace/Strategies.h"
-#include "test_config.h"
 #include "Conn_Test.h"
 
 // ****************************************
diff --git a/tests/Enum_Interfaces_Test.cpp b/tests/Enum_Interfaces_Test.cpp
index dd0f3c65dd1..31e9a639104 100644
--- a/tests/Enum_Interfaces_Test.cpp
+++ b/tests/Enum_Interfaces_Test.cpp
@@ -27,9 +27,9 @@
 //
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/OS.h"
 #include "ace/INET_Addr.h"
-#include "test_config.h"
 
 int
 main (int, char *[])
diff --git a/tests/Future_Test.cpp b/tests/Future_Test.cpp
index 8c187769a78..f8b74352075 100644
--- a/tests/Future_Test.cpp
+++ b/tests/Future_Test.cpp
@@ -17,6 +17,7 @@
 //
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/ACE.h"
 #include "ace/Task.h"
 #include "ace/Synch.h"
@@ -25,7 +26,6 @@
 #include "ace/Method_Object.h"
 #include "ace/Activation_Queue.h"
 #include "ace/Auto_Ptr.h"
-#include "test_config.h"
 
 #if defined (ACE_HAS_THREADS)
 
diff --git a/tests/Handle_Set_Test.cpp b/tests/Handle_Set_Test.cpp
index 40bdff12292..87f22c169ce 100644
--- a/tests/Handle_Set_Test.cpp
+++ b/tests/Handle_Set_Test.cpp
@@ -18,10 +18,10 @@
 //
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Profile_Timer.h"
 #include "ace/Handle_Set.h"
 #include "ace/Containers.h"
-#include "test_config.h"
 
 static void
 test_duplicates (size_t count)
diff --git a/tests/Hash_Map_Manager_Test.cpp b/tests/Hash_Map_Manager_Test.cpp
index bc04edcd5e0..196b1f0a12d 100644
--- a/tests/Hash_Map_Manager_Test.cpp
+++ b/tests/Hash_Map_Manager_Test.cpp
@@ -18,10 +18,10 @@
 //
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/SString.h"
 #include "ace/Synch.h"
-#include "test_config.h"
 
 #if defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
 
diff --git a/tests/IOStream_Test.cpp b/tests/IOStream_Test.cpp
index 14d0010906f..d978c3c1932 100644
--- a/tests/IOStream_Test.cpp
+++ b/tests/IOStream_Test.cpp
@@ -17,12 +17,12 @@
 //
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Thread.h"
 #include "ace/Acceptor.h"
 #include "ace/SOCK_Connector.h"
 #include "ace/SOCK_Acceptor.h"
 #include "ace/IOStream.h"
-#include "test_config.h"
 
 #if !defined (ACE_LACKS_ACE_IOSTREAM)
 
diff --git a/tests/MM_Shared_Memory_Test.cpp b/tests/MM_Shared_Memory_Test.cpp
index c7045bc28e9..baa25ca82ca 100644
--- a/tests/MM_Shared_Memory_Test.cpp
+++ b/tests/MM_Shared_Memory_Test.cpp
@@ -20,11 +20,10 @@
 // 
 // ============================================================================
 
-
+#include "test_config.h"
 #include "ace/Shared_Memory_MM.h"
 #include "ace/Thread.h"
 #include "ace/Thread_Manager.h"
-#include "test_config.h"
 
 const int SHMSZ = 27;
 static TCHAR shm_key[] = ACE_TEMP_FILE_NAME __TEXT ("XXXXXX");
diff --git a/tests/Map_Manager_Test.cpp b/tests/Map_Manager_Test.cpp
index 12707e1d6d5..b10d5618cfd 100644
--- a/tests/Map_Manager_Test.cpp
+++ b/tests/Map_Manager_Test.cpp
@@ -18,11 +18,11 @@
 //
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Map_Manager.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Profile_Timer.h"
 #include "ace/Synch.h"
-#include "test_config.h"
 
 typedef ACE_Null_Mutex MUTEX;
 typedef size_t VALUE;
diff --git a/tests/Mem_Map_Test.cpp b/tests/Mem_Map_Test.cpp
index 4e84adcd1ca..02f12f5a863 100644
--- a/tests/Mem_Map_Test.cpp
+++ b/tests/Mem_Map_Test.cpp
@@ -19,9 +19,8 @@
 // 
 // ============================================================================
 
-
-#include "ace/Mem_Map.h"
 #include "test_config.h"
+#include "ace/Mem_Map.h"
 
 static const int FILE_SIZE = 10;
 static const int NUM_LINES = 15;
diff --git a/tests/Message_Block_Test.cpp b/tests/Message_Block_Test.cpp
index eb6e027b84a..e73d6639752 100644
--- a/tests/Message_Block_Test.cpp
+++ b/tests/Message_Block_Test.cpp
@@ -18,12 +18,12 @@
 //
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Task.h"
 #include "ace/Service_Config.h"
 #include "ace/Malloc.h"
 #include "ace/Profile_Timer.h"
 #include "ace/Free_List.h"
-#include "test_config.h"
 
 // Number of memory allocation strategies used in this test.
 static const int ACE_ALLOC_STRATEGY_NO = 2;
diff --git a/tests/Message_Queue_Notifications_Test.cpp b/tests/Message_Queue_Notifications_Test.cpp
index 5ad4f3a6f20..68e9cf2f081 100644
--- a/tests/Message_Queue_Notifications_Test.cpp
+++ b/tests/Message_Queue_Notifications_Test.cpp
@@ -28,10 +28,10 @@
 // 
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Reactor.h"
 #include "ace/Strategies.h"
 #include "ace/Task.h"
-#include "test_config.h"
 
 static int iterations = 10;
 
diff --git a/tests/Message_Queue_Test.cpp b/tests/Message_Queue_Test.cpp
index 20250e82612..0b01e8067e9 100644
--- a/tests/Message_Queue_Test.cpp
+++ b/tests/Message_Queue_Test.cpp
@@ -17,9 +17,9 @@
 //
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Message_Queue.h"
 #include "ace/Synch.h"
-#include "test_config.h"
 
 typedef ACE_Message_Queue <ACE_NULL_SYNCH> QUEUE;
 typedef ACE_Message_Queue_Iterator <ACE_NULL_SYNCH> ITERATOR;
diff --git a/tests/Mutex_Test.cpp b/tests/Mutex_Test.cpp
index 85694dc86b2..1b525422cf4 100644
--- a/tests/Mutex_Test.cpp
+++ b/tests/Mutex_Test.cpp
@@ -18,9 +18,9 @@
 // 
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Service_Config.h"
 #include "ace/Thread_Manager.h"
-#include "test_config.h"
 
 static void *
 test (void *args)
diff --git a/tests/Naming_Test.cpp b/tests/Naming_Test.cpp
index df39a4fe2f1..37f152b2b47 100644
--- a/tests/Naming_Test.cpp
+++ b/tests/Naming_Test.cpp
@@ -18,10 +18,10 @@
 // 
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/SString.h"
 #include "ace/Naming_Context.h"
 #include "ace/Profile_Timer.h"
-#include "test_config.h"
 
 static char name[BUFSIZ];
 static char value[BUFSIZ];
diff --git a/tests/Pipe_Test.cpp b/tests/Pipe_Test.cpp
index 8a9da99747a..46cea8a972d 100644
--- a/tests/Pipe_Test.cpp
+++ b/tests/Pipe_Test.cpp
@@ -16,10 +16,10 @@
 // 
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Pipe.h"
 #include "ace/Process.h"
 #include "ace/Get_Opt.h"
-#include "test_config.h"
 
 static int close_pipe = 1;
 static int child_process = 0;
diff --git a/tests/Priority_Buffer_Test.cpp b/tests/Priority_Buffer_Test.cpp
index 82afc79cc93..6e1fd8c3bd8 100644
--- a/tests/Priority_Buffer_Test.cpp
+++ b/tests/Priority_Buffer_Test.cpp
@@ -19,9 +19,9 @@
 // 
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Message_Queue.h"
 #include "ace/Service_Config.h"
-#include "test_config.h"
 
 #if defined (ACE_HAS_THREADS)
 
diff --git a/tests/Priority_Task_Test.cpp b/tests/Priority_Task_Test.cpp
index f08f20c99b8..a83106ec90c 100644
--- a/tests/Priority_Task_Test.cpp
+++ b/tests/Priority_Task_Test.cpp
@@ -17,10 +17,10 @@
 // 
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Service_Config.h"
 #include "ace/Task.h"
 #include "ace/Sched_Params.h"
-#include "test_config.h"
 
 #if defined (ACE_HAS_THREADS)
 
diff --git a/tests/Process_Mutex_Test.cpp b/tests/Process_Mutex_Test.cpp
index ef8ab86a6c1..f53522b730f 100644
--- a/tests/Process_Mutex_Test.cpp
+++ b/tests/Process_Mutex_Test.cpp
@@ -16,10 +16,10 @@
 // 
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Synch.h"
 #include "ace/Process.h"
 #include "ace/Get_Opt.h"
-#include "test_config.h"
 
 static int release_mutex = 1;
 static int child_process = 0;
diff --git a/tests/Process_Strategy_Test.cpp b/tests/Process_Strategy_Test.cpp
index a26a89ccfab..9c8c216a4b3 100644
--- a/tests/Process_Strategy_Test.cpp
+++ b/tests/Process_Strategy_Test.cpp
@@ -36,6 +36,7 @@
 //
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Acceptor.h"
 #include "ace/Get_Opt.h"
 #include "ace/SOCK_Acceptor.h"
@@ -43,7 +44,6 @@
 #include "ace/Strategies_T.h"
 #include "ace/Service_Config.h"
 #include "ace/Singleton.h"
-#include "test_config.h"
 #include "Process_Strategy_Test.h"	// Counting_Service and Options in here
 
 u_int shutting_down = 0;
diff --git a/tests/Reactor_Exceptions_Test.cpp b/tests/Reactor_Exceptions_Test.cpp
index 511b27158ba..30be125548c 100644
--- a/tests/Reactor_Exceptions_Test.cpp
+++ b/tests/Reactor_Exceptions_Test.cpp
@@ -17,10 +17,10 @@
 // 
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Service_Config.h"
 #include "ace/Reactor.h"
 #include "ace/SOCK_Dgram.h"
-#include "test_config.h"
 
 #if defined (ACE_HAS_EXCEPTIONS)
 
diff --git a/tests/Reactor_Notify_Test.cpp b/tests/Reactor_Notify_Test.cpp
index e43b503741a..ff5755120fb 100644
--- a/tests/Reactor_Notify_Test.cpp
+++ b/tests/Reactor_Notify_Test.cpp
@@ -17,10 +17,10 @@
 // 
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Synch.h"
 #include "ace/Service_Config.h"
 #include "ace/Task.h"
-#include "test_config.h"
 
 #if defined (ACE_HAS_THREADS)
 
diff --git a/tests/Reactor_Timer_Test.cpp b/tests/Reactor_Timer_Test.cpp
index df4ff47774c..59c2fabdc23 100644
--- a/tests/Reactor_Timer_Test.cpp
+++ b/tests/Reactor_Timer_Test.cpp
@@ -19,9 +19,9 @@
 // 
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Timer_Queue.h"
 #include "ace/Reactor.h"
-#include "test_config.h"
 
 static int done = 0;
 static int count = 0;
diff --git a/tests/Reactors_Test.cpp b/tests/Reactors_Test.cpp
index 0cffe6c416f..05d3f5f2305 100644
--- a/tests/Reactors_Test.cpp
+++ b/tests/Reactors_Test.cpp
@@ -17,10 +17,10 @@
 // 
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Synch.h"
 #include "ace/Service_Config.h"
 #include "ace/Task.h"
-#include "test_config.h"
 
 #if defined (ACE_HAS_THREADS)
 
diff --git a/tests/Reader_Writer_Test.cpp b/tests/Reader_Writer_Test.cpp
index 759cc664285..38b08d79ed0 100644
--- a/tests/Reader_Writer_Test.cpp
+++ b/tests/Reader_Writer_Test.cpp
@@ -18,11 +18,11 @@
 //
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Synch.h"
 #include "ace/Thread.h"
 #include "ace/Service_Config.h"
 #include "ace/Get_Opt.h"
-#include "test_config.h"
 
 #if defined (ACE_HAS_THREADS)
 
diff --git a/tests/Recursive_Mutex_Test.cpp b/tests/Recursive_Mutex_Test.cpp
index e7bbef19fbf..46502986f70 100644
--- a/tests/Recursive_Mutex_Test.cpp
+++ b/tests/Recursive_Mutex_Test.cpp
@@ -18,11 +18,10 @@
 // 
 // ============================================================================
 
-
+#include "test_config.h"
 #include "ace/Service_Config.h"
 #include "ace/Get_Opt.h"
 #include "ace/Synch.h"
-#include "test_config.h"
 
 #if defined (ACE_HAS_THREADS)
 
diff --git a/tests/SOCK_Test.cpp b/tests/SOCK_Test.cpp
index 89bffc10db0..4ca4fbf7755 100644
--- a/tests/SOCK_Test.cpp
+++ b/tests/SOCK_Test.cpp
@@ -20,13 +20,13 @@
 // 
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/OS.h"
 #include "ace/Thread.h"
 #include "ace/Service_Config.h"
 #include "ace/SOCK_Connector.h"
 #include "ace/SOCK_Acceptor.h"                             
 #include "ace/Handle_Set.h"
-#include "test_config.h"
 
 static void *
 client (void *arg)
diff --git a/tests/SPIPE_Test.cpp b/tests/SPIPE_Test.cpp
index e829a7e4dcc..39d96559394 100644
--- a/tests/SPIPE_Test.cpp
+++ b/tests/SPIPE_Test.cpp
@@ -21,13 +21,13 @@
 // 
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/OS.h"
 #include "ace/Thread.h"
 #include "ace/Thread_Manager.h"
 #include "ace/SPIPE_Addr.h"
 #include "ace/SPIPE_Connector.h"
 #include "ace/SPIPE_Acceptor.h"
-#include "test_config.h"
 
 // pipe name to use
 static const char *PIPE_NAME = "ace_pipe_name";
diff --git a/tests/SString_Test.cpp b/tests/SString_Test.cpp
index 2f5e9598e03..0227da1502b 100644
--- a/tests/SString_Test.cpp
+++ b/tests/SString_Test.cpp
@@ -18,8 +18,8 @@
 // 
 // ============================================================================
 
-#include "ace/SString.h"
 #include "test_config.h"
+#include "ace/SString.h"
 
 int 
 main (int, char *[])
diff --git a/tests/SV_Shared_Memory_Test.cpp b/tests/SV_Shared_Memory_Test.cpp
index f8df6c99335..afecca13a22 100644
--- a/tests/SV_Shared_Memory_Test.cpp
+++ b/tests/SV_Shared_Memory_Test.cpp
@@ -17,8 +17,8 @@
 //
 // ============================================================================
 
-#include "ace/Malloc.h"
 #include "test_config.h"
+#include "ace/Malloc.h"
 
 #if defined (ACE_HAS_SYSV_IPC)
 
diff --git a/tests/Semaphore_Test.cpp b/tests/Semaphore_Test.cpp
index 26433d1bdb0..5170301437c 100644
--- a/tests/Semaphore_Test.cpp
+++ b/tests/Semaphore_Test.cpp
@@ -17,11 +17,11 @@
 // 
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Synch.h"
 #include "ace/Thread.h"
 #include "ace/Service_Config.h"
 #include "ace/Get_Opt.h"
-#include "test_config.h"
 
 #if defined (ACE_HAS_THREADS)
 
diff --git a/tests/Service_Config_Test.cpp b/tests/Service_Config_Test.cpp
index 640bcecd261..3e7fb7c9bbf 100644
--- a/tests/Service_Config_Test.cpp
+++ b/tests/Service_Config_Test.cpp
@@ -17,9 +17,9 @@
 //
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Object_Manager.h"
 #include "ace/Service_Config.h"
-#include "test_config.h"
 
 #define VARIETIES 3
 
diff --git a/tests/Sigset_Ops_Test.cpp b/tests/Sigset_Ops_Test.cpp
index 538720a9ce5..2599da7e77a 100644
--- a/tests/Sigset_Ops_Test.cpp
+++ b/tests/Sigset_Ops_Test.cpp
@@ -18,9 +18,8 @@
 // 
 // ============================================================================
 
-
-#include "ace/OS.h"
 #include "test_config.h"
+#include "ace/OS.h"
 
 void 
 siglistset(sigset_t x, int *sigset) 
diff --git a/tests/Simple_Message_Block_Test.cpp b/tests/Simple_Message_Block_Test.cpp
index 8df789f9875..c7284ce35a8 100644
--- a/tests/Simple_Message_Block_Test.cpp
+++ b/tests/Simple_Message_Block_Test.cpp
@@ -20,9 +20,9 @@
 //
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Message_Block.h"
 #include "ace/Synch.h"
-#include "test_config.h"
 
 int
 main (int, char *[])
diff --git a/tests/TSS_Test.cpp b/tests/TSS_Test.cpp
index 569d35af7a5..60a1d445066 100644
--- a/tests/TSS_Test.cpp
+++ b/tests/TSS_Test.cpp
@@ -20,10 +20,10 @@
 //
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Service_Config.h"
 #include "ace/Synch.h"
 #include "TSS_Test_Errno.h"
-#include "test_config.h"
 
 #if defined (ACE_HAS_THREADS)
 
diff --git a/tests/Task_Test.cpp b/tests/Task_Test.cpp
index fafff425f2a..0730c0e72a2 100644
--- a/tests/Task_Test.cpp
+++ b/tests/Task_Test.cpp
@@ -18,10 +18,9 @@
 // 
 // ============================================================================
 
-
+#include "test_config.h"
 #include "ace/Service_Config.h"
 #include "ace/Task.h"
-#include "test_config.h"
 
 #if defined (ACE_HAS_THREADS)
 
diff --git a/tests/Thread_Manager_Test.cpp b/tests/Thread_Manager_Test.cpp
index 5abeec7b172..bfc27e964a5 100644
--- a/tests/Thread_Manager_Test.cpp
+++ b/tests/Thread_Manager_Test.cpp
@@ -19,9 +19,9 @@
 // 
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Service_Config.h"
 #include "ace/Thread_Manager.h"
-#include "test_config.h"
 
 #if defined (ACE_HAS_THREADS)
 
diff --git a/tests/Thread_Pool_Test.cpp b/tests/Thread_Pool_Test.cpp
index eea0bb607ef..8b1791a4bea 100644
--- a/tests/Thread_Pool_Test.cpp
+++ b/tests/Thread_Pool_Test.cpp
@@ -22,10 +22,10 @@
 //
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Task.h"
 #include "ace/Service_Config.h"
 #include "ace/Task.h"
-#include "test_config.h"
 
 #if defined (ACE_HAS_THREADS)
 
diff --git a/tests/Time_Service_Test.cpp b/tests/Time_Service_Test.cpp
index 8c8497a22db..9942df87506 100644
--- a/tests/Time_Service_Test.cpp
+++ b/tests/Time_Service_Test.cpp
@@ -21,8 +21,6 @@
 // 
 // ============================================================================
 
-#include "ace/OS.h"
-
 #include "test_config.h"
 #include "ace/Process.h"
 
diff --git a/tests/Time_Value_Test.cpp b/tests/Time_Value_Test.cpp
index 41078f131d8..e77191ac684 100644
--- a/tests/Time_Value_Test.cpp
+++ b/tests/Time_Value_Test.cpp
@@ -19,6 +19,7 @@
 //
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/config.h"
 
 // Force test of ACE_U_LongLong class on all platforms, except ACE_WIN32.
@@ -40,7 +41,6 @@
 #endif /* ACE_HAS_HI_RES_TIMER || ACE_HAS_LONGLONG_T */
 
 #include "ace/ACE.h"
-#include "test_config.h"
 
 
 #if ! defined (ACE_WIN32)
diff --git a/tests/Timer_Queue_Test.cpp b/tests/Timer_Queue_Test.cpp
index d99802bf386..97362f0856a 100644
--- a/tests/Timer_Queue_Test.cpp
+++ b/tests/Timer_Queue_Test.cpp
@@ -20,6 +20,7 @@
 // 
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Profile_Timer.h"
 #include "ace/Timer_Queue.h"
 #include "ace/Timer_List.h"
@@ -27,7 +28,6 @@
 #include "ace/Timer_Wheel.h"
 #include "ace/Timer_Hash.h"
 #include "ace/Timer_Queue.h"
-#include "test_config.h"
 
 template <class T> void
 randomize_array (T array[], size_t size)
diff --git a/tests/Tokens_Test.cpp b/tests/Tokens_Test.cpp
index bf84bc240bd..c12d6b419f1 100644
--- a/tests/Tokens_Test.cpp
+++ b/tests/Tokens_Test.cpp
@@ -25,9 +25,8 @@
 // 
 // ============================================================================
 
-#include "ace/OS.h"
+#include "test_config.h"
 #include "ace/Process.h"
-
 #include "ace/Get_Opt.h"
 #include "ace/Local_Tokens.h"
 #include "ace/Token_Collection.h"
@@ -35,7 +34,6 @@
 #include "ace/Thread_Manager.h"
 #include "ace/Service_Config.h"
 #include "ace/Token_Invariants.h"
-#include "test_config.h"
 
 #if defined (ACE_HAS_THREADS)
 
diff --git a/tests/UPIPE_SAP_Test.cpp b/tests/UPIPE_SAP_Test.cpp
index 0f1eec5df2f..6d4423a3d73 100644
--- a/tests/UPIPE_SAP_Test.cpp
+++ b/tests/UPIPE_SAP_Test.cpp
@@ -17,11 +17,11 @@
 // 
 // ============================================================================
 
+#include "test_config.h"
 #include "ace/Stream.h"
 #include "ace/UPIPE_Acceptor.h"
 #include "ace/UPIPE_Connector.h"
 #include "ace/Service_Config.h"
-#include "test_config.h"
 
 #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || defined (ACE_WIN32))